diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f2d8b64..26c37eba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,7 @@ find_package(Boost REQUIRED)
 find_package(Iconv REQUIRED)
 find_package(LibXml2 REQUIRED)
 find_package(Oracle REQUIRED)
+find_package(Perl REQUIRED)
 find_package(STLPort REQUIRED)
 find_package(ZLib REQUIRED)
 
diff --git a/engine/server/library/CMakeLists.txt b/engine/server/library/CMakeLists.txt
index 31e09722..98d7949b 100644
--- a/engine/server/library/CMakeLists.txt
+++ b/engine/server/library/CMakeLists.txt
@@ -1,4 +1,5 @@
 
+add_subdirectory(serverGame)
 add_subdirectory(serverKeyShare)
 add_subdirectory(serverMetrics)
 add_subdirectory(serverNetworkMessages)
diff --git a/engine/server/library/serverGame/CMakeLists.txt b/engine/server/library/serverGame/CMakeLists.txt
new file mode 100644
index 00000000..2a0c26b1
--- /dev/null
+++ b/engine/server/library/serverGame/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(serverGame)
+
+if(WIN32)
+	add_definitions(/D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/public)
+
+add_subdirectory(src)
diff --git a/engine/server/library/serverGame/include/public/serverGame/AggroListProperty.h b/engine/server/library/serverGame/include/public/serverGame/AggroListProperty.h
new file mode 100644
index 00000000..d5b324e1
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AggroListProperty.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AggroListProperty.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiCombatPulseQueue.h b/engine/server/library/serverGame/include/public/serverGame/AiCombatPulseQueue.h
new file mode 100644
index 00000000..6741b09f
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiCombatPulseQueue.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/ai/AiCombatPulseQueue.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiCreatureCombatProfile.h b/engine/server/library/serverGame/include/public/serverGame/AiCreatureCombatProfile.h
new file mode 100644
index 00000000..ddc780e6
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiCreatureCombatProfile.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AiCreatureCombatProfile.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiCreatureCombatProfile_Action.h b/engine/server/library/serverGame/include/public/serverGame/AiCreatureCombatProfile_Action.h
new file mode 100644
index 00000000..6076ef97
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiCreatureCombatProfile_Action.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AiCreatureCombatProfile_Action.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiCreatureController.h b/engine/server/library/serverGame/include/public/serverGame/AiCreatureController.h
new file mode 100644
index 00000000..6c940321
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiCreatureController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/AiCreatureController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiCreatureData.h b/engine/server/library/serverGame/include/public/serverGame/AiCreatureData.h
new file mode 100644
index 00000000..5a7b28e1
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiCreatureData.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AiCreatureData.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiCreatureStateArchive.h b/engine/server/library/serverGame/include/public/serverGame/AiCreatureStateArchive.h
new file mode 100644
index 00000000..cc9adbea
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiCreatureStateArchive.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/behavior/AiCreatureStateArchive.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiCreatureWeaponActions.h b/engine/server/library/serverGame/include/public/serverGame/AiCreatureWeaponActions.h
new file mode 100644
index 00000000..eab49eff
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiCreatureWeaponActions.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AiCreatureWeaponActions.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiLocation.h b/engine/server/library/serverGame/include/public/serverGame/AiLocation.h
new file mode 100644
index 00000000..e96d6dcc
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiLocation.h
@@ -0,0 +1 @@
+#include "../../src/shared/behavior/AiLocation.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiLogManager.h b/engine/server/library/serverGame/include/public/serverGame/AiLogManager.h
new file mode 100644
index 00000000..455c6f32
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiLogManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AiLogManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiMovementArchive.h b/engine/server/library/serverGame/include/public/serverGame/AiMovementArchive.h
new file mode 100644
index 00000000..bbf23008
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiMovementArchive.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/ai/AiMovementArchive.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiMovementBase.h b/engine/server/library/serverGame/include/public/serverGame/AiMovementBase.h
new file mode 100644
index 00000000..2777b67f
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiMovementBase.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/ai/AiMovementBase.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiMovementFace.h b/engine/server/library/serverGame/include/public/serverGame/AiMovementFace.h
new file mode 100644
index 00000000..d032d69d
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiMovementFace.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AiMovementFace.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiMovementFlee.h b/engine/server/library/serverGame/include/public/serverGame/AiMovementFlee.h
new file mode 100644
index 00000000..0287cac4
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiMovementFlee.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AiMovementFlee.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiMovementFollow.h b/engine/server/library/serverGame/include/public/serverGame/AiMovementFollow.h
new file mode 100644
index 00000000..7266cfb0
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiMovementFollow.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AiMovementFollow.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiMovementIdle.h b/engine/server/library/serverGame/include/public/serverGame/AiMovementIdle.h
new file mode 100644
index 00000000..7ce2c7f2
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiMovementIdle.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/ai/AiMovementIdle.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiMovementLoiter.h b/engine/server/library/serverGame/include/public/serverGame/AiMovementLoiter.h
new file mode 100644
index 00000000..d4b4d8da
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiMovementLoiter.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AiMovementLoiter.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiMovementMove.h b/engine/server/library/serverGame/include/public/serverGame/AiMovementMove.h
new file mode 100644
index 00000000..1124f61b
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiMovementMove.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AiMovementMove.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiMovementPathFollow.h b/engine/server/library/serverGame/include/public/serverGame/AiMovementPathFollow.h
new file mode 100644
index 00000000..3f809197
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiMovementPathFollow.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AiMovementPathFollow.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiMovementPatrol.h b/engine/server/library/serverGame/include/public/serverGame/AiMovementPatrol.h
new file mode 100644
index 00000000..cc56bdc6
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiMovementPatrol.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AiMovementPatrol.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiMovementSwarm.h b/engine/server/library/serverGame/include/public/serverGame/AiMovementSwarm.h
new file mode 100644
index 00000000..d07c6dfb
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiMovementSwarm.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AiMovementSwarm.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiMovementTarget.h b/engine/server/library/serverGame/include/public/serverGame/AiMovementTarget.h
new file mode 100644
index 00000000..3bb1ed40
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiMovementTarget.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AiMovementTarget.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiMovementWander.h b/engine/server/library/serverGame/include/public/serverGame/AiMovementWander.h
new file mode 100644
index 00000000..8440c488
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiMovementWander.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AiMovementWander.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiMovementWanderInterior.h b/engine/server/library/serverGame/include/public/serverGame/AiMovementWanderInterior.h
new file mode 100644
index 00000000..66225763
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiMovementWanderInterior.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AiMovementWanderInterior.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiMovementWaypoint.h b/engine/server/library/serverGame/include/public/serverGame/AiMovementWaypoint.h
new file mode 100644
index 00000000..25753d96
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiMovementWaypoint.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AiMovementWaypoint.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiPilotManager.h b/engine/server/library/serverGame/include/public/serverGame/AiPilotManager.h
new file mode 100644
index 00000000..4d9a3c0d
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiPilotManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/AiPilotManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiServerShipObjectInterface.h b/engine/server/library/serverGame/include/public/serverGame/AiServerShipObjectInterface.h
new file mode 100644
index 00000000..76c7982d
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiServerShipObjectInterface.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/object/AiServerShipObjectInterface.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiShipAttackTargetList.h b/engine/server/library/serverGame/include/public/serverGame/AiShipAttackTargetList.h
new file mode 100644
index 00000000..8f374de3
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiShipAttackTargetList.h
@@ -0,0 +1 @@
+#include "../../src/shared/behavior/AiShipAttackTargetList.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttack.h b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttack.h
new file mode 100644
index 00000000..afa7639b
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttack.h
@@ -0,0 +1 @@
+#include "../../src/shared/behavior/AiShipBehaviorAttack.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackBomber.h b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackBomber.h
new file mode 100644
index 00000000..b0efd241
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackBomber.h
@@ -0,0 +1 @@
+#include "../../src/shared/behavior/AiShipBehaviorAttackBomber.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackCapitalShip.h b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackCapitalShip.h
new file mode 100644
index 00000000..71917064
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackCapitalShip.h
@@ -0,0 +1 @@
+#include "../../src/shared/behavior/AiShipBehaviorAttackCapitalShip.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackFighter.h b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackFighter.h
new file mode 100644
index 00000000..4bd6e0eb
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackFighter.h
@@ -0,0 +1 @@
+#include "../../src/shared/behavior/AiShipBehaviorAttackFighter.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackFighter_Maneuver.h b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackFighter_Maneuver.h
new file mode 100644
index 00000000..93461ff1
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackFighter_Maneuver.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackFighter_Maneuver_Path.h b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackFighter_Maneuver_Path.h
new file mode 100644
index 00000000..ea1d1371
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorAttackFighter_Maneuver_Path.h
@@ -0,0 +1 @@
+#include "../../src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorBase.h b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorBase.h
new file mode 100644
index 00000000..dbd6e1bc
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorBase.h
@@ -0,0 +1 @@
+#include "../../src/shared/behavior/AiShipBehaviorBase.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorDock.h b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorDock.h
new file mode 100644
index 00000000..a6c453a7
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorDock.h
@@ -0,0 +1 @@
+#include "../../src/shared/behavior/AiShipBehaviorDock.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorFollow.h b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorFollow.h
new file mode 100644
index 00000000..f72a3e38
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorFollow.h
@@ -0,0 +1 @@
+#include "../../src/shared/behavior/AiShipBehaviorFollow.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorIdle.h b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorIdle.h
new file mode 100644
index 00000000..29bc3fde
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorIdle.h
@@ -0,0 +1 @@
+#include "../../src/shared/behavior/AiShipBehaviorIdle.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorTrack.h b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorTrack.h
new file mode 100644
index 00000000..d494de7e
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorTrack.h
@@ -0,0 +1 @@
+#include "../../src/shared/behavior/AiShipBehaviorTrack.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorWaypoint.h b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorWaypoint.h
new file mode 100644
index 00000000..845c711b
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiShipBehaviorWaypoint.h
@@ -0,0 +1 @@
+#include "../../src/shared/behavior/AiShipBehaviorWaypoint.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiShipController.h b/engine/server/library/serverGame/include/public/serverGame/AiShipController.h
new file mode 100644
index 00000000..dd0df4ab
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiShipController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/AiShipController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiShipControllerInterface.h b/engine/server/library/serverGame/include/public/serverGame/AiShipControllerInterface.h
new file mode 100644
index 00000000..b7929746
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiShipControllerInterface.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/AiShipControllerInterface.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiShipPilotData.h b/engine/server/library/serverGame/include/public/serverGame/AiShipPilotData.h
new file mode 100644
index 00000000..9f67c7f4
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiShipPilotData.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/AiShipPilotData.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiShipTurretTargetingSystem.h b/engine/server/library/serverGame/include/public/serverGame/AiShipTurretTargetingSystem.h
new file mode 100644
index 00000000..e5663c02
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiShipTurretTargetingSystem.h
@@ -0,0 +1 @@
+#include "../../src/shared/behavior/AiShipTurretTargetingSystem.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AiTargetingSystem.h b/engine/server/library/serverGame/include/public/serverGame/AiTargetingSystem.h
new file mode 100644
index 00000000..1d25f6d8
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AiTargetingSystem.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/AiTargetingSystem.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AttribModNameManager.h b/engine/server/library/serverGame/include/public/serverGame/AttribModNameManager.h
new file mode 100644
index 00000000..b7155953
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AttribModNameManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/AttribModNameManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AuctionInfo.h b/engine/server/library/serverGame/include/public/serverGame/AuctionInfo.h
new file mode 100644
index 00000000..ffd5bacc
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AuctionInfo.h
@@ -0,0 +1 @@
+#include "../../src/shared/commoditiesMarket/AuctionInfo.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AuctionTokenServer.h b/engine/server/library/serverGame/include/public/serverGame/AuctionTokenServer.h
new file mode 100644
index 00000000..5cbf34bc
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AuctionTokenServer.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/AuctionTokenServer.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/AuthTransferTracker.h b/engine/server/library/serverGame/include/public/serverGame/AuthTransferTracker.h
new file mode 100644
index 00000000..ac83eb97
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/AuthTransferTracker.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/AuthTransferTracker.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/BaselineDistributionListPool.h b/engine/server/library/serverGame/include/public/serverGame/BaselineDistributionListPool.h
new file mode 100644
index 00000000..faaf9ebb
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/BaselineDistributionListPool.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/object/BaselineDistributionListPool.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/BattlefieldMarkerController.h b/engine/server/library/serverGame/include/public/serverGame/BattlefieldMarkerController.h
new file mode 100644
index 00000000..f55d6950
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/BattlefieldMarkerController.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/controller/BattlefieldMarkerController.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/BattlefieldMarkerObject.h b/engine/server/library/serverGame/include/public/serverGame/BattlefieldMarkerObject.h
new file mode 100644
index 00000000..b35b0bbc
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/BattlefieldMarkerObject.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/object/BattlefieldMarkerObject.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/BiographyManager.h b/engine/server/library/serverGame/include/public/serverGame/BiographyManager.h
new file mode 100644
index 00000000..10a33f4b
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/BiographyManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/BiographyManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/BuffManager.h b/engine/server/library/serverGame/include/public/serverGame/BuffManager.h
new file mode 100644
index 00000000..d04fd5c8
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/BuffManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/BuffManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/BuildingController.h b/engine/server/library/serverGame/include/public/serverGame/BuildingController.h
new file mode 100644
index 00000000..07e250e5
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/BuildingController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/BuildingController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/BuildingObject.h b/engine/server/library/serverGame/include/public/serverGame/BuildingObject.h
new file mode 100644
index 00000000..26ef7933
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/BuildingObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/BuildingObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/CellController.h b/engine/server/library/serverGame/include/public/serverGame/CellController.h
new file mode 100644
index 00000000..a30e80d3
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CellController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/CellController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/CellObject.h b/engine/server/library/serverGame/include/public/serverGame/CellObject.h
new file mode 100644
index 00000000..f0261f36
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CellObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/CellObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/CellPermissions.h b/engine/server/library/serverGame/include/public/serverGame/CellPermissions.h
new file mode 100644
index 00000000..64bc6593
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CellPermissions.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/CellPermissions.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/CentralCommandParserGame.h b/engine/server/library/serverGame/include/public/serverGame/CentralCommandParserGame.h
new file mode 100644
index 00000000..e9a0f255
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CentralCommandParserGame.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/CentralCommandParserGame.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/CentralConnection.h b/engine/server/library/serverGame/include/public/serverGame/CentralConnection.h
new file mode 100644
index 00000000..7f0e0f42
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CentralConnection.h
@@ -0,0 +1 @@
+#include "../../src/shared/network/CentralConnection.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/CharacterMatchManager.h b/engine/server/library/serverGame/include/public/serverGame/CharacterMatchManager.h
new file mode 100644
index 00000000..ee6b8ffe
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CharacterMatchManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/CharacterMatchManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/Chat.h b/engine/server/library/serverGame/include/public/serverGame/Chat.h
new file mode 100644
index 00000000..0a20dd35
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/Chat.h
@@ -0,0 +1 @@
+#include "../../src/shared/network/Chat.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ChatServerConnection.h b/engine/server/library/serverGame/include/public/serverGame/ChatServerConnection.h
new file mode 100644
index 00000000..5c4a409a
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ChatServerConnection.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ChatServerConnection.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/CitizenInfo.h b/engine/server/library/serverGame/include/public/serverGame/CitizenInfo.h
new file mode 100644
index 00000000..8e7c50ad
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CitizenInfo.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/city/CitizenInfo.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/CityController.h b/engine/server/library/serverGame/include/public/serverGame/CityController.h
new file mode 100644
index 00000000..c3c84442
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CityController.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/controller/CityController.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/CityInfo.h b/engine/server/library/serverGame/include/public/serverGame/CityInfo.h
new file mode 100644
index 00000000..e9efe65f
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CityInfo.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/city/CityInfo.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/CityInterface.h b/engine/server/library/serverGame/include/public/serverGame/CityInterface.h
new file mode 100644
index 00000000..cb124fb6
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CityInterface.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/city/CityInterface.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/CityObject.h b/engine/server/library/serverGame/include/public/serverGame/CityObject.h
new file mode 100644
index 00000000..799e6cf1
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CityObject.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/object/CityObject.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/CityStringParser.h b/engine/server/library/serverGame/include/public/serverGame/CityStringParser.h
new file mode 100644
index 00000000..1afffc28
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CityStringParser.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/city/CityStringParser.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/CityStructureInfo.h b/engine/server/library/serverGame/include/public/serverGame/CityStructureInfo.h
new file mode 100644
index 00000000..89b43758
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CityStructureInfo.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/city/CityStructureInfo.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/Client.h b/engine/server/library/serverGame/include/public/serverGame/Client.h
new file mode 100644
index 00000000..bf81a272
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/Client.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/Client.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ClusterWideDataClient.h b/engine/server/library/serverGame/include/public/serverGame/ClusterWideDataClient.h
new file mode 100644
index 00000000..a98f508d
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ClusterWideDataClient.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ClusterWideDataClient.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/CollisionCallbacks.h b/engine/server/library/serverGame/include/public/serverGame/CollisionCallbacks.h
new file mode 100644
index 00000000..282e8cc9
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CollisionCallbacks.h
@@ -0,0 +1 @@
+#include "../../src/shared/collision/CollisionCallbacks.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/CombatTracker.h b/engine/server/library/serverGame/include/public/serverGame/CombatTracker.h
new file mode 100644
index 00000000..1a0250aa
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CombatTracker.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/CombatTracker.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/CommandCppFuncs.h b/engine/server/library/serverGame/include/public/serverGame/CommandCppFuncs.h
new file mode 100644
index 00000000..1054a167
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CommandCppFuncs.h
@@ -0,0 +1 @@
+#include "../../src/shared/command/CommandCppFuncs.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/CommandQueue.h b/engine/server/library/serverGame/include/public/serverGame/CommandQueue.h
new file mode 100644
index 00000000..56164fe5
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CommandQueue.h
@@ -0,0 +1 @@
+#include "../../src/shared/command/CommandQueue.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/CommandQueueEntry.h b/engine/server/library/serverGame/include/public/serverGame/CommandQueueEntry.h
new file mode 100644
index 00000000..399a5340
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CommandQueueEntry.h
@@ -0,0 +1 @@
+#include "../../src/shared/command/CommandQueueEntry.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/CommandStringId.h b/engine/server/library/serverGame/include/public/serverGame/CommandStringId.h
new file mode 100644
index 00000000..16569d51
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CommandStringId.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/command/CommandStringId.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/CommoditiesMarket.h b/engine/server/library/serverGame/include/public/serverGame/CommoditiesMarket.h
new file mode 100644
index 00000000..7187eb04
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CommoditiesMarket.h
@@ -0,0 +1 @@
+#include "../../src/shared/commoditiesMarket/CommoditiesMarket.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/CommoditiesMarketListener.h b/engine/server/library/serverGame/include/public/serverGame/CommoditiesMarketListener.h
new file mode 100644
index 00000000..50b8454d
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CommoditiesMarketListener.h
@@ -0,0 +1 @@
+#include "../../src/shared/commoditiesMarket/CommoditiesMarketListener.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/CommoditiesServerConnection.h b/engine/server/library/serverGame/include/public/serverGame/CommoditiesServerConnection.h
new file mode 100644
index 00000000..aa5c7d0c
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CommoditiesServerConnection.h
@@ -0,0 +1 @@
+#include "../../src/shared/commoditiesMarket/CommoditiesServerConnection.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/CommunityManager.h b/engine/server/library/serverGame/include/public/serverGame/CommunityManager.h
new file mode 100644
index 00000000..29d869ef
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CommunityManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/CommunityManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConfigServerGame.h b/engine/server/library/serverGame/include/public/serverGame/ConfigServerGame.h
new file mode 100644
index 00000000..41687204
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConfigServerGame.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ConfigServerGame.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConnectionServerConnection.h b/engine/server/library/serverGame/include/public/serverGame/ConnectionServerConnection.h
new file mode 100644
index 00000000..63e02128
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConnectionServerConnection.h
@@ -0,0 +1 @@
+#include "../../src/shared/network/ConnectionServerConnection.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsentManager.h b/engine/server/library/serverGame/include/public/serverGame/ConsentManager.h
new file mode 100644
index 00000000..61f2628c
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsentManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ConsentManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserAi.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserAi.h
new file mode 100644
index 00000000..061e0a8a
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserAi.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserAi.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserCity.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserCity.h
new file mode 100644
index 00000000..570bcb4d
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserCity.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserCity.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserCollection.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserCollection.h
new file mode 100644
index 00000000..2e8419eb
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserCollection.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserCollection.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserCraft.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserCraft.h
new file mode 100644
index 00000000..703157a2
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserCraft.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserCraft.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserCraftStation.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserCraftStation.h
new file mode 100644
index 00000000..71625c37
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserCraftStation.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserCraftStation.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserDefault.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserDefault.h
new file mode 100644
index 00000000..e29c32e4
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserDefault.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserDefault.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserGuild.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserGuild.h
new file mode 100644
index 00000000..5b5c1e75
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserGuild.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserGuild.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserManufacture.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserManufacture.h
new file mode 100644
index 00000000..c83a29e6
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserManufacture.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserManufacture.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserMessageTo.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserMessageTo.h
new file mode 100644
index 00000000..5462f45f
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserMessageTo.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserMessageTo.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserMoney.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserMoney.h
new file mode 100644
index 00000000..f145eeea
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserMoney.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserMoney.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserNpc.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserNpc.h
new file mode 100644
index 00000000..d216d68c
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserNpc.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserNpc.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserObject.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserObject.h
new file mode 100644
index 00000000..8755db3e
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserObjvar.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserObjvar.h
new file mode 100644
index 00000000..aeaac7e4
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserObjvar.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserObjvar.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserPvp.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserPvp.h
new file mode 100644
index 00000000..b93c9e66
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserPvp.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserPvp.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserResource.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserResource.h
new file mode 100644
index 00000000..256f78fd
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserResource.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserResource.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserScript.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserScript.h
new file mode 100644
index 00000000..8de664aa
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserScript.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserScript.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserServer.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserServer.h
new file mode 100644
index 00000000..2cd2334d
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserServer.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserServer.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserShip.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserShip.h
new file mode 100644
index 00000000..d8ecf483
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserShip.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserShip.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserSkill.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserSkill.h
new file mode 100644
index 00000000..6b909c86
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserSkill.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserSkill.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserSpaceAi.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserSpaceAi.h
new file mode 100644
index 00000000..136894ac
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserSpaceAi.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserSpaceAi.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserSpawner.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserSpawner.h
new file mode 100644
index 00000000..2138b167
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserSpawner.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserSpawner.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserVeteran.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserVeteran.h
new file mode 100644
index 00000000..99a1cbc0
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserVeteran.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserVeteran.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserVoice.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserVoice.h
new file mode 100644
index 00000000..c295effe
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleCommandParserVoice.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleCommandParserVoice.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ConsoleManager.h b/engine/server/library/serverGame/include/public/serverGame/ConsoleManager.h
new file mode 100644
index 00000000..1dfb9c0d
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ConsoleManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ConsoleManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ContainerInterface.h b/engine/server/library/serverGame/include/public/serverGame/ContainerInterface.h
new file mode 100644
index 00000000..abb52894
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ContainerInterface.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ContainerInterface.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ContainmentMessageManager.h b/engine/server/library/serverGame/include/public/serverGame/ContainmentMessageManager.h
new file mode 100644
index 00000000..44580c46
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ContainmentMessageManager.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/object/ContainmentMessageManager.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/CreatureController.h b/engine/server/library/serverGame/include/public/serverGame/CreatureController.h
new file mode 100644
index 00000000..6c12be0f
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CreatureController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/CreatureController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/CreatureObject.h b/engine/server/library/serverGame/include/public/serverGame/CreatureObject.h
new file mode 100644
index 00000000..a9dce6d4
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CreatureObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/CreatureObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/CustomerServiceServerConnection.h b/engine/server/library/serverGame/include/public/serverGame/CustomerServiceServerConnection.h
new file mode 100644
index 00000000..6e07e4ef
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/CustomerServiceServerConnection.h
@@ -0,0 +1 @@
+#include "../../src/shared/network/CustomerServiceServerConnection.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/DatabaseProcessConnection.h b/engine/server/library/serverGame/include/public/serverGame/DatabaseProcessConnection.h
new file mode 100644
index 00000000..5bebcff9
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/DatabaseProcessConnection.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/network/DatabaseProcessConnection.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/DestroyMessageManager.h b/engine/server/library/serverGame/include/public/serverGame/DestroyMessageManager.h
new file mode 100644
index 00000000..9943f558
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/DestroyMessageManager.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/object/DestroyMessageManager.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/DistributionListStack.h b/engine/server/library/serverGame/include/public/serverGame/DistributionListStack.h
new file mode 100644
index 00000000..1acd9989
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/DistributionListStack.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/object/DistributionListStack.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/DraftSchematicObject.h b/engine/server/library/serverGame/include/public/serverGame/DraftSchematicObject.h
new file mode 100644
index 00000000..04524484
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/DraftSchematicObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/DraftSchematicObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/FactoryController.h b/engine/server/library/serverGame/include/public/serverGame/FactoryController.h
new file mode 100644
index 00000000..44b8a222
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/FactoryController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/FactoryController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/FactoryObject.h b/engine/server/library/serverGame/include/public/serverGame/FactoryObject.h
new file mode 100644
index 00000000..14b9f408
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/FactoryObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/FactoryObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/FirstServerGame.h b/engine/server/library/serverGame/include/public/serverGame/FirstServerGame.h
new file mode 100644
index 00000000..5b982718
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/FirstServerGame.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/FirstServerGame.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/FormManagerServer.h b/engine/server/library/serverGame/include/public/serverGame/FormManagerServer.h
new file mode 100644
index 00000000..82124094
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/FormManagerServer.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/FormManagerServer.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/Formation.h b/engine/server/library/serverGame/include/public/serverGame/Formation.h
new file mode 100644
index 00000000..537889fd
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/Formation.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/Formation.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/GameServer.h b/engine/server/library/serverGame/include/public/serverGame/GameServer.h
new file mode 100644
index 00000000..c778dc47
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/GameServer.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/GameServer.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/GameServerMessageArchive.h b/engine/server/library/serverGame/include/public/serverGame/GameServerMessageArchive.h
new file mode 100644
index 00000000..442ccc98
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/GameServerMessageArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/network/GameServerMessageArchive.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/GameServerMetricsData.h b/engine/server/library/serverGame/include/public/serverGame/GameServerMetricsData.h
new file mode 100644
index 00000000..606f9c84
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/GameServerMetricsData.h
@@ -0,0 +1 @@
+#include "../../src/shared/metrics/GameServerMetricsData.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/GroundVehicleController.h b/engine/server/library/serverGame/include/public/serverGame/GroundVehicleController.h
new file mode 100644
index 00000000..bf51dcc5
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/GroundVehicleController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/GroundVehicleController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/GroupController.h b/engine/server/library/serverGame/include/public/serverGame/GroupController.h
new file mode 100644
index 00000000..7c4e8282
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/GroupController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/GroupController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/GroupIdObserver.h b/engine/server/library/serverGame/include/public/serverGame/GroupIdObserver.h
new file mode 100644
index 00000000..f21bc81d
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/GroupIdObserver.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/GroupIdObserver.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/GroupMissionCriticalObjectsBuilder.h b/engine/server/library/serverGame/include/public/serverGame/GroupMissionCriticalObjectsBuilder.h
new file mode 100644
index 00000000..552cb025
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/GroupMissionCriticalObjectsBuilder.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/object/GroupMissionCriticalObjectsBuilder.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/GroupObject.h b/engine/server/library/serverGame/include/public/serverGame/GroupObject.h
new file mode 100644
index 00000000..28f98375
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/GroupObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/GroupObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/GroupStringId.h b/engine/server/library/serverGame/include/public/serverGame/GroupStringId.h
new file mode 100644
index 00000000..3ef3592f
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/GroupStringId.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/object/GroupStringId.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/GroupUpdateObserver.h b/engine/server/library/serverGame/include/public/serverGame/GroupUpdateObserver.h
new file mode 100644
index 00000000..178876bc
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/GroupUpdateObserver.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/GroupUpdateObserver.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/GroupWaypointBuilder.h b/engine/server/library/serverGame/include/public/serverGame/GroupWaypointBuilder.h
new file mode 100644
index 00000000..3911df23
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/GroupWaypointBuilder.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/object/GroupWaypointBuilder.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/GuildController.h b/engine/server/library/serverGame/include/public/serverGame/GuildController.h
new file mode 100644
index 00000000..5cc7c000
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/GuildController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/GuildController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/GuildInfo.h b/engine/server/library/serverGame/include/public/serverGame/GuildInfo.h
new file mode 100644
index 00000000..24395e16
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/GuildInfo.h
@@ -0,0 +1 @@
+#include "../../src/shared/guild/GuildInfo.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/GuildInterface.h b/engine/server/library/serverGame/include/public/serverGame/GuildInterface.h
new file mode 100644
index 00000000..893b1489
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/GuildInterface.h
@@ -0,0 +1 @@
+#include "../../src/shared/guild/GuildInterface.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/GuildMemberInfo.h b/engine/server/library/serverGame/include/public/serverGame/GuildMemberInfo.h
new file mode 100644
index 00000000..c113ba50
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/GuildMemberInfo.h
@@ -0,0 +1 @@
+#include "../../src/shared/guild/GuildMemberInfo.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/GuildObject.h b/engine/server/library/serverGame/include/public/serverGame/GuildObject.h
new file mode 100644
index 00000000..0c362e67
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/GuildObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/GuildObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/GuildStringParser.h b/engine/server/library/serverGame/include/public/serverGame/GuildStringParser.h
new file mode 100644
index 00000000..7438fee1
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/GuildStringParser.h
@@ -0,0 +1 @@
+#include "../../src/shared/guild/GuildStringParser.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/HarvesterInstallationController.h b/engine/server/library/serverGame/include/public/serverGame/HarvesterInstallationController.h
new file mode 100644
index 00000000..379bc7d1
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/HarvesterInstallationController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/HarvesterInstallationController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/HarvesterInstallationObject.h b/engine/server/library/serverGame/include/public/serverGame/HarvesterInstallationObject.h
new file mode 100644
index 00000000..accf9397
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/HarvesterInstallationObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/HarvesterInstallationObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/HateList.h b/engine/server/library/serverGame/include/public/serverGame/HateList.h
new file mode 100644
index 00000000..362e2a1d
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/HateList.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/HateList.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/InstallationController.h b/engine/server/library/serverGame/include/public/serverGame/InstallationController.h
new file mode 100644
index 00000000..4a0d5462
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/InstallationController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/InstallationController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/InstallationObject.h b/engine/server/library/serverGame/include/public/serverGame/InstallationObject.h
new file mode 100644
index 00000000..8e8d3935
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/InstallationObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/InstallationObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/InstallationSynchronizedUi.h b/engine/server/library/serverGame/include/public/serverGame/InstallationSynchronizedUi.h
new file mode 100644
index 00000000..935358ab
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/InstallationSynchronizedUi.h
@@ -0,0 +1 @@
+#include "../../src/shared/synchronizedUi/InstallationSynchronizedUi.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/InstantDeleteList.h b/engine/server/library/serverGame/include/public/serverGame/InstantDeleteList.h
new file mode 100644
index 00000000..e0fc39c4
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/InstantDeleteList.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/InstantDeleteList.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/IntangibleObject.h b/engine/server/library/serverGame/include/public/serverGame/IntangibleObject.h
new file mode 100644
index 00000000..d31fe20a
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/IntangibleObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/IntangibleObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/IntangibleVolumeContainer.h b/engine/server/library/serverGame/include/public/serverGame/IntangibleVolumeContainer.h
new file mode 100644
index 00000000..7250f7ae
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/IntangibleVolumeContainer.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/container/IntangibleVolumeContainer.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/LineOfSightCache.h b/engine/server/library/serverGame/include/public/serverGame/LineOfSightCache.h
new file mode 100644
index 00000000..8f274c16
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/LineOfSightCache.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/object/LineOfSightCache.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/LogoutTracker.h b/engine/server/library/serverGame/include/public/serverGame/LogoutTracker.h
new file mode 100644
index 00000000..c3df5e78
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/LogoutTracker.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/LogoutTracker.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ManufactureInstallationController.h b/engine/server/library/serverGame/include/public/serverGame/ManufactureInstallationController.h
new file mode 100644
index 00000000..f68ea1e2
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ManufactureInstallationController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/ManufactureInstallationController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ManufactureInstallationObject.h b/engine/server/library/serverGame/include/public/serverGame/ManufactureInstallationObject.h
new file mode 100644
index 00000000..cd265fd7
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ManufactureInstallationObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/ManufactureInstallationObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ManufactureObjectInterface.h b/engine/server/library/serverGame/include/public/serverGame/ManufactureObjectInterface.h
new file mode 100644
index 00000000..adbb89d5
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ManufactureObjectInterface.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/ManufactureObjectInterface.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ManufactureSchematicObject.h b/engine/server/library/serverGame/include/public/serverGame/ManufactureSchematicObject.h
new file mode 100644
index 00000000..daade4cc
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ManufactureSchematicObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/ManufactureSchematicObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ManufactureSchematicSynchronizedUi.h b/engine/server/library/serverGame/include/public/serverGame/ManufactureSchematicSynchronizedUi.h
new file mode 100644
index 00000000..99b4545a
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ManufactureSchematicSynchronizedUi.h
@@ -0,0 +1 @@
+#include "../../src/shared/synchronizedUi/ManufactureSchematicSynchronizedUi.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/MessageToQueue.h b/engine/server/library/serverGame/include/public/serverGame/MessageToQueue.h
new file mode 100644
index 00000000..97329d13
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/MessageToQueue.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/MessageToQueue.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/MiningAsteroidController.h b/engine/server/library/serverGame/include/public/serverGame/MiningAsteroidController.h
new file mode 100644
index 00000000..cc6d701f
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/MiningAsteroidController.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/MiningAsteroidController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/Missile.h b/engine/server/library/serverGame/include/public/serverGame/Missile.h
new file mode 100644
index 00000000..74dc3108
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/Missile.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/Missile.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/MissileManager.h b/engine/server/library/serverGame/include/public/serverGame/MissileManager.h
new file mode 100644
index 00000000..92308bfa
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/MissileManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/MissileManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/MissionObject.h b/engine/server/library/serverGame/include/public/serverGame/MissionObject.h
new file mode 100644
index 00000000..45b52063
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/MissionObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/MissionObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/MissionTerminalController.h b/engine/server/library/serverGame/include/public/serverGame/MissionTerminalController.h
new file mode 100644
index 00000000..f0894a1e
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/MissionTerminalController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/MissionTerminalController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/MoveSimController.h b/engine/server/library/serverGame/include/public/serverGame/MoveSimController.h
new file mode 100644
index 00000000..9c659953
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/MoveSimController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/MoveSimController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/MoveSimManager.h b/engine/server/library/serverGame/include/public/serverGame/MoveSimManager.h
new file mode 100644
index 00000000..73b13a2e
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/MoveSimManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/MoveSimManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/NameManager.h b/engine/server/library/serverGame/include/public/serverGame/NameManager.h
new file mode 100644
index 00000000..bc0b08fb
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/NameManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/NameManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/NamedObjectManager.h b/engine/server/library/serverGame/include/public/serverGame/NamedObjectManager.h
new file mode 100644
index 00000000..cd01aa85
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/NamedObjectManager.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/core/NamedObjectManager.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/NebulaManagerServer.h b/engine/server/library/serverGame/include/public/serverGame/NebulaManagerServer.h
new file mode 100644
index 00000000..2eb9e1cc
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/NebulaManagerServer.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/NebulaManagerServer.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/NetworkTriggerVolume.h b/engine/server/library/serverGame/include/public/serverGame/NetworkTriggerVolume.h
new file mode 100644
index 00000000..2c53f1cf
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/NetworkTriggerVolume.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/NetworkTriggerVolume.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/NewbieTutorial.h b/engine/server/library/serverGame/include/public/serverGame/NewbieTutorial.h
new file mode 100644
index 00000000..25990117
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/NewbieTutorial.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/NewbieTutorial.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/NonCriticalTaskQueue.h b/engine/server/library/serverGame/include/public/serverGame/NonCriticalTaskQueue.h
new file mode 100644
index 00000000..119c2f5c
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/NonCriticalTaskQueue.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/NonCriticalTaskQueue.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/NpcConversation.h b/engine/server/library/serverGame/include/public/serverGame/NpcConversation.h
new file mode 100644
index 00000000..f5103dc6
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/NpcConversation.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/NpcConversation.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ObjectCommandParserGetAttributes.h b/engine/server/library/serverGame/include/public/serverGame/ObjectCommandParserGetAttributes.h
new file mode 100644
index 00000000..38644c87
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ObjectCommandParserGetAttributes.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ObjectCommandParserGetAttributes.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ObjectCommandParserSetAttributes.h b/engine/server/library/serverGame/include/public/serverGame/ObjectCommandParserSetAttributes.h
new file mode 100644
index 00000000..7a8e7156
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ObjectCommandParserSetAttributes.h
@@ -0,0 +1 @@
+#include "../../src/shared/console/ObjectCommandParserSetAttributes.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ObjectIdManager.h b/engine/server/library/serverGame/include/public/serverGame/ObjectIdManager.h
new file mode 100644
index 00000000..f2feccaf
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ObjectIdManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ObjectIdManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ObjectTracker.h b/engine/server/library/serverGame/include/public/serverGame/ObjectTracker.h
new file mode 100644
index 00000000..b69fbaa0
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ObjectTracker.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/ObjectTracker.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ObserveTracker.h b/engine/server/library/serverGame/include/public/serverGame/ObserveTracker.h
new file mode 100644
index 00000000..4435dc8f
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ObserveTracker.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ObserveTracker.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PatrolPathNodeProperty.h b/engine/server/library/serverGame/include/public/serverGame/PatrolPathNodeProperty.h
new file mode 100644
index 00000000..9f825b6b
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PatrolPathNodeProperty.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/PatrolPathNodeProperty.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PatrolPathRootProperty.h b/engine/server/library/serverGame/include/public/serverGame/PatrolPathRootProperty.h
new file mode 100644
index 00000000..fa40390f
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PatrolPathRootProperty.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/PatrolPathRootProperty.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PgcRatingInfo.h b/engine/server/library/serverGame/include/public/serverGame/PgcRatingInfo.h
new file mode 100644
index 00000000..0a68c7e3
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PgcRatingInfo.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/city/PgcRatingInfo.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/PlanetController.h b/engine/server/library/serverGame/include/public/serverGame/PlanetController.h
new file mode 100644
index 00000000..245750a1
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PlanetController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/PlanetController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PlanetMapManagerServer.h b/engine/server/library/serverGame/include/public/serverGame/PlanetMapManagerServer.h
new file mode 100644
index 00000000..fdb097a2
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PlanetMapManagerServer.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/PlanetMapManagerServer.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PlanetObject.h b/engine/server/library/serverGame/include/public/serverGame/PlanetObject.h
new file mode 100644
index 00000000..cc140d86
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PlanetObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/PlanetObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PlanetServerConnection.h b/engine/server/library/serverGame/include/public/serverGame/PlanetServerConnection.h
new file mode 100644
index 00000000..974e10d6
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PlanetServerConnection.h
@@ -0,0 +1 @@
+#include "../../src/shared/network/PlanetServerConnection.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PlayerCreationManagerServer.h b/engine/server/library/serverGame/include/public/serverGame/PlayerCreationManagerServer.h
new file mode 100644
index 00000000..532541be
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PlayerCreationManagerServer.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/PlayerCreationManagerServer.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PlayerCreatureController.h b/engine/server/library/serverGame/include/public/serverGame/PlayerCreatureController.h
new file mode 100644
index 00000000..02610a55
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PlayerCreatureController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/PlayerCreatureController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PlayerObject.h b/engine/server/library/serverGame/include/public/serverGame/PlayerObject.h
new file mode 100644
index 00000000..8d318237
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PlayerObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/PlayerObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PlayerQuestObject.h b/engine/server/library/serverGame/include/public/serverGame/PlayerQuestObject.h
new file mode 100644
index 00000000..12a87cc6
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PlayerQuestObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/PlayerQuestObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PlayerSanityChecker.h b/engine/server/library/serverGame/include/public/serverGame/PlayerSanityChecker.h
new file mode 100644
index 00000000..5159f252
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PlayerSanityChecker.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/core/PlayerSanityChecker.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/PlayerShipController.h b/engine/server/library/serverGame/include/public/serverGame/PlayerShipController.h
new file mode 100644
index 00000000..6dcbaa64
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PlayerShipController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/PlayerShipController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PlayerShipTurretTargetingSystem.h b/engine/server/library/serverGame/include/public/serverGame/PlayerShipTurretTargetingSystem.h
new file mode 100644
index 00000000..1e295617
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PlayerShipTurretTargetingSystem.h
@@ -0,0 +1 @@
+#include "../../src/shared/behavior/PlayerShipTurretTargetingSystem.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PortalTriggerVolume.h b/engine/server/library/serverGame/include/public/serverGame/PortalTriggerVolume.h
new file mode 100644
index 00000000..650241fc
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PortalTriggerVolume.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/PortalTriggerVolume.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PositionUpdateTracker.h b/engine/server/library/serverGame/include/public/serverGame/PositionUpdateTracker.h
new file mode 100644
index 00000000..4c92d870
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PositionUpdateTracker.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/core/PositionUpdateTracker.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/PreloadManager.h b/engine/server/library/serverGame/include/public/serverGame/PreloadManager.h
new file mode 100644
index 00000000..4ccdd389
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PreloadManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/PreloadManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ProjectileManager.h b/engine/server/library/serverGame/include/public/serverGame/ProjectileManager.h
new file mode 100644
index 00000000..5b079cc3
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ProjectileManager.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/space/ProjectileManager.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ProsePackageManagerServer.h b/engine/server/library/serverGame/include/public/serverGame/ProsePackageManagerServer.h
new file mode 100644
index 00000000..ea75b5ff
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ProsePackageManagerServer.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ProsePackageManagerServer.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ProxyList.h b/engine/server/library/serverGame/include/public/serverGame/ProxyList.h
new file mode 100644
index 00000000..206ef062
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ProxyList.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/core/ProxyList.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/PurgeManager.h b/engine/server/library/serverGame/include/public/serverGame/PurgeManager.h
new file mode 100644
index 00000000..0fdfb3e5
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PurgeManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/PurgeManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/Pvp.h b/engine/server/library/serverGame/include/public/serverGame/Pvp.h
new file mode 100644
index 00000000..60c9479e
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/Pvp.h
@@ -0,0 +1 @@
+#include "../../src/shared/pvp/Pvp.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PvpEnemiesObserver.h b/engine/server/library/serverGame/include/public/serverGame/PvpEnemiesObserver.h
new file mode 100644
index 00000000..0d9e7f7b
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PvpEnemiesObserver.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/object/PvpEnemiesObserver.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/PvpFactions.h b/engine/server/library/serverGame/include/public/serverGame/PvpFactions.h
new file mode 100644
index 00000000..94519645
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PvpFactions.h
@@ -0,0 +1 @@
+#include "../../src/shared/pvp/PvpFactions.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PvpInternal.h b/engine/server/library/serverGame/include/public/serverGame/PvpInternal.h
new file mode 100644
index 00000000..408ff42d
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PvpInternal.h
@@ -0,0 +1 @@
+#include "../../src/shared/pvp/PvpInternal.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetBase.h b/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetBase.h
new file mode 100644
index 00000000..df7fc522
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetBase.h
@@ -0,0 +1 @@
+#include "../../src/shared/pvp/PvpRuleSetBase.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetBattlefield.h b/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetBattlefield.h
new file mode 100644
index 00000000..59967e71
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetBattlefield.h
@@ -0,0 +1 @@
+#include "../../src/shared/pvp/PvpRuleSetBattlefield.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetDisallowAll.h b/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetDisallowAll.h
new file mode 100644
index 00000000..a8870ec9
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetDisallowAll.h
@@ -0,0 +1 @@
+#include "../../src/shared/pvp/PvpRuleSetDisallowAll.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetNormal.h b/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetNormal.h
new file mode 100644
index 00000000..6b9a7041
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetNormal.h
@@ -0,0 +1 @@
+#include "../../src/shared/pvp/PvpRuleSetNormal.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetPet.h b/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetPet.h
new file mode 100644
index 00000000..2571c823
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetPet.h
@@ -0,0 +1 @@
+#include "../../src/shared/pvp/PvpRuleSetPet.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetShip.h b/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetShip.h
new file mode 100644
index 00000000..1bebbafd
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetShip.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/pvp/PvpRuleSetShip.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetTruce.h b/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetTruce.h
new file mode 100644
index 00000000..837323af
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PvpRuleSetTruce.h
@@ -0,0 +1 @@
+#include "../../src/shared/pvp/PvpRuleSetTruce.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/PvpUpdateAndCellPermissionsObserver.h b/engine/server/library/serverGame/include/public/serverGame/PvpUpdateAndCellPermissionsObserver.h
new file mode 100644
index 00000000..750aa2bf
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PvpUpdateAndCellPermissionsObserver.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/object/PvpUpdateAndCellPermissionsObserver.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/PvpUpdateObserver.h b/engine/server/library/serverGame/include/public/serverGame/PvpUpdateObserver.h
new file mode 100644
index 00000000..288ebc66
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/PvpUpdateObserver.h
@@ -0,0 +1 @@
+#include "../../src/shared/pvp/PvpUpdateObserver.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/RegexList.h b/engine/server/library/serverGame/include/public/serverGame/RegexList.h
new file mode 100644
index 00000000..6013d967
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/RegexList.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/RegexList.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/Region.h b/engine/server/library/serverGame/include/public/serverGame/Region.h
new file mode 100644
index 00000000..3737d3c2
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/Region.h
@@ -0,0 +1 @@
+#include "../../src/shared/region/Region.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/Region3d.h b/engine/server/library/serverGame/include/public/serverGame/Region3d.h
new file mode 100644
index 00000000..c1b89136
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/Region3d.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/region3d/Region3d.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/Region3dMaster.h b/engine/server/library/serverGame/include/public/serverGame/Region3dMaster.h
new file mode 100644
index 00000000..1cd468ae
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/Region3dMaster.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/region3d/Region3dMaster.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/RegionBox.h b/engine/server/library/serverGame/include/public/serverGame/RegionBox.h
new file mode 100644
index 00000000..95ca146f
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/RegionBox.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/region3d/RegionBox.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/RegionMaster.h b/engine/server/library/serverGame/include/public/serverGame/RegionMaster.h
new file mode 100644
index 00000000..e27ebe65
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/RegionMaster.h
@@ -0,0 +1 @@
+#include "../../src/shared/region/RegionMaster.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/RegionPvp.h b/engine/server/library/serverGame/include/public/serverGame/RegionPvp.h
new file mode 100644
index 00000000..21fc8119
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/RegionPvp.h
@@ -0,0 +1 @@
+#include "../../src/shared/region/RegionPvp.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/RegionSphere.h b/engine/server/library/serverGame/include/public/serverGame/RegionSphere.h
new file mode 100644
index 00000000..e45ac428
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/RegionSphere.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/region3d/RegionSphere.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ReportManager.h b/engine/server/library/serverGame/include/public/serverGame/ReportManager.h
new file mode 100644
index 00000000..df291a26
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ReportManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ReportManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ResourceContainerController.h b/engine/server/library/serverGame/include/public/serverGame/ResourceContainerController.h
new file mode 100644
index 00000000..ba7d78ed
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ResourceContainerController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/ResourceContainerController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ResourceContainerObject.h b/engine/server/library/serverGame/include/public/serverGame/ResourceContainerObject.h
new file mode 100644
index 00000000..f79c752b
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ResourceContainerObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/ResourceContainerObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ResourcePoolObject.h b/engine/server/library/serverGame/include/public/serverGame/ResourcePoolObject.h
new file mode 100644
index 00000000..553c6ad3
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ResourcePoolObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/ResourcePoolObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ResourceTypeObject.h b/engine/server/library/serverGame/include/public/serverGame/ResourceTypeObject.h
new file mode 100644
index 00000000..224cca93
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ResourceTypeObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/ResourceTypeObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/SceneGlobalData.h b/engine/server/library/serverGame/include/public/serverGame/SceneGlobalData.h
new file mode 100644
index 00000000..c5bef924
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/SceneGlobalData.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/SceneGlobalData.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerArmorTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerArmorTemplate.h
new file mode 100644
index 00000000..9314f3fc
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerArmorTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerArmorTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerAsteroidManager.h b/engine/server/library/serverGame/include/public/serverGame/ServerAsteroidManager.h
new file mode 100644
index 00000000..4b108241
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerAsteroidManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/ServerAsteroidManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerBattlefieldMarkerObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerBattlefieldMarkerObjectTemplate.h
new file mode 100644
index 00000000..8b877ff4
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerBattlefieldMarkerObjectTemplate.h
@@ -0,0 +1 @@
+#include "../../src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerBuffBuilderManager.h b/engine/server/library/serverGame/include/public/serverGame/ServerBuffBuilderManager.h
new file mode 100644
index 00000000..332946b0
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerBuffBuilderManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ServerBuffBuilderManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerBuildingObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerBuildingObjectTemplate.h
new file mode 100644
index 00000000..3953220a
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerBuildingObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerBuildingObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerBuildoutManager.h b/engine/server/library/serverGame/include/public/serverGame/ServerBuildoutManager.h
new file mode 100644
index 00000000..2a57958a
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerBuildoutManager.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/core/ServerBuildoutManager.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerCellObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerCellObjectTemplate.h
new file mode 100644
index 00000000..e3bee6cc
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerCellObjectTemplate.h
@@ -0,0 +1 @@
+#include "../../src/shared/objectTemplate/ServerCellObjectTemplate.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerCityObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerCityObjectTemplate.h
new file mode 100644
index 00000000..ea011afe
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerCityObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerCityObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerClearCollidableFloraNotification.h b/engine/server/library/serverGame/include/public/serverGame/ServerClearCollidableFloraNotification.h
new file mode 100644
index 00000000..177bd123
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerClearCollidableFloraNotification.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/ServerClearCollidableFloraNotification.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerCollisionProperty.h b/engine/server/library/serverGame/include/public/serverGame/ServerCollisionProperty.h
new file mode 100644
index 00000000..b4b790b1
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerCollisionProperty.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/ServerCollisionProperty.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerCommandPermissionManager.h b/engine/server/library/serverGame/include/public/serverGame/ServerCommandPermissionManager.h
new file mode 100644
index 00000000..fce2acce
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerCommandPermissionManager.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/console/ServerCommandPermissionManager.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerCommandTable.h b/engine/server/library/serverGame/include/public/serverGame/ServerCommandTable.h
new file mode 100644
index 00000000..d2e02366
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerCommandTable.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/command/ServerCommandTable.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerConstructionContractObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerConstructionContractObjectTemplate.h
new file mode 100644
index 00000000..a3a7078f
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerConstructionContractObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerConstructionContractObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerController.h b/engine/server/library/serverGame/include/public/serverGame/ServerController.h
new file mode 100644
index 00000000..77ee4ef9
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/ServerController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerCreatureObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerCreatureObjectTemplate.h
new file mode 100644
index 00000000..abc8b8ca
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerCreatureObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerCreatureObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerDraftSchematicObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerDraftSchematicObjectTemplate.h
new file mode 100644
index 00000000..bbbe5a7b
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerDraftSchematicObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerFactoryObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerFactoryObjectTemplate.h
new file mode 100644
index 00000000..ec0b7379
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerFactoryObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerFactoryObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerGroupObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerGroupObjectTemplate.h
new file mode 100644
index 00000000..139d090c
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerGroupObjectTemplate.h
@@ -0,0 +1 @@
+#include "../../src/shared/objectTemplate/ServerGroupObjectTemplate.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerGuildObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerGuildObjectTemplate.h
new file mode 100644
index 00000000..abd797c3
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerGuildObjectTemplate.h
@@ -0,0 +1 @@
+#include "../../src/shared/objectTemplate/ServerGuildObjectTemplate.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerHarvesterInstallationObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerHarvesterInstallationObjectTemplate.h
new file mode 100644
index 00000000..a25826cd
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerHarvesterInstallationObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerImageDesignerManager.h b/engine/server/library/serverGame/include/public/serverGame/ServerImageDesignerManager.h
new file mode 100644
index 00000000..1b063bcf
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerImageDesignerManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ServerImageDesignerManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerInstallationObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerInstallationObjectTemplate.h
new file mode 100644
index 00000000..f50e69b6
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerInstallationObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerInstallationObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerIntangibleObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerIntangibleObjectTemplate.h
new file mode 100644
index 00000000..724000d0
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerIntangibleObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerIntangibleObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerLotManagerNotification.h b/engine/server/library/serverGame/include/public/serverGame/ServerLotManagerNotification.h
new file mode 100644
index 00000000..8b14ede9
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerLotManagerNotification.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/ServerLotManagerNotification.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerManufactureInstallationObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerManufactureInstallationObjectTemplate.h
new file mode 100644
index 00000000..6ea453e7
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerManufactureInstallationObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerManufactureSchematicObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerManufactureSchematicObjectTemplate.h
new file mode 100644
index 00000000..cf5de9c7
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerManufactureSchematicObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerMessageForwarding.h b/engine/server/library/serverGame/include/public/serverGame/ServerMessageForwarding.h
new file mode 100644
index 00000000..a85efeea
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerMessageForwarding.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/core/ServerMessageForwarding.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerMissionObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerMissionObjectTemplate.h
new file mode 100644
index 00000000..8212ba38
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerMissionObjectTemplate.h
@@ -0,0 +1 @@
+#include "../../src/shared/objectTemplate/ServerMissionObjectTemplate.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerNoBuildNotification.h b/engine/server/library/serverGame/include/public/serverGame/ServerNoBuildNotification.h
new file mode 100644
index 00000000..790ed9ff
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerNoBuildNotification.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/ServerNoBuildNotification.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerObject.h b/engine/server/library/serverGame/include/public/serverGame/ServerObject.h
new file mode 100644
index 00000000..7f2cfc76
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/ServerObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerObjectAttributeIds.h b/engine/server/library/serverGame/include/public/serverGame/ServerObjectAttributeIds.h
new file mode 100644
index 00000000..2123e254
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerObjectAttributeIds.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ServerObjectAttributeIds.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerObjectBaselinesManager.h b/engine/server/library/serverGame/include/public/serverGame/ServerObjectBaselinesManager.h
new file mode 100644
index 00000000..f7865998
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerObjectBaselinesManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/ServerObjectBaselinesManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerObjectTemplate.h
new file mode 100644
index 00000000..9d267eb5
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerObjectTerrainModificationNotification.h b/engine/server/library/serverGame/include/public/serverGame/ServerObjectTerrainModificationNotification.h
new file mode 100644
index 00000000..f58cb42c
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerObjectTerrainModificationNotification.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/ServerObjectTerrainModificationNotification.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerPlanetObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerPlanetObjectTemplate.h
new file mode 100644
index 00000000..c1f80972
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerPlanetObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerPlanetObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerPlayerObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerPlayerObjectTemplate.h
new file mode 100644
index 00000000..0793fc26
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerPlayerObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerPlayerObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerPlayerQuestObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerPlayerQuestObjectTemplate.h
new file mode 100644
index 00000000..e9f76434
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerPlayerQuestObjectTemplate.h
@@ -0,0 +1 @@
+#include "../../src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerResourceClassObject.h b/engine/server/library/serverGame/include/public/serverGame/ServerResourceClassObject.h
new file mode 100644
index 00000000..fea9a5b5
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerResourceClassObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/ServerResourceClassObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerResourceContainerObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerResourceContainerObjectTemplate.h
new file mode 100644
index 00000000..925aa9cb
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerResourceContainerObjectTemplate.h
@@ -0,0 +1 @@
+#include "../../src/shared/objectTemplate/ServerResourceContainerObjectTemplate.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerSecureTrade.h b/engine/server/library/serverGame/include/public/serverGame/ServerSecureTrade.h
new file mode 100644
index 00000000..26f2ab43
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerSecureTrade.h
@@ -0,0 +1 @@
+#include "../../src/shared/trading/ServerSecureTrade.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerSecureTradeManager.h b/engine/server/library/serverGame/include/public/serverGame/ServerSecureTradeManager.h
new file mode 100644
index 00000000..2beb4819
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerSecureTradeManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/trading/ServerSecureTradeManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerSharedObjectTemplateInterface.h b/engine/server/library/serverGame/include/public/serverGame/ServerSharedObjectTemplateInterface.h
new file mode 100644
index 00000000..086aeb95
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerSharedObjectTemplateInterface.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerSharedObjectTemplateInterface.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerShipComponentData.h b/engine/server/library/serverGame/include/public/serverGame/ServerShipComponentData.h
new file mode 100644
index 00000000..d60cd0bd
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerShipComponentData.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/ServerShipComponentData.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerShipObjectInterface.h b/engine/server/library/serverGame/include/public/serverGame/ServerShipObjectInterface.h
new file mode 100644
index 00000000..bcac5abe
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerShipObjectInterface.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/object/ServerShipObjectInterface.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerShipObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerShipObjectTemplate.h
new file mode 100644
index 00000000..1e77b931
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerShipObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerShipObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerShipTargeting.h b/engine/server/library/serverGame/include/public/serverGame/ServerShipTargeting.h
new file mode 100644
index 00000000..f78d0257
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerShipTargeting.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/space/ServerShipTargeting.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerStaticObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerStaticObjectTemplate.h
new file mode 100644
index 00000000..7c148bd3
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerStaticObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerStaticObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerSynchronizedUi.h b/engine/server/library/serverGame/include/public/serverGame/ServerSynchronizedUi.h
new file mode 100644
index 00000000..f2cd48d2
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerSynchronizedUi.h
@@ -0,0 +1 @@
+#include "../../src/shared/synchronizedUi/ServerSynchronizedUi.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerTangibleObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerTangibleObjectTemplate.h
new file mode 100644
index 00000000..6fd08113
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerTangibleObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerTangibleObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerUIManager.h b/engine/server/library/serverGame/include/public/serverGame/ServerUIManager.h
new file mode 100644
index 00000000..ffb50c6e
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerUIManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ServerUIManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerUIPage.h b/engine/server/library/serverGame/include/public/serverGame/ServerUIPage.h
new file mode 100644
index 00000000..722b56c8
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerUIPage.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ServerUIPage.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerUniverse.h b/engine/server/library/serverGame/include/public/serverGame/ServerUniverse.h
new file mode 100644
index 00000000..15e25c8e
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerUniverse.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ServerUniverse.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerUniverseObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerUniverseObjectTemplate.h
new file mode 100644
index 00000000..92a72a83
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerUniverseObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerUniverseObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerVehicleObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerVehicleObjectTemplate.h
new file mode 100644
index 00000000..29a3b96a
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerVehicleObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerVehicleObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerWeaponObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerWeaponObjectTemplate.h
new file mode 100644
index 00000000..a22a018b
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerWeaponObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerWeaponObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerWorld.h b/engine/server/library/serverGame/include/public/serverGame/ServerWorld.h
new file mode 100644
index 00000000..04fb348b
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerWorld.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ServerWorld.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerWorldIntangibleNotification.h b/engine/server/library/serverGame/include/public/serverGame/ServerWorldIntangibleNotification.h
new file mode 100644
index 00000000..0d1fda26
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerWorldIntangibleNotification.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ServerWorldIntangibleNotification.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerWorldTangibleNotification.h b/engine/server/library/serverGame/include/public/serverGame/ServerWorldTangibleNotification.h
new file mode 100644
index 00000000..d7c84067
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerWorldTangibleNotification.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ServerWorldTangibleNotification.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerWorldTerrainObjectNotification.h b/engine/server/library/serverGame/include/public/serverGame/ServerWorldTerrainObjectNotification.h
new file mode 100644
index 00000000..dc1dd9bc
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerWorldTerrainObjectNotification.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ServerWorldTerrainObjectNotification.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerWorldUniverseNotification.h b/engine/server/library/serverGame/include/public/serverGame/ServerWorldUniverseNotification.h
new file mode 100644
index 00000000..a5f5a7bd
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerWorldUniverseNotification.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/ServerWorldUniverseNotification.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ServerXpManagerObjectTemplate.h b/engine/server/library/serverGame/include/public/serverGame/ServerXpManagerObjectTemplate.h
new file mode 100644
index 00000000..eaac7ef6
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ServerXpManagerObjectTemplate.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/objectTemplate/ServerXpManagerObjectTemplate.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/SetupServerGame.h b/engine/server/library/serverGame/include/public/serverGame/SetupServerGame.h
new file mode 100644
index 00000000..6f4bd375
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/SetupServerGame.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/SetupServerGame.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/SharedObjectTemplateInterface.h b/engine/server/library/serverGame/include/public/serverGame/SharedObjectTemplateInterface.h
new file mode 100644
index 00000000..32ea9852
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/SharedObjectTemplateInterface.h
@@ -0,0 +1 @@
+#include "../../src/shared/objectTemplate/ServerSharedObjectTemplateInterface.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipAiEnemySearchManager.h b/engine/server/library/serverGame/include/public/serverGame/ShipAiEnemySearchManager.h
new file mode 100644
index 00000000..06fb36a4
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipAiEnemySearchManager.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/space/ShipAiEnemySearchManager.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipAiReactionManager.h b/engine/server/library/serverGame/include/public/serverGame/ShipAiReactionManager.h
new file mode 100644
index 00000000..9c2521d5
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipAiReactionManager.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/space/ShipAiReactionManager.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipClientUpdateTracker.h b/engine/server/library/serverGame/include/public/serverGame/ShipClientUpdateTracker.h
new file mode 100644
index 00000000..920003a2
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipClientUpdateTracker.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/space/ShipClientUpdateTracker.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataArmor.h b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataArmor.h
new file mode 100644
index 00000000..c70fe3f4
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataArmor.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/ShipComponentDataArmor.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataBooster.h b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataBooster.h
new file mode 100644
index 00000000..ed4ac07f
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataBooster.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/ShipComponentDataBooster.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataBridge.h b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataBridge.h
new file mode 100644
index 00000000..487dbb9c
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataBridge.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/ShipComponentDataBridge.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataCapacitor.h b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataCapacitor.h
new file mode 100644
index 00000000..740e7de8
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataCapacitor.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/ShipComponentDataCapacitor.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataCargoHold.h b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataCargoHold.h
new file mode 100644
index 00000000..d18c0098
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataCargoHold.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/ShipComponentDataCargoHold.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataDroidInterface.h b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataDroidInterface.h
new file mode 100644
index 00000000..d1960f82
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataDroidInterface.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/ShipComponentDataDroidInterface.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataEngine.h b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataEngine.h
new file mode 100644
index 00000000..4c72f999
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataEngine.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/ShipComponentDataEngine.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataHangar.h b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataHangar.h
new file mode 100644
index 00000000..5cf7a4d7
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataHangar.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/ShipComponentDataHangar.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataManager.h b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataManager.h
new file mode 100644
index 00000000..4f10e4d5
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/ShipComponentDataManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataModification.h b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataModification.h
new file mode 100644
index 00000000..5f52d96b
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataModification.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/ShipComponentDataModification.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataReactor.h b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataReactor.h
new file mode 100644
index 00000000..f359526e
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataReactor.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/ShipComponentDataReactor.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataShield.h b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataShield.h
new file mode 100644
index 00000000..113441d4
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataShield.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/ShipComponentDataShield.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataTargetingStation.h b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataTargetingStation.h
new file mode 100644
index 00000000..904d5bf8
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataTargetingStation.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/ShipComponentDataTargetingStation.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataWeapon.h b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataWeapon.h
new file mode 100644
index 00000000..66f47f54
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipComponentDataWeapon.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/ShipComponentDataWeapon.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipController.h b/engine/server/library/serverGame/include/public/serverGame/ShipController.h
new file mode 100644
index 00000000..2b006769
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipController.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/controller/ShipController.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipInternalDamageOverTime.h b/engine/server/library/serverGame/include/public/serverGame/ShipInternalDamageOverTime.h
new file mode 100644
index 00000000..31676e46
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipInternalDamageOverTime.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/ShipInternalDamageOverTime.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipInternalDamageOverTimeManager.h b/engine/server/library/serverGame/include/public/serverGame/ShipInternalDamageOverTimeManager.h
new file mode 100644
index 00000000..7e3cb9aa
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipInternalDamageOverTimeManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/ShipInternalDamageOverTimeManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipObject.h b/engine/server/library/serverGame/include/public/serverGame/ShipObject.h
new file mode 100644
index 00000000..6daabe32
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipObject.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/object/ShipObject.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipObject_Components.h b/engine/server/library/serverGame/include/public/serverGame/ShipObject_Components.h
new file mode 100644
index 00000000..bae21f2c
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipObject_Components.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/ShipObject_Components.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/ShipTurretTargetingSystem.h b/engine/server/library/serverGame/include/public/serverGame/ShipTurretTargetingSystem.h
new file mode 100644
index 00000000..c1c3d52a
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/ShipTurretTargetingSystem.h
@@ -0,0 +1 @@
+#include "../../src/shared/behavior/ShipTurretTargetingSystem.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/SpaceAttackSquad.h b/engine/server/library/serverGame/include/public/serverGame/SpaceAttackSquad.h
new file mode 100644
index 00000000..27d9155e
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/SpaceAttackSquad.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/SpaceAttackSquad.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/SpaceDockingManager.h b/engine/server/library/serverGame/include/public/serverGame/SpaceDockingManager.h
new file mode 100644
index 00000000..4242554e
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/SpaceDockingManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/SpaceDockingManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/SpacePath.h b/engine/server/library/serverGame/include/public/serverGame/SpacePath.h
new file mode 100644
index 00000000..a6639fdd
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/SpacePath.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/SpacePath.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/SpacePathManager.h b/engine/server/library/serverGame/include/public/serverGame/SpacePathManager.h
new file mode 100644
index 00000000..ac776f12
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/SpacePathManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/SpacePathManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/SpaceSquad.h b/engine/server/library/serverGame/include/public/serverGame/SpaceSquad.h
new file mode 100644
index 00000000..fd4186d4
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/SpaceSquad.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/SpaceSquad.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/SpaceSquadManager.h b/engine/server/library/serverGame/include/public/serverGame/SpaceSquadManager.h
new file mode 100644
index 00000000..fc652808
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/SpaceSquadManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/space/SpaceSquadManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/SpaceVisibilityManager.h b/engine/server/library/serverGame/include/public/serverGame/SpaceVisibilityManager.h
new file mode 100644
index 00000000..ee4e5d32
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/SpaceVisibilityManager.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/space/SpaceVisibilityManager.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/Squad.h b/engine/server/library/serverGame/include/public/serverGame/Squad.h
new file mode 100644
index 00000000..fb97de77
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/Squad.h
@@ -0,0 +1 @@
+#include "../../src/shared/ai/Squad.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/StaticLootItemManager.h b/engine/server/library/serverGame/include/public/serverGame/StaticLootItemManager.h
new file mode 100644
index 00000000..6f794b91
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/StaticLootItemManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/StaticLootItemManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/StaticObject.h b/engine/server/library/serverGame/include/public/serverGame/StaticObject.h
new file mode 100644
index 00000000..d4173c4e
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/StaticObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/StaticObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/StationPlayersCollectorAPI.h b/engine/server/library/serverGame/include/public/serverGame/StationPlayersCollectorAPI.h
new file mode 100644
index 00000000..3b69bf4c
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/StationPlayersCollectorAPI.h
@@ -0,0 +1 @@
+#include "../../src/shared/stationplayers/StationPlayersCollectorAPI.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/SuiPageDataServer.h b/engine/server/library/serverGame/include/public/serverGame/SuiPageDataServer.h
new file mode 100644
index 00000000..d6525adc
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/SuiPageDataServer.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/SuiPageDataServer.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/SuiPageDataServerArchive.h b/engine/server/library/serverGame/include/public/serverGame/SuiPageDataServerArchive.h
new file mode 100644
index 00000000..597dd6ad
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/SuiPageDataServerArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/SuiPageDataServerArchive.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/SurveySystem.h b/engine/server/library/serverGame/include/public/serverGame/SurveySystem.h
new file mode 100644
index 00000000..6f97f3c2
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/SurveySystem.h
@@ -0,0 +1 @@
+#include "../../src/shared/resource/SurveySystem.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/TangibleConditionObserver.h b/engine/server/library/serverGame/include/public/serverGame/TangibleConditionObserver.h
new file mode 100644
index 00000000..faf5abc8
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/TangibleConditionObserver.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/TangibleConditionObserver.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/TangibleController.h b/engine/server/library/serverGame/include/public/serverGame/TangibleController.h
new file mode 100644
index 00000000..1b1ff4e8
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/TangibleController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/TangibleController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/TangibleObject.h b/engine/server/library/serverGame/include/public/serverGame/TangibleObject.h
new file mode 100644
index 00000000..f24d9318
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/TangibleObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/TangibleObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/TangibleObject_Conversation.h b/engine/server/library/serverGame/include/public/serverGame/TangibleObject_Conversation.h
new file mode 100644
index 00000000..705a33af
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/TangibleObject_Conversation.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/TangibleObject_Conversation.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/TangibleVolumeContainer.h b/engine/server/library/serverGame/include/public/serverGame/TangibleVolumeContainer.h
new file mode 100644
index 00000000..2f48ab75
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/TangibleVolumeContainer.h
@@ -0,0 +1 @@
+#include "../../src/shared/container/TangibleVolumeContainer.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/TaskGetAttributes.h b/engine/server/library/serverGame/include/public/serverGame/TaskGetAttributes.h
new file mode 100644
index 00000000..1d21cbb5
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/TaskGetAttributes.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/TaskGetAttributes.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/TaskManagerConnection.h b/engine/server/library/serverGame/include/public/serverGame/TaskManagerConnection.h
new file mode 100644
index 00000000..2ec1d503
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/TaskManagerConnection.h
@@ -0,0 +1 @@
+#include "../../src/shared/network/TaskManagerConnection.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/TeleportFixupHandler.h b/engine/server/library/serverGame/include/public/serverGame/TeleportFixupHandler.h
new file mode 100644
index 00000000..5a9a7cce
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/TeleportFixupHandler.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/core/TeleportFixupHandler.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/TriggerVolume.h b/engine/server/library/serverGame/include/public/serverGame/TriggerVolume.h
new file mode 100644
index 00000000..bd2d781b
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/TriggerVolume.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/TriggerVolume.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/TurretController.h b/engine/server/library/serverGame/include/public/serverGame/TurretController.h
new file mode 100644
index 00000000..f1b1fbae
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/TurretController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/TurretController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/UniverseController.h b/engine/server/library/serverGame/include/public/serverGame/UniverseController.h
new file mode 100644
index 00000000..457ebb3a
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/UniverseController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/UniverseController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/UniverseObject.h b/engine/server/library/serverGame/include/public/serverGame/UniverseObject.h
new file mode 100644
index 00000000..509f8f41
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/UniverseObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/UniverseObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/VehicleController.h b/engine/server/library/serverGame/include/public/serverGame/VehicleController.h
new file mode 100644
index 00000000..638c381f
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/VehicleController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/VehicleController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/VehicleObject.h b/engine/server/library/serverGame/include/public/serverGame/VehicleObject.h
new file mode 100644
index 00000000..b1e92206
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/VehicleObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/VehicleObject.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/VeteranRewardManager.h b/engine/server/library/serverGame/include/public/serverGame/VeteranRewardManager.h
new file mode 100644
index 00000000..c10162a1
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/VeteranRewardManager.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/VeteranRewardManager.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/VisibleObjectNotification.h b/engine/server/library/serverGame/include/public/serverGame/VisibleObjectNotification.h
new file mode 100644
index 00000000..0e6cdf94
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/VisibleObjectNotification.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/space/VisibleObjectNotification.h"
+
diff --git a/engine/server/library/serverGame/include/public/serverGame/WeaponController.h b/engine/server/library/serverGame/include/public/serverGame/WeaponController.h
new file mode 100644
index 00000000..1f9fd720
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/WeaponController.h
@@ -0,0 +1 @@
+#include "../../src/shared/controller/WeaponController.h"
diff --git a/engine/server/library/serverGame/include/public/serverGame/WeaponObject.h b/engine/server/library/serverGame/include/public/serverGame/WeaponObject.h
new file mode 100644
index 00000000..cbb90c54
--- /dev/null
+++ b/engine/server/library/serverGame/include/public/serverGame/WeaponObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/object/WeaponObject.h"
diff --git a/engine/server/library/serverGame/src/CMakeLists.txt b/engine/server/library/serverGame/src/CMakeLists.txt
new file mode 100644
index 00000000..2cc5a96b
--- /dev/null
+++ b/engine/server/library/serverGame/src/CMakeLists.txt
@@ -0,0 +1,756 @@
+
+set(SHARED_SOURCES
+	shared/ai/AggroListProperty.cpp
+	shared/ai/AggroListProperty.h
+	shared/ai/AiCombatPulseQueue.cpp
+	shared/ai/AiCombatPulseQueue.h
+	shared/ai/AiCreatureCombatProfile.cpp
+	shared/ai/AiCreatureCombatProfile.h
+	shared/ai/AiCreatureCombatProfile_Action.cpp
+	shared/ai/AiCreatureCombatProfile_Action.h
+	shared/ai/AiCreatureData.cpp
+	shared/ai/AiCreatureData.h
+	shared/ai/AiCreatureWeaponActions.cpp
+	shared/ai/AiCreatureWeaponActions.h
+	shared/ai/AiLogManager.cpp
+	shared/ai/AiLogManager.h
+	shared/ai/AiMovementArchive.cpp
+	shared/ai/AiMovementArchive.h
+	shared/ai/AiMovementBase.cpp
+	shared/ai/AiMovementBase.h
+	shared/ai/AiMovementFace.cpp
+	shared/ai/AiMovementFace.h
+	shared/ai/AiMovementFlee.cpp
+	shared/ai/AiMovementFlee.h
+	shared/ai/AiMovementFollow.cpp
+	shared/ai/AiMovementFollow.h
+	shared/ai/AiMovementIdle.cpp
+	shared/ai/AiMovementIdle.h
+	shared/ai/AiMovementLoiter.cpp
+	shared/ai/AiMovementLoiter.h
+	shared/ai/AiMovementMove.cpp
+	shared/ai/AiMovementMove.h
+	shared/ai/AiMovementPathFollow.cpp
+	shared/ai/AiMovementPathFollow.h
+	shared/ai/AiMovementPatrol.cpp
+	shared/ai/AiMovementPatrol.h
+	shared/ai/AiMovementSwarm.cpp
+	shared/ai/AiMovementSwarm.h
+	shared/ai/AiMovementTarget.cpp
+	shared/ai/AiMovementTarget.h
+	shared/ai/AiMovementWander.cpp
+	shared/ai/AiMovementWander.h
+	shared/ai/AiMovementWanderInterior.cpp
+	shared/ai/AiMovementWanderInterior.h
+	shared/ai/AiMovementWaypoint.cpp
+	shared/ai/AiMovementWaypoint.h
+	shared/ai/AiTargetingSystem.cpp
+	shared/ai/AiTargetingSystem.h
+	shared/ai/Formation.cpp
+	shared/ai/Formation.h
+	shared/ai/HateList.cpp
+	shared/ai/HateList.h
+	shared/ai/Squad.cpp
+	shared/ai/Squad.h
+
+	shared/behavior/AiCreatureStateArchive.cpp
+	shared/behavior/AiCreatureStateArchive.h
+	shared/behavior/AiLocation.cpp
+	shared/behavior/AiLocation.h
+	shared/behavior/AiShipAttackTargetList.h
+	shared/behavior/AiShipAttackTargetList.cpp
+	shared/behavior/AiShipBehaviorAttack.cpp
+	shared/behavior/AiShipBehaviorAttack.h
+	shared/behavior/AiShipBehaviorAttackBomber.cpp
+	shared/behavior/AiShipBehaviorAttackBomber.h
+	shared/behavior/AiShipBehaviorAttackCapitalShip.cpp
+	shared/behavior/AiShipBehaviorAttackCapitalShip.h
+	shared/behavior/AiShipBehaviorAttackFighter.cpp
+	shared/behavior/AiShipBehaviorAttackFighter.h
+	shared/behavior/AiShipBehaviorAttackFighter_Maneuver.cpp
+	shared/behavior/AiShipBehaviorAttackFighter_Maneuver.h
+	shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.cpp
+	shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.h
+	shared/behavior/AiShipBehaviorBase.cpp
+	shared/behavior/AiShipBehaviorBase.h
+	shared/behavior/AiShipBehaviorDock.cpp
+	shared/behavior/AiShipBehaviorDock.h
+	shared/behavior/AiShipBehaviorFollow.cpp
+	shared/behavior/AiShipBehaviorFollow.h
+	shared/behavior/AiShipBehaviorIdle.cpp
+	shared/behavior/AiShipBehaviorIdle.h
+	shared/behavior/AiShipBehaviorTrack.cpp
+	shared/behavior/AiShipBehaviorTrack.h
+	shared/behavior/AiShipBehaviorWaypoint.cpp
+	shared/behavior/AiShipBehaviorWaypoint.h
+	shared/behavior/AiShipTurretTargetingSystem.cpp
+	shared/behavior/AiShipTurretTargetingSystem.h
+	shared/behavior/PlayerShipTurretTargetingSystem.cpp
+	shared/behavior/PlayerShipTurretTargetingSystem.h
+	shared/behavior/ShipTurretTargetingSystem.cpp
+	shared/behavior/ShipTurretTargetingSystem.h
+
+	shared/city/CitizenInfo.cpp
+	shared/city/CitizenInfo.h
+	shared/city/CityInfo.cpp
+	shared/city/CityInfo.h
+	shared/city/CityInterface.cpp
+	shared/city/CityInterface.h
+	shared/city/CityStringParser.cpp
+	shared/city/CityStringParser.h
+	shared/city/CityStructureInfo.cpp
+	shared/city/CityStructureInfo.h
+	shared/city/PgcRatingInfo.cpp
+	shared/city/PgcRatingInfo.h
+
+	shared/collision/CollisionCallbacks.cpp
+	shared/collision/CollisionCallbacks.h
+
+	shared/command/CommandCppFuncs.cpp
+	shared/command/CommandCppFuncs.h
+	shared/command/CommandQueue.cpp
+	shared/command/CommandQueue.h
+	shared/command/ServerCommandTable.cpp
+	shared/command/ServerCommandTable.h
+	shared/command/CommandQueueEntry.cpp
+	shared/command/CommandQueueEntry.h
+
+	shared/commoditiesMarket/AuctionInfo.h
+	shared/commoditiesMarket/CommoditiesMarket.cpp
+	shared/commoditiesMarket/CommoditiesMarket.h
+	shared/commoditiesMarket/CommoditiesMarketListener.cpp
+	shared/commoditiesMarket/CommoditiesMarketListener.h
+	shared/commoditiesMarket/CommoditiesServerConnection.cpp
+	shared/commoditiesMarket/CommoditiesServerConnection.h
+
+	shared/console/CentralCommandParserGame.cpp
+	shared/console/CentralCommandParserGame.h
+	shared/console/ConsoleCommandParserAi.cpp
+	shared/console/ConsoleCommandParserAi.h
+	shared/console/ConsoleCommandParserCity.cpp
+	shared/console/ConsoleCommandParserCity.h
+	shared/console/ConsoleCommandParserCollection.cpp
+	shared/console/ConsoleCommandParserCollection.h
+	shared/console/ConsoleCommandParserCraft.cpp
+	shared/console/ConsoleCommandParserCraft.h
+	shared/console/ConsoleCommandParserCraftStation.cpp
+	shared/console/ConsoleCommandParserCraftStation.h
+	shared/console/ConsoleCommandParserDefault.cpp
+	shared/console/ConsoleCommandParserDefault.h
+	shared/console/ConsoleCommandParserGuild.cpp
+	shared/console/ConsoleCommandParserGuild.h
+	shared/console/ConsoleCommandParserManufacture.cpp
+	shared/console/ConsoleCommandParserManufacture.h
+	shared/console/ConsoleCommandParserMessageTo.cpp
+	shared/console/ConsoleCommandParserMessageTo.h
+	shared/console/ConsoleCommandParserMoney.cpp
+	shared/console/ConsoleCommandParserMoney.h
+	shared/console/ConsoleCommandParserNpc.cpp
+	shared/console/ConsoleCommandParserNpc.h
+	shared/console/ConsoleCommandParserObject.cpp
+	shared/console/ConsoleCommandParserObject.h
+	shared/console/ConsoleCommandParserObjvar.cpp
+	shared/console/ConsoleCommandParserObjvar.h
+	shared/console/ConsoleCommandParserPvp.cpp
+	shared/console/ConsoleCommandParserPvp.h
+	shared/console/ConsoleCommandParserResource.cpp
+	shared/console/ConsoleCommandParserResource.h
+	shared/console/ConsoleCommandParserScript.cpp
+	shared/console/ConsoleCommandParserScript.h
+	shared/console/ConsoleCommandParserServer.cpp
+	shared/console/ConsoleCommandParserServer.h
+	shared/console/ConsoleCommandParserShip.cpp
+	shared/console/ConsoleCommandParserShip.h
+	shared/console/ConsoleCommandParserSkill.cpp
+	shared/console/ConsoleCommandParserSkill.h
+	shared/console/ConsoleCommandParserSpaceAi.cpp
+	shared/console/ConsoleCommandParserSpaceAi.h
+	shared/console/ConsoleCommandParserSpawner.cpp
+	shared/console/ConsoleCommandParserSpawner.h
+	shared/console/ConsoleCommandParserVeteran.cpp
+	shared/console/ConsoleCommandParserVeteran.h
+	shared/console/ConsoleCommandParserVoice.cpp
+	shared/console/ConsoleCommandParserVoice.h
+	shared/console/ConsoleManager.cpp
+	shared/console/ConsoleManager.h
+	shared/console/ObjectCommandParserGetAttributes.cpp
+	shared/console/ObjectCommandParserGetAttributes.h
+	shared/console/ObjectCommandParserSetAttributes.cpp
+	shared/console/ObjectCommandParserSetAttributes.h
+	shared/console/ServerCommandPermissionManager.cpp
+	shared/console/ServerCommandPermissionManager.h 
+
+	shared/container/IntangibleVolumeContainer.cpp
+	shared/container/IntangibleVolumeContainer.h
+	shared/container/TangibleVolumeContainer.cpp
+	shared/container/TangibleVolumeContainer.h
+
+	shared/controller/AiCreatureController.cpp
+	shared/controller/AiCreatureController.h
+	shared/controller/AiShipController.cpp
+	shared/controller/AiShipController.h
+	shared/controller/AiShipControllerInterface.cpp
+	shared/controller/AiShipControllerInterface.h
+	shared/controller/BattlefieldMarkerController.cpp
+	shared/controller/BattlefieldMarkerController.h
+	shared/controller/BuildingController.cpp
+	shared/controller/BuildingController.h
+	shared/controller/CellController.cpp
+	shared/controller/CellController.h
+	shared/controller/CityController.cpp
+	shared/controller/CityController.h
+	shared/controller/CreatureController.cpp
+	shared/controller/CreatureController.h
+	shared/controller/FactoryController.cpp
+	shared/controller/FactoryController.h
+	shared/controller/GroundVehicleController.cpp
+	shared/controller/GroundVehicleController.h
+	shared/controller/GroupController.cpp
+	shared/controller/GroupController.h
+	shared/controller/GuildController.cpp
+	shared/controller/GuildController.h
+	shared/controller/HarvesterInstallationController.cpp
+	shared/controller/HarvesterInstallationController.h
+	shared/controller/InstallationController.cpp
+	shared/controller/InstallationController.h
+	shared/controller/ManufactureInstallationController.cpp
+	shared/controller/ManufactureInstallationController.h
+	shared/controller/MissionTerminalController.cpp
+	shared/controller/MissionTerminalController.h
+	shared/controller/MoveSimController.cpp
+	shared/controller/MoveSimController.h
+	shared/controller/PlanetController.cpp
+	shared/controller/PlanetController.h
+	shared/controller/PlayerCreatureController.cpp
+	shared/controller/PlayerCreatureController.h
+	shared/controller/PlayerShipController.cpp
+	shared/controller/PlayerShipController.h
+	shared/controller/ResourceContainerController.cpp
+	shared/controller/ResourceContainerController.h
+	shared/controller/ServerController.cpp
+	shared/controller/ServerController.h
+	shared/controller/ShipController.cpp
+	shared/controller/ShipController.h
+	shared/controller/TangibleController.cpp
+	shared/controller/TangibleController.h
+	shared/controller/TurretController.cpp
+	shared/controller/TurretController.h
+	shared/controller/UniverseController.cpp
+	shared/controller/UniverseController.h
+	shared/controller/VehicleController.cpp
+	shared/controller/VehicleController.h
+	shared/controller/WeaponController.cpp
+	shared/controller/WeaponController.h 
+
+	shared/core/AttribModNameManager.cpp
+	shared/core/AttribModNameManager.h
+	shared/core/AuctionTokenServer.cpp
+	shared/core/AuctionTokenServer.h
+	shared/core/AuthTransferTracker.cpp
+	shared/core/AuthTransferTracker.h
+	shared/core/BiographyManager.cpp
+	shared/core/BiographyManager.h
+	shared/core/BuffManager.cpp
+	shared/core/BuffManager.h
+	shared/core/CharacterMatchManager.cpp
+	shared/core/CharacterMatchManager.h
+	shared/core/ChatServerConnection.cpp
+	shared/core/ChatServerConnection.h
+	shared/core/Client.cpp
+	shared/core/Client.h
+	shared/core/ClusterWideDataClient.cpp
+	shared/core/ClusterWideDataClient.h
+	shared/core/CombatTracker.cpp
+	shared/core/CombatTracker.h
+	shared/core/CommunityManager.cpp
+	shared/core/CommunityManager.h
+	shared/core/ConfigServerGame.cpp
+	shared/core/ConfigServerGame.h
+	shared/core/ConsentManager.cpp
+	shared/core/ConsentManager.h
+	shared/core/ContainerInterface.cpp
+	shared/core/ContainerInterface.h
+	shared/core/FirstServerGame.h
+	shared/core/FormManagerServer.cpp
+	shared/core/FormManagerServer.h
+	shared/core/GameServer.cpp
+	shared/core/GameServer.h
+	shared/core/InstantDeleteList.cpp
+	shared/core/InstantDeleteList.h
+	shared/core/LogoutTracker.cpp
+	shared/core/LogoutTracker.h
+	shared/core/MoveSimManager.cpp
+	shared/core/MessageToQueue.cpp
+	shared/core/MessageToQueue.h
+	shared/core/NamedObjectManager.cpp
+	shared/core/NamedObjectManager.h
+	shared/core/NameManager.cpp
+	shared/core/NameManager.h
+	shared/core/NewbieTutorial.cpp
+	shared/core/NewbieTutorial.h
+	shared/core/NonCriticalTaskQueue.cpp
+	shared/core/NonCriticalTaskQueue.h
+	shared/core/NpcConversation.cpp
+	shared/core/NpcConversation.h
+	shared/core/ObjectIdManager.cpp
+	shared/core/ObjectIdManager.h
+	shared/core/ObserveTracker.cpp
+	shared/core/ObserveTracker.h
+	shared/core/PlanetMapManagerServer.cpp
+	shared/core/PlanetMapManagerServer.h
+	shared/core/PlayerCreationManagerServer.cpp
+	shared/core/PlayerCreationManagerServer.h
+	shared/core/PlayerSanityChecker.cpp
+	shared/core/PlayerSanityChecker.h
+	shared/core/PositionUpdateTracker.cpp
+	shared/core/PositionUpdateTracker.h
+	shared/core/PreloadManager.cpp
+	shared/core/PreloadManager.h
+	shared/core/ProsePackageManagerServer.cpp
+	shared/core/ProsePackageManagerServer.h
+	shared/core/PurgeManager.cpp
+	shared/core/PurgeManager.h
+	shared/core/RegexList.cpp
+	shared/core/RegexList.h
+	shared/core/ReportManager.cpp
+	shared/core/ReportManager.h
+	shared/core/ServerBuffBuilderManager.cpp
+	shared/core/ServerBuffBuilderManager.h
+	shared/core/ServerBuildoutManager.cpp
+	shared/core/ServerBuildoutManager.h
+	shared/core/ServerImageDesignerManager.cpp
+	shared/core/ServerImageDesignerManager.h
+	shared/core/ServerMessageForwarding.cpp
+	shared/core/ServerMessageForwarding.h
+	shared/core/ServerObjectAttributeIds.cpp
+	shared/core/ServerObjectAttributeIds.h
+	shared/core/ServerUIManager.cpp
+	shared/core/ServerUIManager.h
+	shared/core/ServerUIPage.cpp
+	shared/core/ServerUIPage.h
+	shared/core/ServerUniverse.cpp
+	shared/core/ServerUniverse.h
+	shared/core/ServerWorld.cpp
+	shared/core/ServerWorld.h
+	shared/core/ServerWorldIntangibleNotification.cpp
+	shared/core/ServerWorldIntangibleNotification.h
+	shared/core/ServerWorldTangibleNotification.cpp
+	shared/core/ServerWorldTangibleNotification.h
+	shared/core/ServerWorldTerrainObjectNotification.cpp
+	shared/core/ServerWorldTerrainObjectNotification.h
+	shared/core/ServerWorldUniverseNotification.cpp
+	shared/core/ServerWorldUniverseNotification.h
+	shared/core/StaticLootItemManager.cpp
+	shared/core/StaticLootItemManager.h
+	shared/core/SuiPageDataServer.cpp
+	shared/core/SuiPageDataServer.h
+	shared/core/SuiPageDataServerArchive.cpp
+	shared/core/SuiPageDataServerArchive.h
+	shared/core/SetupServerGame.cpp
+	shared/core/SetupServerGame.h
+	shared/core/TaskGetAttributes.cpp
+	shared/core/TaskGetAttributes.h
+	shared/core/TeleportFixupHandler.cpp
+	shared/core/TeleportFixupHandler.h
+	shared/core/VeteranRewardManager.cpp
+	shared/core/VeteranRewardManager.h
+	shared/core/SceneGlobalData.cpp
+	shared/core/SceneGlobalData.h
+
+	shared/guild/GuildInfo.cpp
+	shared/guild/GuildInfo.h
+	shared/guild/GuildInterface.cpp
+	shared/guild/GuildInterface.h
+	shared/guild/GuildMemberInfo.cpp
+	shared/guild/GuildMemberInfo.h
+	shared/guild/GuildStringParser.cpp
+	shared/guild/GuildStringParser.h
+
+	shared/metrics/GameServerMetricsData.cpp
+	shared/metrics/GameServerMetricsData.h
+
+	shared/network/CentralConnection.cpp
+	shared/network/CentralConnection.h
+	shared/network/Chat.cpp
+	shared/network/Chat.h
+	shared/network/ConnectionServerConnection.cpp
+	shared/network/ConnectionServerConnection.h
+	shared/network/CustomerServiceServerConnection.cpp
+	shared/network/CustomerServiceServerConnection.h
+	shared/network/DatabaseProcessConnection.cpp
+	shared/network/DatabaseProcessConnection.h
+	shared/network/GameServerMessageArchive.cpp
+	shared/network/GameServerMessageArchive.h
+	shared/network/PlanetServerConnection.cpp
+	shared/network/PlanetServerConnection.h
+	shared/network/TaskManagerConnection.cpp
+	shared/network/TaskManagerConnection.h
+
+	shared/object/AiServerShipObjectInterface.cpp
+	shared/object/AiServerShipObjectInterface.h
+	shared/object/BaselineDistributionListPool.cpp
+	shared/object/BaselineDistributionListPool.h
+	shared/object/BattlefieldMarkerObject.cpp
+	shared/object/BattlefieldMarkerObject.h
+	shared/object/BuildingObject.cpp
+	shared/object/BuildingObject.h
+	shared/object/CellObject.cpp
+	shared/object/CellObject.h
+	shared/object/CellPermissions.cpp
+	shared/object/CellPermissions.h
+	shared/object/CityObject.cpp
+	shared/object/CityObject.h
+	shared/object/ContainmentMessageManager.cpp
+	shared/object/ContainmentMessageManager.h
+	shared/object/CreatureObject.cpp
+	shared/object/CreatureObject.h
+	shared/object/CreatureObject_Mounts.cpp
+	shared/object/CreatureObject_Ships.cpp
+	shared/object/DestroyMessageManager.cpp
+	shared/object/DestroyMessageManager.h
+	shared/object/DistributionListStack.cpp
+	shared/object/DistributionListStack.h
+	shared/object/DraftSchematicObject.cpp
+	shared/object/DraftSchematicObject.h
+	shared/object/FactoryObject.cpp
+	shared/object/FactoryObject.h
+	shared/object/GroupIdObserver.cpp
+	shared/object/GroupIdObserver.h
+	shared/object/GroupMissionCriticalObjectsBuilder.cpp
+	shared/object/GroupMissionCriticalObjectsBuilder.h
+	shared/object/GroupWaypointBuilder.cpp
+	shared/object/GroupWaypointBuilder.h
+	shared/object/GroupObject.cpp
+	shared/object/GroupObject.h
+	shared/object/GroupStringId.h
+	shared/object/GroupUpdateObserver.cpp
+	shared/object/GroupUpdateObserver.h
+	shared/object/GuildObject.cpp
+	shared/object/GuildObject.h
+	shared/object/HarvesterInstallationObject.cpp
+	shared/object/HarvesterInstallationObject.h
+	shared/object/InstallationObject.cpp
+	shared/object/InstallationObject.h
+	shared/object/IntangibleObject.cpp
+	shared/object/IntangibleObject.h
+	shared/object/LineOfSightCache.cpp
+	shared/object/LineOfSightCache.h
+	shared/object/ManufactureInstallationObject.cpp
+	shared/object/ManufactureInstallationObject.h
+	shared/object/ManufactureObjectInterface.h
+	shared/object/ManufactureSchematicObject.cpp
+	shared/object/ManufactureSchematicObject.h
+	shared/object/MissionObject.cpp
+	shared/object/MissionObject.h
+	shared/object/NetworkTriggerVolume.cpp
+	shared/object/NetworkTriggerVolume.h
+	shared/object/ObjectFactory.cpp
+	shared/object/ObjectTracker.cpp
+	shared/object/ObjectTracker.h
+	shared/object/PatrolPathNodeProperty.cpp
+	shared/object/PatrolPathNodeProperty.h
+	shared/object/PatrolPathRootProperty.cpp
+	shared/object/PatrolPathRootProperty.h
+	shared/object/PlanetObject.cpp
+	shared/object/PlanetObject.h
+	shared/object/PlayerQuestObject.h
+	shared/object/PlayerQuestObject.cpp
+	shared/object/PlayerObject.cpp
+	shared/object/PlayerObject.h
+	shared/object/PortalTriggerVolume.cpp
+	shared/object/PortalTriggerVolume.h
+	shared/object/PvpEnemiesObserver.cpp
+	shared/object/PvpEnemiesObserver.h
+	shared/object/PvpUpdateAndCellPermissionsObserver.cpp
+	shared/object/PvpUpdateAndCellPermissionsObserver.h
+	shared/object/ResourceContainerObject.cpp
+	shared/object/ResourceContainerObject.h
+	shared/object/ResourcePoolObject.cpp
+	shared/object/ResourcePoolObject.h
+	shared/object/ResourceTypeObject.cpp
+	shared/object/ResourceTypeObject.h
+	shared/object/ServerClearCollidableFloraNotification.cpp
+	shared/object/ServerClearCollidableFloraNotification.h
+	shared/object/ServerCollisionProperty.cpp
+	shared/object/ServerCollisionProperty.h
+	shared/object/ServerLotManagerNotification.cpp
+	shared/object/ServerLotManagerNotification.h
+	shared/object/ServerNoBuildNotification.cpp
+	shared/object/ServerNoBuildNotification.h
+	shared/object/ServerObject.cpp
+	shared/object/ServerObject.h
+	shared/object/ServerObject_AuthTransfer.cpp
+	shared/object/ServerObject_ObjVar.cpp
+	shared/object/ServerObject_Synchronization.cpp
+	shared/object/ServerObjectBaselinesManager.cpp
+	shared/object/ServerObjectBaselinesManager.h
+	shared/object/ServerObjectTerrainModificationNotification.cpp
+	shared/object/ServerObjectTerrainModificationNotification.h
+	shared/object/ServerResourceClassObject.cpp
+	shared/object/ServerResourceClassObject.h
+	shared/object/ServerShipObjectInterface.cpp
+	shared/object/ServerShipObjectInterface.h
+	shared/object/ShipObject.cpp
+	shared/object/ShipObject.h
+	shared/object/ShipObject_Components.cpp
+	shared/object/ShipObject_Components.h
+	shared/object/StaticObject.cpp
+	shared/object/StaticObject.h
+	shared/object/TangibleConditionObserver.cpp
+	shared/object/TangibleConditionObserver.h
+	shared/object/TangibleObject.cpp
+	shared/object/TangibleObject_Conversation.cpp
+	shared/object/TangibleObject_PobItemLimit.cpp
+	shared/object/TangibleObject.h
+	shared/object/TriggerVolume.cpp
+	shared/object/TriggerVolume.h
+	shared/object/UniverseObject.cpp
+	shared/object/UniverseObject.h
+	shared/object/VehicleObject.cpp
+	shared/object/VehicleObject.h
+	shared/object/WeaponObject.cpp
+	shared/object/WeaponObject.h
+
+	shared/objectTemplate/ServerArmorTemplate.cpp
+	shared/objectTemplate/ServerArmorTemplate.h
+	shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.cpp
+	shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.h
+	shared/objectTemplate/ServerBuildingObjectTemplate.cpp
+	shared/objectTemplate/ServerBuildingObjectTemplate.h
+	shared/objectTemplate/ServerCellObjectTemplate.cpp
+	shared/objectTemplate/ServerCellObjectTemplate.h
+	shared/objectTemplate/ServerCityObjectTemplate.cpp
+	shared/objectTemplate/ServerCityObjectTemplate.h
+	shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp
+	shared/objectTemplate/ServerConstructionContractObjectTemplate.h
+	shared/objectTemplate/ServerCreatureObjectTemplate.cpp
+	shared/objectTemplate/ServerCreatureObjectTemplate.h
+	shared/objectTemplate/ServerDraftSchematicObjectTemplate.cpp
+	shared/objectTemplate/ServerDraftSchematicObjectTemplate.h
+	shared/objectTemplate/ServerFactoryObjectTemplate.cpp
+	shared/objectTemplate/ServerFactoryObjectTemplate.h
+	shared/objectTemplate/ServerGroupObjectTemplate.cpp
+	shared/objectTemplate/ServerGroupObjectTemplate.h
+	shared/objectTemplate/ServerGuildObjectTemplate.cpp
+	shared/objectTemplate/ServerGuildObjectTemplate.h
+	shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.cpp
+	shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.h
+	shared/objectTemplate/ServerInstallationObjectTemplate.cpp
+	shared/objectTemplate/ServerInstallationObjectTemplate.h
+	shared/objectTemplate/ServerIntangibleObjectTemplate.cpp
+	shared/objectTemplate/ServerIntangibleObjectTemplate.h
+	shared/objectTemplate/ServerManufactureInstallationObjectTemplate.cpp
+	shared/objectTemplate/ServerManufactureInstallationObjectTemplate.h
+	shared/objectTemplate/ServerManufactureSchematicObjectTemplate.cpp
+	shared/objectTemplate/ServerManufactureSchematicObjectTemplate.h
+	shared/objectTemplate/ServerMissionObjectTemplate.cpp
+	shared/objectTemplate/ServerMissionObjectTemplate.h
+	shared/objectTemplate/ServerObjectTemplate.cpp
+	shared/objectTemplate/ServerObjectTemplate.h
+	shared/objectTemplate/ServerPlanetObjectTemplate.cpp
+	shared/objectTemplate/ServerPlanetObjectTemplate.h
+	shared/objectTemplate/ServerPlayerQuestObjectTemplate.h
+	shared/objectTemplate/ServerPlayerQuestObjectTemplate.cpp
+	shared/objectTemplate/ServerPlayerObjectTemplate.cpp
+	shared/objectTemplate/ServerPlayerObjectTemplate.h
+	shared/objectTemplate/ServerResourceContainerObjectTemplate.cpp
+	shared/objectTemplate/ServerResourceContainerObjectTemplate.h
+	shared/objectTemplate/ServerSharedObjectTemplateInterface.cpp
+	shared/objectTemplate/ServerSharedObjectTemplateInterface.h
+	shared/objectTemplate/ServerShipObjectTemplate.cpp
+	shared/objectTemplate/ServerShipObjectTemplate.h
+	shared/objectTemplate/ServerStaticObjectTemplate.cpp
+	shared/objectTemplate/ServerStaticObjectTemplate.h
+	shared/objectTemplate/ServerTangibleObjectTemplate.cpp
+	shared/objectTemplate/ServerTangibleObjectTemplate.h
+	shared/objectTemplate/ServerUniverseObjectTemplate.cpp
+	shared/objectTemplate/ServerUniverseObjectTemplate.h
+	shared/objectTemplate/ServerVehicleObjectTemplate.cpp
+	shared/objectTemplate/ServerVehicleObjectTemplate.h
+	shared/objectTemplate/ServerWeaponObjectTemplate.cpp
+	shared/objectTemplate/ServerWeaponObjectTemplate.h
+	shared/objectTemplate/ServerXpManagerObjectTemplate.cpp
+	shared/objectTemplate/ServerXpManagerObjectTemplate.h
+
+	shared/pvp/Pvp.cpp
+	shared/pvp/PvpFactions.cpp
+	shared/pvp/PvpFactions.h
+	shared/pvp/Pvp.h
+	shared/pvp/PvpInternal.cpp
+	shared/pvp/PvpInternal.h
+	shared/pvp/PvpRuleSetBase.cpp
+	shared/pvp/PvpRuleSetBase.h
+	shared/pvp/PvpRuleSetBattlefield.cpp
+	shared/pvp/PvpRuleSetBattlefield.h
+	shared/pvp/PvpRuleSetNormal.cpp
+	shared/pvp/PvpRuleSetNormal.h
+	shared/pvp/PvpRuleSetPet.cpp
+	shared/pvp/PvpRuleSetPet.h
+	shared/pvp/PvpRuleSetShip.cpp
+	shared/pvp/PvpRuleSetShip.h
+	shared/pvp/PvpRuleSetTruce.cpp
+	shared/pvp/PvpRuleSetTruce.h
+	shared/pvp/PvpUpdateObserver.cpp
+	shared/pvp/PvpUpdateObserver.h 
+
+	shared/region/Region.cpp
+	shared/region/Region.h
+	shared/region/RegionMaster.cpp
+	shared/region/RegionMaster.h
+	shared/region/RegionPvp.cpp
+	shared/region/RegionPvp.h
+
+	shared/region3d/Region3d.cpp
+	shared/region3d/Region3d.h
+	shared/region3d/Region3dMaster.cpp
+	shared/region3d/Region3dMaster.h
+	shared/region3d/RegionBox.cpp
+	shared/region3d/RegionBox.h
+	shared/region3d/RegionSphere.cpp
+	shared/region3d/RegionSphere.h
+
+	shared/resource/SurveySystem.cpp
+	shared/resource/SurveySystem.h
+
+	shared/space/AiPilotManager.cpp
+	shared/space/AiPilotManager.h
+	shared/space/AiShipPilotData.cpp
+	shared/space/AiShipPilotData.h
+	shared/space/Missile.cpp
+	shared/space/Missile.h
+	shared/space/MissileManager.cpp
+	shared/space/MissileManager.h
+	shared/space/MiningAsteroidController.cpp
+	shared/space/MiningAsteroidController.h
+	shared/space/NebulaManagerServer.cpp
+	shared/space/NebulaManagerServer.h
+	shared/space/ProjectileManager.cpp
+	shared/space/ProjectileManager.h
+	shared/space/ServerAsteroidManager.cpp
+	shared/space/ServerAsteroidManager.h
+	shared/space/ServerShipComponentData.cpp
+	shared/space/ServerShipComponentData.h
+	shared/space/ServerShipTargeting.cpp
+	shared/space/ServerShipTargeting.h
+	shared/space/ShipAiEnemySearchManager.cpp
+	shared/space/ShipAiEnemySearchManager.h
+	shared/space/ShipAiReactionManager.cpp
+	shared/space/ShipAiReactionManager.h
+	shared/space/ShipClientUpdateTracker.cpp
+	shared/space/ShipClientUpdateTracker.h
+	shared/space/ShipComponentDataArmor.cpp
+	shared/space/ShipComponentDataArmor.h
+	shared/space/ShipComponentDataBooster.cpp
+	shared/space/ShipComponentDataBooster.h
+	shared/space/ShipComponentDataBridge.cpp
+	shared/space/ShipComponentDataBridge.h
+	shared/space/ShipComponentDataCapacitor.cpp
+	shared/space/ShipComponentDataCapacitor.h
+	shared/space/ShipComponentDataCargoHold.cpp
+	shared/space/ShipComponentDataCargoHold.h
+	shared/space/ShipComponentDataModification.cpp
+	shared/space/ShipComponentDataModification.h
+	shared/space/ShipComponentDataDroidInterface.cpp
+	shared/space/ShipComponentDataDroidInterface.h
+	shared/space/ShipComponentDataEngine.cpp
+	shared/space/ShipComponentDataEngine.h
+	shared/space/ShipComponentDataHangar.cpp
+	shared/space/ShipComponentDataHangar.h
+	shared/space/ShipComponentDataManager.cpp
+	shared/space/ShipComponentDataManager.h
+	shared/space/ShipComponentDataReactor.cpp
+	shared/space/ShipComponentDataReactor.h
+	shared/space/ShipComponentDataShield.cpp
+	shared/space/ShipComponentDataShield.h
+	shared/space/ShipComponentDataTargetingStation.cpp
+	shared/space/ShipComponentDataTargetingStation.h
+	shared/space/ShipComponentDataWeapon.cpp
+	shared/space/ShipComponentDataWeapon.h
+	shared/space/ShipInternalDamageOverTime.cpp
+	shared/space/ShipInternalDamageOverTime.h
+	shared/space/ShipInternalDamageOverTimeManager.cpp
+	shared/space/ShipInternalDamageOverTimeManager.h
+	shared/space/SpaceAttackSquad.cpp
+	shared/space/SpaceAttackSquad.h
+	shared/space/SpaceDockingManager.cpp
+	shared/space/SpaceDockingManager.h
+	shared/space/SpacePath.cpp
+	shared/space/SpacePath.h
+	shared/space/SpacePathManager.cpp
+	shared/space/SpacePathManager.h
+	shared/space/SpaceSquad.cpp
+	shared/space/SpaceSquad.h
+	shared/space/SpaceSquadManager.cpp
+	shared/space/SpaceSquadManager.h
+	shared/space/SpaceVisibilityManager.cpp
+	shared/space/SpaceVisibilityManager.h
+	shared/space/VisibleObjectNotification.cpp
+	shared/space/VisibleObjectNotification.h
+
+	shared/stationplayers/StationPlayersCollectorAPI.cpp
+	shared/stationplayers/StationPlayersCollectorAPI.h
+
+	shared/synchronizedUi/InstallationSynchronizedUi.cpp
+	shared/synchronizedUi/InstallationSynchronizedUi.h
+	shared/synchronizedUi/ManufactureSchematicSynchronizedUi.cpp
+	shared/synchronizedUi/ManufactureSchematicSynchronizedUi.h
+	shared/synchronizedUi/ServerSynchronizedUi.cpp
+	shared/synchronizedUi/ServerSynchronizedUi.h
+
+	shared/trading/ServerSecureTrade.cpp
+	shared/trading/ServerSecureTrade.h
+	shared/trading/ServerSecureTradeManager.cpp
+	shared/trading/ServerSecureTradeManager.h
+)
+
+if(WIN32)
+	set(PLATFORM_SOURCES
+		win32/FirstServerGame.cpp
+	)
+else()
+	set(PLATFORM_SOURCES "")
+endif()
+
+include_directories(
+	${CMAKE_CURRENT_SOURCE_DIR}/shared
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedCollision/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedDebug/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFile/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundation/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundationTypes/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedGame/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMath/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMathArchive/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMessageDispatch/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedObject/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedRandom/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedSkillSystem/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedTerrain/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedUtility/include/public
+	${SWG_ENGINE_SOURCE_DIR}/server/library/serverNetworkMessages/include/public
+	${SWG_ENGINE_SOURCE_DIR}/server/library/serverUtility/include/public
+	${SWG_GAME_SOURCE_DIR}/shared/library/swgSharedUtility/include/public
+	${SWG_EXTERNALS_SOURCE_DIR}/ours/library/archive/include
+	${SWG_EXTERNALS_SOURCE_DIR}/ours/library/localization/include
+	${SWG_EXTERNALS_SOURCE_DIR}/ours/library/localizationArchive/include/public
+	${SWG_EXTERNALS_SOURCE_DIR}/ours/library/singleton/include
+	${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicode/include
+	${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicodeArchive/include/public
+	${Boost_INCLUDE_DIR}
+)
+
+add_custom_command(
+	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/shared/generated/Packager.cpp
+	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/shared/generated/Packager_cpp.template ${CMAKE_CURRENT_BINARY_DIR}/shared/generated/Packager.cpp
+	COMMAND ${PERL_EXECUTABLE} ${SWG_ENGINE_SOURCE_DIR}/server/library/codegen/make_packages.pl --datafile ${SWG_ENGINE_SOURCE_DIR}/server/library/codegen/package_data.txt --source ${CMAKE_CURRENT_BINARY_DIR}/shared/generated/Packager.cpp
+	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/shared/generated/Packager_cpp.template ${SWG_ENGINE_SOURCE_DIR}/server/library/codegen/make_packages.pl ${SWG_ENGINE_SOURCE_DIR}/server/library/codegen/package_data.txt
+)
+
+add_library(serverGame STATIC
+	${SHARED_SOURCES}
+	${PLATFORM_SOURCES}
+	${CMAKE_CURRENT_BINARY_DIR}/shared/generated/Packager.cpp
+)
diff --git a/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp b/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp
new file mode 100644
index 00000000..9ffeddbf
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AggroListProperty.cpp
@@ -0,0 +1,323 @@
+// ======================================================================
+//
+// AggroListProperty.cpp
+// Copyright 2005 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AggroListProperty.h"
+
+#include "serverGame/AiLogManager.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/TangibleObject.h"
+#include "serverGame/Pvp.h"
+#include "sharedFoundation/Os.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedLog/Log.h"
+
+#include <set>
+
+// ======================================================================
+//
+// AggroListPropertyNamespace
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+namespace AggroListPropertyNamespace
+{
+	bool canAttackTarget(TangibleObject const & attacker, TangibleObject const & target);
+
+	bool isIncapacitated(TangibleObject const & target);
+	bool isDead(TangibleObject const & target);
+	bool isInvulnerable(TangibleObject const & target);
+	bool isGm(TangibleObject const & target);
+	bool isFeigningDeath(TangibleObject const & target);
+	bool isInPlayerBuilding(TangibleObject const & target);
+	bool isAggroImmune(TangibleObject const & target);
+}
+
+using namespace AggroListPropertyNamespace;
+
+// ----------------------------------------------------------------------
+bool AggroListPropertyNamespace::canAttackTarget(TangibleObject const & attacker, TangibleObject const & target)
+{
+	bool result = true;
+
+	if (isIncapacitated(target))
+	{
+		//LOGC(AiLogManager::isLogging(attacker), "debug_ai", ("AggroListPropertyNamespace::canAttackTarget() attacker(%s) target(%s) Target is incapped", attacker.getDebugInformation().c_str(), target.getDebugInformation().c_str()));
+		result = false;
+	}
+	else if (isDead(target))
+	{
+		//LOGC(AiLogManager::isLogging(attacker), "debug_ai", ("AggroListPropertyNamespace::canAttackTarget() attacker(%s) target(%s) Target is dead", attacker.getDebugInformation().c_str(), target.getDebugInformation().c_str()));
+		result = false;
+	}
+	else if (isInvulnerable(target))
+	{
+		//LOGC(AiLogManager::isLogging(attacker), "debug_ai", ("AggroListPropertyNamespace::canAttackTarget() attacker(%s) target(%s) Target is in combat", attacker.getDebugInformation().c_str(), target.getDebugInformation().c_str()));
+		result = false;
+	}
+	else if (!Pvp::canAttack(attacker, target))
+	{
+		//LOGC(AiLogManager::isLogging(attacker), "debug_ai", ("AggroListPropertyNamespace::canAttackTarget() attacker(%s) target(%s) Target is an invalid pvp target", attacker.getDebugInformation().c_str(), target.getDebugInformation().c_str()));
+		result = false;
+	}
+	else if (isGm(target))
+	{
+		//LOGC(AiLogManager::isLogging(attacker), "debug_ai", ("AggroListPropertyNamespace::canAttackTarget() attacker(%s) target(%s) Target is a GM", attacker.getDebugInformation().c_str(), target.getDebugInformation().c_str()));
+		result = false;
+	}
+	else if (isFeigningDeath(target))
+	{
+		//LOGC(AiLogManager::isLogging(attacker), "debug_ai", ("AggroListPropertyNamespace::canAttackTarget() attacker(%s) target(%s) Target is feigning death", attacker.getDebugInformation().c_str(), target.getDebugInformation().c_str()));
+		result = false;
+	}
+	else if (isInPlayerBuilding(target))
+	{
+		//LOGC(AiLogManager::isLogging(attacker), "debug_ai", ("AggroListPropertyNamespace::canAttackTarget() attacker(%s) target(%s) Target is in a player building", attacker.getDebugInformation().c_str(), target.getDebugInformation().c_str()));
+		result = false;
+	}
+	else if (isAggroImmune(target))
+	{
+		//LOGC(AiLogManager::isLogging(attacker), "debug_ai", ("AggroListPropertyNamespace::canAttackTarget() attacker(%s) target(%s) Target is aggro immune", attacker.getDebugInformation().c_str(), target.getDebugInformation().c_str()));
+		result = false;
+	}
+    else if (!attacker.checkLOSTo(target))
+	{
+		//LOGC(AiLogManager::isLogging(attacker), "debug_ai", ("AggroListPropertyNamespace::canAttackTarget() attacker(%s) target(%s) No LOS to target", attacker.getDebugInformation().c_str(), target.getDebugInformation().c_str()));
+		result = false;
+	}
+
+	// We can attack!
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+bool AggroListPropertyNamespace::isIncapacitated(TangibleObject const & target)
+{
+	CreatureObject const * const targetCreatureObject = target.asCreatureObject();
+
+	return (targetCreatureObject != NULL) ? targetCreatureObject->isIncapacitated() : false;
+}
+
+// ----------------------------------------------------------------------
+bool AggroListPropertyNamespace::isDead(TangibleObject const & target)
+{
+	CreatureObject const * const targetCreatureObject = target.asCreatureObject();
+
+	return (targetCreatureObject != NULL) ? targetCreatureObject->isDead() : false;
+}
+
+// ----------------------------------------------------------------------
+bool AggroListPropertyNamespace::isInvulnerable(TangibleObject const & target)
+{
+	CreatureObject const * const targetCreatureObject = target.asCreatureObject();
+
+	return (targetCreatureObject != NULL) ? targetCreatureObject->isInvulnerable() : false;
+}
+
+// ----------------------------------------------------------------------
+bool AggroListPropertyNamespace::isGm(TangibleObject const & target)
+{
+	int temp = 0;
+
+	return target.getObjVars().getItem("gm", temp) && (temp > 0);
+}
+
+// ----------------------------------------------------------------------
+bool AggroListPropertyNamespace::isFeigningDeath(TangibleObject const & target)
+{
+	CreatureObject const * const targetCreatureObject = target.asCreatureObject();
+
+	return (targetCreatureObject != NULL) ? targetCreatureObject->getState(States::FeignDeath) : false;
+}
+
+// ----------------------------------------------------------------------
+bool AggroListPropertyNamespace::isInPlayerBuilding(TangibleObject const & target)
+{
+	ServerObject const * const topMostServerObject = ServerObject::asServerObject(ContainerInterface::getTopmostContainer(target));
+
+	return (topMostServerObject != NULL) ? (topMostServerObject->getGameObjectType() == SharedObjectTemplate::GOT_building_player) : false;
+}
+
+// ----------------------------------------------------------------------
+bool AggroListPropertyNamespace::isAggroImmune(TangibleObject const & target)
+{
+	PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(target.asCreatureObject());
+
+	return (playerObject != NULL) ? playerObject->isAggroImmune() : false;
+}
+
+// ======================================================================
+//
+// AggroListProperty
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+AggroListProperty::AggroListProperty(TangibleObject & owner)
+ : Property(getClassPropertyId(), owner)
+ , m_targetList()
+ , m_aggroDistance(0.0f)
+{
+	setAggroDistance(ConfigServerGame::getAiBaseAggroRadius() + owner.getCollisionSphereExtent_o().getRadius());
+}
+
+// ----------------------------------------------------------------------
+AggroListProperty::~AggroListProperty()
+{
+	clear();
+}
+
+// ----------------------------------------------------------------------
+PropertyId AggroListProperty::getClassPropertyId()
+{
+	return PROPERTY_HASH(AggroListProperty, 1403544761);
+}
+
+// ----------------------------------------------------------------------
+void AggroListProperty::addServerNpAutoDeltaVariables(Archive::AutoDeltaByteStream & stream)
+{
+	stream.addVariable(m_targetList);
+}
+
+// ----------------------------------------------------------------------
+void AggroListProperty::alter()
+{
+	typedef std::vector<TargetList::const_iterator> PurgeList;
+	static PurgeList purgeList;
+
+	TangibleObject & tangibleOwner = getTangibleOwner();
+
+	// Verify each entry in the list and see if we need to escalate it to the hate list
+	// Once verified for the hate list, we need to give a warning to the target that the
+	// aggro is about to occur
+
+	TargetList::iterator iterTargetList = m_targetList.begin();
+
+	for (; iterTargetList != m_targetList.end(); ++iterTargetList)
+	{
+		CachedNetworkId const & target = *iterTargetList;
+		TangibleObject * const targetTangibleObject = TangibleObject::asTangibleObject(target.getObject());
+
+		// First, list things that invalidate this target in the aggro list
+		// Second, list the things that promote the target to the hate list
+		 
+		if (target.getObject() == NULL)
+		{
+			purgeList.push_back(iterTargetList);
+		}
+		else if (tangibleOwner.getDistanceBetweenCollisionSpheres_w(*target.getObject()) > getAggroDistance())
+		{
+			purgeList.push_back(iterTargetList);
+		}
+		else if (canAttackTarget(tangibleOwner, *targetTangibleObject))
+		{
+			if (!tangibleOwner.addHate(target, 0.0f))
+			{
+				WARNING(true, ("AggroListProperty::alter() owner(%s) Trying to add a target to the hate list, but the hate list is rejecting it.", getOwner().getDebugInformation().c_str()));
+			}
+
+			purgeList.push_back(iterTargetList);
+		}
+	}
+
+	// Purge the old items
+	{
+		PurgeList::const_iterator iterPurgeList(purgeList.begin());
+		
+		for (; iterPurgeList != purgeList.end(); ++iterPurgeList)
+		{
+			TargetList::const_iterator iter = *iterPurgeList;
+			m_targetList.erase(iter);
+		}
+
+		purgeList.clear();
+	}
+
+
+}
+
+// ----------------------------------------------------------------------
+void AggroListProperty::addTarget(NetworkId const & target)
+{
+	if (target == getOwner().getNetworkId())
+	{
+		WARNING(true, ("AggroListProperty::addTarget() owner(%s) Owner trying to add hate to itself.", getOwner().getDebugInformation().c_str()));
+	}
+	else
+	{
+		m_targetList.insert(CachedNetworkId(target));
+	}
+}
+
+// ----------------------------------------------------------------------
+void AggroListProperty::removeTarget(NetworkId const & target)
+{
+	TargetList::const_iterator iterAggroListProperty = m_targetList.find(CachedNetworkId(target));
+
+	if (iterAggroListProperty != m_targetList.end())
+	{
+		m_targetList.erase(iterAggroListProperty);
+	}
+	else
+	{
+		DEBUG_WARNING(true, ("AggroListProperty::removeTarget() owner(%s auth=%s) Unable to find the target(%s) in the hate list.", getOwner().getDebugInformation().c_str(), (getOwner().isAuthoritative() ? "yes" : "no"), target.getValueString().c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+void AggroListProperty::clear()
+{
+	m_targetList.clear();
+}
+
+// ----------------------------------------------------------------------
+bool AggroListProperty::isEmpty() const
+{
+	return getTargetList().empty();
+}
+
+// ----------------------------------------------------------------------
+AggroListProperty::TargetList const & AggroListProperty::getTargetList() const
+{
+	return m_targetList.get();
+}
+
+// ----------------------------------------------------------------------
+void AggroListProperty::setAggroDistance(float aggroDistance)
+{
+	m_aggroDistance = clamp(0.0f, aggroDistance, ConfigServerGame::getAiMaxAggroRadius());
+}
+
+// ----------------------------------------------------------------------
+float AggroListProperty::getAggroDistance() const
+{
+	return m_aggroDistance.get();
+}
+
+// ----------------------------------------------------------------------
+TangibleObject & AggroListProperty::getTangibleOwner()
+{
+	return *TangibleObject::asTangibleObject(&getOwner());
+}
+
+// ----------------------------------------------------------------------
+AggroListProperty * AggroListProperty::getAggroListProperty(Object & object)
+{
+	Property * const property = object.getProperty(getClassPropertyId());
+	AggroListProperty * const aggroProperty = (property != NULL) ? static_cast<AggroListProperty *>(property) : NULL;
+
+	return aggroProperty;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AggroListProperty.h b/engine/server/library/serverGame/src/shared/ai/AggroListProperty.h
new file mode 100644
index 00000000..f74da4d5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AggroListProperty.h
@@ -0,0 +1,67 @@
+// ======================================================================
+//
+// AggroListProperty.h
+// Copyright 2005 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AggroListProperty_H
+#define	INCLUDED_AggroListProperty_H
+
+#include "Archive/AutoDeltaSet.h"
+#include "sharedObject/CachedNetworkId.h"
+#include "sharedObject/Property.h"
+
+class TangibleObject;
+
+// ======================================================================
+//
+// AggroListProperty
+//
+// ======================================================================
+
+class AggroListProperty : public Property
+{
+public:
+
+	typedef stdset<CachedNetworkId>::fwd TargetList;
+
+	static int getAggroListPropertyResetTime();
+	static AggroListProperty * getAggroListProperty(Object & object);
+	static PropertyId getClassPropertyId();
+
+public:
+
+	AggroListProperty(TangibleObject & owner);
+	~AggroListProperty();
+
+	void addServerNpAutoDeltaVariables(Archive::AutoDeltaByteStream & stream);
+	void alter();
+
+	void setAggroDistance(float aggroDistance);
+	float getAggroDistance() const;
+
+	void addTarget(NetworkId const & target);
+	void removeTarget(NetworkId const & target);
+	void clear();
+
+	bool isEmpty() const;
+	TargetList const & getTargetList() const;
+
+private:
+
+	TangibleObject & getTangibleOwner();
+
+	AggroListProperty(AggroListProperty const & AggroListProperty);
+	bool operator ==(AggroListProperty const & rhs) const;
+	bool operator !=(AggroListProperty const & rhs) const;
+	AggroListProperty & operator =(AggroListProperty const & rhs);
+
+	Archive::AutoDeltaSet<CachedNetworkId> m_targetList;
+	Archive::AutoDeltaVariable<float> m_aggroDistance;
+};
+
+// ======================================================================
+
+#endif // INCLUDED_AggroListProperty_H
diff --git a/engine/server/library/serverGame/src/shared/ai/AiCombatPulseQueue.cpp b/engine/server/library/serverGame/src/shared/ai/AiCombatPulseQueue.cpp
new file mode 100644
index 00000000..41cf4c7e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiCombatPulseQueue.cpp
@@ -0,0 +1,130 @@
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiCombatPulseQueue.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/TangibleObject.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFoundation/Clock.h"
+#include "sharedFoundation/Watcher.h"
+#include "sharedLog/Log.h"
+
+#include <map>
+
+namespace AiCombatPulseQueueNamespace
+{
+	int s_numberPerFrame;
+	unsigned int s_maxWaitTimeMs;
+
+	typedef std::pair<Watcher<TangibleObject>, unsigned long>  ScheduledAiMapEntry;
+	typedef std::map<Watcher<TangibleObject>, unsigned long>   ScheduledAiMap;
+	typedef std::pair<unsigned long, ScheduledAiMap::iterator>     TimeOrderedAiMultiMapEntry;
+	typedef std::multimap<unsigned long, ScheduledAiMap::iterator> TimeOrderedAiMultiMap;
+
+	ScheduledAiMap s_scheduledAi;
+	TimeOrderedAiMultiMap s_timeOrderedAi;
+}
+
+using namespace AiCombatPulseQueueNamespace;
+
+//------------------------------------------------------------------------------------------
+
+void AiCombatPulseQueue::install()
+{
+	s_numberPerFrame = ConfigServerGame::getAiPulseQueuePerFrame();
+	s_maxWaitTimeMs = ConfigServerGame::getAiPulseQueueMaxWaitTimeMs();
+}
+
+//------------------------------------------------------------------------------------------
+
+void AiCombatPulseQueue::remove()
+{
+}
+
+//------------------------------------------------------------------------------------------
+
+void AiCombatPulseQueue::schedule(TangibleObject * const object, int waitTimeMs, unsigned long currentFrameTimeMs)
+{
+	if (object == NULL)
+		return;
+
+	unsigned long desiredTime = Clock::getFrameStartTimeMs() + currentFrameTimeMs + waitTimeMs;
+
+	// entry is inserted as <object pointer, time we want an onCombatLoop callback>
+	std::pair<ScheduledAiMap::iterator, bool> insertReturn = s_scheduledAi.insert(ScheduledAiMapEntry(Watcher<TangibleObject>(object), desiredTime));
+
+	// if the object already has a call back schedule and our desired time is after the current time, replace the current time
+	if (!insertReturn.second && desiredTime > (insertReturn.first)->second)
+		(insertReturn.first)->second = desiredTime;
+}
+
+//------------------------------------------------------------------------------------------
+
+void AiCombatPulseQueue::setAiPerFrame(int amount)
+{
+	// this ai per frame only comes into effect after all ai that have waited > maxWaitTime have been processed
+	// so it is possible that there may be more Ai per frame calculated
+	s_numberPerFrame = amount;
+}
+
+//------------------------------------------------------------------------------------------
+
+void AiCombatPulseQueue::setAiMaxWaitTimeMs(unsigned int amount)
+{
+	// you are guaranteed that any Ai that have been waiting over this amount are processed at the end of the server frame
+	s_maxWaitTimeMs = amount;
+}
+
+//------------------------------------------------------------------------------------------
+
+void AiCombatPulseQueue::alter(real time)
+{
+	int count = 0;
+	static const std::vector<int8> emptyVector;
+	unsigned long timeMs = Clock::getFrameStartTimeMs() + static_cast<unsigned long>(time * 1000.0f);
+
+	s_timeOrderedAi.clear();
+
+	// fill in the time ordered ai multimap to traverse across
+	for (ScheduledAiMap::iterator i = s_scheduledAi.begin(); i != s_scheduledAi.end(); ++i)
+		s_timeOrderedAi.insert(TimeOrderedAiMultiMapEntry(i->second, i));
+
+	for (TimeOrderedAiMultiMap::iterator j = s_timeOrderedAi.begin(); j != s_timeOrderedAi.end(); ++j)
+	{
+		// if the entry has a time request later than the current time,
+		// or we have done our max number per frame and the entry is less than s_maxWaitTimeMs old, then stop
+		if (j->first > timeMs || (count > s_numberPerFrame && (timeMs - j->first) > s_maxWaitTimeMs))
+			break;
+
+		TangibleObject * const object = (j->second)->first;
+
+		if (object != NULL && object->isInCombat())
+		{
+			NetworkId const & id = object->getNetworkId();
+
+			if (id != NetworkId::cms_invalid)
+			{
+				++count;
+
+				GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(object);
+
+				if (gameScriptObject != NULL)
+				{
+					ScriptParams scriptParams;
+					IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_AI_COMBAT_FRAME, scriptParams));
+				}
+				else
+				{
+					WARNING(true, ("AiCombatPulseQueue::alter() Unable to get the ScriptObject for object(%s)", object->getDebugInformation().c_str()));
+				}
+			}
+		}
+
+		s_scheduledAi.erase(j->second);
+	}
+
+	LOGC(ConfigServerGame::isAiLoggingEnabled() && count > s_numberPerFrame, "debug_ai", ("AiCombatPulseQueue::alter() processed %i ai combat loops, max number set at %i", count, s_numberPerFrame));
+}
+
+//------------------------------------------------------------------------------------------
+
diff --git a/engine/server/library/serverGame/src/shared/ai/AiCombatPulseQueue.h b/engine/server/library/serverGame/src/shared/ai/AiCombatPulseQueue.h
new file mode 100644
index 00000000..0746c9c3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiCombatPulseQueue.h
@@ -0,0 +1,18 @@
+#include "sharedFoundation/NetworkId.h"
+
+class NetworkId;
+class TangibleObject;
+
+class AiCombatPulseQueue
+{
+public:
+	static void install();
+	static void remove();
+
+	static void schedule(TangibleObject* const object, int waitTimeMs = 0, unsigned long currentFrameTimeMs = 0);
+	static void setAiPerFrame(int amount);
+	static void setAiMaxWaitTimeMs(unsigned int amount);
+	static void alter(real time);
+};
+
+
diff --git a/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile.cpp b/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile.cpp
new file mode 100644
index 00000000..cf2cb505
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile.cpp
@@ -0,0 +1,353 @@
+// ======================================================================
+//
+// AiCreatureCombatProfile.cpp
+//
+// copyright 2005, sony online entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiCreatureCombatProfile.h"
+
+#include "serverGame/AiCreatureCombatProfile_Action.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedFile/Iff.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/CrcString.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/PersistentCrcString.h"
+#include "sharedLog/Log.h"
+#include "sharedRandom/Random.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+#include "UnicodeUtils.h"
+
+#include <map>
+#include <set>
+
+// ======================================================================
+//
+// AiCreatureCombatProfileNamespace
+//
+// ======================================================================
+
+namespace AiCreatureCombatProfileNamespace
+{
+	bool s_installed = false;
+	char const * const s_combatProfileTable = "datatables/ai/ai_combat_profiles.iff";
+
+	typedef std::set<PersistentCrcString> CachedActionNameList;
+	typedef std::map<PersistentCrcString, AiCreatureCombatProfile> CombatProfileMap;
+
+	CachedActionNameList s_cachedActionNameList;
+	CombatProfileMap s_combatProfileMap;
+	int const s_actionCount = 14;
+
+	void remove();
+	void clearData();
+	void loadCombatProfileTable(DataTable const & dataTable);
+	std::pair<CachedActionNameList::iterator, CachedActionNameList::iterator> cacheActionName(std::string const & action);
+	void loadCombatProfile();
+	void grantActions(CreatureObject & owner, AiCreatureCombatProfile::ActionList const & actionList);
+}
+
+using namespace AiCreatureCombatProfileNamespace;
+
+// ----------------------------------------------------------------------
+void AiCreatureCombatProfileNamespace::remove()
+{
+	clearData();
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureCombatProfileNamespace::clearData()
+{
+	s_cachedActionNameList.clear();
+
+	CombatProfileMap::iterator iterCombatProfileMap = s_combatProfileMap.begin();
+
+	for (; iterCombatProfileMap != s_combatProfileMap.end(); ++iterCombatProfileMap)
+	{
+		{
+			AiCreatureCombatProfile::ActionList::iterator iterActionList = iterCombatProfileMap->second.m_singleUseActionList.begin();
+
+			for (; iterActionList != iterCombatProfileMap->second.m_singleUseActionList.end(); ++iterActionList)
+			{
+				delete *iterActionList;
+			}
+		}
+
+		{
+			AiCreatureCombatProfile::ActionList::iterator iterActionList = iterCombatProfileMap->second.m_delayRepeatActionList.begin();
+
+			for (; iterActionList != iterCombatProfileMap->second.m_delayRepeatActionList.end(); ++iterActionList)
+			{
+				delete *iterActionList;
+			}
+		}
+
+		{
+			AiCreatureCombatProfile::ActionList::iterator iterActionList = iterCombatProfileMap->second.m_instantRepeatActionList.begin();
+
+			for (; iterActionList != iterCombatProfileMap->second.m_instantRepeatActionList.end(); ++iterActionList)
+			{
+				delete *iterActionList;
+			}
+		}
+	}
+
+	s_combatProfileMap.clear();
+}
+
+// ----------------------------------------------------------------------
+std::pair<CachedActionNameList::iterator, CachedActionNameList::iterator> AiCreatureCombatProfileNamespace::cacheActionName(std::string const & action)
+{
+	std::pair<CachedActionNameList::iterator, CachedActionNameList::iterator> result;
+	std::string const trimmedAction(Unicode::getTrim(action));
+
+	if (!trimmedAction.empty())
+	{
+		std::string const trimmedBaseAction(trimmedAction.substr(0, trimmedAction.find_last_of('_')));
+
+		result.first = s_cachedActionNameList.insert(PersistentCrcString(trimmedAction.c_str(), false)).first;
+		result.second = s_cachedActionNameList.insert(PersistentCrcString(trimmedBaseAction.c_str(), false)).first;
+	}
+	else
+	{
+		result.first = s_cachedActionNameList.end();
+		result.second = s_cachedActionNameList.end();
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureCombatProfileNamespace::loadCombatProfileTable(DataTable const & dataTable)
+{
+	// All AI must be dead when this gets RELOADED
+	
+	if (s_installed)
+	{
+		int const serverObjectCount = ServerWorld::getNumObjects();
+
+		for (int i = 0; i < serverObjectCount; ++i)
+		{
+			ServerObject * const serverObject = ServerWorld::getObject(i);
+			CreatureObject * const creatureObject = (serverObject != NULL) ? serverObject->asCreatureObject() : NULL;
+
+			if (   (creatureObject != NULL)
+			    && !creatureObject->isPlayerControlled())
+			{
+				creatureObject->makeDead(NetworkId::cms_invalid, NetworkId::cms_invalid);
+			}
+		}
+	}
+
+	clearData();
+
+	int const rowCount = dataTable.getNumRows();
+
+	for (int row = 0; row < rowCount; ++row)
+	{
+		PersistentCrcString const profileName(dataTable.getStringValue("profile_id", row), false);
+		CombatProfileMap::iterator iterCombatProfileMap = s_combatProfileMap.find(profileName);
+
+		if (iterCombatProfileMap == s_combatProfileMap.end())
+		{
+			std::pair<CombatProfileMap::iterator, bool> result = s_combatProfileMap.insert(std::make_pair(profileName, AiCreatureCombatProfile()));
+
+			iterCombatProfileMap = result.first;
+		}
+
+		// Store the combat profile
+
+		FormattedString<32> fs;
+		AiCreatureCombatProfile & combatProfile = iterCombatProfileMap->second;
+
+		combatProfile.m_profileId = &(iterCombatProfileMap->first);
+
+		for (int actionIndex = 1; actionIndex <= s_actionCount; ++actionIndex)
+		{
+			std::string const actionName(dataTable.getStringValue(fs.sprintf("action%i", actionIndex), row));
+			std::pair<CachedActionNameList::iterator, CachedActionNameList::iterator> const result = cacheActionName(actionName);
+
+			if (result.first != s_cachedActionNameList.end())
+			{
+				PersistentCrcString const & name = *result.first;
+				PersistentCrcString const & baseName = *result.second;
+				time_t const useTime = static_cast<time_t>(clamp(0, dataTable.getIntValue(fs.sprintf("action%i_use_time", actionIndex), row), 4096));
+				float const useChance = static_cast<float>(clamp(0, dataTable.getIntValue(fs.sprintf("action%i_use_chance", actionIndex), row), 100)) / 100.0f;
+				WARNING((useChance <= 0.0f), ("AiCreatureCombatProfile::loadCombatProfileTable() profile(%s) contains action%i with 0%% use chance which is invalid", combatProfile.m_profileId->getString(), actionIndex));
+
+				AiCreatureCombatProfile::Action::UseCount const useCount = static_cast<AiCreatureCombatProfile::Action::UseCount>(dataTable.getIntValue(fs.sprintf("action%i_use_count", actionIndex), row));
+
+				// Sort the action into the correct type
+
+				if (useCount == AiCreatureCombatProfile::Action::UC_once)
+				{
+					combatProfile.m_singleUseActionList.push_back(new AiCreatureCombatProfile::Action(name, baseName, useTime, useChance, useCount));
+				}
+				else if (useTime > 0)
+				{
+					combatProfile.m_delayRepeatActionList.push_back(new AiCreatureCombatProfile::Action(name, baseName, useTime, useChance, useCount));
+				}
+				else
+				{
+					combatProfile.m_instantRepeatActionList.push_back(new AiCreatureCombatProfile::Action(name, baseName, useTime, useChance, useCount));
+				}
+			}
+		}
+
+		combatProfile.m_knockDownRecoveryTime = static_cast<time_t>(clamp(0, dataTable.getIntValue("knockdown_recovery_time", row), 32));
+	}
+
+	LOG("debug_ai", ("AiCreatureCombatProfile::loadCombatProfileTable() Loading...%s - profiles(%u)", dataTable.getName().c_str(), s_combatProfileMap.size()));
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureCombatProfileNamespace::grantActions(CreatureObject & owner, AiCreatureCombatProfile::ActionList const & actionList)
+{
+	AiCreatureCombatProfile::ActionList::const_iterator iterActionList = actionList.begin();
+
+	for (; iterActionList != actionList.end(); ++iterActionList)
+	{
+		AiCreatureCombatProfile::Action const & action = **iterActionList;
+
+		owner.grantCommand(action.m_name.getString(), false);
+	}
+}
+
+// ======================================================================
+//
+// AiCreatureCombatProfile
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+AiCreatureCombatProfile::AiCreatureCombatProfile()
+ : m_profileId(NULL)
+ , m_singleUseActionList()
+ , m_delayRepeatActionList()
+ , m_instantRepeatActionList()
+ , m_knockDownRecoveryTime(4)
+{
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureCombatProfile::install()
+{
+	DEBUG_FATAL(s_installed, ("Already installed"));
+	ExitChain::add(AiCreatureCombatProfileNamespace::remove, "AiCreatureCombatProfileNamespace::remove");
+
+	// Load data from ai_combat_profiles.tab
+	{
+		bool const openIfNotFound = true;
+		DataTable * const dataTable = DataTableManager::getTable(s_combatProfileTable, openIfNotFound);
+
+		if (dataTable != NULL)
+		{
+#ifdef _DEBUG
+			DataTableManager::addReloadCallback(s_combatProfileTable, &loadCombatProfileTable);
+#endif // _DEBUG
+			loadCombatProfileTable(*dataTable);
+			DataTableManager::close(s_combatProfileTable);
+		}
+		else
+		{
+			FATAL(true, ("AiCreatureCombatProfile::install() Could not open file %s", s_combatProfileTable));
+		}
+	}
+
+	s_installed = true;
+}
+
+// ----------------------------------------------------------------------
+AiCreatureCombatProfile const * AiCreatureCombatProfile::getCombatProfile(CrcString const & profileName)
+{
+	AiCreatureCombatProfile const * result = NULL;
+	CombatProfileMap::const_iterator iterCombatProfileMap = s_combatProfileMap.find(PersistentCrcString(profileName));
+
+	if (iterCombatProfileMap != s_combatProfileMap.end())
+	{
+		result = &iterCombatProfileMap->second;
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureCombatProfile::grantActions(CreatureObject & owner) const
+{
+	AiCreatureCombatProfileNamespace::grantActions(owner, m_singleUseActionList);
+	AiCreatureCombatProfileNamespace::grantActions(owner, m_delayRepeatActionList);
+	AiCreatureCombatProfileNamespace::grantActions(owner, m_instantRepeatActionList);
+}
+
+// ----------------------------------------------------------------------
+std::string const AiCreatureCombatProfile::toString() const
+{
+	std::string result;
+	FormattedString<4096> fs;
+
+	result += fs.sprintf("  WeaponProfileId: %s\n", m_profileId->getString());
+	result += fs.sprintf("* Single-Use Actions *\n");
+
+	if (m_singleUseActionList.empty())
+	{
+		result += fs.sprintf(" none\n");
+	}
+	else
+	{
+		ActionList::const_iterator iterActionList = m_singleUseActionList.begin();
+
+		for (; iterActionList != m_singleUseActionList.end(); ++iterActionList)
+		{
+			AiCreatureCombatProfile::Action const * const action = *iterActionList;
+
+			result += fs.sprintf(" - %30s %3.0f%% chance after %2u seconds\n", action->m_name.getString(), action->m_useChance * 100.0f, static_cast<unsigned int>(action->m_useTime));
+		}
+	}
+
+	result += fs.sprintf("* Delay-Repeat Actions *\n");
+
+	if (m_delayRepeatActionList.empty())
+	{
+		result += fs.sprintf(" none\n");
+	}
+	else
+	{
+		ActionList::const_iterator iterActionList = m_delayRepeatActionList.begin();
+
+		for (; iterActionList != m_delayRepeatActionList.end(); ++iterActionList)
+		{
+			AiCreatureCombatProfile::Action const * const action = *iterActionList;
+
+			result += fs.sprintf(" - %30s %3.0f%% chance every %2u seconds\n", action->m_name.getString(), action->m_useChance * 100.0f, static_cast<unsigned int>(action->m_useTime));
+		}
+	}
+
+	result += fs.sprintf("* Instant-Repeat Actions *\n");
+
+	if (m_instantRepeatActionList.empty())
+	{
+		result += fs.sprintf(" none\n");
+	}
+	else
+	{
+		ActionList::const_iterator iterActionList = m_instantRepeatActionList.begin();
+
+		for (; iterActionList != m_instantRepeatActionList.end(); ++iterActionList)
+		{
+			AiCreatureCombatProfile::Action const * const action = *iterActionList;
+
+			result += fs.sprintf(" - %30s %3.0f%% chance\n", action->m_name.getString(), action->m_useChance * 100.0f);
+		}
+	}
+
+	return result;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile.h b/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile.h
new file mode 100644
index 00000000..9d19106c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile.h
@@ -0,0 +1,54 @@
+// ======================================================================
+//
+// AiCreatureCombatProfile.h
+//
+// copyright 2005, sony online entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AiCreatureCombatProfile_H
+#define INCLUDED_AiCreatureCombatProfile_H
+
+class CrcString;
+class CreatureObject;
+class PersistentCrcString;
+
+// ======================================================================
+class AiCreatureCombatProfile
+{
+public:
+
+	struct Action;
+
+	typedef stdvector<Action *>::fwd ActionList;
+
+	AiCreatureCombatProfile();
+
+	static void install();
+
+	std::string const toString() const;
+
+	/**
+	 * Returns the combat profile corresponding to the specified profile name.
+	 */
+	static AiCreatureCombatProfile const * getCombatProfile(CrcString const & profileName);
+
+	/**
+	 * Grants all the actions from the action lists to the specified owner.
+	 * This is necessary to allow the AI to do the '_' versions of the
+	 * actions.
+	 */
+	void grantActions(CreatureObject & owner) const;
+
+public:
+
+	PersistentCrcString const * m_profileId;
+	ActionList m_singleUseActionList;
+	ActionList m_delayRepeatActionList;
+	ActionList m_instantRepeatActionList;
+	time_t m_knockDownRecoveryTime;
+};
+
+// ======================================================================
+
+#endif // INCLUDED_AiCreatureCombatProfile_H
diff --git a/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile_Action.cpp b/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile_Action.cpp
new file mode 100644
index 00000000..b4781848
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile_Action.cpp
@@ -0,0 +1,28 @@
+// ======================================================================
+//
+// AiCreatureCombatProfile_Action.cpp
+//
+// copyright 2005, sony online entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiCreatureCombatProfile_Action.h"
+
+// ======================================================================
+//
+// AiCreatureCombatProfile_Action
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+AiCreatureCombatProfile::Action::Action(PersistentCrcString const & name, PersistentCrcString const & baseName, time_t useTime, float useChance, UseCount useCount)
+ : m_name(name)
+ , m_baseName(baseName)
+ , m_useTime(useTime)
+ , m_useChance(useChance)
+ , m_useCount(useCount)
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile_Action.h b/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile_Action.h
new file mode 100644
index 00000000..c2559770
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile_Action.h
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// AiCreatureCombatProfile_Action.h
+//
+// copyright 2005, sony online entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AiCreatureCombatProfile_Action_H
+#define INCLUDED_AiCreatureCombatProfile_Action_H
+
+class PersistentCrcString;
+
+#include "serverGame/AiCreatureCombatProfile.h"
+
+// ======================================================================
+struct AiCreatureCombatProfile::Action
+{
+	enum UseCount
+	{
+		UC_once,
+		UC_infinite
+	};
+
+	Action(PersistentCrcString const & name, PersistentCrcString const & baseName, time_t useTime, float useChance, UseCount useCount);
+
+	PersistentCrcString const & m_name;
+	//@TODO The following variable, m_baseName, is no longer used and should probably be removed -- ARH
+	PersistentCrcString const & m_baseName; // This is the name of the action without any underscores in it '_'
+	time_t const m_useTime;
+	float const m_useChance;
+	UseCount const m_useCount;
+
+private:
+
+	Action();
+	Action(Action const &);
+	Action & operator =(Action const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_AiCreatureCombatProfile_Action_H
diff --git a/engine/server/library/serverGame/src/shared/ai/AiCreatureData.cpp b/engine/server/library/serverGame/src/shared/ai/AiCreatureData.cpp
new file mode 100644
index 00000000..034f9980
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiCreatureData.cpp
@@ -0,0 +1,441 @@
+// ======================================================================
+//
+// AiCreatureData.cpp
+//
+// copyright 2005, sony online entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiCreatureData.h"
+
+#include "serverGame/AiCreatureCombatProfile.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedFile/Iff.h"
+#include "sharedFile/TreeFile.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/CrcString.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/PersistentCrcString.h"
+#include "sharedFoundation/PointerDeleter.h"
+#include "sharedFoundation/TemporaryCrcString.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+#include "UnicodeUtils.h"
+
+#include <map>
+
+// ======================================================================
+//
+// AiCreatureDataNamespace
+//
+// ======================================================================
+
+namespace AiCreatureDataNamespace
+{
+	bool s_installed = false;
+	char const * const s_creaureDataTable = "datatables/mob/creatures.iff";
+	char const * const s_weaponDataTable = "datatables/ai/ai_weapons.iff";
+
+	typedef std::map<PersistentCrcString, AiCreatureData *> CreatureDataMap;
+	typedef std::vector<PersistentCrcString> WeaponList;
+	typedef std::map<PersistentCrcString, WeaponList> WeaponDataMap;
+
+	CreatureDataMap s_creatureDataMap;
+	WeaponDataMap s_weaponDataMap;
+	AiCreatureData const * s_defaultCreatureData = NULL;
+	int s_creatureErrorCount = 0;
+	int s_weaponErrorCount = 0;
+
+	void remove();
+	void loadCreatureData(DataTable const & dataTable);
+	void loadWeaponData(DataTable const & dataTable);
+	void loadWeaponColumn(WeaponList & weaponList, std::string const & weaponTemplate);
+	void clearCreatureData();
+	void killAi();
+
+	void verifyMovementSpeed(CrcString const & creatureName, float & movementSpeed);
+	void verifyAggressive(CrcString const & creatureName, float & aggressive);
+	void verifyPrimaryWeapon(CrcString const & creatureName, CrcString & primaryWeapon);
+	void verifySecondaryWeapon(CrcString const & creatureName, CrcString & secondaryWeapon);
+	void verifyPrimarySpecials(CrcString const & creatureName, CrcString & primarySpecials);
+	void verifySecondarySpecials(CrcString const & creatureName, CrcString & secondarySpecials);
+}
+
+using namespace AiCreatureDataNamespace;
+
+// ----------------------------------------------------------------------
+void AiCreatureDataNamespace::remove()
+{
+	clearCreatureData();
+
+	s_weaponDataMap.clear();
+
+	delete s_defaultCreatureData;
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureDataNamespace::clearCreatureData()
+{
+	CreatureDataMap::iterator iterCreatureDataMap = s_creatureDataMap.begin();
+
+	for (; iterCreatureDataMap != s_creatureDataMap.end(); ++iterCreatureDataMap)
+	{
+		delete iterCreatureDataMap->second;
+	}
+
+	s_creatureDataMap.clear();
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureDataNamespace::verifyMovementSpeed(CrcString const & creatureName, float & movementSpeed)
+{
+	float const minMovementSpeed = 0.0f;
+	float const maxMovementSpeed = 3.0f;
+
+	if (   (movementSpeed < minMovementSpeed)
+	    || (movementSpeed > maxMovementSpeed))
+	{
+		WARNING(true, ("AiCreatureData::verifyMovementSpeed() Creature(%s) has invalid movementSpeed(%.f) validRange[%.2f...%.2f]", creatureName.getString(), movementSpeed, minMovementSpeed, maxMovementSpeed));
+		++s_creatureErrorCount;
+		movementSpeed = clamp(minMovementSpeed, movementSpeed, maxMovementSpeed);
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureDataNamespace::verifyAggressive(CrcString const & creatureName, float & aggressive)
+{
+	float const minAggressive = 0.0f;
+	float const maxAggressive = ConfigServerGame::getAiMaxAggroRadius();
+
+	if (   (aggressive < minAggressive)
+	    || (aggressive > maxAggressive))
+	{
+		WARNING(true, ("AiCreatureData::verifyAggressive() Creature(%s) has invalid aggressive(%.f) validRange[%.2f...%.2f]", creatureName.getString(), aggressive, minAggressive, maxAggressive));
+		++s_creatureErrorCount;
+		aggressive = clamp(minAggressive, aggressive, maxAggressive);
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureDataNamespace::verifyPrimaryWeapon(CrcString const & creatureName, CrcString & primaryWeapon)
+{
+	if (   (primaryWeapon != TemporaryCrcString("unarmed", false))
+	    && (primaryWeapon != TemporaryCrcString("none", false)))
+	{
+		if (   (s_weaponDataMap.find(PersistentCrcString(primaryWeapon)) == s_weaponDataMap.end())
+		    && (ObjectTemplateList::lookUp(primaryWeapon.getString()).getCrc() == 0))
+		{
+			++s_creatureErrorCount;
+			WARNING(true, ("AiCreatureData::verifyPrimaryWeapon() Creature(%s) has an invalid primary_weapon(%s)", creatureName.getString(), primaryWeapon.getString()));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureDataNamespace::verifySecondaryWeapon(CrcString const & creatureName, CrcString & secondaryWeapon)
+{
+	if (   (secondaryWeapon != TemporaryCrcString("unarmed", false))
+	    && (secondaryWeapon != TemporaryCrcString("none", false)))
+	{
+		if (   (s_weaponDataMap.find(PersistentCrcString(secondaryWeapon)) == s_weaponDataMap.end())
+		    && (ObjectTemplateList::lookUp(secondaryWeapon.getString()).getCrc() == 0))
+		{
+			++s_creatureErrorCount;
+			WARNING(true, ("AiCreatureData::verifySecondaryWeapon() Creature(%s) has an invalid secondary_weapon(%s)", creatureName.getString(), secondaryWeapon.getString()));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureDataNamespace::verifyPrimarySpecials(CrcString const & creatureName, CrcString & primarySpecials)
+{
+	if (   !primarySpecials.isEmpty()
+	    && (AiCreatureCombatProfile::getCombatProfile(primarySpecials) == NULL))
+	{
+		++s_creatureErrorCount;
+		WARNING(true, ("AiCreatureData::verifyPrimarySpecials() Creature(%s) has invalid primary_weapon_specials(%s)", creatureName.getString(), primarySpecials.getString()));
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureDataNamespace::verifySecondarySpecials(CrcString const & creatureName, CrcString & secondarySpecials)
+{
+	if (   !secondarySpecials.isEmpty()
+	    && (AiCreatureCombatProfile::getCombatProfile(secondarySpecials) == NULL))
+	{
+		++s_creatureErrorCount;
+		WARNING(true, ("AiCreatureData::verifySecondarySpecials() Creature(%s) has invalid secondary_weapon_specials(%s)", creatureName.getString(), secondarySpecials.getString()));
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureDataNamespace::loadCreatureData(DataTable const & dataTable)
+{
+	// if we are loading the data for the first time, check for duplicates
+	bool const checkForDuplicate = s_creatureDataMap.empty();
+
+	int aggressiveCount = 0;
+	int assistCount = 0;
+
+	int const rowCount = dataTable.getNumRows();
+
+	for (int row = 0; row < rowCount; ++row)
+	{
+		PersistentCrcString const name(dataTable.getStringValue("creatureName", row), false);
+
+		CreatureDataMap::iterator iterCreatureData = s_creatureDataMap.find(name);
+
+		if (iterCreatureData == s_creatureDataMap.end())
+		{
+			AiCreatureData * const creatureData = new AiCreatureData;
+
+			std::pair<CreatureDataMap::iterator, bool> result = s_creatureDataMap.insert(std::make_pair(name, creatureData));
+
+			iterCreatureData = result.first;
+		}
+		else if (checkForDuplicate)
+		{
+			LOG("debug_ai", ("AiCreatureData::loadCreatureData() duplicate data at row=%d, crc=%lu, name=\"%s\"", row, name.getCrc(), name.getString()));
+		}
+
+		if (iterCreatureData != s_creatureDataMap.end())
+		{
+			AiCreatureData & creatureData = *NON_NULL(iterCreatureData->second);
+
+			creatureData.m_name = &(iterCreatureData->first);
+			creatureData.m_movementSpeedPercent = dataTable.getFloatValue("movement_speed", row);
+			creatureData.m_primaryWeapon.set(Unicode::getTrim(dataTable.getStringValue("primary_weapon", row)).c_str(), false);
+			creatureData.m_secondaryWeapon.set(Unicode::getTrim(dataTable.getStringValue("secondary_weapon", row)).c_str(), false);
+			creatureData.m_aggressive = dataTable.getFloatValue("aggressive", row);
+			creatureData.m_stalker = (dataTable.getIntValue("stalker", row) > 0);
+			creatureData.m_assist = dataTable.getFloatValue("assist", row);
+			creatureData.m_deathBlow = static_cast<AiCreatureData::DeathBlow>(dataTable.getIntValue("death_blow", row));
+			creatureData.m_primarySpecials.set(Unicode::getTrim(dataTable.getStringValue("primary_weapon_specials", row)).c_str(), false);
+			creatureData.m_secondarySpecials.set(Unicode::getTrim(dataTable.getStringValue("secondary_weapon_specials", row)).c_str(), false);
+			creatureData.m_difficulty = static_cast<CreatureObject::Difficulty>(dataTable.getIntValue("difficultyClass", row));
+
+			verifyMovementSpeed(*creatureData.m_name, creatureData.m_movementSpeedPercent);
+			verifyAggressive(*creatureData.m_name, creatureData.m_aggressive);
+			verifyPrimaryWeapon(*creatureData.m_name, creatureData.m_primaryWeapon);
+			verifyPrimarySpecials(*creatureData.m_name, creatureData.m_primarySpecials);
+			verifySecondaryWeapon(*creatureData.m_name, creatureData.m_secondaryWeapon);
+			verifySecondarySpecials(*creatureData.m_name, creatureData.m_secondarySpecials);
+
+			// Keep track of some statistics
+
+			if (creatureData.m_aggressive > 0.0f)
+			{
+				++aggressiveCount;
+			}
+
+			if (creatureData.m_assist > 0.0f)
+			{
+				++assistCount;
+			}
+		}
+		else
+		{
+			// @TODO: Handle this error case
+		}
+	}
+
+	float const aggressivePercent = !s_creatureDataMap.empty() ? static_cast<float>(aggressiveCount) / static_cast<float>(s_creatureDataMap.size()) * 100.0f : 0.0f;
+	float const assistPercent = !s_creatureDataMap.empty() ? static_cast<float>(assistCount) / static_cast<float>(s_creatureDataMap.size()) * 100.0f : 0.0f;
+
+	LOG("debug_ai", ("AiCreatureData::loadCreatureData() Loading...%s - creatures(%u) errors(%i) aggressive(%.1f%%) assist(%.1f%%)", dataTable.getName().c_str(), s_creatureDataMap.size(), s_creatureErrorCount, aggressivePercent, assistPercent));
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureDataNamespace::loadWeaponData(DataTable const & dataTable)
+{
+	// if we are loading the data for the first time, check for duplicates
+	bool const checkForDuplicate = s_weaponDataMap.empty();
+
+	int const rowCount = dataTable.getNumRows();
+
+	for (int row = 0; row < rowCount; ++row)
+	{
+		PersistentCrcString const name(dataTable.getStringValue("weapon_id", row), false);
+
+		WeaponDataMap::iterator iterWeaponData = s_weaponDataMap.find(name);
+
+		if (iterWeaponData == s_weaponDataMap.end())
+		{
+			std::pair<WeaponDataMap::iterator, bool> result = s_weaponDataMap.insert(std::make_pair(name, WeaponList()));
+
+			iterWeaponData = result.first;
+		}
+		else if (checkForDuplicate)
+		{
+			LOG("debug_ai", ("AiCreatureData::loadWeaponData() duplicate data at row=%d, crc=%lu, name=\"%s\"", row, name.getCrc(), name.getString()));
+		}
+
+		if (iterWeaponData != s_weaponDataMap.end())
+		{
+			WeaponList & weaponList = iterWeaponData->second;
+
+			weaponList.clear();
+
+			// @TODO: Put all the possible weapon template names in a master list or change to ConstCharCrcString
+
+			loadWeaponColumn(weaponList, dataTable.getStringValue("weapon1", row));
+			loadWeaponColumn(weaponList, dataTable.getStringValue("weapon2", row));
+			loadWeaponColumn(weaponList, dataTable.getStringValue("weapon3", row));
+			loadWeaponColumn(weaponList, dataTable.getStringValue("weapon4", row));
+		}
+		else
+		{
+			// @TODO: Handle this error case
+		}
+	}
+
+	LOG("debug_ai", ("AiCreatureData::loadWeaponData() Loading...%s - weaponProfiles(%u) errors(%i)", dataTable.getName().c_str(), s_weaponDataMap.size(), s_weaponErrorCount));
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureDataNamespace::loadWeaponColumn(WeaponList & weaponList, std::string const & weaponTemplate)
+{
+	if (!weaponTemplate.empty())
+	{
+		if (   (weaponTemplate != "unarmed")
+		    && (ObjectTemplateList::lookUp(weaponTemplate.c_str()).getCrc() == 0))
+		{
+			++s_weaponErrorCount;
+			WARNING(true , ("AiCreatureDataNamespace::loadWeaponColumn() Unable to find weapon(%s)", weaponTemplate.c_str()));
+		}
+
+		weaponList.push_back(PersistentCrcString(weaponTemplate.c_str(), true));
+	}
+}
+
+// ======================================================================
+//
+// AiCreatureData
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+AiCreatureData::AiCreatureData()
+ : m_name(NULL)
+ , m_movementSpeedPercent(1.0f)
+ , m_primaryWeapon()
+ , m_secondaryWeapon()
+ , m_aggressive(0.0f)
+ , m_stalker(false)
+ , m_assist(0.0f)
+ , m_deathBlow(DB_no)
+ , m_primarySpecials()
+ , m_secondarySpecials()
+ , m_difficulty(CreatureObject::D_normal)
+{
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureData::install()
+{
+	DEBUG_FATAL(s_installed, ("Already installed"));
+	ExitChain::add(AiCreatureDataNamespace::remove, "AiCreatureDataNamespace::remove");
+
+	s_defaultCreatureData = new AiCreatureData;
+
+	// Load data from ai_weapons.tab
+	{
+		s_weaponErrorCount = 0;
+		bool const openIfNotFound = true;
+		DataTable * const dataTable = DataTableManager::getTable(s_weaponDataTable, openIfNotFound);
+
+		if (dataTable != NULL)
+		{
+			DataTableManager::addReloadCallback(s_weaponDataTable, &loadWeaponData);
+			loadWeaponData(*dataTable);
+			DataTableManager::close(s_weaponDataTable);
+		}
+		else
+		{
+			FATAL(true, ("AiCreatureData::install() Could not open file %s", s_weaponDataTable));
+		}
+	}
+
+	// Load data from creatures.tab
+	{
+		s_creatureErrorCount = 0;
+		bool const openIfNotFound = true;
+		DataTable * const dataTable = DataTableManager::getTable(s_creaureDataTable, openIfNotFound);
+
+		if (dataTable != NULL)
+		{
+			DataTableManager::addReloadCallback(s_creaureDataTable, &loadCreatureData);
+			loadCreatureData(*dataTable);
+			DataTableManager::close(s_creaureDataTable);
+		}
+		else
+		{
+			FATAL(true, ("AiCreatureData::install() Could not open file %s", s_creaureDataTable));
+		}
+	}
+
+	s_installed = true;
+}
+
+// ----------------------------------------------------------------------
+AiCreatureData const & AiCreatureData::getCreatureData(CrcString const & creatureName)
+{
+	CreatureDataMap::const_iterator iterCreatureDataMap = s_creatureDataMap.find(PersistentCrcString(creatureName));
+
+	if (iterCreatureDataMap != s_creatureDataMap.end())
+	{
+		return *iterCreatureDataMap->second;
+	}
+	else
+	{
+		WARNING(true, ("AiCreatureData::getCreatureData() Unable to find data for creatureName(%s)", creatureName.getString()));
+	}
+
+	return *s_defaultCreatureData;
+}
+
+// ----------------------------------------------------------------------
+AiCreatureData const & AiCreatureData::getDefaultCreatureData()
+{
+	return *s_defaultCreatureData;
+}
+
+// ----------------------------------------------------------------------
+std::string AiCreatureData::getWeaponTemplateName(CrcString const & weaponName)
+{
+	// @TODO: Make this return a PersistentCrcString
+
+	std::string result;
+	
+	if (TreeFile::exists(weaponName.getString()))
+	{
+		result = weaponName.getString();
+	}
+	else
+	{
+		WeaponDataMap::const_iterator iterWeaponDataMap = s_weaponDataMap.find(PersistentCrcString(weaponName));
+
+		if (   (iterWeaponDataMap != s_weaponDataMap.end())
+			&& !iterWeaponDataMap->second.empty())
+		{
+			WeaponList const & weaponList = iterWeaponDataMap->second;
+			unsigned int const index = rand() % weaponList.size();
+			
+			result = weaponList[index].getString();
+		}
+		else
+		{
+			result = "unarmed";
+
+			WARNING(true, ("AiCreatureData::getWeaponTemplateName() Unable to find data for weaponName(%s), defaulting to ""unarmed""", weaponName.getString()));
+		}
+	}
+
+	return result;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiCreatureData.h b/engine/server/library/serverGame/src/shared/ai/AiCreatureData.h
new file mode 100644
index 00000000..691601e1
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiCreatureData.h
@@ -0,0 +1,54 @@
+// ======================================================================
+//
+// AiCreatureData.h
+//
+// copyright 2005, sony online entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AiCreatureData_H
+#define INCLUDED_AiCreatureData_H
+
+#include "sharedFoundation/PersistentCrcString.h"
+#include "serverGame/CreatureObject.h"
+
+class CrcString;
+
+// ======================================================================
+class AiCreatureData
+{
+public:
+
+	AiCreatureData();
+
+	static void install();
+
+	static AiCreatureData const & getCreatureData(CrcString const & creatureName);
+	static AiCreatureData const & getDefaultCreatureData();
+	static std::string getWeaponTemplateName(CrcString const & weaponName);
+
+public:
+
+	enum DeathBlow
+	{
+		  DB_no
+		, DB_yes
+		, DB_instant
+	};
+
+	PersistentCrcString const * m_name;
+	float m_movementSpeedPercent;
+	PersistentCrcString m_primaryWeapon;
+	PersistentCrcString m_secondaryWeapon;
+	float m_aggressive;
+	bool m_stalker;
+	float m_assist;
+	DeathBlow m_deathBlow;
+	PersistentCrcString m_primarySpecials;
+	PersistentCrcString m_secondarySpecials;
+	CreatureObject::Difficulty m_difficulty;
+};
+
+// ======================================================================
+
+#endif // INCLUDED_AiCreatureData_H
diff --git a/engine/server/library/serverGame/src/shared/ai/AiCreatureWeaponActions.cpp b/engine/server/library/serverGame/src/shared/ai/AiCreatureWeaponActions.cpp
new file mode 100644
index 00000000..781bc2f1
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiCreatureWeaponActions.cpp
@@ -0,0 +1,202 @@
+// ======================================================================
+//
+// AiCreatureWeaponActions.cpp
+//
+// copyright 2005, sony online entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiCreatureWeaponActions.h"
+
+#include "serverGame/AiCreatureCombatProfile.h"
+#include "serverGame/AiCreatureCombatProfile_Action.h"
+#include "sharedFoundation/Os.h"
+#include "sharedFoundation/PersistentCrcString.h"
+#include "sharedRandom/Random.h"
+
+// ======================================================================
+//
+// AiCreatureWeaponActionsNamespace
+//
+// ======================================================================
+
+namespace AiCreatureWeaponActionsNamespace
+{
+	time_t const s_useChanceRetryTime = 5;
+
+	typedef AiCreatureWeaponActions::Time Time;
+
+	void resetActionTimers(Archive::AutoDeltaVector<Time> & actions, AiCreatureCombatProfile::ActionList const & combatProfileActionList);
+}
+
+using namespace AiCreatureWeaponActionsNamespace;
+
+// ----------------------------------------------------------------------
+void AiCreatureWeaponActionsNamespace::resetActionTimers(Archive::AutoDeltaVector<Time> & weaponActionList, AiCreatureCombatProfile::ActionList const & combatProfileActionList)
+{
+	time_t const osTime = Os::getRealSystemTime();
+
+	weaponActionList.clear();
+
+	for (unsigned int i = 0; i < combatProfileActionList.size(); ++i)
+	{
+		AiCreatureCombatProfile::Action const * const action = combatProfileActionList[i];
+
+		weaponActionList.push_back(Time(osTime + action->m_useTime));
+	}
+}
+
+// ======================================================================
+//
+// AiCreatureWeaponActions
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+AiCreatureWeaponActions::AiCreatureWeaponActions()
+ : m_singleUseActionList()
+ , m_delayRepeatActionList()
+ , m_instantRepeatActionList()
+ , m_combatProfile(NULL)
+{
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureWeaponActions::addServerNpAutoDeltaVariables(Archive::AutoDeltaByteStream & stream)
+{
+	stream.addVariable(m_singleUseActionList);
+	stream.addVariable(m_delayRepeatActionList);
+	stream.addVariable(m_delayRepeatActionList);
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureWeaponActions::setCombatProfile(CreatureObject & owner, AiCreatureCombatProfile const & combatProfile)
+{
+	m_combatProfile = &combatProfile;
+
+	m_combatProfile->grantActions(owner);
+}
+
+// ----------------------------------------------------------------------
+void AiCreatureWeaponActions::reset()
+{
+	if (m_combatProfile != NULL)
+	{
+		resetActionTimers(m_singleUseActionList, m_combatProfile->m_singleUseActionList);
+		resetActionTimers(m_delayRepeatActionList, m_combatProfile->m_delayRepeatActionList);
+		resetActionTimers(m_instantRepeatActionList, m_combatProfile->m_instantRepeatActionList);
+	}
+}
+
+// ----------------------------------------------------------------------
+PersistentCrcString const & AiCreatureWeaponActions::getCombatAction()
+{
+	// If the combat profile is NULL, then the AI has no special actions assigned
+
+	if (m_combatProfile != NULL)
+	{
+		time_t const osTime = Os::getRealSystemTime();
+
+		// Single use actions
+		{
+			unsigned int expiredCount = 0;
+
+			for (unsigned int i = 0; i < m_singleUseActionList.size(); ++i)
+			{
+				if (m_singleUseActionList[i] != 0)
+				{
+					if (osTime > time_t(m_singleUseActionList[i]))
+					{
+						m_singleUseActionList.set(i, 0);
+
+						AiCreatureCombatProfile::Action const * const action = m_combatProfile->m_singleUseActionList[i];
+						float const diceRoll = Random::randomReal();
+
+						if (action->m_useChance >= diceRoll)
+						{
+							return action->m_name;
+						}
+					}
+				}
+				else
+				{
+					++expiredCount;
+				}
+			}
+
+			if (expiredCount >= m_singleUseActionList.size())
+			{
+				m_singleUseActionList.clear();
+			}
+		}
+
+		// Delayed repeat actions
+		{
+			for (unsigned int i = 0; i < m_delayRepeatActionList.size(); ++i)
+			{
+				if (osTime > time_t(m_delayRepeatActionList[i]))
+				{
+					AiCreatureCombatProfile::Action const * const action = m_combatProfile->m_delayRepeatActionList[i];
+					float const diceRoll = Random::randomReal();
+
+					if (action->m_useChance >= diceRoll)
+					{
+						m_delayRepeatActionList.set(i, Time(osTime + action->m_useTime));
+						return action->m_name;
+					}
+					else
+					{
+						// Chance failed, delay the retry
+
+						m_delayRepeatActionList.set(i, Time(osTime + s_useChanceRetryTime));
+					}
+				}
+			}
+		}
+
+		// Instant repeat actions
+		{
+			time_t nextActionTime = 0;
+			unsigned int nextActionIndex = 0;
+
+			for (unsigned int i = 0; i < m_instantRepeatActionList.size(); ++i)
+			{
+				if (osTime >= time_t(m_instantRepeatActionList[i]))
+				{
+					if (   (nextActionTime == 0)
+						|| (time_t(m_instantRepeatActionList[i]) < nextActionTime))
+					{
+						AiCreatureCombatProfile::Action const * const action = m_combatProfile->m_instantRepeatActionList[i];
+						float const diceRoll = Random::randomReal();
+
+						if (action->m_useChance >= diceRoll)
+						{
+							nextActionIndex = i;
+							nextActionTime = m_instantRepeatActionList[i];
+						}
+						else
+						{
+							// Chance failed, delay the retry
+
+							m_instantRepeatActionList.set(nextActionIndex, Time(osTime + s_useChanceRetryTime));
+						}
+					}
+				}
+			}
+
+			if (nextActionTime > 0)
+			{
+				AiCreatureCombatProfile::Action const * const action = m_combatProfile->m_instantRepeatActionList[nextActionIndex];
+
+				m_instantRepeatActionList.set(nextActionIndex, Time(osTime + action->m_useTime + 1));
+
+				return action->m_name;
+			}
+		}
+	}
+
+	return PersistentCrcString::empty;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiCreatureWeaponActions.h b/engine/server/library/serverGame/src/shared/ai/AiCreatureWeaponActions.h
new file mode 100644
index 00000000..ca7d7dbf
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiCreatureWeaponActions.h
@@ -0,0 +1,62 @@
+// ======================================================================
+//
+// AiCreatureWeaponActions.h
+//
+// copyright 2005, sony online entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AiCreatureWeaponActions_H
+#define INCLUDED_AiCreatureWeaponActions_H
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "Archive/AutoDeltaVector.h"
+
+class AiCreatureCombatProfile;
+class CreatureObject;
+class PersistentCrcString;
+
+// ======================================================================
+class AiCreatureWeaponActions
+{
+public:
+
+	AiCreatureWeaponActions();
+
+	void addServerNpAutoDeltaVariables(Archive::AutoDeltaByteStream & stream);
+	
+	/**
+	 * Reset all the timers for this weapon's actions. This needs to be called
+	 * each time the AI enters combat.
+	 */
+
+	void reset();
+
+	/**
+	 * Sets the combat profile which defines the actions for this weapon. This
+	 * additionally grants the actions to the owner which allows them to use
+	 * all the actions in combat.
+	 */
+	
+	void setCombatProfile(CreatureObject & owner, AiCreatureCombatProfile const & combatProfile);
+
+	PersistentCrcString const & getCombatAction();
+
+public:
+
+	typedef uint32 Time;
+
+	Archive::AutoDeltaVector<Time> m_singleUseActionList;
+	Archive::AutoDeltaVector<Time> m_delayRepeatActionList;
+	Archive::AutoDeltaVector<Time> m_instantRepeatActionList;
+	AiCreatureCombatProfile const * m_combatProfile; // Not owned by this class
+
+private:
+
+	AiCreatureWeaponActions(AiCreatureWeaponActions const &);
+	AiCreatureWeaponActions & operator =(AiCreatureWeaponActions const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_AiCreatureWeaponActions_H
diff --git a/engine/server/library/serverGame/src/shared/ai/AiLogManager.cpp b/engine/server/library/serverGame/src/shared/ai/AiLogManager.cpp
new file mode 100644
index 00000000..27102e60
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiLogManager.cpp
@@ -0,0 +1,58 @@
+// ======================================================================
+//
+// AiLogManager.cpp
+// Copyright 2005 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiLogManager.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "sharedFoundation/NetworkId.h"
+
+#include <set>
+
+// ======================================================================
+//
+// AiLogManagerNamespace
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+namespace AiLogManagerNamespace
+{
+	typedef std::set<NetworkId> AiList;
+
+	AiList s_aiList;
+}
+
+using namespace AiLogManagerNamespace;
+
+// ======================================================================
+//
+// AiLogManager
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+void AiLogManager::setLogging(NetworkId const & networkId, bool const enabled)
+{
+	if (enabled)
+	{
+		s_aiList.insert(networkId);
+	}
+	else
+	{
+		s_aiList.erase(networkId);
+	}
+}
+
+// ----------------------------------------------------------------------
+bool AiLogManager::isLogging(NetworkId const & networkId)
+{
+	return ConfigServerGame::isAiLoggingEnabled() || (s_aiList.find(networkId) != s_aiList.end());
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiLogManager.h b/engine/server/library/serverGame/src/shared/ai/AiLogManager.h
new file mode 100644
index 00000000..5948e146
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiLogManager.h
@@ -0,0 +1,37 @@
+// ======================================================================
+//
+// AiLogManager.h
+// Copyright 2005 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiLogManager_H
+#define	INCLUDED_AiLogManager_H
+
+class NetworkId;
+
+// ======================================================================
+//
+// AiLogManager
+//
+// ======================================================================
+
+class AiLogManager
+{
+public:
+
+	static void setLogging(NetworkId const & networkId, bool const enabled);
+	static bool isLogging(NetworkId const & networkId);
+
+private:
+
+	AiLogManager();
+	~AiLogManager();
+	AiLogManager(AiLogManager const &);
+	AiLogManager & operator =(AiLogManager const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_AiLogManager_H
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementArchive.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementArchive.cpp
new file mode 100644
index 00000000..723b8c7e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementArchive.cpp
@@ -0,0 +1,111 @@
+// ======================================================================
+//
+// AiMovementArchive.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+
+#include "serverGame/AiMovementFace.h"
+#include "serverGame/AiMovementFlee.h"
+#include "serverGame/AiMovementFollow.h"
+#include "serverGame/AiLocation.h"
+#include "serverGame/AiMovementLoiter.h"
+#include "serverGame/AiMovementMove.h"
+#include "serverGame/AiMovementSwarm.h"
+#include "serverGame/AiMovementWander.h"
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/CreatureObject.h"
+#include "serverNetworkMessages/AiMovementMessage.h"
+#include "sharedObject/NetworkIdManager.h"
+
+//-----------------------------------------------------------------------
+
+namespace Archive
+{
+	// the archive functions for AiMovementMessage are here so we don't have to link 
+	// serverGame with everything
+	void get(ReadIterator & source, AiMovementMessage & target)
+	{
+		int movementType;
+		get(source, target.m_objectId);
+		get(source, movementType);
+
+		AICreatureController * controller = NULL;
+		Object * object = NetworkIdManager::getObjectById(target.getObjectId());
+		if (object != NULL)
+			controller = dynamic_cast<AICreatureController *>(object->getController());
+
+		if (controller == NULL)
+		{
+			WARNING(true, ("AiMovementMessage Archive::get, got message to object %s that doesn't have an AICreatureController", target.getObjectId().getValueString().c_str()));
+			target.m_movement = AiMovementBaseNullPtr;
+			return;
+		}
+
+		switch (static_cast<AiMovementType>(movementType))
+		{
+			case AMT_loiter:
+				target.m_movement = AiMovementBasePtr(new AiMovementLoiter(controller, source));
+				break;
+			case AMT_wander:
+				target.m_movement = AiMovementBasePtr(new AiMovementWander(controller, source));
+				break;
+			case AMT_follow:
+				target.m_movement = AiMovementBasePtr(new AiMovementFollow(controller, source));
+				break;
+			case AMT_flee:
+				target.m_movement = AiMovementBasePtr(new AiMovementFlee(controller, source));
+				break;
+			case AMT_move:
+				target.m_movement = AiMovementBasePtr(new AiMovementMove(controller, source));
+				break;
+			case AMT_face:
+				target.m_movement = AiMovementBasePtr(new AiMovementFace(controller, source));
+				break;
+			case AMT_swarm:
+				target.m_movement = AiMovementBasePtr(new AiMovementSwarm(controller, source));
+				break;
+			case AMT_idle:
+			case AMT_invalid:
+			default:
+				target.m_movement = AiMovementBaseNullPtr;
+				break;
+		}
+	}
+
+	void put(ByteStream & target, const AiMovementMessage & source)
+	{
+		put(target, source.getObjectId());
+		put(target, source.getMovementType());
+
+		switch (source.getMovementType())
+		{
+			case AMT_loiter:
+			case AMT_wander:
+			case AMT_follow:
+			case AMT_flee:
+			case AMT_move:
+			case AMT_face:
+			case AMT_swarm:
+				if (source.getMovement() != AiMovementBaseNullPtr)
+					source.getMovement()->pack(target);
+				else
+				{
+					FATAL(true, ("AiMovementArchive::put AiMovementMessage: got type %d with no data", static_cast<int>(source.getMovementType())));
+				}
+				break;
+			case AMT_idle:
+			case AMT_invalid:
+			default:
+				break;
+		}
+	}
+
+}
+
+//=======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementArchive.h b/engine/server/library/serverGame/src/shared/ai/AiMovementArchive.h
new file mode 100644
index 00000000..fd4cde54
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementArchive.h
@@ -0,0 +1,30 @@
+// ======================================================================
+//
+// AiMovementArchive.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiMovementArchive_H
+#define	INCLUDED_AiMovementArchive_H
+
+class AiMovementMessage;
+
+// ======================================================================
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+
+	void get(ReadIterator & source, AiMovementMessage & target);
+	void put(ByteStream & target, const AiMovementMessage & source);
+};
+
+
+// ======================================================================
+
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementBase.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementBase.cpp
new file mode 100644
index 00000000..dde28a05
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementBase.cpp
@@ -0,0 +1,297 @@
+// ======================================================================
+//
+// AiMovementBase.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiMovementBase.h"
+
+#include "serverGame/AiMovementIdle.h"
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/AiLocation.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedCollision/Footprint.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedGame/AiDebugString.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/AlterResult.h"
+#include "sharedObject/CellProperty.h"
+
+#include "UnicodeUtils.h"
+
+
+// ----------------------------------------------------------------------
+
+AiMovementBase::AiMovementBase( AICreatureController * controller )
+:	m_controller( controller ),
+	m_stateFunction( NULL ),
+	m_stateName(),
+	m_pendingFunction( NULL ),
+	m_pendingName()
+{
+}
+
+// ----------
+
+AiMovementBase::AiMovementBase( AICreatureController * controller, Archive::ReadIterator & source )
+:	m_controller( controller ),
+	m_stateFunction( NULL ),
+	m_stateName(),
+	m_pendingFunction( NULL ),
+	m_pendingName()
+{
+	// !!!
+	// note that it's up to the derived class to set the state/pending state 
+	// based on the names we get
+	// !!!
+	Archive::get(source, m_stateName);
+	Archive::get(source, m_pendingName);
+}
+
+// ----------
+
+AiMovementBase::~AiMovementBase()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementBase::pack( Archive::ByteStream & target ) const
+{
+	Archive::put(target, m_stateName);
+	Archive::put(target, m_pendingName);
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementBase::alter ( float time )
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementBase::alter");
+	applyStateChange();
+
+	int cycleCount = 0;
+
+	while(m_stateFunction)
+	{
+		AiStateResult result = (this->*m_stateFunction)(time);
+
+		if(result == ASR_Done)
+		{
+			break;
+		}
+		else
+		{
+			cycleCount++;
+
+			if(cycleCount > 5)
+			{
+				DEBUG_WARNING(ConfigServerGame::getReportAiWarnings(),("AiMovementBase::alter - Behavior has gone through more than 5 state changes in a single frame, the behavior may be in an infinite loop\n"));
+				break;
+			}
+
+			applyStateChange();
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+float AiMovementBase::getDefaultAlterTime() const
+{
+	return AlterResult::cms_alterQuickly;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementBase::getHibernateOk ( void ) const
+{
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementBase::getDebugInfo ( std::string & outString ) const
+{
+	Vector const & position_w = m_controller->getCreaturePosition_w();
+
+	outString += FormattedString<1024>().sprintf("AiMovementBase: location(%.2f, %.2f, %.2f) state(%s)", position_w.x, position_w.y, position_w.z, m_stateName.c_str());
+}
+
+
+// ----------------------------------------------------------------------
+
+void AiMovementBase::endBehavior ( void )
+{
+	clear();
+
+	if(!m_controller->hasPendingMovement())
+	{
+		AiMovementBasePtr movement(new AiMovementIdle(m_controller));
+		m_controller->changeMovement(movement);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementBase::clear ( void )
+{
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementBase::refresh( void )
+{
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementBase::setState ( StateAlterFunction newState, char const * newStateName )
+{
+	if(newState != m_stateFunction)
+	{
+		m_pendingFunction = newState;
+		m_pendingName = newStateName;
+	}
+}
+
+// ----------
+
+void AiMovementBase::applyStateChange ( void )
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiBehaviorBase::applyStateChange");
+
+	// This is a while instead of an if because onStateChanged may decide to
+	// force a change to a different state (if the desired state can't be entered, for
+	// example)
+
+	while(m_pendingFunction)
+	{
+		//LOGC(ConfigServerGame::isAiLoggingEnabled(), "debug_ai", ("AiMovementBase::setState - going to state %s\n",m_pendingName.c_str()));
+
+		m_stateFunction = m_pendingFunction;
+		m_stateName = m_pendingName;
+
+		m_pendingFunction = NULL;
+		m_pendingName.clear();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementBase::debugSpeak ( char const * string ) const
+{
+	static char buffer[256];
+
+	int processId = GameServer::getInstance().getProcessId();
+
+	sprintf(buffer,"%d: %s",processId,string);
+
+	static Unicode::String wideString;
+
+	Unicode::narrowToWide(buffer,wideString);
+
+	ServerObject * object = m_controller->getCreature();
+
+	object->speakText(NetworkId::cms_invalid, 0, 0, 0, wideString, 0, Unicode::emptyString);
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementBase::reachedLocation ( AiLocation const & location ) const
+{
+	return m_controller->reachedPoint( location.getCell(), location.getPosition_p(), location.getRadius() );
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementBase::warpToLocation ( AiLocation const & location )
+{
+	m_controller->warpTo( location.getCell(), location.getPosition_p() );
+}
+
+#ifdef _DEBUG
+// ----------------------------------------------------------------------
+
+void AiMovementBase::addDebug(AiDebugString & aiDebugString)
+{
+	aiDebugString.addLineToPosition(CellProperty::getPosition_w(m_controller->getHomeLocation()), PackedRgb::solidGreen);
+}
+#endif // _DEBUG
+
+// ----------------------------------------------------------------------
+
+char const * AiMovementBase::getMovementString(AiMovementType const aiMovementType)
+{
+	switch (aiMovementType)
+	{
+		case AMT_idle: { return "IDLE"; }
+		case AMT_loiter: { return "LOITER"; }
+		case AMT_wander: { return "WANDER"; }
+		case AMT_follow: { return "FOLLOW"; }
+		case AMT_flee: { return "FLEE"; }
+		case AMT_move: { return "MOVE_TO"; }
+		case AMT_face: { return "FACE"; }
+		case AMT_swarm: { return "SWARM"; }
+		case AMT_patrol: { return "PATROL"; }
+		default:
+		case AMT_invalid: { break; }
+	}
+
+	return "INVALID";
+}
+
+// ----------------------------------------------------------------------
+AiMovementSwarm * AiMovementBase::asAiMovementSwarm()
+{
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+AiMovementFace * AiMovementBase::asAiMovementFace()
+{
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+AiMovementFlee * AiMovementBase::asAiMovementFlee()
+{
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+AiMovementFollow * AiMovementBase::asAiMovementFollow()
+{
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+AiMovementLoiter * AiMovementBase::asAiMovementLoiter()
+{
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+AiMovementMove * AiMovementBase::asAiMovementMove()
+{
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+AiMovementPatrol * AiMovementBase::asAiMovementPatrol()
+{
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+AiMovementWander * AiMovementBase::asAiMovementWander()
+{
+	return NULL;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementBase.h b/engine/server/library/serverGame/src/shared/ai/AiMovementBase.h
new file mode 100644
index 00000000..36349887
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementBase.h
@@ -0,0 +1,148 @@
+// ======================================================================
+//
+// AiMovementBase.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef INCLUDED_AiMovementBase_H
+#define INCLUDED_AiMovementBase_H
+
+#include "boost/smart_ptr.hpp"
+
+class AICreatureController;
+class AiDebugString;
+class AiLocation;
+class Vector;
+
+class AiMovementFace;
+class AiMovementFlee;
+class AiMovementFollow;
+class AiMovementLoiter;
+class AiMovementMove;
+class AiMovementPathFollow;
+class AiMovementPatrol;
+class AiMovementSwarm;
+class AiMovementWander;
+
+namespace Archive
+{
+	class ByteStream;
+	class ReadIterator;
+}
+
+#define CHANGE_STATE(A) { setState(reinterpret_cast<StateAlterFunction>(&A),#A); }
+#define CAST_STATE(A) reinterpret_cast<StateAlterFunction>(&A)
+#define INITIAL_STATE(A) { m_stateFunction = reinterpret_cast<StateAlterFunction>(&A); m_stateName = #A; }
+
+#define SETUP_SYNCRONIZED_STATE( A ) \
+	if (m_stateName == #A)\
+		m_stateFunction = reinterpret_cast<StateAlterFunction>(&A);\
+	if (m_pendingName == #A)\
+		m_pendingFunction = reinterpret_cast<StateAlterFunction>(&A);
+
+enum AiStateResult
+{
+	ASR_Done,
+	ASR_Continue,
+};
+
+// ----------
+// duped in base_class.java	(as MOVEMENT_*******)
+enum AiMovementType
+{
+	AMT_idle,
+	AMT_loiter,
+	AMT_wander,
+	AMT_follow,
+	AMT_flee,
+	AMT_move,
+	AMT_patrol,
+	AMT_face,
+	AMT_swarm,
+	AMT_invalid,
+};
+
+	
+// ======================================================================
+
+class AiMovementBase
+{
+public:
+
+	static char const * getMovementString(AiMovementType const aiMovementType);
+
+public:
+
+	explicit AiMovementBase(AICreatureController * controller);
+	AiMovementBase(AICreatureController * controller, Archive::ReadIterator & source);
+	virtual ~AiMovementBase();
+	
+	typedef AiStateResult(AiMovementBase::*StateAlterFunction)(float time);
+
+	virtual AiMovementType getType() const = 0;
+	virtual AiMovementFace * asAiMovementFace();
+	virtual AiMovementFlee * asAiMovementFlee();
+	virtual AiMovementFollow * asAiMovementFollow();
+	virtual AiMovementLoiter * asAiMovementLoiter();
+	virtual AiMovementMove * asAiMovementMove();
+	virtual AiMovementPatrol * asAiMovementPatrol();
+	virtual AiMovementSwarm * asAiMovementSwarm();
+	virtual AiMovementWander * asAiMovementWander();
+	
+	// ----------
+	
+	virtual float getDefaultAlterTime() const;
+	virtual void  pack                ( Archive::ByteStream & target ) const = 0;
+	virtual void alter(float time);
+	
+	virtual bool getHibernateOk() const;
+
+	virtual void getDebugInfo(std::string & outString) const;
+
+	virtual void endBehavior();
+
+	virtual void clear();
+
+	virtual void refresh();
+
+	// state stuff
+	void setState(StateAlterFunction newState, char const * stateName);
+	void applyStateChange();
+
+	// utilities that call up through AiCreatureController
+
+	virtual void debugSpeak(char const * string) const;
+	virtual bool reachedLocation(AiLocation const & location) const;
+	virtual void warpToLocation(AiLocation const & location);
+
+#ifdef _DEBUG
+	virtual void addDebug(AiDebugString & aiDebugString);
+#endif // _DEBUG
+
+protected:
+
+	AICreatureController * m_controller;
+	
+	StateAlterFunction      m_stateFunction;
+	std::string             m_stateName;
+	
+	StateAlterFunction      m_pendingFunction;
+	std::string             m_pendingName;
+};
+
+
+//-----------------------------------------------------------------------
+
+// define shared pointer template for AiMovementBase
+typedef boost::shared_ptr<AiMovementBase> AiMovementBasePtr;
+
+#define AiMovementBaseNullPtr AiMovementBasePtr(NULL)
+
+
+// ======================================================================
+
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementFace.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementFace.cpp
new file mode 100644
index 00000000..16feccbe
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementFace.cpp
@@ -0,0 +1,131 @@
+// ======================================================================
+//
+// AiMovementFace.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiMovementFace.h"
+
+#include "serverGame/AiMovementArchive.h"
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ServerWorld.h"
+
+#include "sharedFoundation/DynamicVariableLocationData.h"
+
+#include "sharedDebug/Profiler.h"
+
+#include "sharedObject/CellProperty.h"
+
+// ----------------------------------------------------------------------
+
+AiMovementFace::AiMovementFace( AICreatureController * controller )
+: AiMovementBase(controller),
+  m_target()
+{
+}
+
+AiMovementFace::AiMovementFace( AICreatureController * controller, CellProperty const * targetCell, Vector const & target_p )
+: AiMovementBase(controller),
+  m_target(targetCell,target_p)
+{
+	CHANGE_STATE( AiMovementFace::stateWaiting );
+}
+
+// ----------
+
+AiMovementFace::AiMovementFace( AICreatureController * controller, ServerObject const * target )
+:	AiMovementBase(controller),
+	m_target(target)
+{
+	CHANGE_STATE( AiMovementFace::stateWaiting );
+}
+
+// ----------
+
+AiMovementFace::AiMovementFace( AICreatureController * controller, Archive::ReadIterator & source )
+:	AiMovementBase(controller, source),
+	m_target(source)
+{
+	SETUP_SYNCRONIZED_STATE( AiMovementFace::stateWaiting );
+}
+
+// ----------
+
+AiMovementFace::~AiMovementFace()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementFace::pack( Archive::ByteStream & target ) const
+{
+	AiMovementBase::pack(target);
+	m_target.pack(target);
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementFace::alter ( float time )
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementFace::alter");
+
+	AiMovementBase::alter(time);
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementFace::stateWaiting ( float time ) 
+{
+	UNREF(time);
+
+	m_target.update();
+
+	m_controller->turnToward( m_target.getCell(), m_target.getPosition_p() );
+
+	return ASR_Done;
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementFace::getDebugInfo ( std::string & outString ) const
+{
+	AiMovementBase::getDebugInfo(outString);
+
+	outString += "\n";
+
+	outString += "AiMovementFace:\n";
+
+	char buffer[256];
+
+	Vector pos = m_target.getPosition_w();
+
+	sprintf(buffer,"Target : (%f,%f,%f)\n",pos.x,pos.y,pos.z);
+
+	outString += buffer;
+}
+
+// ----------------------------------------------------------------------
+
+AiMovementType AiMovementFace::getType() const
+{
+	return AMT_face;
+}
+
+// ----------------------------------------------------------------------
+
+AiMovementFace * AiMovementFace::asAiMovementFace()
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+AiLocation const & AiMovementFace::getTarget() const
+{
+	return m_target;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementFace.h b/engine/server/library/serverGame/src/shared/ai/AiMovementFace.h
new file mode 100644
index 00000000..3d7edc2f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementFace.h
@@ -0,0 +1,51 @@
+// ======================================================================
+//
+// AiMovementFace.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiMovementFace_H
+#define	INCLUDED_AiMovementFace_H
+
+#include "serverGame/AiMovementBase.h"
+#include "serverGame/AiLocation.h"
+
+class ServerObject;
+
+
+// ======================================================================
+
+class AiMovementFace : public AiMovementBase
+{
+public:
+
+	explicit AiMovementFace( AICreatureController * controller );
+	AiMovementFace( AICreatureController * controller, CellProperty const * targetCell, Vector const & target_p );
+	AiMovementFace( AICreatureController * controller, ServerObject const * target );
+	AiMovementFace( AICreatureController * controller, Archive::ReadIterator & source );
+
+	virtual ~AiMovementFace();
+
+	virtual AiMovementType getType() const;
+	virtual AiMovementFace * asAiMovementFace();
+
+	virtual void  pack  ( Archive::ByteStream & target ) const;
+	virtual void  alter ( float time );
+	
+	virtual AiStateResult stateWaiting ( float time );
+
+	virtual void  getDebugInfo ( std::string & outString ) const;
+
+	AiLocation const & getTarget() const;
+
+protected:
+
+	AiLocation m_target;
+};
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementFlee.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementFlee.cpp
new file mode 100644
index 00000000..c407cc15
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementFlee.cpp
@@ -0,0 +1,248 @@
+// ======================================================================
+//
+// AiMovementPathFlee.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiMovementFlee.h"
+
+#include "serverGame/AiMovementArchive.h"
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/CreatureObject.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedObject/CellProperty.h"
+
+using namespace Scripting;
+
+// ======================================================================
+
+AiMovementFlee::AiMovementFlee( AICreatureController * controller )
+:   AiMovementWaypoint(controller),
+    m_fleeFrom(),
+	m_fleeTo(),
+	m_minDistance(0.0f),
+	m_maxDistance(0.0f)
+{
+}
+
+AiMovementFlee::AiMovementFlee( AICreatureController * controller, ServerObject const * target, float minDistance, float maxDistance )
+:	AiMovementWaypoint(controller),
+	m_fleeFrom(target),
+	m_fleeTo(),
+	m_minDistance(minDistance),
+	m_maxDistance(maxDistance)
+{
+}
+
+AiMovementFlee::AiMovementFlee( AICreatureController * controller, Archive::ReadIterator & source )
+:   AiMovementWaypoint(controller, source),
+    m_fleeFrom(source),
+	m_fleeTo(source),
+	m_minDistance(0.0f),
+	m_maxDistance(0.0f)
+{
+	Archive::get(source, m_minDistance);
+	Archive::get(source, m_maxDistance);
+
+	SETUP_SYNCRONIZED_STATE( AiMovementFlee::stateWaiting );
+	SETUP_SYNCRONIZED_STATE( AiMovementFlee::stateThinking );
+	SETUP_SYNCRONIZED_STATE( AiMovementFlee::stateMoving );
+}
+
+// ----------
+
+AiMovementFlee::~AiMovementFlee()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementFlee::pack( Archive::ByteStream & target ) const
+{
+	AiMovementWaypoint::pack(target);
+	m_fleeFrom.pack(target);
+	m_fleeTo.pack(target);
+	Archive::put(target, m_minDistance);
+	Archive::put(target, m_maxDistance);
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementFlee::alter ( float time )
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementFlee::alter");
+
+	AiMovementWaypoint::alter(time);
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementFlee::getDebugInfo ( std::string & outString ) const
+{
+	AiMovementWaypoint::getDebugInfo(outString);
+
+	Vector const & flee_w = m_fleeFrom.getPosition_w();
+	outString += FormattedString<1024>().sprintf("AiMovementFlee: fleeingFrom(%d) offset(%.2f, %.2f, %.2f) distance[%.2f...%.2f]", m_fleeFrom.getObjectId().getHashValue(), flee_w.x, flee_w.y, flee_w.z, m_minDistance, m_maxDistance);
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementFlee::stateWaiting ( float time )
+{
+	UNREF(time);
+
+	if(!m_fleeFrom.isValid())
+		return triggerTargetLost();
+
+	return triggerThinking();
+}
+
+// ----------
+
+AiStateResult AiMovementFlee::stateThinking ( float time )
+{
+	UNREF(time);
+
+	if(!m_fleeFrom.isValid())
+		return triggerTargetLost();
+
+	if(generateWaypoint())
+		return triggerMoving();
+
+	return ASR_Done;
+}
+
+// ----------
+
+AiStateResult AiMovementFlee::stateMoving ( float time )
+{
+	if(m_controller->getStuckCounter() > 5)
+		return triggerThinking();
+
+	return AiMovementWaypoint::stateMoving(time);
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementFlee::triggerThinking ( void )
+{
+	CHANGE_STATE( AiMovementFlee::stateThinking );
+
+	return ASR_Continue;
+}
+
+// ----------
+
+AiStateResult AiMovementFlee::triggerWaypoint ( void )
+{
+	m_controller->triggerScriptsWithTarget(TRIG_FLEE_WAYPOINT,m_fleeFrom.getObjectId());
+
+	AiMovementWaypoint::triggerWaypoint();
+
+	return ASR_Continue;
+}
+
+// ----------
+
+AiStateResult AiMovementFlee::triggerTargetLost ( void )
+{
+	m_controller->triggerScriptsWithTarget(TRIG_FLEE_TARGET_LOST,m_fleeFrom.getObjectId());
+
+	AiMovementWaypoint::triggerTargetLost();
+
+	endBehavior();
+
+	return ASR_Done;
+}
+
+// ----------
+
+AiStateResult AiMovementFlee::triggerPathNotFound ( void )
+{
+	m_controller->triggerScriptsWithTarget(TRIG_FLEE_PATH_NOT_FOUND,m_fleeFrom.getObjectId());
+
+	endBehavior();
+
+	return ASR_Done;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementFlee::hasWaypoint ( void ) const
+{
+	return m_fleeTo.isValid();
+}
+
+// ----------
+
+AiLocation const & AiMovementFlee::getWaypoint ( void ) const
+{
+	return m_fleeTo;
+}
+
+// ----------
+
+bool AiMovementFlee::updateWaypoint ( void )
+{
+	m_fleeFrom.update();
+	m_fleeTo.update();
+
+	if(m_fleeFrom.hasChanged())
+	{
+		generateWaypoint();
+
+		m_fleeFrom.setChanged(false);
+	}
+
+	return true;
+}
+
+// ----------
+
+bool AiMovementFlee::generateWaypoint ( void )
+{
+	Vector current  = m_controller->getCreaturePosition_w();
+	Vector start = m_fleeFrom.getPosition_w();
+	
+	Vector delta = current - start;
+	delta.x += Random::randomReal(0.0f,0.1f);
+	delta.y = 0;
+	delta.z += Random::randomReal(0.0f,0.1f);
+	delta.normalize();
+
+	float fleeDistance = Random::randomReal(m_minDistance, m_maxDistance);
+	delta *= fleeDistance;
+
+	Vector fleePoint = current + delta;
+
+	m_fleeTo = AiLocation(CellProperty::getWorldCellProperty(),fleePoint);
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementFlee::getDecelerate ( void ) const
+{
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+AiMovementType AiMovementFlee::getType() const
+{
+	return AMT_flee;
+}
+
+// ----------------------------------------------------------------------
+
+AiMovementFlee * AiMovementFlee::asAiMovementFlee()
+{
+	return this;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementFlee.h b/engine/server/library/serverGame/src/shared/ai/AiMovementFlee.h
new file mode 100644
index 00000000..855815dd
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementFlee.h
@@ -0,0 +1,77 @@
+// ======================================================================
+//
+// AiMovementFlee.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiMovementFlee_H
+#define	INCLUDED_AiMovementFlee_H
+
+#include "serverGame/AiMovementWaypoint.h"
+#include "serverGame/AiLocation.h"
+
+// ======================================================================
+
+class AiMovementFlee : public AiMovementWaypoint
+{
+public:
+
+	explicit AiMovementFlee( AICreatureController * controller );
+
+	AiMovementFlee( AICreatureController * controller, 
+	                ServerObject const * target, 
+	                float minDistance, 
+	                float maxDistance );
+
+	AiMovementFlee( AICreatureController * controller, 
+	                Archive::ReadIterator & source );
+
+	virtual ~AiMovementFlee();
+
+	virtual AiMovementType getType() const;
+	virtual AiMovementFlee * asAiMovementFlee();
+
+	// ----------
+
+	virtual void               pack                 ( Archive::ByteStream & target ) const;
+	virtual void               alter                ( float time );
+
+	virtual void               getDebugInfo         ( std::string & outString ) const;
+
+	// states & triggers
+
+	virtual AiStateResult      stateWaiting         ( float time );
+	virtual AiStateResult      stateThinking        ( float time );
+	virtual AiStateResult      stateMoving          ( float time );
+
+	virtual AiStateResult      triggerThinking      ( void );
+	virtual AiStateResult      triggerWaypoint      ( void );
+	virtual AiStateResult      triggerTargetLost    ( void );
+	virtual AiStateResult      triggerPathNotFound  ( void );
+	
+	// waypoints
+
+	virtual bool               hasWaypoint          ( void ) const;
+	virtual AiLocation const & getWaypoint          ( void ) const;
+	virtual bool               updateWaypoint       ( void );
+	virtual bool               generateWaypoint     ( void );
+
+	// misc
+
+	virtual bool               getDecelerate        ( void ) const;
+
+protected:
+
+	AiLocation m_fleeFrom;     // this is what we're running from
+	AiLocation m_fleeTo;       // this is where we're running to
+
+	float m_minDistance;
+	float m_maxDistance;
+};
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementFollow.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementFollow.cpp
new file mode 100644
index 00000000..2f7dee39
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementFollow.cpp
@@ -0,0 +1,446 @@
+// ======================================================================
+//
+// AiMovementFollow.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiMovementFollow.h"
+
+#include "serverGame/AiMovementArchive.h"
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ServerObject.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedCollision/SpatialDatabase.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFoundation/DynamicVariableLocationData.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedGame/AiDebugString.h"
+
+using namespace Scripting;
+
+extern float computeMovementModifier (CreatureObject* const object);
+
+// ======================================================================
+
+AiMovementFollow::AiMovementFollow( AICreatureController * controller )
+:	AiMovementTarget(controller),
+	m_offsetTarget(),
+	m_minDistance(0.0f),
+	m_maxDistance(1.0f)
+{
+	CHANGE_STATE( AiMovementFollow::stateWaiting );
+}
+
+AiMovementFollow::AiMovementFollow( AICreatureController * controller, ServerObject const * target, float minDistance, float maxDistance )
+:	AiMovementTarget(controller, target),
+	m_offsetTarget(),
+	m_minDistance(minDistance),
+	m_maxDistance(maxDistance)
+{
+	DEBUG_FATAL(target->getNetworkId() == m_controller->getOwner()->getNetworkId(),("AiMovementFollow - Creature is trying to follow itself\n"));
+
+	// The specified follow distance needs to be the distance between
+	// the 2 object's collision spheres
+
+	float const radius = Random::randomReal(minDistance, maxDistance) + target->getRadius() + m_controller->getCreatureRadius();
+
+	m_target.setRadius(radius);
+
+	if(reachedLocation(m_target))
+	{
+		CHANGE_STATE( AiMovementFollow::stateWaiting );
+
+		triggerWaiting();
+	}
+}
+
+// ----------
+
+AiMovementFollow::AiMovementFollow( AICreatureController * controller, ServerObject const * target, Vector const & offset, bool relativeOffset, float minDistance, float maxDistance )
+:	AiMovementTarget(controller, target),
+	m_offsetTarget(target,offset,relativeOffset),
+	m_minDistance(minDistance),
+	m_maxDistance(maxDistance)
+{
+	DEBUG_FATAL(target->getNetworkId() == m_controller->getOwner()->getNetworkId(),("AiMovementFollow - Creature is trying to follow itself\n"));
+
+	m_target.setRadius( m_maxDistance );
+	m_offsetTarget.setRadius( m_maxDistance );
+
+	if(reachedLocation(m_offsetTarget))
+	{
+		CHANGE_STATE( AiMovementFollow::stateWaiting  );
+
+		triggerWaiting();
+	}
+}
+
+// ----------
+
+AiMovementFollow::AiMovementFollow( AICreatureController * controller, Archive::ReadIterator & source )
+:	AiMovementTarget(controller, source),
+	m_offsetTarget(source),
+	m_minDistance(0.0f),
+	m_maxDistance(1.0f)
+{
+	Archive::get(source, m_minDistance);
+	Archive::get(source, m_maxDistance);
+
+	SETUP_SYNCRONIZED_STATE( AiMovementFollow::stateWaiting );
+	SETUP_SYNCRONIZED_STATE( AiMovementFollow::stateMoving );
+}
+
+// ----------
+
+AiMovementFollow::~AiMovementFollow()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementFollow::pack( Archive::ByteStream & target ) const
+{
+	AiMovementTarget::pack(target);
+	m_offsetTarget.pack(target);
+	Archive::put(target, m_minDistance);
+	Archive::put(target, m_maxDistance);
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementFollow::alter ( float time )
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementFollow::alter");
+
+	m_target.update();
+	m_offsetTarget.update();
+
+	if(!m_target.isValid())
+	{
+		triggerTargetLost();
+
+		return;
+	}
+
+	if(targetTooFar())
+	{
+		triggerTargetLost();
+
+		return;
+	}
+
+	if(m_controller->getStuckCounter() >= 5)
+	{
+		if(hasWaypoint())
+		{
+			warpToLocation(getWaypoint());
+		}
+	}
+
+	if(m_offsetTarget.isValid())
+	{
+		if(m_offsetTarget.hasChanged())
+		{
+			addPathNode(m_offsetTarget);
+
+			m_offsetTarget.setChanged(false);
+		}
+	}
+	else
+	{
+		if(m_target.hasChanged())
+		{
+			addPathNode(m_target);
+
+			m_target.setChanged(false);
+		}
+	}
+
+	// For following to work correctly, the path cutting in AiMovementPathFollow::alter needs to
+	// not treat the object we're following as an obstacle
+
+	CollisionWorld::getDatabase()->pushIgnoreObject(m_target.getObject());
+
+	AiMovementTarget::alter(time);
+
+	CollisionWorld::getDatabase()->popIgnoreObject();
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementFollow::refresh( void )
+{
+	AiMovementTarget::refresh();
+	CHANGE_STATE( AiMovementFollow::stateWaiting );
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementFollow::getDebugInfo ( std::string & outString ) const
+{
+	AiMovementTarget::getDebugInfo(outString);
+
+	Vector const & goalPosition_w = m_target.getPosition_w();
+	outString += FormattedString<1024>().sprintf("AiMovementFollow: following(%d) position(%.2f,%.2f,%.2f)", m_target.getObjectId().getHashValue(), goalPosition_w.x, goalPosition_w.y, goalPosition_w.z);
+
+	if (m_offsetTarget.isValid())
+	{
+		Vector const & offset = m_offsetTarget.getOffset();
+
+		outString += FormattedString<1024>().sprintf(" offset(%.2f,%.2f,%.2f)", offset.x, offset.y, offset.z);
+	}
+
+	outString += FormattedString<1024>().sprintf(" distance[%.2f...%.2f]", m_minDistance, m_maxDistance);
+}
+
+// ----------------------------------------------------------------------
+	
+AiStateResult AiMovementFollow::stateWaiting ( float time )
+{
+	m_target.update();
+	m_offsetTarget.update();
+
+	if (!m_target.isValid())
+	{
+		return triggerTargetLost();
+	}
+
+	if (getPathLength() > 1)
+	{
+		return triggerMoving();
+	}
+
+	// Follow behavior doesn't transition from waiting to moving until the AI
+	// is no longer in range of its target
+	{
+		if (m_offsetTarget.isValid())
+		{
+			if (!reachedLocation(m_offsetTarget))
+			{
+				return triggerMoving();
+			}
+			else
+			{
+				return ASR_Done;
+			}
+		}
+		else
+		{
+			// mbogue: I am trying to understand this legacy code and I have
+			// run into an interesting problem here. These 2 if checks are redundant.
+			// If the first check is true, the second check should be true.
+			// Somehow the second check is not true and I need to track down why
+			// the m_target is able to move without adding a new path location.
+			// Without the reachedLocation() check it causes the AI to toggle
+			// between Moving and Waiting states for no useful reason.
+
+
+
+			if (getPathLength() > 0)
+			{
+				if (!reachedLocation(m_target))
+				{
+					return triggerMoving();
+				}
+				else
+				{
+					return ASR_Done;
+				}
+			}
+			else
+			{
+				// It is possible that something has moved us away from our target.
+				// If that is the case, we need to re-path to the target and resume moving.
+				if (!reachedLocation(m_target))
+				{
+					if (!targetTooFar())
+					{
+						addPathNode(m_target);
+						return triggerMoving();
+					}
+					else
+					{
+						//whatever it is has moved us too far away from our target
+						return triggerTargetLost();
+					}
+				}
+			}
+		}
+	}
+
+	return ASR_Done;
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementFollow::stateMoving ( float time )
+{
+	if (m_offsetTarget.isValid())
+	{
+		// If there's only one node in the path, and we're within range of the target,
+		// go back to waiting state (we don't need to walk to the node).
+
+		if(getPathLength() <= 1)
+		{
+			AiLocation temp = m_offsetTarget;
+
+			temp.setRadius(m_minDistance);
+
+			if(reachedLocation(temp))
+			{
+				return triggerWaiting();
+			}
+		}
+	}
+
+	return AiMovementTarget::stateMoving(time);
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementFollow::triggerWaiting ( void )
+{
+	m_controller->triggerScriptsWithTarget(TRIG_FOLLOW_WAITING,m_target.getObjectId());
+
+	return AiMovementTarget::triggerWaiting();
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementFollow::triggerMoving ( void )
+{
+	m_controller->triggerScriptsWithTarget(TRIG_FOLLOW_MOVING,m_target.getObjectId());
+
+	return AiMovementTarget::triggerMoving();
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementFollow::triggerTargetLost ( void )
+{
+	m_controller->triggerScriptsWithTarget(TRIG_FOLLOW_TARGET_LOST,m_target.getObjectId());
+
+	endBehavior();
+	
+	return AiMovementTarget::triggerTargetLost();
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementFollow::updateWaypoint ( void )
+{
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementFollow::targetTooFar ( void ) const
+{
+	Vector const & creaturePos_w = m_controller->getOwner()->getPosition_w();
+	Vector const & targetPos_w = m_target.getPosition_w();
+
+	return creaturePos_w.magnitudeBetweenSquared(targetPos_w) > sqr(ConfigServerGame::getMaxCombatRange() * 2.0f);
+}
+
+// ----------------------------------------------------------------------
+
+AiMovementType AiMovementFollow::getType() const
+{
+	return AMT_follow;
+}
+
+// ----------------------------------------------------------------------
+
+AiLocation const & AiMovementFollow::getOffsetTarget() const
+{
+	return m_offsetTarget;
+}
+
+// ----------------------------------------------------------------------
+
+float AiMovementFollow::getMinDistance() const
+{
+	return m_minDistance;
+}
+
+// ----------------------------------------------------------------------
+
+float AiMovementFollow::getMaxDistance() const
+{
+	return m_maxDistance;
+}
+
+// ----------------------------------------------------------------------
+
+AiMovementFollow * AiMovementFollow::asAiMovementFollow()
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+AiLocation const & AiMovementFollow::getFinalWaypoint() const
+{
+	if (m_offsetTarget.isValid())
+	{
+		return AiLocation::invalid;
+	}
+
+	return m_target;
+}
+
+#ifdef _DEBUG
+// ----------------------------------------------------------------------
+void AiMovementFollow::addDebug(AiDebugString & aiDebugString)
+{
+	FormattedString<512> fs;
+	AiPath const * const path = getPath();
+
+	if (m_offsetTarget.isValid())
+	{
+		aiDebugString.addText(fs.sprintf("FOLLOW OFFSET\n"), PackedRgb::solidCyan);
+		Vector const & offsetPosition_p = m_offsetTarget.getOffset_p();
+		aiDebugString.addText(fs.sprintf("offset(%.1f, %.1f, %.1f)\n", offsetPosition_p.x, offsetPosition_p.y, offsetPosition_p.z), PackedRgb::solidCyan);
+		aiDebugString.addText(fs.sprintf("offsetTarget(%s)\n", m_offsetTarget.getObjectId().getValueString().c_str()), PackedRgb::solidCyan);
+	}
+	else
+	{
+		aiDebugString.addText(fs.sprintf("FOLLOW\n"), PackedRgb::solidCyan);
+	}
+	
+	aiDebugString.addText(fs.sprintf("%s\n", m_stateName.c_str()), PackedRgb::solidCyan);
+	aiDebugString.addText(fs.sprintf("target(%s)\n", m_target.getObjectId().getValueString().c_str()), PackedRgb::solidCyan);
+	aiDebugString.addText(fs.sprintf("distance[%.1f...%.1f]\n", m_minDistance, m_maxDistance), PackedRgb::solidCyan);
+	aiDebugString.addText(fs.sprintf("pathSize(%u)\n", path->size()), PackedRgb::solidCyan);
+	aiDebugString.addText(fs.sprintf("stuckCounter(%i)\n", m_controller->getStuckCounter()), PackedRgb::solidCyan);
+	aiDebugString.addText(fs.sprintf("avoidanceStuckTime(%.0f)\n", m_avoidanceStuckTime), PackedRgb::solidCyan);
+	aiDebugString.addText(fs.sprintf("obstacle(%s)\n", m_obstacleLocation.getObjectId().getValueString().c_str()), PackedRgb::solidCyan);
+
+	if (!path->empty())
+	{
+		AiDebugString::TransformList transformList;
+		AiPath::const_iterator iterPath = path->begin();
+
+		Transform transform(m_controller->getOwner()->getTransform_o2p());
+		transform.move_l(Vector(0.0f, 0.1f, 0.0f));
+		transformList.push_back(transform);
+
+		for (; iterPath != path->end(); ++iterPath)
+		{
+			transform.setPosition_p(iterPath->getPosition_p());
+			transform.move_l(Vector(0.0f, 0.1f, 0.0f));
+			transformList.push_back(transform);
+		}
+
+		bool const cyclic = false;
+		aiDebugString.addPath(transformList, cyclic);
+	}
+}
+#endif // _DEBUG
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementFollow.h b/engine/server/library/serverGame/src/shared/ai/AiMovementFollow.h
new file mode 100644
index 00000000..bf250725
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementFollow.h
@@ -0,0 +1,86 @@
+// ======================================================================
+//
+// AiMovementFollow.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiMovementFollow_H
+#define	INCLUDED_AiMovementFollow_H
+
+#include "serverGame/AiMovementTarget.h"
+
+// ======================================================================
+
+class AiMovementFollow : public AiMovementTarget
+{
+public:
+
+	explicit AiMovementFollow( AICreatureController * controller );
+
+	AiMovementFollow( AICreatureController * controller, 
+	                  ServerObject const * target, 
+	                  float minDistance, 
+	                  float maxDistance );
+	
+	AiMovementFollow( AICreatureController * controller, 
+	                  ServerObject const * target, 
+	                  Vector const & offset, 
+	                  bool relativeOffset, 
+	                  float minDistance, 
+	                  float maxDistance );
+
+	AiMovementFollow( AICreatureController * controller, 
+	                  Archive::ReadIterator & source );
+
+	virtual ~AiMovementFollow();
+	
+	virtual AiMovementType getType() const;
+	virtual AiMovementFollow * asAiMovementFollow();
+
+	// ----------
+	
+	virtual void               pack                 ( Archive::ByteStream & target ) const;
+	virtual void               alter                ( float time );
+	virtual void               refresh              ( void );
+
+	virtual void               getDebugInfo         ( std::string & outString ) const;
+
+	// states & triggers
+
+	virtual AiStateResult      stateWaiting         ( float time );
+	virtual AiStateResult      stateMoving          ( float time );
+	
+	virtual AiStateResult      triggerWaiting       ( void );
+	virtual AiStateResult      triggerMoving        ( void );
+	virtual AiStateResult      triggerTargetLost    ( void );
+
+	// waypoints
+
+	virtual AiLocation const & getFinalWaypoint() const;
+	virtual bool               updateWaypoint       ( void );
+
+	// ----------
+
+	AiLocation const & getOffsetTarget() const;
+	float getMinDistance() const;
+	float getMaxDistance() const;
+
+#ifdef _DEBUG
+	virtual void addDebug(AiDebugString & aiDebugString);
+#endif // _DEBUG
+
+protected:
+
+	bool targetTooFar ( void ) const;
+
+	AiLocation  m_offsetTarget;
+	float       m_minDistance;
+	float       m_maxDistance;
+};
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementIdle.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementIdle.cpp
new file mode 100644
index 00000000..cf452aeb
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementIdle.cpp
@@ -0,0 +1,75 @@
+// ======================================================================
+//
+// AiMovementIdle.cpp
+// copyright 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiMovementIdle.h"
+
+#include "serverGame/AiMovementArchive.h"
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/CreatureObject.h"
+#include "sharedGame/AiDebugString.h"
+
+// ----------------------------------------------------------------------
+AiMovementIdle::AiMovementIdle(AICreatureController * controller)
+ : AiMovementBase(controller)
+{
+}
+
+// ----------------------------------------------------------------------
+AiMovementIdle::AiMovementIdle(AICreatureController * controller, Archive::ReadIterator & source)
+:	AiMovementBase(controller, source)
+{
+	SETUP_SYNCRONIZED_STATE(AiMovementIdle::stateWaiting);
+}
+
+// ----------------------------------------------------------------------
+AiMovementIdle::~AiMovementIdle()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementIdle::pack( Archive::ByteStream & target ) const
+{
+	AiMovementBase::pack(target);
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementIdle::alter(float time)
+{
+	AiMovementBase::alter(time);
+}
+
+// ----------------------------------------------------------------------
+AiStateResult AiMovementIdle::stateWaiting(float /*time*/)
+{
+	return ASR_Done;
+}
+
+// ----------------------------------------------------------------------
+AiMovementType AiMovementIdle::getType() const
+{
+	return AMT_idle;
+}
+
+// ----------------------------------------------------------------------
+
+AiMovementIdle * AiMovementIdle::asAiMovementIdle()
+{
+	return this;
+}
+
+#ifdef _DEBUG
+// ----------------------------------------------------------------------
+void AiMovementIdle::addDebug(AiDebugString & aiDebugString)
+{
+	aiDebugString.addText("IDLE\n", PackedRgb::solidCyan);
+}
+#endif // _DEBUG
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementIdle.h b/engine/server/library/serverGame/src/shared/ai/AiMovementIdle.h
new file mode 100644
index 00000000..a7eaa8d5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementIdle.h
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// AiMovementIdle.h
+// copyright 2005 Sony Online Entertainment Inc.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiMovementIdle_H
+#define	INCLUDED_AiMovementIdle_H
+
+#include "serverGame/AiMovementBase.h"
+
+class AiDebugString;
+
+// ----------------------------------------------------------------------
+class AiMovementIdle : public AiMovementBase
+{
+public:
+
+	explicit AiMovementIdle(AICreatureController * controller);
+	AiMovementIdle(AICreatureController * controller, Archive::ReadIterator & source);
+	virtual ~AiMovementIdle();
+
+	virtual AiMovementType getType() const;
+	virtual AiMovementIdle * asAiMovementIdle();
+
+	virtual void pack(Archive::ByteStream & target) const;
+	virtual void alter(float time);
+	
+	virtual AiStateResult stateWaiting (float time);
+
+#ifdef _DEBUG
+	virtual void addDebug(AiDebugString & aiDebugString);
+#endif // _DEBUG
+};
+
+// ======================================================================
+
+#endif // INCLUDED_AiMovementIdle_H
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementLoiter.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementLoiter.cpp
new file mode 100644
index 00000000..8e4e5a2d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementLoiter.cpp
@@ -0,0 +1,674 @@
+// ======================================================================
+//
+// AiMovementLoiter.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiMovementLoiter.h"
+
+#include "serverGame/AiLogManager.h"
+#include "serverGame/AiMovementArchive.h"
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ServerWorld.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "sharedCollision/BaseExtent.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedCollision/Floor.h"
+#include "sharedCollision/FloorLocator.h"
+#include "sharedCollision/FloorMesh.h"
+#include "sharedCollision/Footprint.h"
+#include "sharedCollision/MultiList.h"
+#include "sharedCollision/SpatialDatabase.h"
+#include "sharedGame/AiDebugString.h"
+#include "sharedFile/FileNameUtils.h"
+#include "sharedFoundation/DynamicVariableLocationData.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedLog/Log.h"
+#include "sharedMath/Capsule.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedTerrain/TerrainObject.h"
+
+// ======================================================================
+//
+// AiMovementLoiterNamespace
+//
+// ======================================================================
+
+namespace AiMovementLoiterNamespace
+{
+	Vector getRandomLoiterPosition_p(Vector const anchorPosition_p, float const minDistance, float const maxDistance);
+	bool isPositionOnFloor(Floor const * const floor, Vector const & position_p, float const objectRadius, Vector & floorPosition);
+
+	unsigned int const s_maxCachedAiLocations = 5;
+	float const s_failedSelectWaypointSleepTime = 2.0f;
+}
+
+using namespace AiMovementLoiterNamespace;
+
+// ----------------------------------------------------------------------
+Vector AiMovementLoiterNamespace::getRandomLoiterPosition_p(Vector const anchorPosition_p, float const minDistance, float const maxDistance)
+{
+	Vector result = anchorPosition_p;
+	float const angle = Random::randomReal(PI_TIMES_2);
+	float const distance = Random::randomReal(minDistance, maxDistance);
+
+	result.x += distance * cos(angle);
+	result.z += distance * sin(angle);
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+bool AiMovementLoiterNamespace::isPositionOnFloor(Floor const * const floor, Vector const & position_p, float const radius, Vector & floorPosition_p)
+{
+	bool result = false;
+	FloorMesh const * const floorMesh = (floor != NULL) ? floor->getFloorMesh() : NULL;
+
+	if (floorMesh != NULL)
+	{
+		// See if the circle fits entirely on the floor
+		{
+			{
+				bool const allowJump = true;
+				FloorLocator outLoc;
+
+				if (   floorMesh->findFloorTri(FloorLocator(Vector(position_p.x - radius, position_p.y, position_p.z + radius), 0.0f), allowJump, outLoc)
+					&& floorMesh->findFloorTri(FloorLocator(Vector(position_p.x + radius, position_p.y, position_p.z + radius), 0.0f), allowJump, outLoc)
+					&& floorMesh->findFloorTri(FloorLocator(Vector(position_p.x + radius, position_p.y, position_p.z - radius), 0.0f), allowJump, outLoc)
+					&& floorMesh->findFloorTri(FloorLocator(Vector(position_p.x - radius, position_p.y, position_p.z - radius), 0.0f), allowJump, outLoc)
+					&& floorMesh->findFloorTri(FloorLocator(Vector(position_p.x, position_p.y, position_p.z), 0.0f), allowJump, outLoc))
+				{
+					result = true;
+					floorPosition_p = outLoc.getPosition_p();
+				}
+			}
+		}
+	}
+
+	return result;
+}
+
+// ======================================================================
+//
+// AiMovementLoiter
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+AiMovementLoiter::AiMovementLoiter( AICreatureController * controller)
+ : AiMovementWaypoint(controller)
+ , m_anchor()
+ , m_target()
+ , m_sleepTime(1.0f)
+ , m_minDistance(0.0f)
+ , m_maxDistance(1.0f)
+ , m_minDelay(1.0f)
+ , m_maxDelay(1.0f)
+ , m_cachedAiLocations(new CachedAiLocations)
+ , m_goalLocationIndex(-1)
+ , m_bubbleCheckResult(BCR_invalid)
+{
+	LOGC(ConfigServerGame::isAiLoggingEnabled(), "debug_ai", ("AiMovementLoiter::AiMovementLoiter1() owner(%s:%s) minDistance(%.2f) maxDistance(%.2f) minDelay(%.2f) maxDelay(%.2f)", controller->getOwner()->getNetworkId().getValueString().c_str(), FileNameUtils::get(controller->getOwner()->getDebugName(), FileNameUtils::fileName).c_str(), m_minDistance, m_maxDistance, m_minDelay, m_maxDelay));
+
+	m_cachedAiLocations->reserve(s_maxCachedAiLocations);
+	updateWaypoint();
+
+	CHANGE_STATE( AiMovementLoiter::stateWaiting);
+}
+
+// ----------------------------------------------------------------------
+AiMovementLoiter::AiMovementLoiter( AICreatureController * controller, CellProperty const * anchorCell, Vector const & anchor, float minDistance, float maxDistance, float minDelay, float maxDelay)
+ : AiMovementWaypoint(controller)
+ , m_anchor(anchorCell, anchor)
+ , m_target()
+ , m_sleepTime(minDelay)
+ , m_minDistance(minDistance)
+ , m_maxDistance(maxDistance)
+ , m_minDelay(minDelay)
+ , m_maxDelay(maxDelay)
+ , m_cachedAiLocations(new CachedAiLocations)
+ , m_goalLocationIndex(-1)
+ , m_bubbleCheckResult(BCR_invalid)
+{
+	LOGC(ConfigServerGame::isAiLoggingEnabled(), "debug_ai", ("AiMovementLoiter::AiMovementLoiter2() owner(%s:%s) minDistance(%.2f) maxDistance(%.2f) minDelay(%.2f) maxDelay(%.2f)", controller->getOwner()->getNetworkId().getValueString().c_str(), FileNameUtils::get(controller->getOwner()->getDebugName(), FileNameUtils::fileName).c_str(), m_minDistance, m_maxDistance, m_minDelay, m_maxDelay));
+
+	m_cachedAiLocations->reserve(s_maxCachedAiLocations);
+	updateWaypoint();
+
+	CHANGE_STATE( AiMovementLoiter::stateWaiting);
+}
+
+// ----------------------------------------------------------------------
+AiMovementLoiter::AiMovementLoiter( AICreatureController * controller, ServerObject const * anchor, float minDistance, float maxDistance, float minDelay, float maxDelay)
+ : AiMovementWaypoint(controller)
+ , m_anchor(anchor)
+ , m_target()
+ , m_sleepTime(minDelay)
+ , m_minDistance(minDistance)
+ , m_maxDistance(maxDistance)
+ , m_minDelay(minDelay)
+ , m_maxDelay(maxDelay)
+ , m_cachedAiLocations(new CachedAiLocations)
+ , m_goalLocationIndex(-1)
+ , m_bubbleCheckResult(BCR_invalid)
+{
+	LOGC(ConfigServerGame::isAiLoggingEnabled(), "debug_ai", ("AiMovementLoiter::AiMovementLoiter3() owner(%s:%s) minDistance(%.2f) maxDistance(%.2f) minDelay(%.2f) maxDelay(%.2f)", controller->getOwner()->getNetworkId().getValueString().c_str(), FileNameUtils::get(controller->getOwner()->getDebugName(), FileNameUtils::fileName).c_str(), m_minDistance, m_maxDistance, m_minDelay, m_maxDelay));
+	DEBUG_WARNING((m_maxDistance < 1.0f), ("AiMovementLoiter::AiMovementLoiter() maxDistance(%f) < 1.0f", maxDistance));
+
+	m_cachedAiLocations->reserve(s_maxCachedAiLocations);
+	updateWaypoint();
+
+	CHANGE_STATE( AiMovementLoiter::stateWaiting);
+}
+
+// ----------------------------------------------------------------------
+AiMovementLoiter::AiMovementLoiter( AICreatureController * controller, Archive::ReadIterator & source)
+ : AiMovementWaypoint(controller, source)
+ , m_anchor(source)
+ , m_target(source)
+ , m_sleepTime(0.0f)
+ , m_minDistance(0.0f)
+ , m_maxDistance(0.0f)
+ , m_minDelay(0.0f)
+ , m_maxDelay(0.0f)
+ , m_cachedAiLocations(new CachedAiLocations)
+ , m_goalLocationIndex(-1)
+ , m_bubbleCheckResult(BCR_invalid)
+{
+	Archive::get(source, m_minDistance);
+	Archive::get(source, m_maxDistance);
+	Archive::get(source, m_minDelay);
+	Archive::get(source, m_maxDelay);
+
+	m_sleepTime = m_minDelay;
+	m_cachedAiLocations->reserve(s_maxCachedAiLocations);
+
+	LOGC(ConfigServerGame::isAiLoggingEnabled(), "debug_ai", ("AiMovementLoiter::AiMovementLoiter4() owner(%s:%s) minDistance(%.2f) maxDistance(%.2f) minDelay(%.2f) maxDelay(%.2f)", controller->getOwner()->getNetworkId().getValueString().c_str(), FileNameUtils::get(controller->getOwner()->getDebugName(), FileNameUtils::fileName).c_str(), m_minDistance, m_maxDistance, m_minDelay, m_maxDelay));
+
+	SETUP_SYNCRONIZED_STATE( AiMovementLoiter::stateWaiting);
+	SETUP_SYNCRONIZED_STATE( AiMovementLoiter::stateThinking);
+	SETUP_SYNCRONIZED_STATE( AiMovementLoiter::stateMoving);
+}
+
+// ----------------------------------------------------------------------
+AiMovementLoiter::~AiMovementLoiter()
+{
+	delete m_cachedAiLocations;
+	m_cachedAiLocations = NULL;
+}
+
+// ----------------------------------------------------------------------
+void AiMovementLoiter::pack( Archive::ByteStream & target) const
+{
+	AiMovementWaypoint::pack(target);
+	m_anchor.pack(target);
+	m_target.pack(target);
+	Archive::put(target, m_minDistance);
+	Archive::put(target, m_maxDistance);
+	Archive::put(target, m_minDelay);
+	Archive::put(target, m_maxDelay);
+}
+
+// ----------------------------------------------------------------------
+void AiMovementLoiter::alter(float time)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementLoiter::alter");
+
+	AiMovementWaypoint::alter(time);
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementLoiter::getHibernateOk ( void ) const
+{
+	return true;
+}
+
+// ----------------------------------------------------------------------
+void AiMovementLoiter::getDebugInfo ( std::string & outString) const
+{
+	AiMovementWaypoint::getDebugInfo(outString);
+
+	FormattedString<256> fs;
+	outString += "\n";
+	outString += "AiMovementLoiter:\n";
+
+	Vector const anchor = m_anchor.getPosition_w();
+
+	outString += fs.sprintf("Anchor: (%f, %f, %f)\n", anchor.x, anchor.y, anchor.z);
+	outString += fs.sprintf("Loiter dist: [%f...%f]\n", m_minDistance, m_maxDistance);
+	outString += fs.sprintf("Loiter delay: [%f...%f]\n", m_minDelay, m_maxDelay);
+}
+
+// ----------------------------------------------------------------------
+AiStateResult AiMovementLoiter::stateWaiting(float /*time*/)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementLoiter::stateWaiting");
+
+	if (m_sleepTime > 0.0f)
+	{
+		m_controller->sleep(m_sleepTime);
+		m_sleepTime = 0.0f;
+
+		return ASR_Done;
+	}
+	else
+	{
+		return triggerThinking();
+	}
+}
+
+// ----------------------------------------------------------------------
+AiStateResult AiMovementLoiter::stateThinking(float /*time*/)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementLoiter::stateThinking");
+
+	if (!isAnchorValid())
+	{
+		// If our anchor somehow becomes invalid, put the AI back on track
+		// with a known good anchor position  being the home location
+		// of the AI
+
+		Location const & homeLocation = m_controller->getHomeLocation();
+
+		m_anchor = AiLocation(homeLocation.getCell(), homeLocation.getCoordinates());
+	}
+
+	if (generateWaypoint())
+	{
+		// Successfully picked a new loiter location
+
+		m_sleepTime = Random::randomReal(m_minDelay, m_maxDelay);
+		return triggerMoving();
+	}
+
+	// Failed to pick a new loiter location
+
+	m_sleepTime = s_failedSelectWaypointSleepTime;
+	return triggerWaiting();
+}
+
+// ----------------------------------------------------------------------
+AiStateResult AiMovementLoiter::stateMoving(float time)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementLoiter::stateMoving");
+
+	if (!isAnchorValid())
+	{
+		return triggerTargetLost();
+	}
+
+	if (m_controller->getStuckCounter() > 5)
+	{
+		if (m_goalLocationIndex >= 0)
+		{
+			LOGC(AiLogManager::isLogging(m_controller->getOwner()->getNetworkId()), "debug_ai", ("AiMovementLoiter::stateMoving() owner(%s:%s) waypointCount(%u/%u) I was stuck...removing bad index(%d)...warping to anchor position", m_controller->getOwner()->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_controller->getOwner()->getDebugName(), FileNameUtils::fileName).c_str(), m_cachedAiLocations->size(), s_maxCachedAiLocations, m_goalLocationIndex));
+
+			m_controller->warpTo(m_anchor.getCell(), m_anchor.getPosition_p());
+			(*m_cachedAiLocations).erase((*m_cachedAiLocations).begin() + m_goalLocationIndex);
+		}
+		else
+		{
+			LOGC(AiLogManager::isLogging(m_controller->getOwner()->getNetworkId()), "debug_ai", ("AiMovementLoiter::stateMoving() owner(%s:%s) I was stuck...and I don't even have any loiter positions!", m_controller->getOwner()->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_controller->getOwner()->getDebugName(), FileNameUtils::fileName).c_str()));
+		}
+
+		return triggerThinking();
+	}
+
+	return AiMovementWaypoint::stateMoving(time);
+}
+
+// ----------------------------------------------------------------------
+AiStateResult AiMovementLoiter::triggerWaiting()
+{
+	m_controller->triggerScriptsWithParam(Scripting::TRIG_LOITER_WAITING, m_sleepTime);
+
+	return AiMovementWaypoint::triggerWaiting();
+}
+
+// ----------------------------------------------------------------------
+AiStateResult AiMovementLoiter::triggerThinking()
+{
+	CHANGE_STATE( AiMovementLoiter::stateThinking);
+
+	return ASR_Continue;
+}
+
+// ----------------------------------------------------------------------
+AiStateResult AiMovementLoiter::triggerMoving()
+{
+	m_controller->triggerScriptsSimple(Scripting::TRIG_LOITER_MOVING);
+
+	return AiMovementWaypoint::triggerMoving();
+}
+
+// ----------------------------------------------------------------------
+AiStateResult AiMovementLoiter::triggerWaypoint()
+{
+	m_controller->triggerScriptsSimple(Scripting::TRIG_LOITER_WAYPOINT);
+
+	return AiMovementWaypoint::triggerWaypoint();
+}
+
+// ----------------------------------------------------------------------
+AiStateResult AiMovementLoiter::triggerTargetLost()
+{
+	return AiMovementWaypoint::triggerTargetLost();
+}
+
+// ----------------------------------------------------------------------
+bool AiMovementLoiter::hasWaypoint() const
+{
+	return m_target.isValid();
+}
+
+// ----------------------------------------------------------------------
+AiLocation const & AiMovementLoiter::getWaypoint() const
+{
+	return m_target;
+}
+
+// ----------------------------------------------------------------------
+bool AiMovementLoiter::updateWaypoint()
+{
+	m_target.update();
+	m_anchor.update();
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+void AiMovementLoiter::clearWaypoint()
+{
+	m_target = AiLocation();
+}
+
+// ----------------------------------------------------------------------
+bool AiMovementLoiter::generateWaypoint()
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementLoiter::generateWaypoint");
+
+	bool result = false;
+	CreatureObject * const creatureOwner = m_controller->getCreature();
+
+	// If somehow the position of the waypoint changes, then start
+	// recalculating the waypoints
+	{
+		if (m_anchor.hasChanged())
+		{
+			LOGC(AiLogManager::isLogging(creatureOwner->getNetworkId()), "debug_ai", ("AiMovementLoiter::generateWaypoint(anchorChanged) owner(%s:%s) waypointCount(%u/%u)", creatureOwner->getNetworkId().getValueString().c_str(), FileNameUtils::get(creatureOwner->getDebugName(), FileNameUtils::fileName).c_str(), m_cachedAiLocations->size(), s_maxCachedAiLocations));
+
+			m_anchor.setChanged(false);
+			m_cachedAiLocations->clear();
+			m_goalLocationIndex = -1;
+			m_bubbleCheckResult = BCR_invalid;
+		}
+	}
+
+	// If we are not at full capacity on waypoints, lets keep creating more
+	{
+		if (m_cachedAiLocations->size() < m_cachedAiLocations->capacity())
+		{
+			Vector randomPosition_p = getRandomLoiterPosition_p(m_anchor.getPosition_p(), m_minDistance, m_maxDistance);
+
+			// First check to see if we are standing on a floor
+
+			Floor const * const ownerFloor = CollisionWorld::getFloorStandingOn(*creatureOwner);
+
+			if (ownerFloor != NULL)
+			{
+				// The owner is standing on a floor
+
+				Vector floorPosition_p;
+
+				if (isPositionOnFloor(ownerFloor, randomPosition_p, creatureOwner->getRadius(), floorPosition_p))
+				{
+					m_cachedAiLocations->push_back(AiLocation(m_controller->getCreatureCell(), floorPosition_p));
+
+					LOGC(AiLogManager::isLogging(creatureOwner->getNetworkId()), "debug_ai", ("AiMovementLoiter::generateWaypoint(floor) owner(%s:%s) waypointCount(%u/%u)", creatureOwner->getNetworkId().getValueString().c_str(), FileNameUtils::get(creatureOwner->getDebugName(), FileNameUtils::fileName).c_str(), m_cachedAiLocations->size(), s_maxCachedAiLocations));
+				}
+			}
+			else
+			{
+				// The owner is standing on terrain
+
+				// Pre-check to see if there is nothing to collide with. This
+				// check will use a sphere of the max loiter radius centered
+				// around the loiter anchor position.
+				{
+					if (m_bubbleCheckResult == BCR_invalid)
+					{
+						bool const restrictToSameCell = true;
+						float const radius = m_maxDistance;
+						Capsule const capsule(m_anchor.getPosition_p(), m_anchor.getPosition_p(), radius);
+						ColliderList collidedWith;
+
+						CollisionWorld::getDatabase()->queryFor(SpatialDatabase::Q_Static, m_controller->getCreatureCell(), restrictToSameCell, capsule, collidedWith);
+
+						// Check out the collision results
+						{
+							m_bubbleCheckResult = BCR_success;
+							ColliderList::const_iterator iterCollider = collidedWith.begin();
+
+							for (; iterCollider != collidedWith.end(); ++iterCollider)
+							{
+								CollisionProperty * const collisionProperty = *iterCollider;
+								Object const & object = collisionProperty->getOwner();
+
+								if (object.getNetworkId() != creatureOwner->getNetworkId())
+								{
+									// We have collided with something
+
+									m_bubbleCheckResult = BCR_failure;
+									break;
+								}
+							}
+						}
+					}
+				}
+
+				// Make sure the loiter position is not on impassible terrain
+
+				TerrainObject const * const terrainObject = TerrainObject::getConstInstance();
+
+				if (   (terrainObject != NULL)
+				    && terrainObject->isPassable(randomPosition_p))
+				{
+					// Snap the random position to the terrain
+					{
+						float terrainHeight;
+
+						if (terrainObject->getHeightForceChunkCreation(randomPosition_p, terrainHeight))
+						{
+							randomPosition_p = Vector(randomPosition_p.x, terrainHeight, randomPosition_p.z);
+						}
+					}
+
+					bool collision = false;
+
+					// If we failed the bubble check, see if we can straight line to the random position
+					{
+						if (m_bubbleCheckResult != BCR_success)
+						{
+							// We know there is some objects around us so try to find some good
+							// positions by casting a ray from the anchor location to the random position
+
+							bool const restrictToSameCell = true;
+							float const radius = creatureOwner->getCollisionSphereExtent_o().getRadius();
+							Capsule const capsule(m_anchor.getPosition_p(), randomPosition_p, radius);
+							ColliderList collidedWith;
+
+							CollisionWorld::getDatabase()->queryFor(SpatialDatabase::Q_Static, m_controller->getCreatureCell(), restrictToSameCell, capsule, collidedWith);
+
+							// Check out the collision results
+							{
+								ColliderList::const_iterator iterCollider = collidedWith.begin();
+
+								for (; iterCollider != collidedWith.end(); ++iterCollider)
+								{
+									CollisionProperty * const collisionProperty = *iterCollider;
+									Object const & object = collisionProperty->getOwner();
+
+									if (object.getNetworkId() != creatureOwner->getNetworkId())
+									{
+										BaseExtent const * const extent = collisionProperty->getExtent_l();
+
+										if (extent != NULL)
+										{
+											Vector const begin_o(object.rotateTranslate_w2o(m_anchor.getPosition_p()));
+											Vector const end_o(object.rotateTranslate_w2o(randomPosition_p));
+
+											if (extent->intersect(begin_o, end_o))
+											{
+												// We have collided with something
+
+												collision = true;
+												break;
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+
+					// If there was no collisions to this point then save it
+					{
+						if (!collision)
+						{
+							m_cachedAiLocations->push_back(AiLocation(m_controller->getCreatureCell(), randomPosition_p));
+							LOGC(AiLogManager::isLogging(creatureOwner->getNetworkId()), "debug_ai", ("AiMovementLoiter::generateWaypoint(terrain) owner(%s:%s) waypointCount(%u/%u)", creatureOwner->getNetworkId().getValueString().c_str(), FileNameUtils::get(creatureOwner->getDebugName(), FileNameUtils::fileName).c_str(), m_cachedAiLocations->size(), s_maxCachedAiLocations));
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// If we have some cached locations, then lets pick one
+	{
+		if (!m_cachedAiLocations->empty())
+		{
+			int const cachedAiLocationCount = static_cast<int>(m_cachedAiLocations->size());
+			int const index = rand() % cachedAiLocationCount;
+
+			if (index != m_goalLocationIndex)
+			{
+				result = true;
+				m_goalLocationIndex = index;
+				m_target = (*m_cachedAiLocations)[static_cast<unsigned int>(index)];
+			}
+			else
+			{
+				m_target.clear();
+			}
+		}
+	}
+
+	return result;
+}
+
+#ifdef _DEBUG
+// ----------------------------------------------------------------------
+void AiMovementLoiter::addDebug(AiDebugString & aiDebugString)
+{
+	AiMovementWaypoint::addDebug(aiDebugString);
+
+	FormattedString<512> fs;
+	aiDebugString.addText(fs.sprintf("LOITER %s\n%s\ndist[%.0f...%.0f]\ndelay[%.1f...%.1f]\n", (m_anchor.getObject() != NULL) ? "TARGET" : "POSITION", m_stateName.c_str(), m_minDistance, m_maxDistance, m_minDelay, m_maxDelay), PackedRgb::solidCyan);
+
+	//if (m_bubbleCheckResult == BCR_invalid)
+	//{
+	//	aiDebugString.addText("BubbleCheckResult: invalid\n", PackedRgb::solidCyan);
+	//}
+	//else if (m_bubbleCheckResult == BCR_success)
+	//{
+	//	aiDebugString.addText("BubbleCheckResult: success\n", PackedRgb::solidCyan);
+	//}
+	//else if (m_bubbleCheckResult == BCR_failure)
+	//{
+	//	aiDebugString.addText("BubbleCheckResult: failure\n", PackedRgb::solidCyan);
+	//}
+
+	// Draw the current anchor position
+	{
+		Object const * const anchorObject = m_anchor.getObject();
+
+		if (anchorObject != NULL)
+		{
+			// We are anchored to a moving target
+
+			aiDebugString.addLineToPosition(anchorObject->getPosition_w(), PackedRgb::solidYellow);
+		}
+		else
+		{
+			// We are anchored to a stationary target
+
+			Location const & homeLocation = m_controller->getHomeLocation();
+
+			if (   (homeLocation.getCoordinates() != m_anchor.getPosition_p())
+			    && (homeLocation.getCell() != m_anchor.getCellId()))
+			{
+				aiDebugString.addLineToPosition(m_anchor.getPosition_w(), PackedRgb::solidYellow);
+			}
+		}
+	}
+
+	// Draw all the current cached locations
+	{
+		CachedAiLocations::const_iterator iterCachedAiLocations = m_cachedAiLocations->begin();
+
+		for (; iterCachedAiLocations != m_cachedAiLocations->end(); ++iterCachedAiLocations)
+		{
+			AiLocation const & location = *iterCachedAiLocations;
+			Vector const & center_w = location.getPosition_w();
+			float const radius = 0.25f;
+			aiDebugString.addCircle(center_w, radius, PackedRgb::solidCyan);
+		}
+	}
+}
+#endif // _DEBUG
+
+// ----------------------------------------------------------------------
+AiMovementType AiMovementLoiter::getType() const
+{
+	return AMT_loiter;
+}
+
+// ----------------------------------------------------------------------
+AiMovementLoiter * AiMovementLoiter::asAiMovementLoiter()
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+bool AiMovementLoiter::isAnchorValid() const
+{
+	bool result = true;
+
+	if (!m_anchor.isValid())
+	{
+		result = false;
+	}
+	else
+	{
+		TangibleObject const * const tangibleObject = TangibleObject::asTangibleObject(m_anchor.getObject());
+
+		if (tangibleObject != NULL)
+		{
+			if (tangibleObject->isInCombat())
+			{
+				result = false;
+			}
+		}
+	}
+
+	return result;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementLoiter.h b/engine/server/library/serverGame/src/shared/ai/AiMovementLoiter.h
new file mode 100644
index 00000000..4794ff65
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementLoiter.h
@@ -0,0 +1,111 @@
+// ======================================================================
+//
+// AiMovementLoiter.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiMovementLoiter_H
+#define	INCLUDED_AiMovementLoiter_H
+
+#include "serverGame/AiMovementWaypoint.h"
+
+class AiDebugString;
+
+class AiMovementLoiter : public AiMovementWaypoint
+{
+public:
+
+	explicit AiMovementLoiter( AICreatureController * controller );
+
+	AiMovementLoiter( AICreatureController * controller,
+	                  CellProperty const * anchorCell,
+	                  Vector const & anchor,
+	                  float minDistance,
+	                  float maxDistance,
+	                  float minDelay,
+	                  float maxDelay );
+
+	AiMovementLoiter( AICreatureController * controller,
+	                  ServerObject const * anchor,
+	                  float minDistance,
+	                  float maxDistance,
+	                  float minDelay,
+	                  float maxDelay );
+
+	AiMovementLoiter( AICreatureController * controller,
+	                  Archive::ReadIterator & source );
+
+	virtual ~AiMovementLoiter();
+
+	virtual AiMovementType getType() const;
+	virtual AiMovementLoiter * asAiMovementLoiter();
+
+	// ----------
+	// from AiMovementBase
+
+	virtual void               pack              ( Archive::ByteStream & target ) const;
+	virtual void               alter             ( float time );
+	virtual bool               getHibernateOk    ( void ) const;
+
+	virtual void               getDebugInfo      ( std::string & outString ) const;
+
+	// states & triggers
+
+	virtual AiStateResult      stateWaiting      ( float time );
+	virtual AiStateResult      stateThinking     ( float time );
+	virtual AiStateResult      stateMoving       ( float time );
+
+	virtual AiStateResult      triggerWaiting    ( void );
+	virtual AiStateResult      triggerThinking   ( void );
+	virtual AiStateResult      triggerMoving     ( void );
+
+	virtual AiStateResult      triggerWaypoint   ( void );
+	virtual AiStateResult      triggerTargetLost ( void );
+
+	// waypoints
+
+	virtual bool               hasWaypoint       ( void ) const;
+	virtual AiLocation const & getWaypoint       ( void ) const;
+	virtual bool               updateWaypoint    ( void );
+	virtual void               clearWaypoint     ( void );
+	virtual bool			   generateWaypoint  ( void );
+
+#ifdef _DEBUG
+	virtual void addDebug(AiDebugString & aiDebugString);
+#endif // _DEBUG
+
+protected:
+
+	enum BubbleCheckResult
+	{
+		  BCR_invalid
+		, BCR_success
+		, BCR_failure
+	};
+
+	typedef stdvector<AiLocation>::fwd CachedAiLocations;
+
+	AiLocation m_anchor;
+	AiLocation m_target;
+	float m_sleepTime;
+	float m_minDistance;
+	float m_maxDistance;
+	float m_minDelay;
+	float m_maxDelay;
+	bool m_active;
+	CachedAiLocations * m_cachedAiLocations;
+	int m_goalLocationIndex;
+	BubbleCheckResult m_bubbleCheckResult;
+
+private:
+
+	bool isAnchorValid() const;
+};
+
+// ======================================================================
+
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementMove.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementMove.cpp
new file mode 100644
index 00000000..9641e7e3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementMove.cpp
@@ -0,0 +1,320 @@
+// ======================================================================
+//
+// AiMovementMove.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiMovementMove.h"
+
+#include "serverGame/AiMovementArchive.h"
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ServerWorld.h"
+
+#include "serverPathfinding/ServerPathBuilder.h"
+
+#include "sharedFoundation/DynamicVariableLocationData.h"
+#include "serverScript/ScriptFunctionTable.h"
+
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedCollision/Floor.h"
+#include "sharedCollision/FloorMesh.h"
+
+#include "sharedDebug/PerformanceTimer.h"
+#include "sharedFoundation/FormattedString.h"
+
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/PortalProperty.h"
+#include "sharedObject/PortalPropertyTemplate.h"
+
+#include "UnicodeUtils.h"
+
+using namespace Scripting;
+
+
+// ======================================================================
+
+AiMovementMove::AiMovementMove( AICreatureController * controller )
+: AiMovementTarget(controller),
+  m_start(controller->getCreatureCell(),controller->getCreaturePosition_p()),
+  m_targetName(),
+  m_pathBuilder( new ServerPathBuilder() )
+{
+	CHANGE_STATE( AiMovementMove::stateWaiting );
+}
+
+AiMovementMove::AiMovementMove( AICreatureController * controller, CellProperty const * cell, Vector const & target, float radius )
+: AiMovementTarget(controller, cell, target, radius),
+  m_start(controller->getCreatureCell(),controller->getCreaturePosition_p()),
+  m_targetName(),
+  m_pathBuilder( new ServerPathBuilder() )
+{
+	CHANGE_STATE( AiMovementMove::stateWaiting );
+}
+
+// ----------
+
+AiMovementMove::AiMovementMove( AICreatureController * controller, Unicode::String const & targetName )
+: AiMovementTarget(controller),
+  m_start(),
+  m_targetName(targetName),
+  m_pathBuilder( new ServerPathBuilder() )
+{
+	CHANGE_STATE( AiMovementMove::stateWaiting );
+}
+
+// ----------
+
+AiMovementMove::AiMovementMove( AICreatureController * controller, Archive::ReadIterator & source )
+: AiMovementTarget(controller, source),
+  m_start(source),
+  m_targetName(),
+  m_pathBuilder( new ServerPathBuilder() )
+{
+	Archive::get(source, m_targetName);
+
+	SETUP_SYNCRONIZED_STATE( AiMovementMove::stateWaiting );
+	SETUP_SYNCRONIZED_STATE( AiMovementMove::statePathing );
+}
+
+// ----------
+
+AiMovementMove::~AiMovementMove()
+{
+	delete m_pathBuilder;
+	m_pathBuilder = NULL;
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementMove::pack( Archive::ByteStream & target ) const
+{
+	AiMovementTarget::pack(target);
+	m_start.pack(target);
+	Archive::put(target, m_targetName);
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementMove::alter ( float time )
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementMove::alter");
+
+	AiMovementTarget::alter(time);
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementMove::getDebugInfo ( std::string & outString ) const
+{
+	AiMovementTarget::getDebugInfo(outString);
+
+	Vector const & start_w = m_start.getPosition_w();
+	Vector const & goal_w = m_target.getPosition_w();
+
+	outString += FormattedString<1024>().sprintf("AiMovementMove: start(%.2f, %.2f, %.2f) goal(%.2f, %.2f, %.2f)", start_w.x, start_w.y, start_w.z, goal_w.x, goal_w.y, goal_w.z);
+
+	if (!m_targetName.empty())
+	{
+		outString += FormattedString<1024>().sprintf(" goalName(%s)", Unicode::wideToNarrow(m_targetName).c_str());
+	}
+	outString += "\n";
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementMove::clear ( void )
+{
+	m_target = AiLocation();
+	m_targetName.clear();
+	AiMovementTarget::clear();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Recalculate our path.
+ */
+void AiMovementMove::refresh( void )
+{
+	// save our target, since it's going to get cleared in AiMovementMove::clear 
+	// as a side effect of AiMovementTarget::refresh()
+	const AiLocation target(m_target);
+	const Unicode::String targetName(m_targetName);
+
+	AiMovementTarget::refresh();
+	
+	// restore our target
+	m_target = target;
+	m_targetName = targetName;
+	
+	if (m_controller != NULL)
+		m_start = AiLocation(m_controller->getCreatureCell(), m_controller->getCreaturePosition_p());
+	CHANGE_STATE( AiMovementMove::stateWaiting );
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementMove::stateWaiting ( float time )
+{
+	if(m_target.isValid() || !m_targetName.empty())
+		return triggerPathing();
+
+	return ASR_Done;
+}
+
+// ----------
+
+AiStateResult AiMovementMove::statePathing ( float time )
+{
+	if(!m_pathBuilder->buildDone())
+		return ASR_Done;
+
+	if(m_pathBuilder->buildFailed())
+		return triggerPathNotFound();
+
+	// ----------
+	// path search is done and succeeded - transition to moving state
+
+	swapPath(m_pathBuilder->getPath());
+
+	if(!m_targetName.empty())
+	{
+		if(hasPath())
+		{
+			m_target = getPath()->back();
+		}
+	}
+	else
+	{
+		addPathNode(m_target);
+	}
+
+	return triggerMoving();
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementMove::triggerPathing ( void )
+{
+	if(setupPathSearch())
+	{
+		CHANGE_STATE( AiMovementMove::statePathing );
+
+		return ASR_Continue;
+	}
+	else
+	{
+		return triggerPathNotFound();
+	}
+}
+
+// ----------
+
+AiStateResult AiMovementMove::triggerMoving ( void )
+{
+	m_controller->triggerScriptsSimple(TRIG_MOVE_MOVING);
+
+	return AiMovementTarget::triggerMoving();
+}
+
+// ----------
+
+AiStateResult AiMovementMove::triggerTargetLost ( void )
+{
+	endBehavior();
+
+	return AiMovementTarget::triggerTargetLost();
+}
+
+// ----------
+
+AiStateResult AiMovementMove::triggerPathNotFound ( void )
+{
+	m_controller->triggerScriptsSimple(TRIG_MOVE_PATH_NOT_FOUND);
+
+	if (m_controller->isRetreating())
+	{
+		m_controller->setRetreating(false);
+	}
+
+	endBehavior();
+
+	return ASR_Done;
+}
+
+// ----------
+
+AiStateResult AiMovementMove::triggerPathComplete( void )
+{
+	if (m_controller->isRetreating())
+	{
+		m_controller->setRetreating(false);
+	}
+
+	m_controller->triggerScriptsSimple(TRIG_MOVE_PATH_COMPLETE);
+
+	endBehavior();
+
+	return AiMovementTarget::triggerPathComplete();
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementMove::setupPathSearch ( void )
+{
+	if(!m_targetName.empty())
+	{
+		return m_pathBuilder->buildPath_Async( m_controller->getCreature(), m_targetName );
+	}
+
+	// ----------
+
+	if (m_target.getRadius() > 0)
+	{
+		// for the moment, adjust the target to the nearest point on the bounding 
+		// sphere to the ai. we would like to make this more dynamic later (because 
+		// the nearest point might not be reachable, or might change because of the
+		// ai moving around to avoid obsticles).
+		Vector v(m_start.getPosition_w() - m_target.getPosition_w());
+		v.approximateNormalize();
+		v *= m_target.getRadius();
+		m_target.setPosition_w(v + m_target.getPosition_w());
+		m_target.setRadius(0);
+	}
+
+	if(!CollisionWorld::testClear(m_target.getCell(),Sphere(m_target.getPosition_p(),m_target.getRadius())))
+	{
+		return false;
+	}
+	else
+	{
+		return m_pathBuilder->buildPath_Async( m_controller->getCreature(), m_target );
+	}
+}
+
+// ----------------------------------------------------------------------
+
+AiMovementType AiMovementMove::getType() const
+{
+	return AMT_move;
+}
+
+// ----------------------------------------------------------------------
+
+AiMovementMove * AiMovementMove::asAiMovementMove()
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+Unicode::String const & AiMovementMove::getTargetName() const
+{
+	return m_targetName;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementMove.h b/engine/server/library/serverGame/src/shared/ai/AiMovementMove.h
new file mode 100644
index 00000000..a99400e7
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementMove.h
@@ -0,0 +1,75 @@
+// ======================================================================
+//
+// AiMovementMove.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiMovementMove_H
+#define	INCLUDED_AiMovementMove_H
+
+#include "serverGame/AiMovementTarget.h"
+
+class CellProperty;
+class PathGraph;
+class PortalProperty;
+class AiLocation;
+
+typedef stdvector<int>::fwd IndexList;
+
+// ======================================================================
+// The simple move behavior moves to the waypoint, and then transitions
+// back to idle state
+
+class AiMovementMove : public AiMovementTarget
+{
+public:
+
+	explicit AiMovementMove( AICreatureController * controller );
+	AiMovementMove( AICreatureController * controller, CellProperty const * cell, Vector const & target, float radius = 0.0f );
+	AiMovementMove( AICreatureController * controller, Unicode::String const & targetName );	
+	AiMovementMove( AICreatureController * controller, Archive::ReadIterator & source );
+
+	virtual ~AiMovementMove();
+	
+	virtual AiMovementType getType() const;
+	virtual AiMovementMove * asAiMovementMove();
+
+	// ----------
+	
+	virtual void          pack                ( Archive::ByteStream & target ) const;
+	virtual void          alter               ( float time );
+	virtual void          getDebugInfo        ( std::string & outString ) const;
+	virtual void          clear               ( void );
+	virtual void          refresh             ( void );
+
+	// states & triggers
+
+	virtual AiStateResult stateWaiting        ( float time );
+	virtual AiStateResult statePathing        ( float time );
+
+	virtual AiStateResult triggerPathing      ( void );
+	virtual AiStateResult triggerMoving       ( void );
+
+	virtual AiStateResult triggerTargetLost   ( void );
+	virtual AiStateResult triggerPathComplete ( void );
+	virtual AiStateResult triggerPathNotFound ( void );
+	
+	// misc
+
+	virtual bool          setupPathSearch     ( void );
+
+	Unicode::String const & getTargetName() const;
+
+protected:
+
+	AiLocation          m_start;
+	Unicode::String     m_targetName;
+	ServerPathBuilder * m_pathBuilder;
+};
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementPathFollow.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementPathFollow.cpp
new file mode 100644
index 00000000..2105c898
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementPathFollow.cpp
@@ -0,0 +1,436 @@
+// ======================================================================
+//
+// AiMovementPathFollow.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiMovementPathFollow.h"
+
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/AiMovementArchive.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverPathfinding/ServerPathBuilder.h"
+#include "serverPathfinding/ServerPathfindingMessaging.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedPathfinding/ConfigSharedPathfinding.h"
+
+using namespace Scripting;
+
+// ======================================================================
+//
+// AiMovementPathFollowNamespace
+//
+// ======================================================================
+
+namespace AiMovementPathFollowNamespace
+{
+	float const s_maxCutDistance = 64.0f;
+}
+
+using namespace AiMovementPathFollowNamespace;
+
+// ----------------------------------------------------------------------
+
+#ifdef _DEBUG
+
+void sendWaypointInfo ( AiLocation const & loc )
+{
+	UNREF(loc);
+
+	if(ConfigServerGame::getSendBreadcrumbs())
+	{
+		ServerPathfindingMessaging::getInstance().sendWaypointInfo(loc);
+	}
+}
+
+// ----------
+
+void sendEraseWaypoint ( AiLocation const & loc )
+{
+	UNREF(loc);
+
+	if(ConfigServerGame::getSendBreadcrumbs())
+	{
+		ServerPathfindingMessaging::getInstance().sendEraseWaypoint(loc);
+	}
+}
+
+#endif
+
+// ======================================================================
+
+AiMovementPathFollow::AiMovementPathFollow( AICreatureController * controller )
+: AiMovementWaypoint( controller ),
+  m_path( new AiPath() )
+{
+}
+
+AiMovementPathFollow::AiMovementPathFollow( AICreatureController * controller, Archive::ReadIterator & source )
+: AiMovementWaypoint( controller, source ),
+  m_path( new AiPath() )
+{
+	if (m_path != NULL)
+		Archive::get(source, *m_path);
+}
+
+// ----------
+
+AiMovementPathFollow::~AiMovementPathFollow()
+{
+	clearPath();
+
+	delete m_path;
+	m_path = NULL;
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementPathFollow::pack( Archive::ByteStream & target ) const
+{
+	AiMovementWaypoint::pack(target);
+	if (m_path != NULL)
+		Archive::put(target, *m_path);
+	else
+		Archive::put(target, static_cast<int>(0));
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementPathFollow::alter ( float time )
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementPathFollow::alter");
+
+	cutPath();
+
+	AiMovementWaypoint::alter(time);
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementPathFollow::getDebugInfo ( std::string & outString ) const
+{
+	AiMovementWaypoint::getDebugInfo(outString);
+
+	outString += "\n";
+
+	outString += "AiMovementPathFollow:\n";
+
+	char buffer[256];
+
+	sprintf(buffer,"Path length : %d\n",m_path->size());
+	outString += buffer;
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementPathFollow::clear ( void )
+{
+	AiMovementWaypoint::clear();
+	clearPath();
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementPathFollow::refresh( void )
+{
+	AiMovementWaypoint::refresh();
+	clear();
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementPathFollow::triggerWaypoint ( void )
+{
+	clearWaypoint();
+
+	if(m_path->empty())
+	{
+		return triggerPathComplete();
+	}
+	else
+	{
+		return ASR_Done;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementPathFollow::triggerPathComplete ( void )
+{
+	return triggerWaiting();
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementPathFollow::hasWaypoint ( void ) const
+{
+	return !m_path->empty();
+}
+
+// ----------------------------------------------------------------------
+
+AiLocation const & AiMovementPathFollow::getWaypoint ( void ) const
+{
+	if(m_path->empty())
+	{
+		DEBUG_FATAL(true,("AiMovementPathFollow::getWaypoint - no waypoint, path is empty.\n"));
+	}
+
+	return m_path->front();
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementPathFollow::updateWaypoint ( void )
+{
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementPathFollow::clearWaypoint ( void )
+{
+	popNodeFront();
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementPathFollow::getDecelerate ( void ) const
+{
+	if(getPathLength() > 1)
+		return false;
+	else
+		return AiMovementWaypoint::getDecelerate();
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementPathFollow::addPathNode ( AiLocation const & newNode )
+{
+	if(!newNode.isValid()) return;
+
+	m_path->push_back(newNode);
+
+	m_path->back().detach();
+
+#ifdef _DEBUG
+	sendWaypointInfo(m_path->back());
+#endif
+
+	// sanity check
+
+	if(m_path->size() > 200)
+	{
+		endBehavior();
+
+		triggerTargetLost();
+
+		return;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementPathFollow::popNodeFront ( void )
+{
+	if(m_path->empty()) return;
+
+#ifdef _DEBUG
+	sendEraseWaypoint(m_path->front());
+#endif
+
+	m_path->erase(m_path->begin());
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementPathFollow::popNodeBack ( void )
+{
+	if(m_path->empty()) return;
+
+#ifdef _DEBUG
+	sendEraseWaypoint(m_path->back());
+#endif
+
+	AiPath::iterator it = m_path->end();
+
+	it--;
+
+	m_path->erase(it);
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementPathFollow::hasPath ( void ) const
+{
+	return m_path && !m_path->empty();
+}
+
+// ----------------------------------------------------------------------
+
+int AiMovementPathFollow::getPathLength ( void ) const
+{
+	return m_path->size();
+}
+
+// ----------------------------------------------------------------------
+
+AiPath const * AiMovementPathFollow::getPath ( void ) const
+{
+	return m_path;
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementPathFollow::swapPath ( AiPath * newPath )
+{
+	if(newPath == NULL) return;
+
+	AiPath::iterator it;
+
+#ifdef _DEBUG
+	for(it = m_path->begin(); it != m_path->end(); it++)
+	{
+		sendEraseWaypoint(*it);
+	}
+#endif
+
+	m_path->clear();
+
+	m_path->swap(*newPath);
+
+	for(it = m_path->begin(); it != m_path->end(); it++)
+	{
+		(*it).detach();
+
+#ifdef _DEBUG
+		sendWaypointInfo(*it);
+#endif
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementPathFollow::clearPath ( void )
+{
+#ifdef _DEBUG
+
+	if(m_path && !m_path->empty())
+	{
+		AiPath::iterator it;
+
+		for(it = m_path->begin(); it != m_path->end(); it++)
+		{
+			sendEraseWaypoint(*it);
+		}
+	}
+
+#endif
+
+	m_path->clear();
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementPathFollow::cutPath()
+{
+	CreatureObject * const creatureOwner = m_controller->getCreature();
+	Vector const & creaturePosition_p = m_controller->getCreaturePosition_p();
+	CellProperty const * creatureCell = m_controller->getCreatureCell();
+
+	// See if we can move straight to the final path location
+
+	if (m_path->size() > 1)
+	{
+		AiLocation const & finalLocation = m_path->back();
+		Vector const finalPosition_p = finalLocation.getPosition_p(creatureCell);
+		Vector delta = creaturePosition_p - finalPosition_p;
+
+		if (delta.magnitudeSquared() < sqr(s_maxCutDistance))
+		{
+			float const moveRadius = creatureOwner->getRadius();
+			bool const checkY = true;
+			bool const checkFlora = true; // statics
+			bool const checkFauna = false; // dynamics
+
+			if (CollisionWorld::canMove(creatureOwner, finalPosition_p, moveRadius, checkY, checkFlora, checkFauna) == CMR_MoveOK)
+			{
+				// Since we can move to the final path location, remove
+				// all path locations except the final one
+
+				while (m_path->size() > 1)
+				{
+					popNodeFront();
+				}
+			}
+		}
+	}
+
+	// Try to skip the next waypoint
+
+	if (m_path->size() >= 2)
+	{
+		AiPath::iterator iterPath = m_path->begin();
+		Vector delta = creaturePosition_p - iterPath->getPosition_p();
+
+		if (delta.magnitudeSquared() <= sqr(s_maxCutDistance)) 
+		{
+			// Advance to the next path location
+
+			++iterPath;
+
+			if (iterPath->isCuttable())
+			{
+				Vector const finalPosition_p = iterPath->getPosition_p(m_controller->getCreatureCell());
+				float const moveRadius = creatureOwner->getRadius();
+				bool const checkY = true;
+				bool const checkFlora = true; // statics
+				bool const checkFauna = false; // dynamics
+
+				if (CollisionWorld::canMove(creatureOwner, finalPosition_p, moveRadius, checkY, checkFlora, checkFauna) == CMR_MoveOK)
+				{
+					popNodeFront();
+				}
+				else
+				{
+					iterPath->setCuttable(false);
+				}
+			}
+		}
+	}
+
+	return ASR_Continue;
+}
+
+// ======================================================================
+
+namespace Archive
+{
+	void get(ReadIterator & source, AiPath & target)
+	{
+		int size;
+		AiLocation location;
+		get(source, size);
+		for (int i = 0; i < size; ++i)
+		{
+			AiLocation location(source);
+			target.push_back(location);
+			location.clear();
+		}
+	}
+
+	void put(ByteStream & target, const AiPath & source)
+	{
+		put(target, static_cast<int>(source.size()));
+		for (AiPath::const_iterator i = source.begin(); i != source.end(); ++i)
+		{
+			(*i).pack(target);
+		}
+	}
+};
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementPathFollow.h b/engine/server/library/serverGame/src/shared/ai/AiMovementPathFollow.h
new file mode 100644
index 00000000..73bf0e4b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementPathFollow.h
@@ -0,0 +1,87 @@
+// ======================================================================
+//
+// AiMovementPathFollow.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiMovementPathFollow_H
+#define	INCLUDED_AiMovementPathFollow_H
+
+#include "serverGame/AiMovementWaypoint.h"
+
+typedef stdlist<AiLocation>::fwd AiPath;
+class ServerPathBuilder;
+
+// ======================================================================
+
+class AiMovementPathFollow : public AiMovementWaypoint
+{
+public:
+
+	explicit AiMovementPathFollow( AICreatureController * controller );
+	AiMovementPathFollow( AICreatureController * controller, 
+	                      Archive::ReadIterator & source );
+
+	virtual ~AiMovementPathFollow();
+
+	// ----------
+	// from AiMovementBase
+
+	virtual void               pack              ( Archive::ByteStream & target ) const;
+	virtual void               alter             ( float time );
+
+	virtual void               getDebugInfo      ( std::string & outString ) const;
+
+	virtual void               clear             ( void );
+	virtual void               refresh           ( void );
+
+	// states & triggers
+	
+	virtual AiStateResult      triggerWaypoint     ( void );
+	virtual AiStateResult      triggerPathComplete ( void );
+
+	// waypoints
+
+	virtual bool               hasWaypoint       ( void ) const;
+	virtual AiLocation const & getWaypoint       ( void ) const;
+	virtual bool               updateWaypoint    ( void );
+	virtual void               clearWaypoint     ( void );
+
+	// ----------
+
+	virtual bool               getDecelerate     ( void ) const;
+
+	virtual void               addPathNode       ( AiLocation const & newNode );
+	virtual void               popNodeFront      ( void );
+	virtual void               popNodeBack       ( void );
+
+	virtual bool               hasPath           ( void ) const;
+	virtual int                getPathLength     ( void ) const;
+	virtual AiPath const *     getPath           ( void ) const;
+	virtual void               swapPath          ( AiPath * newPath );
+	virtual void               clearPath         ( void );
+
+protected:
+
+	AiStateResult cutPath ( void );
+
+private:
+
+	AiPath * m_path;
+};
+
+// ======================================================================
+
+namespace Archive
+{
+	void get(ReadIterator & source, AiPath & target);
+	void put(ByteStream & target, const AiPath & source);
+};
+
+// ======================================================================
+
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementPatrol.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementPatrol.cpp
new file mode 100644
index 00000000..4ea6a593
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementPatrol.cpp
@@ -0,0 +1,478 @@
+// ======================================================================
+//
+// AiMovementPatrol.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiMovementPatrol.h"
+
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/ServerWorld.h"
+#include "serverPathfinding/CityPathGraphManager.h"
+#include "serverPathfinding/CityPathNode.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedGame/AiDebugString.h"
+#include "UnicodeUtils.h"
+
+
+using namespace Scripting;
+
+
+// ======================================================================
+
+AiMovementPatrol::AiMovementPatrol(AICreatureController * controller, std::vector<Location> const & locations, bool random, bool flip, bool repeat, int startPoint) :
+	AiMovementMove(controller),
+	m_patrolPath(),
+	m_random(random),
+	m_flip(flip),
+	m_repeat(repeat),
+	m_patrolPointIndex(startPoint)
+{
+	int count = locations.size();
+	m_patrolPath.reserve(count);
+	for (std::vector<Location>::const_iterator i = locations.begin(); i != locations.end(); ++i)
+	{
+		const Location & point = *i;
+		m_patrolPath.push_back(AiLocation(point.getCell(), point.getCoordinates()));
+	}
+
+	// this makes sure the path is randomized
+	if (random)
+		m_patrolPointIndex = -1;
+
+	CHANGE_STATE( AiMovementPatrol::stateWaiting );
+}
+
+// ----------
+
+AiMovementPatrol::AiMovementPatrol( AICreatureController * controller, std::vector<Unicode::String> const & locations, bool random, bool flip, bool repeat, int startPoint) :
+	AiMovementMove(controller),
+	m_patrolPath(),
+	m_random(random),
+	m_flip(flip),
+	m_repeat(repeat),
+	m_patrolPointIndex(startPoint)
+{
+	ServerObject * owner = safe_cast<ServerObject *>(controller->getOwner());
+	if (owner != NULL)
+	{
+		DEBUG_REPORT_LOG(ConfigServerGame::isAiLoggingEnabled(), ("AiMovementPatrol creating named path for %s\n", owner->getNetworkId().getValueString().c_str()));
+
+		if (!ServerWorld::isPreloadComplete())
+		{
+			// wait until we know we've loaded all the objects
+			if (!locations.empty())
+			{
+				char buffer[32];
+				std::string data;
+				for (std::vector<Unicode::String>::const_iterator i = locations.begin(); i != locations.end(); ++i)
+				{
+					data += Unicode::wideToNarrow(*i) + "|";
+				}
+				data += random ? '1' : '0';
+				data += flip ? '1' : '0';
+				data += repeat ? '1' : '0';
+				if (startPoint > 0)
+				{
+					data += "*";
+					data += _itoa(startPoint, buffer, 10);
+				}
+				MessageToQueue::sendRecurringMessageToC(owner->getNetworkId(), "C++WaitForPatrolPreload", data, 5);
+				
+				DEBUG_REPORT_LOG(ConfigServerGame::isAiLoggingEnabled(), ("AiMovementPatrol delaying named path for %s until preload is done\n", owner->getNetworkId().getValueString().c_str()));
+				endBehavior();
+				return;
+			}
+		}
+		else
+		{
+			int count = locations.size();
+			m_patrolPath.reserve(count);
+			for (std::vector<Unicode::String>::const_iterator i = locations.begin(); i != locations.end(); ++i)
+			{
+				const Unicode::String & pointName = *i;
+				const CityPathNode * node = CityPathGraphManager::getNamedNodeFor(*owner, pointName);
+				if (node != NULL)
+				{
+					m_patrolPath.push_back(AiLocation(node->getSourceId()));
+				}
+				else
+				{
+					m_patrolPath.clear();
+					WARNING(true, ("AiMovementPatrol unable to find path node %s for object %s", 
+						Unicode::wideToNarrow(pointName).c_str(), 
+						owner->getNetworkId().getValueString().c_str()));
+					break;
+				}
+			}
+			if (!m_patrolPath.empty())
+			{
+				DEBUG_REPORT_LOG(ConfigServerGame::isAiLoggingEnabled(),("AiMovementPatrol created named path for %s\n", owner->getNetworkId().getValueString().c_str()));
+
+				// try an find a node on the path that is a previous root node, or isn't 
+				// being used in any other path
+				std::vector<AiLocation>::iterator i;
+				const ServerObject * node = NULL;
+				const ServerObject * root = NULL;
+				for (i = m_patrolPath.begin(); i != m_patrolPath.end(); ++i)
+				{
+					node = safe_cast<const ServerObject *>(i->getObject());
+					if (node != NULL)
+					{
+						if (node->isPatrolPathRoot())
+						{
+							if (root == NULL || !root->isPatrolPathRoot())
+							{
+								// if we already have a set up root node, use that
+								root = node;
+							}
+							else
+							{
+								// we've got two previous root nodes, we can't connect them
+								root = NULL;
+								break;
+							}
+						}
+						else if (!node->isPatrolPathNode() && root == NULL)
+						{
+							// found a free node
+							root = node;
+						}
+					}
+				}
+				if (root != NULL)
+				{
+					// set up the root node
+					if (!root->isPatrolPathRoot())
+						const_cast<ServerObject *>(root)->setPatrolPathRoot(*root);
+
+					// connect the nodes to the root node
+					for (i = m_patrolPath.begin(); i != m_patrolPath.end(); ++i)
+					{
+						node = safe_cast<const ServerObject *>(i->getObject());
+						if (node != NULL && node != root)
+							const_cast<ServerObject *>(node)->setPatrolPathRoot(*root);
+					}
+					const_cast<ServerObject *>(root)->addPatrolPathingObject(*owner);
+				}
+				else
+				{
+					std::string nodes;
+					for (i = m_patrolPath.begin(); i != m_patrolPath.end(); ++i)
+					{
+						node = safe_cast<const ServerObject *>(i->getObject());
+						if (node != NULL)
+							nodes += node->getNetworkId().getValueString() + " ";
+					}
+					WARNING(true, ("AiMovementPatrol unable to find root node for path: %s", nodes.c_str()));
+				}
+			}
+		}
+	}
+	else
+	{
+		WARNING(true, ("AiMovementPatrol::AiMovementPatrol no owner"));
+	}
+
+	// this makes sure the path is randomized
+	if (random)
+		m_patrolPointIndex = -1;
+
+	CHANGE_STATE( AiMovementPatrol::stateWaiting );
+}
+
+// ----------
+
+AiMovementPatrol::AiMovementPatrol( AICreatureController * controller, Archive::ReadIterator & source ) : 
+	AiMovementMove(controller, source),
+	m_patrolPath(),
+	m_random(false),
+	m_flip(false),
+	m_repeat(false),
+	m_patrolPointIndex(-1)
+{
+	int count;
+	Archive::get(source, count);
+	m_patrolPath.resize(count);
+	for (std::vector<AiLocation>::iterator i = m_patrolPath.begin(); i != m_patrolPath.end(); ++i)
+		(*i).unpack(source);
+		
+	Archive::get(source, m_random);
+	Archive::get(source, m_flip);
+	Archive::get(source, m_repeat);
+	Archive::get(source, m_patrolPointIndex);
+
+	SETUP_SYNCRONIZED_STATE( AiMovementPatrol::stateWaiting );
+}
+
+// ----------
+
+AiMovementPatrol::~AiMovementPatrol()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementPatrol::pack( Archive::ByteStream & target ) const
+{
+	AiMovementMove::pack(target);
+	
+	int count = m_patrolPath.size();
+	Archive::put(target, count);
+	for (std::vector<AiLocation>::const_iterator i = m_patrolPath.begin(); i != m_patrolPath.end(); ++i)
+		(*i).pack(target);
+
+	Archive::put(target, m_random);
+	Archive::put(target, m_flip);
+	Archive::put(target, m_repeat);
+	Archive::put(target, m_patrolPointIndex);
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementPatrol::alter ( float time )
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementPatrol::alter");
+
+	AiMovementMove::alter(time);
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementPatrol::getDebugInfo ( std::string & outString ) const
+{
+	AiMovementMove::getDebugInfo(outString);
+
+	outString += FormattedString<1024>().sprintf("AiMovementPatrol: point index = %d\n", m_patrolPointIndex);
+	outString += "AiMovementPatrol: points:\n";
+	if (!m_patrolPath.empty())
+	{
+		for (std::vector<AiLocation>::const_iterator i = m_patrolPath.begin(); i != m_patrolPath.end(); ++i)
+			(*i).getDebugInfo(outString);
+	}
+	else
+	{
+		outString += "none\n";
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementPatrol::endBehavior()
+{
+	if (!m_patrolPath.empty() && m_controller != NULL)
+	{
+		const ServerObject * owner = safe_cast<const ServerObject *>(m_controller->getOwner());
+		if (owner != NULL)
+		{
+			for (std::vector<AiLocation>::iterator i = m_patrolPath.begin(); i != m_patrolPath.end(); ++i)
+			{
+				const ServerObject * node = safe_cast<const ServerObject *>(i->getObject());
+				if (node != NULL && node->isPatrolPathRoot())
+				{
+					const_cast<ServerObject *>(node)->removePatrolPathingObject(*owner);
+					break;
+				}
+			}		
+		}
+	}
+
+	AiMovementMove::endBehavior();
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementPatrol::clear ( void )
+{
+	DEBUG_REPORT_LOG(ConfigServerGame::isAiLoggingEnabled(), ("AiMovementPatrol clearing path for %s\n", m_controller->getOwner()->getNetworkId().getValueString().c_str()));
+
+	AiMovementMove::clear();
+	m_patrolPath.clear();
+	m_patrolPointIndex = -1;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementPatrol::getHibernateOk() const
+{
+	if (!m_patrolPath.empty())
+	{
+		const ServerObject * node = safe_cast<const ServerObject *>(m_patrolPath.front().getObject());
+		if (node != NULL)
+		{
+			return node->getPatrolPathObservers() == 0;
+		}
+	}
+
+	// we allow patrols to non-named nodes to hibernate
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementPatrol::stateWaiting ( float time )
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementPatrol::stateWaiting");
+
+	if (!m_patrolPath.empty())
+		return triggerPathing();
+	else
+	{
+		DEBUG_REPORT_LOG(ConfigServerGame::isAiLoggingEnabled(), ("AiMovementPatrol waiting: no path for %s\n", m_controller->getOwner()->getNetworkId().getValueString().c_str()));
+
+		m_controller->triggerScriptsSimple(TRIG_MOVE_PATH_NOT_FOUND);
+		endBehavior();
+	}		
+
+	return ASR_Done;
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementPatrol::triggerWaiting( void )
+{
+	CHANGE_STATE( AiMovementPatrol::stateWaiting );
+	return ASR_Done;
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementPatrol::triggerPathComplete( void )
+{
+	if (m_controller->isRetreating())
+	{
+		m_controller->setRetreating(false);
+	}
+
+	if (m_patrolPointIndex >= static_cast<int>(m_patrolPath.size()))
+	{
+		m_controller->triggerScriptsSimple(TRIG_MOVE_PATH_COMPLETE);
+		if (!m_repeat)
+		{
+			DEBUG_REPORT_LOG(ConfigServerGame::isAiLoggingEnabled(), ("AiMovementPatrol path complete for %s\n", m_controller->getOwner()->getNetworkId().getValueString().c_str()));
+			endBehavior();
+			return ASR_Done;
+		}
+	}
+
+	return triggerWaiting();
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementPatrol::setupPathSearch ( void )
+{
+	// choose the next patrol point we're going to
+	int count = m_patrolPath.size();
+	if (m_patrolPointIndex < 0 && count > 0)
+	{
+		m_patrolPointIndex = 0;
+		if (m_random)
+		{
+			std::random_shuffle(m_patrolPath.begin(), m_patrolPath.end());
+		}
+	}
+	if (m_patrolPointIndex >= 0 && m_patrolPointIndex < count)
+	{
+		m_target = m_patrolPath[m_patrolPointIndex++];
+		if (m_patrolPointIndex == count && m_repeat)
+		{
+			m_patrolPointIndex = -1;
+			if (m_flip)
+			{
+				std::reverse(m_patrolPath.begin(), m_patrolPath.end());
+			}
+		}
+	}
+
+	return AiMovementMove::setupPathSearch();
+}
+
+// ----------------------------------------------------------------------
+
+AiMovementType AiMovementPatrol::getType() const
+{
+	return AMT_patrol;
+}
+
+// ----------------------------------------------------------------------
+
+AiMovementPatrol * AiMovementPatrol::asAiMovementPatrol()
+{
+	return this;
+}
+
+#ifdef _DEBUG
+// ----------------------------------------------------------------------
+void AiMovementPatrol::addDebug(AiDebugString & aiDebugString)
+{
+	FormattedString<512> fs;
+	AiPath const * const path = getPath();
+
+	aiDebugString.addText(fs.sprintf("PATROL\n"), PackedRgb::solidCyan);
+	aiDebugString.addText(fs.sprintf("%s\n", m_stateName.c_str()), PackedRgb::solidCyan);
+	aiDebugString.addText(fs.sprintf("pathSize(%u)\n", path->size()), PackedRgb::solidCyan);
+	aiDebugString.addText(fs.sprintf("patrolPathSize(%u)\n", m_patrolPath.size()), PackedRgb::solidCyan);
+	aiDebugString.addText(fs.sprintf("random(%s)\n", m_random ? "yes" : "no"), PackedRgb::solidCyan);
+	aiDebugString.addText(fs.sprintf("flip(%s)\n", m_flip ? "yes" : "no"), PackedRgb::solidCyan);
+	aiDebugString.addText(fs.sprintf("repeat(%s)\n", m_repeat ? "yes" : "no"), PackedRgb::solidCyan);
+	aiDebugString.addText(fs.sprintf("patrolPointIndex(%i)\n", m_patrolPointIndex), PackedRgb::solidCyan);
+	aiDebugString.addText(fs.sprintf("stuckCounter(%i)\n", m_controller->getStuckCounter()), PackedRgb::solidCyan);
+	aiDebugString.addText(fs.sprintf("avoidanceStuckTime(%.0f)\n", m_avoidanceStuckTime), PackedRgb::solidCyan);
+	aiDebugString.addText(fs.sprintf("obstacle(%s)\n", m_obstacleLocation.getObjectId().getValueString().c_str()), PackedRgb::solidCyan);
+
+	//// Render the movement path
+	//{
+	//	if (!path->empty())
+	//	{
+	//		AiDebugString::TransformList transformList;
+	//		AiPath::const_iterator iterPath = path->begin();
+	//	
+	//		Transform transform(m_controller->getOwner()->getTransform_o2p());
+	//		transform.move_l(Vector(0.0f, 0.1f, 0.0f));
+	//		transformList.push_back(transform);
+	//	
+	//		for (; iterPath != path->end(); ++iterPath)
+	//		{
+	//			transform.setPosition_p(iterPath->getPosition_p());
+	//			transform.move_l(Vector(0.0f, 0.1f, 0.0f));
+	//			transformList.push_back(transform);
+	//		}
+	//	
+	//		bool const cyclic = false;
+	//		aiDebugString.addPath(transformList, cyclic);
+	//	}
+	//}
+
+	// Render the patrol path
+	{
+		if (!m_patrolPath.empty())
+		{
+			AiDebugString::TransformList transformList;
+			std::vector<AiLocation>::const_iterator iterPath = m_patrolPath.begin();
+		
+			Transform transform(m_controller->getOwner()->getTransform_o2p());
+			transform.move_l(Vector(0.0f, 0.1f, 0.0f));
+			transformList.push_back(transform);
+		
+			for (; iterPath != m_patrolPath.end(); ++iterPath)
+			{
+				transform.setPosition_p(iterPath->getPosition_p());
+				transform.move_l(Vector(0.0f, 0.1f, 0.0f));
+				transformList.push_back(transform);
+			}
+		
+			bool const cyclic = false;
+			aiDebugString.addPath(transformList, cyclic);
+		}
+	}
+}
+#endif // _DEBUG
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementPatrol.h b/engine/server/library/serverGame/src/shared/ai/AiMovementPatrol.h
new file mode 100644
index 00000000..ceb29ea9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementPatrol.h
@@ -0,0 +1,71 @@
+// ======================================================================
+//
+// AiMovementPatrol.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiMovementPatrol_H
+#define	INCLUDED_AiMovementPatrol_H
+
+#include "serverGame/AiMovementMove.h"
+
+class AiLocation;
+class Location;
+
+
+// ======================================================================
+// This behavior causes an ai to move along a series of waypoints
+
+class AiMovementPatrol : public AiMovementMove
+{
+public:
+
+//	explicit AiMovementPatrol( AICreatureController * controller );
+	AiMovementPatrol(AICreatureController * controller, std::vector<Location> const & locations, bool random, bool flip, bool repeat, int startPoint);
+	AiMovementPatrol(AICreatureController * controller, std::vector<Unicode::String> const & locations, bool random, bool flip, bool repeat, int startPoint);
+	AiMovementPatrol(AICreatureController * controller, Archive::ReadIterator & source);
+
+	virtual ~AiMovementPatrol();
+	
+	virtual AiMovementType getType() const;
+	virtual AiMovementPatrol * asAiMovementPatrol();
+
+	// ----------
+	
+	virtual void          pack                (Archive::ByteStream & target) const;
+	virtual void          alter               (float time);
+	virtual void          getDebugInfo        (std::string & outString) const;
+	virtual void          endBehavior();
+	virtual void          clear               (void);
+//	virtual void          refresh             (void);
+
+	virtual bool          getHibernateOk() const;
+
+	// states & triggers
+	virtual AiStateResult stateWaiting        ( float time );
+
+	virtual AiStateResult triggerWaiting      ( void );
+	virtual AiStateResult triggerPathComplete ( void );
+	
+	// misc
+	virtual bool          setupPathSearch     ( void );
+
+#ifdef _DEBUG
+	virtual void addDebug(AiDebugString & aiDebugString);
+#endif // _DEBUG
+
+protected:
+
+	stdvector<AiLocation>::fwd  m_patrolPath;
+	bool                        m_random;
+	bool                        m_flip;
+	bool                        m_repeat;
+	int                         m_patrolPointIndex;
+};
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementSwarm.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementSwarm.cpp
new file mode 100644
index 00000000..ec7713f1
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementSwarm.cpp
@@ -0,0 +1,369 @@
+// ======================================================================
+//
+// AiMovementSwarm.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiMovementSwarm.h"
+
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/AiMovementArchive.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/World.h"
+
+#include <hash_map>
+
+
+using namespace Scripting;
+
+namespace AiMovementSwarmNamespace
+{
+	typedef std::hash_map<CachedNetworkId, std::vector<AiMovementSwarm::CreatureWatcher>, CachedNetworkId> targetMap;
+	typedef std::hash_map<CachedNetworkId, Vector, CachedNetworkId> offsetMap;
+
+	// map of swarm targets to the creatures swarming them
+	targetMap s_swarmMap;
+	// map of the creatures moving to where they want to move to (generated each frame)
+	offsetMap s_offsetMap;
+	// frame we last updated the goals in
+	unsigned long s_lastFrame = 0;
+	// how close we'll allow a creature to get to their goal before stopping them
+	const float s_goalBuffer = 0.5f;
+}
+using namespace AiMovementSwarmNamespace;
+
+
+// ======================================================================
+
+AiMovementSwarm::AiMovementSwarm( AICreatureController * controller ) :
+	AiMovementFollow(controller),
+	m_offset(0)
+{
+}
+
+AiMovementSwarm::AiMovementSwarm( AICreatureController * controller, ServerObject const * target ) :
+	AiMovementFollow(controller, target, 0, 0),
+	m_offset(0)
+{
+	init();
+}
+
+// ----------
+
+AiMovementSwarm::AiMovementSwarm( AICreatureController * controller, ServerObject const * target, float offset) :
+	AiMovementFollow(controller, target, 0, 0),
+	m_offset(offset)
+{
+	init();
+}
+
+// ----------
+
+AiMovementSwarm::AiMovementSwarm( AICreatureController * controller, Archive::ReadIterator & source ) :
+	AiMovementFollow(controller, source),
+	m_offset(0)
+{
+	Archive::get(source, m_offset);
+	init();
+}
+
+// ----------
+
+AiMovementSwarm::~AiMovementSwarm()
+{
+	cleanup();
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementSwarm::pack( Archive::ByteStream & target ) const
+{
+	AiMovementFollow::pack(target);
+	Archive::put(target, m_offset);
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementSwarm::alter ( float time )
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementSwarm::alter");
+
+	// if this is a new frame, update the goals of all swarming creatures
+	unsigned long currentFrame = ServerClock::getInstance().getServerFrame();
+	if (currentFrame != s_lastFrame)
+	{
+		computeGoals();
+		s_lastFrame = currentFrame;
+	}
+
+	// update the offset from our target we want to go to
+	if (m_target.getObject() != NULL)
+	{
+		const CreatureObject * owner = m_controller->getCreature();
+		if (owner != NULL)
+		{
+			offsetMap::const_iterator found = s_offsetMap.find(CachedNetworkId(*owner));
+			if (found != s_offsetMap.end())
+			{
+				Vector offset((*found).second);
+				offset += owner->getPosition_w();
+				offset -= m_target.getObject()->getPosition_w();
+
+				// The offset is in world space so we need to convert it to parent space
+				Vector offset_p = m_target.getObject()->rotate_w2p(offset);
+
+				m_target.setOffset_p(offset_p, false);
+			}
+		}
+	}
+
+	AiMovementFollow::alter(time);
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementSwarm::refresh()
+{
+	init();
+	AiMovementFollow::refresh();
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementSwarm::clear()
+{
+	cleanup();
+	AiMovementFollow::clear();
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementSwarm::getDebugInfo ( std::string & outString ) const
+{
+	AiMovementFollow::getDebugInfo(outString);
+
+	outString += "\n";
+	outString += "AiMovementSwarm:\n";
+
+	const int BUFSIZE = 256;
+	char buffer[BUFSIZE];
+
+	snprintf(buffer, BUFSIZE, "%.2f", m_offset);
+	outString += buffer;
+}
+
+// ----------------------------------------------------------------------
+
+AiMovementType AiMovementSwarm::getType() const
+{
+	return AMT_swarm;
+}
+
+// ----------------------------------------------------------------------
+
+AiMovementSwarm * AiMovementSwarm::asAiMovementSwarm()
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementSwarm::triggerWaiting()
+{
+	// note: don't use the m_target position function, because it includes the offset position
+	const Object * target = m_target.getObject();
+	if (target != NULL)
+		m_controller->turnToward(target->getParentCell(), target->getPosition_p());
+	return AiMovementFollow::triggerWaiting();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Add our owner and target to the swarm map.
+ */
+void AiMovementSwarm::init()
+{
+	if (m_offset < 0)
+		m_offset = 0;
+
+	const CreatureObject * creatureOwner = m_controller->getCreature();
+	const CreatureObject * creatureTarget = CreatureObject::asCreatureObject(m_target.getObject());
+	if (creatureOwner != NULL && creatureTarget != NULL)
+	{
+		CreatureWatcher watchedCreature(creatureOwner);
+		targetMap::iterator found = s_swarmMap.find(CachedNetworkId(*creatureTarget));
+		if (found != s_swarmMap.end())
+		{
+			std::vector<AiMovementSwarm::CreatureWatcher> & movers = (*found).second;
+			if (std::find(movers.begin(), movers.end(), watchedCreature) == movers.end())
+				movers.push_back(watchedCreature);
+		}
+		else
+		{
+			std::vector<CreatureWatcher> owners;
+			owners.push_back(watchedCreature);
+			s_swarmMap.insert(std::make_pair(CachedNetworkId(*creatureTarget), owners));
+		}
+	}
+	m_target.setRadius(s_goalBuffer);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Remove ourself from the swarm map.
+ */
+void AiMovementSwarm::cleanup()
+{
+	// note: using static_cast instead of safe_cast because the owner may be in the process of being destructed
+	const CreatureObject * owner = static_cast<const CreatureObject *>(m_controller->getOwner());
+	const CreatureObject * target = static_cast<const CreatureObject *>(m_target.getObject());
+	if (owner != NULL && target != NULL)
+	{
+		targetMap::iterator found = s_swarmMap.find(CachedNetworkId(*target));
+		if (found != s_swarmMap.end())
+		{
+			std::vector<CreatureWatcher> & swarmers = (*found).second;
+			std::vector<CreatureWatcher>::iterator swarmer = std::find(swarmers.begin(), swarmers.end(), CreatureWatcher(owner));
+			if (swarmer != swarmers.end())
+			{
+				swarmers.erase(swarmer);
+				if (swarmers.empty())
+					s_swarmMap.erase(found);
+			}
+		}
+	}	
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Compute the goal position for every creature swarming this frame.
+ * NOTE: we may have to throttle this if it's taking up too much time/frame.
+ */
+void AiMovementSwarm::computeGoals()
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementSwarm::computeGoals");
+
+	s_offsetMap.clear();
+
+	for (targetMap::iterator i = s_swarmMap.begin(); i != s_swarmMap.end();)
+	{
+		const CreatureObject * target = CreatureObject::asCreatureObject((*i).first.getObject());
+		if (target != NULL && !target->isDead())
+		{
+			computeGoals(*target, (*i).second);
+			if ((*i).second.empty())
+				s_swarmMap.erase(i++);
+			else
+				++i;
+		}
+		else
+		{
+			s_swarmMap.erase(i++);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Compute the goal position for every creature swarming a given target.
+ *
+ * @param target	the creature things are swarming to
+ * @param movers	the creatures that are swarming the target
+ */
+void AiMovementSwarm::computeGoals(const CreatureObject & target, std::vector<CreatureWatcher> & movers)
+{
+	int i;
+	int count = movers.size();;
+	float distanceBuffer = s_goalBuffer * 2.0f;
+	const float targetRadius = target.getRadius();
+	Vector targetPos(target.getPosition_w());
+	std::vector<Vector> movement(count);
+
+	for (i = 0; i < count; ++i)
+	{
+		// determine movement to target
+		const CreatureObject * mover = movers[i];
+		const AICreatureController * controller = NULL;
+		const AiMovementSwarm * swarmMovement = NULL;
+		if (mover != NULL)
+		{
+			controller = AICreatureController::asAiCreatureController(mover->getController());
+			if (controller != NULL)
+				swarmMovement = dynamic_cast<const AiMovementSwarm *>(controller->getCurrentMovement());
+		}
+
+		if (mover == NULL || mover->isDead())
+		{
+			// dump the mover from our list
+			--count;
+			movers[i] = movers[count];
+			movers.pop_back();
+			movement[i] = movement[count];
+			movement.pop_back();
+			--i;
+			continue;
+		}
+		if (swarmMovement == NULL)
+		{
+			// there are legitimate cases where a creature is in a swarm list but doesn't
+			// have its movement as AiMovementSwarm, such as when the movement is 
+			// pending or suspended
+			continue;
+		}
+
+		Vector moverPos(mover->getPosition_w());
+		const float moverRadius = mover->getRadius();
+		const float moverOffset = swarmMovement->getOffset();
+		float desiredDistance = targetRadius + moverRadius + distanceBuffer + moverOffset;
+		Vector v = targetPos - moverPos;
+		float distanceToTarget = v.magnitude();
+		if (distanceToTarget != 0)
+		{
+			movement[i] += v * ((distanceToTarget - desiredDistance)/distanceToTarget);
+		}
+
+		// determine movement away from any creatures we're intersecting
+		for (int j = i + 1; j < count; ++j)
+		{
+			const CreatureObject * blocker = movers[j];
+			if (blocker == NULL || blocker->isDead())
+			{
+				continue;
+			}
+
+			Vector blockerPos(blocker->getPosition_w());
+			const float blockerRadius = blocker->getRadius();
+			v = blockerPos - moverPos;
+			distanceToTarget = v.magnitude();
+			float separationDistance = moverRadius + blockerRadius + distanceBuffer;
+			if (distanceToTarget > 0 && distanceToTarget < separationDistance)
+			{
+				// move the creatures away from each other proportional to their size
+				float pushDistance = separationDistance - distanceToTarget;
+				float p = blockerRadius / (moverRadius + blockerRadius);
+				movement[i] -= v * ((pushDistance * p) / distanceToTarget);
+				movement[j] += v * ((pushDistance * (1.0f - p)) / distanceToTarget);
+			}
+		}
+	}
+
+	// update the desired destinations of all the movers for when they are altered
+	for (i = 0; i < count; ++i)
+	{
+		if (movers[i] != NULL)
+			s_offsetMap[CachedNetworkId(*movers[i])] = movement[i];
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementSwarm.h b/engine/server/library/serverGame/src/shared/ai/AiMovementSwarm.h
new file mode 100644
index 00000000..702cf26b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementSwarm.h
@@ -0,0 +1,90 @@
+// ======================================================================
+//
+// AiMovementSwarm.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiMovementSwarm_H
+#define	INCLUDED_AiMovementSwarm_H
+
+#include "serverGame/AiMovementFollow.h"
+
+
+class CreatureObject;
+
+
+// ======================================================================
+
+class AiMovementSwarm : public AiMovementFollow
+{
+public:
+	typedef ConstWatcher<CreatureObject> CreatureWatcher;
+
+public:
+
+	explicit AiMovementSwarm( AICreatureController * controller );
+
+	AiMovementSwarm( AICreatureController * controller, 
+	                  ServerObject const * target );
+
+	AiMovementSwarm( AICreatureController * controller, 
+	                  ServerObject const * target,
+	                  float offset );
+	
+	AiMovementSwarm( AICreatureController * controller, 
+	                 Archive::ReadIterator & source );
+
+	virtual ~AiMovementSwarm();
+	
+	virtual AiMovementType getType() const;
+	virtual AiMovementSwarm * asAiMovementSwarm();
+
+	// ----------
+	
+	virtual void           pack                 (Archive::ByteStream & target) const;
+	virtual void           alter                (float time );
+	virtual void           refresh              ();
+	virtual void           clear                ();
+	
+	virtual void           getDebugInfo         (std::string & outString) const;
+
+	// states & triggers
+	virtual AiStateResult  triggerWaiting       ( void );
+
+	// ----------
+
+	float getOffset() const;
+
+private:
+
+	void init();
+	void cleanup();
+	
+	static void computeGoals();
+	static void computeGoals(const CreatureObject & target, std::vector<CreatureWatcher> & movers);
+
+	// Disabled.
+	AiMovementSwarm();
+	AiMovementSwarm(AiMovementSwarm const&);
+	AiMovementSwarm &operator =(AiMovementSwarm const&);
+
+private:
+
+	float m_offset;         // how far to stay from our target
+};
+
+
+//-----------------------------------------------------------------------
+
+inline float AiMovementSwarm::getOffset() const
+{
+	return m_offset;
+}
+
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementTarget.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementTarget.cpp
new file mode 100644
index 00000000..24e69190
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementTarget.cpp
@@ -0,0 +1,130 @@
+// ======================================================================
+//
+// AiMovementTarget.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiMovementTarget.h"
+
+#include "serverGame/AiMovementArchive.h"
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/CreatureObject.h"
+
+
+// ======================================================================
+
+AiMovementTarget::AiMovementTarget( AICreatureController * controller )
+:	AiMovementPathFollow(controller),
+	m_target()
+{
+}
+
+// ----------
+
+AiMovementTarget::AiMovementTarget( AICreatureController * controller, ServerObject const * target )
+:	AiMovementPathFollow(controller),
+	m_target(target)
+{
+}
+
+// ----------
+
+AiMovementTarget::AiMovementTarget( AICreatureController * controller, CellProperty const * cell, Vector const & target, float radius )
+: AiMovementPathFollow(controller),
+  m_target(cell, target, radius)
+{
+}
+
+// ----------
+
+AiMovementTarget::AiMovementTarget( AICreatureController * controller, Archive::ReadIterator & source )
+:	AiMovementPathFollow(controller, source),
+	m_target(source)
+{
+}
+
+// ----------
+
+AiMovementTarget::~AiMovementTarget()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementTarget::pack( Archive::ByteStream & target ) const
+{
+	AiMovementPathFollow::pack(target);
+	m_target.pack(target);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Decide whether we can hibernate or not. If we are targetting a player or
+ * a creature who isn't hibernating, don't hibernate.
+ */
+bool AiMovementTarget::getHibernateOk( void ) const
+{
+static const int MAX_RECURSION = 50;
+static int recursionCount = 0;
+static const AiMovementTarget * preventRecurse = NULL;
+
+	// prevent recursing too many times
+	if (++recursionCount == MAX_RECURSION)
+	{
+		WARNING_STRICT_FATAL(true, ("AiMovementTarget::getHibernateOk has recursed "
+			"too many times!"));
+		--recursionCount;
+		return true;
+	}
+
+	// there might be a chance that calling getHibernate() on the creature we
+	// are folloing will eventually lead back to us, so use the preventRecurse
+	// variable to stop that from happening
+	if (preventRecurse == this)
+	{
+		WARNING_STRICT_FATAL(true, ("AiMovementTarget::getHibernateOk has recursed "
+			"back on itself!"));
+		--recursionCount;
+		return true;
+	}
+	if (preventRecurse == NULL)
+		preventRecurse = this;
+	
+	bool hibernate = true;
+	if (m_target.isValid() && m_target.getObjectId() != NetworkId::cms_invalid)
+	{
+		const Object * o = m_target.getObject();
+		if (o != NULL && o->asServerObject() != NULL)
+		{
+			// if the target is a player, don't hibernate
+			if (o->asServerObject()->isPlayerControlled())
+				hibernate = false;
+			// hibernate if who we're following is hibernating
+			else if (o->asServerObject()->asCreatureObject() != NULL)
+				hibernate = (safe_cast<const CreatureController *>(o->getController()))->getHibernate();
+		}
+		else
+			hibernate = AiMovementPathFollow::getHibernateOk();
+	}
+	else
+		hibernate = AiMovementPathFollow::getHibernateOk();
+
+	// clean up recusion checkers
+	if (preventRecurse == this)
+		preventRecurse = NULL;
+	--recursionCount;
+	return hibernate;
+}
+
+// ----------------------------------------------------------------------
+
+AiLocation const & AiMovementTarget::getTarget() const
+{
+	return m_target;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementTarget.h b/engine/server/library/serverGame/src/shared/ai/AiMovementTarget.h
new file mode 100644
index 00000000..cdd84c7e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementTarget.h
@@ -0,0 +1,51 @@
+// ======================================================================
+//
+// AiMovementTarget.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiMovementTarget_H
+#define	INCLUDED_AiMovementTarget_H
+
+#include "serverGame/AiMovementPathFollow.h"
+
+
+
+// ======================================================================
+
+class AiMovementTarget : public AiMovementPathFollow
+{
+public:
+
+	explicit AiMovementTarget( AICreatureController * controller );
+
+	AiMovementTarget( AICreatureController * controller, 
+	                  ServerObject const * target );
+
+	AiMovementTarget( AICreatureController * controller, CellProperty const * cell, Vector const & target, float radius );
+
+	AiMovementTarget( AICreatureController * controller, 
+	                 Archive::ReadIterator & source );
+
+	virtual ~AiMovementTarget();
+	
+	// ----------
+	
+	virtual void           pack                 ( Archive::ByteStream & target ) const;
+	virtual bool           getHibernateOk       ( void ) const;
+	
+	// ----------
+
+	AiLocation const & getTarget() const;
+
+protected:
+
+	AiLocation     m_target;
+};
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementWander.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementWander.cpp
new file mode 100644
index 00000000..eb648c4b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementWander.cpp
@@ -0,0 +1,295 @@
+// ======================================================================
+//
+// AiMovementWander.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiMovementWander.h"
+
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/CreatureObject.h"
+
+#include "serverScript/ScriptFunctionTable.h"
+
+using namespace Scripting;
+
+// ======================================================================
+
+AiMovementWander::AiMovementWander( AICreatureController * controller )
+:	AiMovementWaypoint(controller),
+	m_target(),
+	m_sleepTime(0.0f),
+	m_minDistance(0.0f),
+	m_maxDistance(0.0f),
+	m_minAngle(0.0f),
+	m_maxAngle(0.0f),
+	m_minDelay(0.0f),
+	m_maxDelay(0.0f)
+{
+}
+
+AiMovementWander::AiMovementWander( AICreatureController * controller, float minDistance, float maxDistance, float minAngle, float maxAngle, float minDelay, float maxDelay )
+:	AiMovementWaypoint(controller),
+	m_target(),
+	m_sleepTime(0.0f),
+	m_minDistance(minDistance),
+	m_maxDistance(maxDistance),
+	m_minAngle(minAngle),
+	m_maxAngle(maxAngle),
+	m_minDelay(minDelay),
+	m_maxDelay(maxDelay)
+{
+	updateWaypoint();
+}
+
+// ----------
+
+AiMovementWander::AiMovementWander( AICreatureController * controller, Archive::ReadIterator & source )
+:	AiMovementWaypoint(controller, source),
+	m_target(),
+	m_sleepTime(0.0f),
+	m_minDistance(0.0f),
+	m_maxDistance(0.0f),
+	m_minAngle(0.0f),
+	m_maxAngle(0.0f),
+	m_minDelay(0.0f),
+	m_maxDelay(0.0f)
+{
+	Archive::get(source, m_minDistance);
+	Archive::get(source, m_maxDistance);
+	Archive::get(source, m_minAngle);
+	Archive::get(source, m_maxAngle);
+	Archive::get(source, m_minDelay);
+	Archive::get(source, m_maxDelay);
+
+	SETUP_SYNCRONIZED_STATE( AiMovementWander::stateWaiting );
+	SETUP_SYNCRONIZED_STATE( AiMovementWander::stateThinking );
+	SETUP_SYNCRONIZED_STATE( AiMovementWander::stateMoving );
+}
+
+// ----------
+
+AiMovementWander::~AiMovementWander()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementWander::pack( Archive::ByteStream & target ) const
+{
+	AiMovementWaypoint::pack(target);
+	Archive::put(target, m_minDistance);
+	Archive::put(target, m_maxDistance);
+	Archive::put(target, m_minAngle);
+	Archive::put(target, m_maxAngle);
+	Archive::put(target, m_minDelay);
+	Archive::put(target, m_maxDelay);
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementWander::alter ( float time )
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementWander::alter");
+
+	AiMovementWaypoint::alter(time);
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementWander::getDebugInfo ( std::string & outString ) const
+{
+	AiMovementWaypoint::getDebugInfo(outString);
+
+	outString += "\n";
+
+	outString += "AiMovementWander:\n";
+
+	char buffer[256];
+
+	Vector goal = m_target.getPosition_w();
+	sprintf(buffer,"Wandering to : (%f,%f,%f)\n",goal.x,goal.y,goal.z);
+	outString += buffer;
+
+	sprintf(buffer,"Wander distance : %f to %f\n",m_minDistance,m_maxDistance);
+	outString += buffer;
+
+	sprintf(buffer,"Wander angle : %f to %f\n",m_minAngle,m_maxAngle);
+	outString += buffer;
+
+	sprintf(buffer,"Wander delay : %f to %f\n",m_minDelay,m_maxDelay);
+	outString += buffer;
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementWander::stateWaiting ( float time )
+{
+	UNREF(time);
+
+	if(m_sleepTime > 0.0f)
+	{
+		m_controller->sleep(m_sleepTime);
+		m_sleepTime = 0.0f;
+
+		return ASR_Done;
+	}
+	else
+	{
+		triggerThinking();
+
+		return ASR_Continue;
+	}
+}
+
+// ----------
+
+AiStateResult AiMovementWander::stateThinking ( float time )
+{
+	UNREF(time);
+
+	if(generateWaypoint())
+	{
+		triggerMoving();
+
+		return ASR_Continue;
+	}
+	else
+	{
+		// failed to generate a waypoint, sleep half a second before we try again.
+
+		m_controller->sleep(0.5f);
+
+		return ASR_Done;
+	}
+}
+
+// ----------
+
+AiStateResult AiMovementWander::stateMoving ( float time )
+{
+	if(m_controller->getStuckCounter() > 5)
+	{
+		triggerThinking();
+
+		return ASR_Continue;
+	}
+
+	return AiMovementWaypoint::stateMoving(time);
+}
+
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementWander::triggerWaiting ( void )
+{
+	m_controller->triggerScriptsWithParam(TRIG_WANDER_WAITING,m_sleepTime);
+
+	return AiMovementWaypoint::triggerWaiting();
+}
+
+// ----------
+
+AiStateResult AiMovementWander::triggerThinking ( void )
+{
+	CHANGE_STATE( AiMovementWander::stateThinking );
+
+	return ASR_Continue;
+}
+
+// ----------
+
+AiStateResult AiMovementWander::triggerMoving ( void )
+{
+	m_controller->triggerScriptsSimple(TRIG_WANDER_MOVING);
+
+	return AiMovementWaypoint::triggerMoving();
+}
+
+// ----------
+
+AiStateResult AiMovementWander::triggerWaypoint ( void )
+{
+	m_controller->triggerScriptsSimple(TRIG_WANDER_WAYPOINT);
+
+	return AiMovementWaypoint::triggerWaypoint();
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementWander::hasWaypoint ( void ) const
+{
+	return true;
+}
+
+// ----------
+
+AiLocation const & AiMovementWander::getWaypoint ( void ) const
+{
+	return m_target;
+}
+
+// ----------
+
+bool AiMovementWander::updateWaypoint ( void )
+{
+	m_target.update();
+
+	return true;
+}
+
+// ----------
+
+void AiMovementWander::clearWaypoint ( void )
+{
+	m_target = AiLocation();
+}
+
+// ----------
+
+bool AiMovementWander::generateWaypoint ( void )
+{
+	Vector center = m_controller->getCreaturePosition_p();
+	Vector facing = m_controller->getOwner()->getObjectFrameK_w();
+
+	float angle = atan2(facing.z, facing.x);
+	float delta = Random::randomReal(m_minAngle, m_maxAngle);
+
+	if (Random::random() & 16)
+	{
+		angle -= delta;
+	}
+	else
+	{
+		angle += delta;
+	}
+
+	float distance = Random::randomReal(m_minDistance, m_maxDistance);
+
+	Vector point = center;
+
+	point.x += distance * cos(angle);
+	point.z += distance * sin(angle);
+
+	m_target = AiLocation(m_controller->getCreatureCell(),point);
+
+	m_sleepTime = Random::randomReal(m_minDelay,m_maxDelay);
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+AiMovementType AiMovementWander::getType() const
+{
+	return AMT_wander;
+}
+
+// ----------------------------------------------------------------------
+AiMovementWander * AiMovementWander::asAiMovementWander()
+{
+	return this;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementWander.h b/engine/server/library/serverGame/src/shared/ai/AiMovementWander.h
new file mode 100644
index 00000000..e39b7848
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementWander.h
@@ -0,0 +1,84 @@
+// ======================================================================
+//
+// AiMovementWander.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiMovementWander_H
+#define	INCLUDED_AiMovementWander_H
+
+#include "serverGame/AiMovementWaypoint.h"
+
+// ======================================================================
+// The simple wander behavior picks random waypoints and walks between
+// them, pausing at each one.
+
+class AiMovementWander : public AiMovementWaypoint
+{
+public:
+
+	explicit AiMovementWander( AICreatureController * controller );
+
+	AiMovementWander( AICreatureController * controller, 
+	                  float minDistance, 
+	                  float maxDistance, 
+	                  float minAngle, 
+	                  float maxAngle, 
+	                  float minDelay, 
+	                  float maxDelay );
+	
+	AiMovementWander( AICreatureController * controller,
+	                  Archive::ReadIterator & source );
+
+	virtual ~AiMovementWander();
+	
+	virtual AiMovementType getType() const;
+	virtual AiMovementWander * asAiMovementWander();
+
+	// ----------
+	
+	virtual void               pack                ( Archive::ByteStream & target ) const;
+	virtual void               alter               ( float time );
+
+	virtual void               getDebugInfo        ( std::string & outString ) const;
+
+	// states & triggers
+
+	virtual AiStateResult      stateWaiting        ( float time );
+	virtual AiStateResult      stateThinking       ( float time );
+	virtual AiStateResult      stateMoving         ( float time );
+	
+	virtual AiStateResult      triggerWaiting      ( void );
+	virtual AiStateResult      triggerThinking     ( void );
+	virtual AiStateResult      triggerMoving       ( void );
+	virtual AiStateResult      triggerWaypoint     ( void );
+
+	// waypoints
+
+	virtual bool               hasWaypoint         ( void ) const;
+	virtual AiLocation const & getWaypoint         ( void ) const;
+	virtual bool               updateWaypoint      ( void );
+	virtual void               clearWaypoint       ( void );
+	virtual bool               generateWaypoint    ( void );
+	
+protected:
+
+	AiLocation  m_target;
+	float       m_sleepTime;
+	
+	float       m_minDistance;
+	float       m_maxDistance;
+	
+	float       m_minAngle;
+	float       m_maxAngle;
+	
+	float       m_minDelay;
+	float       m_maxDelay;
+};
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementWanderInterior.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementWanderInterior.cpp
new file mode 100644
index 00000000..24a4c66a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementWanderInterior.cpp
@@ -0,0 +1,154 @@
+// ======================================================================
+//
+// AiMovementWanderInterior.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiMovementWanderInterior.h"
+
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/BuildingObject.h"
+#include "serverGame/CellObject.h"
+#include "serverGame/CreatureObject.h"
+
+#include "serverPathfinding/ServerPathBuilder.h"
+
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedCollision/Floor.h"
+#include "sharedCollision/FloorMesh.h"
+
+#include "sharedLog/Log.h"
+
+#include "sharedObject/CellProperty.h"
+
+#include "sharedPathfinding/PathGraph.h"
+#include "sharedPathfinding/PathNode.h"
+#include "sharedPathfinding/PathSearch.h"
+
+#include "sharedRandom/Random.h"
+
+// ----------------------------------------------------------------------
+// Pick a random number in [0,max], except for exclude
+
+int random_exclude( int max, int exclude )
+{
+	if(max == 0) return 0;
+
+	int x = Random::random(max-1);
+
+	if(x >= exclude) x++;
+
+	return x;
+}
+
+
+// ======================================================================
+
+AiMovementWanderInterior::AiMovementWanderInterior( AICreatureController * controller )
+: AiMovementWander(controller,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f),
+  m_iterator(),
+  m_lastNodeIndex(-1)
+{
+}
+
+AiMovementWanderInterior::AiMovementWanderInterior( AICreatureController * controller, Archive::ReadIterator & source )
+: AiMovementWander(controller, source),
+  m_iterator(),
+  m_lastNodeIndex(-1)
+{
+	Archive::get(source, m_lastNodeIndex);
+}
+
+// ----------
+
+AiMovementWanderInterior::~AiMovementWanderInterior()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementWanderInterior::pack( Archive::ByteStream & target ) const
+{
+	AiMovementWander::pack(target);
+	Archive::put(target, m_lastNodeIndex);
+}
+
+// ----------------------------------------------------------------------
+// pick a random pathnode on the floor of the cell and walk to it
+
+bool AiMovementWanderInterior::updateWaypoint ( void )
+{
+	CreatureObject const * creature = m_controller->getCreature();
+
+	if(creature == NULL) return false;
+
+	CellProperty const * cell = creature->getParentCell();
+
+	if(cell == NULL) return false;
+
+	Floor const * floor = cell->getFloor();
+
+	if(floor == NULL) return false;
+
+	FloorMesh const * floorMesh = floor->getFloorMesh();
+
+	if(floorMesh == NULL) return false;
+
+	PathGraph const * graph = safe_cast<PathGraph const *>(floorMesh->getPathGraph());
+
+	if(graph == NULL) return false;
+
+	// ----------
+	
+	int closestIndex = findClosestReachablePathNode(creature,graph);
+
+	if(closestIndex == -2)
+	{
+		const CellObject *cellObject = dynamic_cast<const CellObject*>(&cell->getOwner());
+		const BuildingObject *building = (cellObject ? cellObject->getOwnerBuilding() : NULL);
+		Vector creaturePosition = creature->getPosition_w();
+		
+		LOG("building-data-error",("Building id=%s has no path data but creature id=%s at (x=%.2f,y=%.2f,z=%.2f) requires it for wandering, stopping behavior.",	
+			(building ? building->getNetworkId().getValueString().c_str() : "<NULL building>"),
+			creature->getNetworkId().getValueString().c_str(),
+			creaturePosition.x,
+			creaturePosition.y,
+			creaturePosition.z));
+
+		endBehavior();
+	}
+
+	if(closestIndex < 0) return false;
+
+	int randomIndex = random_exclude( graph->getNodeCount() - 1, closestIndex );
+
+	PathSearch search;
+
+	bool searchOk = search.search(graph,closestIndex,randomIndex);
+
+	if(searchOk)
+	{
+		PathNode const * closestNode = graph->getNode(closestIndex);
+
+		if(closestNode != NULL)
+		{
+			m_target = AiLocation(m_controller->getCreatureCell(),closestNode->getPosition_p());
+
+			m_target.setRadius(0.1f);
+
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	else
+	{
+		return false;
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementWanderInterior.h b/engine/server/library/serverGame/src/shared/ai/AiMovementWanderInterior.h
new file mode 100644
index 00000000..a7eadefd
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementWanderInterior.h
@@ -0,0 +1,44 @@
+// ======================================================================
+//
+// AiMovementWanderInterior.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiMovementWanderInterior_H
+#define	INCLUDED_AiMovementWanderInterior_H
+
+#include "serverGame/AiMovementWander.h"
+
+#include "sharedPathfinding/PathGraphIterator.h"
+
+// ======================================================================
+// This is a first pass at an interior wandering behavior - randomly walk
+// between the path nodes for the cell
+
+class AiMovementWanderInterior : public AiMovementWander
+{
+public:
+
+	explicit AiMovementWanderInterior( AICreatureController * controller );
+	AiMovementWanderInterior( AICreatureController * controller,
+	                          Archive::ReadIterator & source );
+
+	virtual ~AiMovementWanderInterior();
+
+	virtual void pack   ( Archive::ByteStream & target ) const;
+
+	bool updateWaypoint ( void );
+
+protected:
+
+	PathGraphIterator m_iterator;
+
+	int m_lastNodeIndex;
+};
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementWaypoint.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementWaypoint.cpp
new file mode 100644
index 00000000..3b2b123e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementWaypoint.cpp
@@ -0,0 +1,660 @@
+// ======================================================================
+//
+// AiMovementWaypoint.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiMovementWaypoint.h"
+
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/AiMovementArchive.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedCollision/CollisionUtils.h"
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedCollision/Footprint.h"
+#include "sharedCollision/Intersect3d.h"
+#include "sharedFoundation/Os.h"
+#include "sharedGame/AiDebugString.h"
+#include "sharedGame/SlopeEffectProperty.h"
+#include "sharedLog/Log.h"
+#include "sharedMath/Circle.h"
+#include "sharedMath/Ray3d.h"
+#include "sharedTerrain/TerrainObject.h"
+
+#include <limits>
+
+using namespace Scripting;
+
+float computeMovementModifier (CreatureObject * const object)
+{
+	if (!object)
+	{
+		DEBUG_FATAL(true, ("object is NULL."));
+		return 0.0f;
+	}
+
+	//-- verify that the object is not on a floor
+	const CollisionProperty* const collision = object->getCollisionProperty ();
+	const bool isOnSolidFloor = collision && collision->getFootprint() && collision->getFootprint()->isOnSolidFloor ();
+
+	float speedModifier = 1.0f;
+	Vector objectFrameK_w(object->getObjectFrameK_w());
+
+	if (object->isInWorldCell () && !isOnSolidFloor)
+	{
+		const Vector position = object->getPosition_w ();
+		const TerrainObject* const terrainObject = TerrainObject::getInstance ();
+
+		if (terrainObject)
+		{
+			if (terrainObject->isBelowWater (position))
+			{
+				speedModifier = object->getWaterModPercent();
+			}
+			else
+			{
+				// determine the slope effect from the actual terrain
+			float terrainHeight;
+			Vector normal;
+			if (terrainObject->getHeight (position, terrainHeight, normal))
+			{
+				const float slopeTolerance  = object->getSlopeModAngle();
+				const float slopeThreshold  = -cos (convertDegreesToRadians (90.f - slopeTolerance));
+				const float speedMultiplier = object->getSlopeModPercent();
+
+					const float slope = normal.dot(objectFrameK_w);
+				if (slope < slopeThreshold)
+				{
+					const float ratio = (slope - slopeThreshold) / (-1.f - slopeThreshold);
+						speedModifier = linearInterpolate (1.f, speedMultiplier, ratio);
+					}
+				}
+			}
+				}
+			}
+
+	// if the creature has a slope effect property, see if it has a greater
+	// (more negative) effect on the creature than the terrain
+	const Property * property = object->getProperty(SlopeEffectProperty::getClassPropertyId());
+	if (property != NULL)
+	{
+		// note we use the creature's base speed modifier, not the one modified by skills
+		// (although for ai they're probably the same)
+		const float baseSpeedMultiplier = object->getBaseSlopeModPercent();
+		const SlopeEffectProperty * slopeEffect = safe_cast<const SlopeEffectProperty *>(property);
+		const std::vector<Vector> & normals = slopeEffect->getNormals();
+		for (std::vector<Vector>::const_iterator i = normals.begin(); i != normals.end(); ++i)
+		{
+			float testSlope = (*i).dot(objectFrameK_w);
+			if (testSlope < 0)
+			{
+				const float testModifier = linearInterpolate (1.f, baseSpeedMultiplier, -testSlope);
+				if (testModifier < speedModifier)
+				{
+//LOG("slope_test", ("Slope effect setting creature %s speed modifier to %f", object->getNetworkId().getValueString().c_str(), testModifier));
+					speedModifier = testModifier;
+				}
+			}
+		}
+		object->removeProperty(SlopeEffectProperty::getClassPropertyId());
+	}
+
+	return speedModifier;
+}
+
+// ======================================================================
+
+AiMovementWaypoint::AiMovementWaypoint( AICreatureController * controller )
+ : AiMovementBase(controller)
+ , m_avoidanceLocation()
+ , m_avoidanceStuckTime(0.0f)
+ , m_avoidanceHeadedToWaypointTime(0.0f)
+ , m_mostRecentAvoidanceFrameNumber(-1)
+ , m_obstacleLocation()
+{
+	CHANGE_STATE( AiMovementWaypoint::stateWaiting );
+}
+
+AiMovementWaypoint::AiMovementWaypoint( AICreatureController * controller, Archive::ReadIterator & source )
+: AiMovementBase(controller, source)
+ , m_avoidanceLocation(source)
+ , m_avoidanceStuckTime(0.0f)
+ , m_avoidanceHeadedToWaypointTime(0.0f)
+ , m_mostRecentAvoidanceFrameNumber(-1)
+ , m_obstacleLocation(source)
+{
+	SETUP_SYNCRONIZED_STATE( AiMovementWaypoint::stateWaiting );
+	SETUP_SYNCRONIZED_STATE( AiMovementWaypoint::stateMoving );
+	SETUP_SYNCRONIZED_STATE( AiMovementWaypoint::stateAvoiding );
+}
+
+// ----------------------------------------------------------------------
+
+AiMovementWaypoint::~AiMovementWaypoint()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementWaypoint::pack( Archive::ByteStream & target ) const
+{
+	AiMovementBase::pack(target);
+	m_avoidanceLocation.pack(target);
+	m_obstacleLocation.pack(target);
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementWaypoint::alter ( float time )
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementWaypoint::alter");
+
+	AiMovementBase::alter(time);
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementWaypoint::refresh( void )
+{
+	AiMovementBase::refresh();
+	CHANGE_STATE( AiMovementWaypoint::stateWaiting );
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementWaypoint::getHibernateOk ( void ) const
+{
+	return m_stateFunction == CAST_STATE(AiMovementWaypoint::stateWaiting);
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementWaypoint::getDebugInfo ( std::string & outString ) const
+{
+	AiMovementBase::getDebugInfo(outString);
+
+	outString += "\n";
+
+	outString += "AiMovementWaypoint:\n";
+
+	char buffer[256];
+
+	if(hasWaypoint())
+	{
+		Vector goal = getWaypoint().getPosition_w();
+		sprintf(buffer,"Waypoint : %s at (%f,%f,%f)\n",getWaypoint().getObjectId().getValueString().c_str(),goal.x,goal.y,goal.z);
+		outString += buffer;
+	}
+	else
+	{
+		outString += "Waypoint : none\n";
+	}
+
+	if(m_obstacleLocation.isValid() && m_avoidanceLocation.isValid())
+	{
+		Vector obstacle = m_obstacleLocation.getPosition_w();
+		Vector avoid = m_avoidanceLocation.getPosition_w();
+
+		sprintf(buffer,"Obstacle Avoidance : avoiding %s at (%f,%f,%f)\n",m_obstacleLocation.getObjectId().getValueString().c_str(),obstacle.x,obstacle.y,obstacle.z);
+		outString += buffer;
+		sprintf(buffer,"Obstacle Avoidance : going to (%f,%f,%f)\n",avoid.x,avoid.y,avoid.z);
+		outString += buffer;
+
+		IGNORE_RETURN(snprintf(buffer, sizeof(buffer), "Obstacle Avoidance: accumulated stuck time (%.2f) seconds\n", m_avoidanceStuckTime));
+		buffer[sizeof(buffer) - 1] = '\0';
+		outString += buffer;
+	}
+	else
+	{
+		outString += "Obstacle Avoidance : none\n";
+	}
+
+	sprintf(buffer,"Speed : %f current, %f desired (modifier %f)\n",m_controller->getSpeed(),getDesiredSpeed(),computeMovementModifier(m_controller->getCreature()));
+	outString += buffer;
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementWaypoint::stateWaiting ( float time )
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementWaypoint::stateWaiting");
+
+	UNREF (time);
+
+	if (hasWaypoint() && getWaypoint().isValid())
+	{
+		return triggerMoving();
+	}
+	else
+	{
+		return ASR_Done;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementWaypoint::stateMoving ( float time )
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementWaypoint::stateMoving");
+
+	if(!m_controller->getCreature()->canMove())
+	{
+		return ASR_Done;
+	}
+
+	if (!hasWaypoint())
+	{
+		return triggerWaiting();
+	}
+
+	if (!getWaypoint().isValid()) 
+	{
+		return triggerTargetLost();
+	}
+
+	if (!updateWaypoint())
+	{
+		return triggerTargetLost();
+	}
+
+	bool const reachedGoal = moveTowards(getWaypoint(), getFinalWaypoint(), time);
+
+	if (reachedGoal)
+	{
+		return triggerWaypoint();
+	}
+
+	if (findObstacle())
+	{
+		return triggerAvoiding();
+	}
+
+ 	return ASR_Done;
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementWaypoint::stateAvoiding ( float time )
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementWaypoint::stateAvoiding");
+
+	//LOG("avoidance_log", ("In avoid state, time: %1.2f\n", m_avoidanceStuckTime));
+
+	//-- Clear the avoidance stuck timer if we haven't avoided in the last x number of frames.
+	int const frameNumber = Os::getNumberOfUpdates();
+	int const deltaFramesSinceLastAvoidance = frameNumber - m_mostRecentAvoidanceFrameNumber;
+
+	if (deltaFramesSinceLastAvoidance > ConfigServerGame::getBehaviorMaxAvoidancePersistenceFrameCount())
+		m_avoidanceStuckTime = 0.0f;
+
+	//-- Remember that we did need to avoid this frame.
+	m_mostRecentAvoidanceFrameNumber = frameNumber;
+
+	//-- Handle avoiding.
+	if (!m_controller->getCreature()->canMove())
+		return ASR_Done;
+
+	if(!hasWaypoint() || !getWaypoint().isValid())
+		return triggerTargetLost();
+	
+	if(!updateWaypoint())
+		return triggerTargetLost();
+
+	if(!updateAvoidancePoint(time))
+		return triggerDoneAvoiding();
+
+	// ----------
+
+	//-- Accumulate the stuck time for this frame.  If we exceeded the max stuck time,
+	//   warp the AI to its target location.
+	m_avoidanceStuckTime += time;
+
+	if(m_avoidanceStuckTime > ConfigServerGame::getBehaviorMaxAvoidanceStuckTime())
+	{
+		warpToLocation(getWaypoint());
+		m_avoidanceStuckTime = 0.0f;
+		return triggerDoneAvoiding();
+	}
+
+	bool const reachedGoal = moveTowards(m_avoidanceLocation, getFinalWaypoint(), time);
+
+	if (reachedGoal)
+	{
+		return triggerDoneAvoiding();
+	}
+
+	return ASR_Done;
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementWaypoint::triggerWaiting ( void )
+{
+	CHANGE_STATE( AiMovementWaypoint::stateWaiting );
+
+	return ASR_Done;
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementWaypoint::triggerMoving ( void )
+{
+	m_avoidanceLocation = AiLocation();
+
+	CHANGE_STATE( AiMovementWaypoint::stateMoving );
+
+	return ASR_Continue;
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementWaypoint::triggerAvoiding ( void )
+{
+	m_avoidanceHeadedToWaypointTime = 0.0f;
+
+	CHANGE_STATE( AiMovementWaypoint::stateAvoiding );
+
+	return ASR_Continue;
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementWaypoint::triggerDoneAvoiding ( void )
+{
+	m_obstacleLocation = AiLocation();
+	m_avoidanceLocation = AiLocation();
+
+	CHANGE_STATE( AiMovementWaypoint::stateMoving );
+
+	return ASR_Continue;
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementWaypoint::triggerWaypoint ( void )
+{
+	clearWaypoint();
+
+	return triggerWaiting();
+}
+
+// ----------------------------------------------------------------------
+
+AiStateResult AiMovementWaypoint::triggerTargetLost ( void )
+{
+	clearWaypoint();
+	
+	return triggerWaiting();
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementWaypoint::hasWaypoint ( void ) const
+{
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+AiLocation const & AiMovementWaypoint::getWaypoint ( void ) const
+{
+	return AiLocation::invalid;
+}
+
+// ----------------------------------------------------------------------
+
+AiLocation const & AiMovementWaypoint::getFinalWaypoint() const
+{
+	return AiLocation::invalid;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementWaypoint::updateWaypoint ( void )
+{
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void AiMovementWaypoint::clearWaypoint ( void )
+{
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementWaypoint::moveTowards(AiLocation const & nextLocation, AiLocation const & finalLocation, float const time)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementWaypoint::moveTowards");
+
+	bool reachedGoal = false;
+	bool finalLocationAdjustment = false;
+
+	float const desiredSpeed = getDesiredSpeed();
+	m_controller->setSpeed(desiredSpeed);
+
+	AiLocation goalLocation;
+
+	if (finalLocation.isValid())
+	{
+		Sphere finalLocationSphere(finalLocation.getPosition_p(), finalLocation.getRadius());
+
+		if (finalLocationSphere.contains(nextLocation.getPosition_p()))
+		{
+			finalLocationAdjustment = true;
+
+			// We know we are attempting to get too close to this final
+			// position so find a better position that does not get too
+			// close
+
+			Vector const & creaturePosition_p = m_controller->getCreaturePosition_p();
+			Vector direction(nextLocation.getPosition_p() - creaturePosition_p);
+			direction.normalize();
+			Ray3d const ray(creaturePosition_p, direction);
+			Intersect3d::ResultData result;
+			
+			if (Intersect3d::intersectRaySphereWithData(ray, finalLocationSphere, &result))
+			{
+				goalLocation = AiLocation(nextLocation.getCell(), creaturePosition_p + direction * result.m_length);
+			}
+		}
+	}
+	
+	if (!goalLocation.isValid())
+	{
+		goalLocation = nextLocation;
+	}
+
+	if (goalLocation.isValid())
+	{
+		m_controller->moveTowards(goalLocation.getCell(), goalLocation.getPosition_p(), time);
+
+		if (   finalLocation.isValid()
+		    && finalLocationAdjustment)
+		{
+			if (reachedLocation(finalLocation))
+			{
+				reachedGoal = true;
+			}
+		}
+		else
+		{
+			if (reachedLocation(nextLocation))
+			{
+				reachedGoal = true;
+			}
+		}
+	}
+
+	return reachedGoal;
+}
+
+// ----------------------------------------------------------------------
+
+float AiMovementWaypoint::getDesiredSpeed ( void ) const
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementWaypoint::getDesiredSpeed");
+
+	float result = 0.0f;
+
+	if (hasWaypoint())
+	{
+		CreatureObject * const creatureOwner = m_controller->getCreature();
+
+		if(m_controller->isRunning())
+		{
+			result = creatureOwner->getRunSpeed() * computeMovementModifier(creatureOwner);
+		}
+		else
+		{
+			result = creatureOwner->getWalkSpeed() * computeMovementModifier(creatureOwner);
+		}
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementWaypoint::getDecelerate ( void ) const
+{
+	return !(m_controller->getCreature()->isInCombat());
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementWaypoint::findObstacle()
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementWaypoint::findObstacle");
+
+	CreatureObject * const creatureOwner = m_controller->getCreature();
+	Vector const & creaturePosition_p = creatureOwner->getPosition_p();
+	Vector const & goalPosition_p = getWaypoint().getPosition_p();
+	Vector delta = goalPosition_p - creaturePosition_p;
+
+	// Clamp the obstacle lookahead distance to 5 meters
+
+	if (delta.magnitudeSquared() > 25.0f)
+	{
+		IGNORE_RETURN( delta.normalize() );
+
+		delta *= 5.0f;
+	}
+
+	ColliderList collidedWith;
+
+	// Collide with the statics in the world
+	{
+		bool const restrictToSameCell = true;
+		Capsule const capsule(creaturePosition_p, creaturePosition_p + delta, m_controller->getCreatureRadius());
+		
+		CollisionWorld::getDatabase()->queryFor(SpatialDatabase::Q_Static, m_controller->getCreatureCell(), restrictToSameCell, capsule, collidedWith);
+	}
+
+	// Check out the collision results
+	// Note: this needs to check for the closest collision object from the owner's position
+	{
+		m_obstacleLocation = AiLocation();
+		ColliderList::const_iterator iterCollider = collidedWith.begin();
+
+		for (; iterCollider != collidedWith.end(); ++iterCollider)
+		{
+			CollisionProperty * const collisionProperty = *iterCollider;
+			Object const & object = collisionProperty->getOwner();
+
+			if (object.getNetworkId() != creatureOwner->getNetworkId())
+			{
+				// We have collided with something
+	
+				m_obstacleLocation = AiLocation(&object);
+				break;
+			}
+		}
+	}
+
+	if (!m_obstacleLocation.isValid())
+	{
+		return false;
+	}
+
+	return updateAvoidancePoint(0.0f);
+}
+
+// ----------------------------------------------------------------------
+
+bool AiMovementWaypoint::updateAvoidancePoint ( float time )
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiMovementWaypoint::updateAvoidancePoint");
+
+	m_obstacleLocation.update();
+
+	if(!m_obstacleLocation.isValid()) return false;
+
+	Vector avoidancePoint;
+
+	CreatureObject const * creature = m_controller->getCreature();
+
+	Vector creaturePos = creature->getPosition_p();
+
+	Vector waypoint = getWaypoint().getPosition_p();
+
+	Vector delta = waypoint - creaturePos;
+
+	Object const * obstacle = m_obstacleLocation.getObject();
+
+	bool avoidOK = Collision3d::CalcAvoidancePoint( creature, delta, obstacle, avoidancePoint );
+
+	if (!avoidOK)
+	{
+		// when avoidOk is false, the collision system could not find a valid move point
+		// (AI moving into a horseshoe, etc.)
+		avoidancePoint = waypoint;
+	}
+	else if (fabs(avoidancePoint.x - waypoint.x) < 0.01f && fabs(avoidancePoint.z - waypoint.z) < 0.01f)
+	{
+		// when avoidOk is true, the collision system has a valid point
+		// this can happen when we are moving around an obstacle, or if we did not run into an obstacle at all
+		// if we did not run into an obstacle, we increase the not stuck counter to get out of the avoid state
+
+		if (m_avoidanceHeadedToWaypointTime > (ConfigServerGame::getBehaviorMaxAvoidanceStuckTime() * 0.1f))
+		{
+			//LOG("avoidance_log", ("Getting out of avoid state\n"));
+			m_avoidanceHeadedToWaypointTime = 0.0f;
+			// returning false will send us to the movement state if we are called from stateAvoiding
+			return false;
+		}
+
+		m_avoidanceHeadedToWaypointTime += time;
+	}
+
+	//LOG("avoidance_log", ("AvoidancePoint is %1.2f %1.2f %1.2f, Waypoint is %1.2f %1.2f %1.2f\n", avoidancePoint.x, avoidancePoint.y, avoidancePoint.z, waypoint.x, waypoint.y, waypoint.z));
+
+	avoidancePoint.y = creaturePos.y;
+
+	m_avoidanceLocation = AiLocation(getWaypoint().getCell(),avoidancePoint);
+
+	// Return true even if we couldn't calculate an avoidance point earlier.
+	// The rest of the code needs to continue attempting to avoid the obstacle
+	// so that the avoidance stuck timer can kick in.
+	return true;
+}
+
+#ifdef _DEBUG
+// ----------------------------------------------------------------------
+void AiMovementWaypoint::addDebug(AiDebugString & aiDebugString)
+{
+	AiMovementBase::addDebug(aiDebugString);
+
+	if (hasWaypoint())
+	{
+		aiDebugString.addLineToPosition(getWaypoint().getPosition_w(), PackedRgb::solidCyan);
+	}
+}
+#endif // _DEBUG
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementWaypoint.h b/engine/server/library/serverGame/src/shared/ai/AiMovementWaypoint.h
new file mode 100644
index 00000000..3022545e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiMovementWaypoint.h
@@ -0,0 +1,103 @@
+// ======================================================================
+//
+// AiMovementWaypoint.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiMovementWaypoint_H
+#define	INCLUDED_AiMovementWaypoint_H
+
+#include "serverGame/AiMovementBase.h"
+#include "serverGame/AiLocation.h"
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMath/Circle.h"
+
+class AiDebugString;
+class CellProperty;
+class CollisionProperty;
+class ServerObject;
+class Object;
+
+// ======================================================================
+// This is the waypoint-following behavior base class. It's very simple -
+// it thinks about how to get to its waypoint, it moves there, and then
+// it waits there.
+
+// A number of useful behaviors (flee, wander, loiter, sentinel, move, 
+// follow) are based off of this behavior
+
+class AiMovementWaypoint : public AiMovementBase
+{
+public:
+
+	explicit AiMovementWaypoint( AICreatureController * controller );
+	AiMovementWaypoint( AICreatureController * controller,
+	                    Archive::ReadIterator & source );
+	
+	virtual ~AiMovementWaypoint();
+
+	// ----------
+	// from AiMovementBase
+	
+	virtual void               pack                ( Archive::ByteStream & target ) const;
+	virtual void               alter               ( float time );
+	virtual void               refresh             ( void );
+	virtual bool               getHibernateOk      ( void ) const;
+	virtual void               getDebugInfo        ( std::string & outString ) const;
+
+	// states & triggers
+	
+	virtual AiStateResult      stateWaiting        ( float time );
+	virtual AiStateResult      stateMoving         ( float time );
+	virtual AiStateResult      stateAvoiding       ( float time );
+
+	virtual AiStateResult      triggerWaiting      ( void );
+	virtual AiStateResult      triggerMoving       ( void );
+	virtual AiStateResult      triggerAvoiding     ( void );
+	virtual AiStateResult      triggerDoneAvoiding ( void );
+
+	virtual AiStateResult      triggerWaypoint     ( void );
+	virtual AiStateResult      triggerTargetLost   ( void );
+	
+	// waypoints
+
+	virtual bool               hasWaypoint         ( void ) const;
+	virtual AiLocation const & getWaypoint         ( void ) const;
+	virtual AiLocation const & getFinalWaypoint() const;
+	virtual bool               updateWaypoint      ( void );
+	virtual void               clearWaypoint       ( void );
+
+	// misc
+	
+	virtual float              getDesiredSpeed     ( void ) const;
+	virtual bool               getDecelerate       ( void ) const;
+
+	// ----------
+	
+#ifdef _DEBUG
+	void addDebug(AiDebugString & aiDebugString);
+#endif // _DEBUG
+
+protected:
+
+	bool findObstacle ( void );
+	bool updateAvoidancePoint ( float time );
+
+	AiLocation m_avoidanceLocation;
+	float m_avoidanceStuckTime;
+	float m_avoidanceHeadedToWaypointTime;
+	int m_mostRecentAvoidanceFrameNumber;
+	AiLocation m_obstacleLocation;
+
+private:
+
+	bool moveTowards(AiLocation const & nextLocation, AiLocation const & finalLocation, float time);
+};
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/ai/AiTargetingSystem.cpp b/engine/server/library/serverGame/src/shared/ai/AiTargetingSystem.cpp
new file mode 100644
index 00000000..2afac7bc
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiTargetingSystem.cpp
@@ -0,0 +1,109 @@
+// ======================================================================
+//
+// AiTargetingSystem.cpp
+//
+// copyright 2005, sony online entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiTargetingSystem.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/HateList.h"
+#include "serverGame/TangibleObject.h"
+#include "sharedFoundation/Os.h"
+
+// ======================================================================
+//
+// AiTargetingSystem
+//
+// ======================================================================
+
+//-----------------------------------------------------------------------
+AiTargetingSystem::AiTargetingSystem(TangibleObject const & owner) 
+ : m_owner(owner)
+ , m_target()
+ , m_verifyTargetTimer(0)
+{
+}
+
+//-----------------------------------------------------------------------
+NetworkId const & AiTargetingSystem::getTarget()
+{
+	if (!m_owner.isHateListEmpty())
+	{
+		// If our target is not the primary hate target, see if we need
+		// to reset the target to attempt to target the the primary hate target
+
+		if (m_target != m_owner.getHateTarget())
+		{
+			if (   (m_target == CachedNetworkId::cms_cachedInvalid)
+				|| (Os::getRealSystemTime() - m_verifyTargetTimer) > 3)
+			{
+				m_target = m_owner.getHateTarget();
+				m_verifyTargetTimer = Os::getRealSystemTime();
+			}
+		}
+
+		TangibleObject const * currentTangibleTarget = TangibleObject::asTangibleObject(m_target.getObject());
+
+		// See if the primary hate target is valid
+		{
+			if (!canAttackTarget(currentTangibleTarget))
+			{
+				m_target = CachedNetworkId::cms_invalid;
+			}
+		}
+
+		// If our current target is not valid, we need to find the next valid target
+		{
+			static HateList::SortedList sortedHateList;
+
+			if (m_target == CachedNetworkId::cms_invalid)
+			{
+				m_owner.getSortedHateList(sortedHateList);
+			}
+
+			HateList::SortedList::const_iterator iterSortedHateList = sortedHateList.begin();
+
+			for (; iterSortedHateList != sortedHateList.end(); ++iterSortedHateList)
+			{
+				currentTangibleTarget = TangibleObject::asTangibleObject(iterSortedHateList->first.getObject());
+
+				if (canAttackTarget(currentTangibleTarget))
+				{
+					m_target = CachedNetworkId(*currentTangibleTarget);
+					break;
+				}
+			}
+
+			sortedHateList.clear();
+		}
+	}
+	else
+	{
+		m_target = CachedNetworkId::cms_invalid;
+	}
+
+	return m_target;
+}
+
+//-----------------------------------------------------------------------
+bool AiTargetingSystem::canAttackTarget(TangibleObject const * target)
+{
+	bool result = false;
+
+	if (target != NULL)
+	{
+		if (   (m_owner.getDistanceBetweenCollisionSpheres_w(*target) <= ConfigServerGame::getMaxCombatRange())
+		    && m_owner.checkLOSTo(*target))
+		{
+			result = true;
+		}
+	}
+
+	return result;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/AiTargetingSystem.h b/engine/server/library/serverGame/src/shared/ai/AiTargetingSystem.h
new file mode 100644
index 00000000..faa31065
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/AiTargetingSystem.h
@@ -0,0 +1,42 @@
+// ======================================================================
+//
+// AiTargetingSystem.h
+//
+// copyright 2005, sony online entertainment
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiTargetingSystem_H
+#define	INCLUDED_AiTargetingSystem_H
+
+#include "sharedObject/CachedNetworkId.h"
+
+class TangibleObject;
+
+// This class picks the highest priority target for an AI to attack.
+//
+// ----------------------------------------------------------------------
+class AiTargetingSystem
+{
+public:
+
+	explicit AiTargetingSystem(TangibleObject const & owner);
+
+	NetworkId const & getTarget();
+
+private:
+
+	bool canAttackTarget(TangibleObject const * target);
+
+	TangibleObject const & m_owner;
+	CachedNetworkId m_target;
+	time_t m_verifyTargetTimer;
+
+	AiTargetingSystem();
+	AiTargetingSystem(AiTargetingSystem const & rhs);
+	AiTargetingSystem & operator =(AiTargetingSystem const & rhs);
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// INCLUDED_AiTargetingSystem_H
diff --git a/engine/server/library/serverGame/src/shared/ai/Formation.cpp b/engine/server/library/serverGame/src/shared/ai/Formation.cpp
new file mode 100644
index 00000000..713d9b00
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/Formation.cpp
@@ -0,0 +1,218 @@
+// ======================================================================
+// 
+// Formation.cpp
+// Copyright Sony Online Entertainment, Inc.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/Formation.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/Squad.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedLog/Log.h"
+
+// ======================================================================
+//
+// Formation
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+Vector const Formation::getPosition_w(Transform const & transform_l2w, Vector const & position_l)
+{
+	Transform transform(transform_l2w);
+
+	Vector const & localFrameI_p = transform_l2w.getLocalFrameI_p();
+	Vector const & localFrameK_p = transform_l2w.getLocalFrameK_p();
+	float const iPhi = localFrameI_p.phi();
+	float const kPhi = localFrameK_p.phi();
+
+	transform.roll_l(iPhi);
+	transform.pitch_l(-kPhi);
+
+	return transform.rotateTranslate_l2p(position_l);
+}
+
+#ifdef _DEBUG
+// ----------------------------------------------------------------------
+char const * const Formation::getShapeString(Formation::Shape const shape)
+{
+	switch (shape)
+	{
+		case Formation::S_claw: { return "claw"; }
+		case Formation::S_wall: { return "wall"; }
+		case Formation::S_sphere: { return "sphere"; }
+		case Formation::S_delta: { return "delta"; }
+		case Formation::S_broad: { return "broad"; }
+		case Formation::S_x: { return "x"; }
+		case Formation::S_count: { break; }
+		case Formation::S_invalid: { break; }
+		default: { break; }
+	}
+
+	return "invalid";
+}
+#endif // _DEBUG
+
+// ----------------------------------------------------------------------
+Formation::Formation()
+ : m_shape(S_broad)
+ , m_spacing(1.0f)
+ , m_transform()
+ , m_dirty(true)
+{
+}
+
+// ----------------------------------------------------------------------
+void Formation::markDirty()
+{
+	m_dirty = true;
+}
+
+// ----------------------------------------------------------------------
+bool Formation::isDirty() const
+{
+	return m_dirty;
+}
+
+// ----------------------------------------------------------------------
+void Formation::setShape(Shape const shape)
+{
+#ifdef _DEBUG
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("Formation::setShape() shape(%s)", getShapeString(shape)));
+#endif
+
+	m_dirty = true;
+	m_shape = shape;
+}
+
+// ----------------------------------------------------------------------
+Formation::Shape Formation::getShape() const
+{
+	return m_shape;
+}
+
+// ----------------------------------------------------------------------
+void Formation::setSpacing(float const spacing)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("Formation::setSpacing() spacing(%.2f)", spacing));
+
+	m_spacing = spacing;
+}
+
+// ----------------------------------------------------------------------
+float Formation::getSpacing() const
+{
+	return m_spacing;
+}
+
+// ----------------------------------------------------------------------
+void Formation::setTransform(Transform const & transform)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("Formation::setTransform()"));
+
+	m_transform = transform;
+}
+
+// ----------------------------------------------------------------------
+Transform const & Formation::getTransform() const
+{
+	return m_transform;
+}
+
+// ----------------------------------------------------------------------
+void Formation::build(Squad & squad)
+{
+	DEBUG_FATAL(squad.isEmpty(), ("Building a formation on an empty squad."));
+
+	Object const * const leaderObject = squad.getLeader().getObject();
+	CollisionProperty const * const leaderCollisionProperty = (leaderObject != NULL) ? leaderObject->getCollisionProperty() : NULL;
+	float const leaderRadius = (leaderCollisionProperty != NULL) ? (leaderCollisionProperty->getBoundingSphere_l().getRadius() * 2.0f) : 1.0f;
+
+	int slotIndex = 0;
+	Squad::UnitMap const & unitSet = squad.getUnitMap();
+	Squad::UnitMap::const_iterator iterUnitMap = unitSet.begin();
+
+	for (; iterUnitMap != unitSet.end(); ++iterUnitMap)
+	{
+		Vector const position_l(getPosition_l(squad, slotIndex));
+		LOGC((ConfigServerGame::isSpaceAiLoggingEnabled() && (leaderRadius <= 1.0f)), "space_debug_ai", ("Formation::buildFormation() Unable to get the radius of the squad leader."));
+		
+		// Set the unit's local-space formation position
+
+		NetworkId const & unit = iterUnitMap->first;
+
+		squad.setUnitFormationPosition_l(unit, position_l * leaderRadius);
+
+		++slotIndex;
+	}
+
+	m_dirty = false;
+}
+
+// ----------------------------------------------------------------------
+Vector Formation::getPosition_l(Squad const & squad, int const slotIndex) const
+{
+	Vector result;
+
+	switch (m_shape)
+	{
+		case Formation::S_x:
+		case Formation::S_claw:
+			{
+				float const rowSign = ((slotIndex % 2) == 0) ? 1.0f : -1.0f;
+				float const row = ceilf(static_cast<float>(slotIndex - 1) / 4.0f) * rowSign;
+				float const columnSign = ((static_cast<int>(floorf(static_cast<float>(slotIndex) / 2.0f)) % 2) == 0) ? 1.0f : -1.0f;
+				float const column = floorf(static_cast<float>(slotIndex) / 2.0f) * columnSign;
+				
+				float const xPercent = acosf(PI_OVER_4) / 2.0f;
+				float const yPercent = asinf(PI_OVER_4) / 2.0f;
+				if (m_shape == Formation::S_x)
+				{
+					result = Vector(column * xPercent, row * yPercent, 0.0f);
+				}
+				else
+				{
+					float const depth = floorf(static_cast<float>(slotIndex - 1) / 4.0f);
+					result = Vector(column * xPercent, row * yPercent, depth);
+				}
+			}
+			break;
+		case Formation::S_wall:
+			{
+				int const unitsPerRow = static_cast<int>(ceilf(sqrtf(static_cast<float>(squad.getUnitCount()))));
+				float const rowSign = ((static_cast<int>(floorf(static_cast<float>(slotIndex - 1) / static_cast<float>(unitsPerRow))) % 2) == 0) ? 1.0f : -1.0f;
+				float const row = floorf(static_cast<float>(slotIndex + (unitsPerRow - 1)) / (static_cast<float>(unitsPerRow) * 2.0f)) * rowSign;
+				float const columnSign = ((slotIndex % 2) == 0) ? 1.0f : -1.0f;
+				float const column = ceilf(static_cast<float>((slotIndex - 1) % unitsPerRow) / 2.0f) * columnSign;
+				result = Vector(column, row, 0.0f);
+			}
+			break;
+		case Formation::S_sphere:
+		case Formation::S_delta:
+		case Formation::S_broad:
+			{
+				int const unitsPerRow = 21;
+				float const sign = ((slotIndex % 2) == 0) ? 1.0f : -1.0f;
+				float const column = ceilf(static_cast<float>((slotIndex) % unitsPerRow) / 2.0f) * sign;
+				float const depth = -floorf(static_cast<float>(slotIndex) / static_cast<float>(unitsPerRow));
+				result = Vector(column, 0.0f, depth);
+			}
+			break;
+		case Formation::S_invalid:
+		case Formation::S_count:
+		default:
+			{
+				FATAL(true, ("Invalid formation(%d) specified", static_cast<int>(m_shape)));
+			}
+			break;
+	}
+
+	//LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("getFormationPosition_l() squadId(%d) formation(%d) slotIndex(%d) direction_l(%.2f, %.2f, %.2f)", m_squadId, static_cast<int>(m_shape), slotIndex, result.x, result.y, result.z));
+
+	return result * m_spacing;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/Formation.h b/engine/server/library/serverGame/src/shared/ai/Formation.h
new file mode 100644
index 00000000..f35b3b77
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/Formation.h
@@ -0,0 +1,75 @@
+// ======================================================================
+// 
+// Formation.h
+// Copyright Sony Online Entertainment, Inc.
+//
+// ======================================================================
+
+#ifndef INCLUDED_Formation_H
+#define INCLUDED_Formation_H
+
+#include "sharedMath/Transform.h"
+#include "sharedMath/Vector.h"
+
+class Squad;
+class Object;
+
+// ----------------------------------------------------------------------
+class Formation
+{
+public:
+
+	enum Shape
+	{
+		S_invalid = 0,
+		S_claw,
+		S_wall,
+		S_sphere,
+		S_delta,
+		S_broad,
+		S_x,
+		S_count
+	};
+
+	static Vector const getPosition_w(Transform const & transform_l2w, Vector const & position_l);
+
+#ifdef _DEBUG
+	static char const * const getShapeString(Shape const shape);
+#endif // _DEBUG
+
+public:
+
+	Formation();
+
+	void markDirty();
+	bool isDirty() const;
+
+	void setShape(Shape const shape);
+	Shape getShape() const;
+
+	void setSpacing(float const spacing);
+	float getSpacing() const;
+
+	void setTransform(Transform const & transform);
+	Transform const & getTransform() const;
+
+	void build(Squad & squad);
+
+private:
+
+	Vector getPosition_l(Squad const & squad, int const slotIndex) const;
+
+	Shape m_shape;
+	float m_spacing;
+	Transform m_transform;
+	bool m_dirty;
+
+	// Disabled
+
+	Formation(Formation const &);
+	Formation & operator =(Formation const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_Formation_H
diff --git a/engine/server/library/serverGame/src/shared/ai/HateList.cpp b/engine/server/library/serverGame/src/shared/ai/HateList.cpp
new file mode 100644
index 00000000..d57fc5cb
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/HateList.cpp
@@ -0,0 +1,767 @@
+// ======================================================================
+//
+// HateList.cpp
+// Copyright 2005 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/HateList.h"
+
+#include "serverGame/AggroListProperty.h"
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/AiLogManager.h"
+#include "serverGame/Client.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/Pvp.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFile/FileNameUtils.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/Os.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/UpdatePvpStatusMessage.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/NetworkIdManager.h"
+
+#include <map>
+#include <set>
+#include <vector>
+
+
+// ======================================================================
+//
+// HateList
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+HateList::HateList()
+ : m_owner(NULL)
+ , m_playerObject(NULL)
+ , m_hateList()
+ , m_target(CachedNetworkId::cms_cachedInvalid)
+ , m_maxHate(0.0f)
+ , m_lastUpdateTime(0)
+ , m_autoExpireTargetDuration(ConfigServerGame::getDefaultAutoExpireTargetDuration())
+ , m_recentHateList()
+{
+}
+
+// ----------------------------------------------------------------------
+HateList::~HateList()
+{
+	clear();
+	m_owner = NULL;
+	m_playerObject = NULL;
+}
+
+// ----------------------------------------------------------------------
+void HateList::alter()
+{
+	if (!isEmpty())
+	{
+		if (!isOwnerValid())
+		{
+			clear();
+		}
+		else
+		{
+			// Determine if it is time to expire the current target
+			{
+				if (   (getAutoExpireTargetDuration() > 0)
+					&& (getTimeSinceLastUpdate() > getAutoExpireTargetDuration()))
+				{
+					LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::alter() owner(%s:%s) Auto-clearing hate list primary target due to lack of activity", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str()));
+
+					// Remove the primary target
+
+					removeTarget(getTarget());
+				}
+			}
+			
+			while (   (m_target.get() != CachedNetworkId::cms_cachedInvalid)
+				   && !isValidTarget(m_target.get().getObject()))
+			{
+				removeTarget(m_target.get());
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+bool HateList::addHate(NetworkId const & target, float const hate)
+{
+	bool result = false;
+
+	if (target == m_owner->getNetworkId())
+	{
+		DEBUG_WARNING(true, ("HateList::addHate() owner(%s) Owner trying to add hate to itself.", m_owner->getDebugInformation().c_str()));
+	}
+	else if (!isOwnerValid())
+	{
+		DEBUG_WARNING(true, ("HateList::addHate() owner(%s) Invalid owner specified", m_owner->getDebugInformation().c_str()));
+	}
+	else
+	{
+		Object * const targetObject = NetworkIdManager::getObjectById(target);
+
+		if (!isValidTarget(targetObject))
+		{
+			DEBUG_WARNING(true, ("HateList::addHate() owner(%s) Invalid target(%s) specified", m_owner->getDebugInformation().c_str(), target.getValueString().c_str()));
+		}
+		else
+		{
+			// If a target AI has a master, the target and the master needs to be added to the hate list (ie. pets should cause their master to gain hate)
+			{
+				CreatureObject const * const targetCreatureObject = CreatureObject::asCreatureObject(targetObject);
+				NetworkId const & masterId = (targetCreatureObject != NULL) ? targetCreatureObject->getMasterId() : NetworkId::cms_invalid;
+
+				if (masterId != NetworkId::cms_invalid)
+				{
+					addHate(masterId, 0.0f);
+				}
+			}
+
+			// A > 0 hate causes the owner to send out an OnSawAttack() trigger about the target
+
+			if (hate > 0.0f)
+			{
+				m_recentHateList.insert(CachedNetworkId(target));
+			}
+
+			resetHateTimer();
+
+			float totalTargetHate = hate;
+			UnSortedList::const_iterator iterHateList = m_hateList.find(CachedNetworkId(target));
+
+			if (iterHateList != m_hateList.end())
+			{
+				totalTargetHate = iterHateList->second + hate;
+
+				//LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::addHate() owner(%s:%s) target(%s) hate(%.2f+%.2f=%.2f)", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str(), target.getValueString().c_str(), iterHateList->second, hate, totalTargetHate));
+
+				m_hateList.set(iterHateList->first, totalTargetHate);
+			}
+			else
+			{
+				IGNORE_RETURN(m_hateList.insert(CachedNetworkId(target), hate));
+				if (m_playerObject)
+					m_playerObject->addToPlayerHateList(target);
+
+				triggerTargetAdded(target);
+
+				//LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::addHate() owner(%s:%s) target(%s) hate(0+%.2f=%.2f)", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str(), target.getValueString().c_str(), hate, hate));
+			}
+
+			if (   (m_target.get() == CachedNetworkId::cms_cachedInvalid)
+				|| (totalTargetHate > m_maxHate.get()))
+			{
+				setTarget(CachedNetworkId(target), totalTargetHate);
+			}
+
+			result = true;
+		}
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+bool HateList::setHate(NetworkId const & target, float const hate)
+{
+	bool result = false;
+
+	if (target == m_owner->getNetworkId())
+	{
+		DEBUG_WARNING(true, ("HateList::setHate() owner(%s) Owner trying to add hate to itself.", m_owner->getDebugInformation().c_str()));
+	}
+	else if (!isOwnerValid())
+	{
+		DEBUG_WARNING(true, ("HateList::setHate() owner(%s) Invalid owner specified", m_owner->getDebugInformation().c_str()));
+	}
+	else if (!isValidTarget(NetworkIdManager::getObjectById(target)))
+	{
+		DEBUG_WARNING(true, ("HateList::setHate() owner(%s) Invalid target(%s) specified", m_owner->getDebugInformation().c_str(), target.getValueString().c_str()));
+	}
+	else
+	{
+		// A > 0 hate causes the owner to send out an OnSawAttack() trigger about the target
+
+		if (hate > 0.0f)
+		{
+			m_recentHateList.insert(CachedNetworkId(target));
+		}
+
+		LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::setHate() owner(%s:%s) target(%s) hate(%.2f)", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str(), target.getValueString().c_str(), hate));
+
+		resetHateTimer();
+
+		UnSortedList::const_iterator iterHateList = m_hateList.find(CachedNetworkId(target));
+
+		if (iterHateList != m_hateList.end())
+		{
+			m_hateList.set(iterHateList->first, hate);
+
+			if(getTarget() == iterHateList->first && hate < m_maxHate.get())
+				findNewTarget();
+		}
+		else
+		{
+			IGNORE_RETURN(m_hateList.insert(CachedNetworkId(target), hate));
+			if (m_playerObject)
+				m_playerObject->addToPlayerHateList(target);
+
+			triggerTargetAdded(target);
+		}
+
+		if (   (m_target.get() == CachedNetworkId::cms_cachedInvalid)
+			|| (hate > m_maxHate.get()))
+		{
+			setTarget(CachedNetworkId(target), hate);
+		}
+
+		result = true;
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+float HateList::getHate(NetworkId const & target) const
+{
+	float result = 0.0f;
+	UnSortedList::const_iterator iterHateList = m_hateList.find(CachedNetworkId(target));
+
+	if (iterHateList != m_hateList.end())
+	{
+		result = iterHateList->second;
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+float HateList::getMaxHate() const
+{
+	return m_maxHate.get();
+}
+
+// ----------------------------------------------------------------------
+bool HateList::removeTarget(NetworkId const & target)
+{
+	bool result = false;
+
+	// Remove the specified unit
+
+	UnSortedList::const_iterator iterHateList = m_hateList.find(CachedNetworkId(target));
+
+	if (iterHateList != m_hateList.end())
+	{
+		result = true;
+
+		m_hateList.erase(iterHateList);
+		if (m_playerObject)
+			m_playerObject->removeFromPlayerHateList(target);
+
+		triggerTargetRemoved(target);
+
+		// Transfer the hate target back to the aggro list
+		{
+			AggroListProperty * const aggroList = AggroListProperty::getAggroListProperty(*m_owner);
+
+			if (aggroList != NULL)
+			{
+				aggroList->addTarget(target);
+			}
+		}
+	}
+	else
+	{
+		DEBUG_WARNING(true, ("HateList::removeTarget() owner(%s auth=%s) Unable to find the target(%s) in the hate list.", m_owner->getDebugInformation().c_str(), (m_owner->isAuthoritative() ? "yes" : "no"), target.getValueString().c_str()));
+	}
+
+	// If the current target was removed, find a new one
+
+	if (m_target.get() == target)
+	{
+		findNewTarget();
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+bool HateList::isValidTarget(Object * const target)
+{
+	bool valid = true;
+	TangibleObject * const targetTangibleObject = TangibleObject::asTangibleObject(target);
+
+	if (targetTangibleObject == NULL)
+	{
+		LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::isValidTarget() owner(%s:%s) TARGET IS NOT A TANGIBLEOBJECT", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str()));
+		valid = false;
+	}
+	else if (m_owner->getSceneId() != targetTangibleObject->getSceneId())
+	{
+		// Not in the same scene
+
+		LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::isValidTarget() owner(%s:%s) TARGET IS NOT IN THE SAME SCENE", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str()));
+		valid = false;
+	}
+	else if (m_owner->getPosition_w().magnitudeBetweenSquared(targetTangibleObject->getPosition_w()) > sqr(getMaxDistanceToTarget()))
+	{
+		// Objects are too far from each other
+
+		LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::isValidTarget() owner(%s:%s) TARGET IS TOO FAR AWAY", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str()));
+		valid = false;
+	}
+	else
+	{
+		int temp = 0;
+
+		if (   targetTangibleObject->isInvulnerable()
+			|| (targetTangibleObject->getObjVars().getItem("gm", temp) && (temp > 0)))
+		{
+			LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::isValidTarget() owner(%s:%s) TARGET IS A GM", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str()));
+			valid = false;
+		}
+		else
+		{
+			CreatureObject const * const targetCreatureObject = targetTangibleObject->asCreatureObject();
+
+			if (targetCreatureObject != NULL)
+			{
+				if (targetTangibleObject->isDisabled())
+				{
+					LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::isValidTarget() owner(%s:%s) TARGET IS DISABLED", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str()));
+					valid = false;
+				}
+				else if (targetCreatureObject->isIncapacitated())
+				{
+					LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::isValidTarget() owner(%s:%s) TARGET IS INCAPACITATED", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str()));
+					valid = false;
+				}
+				else if (targetCreatureObject->isDead())
+				{
+					LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::isValidTarget() owner(%s:%s) TARGET IS DEAD", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str()));
+					valid = false;
+				}
+				else
+				{
+					AICreatureController const * const targetAiCreatureController = AICreatureController::asAiCreatureController(targetCreatureObject->getController());
+
+					if (   (targetAiCreatureController != NULL)
+						&& targetAiCreatureController->isRetreating())
+					{
+						LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::isValidTarget() owner(%s:%s) TARGET IS RETREATING", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str()));
+						valid = false;
+					}
+					else
+					{
+						// If the owner object is not a creature object, we are
+						// just going to allow the hate to be added to it, regardless
+						// of the pvp rules. For instance, if a player attacks a lair,
+						// crate, or turret, etc. we want those objects to add hate to
+						// themselves towards the player so that they and the player
+						// enter combat correctly.
+						{
+							if (   (m_owner->asCreatureObject() != NULL)
+								&& !Pvp::canAttack(*m_owner, *targetTangibleObject))
+							{
+								LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::isValidTarget() owner(%s:%s) PVP CAN'T ATTACK", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str()));
+								valid = false;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return valid;
+}
+
+// ----------------------------------------------------------------------
+CachedNetworkId const & HateList::getTarget() const
+{
+#ifdef _DEBUG
+	if (   (m_target.get() == CachedNetworkId::cms_cachedInvalid)
+	    && !isEmpty())
+	{
+		WARNING(true, ("HateList::getTarget() owner(%s) m_hateList.size(%u) m_target is NULL but the HateList is not empty.", m_owner->getDebugInformation().c_str(), m_hateList.size()));
+	}
+#endif // _DEBUG
+
+	return m_target.get();
+}
+
+// ----------------------------------------------------------------------
+HateList::UnSortedList const & HateList::getUnSortedList() const
+{
+	return m_hateList.getMap();
+}
+
+// ----------------------------------------------------------------------
+void HateList::getSortedList(SortedList & sortedList) const
+{
+	//LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::getSortedList() m_hateList.size(%u)", m_hateList.size()));
+
+	sortedList.clear();
+
+	// Sort the targets based on the most hate
+
+	if (!m_hateList.empty())
+	{
+		// Sort the results
+
+		typedef std::multimap<float, CachedNetworkId> SortedResults;
+		SortedResults sortedResults;
+		UnSortedList::const_iterator iterHateList = m_hateList.begin();
+
+		for (; iterHateList != m_hateList.end(); ++iterHateList)
+		{
+			IGNORE_RETURN(sortedResults.insert(std::make_pair(iterHateList->second, iterHateList->first)));
+		}
+
+		// Save the sorted results
+
+		sortedList.reserve(sortedResults.size());
+		SortedResults::reverse_iterator iterSortedResults = sortedResults.rbegin();
+
+		for (; iterSortedResults != sortedResults.rend(); ++iterSortedResults)
+		{
+			sortedList.push_back(std::make_pair(iterSortedResults->second, iterSortedResults->first));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+bool HateList::isEmpty() const
+{
+	return getUnSortedList().empty();
+}
+
+// ----------------------------------------------------------------------
+void HateList::findNewTarget()
+{
+	CachedNetworkId target;
+	float maxHate = 0.0f;
+
+	// Walk all the attack targets and get the one with the most damage inflicted
+
+	UnSortedList::const_iterator iterHateList = m_hateList.begin();
+
+	for (; iterHateList != m_hateList.end(); ++iterHateList)
+	{
+		if (iterHateList->first.getObject() == NULL)
+		{
+			// This target will be removed in the next alter call
+			continue;
+		}
+
+		if (   (iterHateList->second > maxHate)
+		    || (target == CachedNetworkId::cms_cachedInvalid))
+		{
+			target = iterHateList->first;
+			maxHate = iterHateList->second;
+		}
+	}
+
+	setTarget(target, maxHate);
+}
+
+// ----------------------------------------------------------------------
+void HateList::clear()
+{
+	m_hateList.clear();
+	if (m_playerObject)
+		m_playerObject->clearPlayerHateList();
+	m_target = CachedNetworkId::cms_cachedInvalid;
+	m_maxHate = 0.0f;
+	m_recentHateList.clear();
+}
+
+// ----------------------------------------------------------------------
+bool HateList::isOnList(NetworkId const & target) const
+{
+	return (m_hateList.find(CachedNetworkId(target)) != m_hateList.end());
+}
+
+// ----------------------------------------------------------------------
+void HateList::setTarget(CachedNetworkId const & target, float const hate)
+{
+	m_maxHate = hate;
+
+	if (m_target.get() != target)
+	{
+		m_target = target;
+
+		if (target != CachedNetworkId::cms_cachedInvalid)
+		{
+			triggerTargetChanged(target);
+		}
+	}
+
+#ifdef _DEBUG
+	// We should only have tangible objects in our target list
+
+	if (m_target.get().getObject() != NULL)
+	{
+		TangibleObject const * const targetTangibleObject = TangibleObject::asTangibleObject(m_target.get().getObject()->asServerObject());
+
+		if (targetTangibleObject == NULL)
+		{
+			WARNING(true, ("HateList::setTarget() owner(%s) How did we get a target(%s) that is not a TangibleObject", m_owner->getDebugInformation().c_str(), m_target.get().getObject()->getDebugInformation().c_str()));
+		}
+	}
+#endif // _DEBUG
+}
+
+// ----------------------------------------------------------------------
+void HateList::addServerNpAutoDeltaVariables(Archive::AutoDeltaByteStream & stream)
+{
+	stream.addVariable(m_hateList);
+	stream.addVariable(m_target);
+	stream.addVariable(m_maxHate);
+	stream.addVariable(m_lastUpdateTime);
+	stream.addVariable(m_autoExpireTargetDuration);
+}
+
+// ----------------------------------------------------------------------
+int HateList::getTimeSinceLastUpdate() const
+{
+	time_t const currentTime = Os::getRealSystemTime();
+	time_t const timeSinceActivitiy = (currentTime - m_lastUpdateTime.get());
+
+	return clamp(0, static_cast<int>(timeSinceActivitiy), 1024);
+}
+
+// ----------------------------------------------------------------------
+void HateList::setOwner(TangibleObject * const owner)
+{
+	m_owner = owner;
+
+	CreatureObject * const creatureObject = m_owner ? m_owner->asCreatureObject() : 0;
+
+	if (creatureObject)
+		m_playerObject = PlayerCreatureController::getPlayerObject(creatureObject);
+	else
+		m_playerObject = 0;
+}
+
+// ----------------------------------------------------------------------
+void HateList::triggerTargetChanged(NetworkId const & target)
+{
+	GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(m_owner);
+
+	if (gameScriptObject != NULL)
+	{
+		LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::triggerTargetChanged() owner(%s:%s) target(%s)", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str(), target.getValueString().c_str()));
+
+		ScriptParams scriptParams;
+		scriptParams.addParam(target);
+		IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_HATE_TARGET_CHANGED, scriptParams));
+	}
+	else
+	{
+		WARNING(true, ("HateList::triggerTargetChanged() Unable to get the ScriptObject for this owner(%s)", m_owner->getDebugInformation().c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+void HateList::triggerTargetAdded(NetworkId const & target)
+{
+	GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(m_owner);
+
+	if (gameScriptObject != NULL)
+	{
+		LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::triggerTargetAdded() owner(%s:%s) target(%s)", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str(), target.getValueString().c_str()));
+
+		ScriptParams scriptParams;
+		scriptParams.addParam(target);
+		IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_HATE_TARGET_ADDED, scriptParams));
+	}
+	else
+	{
+		WARNING(true, ("HateList::triggerTargetAdded() Unable to get the ScriptObject for this owner(%s)", m_owner->getDebugInformation().c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+void HateList::triggerTargetRemoved(NetworkId const & target)
+{
+	GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(m_owner);
+
+	if (gameScriptObject != NULL)
+	{
+		LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::triggerTargetRemoved() owner(%s:%s) target(%s)", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str(), target.getValueString().c_str()));
+
+		ScriptParams scriptParams;
+		scriptParams.addParam(target);
+		IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_HATE_TARGET_REMOVED, scriptParams));
+	}
+	else
+	{
+		WARNING(true, ("HateList::triggerTargetRemoved() Unable to get the ScriptObject for this owner(%s)", m_owner->getDebugInformation().c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+int HateList::getAutoExpireTargetDuration() const
+{
+	int result = static_cast<int>(m_autoExpireTargetDuration.get());
+
+	if (!m_owner->getParentCell()->isWorldCell())
+	{
+		result = static_cast<int>(result * ConfigServerGame::getInteriorTargetDurationFactor());
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+bool HateList::isOwnerValid() const
+{
+	CreatureObject const * const ownerCreature = CreatureObject::asCreatureObject(m_owner);
+	bool const ownerIncapacitated = (ownerCreature != NULL) ? ownerCreature->isIncapacitated() : false;
+
+	if (ownerIncapacitated)
+	{
+		LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::isOwnerValid() owner(%s:%s) OWNER IS INCAPACITATED", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str()));
+		return false;
+	}
+
+	bool const ownerDead = (ownerCreature != NULL) ? ownerCreature->isDead() : false;
+
+	if (ownerDead)
+	{
+		LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::isOwnerValid() owner(%s:%s) OWNER IS DEAD", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str()));
+		return false;
+	}
+
+	bool const ownerDisabled = (ownerCreature != NULL) ? ownerCreature->isDisabled() : false;
+
+	if (ownerDisabled)
+	{
+		LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::isOwnerValid() owner(%s:%s) OWNER IS DISABLED", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str()));
+		return false;
+	}
+
+	AICreatureController const * const ownerAiCreatureController = AICreatureController::asAiCreatureController(m_owner->getController());
+	const bool ownerRetreating = (ownerAiCreatureController != NULL) ? ownerAiCreatureController->isRetreating() : false;
+
+	if (ownerRetreating)
+	{
+		LOGC(AiLogManager::isLogging(m_owner->getNetworkId()), "debug_ai", ("HateList::isOwnerValid() owner(%s:%s) OWNER IS RETREATING", m_owner->getNetworkId().getValueString().c_str(), FileNameUtils::get(m_owner->getDebugName(), FileNameUtils::fileName).c_str()));
+		return false;
+	}
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+HateList::RecentList const & HateList::getRecentList() const
+{
+	return m_recentHateList;
+}
+
+// ----------------------------------------------------------------------
+void HateList::clearRecentList()
+{
+	m_recentHateList.clear();
+}
+
+// ----------------------------------------------------------------------
+void HateList::resetHateTimer()
+{
+	m_lastUpdateTime = Os::getRealSystemTime();
+
+	// for NPC, reset the hate timer of every player on the NPC's hate list
+	if (!m_playerObject && !m_hateList.empty())
+	{
+		for (UnSortedList::const_iterator iterHateList = m_hateList.begin(); iterHateList != m_hateList.end(); ++iterHateList)
+		{
+			TangibleObject * const to = TangibleObject::asTangibleObject(iterHateList->first.getObject());
+			if (to && to->isHateListOwnerPlayer())
+			{
+				to->resetHateTimer();
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+float HateList::getMaxDistanceToTarget()
+{
+	return (ConfigServerGame::getMaxCombatRange() * 2.0f);
+}
+
+// ----------------------------------------------------------------------
+void HateList::setAutoExpireTargetEnabled(bool const enabled)
+{
+	if (enabled)
+	{
+		m_autoExpireTargetDuration = ConfigServerGame::getDefaultAutoExpireTargetDuration();
+	}
+	else
+	{
+		m_autoExpireTargetDuration = 0;
+	}
+}
+
+// ----------------------------------------------------------------------
+bool HateList::isAutoExpireTargetEnabled() const
+{
+	return (getAutoExpireTargetDuration() > 0);
+}
+
+// ----------------------------------------------------------------------
+float HateList::getAILeashTime( ) const
+{
+	return static_cast<float>(m_autoExpireTargetDuration.get());
+}
+
+// ----------------------------------------------------------------------
+void HateList::setAILeashTime( float time )
+{
+	m_autoExpireTargetDuration.set( static_cast<time_t>(time) );
+}
+
+void HateList::forceHateTarget(const NetworkId &target)
+{
+	if(!isOnList(target)) // Creature isn't on our hate list.
+		return;
+
+	m_maxHate = getHate(target);
+
+	if (m_target.get() != CachedNetworkId(target))
+	{
+		m_target = CachedNetworkId(target);
+
+		if (m_target.get() != CachedNetworkId::cms_cachedInvalid)
+		{
+			triggerTargetChanged(target);
+		}
+	}
+
+#ifdef _DEBUG
+	// We should only have tangible objects in our target list
+
+	if (m_target.get().getObject() != NULL)
+	{
+		TangibleObject const * const targetTangibleObject = TangibleObject::asTangibleObject(m_target.get().getObject()->asServerObject());
+
+		if (targetTangibleObject == NULL)
+		{
+			WARNING(true, ("HateList::setTarget() owner(%s) How did we get a target(%s) that is not a TangibleObject", m_owner->getDebugInformation().c_str(), m_target.get().getObject()->getDebugInformation().c_str()));
+		}
+	}
+#endif // _DEBUG
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/HateList.h b/engine/server/library/serverGame/src/shared/ai/HateList.h
new file mode 100644
index 00000000..c4f1b761
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/HateList.h
@@ -0,0 +1,107 @@
+// ======================================================================
+//
+// HateList.h
+// Copyright 2005 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_HateList_H
+#define	INCLUDED_HateList_H
+
+#include "Archive/AutoDeltaMap.h"
+#include "sharedObject/CachedNetworkId.h"
+
+class HateList;
+class NetworkId;
+class PlayerObject;
+class TangibleObject;
+
+// ======================================================================
+//
+// HateList
+//
+// ======================================================================
+
+class HateList
+{
+public:
+
+	typedef stdmap<CachedNetworkId, float>::fwd UnSortedList;
+	typedef stdvector<std::pair<CachedNetworkId, float> >::fwd SortedList;
+	typedef stdset<CachedNetworkId>::fwd RecentList;
+
+	static float getMaxDistanceToTarget();
+
+public:
+
+	HateList();
+	~HateList();
+
+	void setOwner(TangibleObject * const owner);
+	void addServerNpAutoDeltaVariables(Archive::AutoDeltaByteStream & stream);
+
+	void alter();
+	bool isEmpty() const;
+	bool addHate(NetworkId const & target, float const hate);
+	bool setHate(NetworkId const & target, float const hate);
+	float getHate(NetworkId const & target) const;
+	float getMaxHate() const;
+	bool removeTarget(NetworkId const & target);
+	void clear();
+	bool isOnList(NetworkId const & target) const;
+	int getTimeSinceLastUpdate() const;
+	void resetHateTimer();
+	void setAutoExpireTargetEnabled(bool enabled);
+	bool isAutoExpireTargetEnabled() const;
+	int getAutoExpireTargetDuration() const;
+
+	CachedNetworkId const & getTarget() const;
+	UnSortedList const & getUnSortedList() const; // Faster
+	void getSortedList(SortedList & sortedHateList) const; // Slower, don't call every frame
+
+	RecentList const & getRecentList() const;
+	void clearRecentList();
+
+	void setAILeashTime( float time );
+	float getAILeashTime( void ) const;
+
+	bool isOwnerPlayer() const;
+
+	void forceHateTarget(NetworkId const & target);
+
+private:
+
+	void findNewTarget();
+	void setTarget(CachedNetworkId const & target, float const hate);
+	void triggerTargetChanged(NetworkId const & target);
+	void triggerTargetAdded(NetworkId const & target);
+	void triggerTargetRemoved(NetworkId const & target);
+	bool isOwnerValid() const;
+	bool isValidTarget(Object * const target);
+
+	HateList(HateList const & hateList);
+	bool operator ==(HateList const & rhs) const;
+	bool operator !=(HateList const & rhs) const;
+	HateList & operator =(HateList const & rhs);
+
+	TangibleObject * m_owner;
+	PlayerObject * m_playerObject;
+	Archive::AutoDeltaMap<CachedNetworkId, float> m_hateList;
+	Archive::AutoDeltaVariable<CachedNetworkId> m_target;
+	Archive::AutoDeltaVariable<float> m_maxHate;
+	Archive::AutoDeltaVariable<time_t> m_lastUpdateTime;
+	Archive::AutoDeltaVariable<time_t> m_autoExpireTargetDuration;
+	stdset<CachedNetworkId>::fwd m_recentHateList; // This is used for assist logic
+};
+
+//----------------------------------------------------------------------
+
+inline bool HateList::isOwnerPlayer() const
+{
+	return (m_playerObject != NULL);
+}
+
+// ======================================================================
+
+#endif // INCLUDED_HateList_H
diff --git a/engine/server/library/serverGame/src/shared/ai/Squad.cpp b/engine/server/library/serverGame/src/shared/ai/Squad.cpp
new file mode 100644
index 00000000..34f645e1
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/Squad.cpp
@@ -0,0 +1,502 @@
+// ======================================================================
+// 
+// Squad.cpp
+// Copyright Sony Online Entertainment, Inc.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/Squad.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/Formation.h"
+#include "serverGame/SpaceSquad.h"
+#include "sharedFile/Iff.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/PersistentCrcString.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedUtility/DataTable.h"
+
+#include <map>
+#include <vector>
+
+// ======================================================================
+//
+// SquadNamespace
+//
+// ======================================================================
+
+namespace SquadNamespace
+{
+	typedef std::map<PersistentCrcString, int> FormationPriorityList;
+
+	bool s_installed = false;
+	FormationPriorityList s_formationPriorityList;
+}
+
+using namespace SquadNamespace;
+
+// ======================================================================
+//
+// Squad
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+void Squad::install()
+{
+	DEBUG_FATAL(s_installed, ("Already installed"));
+
+	// Create the data table
+
+	Iff iff;
+
+	if (iff.open("datatables/space_mobile/space_mobile.iff", true))
+	{
+		DataTable dataTable;
+		dataTable.load(iff);
+
+		int const rowCount = dataTable.getNumRows();
+
+		for (int row = 0; row < rowCount; ++row)
+		{
+			PersistentCrcString const shipName(dataTable.getStringValue("strIndex", row), false);
+			int const formationPriority = dataTable.getIntValue("formationPriority", row);
+			
+			IGNORE_RETURN(s_formationPriorityList.insert(std::make_pair(shipName, formationPriority)));
+
+			LOGC((ConfigServerGame::isSpaceAiLoggingEnabled() && formationPriority  <= 0), "space_debug_ai", ("Squad::install() ERROR: Invalid formationPriority(%d) specified for shipName(%s)", formationPriority, shipName.getString()));
+		}
+	}
+	else
+	{
+		DEBUG_WARNING(true, ("Unable to load space_mobile.iff to retrieve formation priorities!"));
+	}
+
+	ExitChain::add(&remove, "Squad::remove");
+
+	s_installed = true;
+}
+
+// ----------------------------------------------------------------------
+void Squad::remove()
+{
+	DEBUG_FATAL(!s_installed, ("Not installed"));
+
+	s_formationPriorityList.clear();
+
+	s_installed = false;
+}
+
+// ----------------------------------------------------------------------
+Squad::Squad()
+ : m_leaderOffsetPosition_l()
+ , m_id(0)
+ , m_unitMap(new UnitMap)
+ , m_formation()
+ , m_leader()
+ , m_squadPosition_w()
+ , m_squadPositionUpdateTimer(5.0f)
+{
+	m_squadPositionUpdateTimer.setElapsedTime(m_squadPositionUpdateTimer.getExpireTime());
+}
+
+// ----------------------------------------------------------------------
+Squad::~Squad()
+{
+	delete m_unitMap;
+}
+
+// ----------------------------------------------------------------------
+void Squad::alter(float const deltaSeconds)
+{
+	if (   m_formation.isDirty()
+	    && (m_unitMap->size() > 1))
+	{
+		buildFormation();
+	}
+
+	if (m_squadPositionUpdateTimer.updateNoReset(deltaSeconds))
+	{
+		calculateSquadPosition_w();
+	}
+}
+
+// ----------------------------------------------------------------------
+bool Squad::isEmpty() const
+{
+	return m_unitMap->empty();
+}
+
+// ----------------------------------------------------------------------
+int Squad::getUnitCount() const
+{
+	return static_cast<int>(m_unitMap->size());
+}
+
+// ----------------------------------------------------------------------
+Squad::UnitMap const & Squad::getUnitMap() const
+{
+	return *m_unitMap;
+}
+
+// ----------------------------------------------------------------------
+void Squad::getUnitList(UnitList & unitList)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("Squad::getUnitList() className(%s) squadId(%d)", getClassName(), m_id));
+	LOGC((ConfigServerGame::isSpaceAiLoggingEnabled() && m_unitMap->empty()), "space_debug_ai", ("Squad::getUnitList() className(%s) squadId(%d) The current squad list should not be empty!", getClassName(), m_id));
+
+	unitList.clear();
+	unitList.reserve(m_unitMap->size());
+
+	UnitMap::const_iterator iterUnitMap = m_unitMap->begin();
+
+	for (; iterUnitMap != m_unitMap->end(); ++iterUnitMap)
+	{
+		unitList.push_back(iterUnitMap->first);
+	}
+}
+
+// ----------------------------------------------------------------------
+int Squad::getId() const
+{
+	return m_id;
+}
+
+// ----------------------------------------------------------------------
+void Squad::addUnit(NetworkId const & unit)
+{
+	// If this unit is the only unit in the squad, it is assigned as the squad leader
+
+	UnitMap::const_iterator iterUnitMap = m_unitMap->find(CachedNetworkId(unit));
+
+	if (iterUnitMap == m_unitMap->end())
+	{
+		bool const leader = m_unitMap->empty();
+
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("Squad::addUnit() className(%s) squadId(%d) unit(%s) leader(%s) squadSize(%d+1)", getClassName(), m_id, unit.getValueString().c_str(), leader ? "yes" : "no", m_unitMap->size()));
+
+		//-- Add the unit to the new squad
+
+		IGNORE_RETURN(m_unitMap->insert(std::make_pair(unit, &PersistentCrcString::empty)));
+
+		if (leader)
+		{
+			bool const rebuildFormation = true;
+			IGNORE_RETURN(setLeader(unit, rebuildFormation));
+		}
+
+		m_formation.markDirty();
+
+		onAddUnit(unit);
+	}
+	else
+	{
+#ifdef _DEBUG
+		FormattedString<1024> fs;
+		char const * const text = fs.sprintf("Squad::addUnit() className(%s) squadId(%d) unit(%s) is already in the squad, not re-adding", getClassName(), m_id, unit.getValueString().c_str());
+		DEBUG_WARNING(true, (text));
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+	}
+
+//#ifdef _DEBUG
+//	if (ConfigServerGame::isSpaceAiLoggingEnabled())
+//	{
+//		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("Squad::addUnit() squadId(%d) newSize(%u)", m_id, m_unitMap->size()));
+//		iterUnitMap = m_unitMap->begin();
+//		int index = 1;
+//
+//		for (; iterUnitMap != m_unitMap->end(); ++iterUnitMap)
+//		{
+//			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("Squad::addUnit() squadId(%d) [%2d] unit(%s)", m_id, index, iterUnitMap->getValueString().c_str()));
+//			++index;
+//		}
+//	}
+//#endif // _DEBUG
+}
+
+// ----------------------------------------------------------------------
+void Squad::removeUnit(NetworkId const & unit)
+{
+	UnitMap::iterator iterUnitMap = m_unitMap->find(CachedNetworkId(unit));
+
+	if (iterUnitMap != m_unitMap->end())
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("Squad::removeUnit() className(%s) squadId(%d) unit(%s) squadSize(%d-1) leader(%s)", getClassName(), m_id, unit.getValueString().c_str(),  m_unitMap->size(), m_leader.getValueString().c_str()));
+
+		bool const wasLeader = (iterUnitMap->first == m_leader);
+
+		m_unitMap->erase(iterUnitMap);
+
+		// See if we need to assign a new squad leader
+
+		if (wasLeader)
+		{
+			bool const rebuildFormation = false;
+
+		    if (!isEmpty())
+			{
+				IGNORE_RETURN(setLeader(m_unitMap->begin()->first, rebuildFormation));
+			}
+			else
+			{
+				IGNORE_RETURN(setLeader(NetworkId::cms_invalid, rebuildFormation));
+			}
+		}
+
+		m_formation.markDirty();
+
+		onRemoveUnit();
+	}
+	else
+	{
+#ifdef _DEBUG
+		FormattedString<1024> fs;
+		char const * const text = fs.sprintf("Squad::removeUnit() ERROR: className(%s) squadId(%d) Unable to find the unit(%s)", getClassName(), m_id, unit.getValueString().c_str());
+		DEBUG_WARNING(true, (text));
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+	}
+
+//#ifdef _DEBUG
+//	if (ConfigServerGame::isSpaceAiLoggingEnabled())
+//	{
+//		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("Squad::removeUnit() squadId(%d) newSize(%u)", m_id, m_unitMap->size()));
+//		iterUnitMap = m_unitMap->begin();
+//		int index = 1;
+//
+//		for (; iterUnitMap != m_unitMap->end(); ++iterUnitMap)
+//		{
+//			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("Squad::removeUnit() squadId(%d) [%2d] unit(%s)", m_id, index, iterUnitMap->getValueString().c_str()));
+//			++index;
+//		}
+//	}
+//#endif // _DEBUG
+}
+
+
+// ----------------------------------------------------------------------
+Formation & Squad::getFormation()
+{
+	return m_formation;
+}
+
+// ----------------------------------------------------------------------
+bool Squad::setLeader(NetworkId const & unit, bool const rebuildFormation)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("Squad::setLeader() className(%s) squadId(%d) unit(%s) rebuildFormation(%s)", getClassName(), m_id, unit.getValueString().c_str(), rebuildFormation ? "yes" : "no"));
+
+	if (   isEmpty()
+	    && (unit == NetworkId::cms_invalid))
+	{
+		m_leader = CachedNetworkId::cms_cachedInvalid;
+
+		return true;
+	}
+
+	bool result = false;
+	UnitMap::iterator iterUnitMap = m_unitMap->find(CachedNetworkId(unit));
+
+	if (iterUnitMap != m_unitMap->end())
+	{
+		result = true;
+
+		NetworkId oldLeader(m_leader);
+		m_leader = CachedNetworkId(unit);
+		onNewLeader(oldLeader);
+
+		if (rebuildFormation)
+		{
+			m_formation.markDirty();
+		}
+	}
+	else
+	{
+		m_leader = CachedNetworkId::cms_cachedInvalid;
+
+#ifdef _DEBUG
+		FormattedString<1024> fs;
+		char const * const text = fs.sprintf("Squad::setLeader() ERROR: className(%s) Trying to set a leader(%s) who is not a member of the squad.", getClassName(), unit.getValueString().c_str());
+		DEBUG_WARNING(true, (text));
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+CachedNetworkId const & Squad::getLeader() const
+{
+	return m_leader;
+}
+
+// ----------------------------------------------------------------------
+Vector const & Squad::getLeaderOffsetPosition_l() const
+{
+	return m_leaderOffsetPosition_l;
+}
+
+// ----------------------------------------------------------------------
+void Squad::combineWith(Squad & squad)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("Squad::combineWith() className(%s) squadId(%d) combineWithSquadId(%d)", getClassName(), m_id, squad.getId()));
+	LOGC((ConfigServerGame::isSpaceAiLoggingEnabled() && squad.isEmpty()), "space_debug_ai", ("Squad::combineWith() className(%s) squadId(%d) combineWithSquadId(%d) Why are we combining with an empty squad?", getClassName(), m_id, squad.getId()));
+
+	//-- Add all the units to this squad
+
+	UnitMap::const_iterator iterUnitMap = squad.getUnitMap().begin();
+
+	for (; iterUnitMap != squad.getUnitMap().end(); ++iterUnitMap)
+	{
+		NetworkId const & unit = iterUnitMap->first;
+		addUnit(unit);
+	}
+}
+
+// ----------------------------------------------------------------------
+void Squad::setId(int const id)
+{
+	DEBUG_FATAL((id == 0), ("0 is an invalid squad id."));
+
+	m_id = id;
+}
+
+// ----------------------------------------------------------------------
+void Squad::buildFormation()
+{
+	// Prioritize the ships to enter the formation first, the lower the priority
+	// the more towards the center the ships are located
+
+	typedef std::multimap<int, std::pair<NetworkId, PersistentCrcString const *> > SortedUnitList;
+	SortedUnitList sortedUnitList;
+
+	UnitMap::const_iterator iterUnitMap = m_unitMap->begin();
+
+	for (; iterUnitMap != m_unitMap->end(); ++iterUnitMap)
+	{
+		NetworkId const & unit = iterUnitMap->first;
+		PersistentCrcString const * unitName = iterUnitMap->second;
+		DEBUG_FATAL((unitName == NULL), ("The unit should have a non-null name."));
+
+		if (unit == m_leader)
+		{
+			IGNORE_RETURN(sortedUnitList.insert(std::make_pair(0, std::make_pair(unit, unitName))));
+		}
+		else
+		{
+			FormationPriorityList::const_iterator iterFormationPriorityList = s_formationPriorityList.find(*unitName);
+
+			int priority = 10;
+
+			if (iterFormationPriorityList != s_formationPriorityList.end())
+			{
+				priority = iterFormationPriorityList->second;
+			}
+			else
+			{
+#ifdef DEBUG
+				Object * const unitObject = NetworkIdManager::getObjectById(unit);
+				DEBUG_WARNING(true, ("className(%s) Unable to find the ship(%s) [%s] in the formation priority list.", 
+					getClassName(), unitName->getString(), unitObject ? unitObject->getDebugInformation().c_str() : "NULL"));
+#endif
+			}
+
+			IGNORE_RETURN(sortedUnitList.insert(std::make_pair(priority, std::make_pair(unit, unitName))));
+		}
+	}
+
+	// Store the sorted unit list
+
+	m_unitMap->clear();
+	SortedUnitList::reverse_iterator iterSortedUnitList = sortedUnitList.rbegin();
+
+	for (; iterSortedUnitList != sortedUnitList.rend(); ++iterSortedUnitList)
+	{
+		NetworkId const & unit = iterSortedUnitList->second.first;
+		PersistentCrcString const * unitName = iterSortedUnitList->second.second;
+
+		IGNORE_RETURN(m_unitMap->insert(std::make_pair(unit, unitName)));
+	}
+
+	m_formation.build(*this);
+}
+
+// ----------------------------------------------------------------------
+void Squad::setUnitFormationPosition_l(NetworkId const & unit, Vector const & position_l)
+{
+	onSetUnitFormationPosition_l(unit, position_l);
+}
+
+// ----------------------------------------------------------------------
+Vector const & Squad::getSquadPosition_w()
+{
+	if (m_squadPositionUpdateTimer.isExpired())
+	{
+		calculateSquadPosition_w();
+	}
+
+	return m_squadPosition_w;
+}
+
+// ----------------------------------------------------------------------
+void Squad::calculateSquadPosition_w()
+{
+	if (m_squadPositionUpdateTimer.getElapsedRatio() > 0.0f)
+	{
+		// The position has already been calculated this frame
+		return;
+	}
+
+	m_squadPositionUpdateTimer.reset();
+
+	UnitMap::const_iterator iterUnitMap = getUnitMap().begin();
+
+	m_squadPosition_w = Vector::zero;
+
+	for (; iterUnitMap != getUnitMap().end(); ++iterUnitMap)
+	{
+		NetworkId const & unit = (*iterUnitMap).first;
+
+		Object * const object = NetworkIdManager::getObjectById(unit);
+
+		if (object != NULL)
+		{
+			m_squadPosition_w += object->getPosition_w();
+		}
+		else
+		{
+#ifdef _DEBUG
+			FormattedString<1024> fs;
+			char const * const text = fs.sprintf("Squad::calculateSquadPosition_w() unit(%s) did not resolve to a valid object", unit.getValueString().c_str());
+			DEBUG_WARNING(true, (text));
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+		}
+	}
+
+	if (getUnitMap().size() > 1)
+	{
+		m_squadPosition_w /= static_cast<float>(getUnitMap().size());
+	}
+	else
+	{
+#ifdef _DEBUG
+		FormattedString<1024> fs;
+		char const * const text = fs.sprintf("Squad::calculateSquadPosition_w() Why is there a zero size squad?");
+		DEBUG_WARNING(true, (text));
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+	}
+}
+
+// ----------------------------------------------------------------------
+bool Squad::contains(NetworkId const & unit) const
+{
+	return (m_unitMap->find(CachedNetworkId(unit)) != m_unitMap->end());
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/ai/Squad.h b/engine/server/library/serverGame/src/shared/ai/Squad.h
new file mode 100644
index 00000000..2ad0b511
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/ai/Squad.h
@@ -0,0 +1,97 @@
+// ======================================================================
+// 
+// Squad.h
+// Copyright Sony Online Entertainment, Inc.
+//
+// ======================================================================
+
+#ifndef INCLUDED_Squad_H
+#define INCLUDED_Squad_H
+
+#include "serverGame/Formation.h"
+#include "sharedFoundation/Timer.h"
+#include "sharedMath/Vector.h"
+#include "sharedObject/CachedNetworkId.h"
+
+class NetworkId;
+class PersistentCrcString;
+
+// ----------------------------------------------------------------------
+class Squad
+{
+public:
+
+	friend class SpaceSquadManager;
+
+	typedef stdmap<CachedNetworkId, PersistentCrcString const *>::fwd UnitMap;
+	typedef stdvector<CachedNetworkId>::fwd UnitList;
+
+	static void install();
+
+public:
+
+	virtual char const * getClassName() const = 0;
+	virtual void alter(float deltaSeconds);
+
+	bool isEmpty() const;
+	int getUnitCount() const;
+	UnitMap const & getUnitMap() const; // faster
+	void getUnitList(UnitList & unitList); // slower
+	int getId() const;
+
+	void addUnit(NetworkId const & unit);
+	void removeUnit(NetworkId const & unit);
+
+	Formation & getFormation();
+
+	bool setLeader(NetworkId const & unit, bool rebuildFormation);
+	CachedNetworkId const & getLeader() const;
+
+	Vector const & getLeaderOffsetPosition_l() const;
+
+	void combineWith(Squad & squad);
+	void setUnitFormationPosition_l(NetworkId const & unit, Vector const & position_l);
+
+	Vector const & getSquadPosition_w();
+
+	virtual void assignNewLeader() = 0;
+
+	bool contains(NetworkId const & unit) const;
+
+
+protected:
+
+	Squad();
+	virtual ~Squad() = 0;
+
+	virtual void onAddUnit(NetworkId const & unit) = 0;
+	virtual void onRemoveUnit() = 0;
+	virtual void onNewLeader(NetworkId const & oldLeader) = 0;
+	virtual void onSetUnitFormationPosition_l(NetworkId const & unit, Vector const & position_l) = 0;
+	void calculateSquadPosition_w();
+	void setId(int const id);
+
+	Vector m_leaderOffsetPosition_l;
+
+private:
+
+	static void remove();
+
+	void buildFormation();
+
+	int m_id;
+	UnitMap * const m_unitMap;
+	Formation m_formation;
+	CachedNetworkId m_leader;
+	Vector m_squadPosition_w;
+	Timer m_squadPositionUpdateTimer;
+
+	// Disabled
+
+	Squad(Squad const &);
+	Squad & operator =(Squad const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_Squad_H
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiCreatureStateArchive.cpp b/engine/server/library/serverGame/src/shared/behavior/AiCreatureStateArchive.cpp
new file mode 100644
index 00000000..08bba97e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiCreatureStateArchive.cpp
@@ -0,0 +1,54 @@
+// ======================================================================
+//
+// AiCreatureStateArchive.cpp
+// copyright 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiCreatureStateArchive.h"
+
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/CreatureObject.h"
+#include "serverNetworkMessages/AiCreatureStateMessage.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedObject/NetworkIdManager.h"
+
+//-----------------------------------------------------------------------
+
+namespace Archive
+{
+	// The archive functions for AiCreatureStateMessage are here so we don't have to link serverGame with everything
+
+	void get(ReadIterator & source, AiCreatureStateMessage & target)
+	{
+		get(source, target.m_networkId);
+		get(source, target.m_movement);
+
+#ifdef _DEBUG
+		Object * const object = NetworkIdManager::getObjectById(target.m_networkId);
+
+		if (object == NULL)
+		{
+			WARNING(true, ("AiCreatureStateArchive::get() Unable to resolve networkId(%s) to an Object", target.m_networkId.getValueString().c_str()));
+			return;
+		}
+
+		AICreatureController * const controller = (object != NULL) ? AICreatureController::asAiCreatureController(object->getController()) : NULL;
+
+		if (controller == NULL)
+		{
+			WARNING(true, ("AiCreatureStateArchive::get() Message to object(%s) that does not have an AICreatureController", object->getDebugInformation().c_str()));
+			return;
+		}
+#endif // _DEBUG
+	}
+
+	void put(ByteStream & target, AiCreatureStateMessage const & source)
+	{
+		put(target, source.m_networkId);
+		put(target, source.m_movement);
+	}
+}
+
+//=======================================================================
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiCreatureStateArchive.h b/engine/server/library/serverGame/src/shared/behavior/AiCreatureStateArchive.h
new file mode 100644
index 00000000..0b2bdad3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiCreatureStateArchive.h
@@ -0,0 +1,27 @@
+// ======================================================================
+//
+// AiCreatureStateArchive.h
+// copyright 2005 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiCreatureStateArchive_H
+#define	INCLUDED_AiCreatureStateArchive_H
+
+class AiCreatureStateMessage;
+
+// ======================================================================
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+
+	void get(ReadIterator & source, AiCreatureStateMessage & target);
+	void put(ByteStream & target, AiCreatureStateMessage const & source);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_AiCreatureStateArchive_H
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiLocation.cpp b/engine/server/library/serverGame/src/shared/behavior/AiLocation.cpp
new file mode 100644
index 00000000..885657b9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiLocation.cpp
@@ -0,0 +1,639 @@
+// ======================================================================
+//
+// AiLocation.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiLocation.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedCollision/CollisionUtils.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/World.h"
+#include "sharedTerrain/TerrainObject.h"
+
+
+static int gs_debugCounter = -6000000;
+
+const AiLocation AiLocation::invalid;
+
+namespace AiLocationArchive
+{
+	// define some values for data combinations so we don't have to send
+	// all the location data over the network
+	enum AiLocationPackage
+	{
+		ALP_None,         // uninitialized location
+		ALP_Cell,         // cell id, local position, radius
+		ALP_World,        // world position, radius
+		ALP_Object,       // object id
+		ALP_OffsetObject, // object id, offset, relative flag
+	};
+}
+
+#define AI_WARNING(A) WARNING(ConfigServerGame::getReportAiWarnings(),(A);
+
+// ----------------------------------------------------------------------
+
+AiLocation::AiLocation ( void )
+:	m_valid(false),
+	m_attached(false),
+	m_object(NULL),
+	m_objectId(),
+	m_cellObject(NULL),
+	m_position_p(Vector::zero),
+	m_position_w(Vector::zero),
+	m_radius(0.0f),
+	m_offset_p(Vector::zero),
+	m_relativeOffset(false),
+	m_hasChanged(true),
+	m_cuttable(true),
+	m_debugId(gs_debugCounter++)
+{
+}
+
+AiLocation::AiLocation ( CellProperty const * cell, Vector const & position, float radius )
+:	m_valid(true),
+	m_attached(false),
+	m_object(NULL),
+	m_objectId(),
+	m_cellObject(cell ? &cell->getOwner() : NULL),
+	m_position_p(position),
+	m_position_w(CollisionUtils::transformToWorld(cell,position)),
+	m_radius(radius),
+	m_offset_p(Vector::zero),
+	m_relativeOffset(false),
+	m_hasChanged(true),
+	m_cuttable(true),
+	m_debugId(gs_debugCounter++)
+{
+	VALIDATE_LOCATION();
+}
+
+AiLocation::AiLocation ( NetworkId const & cellId, Vector const & position, float radius )
+:	m_valid(true),
+	m_attached(false),
+	m_object(NULL),
+	m_objectId(),
+	m_cellObject(NULL),
+	m_position_p(position),
+	m_position_w(position),
+	m_radius(radius),
+	m_offset_p(Vector::zero),
+	m_relativeOffset(false),
+	m_hasChanged(true),
+	m_cuttable(true),
+	m_debugId(gs_debugCounter++)
+{
+	if(cellId.isValid())
+	{
+		m_cellObject = NetworkIdManager::getObjectById(cellId);
+	}
+	else
+	{
+		m_cellObject = &CellProperty::getWorldCellProperty()->getOwner();
+	}
+
+	if(m_cellObject)
+	{
+		m_position_w = CollisionUtils::transformToWorld(m_cellObject->getCellProperty(),m_position_p);
+	}
+
+	VALIDATE_LOCATION();
+}
+
+AiLocation::AiLocation ( Object const * object )
+:	m_valid(true),
+	m_attached(true),
+	m_object(NULL),
+	m_objectId(),
+	m_cellObject(NULL),
+	m_position_p(Vector::zero),
+	m_position_w(Vector::zero),
+	m_radius(0.0f),
+	m_offset_p(Vector::zero),
+	m_relativeOffset(false),
+	m_hasChanged(true),
+	m_cuttable(true),
+	m_debugId(gs_debugCounter++)
+{
+	setObject(object);
+	VALIDATE_LOCATION();
+}
+
+AiLocation::AiLocation ( NetworkId const & objectId )
+:	m_valid(true),
+	m_attached(true),
+	m_object(NULL),
+	m_objectId(),
+	m_cellObject(NULL),
+	m_position_p(Vector::zero),
+	m_position_w(Vector::zero),
+	m_radius(0.0f),
+	m_offset_p(Vector::zero),
+	m_relativeOffset(false),
+	m_hasChanged(true),
+	m_cuttable(true),
+	m_debugId(gs_debugCounter++)
+{
+	setObject(NetworkIdManager::getObjectById(objectId));
+	VALIDATE_LOCATION();
+}
+
+AiLocation::AiLocation ( Object const * object, Vector const & offset, bool relativeOffset )
+:	m_valid(true),
+	m_attached(true),
+	m_object(NULL),
+	m_objectId(),
+	m_cellObject(NULL),
+	m_position_p(Vector::zero),
+	m_position_w(Vector::zero),
+	m_radius(0.0f),
+	m_offset_p(offset),
+	m_relativeOffset(relativeOffset),
+	m_hasChanged(true),
+	m_cuttable(true),
+	m_debugId(gs_debugCounter++)
+{
+	setObject(object);
+	VALIDATE_LOCATION();
+}
+
+AiLocation::AiLocation ( NetworkId const & objectId, Vector const & offset, bool relativeOffset )
+:	m_valid(true),
+	m_attached(true),
+	m_object(NULL),
+	m_objectId(),
+	m_cellObject(NULL),
+	m_position_p(Vector::zero),
+	m_position_w(Vector::zero),
+	m_radius(0.0f),
+	m_offset_p(offset),
+	m_relativeOffset(relativeOffset),
+	m_hasChanged(true),
+	m_cuttable(true),
+	m_debugId(gs_debugCounter++)
+{
+	setObject(NetworkIdManager::getObjectById(objectId));
+	VALIDATE_LOCATION();
+}
+
+// ----------
+
+AiLocation::AiLocation ( AiLocation const & loc )
+:	m_valid(loc.m_valid),
+	m_attached(loc.m_attached),
+	m_object(loc.m_object),
+	m_objectId(loc.m_objectId),
+	m_cellObject(loc.m_cellObject),
+	m_position_p(loc.m_position_p),
+	m_position_w(loc.m_position_w),
+	m_radius(loc.m_radius),
+	m_offset_p(loc.m_offset_p),
+	m_relativeOffset(loc.m_relativeOffset),
+	m_hasChanged(true),
+	m_cuttable(loc.m_cuttable),
+	m_debugId(gs_debugCounter++)
+{
+}
+
+// ----------
+
+AiLocation::AiLocation ( Archive::ReadIterator & source )
+:	m_valid(),
+	m_attached(),
+	m_object(),
+	m_objectId(),
+	m_cellObject(),
+	m_position_p(),
+	m_position_w(),
+	m_radius(),
+	m_offset_p(),
+	m_relativeOffset(),
+	m_hasChanged(),
+	m_cuttable(),
+	m_debugId()
+{
+	unpack(source);
+}
+
+// ----------
+
+AiLocation::~AiLocation()
+{
+}
+
+// ----------
+
+AiLocation & AiLocation::operator = ( AiLocation const & loc )
+{
+	m_valid = loc.m_valid;
+	m_attached = loc.m_attached;
+	m_object = loc.m_object;
+	m_objectId = loc.m_objectId;
+	m_cellObject = loc.m_cellObject;
+	m_position_p = loc.m_position_p;
+	m_position_w = loc.m_position_w;
+	m_radius = loc.m_radius;
+	m_offset_p = loc.m_offset_p;
+	m_relativeOffset = loc.m_relativeOffset;
+	m_hasChanged = true;
+	m_cuttable = loc.m_cuttable;
+
+	VALIDATE_LOCATION();
+
+	return *this;
+}
+
+// ----------
+
+void AiLocation::pack(Archive::ByteStream & target) const
+{
+	Archive::put(target, m_valid);
+	Archive::put(target, m_attached);
+	Archive::put(target, m_relativeOffset);
+	Archive::put(target, m_hasChanged);
+	Archive::put(target, m_cuttable);
+	Archive::put(target, m_debugId);
+	Archive::put(target, m_radius);
+
+	if (getObjectId() != NetworkId::cms_invalid)
+	{
+		if (getOffset() == Vector::zero)
+		{
+			Archive::put(target, static_cast<uint8>(AiLocationArchive::ALP_Object));
+			Archive::put(target, getObjectId());
+		}
+		else
+		{
+			Archive::put(target, static_cast<uint8>(AiLocationArchive::ALP_OffsetObject));
+			Archive::put(target, getObjectId());
+			Archive::put(target, getOffset());
+		}
+	}
+	else if (getCellId() != NetworkId::cms_invalid)
+	{
+		Archive::put(target, static_cast<uint8>(AiLocationArchive::ALP_Cell));
+		Archive::put(target, getCellId());
+		Archive::put(target, getPosition_p());
+	}
+	else
+	{
+		Archive::put(target, static_cast<uint8>(AiLocationArchive::ALP_World));
+		Archive::put(target, getPosition_w());
+	}
+}
+
+// ----------
+
+void AiLocation::unpack( Archive::ReadIterator & source )
+{
+	Archive::get(source, m_valid);
+	Archive::get(source, m_attached);
+	Archive::get(source, m_relativeOffset);
+	Archive::get(source, m_hasChanged);
+	Archive::get(source, m_cuttable);
+	Archive::get(source, m_debugId);
+	Archive::get(source, m_radius);
+
+	uint8 package;
+	Archive::get(source, package);
+	switch (static_cast<AiLocationArchive::AiLocationPackage>(package))
+	{
+		case AiLocationArchive::ALP_None:
+			// do nothing
+			break;
+		case AiLocationArchive::ALP_Cell:
+			{
+				NetworkId cellId;
+				Archive::get(source, cellId);
+				Archive::get(source, m_position_p);
+				m_position_w = m_position_p;
+				if (cellId.isValid())
+				{
+					m_cellObject = NetworkIdManager::getObjectById(cellId);
+				}
+				else
+				{
+					m_cellObject = &CellProperty::getWorldCellProperty()->getOwner();
+				}
+
+				if (m_cellObject)
+				{
+					m_position_w = CollisionUtils::transformToWorld(m_cellObject->getCellProperty(),m_position_p);
+				}
+			}
+			break;
+		case AiLocationArchive::ALP_World:
+			{
+				Archive::get(source, m_position_w);
+				m_position_p = m_position_w;
+			}
+			break;
+		case AiLocationArchive::ALP_Object:
+			{
+				NetworkId objectId;
+				Archive::get(source, objectId);
+				setObject(NetworkIdManager::getObjectById(objectId));
+			}
+			break;
+		case AiLocationArchive::ALP_OffsetObject:
+			{
+				NetworkId objectId;
+				Archive::get(source, objectId);
+				Archive::get(source, m_offset_p);
+				setObject(NetworkIdManager::getObjectById(objectId));
+			}
+			break;
+		default:
+			WARNING(true, ("AiLocation::AiLocation(archive) received unknown data "
+				"type %d", static_cast<int>(package)));
+			break;
+	}
+	
+	VALIDATE_LOCATION();	
+}
+
+// ----------
+
+void AiLocation::setObject ( Object const * object )
+{
+	if(m_attached)
+	{
+		if (object == NULL)
+		{
+			clear();
+			return;
+		}
+
+		m_object = object;
+		m_objectId = m_object->getNetworkId();
+		m_position_p = m_object->getPosition_p();
+		m_position_w = m_object->getPosition_w();
+		m_cellObject = &(m_object->getParentCell()->getOwner());
+
+		VALIDATE_LOCATION();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AiLocation::detach ( void )
+{
+	m_object = NULL;
+	m_objectId = NetworkId::cms_invalid;
+	m_attached = false;
+}
+
+// ----------------------------------------------------------------------
+
+CellProperty const * AiLocation::getCell ( void ) const
+{
+	return m_cellObject ? m_cellObject->getCellProperty() : NULL;
+}
+
+// ----------
+
+NetworkId const & AiLocation::getCellId ( void ) const
+{
+	CellProperty const * cell = getCell();
+
+	if(cell && (cell != CellProperty::getWorldCellProperty()))
+	{
+		return cell->getOwner().getNetworkId();
+	}
+	else
+	{
+		return NetworkId::cms_invalid;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool AiLocation::hasChanged ( void ) const
+{
+	return m_hasChanged;
+}
+
+// ----------------------------------------------------------------------
+
+Vector AiLocation::getPosition_p ( void ) const
+{
+	if(m_cellObject.getPointer() == NULL)
+	{
+		WARNING(ConfigServerGame::getReportAiWarnings(),("AiLocation::getPosition_p - Locations's parent cell has disappeared\n"));
+		
+		AiLocation * self = const_cast<AiLocation*>(this);
+
+		self->m_position_p = self->m_position_w;
+
+		self->m_cellObject = &(CellProperty::getWorldCellProperty()->getOwner());
+
+		VALIDATE_LOCATION();
+	}
+
+	return m_position_p;
+}
+
+// ----------
+
+Vector AiLocation::getPosition_w ( void ) const
+{
+	return m_position_w;
+}
+
+// ----------
+
+Vector AiLocation::getPosition_p ( CellProperty const * relativeCell ) const
+{
+	Vector pos_p = getPosition_p();
+
+	return CollisionUtils::transformToCell(getCell(),pos_p,relativeCell);
+}
+
+// ----------
+
+void AiLocation::setPosition_p ( Vector const & position_p )
+{
+	NAN_CHECK(position_p);
+
+	m_position_p = position_p;
+	m_position_w = CollisionUtils::transformToWorld(getCell(),position_p);
+}
+
+// ----------
+
+void AiLocation::setPosition_w ( Vector const & position_w )
+{
+	NAN_CHECK(position_w);
+
+	m_position_p = CollisionUtils::transformFromWorld(position_w,getCell());
+	m_position_w = position_w;
+}
+
+// ----------------------------------------------------------------------
+
+Vector AiLocation::getOffsetPosition_p ( void ) const
+{
+	Vector pos_p = getPosition_p();
+
+	Vector offset = m_relativeOffset ? m_object->rotate_o2p(m_offset_p) : m_offset_p;
+
+	return pos_p + offset;
+}
+
+// ----------
+
+Vector AiLocation::getOffsetPosition_w ( void ) const
+{
+	CellProperty const * cell = getCell();
+
+	if(cell)
+	{
+		return cell->getOwner().getTransform_o2w().rotateTranslate_l2p(getOffsetPosition_p());
+	}
+	else
+	{
+		return getOffsetPosition_p();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AiLocation::setOffset_p(Vector const & offset, bool relative)
+{
+	m_offset_p = offset;
+	m_relativeOffset = relative;
+	m_hasChanged = true;
+}
+
+// ----------------------------------------------------------------------
+
+float AiLocation::getRadius ( void ) const
+{
+	return m_radius;
+}
+
+// ----------------------------------------------------------------------
+
+void AiLocation::update ( void )
+{
+	if(!m_attached) return;
+
+	if(!m_object)
+	{
+		// object this location refers to has disappeared
+
+		int id = static_cast<int>(m_objectId.getValue());
+
+		WARNING(ConfigServerGame::getReportAiWarnings(),("AiLocation::update - The object this location was attached (%d) to has disappeared\n",id));
+		m_attached = false;
+		m_valid = false;
+		return;
+	}
+
+	if(!m_cellObject)
+	{
+		WARNING(ConfigServerGame::getReportAiWarnings(),("AiLocation::getPosition_p - Location at (%f,%f,%f) - parent cell has disappeared\n",m_position_w.x,m_position_w.y,m_position_w.z));
+
+		m_position_p = m_position_w;
+		m_cellObject = &(CellProperty::getWorldCellProperty()->getOwner());
+	}
+
+	Vector const offset = m_relativeOffset ? m_object->rotate_o2p(m_offset_p) : m_offset_p;
+	Vector const newPosition_p = m_object->getPosition_p() + offset;
+	float const positionDeltaSquared = newPosition_p.magnitudeBetweenSquared(m_position_p);
+	CellProperty const * const objectCell = m_object->getParentCell();
+
+	if ((positionDeltaSquared > 0.00001f) || (getCell() != objectCell))
+	{
+		m_position_p = newPosition_p;
+		m_hasChanged = true;
+		m_cellObject = &(m_object->getParentCell()->getOwner());
+		m_position_w = CollisionUtils::transformToWorld(getCell(), m_position_p);
+	}
+
+	VALIDATE_LOCATION();
+}
+
+// ----------------------------------------------------------------------
+
+void AiLocation::clear ( void )
+{
+	// Note that this explicitly does _not_ clear m_objectId - if an
+	// AiLocation is detached from its object because the object was 
+	// deleted, the behaviors will still need to know the now-invalid 
+	// NetworkId so they can send it to the scripts.
+
+	m_valid = false;
+	m_attached = false;
+	m_object = NULL;
+	m_cellObject = NULL;
+	m_position_p = Vector::zero;
+	m_radius = 0.0f;
+	m_offset_p = Vector::zero;
+	m_relativeOffset = false;
+	m_hasChanged = true;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiLocation::isInWorldCell ( void ) const
+{
+	return isValid() && ( (getCell() == NULL) || (getCell() == CellProperty::getWorldCellProperty()) );
+
+}
+
+// ----------------------------------------------------------------------
+
+bool AiLocation::validate ( void ) const
+{
+	NAN_CHECK(m_position_p);
+	NAN_CHECK(m_radius);
+	NAN_CHECK(m_offset_p);
+
+	TerrainObject * terrain = TerrainObject::getInstance();
+
+	if(terrain == NULL) return true;
+
+	float w = terrain->getMapWidthInMeters() / 2.0f;
+
+	bool valid = true;
+	
+	valid &= (m_position_p.x <=  w);
+	valid &= (m_position_p.x >= -w);
+
+	valid &= (m_position_p.z <=  w);
+	valid &= (m_position_p.z >= -w);
+
+	float dist2 = getPosition_w().magnitudeSquared();
+
+	valid &= (dist2 >= 9.0f);
+
+	if(!valid)
+	{
+		DEBUG_WARNING(ConfigServerGame::getReportAiWarnings(),("AiLocation::validate - Location (%f,%f,%f) is OOW or too near the origin - terrain size %fx%f\n",m_position_p.x,m_position_p.y,m_position_p.z,w*2.0f,w*2.0f));
+	}
+
+	return valid;
+}
+
+// ----------------------------------------------------------------------
+
+void AiLocation::getDebugInfo( std::string & outString ) const
+{
+	Vector const & w = getPosition_w();
+	outString += FormattedString<1024>().sprintf("world location: %.2f, %.2f, %.2f\n", w.x, w.y, w.z);
+}
+
+// ----------------------------------------------------------------------
+
+Vector const & AiLocation::getOffset_p() const
+{
+	return m_offset_p;
+}
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiLocation.h b/engine/server/library/serverGame/src/shared/behavior/AiLocation.h
new file mode 100644
index 00000000..f8bc2129
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiLocation.h
@@ -0,0 +1,196 @@
+// ======================================================================
+//
+// AiLocation.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiLocation_H
+#define	INCLUDED_AiLocation_H
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Watcher.h"
+#include "sharedMath/Vector.h"
+#include "sharedObject/Object.h"
+
+namespace Archive
+{
+	class ByteStream;
+	class ReadIterator;
+}
+
+class CellProperty;
+
+#ifdef _DEBUG
+#define VALIDATE_LOCATION() validate()
+#else
+#define VALIDATE_LOCATION() NOP
+#endif
+
+// ======================================================================
+
+class AiLocation
+{
+public:
+
+	AiLocation ( void );
+	AiLocation ( CellProperty const * cell, Vector const & point, float radius = 0.0f );
+	AiLocation ( NetworkId const & cellId, Vector const & point, float radius = 0.0f );
+	AiLocation ( Object const * target );
+	AiLocation ( NetworkId const & targetId );
+	AiLocation ( Object const * target, Vector const & offset, bool relativeOffset );
+	AiLocation ( NetworkId const & targetId, Vector const & offset, bool relativeOffset );
+	AiLocation ( AiLocation const & copy );
+	AiLocation ( Archive::ReadIterator & source );
+	
+	~AiLocation();
+
+	static const AiLocation invalid;
+
+	AiLocation & operator = ( AiLocation const & copy );
+	
+	void                 initialize     ( void );
+	
+	void                 pack           ( Archive::ByteStream & target ) const;
+	void                 unpack         ( Archive::ReadIterator & source );
+
+	// ----------
+	
+	bool                 isValid        ( void ) const;
+	bool                 hasChanged     ( void ) const;
+	void                 setChanged     ( bool changed );
+	
+	Object const *       getObject      ( void ) const;
+	void                 setObject      ( Object const * object );
+
+	void                 detach         ( void );
+
+	NetworkId const &    getObjectId    ( void ) const;
+	
+	CellProperty const * getCell        ( void ) const;
+	NetworkId const &    getCellId      ( void ) const;
+	
+	Vector               getPosition_p  ( void ) const;
+	Vector               getPosition_w  ( void ) const;
+
+	Vector               getPosition_p  ( CellProperty const * relativeCell ) const;
+
+	void                 setPosition_p  ( Vector const & position_p );
+	void                 setPosition_w  ( Vector const & position_w );
+
+	Vector               getOffsetPosition_p ( void ) const;
+	Vector               getOffsetPosition_w ( void ) const;
+	Vector const &       getOffset_p() const;
+	void                 setOffset_p(Vector const & offset, bool relative);
+
+	float                getRadius      ( void ) const;
+	void                 setRadius      ( float newRadius );
+
+	Vector               getOffset      ( void ) const;
+	void                 setOffset      ( Vector const & newOffset );
+
+	bool                 getRelativeOffset ( void ) const;
+
+	void                 update         ( void );
+	void                 clear          ( void );
+
+	bool                 isInWorldCell  ( void ) const;
+
+	bool                 isCuttable     ( void ) const;
+	void                 setCuttable    ( bool cuttable );
+
+	int                  getDebugId     ( void ) const;
+	void                 getDebugInfo   ( std::string & outString ) const;
+
+	// ----------
+
+protected:
+
+	bool                 validate       ( void ) const;
+
+	typedef ConstWatcher<Object> ObjectWatcher;
+
+	bool                 m_valid;
+	bool                 m_attached;
+
+	ObjectWatcher        m_object;
+	NetworkId            m_objectId;
+	
+	ObjectWatcher        m_cellObject;
+	Vector               m_position_p;
+	Vector               m_position_w;
+	float                m_radius;
+	Vector               m_offset_p;
+	bool                 m_relativeOffset;
+
+	bool                 m_hasChanged;
+	
+	bool                 m_cuttable;
+
+	int                  m_debugId;
+};
+
+// ----------------------------------------------------------------------
+
+inline bool AiLocation::isValid ( void ) const
+{
+	return m_valid;
+}
+
+inline void AiLocation::setChanged( bool changed )
+{
+	m_hasChanged = changed;
+}
+
+inline Object const * AiLocation::getObject ( void ) const
+{
+	return m_object;
+}
+
+inline NetworkId const & AiLocation::getObjectId ( void ) const
+{
+	return m_objectId;
+}
+
+inline void AiLocation::setRadius ( float newRadius )
+{
+	m_radius = newRadius;
+}
+
+inline Vector AiLocation::getOffset ( void ) const
+{
+	return m_offset_p;
+}
+
+inline void AiLocation::setOffset ( Vector const & newOffset )
+{
+	m_offset_p = newOffset;
+}
+
+inline bool AiLocation::getRelativeOffset ( void ) const
+{
+	return m_relativeOffset;
+}
+
+inline bool AiLocation::isCuttable ( void ) const
+{
+	return m_cuttable;
+}
+
+inline void AiLocation::setCuttable ( bool cuttable )
+{
+	m_cuttable = cuttable;
+}
+
+inline int AiLocation::getDebugId ( void ) const
+{
+	return m_debugId;
+}
+
+
+// ======================================================================
+
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipAttackTargetList.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipAttackTargetList.cpp
new file mode 100644
index 00000000..08958488
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipAttackTargetList.cpp
@@ -0,0 +1,482 @@
+// ======================================================================
+//
+// AiShipAttackTargetList.cpp
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiShipAttackTargetList.h"
+
+#include "serverGame/AiShipController.h"
+#include "serverGame/Client.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/PvpUpdateObserver.h"
+#include "serverGame/ShipController.h"
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/Os.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/UpdatePvpStatusMessage.h"
+#include "sharedObject/NetworkIdManager.h"
+
+#include <map>
+
+// ======================================================================
+//
+// AiShipAttackTargetListNamespace
+//
+// ======================================================================
+
+namespace AiShipAttackTargetListNamespace
+{
+	typedef std::vector<NetworkId> PurgeList;
+
+	static PurgeList s_purgeList;
+
+	class CheapPvpIsEnemyObserver
+	{
+	public:
+		CheapPvpIsEnemyObserver(Object const * actor, Object const * target);
+		~CheapPvpIsEnemyObserver();
+
+	private:
+		CheapPvpIsEnemyObserver();
+		CheapPvpIsEnemyObserver(CheapPvpIsEnemyObserver const & copy);
+		CheapPvpIsEnemyObserver & operator = (CheapPvpIsEnemyObserver const & copy);
+
+	private:
+		ConstWatcher<TangibleObject> m_actor;
+		ConstWatcher<TangibleObject> m_target;
+		bool m_targetIsEnemy;
+	};
+
+}
+
+// ======================================================================
+
+AiShipAttackTargetListNamespace::CheapPvpIsEnemyObserver::CheapPvpIsEnemyObserver(Object const * const actor, Object const * const target)
+: m_actor(0)
+, m_target(0)
+, m_targetIsEnemy(false)
+{
+	ServerObject const * const actorSO = (actor != 0) ? actor->asServerObject() : 0;
+	m_actor = (actorSO != 0) ? actorSO->asTangibleObject() : 0;
+
+	ServerObject const * const targetSO = (target != 0) ? target->asServerObject() : 0;
+	m_target = (targetSO != 0) ? targetSO->asTangibleObject() : 0;
+
+	if ((m_actor != 0) && (m_target != 0))
+	{
+		m_targetIsEnemy = Pvp::isEnemy(*m_actor, *m_target);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+AiShipAttackTargetListNamespace::CheapPvpIsEnemyObserver::~CheapPvpIsEnemyObserver()
+{
+	if ((m_actor != 0) && (m_target != 0))
+	{
+		if (m_targetIsEnemy != Pvp::isEnemy(*m_actor, *m_target))
+		{
+			typedef std::set<Client const *> AuthClients;
+			AuthClients authClients;
+
+			m_target->getAuthClients(authClients);
+			AuthClients::const_iterator ii = authClients.begin();
+			AuthClients::const_iterator iiEnd = authClients.end();
+
+			for (; ii != iiEnd; ++ii)
+			{
+				Client const * const client = *ii;
+				uint32 flags, factionId;
+				Pvp::getClientVisibleStatus(*client, *m_actor, flags, factionId);
+				UpdatePvpStatusMessage const statusMessage(m_actor->getNetworkId(), flags, factionId);
+				client->send(statusMessage, true);
+				PvpUpdateObserver::updatePvpStatusCache(client, *m_actor, flags, factionId);
+			}
+		}
+	}
+}
+
+using namespace AiShipAttackTargetListNamespace;
+
+// ======================================================================
+//
+// AiShipAttackTargetList::AiShipAttackTargetEntry
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+AiShipAttackTargetList::AiShipAttackTargetEntry::AiShipAttackTargetEntry(float const initialDamage)
+ : m_damage(initialDamage)
+ , m_lastDamageTime(Os::getRealSystemTime())
+{
+}
+
+// ======================================================================
+//
+// AiShipAttackTargetList
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+AiShipAttackTargetList::AiShipAttackTargetList(ShipObject * const owner)
+ : m_owner(NON_NULL(owner))
+ , m_targetList(new TargetList)
+ , m_primaryTarget(CachedNetworkId::cms_cachedInvalid)
+ , m_primaryTargetDamage(0.0f)
+{
+}
+
+// ----------------------------------------------------------------------
+AiShipAttackTargetList::~AiShipAttackTargetList()
+{
+	// Notify all the targeted ships that they are no longer being targeted
+
+	while (!m_targetList->empty())
+	{
+		NetworkId const & unit = m_targetList->begin()->first;
+		bool const inDestructorHack = true;
+
+		if (!remove(unit, inDestructorHack))
+		{
+			DEBUG_WARNING(true, ("debug_ai: AiShipAttackTargetList::~AiShipAttackTargetList() ERROR: Unable to remove the unit(%s) from the target list.", unit.getValueString().c_str()));
+			break;
+		}
+	}
+
+	delete m_targetList;
+}
+
+// ----------------------------------------------------------------------
+void AiShipAttackTargetList::add(ShipObject & unit, float const damage)
+{
+#ifdef _DEBUG
+	
+	AiShipController * const ownerAiShipController = AiShipController::asAiShipController(m_owner->getController());
+
+	if (ownerAiShipController != NULL)
+	{
+		if (!ownerAiShipController->isValidTarget(unit))
+		{
+			DEBUG_WARNING(true, ("debug_ai: AiShipAttackTargetList::add() ERROR: Adding an invalid attack target to (%s) which has an exclusive aggro list and this unit(%s) is not in it.", m_owner->getDebugInformation().c_str(), unit.getDebugInformation().c_str()));
+			return;
+		}
+	}
+#endif // _DEBUG
+
+	CheapPvpIsEnemyObserver observer(m_owner, &unit);
+
+	// Add damage to myself
+
+	float attackingUnitDamageTotal = damage;
+	TargetList::iterator iterTargetList = m_targetList->find(CachedNetworkId(unit));
+
+	if (iterTargetList != m_targetList->end())
+	{
+		iterTargetList->second.m_damage += damage;
+		attackingUnitDamageTotal = iterTargetList->second.m_damage;
+		iterTargetList->second.m_lastDamageTime = Os::getRealSystemTime();
+	}
+	else
+	{
+		AiShipAttackTargetEntry entry(damage);
+
+		IGNORE_RETURN(m_targetList->insert(std::make_pair(CachedNetworkId(unit.getNetworkId()), entry)));
+
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipAttackTargetList::add() unit(%s) attackingUnit(%s) damage(%.f) ADDING NEW ATTACK TARGET", m_owner->getNetworkId().getValueString().c_str(), unit.getNetworkId().getValueString().c_str(), damage));
+	}
+
+	m_owner->getController()->asShipController()->onAttackTargetChanged(unit.getNetworkId());
+
+	// See if this unit is the new primary attack target, and it is not the current primary attack target
+
+	if (attackingUnitDamageTotal > m_primaryTargetDamage)
+	{
+		setNewPrimaryTarget(CachedNetworkId(unit), attackingUnitDamageTotal);
+	}
+
+	// Notify the unit that attacked me that I am targeting them
+
+	ShipController * const attackingUnitShipController = unit.getController()->asShipController();
+
+	if (attackingUnitShipController != NULL)
+	{
+		attackingUnitShipController->addAiTargetingMe(m_owner->getNetworkId());
+	}
+	else
+	{
+		DEBUG_WARNING(true, ("debug_ai: AiShipAttackTargetList::add() ERROR: owner(%s) Why does this unit(%s) not have a ShipController?", m_owner->getNetworkId().getValueString().c_str(), unit.getNetworkId().getValueString().c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+bool AiShipAttackTargetList::remove(NetworkId const & unit, bool const inDestructorHack)
+{
+	DEBUG_FATAL((unit == NetworkId::cms_invalid), ("Removing a NULL unit"));
+
+	bool result = false;
+
+	// Remove the specified unit
+
+	TargetList::iterator iterTargetList = m_targetList->find(CachedNetworkId(unit));
+
+	if (iterTargetList != m_targetList->end())
+	{
+		Object * const object = NetworkIdManager::getObjectById(unit);
+
+		CheapPvpIsEnemyObserver observer(m_owner, object);
+
+		result = true;
+
+		m_targetList->erase(iterTargetList);
+		m_owner->getController()->asShipController()->onAttackTargetLost(unit);
+
+		// Tell this unit that we are no longer targeting it
+
+		if (object != NULL)
+		{
+			ShipController * const shipController = object->getController()->asShipController();
+
+			if (shipController != NULL)
+			{
+				shipController->removeAiTargetingMe(m_owner->getNetworkId());
+			}
+			else
+			{
+				DEBUG_WARNING(true, ("debug_ai: AiShipAttackTargetList::remove() owner(%s) ERROR: Why does this unit(%s) not have an ShipController?", m_owner->getDebugInformation().c_str(), unit.getValueString().c_str()));
+			}
+		}
+		else
+		{
+			DEBUG_WARNING(true, ("debug_ai: AiShipAttackTargetList::remove() owner(%s) ERROR: The unit(%s) did not resolve to an Object.", m_owner->getDebugInformation().c_str(), unit.getValueString().c_str()));
+		}
+	}
+	else
+	{
+		DEBUG_WARNING(true, ("debug_ai: AiShipAttackTargetList::remove() owner(%s) ERROR: Unable to find the unit(%s) in the attack target list.", m_owner->getDebugInformation().c_str(), unit.getValueString().c_str()));
+	}
+
+	// If the unit being removed was the primary attack target, find a new primary attack target
+
+	if (   !inDestructorHack
+	    && (m_primaryTarget == unit))
+	{
+		findNewPrimaryTarget();
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+CachedNetworkId const & AiShipAttackTargetList::getPrimaryTarget() const
+{
+	return m_primaryTarget;
+}
+
+// ----------------------------------------------------------------------
+AiShipAttackTargetList::TargetList const & AiShipAttackTargetList::getUnSortedTargetList() const
+{
+	return *m_targetList;
+}
+
+// ----------------------------------------------------------------------
+void AiShipAttackTargetList::getSortedTargetList(SortedTargetList & destTargetList) const
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipAttackTargetList::getSortedTargetList() owner(%s) m_targetList->size(%u)", m_owner->getNetworkId().getValueString().c_str(), m_targetList->size()));
+
+	destTargetList.clear();
+
+	// Sort the targets based on the most damage inflicted
+
+	if (!m_targetList->empty())
+	{
+		// Sort the results
+	
+		typedef std::multimap<float, std::pair<CachedNetworkId, AiShipAttackTargetEntry> > SortedResults;
+		SortedResults sortedResults;
+		TargetList::const_iterator iterTargetList = m_targetList->begin();
+	
+		for (; iterTargetList != m_targetList->end(); ++iterTargetList)
+		{
+			IGNORE_RETURN(sortedResults.insert(std::make_pair(iterTargetList->second.m_damage, std::make_pair(iterTargetList->first, iterTargetList->second))));
+		}
+	
+		// Save the sorted results
+	
+		destTargetList.reserve(sortedResults.size());
+		SortedResults::reverse_iterator iterSortedResults = sortedResults.rbegin();
+	
+		for (; iterSortedResults != sortedResults.rend(); ++iterSortedResults)
+		{
+			destTargetList.push_back(std::make_pair(iterSortedResults->second.first, iterSortedResults->second.second));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+bool AiShipAttackTargetList::isEmpty() const
+{
+	return getUnSortedTargetList().empty();
+}
+
+// ----------------------------------------------------------------------
+void AiShipAttackTargetList::purge(time_t const maxAge)
+{
+	// Remove targets that caused damaged too long ago
+
+	if (!isEmpty())
+	{
+		time_t const systemTime = Os::getRealSystemTime();
+		TargetList::iterator iterTargetList = m_targetList->begin();
+
+		s_purgeList.clear();
+
+		for (; iterTargetList != m_targetList->end(); ++iterTargetList)
+		{
+			NOT_NULL(iterTargetList->first.getObject());
+
+			time_t const age = systemTime - iterTargetList->second.m_lastDamageTime;
+
+			if (age >= maxAge)
+			{
+				LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipAttackTargetList::purge() target(%s) age(%u) maxAge(%u) m_targetList->size(%u)", iterTargetList->first.getValueString().c_str(), age, maxAge, m_targetList->size() - 1));
+
+				NetworkId const lostUnit(iterTargetList->first);
+
+				s_purgeList.push_back(lostUnit);
+			}
+		}
+
+		PurgeList::const_iterator iterPurgeList = s_purgeList.begin();
+
+		for (; iterPurgeList != s_purgeList.end(); ++iterPurgeList)
+		{
+			NetworkId const & unit = (*iterPurgeList);
+			remove(unit);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiShipAttackTargetList::findNewPrimaryTarget()
+{
+	CachedNetworkId newPrimaryTarget;
+	float newPrimaryTargetDamage = 0.0f;
+
+	// Walk all the attack targets and get the one with the most damage inflicted
+	
+	TargetList::const_iterator iterTargetList = m_targetList->begin();
+	
+	for (; iterTargetList != m_targetList->end(); ++iterTargetList)
+	{
+		NOT_NULL(iterTargetList->first.getObject());
+	
+		if (   (iterTargetList->second.m_damage > m_primaryTargetDamage)
+		    || (newPrimaryTarget == CachedNetworkId::cms_cachedInvalid))
+		{
+			newPrimaryTarget = iterTargetList->first;
+			newPrimaryTargetDamage = iterTargetList->second.m_damage;
+		}
+	}
+
+	setNewPrimaryTarget(newPrimaryTarget, newPrimaryTargetDamage);
+
+#ifdef _DEBUG
+	if (m_targetList->empty())
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipAttackTargetList::findNewPrimaryTarget() m_owner(%s) NO TARGET (Empty target list)", m_owner->getNetworkId().getValueString().c_str()));
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipAttackTargetList::findNewPrimaryTarget() m_owner(%s) m_targetList->size(%u) primaryTarget(%s) damage(%f)", m_owner->getNetworkId().getValueString().c_str(), m_targetList->size(), m_primaryTarget.getValueString().c_str(), m_primaryTargetDamage));
+	}
+
+	// We should only have ship objects in our target list
+
+	if (m_primaryTarget.getObject() != NULL)
+	{
+		ServerObject * const targetServerObject = m_primaryTarget.getObject()->asServerObject();
+		ShipObject * const targetShipObject = (targetServerObject != NULL) ? targetServerObject->asShipObject() : NULL;
+
+		if (targetShipObject == NULL)
+		{
+			DEBUG_WARNING(true, ("debug_ai: AiShipAttackTargetList::findNewPrimaryTarget() ERROR: How did we get a target that is not a ShipObject (%s)", m_primaryTarget.getObject()->getDebugInformation().c_str()));
+		}
+	}
+#endif // _DEBUG
+}
+
+// ----------------------------------------------------------------------
+void AiShipAttackTargetList::clear()
+{
+	if (!isEmpty())
+	{
+		purge(0);
+
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipAttackTargetList::clear() m_owner(%s) m_targetList->size(%u) primaryTarget(%s)", m_owner->getNetworkId().getValueString().c_str(), m_targetList->size(), m_primaryTarget.getValueString().c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiShipAttackTargetList::setNewPrimaryTarget(CachedNetworkId const & newPrimaryTarget, float const damage)
+{
+	m_primaryTargetDamage = damage;
+
+	if (m_primaryTarget != newPrimaryTarget)
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipAttackTargetList::setNewPrimaryTarget() m_owner(%s) newPrimaryTarge(%s) damage(%.2f) m_targetList->size(%u)", m_owner->getNetworkId().getValueString().c_str(), newPrimaryTarget.getValueString().c_str(), damage, m_targetList->size()));
+
+		m_primaryTarget = newPrimaryTarget;
+
+		m_owner->setPilotLookAtTarget(newPrimaryTarget);
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiShipAttackTargetList::verify()
+{
+	// If the owner of the target list has exclusive aggros, then we might need to purge some of the targets from the list
+
+	AiShipController * const ownerAiShipController = AiShipController::asAiShipController(m_owner->getController());
+
+	if (ownerAiShipController != NULL)
+	{
+		if (ownerAiShipController->hasExclusiveAggros())
+		{
+			// We have exclusive aggros, remove any invalid targets
+
+			TargetList::iterator iterTargetList = m_targetList->begin();
+
+			s_purgeList.clear();
+
+			for (; iterTargetList != m_targetList->end(); ++iterTargetList)
+			{
+				ShipObject * const unitShipObject = ShipObject::asShipObject(iterTargetList->first.getObject());
+				CreatureObject const * const unitPilot = (unitShipObject != NULL) ? unitShipObject->getPilot() : NULL;
+
+				if (   (unitPilot == NULL)
+				    || !ownerAiShipController->isExclusiveAggro(*unitPilot))
+				{
+					s_purgeList.push_back(unitShipObject->getNetworkId());
+				}
+			}
+
+			PurgeList::const_iterator iterPurgeList = s_purgeList.begin();
+
+			for (; iterPurgeList != s_purgeList.end(); ++iterPurgeList)
+			{
+				NetworkId const & unit = (*iterPurgeList);
+				remove(unit);
+			}
+
+			s_purgeList.clear();
+		}
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipAttackTargetList.h b/engine/server/library/serverGame/src/shared/behavior/AiShipAttackTargetList.h
new file mode 100644
index 00000000..c4fff9bb
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipAttackTargetList.h
@@ -0,0 +1,76 @@
+// ======================================================================
+//
+// AiShipAttackTargetList.h
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiShipAttackTargetList_H
+#define	INCLUDED_AiShipAttackTargetList_H
+
+#include "sharedObject/CachedNetworkId.h"
+
+class NetworkId;
+class ShipObject;
+
+// ======================================================================
+
+class AiShipAttackTargetList
+{
+public:
+
+	class AiShipAttackTargetEntry
+	{
+	public:
+
+		AiShipAttackTargetEntry(float const initialDamage);
+
+		float m_damage;
+		time_t m_lastDamageTime;
+
+	private:
+
+		// Disabled
+
+		AiShipAttackTargetEntry();
+	};
+
+	typedef stdmap<CachedNetworkId, AiShipAttackTargetEntry>::fwd TargetList;
+	typedef stdvector<std::pair<CachedNetworkId, AiShipAttackTargetEntry> >::fwd SortedTargetList;
+
+public:
+
+	AiShipAttackTargetList(ShipObject * const owner);
+	~AiShipAttackTargetList();
+
+	bool isEmpty() const;
+	void add(ShipObject & unit, float const damage);
+	bool remove(NetworkId const & unit, bool const inDestructorHack = false);
+	void purge(time_t const maxAge);
+	void clear();
+	void verify();
+
+	CachedNetworkId const & getPrimaryTarget() const;
+	TargetList const & getUnSortedTargetList() const; // Faster
+	void getSortedTargetList(SortedTargetList & destTargetList) const;   // Slower,  don't call every frame
+
+private:
+
+	void findNewPrimaryTarget();
+	void setNewPrimaryTarget(CachedNetworkId const & newPrimaryTarget, float const damage);
+
+	ShipObject * const m_owner;
+	TargetList * const m_targetList;
+	CachedNetworkId m_primaryTarget;
+	float m_primaryTargetDamage;
+	
+	// Disabled
+
+	AiShipAttackTargetList(AiShipAttackTargetList const &);
+	AiShipAttackTargetList &operator =(AiShipAttackTargetList const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_AiShipAttackTargetList_H
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttack.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttack.cpp
new file mode 100644
index 00000000..0cdc8224
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttack.cpp
@@ -0,0 +1,126 @@
+// ======================================================================
+//
+// AiShipBehaviorAttack.cpp
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiShipBehaviorAttack.h"
+
+#include "serverGame/AiShipAttackTargetList.h"
+#include "serverGame/AiShipController.h"
+#include "serverGame/AiShipPilotData.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/SpaceSquad.h"
+#include "serverGame/SpaceAttackSquad.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedGame/AiDebugString.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/NetworkIdManager.h"
+
+// ======================================================================
+
+AiShipBehaviorAttack::AiShipBehaviorAttack(AiShipController & aiShipController)
+ : AiShipBehaviorBase(aiShipController)
+ , m_leashRadius(aiShipController.getPilotData()->m_leashRadius)
+ , m_damageTaken(false)
+{
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttack::AiShipBehaviorAttack(AiShipBehaviorAttack const & rhs)
+ : AiShipBehaviorBase(rhs)
+ , m_leashRadius(rhs.m_leashRadius)
+ , m_damageTaken(rhs.m_damageTaken)
+{
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttack::~AiShipBehaviorAttack()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttack::alter(float const /*deltaTime*/)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiShipBehaviorAttack::alter");
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttack::setLeashRadius(float const radius)
+{
+	m_leashRadius = radius;
+}
+
+// ----------------------------------------------------------------------
+
+float AiShipBehaviorAttack::getLeashRadius() const
+{
+	return m_leashRadius;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipBehaviorAttack::isWithinLeashDistance() const
+{
+	Vector const & ownerPosition_w = getAiShipController().getOwnerPosition_w();
+	Vector const & leashAnchorPosition_w = getAiShipController().getSquad().getLeashAnchorPosition_w();
+	float const distanceFromLeashAnchorPositionSquared = ownerPosition_w.magnitudeBetweenSquared(leashAnchorPosition_w);
+
+	return (distanceFromLeashAnchorPositionSquared < sqr(getLeashRadius()));
+}
+
+// ----------------------------------------------------------------------
+
+float AiShipBehaviorAttack::getPercentWithinLeashDistance() const
+{
+	DEBUG_WARNING((getLeashRadius() <= 0.0f), ("AiShipBehaviorAttack::getPercentWithinLeashDistance() The leash radius(%f) must be > 0", getLeashRadius()));
+
+	Vector const & ownerPosition_w = getAiShipController().getOwnerPosition_w();
+	Vector const & leashAnchorPosition_w = getAiShipController().getSquad().getLeashAnchorPosition_w();
+
+	// == 1 means the unit is on the leash anchor position
+	// == 0 means the unit is on the shell of the leash sphere
+	// < 0 means the unit is outside the leash sphere
+
+	float const result = (1.0f - (leashAnchorPosition_w.magnitudeBetween(ownerPosition_w) / std::max(1.0f, getLeashRadius())));
+
+	return result;
+}
+
+#ifdef _DEBUG
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttack::addDebug(AiDebugString & aiDebugString)
+{
+	if (getAiShipController().isAttackSquadLeader())
+	{
+		// Show the squad leader look at target
+
+		NetworkId const & lookAtTarget = m_aiShipController.getShipOwner()->getPilotLookAtTarget();
+
+		if (lookAtTarget != NetworkId::cms_invalid)
+		{
+			aiDebugString.addLineToObject(lookAtTarget, PackedRgb::solidRed);
+		}
+
+		// Show the squad leader leash position
+		
+		aiDebugString.addLineToPosition(m_aiShipController.getSquad().getLeashAnchorPosition_w(), PackedRgb::solidGreen);
+
+		// Show the squad leader leash radius
+
+		//aiDebugString.addCircle(m_aiShipController.getLeashAnchorPosition_w(), getLeashRadius(), PackedRgb::solidGreen);
+	}
+}
+#endif // _DEBUG
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttack.h b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttack.h
new file mode 100644
index 00000000..326b7816
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttack.h
@@ -0,0 +1,54 @@
+// ======================================================================
+//
+// AiShipBehaviorAttack.cpp
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiShipBehaviorAttack_H
+#define	INCLUDED_AiShipBehaviorAttack_H
+
+#include "serverGame/AiShipBehaviorBase.h"
+#include "sharedFoundation/Watcher.h"
+
+class AiDebugString;
+class NetworkId;
+class Object;
+class ShipObject;
+
+// ======================================================================
+
+class AiShipBehaviorAttack : public AiShipBehaviorBase
+{
+public:
+
+	explicit AiShipBehaviorAttack(AiShipController & aiShipController);
+	AiShipBehaviorAttack(AiShipBehaviorAttack const & rhs);
+	virtual ~AiShipBehaviorAttack() = 0;
+
+	virtual void alter(float time);
+
+	void setLeashRadius(float const radius);
+	float getLeashRadius() const;
+
+	bool isWithinLeashDistance() const;
+	float getPercentWithinLeashDistance() const;
+
+#ifdef _DEBUG
+	virtual void addDebug(AiDebugString & aiDebugString);
+#endif // _DEBUG
+
+private:
+
+	float m_leashRadius;
+	bool m_damageTaken;
+
+	// Disabled
+	AiShipBehaviorAttack();
+	AiShipBehaviorAttack &operator =(AiShipBehaviorAttack const &);
+};
+
+// ======================================================================
+
+#endif //INCLUDED_AiShipBehaviorAttack_H
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackBomber.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackBomber.cpp
new file mode 100644
index 00000000..239342d3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackBomber.cpp
@@ -0,0 +1,366 @@
+// ======================================================================
+//
+// AiShipBehaviorAttackBomber.cpp
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiShipBehaviorAttackBomber.h"
+
+#include "serverGame/AiShipController.h"
+#include "serverGame/AiShipPilotData.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedGame/AiDebugString.h"
+#include "sharedGame/ShipComponentWeaponManager.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/NetworkIdManager.h"
+
+// ======================================================================
+
+namespace AiShipBehaviorAttackBomber_namespace
+{
+	float const ms_breakOffDistanceSquared = sqr(200.0f);
+	float const ms_evadeOffsetMax = 200.0f; // constant for now, TODO:  hook this up to the pilot type data table
+
+	struct TargetShipData
+	{
+		TargetShipData();
+
+		typedef	std::map<ShipChassisSlotType::Type, int> BombersPerComponentType;
+		
+		int m_totalBombers;
+		BombersPerComponentType m_bombersPerComponent;
+	};
+	
+	typedef std::map<NetworkId, TargetShipData> TargetShipsType;
+	TargetShipsType ms_targetShips;
+}
+
+using namespace AiShipBehaviorAttackBomber_namespace;
+
+// ======================================================================
+
+AiShipBehaviorAttackBomber::AiShipBehaviorAttackBomber(AiShipController & aiShipController) :
+		AiShipBehaviorAttack(aiShipController),
+		m_attackStage(AS_attack),
+		m_targetId(NetworkId::cms_invalid),
+		m_targetComponentSlot(ShipChassisSlotType::SCST_invalid),
+		m_targetComponentPosition_o(Vector::zero),
+		m_evadePosition_o(Vector::zero),
+		m_evadeDistanceSquared(0.0f),
+		m_evadeOffset(Vector::zero),
+		m_evadeChangeDirectionTimer(0.5f),
+		m_missilesFired(0)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackBomber::AiShipBehaviorAttackBomber() unit(%s)", (aiShipController.getOwner() != NULL) ? aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner"));
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttackBomber::AiShipBehaviorAttackBomber(AiShipBehaviorAttack const & sourceBehavior) :
+		AiShipBehaviorAttack(sourceBehavior),
+		m_attackStage(AS_attack),
+		m_targetId(NetworkId::cms_invalid),
+		m_targetComponentSlot(ShipChassisSlotType::SCST_invalid),
+		m_targetComponentPosition_o(Vector::zero),
+		m_evadePosition_o(Vector::zero),
+		m_evadeDistanceSquared(0.0f),
+		m_evadeOffset(Vector::zero),
+		m_evadeChangeDirectionTimer(0.5f),
+		m_missilesFired(0)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackBomber::AiShipBehaviorAttackBomber(AiShipBehaviorAttack &) unit(%s)", (m_aiShipController.getOwner() != NULL) ? m_aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner"));
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttackBomber::~AiShipBehaviorAttackBomber()
+{
+	changeTargetObject(NetworkId::cms_invalid);
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackBomber::alter(float const deltaTime)
+{
+	AiShipBehaviorAttack::alter(deltaTime);
+
+	PROFILER_AUTO_BLOCK_DEFINE("AiShipBehaviorAttackBomber::alter");
+
+	NetworkId const & newTargetId = getAiShipController().getPrimaryAttackTarget();
+
+	if (newTargetId != m_targetId)
+	{
+		changeTargetObject(newTargetId);
+	}
+	
+	if (getTargetCapitalShip())
+	{
+		if (m_targetComponentSlot == ShipChassisSlotType::SCST_invalid)
+			selectTargetComponent();
+		
+		if (m_targetComponentSlot != ShipChassisSlotType::SCST_invalid)
+		{
+			switch(m_attackStage)
+			{
+				case AS_evade:
+					doEvade(deltaTime);
+					break;
+				case AS_attack:
+					doAttackRun(deltaTime);
+					break;
+				default:
+					break;
+			}
+		}
+	}
+ 	else
+ 	{
+ 		// switch to a fighter attack behavior
+		m_aiShipController.switchToFighterAttack();
+ 	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Helper function to pick a component on the targeted capital ship to attack.
+ * Note:  success is not guaranteed.  A component may not be selected after
+ * this function returns
+ */
+void AiShipBehaviorAttackBomber::selectTargetComponent()
+{
+	ShipObject const * const targetShipObject = getTargetCapitalShip();
+	
+	if (targetShipObject)
+	{
+		Vector const position_w=NON_NULL(m_aiShipController.getShipOwner())->getPosition_w();
+		float const evadeDistance = targetShipObject->getApproximateAttackRange();
+		m_evadeDistanceSquared = sqr(evadeDistance);
+		ShipChassisSlotType::Type newTargetComponentSlot = ShipChassisSlotType::SCST_invalid;
+		
+		TargetShipData & targetShipData = ms_targetShips[targetShipObject->getNetworkId()];
+
+		float closestSoFar = 0;
+		int fewestBombersSoFar = 0;
+		std::vector<Transform> transforms;
+		for (int chassisSlot = ShipChassisSlotType::SCST_first;  chassisSlot < ShipChassisSlotType::SCST_num_types; ++chassisSlot)
+		{
+			if (targetShipObject->isValidTargetableSlot(static_cast<ShipChassisSlotType::Type>(chassisSlot)))
+			{
+				targetShipObject->findTransformsForComponent(chassisSlot, transforms);
+				for (std::vector<Transform>::const_iterator i=transforms.begin(); i!=transforms.end(); ++i)
+				{
+					// pick the component whose "evade" position, i.e. the start position for the attack run,
+					// is closest to where we are now.
+					// If coordinating with other bombers, prefer the components that have the fewest bombers
+					// already attacking them.
+					
+					Vector const evadePosition_o = i->getPosition_p() + (i->getLocalFrameJ_p() * evadeDistance * 1.5f);
+					Vector const evadePosition_w = targetShipObject->rotateTranslate_o2w(evadePosition_o);
+					float const distanceSquared = (evadePosition_w - position_w).magnitudeSquared();
+
+					bool preferThisOne = false;
+					if (closestSoFar == 0)
+						preferThisOne = true;
+					if (targetShipData.m_bombersPerComponent[static_cast<ShipChassisSlotType::Type>(chassisSlot)] < fewestBombersSoFar)
+						preferThisOne = true;
+					if (targetShipData.m_bombersPerComponent[static_cast<ShipChassisSlotType::Type>(chassisSlot)] == fewestBombersSoFar &&
+						distanceSquared < closestSoFar)
+						preferThisOne = true;
+
+					if (preferThisOne)
+					{
+						closestSoFar = distanceSquared;
+						fewestBombersSoFar = targetShipData.m_bombersPerComponent[static_cast<ShipChassisSlotType::Type>(chassisSlot)];
+						m_targetComponentPosition_o = i->getPosition_p();
+						m_evadePosition_o = evadePosition_o;
+						newTargetComponentSlot = static_cast<ShipChassisSlotType::Type>(chassisSlot);
+					}
+				}
+			}
+		}
+
+		if (newTargetComponentSlot != ShipChassisSlotType::SCST_invalid)
+		{
+			DEBUG_REPORT_LOG(true,("Ship %s targetting slot %i\n",m_aiShipController.getShipOwner()->getNetworkId().getValueString().c_str(),newTargetComponentSlot));
+			changeTargetComponentSlot(newTargetComponentSlot);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Fly towards a point in space near the capital ship but out of range of
+ * its weapons
+ */
+void AiShipBehaviorAttackBomber::doEvade(float const deltaTime)
+{
+	ShipObject * const ownerShipObject = NON_NULL(m_aiShipController.getShipOwner());
+	ownerShipObject->setBoosterActive(true);
+		
+	if (m_evadeChangeDirectionTimer.updateZero(deltaTime))
+	{
+		m_evadeOffset = Vector (Random::randomReal(-ms_evadeOffsetMax,ms_evadeOffsetMax),
+							   Random::randomReal(-ms_evadeOffsetMax,ms_evadeOffsetMax),
+							   Random::randomReal(-ms_evadeOffsetMax,ms_evadeOffsetMax));
+	}
+
+	Vector const goalPosition_w = NON_NULL(getTargetCapitalShip())->rotateTranslate_o2w(m_evadePosition_o) + m_evadeOffset;
+	float const throttle = 1.0f;
+	m_aiShipController.moveTo(goalPosition_w, throttle, deltaTime);
+
+	if ((getTargetCapitalShip()->getPosition_w() - NON_NULL(m_aiShipController.getShipOwner())->getPosition_w()).magnitudeSquared() > m_evadeDistanceSquared)
+		m_attackStage = AS_attack;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Make a run at the selected component of the capital ship.  Fire missiles &
+ * guns when in range.
+ */
+void AiShipBehaviorAttackBomber::doAttackRun(float const deltaTime)
+{
+	ShipObject const * const targetShipObject = NON_NULL(getTargetCapitalShip());
+	ShipObject * const ownerShipObject = NON_NULL(m_aiShipController.getShipOwner());
+	AiShipPilotData const * pilotData = m_aiShipController.getPilotData();
+	Vector const goalPosition_w = targetShipObject->rotateTranslate_o2w(m_targetComponentPosition_o);
+	Vector const goalPosition_o = ownerShipObject->rotateTranslate_w2o(goalPosition_w); // target in the space of the owner ship
+
+	// Move & do avoidance if necessary
+
+	float const throttle = 1.0f;
+	m_aiShipController.moveTo(goalPosition_w, throttle, deltaTime);
+	
+	// Fire weapons if possible
+
+	Vector normalizedTargetPosition_o(goalPosition_o);
+	if (normalizedTargetPosition_o.approximateNormalize() && (acos(normalizedTargetPosition_o.dot(Vector::unitZ)) < pilotData->m_projectileFireAngle))
+	{
+		for (int weaponIndex = 0; weaponIndex < ShipChassisSlotType::cms_numWeaponIndices; ++weaponIndex)
+		{
+			if (!ownerShipObject->isTurret(weaponIndex))
+			{
+				if (goalPosition_o.magnitudeSquared() < sqr(ownerShipObject->getWeaponRange(weaponIndex)))
+				{
+					ShipChassisSlotType::Type const chassisSlot = static_cast<ShipChassisSlotType::Type>(static_cast<int>(ShipChassisSlotType::SCST_weapon_0) + weaponIndex);
+					if (ownerShipObject->isSlotInstalled(chassisSlot))
+					{
+						if (ownerShipObject->canFireShot(weaponIndex))
+						{
+							if (ShipComponentWeaponManager::isMissile(ownerShipObject->getComponentCrc(chassisSlot)))
+								++m_missilesFired;
+							ownerShipObject->fireShotNonTurretServer(weaponIndex, targetShipObject->getNetworkId(), m_targetComponentSlot);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// Don't fire booster while on attack run (more time to launch missiles & fire guns)
+	
+	ownerShipObject->setBoosterActive(false);
+	
+	// Check for state changes
+	
+	if (!targetShipObject->isValidTargetableSlot(static_cast<ShipChassisSlotType::Type>(m_targetComponentSlot)))
+		changeTargetComponentSlot(ShipChassisSlotType::SCST_invalid);
+	if (((ownerShipObject->getPosition_w() - goalPosition_w).magnitudeSquared() < ms_breakOffDistanceSquared) || m_missilesFired >= pilotData->m_bomberMissilesPerBombingRun)
+	{
+		m_attackStage = AS_evade;
+		m_missilesFired = 0;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns a pointer to the target object, if it is a capital ship
+ */
+ShipObject const * AiShipBehaviorAttackBomber::getTargetCapitalShip() const
+{
+	ShipObject const * const targetShipObject = getAiShipController().getPrimaryAttackTargetShipObject();
+
+	if (targetShipObject && targetShipObject->isCapitalShip())
+	{
+		return targetShipObject;
+	}
+
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackBomber::changeTargetObject(NetworkId const & newTarget)
+{
+	changeTargetComponentSlot(ShipChassisSlotType::SCST_invalid);
+	
+	if (m_targetId != NetworkId::cms_invalid)
+	{
+		TargetShipData & data = ms_targetShips[m_targetId];
+		if (--(data.m_totalBombers) <= 0)
+			IGNORE_RETURN(ms_targetShips.erase(m_targetId));
+	}
+
+	if (newTarget != NetworkId::cms_invalid)
+	{
+		TargetShipData & data = ms_targetShips[newTarget];
+		++(data.m_totalBombers);
+	}
+	
+	m_targetId = newTarget;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackBomber::changeTargetComponentSlot(ShipChassisSlotType::Type newTarget)
+{
+	if (m_targetId != NetworkId::cms_invalid)
+	{
+		TargetShipsType::iterator data=ms_targetShips.find(m_targetId);
+		DEBUG_FATAL(data == ms_targetShips.end(),("Programmer bug:  changing target slot, but target %s is not in ms_targetShips.  It should have already been added",m_targetId.getValueString().c_str()));
+	
+		if (m_targetComponentSlot != ShipChassisSlotType::SCST_invalid)
+			--(data->second.m_bombersPerComponent[m_targetComponentSlot]);
+	
+		if (newTarget != ShipChassisSlotType::SCST_invalid)
+			++(data->second.m_bombersPerComponent[newTarget]);
+	}
+
+	DEBUG_FATAL(newTarget < ShipChassisSlotType::SCST_first || newTarget > ShipChassisSlotType::SCST_num_types,("newTarget out of range"));
+	
+	m_targetComponentSlot = newTarget;
+}
+
+// ----------------------------------------------------------------------
+
+TargetShipData::TargetShipData() :
+		m_totalBombers(0),
+		m_bombersPerComponent()
+{
+}
+		
+#ifdef _DEBUG
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackBomber::addDebug(AiDebugString & aiDebugString)
+{
+	AiShipBehaviorAttack::addDebug(aiDebugString);
+
+	// Show the current maneuver
+
+	{
+		char const * const text = FormattedString<512>().sprintf("BOMBER\n");
+		aiDebugString.addText(text, PackedRgb::solidCyan);
+	}
+}
+#endif // _DEBUG
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackBomber.h b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackBomber.h
new file mode 100644
index 00000000..0e4b530f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackBomber.h
@@ -0,0 +1,66 @@
+// ======================================================================
+//
+// AiShipBehaviorAttackBomber.cpp
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiShipBehaviorAttackBomber_H
+#define	INCLUDED_AiShipBehaviorAttackBomber_H
+
+#include "sharedFoundation/Timer.h"
+#include "serverGame/AiShipBehaviorAttack.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedGame/ShipChassisSlotType.h"
+#include "sharedMath/Vector.h"
+
+class AiDebugString;
+class AiShipController;
+class ShipObject;
+
+// ======================================================================
+
+class AiShipBehaviorAttackBomber : public AiShipBehaviorAttack
+{
+public:
+
+	explicit AiShipBehaviorAttackBomber(AiShipController & aiShipController);
+	explicit AiShipBehaviorAttackBomber(AiShipBehaviorAttack const & sourceBehavior);
+	virtual ~AiShipBehaviorAttackBomber();
+
+	virtual void alter(float time);
+	void addDebug(AiDebugString & aiDebugString);
+
+  private:
+	enum AttackStage {AS_attack, AS_evade};
+
+  private:
+	void selectTargetComponent();
+	void doEvade(float const deltaTime);
+	void doAttackRun(float const deltaTime);
+	ShipObject const * getTargetCapitalShip() const;
+	void changeTargetObject(NetworkId const & newTarget);
+	void changeTargetComponentSlot(ShipChassisSlotType::Type newTarget);
+
+  private:
+	AttackStage m_attackStage;
+	NetworkId m_targetId;
+	ShipChassisSlotType::Type m_targetComponentSlot;
+	Vector m_targetComponentPosition_o; // in the space of the target ship
+	Vector m_evadePosition_o; // in the space of the target ship
+	float m_evadeDistanceSquared;
+	Vector m_evadeOffset;
+	Timer m_evadeChangeDirectionTimer;
+	int m_missilesFired;
+	
+  private:
+	// Disabled
+	AiShipBehaviorAttackBomber();
+	AiShipBehaviorAttackBomber(AiShipBehaviorAttackBomber const &);
+	AiShipBehaviorAttackBomber &operator =(AiShipBehaviorAttackBomber const &);
+};
+
+// ======================================================================
+
+#endif //INCLUDED_AiShipBehaviorAttackBomber_H
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackCapitalShip.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackCapitalShip.cpp
new file mode 100644
index 00000000..d771b837
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackCapitalShip.cpp
@@ -0,0 +1,38 @@
+// ======================================================================
+//
+// AiShipBehaviorAttackCapitalShip.cpp
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiShipBehaviorAttackCapitalShip.h"
+
+#include "serverGame/AiShipController.h"
+#include "serverGame/ConfigServerGame.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedLog/Log.h"
+
+// ======================================================================
+
+AiShipBehaviorAttackCapitalShip::AiShipBehaviorAttackCapitalShip(AiShipController & aiShipController)
+		: AiShipBehaviorAttack(aiShipController)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackCapitalShip::AiShipBehaviorAttackCapitalShip() unit(%s)", (m_aiShipController.getOwner() != NULL) ? m_aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner"));
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttackCapitalShip::~AiShipBehaviorAttackCapitalShip()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackCapitalShip::alter(float const /*deltaSeconds*/)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiShipBehaviorAttackCapitalShip::alter");
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackCapitalShip.h b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackCapitalShip.h
new file mode 100644
index 00000000..c7ce3388
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackCapitalShip.h
@@ -0,0 +1,37 @@
+// ======================================================================
+//
+// AiShipBehaviorAttackCapitalShip.cpp
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiShipBehaviorAttackCapitalShip_H
+#define	INCLUDED_AiShipBehaviorAttackCapitalShip_H
+
+#include "serverGame/AiShipBehaviorAttack.h"
+#include "sharedFoundation/Timer.h"
+
+class NetworkId;
+
+// ======================================================================
+
+class AiShipBehaviorAttackCapitalShip : public AiShipBehaviorAttack
+{
+  public:
+
+	explicit AiShipBehaviorAttackCapitalShip(AiShipController & aiShipController);
+	virtual ~AiShipBehaviorAttackCapitalShip();
+
+	virtual void alter(float deltaSeconds);
+
+  private:
+	// Disabled
+	AiShipBehaviorAttackCapitalShip();
+	AiShipBehaviorAttackCapitalShip(AiShipBehaviorAttackCapitalShip const &);
+	AiShipBehaviorAttackCapitalShip &operator =(AiShipBehaviorAttackCapitalShip const &);
+};
+
+// ======================================================================
+
+#endif //INCLUDED_AiShipBehaviorAttackCapitalShip_H
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter.cpp
new file mode 100644
index 00000000..6b209aed
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter.cpp
@@ -0,0 +1,1126 @@
+// ======================================================================
+//
+// AiShipBehaviorAttackFighter.cpp
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiShipBehaviorAttackFighter.h"
+
+#include "serverGame/AiPilotManager.h"
+#include "serverGame/AiShipAttackTargetList.h"
+#include "serverGame/AiShipBehaviorAttackFighter_Maneuver.h"
+#include "serverGame/AiShipBehaviorAttackFighter_Maneuver_Path.h"
+#include "serverGame/AiShipController.h"
+#include "serverGame/AiShipPilotData.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/SpaceSquad.h"
+#include "serverGame/SpaceAttackSquad.h"
+#include "serverGame/MissileManager.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedGame/AiDebugString.h"
+#include "sharedGame/ShipChassisSlotType.h"
+#include "sharedGame/ShipComponentWeaponManager.h"
+#include "sharedLog/Log.h"
+#include "sharedMath/PackedRgb.h"
+#include "sharedMath/Plane.h"
+#include "sharedMath/Range.h"
+#include "sharedObject/NetworkIdManager.h"
+
+// ======================================================================
+//
+// AiShipBehaviorAttackFighterNamespace
+//
+// ======================================================================
+
+namespace AiShipBehaviorAttackFighterNamespace
+{
+	// ----------------------------------------------------------------------
+
+	//-- Map the weapon priority to weapon slot.
+	typedef std::map<float /*priority*/, int /*chassis slot*/> WeaponPriorityMap;
+
+	bool isTargetInConeOfFire(Object const & attackerObject, Sphere const & targetSphere_w, float const coneAngle);
+}
+
+using namespace AiShipBehaviorAttackFighterNamespace;
+
+// ----------------------------------------------------------------------
+
+bool AiShipBehaviorAttackFighterNamespace::isTargetInConeOfFire(Object const & attackerObject, Sphere const & targetSphere_w, float const coneAngle)
+{
+	return targetSphere_w.intersectsCone(attackerObject.getPosition_w(), attackerObject.getObjectFrameK_w(), coneAngle);
+}
+
+// ======================================================================
+//
+// AiShipBehaviorAttackFighter
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttackFighter::AiAttackTargetInformation::AiAttackTargetInformation()
+ : m_playerControlled(false)
+ , m_distanceToTarget(0.0f)
+ , m_speed(0.0f)
+ , m_weaponRange(0.0f)
+ , m_radius(0.0f)
+ , m_facingTarget(false)
+ , m_behindTarget(false)
+ , m_position_w()
+ , m_orientation_w()
+ , m_directionFromShip_w()
+ , m_offset()
+ , m_maneuverPosition_w()
+ , m_offsetUpdate(0.0f)
+ , m_positionUpdate(0.0f)
+ , m_isBoosting(false)
+ , m_targetInProjectileConeOfFire(false)
+ , m_targetWasInProjectileConeOfFire(false)
+ , m_targetInMissileLockOnConeOfFire(false)
+ , m_collisionCourse(false)
+ , m_requestPositionUpdate(false)
+ , m_inTargetsProjectileConeOfFire(false)
+{
+}
+
+// ----------------------------------------------------------------------
+
+Vector const AiShipBehaviorAttackFighter::calculateEvadePositionWithinLeashDistance_w(AiShipBehaviorAttack const & aiShipBehaviorAttack)
+{
+	Vector evadePosition_w;
+
+	float const leashRadius = aiShipBehaviorAttack.getLeashRadius();
+	float const weaponRange = aiShipBehaviorAttack.getAiShipController().getShipOwner()->getApproximateAttackRange();
+	Vector const & ownerPosition_w = aiShipBehaviorAttack.getAiShipController().getOwnerPosition_w();
+	Vector const & leashAnchorPosition_w = aiShipBehaviorAttack.getAiShipController().getSquad().getLeashAnchorPosition_w();
+	Vector directionFromOwnerToLeashAnchor(leashAnchorPosition_w - ownerPosition_w);
+	IGNORE_RETURN(directionFromOwnerToLeashAnchor.normalize());
+	Vector const farPosition(ownerPosition_w + -directionFromOwnerToLeashAnchor * weaponRange);
+	float const distanceToFarPosition = leashAnchorPosition_w.magnitudeBetween(farPosition);
+	Vector randomUnit(Vector::randomUnit());
+	float const turnRadiusOfAi = aiShipBehaviorAttack.getAiShipController().getLargestTurnRadius();
+	float const evadeDistance = std::min(weaponRange + turnRadiusOfAi, leashRadius) * 0.999f;
+
+	// If there is plenty of room around the unit to evade in any direction, then do so.
+
+	if (distanceToFarPosition < leashRadius)
+	{
+		evadePosition_w = ownerPosition_w + randomUnit * evadeDistance;
+	}
+	else
+	{
+		// We must be cautious when picking the evade position so it is in the leash sphere
+	
+		if (directionFromOwnerToLeashAnchor.dot(randomUnit) < 0.0f)
+		{
+			randomUnit = -randomUnit;
+		}
+		
+		evadePosition_w = (leashAnchorPosition_w + (randomUnit * evadeDistance));
+	}
+
+	aiShipBehaviorAttack.getAiShipController().clampPositionToZone(evadePosition_w);
+
+	// Verify the evade position is NOT outside the leash radius
+	
+#ifdef _DEBUG
+	float const distanceToNewEvadePosition = leashAnchorPosition_w.magnitudeBetween(evadePosition_w);
+
+	if (distanceToNewEvadePosition > aiShipBehaviorAttack.getLeashRadius())
+	{
+		DEBUG_WARNING(true, ("debug_ai: ERROR: New evade position (distance from anchor: %.2f) is outside the leash radius(%.2f).", distanceToNewEvadePosition, aiShipBehaviorAttack.getLeashRadius()));
+	}
+#endif // _DEBUG
+
+	return evadePosition_w;
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttackFighter::AiShipBehaviorAttackFighter(AiShipController & aiShipController)
+ : AiShipBehaviorAttack(aiShipController)
+ , m_currentManeuver(NULL)
+ , m_timeDelta(0.0f)
+ , m_projectileTimer()
+ , m_missileLockOnTimer()
+ , m_missileFireDelayTimer()
+ , m_hitDecayTimer()
+ , m_stateFlags(0)
+ , m_targetInfo(new AiAttackTargetInformation)
+ , m_missRadians()
+ , m_lastManeuverState(static_cast<int>(Maneuver::FM_none))
+ , m_maneuverFlags(0)
+ , m_lastManeuverFlags(0)
+ , m_lastEvadeHealthPercent(1.0f)
+ , m_evadeHealthPercent(0.0f)
+ , m_timeSinceLastShot(0.0f)
+ , m_projectileSpeed(0.0f)
+ , m_nextProjectileShotPerfect(false)
+ , m_shotErrorPosition_l()
+ , m_nextShotPosition_w()
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackFighter::AiShipBehaviorAttackFighter() unit(%s)", (aiShipController.getOwner() != NULL) ? aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner"));
+	initializeTimers();
+	calculateEvadeHealthPercent();
+	calculateNextProjectileShotPerfect();
+	calculateWeaponProjectileSpeed();
+
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackFighter::AiShipBehaviorAttackFighter() unit(%s) m_projectileSpeed(%.0f)", getAiShipController().getOwner()->getNetworkId().getValueString().c_str(), m_projectileSpeed));
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttackFighter::AiShipBehaviorAttackFighter(AiShipBehaviorAttack const & sourceBehavior)
+ : AiShipBehaviorAttack(sourceBehavior)
+ , m_currentManeuver(NULL)
+ , m_timeDelta(0.0f)
+ , m_projectileTimer()
+ , m_missileLockOnTimer()
+ , m_missileFireDelayTimer()
+ , m_hitDecayTimer()
+ , m_stateFlags(0)
+ , m_targetInfo(new AiAttackTargetInformation)
+ , m_missRadians()
+ , m_lastManeuverState(static_cast<int>(Maneuver::FM_none))
+ , m_maneuverFlags(0)
+ , m_lastManeuverFlags(0)
+ , m_lastEvadeHealthPercent(1.0f)
+ , m_evadeHealthPercent(0.0f)
+ , m_timeSinceLastShot(0.0f)
+ , m_projectileSpeed(0.0f)
+ , m_nextProjectileShotPerfect(false)
+ , m_shotErrorPosition_l()
+ , m_nextShotPosition_w()
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackFighter::AiShipBehaviorAttackFighter() unit(%s)", (getAiShipController().getOwner() != NULL) ? getAiShipController().getOwner()->getNetworkId().getValueString().c_str() : "NULL owner"));
+	initializeTimers();
+	calculateEvadeHealthPercent();
+	calculateNextProjectileShotPerfect();
+	calculateWeaponProjectileSpeed();
+	
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackFighter::AiShipBehaviorAttackFighter(AiShipBehaviorAttack const &) unit(%s) m_projectileSpeed(%.0f)" , getAiShipController().getOwner()->getNetworkId().getValueString().c_str(), m_projectileSpeed));
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttackFighter::~AiShipBehaviorAttackFighter()
+{
+	delete m_targetInfo;
+
+	delete m_currentManeuver;
+	m_currentManeuver = NULL;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::alter(float const timeDelta)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiShipBehaviorAttackFighter::alter");
+
+	calculateNextShotPosition_w();
+
+	AiShipBehaviorAttack::alter(timeDelta);
+	
+	setTimeDelta(timeDelta);
+
+	// Update the behavior.
+	alterTargetInformation();
+	alterManeuverFlags();
+	alterManeuver();
+	alterWeapons();
+	alterBooster();
+	alterAttackBehavior();
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::setManeuver(Maneuver * const maneuver)
+{
+	delete m_currentManeuver;
+	m_currentManeuver = maneuver;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::alterManeuver()
+{
+	m_timeSinceLastShot += getTimeDelta();
+
+	bool isManeuverRunning = false;
+	float const overallHealthPercent = getAiShipController().getShipOwner()->getOverallHealthWithShieldsAndArmor();
+
+	if(m_currentManeuver)
+	{
+		ShipObject const * const targetShipObject = getAiShipController().getPrimaryAttackTargetShipObject();
+
+		if (targetShipObject)
+		{
+			isManeuverRunning = m_currentManeuver->alter(getTimeDelta(), m_stateFlags);
+		}
+		else
+		{
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorAttackFighter::alterManeuver() owner(%s) Why does this ship in the attack state with a NULL attack target?", getAiShipController().getOwner()->getNetworkId().getValueString().c_str()));
+		}
+
+		if (overallHealthPercent > m_lastEvadeHealthPercent)
+		{
+			m_lastEvadeHealthPercent = overallHealthPercent;
+		}
+	}
+
+	//-- StateMachine --
+	// "Intelligently pick a new maneuver."
+	bool const flagsChanged = m_maneuverFlags != m_lastManeuverFlags;
+
+	if (!isManeuverRunning || flagsChanged)
+	{
+		Maneuver::FighterManeuver newManeuver = Maneuver::FM_leash;
+
+		//-- Check to see what the ship should do next.
+		if(shouldStartToLeash())
+		{
+			newManeuver = Maneuver::FM_leash;
+
+			getAiShipController().getAttackSquad().clearShotsFired();
+		}
+		else if(shouldStartToEvade())
+		{
+			newManeuver = Maneuver::FM_evade;
+
+			// This keeps us from continually evading
+			
+			m_lastEvadeHealthPercent = overallHealthPercent;
+			
+			calculateEvadeHealthPercent();
+			getAiShipController().getAttackSquad().clearShotsFired();
+		}
+		else 
+		{
+			newManeuver = Maneuver::FM_chase;
+			m_timeSinceLastShot = 0.0f;
+		}
+
+		if (getAiShipController().isAttackSquadLeader())
+		{
+			bool const inFormation = (newManeuver != Maneuver::FM_chase);
+			getAiShipController().getAttackSquad().setInFormation(inFormation);
+		}
+		else
+		{
+			// Non-squad leaders need to always be chasing when they are released to attack
+
+			newManeuver = Maneuver::FM_chase;
+		}
+
+		// Set the last state.
+		m_lastManeuverState = static_cast<int>(newManeuver);
+
+		setManeuver(Maneuver::createManeuver(newManeuver, *this, *m_targetInfo));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::setTimeDelta(float const timeDelta)
+{
+	m_timeDelta = timeDelta;
+}
+
+// ----------------------------------------------------------------------
+
+float AiShipBehaviorAttackFighter::getTimeDelta() const
+{
+	return m_timeDelta;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::alterWeapons()
+{
+	ShipObject const * const targetShipObject = getAiShipController().getPrimaryAttackTargetShipObject();
+
+	if (!targetShipObject)
+	{
+		DEBUG_WARNING(true, ("debug_ai: unit(%s) ERROR: Why is the primary attack target NULL?", getAiShipController().getShipOwner()->getDebugInformation().c_str()));
+		return;
+	}
+
+	bool missileReady = false;
+
+	IGNORE_RETURN(m_missileFireDelayTimer.updateNoReset(getTimeDelta()));
+
+	if (m_targetInfo->m_targetInMissileLockOnConeOfFire)
+	{
+		// Make sure we have a successful missile lock
+
+		if (   m_missileFireDelayTimer.isExpired()
+			&& m_missileLockOnTimer.updateZero(getTimeDelta()))
+		{
+			// See if this missile chance succeeds to fire
+
+			AiShipPilotData const & pilotData = *NON_NULL(getAiShipController().getPilotData());
+
+			missileReady = (Random::randomReal() <= pilotData.m_fighterMissileChanceToFirePercent);
+
+			if (!missileReady)
+			{
+				m_missileLockOnTimer.reset();
+			}
+		}
+	}
+	else
+	{
+		m_missileLockOnTimer.reset();
+	}
+
+	bool projectileReady = false;
+
+	if (   m_projectileTimer.updateNoReset(getTimeDelta())
+	    && m_targetInfo->m_targetInProjectileConeOfFire)
+	{
+		// Make sure enough time has past since the last projectile was shot
+
+		m_projectileTimer.reset();
+		projectileReady = true;
+	}
+
+	if (   missileReady
+	    || projectileReady)
+	{
+		int const weaponIndex = selectWeaponToFire(missileReady);
+
+		if (weaponIndex != -1)
+		{
+			ShipObject & ownerShipObject = *NON_NULL(getAiShipController().getShipOwner());
+
+			ownerShipObject.fireShotNonTurretServer(weaponIndex, targetShipObject->getNetworkId(), ownerShipObject.getPilotLookAtTargetSlot(), 0.0f, 0.0f);
+
+			getAiShipController().getAttackSquad().increaseShotsFired();
+
+			m_timeSinceLastShot = 0.0f;
+			
+			if (ownerShipObject.isMissile(weaponIndex))
+			{
+				// Missile fired
+
+				m_missileFireDelayTimer.reset();
+				m_missileLockOnTimer.reset();
+			}
+			else
+			{
+				// Projectile fired
+
+				calculateNextProjectileShotPerfect();
+			}
+
+			// Keep my target in my attack target list, this resets the decay timer for the unit we are attacking, so it is not purged from the attack target list
+			
+			NetworkId const & attackingUnit = targetShipObject->getNetworkId();
+			float const damage = 0.0001f;
+			bool const verifyAttacker = false;
+			IGNORE_RETURN(getAiShipController().addDamageTaken(attackingUnit, damage, verifyAttacker));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::calculateNextProjectileShotPerfect()
+{
+	AiShipPilotData const & pilotData = *NON_NULL(getAiShipController().getPilotData());
+
+	m_nextProjectileShotPerfect = (Random::randomReal() > pilotData.m_projectileMissChance);
+
+	Vector const directionToTarget(m_targetInfo->m_position_w - getAiShipController().getOwnerPosition_w());
+	float const approximateDistanceToTarget = directionToTarget.approximateMagnitude();
+	float const missHalfAngle = pilotData.m_projectileMissAngle / 2.0f;
+	Transform transform;
+	transform.roll_l(Random::randomReal() * PI_TIMES_2);
+	m_shotErrorPosition_l = transform.rotate_l2p(Vector(0.0f, m_targetInfo->m_radius + approximateDistanceToTarget * missHalfAngle, 0.0f));
+}
+
+// ----------------------------------------------------------------------
+
+int AiShipBehaviorAttackFighter::selectWeaponToFire(bool const includeMissles)
+{
+	int result = -1;
+	WeaponPriorityMap weaponPriorityMap;
+	ShipObject * const ownerShipObject = getAiShipController().getShipOwner();
+
+	for (int weaponIndex = 0; weaponIndex < ShipChassisSlotType::cms_numWeaponIndices; ++weaponIndex)
+	{
+		if (   !ownerShipObject->isTurret(weaponIndex)
+		    && !ownerShipObject->isCountermeasure(weaponIndex))
+		{
+			if (ownerShipObject->canFireShot(weaponIndex))
+			{
+				// -- Get the weapon priority and add it to the list of weapons.
+				bool const canFireProjectiles = true;
+				float const weaponPriority = getWeaponPriority(includeMissles, canFireProjectiles, weaponIndex);
+				
+				if (weaponPriority > FLT_MIN)
+				{
+					IGNORE_RETURN(weaponPriorityMap.insert(std::make_pair(weaponPriority, weaponIndex)));
+				}
+			}
+		}
+	}
+	
+	//-- Shoot based upon weapon priority & skill.
+
+	if (!weaponPriorityMap.empty())
+	{
+		//-- First get the best weapon.
+		WeaponPriorityMap::reverse_iterator itWeapon = weaponPriorityMap.rbegin();
+		
+		//-- Randomize the weapon selection based on skill level.
+		if(Random::randomReal() > getPilotManagerInfo().m_weaponSelectionSkill)
+		{
+			size_t const randumbWeapon = static_cast<size_t>(Random::random(0, static_cast<int>(weaponPriorityMap.size() - 1)));
+			std::advance(itWeapon, randumbWeapon);
+		}
+
+		result = itWeapon->second;
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::alterManeuverFlags()
+{
+	ShipObject * const shipObject = NON_NULL(safe_cast<ShipObject *>(getAiShipController().getOwner()));
+
+	// Track state transitions.
+	m_lastManeuverFlags = m_maneuverFlags;
+
+	// ------------------------------
+	// Set Maneuver Flags in this block ONLY.
+		// Begin
+		//setManeuverFlag(Maneuver::MF_targetInAttackRange, m_targetInfo->m_distanceToTarget <= shipObject->getApproximateAttackRange(false));
+		//setManeuverFlag(Maneuver::MF_targetIsTooClose, m_targetInfo->m_distanceToTarget <= getAiShipController().getLargestTurnRadius());
+		setManeuverFlag(static_cast<int>(Maneuver::MF_missileLockedOnMe), MissileManager::getInstance().isTargetedByMissile(shipObject->getNetworkId()));
+		// End
+	// ------------------------------
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::alterBooster()
+{
+	AiShipPilotData const & pilotData = *NON_NULL(getAiShipController().getPilotData());
+	bool activateBooster = false;
+
+	float const boosterRange = std::max(getAiShipController().getShipOwner()->getApproximateAttackRange(true) * pilotData.m_aggression, getAiShipController().getLargestTurnRadius());
+	if (m_targetInfo->m_isBoosting || 
+		(m_targetInfo->m_distanceToTarget > boosterRange) || 
+		(m_targetInfo->m_behindTarget && !m_targetInfo->m_targetWasInProjectileConeOfFire))
+	{
+		activateBooster = true; 
+	}
+
+	getAiShipController().getShipOwner()->setBoosterActive(activateBooster);
+}
+
+// ----------------------------------------------------------------------
+
+float AiShipBehaviorAttackFighter::getWeaponPriority(bool const missilesReady, bool const projectileReady, int const weaponIndex)
+{
+	ShipObject * const shipObject = NON_NULL(safe_cast<ShipObject *>(getAiShipController().getOwner()));
+	
+	float weaponPriority = -FLT_MAX;
+
+	ShipChassisSlotType::Type const weaponSlot = static_cast<ShipChassisSlotType::Type>(static_cast<int>(ShipChassisSlotType::SCST_weapon_0) + weaponIndex);
+	uint32 const componentCrc = shipObject->getComponentCrc(weaponSlot);
+	bool const isMissile = ShipComponentWeaponManager::isMissile(componentCrc);
+	
+	if (ShipComponentWeaponManager::isCountermeasure(componentCrc))
+	{
+		// We don't shoot countermeasures here, they are handled in the AiShipController
+	}
+	else if((projectileReady && !isMissile) || (missilesReady && isMissile))
+	{
+		//-- Consider the distance to the target over the weapon range.
+		float const range = shipObject->getWeaponRange(weaponIndex);
+
+		if(m_targetInfo->m_distanceToTarget < range)
+		{	
+			//-- Consider the amount of damage inflicted by this weapons.
+			float const weaponDamage = shipObject->getWeaponDamageMaximum(weaponSlot) + shipObject->getWeaponDamageMinimum(weaponSlot);
+			
+			//-- How effective?
+			float const weaponEffectiveness = shipObject->getWeaponEffectivenessShields(weaponSlot) + shipObject->getWeaponEffectivenessArmor(weaponSlot);
+			
+			//-- How much energy do we use?
+			float const energyPerShot = shipObject->getWeaponActualEnergyPerShot(weaponSlot);
+			float const weaponEnergy  = (energyPerShot > FLT_MIN) ? shipObject->computeWeaponProjectileTimeToLive(weaponIndex) / energyPerShot : 1.0f;;
+			
+			//-- Are we running out of ammo for this weapon?
+			float const ammoPerShot = static_cast<float>(shipObject->getWeaponAmmoMaximum(weaponSlot));
+			float const weaponAmmo = ammoPerShot > FLT_MIN ? static_cast<float>(shipObject->getWeaponAmmoCurrent(weaponSlot)) / ammoPerShot : 1.0f;
+
+			//-- Range.
+			float const weaponRange = (range > FLT_MIN) ? m_targetInfo->m_distanceToTarget / range : 1.0f;
+			
+			//-- Compute a "fuzzy" priority.
+			weaponPriority = (weaponDamage * weaponEffectiveness * weaponEnergy * weaponAmmo  * weaponRange);
+		}
+	}
+		
+	return weaponPriority;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::alterTargetInformation()
+{
+	ShipObject & ownerShipObject = *NON_NULL(getAiShipController().getShipOwner());
+	ShipObject const * const targetShipObject = getAiShipController().getPrimaryAttackTargetShipObject();
+
+	if (targetShipObject != NULL)
+	{
+		//-- Set pilot data here.
+		AiShipPilotData const * pilotData = NON_NULL(getAiShipController().getPilotData());
+		float const timeDelta = getTimeDelta();
+
+		//-- Set look at target to activate turret tracking.
+		if (ownerShipObject.hasTurrets())
+		{
+			NetworkId const & targetObjectId = targetShipObject->getNetworkId();
+			if(targetObjectId != ownerShipObject.getPilotLookAtTarget())
+				ownerShipObject.setPilotLookAtTarget(targetObjectId);
+		}
+
+		CreatureObject const * const targetPilot = targetShipObject->getPilot();
+
+		m_targetInfo->m_playerControlled = (targetPilot != NULL) ? targetPilot->isPlayerControlled() : false;
+
+		// Cached target info.
+		bool const includeMissiles = true;
+		m_targetInfo->m_weaponRange = targetShipObject->getApproximateAttackRange(includeMissiles);
+		m_targetInfo->m_speed = targetShipObject->getCurrentSpeed();
+		m_targetInfo->m_orientation_w = targetShipObject->getObjectFrameK_w();
+
+		// Target position.
+		//float const targetRadius = targetShipObject->getRadius();
+		if (m_targetInfo->m_offsetUpdate.updateZero(timeDelta))
+		{
+			m_targetInfo->m_targetWasInProjectileConeOfFire = false;
+			
+			// We can't have bad shot due to this approximation. We need a better solution before enabling this.
+
+			m_targetInfo->m_offset = Vector::zero;
+			//m_targetInfo->m_offset = Vector::randomUnit();
+			//if (m_targetInfo->m_offset.approximateNormalize())
+			//	m_targetInfo->m_offset *= targetRadius;
+		}
+
+		//RLS TODO: Add ShipObject::getInterceptPosition(timeDelta);
+		if (m_targetInfo->m_positionUpdate.updateZero(timeDelta) || m_targetInfo->m_requestPositionUpdate)
+		{
+			m_targetInfo->m_requestPositionUpdate = false;
+			m_targetInfo->m_distanceToTarget = ownerShipObject.getPosition_w().magnitudeBetween(m_targetInfo->m_position_w);
+			m_targetInfo->m_position_w = targetShipObject->getInterceptPosition(timeDelta * 2.0f) + m_targetInfo->m_offset;
+		}
+
+		Vector const & targetPosition_o = ownerShipObject.rotateTranslate_w2o(m_targetInfo->m_position_w);
+		Vector normalizedTargetPosition_o(targetPosition_o);
+		if(normalizedTargetPosition_o.normalize())
+			m_targetInfo->m_directionFromShip_w = normalizedTargetPosition_o;
+
+		m_targetInfo->m_isBoosting = targetShipObject->isBoosterActive();
+		
+		// Note: Using target orientation (not position) vs ship orientation.
+		// RLS TODO: mUST BE IN THE TURN RADIUS TOO
+		m_targetInfo->m_collisionCourse = m_targetInfo->m_distanceToTarget < getAiShipController().getLargestTurnRadius() && acos(m_targetInfo->m_orientation_w.dot(ownerShipObject.getObjectFrameK_w())) < getPilotManagerInfo().m_targetCollisionCourse; 
+
+		// TODO: The projectile cone of fire check needs to use the lead position of the target, not the current position!!!!!!!
+		
+		// Calculate if our target's lead position is in our _projectile_ cone of fire
+		{
+			ShipObject const & attackerShipObject = ownerShipObject;
+			Sphere const targetSphere_w(m_nextShotPosition_w, targetShipObject->getRadius());
+			float const coneAngle = pilotData->m_projectileFireAngle * 0.5f;
+
+			m_targetInfo->m_targetInProjectileConeOfFire = isTargetInConeOfFire(attackerShipObject, targetSphere_w, coneAngle);
+			m_targetInfo->m_targetWasInProjectileConeOfFire |= m_targetInfo->m_targetInProjectileConeOfFire;
+		}
+
+		// Calculate if our target's lead position is in our _missile_ cone of fire
+		{
+			ShipObject const & attackerShipObject = ownerShipObject;
+			Sphere const targetSphere_w(m_nextShotPosition_w, targetShipObject->getRadius());
+			float const coneAngle = pilotData->m_fighterMissileLockOnAngle * 0.5f;
+
+			m_targetInfo->m_targetInMissileLockOnConeOfFire = isTargetInConeOfFire(attackerShipObject, targetSphere_w, coneAngle);
+		}
+		
+		// Calculate if our lead position is in our target's cone of fire
+		{
+			ShipObject const & attackerShipObject = *targetShipObject;
+			float const attackerProjectileSpeed = attackerShipObject.getFastestWeaponProjectileSpeed();
+
+			if (attackerProjectileSpeed > 0.0f)
+			{
+				// Attacker has weapons
+
+				Vector const & attackerShipPosition_w = attackerShipObject.getPosition_w();
+				Vector const & targetLeadPosition_w = ownerShipObject.getTargetLead_p(attackerShipPosition_w, attackerProjectileSpeed);
+				Sphere const targetSphere_w(targetLeadPosition_w, ownerShipObject.getRadius());
+				float const coneAngle = convertDegreesToRadians(30.0f) * 0.5f;
+
+				m_targetInfo->m_inTargetsProjectileConeOfFire = isTargetInConeOfFire(attackerShipObject, targetSphere_w, coneAngle);
+			}
+			else
+			{
+				// Attacker has no weapons
+
+				m_targetInfo->m_inTargetsProjectileConeOfFire = false;
+			}
+		}
+
+		// Am I facing my target?
+		{
+			Vector const directionToTarget(targetShipObject->getPosition_w() - ownerShipObject.getPosition_w());
+			float const dotProduct = directionToTarget.dot(ownerShipObject.getObjectFrameK_w());
+
+			m_targetInfo->m_facingTarget = (dotProduct >= 0.0f);
+		}
+
+		// Am I behind my target?
+		{
+			Vector const & ownerShipPosition_w = ownerShipObject.getPosition_w();
+			Vector const ownerShipPosition_l(targetShipObject->rotateTranslate_w2o(ownerShipPosition_w));
+
+			m_targetInfo->m_behindTarget = (ownerShipPosition_l.z < 0.0f);
+		}
+
+		// Get the size of the target.
+		m_targetInfo->m_radius = targetShipObject->getRadius();
+	}
+	else
+	{
+		DEBUG_WARNING(true, ("debug_ai: unit(%s) ERROR: The primary attack target is NULL.", ownerShipObject.getDebugInformation().c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipBehaviorAttackFighter::isFacingTarget() const
+{
+	return m_targetInfo->m_facingTarget;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipBehaviorAttackFighter::isBehindTarget() const
+{
+	return m_targetInfo->m_behindTarget;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipBehaviorAttackFighter::isTargetInProjectileConeOfFire() const
+{
+	return m_targetInfo->m_targetInProjectileConeOfFire;
+}
+
+// ----------------------------------------------------------------------
+
+float AiShipBehaviorAttackFighter::getDistanceToTargetSquared() const
+{
+	return sqr(m_targetInfo->m_distanceToTarget);
+}
+
+// ----------------------------------------------------------------------
+
+float AiShipBehaviorAttackFighter::getTimeSinceLastShot() const
+{
+	return m_timeSinceLastShot;
+}
+
+// ----------------------------------------------------------------------
+
+float const AiShipBehaviorAttackFighter::getProjectileSpeed() const
+{
+	return m_projectileSpeed;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipBehaviorAttackFighter::shouldStartToLeash() const
+{
+	bool leash = false;
+
+	if (getAiShipController().isAttackSquadLeader())
+	{
+		// Don't evade twice in a row
+
+		if (   (m_lastManeuverState != static_cast<int>(Maneuver::FM_none))
+			&& (m_lastManeuverState != static_cast<int>(Maneuver::FM_evade)))
+		{
+			if (!isWithinLeashDistance())
+			{
+				leash = true;
+			}
+		}
+	}
+
+	return leash;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipBehaviorAttackFighter::shouldStartToEvade() const
+{
+	bool evade = false;
+
+	if (getAiShipController().isAttackSquadLeader())
+	{
+		if (m_lastManeuverState != static_cast<int>(Maneuver::FM_evade))
+		{
+			// If we lose too much of our health, lets evade
+
+			float const overallHealthPercent = getAiShipController().getShipOwner()->getOverallHealthWithShieldsAndArmor();
+			float const healthLossPercent = (m_lastEvadeHealthPercent - overallHealthPercent);
+
+			if (healthLossPercent > m_evadeHealthPercent)
+			{
+				evade = true;
+			}
+
+			// If we fire enough shots, then evade
+
+			if (!evade)
+			{
+				int const totalShotsFired = getAiShipController().getAttackSquad().getTotalShotsFired();
+				int const numberOfShotsToFire = getAiShipController().getAttackSquad().getNumberOfShotsToFire();
+
+				if (totalShotsFired > numberOfShotsToFire)
+				{
+					evade = true;
+				}
+			}
+
+			//evade |= hasManeuverFlag(Maneuver::MF_targetIsTooClose);
+
+			// Are we to close to the target
+
+			if (!evade)
+			{
+				if (getAiShipController().getAttackSquad().isTooCloseToTarget())
+				{
+					evade = true;
+				}
+			}
+		}
+	}
+
+	return evade;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::initializeTimers()
+{
+	AiShipPilotData const & pilotData = *NON_NULL(getAiShipController().getPilotData());
+
+	m_projectileTimer.setExpireTime(pilotData.m_projectileFireDelay);
+	m_projectileTimer.setElapsedTime(Random::randomReal(m_projectileTimer.getExpireTime()));
+
+	m_missileLockOnTimer.setExpireTime(pilotData.m_fighterMissileLockOnTime);
+	m_missileLockOnTimer.reset();
+
+	m_missileFireDelayTimer.setExpireTime(pilotData.m_fighterMissileFireDelay);
+	m_missileFireDelayTimer.setElapsedTime(Random::randomReal(m_missileFireDelayTimer.getExpireTime()));
+
+	m_targetInfo->m_offsetUpdate.setExpireTime(getPilotManagerInfo().m_targetAimZoneUpdate);
+	m_targetInfo->m_offsetUpdate.setElapsedTime(Random::randomReal(m_targetInfo->m_offsetUpdate.getExpireTime()));
+
+	m_targetInfo->m_positionUpdate.setExpireTime(getPilotManagerInfo().m_targetReactionTime);
+	m_targetInfo->m_positionUpdate.setElapsedTime(Random::randomReal(m_targetInfo->m_positionUpdate.getExpireTime()));
+
+	m_hitDecayTimer.setExpireTime(getPilotManagerInfo().m_hitsDecayTimer);
+	m_hitDecayTimer.setElapsedTime(Random::randomReal(m_hitDecayTimer.getExpireTime()));
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::alterAttackBehavior()
+{
+	ShipObject const * const targetShipObject = getAiShipController().getPrimaryAttackTargetShipObject();
+	if (targetShipObject && targetShipObject->isCapitalShip())
+	{
+		getAiShipController().switchToBomberAttack();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+AiPilotManager const & AiShipBehaviorAttackFighter::getPilotManagerInfo() const
+{
+	return getAiShipController().getPilotManagerInfo();
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::setManeuverFlag(int const activeFlags, bool const setFlag)
+{
+	if (setFlag)
+	{
+		m_maneuverFlags |= static_cast<int>(activeFlags);
+	}
+	else
+	{
+		m_maneuverFlags &= ~static_cast<int>(activeFlags);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+
+bool AiShipBehaviorAttackFighter::hasManeuverFlag(int const activeFlags) const
+{
+	return m_maneuverFlags & static_cast<int>(activeFlags);
+}
+
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::calculateEvadeHealthPercent()
+{
+	float const pilotAggression = getAiShipController().getPilotAggression();
+
+	m_evadeHealthPercent = 0.1f + (Random::randomReal() * 0.15f * pilotAggression);
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipBehaviorAttackFighter::isNextProjectileShotPerfect() const
+{
+	return m_nextProjectileShotPerfect;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::calculateWeaponProjectileSpeed()
+{
+	ShipObject const & ownerShipObject = *NON_NULL(getAiShipController().getShipOwner());
+
+	for (int weaponIndex = 0; weaponIndex < ShipChassisSlotType::cms_numWeaponIndices; ++weaponIndex)
+	{
+		if (ownerShipObject.isProjectile(weaponIndex))
+		{
+			float const projectileSpeed = ownerShipObject.getWeaponProjectileSpeed(weaponIndex);
+
+#ifdef _DEBUG
+			if (   (projectileSpeed > 0.0f)
+			    && (m_projectileSpeed > 0.0f)
+			    && (!WithinEpsilonInclusive(projectileSpeed, m_projectileSpeed, 0.0001f)))
+			{
+				DEBUG_WARNING(true, ("debug_ai: unit(%s) ERROR: This AI ship has projectiles with differing speeds. current(%.2f) new(%.2f) weaponIndex(%d) The code does not handle this optimally.", ownerShipObject.getDebugInformation().c_str(), m_projectileSpeed, projectileSpeed, weaponIndex));
+			}
+#endif // _DEBUG
+
+			m_projectileSpeed = std::max(m_projectileSpeed, projectileSpeed);
+		}
+	}
+
+	if (m_projectileSpeed <= 0.0f)
+	{
+		DEBUG_WARNING(true, ("debug_ai: unit(%s) ERROR: This ship has a projectile speed of %.2f.", ownerShipObject.getDebugInformation().c_str(), m_projectileSpeed));
+
+		m_projectileSpeed = 1.0f;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+Vector const & AiShipBehaviorAttackFighter::getNextShotPosition_w() const
+{
+	return m_nextShotPosition_w;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::calculateNextShotPosition_w()
+{
+	ShipObject const * const targetShipObject = getAiShipController().getPrimaryAttackTargetShipObject();
+
+	if (!targetShipObject)
+	{
+		DEBUG_WARNING(true, ("debug_ai: unit(%s) ERROR: Why is the primary attack target NULL?", getAiShipController().getShipOwner()->getDebugInformation().c_str()));
+		return;
+	}
+
+	if (isNextProjectileShotPerfect())
+	{
+		// Perfect shot
+
+		float const projectileSpeed = getProjectileSpeed();
+		Vector const & ownerShipPosition_w = getAiShipController().getOwnerPosition_w();
+		Vector const & targetLeadPosition_w = targetShipObject->getTargetLead_p(ownerShipPosition_w, projectileSpeed);
+
+		m_nextShotPosition_w = targetLeadPosition_w;
+	}
+	else
+	{
+		// Bad shot
+
+		Vector const & targetPosition_w = targetShipObject->getPosition_w();
+		Vector const & ownerShipPosition_w = getAiShipController().getOwnerPosition_w();
+		Vector directionToTargetPosition_w(targetPosition_w - ownerShipPosition_w);
+		float const distanceToTargetPosition = directionToTargetPosition_w.magnitude();
+
+		if (distanceToTargetPosition < Vector::NORMALIZE_THRESHOLD)
+		{
+			// We are on top of the target, just shoot toward the target
+
+			m_nextShotPosition_w = targetPosition_w;
+		}
+		else
+		{
+			IGNORE_RETURN(directionToTargetPosition_w.normalize());
+			Transform transform;
+			transform.setLocalFrameKJ_p(directionToTargetPosition_w, Vector::perpendicular(directionToTargetPosition_w));
+			transform.setPosition_p(ownerShipPosition_w);
+
+			float const x = m_shotErrorPosition_l.x;
+			float const y = m_shotErrorPosition_l.y;
+			float const z = distanceToTargetPosition;
+
+			m_nextShotPosition_w = transform.rotateTranslate_l2p(Vector(x, y, z));
+		}
+	}
+}
+
+#ifdef _DEBUG
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::addDebug(AiDebugString & aiDebugString)
+{
+	AiShipBehaviorAttack::addDebug(aiDebugString);
+
+	// Show the path size
+
+	NOT_NULL(m_currentManeuver);
+	AiShipBehaviorAttackFighter::Maneuver::Path const * path = m_currentManeuver->getCurrentPath();
+
+	char pathSizeText[256];
+	if (path != NULL)
+	{
+		snprintf(pathSizeText, sizeof(pathSizeText) - 1, "PATH(%d)", path->getLength());
+	}
+	else
+	{
+		snprintf(pathSizeText, sizeof(pathSizeText) - 1, "NO PATH");
+	}
+	pathSizeText[sizeof(pathSizeText) - 1] = '\0';
+
+	// Show the current maneuver
+
+	{
+		char const * const text = FormattedString<512>().sprintf("attack[%s%s%s] %d %s\n", AiDebugString::getColorCode(PackedRgb::solidWhite).c_str(), (m_currentManeuver != NULL) ? m_currentManeuver->getFighterManeuverString() : "NULL", AiDebugString::getResetColorCode(), (m_currentManeuver != NULL) ? m_currentManeuver->getSequenceId() : -1, pathSizeText);
+		aiDebugString.addText(text, PackedRgb::solidCyan);
+	}
+
+	//{
+	//	char const * const text = FormattedString<512>().sprintf("facingTarget(%s) behindTarget(%s)\n", isFacingTarget() ? "YES" : "NO", isBehindTarget() ? "YES" : "NO");
+	//	aiDebugString.addText(text, PackedRgb::solidWhite);
+	//}
+
+	//{
+	//	if (m_currentManeuver->isDesiredPositionBehindMe())
+	//	{
+	//		aiDebugString.addText(FormattedString<512>().sprintf("isDesiredPositionBehindMe(YES)\n"), PackedRgb::solidYellow);
+	//	}
+	//	else
+	//	{
+	//		aiDebugString.addText(FormattedString<512>().sprintf("isDesiredPositionBehindMe(NO)\n"), PackedRgb::solidYellow);
+	//	}
+	//}
+
+	//{
+	//	if (m_targetInfo->m_inTargetsProjectileConeOfFire)
+	//	{
+	//		aiDebugString.addText("inTargetsConeOfFire(YES)\n", PackedRgb::solidYellow);
+	//	}
+	//	else
+	//	{
+	//		aiDebugString.addText("inTargetsConeOfFire(NO)\n", PackedRgb::solidYellow);
+	//	}
+	//}
+
+	// Show the maneuver path
+
+	if (   (path != NULL)
+	    && !path->isEmpty())
+	{
+		AiDebugString::TransformList transformList;
+
+		for (int index = 0; index < path->getLength(); ++index)
+		{
+			Vector position_w;
+			IGNORE_RETURN(path->getNode(index, position_w));
+			Transform transform;
+			transform.setPosition_p(position_w.x, position_w.y, position_w.z);
+			transformList.push_back(transform);
+		}
+
+		bool const cyclic = false;
+		aiDebugString.addPath(transformList, cyclic);
+
+		Vector currentPosition_w;
+		if (path->getNode(m_currentManeuver->getCurrentPathIndex(), currentPosition_w))
+		{
+			aiDebugString.addLineToPosition(currentPosition_w, PackedRgb::solidCyan);
+		}
+	}
+	else if (   (m_currentManeuver->getFighterManeuver() == Maneuver::FM_evade)
+	         || (m_currentManeuver->getFighterManeuver() == Maneuver::FM_chase))
+	{
+		// Do not check this in enabled, it spams the client and will disconnect you with too many ships
+
+		aiDebugString.addLineToPosition(m_currentManeuver->getDesiredPosition_w(), PackedRgb::solidCyan);
+	}
+
+	//{
+	//	AiShipPilotData const * pilotData = NON_NULL(getAiShipController().getPilotData());
+	//	
+	//	{
+	//		float const length = m_targetInfo->m_distanceToTarget;
+	//		float const coneAngle = pilotData->m_projectileFireAngle * 0.5f;
+	//		PackedRgb const & color = m_targetInfo->m_targetInProjectileConeOfFire ? PackedRgb::solidRed : PackedRgb::solidWhite;
+	//
+	//		aiDebugString.addCone(length, coneAngle, color);
+	//	}
+	//
+	//	{
+	//		float const length = m_targetInfo->m_distanceToTarget;
+	//		float const coneAngle = pilotData->m_fighterMissileLockOnAngle * 0.5f;
+	//		PackedRgb const & color = m_targetInfo->m_targetInMissileLockOnConeOfFire ? PackedRgb::solidRed : PackedRgb::solidWhite;
+	//
+	//		aiDebugString.addCone(length, coneAngle, color);
+	//	}
+	//}
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::debug_forceManeuver(int const maneuverType)
+{
+	Maneuver::FighterManeuver const forcedManeuverType = static_cast<Maneuver::FighterManeuver>(maneuverType);
+
+	setManeuver(Maneuver::createManeuver(forcedManeuverType, *this, *m_targetInfo));
+}
+
+#endif // _DEBUG
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter.h b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter.h
new file mode 100644
index 00000000..c69be5bb
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter.h
@@ -0,0 +1,146 @@
+// ======================================================================
+//
+// AiShipBehaviorAttackFighter.h
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiShipBehaviorAttackFighter_H
+#define	INCLUDED_AiShipBehaviorAttackFighter_H
+
+#include "serverGame/AiShipBehaviorAttack.h"
+#include "sharedFoundation/Timer.h"
+#include "sharedObject/Object.h"
+
+class AiPilotManager;
+class NetworkId;
+class ShipObject;
+
+// ======================================================================
+
+class AiShipBehaviorAttackFighter : public AiShipBehaviorAttack
+{
+public:
+	class Maneuver;
+
+#ifdef _DEBUG
+	virtual void addDebug(AiDebugString & aiDebugString);
+	void debug_forceManeuver(int maneuverType);
+#endif // _DEBUG
+
+	static Vector const calculateEvadePositionWithinLeashDistance_w(AiShipBehaviorAttack const & aiShipBehaviorAttack);
+
+protected:
+	void setManeuver(Maneuver * const);
+	
+	float getTimeDelta() const;
+	void setTimeDelta(float const timeDelta);
+	
+	float getWeaponPriority(bool const missilesReady, bool const projectileReady, int const weaponIndex);
+	
+	void alterWeapons();
+	void alterManeuverFlags();
+	void alterTargetInformation();
+	void alterManeuver();
+	void alterBooster();
+	
+	AiPilotManager const & getPilotManagerInfo() const;
+
+	void setManeuverFlag(int const activeFlags, bool const setFlag);
+	bool hasManeuverFlag(int const activeFlags) const;
+
+public:
+	
+	class AiAttackTargetInformation
+	{
+	public:
+		
+		AiAttackTargetInformation();
+		
+		bool m_playerControlled;
+		float m_distanceToTarget;
+		float m_speed;
+		float m_weaponRange;
+		float m_radius;
+		bool m_facingTarget;
+		bool m_behindTarget;
+		
+		Vector m_position_w;
+		Vector m_orientation_w;
+		Vector m_directionFromShip_w;
+		Vector m_offset; // aim offset
+		Vector m_maneuverPosition_w;
+		
+		Timer m_offsetUpdate;
+		Timer m_positionUpdate;
+		
+		bool m_isBoosting;
+		bool m_targetInProjectileConeOfFire;
+		bool m_targetWasInProjectileConeOfFire;
+		bool m_targetInMissileLockOnConeOfFire;
+		bool m_collisionCourse;
+		bool m_requestPositionUpdate;
+		bool m_inTargetsProjectileConeOfFire;
+	};
+	
+public:
+	explicit AiShipBehaviorAttackFighter(AiShipController & aiShipController);
+	explicit AiShipBehaviorAttackFighter(AiShipBehaviorAttack const & sourceBehavior);
+	virtual ~AiShipBehaviorAttackFighter();
+
+	virtual void alter(float timeDelta);
+
+	Vector const & getNextShotPosition_w() const;
+	float const getProjectileSpeed() const;
+	bool shouldStartToLeash() const;
+	bool shouldStartToEvade() const;
+	void alterAttackBehavior();
+	bool isFacingTarget() const;
+	bool isBehindTarget() const;
+	bool isTargetInProjectileConeOfFire() const;
+	float getDistanceToTargetSquared() const;
+	float getTimeSinceLastShot() const;
+	bool isNextProjectileShotPerfect() const;
+	
+private:
+
+	void initializeTimers();
+	void calculateEvadeHealthPercent();
+	int selectWeaponToFire(bool const includeMissles);
+	void calculateNextProjectileShotPerfect();
+	void calculateNextShotPosition_w();
+	void calculateWeaponProjectileSpeed();
+
+	Maneuver * m_currentManeuver;
+	float m_timeDelta;
+	Timer m_projectileTimer;
+	Timer m_missileLockOnTimer;
+	Timer m_missileFireDelayTimer;
+	Timer m_hitDecayTimer;
+	int m_stateFlags;
+	AiAttackTargetInformation * const m_targetInfo;
+	Vector m_missRadians;
+	int m_lastManeuverState;
+	int m_maneuverFlags;
+	int m_lastManeuverFlags;
+	float m_lastEvadeHealthPercent;
+	float m_evadeHealthPercent;
+	float m_timeSinceLastShot;
+	float m_projectileSpeed;
+	bool m_nextProjectileShotPerfect;
+	Vector m_shotErrorPosition_l;
+	Vector m_nextShotPosition_w;
+		
+private: // Disabled
+
+	AiShipBehaviorAttackFighter();
+	AiShipBehaviorAttackFighter(AiShipBehaviorAttackFighter const &);
+	AiShipBehaviorAttackFighter &operator =(AiShipBehaviorAttackFighter const &);
+
+	friend class Maneuver;
+};
+
+// ======================================================================
+
+#endif //INCLUDED_AiShipBehaviorAttackFighter_H
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.cpp
new file mode 100644
index 00000000..165b9864
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.cpp
@@ -0,0 +1,746 @@
+// ======================================================================
+//
+// AiShipBehaviorAttackFighter_Maneuver.cpp
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiShipBehaviorAttackFighter_Maneuver.h"
+#include "serverGame/AiShipBehaviorAttackFighter_Maneuver_Path.h"
+
+#include "serverGame/AiPilotManager.h"
+#include "serverGame/AiShipController.h"
+#include "serverGame/AiShipPilotData.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/SpaceAttackSquad.h"
+#include "serverGame/SpaceSquad.h"
+#include "sharedGame/ShipDynamicsModel.h"
+#include "sharedLog/Log.h"
+#include "sharedMath/Range.h"
+#include "sharedTerrain/TerrainObject.h"
+
+#include <vector>
+
+
+// ======================================================================
+
+namespace AiShipBehaviorAttackFighter_ManeuverNamespace
+{
+#ifdef _DEBUG
+	int s_sequenceId = 0;
+#endif // _DEBUG
+}
+
+using namespace AiShipBehaviorAttackFighter_ManeuverNamespace;
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttackFighter::Maneuver::Maneuver(FighterManeuver const fm, AiShipBehaviorAttackFighter & aiShipBehaviorAttack, AiAttackTargetInformation const & targetInfo, float const maxTime, bool updateThrottle) :
+m_aiShipBehaviorAttack(aiShipBehaviorAttack),
+m_targetInfo(targetInfo),
+m_pathList(new PathList),
+m_currentPath(m_pathList->begin()),
+m_currentPathNode(0),
+m_abortFlags(0),
+m_updateThrottle(updateThrottle),
+m_throttleValue(0.0f),
+m_desiredPosition_w(),
+m_maneuverCategory(fm),
+#ifdef _DEBUG
+m_sequenceId(s_sequenceId++),
+#endif // _DEBUG
+m_expirationTimer(maxTime)
+{
+#ifdef _DEBUG
+	float const weaponAttackRange = getAiShipController().getAttackSquad().getWeaponAttackRange();
+
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled() && (weaponAttackRange <= 0.0f), "debug_ai", ("AiShipBehaviorAttackFighter::Maneuver::Maneuver() owner(%s) Why are we attacking if we have no weapons? weaponAttackRange(%.0f)", getAiShipController().getOwner()->getNetworkId().getValueString().c_str(), weaponAttackRange));
+#endif // _DEBUG
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttackFighter::Maneuver::~Maneuver()
+{
+	for(PathList::iterator itPath = m_pathList->begin(); itPath != m_pathList->end(); ++itPath)
+	{
+		Path::deletePath(*itPath);
+	}
+	
+	delete m_pathList;
+
+	m_currentPath = NULL;
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttackFighter::Maneuver::FighterManeuver AiShipBehaviorAttackFighter::Maneuver::getFighterManeuver() const
+{
+	return m_maneuverCategory;
+}
+
+// ----------------------------------------------------------------------
+
+Vector const & AiShipBehaviorAttackFighter::Maneuver::getDesiredPosition_w() const
+{
+	return m_desiredPosition_w;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::Maneuver::setDesiredPosition_w(Vector const & position)
+{
+	m_desiredPosition_w = position;
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttackFighter::AiAttackTargetInformation const & AiShipBehaviorAttackFighter::Maneuver::getTargetInfo() const
+{
+	return m_targetInfo;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipBehaviorAttackFighter::Maneuver::isDesiredPositionBehindMe() const
+{
+	Vector const position_o(getAiShipController().getOwner()->rotateTranslate_w2o(m_desiredPosition_w));
+
+	return (position_o.z < 0.0f);
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::Maneuver::addPath(Path * const path)
+{
+	if (path)
+	{
+		m_pathList->push_back(path);
+	}
+
+	m_currentPath = m_pathList->begin();
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttackFighter::Maneuver::Path * AiShipBehaviorAttackFighter::Maneuver::getCurrentPath()
+{
+	Path * currentPath = NULL;
+	
+	if (!m_pathList->empty() && m_currentPath != m_pathList->end())
+	{
+		currentPath = *m_currentPath;
+	}
+	
+	return currentPath;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipBehaviorAttackFighter::Maneuver::alter(float timeDelta, int stateFlags)
+{
+	bool shouldContinue = !m_expirationTimer.updateZero(timeDelta);
+	
+	if (shouldContinue)
+	{
+		shouldContinue = alterPath(timeDelta);
+	}
+
+	if (shouldContinue)
+	{
+		shouldContinue = !(stateFlags & m_abortFlags);
+	}
+
+	// Modify the controller.
+	if (shouldContinue) 
+	{
+		alterThrottle(timeDelta);
+		modifyController(timeDelta);
+	}
+
+	// let the caller know if it should continue.
+	return shouldContinue;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipBehaviorAttackFighter::Maneuver::alterInternal(float const /*timeDelta*/)
+{
+	return (getDesiredPosition_w() - getAiShipController().getOwnerPosition_w()).approximateMagnitude() > getAiShipController().getLargestTurnRadius();
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipBehaviorAttackFighter::Maneuver::alterPath(float const timeDelta)
+{
+	bool shouldContinue = alterInternal(timeDelta);
+
+	//if (!shouldContinue)
+	//{
+	//	Path * const currentPath = getCurrentPath();
+	//	shouldContinue = currentPath ? selectNextPath() : false;
+	//}
+
+	return shouldContinue;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipBehaviorAttackFighter::Maneuver::selectNextPath()
+{
+	bool shouldContinue = false;
+
+	if (!m_pathList->empty() && (m_currentPath != m_pathList->end()))
+	{
+		shouldContinue = ++m_currentPath != m_pathList->end();
+		m_currentPathNode = 0;
+	}
+
+	return shouldContinue;
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttackFighter::Maneuver::Path * AiShipBehaviorAttackFighter::Maneuver::addEmptyPath()
+{
+	Path * newPath = Path::createPath();
+	addPath(newPath);
+	return newPath;
+}
+
+
+// ----------------------------------------------------------------------
+// RLS -- Ensure the ship controller is modified in this block.
+void AiShipBehaviorAttackFighter::Maneuver::modifyController(float const timeDelta)
+{
+	getAiShipController().moveTo(m_desiredPosition_w, m_throttleValue, timeDelta);
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::Maneuver::alterThrottle(float const /*timeDelta*/)
+{
+	m_throttleValue = 1.0f;
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttackFighter::Maneuver * AiShipBehaviorAttackFighter::Maneuver::createManeuver(FighterManeuver const manueverType, AiShipBehaviorAttackFighter & aiShipBehaviorAttack, AiAttackTargetInformation const & targetInfo)
+{
+	Maneuver * aiManeuver = NULL;
+
+	switch(manueverType)
+	{
+	case FM_chase:
+		aiManeuver = createManeuverChase(aiShipBehaviorAttack, targetInfo);
+		break;
+		
+	case FM_leash:
+		aiManeuver = createManeuverLeash(aiShipBehaviorAttack, targetInfo);
+		break;
+		
+	default:
+	case FM_none:
+	case FM_evade:
+		aiManeuver = createManeuverEvade(aiShipBehaviorAttack, targetInfo);
+		break;
+	}
+
+	return aiManeuver;
+}
+
+// ----------------------------------------------------------------------
+
+AiShipController & AiShipBehaviorAttackFighter::Maneuver::getAiShipController()
+{
+	return m_aiShipBehaviorAttack.getAiShipController();
+}
+
+// ----------------------------------------------------------------------
+
+AiShipController const & AiShipBehaviorAttackFighter::Maneuver::getAiShipController() const
+{
+	return m_aiShipBehaviorAttack.getAiShipController();
+}
+
+#ifdef _DEBUG
+// ----------------------------------------------------------------------
+
+int AiShipBehaviorAttackFighter::Maneuver::getSequenceId() const
+{
+	return m_sequenceId;
+}
+#endif // _DEBUG
+
+// ----------------------------------------------------------------------
+
+int AiShipBehaviorAttackFighter::Maneuver::getCurrentPathIndex() const
+{
+	return m_currentPathNode;
+}
+
+//=======================================================================
+
+class AiManeuver_Chase : public AiShipBehaviorAttackFighter::Maneuver
+{
+public:
+	AiManeuver_Chase(AiShipBehaviorAttackFighter & aiShipBehaviorAttack, AiShipBehaviorAttackFighter::AiAttackTargetInformation const & targetInfo)
+	 : Maneuver(FM_chase, aiShipBehaviorAttack, targetInfo, aiShipBehaviorAttack.getAiShipController().getPilotData()->m_fighterChaseMaxTime, true)
+	 , m_chaseOnTailTimer(getAiShipController().getPilotData()->m_fighterChaseMaxOnTailTime)
+	 , m_pursuitType(PT_lag)
+	 , m_frontComfortDistance(0.0f)
+	 , m_rearComfortDistance(0.0f)
+	{
+		// Calculate the front and rear comfort distances, when these distances are penetrated, the AI wants to stop chasing
+
+		ShipObject const * const primaryTargetShipObject = getAiShipController().getPrimaryAttackTargetShipObject();
+
+		if (primaryTargetShipObject != NULL)
+		{
+			float const ownerShipRadius = getAiShipController().getShipOwner()->getRadius();
+			float const ownerTurnRadius = getAiShipController().getLargestTurnRadius();
+			float const targetShipRadius = primaryTargetShipObject->getRadius();
+
+			m_frontComfortDistance = (targetShipRadius + (ownerShipRadius * 2.0f) + (ownerTurnRadius * 0.7f));
+			m_rearComfortDistance = (targetShipRadius + (ownerShipRadius * 2.0f) + (ownerTurnRadius * 0.3f));
+		}
+		else
+		{
+			// ERROR
+		}
+
+		calculateChaseDistance();
+
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiManeuver_Chase() owner(%s) isAttackSquadLeader(%s) NEW CHASE MANEUVER", getAiShipController().getOwner()->getNetworkId().getValueString().c_str(), getAiShipController().isAttackSquadLeader() ? "yes" : "no"));
+
+		if (getAiShipController().isAttackSquadLeader())
+		{
+			getAiShipController().getAttackSquad().setTooCloseToTarget(false);
+		}
+
+		setDesiredPosition_w(m_targetInfo.m_position_w);
+	}
+
+	virtual char const * const getFighterManeuverString() const;
+
+protected:
+	  
+	bool alterInternal(float const /*timeDelta*/)
+	{
+		bool shouldContinue = true;
+		bool const attackSquadLeader = getAiShipController().isAttackSquadLeader();
+
+		calculateChaseDistance();
+
+		ShipObject const * const primaryTargetShipObject = getAiShipController().getPrimaryAttackTargetShipObject();
+
+		if (primaryTargetShipObject != NULL)
+		{
+			bool const facingTarget = m_aiShipBehaviorAttack.isFacingTarget();
+
+			if (facingTarget)
+			{
+				// Lead pursuit
+
+				setDesiredPosition_w(m_aiShipBehaviorAttack.getNextShotPosition_w());
+				m_pursuitType = PT_lead;
+			}
+			else
+			{
+				// Lag pursuit
+
+				float const chaseDistance = getAiShipController().getAttackSquad().getChaseDistance();
+				Vector const lagPursuitPosition_l(Vector(0.0f, 0.0f, -chaseDistance));
+				Vector const lagPursuitPosition_w(primaryTargetShipObject->getTransform_o2w().rotateTranslate_l2p(lagPursuitPosition_l));
+
+				setDesiredPosition_w(lagPursuitPosition_w);
+				m_pursuitType = PT_lag;
+			}
+
+			// If anyone in the attack squad is too close to the target, flag it
+
+			bool const behindTarget = m_aiShipBehaviorAttack.isBehindTarget();
+			float const tooCloseDistance = behindTarget ? m_rearComfortDistance : m_frontComfortDistance;
+
+			if (getDistanceToTargetSquared() <= sqr(tooCloseDistance))
+			{
+				getAiShipController().getAttackSquad().setTooCloseToTarget(true);
+			}
+
+			if (attackSquadLeader)
+			{
+				if (m_aiShipBehaviorAttack.shouldStartToLeash())
+				{
+					shouldContinue = false;
+
+					LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiManeuver_Chase() owner(%s) CHASE BAILING - NEED TO LEASH", getAiShipController().getOwner()->getNetworkId().getValueString().c_str()));
+				}
+				else if (m_aiShipBehaviorAttack.shouldStartToEvade())
+				{
+					shouldContinue = false;
+
+					LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiManeuver_Chase() owner(%s) CHASE BAILING - NEED TO EVADE", getAiShipController().getOwner()->getNetworkId().getValueString().c_str()));
+				}
+			}
+		}
+		else
+		{
+			// ERROR
+		}
+
+		//if (shouldContinue)
+		//{
+		//	// See if we have been on the target's ass too long
+		//
+		//	float const chaseDistance = getAiShipController().getAttackSquad().getChaseDistance();
+		//
+		//	if (getDistanceToTargetSquared() < sqr(chaseDistance))
+		//	{
+		//		if (m_chaseOnTailTimer.updateZero(timeDelta))
+		//		{
+		//			shouldContinue = false;
+		//		}
+		//	}
+		//	else
+		//	{
+		//		m_chaseOnTailTimer.reset();
+		//	}
+		//}
+
+		return shouldContinue;
+	}
+
+	virtual void alterThrottle(float const /*timeDelta*/)
+	{
+		float const chaseDistance = getAiShipController().getAttackSquad().getChaseDistance();
+		float const distanceToTargetSquared = getDistanceToTargetSquared();
+
+		if (   (distanceToTargetSquared < sqr(chaseDistance))
+		    && m_targetInfo.m_playerControlled)
+		{
+			AiShipPilotData const & pilotData = *NON_NULL(getAiShipController().getPilotData());
+			m_throttleValue = pilotData.m_fighterChaseMinThrottle;
+		}
+		else
+		{
+			if (isDesiredPositionBehindMe())
+			{
+				m_throttleValue = 0.5f;
+			}
+			else
+			{
+				m_throttleValue = 1.0f;
+			}
+		}
+	}
+
+private:
+
+	float getDistanceToTargetSquared()
+	{
+		return m_targetInfo.m_position_w.magnitudeBetweenSquared(getAiShipController().getOwnerPosition_w());
+	}
+
+	void calculateChaseDistance()
+	{
+		if (getAiShipController().isAttackSquadLeader())
+		{
+			ShipObject const * const primaryTargetShipObject = getAiShipController().getPrimaryAttackTargetShipObject();
+
+			if (primaryTargetShipObject != NULL)
+			{
+				AiShipPilotData const & pilotData = *NON_NULL(getAiShipController().getPilotData());
+				float const currentSpeed = getAiShipController().getShipOwner()->getCurrentSpeed();
+				float const seperationDistance = (currentSpeed * pilotData.m_fighterChaseSeperationTime);
+				float const chaseDistance = (m_rearComfortDistance * 1.2f) + seperationDistance;
+
+				getAiShipController().getAttackSquad().setChaseDistance(chaseDistance);
+			}
+			else
+			{
+				// ERROR
+			}
+		}
+	}
+
+	enum PursuitType
+	{
+		PT_lead,
+		PT_lag
+	};
+
+	Timer m_chaseOnTailTimer;
+	PursuitType m_pursuitType;
+	float m_frontComfortDistance;
+	float m_rearComfortDistance;
+
+	AiManeuver_Chase(AiManeuver_Chase const &);
+	AiManeuver_Chase();
+	AiManeuver_Chase const & operator=(AiManeuver_Chase const & rhs);
+};
+
+// ----------------------------------------------------------------------
+
+char const * const AiManeuver_Chase::getFighterManeuverString() const
+{
+	switch (m_pursuitType)
+	{
+		case PT_lead: { return "CHASE: LEAD PURSUIT"; }
+		case PT_lag: { return "CHASE: LAG PURSUIT"; }
+		default: {}
+	}
+
+	return "CHASE: INVALID";
+}
+
+//=======================================================================
+
+class AiManeuver_Leash : public AiShipBehaviorAttackFighter::Maneuver
+{
+public:
+	AiManeuver_Leash(AiShipBehaviorAttackFighter & aiShipBehaviorAttack, AiShipBehaviorAttackFighter::AiAttackTargetInformation const & targetInfo) :
+	Maneuver(FM_leash, aiShipBehaviorAttack, targetInfo, 100.0f, true)
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiManeuver_Leash() owner(%s) isAttackSquadLeader(%s) NEW LEASH MANEUVER", getAiShipController().getOwner()->getNetworkId().getValueString().c_str(), getAiShipController().isAttackSquadLeader() ? "yes" : "no"));
+
+		setDesiredPosition_w(linearInterpolate(getAiShipController().getOwnerPosition_w(), getAiShipController().getSquad().getLeashAnchorPosition_w(), 1.0f - getAiShipController().getPilotAggression() * 0.5f));
+
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled() && (getDesiredPosition_w() == Vector::zero), "debug_ai", ("AiManeuver_Leash() ERROR: Desired Leash position set to Vector::zero."));
+	}
+
+	virtual char const * const getFighterManeuverString() const;
+
+protected:
+
+	virtual bool alterInternal(float const timeDelta)
+	{
+		bool shouldContinue = Maneuver::alterInternal(timeDelta);
+
+		// See if we have leashed far enough back in
+
+		float const percentWithinLeashDistance = m_aiShipBehaviorAttack.getPercentWithinLeashDistance();
+		
+		if (percentWithinLeashDistance > 0.25f)
+		{
+			shouldContinue = false;
+
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiManeuver_Leash() owner(%s) LEASH BAILING - WE HAVE LEASHED FAR ENOUGH", getAiShipController().getOwner()->getNetworkId().getValueString().c_str()));
+		}
+
+		return shouldContinue;
+	}
+
+private:
+
+	AiManeuver_Leash(AiManeuver_Leash const &);
+	AiManeuver_Leash();
+	AiManeuver_Leash const & operator=(AiManeuver_Leash const & rhs);
+};
+
+// ----------------------------------------------------------------------
+
+char const * const AiManeuver_Leash::getFighterManeuverString() const
+{
+	return "LEASH";
+}
+
+//=======================================================================
+
+class AiManeuver_Evade : public AiShipBehaviorAttackFighter::Maneuver
+{
+public:
+
+	AiManeuver_Evade(AiShipBehaviorAttackFighter & aiShipBehaviorAttack, AiShipBehaviorAttackFighter::AiAttackTargetInformation const & targetInfo)
+	 : Maneuver(FM_evade, aiShipBehaviorAttack, targetInfo, aiShipBehaviorAttack.getAiShipController().getPilotData()->m_fighterEvadeMaxTime, true)
+	 , m_evadePositionUpdateTimer_w(getAiShipController().getPilotData()->m_fighterEvadePositionUpdateDelay)
+	 , m_evadePositionUpdateTimer_l(4.0f)
+	 , m_evadePosition_l()
+	 , m_forceGetBehindTarget((rand() % 2) == 0)
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiManeuver_Evade() owner(%s) isAttackSquadLeader(%s) NEW EVADE MANEUVER", getAiShipController().getOwner()->getNetworkId().getValueString().c_str(), getAiShipController().isAttackSquadLeader() ? "yes" : "no"));
+
+		calculateEvadePosition_l();
+		calculateDesiredPosition(0.0f);
+	}
+
+	virtual char const * const getFighterManeuverString() const;
+
+protected:
+	
+	bool alterInternal(float const timeDelta)
+	{
+		bool shouldContinue = true;
+
+		if (m_aiShipBehaviorAttack.isBehindTarget())
+		{
+			// If I am behind the target and and the target is moving fast enough, I need to turn around
+			// immediatelly to chase the target
+
+			float const ownerShipActualSpeedMaximum = getAiShipController().getShipOwner()->getShipActualSpeedMaximum();
+		
+			if (m_targetInfo.m_speed > (ownerShipActualSpeedMaximum * 0.9f))
+			{
+				// Stop evading so we can do a lag pursuit
+		
+				shouldContinue = false;
+			}
+		}
+
+		if (shouldContinue)
+		{
+			float const turnRadius = getAiShipController().getLargestTurnRadius();
+			float const weaponRange = getAiShipController().getAttackSquad().getProjectileAttackRange();
+
+			if (m_aiShipBehaviorAttack.getDistanceToTargetSquared() > sqr(weaponRange + turnRadius))
+			{
+				// We are far enough from the target to make an attack run, stop evading
+
+				shouldContinue = false;
+			}
+			else
+			{
+				if (m_forceGetBehindTarget)
+				{
+					if (m_targetInfo.m_inTargetsProjectileConeOfFire)
+					{
+						if (m_evadePositionUpdateTimer_l.updateZero(timeDelta))
+						{
+							// We have been targeted too much, change direction
+
+							m_evadePositionUpdateTimer_l.reset();
+							calculateEvadePosition_l();
+						}
+					}
+
+					if (m_evadePositionUpdateTimer_w.updateZero(timeDelta))
+					{
+						// Calculate a new evade position
+
+						m_evadePositionUpdateTimer_w.reset();
+						calculateDesiredPosition(timeDelta);
+					}
+				}
+				else if (m_targetInfo.m_inTargetsProjectileConeOfFire)
+				{
+					if (m_evadePositionUpdateTimer_l.updateZero(timeDelta))
+					{
+						// We have been targeted too much, change direction
+
+						m_evadePositionUpdateTimer_l.reset();
+						calculateEvadePosition_l();
+					}
+
+					if (m_evadePositionUpdateTimer_w.updateZero(timeDelta))
+					{
+						// Calculate a new evade position
+
+						m_evadePositionUpdateTimer_w.reset();
+						calculateDesiredPosition(timeDelta);
+					}
+				}
+			}
+		}
+
+		return shouldContinue;
+	}
+
+	virtual void alterThrottle(float const /*timeDelta*/)
+	{
+		if (isDesiredPositionBehindMe())
+		{
+			m_throttleValue = 0.5f;
+		}
+		else
+		{
+			m_throttleValue = 1.0f;
+		}
+	}
+
+private:
+
+	void calculateDesiredPosition(float const deltaSeconds)
+	{
+		ShipObject const * const primaryTargetShipObject = getAiShipController().getPrimaryAttackTargetShipObject();
+
+		if (primaryTargetShipObject!= NULL)
+		{
+			ShipController const * const targetShipController = primaryTargetShipObject->getController()->asShipController();
+
+			if (targetShipController != NULL)
+			{
+				Transform transform;
+				Vector velocity;
+
+				targetShipController->getApproximateFutureTransform(transform, velocity, deltaSeconds);
+
+				setDesiredPosition_w(transform.rotateTranslate_l2p(m_evadePosition_l));
+			}
+			else
+			{
+				setDesiredPosition_w(primaryTargetShipObject->getTransform_o2w().rotateTranslate_l2p(m_evadePosition_l));
+			}
+		}
+	}
+
+	void calculateEvadePosition_l()
+	{
+		// Calculate the evade position relative to the -z axis of the target
+
+		AiShipPilotData const & pilotData = *NON_NULL(getAiShipController().getPilotData());
+		Transform transform;
+
+		float const rollAngle = Random::randomReal() * PI_TIMES_2;
+		transform.roll_l(rollAngle);
+
+		float const halfEvadeAngle = Random::randomReal() * pilotData.m_fighterEvadeAngle * 0.5f;
+		transform.pitch_l(halfEvadeAngle);
+
+		float const x = 0.0f;
+		float const y = 0.0f;
+		float const z = -10000.0f;
+
+		m_evadePosition_l = transform.rotateTranslate_l2p(Vector(x, y, z));
+	}
+
+	Timer m_evadePositionUpdateTimer_w;
+	Timer m_evadePositionUpdateTimer_l;
+	Vector m_evadePosition_l;
+	bool m_forceGetBehindTarget;
+
+	AiManeuver_Evade(AiManeuver_Evade const &);
+	AiManeuver_Evade();
+	AiManeuver_Evade const & operator=(AiManeuver_Evade const & rhs);
+};
+
+// ----------------------------------------------------------------------
+
+char const * const AiManeuver_Evade::getFighterManeuverString() const
+{
+	return "EVADE";
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttackFighter::Maneuver * AiShipBehaviorAttackFighter::Maneuver::createManeuverChase(AiShipBehaviorAttackFighter & aiShipBehaviorAttack, AiAttackTargetInformation const & targetInfo)
+{
+	return new AiManeuver_Chase(aiShipBehaviorAttack, targetInfo);
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttackFighter::Maneuver * AiShipBehaviorAttackFighter::Maneuver::createManeuverEvade(AiShipBehaviorAttackFighter & aiShipBehaviorAttack, AiAttackTargetInformation const & targetInfo)
+{
+	return new AiManeuver_Evade(aiShipBehaviorAttack, targetInfo);
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorAttackFighter::Maneuver * AiShipBehaviorAttackFighter::Maneuver::createManeuverLeash(AiShipBehaviorAttackFighter & aiShipBehaviorAttack, AiAttackTargetInformation const & targetInfo)
+{
+	return new AiManeuver_Leash(aiShipBehaviorAttack, targetInfo);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.h b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.h
new file mode 100644
index 00000000..77436c40
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.h
@@ -0,0 +1,112 @@
+// ======================================================================
+//
+// AiShipBehaviorAttackFighter_Maneuver.h
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiShipBehaviorAttackFighter_Maneuver_H
+#define	INCLUDED_AiShipBehaviorAttackFighter_Maneuver_H
+
+// ======================================================================
+
+#include "serverGame/AiShipBehaviorAttackFighter.h"
+
+class AiShipController;
+
+//-----------------------------------------------------------------------
+
+class AiShipBehaviorAttackFighter::Maneuver
+{
+public:
+
+	enum FighterManeuver
+	{
+		FM_none,
+		FM_chase,
+		FM_evade,
+		FM_leash
+	};
+
+	enum ManeuverFlags
+	{
+		MF_targetInAttackRange			= 0x00000001,
+		MF_targetIsTooClose				= 0x00000002,
+		MF_missileLockedOnMe			= 0x00000004
+	};
+	
+	Maneuver(FighterManeuver fm, AiShipBehaviorAttackFighter & aiShipBehaviorAttack, AiAttackTargetInformation const & targetInfo, float const maxTime, bool updateThrottle = true);
+	virtual ~Maneuver();
+	
+	Vector const & getDesiredPosition_w() const;
+	void setDesiredPosition_w(Vector const & position);
+	
+	AiAttackTargetInformation const & getTargetInfo() const;
+
+	bool isDesiredPositionBehindMe() const;
+	
+	// Path management.
+	class Path;
+	typedef stdvector<Path*>::fwd PathList;
+	void addPath(Path * path);
+	Path * getCurrentPath();
+	bool selectNextPath();
+	Path * addEmptyPath();
+	int getCurrentPathIndex() const;
+	
+	// Return positive if it should continue.
+	virtual bool alter(float timeDelta, int stateFlags);
+	
+	virtual char const * const getFighterManeuverString() const = 0;
+	virtual FighterManeuver getFighterManeuver() const;
+	
+#ifdef _DEBUG
+	int getSequenceId() const;
+#endif // _DEBUG
+	
+	public:
+		static Maneuver * createManeuver(FighterManeuver const manueverType, AiShipBehaviorAttackFighter & aiShipBehaviorAttack, AiAttackTargetInformation const & targetInfo);
+		static Maneuver * createManeuverChase(AiShipBehaviorAttackFighter & aiShipBehaviorAttack, AiAttackTargetInformation const & targetInfo);
+		static Maneuver * createManeuverEvade(AiShipBehaviorAttackFighter & aiShipBehaviorAttack, AiAttackTargetInformation const & targetInfo);
+		static Maneuver * createManeuverLeash(AiShipBehaviorAttackFighter & aiShipBehaviorAttack, AiAttackTargetInformation const & targetInfo);
+		
+	protected:
+		virtual bool alterPath(float const timeDelta);
+		virtual void alterThrottle(float const timeDelta);
+		virtual bool alterInternal(float const timeDelta);
+		
+		virtual void modifyController(float const timeDelta);
+		
+		AiShipController & getAiShipController();
+		AiShipController const & getAiShipController() const;
+		
+		AiShipBehaviorAttackFighter & m_aiShipBehaviorAttack;
+		AiAttackTargetInformation const & m_targetInfo;
+		PathList * const m_pathList;
+		PathList::iterator m_currentPath;
+		int m_currentPathNode;
+		int m_abortFlags;
+		bool m_updateThrottle;
+		float m_throttleValue;
+		Vector m_desiredPosition_w;
+		FighterManeuver m_maneuverCategory; 
+		
+#ifdef _DEBUG
+		int m_sequenceId;
+#endif // _DEBUG
+		
+private:
+
+	Timer m_expirationTimer;
+
+	// Disabled
+
+	Maneuver();
+	Maneuver(Maneuver const &);
+	Maneuver const & operator=(Maneuver const & rhs);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_AiShipBehaviorAttackFighter_Maneuver_H
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.cpp
new file mode 100644
index 00000000..d510e0f7
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.cpp
@@ -0,0 +1,259 @@
+// ======================================================================
+//
+// AiShipBehaviorAttackFighter_Maneuver_Path.cpp
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiShipBehaviorAttackFighter_Maneuver_Path.h"
+
+#include "sharedMath/Range.h"
+#include "sharedMath/Vector.h"
+#include "sharedMath/Transform.h"
+#include "sharedRandom/Random.h"
+#include "sharedFoundation/Misc.h"
+
+#include <deque>
+
+// ======================================================================
+
+namespace AiShipBehaviorAttackFighter_Maneuver_Path
+{
+	// You must pass in an initialized transform.
+
+	void constructLookAtTransformation(Transform & objectTransform, Vector const & lookAtPosition)
+	{
+		Vector const upVector(objectTransform.getLocalFrameJ_p());
+		Vector const objectPosition(objectTransform.getPosition_p());
+
+		Vector k = lookAtPosition - objectPosition;
+		if (!k.normalize())
+			return;
+
+		Vector i = upVector.cross(k);
+		if (!i.normalize())
+			return;
+
+		k = i.cross(upVector);
+		if (!k.normalize())
+			return;
+
+		objectTransform.setLocalFrameIJK_p(i, upVector, k);
+	}
+}
+
+using namespace AiShipBehaviorAttackFighter_Maneuver_Path;
+
+// ======================================================================
+
+AiShipBehaviorAttackFighter::Maneuver::Path::Path() :
+m_nodeList(new NodeList)
+{
+
+}
+	
+//-----------------------------------------------------------------------
+	
+AiShipBehaviorAttackFighter::Maneuver::Path::~Path()
+{
+	delete m_nodeList;
+}
+
+//-----------------------------------------------------------------------
+
+bool AiShipBehaviorAttackFighter::Maneuver::Path::getNextNode(Index & currentIndex, Node & desiredPosition, Transform const & currentLocation, float const distanceTolerance) const
+{
+	bool hasNextNode = getNode(currentIndex, desiredPosition);
+	
+	if (hasNextNode)
+	{
+		if ((desiredPosition - currentLocation.getPosition_p()).magnitudeSquared() < sqr(distanceTolerance))
+		{
+			currentIndex++;
+		}
+	}
+
+	return hasNextNode;
+}
+
+
+//-----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::Maneuver::Path::addNode(Node const & node)
+{
+	m_nodeList->push_back(node);
+}
+
+//-----------------------------------------------------------------------
+
+bool AiShipBehaviorAttackFighter::Maneuver::Path::getNode(Index const & index, Node & node) const
+{
+	bool found = false;
+
+	if (!m_nodeList->empty() && index < static_cast<int>(m_nodeList->size()))
+	{
+		node = (*m_nodeList)[static_cast<const size_t>(index)];
+		found = true;
+	}
+	
+	return found;
+}
+
+//-----------------------------------------------------------------------
+
+AiShipBehaviorAttackFighter::Maneuver::Path * AiShipBehaviorAttackFighter::Maneuver::Path::createPath()
+{
+	return new Path;
+}
+
+//-----------------------------------------------------------------------
+
+AiShipBehaviorAttackFighter::Maneuver::Path * AiShipBehaviorAttackFighter::Maneuver::Path::createPath(
+	PathTypes const pathType,
+	float const complexity,
+	float const tension,
+	float const objectRadius,
+	float const turnRadius,
+	Transform const & startTransform,
+	Vector const & endPosition)
+{
+	float const pathLength = startTransform.getPosition_p().magnitudeBetween(endPosition);
+	
+	// Ensure the path length is > 1.
+	DEBUG_WARNING(pathLength < 1.0f, ("Path length must be >= 1.0"));
+
+	Transform transformToEnd(startTransform);
+	constructLookAtTransformation(transformToEnd, endPosition);
+
+	DEBUG_WARNING(objectRadius < 1.0f, ("objectRadius must be >= 1.0"));
+
+	// Create a path length.
+	float const totalPathLengthDesired = std::max(pathLength, 1.0f) + turnRadius + objectRadius;
+
+	// Ensure totalPathLength is > 1.
+	DEBUG_WARNING(totalPathLengthDesired < 1.0f, ("Total path length desired must be >= 1.0"));
+	float const totalPathLength = std::max(totalPathLengthDesired, 1.0f);
+
+	float const turnRadiusPlusObjectRadius = (turnRadius + objectRadius) * 0.5f;
+	DEBUG_WARNING(turnRadiusPlusObjectRadius < 1.0f, ("turnRadiusPlusObjectRadius must be >= 1.0"));
+
+	// Generate the inner and outer radii
+	float const pathRadiusMultiplier = (1.0f + tension - complexity) * 0.5f;
+	float const radius1 = totalPathLength * Random::randomReal(0.0f, pathRadiusMultiplier);
+	float const radius2 = totalPathLength * Random::randomReal(0.0f, pathRadiusMultiplier);
+	float const minTurns = std::min(radius1, radius2) / std::max(objectRadius, 1.0f);
+	float const maxTurns = std::max(radius1, radius2) / std::max(objectRadius, 1.0f);
+	float const turns = Random::randomReal(minTurns, maxTurns);
+
+	// 0 = straight, 1 = parabolic1, 2 = parabolic2
+	int const mode = Random::random(0, static_cast<int>(complexity));
+	
+	float const amp = Random::randomReal(0.0f, tension);
+	float const tms = Random::randomReal(0.0f, (tension + complexity) * 0.5f); // K
+	float const angle = Random::randomReal(PI_OVER_4, clamp(PI_OVER_4, PI_TIMES_2 * complexity, PI_TIMES_2));
+
+	Path * const path = NON_NULL(new Path);
+	Node node;
+
+	unsigned const int ncvs = static_cast<unsigned int>(totalPathLength / std::max(turnRadiusPlusObjectRadius, 1.0f)); // Number of CVs
+
+	float const ooHeight = 1.0f / totalPathLength;
+	float const sqrHeight = sqr(totalPathLength);
+	float const ooSqrHeight = 1.0f / sqrHeight;
+	
+	for (unsigned i = 0; i < ncvs; i++)
+	{   
+		node.z = static_cast<float>(i) * static_cast<float>(turnRadiusPlusObjectRadius);
+		float const tInterpolation = node.z * ooHeight;
+		
+		float t0 = amp * sinf((tms * tInterpolation) + angle);
+		float t1 = 0.0f;
+
+		switch(mode) 
+		{
+			case 0: 
+				t1 = node.z * ooHeight; 
+				break;
+
+			case 1: 
+				t1 = sqr(node.z) * ooSqrHeight; 
+				break;
+			default:
+			case 2: 
+				t1 = sqrtf(node.z * ooHeight); 
+				break;
+		}
+
+		float const t0t1Interpolant = t0 * (radius1 - (radius1 - radius2) * t1);
+		float const offset = (node.z * turns * 2.0f * PI) * ooHeight;
+
+		node.x = t0t1Interpolant * cosf(offset);
+		node.y = t0t1Interpolant * sinf(offset);
+
+		if (PT_loop == pathType)
+		{
+			Node const & loopNode = cubicInterpolate(transformToEnd.rotateTranslate_l2p(node), startTransform.getPosition_p(), tInterpolation);
+			path->addNode(loopNode);
+		}
+		else
+		{
+			path->addNode(transformToEnd.rotateTranslate_l2p(node));
+		}
+	}
+
+
+	return path;
+}
+
+//-----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::Maneuver::Path::deletePath(AiShipBehaviorAttackFighter::Maneuver::Path * path)
+{
+	delete path;
+}
+
+//-----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::Maneuver::Path::clearNodes()
+{
+	m_nodeList->clear();
+}
+
+//-----------------------------------------------------------------------
+
+void AiShipBehaviorAttackFighter::Maneuver::Path::popFrontNode()
+{
+	m_nodeList->pop_front();
+}
+
+//-----------------------------------------------------------------------
+
+bool AiShipBehaviorAttackFighter::Maneuver::Path::isEmpty() const
+{
+	return m_nodeList->empty();
+}
+
+//-----------------------------------------------------------------------
+
+bool AiShipBehaviorAttackFighter::Maneuver::Path::getFrontNode(Node & node) const
+{
+	bool success = !m_nodeList->empty();
+	
+	if (success)
+	{
+		node = m_nodeList->front();
+	}
+
+	return success;
+}
+
+//-----------------------------------------------------------------------
+
+int AiShipBehaviorAttackFighter::Maneuver::Path::getLength() const
+{
+	return static_cast<int>(m_nodeList->size());
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.h b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.h
new file mode 100644
index 00000000..f41594ae
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.h
@@ -0,0 +1,67 @@
+// ======================================================================
+//
+// AiShipBehaviorAttackFighter_Maneuver_Path.h
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef INCLUDED_AiShipBehaviorAttackFighter_Maneuver_Path_H
+#define INCLUDED_AiShipBehaviorAttackFighter_Maneuver_Path_H
+
+#include "serverGame/AiShipBehaviorAttackFighter_Maneuver.h"
+
+class Transform;
+
+// ======================================================================
+
+class AiShipBehaviorAttackFighter::Maneuver::Path
+{
+public:
+	typedef Vector Node;
+	typedef int Index;
+
+	enum PathTypes
+	{
+		PT_empty,
+		PT_first,
+		PT_helix = PT_first,
+		PT_loop, // guarantees final point of the generated "createPath" path is the endPosition
+		PT_last = PT_loop,
+		PT_count = PT_last
+	};
+
+	bool getNextNode(Index & currentIndex, Node & desiredPosition, Transform const & currentLocation, float const distanceTolerance) const;
+	void addNode(Node const & node);
+	bool getNode(Index const & index, Node & node) const;
+	bool getFrontNode(Node & node) const;
+	bool isEmpty() const;
+	void popFrontNode();
+	void clearNodes();
+	int getLength() const;
+
+	static Path * createPath(PathTypes const pathType,				// Selects the path type.
+								float const complexity, 			// Complexity of the path. (skill)
+								float const tension,				// How tight the path follows control points. (aggresiveness)
+								float const objectRadius,			// The size of the thing moving through the paths.
+								float const turnRadius,
+								Transform const & startXForm,		// Starting position of the path.
+								Vector const & endPosition);
+
+	static Path * createPath();
+
+	static void deletePath(Path * path);
+
+private:
+	Path();
+	virtual ~Path();
+
+	typedef stddeque<Node>::fwd NodeList;
+	NodeList * const m_nodeList;
+
+private: // Disabled.
+	Path(Path const &);
+	Path &operator=(Path const &);
+};
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorBase.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorBase.cpp
new file mode 100644
index 00000000..38c78019
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorBase.cpp
@@ -0,0 +1,93 @@
+// ======================================================================
+//
+// AiShipBehaviorBase.cpp
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiShipBehaviorBase.h"
+
+#include "serverGame/AiShipController.h"
+#include "serverGame/SpaceSquad.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedGame/AiDebugString.h"
+#include "sharedObject/Object.h"
+
+// ======================================================================
+//
+// AiShipBehaviorBase
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorBase::AiShipBehaviorBase(AiShipController & aiShipController)
+ : m_aiShipController(aiShipController)
+{
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorBase::AiShipBehaviorBase(AiShipBehaviorBase const & rhs)
+ : m_aiShipController(rhs.m_aiShipController)
+{
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorBase::~AiShipBehaviorBase()
+{
+}
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorType AiShipBehaviorBase::getBehaviorType() const
+{
+	return ASBT_invalid;
+}
+
+// ----------------------------------------------------------------------
+
+char const * AiShipBehaviorBase::getBehaviorString(AiShipBehaviorType const behavior)
+{
+	switch (behavior)
+	{
+		case ASBT_idle: { return "IDLE"; }
+		case ASBT_track: { return "TRACK"; }
+		case ASBT_moveTo: { return "MOVETO"; }
+		case ASBT_patrol: { return "PATROL"; }
+		case ASBT_follow: { return "FOLLOW"; }
+		case ASBT_dock: { return "DOCK"; }
+		case ASBT_invalid:
+		default: break;
+	}
+
+	return "INVALID";
+}
+
+// ----------------------------------------------------------------------
+
+AiShipController & AiShipBehaviorBase::getAiShipController()
+{
+	return m_aiShipController;
+}
+
+// ----------------------------------------------------------------------
+
+AiShipController const & AiShipBehaviorBase::getAiShipController() const
+{
+	return m_aiShipController;
+}
+
+#ifdef _DEBUG
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorBase::addDebug(AiDebugString & aiDebugString)
+{
+	aiDebugString.addText(FormattedString<512>().sprintf("%s\n", getBehaviorString(getBehaviorType())), PackedRgb::solidCyan);
+}
+#endif // _DEBUG
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorBase.h b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorBase.h
new file mode 100644
index 00000000..bc00bb83
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorBase.h
@@ -0,0 +1,67 @@
+// ======================================================================
+//
+// AiShipBehaviorBase.h
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef INCLUDED_AiShipBehaviorBase_H
+#define INCLUDED_AiShipBehaviorBase_H
+
+class AiDebugString;
+class AiShipController;
+
+// ----------
+// duped in ship_ai.scriptlib
+
+enum AiShipBehaviorType
+{
+	ASBT_idle = 0,
+	ASBT_track,
+	ASBT_moveTo,
+	ASBT_patrol,
+	ASBT_follow,
+	ASBT_dock,
+	ASBT_invalid
+};
+
+// ======================================================================
+
+class AiShipBehaviorBase
+{
+public:
+
+	static char const * getBehaviorString(AiShipBehaviorType const behavior);
+
+public:
+
+	explicit AiShipBehaviorBase(AiShipController & aiShipController);
+	AiShipBehaviorBase(AiShipBehaviorBase const & rhs);
+	virtual ~AiShipBehaviorBase() = 0;
+	
+	virtual void alter(float deltaSeconds) = 0;
+
+	virtual AiShipBehaviorType getBehaviorType() const;
+
+	AiShipController & getAiShipController();
+	AiShipController const & getAiShipController() const;
+
+#ifdef _DEBUG
+	virtual void addDebug(AiDebugString & aiDebugString);
+#endif // _DEBUG
+
+protected:
+
+	AiShipController & m_aiShipController;
+
+private:
+
+	// Disabled
+	AiShipBehaviorBase();
+	AiShipBehaviorBase &operator =(AiShipBehaviorBase const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_AiShipBehaviorBase_H
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorDock.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorDock.cpp
new file mode 100644
index 00000000..e8c1aede
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorDock.cpp
@@ -0,0 +1,688 @@
+// ======================================================================
+//
+// AiShipBehaviorDock.cpp
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiShipBehaviorDock.h"
+
+#include "serverGame/AiShipController.h"
+#include "serverGame/AiShipPilotData.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/SpaceDockingManager.h"
+#include "serverGame/SpaceSquad.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedCollision/BaseExtent.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedCollision/SpaceAvoidanceManager.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedGame/AiDebugString.h"
+#include "sharedGame/CollisionCallbackManager.h"
+#include "sharedLog/Log.h"
+#include "sharedMath/AxialBox.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedObject/Appearance.h"
+#include "sharedObject/NetworkIdManager.h"
+
+// ======================================================================
+//
+// AiShipBehaviorDockNamespace
+//
+// ======================================================================
+
+namespace AiShipBehaviorDockNamespace
+{
+	float s_tractorBeamErrorDistance = 1.0f;
+}
+
+using namespace AiShipBehaviorDockNamespace;
+
+// ======================================================================
+//
+// AiShipBehaviorDock
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+AiShipBehaviorDock::AiShipBehaviorDock(ShipController & shipController, ShipObject & dockTarget, float const secondsAtDock)
+ : m_shipController(shipController)
+ , m_dockTarget(dockTarget)
+ , m_timeAtDockTimer(secondsAtDock)
+ , m_approachHardPointList(new HardPointList)
+ , m_initialApproachHardPointCount(0)
+ , m_exitHardPointList(new HardPointList)
+ , m_dockHardPoint()
+ , m_landingHardPoint()
+ , m_hasLandingHardPoint(shipController.getOwner()->getAppearance()->findHardpoint(TemporaryCrcString("landing1", false), m_landingHardPoint))
+ , m_dockingState(DS_approach)
+ , m_dockingStateTime(0.0f)
+ , m_infiniteDockTime(secondsAtDock < 0.0f)
+ , m_dockFinished(false)
+ , m_goalPosition_w()
+ , m_wingsOpenedBeforeDock(m_shipController.getShipOwner()->hasWings() && m_shipController.getShipOwner()->wingsOpened())
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock: [1/6] unit(%s) dockTarget(%s) secondsAtDock(%.2f) landingHardPoint(%s)", (shipController.getOwner() != NULL) ? shipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner", dockTarget.getNetworkId().getValueString().c_str(), secondsAtDock, m_hasLandingHardPoint ? "yes" : "no"));
+
+	if (m_shipController.isBeingDocked())
+	{
+		DEBUG_WARNING(true, ("debug_ai: AiShipBehaviorDock() unit(%s) dockTarget(%s) ERROR: We can't dock with someone if we are currently being docked.", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str()));
+
+		// Fail the docking
+
+		m_dockTarget = CachedNetworkId::cms_cachedInvalid;
+	}
+
+	if (m_shipController.getOwner()->getNetworkId() == dockTarget.getNetworkId())
+	{
+		DEBUG_WARNING(true, ("debug_ai: AiShipBehaviorDock() unit(%s) dockTarget(%s) ERROR: Why is the ship trying to dock with itself?", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str()));
+
+		// Fail the docking
+
+		m_dockTarget = CachedNetworkId::cms_cachedInvalid;
+	}
+
+	if (m_dockTarget != CachedNetworkId::cms_cachedInvalid)
+	{
+		SpaceDockingManager::fetchDockingProcedure(*m_shipController.getOwner(), dockTarget, m_dockHardPoint, *m_approachHardPointList, *m_exitHardPointList);
+	}
+
+	if (   (m_dockTarget != CachedNetworkId::cms_cachedInvalid)
+	    && m_approachHardPointList->empty())
+	{
+		DEBUG_WARNING(true, ("debug_ai: AiShipBehaviorDock() unit(%s) dockTarget(%s) ERROR Why is the approach hard point list empty?", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str()));
+
+		// Fail the docking
+
+		SpaceDockingManager::releaseDockingProcedure(m_shipController.getOwner()->getNetworkId(), m_dockTarget);
+		m_dockTarget = CachedNetworkId::cms_cachedInvalid;
+	}
+
+	if (   (m_dockTarget != CachedNetworkId::cms_cachedInvalid)
+	    && m_exitHardPointList->empty())
+	{
+		DEBUG_WARNING(true, ("debug_ai: AiShipBehaviorDock() unit(%s) dockTarget(%s) ERROR Why is the exit hard point list empty?", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str()));
+
+		// Fail the docking
+
+		SpaceDockingManager::releaseDockingProcedure(m_shipController.getOwner()->getNetworkId(), m_dockTarget);
+		m_dockTarget = CachedNetworkId::cms_cachedInvalid;
+	}
+
+	if (m_dockTarget != CachedNetworkId::cms_cachedInvalid)
+	{
+		// Notify the ship that we want to dock with it
+
+		ShipController * const dockTargetShipController = dockTarget.getController()->asShipController();
+
+		if (dockTargetShipController != NULL)
+		{
+			dockTargetShipController->addDockedBy(*shipController.getOwner());
+		}
+		else
+		{
+			DEBUG_WARNING(true, ("debug_ai: AiShipBehaviorDock() ERROR: Why does this dockTarget(%s) not have a ship controller?", dockTarget.getDebugInformation().c_str()));
+
+			// Fail the docking
+
+			SpaceDockingManager::releaseDockingProcedure(m_shipController.getOwner()->getNetworkId(), m_dockTarget);
+			m_dockTarget = CachedNetworkId::cms_cachedInvalid;
+		}
+	}
+
+	if (m_dockTarget != CachedNetworkId::cms_cachedInvalid)
+	{
+		// Turn off collision for the auth-client at this point
+
+		if (m_shipController.getShipOwner()->isPlayerShip())
+		{
+			m_shipController.appendMessage(CM_addIgnoreIntersect, 0.0f, new MessageQueueGenericValueType<NetworkId>(m_dockTarget), GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+		}
+	}
+
+	m_initialApproachHardPointCount = static_cast<int>(m_approachHardPointList->size());
+
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock() unit(%s) dockTarget(%s) approachHardPointCount(%u) exitHardPointCount(%u)", (shipController.getOwner() != NULL) ? shipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner", dockTarget.getNetworkId().getValueString().c_str(), m_approachHardPointList->size(), m_exitHardPointList->size()));
+}
+
+// ----------------------------------------------------------------------
+AiShipBehaviorDock::~AiShipBehaviorDock()
+{
+	ShipObject * const ownerShipObject = m_shipController.getShipOwner();
+
+	// Open the wings
+
+	if (   (ownerShipObject != NULL)
+	    && m_wingsOpenedBeforeDock)
+	{
+		m_shipController.getShipOwner()->openWings();
+	}
+
+	// Turn collision back on
+
+	if (m_dockTarget != CachedNetworkId::cms_cachedInvalid)
+	{
+		CollisionCallbackManager::removeIgnoreIntersect(m_shipController.getOwner()->getNetworkId(), m_dockTarget);
+		
+		if (    (ownerShipObject != NULL)
+		     && ownerShipObject->isPlayerShip())
+		{
+			m_shipController.appendMessage(CM_removeIgnoreIntersect, 0.0f, new MessageQueueGenericValueType<NetworkId>(m_dockTarget), GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+		}
+	}
+
+	// Notify the dock target that we are done docking with it
+
+	Object * const dockTarget = m_dockTarget.getObject();
+
+	if (dockTarget != NULL)
+	{
+		ShipController * const dockTargetShipController = dockTarget->getController()->asShipController();
+
+		if (dockTargetShipController != NULL)
+		{
+			dockTargetShipController->removeDockedBy(*m_shipController.getOwner());
+		}
+	}
+
+	delete m_approachHardPointList;
+	delete m_exitHardPointList;
+}
+
+// ----------------------------------------------------------------------
+void AiShipBehaviorDock::alter(float deltaSeconds)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiShipBehaviorDock::alter");
+
+	bool abortDocking = false;
+
+	if (m_dockTarget.getObject() == NULL)
+	{
+		// If we lose the dock target, fail the docking procedure.
+
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock::alter() unit(%s) dockTarget(%s) DOCK TARGET LOST...UNDOCKING", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str()));
+		abortDocking = true;
+	}
+	else
+	{
+		// If the dock target is an AI ship and it begins attacking, stop the docking procedure.
+
+		AiShipController * const dockTargetAiShipController = AiShipController::asAiShipController(m_dockTarget.getObject()->getController());
+
+		if (   (dockTargetAiShipController != NULL)
+			&& dockTargetAiShipController->isAttacking())
+		{
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock::alter() unit(%s) dockTarget(%s) DOCK TARGET IS ATTACKING...UNDOCKING", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str()));
+			abortDocking = true;
+		}
+	}
+
+	if (abortDocking)
+	{
+		if (m_timeAtDockTimer.isExpired())
+		{
+			triggerUnDockWithSuccess();
+		}
+		else
+		{
+			triggerUnDockWithFailure();
+		}
+	}
+	else
+	{
+		// Continue docking
+
+		m_dockingStateTime += deltaSeconds;
+
+		switch (m_dockingState)
+		{
+			case DS_approach: { approach(deltaSeconds); } break;
+			case DS_approachTractorBeam: { approachTractorBeam(deltaSeconds); } break;
+			case DS_landing: { landing(deltaSeconds); } break;
+			case DS_docked: { docked(deltaSeconds); } break;
+			case DS_exitTractorBeam: { unDock(deltaSeconds); } break;
+			default: { FATAL(true, ("Unexpected docking procedure")); } break;
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiShipBehaviorDock::approach(float const deltaSeconds)
+{
+	setApproachPosition();
+
+	float const distanceToGoalSquared = m_shipController.getOwner()->getPosition_w().magnitudeBetweenSquared(m_goalPosition_w);
+	float const turnRadius = m_shipController.getLargestTurnRadius();
+
+	if (distanceToGoalSquared <= sqr(turnRadius))
+	{
+		// Start the approach tractor beam
+
+		m_dockingState = DS_approachTractorBeam;
+
+		// Turn off collision
+
+		CollisionCallbackManager::addIgnoreIntersect(m_shipController.getOwner()->getNetworkId(), m_dockTarget);
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock: [2/6] unit(%s) dockTarget(%s) TRACTOR BEAM", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str()));
+	}
+	else
+	{
+		// Move the unit towards the first approach position
+
+		m_shipController.setThrottle(1.0f);
+
+		Vector resultAvoidancePosition_w;
+		Vector const & shipVelocity = m_shipController.getShipOwner()->getCurrentVelocity_p();
+		
+		if (SpaceAvoidanceManager::getAvoidancePosition(*m_shipController.getOwner(), shipVelocity, m_goalPosition_w, resultAvoidancePosition_w))
+		{
+			IGNORE_RETURN(m_shipController.face(resultAvoidancePosition_w, deltaSeconds));
+		}
+		else
+		{
+			IGNORE_RETURN(m_shipController.face(m_goalPosition_w, deltaSeconds));
+		}
+	}
+
+	// Close the wings
+
+	if (m_wingsOpenedBeforeDock)
+	{
+		m_shipController.getShipOwner()->closeWings();
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiShipBehaviorDock::approachTractorBeam(float const deltaSeconds)
+{
+	m_shipController.setThrottle(0.0f);
+
+	setApproachPosition();
+
+	Vector const & ownerPosition_w = m_shipController.getOwner()->getPosition_w();
+	float const distanceToGoalSquared = ownerPosition_w.magnitudeBetweenSquared(m_goalPosition_w);
+
+	if (   m_approachHardPointList->empty()
+	    && (distanceToGoalSquared < sqr(s_tractorBeamErrorDistance)))
+	{
+		if (alignWithDock(deltaSeconds))
+		{
+			// Start the landing tractor beam
+
+			m_dockingState = DS_landing;
+
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock: [3/6] unit(%s) dockTarget(%s) LANDING", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str()));
+		}
+	}
+	else
+	{
+		if (distanceToGoalSquared < sqr(s_tractorBeamErrorDistance))
+		{
+			Vector const forward_w(m_dockTarget.getObject()->rotateTranslate_o2w(m_approachHardPointList->back().rotateTranslate_l2p(Vector(100000.0f, 0.0f, 0.0f))));
+			Vector const up_w(m_dockTarget.getObject()->rotateTranslate_o2w(m_approachHardPointList->back().rotateTranslate_l2p(Vector(0.0f, 0.0f, -100000.0f))));
+
+			if (m_shipController.face(forward_w, up_w, deltaSeconds))
+			{
+				// Move to the next approach point
+
+				if (!m_approachHardPointList->empty())
+				{
+					m_approachHardPointList->pop_back();
+				}
+			}
+		}
+		else
+		{
+			bool const allowOrientation = (m_initialApproachHardPointCount == static_cast<int>(m_approachHardPointList->size()));
+			tractorBeamToGoalPosition(deltaSeconds, allowOrientation);
+
+			if (allowOrientation)
+			{
+				IGNORE_RETURN(m_shipController.face(m_goalPosition_w, deltaSeconds));
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiShipBehaviorDock::landing(float const deltaSeconds)
+{
+	m_shipController.setThrottle(0.0f);
+	setDockPosition();
+
+	Vector const & ownerPosition_w = m_shipController.getOwner()->getPosition_w();
+	float const distanceToGoalSquared = ownerPosition_w.magnitudeBetweenSquared(m_goalPosition_w);
+
+	if (distanceToGoalSquared < sqr(s_tractorBeamErrorDistance))
+	{
+		triggerDocked();
+	}
+
+	if (m_dockingState == DS_landing)
+	{
+		bool const allowOrientation = false;
+		tractorBeamToGoalPosition(deltaSeconds, allowOrientation);
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiShipBehaviorDock::docked(float const deltaSeconds)
+{
+	m_shipController.setThrottle(0.0f);
+
+	// Run the dock timer
+
+	if (   !m_infiniteDockTime
+	    && m_timeAtDockTimer.updateNoReset(deltaSeconds))
+	{
+		triggerStartUnDock();
+		unDock();
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiShipBehaviorDock::unDock(float const deltaSeconds)
+{
+	if (!m_exitHardPointList->empty())
+	{
+		setExitPosition();
+	}
+
+	// Lerp the ship to the goal position
+
+	Vector const & ownerPosition_w = m_shipController.getOwner()->getPosition_w();
+	float const distanceToGoalSquared = ownerPosition_w.magnitudeBetweenSquared(m_goalPosition_w);
+
+	if (distanceToGoalSquared < sqr(s_tractorBeamErrorDistance))
+	{
+		if (m_exitHardPointList->empty())
+		{
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock: [6/6] unit(%s) dockTarget(%s) UNDOCKED", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str()));
+
+			if (m_timeAtDockTimer.isExpired())
+			{
+				triggerUnDockWithSuccess();
+			}
+			else
+			{
+				// The docking was stopped prematurely
+
+				triggerUnDockWithFailure();
+			}
+
+			m_dockFinished = true;
+		}
+		else
+		{
+			m_exitHardPointList->pop_front();
+		}
+	}
+
+	if (m_dockingState == DS_exitTractorBeam)
+	{
+		bool const allowOrientation = false;
+		tractorBeamToGoalPosition(deltaSeconds, allowOrientation);
+	}
+}
+
+// ----------------------------------------------------------------------
+bool AiShipBehaviorDock::alignWithDock(float const deltaSeconds)
+{
+	CollisionProperty const * const ownerCollisionProperty = NON_NULL(m_shipController.getOwner()->getCollisionProperty());
+	AxialBox const ownerAxialBox = ownerCollisionProperty->getExtent_l()->getBoundingBox();
+	Vector forward_l;
+	Vector up_l;
+	float const width = ownerAxialBox.getWidth();
+	float const height = ownerAxialBox.getHeight();
+	float const depth = ownerAxialBox.getDepth();
+
+	if (   (width < height)
+		&& (width < depth))
+	{
+		forward_l = Vector::unitX;
+		up_l = Vector::unitY;
+	}
+	else if (height <= depth)
+	{
+		forward_l = Vector::unitX;
+		up_l = -Vector::unitZ;
+	}
+	else
+	{
+		forward_l = Vector::unitZ;
+		up_l = Vector::unitY;
+	}
+
+	Vector const forward_w(m_dockTarget.getObject()->rotateTranslate_o2w(m_dockHardPoint.rotateTranslate_l2p(forward_l * 100000.0f)));
+	Vector const up_w(m_dockTarget.getObject()->rotateTranslate_o2w(m_dockHardPoint.rotateTranslate_l2p(up_l * 100000.0f)));
+	return m_shipController.face(forward_w, up_w, deltaSeconds);
+}
+
+// ----------------------------------------------------------------------
+bool AiShipBehaviorDock::isDocked() const
+{
+	return (m_dockingState == DS_docked);
+}
+
+// ----------------------------------------------------------------------
+void AiShipBehaviorDock::triggerDocked()
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock: [4/6] unit(%s) dockTarget(%s) timeAtDock(%.2f) DOCKED", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str(), m_timeAtDockTimer.getExpireTime()));
+
+	m_dockingState = DS_docked;
+	m_dockingStateTime = 0.0f;
+
+	GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(m_shipController.getOwner());
+
+	if(gameScriptObject != NULL)
+	{
+		ScriptParams scriptParams;
+		scriptParams.addParam(m_dockTarget);
+		IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_SPACE_UNIT_DOCKED, scriptParams));
+
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock::triggerDocked() unit(%s) dockTarget(%s)", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str()));
+	}
+	else
+	{
+		DEBUG_WARNING(true, ("debug_ai: AiShipBehaviorDock::triggerDocked() ERROR: Unable to get the ScriptObject for this object(%s)", m_shipController.getOwner()->getDebugInformation().c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiShipBehaviorDock::triggerStartUnDock()
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock: [5/6] unit(%s) dockTarget(%s) START UNDOCK", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str()));
+
+	GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(m_shipController.getOwner());
+
+	if(gameScriptObject != NULL)
+	{
+		ScriptParams scriptParams;
+		scriptParams.addParam(m_dockTarget);
+		IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_SPACE_UNIT_START_UNDOCK, scriptParams));
+
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock::triggerStartUnDock() unit(%s) dockTarget(%s)", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str()));
+	}
+	else
+	{
+		DEBUG_WARNING(true, ("debug_ai: AiShipBehaviorDock::triggerStartUnDock() ERROR: Unable to get the ScriptObject for this object(%s)", m_shipController.getOwner()->getDebugInformation().c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiShipBehaviorDock::triggerUnDockWithSuccess()
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock::triggerUnDockWithSuccess() unit(%s) dockTarget(%s)", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str()));
+
+	GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(m_shipController.getOwner());
+
+	if(gameScriptObject != NULL)
+	{
+		ScriptParams scriptParams;
+		scriptParams.addParam(m_dockTarget);
+		scriptParams.addParam(true);
+		IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_SPACE_UNIT_UNDOCKED, scriptParams));
+	}
+	else
+	{
+		DEBUG_WARNING(true, ("debug_ai: AiShipBehaviorDock::triggerUnDockWithSuccess() ERROR: Unable to get the ScriptObject for this object(%s)", m_shipController.getOwner()->getDebugInformation().c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiShipBehaviorDock::triggerUnDockWithFailure()
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock::triggerUnDockWithFailure() unit(%s) dockTarget(%s)", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str()));
+
+	m_dockFinished = true;
+
+	GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(m_shipController.getOwner());
+
+	if(gameScriptObject != NULL)
+	{
+		ScriptParams scriptParams;
+		scriptParams.addParam(m_dockTarget);
+		scriptParams.addParam(false);
+		IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_SPACE_UNIT_UNDOCKED, scriptParams));
+	}
+	else
+	{
+		DEBUG_WARNING(true, ("debug_ai: AiShipBehaviorDock::triggerUnDockWithFailure() ERROR: Unable to get the ScriptObject for this object(%s)", m_shipController.getOwner()->getDebugInformation().c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiShipBehaviorDock::unDock()
+{
+	// If the ship was still getting to the approach point, immediatelly fail the dock, if the ship was in the middle of the docking procedure, send the ship out the exit path and release it
+
+	if (m_dockingState == DS_approach)
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock::unDock() unit(%s) dockTarget(%s) ABORTING IMMEDIATELLY", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str()));
+
+		triggerUnDockWithFailure();
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock::unDock() unit(%s) dockTarget(%s) GOING TO EXIT PATH", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str()));
+
+		m_dockingState = DS_exitTractorBeam;
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiShipBehaviorDock::setApproachPosition()
+{
+	if (!m_approachHardPointList->empty())
+	{
+		Transform const & transform = m_approachHardPointList->back();
+
+		m_goalPosition_w = m_dockTarget.getObject()->rotateTranslate_o2w(transform.getPosition_p());
+	}
+}
+
+// ----------------------------------------------------------------------
+void AiShipBehaviorDock::setDockPosition()
+{
+	m_goalPosition_w = m_dockTarget.getObject()->rotateTranslate_o2w(m_dockHardPoint.getPosition_p());
+}
+
+// ----------------------------------------------------------------------
+void AiShipBehaviorDock::setExitPosition()
+{
+	if (!m_exitHardPointList->empty())
+	{
+		m_goalPosition_w = m_dockTarget.getObject()->rotateTranslate_o2w(m_exitHardPointList->front().getPosition_p());
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorDock::setExitPosition() unit(%s) dockTarget(%s) Why is the exit hard point list empty?", m_shipController.getOwner()->getDebugInformation().c_str(), m_dockTarget.getValueString().c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+bool AiShipBehaviorDock::isDockFinished() const
+{
+	return m_dockFinished;
+}
+
+// ----------------------------------------------------------------------
+CachedNetworkId const & AiShipBehaviorDock::getDockTarget() const
+{
+	return m_dockTarget;
+}
+
+// ----------------------------------------------------------------------
+float AiShipBehaviorDock::getMaxTractorBeamSpeed() const
+{
+	float const shipActualSpeedMaximum = m_shipController.getShipOwner()->getShipActualSpeedMaximum();
+	AiShipController * const aiShipController = m_shipController.asAiShipController();
+
+	return (aiShipController != NULL) ? (shipActualSpeedMaximum * aiShipController->getPilotData()->m_nonCombatMaxSpeedPercent) : shipActualSpeedMaximum;
+}
+
+// ----------------------------------------------------------------------
+void AiShipBehaviorDock::tractorBeamToGoalPosition(float const deltaSeconds, bool const allowOrientation)
+{
+	// Lerp the ship to the goal position, but only as fast as the ship can actually move
+
+	float const maxTractorBeamSpeed = getMaxTractorBeamSpeed() * deltaSeconds;
+
+	// See if we are close enough to the goal position
+
+	Vector const & ownerPosition_w = m_shipController.getOwner()->getPosition_w();
+
+	if (ownerPosition_w.magnitudeBetween(m_goalPosition_w) <= maxTractorBeamSpeed)
+	{
+		m_shipController.setPosition_w(m_goalPosition_w, allowOrientation);
+	}
+	else
+	{
+		// Still tractor beaming towards the goal position
+
+		Vector directionToGoalPosition(m_goalPosition_w - ownerPosition_w);
+		directionToGoalPosition.normalize();
+		Vector const newPosition(ownerPosition_w + (directionToGoalPosition * maxTractorBeamSpeed));
+	
+		m_shipController.setPosition_w(newPosition, allowOrientation);
+	}
+}
+
+#ifdef _DEBUG
+// ----------------------------------------------------------------------
+char const * AiShipBehaviorDock::getDockingStateString(DockingState const dockingState)
+{
+	switch (dockingState)
+	{
+		case DS_approach: { return "APPROACH"; }
+		case DS_approachTractorBeam: { return "APPROACH TRACTOR BEAM"; }
+		case DS_landing: { return "LANDING"; }
+		case DS_docked: { return "DOCKED"; }
+		case DS_exitTractorBeam: { return "EXIT TRACTOR BEAM"; }
+		default: break;
+	};
+
+	return "";
+}
+
+// ----------------------------------------------------------------------
+void AiShipBehaviorDock::addDebug(AiDebugString & aiDebugString)
+{
+	aiDebugString.addText(FormattedString<512>().sprintf("DOCKING[%s]\n", getDockingStateString(m_dockingState)), PackedRgb::solidCyan);
+
+	aiDebugString.addLineToPosition(m_goalPosition_w, PackedRgb::solidCyan);
+
+	if (m_dockTarget.getObject() != NULL)
+	{
+		Transform transform;
+		transform.multiply(m_dockTarget.getObject()->getTransform_o2w(), m_dockHardPoint);
+		aiDebugString.addAxis(transform, 40.0f);
+	}
+}
+#endif // _DEBUG
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorDock.h b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorDock.h
new file mode 100644
index 00000000..a3fcde7b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorDock.h
@@ -0,0 +1,98 @@
+// ======================================================================
+//
+// AiShipBehaviorDock.h
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiShipBehaviorDock_H
+#define	INCLUDED_AiShipBehaviorDock_H
+
+#include "sharedFoundation/Timer.h"
+#include "sharedMath/Transform.h"
+#include "sharedMath/Vector.h"
+#include "sharedObject/CachedNetworkId.h"
+
+class AiDebugString;
+class NetworkId;
+class ShipController;
+class ShipObject;
+
+// ======================================================================
+
+class AiShipBehaviorDock
+{
+public:
+
+	AiShipBehaviorDock(ShipController & shipController, ShipObject & dockTarget, float const secondsAtDock);
+	~AiShipBehaviorDock();
+
+	void alter(float deltaSeconds);
+	bool isDocked() const;
+	void unDock();
+	bool isDockFinished() const;
+	CachedNetworkId const & getDockTarget() const;
+
+#ifdef _DEBUG
+	void addDebug(AiDebugString & aiDebugString);
+#endif // _DEBUG
+
+private:
+
+	enum DockingState
+	{
+		DS_approach,
+		DS_approachTractorBeam,
+		DS_landing,
+		DS_docked,
+		DS_exitTractorBeam
+	};
+
+#ifdef _DEBUG
+	static char const * getDockingStateString(DockingState const dockingState);
+#endif // _DEBUG
+
+	typedef stdlist<Transform>::fwd HardPointList;
+
+	ShipController & m_shipController;
+	CachedNetworkId m_dockTarget;
+	Timer m_timeAtDockTimer;
+	HardPointList * const m_approachHardPointList;
+	int m_initialApproachHardPointCount;
+	HardPointList * const m_exitHardPointList;
+	Transform m_dockHardPoint;
+	Transform m_landingHardPoint;
+	bool m_hasLandingHardPoint;
+	DockingState m_dockingState;
+	float m_dockingStateTime;
+	bool m_infiniteDockTime;
+	bool m_dockFinished;
+	Vector m_goalPosition_w;
+	bool m_wingsOpenedBeforeDock;
+	
+	void approach(float const deltaSeconds);
+	void approachTractorBeam(float const deltaSeconds);
+	void landing(float const deltaSeconds);
+	void docked(float const deltaSeconds);
+	void unDock(float const deltaSeconds);
+	bool alignWithDock(float const deltaSeconds);
+	void setApproachPosition();
+	void setDockPosition();
+	void setExitPosition();
+	void triggerDocked();
+	void triggerStartUnDock();
+	void triggerUnDockWithSuccess();
+	void triggerUnDockWithFailure();
+	float getMaxTractorBeamSpeed() const;
+	void tractorBeamToGoalPosition(float const deltaSeconds, bool const allowOrientation);
+
+	// Disabled
+	AiShipBehaviorDock();
+	AiShipBehaviorDock(AiShipBehaviorDock const &);
+	AiShipBehaviorDock &operator =(AiShipBehaviorDock const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_AiShipBehaviorDock_H
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorFollow.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorFollow.cpp
new file mode 100644
index 00000000..dedc3fda
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorFollow.cpp
@@ -0,0 +1,133 @@
+// ======================================================================
+//
+// AiShipBehaviorFollow.cpp
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiShipBehaviorFollow.h"
+
+#include "serverGame/AiShipController.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/Formation.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/SpaceSquad.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedLog/Log.h"
+
+// ======================================================================
+//
+// AiShipBehaviorFollowNamespace
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+namespace AiShipBehaviorFollowNamespace
+{
+	float slowDownRequestRadiusGain = 0.9f;
+}
+
+using namespace AiShipBehaviorFollowNamespace;
+
+// ======================================================================
+//
+// AiShipBehaviorFollow
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+AiShipBehaviorFollow::AiShipBehaviorFollow(AiShipController & aiShipController, NetworkId const & followedUnit)
+ : AiShipBehaviorBase(aiShipController)
+ , m_followedUnit(followedUnit)
+ , m_followedUnitLost(false)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorFollow::AiShipBehaviorFollow() unit(%s) followedUnit(%s)", (m_aiShipController.getOwner() != NULL) ? m_aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner", followedUnit.getValueString().c_str()));
+
+	DEBUG_WARNING((m_followedUnit.getObject() == NULL), ("Trying to follow a NULL object."));
+}
+
+// ----------------------------------------------------------------------
+void AiShipBehaviorFollow::alter(float const deltaSeconds)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiShipBehaviorFollow::alter");
+
+	// Get the goal position
+
+	Object * const followedUnitObject = m_followedUnit.getObject();
+	Vector goalPosition_w;
+
+	if (followedUnitObject != NULL)
+	{
+		goalPosition_w = Formation::getPosition_w(followedUnitObject->getTransform_o2w(), m_aiShipController.getFormationPosition_l());
+
+		// Determine if the unit being followed is far enough away to request it to slow down
+
+		if (m_aiShipController.getOwner()->getPosition_w().magnitudeBetweenSquared(goalPosition_w) > sqr(m_aiShipController.getLargestTurnRadius() * slowDownRequestRadiusGain))
+		{
+			ShipController * const shipController = followedUnitObject->getController()->asShipController();
+			AiShipController * const aiShipController = (shipController != NULL) ? shipController->asAiShipController() : NULL;
+
+			if (aiShipController != NULL)
+			{
+				aiShipController->requestSlowDown();
+			}
+		}
+	}
+	else
+	{
+		if (!m_followedUnitLost)
+		{
+			m_followedUnitLost = true;
+
+			triggerFollowedUnitLost();
+		}
+
+		// Handle the case where we could not resolve the goal position
+
+		Object const * const object = m_aiShipController.getOwner();
+
+		if (object != NULL)
+		{
+			goalPosition_w = object->getPosition_w();
+		}
+	}
+
+	// Calculate the throttle
+
+	float const throttle = m_aiShipController.calculateThrottleToPosition_w(goalPosition_w, m_aiShipController.getLargestTurnRadius());
+
+	// Move the ship
+
+	m_aiShipController.moveTo(goalPosition_w, throttle, deltaSeconds);
+}
+
+// ----------------------------------------------------------------------
+void AiShipBehaviorFollow::triggerFollowedUnitLost()
+{
+	Object * object = m_aiShipController.getOwner();
+	ServerObject *serverObject = (object != NULL) ? object->asServerObject() : NULL;
+	GameScriptObject * gameScriptObject = (serverObject != NULL) ? serverObject->getScriptObject() : NULL;
+
+	if(gameScriptObject != NULL)
+	{
+		ScriptParams scriptParams;
+		scriptParams.addParam(m_followedUnit);
+		IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_SPACE_UNIT_FOLLOW_LOST, scriptParams));
+	}
+	else
+	{
+		WARNING(true, ("Unable to get the ScriptObject for this object."));
+	}
+}
+
+// ----------------------------------------------------------------------
+AiShipBehaviorType AiShipBehaviorFollow::getBehaviorType() const
+{
+	return ASBT_follow;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorFollow.h b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorFollow.h
new file mode 100644
index 00000000..a5b5be68
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorFollow.h
@@ -0,0 +1,44 @@
+// ======================================================================
+//
+// AiShipBehaviorFollow.h
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiShipBehaviorFollow_H
+#define	INCLUDED_AiShipBehaviorFollow_H
+
+#include "serverGame/AiShipBehaviorBase.h"
+#include "sharedObject/CachedNetworkId.h"
+
+class AiShipController;
+class NetworkId;
+
+// ======================================================================
+
+class AiShipBehaviorFollow : public AiShipBehaviorBase
+{
+public:
+
+	AiShipBehaviorFollow(AiShipController & aiShipController, NetworkId const & followedUnit);
+
+	virtual void alter(float deltaSeconds);
+	virtual AiShipBehaviorType getBehaviorType() const;
+
+private:
+
+	void triggerFollowedUnitLost();
+
+	CachedNetworkId m_followedUnit;
+	bool m_followedUnitLost;
+
+	// Disabled
+	AiShipBehaviorFollow();
+	AiShipBehaviorFollow(AiShipBehaviorFollow const &);
+	AiShipBehaviorFollow &operator =(AiShipBehaviorFollow const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_AiShipBehaviorFollow_H
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorIdle.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorIdle.cpp
new file mode 100644
index 00000000..14d8253c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorIdle.cpp
@@ -0,0 +1,44 @@
+// ======================================================================
+//
+// AiShipBehaviorIdle.cpp
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiShipBehaviorIdle.h"
+
+#include "serverGame/AiShipController.h"
+#include "serverGame/ConfigServerGame.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedLog/Log.h"
+
+// ======================================================================
+//
+// AiShipBehaviorIdle
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorIdle::AiShipBehaviorIdle(AiShipController & aiShipController)
+ : AiShipBehaviorBase(aiShipController)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorIdle() unit(%s)", (m_aiShipController.getOwner() != NULL) ? m_aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner"));
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorIdle::alter(float const /*deltaSeconds*/)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiShipBehaviorIdle::alter");
+}
+
+// ----------------------------------------------------------------------
+AiShipBehaviorType AiShipBehaviorIdle::getBehaviorType() const
+{
+	return ASBT_idle;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorIdle.h b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorIdle.h
new file mode 100644
index 00000000..f6767677
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorIdle.h
@@ -0,0 +1,36 @@
+// ======================================================================
+//
+// AiShipBehaviorIdle.h
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiShipBehaviorIdle_H
+#define	INCLUDED_AiShipBehaviorIdle_H
+
+#include "serverGame/AiShipBehaviorBase.h"
+class AiShipController;
+
+// ======================================================================
+
+class AiShipBehaviorIdle : public AiShipBehaviorBase
+{
+public:
+
+	explicit AiShipBehaviorIdle(AiShipController & aiShipController);
+
+	virtual void alter(float deltaSeconds);
+	virtual AiShipBehaviorType getBehaviorType() const;
+
+private:
+
+	// Disabled
+	AiShipBehaviorIdle();
+	AiShipBehaviorIdle(AiShipBehaviorIdle const &);
+	AiShipBehaviorIdle &operator =(AiShipBehaviorIdle const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_AiShipBehaviorIdle_H
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorTrack.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorTrack.cpp
new file mode 100644
index 00000000..68a47863
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorTrack.cpp
@@ -0,0 +1,51 @@
+// ======================================================================
+//
+// AiShipBehaviorTrack.cpp
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiShipBehaviorTrack.h"
+
+#include "serverGame/AiShipController.h"
+#include "serverGame/ConfigServerGame.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/Object.h"
+
+// ======================================================================
+//
+// AiShipBehaviorTrack
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorTrack::AiShipBehaviorTrack(AiShipController & aiShipController, Object const & target)
+ : AiShipBehaviorBase(aiShipController)
+ , m_target(&target)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorTrack() unit(%s) target(%s)", (m_aiShipController.getOwner() != NULL) ? m_aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner", target.getNetworkId().getValueString().c_str()));
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorTrack::alter(float deltaSeconds)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiShipBehaviorTrack::alter");
+
+	if (m_target != NULL)
+	{
+		IGNORE_RETURN(m_aiShipController.face(m_target->getPosition_w(), deltaSeconds));
+	}
+}
+
+// ----------------------------------------------------------------------
+AiShipBehaviorType AiShipBehaviorTrack::getBehaviorType() const
+{
+	return ASBT_track;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorTrack.h b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorTrack.h
new file mode 100644
index 00000000..5bcedee4
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorTrack.h
@@ -0,0 +1,41 @@
+// ======================================================================
+//
+// AiShipBehaviorTrack.h
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiShipBehaviorTrack_H
+#define	INCLUDED_AiShipBehaviorTrack_H
+
+#include "serverGame/AiShipBehaviorBase.h"
+#include "sharedFoundation/Watcher.h"
+
+class AiShipController;
+class Object;
+
+// ======================================================================
+
+class AiShipBehaviorTrack : public AiShipBehaviorBase
+{
+public:
+
+	AiShipBehaviorTrack(AiShipController & aiShipController, Object const & target);
+	
+	virtual void alter(float deltaSeconds);
+	virtual AiShipBehaviorType getBehaviorType() const;
+
+private:
+
+	ConstWatcher<Object> m_target;
+
+	// Disabled
+	AiShipBehaviorTrack();
+	AiShipBehaviorTrack(AiShipBehaviorTrack const &);
+	AiShipBehaviorTrack &operator =(AiShipBehaviorTrack const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_AiShipBehaviorTrack_H
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorWaypoint.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorWaypoint.cpp
new file mode 100644
index 00000000..f68335b9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorWaypoint.cpp
@@ -0,0 +1,270 @@
+// ======================================================================
+//
+// AiShipBehaviorWaypoint.cpp
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiShipBehaviorWaypoint.h"
+
+#include "serverGame/AiShipController.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/SpacePath.h"
+#include "serverGame/SpacePathManager.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedGame/AiDebugString.h"
+#include "sharedLog/Log.h"
+#include "sharedTerrain/TerrainObject.h"
+
+// ======================================================================
+//
+// AiShipBehaviorWaypoint
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+
+AiShipBehaviorWaypoint::AiShipBehaviorWaypoint(AiShipController & aiShipController, bool const cyclic)
+ : AiShipBehaviorBase(aiShipController)
+ , m_cyclic(cyclic)
+ , m_moveToCompleteTriggerSent(false)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorWaypoint::AiShipBehaviorWaypoint() unit(%s) cyclic(%s)", (aiShipController.getOwner() != NULL) ? aiShipController.getOwner()->getNetworkId().getValueString().c_str() : "NULL owner", cyclic ? "yes" : "no"));
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipBehaviorWaypoint::alter(float deltaSeconds)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiShipBehaviorWaypoint::alter");
+
+	// Get the goal position
+
+	Vector goalPosition_w;
+	{
+		if (!getNextPosition_w(goalPosition_w))
+		{
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorWaypoint::alter() unit(%s) Why do we have a path with no points in it?", m_aiShipController.getOwner()->getNetworkId().getValueString().c_str()));
+			goalPosition_w = m_aiShipController.getOwnerPosition_w();
+		}
+	}
+
+	// Calculate the throttle
+
+	float throttle = 1.0f;
+	{
+		SpacePath const * const path = m_aiShipController.getPath();
+
+		if (   (path != NULL)
+			&& !m_cyclic
+			&& (m_aiShipController.getCurrentPathIndex() == (path->getTransformList().size() - 1)))
+		{
+			throttle = m_aiShipController.calculateThrottleToPosition_w(goalPosition_w, m_aiShipController.getLargestTurnRadius());
+
+			// See if we need to send the move to complete trigger
+
+			if (   !m_moveToCompleteTriggerSent
+				&& m_aiShipController.getOwnerPosition_w().magnitudeBetweenSquared(goalPosition_w) < sqr(m_aiShipController.getLargestTurnRadius()))
+			{
+				m_moveToCompleteTriggerSent = true;
+
+				GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(m_aiShipController.getOwner());
+
+				if(gameScriptObject != NULL)
+				{
+					ScriptParams scriptParams;
+					IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_SPACE_UNIT_MOVE_TO_COMPLETE, scriptParams));
+
+					LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipBehaviorWaypoint::alter() unit(%s) Trigger sent: TRIG_SPACE_UNIT_MOVE_TO_COMPLETE", m_aiShipController.getOwner()->getDebugInformation().c_str()));
+				}
+				else
+				{
+					DEBUG_WARNING(true, ("debug_ai: Unable to get the ScriptObject for this object(%s)", m_aiShipController.getOwner()->getDebugInformation().c_str()));
+				}
+			}
+		}
+	}
+
+	// Move the ship
+
+	m_aiShipController.moveTo(goalPosition_w, throttle, deltaSeconds);
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipBehaviorWaypoint::getNextPosition_w(Vector & position_w)
+{
+	bool result = false;
+
+	SpacePath * const path = m_aiShipController.getPath();
+
+	if (   (path != NULL)
+	    && !path->isEmpty()
+	    && (m_aiShipController.getCurrentPathIndex() < path->getTransformList().size()))
+	{
+		ShipObject const * const shipObject = m_aiShipController.getShipOwner();
+
+		if (shipObject != NULL)
+		{
+			SpacePath::TransformList const & transformList = path->getTransformList();
+			Vector const & nextPosition = getGoalPosition_w();
+			float const distanceToGoalSquared = shipObject->getPosition_w().magnitudeBetweenSquared(nextPosition);
+
+			// If the distance to the goal position is less than a specified amount,
+			// the calculate the next position using a spline to round out the transition
+			// to the next point.
+
+			float const turnRadiusSquared = sqr(m_aiShipController.getLargestTurnRadius());
+
+			if (distanceToGoalSquared < turnRadiusSquared)
+			{
+				// Move to the next path point
+
+				if (m_cyclic)
+				{
+					if ((m_aiShipController.getCurrentPathIndex() + 1) >= transformList.size())
+					{
+						m_aiShipController.setCurrentPathIndex(0);
+					}
+					else
+					{
+						m_aiShipController.setCurrentPathIndex(m_aiShipController.getCurrentPathIndex() + 1);
+					}
+				}
+				else
+				{
+					if (m_aiShipController.getCurrentPathIndex() < (transformList.size() - 1))
+					{
+						m_aiShipController.setCurrentPathIndex(m_aiShipController.getCurrentPathIndex() + 1);
+					}
+				}
+			}
+
+			result = true;
+			position_w = getGoalPosition_w();
+		}
+	}
+	else
+	{
+		m_aiShipController.setCurrentPathIndex(0);
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+Vector AiShipBehaviorWaypoint::getGoalPosition_w() const
+{
+	Vector result;
+
+	SpacePath * const path = m_aiShipController.getPath();
+
+	if (   (path != NULL)
+	    && !path->isEmpty())
+	{
+		SpacePath::TransformList const & transformList = path->getTransformList();
+		result = transformList[m_aiShipController.getCurrentPathIndex()].getPosition_p();
+
+		m_aiShipController.clampPositionToZone(result);
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipBehaviorWaypoint::getGoalPosition_w() unit(%s) ERROR: Getting a goal position on an empty path.", m_aiShipController.getOwner()->getNetworkId().getValueString().c_str()));
+	}
+
+	return result;
+}
+
+//// ----------------------------------------------------------------------
+//
+//Vector AiShipBehaviorWaypoint::getPreviousGoalPosition() const
+//{
+//	Vector result;
+//
+//	if (!path.empty())
+//	{
+//		if ((m_currentPathIndex - 1) >= path.size())
+//		{
+//			result = path[path.size() - 1].getPosition_p();
+//		}
+//		else
+//		{
+//			result = path[m_currentPathIndex - 1].getPosition_p();
+//		}
+//	}
+//
+//	return result;
+//}
+//
+//// ----------------------------------------------------------------------
+//
+//Vector AiShipBehaviorWaypoint::getNextGoalPosition() const
+//{
+//	Vector result;
+//
+//	if (!path.empty())
+//	{
+//		if ((m_currentPathIndex + 1) >= path.size())
+//		{
+//			result = path[0].getPosition_p();
+//		}
+//		else
+//		{
+//			result = path[m_currentPathIndex + 1].getPosition_p();
+//		}
+//	}
+//
+//	return result;
+//}
+
+// ----------------------------------------------------------------------
+AiShipBehaviorType AiShipBehaviorWaypoint::getBehaviorType() const
+{
+	AiShipBehaviorType result = ASBT_moveTo;
+
+	if (m_cyclic)
+	{
+		result = ASBT_patrol;
+	}
+
+	return result;
+}
+
+#ifdef _DEBUG
+// ----------------------------------------------------------------------
+void AiShipBehaviorWaypoint::addDebug(AiDebugString & aiDebugString)
+{
+	if (m_aiShipController.isSquadLeader())
+	{
+		SpacePath const * const path = m_aiShipController.getPath();
+
+		if (path != NULL)
+		{
+			aiDebugString.addLineToPosition(m_aiShipController.getMoveToGoalPosition_w(), PackedRgb::solidGreen);
+			aiDebugString.addCircle(m_aiShipController.getMoveToGoalPosition_w(), m_aiShipController.getLargestTurnRadius(), PackedRgb::solidGreen);
+			aiDebugString.addPath(path->getTransformList(), m_cyclic);
+
+			char const * const text = FormattedString<256>().sprintf("%s [PATH SIZE %u]\n", getBehaviorString(getBehaviorType()), path->getTransformList().size());
+			aiDebugString.addText(text, PackedRgb::solidCyan);
+		}
+		else
+		{
+			char const * const text = FormattedString<256>().sprintf("%s [ERROR: NO PATH]\n", getBehaviorString(getBehaviorType()));
+			aiDebugString.addText(text, PackedRgb::solidCyan);
+		}
+	}
+	else
+	{
+		AiShipBehaviorBase::addDebug(aiDebugString);
+	}
+}
+#endif // _DEBUG
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorWaypoint.h b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorWaypoint.h
new file mode 100644
index 00000000..8cc93c38
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorWaypoint.h
@@ -0,0 +1,52 @@
+// ======================================================================
+//
+// AiShipBehaviorWaypoint.h
+// Copyright 2004 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiShipBehaviorWaypoint_H
+#define	INCLUDED_AiShipBehaviorWaypoint_H
+
+#include "serverGame/AiShipBehaviorBase.h"
+
+class AiDebugString;
+class AiShipController;
+class Vector;
+
+// ======================================================================
+
+class AiShipBehaviorWaypoint : public AiShipBehaviorBase
+{
+public:
+
+	AiShipBehaviorWaypoint(AiShipController & aiShipController, bool const cyclic);
+	
+	virtual void alter(float deltaSeconds);
+	virtual AiShipBehaviorType getBehaviorType() const;
+
+#ifdef _DEBUG
+	virtual void addDebug(AiDebugString & aiDebugString);
+#endif // _DEBUG
+
+private:
+
+	bool getNextPosition_w(Vector & position_w);
+
+	Vector getGoalPosition_w() const;
+	//Vector getPreviousGoalPosition() const;
+	//Vector getNextGoalPosition() const;
+
+	bool m_cyclic;
+	bool m_moveToCompleteTriggerSent;
+
+	// Disabled
+	AiShipBehaviorWaypoint();
+	AiShipBehaviorWaypoint(AiShipBehaviorWaypoint const &);
+	AiShipBehaviorWaypoint &operator =(AiShipBehaviorWaypoint const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_AiShipBehaviorWaypoint_H
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipTurretTargetingSystem.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipTurretTargetingSystem.cpp
new file mode 100644
index 00000000..cd08590e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipTurretTargetingSystem.cpp
@@ -0,0 +1,42 @@
+// ======================================================================
+//
+// AiShipTurretTargetingSystem.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiShipTurretTargetingSystem.h"
+
+#include "serverGame/ShipObject.h"
+
+// ======================================================================
+
+AiShipTurretTargetingSystem::AiShipTurretTargetingSystem(ShipController & shipController) :
+		ShipTurretTargetingSystem(shipController)
+{
+}
+
+// ----------------------------------------------------------------------
+
+AiShipTurretTargetingSystem::~AiShipTurretTargetingSystem()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipTurretTargetingSystem::doShot(int const weaponIndex, NetworkId const & targetId, ShipChassisSlotType::Type targetedComponent, bool const goodShot)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiShipTurretTargetingSystem::doShot");
+	ShipObject & shipObject = getShipOwner();
+	shipObject.fireShotTurretServer(weaponIndex, targetId, targetedComponent, goodShot, false);
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipTurretTargetingSystem::isTurretControlled(int const /*weaponIndex*/)
+{
+	return true;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipTurretTargetingSystem.h b/engine/server/library/serverGame/src/shared/behavior/AiShipTurretTargetingSystem.h
new file mode 100644
index 00000000..e6286a48
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/AiShipTurretTargetingSystem.h
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// AiShipTurretTargetingSystem.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AiShipTurretTargetingSystem_H
+#define INCLUDED_AiShipTurretTargetingSystem_H
+
+// ======================================================================
+
+#include "serverGame/AiShipAttackTargetList.h"
+#include "serverGame/ShipTurretTargetingSystem.h"
+#include "sharedFoundation/Timer.h"
+
+class AiShipController;
+class CachedNetworkId;
+class NetworkId;
+
+// ======================================================================
+
+/**
+ * Fire AI turrets automatically at enemies.
+ */
+class AiShipTurretTargetingSystem : public ShipTurretTargetingSystem
+{
+  public:
+	AiShipTurretTargetingSystem(ShipController & shipController);
+	virtual ~AiShipTurretTargetingSystem();
+
+  private:	
+	virtual void doShot(int const weaponIndex, NetworkId const & targetId, ShipChassisSlotType::Type targetedComponent, bool const goodShot);
+	virtual bool isTurretControlled(int const weaponIndex);
+	
+  private:
+	AiShipTurretTargetingSystem(AiShipTurretTargetingSystem const &); //disable
+	AiShipTurretTargetingSystem& operator=(AiShipTurretTargetingSystem const &); //disable
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/behavior/PlayerShipTurretTargetingSystem.cpp b/engine/server/library/serverGame/src/shared/behavior/PlayerShipTurretTargetingSystem.cpp
new file mode 100644
index 00000000..41846eae
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/PlayerShipTurretTargetingSystem.cpp
@@ -0,0 +1,59 @@
+// ======================================================================
+//
+// PlayerShipTurretTargetingSystem.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PlayerShipTurretTargetingSystem.h"
+
+#include "serverGame/ShipObject.h"
+
+// ======================================================================
+
+PlayerShipTurretTargetingSystem::PlayerShipTurretTargetingSystem(ShipController & shipController) :
+		ShipTurretTargetingSystem(shipController),
+		m_playerControlledWeaponIndices(new BitArray)
+{
+}
+
+// ----------------------------------------------------------------------
+
+PlayerShipTurretTargetingSystem::~PlayerShipTurretTargetingSystem()
+{
+	delete m_playerControlledWeaponIndices;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipTurretTargetingSystem::doShot(int const weaponIndex, NetworkId const & targetId, ShipChassisSlotType::Type targetedComponent, bool const goodShot)
+{
+	ShipObject & shipObject = getShipOwner();
+	shipObject.fireShotTurretServer(weaponIndex, targetId, targetedComponent, goodShot, true);
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerShipTurretTargetingSystem::isTurretControlled(int const weaponIndex)
+{
+	return !m_playerControlledWeaponIndices->testBit(weaponIndex);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipTurretTargetingSystem::setWeaponIndexPlayerControlled(int const weaponIndex, bool const playerControlled)
+{
+	DEBUG_FATAL((weaponIndex < 0), ("Invalid weaponIndex(%d)", weaponIndex));
+
+	if (playerControlled)
+	{
+		m_playerControlledWeaponIndices->setBit(weaponIndex);
+	}
+	else
+	{
+		m_playerControlledWeaponIndices->clearBit(weaponIndex);
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/behavior/PlayerShipTurretTargetingSystem.h b/engine/server/library/serverGame/src/shared/behavior/PlayerShipTurretTargetingSystem.h
new file mode 100644
index 00000000..adaa6817
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/PlayerShipTurretTargetingSystem.h
@@ -0,0 +1,47 @@
+// ======================================================================
+//
+// PlayerShipTurretTargetingSystem.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_PlayerShipTurretTargetingSystem_H
+#define INCLUDED_PlayerShipTurretTargetingSystem_H
+
+// ======================================================================
+
+#include "serverGame/ShipTurretTargetingSystem.h"
+
+class AiShipController;
+class BitArray;
+class CachedNetworkId;
+class NetworkId;
+
+// ======================================================================
+
+/**
+ * Automatically fire some or all of the player's ship's turrets
+ */
+class PlayerShipTurretTargetingSystem : public ShipTurretTargetingSystem
+{
+  public:
+	PlayerShipTurretTargetingSystem(ShipController & shipController);
+	virtual ~PlayerShipTurretTargetingSystem();
+
+	void setWeaponIndexPlayerControlled(int const weaponIndex, bool const playerControlled);
+
+  private:	
+	virtual void doShot(int const weaponIndex, NetworkId const & targetId, ShipChassisSlotType::Type targetedComponent, bool const goodShot);
+	virtual bool isTurretControlled(int const weaponIndex);
+	
+  private:
+	BitArray * const m_playerControlledWeaponIndices;
+
+  private:
+	PlayerShipTurretTargetingSystem(PlayerShipTurretTargetingSystem const &); //disable
+	PlayerShipTurretTargetingSystem& operator=(PlayerShipTurretTargetingSystem const &); //disable
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/behavior/ShipTurretTargetingSystem.cpp b/engine/server/library/serverGame/src/shared/behavior/ShipTurretTargetingSystem.cpp
new file mode 100644
index 00000000..23cbc81f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/ShipTurretTargetingSystem.cpp
@@ -0,0 +1,276 @@
+// ======================================================================
+//
+// ShipTurretTargetingSystem.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipTurretTargetingSystem.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ShipController.h"
+#include "serverGame/ShipObject.h"
+#include "sharedLog/Log.h"
+
+// ======================================================================
+
+ShipTurretTargetingSystem::ShipTurretTargetingSystem(ShipController & shipController) :
+		m_targetsDirty(false),
+		m_shipController(shipController),
+		m_turretsPerTarget(new TurretsPerTargetType),
+		m_targetList(new AiShipAttackTargetList::SortedTargetList),
+		m_idealTurretsPerTarget(0),
+		m_retargetTimer(2.0f) //TODO: determine if we need really this.  It was done because SpaceTargetManager::buildTargetList is expensive and we don't want to call it often, but that may change
+{
+}
+
+// ----------------------------------------------------------------------
+
+ShipTurretTargetingSystem::~ShipTurretTargetingSystem()
+{
+	delete m_turretsPerTarget;
+	delete m_targetList;
+}
+
+// ---------------------------------------------------------------------
+
+void ShipTurretTargetingSystem::alter(float const deltaTime)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ShipTurretTargetingSystem::alter");
+	IGNORE_RETURN(m_retargetTimer.updateNoReset(deltaTime));
+
+	ShipObject * const shipObject = NON_NULL(NON_NULL(NON_NULL(m_shipController.getOwner())->asServerObject())->asShipObject());
+		
+	for (int weaponIndex = 0; weaponIndex < ShipChassisSlotType::cms_numWeaponIndices; ++weaponIndex)
+	{
+		if (shipObject->isTurret(weaponIndex)
+			&& isTurretControlled(weaponIndex))
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("turret");
+			bool canFireShot = false;
+			Object const * const target = shipObject->getTurretTarget(weaponIndex).getObject();
+			
+			if (target)
+			{
+				Vector const & turretPosition_w = shipObject->getTurretTransform(weaponIndex).getPosition_p();
+				bool const targetInRange = (target->getPosition_w().magnitudeBetweenSquared(turretPosition_w) <= sqr(shipObject->getWeaponRange(weaponIndex)));
+
+				if (targetInRange)
+				{
+					canFireShot = shipObject->canTurretFireTowardsLocation_p(weaponIndex, target->getPosition_w());
+
+					if (canFireShot)
+					{
+						ShipChassisSlotType::Type const shipChassisSlotType = static_cast<ShipChassisSlotType::Type>(static_cast<int>(ShipChassisSlotType::SCST_weapon_0) + weaponIndex);
+						if (shipObject->isSlotInstalled(shipChassisSlotType))
+						{
+							if (shipObject->hasEnergyForAShot(weaponIndex) && shipObject->hasAmmoForAShot(weaponIndex))
+							{
+								PROFILER_AUTO_BLOCK_DEFINE("fireShot");
+								doShot(weaponIndex, target->getNetworkId(), shipObject->getPilotLookAtTargetSlot(), (Random::randomReal(0.0f,1.0f) > m_shipController.getTurretMissChance()));
+
+								// Keep my target in my attack target list, this resets the decay timer for the unit we are attacking, so it is not purged from the attack target list
+								
+								NetworkId const & attackingUnit = target->getNetworkId();
+								float const damage = 0.0001f;
+								bool const verifyAttacker = false;
+								m_shipController.addDamageTaken(attackingUnit, damage, verifyAttacker);
+							}
+						}
+					}
+				}
+			}
+			
+			if (!canFireShot)
+			{
+				shipObject->setTurretTarget(weaponIndex, onTurretLostTarget(weaponIndex, shipObject->getTurretTarget(weaponIndex)));
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+ShipController const & ShipTurretTargetingSystem::getShipController() const
+{
+	return m_shipController;
+}
+	
+// ----------------------------------------------------------------------
+
+ShipController & ShipTurretTargetingSystem::getShipController() 
+{
+	return m_shipController; //lint !e1536 // returning reference to member
+}
+	
+// ----------------------------------------------------------------------
+
+void ShipTurretTargetingSystem::onTargetChanged(NetworkId const & /*target*/)
+{
+	m_targetsDirty = true;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipTurretTargetingSystem::onTargetLost(NetworkId const & target)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("ShipTurretTargetingSystem::onTargetLost() owner(%s) target(%s)", m_shipController.getOwner()->getNetworkId().getValueString().c_str(), target.getValueString().c_str()));
+
+	m_targetsDirty = true;
+
+	// If any turret was attacking this target, remove the target
+
+	ShipObject * const shipObject = NON_NULL(NON_NULL(NON_NULL(m_shipController.getOwner())->asServerObject())->asShipObject());
+	if (!shipObject)  // for release builds
+	{
+		WARNING(true,("Programmer bug:  got a NULL ShipObject in ShipTurretTargetingSystem::onTargetLost().  May indicate that the ShipObject has already been partially deconstructed."));
+		return;
+	}
+
+	for (int weaponIndex = 0; weaponIndex < ShipChassisSlotType::cms_numWeaponIndices; ++weaponIndex)
+	{
+		if (shipObject->isTurret(weaponIndex))
+		{
+			if (shipObject->getTurretTarget(weaponIndex) == target)
+			{
+				LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("ShipTurretTargetingSystem::onTargetLost() owner(%s) TARGET LOST(%s)", m_shipController.getOwner()->getNetworkId().getValueString().c_str(), target.getValueString().c_str()));
+
+				// Remove the turrets assignment since it is no longer in the target list
+
+				shipObject->setTurretTarget(weaponIndex, CachedNetworkId::cms_cachedInvalid);
+			}
+		}
+	}
+
+	// We must acquire a new target list here so the turrets stop shooting at invalid targets	
+	IGNORE_RETURN(buildTargetList());
+}
+
+// ----------------------------------------------------------------------
+
+ShipObject & ShipTurretTargetingSystem::getShipOwner()
+{
+	return (*NON_NULL(NON_NULL(NON_NULL(m_shipController.getOwner())->asServerObject())->asShipObject()));
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipTurretTargetingSystem::buildTargetList()
+{
+	m_retargetTimer.reset();
+	m_targetsDirty = false;
+
+	// Get a new list of attack targets
+	
+	ShipObject * const ownerShipObject = getShipController().getShipOwner();
+	ShipController * const ownerShipController = ownerShipObject->getController()->asShipController();
+	bool result = false;
+	m_targetList->clear();
+	
+	if (ownerShipController != NULL)
+	{
+		if (!ownerShipController->getAttackTargetList().isEmpty())
+		{
+			result = true;
+
+			ownerShipController->getAttackTargetList().getSortedTargetList(*m_targetList);
+
+			// Count the number of turrets currently available
+			int numGuns=0;
+			for (int weaponIndex = 0; weaponIndex < ShipChassisSlotType::cms_numWeaponIndices; ++weaponIndex)
+			{
+				if (ownerShipObject->isTurret(weaponIndex))
+				{
+					ShipChassisSlotType::Type const shipChassisSlotType = static_cast<ShipChassisSlotType::Type>(static_cast<int>(ShipChassisSlotType::SCST_weapon_0) + weaponIndex);
+					if (ownerShipObject->isSlotInstalled(shipChassisSlotType))
+						++numGuns;
+				}
+			}				
+
+			m_idealTurretsPerTarget = std::max(1, numGuns / static_cast<int>(m_targetList->size()));
+		}
+		else
+		{
+			m_idealTurretsPerTarget = 0;
+		}
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("PlayerShipTurretTargetingSystem::alter() ERROR: Why does this owner(%s) not have an ShipController?", ownerShipObject->getNetworkId().getValueString().c_str()));
+	}
+
+	// Cleanup: remove anything from the turretsPerTarget that has a count of 0, so that turretsPerTarget doesn't grow indefinitely
+	
+	for (TurretsPerTargetType::iterator i=m_turretsPerTarget->begin(); i!=m_turretsPerTarget->end();)
+	{
+		if (i->second <= 0)
+			m_turretsPerTarget->erase(i++);
+		else
+			++i;
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Called when a turret has no target or can't shoot at its assigned target.
+ * Figure out a new target for the turret.
+ */
+CachedNetworkId ShipTurretTargetingSystem::onTurretLostTarget(int const weaponIndex, CachedNetworkId const & oldTarget)
+{
+	// Only get new targets if some new targets have been added to the list while the timer was ticking
+
+	if (   m_targetsDirty
+	    && m_retargetTimer.isExpired()
+	    && !buildTargetList())
+	{
+		return CachedNetworkId::cms_cachedInvalid;
+	}
+
+	if (oldTarget != CachedNetworkId::cms_cachedInvalid)
+	{
+		--((*m_turretsPerTarget)[oldTarget]);
+		DEBUG_FATAL((*m_turretsPerTarget)[oldTarget] < 0,("Programmer bug:  m_turretsPerTarget went negative for target %s", oldTarget.getValueString().c_str()));
+	}
+		
+	ShipObject * const ownerShipObject = getShipController().getShipOwner();
+
+	CachedNetworkId bestTarget(CachedNetworkId::cms_cachedInvalid);
+	CachedNetworkId bestTargetIgnoringLimits(CachedNetworkId::cms_cachedInvalid);
+	
+	for (AiShipAttackTargetList::SortedTargetList::const_iterator target = m_targetList->begin(); target != m_targetList->end(); ++target)
+	{
+		CachedNetworkId const & cachedNetworkId = target->first;
+		Object const * const targetObject = NON_NULL(cachedNetworkId.getObject());
+
+		if (targetObject)
+		{
+			if (ownerShipObject->canTurretFireTowardsLocation_p(weaponIndex, targetObject->getPosition_w()))
+			{
+				if ((*m_turretsPerTarget)[target->first] < m_idealTurretsPerTarget)
+				{
+					bestTarget = target->first;
+					break;
+				}
+				else
+					bestTargetIgnoringLimits = target->first;
+			}
+		}
+	}
+
+	if (bestTarget == CachedNetworkId::cms_cachedInvalid)
+		bestTarget = bestTargetIgnoringLimits;
+
+	if (bestTarget != CachedNetworkId::cms_cachedInvalid)
+	{
+		++((*m_turretsPerTarget)[bestTarget]);
+		return bestTarget;
+	}
+
+	return CachedNetworkId::cms_cachedInvalid;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/behavior/ShipTurretTargetingSystem.h b/engine/server/library/serverGame/src/shared/behavior/ShipTurretTargetingSystem.h
new file mode 100644
index 00000000..5db0dc92
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/behavior/ShipTurretTargetingSystem.h
@@ -0,0 +1,75 @@
+// ======================================================================
+//
+// ShipTurretTargetingSystem.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ShipTurretTargetingSystem_H
+#define INCLUDED_ShipTurretTargetingSystem_H
+
+// ======================================================================
+
+#include "serverGame/AiShipAttackTargetList.h"
+#include "sharedFoundation/Timer.h"
+#include "sharedGame/ShipChassisSlotType.h"
+
+class CachedNetworkId;
+class NetworkId;
+class ShipController;
+class ShipObject;
+
+// ======================================================================
+
+/**
+ * A system that automatically fires ship turrets at enemies.
+ * This can be attached to a ship controller, which will cause
+ * the ship to automatically fire its turrets.
+ *
+ * Derive from this class to make targeting systems for AI or for player
+ * ships with autopilot.
+ */
+class ShipTurretTargetingSystem
+{
+  public:
+	ShipTurretTargetingSystem(ShipController & shipController);
+	virtual ~ShipTurretTargetingSystem() = 0;
+
+	virtual void alter(float const deltaTime);
+	ShipController const & getShipController() const;
+	ShipController & getShipController();
+	ShipObject & getShipOwner();
+
+	void clearTargets();
+	void onTargetChanged(NetworkId const & target);
+	void onTargetLost(NetworkId const & target);
+
+  protected:
+	bool m_targetsDirty;
+
+  private:	
+	CachedNetworkId onTurretLostTarget(int const weaponIndex, CachedNetworkId const & oldTarget);
+	virtual void doShot(int const weaponIndex, NetworkId const & targetId, ShipChassisSlotType::Type targetedComponent, bool const goodShot) = 0;
+	virtual bool isTurretControlled(int const weaponIndex) = 0;
+	bool buildTargetList();
+
+  protected:
+	typedef stdmap<NetworkId, int>::fwd TurretsPerTargetType;
+
+  private:
+	ShipController & m_shipController;
+
+  protected:
+	TurretsPerTargetType * const m_turretsPerTarget;
+	AiShipAttackTargetList::SortedTargetList * const m_targetList;
+	int m_idealTurretsPerTarget;
+	Timer m_retargetTimer;
+
+  private:
+	ShipTurretTargetingSystem(ShipTurretTargetingSystem const &); //disable
+	ShipTurretTargetingSystem & operator=(ShipTurretTargetingSystem const &); //disable
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/city/CitizenInfo.cpp b/engine/server/library/serverGame/src/shared/city/CitizenInfo.cpp
new file mode 100644
index 00000000..b8679905
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/city/CitizenInfo.cpp
@@ -0,0 +1,65 @@
+// ======================================================================
+//
+// CitizenInfo.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CitizenInfo.h"
+
+#include "Archive/Archive.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+// ======================================================================
+
+namespace Archive
+{
+	void get(ReadIterator & source, CitizenInfo & target)
+	{
+		get(source, target.m_citizenName);
+		get(source, target.m_citizenProfessionSkillTemplate);
+		get(source, target.m_citizenLevel);
+		get(source, target.m_citizenPermissions);
+		get(source, target.m_citizenRank);
+		get(source, target.m_citizenTitle);
+		get(source, target.m_citizenAllegiance);
+	}
+
+	void put(ByteStream & target, const CitizenInfo & source)
+	{
+		put(target, source.m_citizenName);
+		put(target, source.m_citizenProfessionSkillTemplate);
+		put(target, source.m_citizenLevel);
+		put(target, source.m_citizenPermissions);
+		put(target, source.m_citizenRank);
+		put(target, source.m_citizenTitle);
+		put(target, source.m_citizenAllegiance);
+	}
+}
+
+// ======================================================================
+
+bool CitizenInfo::operator== (const CitizenInfo& rhs) const
+{
+	if (this == &rhs)
+		return true;
+
+	return ((m_citizenName == rhs.m_citizenName) &&
+		(m_citizenProfessionSkillTemplate == rhs.m_citizenProfessionSkillTemplate) &&
+		(m_citizenLevel == rhs.m_citizenLevel) &&
+		(m_citizenPermissions == rhs.m_citizenPermissions) &&
+		(m_citizenRank == rhs.m_citizenRank) &&
+		(m_citizenTitle == rhs.m_citizenTitle) &&
+		(m_citizenAllegiance == rhs.m_citizenAllegiance));
+}
+
+// ----------------------------------------------------------------------
+
+bool CitizenInfo::operator!= (const CitizenInfo& rhs) const
+{
+	return !operator==(rhs);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/city/CitizenInfo.h b/engine/server/library/serverGame/src/shared/city/CitizenInfo.h
new file mode 100644
index 00000000..71a8b7ec
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/city/CitizenInfo.h
@@ -0,0 +1,65 @@
+// ======================================================================
+//
+// CitizenInfo.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _CitizenInfo_H_
+#define _CitizenInfo_H_
+
+// ======================================================================
+
+#include "sharedFoundation/BitArray.h"
+#include "sharedFoundation/NetworkId.h"
+
+// ======================================================================
+
+class CitizenInfo
+{
+public:
+	bool operator== (const CitizenInfo& rhs) const;
+	bool operator!= (const CitizenInfo& rhs) const;
+
+public:
+	std::string m_citizenName;
+	std::string m_citizenProfessionSkillTemplate;
+	int m_citizenLevel;
+	int m_citizenPermissions;
+	BitArray m_citizenRank;
+	std::string m_citizenTitle;
+	NetworkId m_citizenAllegiance;
+};
+
+// ----------------------------------------------------------------------
+
+namespace CitizenPermissions
+{
+	enum
+	{
+		Citizen = 0, // base citizen without any additional permission
+		Militia = (1<<0),
+		AbsentWeek1 = (1<<1),
+		AbsentWeek2 = (1<<2),
+		AbsentWeek3 = (1<<3),
+		AbsentWeek4 = (1<<4),
+		AbsentWeek5 = (1<<5),
+		InactiveProtected = (1<<6), // protected from being removed as a citizen and structures marked packable due to inactivity
+	};
+}
+
+// ======================================================================
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+
+	void get(ReadIterator & source, CitizenInfo & target);
+	void put(ByteStream & target, const CitizenInfo & source);
+}
+
+// ======================================================================
+
+#endif // _CitizenInfo_H_
diff --git a/engine/server/library/serverGame/src/shared/city/CityInfo.cpp b/engine/server/library/serverGame/src/shared/city/CityInfo.cpp
new file mode 100644
index 00000000..4600199a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/city/CityInfo.cpp
@@ -0,0 +1,51 @@
+// ======================================================================
+//
+// CityInfo.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CityInfo.h"
+
+// ======================================================================
+
+bool CityInfo::operator== (const CityInfo& rhs) const
+{
+	if (this == &rhs)
+		return true;
+
+	return ((m_cityName == rhs.m_cityName) &&
+		(m_cityHallId == rhs.m_cityHallId) &&
+		(m_planet == rhs.m_planet) &&
+		(m_x == rhs.m_x) &&
+		(m_z == rhs.m_z) &&
+		(m_radius == rhs.m_radius) &&
+		(m_faction == rhs.m_faction) &&
+		(m_gcwDefenderRegion == rhs.m_gcwDefenderRegion) &&
+		(m_timeJoinedGcwDefenderRegion == rhs.m_timeJoinedGcwDefenderRegion) &&
+		(m_creationTime == rhs.m_creationTime) &&
+		(m_leaderId == rhs.m_leaderId) &&
+		(m_citizenCount == rhs.m_citizenCount) &&
+		(m_structureCount == rhs.m_structureCount) &&
+		(m_incomeTax == rhs.m_incomeTax) &&
+		(m_propertyTax == rhs.m_propertyTax) &&
+		(m_salesTax == rhs.m_salesTax) &&
+		(m_travelLoc == rhs.m_travelLoc) &&
+		(m_travelCost == rhs.m_travelCost) &&
+		(m_travelInterplanetary == rhs.m_travelInterplanetary) &&
+		(m_cloneLoc == rhs.m_cloneLoc) &&
+		(m_cloneRespawn == rhs.m_cloneRespawn) &&
+		(m_cloneRespawnCell == rhs.m_cloneRespawnCell) &&
+		(m_cloneId == rhs.m_cloneId));
+}
+
+// ----------------------------------------------------------------------
+
+bool CityInfo::operator!= (const CityInfo& rhs) const
+{
+	return !operator==(rhs);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/city/CityInfo.h b/engine/server/library/serverGame/src/shared/city/CityInfo.h
new file mode 100644
index 00000000..52b041af
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/city/CityInfo.h
@@ -0,0 +1,539 @@
+// ======================================================================
+//
+// CityInfo.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _CityInfo_H_
+#define _CityInfo_H_
+
+// ======================================================================
+
+#include "Archive/Archive.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedMath/Vector.h"
+#include "sharedMathArchive/VectorArchive.h"
+
+class CityInfo;
+
+// ======================================================================
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+
+	void get(ReadIterator & source, CityInfo & target);
+	void put(ByteStream & target, const CityInfo & source);
+}
+
+// ======================================================================
+
+class CityInfo
+{
+	friend void Archive::get(ReadIterator & source, CityInfo & target);
+	friend void Archive::put(ByteStream & target, const CityInfo & source);
+
+public:
+	CityInfo();
+	CityInfo(CityInfo const &);
+	~CityInfo();
+
+	bool operator== (const CityInfo& rhs) const;
+	bool operator!= (const CityInfo& rhs) const;
+
+	std::string const &getCityName() const;
+	NetworkId const &getCityHallId() const;
+	std::string const &getPlanet() const;
+	int getX() const;
+	int getZ() const;
+	int getRadius() const;
+	uint32 getFaction() const;
+	std::string const &getGcwDefenderRegion() const;
+	int getTimeJoinedGcwDefenderRegion() const;
+	int getCreationTime() const;
+	NetworkId const &getLeaderId() const;
+	int getCitizenCount() const;
+	int getStructureCount() const;
+	int getIncomeTax() const;
+	int getPropertyTax() const;
+	int getSalesTax() const;
+	Vector const &getTravelLoc() const;
+	int getTravelCost() const;
+	bool getTravelInterplanetary() const;
+	Vector const &getCloneLoc() const;
+	Vector const &getCloneRespawn() const;
+	NetworkId const &getCloneRespawnCell() const;
+	NetworkId const &getCloneId() const;
+
+	void setCityInfo(std::string const &cityName, NetworkId const &cityHallId, std::string const &cityPlanet, int x, int z, int radius, NetworkId const &leaderId, int incomeTax, int propertyTax, int salesTax, Vector const &travelLoc, int travelCost, bool travelInterplanetary, Vector const &cloneLoc, Vector const &cloneRespawn, NetworkId const &cloneRespawnCell, NetworkId const &cloneId);
+	void setCityName(std::string const &cityName);
+	void setCityHall(NetworkId const &cityHallId);
+	void setCityLocation(std::string const &cityPlanet, int x, int z);
+	void setCityRadius(int radius);
+	void setCityFaction(uint32 faction);
+	void setCityGcwDefenderRegion(std::string const &gcwDefenderRegion);
+	void setCityTimeJoinedGcwDefenderRegion(int timeJoinedGcwDefenderRegion);
+	void setCityCreationTime(int creationTime);
+	void setCityLeader(NetworkId const &leaderId);
+	void setCitizenCount(int citizenCount);
+	void setStructureCount(int structureCount);
+	void setCityIncomeTax(int incomeTax);
+	void setCityPropertyTax(int propertyTax);
+	void setCitySalesTax(int salesTax);
+	void setCityTravelInfo(Vector const &travelLoc, int travelCost, bool travelInterplanetary);
+	void setCityCloneInfo(Vector const &cloneLoc, Vector const &cloneRespawn, NetworkId const &cloneRespawnCell, NetworkId const &cloneId);
+
+private:
+	std::string m_cityName;
+	NetworkId m_cityHallId;
+	std::string m_planet;
+	int m_x, m_z, m_radius;
+	uint32 m_faction;
+	std::string m_gcwDefenderRegion;
+	int m_timeJoinedGcwDefenderRegion;
+	int m_creationTime;
+	NetworkId m_leaderId;
+	int m_citizenCount;
+	int m_structureCount;
+	int m_incomeTax, m_propertyTax, m_salesTax;
+	Vector m_travelLoc;
+	int m_travelCost;
+	bool m_travelInterplanetary;
+	Vector m_cloneLoc;
+	Vector m_cloneRespawn;
+	NetworkId m_cloneRespawnCell;
+	NetworkId m_cloneId;
+};
+
+// ----------------------------------------------------------------------
+
+inline CityInfo::CityInfo() :
+	m_cityName(),
+	m_cityHallId(NetworkId::cms_invalid),
+	m_planet(),
+	m_x(0),
+	m_z(0),
+	m_radius(0),
+	m_faction(0),
+	m_gcwDefenderRegion(),
+	m_timeJoinedGcwDefenderRegion(0),
+	m_creationTime(0),
+	m_leaderId(NetworkId::cms_invalid),
+	m_citizenCount(0),
+	m_structureCount(0),
+	m_incomeTax(0),
+	m_propertyTax(0),
+	m_salesTax(0),
+	m_travelLoc(Vector::zero),
+	m_travelCost(0),
+	m_travelInterplanetary(false),
+	m_cloneLoc(Vector::zero),
+	m_cloneRespawn(Vector::zero),
+	m_cloneRespawnCell(NetworkId::cms_invalid),
+	m_cloneId(NetworkId::cms_invalid)
+{
+}
+
+// ----------------------------------------------------------------------
+
+inline CityInfo::CityInfo(CityInfo const &rhs) :
+	m_cityName(rhs.m_cityName),
+	m_cityHallId(rhs.m_cityHallId),
+	m_planet(rhs.m_planet),
+	m_x(rhs.m_x),
+	m_z(rhs.m_z),
+	m_radius(rhs.m_radius),
+	m_faction(rhs.m_faction),
+	m_gcwDefenderRegion(rhs.m_gcwDefenderRegion),
+	m_timeJoinedGcwDefenderRegion(rhs.m_timeJoinedGcwDefenderRegion),
+	m_creationTime(rhs.m_creationTime),
+	m_leaderId(rhs.m_leaderId),
+	m_citizenCount(rhs.m_citizenCount),
+	m_structureCount(rhs.m_structureCount),
+	m_incomeTax(rhs.m_incomeTax),
+	m_propertyTax(rhs.m_propertyTax),
+	m_salesTax(rhs.m_salesTax),
+	m_travelLoc(rhs.m_travelLoc),
+	m_travelCost(rhs.m_travelCost),
+	m_travelInterplanetary(rhs.m_travelInterplanetary),
+	m_cloneLoc(rhs.m_cloneLoc),
+	m_cloneRespawn(rhs.m_cloneRespawn),
+	m_cloneRespawnCell(rhs.m_cloneRespawnCell),
+	m_cloneId(rhs.m_cloneId)
+{
+}
+
+// ----------------------------------------------------------------------
+
+inline CityInfo::~CityInfo()
+{
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const &CityInfo::getCityName() const
+{
+	return m_cityName;
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &CityInfo::getCityHallId() const
+{
+	return m_cityHallId;
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const &CityInfo::getPlanet() const
+{
+	return m_planet;
+}
+
+// ----------------------------------------------------------------------
+
+inline int CityInfo::getX() const
+{
+	return m_x;
+}
+
+// ----------------------------------------------------------------------
+
+inline int CityInfo::getZ() const
+{
+	return m_z;
+}
+
+// ----------------------------------------------------------------------
+
+inline int CityInfo::getRadius() const
+{
+	return m_radius;
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 CityInfo::getFaction() const
+{
+	return m_faction;
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const &CityInfo::getGcwDefenderRegion() const
+{
+	return m_gcwDefenderRegion;
+}
+
+// ----------------------------------------------------------------------
+
+inline int CityInfo::getTimeJoinedGcwDefenderRegion() const
+{
+	return m_timeJoinedGcwDefenderRegion;
+}
+
+// ----------------------------------------------------------------------
+
+inline int CityInfo::getCreationTime() const
+{
+	return m_creationTime;
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &CityInfo::getLeaderId() const
+{
+	return m_leaderId;
+}
+
+// ----------------------------------------------------------------------
+
+inline int CityInfo::getCitizenCount() const
+{
+	return m_citizenCount;
+}
+
+// ----------------------------------------------------------------------
+
+inline int CityInfo::getStructureCount() const
+{
+	return m_structureCount;
+}
+
+// ----------------------------------------------------------------------
+
+inline int CityInfo::getIncomeTax() const
+{
+	return m_incomeTax;
+}
+
+// ----------------------------------------------------------------------
+
+inline int CityInfo::getPropertyTax() const
+{
+	return m_propertyTax;
+}
+
+// ----------------------------------------------------------------------
+
+inline int CityInfo::getSalesTax() const
+{
+	return m_salesTax;
+}
+
+// ----------------------------------------------------------------------
+
+inline Vector const &CityInfo::getTravelLoc() const
+{
+	return m_travelLoc;
+}
+
+// ----------------------------------------------------------------------
+
+inline int CityInfo::getTravelCost() const
+{
+	return m_travelCost;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool CityInfo::getTravelInterplanetary() const
+{
+	return m_travelInterplanetary;
+}
+
+// ----------------------------------------------------------------------
+
+inline Vector const &CityInfo::getCloneLoc() const
+{
+	return m_cloneLoc;
+}
+
+// ----------------------------------------------------------------------
+
+inline Vector const &CityInfo::getCloneRespawn() const
+{
+	return m_cloneRespawn;
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &CityInfo::getCloneRespawnCell() const
+{
+	return m_cloneRespawnCell;
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &CityInfo::getCloneId() const
+{
+	return m_cloneId;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityInfo::setCityInfo(std::string const &cityName, NetworkId const &cityHallId, std::string const &cityPlanet, int x, int z, int radius, NetworkId const &leaderId, int incomeTax, int propertyTax, int salesTax, Vector const &travelLoc, int travelCost, bool travelInterplanetary, Vector const &cloneLoc, Vector const &cloneRespawn, NetworkId const &cloneRespawnCell, NetworkId const &cloneId)
+{
+	m_cityName = cityName;
+	m_cityHallId = cityHallId;
+	m_planet = cityPlanet;
+	m_x = x;
+	m_z = z;
+	m_radius = radius;
+	m_leaderId = leaderId;
+	m_incomeTax = incomeTax;
+	m_propertyTax = propertyTax;
+	m_salesTax = salesTax;
+	m_travelLoc = travelLoc;
+	m_travelCost = travelCost;
+	m_travelInterplanetary = travelInterplanetary;
+	m_cloneLoc = cloneLoc;
+	m_cloneRespawn = cloneRespawn;
+	m_cloneRespawnCell = cloneRespawnCell;
+	m_cloneId = cloneId;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityInfo::setCityName(std::string const &cityName)
+{
+	m_cityName = cityName;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityInfo::setCityHall(NetworkId const &cityHallId)
+{
+	m_cityHallId = cityHallId;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityInfo::setCityLocation(std::string const &cityPlanet, int x, int z)
+{
+	m_planet = cityPlanet;
+	m_x = x;
+	m_z = z;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityInfo::setCityRadius(int radius)
+{
+	m_radius = radius;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityInfo::setCityFaction(uint32 faction)
+{
+	m_faction = faction;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityInfo::setCityGcwDefenderRegion(std::string const &gcwDefenderRegion)
+{
+	m_gcwDefenderRegion = gcwDefenderRegion;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityInfo::setCityTimeJoinedGcwDefenderRegion(int timeJoinedGcwDefenderRegion)
+{
+	m_timeJoinedGcwDefenderRegion = timeJoinedGcwDefenderRegion;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityInfo::setCityCreationTime(int creationTime)
+{
+	m_creationTime = creationTime;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityInfo::setCityLeader(NetworkId const &leaderId)
+{
+	m_leaderId = leaderId;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityInfo::setCitizenCount(int citizenCount)
+{
+	m_citizenCount = citizenCount;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityInfo::setStructureCount(int structureCount)
+{
+	m_structureCount = structureCount;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityInfo::setCityIncomeTax(int incomeTax)
+{
+	m_incomeTax = incomeTax;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityInfo::setCityPropertyTax(int propertyTax)
+{
+	m_propertyTax = propertyTax;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityInfo::setCitySalesTax(int salesTax)
+{
+	m_salesTax = salesTax;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityInfo::setCityTravelInfo(Vector const &travelLoc, int travelCost, bool travelInterplanetary)
+{
+	m_travelLoc = travelLoc;
+	m_travelCost = travelCost;
+	m_travelInterplanetary = travelInterplanetary;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityInfo::setCityCloneInfo(Vector const &cloneLoc, Vector const &cloneRespawn, NetworkId const &cloneRespawnCell, NetworkId const &cloneId)
+{
+	m_cloneLoc = cloneLoc;
+	m_cloneRespawn = cloneRespawn;
+	m_cloneRespawnCell = cloneRespawnCell;
+	m_cloneId = cloneId;
+}
+
+// ======================================================================
+
+inline void Archive::get(ReadIterator & source, CityInfo & target)
+{
+	get(source, target.m_cityName);
+	get(source, target.m_cityHallId);
+	get(source, target.m_planet);
+	get(source, target.m_x);
+	get(source, target.m_z);
+	get(source, target.m_radius);
+	get(source, target.m_faction);
+	get(source, target.m_gcwDefenderRegion);
+	get(source, target.m_timeJoinedGcwDefenderRegion);
+	get(source, target.m_creationTime);
+	get(source, target.m_leaderId);
+	get(source, target.m_citizenCount);
+	get(source, target.m_structureCount);
+	get(source, target.m_incomeTax);
+	get(source, target.m_propertyTax);
+	get(source, target.m_salesTax);
+	get(source, target.m_travelLoc);
+	get(source, target.m_travelCost);
+	get(source, target.m_travelInterplanetary);
+	get(source, target.m_cloneLoc);
+	get(source, target.m_cloneRespawn);
+	get(source, target.m_cloneRespawnCell);
+	get(source, target.m_cloneId);
+}
+
+// ----------------------------------------------------------------------
+
+inline void Archive::put(ByteStream & target, const CityInfo & source)
+{
+	put(target, source.m_cityName);
+	put(target, source.m_cityHallId);
+	put(target, source.m_planet);
+	put(target, source.m_x);
+	put(target, source.m_z);
+	put(target, source.m_radius);
+	put(target, source.m_faction);
+	put(target, source.m_gcwDefenderRegion);
+	put(target, source.m_timeJoinedGcwDefenderRegion);
+	put(target, source.m_creationTime);
+	put(target, source.m_leaderId);
+	put(target, source.m_citizenCount);
+	put(target, source.m_structureCount);
+	put(target, source.m_incomeTax);
+	put(target, source.m_propertyTax);
+	put(target, source.m_salesTax);
+	put(target, source.m_travelLoc);
+	put(target, source.m_travelCost);
+	put(target, source.m_travelInterplanetary);
+	put(target, source.m_cloneLoc);
+	put(target, source.m_cloneRespawn);
+	put(target, source.m_cloneRespawnCell);
+	put(target, source.m_cloneId);
+}
+
+// ======================================================================
+
+#endif // _CityInfo_H_
diff --git a/engine/server/library/serverGame/src/shared/city/CityInterface.cpp b/engine/server/library/serverGame/src/shared/city/CityInterface.cpp
new file mode 100644
index 00000000..8983c79e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/city/CityInterface.cpp
@@ -0,0 +1,650 @@
+// ======================================================================
+//
+// CityInterface.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CityInterface.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/Chat.h"
+#include "serverGame/CityObject.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ServerUniverse.h"
+#include "sharedNetworkMessages/ChatRoomData.h"
+
+// ======================================================================
+
+namespace CityInterfaceNamespace
+{
+	// ----------------------------------------------------------------------
+
+	std::string const &getChatRoomPrefix()
+	{ //lint !e1929 // returning a reference makes sense here.
+		static std::string const prefix = std::string("SWG.") + GameServer::getInstance().getClusterName().c_str() + ".city.";
+		return prefix;
+	}
+
+	// ----------------------------------------------------------------------
+
+	std::string const &getChatRoomSuffix()
+	{ //lint !e1929 // returning a reference makes sense here.
+		static std::string const suffix("." + ChatRoomTypes::ROOM_CITY);
+		return suffix;
+	}
+
+	// ----------------------------------------------------------------------
+
+	std::string getChatRoomPath(int cityId)
+	{
+		char buf[256];
+		snprintf(buf, 256, "%s%d%s", getChatRoomPrefix().c_str(), cityId, getChatRoomSuffix().c_str());
+		return std::string(buf);
+	}
+
+	// ----------------------------------------------------------------------
+
+	std::string getChatRoomTitle(int cityId)
+	{
+		char buf[32];
+		snprintf(buf, 32, "%d", cityId);
+		return std::string(buf);
+	}
+}
+using namespace CityInterfaceNamespace;
+
+// ======================================================================
+
+std::vector<int> const & CityInterface::getCitizenOfCityId(NetworkId const &citizenId)
+{
+	return ServerUniverse::getInstance().getMasterCityObject()->getCitizenOfCityId(citizenId);
+}
+
+// ----------------------------------------------------------------------
+
+int CityInterface::getMilitiaOfCityId(NetworkId const &citizenId)
+{
+	std::vector<int> const & cityId = getCitizenOfCityId(citizenId);
+	if (!cityId.empty())
+	{
+		int const firstCityId = cityId.front();
+		if (isCityMilitia(firstCityId, citizenId))
+			return firstCityId;
+	}
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::getAllCityIds(std::vector<int> &results)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->getAllCityIds(results);
+}
+
+// ----------------------------------------------------------------------
+
+int CityInterface::findCityByName(std::string const &name)
+{
+	return ServerUniverse::getInstance().getMasterCityObject()->findCityByName(name);
+}
+
+// ----------------------------------------------------------------------
+
+int CityInterface::findCityByCityHall(NetworkId const &cityHallId)
+{
+	return ServerUniverse::getInstance().getMasterCityObject()->findCityByCityHall(cityHallId);
+}
+
+// ----------------------------------------------------------------------
+
+int CityInterface::getCityAtLocation(std::string const &planetName, int x, int z, int radius)
+{
+	return ServerUniverse::getInstance().getMasterCityObject()->getCityAtLocation(planetName, x, z, radius);
+}
+
+// ----------------------------------------------------------------------
+
+bool CityInterface::cityExists(int cityId)
+{
+	return ServerUniverse::getInstance().getMasterCityObject()->cityExists(cityId);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::getCitizenIds(int cityId, std::vector<NetworkId> &results)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->getCitizenIds(cityId, results);
+}
+
+// ----------------------------------------------------------------------
+
+int CityInterface::getCitizenCount(int cityId)
+{
+	return getCityInfo(cityId).getCitizenCount();
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::getCityStructureIds(int cityId, std::vector<NetworkId> &results)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->getCityStructureIds(cityId, results);
+}
+
+// ----------------------------------------------------------------------
+
+CityInfo const &CityInterface::getCityInfo(int cityId)
+{
+	return ServerUniverse::getInstance().getMasterCityObject()->getCityInfo(cityId);
+}
+
+// ----------------------------------------------------------------------
+
+std::map<int, CityInfo> const &CityInterface::getAllCityInfo()
+{
+	return ServerUniverse::getInstance().getMasterCityObject()->getAllCityInfo();
+}
+
+// ----------------------------------------------------------------------
+
+CitizenInfo const *CityInterface::getCitizenInfo(int cityId, NetworkId const &citizenId)
+{
+	return ServerUniverse::getInstance().getMasterCityObject()->getCitizenInfo(cityId, citizenId);
+}
+
+// ----------------------------------------------------------------------
+
+std::map<std::pair<int, NetworkId>, CitizenInfo> const &CityInterface::getAllCitizensInfo()
+{
+	return ServerUniverse::getInstance().getMasterCityObject()->getAllCitizensInfo();
+}
+
+// ----------------------------------------------------------------------
+
+CityStructureInfo const *CityInterface::getCityStructureInfo(int cityId, NetworkId const &structureId)
+{
+	return ServerUniverse::getInstance().getMasterCityObject()->getCityStructureInfo(cityId, structureId);
+}
+
+// ----------------------------------------------------------------------
+
+std::map<std::pair<int, NetworkId>, CityStructureInfo> const & CityInterface::getAllCityStructuresInfo()
+{
+	return ServerUniverse::getInstance().getMasterCityObject()->getAllCityStructuresInfo();
+}
+
+// ----------------------------------------------------------------------
+
+std::map<std::pair<std::string, int>, uint32> const & CityInterface::getGcwRegionDefenderCities()
+{
+	return ServerUniverse::getInstance().getMasterCityObject()->getGcwRegionDefenderCities();
+}
+
+// ----------------------------------------------------------------------
+
+std::map<std::string, std::pair<int, int> > const & CityInterface::getGcwRegionDefenderCitiesCount()
+{
+	return ServerUniverse::getInstance().getMasterCityObject()->getGcwRegionDefenderCitiesCount();
+}
+
+// ----------------------------------------------------------------------
+
+int CityInterface::getGcwRegionDefenderCitiesVersion()
+{
+	return ServerUniverse::getInstance().getMasterCityObject()->getGcwRegionDefenderCitiesVersion();
+}
+
+// ----------------------------------------------------------------------
+
+bool CityInterface::isValidCityName(std::string const &cityName)
+{
+	if (cityName.empty() || cityName.length() > 25 || cityName.find(':') != std::string::npos)
+		return false;
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool CityInterface::isCityMilitia(int cityId, NetworkId const &citizenId)
+{
+	CitizenInfo const *ci = getCitizenInfo(cityId, citizenId);
+	if (ci && (ci->m_citizenPermissions & CitizenPermissions::Militia))
+		return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+int CityInterface::createCity(std::string const &cityName, NetworkId const &cityHallId, std::string const &cityPlanet, int x, int z, int radius, NetworkId const &leaderId, int incomeTax, int propertyTax, int salesTax, Vector const &travelLoc, int travelCost, bool travelInterplanetary, Vector const &cloneLoc, Vector const &cloneRespawn, NetworkId const &cloneRespawnCell, NetworkId const &cloneId)
+{
+	if (   !isValidCityName(cityName)
+	    || cityPlanet.empty()
+	    || cityHallId == NetworkId::cms_invalid
+	    || getCityAtLocation(cityPlanet, x, z, radius))
+		return 0;
+	return ServerUniverse::getInstance().getMasterCityObject()->createCity(cityName, cityHallId, cityPlanet, x, z, radius, leaderId, incomeTax, propertyTax, salesTax, travelLoc, travelCost, travelInterplanetary, cloneLoc, cloneRespawn, cloneRespawnCell, cloneId);
+}
+
+// ----------------------------------------------------------------------
+void CityInterface::removeCity(int cityId)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->removeCity(cityId);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::removeCitizen(int cityId, NetworkId const &citizenId, bool sendUpdateNotification /*= true*/)
+{
+	UNREF(sendUpdateNotification);
+	ServerUniverse::getInstance().getMasterCityObject()->removeCitizen(cityId, citizenId);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::removeCityStructure(int cityId, NetworkId const &structureId)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->removeCityStructure(cityId, structureId);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::setCityName(int cityId, std::string const &cityName)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->setCityName(cityId, cityName);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::setCityHall(int cityId, NetworkId const &cityHallId)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->setCityHall(cityId, cityHallId);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::setCityLocation(int cityId, std::string const &cityPlanet, int x, int z)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->setCityLocation(cityId, cityPlanet, x, z);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::setCityRadius(int cityId, int radius)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->setCityRadius(cityId, radius);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::setCityFaction(int cityId, uint32 faction, bool notifyCitizens)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->setCityFaction(cityId, faction, notifyCitizens);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::setCityGcwDefenderRegion(int cityId, std::string const &gcwDefenderRegion, int timeJoined, bool notifyCitizens)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->setCityGcwDefenderRegion(cityId, gcwDefenderRegion, timeJoined, notifyCitizens);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::setCityCreationTime(int cityId, int creationTime)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->setCityCreationTime(cityId, creationTime);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::setCityLeader(int cityId, NetworkId const &leaderId)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->setCityLeader(cityId, leaderId);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::setCityIncomeTax(int cityId, int incomeTax)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->setCityIncomeTax(cityId, incomeTax);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::setCityPropertyTax(int cityId, int propertyTax)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->setCityPropertyTax(cityId, propertyTax);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::setCitySalesTax(int cityId, int salesTax)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->setCitySalesTax(cityId, salesTax);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::setCityTravelInfo(int cityId, Vector const &travelLoc, int travelCost, bool travelInterplanetary)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->setCityTravelInfo(cityId, travelLoc, travelCost, travelInterplanetary);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::setCityCloneInfo(int cityId, Vector const &cloneLoc, Vector const &cloneRespawn, NetworkId const &cloneRespawnCell, NetworkId const &cloneId)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->setCityCloneInfo(cityId, cloneLoc, cloneRespawn, cloneRespawnCell, cloneId);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::setCitizenInfo(int cityId, NetworkId const &citizenId, std::string const &citizenName, NetworkId const &allegiance, int permissions)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->setCitizen(cityId, citizenId, citizenName, allegiance, permissions);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::setCitizenProfessionInfo(int cityId, NetworkId const &citizenId, std::string const &citizenProfessionSkillTemplate, int citizenLevel)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->setCitizenProfessionInfo(cityId, citizenId, citizenProfessionSkillTemplate, citizenLevel);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::addCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->addCitizenRank(cityId, citizenId, rankName);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::removeCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->removeCitizenRank(cityId, citizenId, rankName);
+}
+
+// ----------------------------------------------------------------------
+
+bool CityInterface::hasCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName)
+{
+	return ServerUniverse::getInstance().getMasterCityObject()->hasCitizenRank(cityId, citizenId, rankName);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::getCitizenRank(int cityId, NetworkId const &citizenId, std::vector<std::string> &ranks)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->getCitizenRank(cityId, citizenId, ranks);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::setCitizenTitle(int cityId, NetworkId const &citizenId, std::string const &citizenTitle)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->setCitizenTitle(cityId, citizenId, citizenTitle);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::setCityStructureInfo(int cityId, NetworkId const &structureId, int structureType, bool structureValid)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->setCityStructure(cityId, structureId, structureType, structureValid);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::enterCityChatRoom(int cityId, CreatureObject const &who)
+{
+	if (cityId > 0)
+	{
+		Chat::createRoom("System", false, getChatRoomPath(cityId), getChatRoomTitle(cityId));
+		std::string firstName;
+		size_t pos = 0;
+		IGNORE_RETURN(Unicode::getFirstToken(Unicode::wideToNarrow(who.getObjectName()), 0, pos, firstName));
+		Chat::invite(firstName, getChatRoomPath(cityId));
+		Chat::enterRoom(firstName, getChatRoomPath(cityId), false, false);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::reenterCityChatRoom(CreatureObject const &who)
+{
+	std::vector<int> const & cityIds = CityInterface::getCitizenOfCityId(who.getNetworkId());
+	if (!cityIds.empty())
+	{
+		int const cityId = cityIds.front();
+
+		std::string firstName;
+		size_t pos = 0;
+		IGNORE_RETURN(Unicode::getFirstToken(Unicode::wideToNarrow(who.getObjectName()), 0, pos, firstName));
+
+		std::string const cityChatRoomPath = getChatRoomPath(cityId);
+		Chat::exitRoom(firstName, cityChatRoomPath);
+		Chat::uninvite(firstName, cityChatRoomPath);
+		Chat::invite(firstName, cityChatRoomPath);
+		Chat::enterRoom(firstName, cityChatRoomPath, false, false);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::leaveCityChatRoom(int cityId, CreatureObject const &who)
+{
+	if (cityId > 0)
+	{
+		std::string firstName;
+		size_t pos = 0;
+		IGNORE_RETURN(Unicode::getFirstToken(Unicode::wideToNarrow(who.getObjectName()), 0, pos, firstName));
+		Chat::exitRoom(firstName, getChatRoomPath(cityId));
+		Chat::uninvite(firstName, getChatRoomPath(cityId));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::sendCityChat(CreatureObject const &who, Unicode::String const &text)
+{
+	std::vector<int> const & cityIds = CityInterface::getCitizenOfCityId(who.getNetworkId());
+	if (!cityIds.empty())
+	{
+		int const cityId = cityIds.front();
+
+		std::string firstName;
+		size_t pos = 0;
+		IGNORE_RETURN(Unicode::getFirstToken(Unicode::wideToNarrow(who.getObjectName()), 0, pos, firstName));
+		Chat::sendToRoom(firstName, getChatRoomPath(cityId), text, Unicode::String());
+	}
+}
+
+// ---------------------------------------------------------------------
+
+void CityInterface::onChatRoomCreate(std::string const &path)
+{
+	std::string const &prefix = getChatRoomPrefix();
+	if (!path.compare(0, prefix.length(), prefix))
+	{
+		int cityId = atoi(path.c_str()+prefix.length());
+		if (cityId)
+		{
+			std::vector<ServerObject *> players;
+			GameServer::getInstance().getObjectsWithClients(players);
+			for (std::vector<ServerObject *>::const_iterator i = players.begin(); i != players.end(); ++i)
+			{
+				if ((*i)->isAuthoritative() && (*i)->isPlayerControlled())
+				{
+					CreatureObject const *playerCreature = (*i)->asCreatureObject();
+					if (playerCreature)
+					{
+						std::vector<int> const & cityIds = CityInterface::getCitizenOfCityId(playerCreature->getNetworkId());
+						if (!cityIds.empty())
+						{
+							if (cityIds.front() == cityId)
+								enterCityChatRoom(cityId, *playerCreature);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::createAllCityChatRooms()
+{
+	std::set<int> cityIds;
+	std::vector<ServerObject *> players;
+	GameServer::getInstance().getObjectsWithClients(players);
+	for (std::vector<ServerObject *>::const_iterator i = players.begin(); i != players.end(); ++i)
+	{
+		if ((*i)->isAuthoritative() && (*i)->isPlayerControlled())
+		{
+			CreatureObject const *playerCreature = (*i)->asCreatureObject();
+			if (playerCreature)
+			{
+				std::vector<int> const & playerCityIds = CityInterface::getCitizenOfCityId(playerCreature->getNetworkId());
+				if (!playerCityIds.empty())
+					IGNORE_RETURN(cityIds.insert(playerCityIds.front()));
+			}
+		}
+	}
+	for (std::set<int>::const_iterator j = cityIds.begin(); j != cityIds.end(); ++j)
+	{
+		Chat::createRoom("System", false, getChatRoomPath(*j), getChatRoomTitle(*j));
+	}
+}
+
+// ----------------------------------------------------------------------
+// returns the number of citizens and city name that the mail was
+// sent to or -1 if insufficient permission to send mail to citizens
+std::pair<int, std::string> CityInterface::mailToCitizens(CreatureObject const &who, Unicode::String const &subject, Unicode::String const &message, Unicode::String const &oob)
+{
+	int count = -1;
+	std::string cityName;
+
+	// because of the bug that allows a player to be a citizen of more than one cities, we
+	// cannot just get the city that the player is a citizen of and check to see if he's the
+	// mayor of that city; we have to check every city and find one that he's mayor of
+	std::map<int, CityInfo> const & allCities = ServerUniverse::getInstance().getMasterCityObject()->getAllCityInfo();
+	for (std::map<int, CityInfo>::const_iterator j = allCities.begin(); j != allCities.end(); ++j)
+	{
+		CityInfo const &cityInfo = j->second;
+		if (cityInfo.getLeaderId() == who.getNetworkId())
+		{
+			cityName = cityInfo.getCityName();
+			count = 0;
+			std::map<std::pair<int, NetworkId>, CitizenInfo> const & allCitizens = ServerUniverse::getInstance().getMasterCityObject()->getAllCitizensInfo();
+			for (std::map<std::pair<int, NetworkId>, CitizenInfo>::const_iterator i = allCitizens.lower_bound(std::make_pair(j->first, NetworkId::cms_invalid)); i != allCitizens.end(); ++i)
+			{
+				if (i->first.first != j->first)
+					break;
+
+				Chat::sendPersistentMessage(Unicode::wideToNarrow(who.getEncodedObjectName()), i->second.m_citizenName, subject, message, oob);
+				++count;
+			}
+
+			break;
+		}
+	}
+
+	return std::make_pair(count, cityName);
+}
+
+// ----------------------------------------------------------------------
+// returns the number of citizens and city name that the mail was
+// sent to or -1 if insufficient permission to send mail to citizens
+std::pair<int, std::string> CityInterface::mailToCitizens(int cityId, Unicode::String const &subject, Unicode::String const &message, Unicode::String const &oob)
+{
+	std::string const cityName = CityInterface::getCityInfo(cityId).getCityName();
+	if (cityName.empty())
+		return std::make_pair(-1, std::string());
+
+	int count = 0;
+	std::map<std::pair<int, NetworkId>, CitizenInfo> const & allCitizens = ServerUniverse::getInstance().getMasterCityObject()->getAllCitizensInfo();
+	for (std::map<std::pair<int, NetworkId>, CitizenInfo>::const_iterator i = allCitizens.lower_bound(std::make_pair(cityId, NetworkId::cms_invalid)); i != allCitizens.end(); ++i)
+	{
+		if (i->first.first != cityId)
+			break;
+
+		Chat::sendPersistentMessage("City Hall", i->second.m_citizenName, subject, message, oob);
+		++count;
+	}
+
+	return std::make_pair(count, cityName);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::verifyCitizenName(NetworkId const &citizenId, std::string const &citizenName)
+{
+	std::vector<int> const & cityId = getCitizenOfCityId(citizenId);
+	for (std::vector<int>::const_iterator iterCityId = cityId.begin(); iterCityId != cityId.end(); ++iterCityId)
+	{
+		CitizenInfo const * const ci = getCitizenInfo(*iterCityId, citizenId);
+		if (!ci)
+			continue;
+
+		if (ci->m_citizenName == citizenName)
+			continue;
+
+		setCitizenInfo(*iterCityId, citizenId, citizenName, ci->m_citizenAllegiance, ci->m_citizenPermissions);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::checkForDualCitizenship()
+{
+	ServerUniverse::getInstance().getMasterCityObject()->checkForDualCitizenship();
+}
+
+// ----------------------------------------------------------------------
+
+PgcRatingInfo const * CityInterface::getPgcRating(NetworkId const &chroniclerId)
+{
+	return ServerUniverse::getInstance().getMasterCityObject()->getPgcRating(chroniclerId);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::getPgcChroniclerId(std::string const &chroniclerName, std::vector<NetworkId> &chroniclerIds)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->getPgcChroniclerId(chroniclerName, chroniclerIds);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::adjustPgcRating(NetworkId const &chroniclerId, std::string const &chroniclerName, int adjustment)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->adjustPgcRating(chroniclerId, chroniclerName, adjustment);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::adjustPgcRatingData(NetworkId const &chroniclerId, std::string const &chroniclerName, int index, int adjustment)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->adjustPgcRatingData(chroniclerId, chroniclerName, index, adjustment);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::setPgcRatingData(NetworkId const &chroniclerId, std::string const &chroniclerName, int index, int value)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->setPgcRatingData(chroniclerId, chroniclerName, index, value);
+}
+
+// ----------------------------------------------------------------------
+
+void CityInterface::verifyPgcChroniclerName(NetworkId const &chroniclerId, std::string const &chroniclerName)
+{
+	ServerUniverse::getInstance().getMasterCityObject()->verifyPgcChroniclerName(chroniclerId, chroniclerName);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/city/CityInterface.h b/engine/server/library/serverGame/src/shared/city/CityInterface.h
new file mode 100644
index 00000000..ac0c3785
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/city/CityInterface.h
@@ -0,0 +1,97 @@
+// ======================================================================
+//
+// CityInterface.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _CityInterface_H_
+#define _CityInterface_H_
+
+// ======================================================================
+
+class CreatureObject;
+class CitizenInfo;
+class CityInfo;
+class CityObject;
+class CityStructureInfo;
+class NetworkId;
+class PgcRatingInfo;
+class Vector;
+
+// ======================================================================
+
+class CityInterface // static
+{
+public:
+	static stdvector<int>::fwd const &getCitizenOfCityId(NetworkId const &citizenId);
+	static int getMilitiaOfCityId(NetworkId const &citizenId);
+	static void getAllCityIds(stdvector<int>::fwd &results);
+	static int findCityByName(std::string const &name);
+	static int findCityByCityHall(NetworkId const &cityHallId);
+	static int getCityAtLocation(std::string const &planetName, int x, int z, int radius);
+	static bool cityExists(int cityId);
+	static void getCitizenIds(int cityId, stdvector<NetworkId>::fwd &results);
+	static int getCitizenCount(int cityId);
+	static void getCityStructureIds(int cityId, stdvector<NetworkId>::fwd &results);
+	static CityInfo const &getCityInfo(int cityId);
+	static stdmap<int, CityInfo>::fwd const &getAllCityInfo();
+	static CitizenInfo const *getCitizenInfo(int cityId, NetworkId const &citizenId);
+	static stdmap<std::pair<int, NetworkId>, CitizenInfo>::fwd const &getAllCitizensInfo();
+	static CityStructureInfo const *getCityStructureInfo(int cityId, NetworkId const &structureId);
+	static stdmap<std::pair<int, NetworkId>, CityStructureInfo>::fwd const & getAllCityStructuresInfo();
+	static std::map<std::pair<std::string, int>, uint32> const & getGcwRegionDefenderCities();
+	static std::map<std::string, std::pair<int, int> > const & getGcwRegionDefenderCitiesCount();
+	static int getGcwRegionDefenderCitiesVersion();
+
+	static bool isValidCityName(std::string const &cityName);
+	static bool isCityMilitia(int cityId, NetworkId const &citizenId);
+	static int createCity(std::string const &cityName, NetworkId const &cityHallId, std::string const &cityPlanet, int x, int z, int radius, NetworkId const &leaderId, int incomeTax, int propertyTax, int salesTax, Vector const &travelLoc, int travelCost, bool travelInterplanetary, Vector const &cloneLoc, Vector const &cloneRespawn, NetworkId const &cloneRespawnCell, NetworkId const &cloneId);
+	static void removeCity(int cityId);
+	static void removeCitizen(int cityId, NetworkId const &citizenId, bool sendUpdateNotification = true);
+	static void removeCityStructure(int cityId, NetworkId const &structureId);
+	static void setCityName(int cityId, std::string const &cityName);
+	static void setCityHall(int cityId, NetworkId const &cityHallId);
+	static void setCityLocation(int cityId, std::string const &cityPlanet, int x, int z);
+	static void setCityRadius(int cityId, int radius);
+	static void setCityFaction(int cityId, uint32 faction, bool notifyCitizens);
+	static void setCityGcwDefenderRegion(int cityId, std::string const &gcwDefenderRegion, int timeJoined, bool notifyCitizens);
+	static void setCityCreationTime(int cityId, int creationTime);
+	static void setCityLeader(int cityId, NetworkId const &leaderId);
+	static void setCityIncomeTax(int cityId, int incomeTax);
+	static void setCityPropertyTax(int cityId, int propertyTax);
+	static void setCitySalesTax(int cityId, int salesTax);
+	static void setCityTravelInfo(int cityId, Vector const &travelLoc, int travelCost, bool travelInterplanetary);
+	static void setCityCloneInfo(int cityId, Vector const &cloneLoc, Vector const &cloneRespawn, NetworkId const &cloneRespawnCell, NetworkId const &cloneId);
+	static void setCitizenInfo(int cityId, NetworkId const &citizenId, std::string const &citizenName, NetworkId const &allegiance, int permissions);
+	static void setCitizenProfessionInfo(int cityId, NetworkId const &citizenId, std::string const &citizenProfessionSkillTemplate, int citizenLevel);
+	static void addCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName);
+	static void removeCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName);
+	static bool hasCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName);
+	static void getCitizenRank(int cityId, NetworkId const &citizenId, stdvector<std::string>::fwd &ranks);
+	static void setCitizenTitle(int cityId, NetworkId const &citizenId, std::string const &citizenTitle);
+	static void setCityStructureInfo(int cityId, NetworkId const &structureId, int structureType, bool structureValid);
+	static void enterCityChatRoom(int cityId, CreatureObject const &who);
+	static void reenterCityChatRoom(CreatureObject const &who);
+	static void leaveCityChatRoom(int cityId, CreatureObject const &who);
+	static void sendCityChat(CreatureObject const &who, Unicode::String const &text);
+	static void onChatRoomCreate(std::string const &path);
+	static void createAllCityChatRooms();
+	static std::pair<int, std::string> mailToCitizens(CreatureObject const &who, Unicode::String const &subject, Unicode::String const &message, Unicode::String const &oob);
+	static std::pair<int, std::string> mailToCitizens(int cityId, Unicode::String const &subject, Unicode::String const &message, Unicode::String const &oob);
+	static void verifyCitizenName(NetworkId const &citizenId, std::string const &citizenName);
+
+	static void checkForDualCitizenship();
+
+	static PgcRatingInfo const * getPgcRating(NetworkId const &chroniclerId);
+	static void getPgcChroniclerId(std::string const &chroniclerName, std::vector<NetworkId> &chroniclerIds);
+	static void adjustPgcRating(NetworkId const &chroniclerId, std::string const &chroniclerName, int adjustment);
+	static void adjustPgcRatingData(NetworkId const &chroniclerId, std::string const &chroniclerName, int index, int adjustment);
+	static void setPgcRatingData(NetworkId const &chroniclerId, std::string const &chroniclerName, int index, int value);
+	static void verifyPgcChroniclerName(NetworkId const &chroniclerId, std::string const &chroniclerName);
+};
+
+// ======================================================================
+
+#endif // _CityInterface_H_
diff --git a/engine/server/library/serverGame/src/shared/city/CityStringParser.cpp b/engine/server/library/serverGame/src/shared/city/CityStringParser.cpp
new file mode 100644
index 00000000..dfe068ec
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/city/CityStringParser.cpp
@@ -0,0 +1,376 @@
+// ======================================================================
+//
+// CityStringParser.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CityStringParser.h"
+
+#include "serverGame/PgcRatingInfo.h"
+#include "sharedFoundation/BitArray.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMath/Vector.h"
+
+// ======================================================================
+
+static void skipField(std::string const &source, unsigned int &pos)
+{
+	while (source[pos] && source[pos] != ':')
+		++pos;
+	if (source[pos] == ':')
+		++pos;
+}
+
+// ----------------------------------------------------------------------
+
+static void nextInt(std::string const &source, unsigned int &pos, int &ret)
+{
+	ret = atoi(source.c_str()+pos);
+	skipField(source, pos);
+}
+
+// ----------------------------------------------------------------------
+
+static void nextBool(std::string const &source, unsigned int &pos, bool &ret)
+{
+	ret = atoi(source.c_str()+pos) ? true : false;
+	skipField(source, pos);
+}
+
+// ----------------------------------------------------------------------
+
+static void nextFloat(std::string const &source, unsigned int &pos, float &ret)
+{
+	ret = static_cast<float>(atof(source.c_str()+pos));
+	skipField(source, pos);
+}
+
+// ----------------------------------------------------------------------
+
+static void nextString(std::string const &source, unsigned int &pos, std::string &ret)
+{
+	unsigned int oldPos = pos;
+	while (source[pos] && source[pos] != ':')
+		++pos;
+	ret = source.substr(oldPos, pos-oldPos);
+	if (source[pos] == ':')
+		++pos;
+}
+
+// ----------------------------------------------------------------------
+
+static void nextOid(std::string const &source, unsigned int &pos, NetworkId &ret)
+{
+	unsigned int oldPos = pos;
+	skipField(source, pos);
+	ret = NetworkId(source.substr(oldPos, pos-oldPos));
+}
+
+// ----------------------------------------------------------------------
+
+static void nextVector(std::string const &source, unsigned int &pos, Vector &ret)
+{
+	nextFloat(source, pos, ret.x);
+	nextFloat(source, pos, ret.y);
+	nextFloat(source, pos, ret.z);
+}
+
+// ======================================================================
+
+bool CityStringParser::parseCityInfo(std::string const &source, int &cityId, std::string &cityName, NetworkId &cityHallId, std::string &cityPlanet, int &x, int &z, int &radius, int &creationTime, NetworkId &leaderId, int &incomeTax, int &propertyTax, int &salesTax, Vector &travelLoc, int &travelCost, bool &travelInterplanetary, Vector &cloneLoc, Vector &cloneRespawn, NetworkId &cloneRespawnCell, NetworkId &cloneId)
+{
+	// need to parse different versions
+	if (source.find("v2:") == 0) // version 2
+	{
+		unsigned int pos = 3;
+		nextInt(source, pos, cityId);
+		nextString(source, pos, cityName);
+		nextOid(source, pos, cityHallId);
+		nextString(source, pos, cityPlanet);
+		nextInt(source, pos, x);
+		nextInt(source, pos, z);
+		nextInt(source, pos, radius);
+		nextInt(source, pos, creationTime);
+		nextOid(source, pos, leaderId);
+		nextInt(source, pos, incomeTax);
+		nextInt(source, pos, propertyTax);
+		nextInt(source, pos, salesTax);
+		nextVector(source, pos, travelLoc);
+		nextInt(source, pos, travelCost);
+		nextBool(source, pos, travelInterplanetary);
+		nextVector(source, pos, cloneLoc);
+		nextVector(source, pos, cloneRespawn);
+		nextOid(source, pos, cloneRespawnCell);
+		nextOid(source, pos, cloneId);
+	}
+	else // version 1
+	{
+		unsigned int pos = 0;
+		nextInt(source, pos, cityId);
+		nextString(source, pos, cityName);
+		nextOid(source, pos, cityHallId);
+		nextString(source, pos, cityPlanet);
+		nextInt(source, pos, x);
+		nextInt(source, pos, z);
+		nextInt(source, pos, radius);
+		creationTime = 0;
+		nextOid(source, pos, leaderId);
+		nextInt(source, pos, incomeTax);
+		nextInt(source, pos, propertyTax);
+		nextInt(source, pos, salesTax);
+		nextVector(source, pos, travelLoc);
+		nextInt(source, pos, travelCost);
+		nextBool(source, pos, travelInterplanetary);
+		nextVector(source, pos, cloneLoc);
+		nextVector(source, pos, cloneRespawn);
+		nextOid(source, pos, cloneRespawnCell);
+		nextOid(source, pos, cloneId);
+	}
+
+	bool const ok = cityId && !cityName.empty() && !cityPlanet.empty() && cityHallId != NetworkId::cms_invalid;
+	WARNING(!ok, ("CityStringParser::parseCityInfo: bad string [%s]", source.c_str()));
+	return ok;
+}
+
+// ----------------------------------------------------------------------
+
+bool CityStringParser::parseCitizenInfo(std::string const &source, int &cityId, NetworkId &citizenId, std::string &citizenName, std::string &citizenProfessionSkillTemplate, int &citizenLevel, int &citizenPermissions, BitArray &citizenRank, std::string &citizenTitle, NetworkId &citizenAllegiance)
+{
+	// need to parse different versions
+	if (source.find("v3:") == 0) // version 3 is to store pgc rating info
+	{
+		return false;
+	}
+
+	if (source.find("v2:") == 0) // version 2
+	{
+		unsigned int pos = 3;
+		nextInt(source, pos, cityId);
+		nextOid(source, pos, citizenId);
+		nextString(source, pos, citizenName);
+		nextString(source, pos, citizenProfessionSkillTemplate);
+		nextInt(source, pos, citizenLevel);
+		nextString(source, pos, citizenTitle);
+		nextOid(source, pos, citizenAllegiance);
+		nextInt(source, pos, citizenPermissions);
+
+		std::string rankStr;
+		nextString(source, pos, rankStr);
+		citizenRank.setFromDbTextString(rankStr.c_str());
+	}
+	else // version 1
+	{
+		unsigned int pos = 0;
+		nextInt(source, pos, cityId);
+		nextOid(source, pos, citizenId);
+		nextString(source, pos, citizenName);
+		citizenProfessionSkillTemplate.clear();
+		citizenLevel = 0;
+		citizenTitle.clear();
+		nextOid(source, pos, citizenAllegiance);
+		nextInt(source, pos, citizenPermissions);
+		citizenRank.clear();
+	}
+
+	bool const ok = cityId && citizenId != NetworkId::cms_invalid && !citizenName.empty();
+	WARNING(!ok, ("CityStringParser::parseCitizenInfo: bad string [%s]", source.c_str()));
+	return ok;
+}
+
+// ----------------------------------------------------------------------
+
+bool CityStringParser::parseCityStructureInfo(std::string const &source, int &cityId, NetworkId &structureId, int &structureType, bool &structureValid)
+{
+	unsigned int pos = 0;
+	nextInt(source, pos, cityId);
+	nextOid(source, pos, structureId);
+	nextInt(source, pos, structureType);
+	nextBool(source, pos, structureValid);
+	bool ok = cityId && structureId != NetworkId::cms_invalid;
+	WARNING(!ok, ("CityStringParser::parseCityStructureInfo: bad string [%s]", source.c_str()));
+	return ok;
+}
+
+// ----------------------------------------------------------------------
+
+bool CityStringParser::parsePgcRatingInfo(std::string const &source, NetworkId &chroniclerId, PgcRatingInfo &pgcRatingInfo)
+{
+	if (source.find("v3:") == 0) // version 3 is to store pgc rating info
+	{
+		unsigned int pos = 3;
+		nextOid(source, pos, chroniclerId);
+		nextString(source, pos, pgcRatingInfo.m_chroniclerName);
+
+		NetworkId temp;
+
+		nextOid(source, pos, temp);
+		pgcRatingInfo.m_ratingCount = temp.getValue();
+
+		nextOid(source, pos, temp);
+		pgcRatingInfo.m_ratingTotal = temp.getValue();
+
+		nextInt(source, pos, pgcRatingInfo.m_lastRatingTime);
+
+		for (size_t i = 0, max = pgcRatingInfo.m_data.size(); ((i < PgcRatingInfo::ms_PgcRatingDataSize) && (i < max)); ++i)
+		{
+			nextInt(source, pos, pgcRatingInfo.m_data[i]);
+		}
+
+		bool const ok = chroniclerId != NetworkId::cms_invalid && !pgcRatingInfo.m_chroniclerName.empty();
+		WARNING(!ok, ("CityStringParser::parsePgcRatingInfo: bad string [%s]", source.c_str()));
+		return ok;
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void CityStringParser::buildCitySpec(int cityId, std::string const &cityName, NetworkId const &cityHallId, std::string const &cityPlanet, int x, int z, int radius, int creationTime, NetworkId const &leaderId, int incomeTax, int propertyTax, int salesTax, Vector const &travelLoc, int travelCost, bool travelInterplanetary, Vector const &cloneLoc, Vector const &cloneRespawn, NetworkId const &cloneRespawnCell, NetworkId const &cloneId, std::string &result)
+{
+	FATAL(cityName.length() > 25, ("CityStringParser::buildNameSpec: bad city name"));
+
+	// DB column to store information is VARCHAR2(500)
+	char buffer[501]; // 500 chars + terminating \0
+
+	// only write out newer version if there is actually new version information
+	if (creationTime > 0) // version 2
+	{
+		snprintf(buffer, sizeof(buffer), "v2:%d:%s:%s:%s:%d:%d:%d:%d:%s:%d:%d:%d:%.10g:%.10g:%.10g:%d:%d:%.10g:%.10g:%.10g:%.10g:%.10g:%.10g:%s:%s",
+			cityId,
+			cityName.c_str(),
+			cityHallId.getValueString().c_str(),
+			cityPlanet.c_str(),
+			x, z, radius,
+			creationTime,
+			leaderId.getValueString().c_str(),
+			incomeTax, propertyTax, salesTax,
+			static_cast<double>(travelLoc.x), static_cast<double>(travelLoc.y), static_cast<double>(travelLoc.z),
+			travelCost,
+			travelInterplanetary ? 1 : 0,
+			static_cast<double>(cloneLoc.x), static_cast<double>(cloneLoc.y), static_cast<double>(cloneLoc.z),
+			static_cast<double>(cloneRespawn.x), static_cast<double>(cloneRespawn.y), static_cast<double>(cloneRespawn.z),
+			cloneRespawnCell.getValueString().c_str(),
+			cloneId.getValueString().c_str());
+	}
+	else // version 1
+	{
+		snprintf(buffer, sizeof(buffer), "%d:%s:%s:%s:%d:%d:%d:%s:%d:%d:%d:%.10g:%.10g:%.10g:%d:%d:%.10g:%.10g:%.10g:%.10g:%.10g:%.10g:%s:%s",
+			cityId,
+			cityName.c_str(),
+			cityHallId.getValueString().c_str(),
+			cityPlanet.c_str(),
+			x, z, radius,
+			leaderId.getValueString().c_str(),
+			incomeTax, propertyTax, salesTax,
+			static_cast<double>(travelLoc.x), static_cast<double>(travelLoc.y), static_cast<double>(travelLoc.z),
+			travelCost,
+			travelInterplanetary ? 1 : 0,
+			static_cast<double>(cloneLoc.x), static_cast<double>(cloneLoc.y), static_cast<double>(cloneLoc.z),
+			static_cast<double>(cloneRespawn.x), static_cast<double>(cloneRespawn.y), static_cast<double>(cloneRespawn.z),
+			cloneRespawnCell.getValueString().c_str(),
+			cloneId.getValueString().c_str());
+	}
+
+	// absolutely, positively make sure that there is no more than 500
+	// characters in buffer (not including the terminating \0) or the DB
+	// will ***CRASH*** because the column is defined as VARCHAR2(500)
+	buffer[500] = '\0';
+	result = buffer;
+}
+
+// ----------------------------------------------------------------------
+
+void CityStringParser::buildCitizenSpec(int const cityId, NetworkId const &citizenId, std::string const &citizenName, std::string const &citizenProfessionSkillTemplate, int const citizenLevel, int const citizenPermissions, BitArray const &citizenRank, std::string const &citizenTitle, NetworkId const &citizenAllegiance, std::string &result)
+{
+	FATAL(citizenTitle.length() > 25, ("CityStringParser::buildMemberSpec: bad title"));
+
+	std::string rankStr;
+	citizenRank.getAsDbTextString(rankStr);
+
+	// DB column to store information is VARCHAR2(500)
+	char buffer[501]; // 500 chars + terminating \0
+
+	// only write out newer version if there is actually new version information
+	if ((citizenLevel > 0) || !rankStr.empty() || !citizenProfessionSkillTemplate.empty() || !citizenTitle.empty()) // version 2
+	{
+		snprintf(buffer, sizeof(buffer), "v2:%d:%s:%s:%s:%d:%s:%s:%d:%s",
+			cityId,
+			citizenId.getValueString().c_str(),
+			citizenName.c_str(),
+			citizenProfessionSkillTemplate.c_str(),
+			citizenLevel,
+			citizenTitle.c_str(),
+			citizenAllegiance.getValueString().c_str(),
+			citizenPermissions,
+			rankStr.c_str());
+	}
+	else // version 1
+	{
+		snprintf(buffer, sizeof(buffer), "%d:%s:%s:%s:%d",
+			cityId,
+			citizenId.getValueString().c_str(),
+			citizenName.c_str(),
+			citizenAllegiance.getValueString().c_str(),
+			citizenPermissions);
+	}
+
+	// absolutely, positively make sure that there is no more than 500
+	// characters in buffer (not including the terminating \0) or the DB
+	// will ***CRASH*** because the column is defined as VARCHAR2(500)
+	buffer[500] = '\0';
+	result = buffer;
+}
+
+// ----------------------------------------------------------------------
+
+void CityStringParser::buildCityStructureSpec(int cityId, NetworkId const &structureId, int structureType, bool structureValid, std::string &result)
+{
+	char buffer[256];
+	// max field lengths - 11:21:11:1
+	snprintf(buffer, sizeof(buffer)-1, "%d:%s:%d:%d",
+		cityId,
+		structureId.getValueString().c_str(),
+		structureType,
+		structureValid ? 1 : 0);
+	buffer[sizeof(buffer)-1] = '\0';
+	result = buffer;
+}
+
+// ----------------------------------------------------------------------
+
+void CityStringParser::buildPgcRatingSpec(NetworkId const &chroniclerId, PgcRatingInfo const &pgcRatingInfo, std::string &result)
+{
+	// DB column to store information is VARCHAR2(500)
+	char buffer[501]; // 500 chars + terminating \0
+
+	std::string pgcData;
+	for (size_t i = 0, max = pgcRatingInfo.m_data.size(); ((i < PgcRatingInfo::ms_PgcRatingDataSize) && (i < max)); ++i)
+	{
+		if (!pgcData.empty())
+			pgcData += ":";
+
+		snprintf(buffer, sizeof(buffer), "%d", pgcRatingInfo.m_data[i]);
+		pgcData += buffer;
+	}
+
+	snprintf(buffer, sizeof(buffer), "v3:%s:%s:%s:%s:%d:%s",
+		chroniclerId.getValueString().c_str(),
+		pgcRatingInfo.m_chroniclerName.c_str(),
+		NetworkId(pgcRatingInfo.m_ratingCount).getValueString().c_str(),
+		NetworkId(pgcRatingInfo.m_ratingTotal).getValueString().c_str(),
+		pgcRatingInfo.m_lastRatingTime,
+		pgcData.c_str());
+
+	// absolutely, positively make sure that there is no more than 500
+	// characters in buffer (not including the terminating \0) or the DB
+	// will ***CRASH*** because the column is defined as VARCHAR2(500)
+	buffer[500] = '\0';
+	result = buffer;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/city/CityStringParser.h b/engine/server/library/serverGame/src/shared/city/CityStringParser.h
new file mode 100644
index 00000000..226feea8
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/city/CityStringParser.h
@@ -0,0 +1,41 @@
+// ======================================================================
+//
+// CityStringParser.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _CityStringParser_H_
+#define _CityStringParser_H_
+
+// ======================================================================
+
+class BitArray;
+class NetworkId;
+class PgcRatingInfo;
+class Vector;
+
+// ======================================================================
+
+class CityStringParser // static
+{
+public:
+	static bool parseCityInfo(std::string const &source, int &cityId, std::string &cityName, NetworkId &cityHallId, std::string &cityPlanet, int &x, int &z, int &radius, int &creationTime, NetworkId &leaderId, int &incomeTax, int &propertyTax, int &salesTax, Vector &travelLoc, int &travelCost, bool &travelInterplanetary, Vector &cloneLoc, Vector &cloneRespawn, NetworkId &cloneRespawnCell, NetworkId &cloneId);
+	static bool parseCitizenInfo(std::string const &source, int &cityId, NetworkId &citizenId, std::string &citizenName, std::string &citizenProfessionSkillTemplate, int &citizenLevel, int &citizenPermissions, BitArray &citizenRank, std::string &citizenTitle, NetworkId &citizenAllegiance);
+	static bool parseCityStructureInfo(std::string const &source, int &cityId, NetworkId &structureId, int &structureType, bool &structureValid);
+	static bool parsePgcRatingInfo(std::string const &source, NetworkId &chroniclerId, PgcRatingInfo &pgcRatingInfo);
+
+	static void buildCitySpec(int cityId, std::string const &cityName, NetworkId const &cityHallId, std::string const &cityPlanet, int x, int z, int radius, int creationTime, NetworkId const &leaderId, int incomeTax, int propertyTax, int salesTax, Vector const &travelLoc, int travelCost, bool travelInterplanetary, Vector const &cloneLoc, Vector const &cloneRespawn, NetworkId const &cloneRespawnCell, NetworkId const &cloneId, std::string &result);
+	static void buildCitizenSpec(int cityId, NetworkId const &citizenId, std::string const &citizenName, std::string const &citizenProfessionSkillTemplate, int citizenLevel, int citizenPermissions, BitArray const &citizenRank, std::string const &citizenTitle, NetworkId const &citizenAllegiance, std::string &result);
+	static void buildCityStructureSpec(int cityId, NetworkId const &structureId, int structureType, bool structureValid, std::string &result);
+	static void buildPgcRatingSpec(NetworkId const &chroniclerId, PgcRatingInfo const &pgcRatingInfo, std::string &result);
+
+private:
+	CityStringParser();
+};
+
+// ======================================================================
+
+#endif // _CityStringParser_H_
+
diff --git a/engine/server/library/serverGame/src/shared/city/CityStructureInfo.cpp b/engine/server/library/serverGame/src/shared/city/CityStructureInfo.cpp
new file mode 100644
index 00000000..79359ee0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/city/CityStructureInfo.cpp
@@ -0,0 +1,49 @@
+// ======================================================================
+//
+// CityStructureInfo.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CityStructureInfo.h"
+
+#include "Archive/Archive.h"
+
+// ======================================================================
+
+namespace Archive
+{
+	void get(ReadIterator & source, CityStructureInfo & target)
+	{
+		get(source, target.m_structureType);
+		get(source, target.m_structureValid);
+	}
+
+	void put(ByteStream & target, const CityStructureInfo & source)
+	{
+		put(target, source.m_structureType);
+		put(target, source.m_structureValid);
+	}
+}
+
+// ======================================================================
+
+bool CityStructureInfo::operator== (const CityStructureInfo& rhs) const
+{
+	if (this == &rhs)
+		return true;
+
+	return ((m_structureType == rhs.m_structureType) &&
+		(m_structureValid == rhs.m_structureValid));
+}
+
+// ----------------------------------------------------------------------
+
+bool CityStructureInfo::operator!= (const CityStructureInfo& rhs) const
+{
+	return !operator==(rhs);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/city/CityStructureInfo.h b/engine/server/library/serverGame/src/shared/city/CityStructureInfo.h
new file mode 100644
index 00000000..f99738da
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/city/CityStructureInfo.h
@@ -0,0 +1,79 @@
+// ======================================================================
+//
+// CityStructureInfo.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _CityStructureInfo_H_
+#define _CityStructureInfo_H_
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkId.h"
+
+class CityStructureInfo;
+
+// ======================================================================
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+
+	void get(ReadIterator & source, CityStructureInfo & target);
+	void put(ByteStream & target, const CityStructureInfo & source);
+}
+
+// ======================================================================
+
+class CityStructureInfo
+{
+	friend void Archive::get(ReadIterator & source, CityStructureInfo & target);
+	friend void Archive::put(ByteStream & target, const CityStructureInfo & source);
+
+public:
+	bool operator== (const CityStructureInfo& rhs) const;
+	bool operator!= (const CityStructureInfo& rhs) const;
+
+	int getStructureType() const;
+	bool getStructureValid() const;
+	void setStructureType(int structureType);
+	void setStructureValid(bool structureValid);
+private:
+	int m_structureType;
+	bool m_structureValid;
+};
+
+// ----------------------------------------------------------------------
+
+inline int CityStructureInfo::getStructureType() const
+{
+	return m_structureType;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool CityStructureInfo::getStructureValid() const
+{
+	return m_structureValid;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityStructureInfo::setStructureType(int structureType)
+{
+	m_structureType = structureType;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CityStructureInfo::setStructureValid(bool structureValid)
+{
+	m_structureValid = structureValid;
+}
+
+// ======================================================================
+
+#endif // _CityStructureInfo_H_
diff --git a/engine/server/library/serverGame/src/shared/city/PgcRatingInfo.cpp b/engine/server/library/serverGame/src/shared/city/PgcRatingInfo.cpp
new file mode 100644
index 00000000..403df9a8
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/city/PgcRatingInfo.cpp
@@ -0,0 +1,59 @@
+// ======================================================================
+//
+// PgcRatingInfo.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PgcRatingInfo.h"
+
+#include "Archive/Archive.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+// ======================================================================
+
+namespace Archive
+{
+	void get(ReadIterator & source, PgcRatingInfo & target)
+	{
+		get(source, target.m_chroniclerName);
+		get(source, target.m_ratingCount);
+		get(source, target.m_ratingTotal);
+		get(source, target.m_lastRatingTime);
+		get(source, target.m_data);
+	}
+
+	void put(ByteStream & target, const PgcRatingInfo & source)
+	{
+		put(target, source.m_chroniclerName);
+		put(target, source.m_ratingCount);
+		put(target, source.m_ratingTotal);
+		put(target, source.m_lastRatingTime);
+		put(target, source.m_data);
+	}
+}
+
+// ======================================================================
+
+bool PgcRatingInfo::operator== (const PgcRatingInfo& rhs) const
+{
+	if (this == &rhs)
+		return true;
+
+	return ((m_chroniclerName == rhs.m_chroniclerName) &&
+		(m_ratingCount == rhs.m_ratingCount) &&
+		(m_ratingTotal == rhs.m_ratingTotal) &&
+		(m_lastRatingTime == rhs.m_lastRatingTime) &&
+		(m_data == rhs.m_data));
+}
+
+// ----------------------------------------------------------------------
+
+bool PgcRatingInfo::operator!= (const PgcRatingInfo& rhs) const
+{
+	return !operator==(rhs);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/city/PgcRatingInfo.h b/engine/server/library/serverGame/src/shared/city/PgcRatingInfo.h
new file mode 100644
index 00000000..82e0d4c3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/city/PgcRatingInfo.h
@@ -0,0 +1,45 @@
+// ======================================================================
+//
+// PgcRatingInfo.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _PgcRatingInfo_H_
+#define _PgcRatingInfo_H_
+
+// ======================================================================
+
+class PgcRatingInfo
+{
+public:
+	static const size_t ms_PgcRatingDataSize = 20;
+
+	PgcRatingInfo() : m_chroniclerName(), m_ratingCount(0), m_ratingTotal(0), m_lastRatingTime(0), m_data(ms_PgcRatingDataSize, 0) {};
+
+	bool operator== (const PgcRatingInfo& rhs) const;
+	bool operator!= (const PgcRatingInfo& rhs) const;
+
+public:
+	std::string m_chroniclerName;
+	int64 m_ratingCount;
+	int64 m_ratingTotal;
+	int m_lastRatingTime;
+	std::vector<int> m_data;
+};
+
+// ======================================================================
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+
+	void get(ReadIterator & source, PgcRatingInfo & target);
+	void put(ByteStream & target, const PgcRatingInfo & source);
+}
+
+// ======================================================================
+
+#endif // _PgcRatingInfo_H_
diff --git a/engine/server/library/serverGame/src/shared/collision/CollisionCallbacks.cpp b/engine/server/library/serverGame/src/shared/collision/CollisionCallbacks.cpp
new file mode 100644
index 00000000..99c4f3cb
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/collision/CollisionCallbacks.cpp
@@ -0,0 +1,144 @@
+// ======================================================================
+//
+// CollisionCallbacks.cpp
+// tford
+//
+// copyright 2004, sony online entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CollisionCallbacks.h"
+
+#include "serverGame/ShipController.h"
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/CrcLowerString.h"
+#include "sharedGame/CollisionCallbackManager.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedNetworkMessages/MessageQueueUpdateShipOnCollision.h"
+#include "sharedMath/Transform.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/ShipUpdateTransformCollisionMessage.h"
+#include "sharedObject/CellProperty.h"
+
+// ======================================================================
+
+namespace CollisionCallbacksNamespace
+{
+	void remove();
+	int convertObjectToIndex(Object * const object);
+	bool onHitDoCollisionWith(Object * const object, Object * const wasHitByThisObject);
+	bool onDoCollisionWithTerrain(Object * const object);
+}
+
+using namespace CollisionCallbacksNamespace;
+
+// ======================================================================
+
+void CollisionCallbacks::install()
+{
+	CollisionCallbackManager::install();
+
+	CollisionCallbackManager::registerConvertObjectToIndexFunction(CollisionCallbacksNamespace::convertObjectToIndex);
+
+	int const shipFighter = static_cast<int>(SharedObjectTemplate::GOT_ship_fighter);
+	int const shipCapital = static_cast<int>(SharedObjectTemplate::GOT_ship_capital);
+	int const shipStation = static_cast<int>(SharedObjectTemplate::GOT_ship_station);
+	int const shipTransport = static_cast<int>(SharedObjectTemplate::GOT_ship_transport);
+	int const asteroid = static_cast<int>(SharedObjectTemplate::GOT_misc_asteroid);
+	int const miningAsteroidStatic = static_cast<int>(SharedObjectTemplate::GOT_ship_mining_asteroid_static);
+	int const miningAsteroidDynamic = static_cast<int>(SharedObjectTemplate::GOT_ship_mining_asteroid_dynamic);
+
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, shipFighter, shipCapital);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, shipFighter, shipStation);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, shipFighter, shipTransport);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, shipFighter, asteroid);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, shipFighter, miningAsteroidStatic);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, shipFighter, miningAsteroidDynamic);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, shipCapital, shipCapital);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, shipCapital, shipStation);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, shipCapital, shipTransport);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, shipCapital, asteroid);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, shipTransport, shipCapital);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, shipTransport, shipStation);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, shipTransport, shipTransport);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, shipTransport, asteroid);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, shipTransport, miningAsteroidStatic);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, shipTransport, miningAsteroidDynamic);
+
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, miningAsteroidDynamic, miningAsteroidStatic);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, miningAsteroidDynamic, shipCapital);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, miningAsteroidDynamic, shipTransport);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, miningAsteroidDynamic, asteroid);
+	CollisionCallbackManager::registerOnHitFunction(CollisionCallbacksNamespace::onHitDoCollisionWith, miningAsteroidDynamic, shipStation);
+
+	//CollisionCallbackManager::registerDoCollisionWithTerrainFunction(CollisionCallbacksNamespace::onDoCollisionWithTerrain);
+
+	ExitChain::add(CollisionCallbacksNamespace::remove, "CollisionCallbacks");
+}
+
+// ======================================================================
+
+void CollisionCallbacksNamespace::remove()
+{ }
+
+// ----------------------------------------------------------------------
+
+int CollisionCallbacksNamespace::convertObjectToIndex(Object * const object)
+{
+	FATAL(!object, ("CollisionCallbacksNamespace::convertObjectToIndex: object == NULL."));
+
+	ServerObject const * serverObject = object->asServerObject();
+	if (serverObject)
+		return serverObject->getGameObjectType();
+
+	return SharedObjectTemplate::GOT_none;
+}
+
+// ----------------------------------------------------------------------
+
+bool CollisionCallbacksNamespace::onHitDoCollisionWith(Object * const object, Object * const wasHitByThisObject)
+{
+	DEBUG_WARNING(!object, ("CollisionCallbacksNamespace::onHitDoCollisionWith: Object == NULL"));
+	DEBUG_WARNING(!wasHitByThisObject, ("CollisionCallbacksNamespace::onHitDoCollisionWith: wasHitByThisObject == NULL"));
+
+	ShipObject * shipObject = safe_cast<ShipObject *>(object);
+	DEBUG_WARNING(!shipObject, ("CollisionCallbacksNamespace::onHitDoCollisionWith: shipObject == NULL"));
+
+	CollisionCallbackManager::Result result;
+	if (CollisionCallbackManager::intersectAndReflect(object, wasHitByThisObject, result))
+	{
+		ShipController * const shipController = static_cast<ShipController *>(shipObject->getController());
+		NOT_NULL(shipController);
+
+		shipController->respondToCollision(result.m_deltaToMoveBack_p, result.m_newReflection_p, result.m_normalOfSurface_p);
+
+		return true;
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool CollisionCallbacksNamespace::onDoCollisionWithTerrain(Object * const object)
+{
+	DEBUG_FATAL (!object, ("CollisionCallbacksNamespace::onDoCollisionWithTerrain: Object == NULL"));
+
+	ShipObject * shipObject = safe_cast<ShipObject *>(object);
+	DEBUG_FATAL (!shipObject, ("CollisionCallbacksNamespace::onDoCollisionWithTerrain: shipObject == NULL"));
+
+	CollisionCallbackManager::Result result;
+	if (CollisionCallbackManager::intersectAndReflectWithTerrain(object, result))
+	{
+		ShipController * const shipController = safe_cast<ShipController *>(shipObject->getController());
+		NOT_NULL(shipController);
+
+		shipController->respondToCollision(result.m_deltaToMoveBack_p, result.m_newReflection_p, result.m_normalOfSurface_p);
+		return true;
+	}
+	return false;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/collision/CollisionCallbacks.h b/engine/server/library/serverGame/src/shared/collision/CollisionCallbacks.h
new file mode 100644
index 00000000..1a95596a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/collision/CollisionCallbacks.h
@@ -0,0 +1,30 @@
+// ======================================================================
+//
+// CollisionCallbacks.h
+// Copyright 2004, Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef INCLUDED_CollisionCallbacks_H
+#define INCLUDED_CollisionCallbacks_H
+
+// ======================================================================
+
+class Object;
+
+
+class CollisionCallbacks
+{
+public:
+	static void install();
+private:
+	CollisionCallbacks();
+	CollisionCallbacks(CollisionCallbacks const & copy);
+	CollisionCallbacks & operator = (CollisionCallbacks const & copy);
+};
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/command/CommandCppFuncs.cpp b/engine/server/library/serverGame/src/shared/command/CommandCppFuncs.cpp
new file mode 100644
index 00000000..6ab535ed
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/command/CommandCppFuncs.cpp
@@ -0,0 +1,9875 @@
+// ======================================================================
+//
+// CommandCppFuncs.cpp
+// Copyright 2002-2004, Sony Online Entertainment, Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CommandCppFuncs.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/BiographyManager.h"
+#include "serverGame/BuildingObject.h"
+#include "serverGame/BuffManager.h"
+#include "serverGame/CellObject.h"
+#include "serverGame/CharacterMatchManager.h"
+#include "serverGame/Chat.h"
+#include "serverGame/CitizenInfo.h"
+#include "serverGame/CityInfo.h"
+#include "serverGame/CityInterface.h"
+#include "serverGame/Client.h"
+#include "serverGame/CommandStringId.h"
+#include "serverGame/CommandQueue.h"
+#include "serverGame/CommoditiesMarket.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ConsoleManager.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureController.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/DraftSchematicObject.h"
+#include "serverGame/FactoryObject.h"
+#include "serverGame/FormManagerServer.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/GroupStringId.h"
+#include "serverGame/GuildInterface.h"
+#include "serverGame/GuildMemberInfo.h"
+#include "serverGame/HarvesterInstallationObject.h"
+#include "serverGame/ServerImageDesignerManager.h"
+#include "serverGame/ManufactureSchematicObject.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/ObserveTracker.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ProsePackageManagerServer.h"
+#include "serverGame/ReportManager.h"
+#include "serverGame/ResourceContainerObject.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerAsteroidManager.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipController.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/TaskGetAttributes.h"
+#include "serverGame/VeteranRewardManager.h"
+#include "serverNetworkMessages/DownloadCharacterMessage.h"
+#include "serverNetworkMessages/ExchangeListCreditsMessage.h"
+#include "serverNetworkMessages/GameConnectionServerMessages.h"
+#include "serverNetworkMessages/GroupMemberParam.h"
+#include "serverNetworkMessages/UploadCharacterMessage.h"
+#include "serverNetworkMessages/TeleportToMessage.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptDictionary.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedCollision/Footprint.h"
+#include "sharedFile/TreeFile.h"
+#include "sharedFoundation/CalendarTime.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/CrcLowerString.h"
+#include "sharedFoundation/DynamicVariableLocationData.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedGame/CitizenRankDataTable.h"
+#include "sharedGame/Command.h"
+#include "sharedGame/CommandTable.h"
+#include "sharedGame/CustomizationManager.h"
+#include "sharedGame/GroupPickupPoint.h"
+#include "sharedGame/GuildRankDataTable.h"
+#include "sharedGame/PlayerFormationManager.h"
+#include "sharedGame/GameLanguageManager.h"
+#include "sharedGame/GameObjectTypes.h"
+#include "sharedGame/TravelPoint.h"
+#include "sharedUtility/Location.h"
+#include "sharedGame/MatchMakingCharacterPreferenceId.h"
+#include "sharedGame/MatchMakingCharacterProfileId.h"
+#include "sharedGame/MatchMakingId.h"
+#include "sharedGame/MoodManager.h"
+#include "sharedGame/OutOfBandPackager.h"
+#include "sharedGame/PlatformFeatureBits.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/Quest.h"
+#include "sharedGame/QuestManager.h"
+#include "sharedGame/SharedStringIds.h"
+#include "sharedGame/ShipChassisSlotType.h"
+#include "sharedGame/SocialsManager.h"
+#include "sharedGame/SpatialChatManager.h"
+#include "sharedGame/TextIterator.h"
+#include "sharedGame/Waypoint.h"
+#include "sharedLog/Log.h"
+#include "sharedMath/MultiShape.h"
+#include "sharedNetworkMessages/CharacterSheetResponseMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatRequestLog.h"
+#include "sharedNetworkMessages/ClientEffectMessages.h"
+#include "sharedNetworkMessages/ConsoleChannelMessages.h"
+#include "sharedNetworkMessages/EditAppearanceMessage.h"
+#include "sharedNetworkMessages/EditStatsMessage.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/MessageQueueCombatSpam.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlotsQueryResponse.h"
+#include "sharedNetworkMessages/MessageQueueGenericIntResponse.h"
+#include "sharedNetworkMessages/MessageQueueGenericResponse.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedNetworkMessages/MessageQueueNetworkId.h"
+#include "sharedNetworkMessages/MessageQueuePosture.h"
+#include "sharedNetworkMessages/MessageQueueSitOnObject.h"
+#include "sharedNetworkMessages/MessageQueueSpatialChat.h"
+#include "sharedObject/CachedNetworkId.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/ContainedByProperty.h"
+#include "sharedObject/CustomizationData.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/PaletteColorCustomizationVariable.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/SlottedContainmentProperty.h"
+#include "sharedObject/VolumeContainer.h"
+#include "sharedSkillSystem/SkillManager.h"
+#include "sharedSkillSystem/SkillObject.h"
+#include "sharedTerrain/TerrainObject.h"
+
+#include <cstdlib>
+
+namespace CommandCppFuncsNamespace
+{
+	const std::string BEAST_SCRIPT = "ai.beast";
+
+	void internalSetBoosterOnOff(NetworkId const & actor, bool onOff)
+	{
+		ServerObject * const actorServerObj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(actor));
+		CreatureObject * const actorCreature = actorServerObj != NULL ? actorServerObj->asCreatureObject() : NULL;
+		
+		if (actorCreature == NULL)
+			return;
+		
+		ShipObject * const shipObject = actorCreature->getPilotedShip();
+		if (shipObject == NULL)
+			return;
+		
+		if (!shipObject->isSlotInstalled(ShipChassisSlotType::SCST_booster))
+		{
+			Chat::sendSystemMessage(*actorCreature, SharedStringIds::no_booster, Unicode::emptyString);
+			return;
+		}
+		
+		if (!shipObject->isComponentFunctional(ShipChassisSlotType::SCST_booster))
+		{
+			Chat::sendSystemMessage(*actorCreature, SharedStringIds::booster_disabled, Unicode::emptyString);
+			return;
+		}
+
+		if (onOff && shipObject->getBoosterEnergyCurrent() < shipObject->getBoosterEnergyRechargeRate())
+		{		
+			Chat::sendSystemMessage(*actorCreature, SharedStringIds::booster_low_energy, Unicode::emptyString);
+			return;
+		}
+
+		if (onOff && !shipObject->isBoosterReady())
+		{
+			Chat::sendSystemMessage(*actorCreature, SharedStringIds::booster_not_ready, Unicode::emptyString);
+			return;
+		}
+
+		shipObject->setComponentActive(ShipChassisSlotType::SCST_booster, onOff);
+		shipObject->restartBoosterTimer();
+	}
+
+	ServerObject const *getFirstParentInWorldOrPlayer(ServerObject const *o)
+	{
+		while (o && !o->isInWorld() && !o->isPlayerControlled())
+			o = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*o));
+		return o;
+	}
+
+	ServerObject const *getFirstCreatureContainer(ServerObject const *o)
+	{
+		while (o && !o->isInWorld() && !o->asCreatureObject())
+			o = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*o));
+		return o;
+	}
+
+
+	ShipObject *getAttachedShip(CreatureObject *creature)
+	{
+		// The "attached" ship is the ship which must move along with the creature.
+		// This means if the creature is piloting, the ship is is piloting,
+		// or the containing ship if the creature is the ship's owner.
+		ShipObject * const ship = ShipObject::getContainingShipObject(creature);
+		if (   ship
+		    && (   ship->getOwnerId() == creature->getNetworkId()
+		        || creature->getPilotedShip() == ship))
+			return ship;
+		return 0;
+	}
+
+	CreatureObject * findAndResolveCreatureByNetworkId(NetworkId const & targetId)
+	{
+		CreatureObject * targetCreatureObject = NULL;
+
+		{
+			// find the target.  the target could be either a creature or ship
+			ServerObject * const serverObject = ServerWorld::findObjectByNetworkId(targetId);
+			targetCreatureObject = (serverObject != NULL) ? serverObject->asCreatureObject() : NULL;
+
+			if (targetCreatureObject == NULL)
+			{
+				ShipObject * const shipObject = (serverObject != NULL) ? serverObject->asShipObject() : NULL;
+
+				if (shipObject != NULL)
+				{
+					targetCreatureObject = shipObject->getPilot();
+
+					if (targetCreatureObject == NULL)
+					{
+						// this means that it is a POB ship that doesn't have a pilot
+						// in this case we find the owner
+						std::vector<CreatureObject *> passengers;
+						shipObject->findAllPassengers(passengers, true);
+
+						std::vector<CreatureObject *>::const_iterator ii = passengers.begin();
+						std::vector<CreatureObject *>::const_iterator iiEnd = passengers.end();
+
+						for (; ii != iiEnd && targetCreatureObject == NULL; ++ii)
+						{
+							if ((*ii)->getNetworkId() == shipObject->getOwnerId())
+							{
+								targetCreatureObject = *ii;
+								break;
+							}
+						}
+					}
+				}
+			}
+		}
+		return targetCreatureObject;
+	}
+
+	ShipObject const *getFirstPackedShipForCreature(CreatureObject const &creature)
+	{
+		ServerObject const * const datapad = creature.getDatapad();
+		if (datapad)
+		{
+			Container const * const container = ContainerInterface::getContainer(*datapad);
+			if (container)
+			{
+				for (ContainerConstIterator i = container->begin(); i != container->end(); ++i)
+				{
+					ServerObject const * const content = safe_cast<ServerObject const *>((*i).getObject());
+					if (   content
+					    && content->getGameObjectType() == SharedObjectTemplate::GOT_data_ship_control_device
+					    && !content->isBeingDestroyed())
+					{
+						Container const * const scdContainer = ContainerInterface::getContainer(*content);
+						if (scdContainer)
+						{
+							for (ContainerConstIterator j = scdContainer->begin(); j != scdContainer->end(); ++j)
+							{
+								ServerObject const * const scdContent = safe_cast<ServerObject const *>((*j).getObject());
+								if (scdContent && !scdContent->isBeingDestroyed() && scdContent->asShipObject())
+									return scdContent->asShipObject();
+							}
+						}
+					}
+				}
+			}
+		}
+		return 0;
+	}
+
+	// Move a list of items back into their slots. We assume the items were just in their slots and can be moved back with no problems.
+	void reequipItems(ServerObject & destination, const std::vector<std::pair<ServerObject *, SlotId> > & oldItems)
+	{
+		Container::ContainerErrorCode errorCode = Container::CEC_Success;
+		for (std::vector<std::pair<ServerObject *, SlotId> >::const_iterator i = oldItems.begin(); i != oldItems.end(); ++i)
+		{
+			IGNORE_RETURN(ContainerInterface::transferItemToSlottedContainer(destination, *((*i).first), (*i).second, NULL, errorCode));
+		}
+	}
+
+	void doSocial(ServerObject & actor, NetworkId const & targetId, uint32 socialType)
+	{
+		if (actor.getClient())
+		{
+			ServerObject const * const target = ServerWorld::findObjectByNetworkId(targetId);
+			if (target && ObserveTracker::isObserving(*(actor.getClient()), *target))
+			{
+				actor.performSocial(targetId, socialType, true, true);
+			}
+		}
+	}
+
+	namespace GroupHelpers
+	{
+		bool creatureIsContainedInPOBShip(CreatureObject const * creatureObject);
+		void removeFromGroupAndCreatePOBGroup(GroupObject * groupToRemoveFrom,
+												GroupMemberParam const & leader,
+												GroupObject::GroupMemberParamVector & membersInsidePOB);
+		// The owner of the POB ship is not included in the inside POB member lists
+		void separateGroupBasedOffofPOBShip(GroupObject * groupObj,
+											NetworkId const & ownerOfThePOBShipId,
+											NetworkId const & POBShipId,
+											GroupObject::GroupMemberParamVector & membersInsidePOB,
+											GroupObject::GroupMemberParamVector & membersOutsidePOB);
+
+		TravelPoint const * getNearestTravelPoint(std::string const & planetName, Vector const & location, std::vector<int> const & cityBanList, uint32 faction, bool starPortAndShuttleportOnly);
+	}
+
+	void triggerSpaceEjectPlayerFromShip(CreatureObject * creatureObject);
+	
+	int const cs_spaceSpeechMultiple = 10;
+}
+
+// ======================================================================
+
+bool CommandCppFuncsNamespace::GroupHelpers::creatureIsContainedInPOBShip(CreatureObject const * const creatureObject)
+{
+	NOT_NULL(creatureObject);
+
+	ShipObject const * const shipObject = ShipObject::getContainingShipObject(creatureObject);
+	return shipObject && shipObject->getPortalProperty();
+}
+
+// ----------------------------------------------------------------------
+
+void CommandCppFuncsNamespace::GroupHelpers::removeFromGroupAndCreatePOBGroup(GroupObject * const groupToRemoveFrom,
+													GroupMemberParam const & leader,
+													GroupObject::GroupMemberParamVector & membersInsidePOB)
+{
+	if (groupToRemoveFrom != 0)
+	{
+		GroupObject::GroupMemberParamVector::const_iterator ii = membersInsidePOB.begin();
+		GroupObject::GroupMemberParamVector::const_iterator iiEnd = membersInsidePOB.end();
+
+		for (; ii != iiEnd; ++ii)
+		{
+			NetworkId const & memberId = (*ii).m_memberId;
+			groupToRemoveFrom->removeGroupMember(memberId);
+
+			CreatureObject * const memberCreatureObject = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(memberId));
+			if (memberCreatureObject != 0)
+			{
+				if (memberCreatureObject->getGroup() == groupToRemoveFrom)
+					memberCreatureObject->getGroup()->onGroupMemberRemoved(memberCreatureObject->getNetworkId(), false);
+			}
+		}
+	}
+
+	if (!membersInsidePOB.empty())
+	{
+		ServerUniverse::getInstance().createGroup(leader, membersInsidePOB);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+// The owner of the POB ship is not included in the inside POB member lists
+void CommandCppFuncsNamespace::GroupHelpers::separateGroupBasedOffofPOBShip(GroupObject * const groupObj,
+													NetworkId const & ownerOfThePOBShipId,
+													NetworkId const & POBShipId,
+													GroupObject::GroupMemberParamVector & membersInsidePOB,
+													GroupObject::GroupMemberParamVector & membersOutsidePOB)
+{
+	NOT_NULL(groupObj);
+
+	GroupObject::GroupMemberVector const & groupMembers = groupObj->getGroupMembers();
+	GroupObject::GroupMemberVector::const_iterator ii = groupMembers.begin();
+	GroupObject::GroupMemberVector::const_iterator iiEnd = groupMembers.end();
+
+	for (; ii != iiEnd; ++ii)
+	{
+		NetworkId const & memberId = ii->first;
+		NetworkId const & POBShipMemberIsContainedInId = groupObj->getPOBShipMemberIsContainedIn(memberId);
+		GroupMemberParam const & groupMemberParam = groupObj->createGroupMemberParamForMember(memberId);
+
+		if (POBShipMemberIsContainedInId == POBShipId)
+		{
+			// this member is contained in the same POB
+			if (memberId != ownerOfThePOBShipId)
+			{
+				// and is not the owner of the POB
+				membersInsidePOB.push_back(groupMemberParam);
+			}
+		}
+		else
+		{
+			membersOutsidePOB.push_back(groupMemberParam);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommandCppFuncsNamespace::triggerSpaceEjectPlayerFromShip(CreatureObject * const creatureObject)
+{
+	if (creatureObject == 0)
+	{
+		WARNING(true, ("CommandCppFuncsNamespace::triggerSpaceEjectPlayerFromShip: NULL CreatureObject."));
+		return;
+	}
+
+	GameScriptObject * gameScriptObject = creatureObject->getScriptObject();
+
+	if(gameScriptObject != 0)
+	{
+		ScriptParams scriptParams;
+		IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_SPACE_EJECT_PLAYER_FROM_SHIP, scriptParams));
+	}
+	else
+	{
+		WARNING(true, ("CommandCppFuncsNamespace::triggerSpaceEjectPlayerFromShip: NULL ScriptObject."));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+TravelPoint const * CommandCppFuncsNamespace::GroupHelpers::getNearestTravelPoint(std::string const & planetName, Vector const & location, std::vector<int> const & cityBanList, uint32 faction, bool starPortAndShuttleportOnly)
+{
+	TravelPoint const * nearestTravelPoint = NULL;
+	PlanetObject const * const planetObject = ServerUniverse::getInstance().getPlanetByName(planetName);
+	if (planetObject)
+	{
+		int const numberOfTravelPoints = planetObject->getNumberOfTravelPoints();
+		for (int i = 0; i < numberOfTravelPoints; ++i)
+		{
+			TravelPoint const * tp = planetObject->getTravelPoint(i);
+			if (!tp)
+				continue;
+
+			if (starPortAndShuttleportOnly && ((tp->getType() & TravelPoint::TPT_PC_CampShuttleBeacon) || (tp->getType() & TravelPoint::TPT_NPC_StaticBaseBeacon)))
+				continue;
+
+			// need to check factional alignment in order to use the gcw static base travel point
+			std::string const & tpName = tp->getName();
+			if (tpName.find("gcwstaticbase") != std::string::npos)
+			{
+				if ((tpName.find("rebel") != std::string::npos) && !PvpData::isRebelFactionId(faction))
+					continue;
+				else if ((tpName.find("imperial") != std::string::npos) && !PvpData::isImperialFactionId(faction))
+					continue;
+			}
+
+			// if the travel point is inside a player city, make sure player is not banned in that city
+			if (!cityBanList.empty())
+			{
+				int const cityAtTp = CityInterface::getCityAtLocation(planetName, static_cast<int>(tp->getPosition_w().x), static_cast<int>(tp->getPosition_w().z), 0);
+				if ((cityAtTp > 0) && (std::find(cityBanList.begin(), cityBanList.end(), cityAtTp) != cityBanList.end()))
+					continue;
+			}
+
+			if (!nearestTravelPoint || (location.magnitudeBetweenSquared(tp->getPosition_w()) < location.magnitudeBetweenSquared(nearestTravelPoint->getPosition_w())))
+				nearestTravelPoint = tp;
+		}
+	}
+
+	return nearestTravelPoint;
+}
+
+// ======================================================================
+
+using namespace CommandCppFuncsNamespace;
+
+// ======================================================================
+
+static const std::string OBJVAR_PLAYERS_CAN_ACCESS_CONTAINER("players_can_access_container");
+
+// ======================================================================
+
+static void sendProseMessage(const CreatureObject &actor, const ServerObject * const target, StringId const &stringId)
+{
+	Chat::sendSystemMessageSimple (actor, stringId, target);
+}
+
+// ======================================================================
+
+static Client *getClientFromCharacterId(NetworkId const &charId)
+{
+	ServerObject *obj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(charId));
+	if (obj)
+		return obj->getClient();
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+static std::string nextStringParm(Unicode::String const &str, size_t &curpos)
+{
+	size_t endpos = 0;
+	Unicode::String token;
+	if (!Unicode::getFirstToken(str, curpos, endpos, token))
+		return std::string ();
+	curpos = endpos;
+	return Unicode::wideToNarrow(token);
+}
+
+// ----------------------------------------------------------------------
+
+static int nextIntParm(Unicode::String const &str, size_t &curpos)
+{
+	std::string strParm = nextStringParm(str, curpos);
+	if (strParm.empty())
+		return -1;
+	return atoi(strParm.c_str());
+}
+
+// ----------------------------------------------------------------------
+
+static NetworkId nextOidParm(Unicode::String const &str, size_t &curpos)
+{
+	std::string const &s = nextStringParm(str, curpos);
+	if (!s.empty())
+	{
+		if ((!isdigit(s.c_str()[0])) && ((s.c_str()[0]) != '-'))
+			return NameManager::getInstance().getPlayerId(NameManager::normalizeName(s));
+		return NetworkId(s);
+	}
+	return NetworkId::cms_invalid;
+}
+
+// ----------------------------------------------------------------------
+
+static float nextFloatParm(Unicode::String const &str, size_t &curpos)
+{
+	return static_cast<float>(strtod(nextStringParm(str, curpos).c_str(), NULL));
+}
+
+
+// ----------------------------------------------------------------------
+
+static bool nextBoolParm(Unicode::String const &str, size_t &curpos)
+{
+	return (nextIntParm(str, curpos) != 0);
+}
+
+// ----------------------------------------------------------------------
+
+static Vector nextVectorParm(Unicode::String const &str, size_t &curpos)
+{
+	float x=nextFloatParm(str,curpos);
+	float y=nextFloatParm(str,curpos);
+	float z=nextFloatParm(str,curpos);
+
+	return Vector(x,y,z);
+}
+
+// ======================================================================
+
+static void commandFuncConsoleAll(Command const &command, NetworkId const &actor,
+	NetworkId const &target, Unicode::String const &params)
+{
+	UNREF(command);
+	UNREF(target);
+	if (actor != NetworkId::cms_invalid)
+	{
+		ServerObject *obj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(actor));
+		if (obj)
+		{
+			Client *client = obj->getClient();
+			if (client && client->isGod())
+			{
+				LOG("CustomerService",("Avatar:%s executing command: %s", PlayerObject::getAccountDescription(client->getCharacterObjectId()).c_str(), Unicode::wideToNarrow(params).c_str()));
+				ConsoleMgr::processString(Unicode::wideToNarrow(params), client, 0);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncConsoleCategory(NetworkId const &actor,
+	std::string const &category, Unicode::String const &params)
+{
+	if (actor != NetworkId::cms_invalid)
+	{
+		ServerObject *obj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(actor));
+		if (obj)
+		{
+			Client *client = obj->getClient();
+			if (client)
+			{
+				ConsoleMgr::processString(category + " " + Unicode::wideToNarrow(params), client, 0);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncConsoleCombat(Command const &command, NetworkId const &actor,
+	NetworkId const &target, Unicode::String const &params)
+{
+	UNREF(command);
+	UNREF(target);
+	commandFuncConsoleCategory(actor, "combat", params);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncConsoleCraft(Command const &command, NetworkId const &actor,
+	NetworkId const &target, Unicode::String const &params)
+{
+	UNREF(command);
+	UNREF(target);
+	commandFuncConsoleCategory(actor, "craft", params);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncConsoleDatabase(Command const &command, NetworkId const &actor,
+	NetworkId const &target, Unicode::String const &params)
+{
+	UNREF(command);
+	UNREF(target);
+	commandFuncConsoleCategory(actor, "database", params);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncConsoleManufacture(Command const &command, NetworkId const &actor,
+	NetworkId const &target, Unicode::String const &params)
+{
+	UNREF(command);
+	UNREF(target);
+	commandFuncConsoleCategory(actor, "manufacture", params);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncConsoleMoney(Command const &command, NetworkId const &actor,
+	NetworkId const &target, Unicode::String const &params)
+{
+	UNREF(command);
+	UNREF(target);
+	commandFuncConsoleCategory(actor, "money", params);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncConsoleNpc(Command const &command, NetworkId const &actor,
+	NetworkId const &target, Unicode::String const &params)
+{
+	UNREF(command);
+	UNREF(target);
+	commandFuncConsoleCategory(actor, "npc", params);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncConsoleObject(Command const &command, NetworkId const &actor,
+	NetworkId const &target, Unicode::String const &params)
+{
+	UNREF(command);
+	UNREF(target);
+	commandFuncConsoleCategory(actor, "object", params);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncConsoleObjvar(Command const &command, NetworkId const &actor,
+	NetworkId const &target, Unicode::String const &params)
+{
+	UNREF(command);
+	UNREF(target);
+	commandFuncConsoleCategory(actor, "objvar", params);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncConsoleResource(Command const &command, NetworkId const &actor,
+	NetworkId const &target, Unicode::String const &params)
+{
+	UNREF(command);
+	UNREF(target);
+	commandFuncConsoleCategory(actor, "resource", params);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncConsoleScript(Command const &command, NetworkId const &actor,
+	NetworkId const &target, Unicode::String const &params)
+{
+	UNREF(command);
+	UNREF(target);
+	commandFuncConsoleCategory(actor, "script", params);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncConsoleServer(Command const &command, NetworkId const &actor,
+	NetworkId const &target, Unicode::String const &params)
+{
+	UNREF(command);
+	UNREF(target);
+	commandFuncConsoleCategory(actor, "server", params);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncConsoleSkill(Command const &command, NetworkId const &actor,
+	NetworkId const &target, Unicode::String const &params)
+{
+	UNREF(command);
+	UNREF(target);
+	commandFuncConsoleCategory(actor, "skill", params);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAdminSetGodMode(Command const &, NetworkId const &actor,
+	NetworkId const &, Unicode::String const &params)
+{
+	size_t pos = 0;
+	bool enable = nextBoolParm(params, pos);
+
+	Client *client = getClientFromCharacterId(actor);
+	if (client)
+		IGNORE_RETURN(client->setGodMode(enable));
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncResetCooldowns(Command const &, NetworkId const &actor,
+									   NetworkId const &, Unicode::String const &params)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	if (actorObj)
+	{
+		actorObj->getCommandQueue()->resetCooldowns();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncSpewCommandQueue(Command const &, NetworkId const &actor,
+									   NetworkId const &, Unicode::String const &params)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	if (actorObj)
+	{
+		actorObj->getCommandQueue()->spew();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAdminKick(Command const &, NetworkId const &actor,
+	NetworkId const &target, Unicode::String const &params)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	if (actorObj)
+	{
+		NetworkId who(target);
+		if (who == NetworkId::cms_invalid)
+		{
+			size_t curpos = 0;
+			who = nextOidParm(params, curpos);
+			if (who == NetworkId::cms_invalid)
+				return;
+		}
+
+		ShipObject * const shipObject = dynamic_cast<ShipObject *>(NetworkIdManager::getObjectById(who));
+		if (shipObject)
+		{
+			// If the target is a ship, kick all the people in the ship
+			std::vector<CreatureObject *> passengers;
+			shipObject->findAllPassengers(passengers, true);
+			for (std::vector<CreatureObject *>::const_iterator i=passengers.begin(); i!=passengers.end(); ++i)
+			{
+				KickPlayer const kickMessage((*i)->getNetworkId(), "Admin Kick");
+				GameServer::getInstance().sendToConnectionServers(kickMessage);
+			}
+		}
+		else
+		{		
+			KickPlayer const kickMessage(who, "Admin Kick");
+			GameServer::getInstance().sendToConnectionServers(kickMessage);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncLocateStructure(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const & params)
+{
+	CreatureObject * const actorObj = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (!actorObj)
+		return;
+
+	PlayerObject * const playerObj = PlayerCreatureController::getPlayerObject(actorObj);
+	if (!playerObj)
+		return;
+
+	Client * const clientObj = actorObj->getClient();
+	if (!clientObj)
+		return;
+
+	bool const isGod = clientObj->isGod();
+	NetworkId ownerId = actor;
+
+	// god mode can specify a different player to search for
+	if (isGod && !params.empty())
+	{
+		ownerId = NetworkId(Unicode::wideToNarrow(params));
+		if (!ownerId.isValid())
+			ownerId = actor;
+	}
+
+	int const timeNow = static_cast<int>(::time(NULL));
+	if (!isGod && actorObj->getObjVars().hasItem("timeNextLocateStructureCommandAllowed") && (actorObj->getObjVars().getType("timeNextLocateStructureCommandAllowed") == DynamicVariable::INT))
+	{
+		int timeNextLocateStructureCommandAllowed = 0;
+		if (actorObj->getObjVars().getItem("timeNextLocateStructureCommandAllowed", timeNextLocateStructureCommandAllowed))
+		{
+			if (timeNextLocateStructureCommandAllowed > timeNow)
+			{
+				ProsePackage prosePackage;
+				prosePackage.stringId = StringId("player_structure", "locate_structure_command_too_fast");
+				prosePackage.target.str = Unicode::narrowToWide(CalendarTime::convertSecondsToHMS(static_cast<unsigned int>(timeNextLocateStructureCommandAllowed - timeNow)));
+				Chat::sendSystemMessage(*actorObj, prosePackage);
+
+				return;
+			}
+		}
+	}
+
+	NetworkId ownerResidenceId;
+	if (ownerId == actor)
+	{
+		ownerResidenceId = actorObj->getHouse();
+
+		StringId::LocUnicodeString response;
+		if (StringId("player_structure", "locate_structure_command_executing").localize(response))
+			ConsoleMgr::broadcastString(Unicode::wideToNarrow(response), clientObj);
+	}
+	else
+	{
+		// should only be here for god mode
+		ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("Searching galaxy for all unpacked structures and installations owned by %s.", ownerId.getValueString().c_str()),
+			clientObj);
+	}
+
+	GenericValueTypeMessage<std::pair<std::pair<uint32, bool>, std::pair<std::pair<NetworkId, NetworkId>, NetworkId> > > locateStructureByOwnerIdReq("LSBOIReq", std::make_pair(std::make_pair(GameServer::getInstance().getProcessId(), isGod), std::make_pair(std::make_pair(ownerId, ownerResidenceId), actor)));
+	GameServer::getInstance().sendToCentralServer(locateStructureByOwnerIdReq);
+
+	if (!isGod)
+		IGNORE_RETURN(actorObj->setObjVarItem("timeNextLocateStructureCommandAllowed", (timeNow + ConfigServerGame::getLocateStructureCommandIntervalSeconds())));
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncLocateVendor(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const & params)
+{
+	CreatureObject * const actorObj = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (!actorObj)
+		return;
+
+	PlayerObject * const playerObj = PlayerCreatureController::getPlayerObject(actorObj);
+	if (!playerObj)
+		return;
+
+	Client * const clientObj = actorObj->getClient();
+	if (!clientObj)
+		return;
+
+	bool const isGod = clientObj->isGod();
+	NetworkId ownerId = actor;
+
+	// god mode can specify a different player to search for
+	if (isGod && !params.empty())
+	{
+		ownerId = NetworkId(Unicode::wideToNarrow(params));
+		if (!ownerId.isValid())
+			ownerId = actor;
+	}
+
+	int const timeNow = static_cast<int>(::time(NULL));
+	if (!isGod && actorObj->getObjVars().hasItem("timeNextLocateVendorCommandAllowed") && (actorObj->getObjVars().getType("timeNextLocateVendorCommandAllowed") == DynamicVariable::INT))
+	{
+		int timeNextLocateVendorCommandAllowed = 0;
+		if (actorObj->getObjVars().getItem("timeNextLocateVendorCommandAllowed", timeNextLocateVendorCommandAllowed))
+		{
+			if (timeNextLocateVendorCommandAllowed > timeNow)
+			{
+				ProsePackage prosePackage;
+				prosePackage.stringId = StringId("player_vendor", "locate_vendor_command_too_fast");
+				prosePackage.target.str = Unicode::narrowToWide(CalendarTime::convertSecondsToMS(static_cast<unsigned int>(timeNextLocateVendorCommandAllowed - timeNow)));
+				Chat::sendSystemMessage(*actorObj, prosePackage);
+
+				return;
+			}
+		}
+	}
+
+	if (ownerId == actor)
+	{
+		StringId::LocUnicodeString response;
+		if (StringId("player_vendor", "locate_vendor_command_executing").localize(response))
+			ConsoleMgr::broadcastString(Unicode::wideToNarrow(response), clientObj);
+	}
+	else
+	{
+		// should only be here for god mode
+		ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("Searching the commodities system for all initialized vendors owned by %s.", ownerId.getValueString().c_str()),
+			clientObj);
+	}
+
+	GenericValueTypeMessage<std::pair<std::pair<NetworkId, NetworkId>, bool> > const msg("GetVendorInfoForPlayer", std::make_pair(std::make_pair(actor, ownerId), isGod));
+	CommoditiesMarket::sendToCommoditiesServer(msg);
+
+	if (!isGod)
+		IGNORE_RETURN(actorObj->setObjVarItem("timeNextLocateVendorCommandAllowed", (timeNow + ConfigServerGame::getLocateVendorCommandIntervalSeconds())));
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncShowCtsHistory(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const & params)
+{
+	CreatureObject const * targetObj = dynamic_cast<CreatureObject const*>(ServerWorld::findObjectByNetworkId(actor));
+	if (!targetObj)
+		return;
+
+	PlayerObject const * targetPlayerObj = PlayerCreatureController::getPlayerObject(targetObj);
+	if (!targetPlayerObj)
+		return;
+
+	Client * const clientObj = targetObj->getClient();
+	if (!clientObj)
+		return;
+
+	NetworkId target = actor;
+
+	// god mode can specify a different player to show CTS history for
+	if (clientObj->isGod() && !params.empty())
+	{
+		target = NetworkId(Unicode::wideToNarrow(params));
+		if (!target.isValid())
+			target = actor;
+	}
+
+	if (target != actor)
+	{
+		targetObj = dynamic_cast<CreatureObject const*>(ServerWorld::findObjectByNetworkId(target));
+		targetPlayerObj = (targetObj ? PlayerCreatureController::getPlayerObject(targetObj) : NULL);
+		if (!targetPlayerObj)
+		{
+			ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("%s is not a valid or nearby player character.", target.getValueString().c_str()), clientObj);
+			return;
+		}
+
+		ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("Retrieving CTS history for %s.", target.getValueString().c_str()), clientObj);
+	}
+	else
+	{
+		ConsoleMgr::broadcastString("Retrieving CTS history for this character.", clientObj);
+	}
+
+	// we need to return the CTS history ordered by transfer time
+	std::multimap<int, std::pair<std::string, std::string> > orderedCtsHistory;
+
+	DynamicVariableList::NestedList const ctsTransactions(targetObj->getObjVars(), "ctsHistory");
+	for (DynamicVariableList::NestedList::const_iterator i = ctsTransactions.begin(); i != ctsTransactions.end(); ++i)
+	{
+		Unicode::String ctsTransactionDetail;
+		if (i.getValue(ctsTransactionDetail))
+		{
+			Unicode::UnicodeStringVector tokens;
+			if (Unicode::tokenize(ctsTransactionDetail, tokens, NULL, NULL) && (tokens.size() >= 4))
+			{
+				Unicode::String characterName;
+				for (size_t i = 3, j = tokens.size(); i < j; ++i)
+				{
+					if (!characterName.empty())
+						characterName += Unicode::narrowToWide(" ");
+
+					characterName += tokens[i];
+				}
+
+				IGNORE_RETURN(orderedCtsHistory.insert(std::make_pair(atoi(Unicode::wideToNarrow(tokens[0]).c_str()), std::make_pair(Unicode::wideToNarrow(characterName), Unicode::wideToNarrow(tokens[1])))));
+			}
+		}
+	}
+
+	if (orderedCtsHistory.empty())
+	{
+		ConsoleMgr::broadcastString("No CTS history found.", clientObj);	
+	}
+	else
+	{
+		int count = 0;
+		for (std::multimap<int, std::pair<std::string, std::string> >::const_iterator iter = orderedCtsHistory.begin(); iter != orderedCtsHistory.end(); ++iter)
+		{
+			++count;
+
+			if (orderedCtsHistory.size() == 1)
+				ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("Transferred from %s, %s on %s.", iter->second.first.c_str(), iter->second.second.c_str(), CalendarTime::convertEpochToTimeStringLocal(iter->first).c_str()), clientObj);
+			else
+				ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("%d) Transferred from %s, %s on %s.", count, iter->second.first.c_str(), iter->second.second.c_str(), CalendarTime::convertEpochToTimeStringLocal(iter->first).c_str()), clientObj);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAdminPlanetwarp(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &params)
+{
+	size_t pos = 0;
+	std::string const planetName = nextStringParm(params, pos);
+	Vector const newPosition_w = nextVectorParm(params, pos);
+	NetworkId const newContainer = nextOidParm(params, pos);
+	Vector const newPosition_p = nextVectorParm(params, pos);
+
+	CreatureObject * const actorCreature = safe_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(actor));
+	if (actorCreature)
+	{
+		TangibleObject *targetTangible = actorCreature;
+		if (target != NetworkId::cms_invalid)
+			targetTangible = dynamic_cast<TangibleObject *>(ServerWorld::findObjectByNetworkId(target));
+
+		if (targetTangible)
+		{
+			if (!ServerWorld::isSpaceScene() && !strncmp(planetName.c_str(), "space_", 5) && targetTangible->asCreatureObject())
+			{
+				// going to space from the ground, so require a ship and set launch information
+				ShipObject const * const ship = getFirstPackedShipForCreature(*targetTangible->asCreatureObject());
+				if (!ship)
+				{
+					Chat::sendSystemMessage(*actorCreature, Unicode::narrowToWide("No valid ship, cannot warp to space scene."), Unicode::emptyString);
+					return;
+				}
+
+				DynamicVariableLocationData const loc(targetTangible->getPosition_w(), ServerWorld::getSceneId(), NetworkId::cms_invalid);
+				targetTangible->setObjVarItem("space.launch.worldLoc", loc);
+				targetTangible->setObjVarItem("space.launch.ship", ship->getNetworkId());
+				targetTangible->setObjVarItem("space.launch.startIndex", static_cast<int>(0));
+			}
+
+			GameServer::getInstance().requestSceneWarp(CachedNetworkId(*targetTangible), planetName, newPosition_w, newContainer, newPosition_p);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAdminTeleport(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &params)
+{
+	size_t pos = 0;
+	Vector position_w = nextVectorParm(params, pos);
+	NetworkId targetCell = nextOidParm(params, pos);
+	Vector position_p = nextVectorParm(params, pos);
+
+	// make sure coordinates are sane
+	float const maxSaneCoordinate = 100000;
+	if ((position_w.x < -maxSaneCoordinate) ||
+		(position_w.x > maxSaneCoordinate) ||
+		(position_w.y < -maxSaneCoordinate) ||
+		(position_w.y > maxSaneCoordinate) ||
+		(position_w.z < -maxSaneCoordinate) ||
+		(position_w.z > maxSaneCoordinate) ||
+		(position_p.x < -maxSaneCoordinate) ||
+		(position_p.x > maxSaneCoordinate) ||
+		(position_p.y < -maxSaneCoordinate) ||
+		(position_p.y > maxSaneCoordinate) ||
+		(position_p.z < -maxSaneCoordinate) ||
+		(position_p.z > maxSaneCoordinate))
+	{
+		const Object * const actorObj = NetworkIdManager::getObjectById(actor);
+		if (actorObj && actorObj->asServerObject())
+		{
+			Client * const actorClient = actorObj->asServerObject()->getClient();
+			if (actorClient)
+			{
+				char buffer[512];
+				snprintf(buffer, sizeof(buffer)-1, "specified coordinate (%.2f,%.2f,%.2f) (%.2f,%.2f,%.2f) is out of range",
+					position_w.x, position_w.y, position_w.z,
+					position_p.x, position_p.y, position_p.z);
+				buffer[sizeof(buffer)-1] = '\0';
+
+				ConsoleMgr::broadcastString(buffer, actorClient);
+			}
+		}
+
+		return;
+	}
+
+	ServerObject *teleportObj = 0;
+	if (target != NetworkId::cms_invalid)
+		teleportObj = ServerWorld::findObjectByNetworkId(target);
+	else
+		teleportObj = ServerWorld::findObjectByNetworkId(actor);
+
+	if (teleportObj)
+	{
+		// if the person teleporting is the owner of the containing ship, move the ship instead
+		ShipObject * const ship = getAttachedShip(teleportObj->asCreatureObject());
+		if (ship)
+			ship->teleportObject(position_w, NetworkId::cms_invalid, "", position_w, "");
+		else
+			teleportObj->teleportObject(position_w, targetCell, "", position_p, "");
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAdminTeleportTo(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &params)
+{
+	CreatureObject * const actorObj = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	if (actorObj)
+	{
+		CachedNetworkId who(target);
+		if (who == NetworkId::cms_invalid)
+		{
+			size_t curpos = 0;
+			who = nextOidParm(params, curpos);
+		}
+		// if the object exists locally, just teleport to it, otherwise send to db server for scatter/gather
+		Object * const destObj = who.getObject();
+		if (destObj)
+		{
+			// if the person teleporting has a ship that must go with it, move the ship instead
+			ShipObject * const ship = getAttachedShip(actorObj->asCreatureObject());
+			if (ship)
+				ship->teleportObject(destObj->findPosition_w(), NetworkId::cms_invalid, "", destObj->findPosition_w(), "");
+			else
+			{
+				Object const * const firstParent = ContainerInterface::getFirstParentInWorld(*destObj);
+				if (firstParent)
+				{
+					actorObj->teleportObject(
+						firstParent->getPosition_w(),
+						firstParent->getAttachedTo() ? firstParent->getAttachedTo()->getNetworkId() : NetworkId::cms_invalid,
+						"",
+						firstParent->getPosition_p(),
+						"");
+				}
+			}
+		}
+		else
+		{
+			TeleportToMessage const teleportToMessage(actor, who, GameServer::getInstance().getProcessId());
+			GameServer::getInstance().sendToCentralServer(teleportToMessage);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAdminListGuilds(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &)
+{
+	Object *actorObj = NetworkIdManager::getObjectById(actor);
+	if (actorObj && actorObj->asServerObject())
+	{
+		Client *client = actorObj->asServerObject()->getClient();
+		if (client)
+		{
+			char buf[512];
+			std::vector<int> guildIds;
+
+			GuildInterface::getAllGuildIds(guildIds);
+			for (std::vector<int>::const_iterator i = guildIds.begin(); i != guildIds.end(); ++i)
+			{
+				snprintf(buf, 511, "id:%-8d name:%s abbrev:%s leaderId:%s",
+					*i,
+					GuildInterface::getGuildName(*i).c_str(),
+					GuildInterface::getGuildAbbrev(*i).c_str(),
+					GuildInterface::getGuildLeaderId(*i).getValueString().c_str());
+				buf[511] = '\0';
+				ConsoleMgr::broadcastString(buf, client);
+			}
+			snprintf(buf, 511, "%d guilds total.", guildIds.size());
+			ConsoleMgr::broadcastString(buf, client);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAdminEditBank(Command const &cmd, NetworkId const &actor, NetworkId const &target, Unicode::String const &params)
+{
+	CreatureObject * actorCreature  = safe_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	CreatureObject * targetCreature = safe_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(target));
+	if (!targetCreature || !actorCreature)
+	{
+		DEBUG_REPORT_LOG(true, ("Received open command for null player or target.\n"));
+		return;
+	}
+
+	ServerObject * targetBank = targetCreature->getBankContainer();
+	if(!targetBank)
+	{
+		DEBUG_REPORT_LOG(true, ("Couldn't get bank for player %s.\n", target.getValueString().c_str()));
+		return;
+	}
+
+	if (targetBank->isAuthoritative())
+	{
+		ScriptParams params;
+		params.addParam(actor);
+		if (targetBank->getScriptObject()->trigAllScripts(Scripting::TRIG_ABOUT_TO_OPEN_CONTAINER, params) == SCRIPT_CONTINUE)
+		{
+			Client *client = actorCreature->getClient();
+			if (client)
+				client->openContainer(*targetBank, 0, std::string());
+		}
+	}
+	else
+	{
+		GenericValueTypeMessage<std::pair<NetworkId, NetworkId> > const rssMessage(
+			"RequestSameServer",
+			std::make_pair(
+				ContainerInterface::getTopmostContainer(*actorCreature)->getNetworkId(),
+				ContainerInterface::getTopmostContainer(*targetBank)->getNetworkId()));
+		GameServer::getInstance().sendToPlanetServer(rssMessage);
+		ContainerInterface::sendContainerMessageToClient(*actorCreature, Container::CEC_TryAgain, targetBank);
+
+		//actorCreature->transferAuthority(targetBank->getAuthServerProcessId(), true, false);
+		//actorCreature->commandQueueEnqueue(cmd, target, params, 0, false, Command::CP_Normal, false);
+		//LOG("container", ("Received open editBank.  Player not on same server as the target's bank. Migrating player"));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAdminEditStats(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &)
+{
+	CreatureObject* const creatureActor = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById (actor));
+	if (!creatureActor)
+	{
+		WARNING (true, ("commandFuncAdminEditStats: null actor"));
+		return;
+	}
+
+	CreatureObject* const creatureTarget = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById (target));
+	if (!creatureTarget)
+	{
+		WARNING (true, ("commandFuncAdminEditStats: null target"));
+		return;
+	}
+
+	EditStatsMessage const esm(target);
+	Client * const client = creatureActor->getClient();
+	if (client)
+		client->send(esm, true);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAdminEditAppearance(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &)
+{
+	CreatureObject* const creatureActor = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById (actor));
+	if (!creatureActor)
+	{
+		WARNING (true, ("commandFuncAdminEditAppearance: null actor"));
+		return;
+	}
+
+	CreatureObject* const creatureTarget = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById (target));
+	if (!creatureTarget)
+	{
+		WARNING (true, ("commandFuncAdminEditAppearance: null target"));
+		return;
+	}
+
+	EditAppearanceMessage const eam(target);
+	Client * const client = creatureActor->getClient();
+	if (client)
+		client->send(eam, true);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAdminGrantTitle(Command const &, NetworkId const &, NetworkId const &, Unicode::String const &)
+{
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAdminCredits(Command const &, NetworkId const &, NetworkId const &, Unicode::String const &)
+{
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAdminGetStationName(Command const &, NetworkId const & actor, NetworkId const & target , Unicode::String const & params)
+{
+	const Object * const actorObj = NetworkIdManager::getObjectById(actor);
+	if (actorObj && actorObj->asServerObject())
+	{
+		Client * const actorClient = actorObj->asServerObject()->getClient();
+		if (actorClient)
+		{
+			const CreatureObject* creatureTarget = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById (target));
+			if (!creatureTarget)
+			{
+				size_t pos = 0;
+				NetworkId targetId(nextOidParm(params, pos));
+				creatureTarget = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById (targetId));
+			}
+
+			if(!creatureTarget)
+			{
+				ConsoleMgr::broadcastString("Could not resolve target passed to getStationName", actorClient);
+				return;
+			}
+
+			const Client * const clientTarget = creatureTarget->getClient();
+			if(clientTarget)
+			{
+				const std::string & stationName = clientTarget->getAccountName();
+				char buf [512];
+				snprintf(buf, 511, "Station name is: %s.", stationName.c_str());
+				ConsoleMgr::broadcastString(buf, actorClient);
+			}
+			else
+				DEBUG_WARNING(true, ("Could not get the target Client in commandFuncAdminGetStationName"));
+		}
+		else
+			DEBUG_WARNING(true, ("Could not get the actor Client in commandFuncAdminGetStationName"));
+	}
+	else
+		DEBUG_WARNING(true, ("Could not get the actor object in commandFuncAdminGetStationName"));
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAuctionCreate(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+
+	/*printf("!!!!AUCTION: process = %i\n", (int)GameServer::getInstance().getProcessId());
+	printf("!!!!PID = %i\n", (int)getpid());
+
+	Chat::getFriendsList("SWG.msivertson.Orami");
+
+	return;*/
+
+	size_t pos = 0;
+	NetworkId itemId(nextOidParm(params, pos));
+	NetworkId auctionContainerId(nextOidParm(params, pos));
+	int minBid = nextIntParm(params, pos);
+	int timer = nextIntParm(params, pos);
+	Unicode::String userDescription = Unicode::narrowToWide(nextStringParm(params, pos));
+
+	UNREF(timer);
+
+	CreatureObject *actorCreature = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	TangibleObject *itemTangible = dynamic_cast<TangibleObject *>(NetworkIdManager::getObjectById(itemId));
+	ServerObject *auctionContainer = dynamic_cast<ServerObject *>(NetworkIdManager::getObjectById(auctionContainerId));
+
+	if (actorCreature && itemTangible && auctionContainer)
+	{
+		CommoditiesMarket::auctionCreatePermanent(
+			"Test Name",
+			*itemTangible,
+			*auctionContainer,
+			minBid,
+			userDescription);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAuctionCreateImmediate(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	size_t pos = 0;
+	NetworkId itemId(nextOidParm(params, pos));
+	NetworkId auctionContainerId(nextOidParm(params, pos));
+	int price = nextIntParm(params, pos);
+	int timer = nextIntParm(params, pos);
+	Unicode::String userDescription = Unicode::narrowToWide(nextStringParm(params, pos));
+
+	CreatureObject *actorCreature = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+
+
+
+	TangibleObject *itemTangible = dynamic_cast<TangibleObject *>(NetworkIdManager::getObjectById(itemId));
+	ServerObject *auctionContainer = dynamic_cast<ServerObject *>(NetworkIdManager::getObjectById(auctionContainerId));
+
+	if (actorCreature && itemTangible && auctionContainer)
+	{
+		CommoditiesMarket::auctionCreateImmediate(
+			*actorCreature,
+			*itemTangible,
+			Unicode::String(),
+			*auctionContainer,
+			price,
+			timer,
+			userDescription);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAuctionBid(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	size_t pos = 0;
+	NetworkId auctionId(nextOidParm(params, pos));
+	int bidAmount = nextIntParm(params, pos);
+	int maxProxyBid = nextIntParm(params, pos);
+	CreatureObject *actorCreature = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+
+	CommoditiesMarket::getAuctionDetails(*actorCreature, auctionId);
+
+	return;
+
+	if (actorCreature)
+	{
+		CommoditiesMarket::auctionBid(
+			*actorCreature,
+			auctionId.getValue(),
+			bidAmount,
+			maxProxyBid);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAuctionCancel(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	size_t pos = 0;
+	NetworkId auctionId(nextOidParm(params, pos));
+
+	CreatureObject *actorCreature = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+
+	if (actorCreature)
+	{
+		CommoditiesMarket::auctionCancel(
+			*actorCreature,
+			auctionId.getValue());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAuctionAccept(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	size_t pos = 0;
+	NetworkId auctionId(nextOidParm(params, pos));
+
+	CreatureObject *actorCreature = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+
+	if (actorCreature)
+	{
+		CommoditiesMarket::auctionAccept(
+			*actorCreature,
+			auctionId.getValue());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAuctionQuery(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+#if 0
+	size_t pos = 0;
+	NetworkId auctionContainerId(nextOidParm(params, pos));
+	int requestId = nextIntParm(params, pos);
+	int type = nextIntParm(params, pos);
+	int category = nextIntParm(params, pos);
+
+	CreatureObject *actorCreature = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	ServerObject *auctionContainer = dynamic_cast<ServerObject *>(NetworkIdManager::getObjectById(auctionContainerId));
+
+	if (actorCreature && auctionContainer)
+	{
+		CommoditiesMarket::auctionQuery(
+			*actorCreature,
+			requestId,
+			type,
+			category,
+			*auctionContainer);
+	}
+#endif
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAuctionRetrieve(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	size_t pos = 0;
+	NetworkId itemId(nextOidParm(params, pos));
+	NetworkId auctionId(nextOidParm(params, pos));
+	NetworkId auctionContainerId(nextOidParm(params, pos));
+
+	CreatureObject *actorCreature = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	ServerObject *auctionContainer = dynamic_cast<ServerObject *>(NetworkIdManager::getObjectById(auctionContainerId));
+
+	if (actorCreature && auctionContainer && actorCreature->isAuthoritative() && auctionContainer->isAuthoritative())
+	{
+		CommoditiesMarket::auctionRetrieve(
+			*actorCreature,
+			auctionId.getValue(),
+			itemId,
+			*auctionContainer);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncSocial(Command const &command, NetworkId const &actor, NetworkId const &target, Unicode::String const &params)
+{
+	UNREF(command);
+	if (actor != NetworkId::cms_invalid)
+	{
+		ServerObject * const obj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(actor));
+		if (obj)
+		{
+			Unicode::UnicodeStringVector sv;
+			Unicode::tokenize (params, sv);
+
+			if (sv.empty ())
+			{
+				WARNING (true, ("commandFuncSocial no params"));
+				return;
+			}
+
+			const std::string & socialName = Unicode::wideToNarrow (sv [0]);
+			const uint32 socialType        = SocialsManager::getSocialTypeByName (socialName);
+
+			if (!socialType)
+				WARNING (true, ("commandFuncSocial Bad social type specified: [%s]", socialName.c_str ()));
+			else
+			{
+				bool animationOk = true;
+				bool textOk      = true;
+				if (sv.size () > 1)
+					animationOk = !sv [1].empty () && sv [1][0] == '1';
+				if (sv.size () > 2)
+					textOk      = !sv [2].empty () && sv [2][0] == '1';
+
+				obj->performSocial (target, socialType, animationOk, textOk);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncSocialInternal (Command const &command, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	UNREF(command);
+	if (actor != NetworkId::cms_invalid)
+	{
+		ServerObject * const obj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(actor));
+		if (obj)
+		{
+			Unicode::UnicodeStringVector sv;
+			Unicode::tokenize (params, sv);
+
+			if (sv.size () < 2)
+			{
+				WARNING (true, ("commandFuncSocial not enough params"));
+				return;
+			}
+
+			const NetworkId targetId          (Unicode::wideToNarrow (sv [0]));
+			const uint32    socialType = atoi (Unicode::wideToNarrow (sv [1]).c_str());
+
+			if (!socialType)
+				WARNING (true, ("commandFuncSocialInternal Bad social type specified: '%d'", socialType));
+			else
+			{
+				bool animationOk = true;
+				bool textOk      = true;
+				if (sv.size () > 3)
+				{
+					animationOk = !sv [2].empty () && sv [2][0] == '1';
+					textOk      = !sv [3].empty () && sv [3][0] == '1';
+				}
+				obj->performSocial (targetId, socialType, animationOk, textOk);
+			}
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+static void commandFuncSetMood (Command const &command, NetworkId const &actor, NetworkId const &, Unicode::String const & params)
+{
+	UNREF(command);
+	if (actor != NetworkId::cms_invalid)
+	{
+		CreatureObject * const obj = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+		if (obj)
+		{
+			const std::string moodName = Unicode::wideToNarrow (params);
+
+			if (moodName == "none")
+			{
+				obj->setMood (0);
+			}
+			else
+			{
+				const uint32 moodType = MoodManager::getMoodByCanonicalName (moodName);
+				if (moodType)
+					obj->setMood (moodType);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncSetMoodInternal (Command const &command, NetworkId const &actor,
+	NetworkId const &, Unicode::String const &params)
+{
+	UNREF(command);
+	if (actor != NetworkId::cms_invalid)
+	{
+		CreatureObject * const obj = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+		if (obj)
+		{
+			const uint32 moodType = atoi(Unicode::wideToNarrow(params).c_str());
+			obj->setMood (moodType);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+static void commandFuncRequestWaypointAtPosition (Command const &command, NetworkId const &actor,
+	NetworkId const &, Unicode::String const &params)
+{
+	UNREF(command);
+	if (actor != NetworkId::cms_invalid)
+	{
+		CreatureObject * const obj = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+		if (obj)
+		{
+			if(obj->isPlayerControlled())
+			{
+				PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(obj);
+				if(playerObject)
+				{
+					size_t curpos = 0;
+
+					uint8 color = static_cast<uint8>(Waypoint::Blue);
+					std::string planet         = nextStringParm            (params, curpos);
+
+					// the first parameter may be the name of the planet or an unsigned
+					// int specifying the color of the waypoint, in which case the
+					// second parameter is the name of the planet
+
+					// obfuscation to prevent player from manually entering the
+					// requestWaypointAtPosition command and specifying the waypoint color
+					char buffer[256];
+					snprintf(buffer, sizeof(buffer)-1, "(^-,=+_)color_%s(,+-=_^)=", actor.getValueString().c_str());
+					buffer[sizeof(buffer)-1] = '\0';
+
+					if (planet.find(buffer) == 0)
+					{
+						size_t const bufferLength = strlen(buffer);
+						if (planet.size() > bufferLength)
+						{
+							std::string const colorStr = planet.substr(bufferLength);
+							color = static_cast<uint8>(atoi(colorStr.c_str()));
+
+							if ((color >= static_cast<uint8>(Waypoint::NumColors)) || (color == static_cast<uint8>(Waypoint::Invisible)))
+								color = static_cast<uint8>(Waypoint::Blue);
+						}
+
+						planet = nextStringParm(params, curpos);
+					}
+
+					const float x              = nextFloatParm             (params, curpos);
+					const float y              = nextFloatParm             (params, curpos);
+					const float z              = nextFloatParm             (params, curpos);
+					curpos                     = Unicode::skipWhitespace (params, curpos);
+
+					const std::string& sceneId = ServerWorld::getSceneId();
+					StringId s("planet_n", sceneId);
+
+					const Unicode::String & name = ((curpos != Unicode::String::npos) ? (params.substr (curpos)) : (Unicode::narrowToWide("@" + s.getCanonicalRepresentation())));
+
+					// get player object
+					Waypoint waypoint(playerObject->createWaypoint(Location(Vector(x, y, z), NetworkId::cms_invalid, Location::getCrcBySceneName(planet)),false));
+					if (waypoint.isValid())
+					{
+						waypoint.setName(name); // Waypoints are a bit like smart pointers, so this is changing the data on the PlayerObject, not just on a local variable
+						waypoint.setColor(color);
+					}
+					else
+					{
+						Chat::sendSystemMessage(*obj, SharedStringIds::too_many_waypoints, Unicode::emptyString);
+					}
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+* Parameters: <target> <chatType> <mood> <flags> <text...>
+* All parameters except text are integers
+*/
+
+static void commandFuncSpatialChatInternal(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	if (actor != NetworkId::cms_invalid)
+	{
+		ServerObject * const obj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(actor));
+		if (obj)
+		{
+
+			size_t curpos = 0;
+
+			const NetworkId targetId (nextStringParm (params, curpos));
+			const int chatType  = nextIntParm (params, curpos);
+			const int mood      = nextIntParm (params, curpos);
+			int flags           = nextIntParm (params, curpos);
+			int language        = nextIntParm (params, curpos);
+
+			// Verify the language parameter
+
+			if (!GameLanguageManager::isLanguageValid(language))
+			{
+				language = GameLanguageManager::getBasicLanguageId();
+			}
+
+			curpos              = Unicode::skipWhitespace  (params, curpos);
+
+			if (curpos == Unicode::String::npos)
+			{
+				DEBUG_WARNING (true, ("empty string in spatial chat"));
+				return;
+			}
+
+			const size_t nullpos = params.find (static_cast<unsigned short>(0), curpos);
+
+			Unicode::String text;
+			Unicode::String oob;
+
+			if (nullpos != Unicode::String::npos)
+			{
+				text = params.substr (curpos, nullpos - curpos);
+				oob  = params.substr (nullpos + 1);
+			}
+			else
+			{
+				// Strip any color codes the user may have entered
+
+				text = TextIterator(params.substr (curpos)).getPrintableText();
+			}
+
+			if (text.empty())
+			{
+				return;
+			}
+
+			const bool isPrivate = SpatialChatManager::isPrivate (chatType);
+
+			if (isPrivate)
+				flags |= MessageQueueSpatialChat::F_isPrivate;
+
+			if (chatType != -1 && mood != -1 && flags != -1 && curpos != Unicode::String::npos)
+			{
+				uint16 volume    = SpatialChatManager::getVolume (chatType);
+
+				CreatureObject * const creatureActor = obj->asCreatureObject();
+
+				//speak cs_spaceSpeechMultiple times when piloting a ship
+				if(creatureActor && creatureActor->getPilotedShip())
+					volume *= cs_spaceSpeechMultiple;
+
+				// track amount of spatial chat for the character
+				bool allowToSpeak = true;
+				bool squelched = false;
+				PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(creatureActor);
+				if (playerObject)
+				{
+					// update chat character count
+					playerObject->updateChatSpamSpatialNumCharacters(actor, text.size());
+
+					// see if player has exceeded chat limit
+					if (ConfigServerGame::getChatSpamLimiterEnabledForFreeTrial() &&
+						obj->getClient() &&
+						((obj->getClient()->getSubscriptionFeatures() & ClientSubscriptionFeature::Base) == 0) &&
+						((playerObject->getChatSpamSpatialNumCharacters() + playerObject->getChatSpamNonSpatialNumCharacters()) > ConfigServerGame::getChatSpamLimiterNumCharacters()))
+					{
+						allowToSpeak = false;
+					}
+					// see if the player is squelched
+					else if (0 != playerObject->getSecondsUntilUnsquelched())
+					{
+						allowToSpeak = false;
+						squelched = true;
+					}
+				}
+
+				if (allowToSpeak)
+				{
+					// character allowed to talk
+					obj->speakText(
+						MessageQueueSpatialChat(
+						CachedNetworkId(actor),
+						CachedNetworkId(targetId),
+						text,
+						volume,
+						static_cast<uint16>(chatType),
+						static_cast<uint16>(mood),
+						flags,
+						language,
+						oob));
+				}
+				else if (!squelched && (ConfigServerGame::getChatSpamNotifyPlayerWhenLimitedIntervalSeconds() > 0) && obj->getClient())
+				{
+					// send message telling character he can no longer talk
+					const int timeNow = static_cast<int>(::time(NULL));
+					const int chatSpamTimeEndInterval = playerObject->getChatSpamTimeEndInterval();
+					if ((chatSpamTimeEndInterval > timeNow) && (timeNow >= playerObject->getChatSpamNextTimeToNotifyPlayerWhenLimited()))
+					{
+						GenericValueTypeMessage<int> csl("ChatSpamLimited", (chatSpamTimeEndInterval - timeNow));
+						obj->getClient()->send(csl, true);
+
+						playerObject->setChatSpamNextTimeToNotifyPlayerWhenLimited((timeNow + ConfigServerGame::getChatSpamNotifyPlayerWhenLimitedIntervalSeconds()));
+					}
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+* Parameters: <target> <chatType name> <mood name> <text...>[null terminator + oob]
+* All parameters are strings
+*/
+
+static void commandFuncSpatialChat(Command const &, NetworkId const &actor, NetworkId const & targetId, Unicode::String const &params)
+{
+	if (actor != NetworkId::cms_invalid)
+	{
+		ServerObject * const obj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(actor));
+		if (obj)
+		{
+			size_t curpos = 0;
+
+			Unicode::String chatTypeName;
+			Unicode::String moodTypeName;
+			Unicode::String flagsString;
+
+			if (!Unicode::getFirstToken (params, curpos, curpos, chatTypeName) || curpos == Unicode::String::npos)
+			{
+				WARNING (true, ("Not enough arguments to commandFuncSpatialChat (no chat type)"));
+				return;
+			}
+
+			if (!Unicode::getFirstToken (params, ++curpos, curpos, moodTypeName) || curpos == Unicode::String::npos)
+			{
+				WARNING (true, ("Not enough arguments to commandFuncSpatialChat (no mood type)"));
+				return;
+			}
+
+			if (!Unicode::getFirstToken (params, ++curpos, curpos, flagsString) || curpos == Unicode::String::npos)
+			{
+				WARNING (true, ("Not enough arguments to commandFuncSpatialChat (no flags)"));
+				return;
+			}
+
+			curpos = Unicode::skipWhitespace(params, ++curpos);
+
+			const std::string & narrow_chatTypeName = Unicode::wideToNarrow (chatTypeName);
+			const std::string & narrow_moodTypeName = Unicode::wideToNarrow (moodTypeName);
+
+			const uint32 chatType = SpatialChatManager::getChatTypeByName (narrow_chatTypeName);
+
+			curpos = Unicode::skipWhitespace  (params, curpos);
+
+			if (curpos == Unicode::String::npos)
+			{
+				DEBUG_WARNING (true, ("empty string in spatial chat"));
+				return;
+			}
+
+			size_t nullpos = params.find (static_cast<unsigned short>(0), curpos);
+
+			Unicode::String text;
+			Unicode::String oob;
+
+			if (nullpos != Unicode::String::npos)
+			{
+				text = params.substr (curpos, nullpos - curpos);
+				oob  = params.substr (nullpos + 1);
+			}
+			else
+			{
+				text = params.substr (curpos);
+
+			}
+
+			if (curpos != Unicode::String::npos)
+			{
+				const uint32 moodType = MoodManager::getMoodByCanonicalName   (narrow_moodTypeName);
+				const bool isPrivate  = SpatialChatManager::isPrivate (chatType);
+
+				uint32 flags = atoi (Unicode::wideToNarrow (flagsString).c_str ());
+				if (isPrivate)
+					flags |= MessageQueueSpatialChat::F_isPrivate;
+
+				const uint16 volume    = SpatialChatManager::getVolume (chatType);
+
+				// track amount of spatial chat for the character
+				bool allowToSpeak = true;
+				bool squelched = false;
+				PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(obj->asCreatureObject());
+				if (playerObject)
+				{
+					// update chat character count
+					playerObject->updateChatSpamSpatialNumCharacters(actor, text.size());
+
+					// see if player has exceeded chat limit
+					if (ConfigServerGame::getChatSpamLimiterEnabledForFreeTrial() &&
+						obj->getClient() &&
+						((obj->getClient()->getSubscriptionFeatures() & ClientSubscriptionFeature::Base) == 0) &&
+						((playerObject->getChatSpamSpatialNumCharacters() + playerObject->getChatSpamNonSpatialNumCharacters()) > ConfigServerGame::getChatSpamLimiterNumCharacters()))
+					{
+						allowToSpeak = false;
+					}
+					// see if the player is squelched
+					else if (0 != playerObject->getSecondsUntilUnsquelched())
+					{
+						allowToSpeak = false;
+						squelched = true;
+					}
+				}
+
+				if (allowToSpeak)
+				{
+					// character allowed to talk
+					obj->speakText(
+						MessageQueueSpatialChat(
+						CachedNetworkId(actor),
+						CachedNetworkId(targetId),
+						text,
+						volume,
+						static_cast<uint16>(chatType),
+						static_cast<uint16>(moodType),
+						flags,
+						0,
+						oob));
+				}
+				else if (!squelched && (ConfigServerGame::getChatSpamNotifyPlayerWhenLimitedIntervalSeconds() > 0) && obj->getClient())
+				{
+					// send message telling character he can no longer talk
+					const int timeNow = static_cast<int>(::time(NULL));
+					const int chatSpamTimeEndInterval = playerObject->getChatSpamTimeEndInterval();
+					if ((chatSpamTimeEndInterval > timeNow) && (timeNow >= playerObject->getChatSpamNextTimeToNotifyPlayerWhenLimited()))
+					{
+						GenericValueTypeMessage<int> csl("ChatSpamLimited", (chatSpamTimeEndInterval - timeNow));
+						obj->getClient()->send(csl, true);
+
+						playerObject->setChatSpamNextTimeToNotifyPlayerWhenLimited((timeNow + ConfigServerGame::getChatSpamNotifyPlayerWhenLimitedIntervalSeconds()));
+					}
+				}
+			}
+			else
+				WARNING (true, ("Invalid empty output string in commandFuncSpatialChat"));
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+/**
+*
+* string Params:
+*       - string networkId of 'other' participant
+*		- integer numeric value
+*		- integer bitflags for transmission (0x01 == sendToActor, 0x02 == sendToTarget, 0x04 == sendToBystanders)
+*       - string or stringID.  StringId is preceded with a '@'
+*
+static void commandFuncCombatSpam (Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &params)
+{
+	const CachedNetworkId actorId  (actor);
+	const CachedNetworkId targetId (target);
+
+	ServerObject * const obj = safe_cast<ServerObject *>(actorId.getObject ());
+	if (!obj)
+	{
+		WARNING (true, ("null actor in commandFuncCombatSpam"));
+		return;
+	}
+
+	size_t curpos = 0;
+
+	Unicode::String otherIdStr;
+	Unicode::String intValueStr;
+	Unicode::String bitflagsStr;
+	Unicode::String stringId;
+	Unicode::String combatSpamType;
+
+	if (!Unicode::getFirstToken (params, curpos, curpos, otherIdStr) || curpos == Unicode::String::npos)
+	{
+		WARNING (true, ("Not enough arguments to commandFuncCombatSpam (missing networkId value)"));
+		return;
+	}
+
+	if (!Unicode::getFirstToken (params, ++curpos, curpos, intValueStr) || curpos == Unicode::String::npos)
+	{
+		WARNING (true, ("Not enough arguments to commandFuncCombatSpam (missing int value)"));
+		return;
+	}
+
+	if (!Unicode::getFirstToken (params, ++curpos, curpos, bitflagsStr) || curpos == Unicode::String::npos)
+	{
+		WARNING (true, ("Not enough arguments to commandFuncCombatSpam (missing bitflags)"));
+		return;
+	}
+
+	if (!Unicode::getFirstToken (params, ++curpos, curpos, stringId) || curpos == Unicode::String::npos)
+	{
+		WARNING (true, ("Not enough arguments to commandFuncCombatSpam (missing stringId)"));
+		return;
+	}
+
+	if (!Unicode::getFirstToken (params, ++curpos, curpos, combatSpamType))
+	{
+		WARNING (true, ("Not enough arguments to commandFuncCombatSpam (missing combatSpamType)"));
+		return;
+	}
+
+	//DEBUG_REPORT_LOG(true, ("Combat spam type: %d\n", Unicode::toInt(combatSpamType)));
+
+	const CachedNetworkId otherId (Unicode::wideToNarrow (otherIdStr));
+
+	MessageQueueCombatSpam msg (actorId, (actor.getObject() ? actor.getObject()->getPosition_w() : Vector::zero), targetId, (target.getObject() ? target.getObject()->getPosition_w() : Vector::zero), otherId, 0, Unicode::String (), static_cast<unsigned char>(Unicode::toInt(combatSpamType)));
+
+	curpos = Unicode::skipWhitespace(params, ++curpos);
+
+	const int    intValue = atoi (Unicode::wideToNarrow (intValueStr).c_str ());
+	const int    bitflags = atoi (Unicode::wideToNarrow (bitflagsStr).c_str ());
+
+	if (bitflags == 0)
+	{
+		WARNING_STRICT_FATAL (true, ("Got a commandFuncCombatSpam with no recepients specified."));
+	}
+
+	msg.m_intValue = intValue;
+
+	if (stringId [0] == '@')
+	{
+		stringId.erase (static_cast<size_t>(0), 1);
+		msg.m_msgId = StringId (Unicode::wideToNarrow (stringId));
+	}
+	else
+		msg.m_msg = stringId;
+
+	enum Bitflags
+	{
+		B_sendToActor      = 0x01,
+		B_sendToTarget     = 0x02,
+		B_sendToBystanders = 0x04
+	};
+
+	const bool sendToSelf       = (bitflags & B_sendToActor)      != 0;
+	const bool sendToTarget     = (bitflags & B_sendToTarget)     != 0;
+	const bool sendToBystanders = (bitflags & B_sendToBystanders) != 0;
+
+	obj->performCombatSpam (msg, sendToSelf, sendToTarget, sendToBystanders);
+}
+*/
+//----------------------------------------------------------------------
+
+/**
+*
+* string Params:
+*		- string   target type (Player or ChatChannel)
+*		- string   target id   (Player name or chat channel name, e.g. SWG.betaGalaxy.Justin or SWG.betaGalaxy.system)
+*       - string   message
+*/
+
+static void commandFuncSystemMessage(Command const &, NetworkId const &, NetworkId const &, Unicode::String const &params)
+{
+	size_t curpos = 0;
+
+	Unicode::String targetTypeStr;
+	Unicode::String targetIdStr;
+
+	if (!Unicode::getFirstToken (params, curpos, curpos, targetTypeStr) || curpos == Unicode::String::npos)
+	{
+		WARNING (true, ("Not enough arguments to commandFuncSystemMessage (missing int value)"));
+		return;
+	}
+
+	if (!Unicode::getFirstToken (params, ++curpos, curpos, targetIdStr) || curpos == Unicode::String::npos)
+	{
+		WARNING (true, ("Not enough arguments to commandFuncSystemMessage (missing bitflags)"));
+		return;
+	}
+
+	if (curpos == Unicode::String::npos)
+	{
+		WARNING (true, ("Not enough arguments to commandFuncSystemMessage (missing msg)"));
+		return;
+	}
+
+	curpos = Unicode::skipWhitespace(params, ++curpos);
+
+	Unicode::String output = params.substr (curpos);
+
+	if (output.empty ())
+	{
+		WARNING (true, ("Not enough arguments to commandFuncSystemMessage (missing msg)"));
+		return;
+	}
+
+	std::string targetType = Unicode::wideToNarrow(targetTypeStr);
+	std::string targetId = Unicode::wideToNarrow(targetIdStr);
+	static const Unicode::String oob;
+
+	if(targetType == "Player")
+	{
+		Chat::sendInstantMessage("SYSTEM", targetId, output, oob);
+	}
+	else if(targetType == "ChatChannel")
+	{
+		Chat::sendToRoom("SYSTEM", targetId, output, oob);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+static void commandFuncSetWaypointActiveStatus(Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const &params)
+{
+	CachedNetworkId actorId(actor);
+	WARNING(! actorId.getObject(), ("commandSetWaypointActiveStatus: Could not get an object for actor id %s\n", actor.getValueString().c_str()));
+	if(actorId.getObject())
+	{
+		CreatureObject * creature = dynamic_cast<CreatureObject *>(actorId.getObject());
+		if(creature)
+		{
+			if(creature->isPlayerControlled())
+			{
+				PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(creature);
+				if(playerObject)
+				{
+					Waypoint w = playerObject->getWaypoint(target);
+					if (w.isValid())
+					{
+						Unicode::String status;
+						size_t curpos = 0;
+						if (!Unicode::getFirstToken (params, curpos, curpos, status))
+						{
+							WARNING (true, ("Not enough arguments to commandFuncSystemMessage (missing int value)"));
+							return;
+						}
+						if(status == Unicode::narrowToWide("on"))
+						{
+							w.setActive(true);
+						}
+						else if(status == Unicode::narrowToWide("off"))
+						{
+							w.setActive(false);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+static void commandFuncSetWaypointName(Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const &params)
+{
+	CachedNetworkId actorId(actor);
+	WARNING(! actorId.getObject(), ("commandFuncSetWaypointName: Could not get an object for actor id %s\n", actor.getValueString().c_str()));
+	if(actorId.getObject())
+	{
+		CreatureObject * creature = dynamic_cast<CreatureObject *>(actorId.getObject());
+		if(creature)
+		{
+			if(creature->isPlayerControlled())
+			{
+				PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(creature);
+				if(playerObject)
+				{
+					Waypoint w = playerObject->getWaypoint(target);
+					if (w.isValid())
+					{
+						Unicode::String name;
+						size_t curpos = 0;
+						if (!Unicode::getFirstToken (params, curpos, curpos, name))
+						{
+							WARNING (true, ("Not enough arguments to commandFuncSystemMessage (missing text value)"));
+							return;
+						}
+						w.setName(params);
+					}
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandSetPosture(Command const &command, NetworkId const &actor, NetworkId const &, Unicode::String const &)
+{
+	CachedNetworkId actorId(actor);
+	if (actorId.getObject() != NULL)
+	{
+		CreatureController * const controller = dynamic_cast<CreatureController *>(actorId.getObject()->getController());
+		if (controller != NULL)
+		{
+			CreatureObject * const creature    = safe_cast<CreatureObject*>(actorId.getObject());
+			NOT_NULL (creature);
+			Postures::Enumerator const posture = creature->getPosture();
+
+			// send the creature's posture to it
+			MessageQueuePosture * message = new MessageQueuePosture(posture, true);
+			controller->appendMessage(
+				CM_setPosture,
+				0.0f,
+				message,
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_ALL_CLIENT
+				);
+
+			// Ensure the chair sitting state is off if the player is not sitting.
+			if (posture != Postures::Sitting)
+			{
+				creature->setState(States::SittingOnChair, false);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncJumpServer(Command const &command, NetworkId const &actor, NetworkId const &, Unicode::String const &)
+{
+	CachedNetworkId actorId(actor);
+	if (actorId.getObject() != NULL)
+	{
+		CreatureController * const controller = dynamic_cast<CreatureController *>(actorId.getObject()->getController());
+		if (controller != NULL)
+		{
+			controller->appendMessage(
+				CM_jump,
+				0.0f,
+				NULL,
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_ALL_CLIENT
+				);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAddBannedPlayer(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	size_t curpos = 0;
+	NetworkId objId(nextOidParm(params, curpos));
+	curpos = Unicode::skipWhitespace(params, curpos);
+
+	Object *obj = NetworkIdManager::getObjectById(objId);
+	Client *client = getClientFromCharacterId(actor);
+	if (obj)
+	{
+		CellObject *cell = dynamic_cast<CellObject *>(obj);
+		if (cell)
+		{
+			BuildingObject *building = cell->getOwnerBuilding();
+			if (building && building->isOwner(actor, client))
+				cell->addBanned(Unicode::wideToNarrow(params.substr(curpos)));
+		}
+		else
+		{
+			BuildingObject *building = dynamic_cast<BuildingObject *>(obj);
+			if (building && building->isOwner(actor, client))
+				building->addBanned(Unicode::wideToNarrow(params.substr(curpos)));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncRemoveBannedPlayer(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	size_t curpos = 0;
+	NetworkId objId(nextOidParm(params, curpos));
+	curpos = Unicode::skipWhitespace(params, curpos);
+
+	Object *obj = NetworkIdManager::getObjectById(objId);
+	Client *client = getClientFromCharacterId(actor);
+	if (obj)
+	{
+		CellObject *cell = dynamic_cast<CellObject *>(obj);
+		if (cell)
+		{
+			BuildingObject *building = cell->getOwnerBuilding();
+			if (building && building->isOwner(actor, client))
+				cell->removeBanned(Unicode::wideToNarrow(params.substr(curpos)));
+		}
+		else
+		{
+			BuildingObject *building = dynamic_cast<BuildingObject *>(obj);
+			if (building && building->isOwner(actor, client))
+				building->removeBanned(Unicode::wideToNarrow(params.substr(curpos)));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAddAllowedPlayer(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	size_t curpos = 0;
+	NetworkId objId(nextOidParm(params, curpos));
+	curpos = Unicode::skipWhitespace(params, curpos);
+
+	Object *obj = NetworkIdManager::getObjectById(objId);
+	Client *client = getClientFromCharacterId(actor);
+	if (obj)
+	{
+		CellObject *cell = dynamic_cast<CellObject *>(obj);
+		if (cell)
+		{
+			BuildingObject *building = cell->getOwnerBuilding();
+			if (building && building->isOwner(actor, client))
+				cell->addAllowed(Unicode::wideToNarrow(params.substr(curpos)));
+		}
+		else
+		{
+			BuildingObject *building = dynamic_cast<BuildingObject *>(obj);
+			if (building && building->isOwner(actor, client))
+				building->addAllowed(Unicode::wideToNarrow(params.substr(curpos)));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncRemoveAllowedPlayer(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	size_t curpos = 0;
+	NetworkId objId(nextOidParm(params, curpos));
+	curpos = Unicode::skipWhitespace(params, curpos);
+
+	Object *obj = NetworkIdManager::getObjectById(objId);
+	Client *client = getClientFromCharacterId(actor);
+	if (obj)
+	{
+		CellObject *cell = dynamic_cast<CellObject *>(obj);
+		if (cell)
+		{
+			BuildingObject *building = cell->getOwnerBuilding();
+			if (building && building->isOwner(actor, client))
+				cell->removeAllowed(Unicode::wideToNarrow(params.substr(curpos)));
+		}
+		else
+		{
+			BuildingObject *building = dynamic_cast<BuildingObject *>(obj);
+			if (building && building->isOwner(actor, client))
+				building->removeAllowed(Unicode::wideToNarrow(params.substr(curpos)));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncSetPublicState(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	size_t curpos = 0;
+	NetworkId objId(nextOidParm(params, curpos));
+	int publicState = nextIntParm(params, curpos);
+
+	Object *obj = NetworkIdManager::getObjectById(objId);
+	Client *client = getClientFromCharacterId(actor);
+	if (obj)
+	{
+		CellObject *cell = dynamic_cast<CellObject *>(obj);
+		if (cell)
+		{
+			BuildingObject *building = cell->getOwnerBuilding();
+			if (building && building->isOwner(actor, client))
+				cell->setIsPublic(publicState ? true : false);
+		}
+		else
+		{
+			BuildingObject *building = dynamic_cast<BuildingObject *>(obj);
+			if (building && building->isOwner(actor, client))
+				building->setIsPublic(publicState ? true : false);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncSetOwner(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	size_t curpos = 0;
+	NetworkId objId(nextOidParm(params, curpos));
+	NetworkId ownerId(nextOidParm(params, curpos));
+
+	Object *obj = NetworkIdManager::getObjectById(objId);
+	Client *client = getClientFromCharacterId(actor);
+	if (obj)
+	{
+		ServerObject *tangibleObj = safe_cast<ServerObject *>(obj);
+		if (tangibleObj && tangibleObj->isOwner(actor, client))
+		{
+			tangibleObj->setOwnerId(ownerId);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void resolveDuelParticipants(CreatureObject &actor, TangibleObject &target, TangibleObject *&actorFlagObj, CreatureObject *&targetMessageObj)
+{
+	ShipObject * const targetShip = target.asShipObject();
+	if (targetShip)
+	{
+		// Dueling a ship
+		// actorFlagObj is the containing ship of the actor if he owns it
+		ShipObject * const actorShip = ShipObject::getContainingShipObject(&actor);
+		if (   actorShip
+		    && actorShip->isPlayerShip()
+		    && actor.getNetworkId() == actorShip->getOwnerId())
+			actorFlagObj = actorShip;
+		// targetMessageObj is the owner of the target ship
+		if (targetShip->isPlayerShip())
+		{
+			Object * const o = NetworkIdManager::getObjectById(targetShip->getOwnerId());
+			if (o)
+			{
+				ServerObject * const so = o->asServerObject();
+				if (so)
+					targetMessageObj = so->asCreatureObject();
+			}
+		}
+	}
+	else
+	{
+		actorFlagObj = &actor;
+		targetMessageObj = target.asCreatureObject();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncDuel(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &)
+{
+	if (target != NetworkId::cms_invalid && target != actor)
+	{
+		CreatureObject * const actorObj = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+		TangibleObject * const targetObj = dynamic_cast<TangibleObject *>(NetworkIdManager::getObjectById(target));
+		if (actorObj && targetObj)
+		{
+			TangibleObject *actorFlagObj = 0;
+			CreatureObject *targetMessageObj = 0;
+			resolveDuelParticipants(*actorObj, *targetObj, actorFlagObj, targetMessageObj);
+
+			if (actorFlagObj && targetMessageObj && actorObj != targetMessageObj)
+			{
+				if (PlayerObject::isIgnoring(actor, targetMessageObj->getNetworkId()))
+					return;
+
+				if (actorObj->hasAutoDeclineDuel())
+				{
+					sendProseMessage(*actorObj, targetMessageObj, CommandStringId::SID_DUEL_CANNOT_DUEL_AUTO_DECLINE);
+					return;
+				}
+
+				if (Pvp::canAttack(*actorObj, *targetObj))
+				{
+					sendProseMessage(*actorObj, targetMessageObj, CommandStringId::SID_DUEL_ALREADY_CAN_ATTACK);
+					return;
+				}
+
+				if (Pvp::canAttack(*targetObj, *actorObj))
+				{
+					sendProseMessage(*actorObj, targetMessageObj, CommandStringId::SID_DUEL_NOT_AVAILABLE_TO_DUEL);
+					return;
+				}
+
+				if (targetObj->hasAutoDeclineDuel())
+				{
+					sendProseMessage(*actorObj, targetMessageObj, CommandStringId::SID_DUEL_NOT_AVAILABLE_TO_DUEL);
+					sendProseMessage(*targetMessageObj, actorObj, CommandStringId::SID_DUEL_AUTO_DECLINED_DUEL);
+					return;
+				}
+
+				if(targetObj->getObjVars().hasItem("hologram_performer"))
+				{
+					sendProseMessage(*actorObj, targetMessageObj, CommandStringId::SID_DUEL_NOT_HOLOGRAM);
+				}
+				else if (!Pvp::isDuelingAllowed(*actorFlagObj, *targetObj))
+				{
+					sendProseMessage(*actorObj, targetMessageObj, CommandStringId::SID_DUEL_NOT_HERE);
+				}
+				else if (Pvp::hasDuelEnemyFlag(*actorFlagObj, targetObj->getNetworkId()))
+				{
+					if (Pvp::hasDuelEnemyFlag(*targetObj, actorFlagObj->getNetworkId()))
+						sendProseMessage(*actorObj, targetMessageObj, CommandStringId::SID_DUEL_ALREADY_DUELING);
+					else
+						sendProseMessage(*actorObj, targetMessageObj, CommandStringId::SID_DUEL_ALREADY_CHALLENGED);
+				}
+				else if (Pvp::hasDuelEnemyFlag(*targetObj, actorFlagObj->getNetworkId()))
+				{
+					// Duel Accepted and Starting.
+					Pvp::setDuelEnemyFlag(*actorFlagObj, *targetObj);
+					sendProseMessage(*actorObj, targetMessageObj, CommandStringId::SID_DUEL_ACCEPT_SELF);
+					sendProseMessage(*targetMessageObj, actorObj, CommandStringId::SID_DUEL_ACCEPT_TARGET);
+
+					// Call their Script Triggers
+					ServerObject* serverActor = actorObj->asServerObject();
+					if(serverActor)
+					{
+						ScriptParams params;
+						params.addParam(actor);
+						params.addParam(target);
+						if(serverActor->getScriptObject())
+						{
+							IGNORE_RETURN(serverActor->getScriptObject()->trigAllScripts(Scripting::TRIG_ON_DUEL_START, params));
+							
+						}
+					}
+
+					ServerObject* serverTarget = targetObj->asServerObject();
+					if(serverTarget)
+					{
+						ScriptParams params;
+						params.addParam(actor);
+						params.addParam(target);
+						if(serverTarget->getScriptObject())
+						{
+							IGNORE_RETURN( serverTarget->getScriptObject()->trigAllScripts(Scripting::TRIG_ON_DUEL_START, params));
+						}
+					}
+					/// End script triggers.
+
+				}
+				else
+				{
+					// Duel Request
+					// Call their Script Triggers
+					ServerObject* serverActor = actorObj->asServerObject();
+					if(serverActor)
+					{
+						ScriptParams params;
+						params.addParam(actor);
+						params.addParam(target);
+						if(serverActor->getScriptObject())
+						{
+							if( serverActor->getScriptObject()->trigAllScripts(Scripting::TRIG_ON_DUEL_REQUEST, params) == SCRIPT_OVERRIDE )
+								return;
+						}
+					}
+
+					ServerObject* serverTarget = targetObj->asServerObject();
+					if(serverTarget)
+					{
+						ScriptParams params;
+						params.addParam(actor);
+						params.addParam(target);
+						if(serverTarget->getScriptObject())
+						{
+							if( serverTarget->getScriptObject()->trigAllScripts(Scripting::TRIG_ON_DUEL_REQUEST, params) == SCRIPT_OVERRIDE )
+								return;
+						}
+					}
+					/// End script triggers.
+					Pvp::setDuelEnemyFlag(*actorFlagObj, *targetObj);
+					sendProseMessage(*actorObj, targetMessageObj, CommandStringId::SID_DUEL_CHALLENGE_SELF);
+					sendProseMessage(*targetMessageObj, actorObj, CommandStringId::SID_DUEL_CHALLENGE_TARGET);
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncEndDuel(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &)
+{
+	if (target != NetworkId::cms_invalid)
+	{
+		CreatureObject * const actorObj = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+		TangibleObject * const targetObj = dynamic_cast<TangibleObject *>(NetworkIdManager::getObjectById(target));
+		if (actorObj && targetObj)
+		{
+			TangibleObject *actorFlagObj = 0;
+			CreatureObject *targetMessageObj = 0;
+			resolveDuelParticipants(*actorObj, *targetObj, actorFlagObj, targetMessageObj);
+
+			if (actorFlagObj && targetMessageObj)
+			{
+				if (Pvp::hasDuelEnemyFlag(*targetObj, actorFlagObj->getNetworkId()))
+				{
+					Pvp::removeDuelEnemyFlags(*targetObj, actorFlagObj->getNetworkId());
+					if (Pvp::hasDuelEnemyFlag(*actorFlagObj, targetObj->getNetworkId()))
+					{
+						Pvp::removeDuelEnemyFlags(*actorFlagObj, targetObj->getNetworkId());
+						sendProseMessage(*actorObj, targetMessageObj, CommandStringId::SID_DUEL_END_SELF);
+						sendProseMessage(*targetMessageObj, actorObj, CommandStringId::SID_DUEL_END_TARGET);
+
+						// notify script that the duel has ended because of the EndDuel command
+						{
+						ScriptParams params;
+						params.addParam(targetObj->getNetworkId(), "target");
+						ScriptDictionaryPtr dictionary;
+						GameScriptObject::makeScriptDictionary(params, dictionary);
+						if (dictionary.get() != NULL)
+						{
+							dictionary->serialize();
+							MessageToQueue::getInstance().sendMessageToJava(actorFlagObj->getNetworkId(), 
+								"endDuelCommandNotification", dictionary->getSerializedData(), 0, false);
+						}
+						}
+
+						{
+							ScriptParams params;
+							params.addParam(actorFlagObj->getNetworkId(), "target");
+							ScriptDictionaryPtr dictionary;
+							GameScriptObject::makeScriptDictionary(params, dictionary);
+							if (dictionary.get() != NULL)
+							{
+								dictionary->serialize();
+								MessageToQueue::getInstance().sendMessageToJava(targetObj->getNetworkId(), 
+									"endDuelCommandNotification", dictionary->getSerializedData(), 0, false);
+							}
+						}
+					}
+					else
+					{
+						sendProseMessage(*actorObj, targetMessageObj, CommandStringId::SID_DUEL_REJECT_SELF);
+						sendProseMessage(*targetMessageObj, actorObj, CommandStringId::SID_DUEL_REJECT_TARGET);
+					}
+				}
+				else if (Pvp::hasDuelEnemyFlag(*actorFlagObj, targetObj->getNetworkId()))
+				{
+					Pvp::removeDuelEnemyFlags(*actorFlagObj, targetObj->getNetworkId());
+					sendProseMessage(*actorObj, targetMessageObj, CommandStringId::SID_DUEL_CANCEL_SELF);
+					sendProseMessage(*targetMessageObj, actorObj, CommandStringId::SID_DUEL_CANCEL_TARGET);
+				}
+				else
+				{
+					sendProseMessage(*actorObj, targetMessageObj, CommandStringId::SID_DUEL_NOT_DUELING);
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncHarvesterActivate(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(actor));
+	HarvesterInstallationObject *targetObj = dynamic_cast<HarvesterInstallationObject*>(NetworkIdManager::getObjectById(target));
+	if (targetObj && actorObj && targetObj->isOnAdminList(*actorObj))
+			targetObj->activate(actor);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncHarvesterDeactivate(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(actor));
+	HarvesterInstallationObject *targetObj = dynamic_cast<HarvesterInstallationObject*>(NetworkIdManager::getObjectById(target));
+	if (targetObj && actorObj &&targetObj->isOnAdminList(*actorObj))
+			targetObj->deactivate();
+
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncHarvesterHarvest(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(actor));
+	HarvesterInstallationObject *targetObj = dynamic_cast<HarvesterInstallationObject*>(NetworkIdManager::getObjectById(target));
+	if (targetObj && actorObj && targetObj->isOnAdminList(*actorObj))
+			targetObj->harvest();
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncHarvesterSelectResource(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &parameter)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(actor));
+	HarvesterInstallationObject *targetObj = dynamic_cast<HarvesterInstallationObject*>(NetworkIdManager::getObjectById(target));
+	NetworkId poolId(Unicode::wideToNarrow(parameter));
+	if (targetObj && actorObj && targetObj->isOnAdminList(*actorObj))
+		targetObj->selectResource(poolId, actor);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncHarvesterDiscardHopper(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(actor));
+	HarvesterInstallationObject *targetObj = dynamic_cast<HarvesterInstallationObject*>(NetworkIdManager::getObjectById(target));
+	if (targetObj && actorObj &&targetObj->isOnAdminList(*actorObj))
+		targetObj->discardAllHopperContents();
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncHarvesterMakeCrate(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &params)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(actor));
+	HarvesterInstallationObject *targetObj = dynamic_cast<HarvesterInstallationObject*>(NetworkIdManager::getObjectById(target));
+	size_t pos=0;
+	const NetworkId resourceId = nextOidParm(params,pos);
+	const int amount = nextIntParm(params,pos);
+	const bool discard = nextBoolParm(params,pos);
+	const uint8 sequenceId = static_cast<uint8>(nextIntParm(params,pos));
+
+	if (targetObj && actorObj && targetObj->isOnAdminList(*actorObj))
+		targetObj->emptyHopper(actor,resourceId,amount,discard,sequenceId);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncResourceSetName(Command const &, NetworkId const &, NetworkId const &target, Unicode::String const &params)
+{
+	ResourceTypeObject * const targetObj = ServerUniverse::getInstance().getResourceTypeById(target);
+	if (targetObj)
+		targetObj->setName(Unicode::wideToNarrow(params));
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncResourceContainerTransfer(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &params)
+{
+	CreatureObject * const player = safe_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (!player)
+		return;
+	
+	ResourceContainerObject *sourceObj = dynamic_cast<ResourceContainerObject*>(NetworkIdManager::getObjectById(target));
+	size_t pos = 0;
+	NetworkId destId = nextOidParm(params,pos);
+	ResourceContainerObject *destObj = dynamic_cast<ResourceContainerObject*>(NetworkIdManager::getObjectById(destId));
+	int amount = nextIntParm(params,pos); 
+
+	
+	if (!sourceObj || !destObj || amount <= 0)
+		return;
+
+	Container::ContainerErrorCode error = Container::CEC_Success;
+	if (!player->canManipulateObject(*sourceObj, true, true, true, 10.0f, error))
+	{
+		ContainerInterface::sendContainerMessageToClient(*player, error, sourceObj);
+		return;
+	}
+	if (!player->canManipulateObject(*destObj, true, true, true, 10.0f, error))
+	{
+		ContainerInterface::sendContainerMessageToClient(*player, error, destObj);
+		return;
+	}
+	
+	sourceObj->transferTo(*destObj, amount);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncMakeSurvey(Command const &, NetworkId const &, NetworkId const &, Unicode::String const &)
+{
+	//TODO: Do something here someday
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncRequestSurvey(Command const &, NetworkId const &actor, NetworkId const &tool, Unicode::String const &params)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	if (actorObj && actorObj->getClient())
+	{
+		size_t curpos = 0;
+		Unicode::String resourceName = Unicode::narrowToWide(nextStringParm (params, curpos));
+
+		ScriptParams params;
+		params.addParam(actor);
+		params.addParam(resourceName);
+
+		//now trigger the script, the actor should have exactly one on himself
+		ServerObject *toolObj = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(tool));
+		if (toolObj)
+			toolObj->getScriptObject()->trigAllScripts(Scripting::TRIG_REQUEST_SURVEY, params);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncRequestCoreSample(Command const &, NetworkId const &actor, NetworkId const &tool, Unicode::String const &params)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	if (actorObj && actorObj->getClient())
+	{
+		size_t curpos = 0;
+		Unicode::String resourceName = Unicode::narrowToWide(nextStringParm (params, curpos));
+
+		ScriptParams params;
+		params.addParam(actor);
+		params.addParam(resourceName);
+
+		//now trigger the script, the actor should have exactly one on himself
+		ServerObject *toolObj = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(tool));
+		if (toolObj)
+			toolObj->getScriptObject()->trigAllScripts(Scripting::TRIG_REQUEST_CORESAMPLE, params);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncResourceContainerSplit(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &params)
+{
+	ResourceContainerObject * const sourceObj = dynamic_cast<ResourceContainerObject*>(NetworkIdManager::getObjectById(target));
+	if (!sourceObj)
+		return;
+
+	CreatureObject * const player = safe_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (!player)
+		return;
+
+	size_t pos = 0;
+	const int amount           = nextIntParm(params,pos);
+	const CachedNetworkId destContainer (nextOidParm(params,pos));
+	const int arrangementId    = nextIntParm(params,pos);
+	const Vector & newLocation = nextVectorParm(params,pos);
+
+	Container::ContainerErrorCode error = Container::CEC_Success;
+	if (!player->canManipulateObject(*sourceObj, true, true, true, 10.0f, error))
+	{
+		ContainerInterface::sendContainerMessageToClient(*player, error, sourceObj);
+	}
+	else if (!sourceObj->splitContainer(amount,destContainer,arrangementId,newLocation, safe_cast<ServerObject*>(NetworkIdManager::getObjectById(actor))))
+	{
+		ContainerInterface::sendContainerMessageToClient(*player, Container::CEC_Full, safe_cast<ServerObject *>(destContainer.getObject ()));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncFactoryCrateSplit(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &params)
+{
+	FactoryObject * const sourceObj = dynamic_cast<FactoryObject*>(NetworkIdManager::getObjectById(target));
+	if (!sourceObj)
+		return;
+
+	CreatureObject * const player = safe_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (!player)
+		return;
+
+	size_t pos = 0;
+	const int amount = nextIntParm(params,pos);
+	const CachedNetworkId destContainerId (nextOidParm(params,pos));
+	ServerObject * destContainer = safe_cast<ServerObject *>(destContainerId.getObject());
+	if (destContainer == NULL || ContainerInterface::getVolumeContainer(*destContainer) == NULL)
+	{
+		ContainerInterface::sendContainerMessageToClient(*player, Container::CEC_NotFound);
+		return;
+	}
+
+	Container::ContainerErrorCode error = Container::CEC_Success;
+	if (!player->canManipulateObject(*sourceObj, true, true, true, 10.0f, error))
+	{
+		ContainerInterface::sendContainerMessageToClient(*player, error, sourceObj);
+	}
+	else if (sourceObj->makeCopy(*destContainer, amount) == NULL)
+	{
+		ContainerInterface::sendContainerMessageToClient(*player, Container::CEC_Full,
+			destContainer);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncPermissionListModify(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &params)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	if (actorObj && actorObj->getClient())
+	{
+		size_t curpos = 0;
+		const Unicode::String & playerName = Unicode::narrowToWide(nextStringParm (params, curpos));
+		const Unicode::String & listName   = Unicode::narrowToWide(nextStringParm (params, curpos));
+		const Unicode::String & action     = Unicode::narrowToWide(nextStringParm (params, curpos));
+
+		ScriptParams params;
+		params.addParam(actor);
+		params.addParam(playerName);
+		params.addParam(listName);
+		params.addParam(action);
+
+		//now trigger the script, the actor should have exactly one on himself
+		actorObj->getScriptObject()->trigAllScripts(Scripting::TRIG_PERMISSION_LIST_MODIFY, params);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncSynchronizedUiListen(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &)
+{
+	ServerObject *targetObj = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(target));
+	CreatureObject * const actorObject = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(actor));
+	if (targetObj && actorObject)
+		targetObj->addSynchronizedUiClient(*actorObject);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncSynchronizedUiStopListening(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &)
+{
+	ServerObject *targetObj = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(target));
+	if (targetObj)
+		targetObj->removeSynchronizedUiClient(actor);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncHarvesterGetResourceData(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &)
+{
+	HarvesterInstallationObject *targetObj = dynamic_cast<HarvesterInstallationObject*>(NetworkIdManager::getObjectById(target));
+	CreatureObject *actorObject = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(actor));
+	if (targetObj && actorObject && targetObj->isOnAdminList(*actorObject))
+	{
+		targetObj->sendResourceDataToClient(*actorObject);
+	}
+}
+
+// ----------------------------------------------------------------------
+/**
+* @param params the destination container, and an optional arrangement
+*/
+
+//------------------------------------------------------------------------------------------
+static void commandFuncTransferItem(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const & params)
+{
+	ServerObject * const item        = ServerWorld::findObjectByNetworkId(target);
+	ServerObject * const playerSo      = ServerWorld::findObjectByNetworkId(actor);
+
+	if (!playerSo || !item)
+	{
+		DEBUG_REPORT_LOG(true, ("Received transfer item command for null player or target.\n"));
+		return;
+	}
+
+	if (item->isPlayerControlled())
+		return;
+
+	CreatureObject* const player = playerSo->asCreatureObject();
+	if (!player)
+		return;
+
+	size_t curpos = 0;
+	const NetworkId & destId = nextOidParm(params, curpos);
+	const int arrangement  = nextIntParm(params, curpos);
+	const Vector & pos = nextVectorParm(params, curpos);
+	Transform t;
+	t.setPosition_p(pos);
+
+	ServerObject * const destination = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(destId));
+
+	//@todo this value (6) came from a data table that cannot be referenced.  It's the distance you can be from an object for pick up.  When we get command table range validation in, we can remove it.
+	Container::ContainerErrorCode errorCode = Container::CEC_Success;
+
+	// call canManipulateObject telling it to skip the no trade check;
+	// we'll do the no trade check separately if canManipulateObject passes
+	bool allowedByGodMode = false;
+	bool canManipulateTarget = player->canManipulateObject(*item, true, true, true, 6, errorCode, true, &allowedByGodMode);
+	if (canManipulateTarget && !allowedByGodMode && item->markedNoTrade())
+	{
+		// the item must be owned by this creature
+		NetworkId ownerId;
+		if (item->asIntangibleObject())
+		{
+			ServerObject const * const containedBy = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*item));
+			ownerId = containedBy ? containedBy->getOwnerId() : NetworkId::cms_invalid;
+		}
+		else
+		{
+			ownerId = item->getOwnerId();
+		}
+
+		if (ownerId != player->getNetworkId())
+		{
+			canManipulateTarget = false;
+
+			if (item->markedNoTradeShared(true))
+			{
+				// if the no trade item is a "shared" no trade item and is immediately
+				// contained in a structure cell, and is being transferred to the
+				// transferer's inventory (i.e. picked up), also allow the transfer
+				// if the transferer is on the same account as the current owner of the item
+				ServerObject const * const containedBy = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*item));
+				if (containedBy && containedBy->asCellObject())
+				{
+					if (destination && (player->getInventory() == destination))
+					{
+						PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(player);
+						if (playerObject && (playerObject->getStationId() == NameManager::getInstance().getPlayerStationId(ownerId)))
+							canManipulateTarget = true;
+					}
+				}
+			}
+		}
+	}
+
+	if (!canManipulateTarget)
+	{
+		if(errorCode == Container::CEC_NoPermission)
+		{
+			Object * parentObject = ContainerInterface::getContainedByObject(*item);
+			if(parentObject && parentObject->asServerObject() && parentObject->asServerObject()->asTangibleObject()
+				&& parentObject->asServerObject()->asTangibleObject()->isLocked())
+			{
+				ContainerInterface::sendContainerMessageToClient(*player, errorCode, parentObject->asServerObject());
+				return;
+			}
+		}
+		ContainerInterface::sendContainerMessageToClient(*player, errorCode, item);
+		return;
+	}
+
+	//-- don't transfer from/to factory crates
+	{
+		if (destination && destination->getGameObjectType () == SharedObjectTemplate::GOT_misc_factory_crate)
+			return;
+
+		const ServerObject * const containedBy = safe_cast<const ServerObject *>(ContainerInterface::getContainedByObject (*item));
+
+		if (containedBy && containedBy->getGameObjectType () == SharedObjectTemplate::GOT_misc_factory_crate)
+			return;
+	}
+
+	// If our destination is a locked container, make sure we can access it.
+	bool lockedDestContainer = false;
+	{
+		if(destination && destination->asTangibleObject() && destination->asTangibleObject()->isLocked())
+		{
+			lockedDestContainer = true;
+			TangibleObject * destTangible = destination->asTangibleObject();
+			if(!destTangible->isUserOnAccessList(player->getNetworkId()) && !destTangible->isGuildOnAccessList(player->getGuildId()) 
+				&& player->getClient() && !player->getClient()->isGod())
+			{
+				ContainerInterface::sendContainerMessageToClient(*player, Container::CEC_NoPermission, destination);
+				return;
+			}
+		}
+
+	}
+
+	{
+		// No Drag and Drop while using Loot rules (especially random).
+		const ServerObject *  source = getFirstCreatureContainer(item);
+
+		if(source && source->asCreatureObject() && source->asCreatureObject()->isDead() && destination)
+		{
+			const ServerObject* dest = getFirstCreatureContainer(destination);
+			if(dest && dest->asCreatureObject() && dest->asCreatureObject()->getGroup())
+			{
+				int lootRule = dest->asCreatureObject()->getGroup()->getLootRule();
+				// Random/Lotto Loot Rule, no drag and drop allowed!
+				if(lootRule == 3 || lootRule == 2)
+				{
+					return;
+				}
+			}
+		}
+
+	}
+
+	if (!item->isAuthoritative())
+	{
+		GenericValueTypeMessage<std::pair<NetworkId, NetworkId> > const rssMessage(
+			"RequestSameServer",
+			std::make_pair(
+				ContainerInterface::getTopmostContainer(*player)->getNetworkId(),
+				ContainerInterface::getTopmostContainer(*item)->getNetworkId()));
+		GameServer::getInstance().sendToPlanetServer(rssMessage);
+		ContainerInterface::sendContainerMessageToClient(*player, Container::CEC_TryAgain, item);
+		return;
+	}
+
+	bool retval = true;
+	if (destId == NetworkId::cms_invalid)
+	{
+		//to world
+		retval = ContainerInterface::transferItemToWorld(*item, t, player, errorCode);
+	}
+	else
+	{
+		if (!destination)
+		{
+			DEBUG_REPORT_LOG(true, ("Cannot transfer item to unknown destination container\n"));
+			return;
+		}
+		if (!destination->isAuthoritative())
+		{
+			GenericValueTypeMessage<std::pair<NetworkId, NetworkId> > const rssMessage(
+				"RequestSameServer",
+				std::make_pair(
+					ContainerInterface::getTopmostContainer(*player)->getNetworkId(),
+					ContainerInterface::getTopmostContainer(*destination)->getNetworkId()));
+			GameServer::getInstance().sendToPlanetServer(rssMessage);
+			ContainerInterface::sendContainerMessageToClient(*player, Container::CEC_TryAgain, destination);
+			return;
+		}
+
+		//@todo quick check to make sure people aren't exploiting unlimited volume containers.  Really there shouldn't be any of these, but there have been bugs in the past...
+		VolumeContainer * vol = ContainerInterface::getVolumeContainer(*destination);
+		if (vol && vol->getTotalVolume() == static_cast<int>(VolumeContainer::VL_NoVolumeLimit))
+		{
+			WARNING(true, ("Player accessing infinite volume container %s", destination->getNetworkId().getValueString().c_str()));
+			//send error message and return
+		}
+
+		//Don't allow people to put things in unowned containers. Locked containers are allowed since they enforce their own list.
+		if (!destination->getObjVars().hasItem(OBJVAR_PLAYERS_CAN_ACCESS_CONTAINER) && !lockedDestContainer && 
+			player->getClient() && !player->getClient()->isGod() && 
+			destination->getOwnerId() == NetworkId::cms_invalid)
+		{
+			errorCode = Container::CEC_NoPermission;
+			ContainerInterface::sendContainerMessageToClient(*player, errorCode, destination);
+			return;
+		}
+
+		//Check to make sure you can manipulate the destination
+		if (!player->canManipulateObject(*destination, false, true, true, 6, errorCode))
+		{
+			ContainerInterface::sendContainerMessageToClient(*player, errorCode, destination);
+			return;
+		}
+
+		//special case.  If this is our inventory we are unequipping to, allow it to be somewhat overloaded.
+		const Object * itemParent = ContainerInterface::getContainedByObject(*item);
+		if (itemParent && itemParent == player && player->getInventory() == destination && item->getVolume() < 2)
+		{
+			VolumeContainer * volContainer = ContainerInterface::getVolumeContainer(*destination);
+			if (!volContainer)
+			{
+				errorCode = Container::CEC_Unknown;
+			}
+			else
+			{
+				const int allowedOverload = volContainer->getTotalVolume() + 2;
+				if (volContainer->getCurrentVolume() >= allowedOverload)
+				{
+					errorCode = Container::CEC_Full;
+				}
+				else
+				{
+					int oldCap = volContainer->debugDoNotUseSetCapacity(allowedOverload);
+					retval = ContainerInterface::transferItemToVolumeContainer(*destination, *item, player, errorCode, true);
+					IGNORE_RETURN( volContainer->debugDoNotUseSetCapacity(oldCap) );
+				}
+			}
+		}
+		else
+		{
+			const Object * destParent = ContainerInterface::getContainedByObject(*destination);
+			if(destParent && destParent == player->getAppearanceInventory())
+			{
+				// Trying to transfer to a container currently in our Appearance inventory. Not allowed.
+				StringId const code("container_error_message", "container34_prose");
+
+				ProsePackage pp;
+				pp.stringId = code;
+				pp.actor.id        = player->getNetworkId ();
+
+				// Send to the player.
+				Chat::sendSystemMessage (*player, pp);
+
+				retval = false;
+
+			}
+			else if (destination == player->getAppearanceInventory() && ContainerInterface::getContainer(*item) != NULL)
+			{
+				const Container * itemContainer = ContainerInterface::getContainer(*item);
+				if(itemContainer && itemContainer->getNumberOfItems() == 0)
+				{
+					retval = ContainerInterface::transferItemToUnknownContainer(*destination, *item, arrangement, t, player, errorCode);
+				}
+				else
+				{
+					StringId const code("container_error_message", "container33_prose");
+
+					ProsePackage pp;
+					pp.stringId = code;
+					pp.actor.id        = player->getNetworkId ();
+
+					// Send to the player.
+					Chat::sendSystemMessage (*player, pp);
+				}
+			}
+			else
+			{
+				retval = ContainerInterface::transferItemToUnknownContainer(*destination, *item, arrangement, t, player, errorCode);
+				
+				// if we are equipping an object to a filled slot, move the equipped item(s) to our inventory
+				if (!retval && errorCode == Container::CEC_SlotOccupied && destination->getNetworkId() == player->getNetworkId())
+				{
+					ServerObject * inventory = player->getInventory();
+					const SlottedContainer * equipment = ContainerInterface::getSlottedContainer(*player);
+					const SlottedContainmentProperty * itemContainmentProperty = ContainerInterface::getSlottedContainmentProperty(*item);
+
+					if (inventory != NULL && equipment != NULL && itemContainmentProperty != NULL)
+					{
+						std::vector<std::pair<ServerObject *, SlotId> > oldItems;
+						retval = true;
+						int slotCount = itemContainmentProperty->getNumberOfSlots(arrangement);
+						for (int i = 0; i < slotCount && retval; ++i)
+						{
+							SlotId slot = itemContainmentProperty->getSlotId(arrangement, i);
+							const Container::ContainedItem & currentWeaponId = equipment->getObjectInSlot(slot, errorCode);
+							ServerObject * oldItem = safe_cast<ServerObject *>(currentWeaponId.getObject());
+							if (oldItem != NULL)
+							{
+								if (ContainerInterface::transferItemToVolumeContainer(*inventory, *oldItem, player, errorCode, true))
+								{
+									oldItems.push_back(std::make_pair(oldItem, slot));
+								}
+								else
+									retval = false;
+							}
+						}
+						if (retval)
+						{
+							if (!ContainerInterface::transferItemToUnknownContainer(*destination, *item, arrangement, t, player, errorCode))
+							{
+								// move the old items back into their slots
+								reequipItems(*destination, oldItems);
+								retval = false;
+							}
+
+						}
+						else
+						{
+							// move the old items back into their slots
+							reequipItems(*destination, oldItems);
+							errorCode = Container::CEC_SlotOccupied;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	if (!retval && player)
+	{
+		if(errorCode == Container::CEC_SlotOccupied && destination == player->getAppearanceInventory())
+		{
+			// Failed to place an object in our appearance inventory. Let's flush out some more information.
+			ServerObject * appearanceInv = player->getAppearanceInventory();
+			const SlottedContainer * equipment = ContainerInterface::getSlottedContainer(*appearanceInv);
+			const SlottedContainmentProperty * itemContainmentProperty = ContainerInterface::getSlottedContainmentProperty(*item);
+
+			if(!itemContainmentProperty || !equipment || arrangement < 0)
+			{
+				// This should never happen, but if it does - just send our normal bland error message.
+				ContainerInterface::sendContainerMessageToClient(*player, errorCode);
+				return;
+			}
+
+			int slotCount = itemContainmentProperty->getNumberOfSlots(arrangement);
+			std::vector<ServerObject *> objectsToSend;
+			for (int i = 0; i < slotCount; ++i)
+			{
+				SlotId slot = itemContainmentProperty->getSlotId(arrangement, i);
+				const Container::ContainedItem & currentWeaponId = equipment->getObjectInSlot(slot, errorCode);
+				ServerObject * oldItem = safe_cast<ServerObject *>(currentWeaponId.getObject());
+				if (oldItem != NULL)
+				{
+					if( std::find(objectsToSend.begin(), objectsToSend.end(), oldItem) == objectsToSend.end() )
+						objectsToSend.push_back(oldItem);
+				}
+			}
+			
+			std::vector<ServerObject *>::iterator iter = objectsToSend.begin();
+			for(; iter != objectsToSend.end(); ++iter)
+			{
+				// No idea how this could happen, but just incase.
+				if((*iter) == NULL)
+					continue;
+
+				StringId const code("container_error_message", "container32_prose");
+
+				// Setup the prose package with all the %TT and %TO information.
+				ProsePackage pp;
+				pp.stringId = code;
+
+				pp.target.id       = (*iter)->getNetworkId ();
+				pp.target.str      = (*iter)->getAssignedObjectName ();
+				if (pp.target.str.empty ())
+					pp.target.stringId = (*iter)->getObjectNameStringId ();
+
+				pp.other.id        = item->getNetworkId();
+				pp.other.str       = item->getAssignedObjectName();
+				if (pp.other.str.empty())
+					pp.other.stringId = item->getObjectNameStringId();
+
+				pp.actor.id        = player->getNetworkId ();
+
+				// Send to the player.
+				Chat::sendSystemMessage (*player, pp);
+			}
+			
+			return;
+		}
+
+		ContainerInterface::sendContainerMessageToClient(*player, errorCode);
+	}
+}
+// ----------------------------------------------------------------------
+
+static bool isGoingInWeaponSlot(const ServerObject& target, int arrangement)
+{
+	if (arrangement <= 0)
+		return false;
+
+	const SlottedContainmentProperty * slotted = ContainerInterface::getSlottedContainmentProperty(target);
+	bool useWeapon = false;
+	if (slotted)
+	{
+		//In this case, the player is transferring something from their equipment, which may be armor or a weapon
+		static const SlotId right_hand = SlotIdManager::findSlotId(CrcLowerString("hold_r"));
+		static const SlotId left_hand = SlotIdManager::findSlotId(CrcLowerString("hold_l"));
+
+		const int numSlots = slotted->getNumberOfSlots(arrangement);
+		for (int i = 0; i < numSlots; ++i)
+		{
+			SlotId currentSlot = slotted->getSlotId(arrangement, i);
+			if (currentSlot == right_hand || currentSlot == left_hand)
+			{
+				useWeapon = true;
+				break;
+			}
+		}
+	}
+	return useWeapon;
+}
+
+//------------------------------------------------------------------------------------------
+
+static void commandFuncTransferWeapon(Command const & c, NetworkId const &actor, NetworkId const &target, Unicode::String const & params)
+{
+	ServerObject * item = ServerWorld::findObjectByNetworkId(target);
+	CreatureObject * actorObject = safe_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+
+	size_t curpos = 0;
+	const NetworkId & destId = nextOidParm(params, curpos);
+	const int arrangement  = nextIntParm(params, curpos);
+	UNREF(destId);
+	
+	if (item && actorObject && isGoingInWeaponSlot(*item, arrangement))
+	{
+		commandFuncTransferItem(c, actor, target, params);
+	}
+	
+}
+
+//------------------------------------------------------------------------------------------
+
+static void commandFuncTransferArmor(Command const & c, NetworkId const &actor, NetworkId const &target, Unicode::String const & params)
+{
+	CreatureObject * actorObject = safe_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (actorObject)
+	{
+		commandFuncTransferItem(c, actor, target, params);
+	}
+}
+
+//------------------------------------------------------------------------------------------
+
+void CommandCppFuncs::commandFuncTransferMisc(Command const & c, NetworkId const &actor, NetworkId const &target, Unicode::String const & params)
+{
+	ServerObject * item = ServerWorld::findObjectByNetworkId(target);
+	CreatureObject * actorObject = safe_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	
+	size_t curpos = 0;
+	const NetworkId & destId = nextOidParm(params, curpos);
+	const int arrangement  = nextIntParm(params, curpos);
+
+	//This command can only be used to transfer non-weapon objects not contained directly by the player unless it is not armor
+	if (item && actorObject && !isGoingInWeaponSlot(*item, arrangement) &&
+		( destId != actor || !GameObjectTypes::isTypeOf(item->getGameObjectType(), SharedObjectTemplate::GOT_armor)) )
+	{
+		commandFuncTransferItem(c, actor, target, params);
+	}
+}
+
+//------------------------------------------------------------------------------------------
+/**
+* @param params the slotname, if any, to be echo'd back to the client or passed to the script
+*/
+
+static void commandFuncOpenContainer(Command const & cmd, NetworkId const &actor, NetworkId const &target, Unicode::String const & params)
+{
+	ServerObject * container = ServerWorld::findObjectByNetworkId(target);
+	CreatureObject * player = safe_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (!container || !player)
+	{
+		DEBUG_REPORT_LOG(true, ("Received open command for null player or target.\n"));
+		return;
+	}
+	//@todo check permissions
+	if (!ContainerInterface::getContainer(*container))
+	{
+		DEBUG_REPORT_LOG(true, ("Received open command on non container object.\n"));
+		return;
+	}
+
+	//-- don't open factory crates
+	if (container->getGameObjectType () == SharedObjectTemplate::GOT_misc_factory_crate)
+		return;
+
+	//-- if they are opening a crafting station, what they really want is the hopper
+	//-- but only if the object is not a volume container
+	if (container->getGameObjectType () == SharedObjectTemplate::GOT_misc_crafting_station
+		&& (NULL == ContainerInterface::getVolumeContainer (*container)))
+	{	
+		static const SlotId inputHopperId(SlotIdManager::findSlotId(CrcLowerString("ingredient_hopper")));
+
+		ServerObject const * const station = container;
+		ServerObject * hopper = NULL;
+		const SlottedContainer * stationContainer = ContainerInterface::getSlottedContainer (*station);
+		if (stationContainer != NULL)
+		{
+			Container::ContainerErrorCode tmp = Container::CEC_Success;
+			Object* tmpHopperObj = (stationContainer->getObjectInSlot (inputHopperId, tmp)).getObject();
+			if (tmp == Container::CEC_Success && tmpHopperObj)
+			{
+				hopper = tmpHopperObj->asServerObject();
+			}
+		}
+
+		if (hopper)
+		{
+			container = hopper;
+		}
+		else
+		{
+			// report the failure as it indicates a change to some other system
+			WARNING(true, ("Received open command on a crafting station and failed to open the hopper.\n"));
+		}
+	}
+
+	size_t curpos = 0;
+
+	std::string slotName;
+	int sequence = nextIntParm    (params, curpos);
+	if (curpos != std::string::npos)
+	{
+		++curpos;
+		slotName = nextStringParm (params, curpos);
+	}
+
+	if (container->isAuthoritative())
+	{
+		Container::ContainerErrorCode code = Container::CEC_Success;
+
+		bool const isPublicContainer = container->getGameObjectType () == SharedObjectTemplate::GOT_misc_container_public;
+
+		if (isPublicContainer && player->getClient())
+			ObserveTracker::onClientAboutToOpenPublicContainer(*player->getClient(), *container);
+
+		bool const doPermissionCheckOnItem = !isPublicContainer;
+		bool const doPermissionCheckOnParents = !isPublicContainer;
+
+		if (player->canManipulateObject(*container, false, doPermissionCheckOnItem, doPermissionCheckOnParents, 6.0f, code))
+		{
+			// Additional check for Locked containers.
+			if(container->asTangibleObject() && container->asTangibleObject()->isLocked())
+			{
+				TangibleObject * tangibleTarget = container->asTangibleObject();
+				if(!tangibleTarget->isUserOnAccessList(player->getNetworkId()) && !tangibleTarget->isGuildOnAccessList(player->getGuildId()))
+				{
+					// Player is NOT on the admin list or guild list, they cannot open the container.
+					ContainerInterface::sendContainerMessageToClient(*player, Container::CEC_NoPermission, container);
+					return;
+				}
+			}
+
+			ScriptParams params;
+			params.addParam(actor);
+			if (container->getScriptObject()->trigAllScripts(Scripting::TRIG_ABOUT_TO_OPEN_CONTAINER, params) == SCRIPT_CONTINUE)
+			{
+				Client *client = player->getClient();
+				if (client)
+					client->openContainer(*container, sequence, slotName);
+			}
+		}
+		else
+		{
+			ContainerInterface::sendContainerMessageToClient(*player, code, container);
+		}
+	}
+	else
+	{
+		GenericValueTypeMessage<std::pair<NetworkId, NetworkId> > const rssMessage(
+			"RequestSameServer",
+			std::make_pair(
+				ContainerInterface::getTopmostContainer(*player)->getNetworkId(),
+				ContainerInterface::getTopmostContainer(*container)->getNetworkId()));
+		GameServer::getInstance().sendToPlanetServer(rssMessage);
+		ContainerInterface::sendContainerMessageToClient(*player, Container::CEC_TryAgain, container);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncCloseContainer(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &)
+{
+	ServerObject * const container = ServerWorld::findObjectByNetworkId(target);
+	ServerObject * const player = ServerWorld::findObjectByNetworkId(actor);
+	if (!container || !player)
+	{
+		DEBUG_REPORT_LOG(true, ("Received close command for null player or target.\n"));
+		return;
+	}
+
+	//-- can't close ourself
+	if (player == container)
+		return;
+
+	if (!ContainerInterface::getContainer(*container))
+	{
+		DEBUG_REPORT_LOG(true, ("Received close command on non container object.\n"));
+		return;
+	}
+
+	if (container->isAuthoritative())
+	{
+		Client * const client = player->getClient();
+		if (client)
+			client->closeContainer(*container);
+	}
+	else
+	{
+		DEBUG_REPORT_LOG(true, ("Multi-Server not supported for containers yet"));
+		//@todo the player is trying to access a container not on this server.  Somehow get it here
+		//Then do the check
+	}
+
+}
+
+//------------------------------------------------------------------------------------------
+
+static void commandFuncOpenLotteryContainer(Command const & /*command*/, NetworkId const & /*actor*/, NetworkId const & /*target*/, Unicode::String const & /*params*/)
+{
+	// moved from a command to a script hook.
+	// This needs to be removed for the next
+	// official non-hotfix patch
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncCloseLotteryContainer(Command const & cmd, NetworkId const & actor, NetworkId const &target, Unicode::String const & params)
+{
+	ServerObject * const container = ServerWorld::findObjectByNetworkId(target);
+	if (container == 0)
+	{
+		DEBUG_REPORT_LOG(true, ("commandFuncOpenLotteryContainer: container == 0.\n"));
+		return;
+	}
+
+	CreatureObject * const player = safe_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (player == 0)
+	{
+		DEBUG_REPORT_LOG(true, ("commandFuncOpenLotteryContainer: player == 0.\n"));
+		return;
+	}
+
+	if (ContainerInterface::getContainer(*container) == 0)
+	{
+		DEBUG_REPORT_LOG(true, ("commandFuncOpenLotteryContainer: ContainerInterface::getContainer == 0.\n"));
+		return;
+	}
+
+	Controller * const controller = player->getController();
+
+	if (controller != 0)
+	{
+		typedef MessageQueueGenericValueType<NetworkId> Message;
+		Message * const message = new Message(target);
+
+		controller->appendMessage(
+			CM_groupCloseLotteryWindowOnClient,
+			0.0f,
+			message,
+			GameControllerMessageFlags::SEND |
+			GameControllerMessageFlags::RELIABLE |
+			GameControllerMessageFlags::DEST_AUTH_CLIENT);
+	}
+}
+
+// ----------------------------------------------------------------------
+/**
+* @param params the destination container, and an optional arrangement
+*/
+static void commandFuncGiveItem(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const & params)
+{
+	ServerObject * const item   = ServerWorld::findObjectByNetworkId(target);
+	ServerObject * const player = ServerWorld::findObjectByNetworkId(actor);
+	if (!player || !item)
+	{
+		DEBUG_REPORT_LOG(true, ("Received give item command for null player or target.\n"));
+		return;
+	}
+	size_t curpos = 0;
+	NetworkId destId = nextOidParm(params, curpos);
+
+	//@todo this value (6) came from a data table that cannot be referenced.  It's the distance you can be from an object for pick up.  When we get command table range validation in, we can remove it.
+	Container::ContainerErrorCode errorCode = Container::CEC_Success;
+	if (!player->canManipulateObject(*item, true, true, true, 6, errorCode))
+	{
+		ContainerInterface::sendContainerMessageToClient(*player, errorCode, item);
+		return;
+	}
+
+	if (!item->isAuthoritative())
+	{
+		GenericValueTypeMessage<std::pair<NetworkId, NetworkId> > const rssMessage(
+			"RequestSameServer",
+			std::make_pair(
+				ContainerInterface::getTopmostContainer(*player)->getNetworkId(),
+				ContainerInterface::getTopmostContainer(*item)->getNetworkId()));
+		GameServer::getInstance().sendToPlanetServer(rssMessage);
+		ContainerInterface::sendContainerMessageToClient(*player, Container::CEC_TryAgain, item);
+		return;
+	}
+
+	ServerObject* const destination = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(destId));
+
+	if (!destination)
+	{
+		DEBUG_REPORT_LOG(true, ("Cannot transfer item to unknown destination container\n"));
+		return;
+	}
+
+	if (!destination->isAuthoritative())
+	{
+		GenericValueTypeMessage<std::pair<NetworkId, NetworkId> > const rssMessage(
+			"RequestSameServer",
+			std::make_pair(
+				ContainerInterface::getTopmostContainer(*player)->getNetworkId(),
+				ContainerInterface::getTopmostContainer(*destination)->getNetworkId()));
+		GameServer::getInstance().sendToPlanetServer(rssMessage);
+		ContainerInterface::sendContainerMessageToClient(*player, Container::CEC_TryAgain, destination);
+		return;
+	}
+
+	if (!player->canManipulateObject(*destination, false, false, false, 6, errorCode))
+	{
+		ContainerInterface::sendContainerMessageToClient(*player, errorCode, destination);
+		return;
+	}
+
+	// check and see if this is a gem->socket operation, which is handled by our code
+	TangibleObject * const socket = dynamic_cast<TangibleObject *>(destination);
+	if (socket != NULL)
+	{
+		TangibleObject * const gem = dynamic_cast<TangibleObject *>(item);
+		if (gem != NULL)
+		{
+			const int destGot                                      = socket->getGameObjectType();
+			const SharedTangibleObjectTemplate * const gemTemplate = safe_cast<const SharedTangibleObjectTemplate *>(gem->getSharedTemplate());
+			const int count                                        = gemTemplate->getSocketDestinationsCount();
+
+			for (int i = 0; i < count; ++i)
+			{
+				const int gemSocketGot = gemTemplate->getSocketDestinations(i);
+				if (destGot == gemSocketGot || GameObjectTypes::isTypeOf (destGot, gemSocketGot))
+				{
+					// make sure the gem and socket are both in the player's inventory
+					if (!socket->isContainedBy(*player, true) ||
+						!gem->isContainedBy(*player, true))
+					{
+						Chat::sendSystemMessage(*player, SharedStringIds::gem_not_in_inventory, Unicode::emptyString);
+						return;
+					}
+
+					// if the socketed item is equipped, unequip it temporarily
+					CreatureObject * owner = NULL;
+					Object * container = ContainerInterface::getContainedByObject(*socket);
+					if (container != NULL && container->asServerObject()->asCreatureObject() != NULL)
+					{
+						owner = container->asServerObject()->asCreatureObject();
+						// fake unequipping the item
+						owner->onContainerLostItem(NULL, *socket, NULL);
+					}
+
+					std::vector<std::pair<std::string, int> > skillModBonuses;
+					gem->getSkillModBonuses(skillModBonuses, false);
+					if (socket->addSkillModSocketBonuses(skillModBonuses))
+					{
+						gem->permanentlyDestroy(DeleteReasons::Consumed);
+						Chat::sendSystemMessage(*player, SharedStringIds::gem_inserted, Unicode::emptyString);
+					}
+					else
+					{
+						// tell the player they can't use the gem
+						Chat::sendSystemMessage(*player, SharedStringIds::gem_not_inserted, Unicode::emptyString);
+					}
+					if (owner != NULL)
+					{
+						// "re-equip" the item
+						owner->onContainerGainItem(*socket, NULL, NULL);
+					}
+					return;
+				}
+			}
+		}
+	}
+
+	// nope, pass it on to scripts
+	ScriptParams scriptParameters;
+	scriptParameters.addParam (target);
+	scriptParameters.addParam (actor);
+
+	if (destination->getScriptObject()->trigAllScripts(Scripting::TRIG_GIVE_ITEM, scriptParameters) == SCRIPT_OVERRIDE)
+	{
+		item->permanentlyDestroy(DeleteReasons::BadContainerTransfer);
+	}
+
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncGroupInvite(Command const & command, NetworkId const &actor, NetworkId const &target, Unicode::String const &params)
+{
+	if (actor == target)
+		return;
+
+	CreatureObject * const actorObj = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (!actorObj)
+		return;
+
+	ShipObject const * const actorShipObject = ShipObject::getContainingShipObject(actorObj);
+
+	GroupObject * const groupObj = actorObj->getGroup();
+	if (groupObj)
+	{
+		if (groupObj->getGroupLeaderId() != actor)
+		{
+			sendProseMessage(*actorObj, 0, GroupStringId::SID_GROUP_MUST_BE_LEADER);
+			return;
+		}
+	}
+
+	NetworkId parsedNetworkId = NetworkId::cms_invalid;
+	if (target.isValid())
+	{
+		CreatureObject * const targetObj = findAndResolveCreatureByNetworkId(target);
+		if (targetObj)
+		{
+			// pointer check is done for space
+			if (actorObj == targetObj)
+			{
+				return;
+			}
+
+			parsedNetworkId = targetObj->getNetworkId();
+		}
+	}
+	else if (!params.empty())
+	{
+		// check to see if a target name was specified, and see
+		// if that resolves into a player character in the galaxy
+		parsedNetworkId = NameManager::getInstance().getPlayerId(Unicode::wideToNarrow(Unicode::toLower(params)));
+	}
+
+	if (!parsedNetworkId.isValid())
+	{
+		sendProseMessage(*actorObj, 0, GroupStringId::SID_GROUP_INVITE_NO_TARGET_SELF);
+		return;
+	}
+
+	// cannot invite while in combat
+	if (actorObj->getState(States::Combat) && ConfigServerGame::getGroupInviteInviterCombatRestriction())
+	{
+		sendProseMessage(*actorObj, 0, GroupStringId::SID_GROUP_INVITE_IN_COMBAT);
+		return;
+	}
+
+	// send a messageTo to the target to invite to group
+	char buffer[1024];
+	snprintf(buffer, sizeof(buffer)-1, "%s|%s|%s|%s", actor.getValueString().c_str(), (actorShipObject ? actorShipObject->getNetworkId().getValueString().c_str() : "0"), (groupObj ? groupObj->getNetworkId().getValueString().c_str() : "0"), Unicode::wideToNarrow(actorObj->getAssignedObjectName()).c_str());
+	buffer[sizeof(buffer)-1] = '\0';
+
+	MessageToQueue::getInstance().sendMessageToC(parsedNetworkId,
+		"C++InviteToGroupReq",
+		buffer,
+		0,
+		false,
+		actor,
+		"C++InviteToGroupRspTargetNotFound");
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncGroupUninvite(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &params)
+{
+	if (actor == target)
+		return;
+
+	CreatureObject *actorObj = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (!actorObj)
+		return;
+
+	NetworkId parsedNetworkId = NetworkId::cms_invalid;
+	if (target.isValid())
+	{
+		CreatureObject * const targetObj = findAndResolveCreatureByNetworkId(target);
+		if (targetObj)
+		{
+			parsedNetworkId = targetObj->getNetworkId();
+		}
+	}
+	else if (!params.empty())
+	{
+		// check to see if a target name was specified, and see
+		// if that resolves into a player character in the galaxy
+		parsedNetworkId = NameManager::getInstance().getPlayerId(Unicode::wideToNarrow(Unicode::toLower(params)));
+	}
+
+	if (!parsedNetworkId.isValid())
+	{
+		sendProseMessage(*actorObj, 0, GroupStringId::SID_GROUP_UNINVITE_NO_TARGET_SELF);
+		return;
+	}
+
+	// send a messageTo to the target to uninvite
+	char buffer[1024];
+	snprintf(buffer, sizeof(buffer)-1, "%s|%s", actor.getValueString().c_str(), Unicode::wideToNarrow(actorObj->getAssignedObjectName()).c_str());
+	buffer[sizeof(buffer)-1] = '\0';
+
+	MessageToQueue::getInstance().sendMessageToC(parsedNetworkId,
+		"C++UninviteFromGroupReq",
+		buffer,
+		0,
+		false,
+		actor,
+		"C++UninviteFromGroupRspTargetNotFound");
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncGroupJoin(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (!actorObj)
+		return;
+
+	if ((actorObj->getGroup()) && (!GroupHelpers::creatureIsContainedInPOBShip(actorObj)))
+		return;
+
+	NetworkId const & inviterId = actorObj->getGroupInviterId();
+	if (!inviterId.isValid())
+	{
+		sendProseMessage(*actorObj, 0, GroupStringId::SID_GROUP_MUST_BE_INVITED);
+		return;
+	}
+
+	// cannot join while in combat
+	if (actorObj->getState(States::Combat) && ConfigServerGame::getGroupJoinInviteeCombatRestriction())
+	{
+		sendProseMessage(*actorObj, 0, GroupStringId::SID_GROUP_JOIN_IN_COMBAT);
+		return;
+	}
+
+	// send a messageTo to the inviter requesting the inviter's
+	// group/group member information so we can join the group
+	// or create a new group with the inviter as the group leader
+	MessageToQueue::getInstance().sendMessageToC(inviterId,
+		"C++GroupJoinInviterInfoReq",
+		actorObj->getNetworkId().getValueString(),
+		0,
+		false,
+		actor,
+		"C++GroupJoinInviterInfoReqInviterNotFound");
+
+	actorObj->setGroupInviter(NetworkId::cms_invalid, std::string(), NetworkId::cms_invalid);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncGroupDecline(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (actorObj)
+	{
+		NetworkId inviterId = actorObj->getGroupInviterId();
+		if (inviterId.isValid())
+		{
+			// notify invitee
+			ProsePackage pp;
+			pp.stringId = GroupStringId::SID_GROUP_DECLINE_SELF;
+			pp.target.str = Unicode::narrowToWide(actorObj->getGroupInviterName());
+			pp.actor.id = actorObj->getNetworkId();
+			Chat::sendSystemMessage(*actorObj, pp);
+
+			// notify inviter
+			StringId responseSid = GroupStringId::SID_GROUP_DECLINE_LEADER;
+			std::string const inviteeName(Unicode::wideToNarrow(actorObj->getAssignedObjectName()));
+			std::string response = responseSid.getCanonicalRepresentation();
+			response += "|";
+
+			if (!inviteeName.empty())
+			{
+				response += "nameString|";
+				response += inviteeName;
+			}
+			else
+			{
+				StringId inviteeNameSid = actorObj->getObjectNameStringId();
+				response += "nameStringId|";
+				response += inviteeNameSid.getCanonicalRepresentation();
+			}
+
+			MessageToQueue::getInstance().sendMessageToC(inviterId,
+				"C++GroupOperationGenericRsp",
+				response,
+				0,
+				false);
+		}
+
+		actorObj->setGroupInviter(NetworkId::cms_invalid, std::string(), NetworkId::cms_invalid);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncGroupDisband(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &)
+{
+	CreatureObject * const actorObj = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (actorObj)
+	{
+		GroupObject * const groupObj = actorObj->getGroup();
+		if (groupObj)
+		{
+			if (groupObj->getGroupLeaderId() != actor)
+			{
+				// we are not the leader.  we are tring to leave the group
+				NetworkId const & POBShipId = groupObj->getPOBShipMemberIsContainedIn(actor);
+
+				if ((POBShipId.isValid()) && (groupObj->getPOBShipOwnedByMember(actor) == POBShipId))
+				{
+					// we own this POB so we can remove everyone inside it from the group
+					GroupMemberParam const & leader = groupObj->createGroupMemberParamForMember(actor);
+
+					GroupObject::GroupMemberParamVector membersInsidePOB;
+					GroupObject::GroupMemberParamVector membersOutsidePOB;
+
+					GroupHelpers::separateGroupBasedOffofPOBShip(groupObj,
+																actor,
+																POBShipId,
+																membersInsidePOB,
+																membersOutsidePOB);
+
+					// if there are no members outside, then the group only consisted of
+					// the people in the POB.  If that's the case, then don't destroy the
+					// old group and create a new one
+					if (!membersOutsidePOB.empty())
+					{
+						groupObj->removeGroupMember(actor);
+
+						if (actorObj->getGroup() == groupObj)
+							actorObj->getGroup()->onGroupMemberRemoved(actorObj->getNetworkId(), false);
+
+						// remove everyone inside the target POB from the group
+						GroupHelpers::removeFromGroupAndCreatePOBGroup(groupObj, leader, membersInsidePOB);
+					}
+				}
+				else
+				{
+					// we don't own the POB or we are not in a POB ship so just remove us
+					groupObj->removeGroupMember(actor);
+
+					if (actorObj->getGroup() == groupObj)
+						actorObj->getGroup()->onGroupMemberRemoved(actorObj->getNetworkId(), false);
+				}
+			}
+			else
+			{
+				// we are the group leader, no target is specified, so we disband the group
+				if (!target.isValid())
+				{
+					// find everyone in a POB and remove them from the group
+					// and create new POB based groups for them
+
+					// this is done in 2 steps because the second half will actually remove
+					// members from the group.  we don't want to iterate over the members as
+					// they are being removed
+
+					GroupObject::GroupMemberParamVector membersOwningPOBs;
+					std::vector<NetworkId> membersNotInPOBs;
+
+					{
+						GroupObject::GroupMemberVector const & groupMembers = groupObj->getGroupMembers();
+						GroupObject::GroupMemberVector::const_iterator ii = groupMembers.begin();
+						GroupObject::GroupMemberVector::const_iterator iiEnd = groupMembers.end();
+
+						for (; ii != iiEnd; ++ii)
+						{
+							// get the member
+							NetworkId const & memberId = ii->first;
+							NetworkId const & POBShipId = groupObj->getPOBShipOwnedByMember(memberId);
+
+							if ((POBShipId.isValid()) && (groupObj->getPOBShipMemberIsContainedIn(memberId).isValid()))
+							{
+								GroupMemberParam const & memberWithPOBShip = groupObj->createGroupMemberParamForMember(memberId);
+								membersOwningPOBs.push_back(memberWithPOBShip);
+							}
+							else
+							{
+								membersNotInPOBs.push_back(memberId);
+							}
+						}
+					}
+
+					// we build and cache this data for after the GroupObject has been destroyed
+					std::map<NetworkId /* memberId of POB owner is key */, GroupObject::GroupMemberParamVector> membersInsidePOB;
+					std::map<NetworkId /* memberId of POB owner is key */, GroupObject::GroupMemberParamVector> membersOutsidePOB;
+
+					{
+						// create the new POB ship group data collections for those that need it
+						GroupObject::GroupMemberParamVector::const_iterator ii = membersOwningPOBs.begin();
+						GroupObject::GroupMemberParamVector::const_iterator iiEnd = membersOwningPOBs.end();
+
+						for (; ii != iiEnd; ++ii)
+						{
+							NetworkId const & memberId = (*ii).m_memberId;
+							NetworkId const & POBShipId = (*ii).m_memberShipId;
+
+							GroupHelpers::separateGroupBasedOffofPOBShip(groupObj,
+																		memberId,
+																		POBShipId,
+																		membersInsidePOB[memberId],
+																		membersOutsidePOB[memberId]);
+						}
+					}
+
+					if (membersOwningPOBs.empty())
+					{
+						groupObj->disbandGroup();
+
+						if (actorObj->getGroup() == groupObj)
+							actorObj->getGroup()->onGroupMemberRemoved(actorObj->getNetworkId(), true);
+					}
+					else
+					{
+						// manually remove everyone from the actors group.  this helps us avoid
+						// calling disband and then creteGroup with the actor being set up as
+						// the leader.  Calling disband and create with each group would cause
+						// the actions to be executed out of order on multiserver due to creates
+						// message being processed before the controller's remove and disband
+						// messages were processed
+						{
+							std::set<NetworkId> membersNotInActorsGroup;
+
+							{
+								// gather all of the members that are not inside the current
+								// group leader's ship
+
+								GroupObject::GroupMemberParamVector::const_iterator ii = membersOwningPOBs.begin();
+								GroupObject::GroupMemberParamVector::const_iterator iiEnd = membersOwningPOBs.end();
+
+								for (; ii != iiEnd; ++ii)
+								{
+									GroupMemberParam const & owner = *ii;
+
+									if (owner.m_memberId != actor)
+									{
+										GroupObject::GroupMemberParamVector const & membersOutsideActorPOB = membersOutsidePOB[owner.m_memberId];
+
+										GroupObject::GroupMemberParamVector::const_iterator jj = membersOutsideActorPOB.begin();
+										GroupObject::GroupMemberParamVector::const_iterator jjEnd = membersOutsideActorPOB.end();
+
+										for (; jj != jjEnd; ++jj)
+										{
+											membersNotInActorsGroup.insert((*jj).m_memberId);
+										}
+									}
+								}
+
+								std::vector<NetworkId>::const_iterator jj = membersNotInPOBs.begin();
+								std::vector<NetworkId>::const_iterator jjEnd = membersNotInPOBs.end();
+
+								// we need to make sure that we also add in other non POB ships to be removed
+
+								for (; jj != jjEnd; ++jj)
+								{
+									if (*jj != actor)
+									{
+										membersNotInActorsGroup.insert(*jj);
+									}
+								}
+							}
+
+							// remove everyone that is is not in the original leader's POB from the
+							// current group
+							std::set<NetworkId>::const_iterator ii = membersNotInActorsGroup.begin();
+							std::set<NetworkId>::const_iterator iiEnd = membersNotInActorsGroup.end();
+
+							for (; ii != iiEnd; ++ii)
+							{
+								NetworkId const & memberId = *ii;
+								groupObj->removeGroupMember(memberId);
+
+								CreatureObject * const memberCreatureObject = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(memberId));
+								if (memberCreatureObject != 0)
+								{
+									if (memberCreatureObject->getGroup() == groupObj)
+										memberCreatureObject->getGroup()->onGroupMemberRemoved(memberCreatureObject->getNetworkId(), false);
+								}
+							}
+						}
+
+						// now create the POB groups that we just built the data sets for
+						{
+							// create the new POB ship groups for those that need it
+							GroupObject::GroupMemberParamVector::const_iterator ii = membersOwningPOBs.begin();
+							GroupObject::GroupMemberParamVector::const_iterator iiEnd = membersOwningPOBs.end();
+
+							for (; ii != iiEnd; ++ii)
+							{
+								GroupMemberParam const & leader = *ii;
+
+								// create the new POB groups.  notice NULL is passed in for the
+								// groupToRemoveFrom because the original group has already had
+								// all of the members removed
+
+								if (leader.m_memberId != actor)
+								{
+									GroupHelpers::removeFromGroupAndCreatePOBGroup(0, leader, membersInsidePOB[leader.m_memberId]);
+								}
+							}
+						}
+					}
+				}
+
+				// we are the group leader. a target is specified, so we remove them
+				else if (groupObj->isGroupMember(target))
+				{
+					// send message to target to leave the group
+					MessageToQueue::getInstance().sendMessageToC(target,
+						"C++LeaveGroupReq",
+						groupObj->getNetworkId().getValueString(),
+						0,
+						false);
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncKickFromShip(Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const &params)
+{
+ 	CreatureObject const * const actorObject = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (actorObject != 0)
+	{
+		CreatureObject * const targetObject = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(target));
+		if ((targetObject != 0) && (actorObject != targetObject))
+		{
+			ShipObject const * const actorShipObject = ShipObject::getContainingShipObject(actorObject);
+
+			if ((actorShipObject != 0) && (actorShipObject->getOwnerId() == actorObject->getNetworkId()))
+			{
+				// check that both are in the same ship
+				if (ShipObject::getContainingShipObject(targetObject) == actorShipObject)
+				{
+					triggerSpaceEjectPlayerFromShip(targetObject);
+				}
+			}
+			else
+			{
+				sendProseMessage(*actorObject, 0, GroupStringId::SID_GROUP_NO_KICK_FROM_SHIP_OWNER);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncGroupChat(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (actorObj)
+	{
+		GroupObject *groupObj = actorObj->getGroup();
+		if (groupObj)
+		{
+			// don't allow if the actor is squelched
+			PlayerObject * const playerObj = PlayerCreatureController::getPlayerObject(actorObj);
+			if (!playerObj || (playerObj->getSecondsUntilUnsquelched() != 0))
+			{
+				return;
+			}
+
+			groupObj->sendGroupChat(actor, params);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAuctionChat(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (actorObj)
+	{
+		std::string firstName;
+		size_t pos = 0;
+		Unicode::getFirstToken(Unicode::wideToNarrow(actorObj->getObjectName()), 0, pos, firstName);
+
+		const std::string channelName = "SWG." + GameServer::getInstance().getClusterName() + "." + ServerWorld::getSceneId() + ".named.Auction";
+		Chat::sendToRoom(firstName, channelName, params, Unicode::String());
+
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncPlanetChat(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (actorObj)
+	{
+		std::string firstName;
+		size_t pos = 0;
+		Unicode::getFirstToken(Unicode::wideToNarrow(actorObj->getObjectName()), 0, pos, firstName);
+
+		const std::string channelName = "SWG." + GameServer::getInstance().getClusterName() + "." + ServerWorld::getSceneId() + ".named.Planet";
+		Chat::sendToRoom(firstName, channelName, params, Unicode::String());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncGroupMakeLeader(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &)
+{
+	if (actor == target)
+		return;
+
+	CreatureObject *actorObj = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (!actorObj)
+		return;
+
+	if (!target.isValid())
+		return;
+
+	GroupObject * const groupObj = actorObj->getGroup();
+	if (groupObj)
+	{
+		if (groupObj->getGroupLeaderId() != actor)
+		{
+			sendProseMessage(*actorObj, 0, GroupStringId::SID_GROUP_MUST_BE_LEADER);
+			return;
+		}
+
+		groupObj->makeLeader(target);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncGroupMakeMasterLooter(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (!actorObj)
+		return;
+
+	GroupObject * const groupObj = actorObj->getGroup();
+	if (groupObj != 0)
+	{
+		if (groupObj->getGroupLeaderId() != actor)
+		{
+			sendProseMessage(*actorObj, 0, GroupStringId::SID_GROUP_MUST_BE_LEADER);
+			return;
+		}
+
+		groupObj->makeLootMaster(target.isValid() ? target : actor);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncCreateGroupPickup(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &)
+{
+	CreatureObject * const actorObj = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (!actorObj)
+		return;
+
+	PlayerObject * const playerObj = PlayerCreatureController::getPlayerObject(actorObj);
+	if (!playerObj)
+		return;
+
+	Client * const clientObj = actorObj->getClient();
+	if (!clientObj)
+		return;
+
+	GroupObject * const groupObj = actorObj->getGroup();
+	if (!groupObj || ((groupObj->getGroupLeaderId() != actor) && (playerObj->getSkillTemplate().find("officer_") != 0)))
+	{
+		sendProseMessage(*actorObj, 0, StringId("group", "create_group_pickup_not_group_leader"));
+		return;
+	}
+
+	Vector const currentWorldLocation = actorObj->findPosition_w();
+	std::string const currentScene = ServerWorld::getSceneId();
+	if (!GroupPickupPoint::isGroupPickupAllowedAtLocation(currentScene, static_cast<int>(currentWorldLocation.x), static_cast<int>(currentWorldLocation.z)))
+	{
+		sendProseMessage(*actorObj, 0, StringId("group", "create_group_pickup_unsupported_location"));
+		return;
+	}
+
+	if (groupObj->getSecondsLeftOnGroupPickup())
+	{
+		sendProseMessage(*actorObj, 0, StringId("group", "create_group_pickup_existing"));
+		return;
+	}
+
+	// see if there are any connected player group members within 20m to assist/approve creating the group pickup point
+	std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData();
+	GroupObject::GroupMemberVector const & groupMembers = groupObj->getGroupMembers();
+	bool anyConnectedGroupMemberInRange = false;
+
+	GroupObject::GroupMemberVector::const_iterator iterGroupMember;
+	for (iterGroupMember = groupMembers.begin(); iterGroupMember != groupMembers.end(); ++iterGroupMember)
+	{
+		if ((iterGroupMember->first != actor) && groupObj->isMemberPC(iterGroupMember->first) && (connectedCharacterLfgData.count(iterGroupMember->first) > 0))
+		{
+			CreatureObject const * memberObj = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(iterGroupMember->first));
+			if (memberObj)
+			{
+				Vector const memberWorldLocation = memberObj->findPosition_w();
+				if (static_cast<int>(currentWorldLocation.magnitudeBetweenSquared(memberWorldLocation)) <= ConfigServerGame::getGroupPickupPointApprovalRangeSquared())
+				{
+					anyConnectedGroupMemberInRange = true;
+					break;
+				}
+			}
+		}
+	}
+
+	// if there are no connected group members within 20m, bail
+	if (!anyConnectedGroupMemberInRange)
+	{
+		ProsePackage prosePackage;
+		prosePackage.stringId = StringId("group", "create_group_pickup_no_assistant");
+		prosePackage.digitInteger = static_cast<int>(sqrt(static_cast<float>(ConfigServerGame::getGroupPickupPointApprovalRangeSquared())));
+
+		Chat::sendSystemMessage(*actorObj, prosePackage);
+		return;
+	}
+
+	// tell other group members that the group leader has created the group pickup point;
+	// we need to contact all other group members, even if they are not currently connected,
+	// so that we can create the group pickup point waypoint for them when they reconnect
+	std::string const actorName = Unicode::wideToNarrow(actorObj->getAssignedObjectName());
+	for (iterGroupMember = groupMembers.begin(); iterGroupMember != groupMembers.end(); ++iterGroupMember)
+	{
+		if ((iterGroupMember->first != actor) && groupObj->isMemberPC(iterGroupMember->first))
+		{
+			char buffer[1024];
+			snprintf(buffer, sizeof(buffer)-1, "%s|%d|%d|%d|%s", currentScene.c_str(), static_cast<int>(currentWorldLocation.x), static_cast<int>(currentWorldLocation.y), static_cast<int>(currentWorldLocation.z), actorName.c_str());
+			buffer[sizeof(buffer)-1] = '\0';
+
+			MessageToQueue::getInstance().sendMessageToC(iterGroupMember->first,
+				"C++GroupPickupPointCreated",
+				buffer,
+				0,
+				false);
+		}
+	}
+
+	// create the group pickup point
+	time_t const timeNow = ::time(NULL);
+	groupObj->setGroupPickupTimer(timeNow, timeNow + static_cast<time_t>(ConfigServerGame::getGroupPickupPointTimeLimitSeconds()));
+	groupObj->setGroupPickupLocation(currentScene, currentWorldLocation);
+
+	// tell group leader that the group pickup point has been created
+	StringId::LocUnicodeString response;
+	if (StringId("group", "create_group_pickup_success_leader").localize(response))
+	{
+		ConsoleMgr::broadcastString(FormattedString<2048>().sprintf(Unicode::wideToNarrow(response).c_str(), CalendarTime::convertSecondsToMS(static_cast<unsigned int>(ConfigServerGame::getGroupPickupPointTimeLimitSeconds())).c_str()),
+			clientObj);
+	}
+
+	// create/update the group leader's group pickup point waypoint
+	Location const location(currentWorldLocation, NetworkId::cms_invalid, Location::getCrcBySceneName(currentScene));
+	playerObj->createOrUpdateReusableWaypoint(location, "groupPickupWp", Unicode::narrowToWide("Group Pickup Point"), Waypoint::White);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncUseGroupPickup(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	CreatureObject * const actorObj = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (!actorObj)
+		return;
+
+	PlayerObject const * const playerObj = PlayerCreatureController::getPlayerObject(actorObj);
+	if (!playerObj)
+		return;
+
+	Client const * const clientObj = actorObj->getClient();
+	if (!clientObj)
+		return;
+
+	GameScriptObject * const gameScriptObject = actorObj->getScriptObject();
+	if (!gameScriptObject)
+		return;
+
+	bool starPortAndShuttleportOnly = false;
+	static Unicode::String const noCampParam = Unicode::narrowToWide("nocamp");
+	if (Unicode::caseInsensitiveCompare(params, noCampParam))
+		starPortAndShuttleportOnly = true;
+
+	GroupObject * const groupObj = actorObj->getGroup();
+	if (!groupObj || (groupObj->getSecondsLeftOnGroupPickup() == 0))
+	{
+		sendProseMessage(*actorObj, 0, StringId("group", "use_group_pickup_none_active"));
+		return;
+	}
+
+	Vector const currentWorldLocation = actorObj->findPosition_w();
+	std::string const currentScene = ServerWorld::getSceneId();
+	if (!GroupPickupPoint::isGroupPickupAllowedAtLocation(currentScene, static_cast<int>(currentWorldLocation.x), static_cast<int>(currentWorldLocation.z)))
+	{
+		sendProseMessage(*actorObj, 0, StringId("group", "use_group_pickup_unsupported_location"));
+		return;
+	}
+
+	if (actorObj->getState(States::Combat))
+	{
+		sendProseMessage(*actorObj, 0, StringId("group", "use_group_pickup_in_combat"));
+		return;
+	}
+
+	if (actorObj->isIncapacitated() || actorObj->isDead())
+	{
+		sendProseMessage(*actorObj, 0, StringId("group", "use_group_pickup_dead_or_incap"));
+		return;
+	}
+
+	if (actorObj->getMountedCreature())
+	{
+		sendProseMessage(*actorObj, 0, StringId("group", "use_group_pickup_on_mount"));
+		return;
+	}
+
+	// trigger script to make sure script is ok with the player traveling to the group pickup point
+	ScriptParams sp1;
+	if (gameScriptObject->trigAllScripts(Scripting::TRIG_ABOUT_TO_TRAVEL_TO_GROUP_PICKUP_POINT, sp1) != SCRIPT_CONTINUE)
+		return;
+
+	// if group pickup point is in mustafar or any of the kashyyyk zones,
+	// check to make sure player has the required feature bits to go there
+	std::pair<std::string, Vector> const & groupPickupLocation = groupObj->getGroupPickupLocation();
+	uint32 const gameFeatureBits = clientObj->getGameFeatures();
+
+	if (groupPickupLocation.first.find("kashyyyk") == 0)
+	{
+		if (!((gameFeatureBits & ClientGameFeature::Episode3PreorderDownload) || (gameFeatureBits & ClientGameFeature::Episode3ExpansionRetail)))
+		{
+			sendProseMessage(*actorObj, 0, StringId("travel", "kashyyyk_unauthorized"));
+			return;
+		}
+	}
+	else if (groupPickupLocation.first == "mustafar")
+	{
+		if (!((gameFeatureBits & ClientGameFeature::TrialsOfObiwanPreorder) || (gameFeatureBits & ClientGameFeature::TrialsOfObiwanRetail)))
+		{
+			sendProseMessage(*actorObj, 0, StringId("travel", "mustafar_unauthorized"));
+			return;
+		}
+	}
+
+	// determine cost, and make sure player has enough credits
+	int totalCost;
+	if (!GroupPickupPoint::getGroupPickupTravelCost(currentScene, groupPickupLocation.first, totalCost) || (totalCost <= 0))
+	{
+		sendProseMessage(*actorObj, 0, StringId("group", "use_group_pickup_internal_error_cannot_determine_cost"));
+		return;
+	}
+
+	int const bankBalance = actorObj->getBankBalance();
+	int const cashBalance = actorObj->getCashBalance();
+
+	if ((bankBalance + cashBalance) < totalCost)
+	{
+		ProsePackage prosePackage;
+		prosePackage.stringId = StringId("group", "use_group_pickup_not_enough_credits");
+		prosePackage.digitInteger = totalCost;
+
+		Chat::sendSystemMessage(*actorObj, prosePackage);
+		return;
+	}
+
+	// find the travel point (starport, shuttleport, camp with shuttle beacon)
+	// nearest to the group pickup point
+
+	// get the list of cities the player is currently banned from
+	std::vector<int> cityBanList;
+	DynamicVariableList const & objvars = actorObj->getObjVars();
+	if (objvars.hasItem("city.banlist") && (objvars.getType("city.banlist") == DynamicVariable::INT_ARRAY))
+		IGNORE_RETURN(objvars.getItem("city.banlist", cityBanList));
+
+	std::string sceneIdOfNearestTravelPoint = groupPickupLocation.first;
+	TravelPoint const * nearestTravelPoint = GroupHelpers::getNearestTravelPoint(groupPickupLocation.first, groupPickupLocation.second, cityBanList, actorObj->getPvpFaction(), starPortAndShuttleportOnly);
+
+	// if no nearest travel point found, and the pickup point is inside one
+	// of the kashyyyk zones that do not have a starport, use kashyyyk_main
+	// as the pickup point planet and find the nearest travel point there,
+	// and that should return at least the kachirho starport
+	// *****OR*****
+	// if nearest travel point is found inside any kashyyyk zone other than kashyyyk_main
+	// and the player is not already in that respective zone, don't allow them to travel
+	// there as entrance to those zones requires going through kashyyyk_main first, so
+	// find the nearest travel point in kashyyyk_main and use that as the travel point
+	bool findNearestTravelPointOnKashyyykMain = false;
+	if (!nearestTravelPoint && (groupPickupLocation.first.find("kashyyyk") == 0) && (groupPickupLocation.first != "kashyyyk_main"))
+	{
+		// if already on the kashyyyk zone where the group pickup point is, player is
+		// already closest to the group pickup point than any travel point on kashyyyk_main
+		if (currentScene == groupPickupLocation.first)
+		{
+			sendProseMessage(*actorObj, 0, StringId("group", "use_group_pickup_closest_to_group_pickup_point"));
+			return;
+		}
+
+		findNearestTravelPointOnKashyyykMain = true;
+	}
+	else if (nearestTravelPoint && (groupPickupLocation.first.find("kashyyyk") == 0) && (groupPickupLocation.first != "kashyyyk_main") && (currentScene != groupPickupLocation.first))
+	{
+		findNearestTravelPointOnKashyyykMain = true;
+	}
+
+	if (findNearestTravelPointOnKashyyykMain)
+	{
+		sceneIdOfNearestTravelPoint = "kashyyyk_main";
+
+		if (groupPickupLocation.first == "kashyyyk_hunting")
+		{
+			// we want to find the travel point on kashyyyk_main nearest to the entrance to kashyyyk_hunting which is at (190.0f, 20.0f, -430.0f)
+			nearestTravelPoint = GroupHelpers::getNearestTravelPoint(sceneIdOfNearestTravelPoint, Vector(190.0f, 20.0f, -430.0f), cityBanList, actorObj->getPvpFaction(), starPortAndShuttleportOnly);
+		}
+		else if (groupPickupLocation.first == "kashyyyk_dead_forest")
+		{
+			// we want to find the travel point on kashyyyk_main nearest to the entrance to kashyyyk_dead_forest which is at (-745.0f, 18.0f, 256.0f)
+			nearestTravelPoint = GroupHelpers::getNearestTravelPoint(sceneIdOfNearestTravelPoint, Vector(-745.0f, 18.0f, 256.0f), cityBanList, actorObj->getPvpFaction(), starPortAndShuttleportOnly);
+		}
+		else
+		{
+			// (-672.0f, 19.0f, -157.0f) is the kachirho starport
+			nearestTravelPoint = GroupHelpers::getNearestTravelPoint(sceneIdOfNearestTravelPoint, Vector(-672.0f, 19.0f, -157.0f), cityBanList, actorObj->getPvpFaction(), starPortAndShuttleportOnly);
+		}
+	}
+
+	if (!nearestTravelPoint)
+	{
+		sendProseMessage(*actorObj, 0, StringId("group", "use_group_pickup_internal_error_cannot_find_travelpoint"));
+		return;
+	}
+
+	// if nearest travel point and current planet is the same, and the nearest travel point to the 
+	// group pickup point is farther away than the current location to the group pickup point, then
+	// fail, as there is no need to travel as the player is currently closer to the group pickup point
+	if ((sceneIdOfNearestTravelPoint == currentScene) && (sceneIdOfNearestTravelPoint == groupPickupLocation.first) && (groupPickupLocation.second.magnitudeBetweenSquared(nearestTravelPoint->getPosition_w()) > groupPickupLocation.second.magnitudeBetweenSquared(currentWorldLocation)))
+	{
+		sendProseMessage(*actorObj, 0, StringId("group", "use_group_pickup_closest_to_group_pickup_point"));
+		return;
+	}
+
+	// if the nearest travel point is a shuttleport in a player city, the city gets a share of the travel cost
+	int cityShareOfCost = 0;
+	int systemShareOfCost = totalCost;
+	int const cityIdAtNearestTravelPoint = CityInterface::getCityAtLocation(sceneIdOfNearestTravelPoint, static_cast<int>(nearestTravelPoint->getPosition_w().x), static_cast<int>(nearestTravelPoint->getPosition_w().z), 0);
+	NetworkId cityHallAtNearestTravelPoint;
+	std::string cityNameAtNearestTravelPoint;
+	if (cityIdAtNearestTravelPoint > 0)
+	{
+		CityInfo const & ci = CityInterface::getCityInfo(cityIdAtNearestTravelPoint);
+		cityHallAtNearestTravelPoint = ci.getCityHallId();
+		if (cityHallAtNearestTravelPoint.isValid())
+		{
+			cityNameAtNearestTravelPoint = ci.getCityName();
+			cityShareOfCost = (totalCost * ConfigServerGame::getGroupPickupTravelPlayerCityPercent()) / 100;
+			systemShareOfCost = totalCost - cityShareOfCost;
+		}
+	}
+
+	// if player doesn't have enough money in bank, transfer from cash into back to make up the difference
+	if (bankBalance < totalCost)
+	{
+		if (!actorObj->depositCashToBank(totalCost - bankBalance))
+		{
+			sendProseMessage(*actorObj, 0, StringId("group", "use_group_pickup_internal_error_cannot_move_cash_to_bank"));
+			return;
+		}
+	}
+
+	// transfer the total travel cost from the player
+	if (!actorObj->transferBankCreditsTo("GroupPickupPointTravel", totalCost))
+	{
+		sendProseMessage(*actorObj, 0, StringId("group", "use_group_pickup_internal_error_cannot_transfer_payment_from_bank"));
+		return;
+	}
+
+	// tell player his credits have been deducted
+	ProsePackage prosePackage;
+	prosePackage.stringId = StringId("group", "use_group_pickup_credits_deducted");
+	prosePackage.digitInteger = totalCost;
+
+	Chat::sendSystemMessage(*actorObj, prosePackage);
+
+	// if the city gets a share of the travel cost, send message to the city hall to transfer the city's share
+	if (cityHallAtNearestTravelPoint.isValid() && (cityShareOfCost > 0))
+	{
+		char buffer[64];
+		snprintf(buffer, sizeof(buffer)-1, "%d", cityShareOfCost);
+		buffer[sizeof(buffer)-1] = '\0';
+
+		MessageToQueue::getInstance().sendMessageToC(cityHallAtNearestTravelPoint,
+			"C++CityShareGroupPickupPointTravelCost",
+			buffer,
+			0,
+			false);
+	}
+
+	// log the transaction
+	if (cityHallAtNearestTravelPoint.isValid())
+		LOG("CustomerService", ("GroupPickupPointTravel:%s in group %s traveled from %s to %s for a cost of %d (%d to system, %d to %s)", playerObj->getAccountDescription().c_str(), groupObj->getNetworkId().getValueString().c_str(), currentScene.c_str(), groupPickupLocation.first.c_str(), totalCost, systemShareOfCost, cityShareOfCost, cityNameAtNearestTravelPoint.c_str()));
+	else
+		LOG("CustomerService", ("GroupPickupPointTravel:%s in group %s traveled from %s to %s for a cost of %d", playerObj->getAccountDescription().c_str(), groupObj->getNetworkId().getValueString().c_str(), currentScene.c_str(), groupPickupLocation.first.c_str(), totalCost));
+
+	// trigger script to teleport player to the destination travel location;
+	// script has various "cleanup/setup" it needs to be when the player travels
+	ScriptParams sp2;
+	sp2.addParam(sceneIdOfNearestTravelPoint.c_str());
+	sp2.addParam(nearestTravelPoint->getName().c_str());
+
+	IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_TRAVEL_TO_GROUP_PICKUP_POINT, sp2));
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncGroupPickRandomGroupMember(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const & params)
+{
+	CreatureObject * const targetObj = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(actor));
+	if (!targetObj)
+		return;
+
+	PlayerObject const * const targetPlayerObj = PlayerCreatureController::getPlayerObject(targetObj);
+	if (!targetPlayerObj)
+		return;
+
+	GroupObject const * const group = targetObj->getGroup();
+	if (!group)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You are not currently in a group."), Unicode::emptyString);
+		return;
+	}
+
+	// prevent spamming of the command
+	Client const * const client = targetObj->getClient();
+	if (!client)
+		return;
+
+	int const timeNow = static_cast<int>(::time(NULL));
+	if (!client->isGod() && targetObj->getObjVars().hasItem("timeNextGroupPickRandomGroupMemberCommandAllowed") && (targetObj->getObjVars().getType("timeNextGroupPickRandomGroupMemberCommandAllowed") == DynamicVariable::INT))
+	{
+		int timeNextGroupPickRandomGroupMemberCommandAllowed = 0;
+		if (targetObj->getObjVars().getItem("timeNextGroupPickRandomGroupMemberCommandAllowed", timeNextGroupPickRandomGroupMemberCommandAllowed))
+		{
+			if (timeNextGroupPickRandomGroupMemberCommandAllowed > timeNow)
+			{
+				Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("You must wait %ds before you can run this command again.", (timeNextGroupPickRandomGroupMemberCommandAllowed - timeNow))), Unicode::emptyString);
+				return;
+			}
+		}
+	}
+
+	// handle options
+	static uint32 const pointatSocialType = SocialsManager::getSocialTypeByName("pointat");
+	uint32 socialType = 0;
+
+	if (!params.empty())
+	{
+		Unicode::UnicodeStringVector tokens;
+		if (Unicode::tokenize(Unicode::toLower(params), tokens, NULL, NULL) && !tokens.empty())
+		{
+			static Unicode::String const paramsPoint1 = Unicode::narrowToWide("-point");
+			static Unicode::String const paramsPoint2 = Unicode::narrowToWide("point");
+			static Unicode::String const paramsEmote1 = Unicode::narrowToWide("-emote=");
+			static Unicode::String const paramsEmote2 = Unicode::narrowToWide("emote=");
+			std::string emote;
+
+			for (Unicode::UnicodeStringVector::const_iterator iter = tokens.begin(); iter != tokens.end(); ++iter)
+			{
+				if ((*iter == paramsPoint1) || (*iter == paramsPoint2))
+				{
+					socialType = pointatSocialType;
+				}
+				else if (iter->find(paramsEmote1) == 0)
+				{
+					emote = Unicode::wideToNarrow(*iter).substr(7);
+					socialType = SocialsManager::getSocialTypeByName(emote);
+					if (socialType == 0)
+					{
+						Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("\"%s\" is not a valid emote.", emote.c_str())), Unicode::emptyString);
+						return;
+					}
+				}
+				else if (iter->find(paramsEmote2) == 0)
+				{
+					emote = Unicode::wideToNarrow(*iter).substr(6);
+					socialType = SocialsManager::getSocialTypeByName(emote);
+					if (socialType == 0)
+					{
+						Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("\"%s\" is not a valid emote.", emote.c_str())), Unicode::emptyString);
+						return;
+					}
+				}
+			}
+		}
+	}
+
+	GroupObject::GroupMemberVector const & results = group->getGroupMembers();
+	if (results.empty())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("No group member could be found."), Unicode::emptyString);
+	}
+	else
+	{
+		GroupObject::GroupMemberVector pcMembers;
+		for (GroupObject::GroupMemberVector::const_iterator iter = results.begin(); iter != results.end(); ++iter)
+		{
+			if (group->isMemberPC(iter->first))
+			{
+				pcMembers.push_back(*iter);
+			}
+		}
+
+		if (pcMembers.empty())
+		{
+			Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("No group member could be found."), Unicode::emptyString);
+		}
+		else
+		{
+			int const random = ::rand() % pcMembers.size();
+			Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("Group member \"%s\" was randomly chosen.", pcMembers[random].second.c_str())), Unicode::emptyString);
+
+			// do emote at the selected player, if requested
+			if (socialType > 0)
+			{
+				// if I'm the one selected, use the /pointat social to point at myself
+				// since other socials may not make sense when I am the target
+				doSocial(*targetObj, pcMembers[random].first, ((pcMembers[random].first == targetObj->getNetworkId()) ? pointatSocialType : socialType));
+			}
+		}
+	}
+
+	// set cooldown
+	if (!client->isGod())
+		IGNORE_RETURN(targetObj->setObjVarItem("timeNextGroupPickRandomGroupMemberCommandAllowed", (timeNow + 30)));
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncGroupTextChatRoomRejoin(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &)
+{
+	CreatureObject * const targetObj = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(actor));
+	if (!targetObj)
+		return;
+
+	PlayerObject const * const targetPlayerObj = PlayerCreatureController::getPlayerObject(targetObj);
+	if (!targetPlayerObj)
+		return;
+
+	GroupObject const * const group = targetObj->getGroup();
+	if (!group)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You are not currently in a group."), Unicode::emptyString);
+		return;
+	}
+
+	// prevent spamming of the command
+	Client const * const client = targetObj->getClient();
+	if (!client)
+		return;
+
+	int const timeNow = static_cast<int>(::time(NULL));
+	if (!client->isGod() && targetObj->getObjVars().hasItem("timeNextGroupTextChatRoomRejoinCommandAllowed") && (targetObj->getObjVars().getType("timeNextGroupTextChatRoomRejoinCommandAllowed") == DynamicVariable::INT))
+	{
+		int timeNextGroupTextChatRoomRejoinCommandAllowed = 0;
+		if (targetObj->getObjVars().getItem("timeNextGroupTextChatRoomRejoinCommandAllowed", timeNextGroupTextChatRoomRejoinCommandAllowed))
+		{
+			if (timeNextGroupTextChatRoomRejoinCommandAllowed > timeNow)
+			{
+				Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("You must wait %ds before you can run this command again.", (timeNextGroupTextChatRoomRejoinCommandAllowed - timeNow))), Unicode::emptyString);
+				return;
+			}
+		}
+	}
+
+	Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("Attempting to leave and rejoin the group text chat room."), Unicode::emptyString);
+	group->reenterGroupChatRoom(*targetObj);
+
+	// set cooldown
+	if (!client->isGod())
+		IGNORE_RETURN(targetObj->setObjVarItem("timeNextGroupTextChatRoomRejoinCommandAllowed", (timeNow + 60)));
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncGuildChat(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (actorObj)
+	{
+		// don't allow if the actor is squelched
+		PlayerObject * const playerObj = PlayerCreatureController::getPlayerObject(actorObj);
+		if (!playerObj || (playerObj->getSecondsUntilUnsquelched() != 0))
+		{
+			return;
+		}
+
+		GuildInterface::sendGuildChat(*actorObj, params);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncGuildTextChatRoomRejoin(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &)
+{
+	CreatureObject * const targetObj = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(actor));
+	if (!targetObj)
+		return;
+
+	PlayerObject const * const targetPlayerObj = PlayerCreatureController::getPlayerObject(targetObj);
+	if (!targetPlayerObj)
+		return;
+
+	if (targetObj->getGuildId() == 0)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You are not currently in a guild."), Unicode::emptyString);
+		return;
+	}
+
+	// prevent spamming of the command
+	Client const * const client = targetObj->getClient();
+	if (!client)
+		return;
+
+	int const timeNow = static_cast<int>(::time(NULL));
+	if (!client->isGod() && targetObj->getObjVars().hasItem("timeNextGuildTextChatRoomRejoinCommandAllowed") && (targetObj->getObjVars().getType("timeNextGuildTextChatRoomRejoinCommandAllowed") == DynamicVariable::INT))
+	{
+		int timeNextGuildTextChatRoomRejoinCommandAllowed = 0;
+		if (targetObj->getObjVars().getItem("timeNextGuildTextChatRoomRejoinCommandAllowed", timeNextGuildTextChatRoomRejoinCommandAllowed))
+		{
+			if (timeNextGuildTextChatRoomRejoinCommandAllowed > timeNow)
+			{
+				Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("You must wait %ds before you can run this command again.", (timeNextGuildTextChatRoomRejoinCommandAllowed - timeNow))), Unicode::emptyString);
+				return;
+			}
+		}
+	}
+
+	Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("Attempting to leave and rejoin the guild text chat room."), Unicode::emptyString);
+	GuildInterface::reenterGuildChatRoom(*targetObj);
+
+	// set cooldown
+	if (!client->isGod())
+		IGNORE_RETURN(targetObj->setObjVarItem("timeNextGuildTextChatRoomRejoinCommandAllowed", (timeNow + 60)));
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncGuildPickRandomGuildMember(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const & params)
+{
+	CreatureObject * const targetObj = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(actor));
+	if (!targetObj)
+		return;
+
+	PlayerObject const * const targetPlayerObj = PlayerCreatureController::getPlayerObject(targetObj);
+	if (!targetPlayerObj)
+		return;
+
+	if (targetObj->getGuildId() == 0)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You are not currently in a guild."), Unicode::emptyString);
+		return;
+	}
+
+	// prevent spamming of the command
+	Client const * const client = targetObj->getClient();
+	if (!client)
+		return;
+
+	int const timeNow = static_cast<int>(::time(NULL));
+	if (!client->isGod() && targetObj->getObjVars().hasItem("timeNextGuildPickRandomGuildMemberCommandAllowed") && (targetObj->getObjVars().getType("timeNextGuildPickRandomGuildMemberCommandAllowed") == DynamicVariable::INT))
+	{
+		int timeNextGuildPickRandomGuildMemberCommandAllowed = 0;
+		if (targetObj->getObjVars().getItem("timeNextGuildPickRandomGuildMemberCommandAllowed", timeNextGuildPickRandomGuildMemberCommandAllowed))
+		{
+			if (timeNextGuildPickRandomGuildMemberCommandAllowed > timeNow)
+			{
+				Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("You must wait %ds before you can run this command again.", (timeNextGuildPickRandomGuildMemberCommandAllowed - timeNow))), Unicode::emptyString);
+				return;
+			}
+		}
+	}
+
+	// handle options
+	static uint32 const pointatSocialType = SocialsManager::getSocialTypeByName("pointat");
+	uint32 socialType = 0;
+	bool onlineOption = false;
+
+	if (!params.empty())
+	{
+		Unicode::UnicodeStringVector tokens;
+		if (Unicode::tokenize(Unicode::toLower(params), tokens, NULL, NULL) && !tokens.empty())
+		{
+			static Unicode::String const paramsOnline1 = Unicode::narrowToWide("-online");
+			static Unicode::String const paramsOnline2 = Unicode::narrowToWide("online");
+			static Unicode::String const paramsPoint1 = Unicode::narrowToWide("-point");
+			static Unicode::String const paramsPoint2 = Unicode::narrowToWide("point");
+			static Unicode::String const paramsEmote1 = Unicode::narrowToWide("-emote=");
+			static Unicode::String const paramsEmote2 = Unicode::narrowToWide("emote=");
+			std::string emote;
+
+			for (Unicode::UnicodeStringVector::const_iterator iter = tokens.begin(); iter != tokens.end(); ++iter)
+			{
+				if ((*iter == paramsOnline1) || (*iter == paramsOnline2))
+				{
+					onlineOption = true;
+				}
+				else if ((*iter == paramsPoint1) || (*iter == paramsPoint2))
+				{
+					socialType = pointatSocialType;
+				}
+				else if (iter->find(paramsEmote1) == 0)
+				{
+					emote = Unicode::wideToNarrow(*iter).substr(7);
+					socialType = SocialsManager::getSocialTypeByName(emote);
+					if (socialType == 0)
+					{
+						Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("\"%s\" is not a valid emote.", emote.c_str())), Unicode::emptyString);
+						return;
+					}
+				}
+				else if (iter->find(paramsEmote2) == 0)
+				{
+					emote = Unicode::wideToNarrow(*iter).substr(6);
+					socialType = SocialsManager::getSocialTypeByName(emote);
+					if (socialType == 0)
+					{
+						Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("\"%s\" is not a valid emote.", emote.c_str())), Unicode::emptyString);
+						return;
+					}
+				}
+			}
+		}
+	}
+
+	std::vector<NetworkId> results;
+	GuildInterface::getGuildMemberIdsWithPermissions(targetObj->getGuildId(), GuildInterface::Member, results);
+	if (results.empty())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("No guild member could be found."), Unicode::emptyString);
+	}
+	else
+	{
+		std::vector<NetworkId> resultsOnline;
+		if (onlineOption)
+		{
+			std::map<NetworkId, LfgCharacterData> const & connectedPlayers = ServerUniverse::getConnectedCharacterLfgData();
+			for (std::vector<NetworkId>::const_iterator iter = results.begin(); iter != results.end(); ++iter)
+			{
+				if ((*iter == targetObj->getNetworkId()) || (connectedPlayers.count(*iter) > 0))
+					resultsOnline.push_back(*iter);
+			}
+
+			if (resultsOnline.empty())
+				resultsOnline.push_back(targetObj->getNetworkId());
+		}
+
+		NetworkId const randomMember = (onlineOption ? resultsOnline[::rand() % resultsOnline.size()] : results[::rand() % results.size()]);
+		GuildMemberInfo const * const gmi = GuildInterface::getGuildMemberInfo(targetObj->getGuildId(), randomMember);
+		if (!gmi)
+		{
+			Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("No guild member could be found."), Unicode::emptyString);
+		}
+		else
+		{
+			Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("Guild member \"%s\" was randomly chosen out of %d guild members in guild %s [%s].", gmi->m_name.c_str(), results.size(), GuildInterface::getGuildName(targetObj->getGuildId()).c_str(), GuildInterface::getGuildAbbrev(targetObj->getGuildId()).c_str())), Unicode::emptyString);
+
+			// reminder of the -online option
+			if (!onlineOption && (randomMember != targetObj->getNetworkId()) && (ServerUniverse::getConnectedCharacterLfgData().count(randomMember) <= 0))
+			{
+				Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("Use \"/guildPickRandomGuildMember -online\" to only select online guild members."), Unicode::emptyString);
+			}
+
+			// do emote at the selected player, if requested
+			if (socialType > 0)
+			{
+				// if I'm the one selected, use the /pointat social to point at myself
+				// since other socials may not make sense when I am the target
+				doSocial(*targetObj, randomMember, ((randomMember == targetObj->getNetworkId()) ? pointatSocialType : socialType));
+			}
+		}
+	}
+
+	// set cooldown
+	if (!client->isGod())
+		IGNORE_RETURN(targetObj->setObjVarItem("timeNextGuildPickRandomGuildMemberCommandAllowed", (timeNow + 30)));
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncCityChat(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	CreatureObject *actorObj = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actor));
+	if (actorObj)
+	{
+		// don't allow if the actor is squelched
+		PlayerObject * const playerObj = PlayerCreatureController::getPlayerObject(actorObj);
+		if (!playerObj || (playerObj->getSecondsUntilUnsquelched() != 0))
+		{
+			return;
+		}
+
+		CityInterface::sendCityChat(*actorObj, params);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncCityTextChatRoomRejoin(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &)
+{
+	CreatureObject * const targetObj = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(actor));
+	if (!targetObj)
+		return;
+
+	PlayerObject const * const targetPlayerObj = PlayerCreatureController::getPlayerObject(targetObj);
+	if (!targetPlayerObj)
+		return;
+
+	std::vector<int> const & cityIds = CityInterface::getCitizenOfCityId(targetObj->getNetworkId());
+	if (cityIds.empty())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You are not currently a citizen of a player city."), Unicode::emptyString);
+		return;
+	}
+
+	// prevent spamming of the command
+	Client const * const client = targetObj->getClient();
+	if (!client)
+		return;
+
+	int const timeNow = static_cast<int>(::time(NULL));
+	if (!client->isGod() && targetObj->getObjVars().hasItem("timeNextCityTextChatRoomRejoinCommandAllowed") && (targetObj->getObjVars().getType("timeNextCityTextChatRoomRejoinCommandAllowed") == DynamicVariable::INT))
+	{
+		int timeNextCityTextChatRoomRejoinCommandAllowed = 0;
+		if (targetObj->getObjVars().getItem("timeNextCityTextChatRoomRejoinCommandAllowed", timeNextCityTextChatRoomRejoinCommandAllowed))
+		{
+			if (timeNextCityTextChatRoomRejoinCommandAllowed > timeNow)
+			{
+				Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("You must wait %ds before you can run this command again.", (timeNextCityTextChatRoomRejoinCommandAllowed - timeNow))), Unicode::emptyString);
+				return;
+			}
+		}
+	}
+
+	Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("Attempting to leave and rejoin the city text chat room."), Unicode::emptyString);
+	CityInterface::reenterCityChatRoom(*targetObj);
+
+	// set cooldown
+	if (!client->isGod())
+		IGNORE_RETURN(targetObj->setObjVarItem("timeNextCityTextChatRoomRejoinCommandAllowed", (timeNow + 60)));
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncCityPickRandomCitizen(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const & params)
+{
+	CreatureObject * const targetObj = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(actor));
+	if (!targetObj)
+		return;
+
+	PlayerObject const * const targetPlayerObj = PlayerCreatureController::getPlayerObject(targetObj);
+	if (!targetPlayerObj)
+		return;
+
+	std::vector<int> const & cityIds = CityInterface::getCitizenOfCityId(targetObj->getNetworkId());
+	if (cityIds.empty())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You are not currently a citizen of any city."), Unicode::emptyString);
+		return;
+	}
+
+	// prevent spamming of the command
+	Client const * const client = targetObj->getClient();
+	if (!client)
+		return;
+
+	int const timeNow = static_cast<int>(::time(NULL));
+	if (!client->isGod() && targetObj->getObjVars().hasItem("timeNextCityPickRandomCitizenCommandAllowed") && (targetObj->getObjVars().getType("timeNextCityPickRandomCitizenCommandAllowed") == DynamicVariable::INT))
+	{
+		int timeNextCityPickRandomCitizenCommandAllowed = 0;
+		if (targetObj->getObjVars().getItem("timeNextCityPickRandomCitizenCommandAllowed", timeNextCityPickRandomCitizenCommandAllowed))
+		{
+			if (timeNextCityPickRandomCitizenCommandAllowed > timeNow)
+			{
+				Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("You must wait %ds before you can run this command again.", (timeNextCityPickRandomCitizenCommandAllowed - timeNow))), Unicode::emptyString);
+				return;
+			}
+		}
+	}
+
+	// handle options
+	static uint32 const pointatSocialType = SocialsManager::getSocialTypeByName("pointat");
+	uint32 socialType = 0;
+	bool onlineOption = false;
+
+	if (!params.empty())
+	{
+		Unicode::UnicodeStringVector tokens;
+		if (Unicode::tokenize(Unicode::toLower(params), tokens, NULL, NULL) && !tokens.empty())
+		{
+			static Unicode::String const paramsOnline1 = Unicode::narrowToWide("-online");
+			static Unicode::String const paramsOnline2 = Unicode::narrowToWide("online");
+			static Unicode::String const paramsPoint1 = Unicode::narrowToWide("-point");
+			static Unicode::String const paramsPoint2 = Unicode::narrowToWide("point");
+			static Unicode::String const paramsEmote1 = Unicode::narrowToWide("-emote=");
+			static Unicode::String const paramsEmote2 = Unicode::narrowToWide("emote=");
+			std::string emote;
+
+			for (Unicode::UnicodeStringVector::const_iterator iter = tokens.begin(); iter != tokens.end(); ++iter)
+			{
+				if ((*iter == paramsOnline1) || (*iter == paramsOnline2))
+				{
+					onlineOption = true;
+				}
+				else if ((*iter == paramsPoint1) || (*iter == paramsPoint2))
+				{
+					socialType = pointatSocialType;
+				}
+				else if (iter->find(paramsEmote1) == 0)
+				{
+					emote = Unicode::wideToNarrow(*iter).substr(7);
+					socialType = SocialsManager::getSocialTypeByName(emote);
+					if (socialType == 0)
+					{
+						Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("\"%s\" is not a valid emote.", emote.c_str())), Unicode::emptyString);
+						return;
+					}
+				}
+				else if (iter->find(paramsEmote2) == 0)
+				{
+					emote = Unicode::wideToNarrow(*iter).substr(6);
+					socialType = SocialsManager::getSocialTypeByName(emote);
+					if (socialType == 0)
+					{
+						Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("\"%s\" is not a valid emote.", emote.c_str())), Unicode::emptyString);
+						return;
+					}
+				}
+			}
+		}
+	}
+
+	std::vector<NetworkId> results;
+	CityInterface::getCitizenIds(cityIds[0], results);
+	if (results.empty())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("No citizen could be found."), Unicode::emptyString);
+	}
+	else
+	{
+		std::vector<NetworkId> resultsOnline;
+		if (onlineOption)
+		{
+			std::map<NetworkId, LfgCharacterData> const & connectedPlayers = ServerUniverse::getConnectedCharacterLfgData();
+			for (std::vector<NetworkId>::const_iterator iter = results.begin(); iter != results.end(); ++iter)
+			{
+				if ((*iter == targetObj->getNetworkId()) || (connectedPlayers.count(*iter) > 0))
+					resultsOnline.push_back(*iter);
+			}
+
+			if (resultsOnline.empty())
+				resultsOnline.push_back(targetObj->getNetworkId());
+		}
+
+		NetworkId const randomMember = (onlineOption ? resultsOnline[::rand() % resultsOnline.size()] : results[::rand() % results.size()]);
+		CitizenInfo const * const ci = CityInterface::getCitizenInfo(cityIds[0], randomMember);
+		if (!ci)
+		{
+			Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("No citizen could be found."), Unicode::emptyString);
+		}
+		else
+		{
+			Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("Citizen \"%s\" was randomly chosen out of %d citizens in city %s.", ci->m_citizenName.c_str(), results.size(), CityInterface::getCityInfo(cityIds[0]).getCityName().c_str())), Unicode::emptyString);
+
+			// reminder of the -online option
+			if (!onlineOption && (randomMember != targetObj->getNetworkId()) && (ServerUniverse::getConnectedCharacterLfgData().count(randomMember) <= 0))
+			{
+				Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("Use \"/cityPickRandomCitizen -online\" to only select online citizens."), Unicode::emptyString);
+			}
+
+			// do emote at the selected player, if requested
+			if (socialType > 0)
+			{
+				// if I'm the one selected, use the /pointat social to point at myself
+				// since other socials may not make sense when I am the target
+				doSocial(*targetObj, randomMember, ((randomMember == targetObj->getNetworkId()) ? pointatSocialType : socialType));
+			}
+		}
+	}
+
+	// set cooldown
+	if (!client->isGod())
+		IGNORE_RETURN(targetObj->setObjVarItem("timeNextCityPickRandomCitizenCommandAllowed", (timeNow + 30)));
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncShowDanceVisuals(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	size_t pos = 0;
+	bool enable = nextBoolParm(params, pos);
+	CreatureObject *creature = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(actor));
+	if (creature)
+	{
+		IGNORE_RETURN(creature->showDanceVisuals(enable));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncShowMusicianVisuals(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	size_t pos = 0;
+	bool enable = nextBoolParm(params, pos);
+	CreatureObject *creature = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(actor));
+	if (creature)
+	{
+		IGNORE_RETURN(creature->showMusicianVisuals(enable));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncPlaceStructure (const Command& /*command*/, const NetworkId& actor, const NetworkId& /*target*/, const Unicode::String& parameters)
+{
+	Object* const object = NetworkIdManager::getObjectById (actor);
+	if (!object)
+	{
+		DEBUG_WARNING (true, ("commandFuncPlaceStructure: PB null actor\n"));
+		return;
+	}
+
+	ServerObject* const serverObject = dynamic_cast<ServerObject*> (object);
+	if (!serverObject)
+	{
+		DEBUG_WARNING (true, ("commandFuncPlaceStructure: object is not a server object\n"));
+		return;
+	}
+
+	size_t pos = 0;
+	const NetworkId deedNetworkId = nextOidParm (parameters, pos);
+	const float x = nextFloatParm (parameters, pos);
+	const float z = nextFloatParm (parameters, pos);
+	const Vector position (x, 0.f, z);
+	const int rotation = nextIntParm (parameters, pos);
+
+	ScriptParams scriptParameters;
+	scriptParameters.addParam (actor);
+	scriptParameters.addParam (deedNetworkId);
+	scriptParameters.addParam (position);
+	scriptParameters.addParam (rotation);
+
+	if (serverObject->getScriptObject ()->trigAllScripts (Scripting::TRIG_PLACE_STRUCTURE, scriptParameters) != SCRIPT_CONTINUE)
+		DEBUG_REPORT_LOG (true, ("commandFuncPlaceStructure: did not return SCRIPT_CONTINUE\n"));
+}
+
+// ----------------------------------------------------------------------
+/**
+ * Change the posture of the player to sitting.
+ *
+ * Broadcast the request to sit on a chair.
+ */
+
+static void commandFuncSitServer(const Command& /*command*/, const NetworkId& actorId, const NetworkId& /* targetId */, const Unicode::String& parameters)
+{
+	// The command handler only runs on the authoratative server for the actor,
+	// so it should be fine to directly grab the CreatureController from the actor.
+
+	//-- Get the actor object.
+	Object *const actorObject = NetworkIdManager::getObjectById(actorId);
+	if (!actorObject)
+	{
+		DEBUG_WARNING(true, ("commandFuncPostureSit: failed to lookup Object from actorId network id [%s], aborting sit request.\n", actorId.getValueString().c_str()));
+		return;
+	}
+
+	CreatureObject *const creatureActorObject = CreatureObject::asCreatureObject(actorObject);
+	if (!creatureActorObject)
+	{
+		DEBUG_WARNING(true, ("commandFuncPostureSit:  Object [%s] is not a creature, aborting sit request.\n", actorId.getValueString().c_str()));
+		return;
+	}
+
+	//-- Do not let a player sit on the ground in water.  (Sitting on a chair in water is okay, but that implies a designer stuck a chair in water).
+	bool const  sittingOnChair = !parameters.empty();
+	NetworkId   chairCellId;
+	Vector      chairPosition_p;
+
+	if (sittingOnChair)
+	{
+		//-- Pull the chair cell id and position out of the parameters string.
+		std::string const narrowParameters = Unicode::wideToNarrow(parameters);
+
+		std::string::size_type const lastCommaIndex = narrowParameters.find_last_of(',');
+
+		std::string const            chairCellIdString(narrowParameters, lastCommaIndex + 1);
+		std::string const            chairPosition_pString(narrowParameters, 0, lastCommaIndex);
+
+		//-- Get chair position.  Abort command if cannot scan vector position from string.
+		int const scanCount = sscanf(chairPosition_pString.c_str(), "%g,%g,%g", &chairPosition_p.x, &chairPosition_p.y, &chairPosition_p.z);
+		if (scanCount != 3)
+		{
+			DEBUG_WARNING(true, ("commandFuncPostureSit: sitting on chair but chair parameter [%s] was malformed: couldn't be converted to parent x,y,z.", Unicode::wideToNarrow(parameters).c_str()));
+			return;
+		}
+
+		chairCellId = NetworkId(chairCellIdString);
+	}
+
+	if (!sittingOnChair)
+	{
+		// Trying to sit on the ground.
+		const TerrainObject* const     terrainObject     = TerrainObject::getConstInstance();
+		const CollisionProperty* const collisionProperty = actorObject->getCollisionProperty ();
+		const bool                     isOnSolidFloor    = collisionProperty && collisionProperty->getFootprint() && collisionProperty->getFootprint()->isOnSolidFloor();
+
+		Vector normal = Vector::unitY;
+		if (terrainObject && actorObject->isInWorldCell() && !isOnSolidFloor)
+		{
+			const Vector position = actorObject->getPosition_w ();
+
+			float terrainHeight;
+			if (terrainObject->getHeight(position, terrainHeight, normal))
+			{
+				//-- see if the object is swimming
+				float waterHeight;
+				if (terrainObject->getWaterHeight(position, waterHeight))
+				{
+					if (waterHeight >terrainHeight)
+					{
+						// Client is in the water, abort the command.
+						Chat::sendSystemMessage (*creatureActorObject, SharedStringIds::no_sitting_in_water, Unicode::emptyString);
+						return;
+					}
+				}
+			}
+		}
+	}
+
+	//-- Get the controller.
+	Controller *const controller = actorObject->getController();
+	if (!controller)
+	{
+		DEBUG_WARNING(true, ("commandFuncPostureSit: object [%s] has no controller, aborting sit request.\n", actorId.getValueString().c_str()));
+		return;
+	}
+
+	//-- Send the SitOnObject controller message to all clients.
+	if (!sittingOnChair)
+	{
+		//-- Just tell the client to change to the sitting posture immediately.
+		const_cast<CreatureObject*>(creatureActorObject)->setPosture(Postures::Sitting, true);
+	}
+	else
+	{
+		//-- Send a SitOnObject message with the chair coordinates.
+		const_cast<CreatureObject*>(creatureActorObject)->sitOnObject(chairCellId, chairPosition_p);
+	}
+
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncGetAttributes(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const & params)
+{
+	size_t curpos = 0;
+	int const clientRevision = nextIntParm(params, curpos);
+	TaskGetAttributes * const task = new TaskGetAttributes(actor, target, clientRevision);
+	NonCriticalTaskQueue::getInstance().addTask(task);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncGetAttributesBatch(Command const &, NetworkId const &actor, NetworkId const & , Unicode::String const & params)
+{
+	size_t curpos = 0;
+	NetworkId obj = nextOidParm(params, curpos);
+	while(obj != NetworkId::cms_invalid)
+	{
+		int const clientRevision = nextIntParm(params, curpos);
+		TaskGetAttributes * const task = new TaskGetAttributes(actor, obj, clientRevision);
+		NonCriticalTaskQueue::getInstance().addTask(task);
+		obj = nextOidParm(params, curpos);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static std::string underscoreToSpace (const std::string& source)
+{
+	std::string result = source;
+	std::replace (result.begin (), result.end (), '_', ' ');
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncPurchaseTicket (const Command& /*command*/, const NetworkId& actor, const NetworkId& /*target*/, const Unicode::String& parameters)
+{
+	ServerObject* const serverObject = ServerObject::getServerObject(actor);
+	if (!serverObject)
+	{
+		DEBUG_WARNING (true, ("commandFuncPurchaseTicket: object is not a server object"));
+		return;
+	}
+
+	size_t pos = 0;
+	const Unicode::String planetName1  = Unicode::narrowToWide (nextStringParm (parameters, pos));
+	const Unicode::String travelPoint1 = Unicode::narrowToWide (underscoreToSpace (nextStringParm (parameters, pos)));
+	const Unicode::String planetName2  = Unicode::narrowToWide (nextStringParm (parameters, pos));
+	const Unicode::String travelPoint2 = Unicode::narrowToWide (underscoreToSpace (nextStringParm (parameters, pos)));
+	const bool roundTrip = nextBoolParm (parameters, pos);
+	const bool instantTravel = nextBoolParm (parameters, pos);
+
+	ScriptParams scriptParameters;
+	scriptParameters.addParam (actor);
+	scriptParameters.addParam (planetName1);
+	scriptParameters.addParam (travelPoint1);
+	scriptParameters.addParam (planetName2);
+	scriptParameters.addParam (travelPoint2);
+	scriptParameters.addParam (roundTrip);
+
+	Scripting::TrigId id = instantTravel ? Scripting::TRIG_PURCHASE_TICKET_INSTANT_TRAVEL : Scripting::TRIG_PURCHASE_TICKET;
+
+	if (serverObject->getScriptObject ()->trigAllScripts (id, scriptParameters) != SCRIPT_CONTINUE)
+		DEBUG_REPORT_LOG (true, ("commandFuncPurchaseTicket: did not return SCRIPT_CONTINUE\n"));
+}
+
+//----------------------------------------------------------------------
+
+static void commandFuncRequestResourceWeights(const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params)
+{
+	CreatureObject* const creature = CreatureObject::getCreatureObject(actor);
+	if (creature == NULL)
+	{
+		WARNING (true, ("commandFuncRequestResourceWeights: PB null actor"));
+		return;
+	}
+
+	uint32 schematicCrc;
+	sscanf(Unicode::wideToNarrow(params).c_str(), "%lu", &schematicCrc);
+	DraftSchematicObject::requestResourceWeights(*creature, schematicCrc);
+}
+
+//----------------------------------------------------------------------
+
+static void commandFuncRequestResourceWeightsBatch(const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params)
+{
+	CreatureObject* const creature = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById (actor));
+	if (creature == NULL)
+	{
+		WARNING (true, ("commandFuncRequestResourceWeightsBatch: PB null actor"));
+		return;
+	}
+
+	int schematicCrc;
+
+	size_t curpos = 0;
+	schematicCrc = nextIntParm(params, curpos);
+	while(schematicCrc != -1)
+	{
+		DraftSchematicObject::requestResourceWeights(*creature, static_cast<uint32>(schematicCrc));
+		schematicCrc = nextIntParm(params, curpos);
+	}
+}
+
+//----------------------------------------------------------------------
+
+static void commandFuncRequestDraftSlots (const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params)
+{
+	CreatureObject* const creature = CreatureObject::getCreatureObject(actor);
+	if (creature == NULL)
+	{
+		WARNING (true, ("commandFuncRequestDraftSlots: PB null actor"));
+		return;
+	}
+
+	PlayerObject * const player = PlayerCreatureController::getPlayerObject(creature);
+	if (player == NULL)
+	{
+		WARNING (true, ("commandFuncRequestDraftSlots: no player object for actor ""%s", actor.getValueString().c_str()));
+		return;
+	}
+
+	uint32 serverCrc, sharedCrc;
+	sscanf(Unicode::wideToNarrow(params).c_str(), "%lu %lu", &serverCrc, &sharedCrc);
+
+	MessageQueueDraftSlotsQueryResponse * const message = new MessageQueueDraftSlotsQueryResponse(std::make_pair(serverCrc, sharedCrc));
+	if (!player->requestDraftSlots(serverCrc, NULL, message))
+	{
+		WARNING (true, ("commandFuncRequestDraftSlots failed to request draft slots for %u", serverCrc));
+		delete message;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncRequestDraftSlotsBatch (const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params)
+{
+	CreatureObject* const creature = CreatureObject::getCreatureObject(actor);
+	if (creature == NULL)
+	{
+		WARNING (true, ("commandFuncRequestDraftSlotsBatch: PB null actor"));
+		return;
+	}
+
+	PlayerObject * const player = PlayerCreatureController::getPlayerObject(creature);
+	if (player == NULL)
+	{
+		WARNING (true, ("commandFuncRequestDraftSlotsBatch: no player object for actor ""%s", actor.getValueString().c_str()));
+		return;
+	}
+
+	uint32 uServerCrc = 0;
+	uint32 uSharedCrc = 0;
+	size_t curpos = 0;
+
+	std::string serverCrcString = nextStringParm(params, curpos);
+	if(serverCrcString.empty())
+		return;
+	sscanf(serverCrcString.c_str(), "%lu", &uServerCrc);
+	std::string sharedCrcString = nextStringParm(params, curpos);
+	if(sharedCrcString.empty())
+		return;
+	sscanf(sharedCrcString.c_str(), "%lu", &uSharedCrc);
+
+	bool done = false;
+	while(uServerCrc != 0 && uSharedCrc != 0 && !done)
+	{
+		MessageQueueDraftSlotsQueryResponse * const message = new MessageQueueDraftSlotsQueryResponse(std::make_pair(uServerCrc, uSharedCrc));
+		if (!player->requestDraftSlots(uServerCrc, NULL, message))
+		{
+			WARNING (true, ("commandFuncRequestDraftSlotsBatch failed to request draft slots for %lu", uServerCrc));
+			delete message;
+		}
+		serverCrcString = nextStringParm(params, curpos);
+		if(serverCrcString.empty())
+			done = true;
+		sscanf(serverCrcString.c_str(), "%lu", &uServerCrc);
+		sharedCrcString = nextStringParm(params, curpos);
+		if(sharedCrcString.empty())
+			done = true;
+		sscanf(sharedCrcString.c_str(), "%lu", &uSharedCrc);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncRequestManfSchematicSlots (const Command& , const NetworkId& actor, const NetworkId& target, const Unicode::String& params)
+{
+	CreatureObject* const creature = CreatureObject::getCreatureObject(actor);
+	if (creature == NULL)
+	{
+		WARNING (true, ("commandFuncRequestDraftSlots: PB null actor"));
+		return;
+	}
+
+	const ManufactureSchematicObject * schematic = dynamic_cast<
+		const ManufactureSchematicObject *>(NetworkIdManager::getObjectById(target));
+	if (schematic != NULL)
+	{
+		schematic->requestSlots(*creature);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncRequestCraftingSession (const Command& , const NetworkId& actor, const NetworkId& target, const Unicode::String& params)
+{
+	CreatureObject* const creature = CreatureObject::getCreatureObject(actor);
+	if (creature == NULL)
+	{
+		WARNING (true, ("commandFuncRequestCraftingSession: PB null actor"));
+		return;
+	}
+
+	PlayerObject * player = PlayerCreatureController::getPlayerObject(creature);
+	if (player == NULL)
+	{
+		WARNING (true, ("commandFuncRequestCraftingSession: no player object for actor "
+			"%s", actor.getValueString().c_str()));
+		return;
+	}
+
+	if (!player->requestCraftingSession(target))
+	{
+		// get the station we are attempting to use.
+		TangibleObject const * const craftingObject = TangibleObject::getTangibleObject(target);
+
+		// 1 means this request was made on a crafting station versus a crafting tool.
+		uint8 const sequenceId = static_cast<uint8>(craftingObject && craftingObject->isCraftingStation() ? 1 : 0);
+
+		MessageQueueGenericIntResponse * response = new MessageQueueGenericIntResponse (
+			CM_requestCraftingSession, false, sequenceId);
+		creature->getController()->appendMessage(CM_craftingResult, 0.0f, response,
+			GameControllerMessageFlags::SEND |
+			GameControllerMessageFlags::RELIABLE |
+			GameControllerMessageFlags::DEST_AUTH_CLIENT);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncRequestCraftingSessionFail(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &)
+{
+	CreatureObject* const creatureActor = CreatureObject::getCreatureObject(actor);
+	if (creatureActor)
+	{
+		creatureActor->getController()->appendMessage(
+			CM_craftingResult,
+			0.0f,
+			new MessageQueueGenericIntResponse(CM_requestCraftingSession, false, 0),
+			GameControllerMessageFlags::SEND |
+			GameControllerMessageFlags::RELIABLE |
+			GameControllerMessageFlags::DEST_AUTH_CLIENT);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncSelectDraftSchematic (const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params)
+{
+	CreatureObject* const creature = CreatureObject::getCreatureObject(actor);
+	if (creature == NULL)
+	{
+		WARNING (true, ("commandFuncSelectDraftSchematic: PB null actor"));
+		return;
+	}
+
+	PlayerObject * player = PlayerCreatureController::getPlayerObject(creature);
+	if (player == NULL)
+	{
+		WARNING (true, ("commandFuncSelectDraftSchematic: no player object for actor "
+			"%s", actor.getValueString().c_str()));
+		return;
+	}
+
+	int schematicIndex = atoi(Unicode::wideToNarrow(params).c_str());
+
+	player->selectDraftSchematic(schematicIndex);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncNextCraftingStage(const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params)
+{
+	CreatureObject* const creature = CreatureObject::getCreatureObject(actor);
+	if (creature == NULL)
+	{
+		WARNING (true, ("commandFuncNextCraftingStage: PB null actor"));
+		return;
+	}
+
+	PlayerObject * player = PlayerCreatureController::getPlayerObject(creature);
+	if (player == NULL)
+	{
+		WARNING (true, ("commandFuncNextCraftingStage: no player object for actor "
+			"%s", actor.getValueString().c_str()));
+		return;
+	}
+
+	uint8 sequenceId = static_cast<uint8>(atoi(Unicode::wideToNarrow(params).c_str()));
+	int result = player->goToNextCraftingStage();
+
+	MessageQueueGenericIntResponse * response = new MessageQueueGenericIntResponse (
+		CM_nextCraftingStage, result, sequenceId);
+	creature->getController()->appendMessage(CM_nextCraftingStageResult, 0.0f, response,
+		GameControllerMessageFlags::SEND |
+		GameControllerMessageFlags::RELIABLE |
+		GameControllerMessageFlags::DEST_AUTH_CLIENT);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncCreatePrototype(const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params)
+{
+	CreatureObject* const creature = CreatureObject::getCreatureObject(actor);
+	if (creature == NULL)
+	{
+		WARNING (true, ("commandFuncCreatePrototype: PB null actor"));
+		return;
+	}
+
+	PlayerObject * const player = PlayerCreatureController::getPlayerObject(creature);
+	if (player == NULL)
+	{
+		WARNING (true, ("commandFuncCreatePrototype: no player object for actor %s", actor.getValueString().c_str()));
+		return;
+	}
+
+	size_t pos = 0;
+	const uint8 sequenceId = static_cast<uint8>(nextIntParm(params, pos));
+	bool realPrototype = nextBoolParm(params, pos);
+
+	const bool result = player->createPrototype(realPrototype);
+
+	MessageQueueGenericIntResponse * const response = new MessageQueueGenericIntResponse (CM_createPrototype, result, sequenceId);
+	creature->getController()->appendMessage(CM_craftingResult, 0.0f, response,
+		GameControllerMessageFlags::SEND |
+		GameControllerMessageFlags::RELIABLE |
+		GameControllerMessageFlags::DEST_AUTH_CLIENT);
+
+	if (!result)
+		player->stopCrafting(false);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncCreateManfSchematic(const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params)
+{
+	CreatureObject* const creature = CreatureObject::getCreatureObject(actor);
+	if (creature == NULL)
+	{
+		WARNING (true, ("commandFuncCreateManfSchematic: PB null actor"));
+		return;
+	}
+
+	PlayerObject * const player = PlayerCreatureController::getPlayerObject(creature);
+	if (player == NULL)
+	{
+		WARNING (true, ("commandFuncCreateManfSchematic: no player object for actor %s", actor.getValueString().c_str()));
+		return;
+	}
+
+	const uint8 sequenceId = static_cast<uint8>(atoi(Unicode::wideToNarrow(params).c_str()));
+
+	const bool result = player->createManufacturingSchematic();
+
+	MessageQueueGenericIntResponse * const response = new MessageQueueGenericIntResponse (CM_createManfSchematic, result, sequenceId);
+	creature->getController()->appendMessage(CM_craftingResult, 0.0f, response,
+		GameControllerMessageFlags::SEND |
+		GameControllerMessageFlags::RELIABLE |
+		GameControllerMessageFlags::DEST_AUTH_CLIENT);
+
+	if (!result)
+		player->stopCrafting(false);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncCancelCraftingSession(const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params)
+{
+	CreatureObject* const creature = CreatureObject::getCreatureObject(actor);
+	if (creature == NULL)
+	{
+		WARNING (true, ("commandFuncCancelCraftingSession: PB null actor"));
+		return;
+	}
+
+	PlayerObject * player = PlayerCreatureController::getPlayerObject(creature);
+	if (player == NULL)
+	{
+		WARNING (true, ("commandFuncCancelCraftingSession: no player object for actor "
+			"%s", actor.getValueString().c_str()));
+		return;
+	}
+
+	player->stopCrafting(true);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncStopCraftingSession(const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params)
+{
+	CreatureObject* const creature = CreatureObject::getCreatureObject(actor);
+	if (creature == NULL)
+	{
+		WARNING (true, ("commandFuncStopCraftingSession: PB null actor"));
+		return;
+	}
+
+	PlayerObject * player = PlayerCreatureController::getPlayerObject(creature);
+	if (player == NULL)
+	{
+		WARNING (true, ("commandFuncStopCraftingSession: no player object for actor "
+			"%s", actor.getValueString().c_str()));
+		return;
+	}
+
+	player->stopCrafting(true);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncRestartCraftingSession(const Command& , const NetworkId& actor, const NetworkId& , const Unicode::String& params)
+{
+	CreatureObject* const creature = CreatureObject::getCreatureObject(actor);
+	if (creature == NULL)
+	{
+		WARNING (true, ("commandFuncRestartCraftingSession: PB null actor"));
+		return;
+	}
+
+	PlayerObject * player = PlayerCreatureController::getPlayerObject(creature);
+	if (player == NULL)
+	{
+		WARNING (true, ("commandFuncRestartCraftingSession: no player object for actor "
+			"%s", actor.getValueString().c_str()));
+		return;
+	}
+
+	uint8 sequenceId = static_cast<uint8>(atoi(Unicode::wideToNarrow(params).c_str()));
+
+	const bool success = player->restartCrafting();
+
+	MessageQueueGenericIntResponse * response = new MessageQueueGenericIntResponse (
+		CM_restartCraftingSession, success, sequenceId);
+	creature->getController()->appendMessage(CM_craftingResult, 0.0f, response,
+		GameControllerMessageFlags::SEND |
+		GameControllerMessageFlags::RELIABLE |
+		GameControllerMessageFlags::DEST_AUTH_CLIENT);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncSetMatchMakingPersonalId(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	//DEBUG_REPORT_LOG(true, ("commandFuncSetMatchMakingPersonalId() <networkId> %s <params> %s\n", actor.getValueString().empty() ? "noId" : actor.getValueString().c_str(), Unicode::wideToNarrow(params).c_str()));
+
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor));
+
+	if (playerObject != NULL)
+	{
+		MatchMakingId matchMakingId;
+		matchMakingId.unPackIntString(Unicode::wideToNarrow(params));
+
+		playerObject->setMatchMakingPersonalProfileId(matchMakingId);
+
+		//DEBUG_REPORT_LOG(true, ("commandFuncSetMatchMakingPersonalId() <networkId> %s %s\n", actor.getValueString().c_str(), matchMakingId.isBitSet(MatchMakingId::B_anonymous) ? "anonymous" : "searchable"));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncSetMatchMakingCharacterId(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	//DEBUG_REPORT_LOG(true, ("commandFuncSetMatchMakingCharacterId() <networkId> %s <params> %s\n", actor.getValueString().empty() ? "noId" : actor.getValueString().c_str(), Unicode::wideToNarrow(params).c_str()));
+
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor));
+
+	if (playerObject != NULL)
+	{
+		MatchMakingId matchMakingId;
+		matchMakingId.unPackIntString(Unicode::wideToNarrow(params));
+
+		playerObject->setMatchMakingCharacterProfileId(matchMakingId);
+
+		//DEBUG_REPORT_LOG(true, ("commandFuncSetMatchMakingCharacterId() <networkId> %s %s\n", actor.getValueString().c_str(), matchMakingId.isBitSet(MatchMakingId::B_anonymous) ? "anonymous" : "searchable"));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAddFriend(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	ServerObject * const serverObject = ServerObject::getServerObject(actor);
+
+	if (serverObject != NULL)
+	{
+		size_t pos = 0;
+		std::string name(nextStringParm(params, pos));
+
+		if (!name.empty())
+		{
+			std::string player(Chat::constructChatAvatarId(*serverObject).getFullName());
+
+			//DEBUG_REPORT_LOG(true, ("commandFuncAddFriend() <networkId> %s <player> %s <name> %s\n", actor.getValueString().c_str(), player.c_str(), name.c_str()));
+
+			Chat::addFriend(player, name);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncRemoveFriend(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	ServerObject * const serverObject = ServerObject::getServerObject(actor);
+
+	if (serverObject != NULL)
+	{
+		size_t pos = 0;
+		std::string name(nextStringParm(params, pos));
+
+		if (!name.empty())
+		{
+			std::string player(Chat::constructChatAvatarId(*serverObject).getFullName());
+
+			//DEBUG_REPORT_LOG(true, ("commandFuncRemoveFriend() <networkId> %s <player> %s <name> %s\n", actor.getValueString().c_str(), player.c_str(), name.c_str()));
+
+			Chat::removeFriend(player, name);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncGetFriendList(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	ServerObject * const serverObject = ServerObject::getServerObject(actor);
+
+	if (serverObject != NULL)
+	{
+		std::string player(Chat::constructChatAvatarId(*serverObject).getFullName());
+
+		//DEBUG_REPORT_LOG(true, ("commandFuncGetFriendList() <networkId> %s <player> %s\n", actor.getValueString().empty() ? "noId" : actor.getValueString().c_str(), player.c_str()));
+
+		Chat::getFriendsList(player);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAddIgnore(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	ServerObject * const serverObject = ServerObject::getServerObject(actor);
+
+	if (serverObject != NULL)
+	{
+		size_t pos = 0;
+		std::string name(nextStringParm(params, pos));
+
+		if (!name.empty())
+		{
+			std::string player(Chat::constructChatAvatarId(*serverObject).getFullName());
+
+			//DEBUG_REPORT_LOG(true, ("commandFuncAddIgnore() <networkId> %s <player> %s <name> %s\n", actor.getValueString().empty() ? "noId" : actor.getValueString().c_str(), player.c_str(), name.c_str()));
+
+			Chat::addIgnore(player, name);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncRemoveIgnore(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	ServerObject * const serverObject = ServerObject::getServerObject(actor);
+
+	if (serverObject != NULL)
+	{
+		size_t pos = 0;
+		std::string name(nextStringParm(params, pos));
+
+		if (!name.empty())
+		{
+			std::string player(Chat::constructChatAvatarId(*serverObject).getFullName());
+
+			//DEBUG_REPORT_LOG(true, ("commandFuncRemoveIgnore() <networkId> %s <player> %s <name> %s\n", actor.getValueString().empty() ? "noId" : actor.getValueString().c_str(), player.c_str(), name.c_str()));
+
+			Chat::removeIgnore(player, name);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncGetIgnoreList(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &)
+{
+	ServerObject * const serverObject = ServerObject::getServerObject(actor);
+
+	if (serverObject != NULL)
+	{
+		std::string player(Chat::constructChatAvatarId(*serverObject).getFullName());
+
+		//DEBUG_REPORT_LOG(true, ("commandFuncGetIgnoreList() <networkId> %s <player> %s\n", actor.getValueString().empty() ? "noId" : actor.getValueString().c_str(), player.c_str()));
+
+		Chat::getIgnoreList(player);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncRequestBiography(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &)
+{
+	CreatureObject * const creatureObject = CreatureObject::getCreatureObject(actor);
+
+	if (creatureObject != NULL)
+	{
+		BiographyManager::requestBiography(target, creatureObject);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncSetBiography(Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const &params)
+{
+	if (target != NetworkId::cms_invalid)
+	{
+		// get the actor
+		CreatureObject * const creatureActor = CreatureObject::getCreatureObject(actor);
+		if (!creatureActor)
+		{
+			WARNING (true, ("commandFuncSetBiography: bad actor"));
+			return;
+		}
+
+		Client * const clientActor = creatureActor->getClient();
+		if(!clientActor)
+		{
+			WARNING(true, ("no Client in commandFuncSetBiography"));
+			return;
+		}
+
+		if(!clientActor->isGod())
+		{
+			LOG("CustomerService", ("CheatChannel:%s attempted to set biography data on %s, but is not a God", PlayerObject::getAccountDescription(actor).c_str(), PlayerObject::getAccountDescription(target).c_str()));
+		}
+		else
+		{
+			BiographyManager::setBiography(target, params);
+		}
+	}
+	else
+	{
+		BiographyManager::setBiography(actor, params);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncRequestCharacterSheetInfo(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &)
+{
+	const CreatureObject* const creatureActor = CreatureObject::getCreatureObject(actor);
+	if (creatureActor == NULL)
+	{
+		WARNING (true, ("commandFuncRequestCharacterSheetInfo: null actor"));
+		return;
+	}
+
+	//TODO get the born and played times (once they're in the DB)
+	int born                   = 0;
+	int played                 = 0;
+
+	//get the bind location
+	Vector bindLoc;
+	std::string bindPlanet;
+	NetworkId bindId;
+	if (creatureActor->getObjVars().hasItem("bind.facility"))
+	{
+		creatureActor->getObjVars().getItem("bind.facility", bindId);
+	}
+	if(bindId != NetworkId::cms_invalid)
+	{
+		const ServerObject* const bindObject = ServerObject::getServerObject(bindId);
+		if (bindObject != NULL)
+		{
+			bindLoc    = bindObject->getPosition_w();
+			bindPlanet = bindObject->getSceneId();
+		}
+	}
+
+	//get the bankId
+	Vector bankLoc(0, 0, 0);
+	std::string bankPlanet;
+	if (creatureActor->getObjVars().hasItem("banking_bankid"))
+	{
+		creatureActor->getObjVars().getItem("banking_bankid", bankPlanet);
+	}
+
+	// get the city(ies) this character is a citizen of
+	NetworkId cityHallOfMayorCity;
+	std::string citizensOf;
+	std::vector<int> const & cityId = CityInterface::getCitizenOfCityId(creatureActor->getNetworkId());
+	if (!cityId.empty())
+	{
+		std::string cityName;
+		for (std::vector<int>::const_iterator iterCity = cityId.begin(); iterCity != cityId.end(); ++iterCity)
+		{
+			CityInfo const & cityInfo = CityInterface::getCityInfo(*iterCity);
+			cityName = cityInfo.getCityName();
+			if (cityName.empty())
+				continue;
+
+			if (!citizensOf.empty())
+				citizensOf += ",";
+
+			if (creatureActor->getNetworkId() == cityInfo.getLeaderId())
+			{
+				citizensOf += "*";
+				cityHallOfMayorCity = cityInfo.getCityHallId();
+			}
+
+			citizensOf += cityName;
+		}
+	}
+
+	// get the residence location
+	Vector resLoc;
+	std::string resPlanet;
+	NetworkId houseNetworkId = creatureActor->getHouse();
+
+	// mayor has city hall as his residence
+	if (!houseNetworkId.isValid() && cityHallOfMayorCity.isValid())
+		houseNetworkId = cityHallOfMayorCity;
+
+	const ServerObject* const resObject = ServerObject::getServerObject(houseNetworkId);
+	if (resObject != NULL)
+	{
+		resLoc    = resObject->getPosition_w();
+		resPlanet = ServerWorld::getSceneId();
+	}
+	else if (houseNetworkId.isValid() && MessageToQueue::isInstalled())
+	{
+		// the residence may not be on this game server, try to find it
+		MessageToQueue::getInstance().sendMessageToC(houseNetworkId,
+			"C++CharacterSheetInfoResidenceLocationReq",
+			creatureActor->getNetworkId().getValueString(),
+			0,
+			false);
+	}
+
+	//get the spouse's name
+	Unicode::String spouseName = Unicode::emptyString;
+	if (creatureActor->getObjVars().hasItem("marriage.spouseName"))
+	{
+		creatureActor->getObjVars().getItem("marriage.spouseName", spouseName);
+	}
+
+	//get the number of used lots
+	int lots = creatureActor->getMaxNumberOfLots();
+
+	PlayerObject const * const player = PlayerCreatureController::getPlayerObject(creatureActor);
+	if(player)
+	{
+		int lotsUsed = player->getAccountNumLots();
+		lots -= lotsUsed;
+	}
+
+	//build, send the message back to the client
+	CharacterSheetResponseMessage const chrm(born, played, bindLoc, bindPlanet, bankLoc, bankPlanet, resLoc, resPlanet, citizensOf, spouseName, lots);
+	Client * const client = creatureActor->getClient();
+	if (client)
+		client->send(chrm, true);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncRequestCharacterMatch(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	//DEBUG_REPORT_LOG(true, ("commandFuncRequestCharacterMatch() - networkId: %s params: %s\n", actor.getValueString().c_str(), Unicode::wideToNarrow(params).c_str()));
+
+	// Build the new id
+
+	MatchMakingCharacterPreferenceId matchMakingCharacterPreferenceId;
+
+	matchMakingCharacterPreferenceId.unPackString(Unicode::wideToNarrow(params));
+
+	CharacterMatchManager::requestMatch(actor, matchMakingCharacterPreferenceId);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncExtractObject(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	CreatureObject* const creature = CreatureObject::getCreatureObject(actor);
+	if (creature == NULL)
+	{
+		WARNING (true, ("commandFuncExtractObject: PB null actor"));
+		return;
+	}
+
+	if (creature->getInventory() == NULL)
+	{
+		WARNING (true, ("commandFuncExtractObject: actor %s has no inventory",
+			actor.getValueString().c_str()));
+		return;
+	}
+
+	FactoryObject* const factory = dynamic_cast<FactoryObject *>(NetworkIdManager::getObjectById (target));
+	if (factory == NULL)
+	{
+		WARNING (true, ("commandFuncExtractObject: PB null target"));
+		return;
+	}
+
+	Container::ContainerErrorCode error;
+	if (creature->canManipulateObject(*factory, false, true, true, 10.0f, error))
+		factory->removeObject(*creature->getInventory());
+	else
+		ContainerInterface::sendContainerMessageToClient(*creature, error, factory);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncRevokeSkill(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	CreatureObject * const creature = CreatureObject::getCreatureObject(actor);
+	if (creature == NULL)
+	{
+		WARNING (true, ("commandFuncRevokeSkill: PB null actor"));
+		return;
+	}
+
+	size_t pos = 0;
+	std::string skillName = nextStringParm(params, pos);
+	const SkillObject * skill = SkillManager::getInstance ().getSkill (skillName);
+	if (skill == NULL)
+	{
+		WARNING (true, ("commandFuncRevokeSkill: can't revoke bad skill"));
+	}
+	else
+	{
+		LOG("CustomerService", ("Skill: God (via cmdfunc) has requested the revocation of skill %s from character %s.",
+			skillName.c_str(), creature->getNetworkId().getValueString().c_str()));
+		creature->revokeSkill (*skill);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncSetCurrentSkillTitle(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	CreatureObject * const creatureObject = CreatureObject::getCreatureObject(actor);
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(creatureObject);
+
+	if (playerObject != NULL)
+	{
+		size_t pos = 0;
+		std::string const &title = nextStringParm(params, pos);
+
+		if (title.empty())
+		{
+			playerObject->setTitle(title);
+		}
+		else
+		{
+			bool validTitle = false;
+
+			// citizenship title is always valid
+			if (title == "citizenship")
+			{
+				playerObject->setTitle(title);
+				validTitle = true;
+			}
+
+			// see if it's a collection slot title and the character actually has the collection slot
+			if (!validTitle)
+			{
+				CollectionsDataTable::CollectionInfoSlot const * const slot = CollectionsDataTable::isASlotTitle(title);
+
+				if (slot && playerObject->hasCompletedCollectionSlot(*slot))
+				{
+					playerObject->setTitle(title);
+					validTitle = true;
+				}
+			}
+
+			// see if it's a collection title and the character actually has the collection
+			if (!validTitle)
+			{
+				CollectionsDataTable::CollectionInfoCollection const * const collection = CollectionsDataTable::isACollectionTitle(title);
+
+				if (collection && playerObject->hasCompletedCollection(collection->name))
+				{
+					playerObject->setTitle(title);
+					validTitle = true;
+				}
+			}
+
+			// see if it's a collection page title and the character actually has the collection page
+			if (!validTitle)
+			{
+				CollectionsDataTable::CollectionInfoPage const * const page = CollectionsDataTable::isAPageTitle(title);
+
+				if (page && playerObject->hasCompletedCollectionPage(page->name))
+				{
+					playerObject->setTitle(title);
+					validTitle = true;
+				}
+			}
+
+			// see if it's a guild member rank title and the character actually has the guild member rank
+			if (!validTitle)
+			{
+				GuildRankDataTable::GuildRank const * const guildRankInfo = GuildRankDataTable::isARankTitle(title);
+
+				if (guildRankInfo && playerObject->getGuildRank().testBit(guildRankInfo->slotId))
+				{
+					playerObject->setTitle(title);
+					validTitle = true;
+				}
+			}
+
+			// see if it's a citizen rank title and the character actually has the citizen rank
+			if (!validTitle)
+			{
+				CitizenRankDataTable::CitizenRank const * const citizenRankInfo = CitizenRankDataTable::isARankTitle(title);
+
+				if (citizenRankInfo && playerObject->getCitizenRank().testBit(citizenRankInfo->slotId))
+				{
+					playerObject->setTitle(title);
+					validTitle = true;
+				}
+			}
+
+			// see if it's a guild GCW Region Defender title
+			if (!validTitle)
+			{
+				if (title == "guild_gcw_region_defender")
+				{
+					std::pair<std::string, std::pair<bool, bool> > const & guildGcwDefenderRegionInfo = playerObject->getGuildGcwDefenderRegionInfo();
+					if (!guildGcwDefenderRegionInfo.first.empty() && guildGcwDefenderRegionInfo.second.second)
+					{
+						playerObject->setTitle(title);
+						validTitle = true;
+					}
+				}
+			}
+
+			// see if it's a city GCW Region Defender title
+			if (!validTitle)
+			{
+				if (title == "city_gcw_region_defender")
+				{
+					std::pair<std::string, std::pair<bool, bool> > const & cityGcwDefenderRegionInfo = playerObject->getCityGcwDefenderRegionInfo();
+					if (!cityGcwDefenderRegionInfo.first.empty() && cityGcwDefenderRegionInfo.second.second)
+					{
+						playerObject->setTitle(title);
+						validTitle = true;
+					}
+				}
+			}
+
+			// Run through all the skills for this player and make sure
+			// this is a valid skill title for them
+			if (!validTitle)
+			{
+				CreatureObject::SkillList::const_iterator iterSkillList = creatureObject->getSkillList().begin();
+				for (; iterSkillList != creatureObject->getSkillList().end(); ++iterSkillList)
+				{
+					SkillObject const *skillObject = (*iterSkillList);
+
+					if (   (skillObject != NULL)
+							&& skillObject->isTitle()
+						&& (skillObject->getSkillName() == title))
+					{
+						playerObject->setTitle(title);
+						validTitle = true;
+						break;
+					}
+				}
+			}
+
+			if (!validTitle)
+			{
+				playerObject->setTitle(std::string());
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncRepair(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	CreatureObject* const creature = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById (actor));
+	if (creature == NULL)
+	{
+		WARNING (true, ("commandFuncRepair: PB null actor"));
+		return;
+	}
+
+	TangibleObject* const object = dynamic_cast<TangibleObject *>(NetworkIdManager::getObjectById (target));
+	if (object == NULL)
+	{
+		WARNING (true, ("commandFuncRepair: PB null target"));
+		return;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncToggleSearchableByCtsSourceGalaxy(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	//DEBUG_REPORT_LOG(true, ("commandFuncToggleSearchableByCtsSourceGalaxy() - networkId: %s\n", actor.getValueString().c_str()));
+
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor));
+
+	if (playerObject != NULL)
+	{
+		playerObject->toggleSearchableByCtsSourceGalaxy();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncToggleDisplayLocationInSearchResults(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	//DEBUG_REPORT_LOG(true, ("commandFuncToggleDisplayLocationInSearchResults() - networkId: %s\n", actor.getValueString().c_str()));
+
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor));
+
+	if (playerObject != NULL)
+	{
+		playerObject->toggleDisplayLocationInSearchResults();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncToggleAnonymous(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	//DEBUG_REPORT_LOG(true, ("commandFuncToggleAnonymous() - networkId: %s\n", actor.getValueString().c_str()));
+
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor));
+
+	if (playerObject != NULL)
+	{
+		playerObject->toggleAnonymous();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncToggleHelper(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	//DEBUG_REPORT_LOG(true, ("commandFuncToggleHelper() - networkId: %s\n", actor.getValueString().c_str()));
+
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor));
+
+	if (playerObject != NULL)
+	{
+		playerObject->toggleHelper();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncToggleRolePlay(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	//DEBUG_REPORT_LOG(true, ("commandFuncToggleRolePlay() - networkId: %s\n", actor.getValueString().c_str()));
+
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor));
+
+	if (playerObject != NULL)
+	{
+		playerObject->toggleRolePlay();
+	}
+}
+
+
+// ----------------------------------------------------------------------
+
+static void commandFuncToggleOutOfCharacter(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor));
+
+	if (playerObject != NULL)
+	{
+		playerObject->toggleOutOfCharacter();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncToggleLookingForWork(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor));
+
+	if (playerObject != NULL)
+	{
+		playerObject->toggleLookingForWork();
+	}
+}
+
+
+// ----------------------------------------------------------------------
+
+static void commandFuncToggleLookingForGroup(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	//DEBUG_REPORT_LOG(true, ("commandFuncToggleLookingForGroup() - networkId: %s\n", actor.getValueString().c_str()));
+
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor));
+
+	if (playerObject != NULL)
+	{
+		playerObject->toggleLookingForGroup();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncToggleAwayFromKeyBoard(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	//DEBUG_REPORT_LOG(true, ("commandFuncToggleAwayFromKeyBoard() - networkId: %s\n", actor.getValueString().c_str()));
+
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor));
+
+	if (playerObject != NULL)
+	{
+		playerObject->toggleAwayFromKeyBoard();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncToggleDisplayingFactionRank(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(CreatureObject::getCreatureObject(actor));
+
+	if (playerObject != NULL)
+	{
+		playerObject->toggleDisplayingFactionRank();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncReport(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	CreatureObject const * const reportingCreatureObject = CreatureObject::getCreatureObject(actor);
+
+	if (reportingCreatureObject != NULL)
+	{
+		if (ReportManager::isThrottled(actor))
+		{
+			// Player is trying to report too quickly after a previous report
+
+			ProsePackage prosePackage;
+			prosePackage.stringId = StringId("system_msg", "report_wait");
+			prosePackage.digitInteger = ReportManager::getThrottleTimeRemaining(actor);
+
+			Chat::sendSystemMessage(*reportingCreatureObject, prosePackage);
+		}
+		else
+		{
+			Unicode::String harassingPlayerName;
+			//size_t curpos = 0;
+			//size_t endpos = 0;
+
+			// If this player is on this galaxy, we can get the network id
+
+			//Vivox phase 1 temporary solution: the client is appending
+			//its connection information to the report command, this should
+			//come from VChat really
+			Unicode::String const delimiter = Unicode::narrowToWide("|");
+
+			Unicode::UnicodeStringVector tokens;
+			if(Unicode::tokenize(params, tokens, &delimiter) && tokens.size() > 1)
+			{
+				harassingPlayerName = tokens[0];
+				Unicode::String rest;
+				uint32 numTokens = tokens.size();
+				for(uint32 i = 1; i < numTokens; ++i)
+				{
+					if(i != 1)
+					{
+						rest.append(delimiter);
+					}
+					rest.append(tokens[i]);
+				}
+
+				NetworkId const harassingPlayerNetworkId = NameManager::getInstance().getPlayerId(Unicode::wideToNarrow(Unicode::toLower(harassingPlayerName)));
+
+				ReportManager::addReport(reportingCreatureObject->getAssignedObjectFirstName(), actor, harassingPlayerName, harassingPlayerNetworkId, std::string("Report"), rest);
+			}
+			else
+			{
+				// No harassing player specified
+
+				Chat::sendSystemMessage(*reportingCreatureObject, StringId("system_msg", "report_no_name"), Unicode::emptyString);
+			}
+			
+
+			//if (Unicode::getFirstToken(name, curpos, endpos, harassingPlayerName))
+			//{
+			//	NetworkId const harassingPlayerNetworkId = NameManager::getInstance().getPlayerId(Unicode::wideToNarrow(Unicode::toLower(harassingPlayerName)));
+
+			//	ReportManager::addReport(reportingCreatureObject->getAssignedObjectFirstName(), actor, harassingPlayerName, harassingPlayerNetworkId, std::string("Report"));
+			//}
+			//else
+			//{
+			//	// No harassing player specified
+
+			//	Chat::sendSystemMessage(*reportingCreatureObject, StringId("system_msg", "report_no_name"), Unicode::emptyString);
+			//}
+		}
+	}
+	else
+	{
+		DEBUG_WARNING(true, ("A non-player is trying to report a harassment. oid: %s", actor.getValueString().c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncNpcConversationStart(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	ServerObject * const actorObject = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(actor));
+	CreatureObject * const player = actorObject != NULL ? actorObject->asCreatureObject() : NULL;
+	if (player == NULL)
+	{
+		DEBUG_WARNING(true, ("commandFuncNpcConversationStart: couldn't find actor"));
+		return;
+	}
+
+	ServerObject * const npcObject = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(target));
+	TangibleObject * const npc = npcObject != NULL ? npcObject->asTangibleObject() : NULL;
+	if (npc == NULL)
+	{
+		DEBUG_WARNING(true, ("commandFuncNpcConversationStart: Couldn't find npc to converse with"));
+		return;
+	}
+
+	if (!ServerWorld::isSpaceScene())
+	{
+		Container::ContainerErrorCode error = Container::CEC_Success;
+		if (!player->canManipulateObject(*npc, false, false, false, 30.0f, error))
+		{
+			DEBUG_WARNING(true, ("commandFuncNpcConversationStart (ground): failed canManipulateObject check"));
+			return;
+		}
+	}
+	
+	std::string const & realParams = Unicode::wideToNarrow(params);
+	if (realParams.size() < 2)
+	{
+		DEBUG_WARNING(true, ("commandFuncNpcConversationStart: bad params %s", realParams.c_str()));
+		return;
+	}
+
+	const char * const conversationName = &realParams[2];
+	NpcConversationData::ConversationStarter const starter = static_cast<NpcConversationData::ConversationStarter>(atoi(realParams.c_str()));
+
+	player->startNpcConversation (*npc, conversationName, starter, 0);
+}
+
+//----------------------------------------------------------------------
+
+static void commandFuncNpcConversationStop(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	ServerObject * const actorObject = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(actor));
+	TangibleObject * const player = actorObject !=  NULL ? actorObject->asTangibleObject(): NULL;
+	if (player == NULL)
+	{
+		DEBUG_WARNING(true, ("commandFuncNpcConversationStop: couldn't find actor"));
+		return;
+	}
+	player->endNpcConversation();
+}
+
+//----------------------------------------------------------------------
+
+static void commandFuncNpcConversationSelect(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	Object * const actorObject = NetworkIdManager::getObjectById(actor);
+	CreatureObject * const player = dynamic_cast<CreatureObject * const>(actorObject);
+	if (player == NULL)
+	{
+		DEBUG_WARNING(true, ("commandFuncNpcConversationStop: couldn't find actor"));
+		return;
+	}
+
+	std::string realParams(Unicode::wideToNarrow(params));
+	int selection = atoi(realParams.c_str());
+	player->respondToNpc(selection);
+}
+
+//----------------------------------------------------------------------
+
+static void commandFuncServerDestroyObject (Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const & params)
+{
+	CreatureObject * const player = dynamic_cast<CreatureObject * const> (NetworkIdManager::getObjectById (actor));
+	if (player == NULL)
+	{
+		DEBUG_WARNING (true, ("commandFuncServerDestroyObject: couldn't find actor"));
+		return;
+	}
+
+	ServerObject * const targetObject = safe_cast<ServerObject *>(NetworkIdManager::getObjectById (target));
+	if (!targetObject)
+	{
+		PlayerObject * p = PlayerCreatureController::getPlayerObject(player);
+		if(p)
+		{
+			p->destroyWaypoint(target);
+			return;
+		}
+		else
+		{
+			DEBUG_WARNING (true, ("commandFuncServerDestroyObject: couldn't find target"));
+			return;
+		}
+	}
+
+	ServerObject const * const topMost = getFirstParentInWorldOrPlayer(targetObject);
+	if (!topMost || topMost->getNetworkId() != actor)
+	{
+		DEBUG_WARNING (true, ("player tried to delete something not in their inventory"));
+		return;
+	}
+
+	ProsePackage pp;
+	const bool sendResponse = !params.empty ();
+
+	int const got = targetObject->getGameObjectType ();
+	if (sendResponse)
+	{
+		ProsePackageManagerServer::createSimpleProsePackage (*targetObject, SharedStringIds::rsp_object_deleted_prose, pp);
+		pp.other.stringId = GameObjectTypes::getStringId (got);
+	}
+
+	// Cannot destroy an empty ship pcd while contained by a ship you own
+	if (got == SharedObjectTemplate::GOT_data_ship_control_device)
+	{
+		ShipObject const * const containingShip = ShipObject::getContainingShipObject(player);
+		if (containingShip && containingShip->getOwnerId() == actor && containingShip->getControlDevice() == targetObject)
+		{
+			if (sendResponse)
+				Chat::sendSystemMessage(*player, SharedStringIds::no_destroy_in_flight, Unicode::emptyString);
+			return;
+		}
+	}
+
+	// Cannot destroy a tcg card that is in the middle of the redemption process
+	if (!VeteranRewardManager::checkForTcgRedemptionInProgress(*targetObject))
+		return;
+
+	// Cannot destroy a reward item that is in the middle of the trade in process
+	if (!VeteranRewardManager::checkForTradeInInProgress(*targetObject))
+		return;
+
+	Object const * const currentContainer = ContainerInterface::getContainedByObject(*targetObject);
+	if(currentContainer && currentContainer->asServerObject() && ( currentContainer->asServerObject()->getGameObjectType() == SharedObjectTemplate::GOT_chronicles_quest_holocron || currentContainer->asServerObject()->getGameObjectType() == SharedObjectTemplate::GOT_chronicles_quest_holocron_recipe ) )
+	{
+		// Give the player a warning here?
+		return;
+	}
+
+	if (targetObject->permanentlyDestroy(DeleteReasons::Player))
+	{
+		LOG("CustomerService", ("Deletion:%s is deleting object %s", PlayerObject::getAccountDescription(actor).c_str(), ServerObject::getLogDescription(targetObject).c_str()));
+		if (sendResponse)
+			Chat::sendSystemMessage (*player, pp);
+	}
+	else
+		WARNING (true, ("commandFuncServerDestroyObject: Error encountered while deleting object %s", target.getValueString ().c_str ()));
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncSetSpokenLanguage(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	Object * const object = NetworkIdManager::getObjectById(actor);
+	CreatureObject * const creatureObject = dynamic_cast<CreatureObject * const>(object);
+
+	if (creatureObject != NULL)
+	{
+		PlayerObject *playerObject = PlayerCreatureController::getPlayerObject(creatureObject);
+
+		if (playerObject != NULL)
+		{
+			size_t pos = 0;
+			int const languageId = nextIntParm(params, pos);
+			std::string skillModName;
+			GameLanguageManager::getLanguageSpeakSkillModName(languageId, skillModName);
+
+			// Make sure the player is setting a valid game language
+
+			std::map<std::string, std::pair<int, int> >::const_iterator iterModMap = creatureObject->getModMap().find(skillModName);
+
+			if (iterModMap != creatureObject->getModMap().end())
+			{
+				int const baseValue = iterModMap->second.first;
+				int const modValue = iterModMap->second.second;
+
+				if ((baseValue + modValue) > 0)
+				{
+					playerObject->setSpokenLanguage(languageId);
+				}
+			}
+			else
+			{
+				DEBUG_WARNING(true, ("Invalid game language specified: %d", languageId));
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+static void commandFuncUnstick(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	Object * const object = NetworkIdManager::getObjectById(actor);
+	CreatureObject * const creatureObject = dynamic_cast<CreatureObject * const>(object);
+	if (creatureObject != NULL)
+	{
+		if (!ShipObject::getContainingShipObject(creatureObject)) // no unsticking in ships
+		{
+			PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(creatureObject);
+			if (playerObject)
+			{
+				Chat::sendSystemMessageSimple(*creatureObject, SharedStringIds::unstick_in_progress, NULL);
+				if (!playerObject->getIsUnsticking())
+				{
+					Vector position = creatureObject->getPosition_p();
+					//Send positional information with this unstick along with the message.  If you change
+					//the format of this positional information, you must also change it in the handler in ServerObject.cpp
+					char buf[255];
+					snprintf(buf, sizeof(buf), "%f:%f", position.x, position.z);
+					buf[sizeof(buf) - 1] = '\0';
+
+					int wait = 30;
+					if (creatureObject->getClient() && creatureObject->getClient()->isGodValidated())
+					{
+						if (creatureObject->getObjVars().getItem("debugUnstickWait", wait))
+						{
+							if (wait <= 0)
+								wait = 1;
+						}
+						else
+						{
+							wait = 30;
+						}
+					}
+
+					MessageToQueue::getInstance().sendMessageToC(actor, "C++Unstick", buf, wait, false);
+					playerObject->setIsUnsticking(true);
+				}
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+static void commandFuncGetAccountInfo(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	const CreatureObject * gm = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	if(gm)
+	{
+		const Client * gmClient = gm->getClient();
+		if(gmClient)
+		{
+			bool foundAsPilot = false;
+			const CreatureObject * player = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(target));
+			if (!player)
+			{
+				ShipObject const * const ship = dynamic_cast<ShipObject const *>(NetworkIdManager::getObjectById(target));
+				if (ship)
+				{
+					foundAsPilot = true;
+					player = ship->getPilot();
+				}
+			}
+			std::string result;
+			if(player)
+			{
+				const Client * client = player->getClient();
+				if(client)
+				{
+					if (foundAsPilot)
+						result =  "Pilot Character Name   : ";
+					else
+						result =  "Character Name         : ";
+
+					result += Unicode::wideToNarrow(player->getAssignedObjectName());
+					result += "\nAccount Name           : ";
+					result += client->getAccountName();
+					result += "\nStation Id             : ";
+					char buf[32];
+					IGNORE_RETURN(snprintf(buf, sizeof(buf)-1, "%d", client->getStationId()));
+					buf[sizeof(buf)-1] = '\0';
+					result += buf;
+					result += "\nGame Features          : ";
+					result += ClientGameFeature::getDescription(client->getGameFeatures());
+					result += "\nSubscription Features  : ";
+					uint32 const subscriptionFeatures = client->getSubscriptionFeatures();
+					result += ClientSubscriptionFeature::getDescription(subscriptionFeatures);
+
+					result += "\nAccount SWG Feature Ids: ";
+					std::string accountFeatureIdsString;
+					Client::AccountFeatureIdList const & accountFeatureIds = client->getAccountFeatureIds();
+					for (Client::AccountFeatureIdList::const_iterator iterAccountFeatureIds = accountFeatureIds.begin(); iterAccountFeatureIds != accountFeatureIds.end(); ++iterAccountFeatureIds)
+					{
+						if (!accountFeatureIdsString.empty())
+							accountFeatureIdsString += ", ";
+
+						accountFeatureIdsString += FormattedString<1024>().sprintf("%lu:%d", iterAccountFeatureIds->first, iterAccountFeatureIds->second);
+
+						if (VeteranRewardManager::isFeatureIdBlockedBySubscriptionBit(*player, iterAccountFeatureIds->first))
+							accountFeatureIdsString += "*";
+					}
+
+					if (!accountFeatureIdsString.empty())
+						result += accountFeatureIdsString;
+
+					result += "\nIP Address             : ";
+					result += client->getIpAddress();
+					result += "\nGod Mode               : ";
+					if(client->isGod())
+						result += "true";
+					else
+						result += "false";
+				}
+				else
+				{
+					result = "Object " + target.getValueString() + " is not controlled by a player.";
+				}
+			}
+			else
+			{
+				result = "Object " + target.getValueString() + " is not a creature or a ship.";
+			}
+			ConGenericMessage const msg(result, 0);
+			gmClient->send(msg, true);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncApplyPowerup (Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	const NetworkId & powerupId     = target;
+	const NetworkId targetOfApplyId (Unicode::wideToNarrow (params));
+	ServerObject * const powerup = safe_cast<ServerObject *>(NetworkIdManager::getObjectById (powerupId));
+	if (powerup)
+	{
+		const ServerObject * const targetOfApply = safe_cast<ServerObject *>(NetworkIdManager::getObjectById (targetOfApplyId));
+
+		if (targetOfApply)
+		{
+			const int got_targetOfApply = targetOfApply->getGameObjectType ();
+			const int got_powerup       = powerup->getGameObjectType       ();
+
+			if (GameObjectTypes::doesPowerupApply (got_powerup, got_targetOfApply))
+			{
+				GameScriptObject * const gso = powerup->getScriptObject();
+				if (gso)
+				{
+					ScriptParams scriptParams;
+					scriptParams.addParam (actor);
+					scriptParams.addParam (targetOfApplyId);
+					gso->trigAllScripts(Scripting::TRIG_APPLY_POWERUP, scriptParams);
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncLag (Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+#if 0
+	ServerObject * a = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(actor));
+	ServerObject * t = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(target));
+	if(! t)
+	{
+		t = a;
+	}
+	if(t != 0)
+	{
+		if(t->getClient())
+		{
+			if(a && a->getClient())
+			{
+				GameNetworkMessage const request("LagRequest");
+				t->getClient()->send(request, true);
+				int connectionServerLag = t->getClient()->getConnectionServerLag();
+				int gameServerLag = t->getClient()->getGameServerLag();
+				char lagMsg[1024];
+				snprintf(lagMsg, sizeof(lagMsg), "Lag update request sent to client.\nCurrent Lag: ConnectionServer=%d, GameServer=%d\n", connectionServerLag, gameServerLag);
+				std::string msg(lagMsg);
+				ConGenericMessage const result(msg, 0);
+				a->getClient()->send(result, true);
+			}
+		}
+	}
+#endif
+}
+
+// ----------------------------------------------------------------------
+
+static void commandExecuteKnowledgeBaseMessage (Command const &, NetworkId const &actor, NetworkId const & , Unicode::String const &params)
+{
+	UNREF(actor);
+	UNREF(params);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncEmptyMailTarget(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	size_t pos = 0;
+	std::string networkId(nextStringParm(params, pos));
+
+	NetworkId targetNetworkId(networkId);
+
+	DEBUG_REPORT_LOG(true, ("commandFuncEmptyMailTarget() - Player(%s) is emptying the mailbox of player(%s).\n", actor.getValueString().c_str(), targetNetworkId.getValueString().c_str()));
+
+	Chat::emptyMail(actor, targetNetworkId);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncSetPlayerAppearance(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &params)
+{
+	//-- Collect parameters.
+	std::string  token;
+	std::string  objectTemplateName;
+
+	bool    useTarget = false;
+	size_t  pos       = 0;
+
+	do
+	{
+		token = Unicode::toLower(nextStringParm(params, pos));
+		if (token == "-target")
+			useTarget = true;
+		else if (!token.empty())
+			objectTemplateName = token;
+	} while (!token.empty());
+
+	//-- Log attempt.
+	NetworkId subjectNetworkId = useTarget ? target: actor;
+
+	LOG("setPlayerAppearance", 
+		("commandFuncSetPlayerAppearance(): command called by actor id=[%s]: attempting to change appearance for player id=[%s], using appearance info from object template=[%s], subject=[%s]",
+		actor.getValueString().c_str(),
+		subjectNetworkId.getValueString().c_str(),
+		objectTemplateName.c_str(),
+		useTarget ? "target" : "self"
+		));
+
+	//-- Validate parameters.
+	if (subjectNetworkId == NetworkId::cms_invalid)
+	{
+		WARNING(true, ("commandFuncSetPlayerAppearance(): subjectNetworkId is invalid, useTarget=[%s]", useTarget ? "true" : "false"));
+		return;
+	}
+
+	CreatureObject *const creatureObject = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(subjectNetworkId));
+	if (!creatureObject)
+	{
+		WARNING(true, ("commandFuncSetPlayerAppearance(): subject network id=[%s] is not a CreatureObject-derived class.", subjectNetworkId.getValueString().c_str()));
+		return;
+	}
+
+	if (objectTemplateName.empty())
+	{
+		// Use the Creature's natural object template name.
+		objectTemplateName = creatureObject->getObjectTemplateName();
+	}
+	else
+	{
+		// Ensure non-default object template name refers to an existing file.
+		if (!TreeFile::exists(objectTemplateName.c_str()))
+		{
+			WARNING(true, 
+				("commandFuncSetPlayerAppearance(): could not change id=[%s] to non-default object template name=[%s]: object template does not exist",
+				subjectNetworkId.getValueString().c_str(),
+				objectTemplateName.c_str()
+				));
+			return;
+		}
+	}
+
+	//-- Get the controller, instruct it to change the appearance.
+	CreatureController *const controller = dynamic_cast<CreatureController*>(creatureObject->getController());
+	if (!controller)
+	{
+		WARNING(true, ("commandFuncSetPlayerAppearance(): subject network id=[%s] does not have a CreatureController.", subjectNetworkId.getValueString().c_str()));
+		return;
+	}
+
+	//-- Set the new appearance.
+	controller->setAppearanceFromObjectTemplate(objectTemplateName);
+}
+
+static void commandFuncRevertPlayerAppearance(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &params)
+{
+	//-- Collect parameters.
+	std::string  token;
+	std::string  objectTemplateName;
+
+	bool    useTarget = false;
+	size_t  pos       = 0;
+
+	do
+	{
+		token = Unicode::toLower(nextStringParm(params, pos));
+		if (token == "-target")
+			useTarget = true;
+		else if (!token.empty())
+			objectTemplateName = token;
+	} while (!token.empty());
+
+	//-- Log attempt.
+	NetworkId subjectNetworkId = useTarget ? target: actor;
+
+	LOG("setPlayerAppearance", 
+		("commandFuncRevertPlayerAppearance(): command called by actor id=[%s]: attempting to change appearance for player id=[%s], using appearance info from object template=[%s], subject=[%s]",
+		actor.getValueString().c_str(),
+		subjectNetworkId.getValueString().c_str(),
+		objectTemplateName.c_str(),
+		useTarget ? "target" : "self"
+		));
+
+	//-- Validate parameters.
+	if (subjectNetworkId == NetworkId::cms_invalid)
+	{
+		WARNING(true, ("commandFuncRevertPlayerAppearance(): subjectNetworkId is invalid, useTarget=[%s]", useTarget ? "true" : "false"));
+		return;
+	}
+
+	CreatureObject *const creatureObject = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(subjectNetworkId));
+	if (!creatureObject)
+	{
+		WARNING(true, ("commandFuncRevertPlayerAppearance(): subject network id=[%s] is not a CreatureObject-derived class.", subjectNetworkId.getValueString().c_str()));
+		return;
+	}
+
+	//-- Get the controller, instruct it to change the appearance.
+	CreatureController *const controller = dynamic_cast<CreatureController*>(creatureObject->getController());
+	if (!controller)
+	{
+		WARNING(true, ("commandFuncRevertPlayerAppearance(): subject network id=[%s] does not have a CreatureController.", subjectNetworkId.getValueString().c_str()));
+		return;
+	}
+
+	//-- Set the new appearance.
+	std::string const none("none");
+	controller->setAppearanceFromObjectTemplate(none);
+}
+
+//-----------------------------------------------------------------------
+
+static void commandFuncReconnectToTransferServer(Command const &, NetworkId const &, NetworkId const & , Unicode::String const &)
+{
+	GameNetworkMessage const msg("ReconnectToTransferServer");
+	GameServer::getInstance().sendToCentralServer(msg);
+}
+
+//-----------------------------------------------------------------------
+
+static void commandFuncFindFriend(Command const &, NetworkId const &actor, NetworkId const & , Unicode::String const &params)
+{
+	ServerObject * a = safe_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	if(a && a->getClient())
+	{
+		size_t pos = 0;
+		const std::string playerName = nextStringParm (params, pos);
+		CreatureObject * creatureObject = a->asCreatureObject();
+		if(creatureObject)
+		{
+			if(! playerName.empty())
+			{
+				// break the name down into its subcomponents
+				ChatAvatarId const cav(NameManager::normalizeName(playerName));
+
+				// can only find friend on the same cluster
+				bool const sameGame = (cav.gameCode.empty() || !_stricmp(cav.gameCode.c_str(), Chat::getGameCode().c_str()));
+				bool const sameCluster = (sameGame && (cav.cluster.empty() || !_stricmp(cav.cluster.c_str(), GameServer::getInstance().getClusterName().c_str())));
+
+				if (!sameGame || !sameCluster)
+				{
+					StringId stringId = StringId("ui_cmnty", "friend_location_failed_remote_name");
+					Chat::sendSystemMessage(*creatureObject, stringId, Unicode::emptyString);
+				}
+				else
+				{
+					PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(creatureObject);
+					if(playerObject)
+					{
+						playerObject->findFriend(cav.name);
+					}
+				}
+			}
+			else
+			{
+				// playerName is empty, send an error to requesting client
+				StringId stringId = StringId("ui_cmnty", "friend_location_failed_usage");
+				Chat::sendSystemMessage(*creatureObject, stringId, Unicode::emptyString);			
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncFormCommand(Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const & params)
+{
+	UNREF(target);
+
+	Unicode::UnicodeStringVector tokens;
+	IGNORE_RETURN(Unicode::tokenize (params, tokens));
+
+	if(tokens.size() == 0)
+		return;
+
+	std::string const commandStr = Unicode::wideToNarrow(tokens[0]);
+	FormManager::Command const command = static_cast<FormManager::Command>(atoi(commandStr.c_str()));
+
+	switch(command)
+	{
+		case FormManager::CREATE_OBJECT:
+		{
+			if(tokens.size() < 5)
+				return;
+
+			std::string const templateName = Unicode::wideToNarrow(tokens[1]);
+
+			std::string const & xStr = Unicode::wideToNarrow(tokens[2]);
+			std::string const & yStr = Unicode::wideToNarrow(tokens[3]);
+			std::string const & zStr = Unicode::wideToNarrow(tokens[4]);
+			std::string const & cellStr = Unicode::wideToNarrow(tokens[5]);
+			NetworkId const cellId(cellStr);
+
+			float const x = static_cast<float>(atof(xStr.c_str()));
+			float const y = static_cast<float>(atof(yStr.c_str()));
+			float const z = static_cast<float>(atof(zStr.c_str()));
+
+			//we must have an odd number of tokens left (so that the datamap has a full key->value mapping)
+			if(tokens.size() % 2 != 0)
+				return;
+
+			//TODO centralize pack/unpack
+			FormManager::UnpackedFormData dataMap;
+			std::vector<std::string> values;
+			for(int i = 6; i < static_cast<int>(tokens.size()) - 1; i += 2)
+			{
+				std::string const & key   = Unicode::wideToNarrow(tokens[static_cast<size_t>(i)]);
+				std::string const & value = Unicode::wideToNarrow(tokens[static_cast<size_t>(i + 1)]);
+				values.clear();
+				values.push_back(value);
+				dataMap[key] = values;
+			}
+
+			FormManagerServer::handleCreateObjectData(actor, templateName, Vector(x, y, z), cellId, dataMap);
+			break;
+		}
+
+		case FormManager::EDIT_OBJECT:
+		{
+			if(tokens.size() < 1)
+				return;
+
+			//we must have an even number of tokens left (so that the datamap has a full key->value mapping)
+			if(tokens.size() % 2 != 1)
+				return;
+
+			//TODO centralize pack/unpack
+			FormManager::UnpackedFormData dataMap;
+			std::vector<std::string> values;
+			for(int i = 1; i < static_cast<int>(tokens.size()) - 1; i += 2)
+			{
+				std::string const & key   = Unicode::wideToNarrow(tokens[static_cast<size_t>(i)]);
+				std::string const & value = Unicode::wideToNarrow(tokens[static_cast<size_t>(i + 1)]);
+				values.clear();
+				values.push_back(value);
+				dataMap[key] = values;
+			}
+			
+			FormManagerServer::handleEditObjectData(actor, target, dataMap);
+			break;
+		}
+
+		case FormManager::REQUEST_EDIT_OBJECT:
+		{
+			FormManagerServer::requestEditObjectDataForClient(actor, target);
+			break;
+		}
+
+		default:
+			DEBUG_FATAL(true, ("Unknown command in commandFuncFormCommand"));
+			break;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncInstallShipComponents(Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const & params)
+{
+	//params for installShipComponent are "<shipId> <slotnumber> <objId>"
+	
+	Object const * const actorObj = NetworkIdManager::getObjectById(actor);
+	ServerObject const * const actorServerObj = actorObj ? actorObj->asServerObject() : NULL;
+	CreatureObject const * const actorCreature = actorServerObj ? actorServerObj->asCreatureObject() : NULL;
+	if(!actorCreature)
+	{
+		return;
+	}
+
+	//they must be near a space terminal (if not a god)
+	Client const * const client = actorCreature->getClient();
+	if(!client)
+		return;
+	if(!client->isGod())
+	{
+		Object * const targetObj = NetworkIdManager::getObjectById(target);
+		ServerObject * const targetServerObj = targetObj ? targetObj->asServerObject() : NULL;
+		if( !targetServerObj || ((targetServerObj->getGameObjectType() != SharedObjectTemplate::GOT_terminal_space) &&
+			                     (targetServerObj->getGameObjectType() != SharedObjectTemplate::GOT_terminal_space_npe)) )
+			return;
+	}
+	else
+	{
+		Chat::sendSystemMessage(*actorCreature, Unicode::narrowToWide("Bypassing terminal check due to GOD mode."), Unicode::emptyString);
+	}
+
+	size_t pos = 0;
+	NetworkId const & shipId = nextOidParm(params, pos);
+	Object * const shipObj = NetworkIdManager::getObjectById(shipId);
+	ServerObject * const shipServerObj = shipObj ? shipObj->asServerObject() : NULL;
+	ShipObject * const ship = shipServerObj ? shipServerObj->asShipObject() : NULL;
+	if(!ship)
+		return;
+
+	ShipChassisSlotType::Type const slotType = static_cast<ShipChassisSlotType::Type const>(nextIntParm(params, pos));
+	NetworkId const & componentId = nextOidParm(params, pos);
+	Object * const componentObj = NetworkIdManager::getObjectById(componentId);
+	ServerObject * const componentServerObj = componentObj ? componentObj->asServerObject() : NULL;
+	TangibleObject * const component = componentServerObj ? componentServerObj->asTangibleObject() : NULL;
+	if(!component)
+	{
+		return;
+	}
+
+	//make sure the player can manipulate the object
+	Container::ContainerErrorCode error = Container::CEC_Success;
+	if (!actorCreature->canManipulateObject(*component, true, true, true, 16.0f, error))
+	{
+		StringId cantManipulateId("player_utility", "cannot_manipulate");
+		Chat::sendSystemMessage(*actorCreature, cantManipulateId, Unicode::emptyString);
+		return;
+	}
+
+	//make sure the object is not in a non-player modifiable slot
+	ContainedByProperty const * const containedByProperty = component->getContainedByProperty();
+	if (containedByProperty)
+	{
+		Object const * const containedByObject = containedByProperty->getContainedBy();
+		if (containedByObject)
+		{
+			SlottedContainer const * const slottedContainer = ContainerInterface::getSlottedContainer(*containedByObject);
+			if(slottedContainer)
+			{
+				SlotId const & slotId = slottedContainer->findFirstSlotIdForObject(component->getNetworkId());
+				if(slotId != SlotId::invalid)
+				{
+					if(!ContainerInterface::canPlayerManipulateSlot(slotId))
+					{
+						StringId cantManipulateId("player_utility", "cannot_manipulate_slot");		
+						Chat::sendSystemMessage(*actorCreature, cantManipulateId, Unicode::emptyString);
+						return;
+					}
+				}
+			}
+		}
+	}
+
+	IGNORE_RETURN(ship->installComponent(actor, slotType, *component));
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncUninstallShipComponents(Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const & params)
+{
+	//params for uninstallShipComponent are "<shipId> <slotnumber>"
+
+	Object * const actorObj = NetworkIdManager::getObjectById(actor);
+	ServerObject * const actorServerObj = actorObj ? actorObj->asServerObject() : NULL;
+	CreatureObject * const actorCreature = actorServerObj ? actorServerObj->asCreatureObject() : NULL;
+	if(!actorCreature)
+		return;
+	ServerObject * const actorInv = actorCreature->getInventory();
+	if(!actorInv)
+		return;
+
+	//they must be near a space terminal (if not a god)
+	Client const * const client = actorCreature->getClient();
+	if(!client)
+		return;
+	if(!client->isGod())
+	{
+		Object * const targetObj = NetworkIdManager::getObjectById(target);
+		ServerObject * const targetServerObj = targetObj ? targetObj->asServerObject() : NULL;
+		if(!targetServerObj ||
+			 ((targetServerObj->getGameObjectType() != SharedObjectTemplate::GOT_terminal_space)
+			   && (targetServerObj->getGameObjectType() != SharedObjectTemplate::GOT_terminal_space_npe)) )
+			return;
+	}
+	else
+	{
+		Chat::sendSystemMessage(*actorCreature, Unicode::narrowToWide("Bypassing terminal check due to GOD mode."), Unicode::emptyString);
+	}
+
+	ServerObject const * const actorInventoryObject = actorCreature->getInventory();
+	if(!actorInventoryObject)
+	{
+		Chat::sendSystemMessage(*actorCreature, SharedStringIds::shipcomponentinstall_noinventory, Unicode::emptyString);
+		return;
+	}
+	VolumeContainer const * const inventoryContainer = ContainerInterface::getVolumeContainer(*actorInventoryObject);
+	if(!inventoryContainer)
+	{
+		Chat::sendSystemMessage(*actorCreature, SharedStringIds::shipcomponentinstall_noinventorycontainer, Unicode::emptyString);
+		return;
+	}
+	if (inventoryContainer->getCurrentVolume() >= inventoryContainer->getTotalVolume())
+	{
+		Chat::sendSystemMessage(*actorCreature, SharedStringIds::shipcomponentinstall_inventoryfull, Unicode::emptyString);
+		return;
+	}
+
+	size_t pos = 0;
+	NetworkId const & shipId = nextOidParm(params, pos);
+	Object * const shipObj = NetworkIdManager::getObjectById(shipId);
+	ServerObject * const shipServerObj = shipObj ? shipObj->asServerObject() : NULL;
+	ShipObject * const ship = shipServerObj ? shipServerObj->asShipObject() : NULL;
+	if(!ship)
+		return;
+
+	ShipChassisSlotType::Type const slotType = static_cast<ShipChassisSlotType::Type const>(nextIntParm(params, pos));
+
+	IGNORE_RETURN(ship->uninstallComponent(actor, slotType, *actorInv));
+}
+
+
+// ----------------------------------------------------------------------
+
+static void commandFuncInsertItemIntoShipComponentSlot(Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const & params)
+{
+	//params for insertItemIntoShipComponentSlot are "<shipId> <slotnumber> <objid>"
+
+	Object * const actorObj = NetworkIdManager::getObjectById(actor);
+	ServerObject * const actorServerObj = actorObj ? actorObj->asServerObject() : NULL;
+	CreatureObject * const actorCreature = actorServerObj ? actorServerObj->asCreatureObject() : NULL;
+	if(!actorCreature)
+		return;
+
+	//they must be near a space terminal (if not a god)
+	Client const * const client = actorCreature->getClient();
+	if(!client)
+		return;
+	if(!client->isGod())
+	{
+		Object * const targetObj = NetworkIdManager::getObjectById(target);
+		ServerObject * const targetServerObj = targetObj ? targetObj->asServerObject() : NULL;
+		if(!targetServerObj || ((targetServerObj->getGameObjectType() != SharedObjectTemplate::GOT_terminal_space) &&
+			                    (targetServerObj->getGameObjectType() != SharedObjectTemplate::GOT_terminal_space_npe)) )
+			return;
+	}
+	else
+	{
+		Chat::sendSystemMessage(*actorCreature, Unicode::narrowToWide("Bypassing terminal check due to GOD mode."), Unicode::emptyString);
+	}
+
+	size_t pos = 0;
+	NetworkId const & shipId = nextOidParm(params, pos);
+	Object * const shipObj = NetworkIdManager::getObjectById(shipId);
+	ServerObject * const shipServerObj = shipObj ? shipObj->asServerObject() : NULL;
+	ShipObject * const ship = shipServerObj ? shipServerObj->asShipObject() : NULL;
+	if(!ship)
+		return;
+
+	ShipChassisSlotType::Type const slotType = static_cast<ShipChassisSlotType::Type const>(nextIntParm(params, pos));
+
+	if(!ship->isSlotInstalled(slotType))
+		return;
+
+	NetworkId const componentId = nextOidParm(params, pos);
+
+	ScriptParams trigParams;
+	trigParams.addParam(slotType);
+	trigParams.addParam(componentId);
+	trigParams.addParam(actor);
+
+	//now trigger the ship
+	IGNORE_RETURN(ship->getScriptObject()->trigAllScripts(Scripting::TRIG_SHIP_COMPONENT_ITEM_DROPPED_ON_SLOT, trigParams));
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAssociateDroidControlDeviceWithShip(Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const & params)
+{
+	//params for associateDroidControlDeviceWithShip are "<shipId> <droidControlDeviceId>"
+
+	Object const * const actorObj = NetworkIdManager::getObjectById(actor);
+	ServerObject const * const actorServerObj = actorObj ? actorObj->asServerObject() : NULL;
+	CreatureObject const * const actorCreature = actorServerObj ? actorServerObj->asCreatureObject() : NULL;
+	if (!actorCreature)
+		return;
+
+	//they must be near a space terminal (if not a god)
+	Client const * const client = actorCreature->getClient();
+	if(!client)
+		return;
+	if(!client->isGod())
+	{
+		Object * const targetObj = NetworkIdManager::getObjectById(target);
+		ServerObject * const targetServerObj = targetObj ? targetObj->asServerObject() : NULL;
+		if(!targetServerObj || ((targetServerObj->getGameObjectType() != SharedObjectTemplate::GOT_terminal_space) &&
+			                    (targetServerObj->getGameObjectType() != SharedObjectTemplate::GOT_terminal_space_npe)) )
+			return;
+	}
+	else
+	{
+		Chat::sendSystemMessage(*actorCreature, Unicode::narrowToWide("Bypassing terminal check due to GOD mode."), Unicode::emptyString);
+	}
+
+	size_t pos = 0;
+	NetworkId const & shipId = nextOidParm(params, pos);
+	Object * const shipObj = NetworkIdManager::getObjectById(shipId);
+	ServerObject * const shipServerObj = shipObj ? shipObj->asServerObject() : NULL;
+	ShipObject * const ship = shipServerObj ? shipServerObj->asShipObject() : NULL;
+	if(!ship)
+		return;
+
+	NetworkId const droidControlDeviceId = nextOidParm(params, pos);
+
+	if (!droidControlDeviceId.isValid())
+	{
+		// removing from ship
+		ship->setInstalledDroidControlDevice(NetworkId::cms_invalid);
+	}
+	else
+	{
+		// putting in ship
+		ScriptParams trigParams;
+		trigParams.addParam(actorCreature->getNetworkId());
+		trigParams.addParam(droidControlDeviceId);
+
+		//now trigger the ship
+		IGNORE_RETURN(ship->getScriptObject()->trigAllScripts(Scripting::TRIG_SHIP_TRY_TO_EQUIP_DROID_CONTROL_DEVICE_IN_SHIP, trigParams));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncServerAsteroidDataListen(Command const &, NetworkId const & actor, NetworkId const & , Unicode::String const & )
+{
+	Object const * const actorObj = NetworkIdManager::getObjectById(actor);
+	ServerObject const * const actorServerObj = actorObj ? actorObj->asServerObject() : NULL;
+	CreatureObject const * const actorCreature = actorServerObj ? actorServerObj->asCreatureObject() : NULL;
+	if(!actorCreature)
+		return;
+
+	ServerAsteroidManager::listenforServerAsteroidDebugData(actor);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncServerAsteroidDataStopListening(Command const &, NetworkId const & actor, NetworkId const & , Unicode::String const & )
+{
+	Object const * const actorObj = NetworkIdManager::getObjectById(actor);
+	ServerObject const * const actorServerObj = actorObj ? actorObj->asServerObject() : NULL;
+	CreatureObject const * const actorCreature = actorServerObj ? actorServerObj->asCreatureObject() : NULL;
+	if(!actorCreature)
+		return;
+
+	ServerAsteroidManager::endListenforServerAsteroidDebugData(actor);
+}
+
+//----------------------------------------------------------------------
+
+static void commandFuncBoosterOn(Command const &, NetworkId const & actor, NetworkId const &, Unicode::String const &)
+{
+	internalSetBoosterOnOff(actor, true);
+}
+
+//----------------------------------------------------------------------
+
+static void commandFuncBoosterOff(Command const &, NetworkId const & actor, NetworkId const &, Unicode::String const &)
+{
+	internalSetBoosterOnOff(actor, false);
+}
+
+//----------------------------------------------------------------------
+
+static void commandFuncSetFormation(Command const &, NetworkId const & actor, NetworkId const &, Unicode::String const & params)
+{
+	Object * const o = NetworkIdManager::getObjectById(actor);
+	ServerObject * const so = o ? o->asServerObject() : NULL;
+	CreatureObject * const actorCreature = so ? so->asCreatureObject() : NULL;
+	if(actorCreature)
+	{
+		GroupObject * const group = actorCreature->getGroup();
+		if(group)
+		{
+			if(group->getGroupLeaderId() == actor)
+			{
+				std::string paramsNarrow = Unicode::wideToNarrow(params);
+				if(paramsNarrow == "none")
+				{
+					group->setFormationNameCrc(Crc::crcNull);
+				}
+				else
+				{
+					if(PlayerFormationManager::isValidFormationName(paramsNarrow))
+						group->setFormationNameCrc(Crc::normalizeAndCalculate(paramsNarrow.c_str()));
+				}
+			}
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+static void commandFuncSetFormationSlot(Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const & params)
+{
+	Object * const actorObject = NetworkIdManager::getObjectById(actor);
+	ServerObject * const actorServerObject = (actorObject != 0) ? actorObject->asServerObject() : 0;
+	CreatureObject * const actorCreatureObject = (actorServerObject != 0) ? actorServerObject->asCreatureObject() : 0;
+	if ((actorCreatureObject != 0) && (actor != NetworkId::cms_invalid))
+	{
+		GroupObject * const group = actorCreatureObject->getGroup();
+		if (group)
+		{
+			if (group->getGroupLeaderId() == actor)
+			{
+				size_t pos = 0;
+				int const formationSlot = nextIntParm(params, pos);
+				if (formationSlot > -1)
+				{
+					group->setShipFormationSlotForMember(target, formationSlot);
+				}
+			}
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+static void commandFuncUnDock(Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const & params)
+{
+	Object * const object = NetworkIdManager::getObjectById(actor);
+
+	if (object != NULL)
+	{
+		ShipObject * const shipObject = ShipObject::getContainingShipObject(object->asServerObject());
+
+		if (shipObject != NULL)
+		{
+			ShipController * const shipController = dynamic_cast<ShipController *>(shipObject->getController());
+
+			if (shipController != NULL)
+			{
+				shipController->unDock();
+			}
+			else
+			{
+				WARNING(true, ("commandFuncUnDock() Undock requested on an object(%s) without a ShipController.", object->getDebugInformation().c_str()));
+			}
+		}
+		else
+		{
+			WARNING(true, ("commandFuncUnDock() Undock requested on an object(%s) contained by a NULL ShipObject.", object->getDebugInformation().c_str()));
+		}
+	}
+	else
+	{
+		WARNING(true, ("commandFuncUnDock() Undock requested on a NULL object(%s).", actor.getValueString().c_str()));
+	}
+}
+	
+//----------------------------------------------------------------------
+
+static void commandFuncLaunchIntoSpace(Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const & params)
+{
+	ServerObject * const actorServerObj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(actor));
+	CreatureObject * const actorCreature = actorServerObj != NULL ? actorServerObj->asCreatureObject() : NULL;
+	if(!actorCreature)
+	{
+		WARNING(true, ("No actorCreature in commandFuncLaunchIntoSpace"));
+		return;
+	}
+
+	if(!target.isValid())
+	{
+		StringId invalidTargetId("player_utility", "invalid_target");
+		Chat::sendSystemMessage(*actorCreature, invalidTargetId, Unicode::emptyString);
+		return;
+	}
+
+	//target must be a space terminal
+	Object const * const o = NetworkIdManager::getObjectById(target);
+	ServerObject const * const so = o ? o->asServerObject() : NULL;
+	if(!so)
+	{
+		StringId invalidTargetId("player_utility", "target_not_server_object");
+		Chat::sendSystemMessage(*actorCreature, invalidTargetId, Unicode::emptyString);
+		return;
+	}
+	if(so->getGameObjectType() != SharedObjectTemplate::GOT_terminal_space)
+	{
+		ProsePackage p;
+		p.stringId = StringId("player_utility", "not_space_terminal");
+		p.target.id = target;
+		Unicode::String oob;
+		OutOfBandPackager::pack(p, -1, oob);
+		Chat::sendSystemMessage(*actorCreature, Unicode::emptyString, oob);;
+		return;
+	}
+
+	Unicode::UnicodeStringVector tokens;
+	Unicode::tokenize (params, tokens);
+	
+	if(tokens.empty())
+	{
+		Chat::sendSystemMessage(*actorCreature, Unicode::narrowToWide("(unlocalized) No parameters."), Unicode::emptyString);
+		return;
+	}
+
+	NetworkId const shipPCDId(Unicode::wideToNarrow(tokens[0]).c_str());
+	if(!shipPCDId.isValid())
+	{
+		Chat::sendSystemMessage(*actorCreature, Unicode::narrowToWide("(unlocalized) Invalid ship."), Unicode::emptyString);
+		return;
+	}
+	Object * const terminalO = NetworkIdManager::getObjectById(target);
+	ServerObject * const terminalSO = terminalO ? terminalO->asServerObject() : NULL;
+	if(terminalSO)
+	{
+		std::vector<NetworkId> networkIds;
+
+		unsigned int tokenIndex = 1;
+
+		if(tokens.size() > tokenIndex)
+		{
+			int const numberOfNetworkIds = atoi(Unicode::wideToNarrow(tokens[tokenIndex]).c_str());
+			for (int i = 0; i < numberOfNetworkIds; ++i)
+			{
+				++tokenIndex;
+				if(tokens.size() > tokenIndex)
+				{
+					NetworkId const Id(Unicode::wideToNarrow(tokens[tokenIndex]));
+					if (Id.isValid())
+					{
+						networkIds.push_back(Id);
+					}
+				}
+			}
+		}		
+
+		++tokenIndex;
+
+		//adding an empty string is fine (it means they aren't traveling to another ground starport)
+		std::string strPointPlanetResult;
+		if(tokens.size() > tokenIndex)
+		{
+			strPointPlanetResult = Unicode::wideToNarrow(tokens[tokenIndex]);
+		}
+
+		++tokenIndex;
+
+		//adding an empty string is fine (it means they aren't traveling to another ground starport)
+		std::string strPointLocationResult;
+		if(tokens.size() > tokenIndex)
+		{
+			strPointLocationResult = Unicode::wideToNarrow(tokens[tokenIndex]);
+			std::replace (strPointLocationResult.begin (), strPointLocationResult.end (), '_', ' ');
+		}
+
+		ScriptParams params;
+		params.addParam(actor);
+		params.addParam(shipPCDId);
+		params.addParam(networkIds);
+		//adding an empty string is fine (it means they aren't traveling to another ground starport)
+		params.addParam(strPointPlanetResult.c_str());
+		//adding an empty string is fine (it means they aren't traveling to another ground starport)
+		params.addParam(strPointLocationResult.c_str());
+
+		IGNORE_RETURN(terminalSO->getScriptObject()->trigAllScripts(Scripting::TRIG_ABOUT_TO_LAUNCH_TO_SPACE, params));
+	}
+	else
+	{
+		Chat::sendSystemMessage(*actorCreature, Unicode::narrowToWide("(unlocalized) Invalid terminal"), Unicode::emptyString);
+	}
+}
+
+//----------------------------------------------------------------------
+
+static void commandFuncAcceptQuest(Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const & params)
+{
+	ServerObject * const actorServerObj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(actor));
+	CreatureObject * const actorCreature = actorServerObj != NULL ? actorServerObj->asCreatureObject() : NULL;
+	if(!actorCreature)
+	{
+		WARNING(true, ("No actorCreature in commandFuncAcceptQuest"));
+		return;
+	}
+	PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(actorCreature);
+	if(!playerObject)
+	{
+		WARNING(true, ("No playerObject in commandFuncAcceptQuest"));
+		return;
+	}
+
+	uint32 const questCrc = atoi(Unicode::wideToNarrow(params).c_str());
+	if(playerObject->getPendingRequestQuestCrc() == questCrc)
+	{
+		NetworkId const & questGiver = playerObject->getPendingRequestQuestGiver();
+		playerObject->questActivateQuest(questCrc, questGiver);
+		playerObject->setPendingRequestQuestInformation(0, NetworkId::cms_invalid);
+	}
+}
+
+//----------------------------------------------------------------------
+
+static void commandFuncReceiveReward(Command const &, NetworkId const & actor, NetworkId const & target, Unicode::String const & params)
+{
+	ServerObject * const actorServerObj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(actor));
+	CreatureObject * const actorCreature = actorServerObj != NULL ? actorServerObj->asCreatureObject() : NULL;
+	if(!actorCreature)
+	{
+		WARNING(true, ("No actorCreature in commandFuncReceiveReward"));
+		return;
+	}
+	PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(actorCreature);
+	if(!playerObject)
+	{
+		WARNING(true, ("No playerObject in commandFuncReceiveReward"));
+		return;
+	}
+
+	Unicode::UnicodeStringVector sv;
+	Unicode::tokenize (params, sv);
+	
+	if(sv.empty())
+		return;
+	uint32 const questCrc = atoi(Unicode::wideToNarrow(sv[0]).c_str());
+	std::string selectedReward;
+	if(sv.size() > 1)
+		selectedReward = Unicode::wideToNarrow(sv[1]);
+
+	if((playerObject->getPendingRequestQuestCrc() == questCrc) || playerObject->questPlayerCanClaimRewardFor(questCrc))
+	{
+		playerObject->questGrantQuestReward(questCrc, selectedReward);
+		playerObject->setPendingRequestQuestInformation(0, NetworkId::cms_invalid);
+	}
+}
+
+//----------------------------------------------------------------------
+
+static void commandFuncAbandonQuest(Command const &, NetworkId const & actor, NetworkId const & , Unicode::String const & params)
+{
+	size_t pos = 0;
+	
+	//not currently used, but can distinguish between different quest types
+	int const questSystemType = nextIntParm(params, pos);
+	UNREF(questSystemType);
+	std::string const & questName = nextStringParm(params, pos);
+
+	if(QuestManager::isQuestAbandonable(questName))
+	{
+		ServerObject * const actorServerObj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(actor));
+		CreatureObject * const actorCreature = actorServerObj != NULL ? actorServerObj->asCreatureObject() : NULL;
+		if(actorCreature)
+		{
+			PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(actorCreature);
+			if(playerObject)
+			{
+				Quest const * const q = QuestManager::getQuest(questName);
+				if(q && playerObject->questHasActiveQuest(q->getId()) && !playerObject->questHasCompletedQuest(q->getId()))
+				{
+					LOG("Quest", ("Abandon:%s abandoned quest [%s] with status [0x%08X].\n",
+						PlayerObject::getAccountDescription(actorServerObj->getClient()->getCharacterObjectId()).c_str(),
+						questName.c_str(), playerObject->questGetQuestStatus(q->getId())));
+
+					playerObject->questClearQuest(q->getId());
+				}
+			}
+		}
+	}
+}
+
+
+
+// ----------------------------------------------------------------------
+
+static void commandFuncExchangeListCredits(Command const &, NetworkId const &actor, NetworkId const &target, Unicode::String const &params)
+{
+	ServerObject * const actorServerObj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(actor));
+	CreatureObject * const actorCreature = actorServerObj != NULL ? actorServerObj->asCreatureObject() : NULL;
+	if(!actorCreature)
+	{
+		WARNING(true, ("No actorCreature in commandFuncReceiveReward"));
+		return;
+	}
+	PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(actorCreature);
+	if(!playerObject)
+	{
+		WARNING(true, ("No playerObject in commandFuncReceiveReward"));
+		return;
+	}
+
+	Unicode::UnicodeStringVector sv;
+	Unicode::tokenize (params, sv);
+	
+	if(sv.empty())
+		return;
+	uint32 const credits = (uint32)atoi(Unicode::wideToNarrow(sv[0]).c_str());
+	if ( credits <= 0 )
+		return;
+
+
+	char message[512];
+	sprintf(message,"Listing %ld credits on station exchange.", credits);
+	Chat::sendSystemMessage(*actorCreature, Unicode::narrowToWide(message), Unicode::emptyString);
+
+
+	ExchangeListCreditsMessage const msg(actor, credits, GameServer::getInstance().getProcessId());
+        GameServer::getInstance().sendToCentralServer(msg);
+}
+
+//-----------------------------------------------------------------------
+
+static void commandFuncSquelch(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	const CreatureObject * gm = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	if (gm)
+	{
+		const Client * gmClient = gm->getClient();
+		if (gmClient)
+		{
+			char buffer[2048];
+			if (!target.isValid())
+			{
+				ConGenericMessage const msg("Error! No target specified for /squelch command.", 0);
+				gmClient->send(msg, true);
+			}
+			else
+			{
+				ServerObject * so = dynamic_cast<ServerObject *>(NetworkIdManager::getObjectById(target));
+				if (!so)
+				{
+					snprintf(buffer, sizeof(buffer)-1, "Error! Cannot find object for %s", target.getValueString().c_str());
+					buffer[sizeof(buffer)-1] = '\0';
+					ConGenericMessage const msg(buffer, 0);
+					gmClient->send(msg, true);
+				}
+				else
+				{
+					CreatureObject * c = so->asCreatureObject();
+					if (!c)
+					{
+						snprintf(buffer, sizeof(buffer)-1, "Error! %s (%s) is not a creature object", target.getValueString().c_str(), Unicode::wideToNarrow(so->getAssignedObjectName()).c_str());
+						buffer[sizeof(buffer)-1] = '\0';
+						ConGenericMessage const msg(buffer, 0);
+						gmClient->send(msg, true);
+					}
+					else
+					{
+						PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+						if (!p)
+						{
+							snprintf(buffer, sizeof(buffer)-1, "Error! %s (%s) is not a player object", target.getValueString().c_str(), Unicode::wideToNarrow(so->getAssignedObjectName()).c_str());
+							buffer[sizeof(buffer)-1] = '\0';
+							ConGenericMessage const msg(buffer, 0);
+							gmClient->send(msg, true);
+						}
+						else if (p->getSecondsUntilUnsquelched() < 0)
+						{
+							snprintf(buffer, sizeof(buffer)-1, "Error! %s (%s) is already squelched", target.getValueString().c_str(), Unicode::wideToNarrow(so->getAssignedObjectName()).c_str());
+							buffer[sizeof(buffer)-1] = '\0';
+							ConGenericMessage const msg(buffer, 0);
+							gmClient->send(msg, true);
+						}
+						else
+						{
+							snprintf(buffer, sizeof(buffer)-1, "Squelching %s (%s)", target.getValueString().c_str(), Unicode::wideToNarrow(so->getAssignedObjectName()).c_str());
+							buffer[sizeof(buffer)-1] = '\0';
+							ConGenericMessage const msg(buffer, 0);
+							gmClient->send(msg, true);
+
+							p->squelch(gm->getNetworkId(), Unicode::wideToNarrow(gm->getAssignedObjectName()), -1);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+static void commandFuncUnsquelch(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	const CreatureObject * gm = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	if (gm)
+	{
+		const Client * gmClient = gm->getClient();
+		if (gmClient)
+		{
+			char buffer[2048];
+			if (!target.isValid())
+			{
+				ConGenericMessage const msg("Error! No target specified for /unsquelch command.", 0);
+				gmClient->send(msg, true);
+			}
+			else
+			{
+				ServerObject * so = dynamic_cast<ServerObject *>(NetworkIdManager::getObjectById(target));
+				if (!so)
+				{
+					snprintf(buffer, sizeof(buffer)-1, "Error! Cannot find object for %s", target.getValueString().c_str());
+					buffer[sizeof(buffer)-1] = '\0';
+					ConGenericMessage const msg(buffer, 0);
+					gmClient->send(msg, true);
+				}
+				else
+				{
+					CreatureObject * c = so->asCreatureObject();
+					if (!c)
+					{
+						snprintf(buffer, sizeof(buffer)-1, "Error! %s (%s) is not a creature object", target.getValueString().c_str(), Unicode::wideToNarrow(so->getAssignedObjectName()).c_str());
+						buffer[sizeof(buffer)-1] = '\0';
+						ConGenericMessage const msg(buffer, 0);
+						gmClient->send(msg, true);
+					}
+					else
+					{
+						PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+						if (!p)
+						{
+							snprintf(buffer, sizeof(buffer)-1, "Error! %s (%s) is not a player object", target.getValueString().c_str(), Unicode::wideToNarrow(so->getAssignedObjectName()).c_str());
+							buffer[sizeof(buffer)-1] = '\0';
+							ConGenericMessage const msg(buffer, 0);
+							gmClient->send(msg, true);
+						}
+						else if (p->getSecondsUntilUnsquelched() == 0)
+						{
+							snprintf(buffer, sizeof(buffer)-1, "Error! %s (%s) is not currently squelched", target.getValueString().c_str(), Unicode::wideToNarrow(so->getAssignedObjectName()).c_str());
+							buffer[sizeof(buffer)-1] = '\0';
+							ConGenericMessage const msg(buffer, 0);
+							gmClient->send(msg, true);
+						}
+						else
+						{
+							snprintf(buffer, sizeof(buffer)-1, "Unsquelching %s (%s)", target.getValueString().c_str(), Unicode::wideToNarrow(so->getAssignedObjectName()).c_str());
+							buffer[sizeof(buffer)-1] = '\0';
+							ConGenericMessage const msg(buffer, 0);
+							gmClient->send(msg, true);
+
+							p->unsquelch();
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+static void commandFuncGrantWarden(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	const CreatureObject * gm = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	if (gm)
+	{
+		const Client * gmClient = gm->getClient();
+		if (gmClient)
+		{
+			char buffer[2048];
+			if (!target.isValid())
+			{
+				ConGenericMessage const msg("Error! No target specified for /grantWarden command.", 0);
+				gmClient->send(msg, true);
+			}
+			else
+			{
+				ServerObject * so = dynamic_cast<ServerObject *>(NetworkIdManager::getObjectById(target));
+				if (!so)
+				{
+					snprintf(buffer, sizeof(buffer)-1, "Error! Cannot find object for %s", target.getValueString().c_str());
+					buffer[sizeof(buffer)-1] = '\0';
+					ConGenericMessage const msg(buffer, 0);
+					gmClient->send(msg, true);
+				}
+				else
+				{
+					CreatureObject * c = so->asCreatureObject();
+					if (!c)
+					{
+						snprintf(buffer, sizeof(buffer)-1, "Error! %s (%s) is not a creature object", target.getValueString().c_str(), Unicode::wideToNarrow(so->getAssignedObjectName()).c_str());
+						buffer[sizeof(buffer)-1] = '\0';
+						ConGenericMessage const msg(buffer, 0);
+						gmClient->send(msg, true);
+					}
+					else
+					{
+						PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+						if (!p)
+						{
+							snprintf(buffer, sizeof(buffer)-1, "Error! %s (%s) is not a player object", target.getValueString().c_str(), Unicode::wideToNarrow(so->getAssignedObjectName()).c_str());
+							buffer[sizeof(buffer)-1] = '\0';
+							ConGenericMessage const msg(buffer, 0);
+							gmClient->send(msg, true);
+						}
+						else if (p->isWarden())
+						{
+							snprintf(buffer, sizeof(buffer)-1, "Error! %s (%s) is already a warden", target.getValueString().c_str(), Unicode::wideToNarrow(so->getAssignedObjectName()).c_str());
+							buffer[sizeof(buffer)-1] = '\0';
+							ConGenericMessage const msg(buffer, 0);
+							gmClient->send(msg, true);
+						}
+						else
+						{
+							snprintf(buffer, sizeof(buffer)-1, "Granting warden to %s (%s)", target.getValueString().c_str(), Unicode::wideToNarrow(so->getAssignedObjectName()).c_str());
+							buffer[sizeof(buffer)-1] = '\0';
+							ConGenericMessage const msg(buffer, 0);
+							gmClient->send(msg, true);
+
+							p->setPriviledgedTitle(static_cast<int8>(PlayerDataPriviledgedTitle::Warden));
+
+							LOG("CustomerService", ("Warden:%s grantWarden to %s", PlayerObject::getAccountDescription(gm).c_str(), p->getAccountDescription().c_str()));
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+static void commandFuncRevokeWarden(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	const CreatureObject * gm = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	if (gm)
+	{
+		const Client * gmClient = gm->getClient();
+		if (gmClient)
+		{
+			char buffer[2048];
+			if (!target.isValid())
+			{
+				ConGenericMessage const msg("Error! No target specified for /revokeWarden command.", 0);
+				gmClient->send(msg, true);
+			}
+			else
+			{
+				ServerObject * so = dynamic_cast<ServerObject *>(NetworkIdManager::getObjectById(target));
+				if (!so)
+				{
+					snprintf(buffer, sizeof(buffer)-1, "Error! Cannot find object for %s", target.getValueString().c_str());
+					buffer[sizeof(buffer)-1] = '\0';
+					ConGenericMessage const msg(buffer, 0);
+					gmClient->send(msg, true);
+				}
+				else
+				{
+					CreatureObject * c = so->asCreatureObject();
+					if (!c)
+					{
+						snprintf(buffer, sizeof(buffer)-1, "Error! %s (%s) is not a creature object", target.getValueString().c_str(), Unicode::wideToNarrow(so->getAssignedObjectName()).c_str());
+						buffer[sizeof(buffer)-1] = '\0';
+						ConGenericMessage const msg(buffer, 0);
+						gmClient->send(msg, true);
+					}
+					else
+					{
+						PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+						if (!p)
+						{
+							snprintf(buffer, sizeof(buffer)-1, "Error! %s (%s) is not a player object", target.getValueString().c_str(), Unicode::wideToNarrow(so->getAssignedObjectName()).c_str());
+							buffer[sizeof(buffer)-1] = '\0';
+							ConGenericMessage const msg(buffer, 0);
+							gmClient->send(msg, true);
+						}
+						else if (!p->isWarden())
+						{
+							snprintf(buffer, sizeof(buffer)-1, "Error! %s (%s) is not a warden", target.getValueString().c_str(), Unicode::wideToNarrow(so->getAssignedObjectName()).c_str());
+							buffer[sizeof(buffer)-1] = '\0';
+							ConGenericMessage const msg(buffer, 0);
+							gmClient->send(msg, true);
+						}
+						else
+						{
+							snprintf(buffer, sizeof(buffer)-1, "Revoking warden from %s (%s)", target.getValueString().c_str(), Unicode::wideToNarrow(so->getAssignedObjectName()).c_str());
+							buffer[sizeof(buffer)-1] = '\0';
+							ConGenericMessage const msg(buffer, 0);
+							gmClient->send(msg, true);
+
+							p->setPriviledgedTitle(static_cast<int8>(PlayerDataPriviledgedTitle::NormalPlayer));
+
+							LOG("CustomerService", ("Warden:%s revokeWarden from %s", PlayerObject::getAccountDescription(gm).c_str(), p->getAccountDescription().c_str()));
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+static void commandFuncSpammer(Command const &, NetworkId const &actor, NetworkId const & targetForCommand, Unicode::String const &params)
+{
+	NetworkId target = targetForCommand;
+	const CreatureObject * gm = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	if (gm)
+	{
+		const Client * gmClient = gm->getClient();
+		if (gmClient)
+		{
+			// check warden permission first
+			const PlayerObject * gmPlayerObject = PlayerCreatureController::getPlayerObject(gm);
+			if (!gmPlayerObject || !gmPlayerObject->isWarden())
+			{
+				Chat::sendSystemMessage(*gm, StringId("warden", "not_authorized"), Unicode::emptyString);
+				return;
+			}
+
+			// check to see if warden functionality is enabled
+			if (!ConfigServerGame::getEnableWarden())
+			{
+				Chat::sendSystemMessage(*gm, StringId("warden", "warden_functionality_disabled"), Unicode::emptyString);
+				return;
+			}
+
+			// check for valid target
+			NetworkId parsedNetworkId;
+			if (!target.isValid())
+			{
+				// check to see if a target name was specified, and see
+				// if that resolves into a player character in the galaxy
+				if (params.empty())
+				{
+					Chat::sendSystemMessage(*gm, StringId("warden", "no_target"), Unicode::emptyString);
+					return;
+				}
+				else
+				{
+					parsedNetworkId = NameManager::getInstance().getPlayerId(Unicode::wideToNarrow(Unicode::toLower(params)));
+					if (!parsedNetworkId.isValid())
+					{
+						Chat::sendSystemMessage(*gm, StringId("warden", "invalid_target"), Unicode::emptyString);
+						return;
+					}
+					else
+					{
+						target = parsedNetworkId;
+					}
+				}
+			}
+
+			ServerObject * so = dynamic_cast<ServerObject *>(NetworkIdManager::getObjectById(target));
+			if (!so)
+			{
+				if (parsedNetworkId.isValid())
+				{
+					// send a messageTo to the target to do apply the /spammer operation
+					char buffer[1024];
+					snprintf(buffer, sizeof(buffer)-1, "%s %s", actor.getValueString().c_str(), Unicode::wideToNarrow(gm->getAssignedObjectName()).c_str());
+					buffer[sizeof(buffer)-1] = '\0';
+
+					MessageToQueue::getInstance().sendMessageToC(parsedNetworkId,
+						"C++SpammerReq",
+						buffer,
+						0,
+						false,
+						actor,
+						"C++SpammerRspTargetNotFound");
+				}
+				else
+				{
+					Chat::sendSystemMessage(*gm, StringId("warden", "invalid_target"), Unicode::emptyString);
+				}
+
+				return;
+			}
+
+			CreatureObject * c = so->asCreatureObject();
+			if (!c)
+			{
+				Chat::sendSystemMessage(*gm, StringId("warden", "invalid_target"), Unicode::emptyString);
+				return;
+			}
+
+			PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+			if (!p)
+			{
+				Chat::sendSystemMessage(*gm, StringId("warden", "invalid_target"), Unicode::emptyString);
+				return;
+			}
+
+			// on a session-authenticated cluster, cannot /spammer a secured login character
+			if (so->getClient() && so->getClient()->isGodValidated())
+			{
+				if (!ConfigServerGame::getAdminGodToAll() && !ConfigServerGame::getEnableWardenCanSquelchSecuredLogin())
+				{
+					ProsePackage prosePackage;
+					prosePackage.stringId = StringId("warden", "cannot_spammer_target");
+					prosePackage.target.str = so->getAssignedObjectName();
+					Chat::sendSystemMessage(*gm, prosePackage);
+					return;
+				}
+			}
+
+			// cannot /spammer self
+			if (target == actor)
+			{
+				ProsePackage prosePackage;
+				prosePackage.stringId = StringId("warden", "cannot_spammer_target");
+				prosePackage.target.str = so->getAssignedObjectName();
+				Chat::sendSystemMessage(*gm, prosePackage);
+				return;
+			}
+
+			// cannot /spammer a target that is already squelched
+			if (p->getSecondsUntilUnsquelched() != 0)
+			{
+				ProsePackage prosePackage;
+				prosePackage.stringId = StringId("warden", "cannot_spammer_target");
+				prosePackage.target.str = so->getAssignedObjectName();
+				Chat::sendSystemMessage(*gm, prosePackage);
+				return;
+			}
+
+			// do it
+			p->squelch(actor, Unicode::wideToNarrow(gm->getAssignedObjectName()), ConfigServerGame::getWardenSquelchDurationSeconds());
+			ReportManager::addReport(gm->getAssignedObjectFirstName(), actor, so->getAssignedObjectFirstName(), target, std::string("Warden"));
+
+			// log it
+			LOG("CustomerService", ("Warden:%s has spammer %s", PlayerObject::getAccountDescription(gm).c_str(), p->getAccountDescription().c_str()));
+
+			// display confirmation message
+			ProsePackage prosePackage;
+			prosePackage.stringId = StringId("warden", "confirm_spammer");
+			prosePackage.target.str = so->getAssignedObjectName();
+			Chat::sendSystemMessage(*gm, prosePackage);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+static void commandFuncUnspammer(Command const &, NetworkId const &actor, NetworkId const & targetForCommand, Unicode::String const &params)
+{
+	NetworkId target = targetForCommand;
+	const CreatureObject * gm = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	if (gm)
+	{
+		const Client * gmClient = gm->getClient();
+		if (gmClient)
+		{
+			// check warden permission first
+			const PlayerObject * gmPlayerObject = PlayerCreatureController::getPlayerObject(gm);
+			if (!gmPlayerObject || !gmPlayerObject->isWarden())
+			{
+				Chat::sendSystemMessage(*gm, StringId("warden", "not_authorized"), Unicode::emptyString);
+				return;
+			}
+
+			// check for valid target
+			NetworkId parsedNetworkId;
+			if (!target.isValid())
+			{
+				// check to see if a target name was specified, and see
+				// if that resolves into a player character in the galaxy
+				if (params.empty())
+				{
+					Chat::sendSystemMessage(*gm, StringId("warden", "no_target"), Unicode::emptyString);
+					return;
+				}
+				else
+				{
+					parsedNetworkId = NameManager::getInstance().getPlayerId(Unicode::wideToNarrow(Unicode::toLower(params)));
+					if (!parsedNetworkId.isValid())
+					{
+						Chat::sendSystemMessage(*gm, StringId("warden", "invalid_target"), Unicode::emptyString);
+						return;
+					}
+					else
+					{
+						target = parsedNetworkId;
+					}
+				}
+			}
+
+			ServerObject * so = dynamic_cast<ServerObject *>(NetworkIdManager::getObjectById(target));
+			if (!so)
+			{
+				if (parsedNetworkId.isValid())
+				{
+					// send a messageTo to the target to do apply the /unspammer operation
+					MessageToQueue::getInstance().sendMessageToC(parsedNetworkId,
+						"C++UnspammerReq",
+						actor.getValueString(),
+						0,
+						false,
+						actor,
+						"C++UnspammerRspTargetNotFound");
+				}
+				else
+				{
+					Chat::sendSystemMessage(*gm, StringId("warden", "invalid_target"), Unicode::emptyString);
+				}
+
+				return;
+			}
+
+			CreatureObject * c = so->asCreatureObject();
+			if (!c)
+			{
+				Chat::sendSystemMessage(*gm, StringId("warden", "invalid_target"), Unicode::emptyString);
+				return;
+			}
+
+			PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+			if (!p)
+			{
+				Chat::sendSystemMessage(*gm, StringId("warden", "invalid_target"), Unicode::emptyString);
+				return;
+			}
+
+			// cannot /unspammer a target that is not currently /spammer(ed)
+			if (p->getSecondsUntilUnsquelched() <= 0)
+			{
+				ProsePackage prosePackage;
+				prosePackage.stringId = StringId("warden", "cannot_unspammer_target");
+				prosePackage.target.str = so->getAssignedObjectName();
+				Chat::sendSystemMessage(*gm, prosePackage);
+				return;
+			}
+
+			// can only /unspammer target that I /spammer(ed)
+			if (p->getSquelchedById() != actor)
+			{
+				ProsePackage prosePackage;
+				prosePackage.stringId = StringId("warden", "cannot_unspammer_target");
+				prosePackage.target.str = so->getAssignedObjectName();
+				Chat::sendSystemMessage(*gm, prosePackage);
+				return;
+			}
+
+			// do it
+			p->unsquelch();
+
+			// log it
+			LOG("CustomerService", ("Warden:%s has unspammer %s", PlayerObject::getAccountDescription(gm).c_str(), p->getAccountDescription().c_str()));
+
+			// display confirmation message
+			ProsePackage prosePackage;
+			prosePackage.stringId = StringId("warden", "confirm_unspammer");
+			prosePackage.target.str = so->getAssignedObjectName();
+			Chat::sendSystemMessage(*gm, prosePackage);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+static void commandFuncDeputizeWarden(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	const CreatureObject * gm = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	if (gm)
+	{
+		const Client * gmClient = gm->getClient();
+		if (gmClient)
+		{
+			// check warden permission first
+			const PlayerObject * gmPlayerObject = PlayerCreatureController::getPlayerObject(gm);
+			if (!gmPlayerObject || !gmPlayerObject->isWarden())
+			{
+				Chat::sendSystemMessage(*gm, StringId("warden", "not_authorized"), Unicode::emptyString);
+				return;
+			}
+
+			// check to see if warden functionality is enabled
+			if (!ConfigServerGame::getEnableWarden())
+			{
+				Chat::sendSystemMessage(*gm, StringId("warden", "warden_functionality_disabled"), Unicode::emptyString);
+				return;
+			}
+
+			// check to see if wardens are allowed to deputize other wardens
+			if (!ConfigServerGame::getEnableWardenToDeputizeWarden())
+			{
+				Chat::sendSystemMessage(*gm, StringId("warden", "not_authorized"), Unicode::emptyString);
+				return;
+			}
+
+			// check for valid target
+			NetworkId parsedNetworkId = target;
+			if (!parsedNetworkId.isValid())
+			{
+				// check to see if a target name was specified, and see
+				// if that resolves into a player character in the galaxy
+				if (params.empty())
+				{
+					Chat::sendSystemMessage(*gm, StringId("warden", "cannot_deputize"), Unicode::emptyString);
+					return;
+				}
+				else
+				{
+					parsedNetworkId = NameManager::getInstance().getPlayerId(Unicode::wideToNarrow(Unicode::toLower(params)));
+					if (!parsedNetworkId.isValid())
+					{
+						Chat::sendSystemMessage(*gm, StringId("warden", "cannot_deputize"), Unicode::emptyString);
+						return;
+					}
+				}
+			}
+
+			// cannot deputize self
+			if (parsedNetworkId == gm->getNetworkId())
+			{
+				Chat::sendSystemMessage(*gm, StringId("warden", "cannot_deputize"), Unicode::emptyString);
+				return;
+			}
+
+			// send a messageTo to the target to complete the deputize process
+			char buffer[1024];
+			snprintf(buffer, sizeof(buffer)-1, "%s|%lu", gm->getNetworkId().getValueString().c_str(), gmPlayerObject->getStationId());
+			buffer[sizeof(buffer)-1] = '\0';
+
+			MessageToQueue::getInstance().sendMessageToC(parsedNetworkId,
+				"C++DeputizeWardenReq",
+				buffer,
+				0,
+				false,
+				actor,
+				"C++DeputizeWardenRspCannotDeputize");
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+static void commandFuncUndeputizeWarden(Command const &, NetworkId const &actor, NetworkId const & target, Unicode::String const &params)
+{
+	const CreatureObject * gm = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	if (gm)
+	{
+		const Client * gmClient = gm->getClient();
+		if (gmClient)
+		{
+			// check warden permission first
+			const PlayerObject * gmPlayerObject = PlayerCreatureController::getPlayerObject(gm);
+			if (!gmPlayerObject || !gmPlayerObject->isWarden())
+			{
+				Chat::sendSystemMessage(*gm, StringId("warden", "not_authorized"), Unicode::emptyString);
+				return;
+			}
+
+			// check for valid target
+			NetworkId parsedNetworkId = target;
+			if (!parsedNetworkId.isValid())
+			{
+				// check to see if a target name was specified, and see
+				// if that resolves into a player character in the galaxy
+				if (params.empty())
+				{
+					Chat::sendSystemMessage(*gm, StringId("warden", "cannot_undeputize"), Unicode::emptyString);
+					return;
+				}
+				else
+				{
+					parsedNetworkId = NameManager::getInstance().getPlayerId(Unicode::wideToNarrow(Unicode::toLower(params)));
+					if (!parsedNetworkId.isValid())
+					{
+						Chat::sendSystemMessage(*gm, StringId("warden", "cannot_undeputize"), Unicode::emptyString);
+						return;
+					}
+				}
+			}
+
+			// cannot undeputize self
+			if (parsedNetworkId == gm->getNetworkId())
+			{
+				Chat::sendSystemMessage(*gm, StringId("warden", "cannot_undeputize"), Unicode::emptyString);
+				return;
+			}
+
+			// send a messageTo to the target to complete the undeputize process
+			char buffer[1024];
+			snprintf(buffer, sizeof(buffer)-1, "%s|%lu", gm->getNetworkId().getValueString().c_str(), gmPlayerObject->getStationId());
+			buffer[sizeof(buffer)-1] = '\0';
+
+			MessageToQueue::getInstance().sendMessageToC(parsedNetworkId,
+				"C++UndeputizeWardenReq",
+				buffer,
+				0,
+				false,
+				actor,
+				"C++UndeputizeWardenRspCannotUndeputize");
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+static void commandFuncRemoveBuff(Command const &, NetworkId const &actor, NetworkId const & , Unicode::String const &params)
+{
+	CreatureObject * player = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	if (player)
+	{
+		size_t pos = 0;
+		int32 const buffCrc = nextIntParm(params, pos);
+		if (buffCrc && BuffManager::getIsBuffPlayerRemovable(buffCrc))
+		{
+			player->removeBuff(buffCrc);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+static void commandFuncOccupyUnlockedSlot(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &)
+{
+	CreatureObject * gm = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	PlayerObject const * const gmPlayerObject = PlayerCreatureController::getPlayerObject(gm);
+	if (gm && gmPlayerObject)
+	{
+		const Client * gmClient = gm->getClient();
+		if (gmClient)
+		{
+			// check to see if /occupyUnlockedSlot is enabled
+			if (!ConfigServerGame::getEnableOccupyUnlockedSlotCommand())
+			{
+				Chat::sendSystemMessage(*gm, StringId("unlocked_slot", "occupy_unlocked_slot_command_disabled"), Unicode::emptyString);
+				return;
+			}
+
+			// check to see if the account currently has an unoccupied unlocked slot
+			if (!gmClient->getHasUnoccupiedJediSlot())
+			{
+				Chat::sendSystemMessage(*gm, StringId("unlocked_slot", "occupy_unlocked_slot_command_account_has_no_unoccupied_unlocked_slot"), Unicode::emptyString);
+				return;
+			}
+
+			// already unlocked slot character
+			if (gmClient->getIsJediSlotCharacter())
+			{
+				Chat::sendSystemMessage(*gm, StringId("unlocked_slot", "occupy_unlocked_slot_command_already_unlocked_character"), Unicode::emptyString);
+				return;
+			}
+
+			// check to see if there is a cooldown is in effect for the command
+			int const timeNow = static_cast<int>(::time(NULL));
+			if (!gmClient->isGod() && gm->getObjVars().hasItem("timeNextOccupyVacateUnlockedSlotCommandAllowed") && (gm->getObjVars().getType("timeNextOccupyVacateUnlockedSlotCommandAllowed") == DynamicVariable::INT))
+			{
+				int timeNextOccupyVacateUnlockedSlotCommandAllowed = 0;
+				if (gm->getObjVars().getItem("timeNextOccupyVacateUnlockedSlotCommandAllowed", timeNextOccupyVacateUnlockedSlotCommandAllowed))
+				{
+					if (timeNextOccupyVacateUnlockedSlotCommandAllowed > timeNow)
+					{
+						ProsePackage prosePackage;
+						prosePackage.stringId = StringId("unlocked_slot", "occupy_unlocked_slot_command_too_fast");
+						prosePackage.target.str = Unicode::narrowToWide(CalendarTime::convertSecondsToHMS(static_cast<unsigned int>(timeNextOccupyVacateUnlockedSlotCommandAllowed - timeNow)));
+						Chat::sendSystemMessage(*gm, prosePackage);
+
+						return;
+					}
+				}
+			}
+
+			// CS log the request
+			LOG("CustomerService",("JediUnlockedSlot:%s requesting OccupyUnlockedSlot", PlayerObject::getAccountDescription(gm).c_str()));
+
+			// send off request to LoginServer to make this character occupy the unlocked slot
+			GenericValueTypeMessage<std::pair<std::pair<uint32, NetworkId>, uint32> > const occupyUnlockedSlotReq("OccupyUnlockedSlotReq", std::make_pair(std::make_pair(static_cast<uint32>(gmPlayerObject->getStationId()), actor), GameServer::getInstance().getProcessId()));
+			GameServer::getInstance().sendToCentralServer(occupyUnlockedSlotReq);
+
+			// set cooldown
+			if (!gmClient->isGod())
+			{
+				IGNORE_RETURN(gm->setObjVarItem("timeNextOccupyVacateUnlockedSlotCommandAllowed", (timeNow + ConfigServerGame::getOccupyVacateUnlockedSlotCommandCooldownSeconds())));
+			}
+
+			// display "wait for reply" message
+			ProsePackage prosePackage;
+			prosePackage.stringId = StringId("unlocked_slot", "occupy_unlocked_slot_wait_for_reply");
+			prosePackage.target.str = Unicode::narrowToWide(CalendarTime::convertSecondsToHMS(static_cast<unsigned int>(ConfigServerGame::getOccupyVacateUnlockedSlotCommandCooldownSeconds())));
+			Chat::sendSystemMessage(*gm, prosePackage);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+static void commandFuncVacateUnlockedSlot(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &)
+{
+	CreatureObject * gm = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	PlayerObject const * const gmPlayerObject = PlayerCreatureController::getPlayerObject(gm);
+	if (gm && gmPlayerObject)
+	{
+		const Client * gmClient = gm->getClient();
+		if (gmClient)
+		{
+			// check to see if /vacateUnlockedSlot is enabled
+			if (!ConfigServerGame::getEnableVacateUnlockedSlotCommand())
+			{
+				Chat::sendSystemMessage(*gm, StringId("unlocked_slot", "vacate_unlocked_slot_command_disabled"), Unicode::emptyString);
+				return;
+			}
+
+			// check to see if this character is an unlocked slot character
+			if (!gmClient->getIsJediSlotCharacter())
+			{
+				Chat::sendSystemMessage(*gm, StringId("unlocked_slot", "vacate_unlocked_slot_command_not_unlocked_character"), Unicode::emptyString);
+				return;
+			}
+
+			// check to see if there is a cooldown is in effect for the command
+			int const timeNow = static_cast<int>(::time(NULL));
+			if (!gmClient->isGod() && gm->getObjVars().hasItem("timeNextOccupyVacateUnlockedSlotCommandAllowed") && (gm->getObjVars().getType("timeNextOccupyVacateUnlockedSlotCommandAllowed") == DynamicVariable::INT))
+			{
+				int timeNextOccupyVacateUnlockedSlotCommandAllowed = 0;
+				if (gm->getObjVars().getItem("timeNextOccupyVacateUnlockedSlotCommandAllowed", timeNextOccupyVacateUnlockedSlotCommandAllowed))
+				{
+					if (timeNextOccupyVacateUnlockedSlotCommandAllowed > timeNow)
+					{
+						ProsePackage prosePackage;
+						prosePackage.stringId = StringId("unlocked_slot", "vacate_unlocked_slot_command_too_fast");
+						prosePackage.target.str = Unicode::narrowToWide(CalendarTime::convertSecondsToHMS(static_cast<unsigned int>(timeNextOccupyVacateUnlockedSlotCommandAllowed - timeNow)));
+						Chat::sendSystemMessage(*gm, prosePackage);
+
+						return;
+					}
+				}
+			}
+
+			// CS log the request
+			LOG("CustomerService",("JediUnlockedSlot:%s requesting VacateUnlockedSlot", PlayerObject::getAccountDescription(gm).c_str()));
+
+			// send off request to LoginServer to make this character vacate the unlocked slot
+			GenericValueTypeMessage<std::pair<std::pair<uint32, NetworkId>, uint32> > const vacateUnlockedSlotReq("VacateUnlockedSlotReq", std::make_pair(std::make_pair(static_cast<uint32>(gmPlayerObject->getStationId()), actor), GameServer::getInstance().getProcessId()));
+			GameServer::getInstance().sendToCentralServer(vacateUnlockedSlotReq);
+
+			// set cooldown
+			if (!gmClient->isGod())
+			{
+				IGNORE_RETURN(gm->setObjVarItem("timeNextOccupyVacateUnlockedSlotCommandAllowed", (timeNow + ConfigServerGame::getOccupyVacateUnlockedSlotCommandCooldownSeconds())));
+			}
+
+			// display "wait for reply" message
+			ProsePackage prosePackage;
+			prosePackage.stringId = StringId("unlocked_slot", "vacate_unlocked_slot_wait_for_reply");
+			prosePackage.target.str = Unicode::narrowToWide(CalendarTime::convertSecondsToHMS(static_cast<unsigned int>(ConfigServerGame::getOccupyVacateUnlockedSlotCommandCooldownSeconds())));
+			Chat::sendSystemMessage(*gm, prosePackage);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+static void commandFuncSwapUnlockedSlot(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	CreatureObject * gm = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(actor));
+	PlayerObject const * const gmPlayerObject = PlayerCreatureController::getPlayerObject(gm);
+	if (gm && gmPlayerObject)
+	{
+		const Client * gmClient = gm->getClient();
+		if (gmClient)
+		{
+			// check to see if /swapUnlockedSlot is enabled
+			if (!ConfigServerGame::getEnableSwapUnlockedSlotCommand())
+			{
+				Chat::sendSystemMessage(*gm, StringId("unlocked_slot", "swap_unlocked_slot_command_disabled"), Unicode::emptyString);
+				return;
+			}
+
+			// check to see if this character is an unlocked slot character
+			if (!gmClient->getIsJediSlotCharacter())
+			{
+				Chat::sendSystemMessage(*gm, StringId("unlocked_slot", "swap_unlocked_slot_command_not_unlocked_character"), Unicode::emptyString);
+				return;
+			}
+
+			// check to see if a target character name is specified
+			if (params.empty())
+			{
+				Chat::sendSystemMessage(*gm, StringId("unlocked_slot", "swap_unlocked_slot_command_no_params"), Unicode::emptyString);
+				return;
+			}
+
+			// check to see if a valid target character name is specified
+			NetworkId const parsedNetworkId = NameManager::getInstance().getPlayerId(Unicode::wideToNarrow(Unicode::toLower(params)));
+			if (!parsedNetworkId.isValid())
+			{
+				Chat::sendSystemMessage(*gm, StringId("unlocked_slot", "swap_unlocked_slot_command_invalid_target"), Unicode::emptyString);
+				return;
+			}
+
+			// cannot swap with yourself
+			if (parsedNetworkId == actor)
+			{
+				Chat::sendSystemMessage(*gm, StringId("unlocked_slot", "swap_unlocked_slot_command_target_is_already_unlocked_character"), Unicode::emptyString);
+				return;
+			}
+
+			// check to see if there is a cooldown is in effect for the command
+			int const timeNow = static_cast<int>(::time(NULL));
+			if (!gmClient->isGod() && gm->getObjVars().hasItem("timeNextOccupyVacateUnlockedSlotCommandAllowed") && (gm->getObjVars().getType("timeNextOccupyVacateUnlockedSlotCommandAllowed") == DynamicVariable::INT))
+			{
+				int timeNextOccupyVacateUnlockedSlotCommandAllowed = 0;
+				if (gm->getObjVars().getItem("timeNextOccupyVacateUnlockedSlotCommandAllowed", timeNextOccupyVacateUnlockedSlotCommandAllowed))
+				{
+					if (timeNextOccupyVacateUnlockedSlotCommandAllowed > timeNow)
+					{
+						ProsePackage prosePackage;
+						prosePackage.stringId = StringId("unlocked_slot", "swap_unlocked_slot_command_too_fast");
+						prosePackage.target.str = Unicode::narrowToWide(CalendarTime::convertSecondsToHMS(static_cast<unsigned int>(timeNextOccupyVacateUnlockedSlotCommandAllowed - timeNow)));
+						Chat::sendSystemMessage(*gm, prosePackage);
+
+						return;
+					}
+				}
+			}
+
+			// CS log the request
+			LOG("CustomerService",("JediUnlockedSlot:%s requesting SwapUnlockedSlot with %s (%s)", PlayerObject::getAccountDescription(gm).c_str(), parsedNetworkId.getValueString().c_str(), NameManager::getInstance().getPlayerFullName(parsedNetworkId).c_str()));
+
+			// send off request to LoginServer to make this character normal and the target characer unlocked
+			GenericValueTypeMessage<std::pair<std::pair<uint32, NetworkId>, std::pair<uint32, NetworkId> > > const swapUnlockedSlotReq("SwapUnlockedSlotReq", std::make_pair(std::make_pair(static_cast<uint32>(gmPlayerObject->getStationId()), actor), std::make_pair(GameServer::getInstance().getProcessId(), parsedNetworkId)));
+			GameServer::getInstance().sendToCentralServer(swapUnlockedSlotReq);
+
+			// set cooldown
+			if (!gmClient->isGod())
+			{
+				IGNORE_RETURN(gm->setObjVarItem("timeNextOccupyVacateUnlockedSlotCommandAllowed", (timeNow + ConfigServerGame::getOccupyVacateUnlockedSlotCommandCooldownSeconds())));
+			}
+
+			// display "wait for reply" message
+			ProsePackage prosePackage;
+			prosePackage.stringId = StringId("unlocked_slot", "swap_unlocked_slot_wait_for_reply");
+			prosePackage.target.str = Unicode::narrowToWide(CalendarTime::convertSecondsToHMS(static_cast<unsigned int>(ConfigServerGame::getOccupyVacateUnlockedSlotCommandCooldownSeconds())));
+			Chat::sendSystemMessage(*gm, prosePackage);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncPickupAllRoomItemsIntoInventory(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &params)
+{
+	CreatureObject * const targetObj = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(actor));
+	if (!targetObj)
+		return;
+
+	PlayerObject * const targetPlayerObj = PlayerCreatureController::getPlayerObject(targetObj);
+	if (!targetPlayerObj)
+		return;
+
+	// don't allow this in god mode because it could be used accidentally and pick up a bunch of stuff,
+	// and god mode allows stuff to be picked up, which wouldn't normally be allowed to be picked up
+	if (!targetObj->getClient())
+		return;
+
+	if (targetObj->getClient()->isGod())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You cannot do this while in GOD mode."), Unicode::emptyString);
+		return;
+	}
+
+	// don't do this if the character is not "active", meaning he's probably doing it with a macro
+	if (targetPlayerObj->getSessionLastActiveTime() == 0)
+		return;
+
+	// don't allow multiple /pickupAllRoomItemsIntoInventory and/or /dropAllInventoryItemsIntoRoom
+	int const timeNow = static_cast<int>(::time(NULL));
+	int pickupDropAllItemsOperationTimeout = 0;
+	if (targetObj->getObjVars().getItem("pickupDropAllItemsOperation.timeout", pickupDropAllItemsOperationTimeout) && (pickupDropAllItemsOperationTimeout > timeNow))
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("You are already performing the /pickupAllRoomItemsIntoInventory or /dropAllInventoryItemsIntoRoom command.  Please wait for the current operation to complete, or if the current operation does not complete in %s, you can try another operation.", CalendarTime::convertSecondsToMS(static_cast<unsigned int>(pickupDropAllItemsOperationTimeout - timeNow)).c_str())), Unicode::emptyString);
+		return;
+	}
+
+	ServerObject const * const containingCell = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*targetObj));
+	if (!containingCell || !containingCell->asCellObject())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You must be standing inside a room of a structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	ServerObject const * const containingPOBso = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*containingCell));
+	if (!containingPOBso)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You must be standing inside a room of a structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	if (!containingPOBso->isInWorldCell())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You must be standing inside a room of a structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	if (containingPOBso->asBuildingObject() && !containingPOBso->asBuildingObject()->getContentsLoaded())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("Please wait until the building has loaded its contents and try again."), Unicode::emptyString);
+		return;
+	}
+
+	TangibleObject const * const containingPOB = containingPOBso->asTangibleObject();
+	if (!containingPOB)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+		return;
+	}
+
+	if (!containingPOB->isOnAdminList(*targetObj))
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You must be the owner or an admin of the structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	ServerObject const * const targetInventoryObj = targetObj->getInventory();
+	if (!targetInventoryObj)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+		return;
+	}
+
+	VolumeContainer const * const targetInventoryContainer = ContainerInterface::getVolumeContainer(*targetInventoryObj);
+	if (!targetInventoryContainer)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+		return;
+	}
+
+	// see if the player specified to overload the inventory
+	Unicode::String const lowercaseParams = Unicode::toLower(params);
+	static Unicode::String const paramsOverload1 = Unicode::narrowToWide("-overload");
+	static Unicode::String const paramsOverload2 = Unicode::narrowToWide("overload");
+	bool const allowInventoryOverload = ((lowercaseParams == paramsOverload1) || (lowercaseParams == paramsOverload2));
+
+	int const inventoryBaseLimit = targetInventoryContainer->getTotalVolume();
+	int const inventoryOverLimit = std::max(inventoryBaseLimit, (inventoryBaseLimit + ConfigServerGame::getMoveValidationMaxInventoryOverload() - 11));
+	int const inventoryLimit = (allowInventoryOverload ? inventoryOverLimit : inventoryBaseLimit);
+
+	if (targetInventoryContainer->getCurrentVolume() >= inventoryLimit)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("Your inventory is full."), Unicode::emptyString);
+
+		// if they didn't run the command with the -overload
+		// option, remind them about the -overload option
+		if (!allowInventoryOverload && (targetInventoryContainer->getCurrentVolume() < inventoryOverLimit))
+			Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("If you wish to pick up more items than available inventory space, you can specify the \"overload\" option with the command by typing \"/pickupAllRoomItemsIntoInventory -overload\" which will pick up additional items and overload your inventory, but not so overloaded as to prevent you from moving."), Unicode::emptyString);
+
+		return;
+	}
+
+	Container const * const cellContainer = ContainerInterface::getContainer(*containingCell);
+	if (!cellContainer)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+		return;
+	}
+
+	// the player counts as 1 item in the room
+	if (cellContainer->getNumberOfItems() <= 1)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("This room is empty."), Unicode::emptyString);
+		return;
+	}
+
+	// start messageTo loop to pick up the items in the room, spread
+	// out over a period of time so it doesn't lag out the server
+	int pickupDropAllItemsOperationId = ::rand();
+	while (pickupDropAllItemsOperationId == 0)
+		pickupDropAllItemsOperationId = ::rand();
+
+	targetPlayerObj->setPickupDropAllItemsOperationId(pickupDropAllItemsOperationId);
+	targetPlayerObj->setPickupDropAllItemsCellId(containingCell->getNetworkId());
+	targetPlayerObj->setPickupAllItemsAllowInventoryOverload(allowInventoryOverload);
+	targetPlayerObj->setPickupDropAllItemsNumItemsSoFar(0);
+	targetPlayerObj->getPickupDropAllItemsProcessedItemsSoFar().clear();
+
+	IGNORE_RETURN(targetObj->setObjVarItem("pickupDropAllItemsOperation.timeout", timeNow + (5 * 60)));
+	IGNORE_RETURN(targetObj->setObjVarItem("pickupDropAllItemsOperation.operationId", pickupDropAllItemsOperationId));
+
+	Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("Please remain in the room while the operation is being performed.  You will be notified when the operation is complete."), Unicode::emptyString);
+
+	MessageToQueue::getInstance().sendMessageToC(targetObj->getNetworkId(),
+		"C++PickupAllRoomItemsIntoInventory",
+		"",
+		0,
+		false);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncDropAllInventoryItemsIntoRoom(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &)
+{
+	CreatureObject * const targetObj = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(actor));
+	if (!targetObj)
+		return;
+
+	PlayerObject * const targetPlayerObj = PlayerCreatureController::getPlayerObject(targetObj);
+	if (!targetPlayerObj)
+		return;
+
+	// don't allow this in god mode because it could be used accidentally and drop a bunch of stuff,
+	// and god mode allows stuff to be dropped, which wouldn't normally be allowed to be dropped
+	if (!targetObj->getClient())
+		return;
+
+	if (targetObj->getClient()->isGod())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You cannot do this while in GOD mode."), Unicode::emptyString);
+		return;
+	}
+
+	// don't do this if the character is not "active", meaning he's probably doing it with a macro
+	if (targetPlayerObj->getSessionLastActiveTime() == 0)
+		return;
+
+	// don't allow multiple /pickupAllRoomItemsIntoInventory and/or /dropAllInventoryItemsIntoRoom
+	int const timeNow = static_cast<int>(::time(NULL));
+	int pickupDropAllItemsOperationTimeout = 0;
+	if (targetObj->getObjVars().getItem("pickupDropAllItemsOperation.timeout", pickupDropAllItemsOperationTimeout) && (pickupDropAllItemsOperationTimeout > timeNow))
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("You are already performing the /pickupAllRoomItemsIntoInventory or /dropAllInventoryItemsIntoRoom command.  Please wait for the current operation to complete, or if the current operation does not complete in %s, you can try another operation.", CalendarTime::convertSecondsToMS(static_cast<unsigned int>(pickupDropAllItemsOperationTimeout - timeNow)).c_str())), Unicode::emptyString);
+		return;
+	}
+
+	ServerObject const * const containingCell = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*targetObj));
+	if (!containingCell || !containingCell->asCellObject())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You must be standing inside a room of a structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	ServerObject const * const containingPOBso = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*containingCell));
+	if (!containingPOBso)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You must be standing inside a room of a structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	if (!containingPOBso->isInWorldCell())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You must be standing inside a room of a structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	if (containingPOBso->asBuildingObject() && !containingPOBso->asBuildingObject()->getContentsLoaded())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("Please wait until the building has loaded its contents and try again."), Unicode::emptyString);
+		return;
+	}
+
+	TangibleObject const * const containingPOB = containingPOBso->asTangibleObject();
+	if (!containingPOB)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+		return;
+	}
+
+	// check for lot overlimit drop restriction
+	if ((targetPlayerObj->getAccountNumLots() > targetObj->getMaxNumberOfLots()) && targetObj->getObjVars().hasItem("lotOverlimit.structure_id"))
+	{
+		NetworkId lotOverlimitStructure;
+		if (targetObj->getObjVars().getItem("lotOverlimit.structure_id", lotOverlimitStructure) && lotOverlimitStructure.isValid())
+		{
+			if (GameObjectTypes::isTypeOf(containingPOB->getGameObjectType(), SharedObjectTemplate::GOT_building) && (containingPOB->getNetworkId() != lotOverlimitStructure))
+			{
+				std::string lotOverlimitStructureName;
+				std::string lotOverlimitStructureLocation;
+
+				IGNORE_RETURN(targetObj->getObjVars().getItem("lotOverlimit.structure_name", lotOverlimitStructureName));
+				IGNORE_RETURN(targetObj->getObjVars().getItem("lotOverlimit.structure_location", lotOverlimitStructureLocation));
+
+				Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("You are currently over the lot limit, and cannot drop any item into (or move around items within) any factory or structure, other than the %s structure located at %s that caused you to exceed the lot limit.", lotOverlimitStructureName.c_str(), lotOverlimitStructureLocation.c_str())), Unicode::emptyString);
+				return;
+			}
+		}
+	}
+
+	if (!containingPOB->isOnAdminList(*targetObj))
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You must be the owner or an admin of the structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	ServerObject const * const targetInventoryObj = targetObj->getInventory();
+	if (!targetInventoryObj)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+		return;
+	}
+
+	VolumeContainer const * const targetInventoryContainer = ContainerInterface::getVolumeContainer(*targetInventoryObj);
+	if (!targetInventoryContainer)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+		return;
+	}
+
+	int pobBaseItemLimit = 0;
+	int pobAdditionalItems = 0;
+	const int pobItemLimit = containingPOB->getPobTotalItemLimit(pobBaseItemLimit, pobAdditionalItems);
+
+	if (containingPOB->getPobItemCount() >= pobItemLimit)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("The structure or POB ship is full."), Unicode::emptyString);
+		return;
+	}
+
+	if (targetInventoryContainer->getCurrentVolume() <= 0)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("Your inventory  is empty."), Unicode::emptyString);
+		return;
+	}
+
+	// start messageTo loop to drop the inventory items into the room,
+	// spread out over a period of time so it doesn't lag out the server
+	int pickupDropAllItemsOperationId = ::rand();
+	while (pickupDropAllItemsOperationId == 0)
+		pickupDropAllItemsOperationId = ::rand();
+
+	targetPlayerObj->setPickupDropAllItemsOperationId(pickupDropAllItemsOperationId);
+	targetPlayerObj->setPickupDropAllItemsCellId(containingCell->getNetworkId());
+	targetPlayerObj->setPickupDropAllItemsNumItemsSoFar(0);
+	targetPlayerObj->getPickupDropAllItemsProcessedItemsSoFar().clear();
+
+	IGNORE_RETURN(targetObj->setObjVarItem("pickupDropAllItemsOperation.timeout", timeNow + (5 * 60)));
+	IGNORE_RETURN(targetObj->setObjVarItem("pickupDropAllItemsOperation.operationId", pickupDropAllItemsOperationId));
+
+	Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("Please remain in the room while the operation is being performed.  You will be notified when the operation is complete."), Unicode::emptyString);
+
+	MessageToQueue::getInstance().sendMessageToC(targetObj->getNetworkId(),
+		"C++DropAllInventoryItemsIntoRoom",
+		"",
+		0,
+		false);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncSaveDecorationLayout(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &)
+{
+	CreatureObject const * const targetObj = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(actor));
+	if (!targetObj)
+		return;
+
+	ServerObject const * const containingCell = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*targetObj));
+	if (!containingCell || !containingCell->asCellObject())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You must be standing inside a structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	ServerObject const * const containingPOBso = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*containingCell));
+	if (!containingPOBso)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You must be standing inside a structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	if (!containingPOBso->isInWorldCell())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You must be standing inside a structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	if (containingPOBso->asBuildingObject() && !containingPOBso->asBuildingObject()->getContentsLoaded())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("Please wait until the building has loaded its contents and try again."), Unicode::emptyString);
+		return;
+	}
+
+	TangibleObject const * const containingPOB = containingPOBso->asTangibleObject();
+	if (!containingPOB)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+		return;
+	}
+
+	if (!containingPOB->isOnAdminList(*targetObj))
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You must be the owner or an admin of the structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	// poke script to pop up some SUI windows to let the user pick which save slot to use
+	MessageToQueue::getInstance().sendMessageToJava(targetObj->getNetworkId(), "handleSaveDecorationLayout", std::vector<int8>(), 0, false);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncRestoreDecorationLayout(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const &)
+{
+	CreatureObject const * const targetObj = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(actor));
+	if (!targetObj)
+		return;
+
+	PlayerObject const * const targetPlayerObj = PlayerCreatureController::getPlayerObject(targetObj);
+	if (!targetPlayerObj)
+		return;
+
+	ServerObject const * const containingCell = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*targetObj));
+	if (!containingCell || !containingCell->asCellObject())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You must be standing inside a structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	ServerObject const * const containingPOBso = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*containingCell));
+	if (!containingPOBso)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You must be standing inside a structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	if (!containingPOBso->isInWorldCell())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You must be standing inside a structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	// don't allow another restore on the pob while one is still in progress
+	int const timeNow = static_cast<int>(::time(NULL));
+	int restoreDecorationOperationTimeout = 0;
+	if (targetObj->getObjVars().getItem("restoreDecorationOperation.timeout", restoreDecorationOperationTimeout) && (restoreDecorationOperationTimeout > timeNow))
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("You are already performing a restore decoration layout operation.  Please wait for the current operation to complete, or if the current operation does not complete in %s, you can try another operation.", CalendarTime::convertSecondsToMS(static_cast<unsigned int>(restoreDecorationOperationTimeout - timeNow)).c_str())), Unicode::emptyString);
+		return;
+	}
+
+	if (containingPOBso->asBuildingObject() && !containingPOBso->asBuildingObject()->getContentsLoaded())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("Please wait until the building has loaded its contents and try again."), Unicode::emptyString);
+		return;
+	}
+
+	TangibleObject const * const containingPOB = containingPOBso->asTangibleObject();
+	if (!containingPOB)
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+		return;
+	}
+
+	// check for lot overlimit drop restriction
+	if ((targetPlayerObj->getAccountNumLots() > targetObj->getMaxNumberOfLots()) && targetObj->getObjVars().hasItem("lotOverlimit.structure_id"))
+	{
+		NetworkId lotOverlimitStructure;
+		if (targetObj->getObjVars().getItem("lotOverlimit.structure_id", lotOverlimitStructure) && lotOverlimitStructure.isValid())
+		{
+			if (GameObjectTypes::isTypeOf(containingPOB->getGameObjectType(), SharedObjectTemplate::GOT_building) && (containingPOB->getNetworkId() != lotOverlimitStructure))
+			{
+				std::string lotOverlimitStructureName;
+				std::string lotOverlimitStructureLocation;
+
+				IGNORE_RETURN(targetObj->getObjVars().getItem("lotOverlimit.structure_name", lotOverlimitStructureName));
+				IGNORE_RETURN(targetObj->getObjVars().getItem("lotOverlimit.structure_location", lotOverlimitStructureLocation));
+
+				Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("You are currently over the lot limit, and cannot drop any item into (or move around items within) any factory or structure, other than the %s structure located at %s that caused you to exceed the lot limit.", lotOverlimitStructureName.c_str(), lotOverlimitStructureLocation.c_str())), Unicode::emptyString);
+				return;
+			}
+		}
+	}
+
+	if (!containingPOB->isOnAdminList(*targetObj))
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You must be the owner or an admin of the structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	// see if there's any saved decoration layout to restore
+	if (!targetPlayerObj->getObjVars().hasItem("savedDecoration1.saveTime") && !targetPlayerObj->getObjVars().hasItem("savedDecoration2.saveTime") && !targetPlayerObj->getObjVars().hasItem("savedDecoration3.saveTime"))
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You do not have any saved decoration layout."), Unicode::emptyString);
+		return;
+	}
+
+	// poke script to pop up some SUI windows to let the user pick which save slot to use
+	MessageToQueue::getInstance().sendMessageToJava(targetObj->getNetworkId(), "handleRestoreDecorationLayout", std::vector<int8>(), 0, false);
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncAreaPickRandomPlayer(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const & params)
+{
+	CreatureObject * const targetObj = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(actor));
+	if (!targetObj)
+		return;
+
+	PlayerObject const * const targetPlayerObj = PlayerCreatureController::getPlayerObject(targetObj);
+	if (!targetPlayerObj)
+		return;
+
+	// prevent spamming of the command
+	Client const * const client = targetObj->getClient();
+	if (!client)
+		return;
+
+	int const timeNow = static_cast<int>(::time(NULL));
+	if (!client->isGod() && targetObj->getObjVars().hasItem("timeNextAreaPickRandomPlayerCommandAllowed") && (targetObj->getObjVars().getType("timeNextAreaPickRandomPlayerCommandAllowed") == DynamicVariable::INT))
+	{
+		int timeNextAreaPickRandomPlayerCommandAllowed = 0;
+		if (targetObj->getObjVars().getItem("timeNextAreaPickRandomPlayerCommandAllowed", timeNextAreaPickRandomPlayerCommandAllowed))
+		{
+			if (timeNextAreaPickRandomPlayerCommandAllowed > timeNow)
+			{
+				Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("You must wait %ds before you can run this command again.", (timeNextAreaPickRandomPlayerCommandAllowed - timeNow))), Unicode::emptyString);
+				return;
+			}
+		}
+	}
+
+	// handle options
+	static uint32 const pointatSocialType = SocialsManager::getSocialTypeByName("pointat");
+	uint32 socialType = 0;
+	int range = 16; // default is 16m
+
+	if (!params.empty())
+	{
+		Unicode::UnicodeStringVector tokens;
+		if (Unicode::tokenize(Unicode::toLower(params), tokens, NULL, NULL) && !tokens.empty())
+		{
+			static Unicode::String const paramsPoint1 = Unicode::narrowToWide("-point");
+			static Unicode::String const paramsPoint2 = Unicode::narrowToWide("point");
+			static Unicode::String const paramsEmote1 = Unicode::narrowToWide("-emote=");
+			static Unicode::String const paramsEmote2 = Unicode::narrowToWide("emote=");
+			std::string emote;
+
+			for (Unicode::UnicodeStringVector::const_iterator iter = tokens.begin(); iter != tokens.end(); ++iter)
+			{
+				if ((*iter == paramsPoint1) || (*iter == paramsPoint2))
+				{
+					socialType = pointatSocialType;
+				}
+				else if (iter->find(paramsEmote1) == 0)
+				{
+					emote = Unicode::wideToNarrow(*iter).substr(7);
+					socialType = SocialsManager::getSocialTypeByName(emote);
+					if (socialType == 0)
+					{
+						Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("\"%s\" is not a valid emote.", emote.c_str())), Unicode::emptyString);
+						return;
+					}
+				}
+				else if (iter->find(paramsEmote2) == 0)
+				{
+					emote = Unicode::wideToNarrow(*iter).substr(6);
+					socialType = SocialsManager::getSocialTypeByName(emote);
+					if (socialType == 0)
+					{
+						Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("\"%s\" is not a valid emote.", emote.c_str())), Unicode::emptyString);
+						return;
+					}
+				}
+				else
+				{
+					range = ::atoi(Unicode::wideToNarrow(*iter).c_str());
+					if ((range < 1) || (range > 256))
+					{
+						Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("Range must be 1-256."), Unicode::emptyString);
+						return;
+					}
+				}
+			}
+		}
+	}
+
+	std::vector<ServerObject *> playersInRange;
+	ServerWorld::findPlayerCreaturesInRange(targetObj->getPosition_w(), static_cast<float>(range), playersInRange);
+	if (playersInRange.empty())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("No eligible players found within %dm.", range)), Unicode::emptyString);
+	}
+	else
+	{
+		std::vector<ServerObject const *> validPlayers;
+		CreatureObject const * co;
+		for (std::vector<ServerObject *>::const_iterator iter = playersInRange.begin(); iter != playersInRange.end(); ++iter)
+		{
+			co = (*iter)->asCreatureObject();
+			if (!co || !PlayerCreatureController::getPlayerObject(co))
+				continue;
+
+			// always include self, even if I am invisible
+			if (co->getNetworkId() == targetObj->getNetworkId())
+			{
+				validPlayers.push_back(*iter);
+				continue;
+			}
+
+			// don't include invisible players
+			if (co->isHidden() || !co->isVisible() || !co->getCoverVisibility())
+				continue;
+
+			validPlayers.push_back(*iter);
+		}
+
+		if (validPlayers.empty())
+		{
+			Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("No eligible players found within %dm.", range)), Unicode::emptyString);
+		}
+		else
+		{
+			int const random = ::rand() % validPlayers.size();
+			Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("Player \"%s\" within %dm was randomly chosen.", Unicode::wideToNarrow(validPlayers[random]->getAssignedObjectName()).c_str(), range)), Unicode::emptyString);
+
+			// do emote at the selected player, if requested
+			if (socialType > 0)
+			{
+				// if I'm the one selected, use the /pointat social to point at myself
+				// since other socials may not make sense when I am the target
+				doSocial(*targetObj, validPlayers[random]->getNetworkId(), ((validPlayers[random]->getNetworkId() == targetObj->getNetworkId()) ? pointatSocialType : socialType));
+			}
+		}
+	}
+
+	// set cooldown
+	if (!client->isGod())
+		IGNORE_RETURN(targetObj->setObjVarItem("timeNextAreaPickRandomPlayerCommandAllowed", (timeNow + 30)));
+}
+
+// ----------------------------------------------------------------------
+
+static void commandFuncRoomPickRandomPlayer(Command const &, NetworkId const &actor, NetworkId const &, Unicode::String const & params)
+{
+	CreatureObject * const targetObj = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(actor));
+	if (!targetObj)
+		return;
+
+	PlayerObject const * const targetPlayerObj = PlayerCreatureController::getPlayerObject(targetObj);
+	if (!targetPlayerObj)
+		return;
+
+	ServerObject const * const containingCell = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*targetObj));
+	if (!containingCell || !containingCell->asCellObject())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("You must be standing inside a room of a structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	// prevent spamming of the command
+	Client const * const client = targetObj->getClient();
+	if (!client)
+		return;
+
+	int const timeNow = static_cast<int>(::time(NULL));
+	if (!client->isGod() && targetObj->getObjVars().hasItem("timeNextRoomPickRandomPlayerCommandAllowed") && (targetObj->getObjVars().getType("timeNextRoomPickRandomPlayerCommandAllowed") == DynamicVariable::INT))
+	{
+		int timeNextRoomPickRandomPlayerCommandAllowed = 0;
+		if (targetObj->getObjVars().getItem("timeNextRoomPickRandomPlayerCommandAllowed", timeNextRoomPickRandomPlayerCommandAllowed))
+		{
+			if (timeNextRoomPickRandomPlayerCommandAllowed > timeNow)
+			{
+				Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("You must wait %ds before you can run this command again.", (timeNextRoomPickRandomPlayerCommandAllowed - timeNow))), Unicode::emptyString);
+				return;
+			}
+		}
+	}
+
+	// handle options
+	static uint32 const pointatSocialType = SocialsManager::getSocialTypeByName("pointat");
+	uint32 socialType = 0;
+
+	if (!params.empty())
+	{
+		Unicode::UnicodeStringVector tokens;
+		if (Unicode::tokenize(Unicode::toLower(params), tokens, NULL, NULL) && !tokens.empty())
+		{
+			static Unicode::String const paramsPoint1 = Unicode::narrowToWide("-point");
+			static Unicode::String const paramsPoint2 = Unicode::narrowToWide("point");
+			static Unicode::String const paramsEmote1 = Unicode::narrowToWide("-emote=");
+			static Unicode::String const paramsEmote2 = Unicode::narrowToWide("emote=");
+			std::string emote;
+
+			for (Unicode::UnicodeStringVector::const_iterator iter = tokens.begin(); iter != tokens.end(); ++iter)
+			{
+				if ((*iter == paramsPoint1) || (*iter == paramsPoint2))
+				{
+					socialType = pointatSocialType;
+				}
+				else if (iter->find(paramsEmote1) == 0)
+				{
+					emote = Unicode::wideToNarrow(*iter).substr(7);
+					socialType = SocialsManager::getSocialTypeByName(emote);
+					if (socialType == 0)
+					{
+						Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("\"%s\" is not a valid emote.", emote.c_str())), Unicode::emptyString);
+						return;
+					}
+				}
+				else if (iter->find(paramsEmote2) == 0)
+				{
+					emote = Unicode::wideToNarrow(*iter).substr(6);
+					socialType = SocialsManager::getSocialTypeByName(emote);
+					if (socialType == 0)
+					{
+						Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("\"%s\" is not a valid emote.", emote.c_str())), Unicode::emptyString);
+						return;
+					}
+				}
+			}
+		}
+	}
+
+	std::vector<ServerObject const *> validPlayers;
+	Container const * const cellContainer = ContainerInterface::getContainer(*containingCell);
+	if (cellContainer)
+	{
+		Object const * object;
+		ServerObject const * serverObject;
+		CreatureObject const * creatureObject;
+		for (ContainerConstIterator iter = cellContainer->begin(); iter != cellContainer->end(); ++iter)
+		{
+			object = (*iter).getObject();
+			if (!object)
+				continue;
+
+			serverObject = object->asServerObject();
+			if (!serverObject)
+				continue;
+
+			creatureObject = serverObject->asCreatureObject();
+			if (!creatureObject || !PlayerCreatureController::getPlayerObject(creatureObject))
+				continue;
+
+			// always include self, even if I am invisible
+			if (creatureObject->getNetworkId() == targetObj->getNetworkId())
+			{
+				validPlayers.push_back(serverObject);
+				continue;
+			}
+
+			// don't include invisible players
+			if (creatureObject->isHidden() || !creatureObject->isVisible() || !creatureObject->getCoverVisibility())
+				continue;
+
+			validPlayers.push_back(serverObject);
+		}
+	}
+
+	if (validPlayers.empty())
+	{
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide("No eligible players found in this room."), Unicode::emptyString);
+	}
+	else
+	{
+		int const random = ::rand() % validPlayers.size();
+		Chat::sendSystemMessage(*targetObj, Unicode::narrowToWide(FormattedString<1024>().sprintf("Player \"%s\" was randomly chosen out of %d players in this room.", Unicode::wideToNarrow(validPlayers[random]->getAssignedObjectName()).c_str(), validPlayers.size())), Unicode::emptyString);
+
+		// do emote at the selected player, if requested
+		if (socialType > 0)
+		{
+			// if I'm the one selected, use the /pointat social to point at myself
+			// since other socials may not make sense when I am the target
+			doSocial(*targetObj, validPlayers[random]->getNetworkId(), ((validPlayers[random]->getNetworkId() == targetObj->getNetworkId()) ? pointatSocialType : socialType));
+		}
+	}
+
+	// set cooldown
+	if (!client->isGod())
+		IGNORE_RETURN(targetObj->setObjVarItem("timeNextRoomPickRandomPlayerCommandAllowed", (timeNow + 30)));
+}
+
+// ======================================================================
+
+void CommandCppFuncs::install()
+{
+	// console style commands
+	CommandTable::addCppFunction("console_all",          commandFuncConsoleAll);
+	CommandTable::addCppFunction("console_combat",       commandFuncConsoleCombat);
+	CommandTable::addCppFunction("console_craft",        commandFuncConsoleCraft);
+	CommandTable::addCppFunction("console_database",     commandFuncConsoleDatabase);
+	CommandTable::addCppFunction("console_manufacture",  commandFuncConsoleManufacture);
+	CommandTable::addCppFunction("console_money",        commandFuncConsoleMoney);
+	CommandTable::addCppFunction("console_npc",          commandFuncConsoleNpc);
+	CommandTable::addCppFunction("console_object",       commandFuncConsoleObject);
+	CommandTable::addCppFunction("console_objvar",       commandFuncConsoleObjvar);
+	CommandTable::addCppFunction("console_resource",     commandFuncConsoleResource);
+	CommandTable::addCppFunction("console_script",       commandFuncConsoleScript);
+	CommandTable::addCppFunction("console_server",       commandFuncConsoleServer);
+	CommandTable::addCppFunction("console_skill",        commandFuncConsoleSkill);
+
+	// communication commands
+	CommandTable::addCppFunction("social",               commandFuncSocial);
+	CommandTable::addCppFunction("socialInternal",       commandFuncSocialInternal);
+	CommandTable::addCppFunction("spatialChat",          commandFuncSpatialChat);
+	CommandTable::addCppFunction("spatialChatInternal",  commandFuncSpatialChatInternal);
+	CommandTable::addCppFunction("setMood",              commandFuncSetMood);
+	CommandTable::addCppFunction("setMoodInternal",      commandFuncSetMoodInternal);
+	CommandTable::addCppFunction("systemMessage",        commandFuncSystemMessage);
+//	CommandTable::addCppFunction("combatSpam",           commandFuncCombatSpam);
+
+	// admin commands
+	CommandTable::addCppFunction("admin_setGodMode",     commandFuncAdminSetGodMode);
+	CommandTable::addCppFunction("admin_kick",           commandFuncAdminKick);
+	CommandTable::addCppFunction("admin_planetwarp",     commandFuncAdminPlanetwarp);
+	CommandTable::addCppFunction("admin_teleport",       commandFuncAdminTeleport);
+	CommandTable::addCppFunction("admin_teleportTo",     commandFuncAdminTeleportTo);
+	CommandTable::addCppFunction("admin_listGuilds",     commandFuncAdminListGuilds);
+	CommandTable::addCppFunction("editBank",             commandFuncAdminEditBank);
+	CommandTable::addCppFunction("editStats",            commandFuncAdminEditStats);
+	CommandTable::addCppFunction("editAppearance",       commandFuncAdminEditAppearance);
+	CommandTable::addCppFunction("grantTitle",           commandFuncAdminGrantTitle);
+	CommandTable::addCppFunction("credits",              commandFuncAdminCredits);
+	CommandTable::addCppFunction("getStationName",       commandFuncAdminGetStationName);
+	CommandTable::addCppFunction("emptyMailTarget",      commandFuncEmptyMailTarget);
+	CommandTable::addCppFunction("setPlayerAppearance",  commandFuncSetPlayerAppearance);
+	CommandTable::addCppFunction("revertPlayerAppearance", commandFuncRevertPlayerAppearance);
+
+	// auction commands
+	CommandTable::addCppFunction("auction_create",       commandFuncAuctionCreate);
+	CommandTable::addCppFunction("auction_create_immediate",       commandFuncAuctionCreateImmediate);
+	CommandTable::addCppFunction("auction_bid",          commandFuncAuctionBid);
+	CommandTable::addCppFunction("auction_cancel",       commandFuncAuctionCancel);
+	CommandTable::addCppFunction("auction_accept",       commandFuncAuctionAccept);
+	CommandTable::addCppFunction("auction_query",        commandFuncAuctionQuery);
+	CommandTable::addCppFunction("auction_retrieve",     commandFuncAuctionRetrieve);
+
+	// cell/building permissions commands
+	CommandTable::addCppFunction("addBannedPlayer",      commandFuncAddBannedPlayer);
+	CommandTable::addCppFunction("removeBannedPlayer",   commandFuncRemoveBannedPlayer);
+	CommandTable::addCppFunction("addAllowedPlayer",     commandFuncAddAllowedPlayer);
+	CommandTable::addCppFunction("removeAllowedPlayer",  commandFuncRemoveAllowedPlayer);
+	CommandTable::addCppFunction("setPublicState",       commandFuncSetPublicState);
+	CommandTable::addCppFunction("setOwner",             commandFuncSetOwner);
+
+	CommandTable::addCppFunction("setPosture",           commandSetPosture);
+	CommandTable::addCppFunction("duel",                 commandFuncDuel);
+	CommandTable::addCppFunction("endDuel",              commandFuncEndDuel);
+
+	// ui
+	CommandTable::addCppFunction("setWaypointActiveStatus", commandFuncSetWaypointActiveStatus);
+	CommandTable::addCppFunction("setWaypointName",         commandFuncSetWaypointName);
+
+	// harvester
+	CommandTable::addCppFunction("harvesterActivate",         commandFuncHarvesterActivate);
+	CommandTable::addCppFunction("harvesterDeactivate",       commandFuncHarvesterDeactivate);
+	CommandTable::addCppFunction("harvesterHarvest",          commandFuncHarvesterHarvest);
+	CommandTable::addCppFunction("harvesterSelectResource",   commandFuncHarvesterSelectResource);
+	CommandTable::addCppFunction("harvesterDiscardHopper",    commandFuncHarvesterDiscardHopper);
+	CommandTable::addCppFunction("harvesterMakeCrate",        commandFuncHarvesterMakeCrate);
+	CommandTable::addCppFunction("harvesterGetResourceData",  commandFuncHarvesterGetResourceData);
+
+	// syncronized ui
+	CommandTable::addCppFunction("synchronizedUiListen"   ,        commandFuncSynchronizedUiListen);
+	CommandTable::addCppFunction("synchronizedUiStopListening",    commandFuncSynchronizedUiStopListening);
+
+	// resource
+	CommandTable::addCppFunction("resourceSetName",           commandFuncResourceSetName);
+
+	// resource container
+	CommandTable::addCppFunction("resourceContainerTransfer", commandFuncResourceContainerTransfer);
+	CommandTable::addCppFunction("resourceContainerSplit",    commandFuncResourceContainerSplit);
+
+	// survey
+	CommandTable::addCppFunction("makeSurvey",                commandFuncMakeSurvey);
+	CommandTable::addCppFunction("requestSurvey",             commandFuncRequestSurvey);
+	CommandTable::addCppFunction("requestCoreSample",         commandFuncRequestCoreSample);
+
+	CommandTable::addCppFunction("transferItemWeapon",        commandFuncTransferWeapon);
+	CommandTable::addCppFunction("transferItemArmor",         commandFuncTransferArmor);
+	CommandTable::addCppFunction("transferItemMisc",          commandFuncTransferMisc);
+	CommandTable::addCppFunction("openContainer",             commandFuncOpenContainer);
+	CommandTable::addCppFunction("closeContainer",            commandFuncCloseContainer);
+	CommandTable::addCppFunction("openLotteryContainer",  commandFuncOpenLotteryContainer);
+	CommandTable::addCppFunction("closeLotteryContainer", commandFuncCloseLotteryContainer);
+	CommandTable::addCppFunction("giveItem",              commandFuncGiveItem);
+
+	// grouping
+	CommandTable::addCppFunction("groupInvite",     commandFuncGroupInvite);
+	CommandTable::addCppFunction("groupUninvite",   commandFuncGroupUninvite);
+	CommandTable::addCppFunction("groupJoin",       commandFuncGroupJoin);
+	CommandTable::addCppFunction("groupDecline",    commandFuncGroupDecline);
+	CommandTable::addCppFunction("groupDisband",    commandFuncGroupDisband);
+	CommandTable::addCppFunction("kickFromShip",    commandFuncKickFromShip);
+	CommandTable::addCppFunction("groupChat",       commandFuncGroupChat);
+	CommandTable::addCppFunction("groupMakeLeader", commandFuncGroupMakeLeader);
+	CommandTable::addCppFunction("groupMakeMasterLooter", commandFuncGroupMakeMasterLooter);
+	CommandTable::addCppFunction("createGroupPickup", commandFuncCreateGroupPickup);
+	CommandTable::addCppFunction("useGroupPickup", commandFuncUseGroupPickup);
+	CommandTable::addCppFunction("groupTextChatRoomRejoin", commandFuncGroupTextChatRoomRejoin);
+	CommandTable::addCppFunction("groupPickRandomGroupMember", commandFuncGroupPickRandomGroupMember);
+
+	// guilds
+	CommandTable::addCppFunction("guildChat",       commandFuncGuildChat);
+	CommandTable::addCppFunction("guildTextChatRoomRejoin", commandFuncGuildTextChatRoomRejoin);
+	CommandTable::addCppFunction("guildPickRandomGuildMember", commandFuncGuildPickRandomGuildMember);
+
+	// city
+	CommandTable::addCppFunction("cityChat",        commandFuncCityChat);
+	CommandTable::addCppFunction("cityTextChatRoomRejoin", commandFuncCityTextChatRoomRejoin);
+	CommandTable::addCppFunction("cityPickRandomCitizen", commandFuncCityPickRandomCitizen);
+
+	//chat
+	CommandTable::addCppFunction("auctionChat",       commandFuncAuctionChat);
+	CommandTable::addCppFunction("planetChat",       commandFuncPlanetChat);
+	
+	// crafting
+	CommandTable::addCppFunction("requestResourceWeights",      commandFuncRequestResourceWeights);
+	CommandTable::addCppFunction("requestResourceWeightsBatch", commandFuncRequestResourceWeightsBatch);
+	CommandTable::addCppFunction("requestDraftSlots",         commandFuncRequestDraftSlots);
+	CommandTable::addCppFunction("requestDraftSlotsBatch",    commandFuncRequestDraftSlotsBatch);
+	CommandTable::addCppFunction("requestManfSchematicSlots", commandFuncRequestManfSchematicSlots);
+	CommandTable::addCppFunction("requestCraftingSession",    commandFuncRequestCraftingSession);
+	CommandTable::addCppFunction("requestCraftingSessionFail",commandFuncRequestCraftingSessionFail);
+	CommandTable::addCppFunction("selectDraftSchematic",      commandFuncSelectDraftSchematic);
+	CommandTable::addCppFunction("nextCraftingStage",         commandFuncNextCraftingStage);
+	CommandTable::addCppFunction("createPrototype",           commandFuncCreatePrototype);
+	CommandTable::addCppFunction("createManfSchematic",       commandFuncCreateManfSchematic);
+	CommandTable::addCppFunction("cancelCraftingSession",     commandFuncCancelCraftingSession);
+	CommandTable::addCppFunction("stopCraftingSession",       commandFuncStopCraftingSession);
+	CommandTable::addCppFunction("restartCraftingSession",    commandFuncRestartCraftingSession);
+	CommandTable::addCppFunction("extractObject",             commandFuncExtractObject);
+	CommandTable::addCppFunction("repair",                    commandFuncRepair);
+	CommandTable::addCppFunction("factoryCrateSplit",         commandFuncFactoryCrateSplit);
+
+	// misc
+	CommandTable::addCppFunction("showDanceVisuals",          commandFuncShowDanceVisuals);
+	CommandTable::addCppFunction("showMusicianVisuals",       commandFuncShowMusicianVisuals);
+	CommandTable::addCppFunction("placeStructure",            commandFuncPlaceStructure);
+	CommandTable::addCppFunction("getAttributes",             commandFuncGetAttributes);
+	CommandTable::addCppFunction("getAttributesBatch",        commandFuncGetAttributesBatch);
+	CommandTable::addCppFunction("sitServer",                 commandFuncSitServer);
+	CommandTable::addCppFunction("jumpServer",                commandFuncJumpServer);
+	CommandTable::addCppFunction("purchaseTicket",            commandFuncPurchaseTicket);
+	CommandTable::addCppFunction("addFriend",                 commandFuncAddFriend);
+	CommandTable::addCppFunction("removeFriend",              commandFuncRemoveFriend);
+	CommandTable::addCppFunction("getFriendList",             commandFuncGetFriendList);
+	CommandTable::addCppFunction("addIgnore",                 commandFuncAddIgnore);
+	CommandTable::addCppFunction("removeIgnore",              commandFuncRemoveIgnore);
+	CommandTable::addCppFunction("getIgnoreList",             commandFuncGetIgnoreList);
+	CommandTable::addCppFunction("requestBiography",          commandFuncRequestBiography);
+	CommandTable::addCppFunction("setBiography",              commandFuncSetBiography);
+	CommandTable::addCppFunction("requestWaypointAtPosition", commandFuncRequestWaypointAtPosition);
+	CommandTable::addCppFunction("serverDestroyObject",       commandFuncServerDestroyObject);
+	CommandTable::addCppFunction("setSpokenLanguage",         commandFuncSetSpokenLanguage);
+	CommandTable::addCppFunction("applyPowerup",              commandFuncApplyPowerup);
+	CommandTable::addCppFunction("report",                    commandFuncReport);
+	CommandTable::addCppFunction("resetCooldowns",            commandFuncResetCooldowns);
+	CommandTable::addCppFunction("spewCommandQueue",          commandFuncSpewCommandQueue);
+	CommandTable::addCppFunction("locateStructure",           commandFuncLocateStructure);
+	CommandTable::addCppFunction("locateVendor",              commandFuncLocateVendor);
+	CommandTable::addCppFunction("showCtsHistory",            commandFuncShowCtsHistory);
+	CommandTable::addCppFunction("pickupAllRoomItemsIntoInventory", commandFuncPickupAllRoomItemsIntoInventory);
+	CommandTable::addCppFunction("dropAllInventoryItemsIntoRoom", commandFuncDropAllInventoryItemsIntoRoom);
+	CommandTable::addCppFunction("saveDecorationLayout",      commandFuncSaveDecorationLayout);
+	CommandTable::addCppFunction("restoreDecorationLayout",   commandFuncRestoreDecorationLayout);
+	CommandTable::addCppFunction("areaPickRandomPlayer",      commandFuncAreaPickRandomPlayer);
+	CommandTable::addCppFunction("roomPickRandomPlayer",      commandFuncRoomPickRandomPlayer);
+
+	// match making
+	CommandTable::addCppFunction("setMatchMakingPersonalId",  commandFuncSetMatchMakingPersonalId);
+	CommandTable::addCppFunction("setMatchMakingCharacterId", commandFuncSetMatchMakingCharacterId);
+	CommandTable::addCppFunction("requestCharacterMatch",     commandFuncRequestCharacterMatch);
+	CommandTable::addCppFunction("toggleSearchableByCtsSourceGalaxy", commandFuncToggleSearchableByCtsSourceGalaxy);
+	CommandTable::addCppFunction("toggleDisplayLocationInSearchResults", commandFuncToggleDisplayLocationInSearchResults);
+	CommandTable::addCppFunction("toggleAnonymous",           commandFuncToggleAnonymous);
+	CommandTable::addCppFunction("toggleHelper",              commandFuncToggleHelper);
+	CommandTable::addCppFunction("toggleRolePlay",            commandFuncToggleRolePlay);
+	CommandTable::addCppFunction("toggleLookingForGroup",     commandFuncToggleLookingForGroup);
+	CommandTable::addCppFunction("toggleAwayFromKeyBoard",    commandFuncToggleAwayFromKeyBoard);
+	CommandTable::addCppFunction("toggleDisplayingFactionRank", commandFuncToggleDisplayingFactionRank);
+	CommandTable::addCppFunction("toggleOutOfCharacter",      commandFuncToggleOutOfCharacter);
+	CommandTable::addCppFunction("toggleLookingForWork",      commandFuncToggleLookingForWork);
+
+	//skill
+	CommandTable::addCppFunction("revokeSkill",                 commandFuncRevokeSkill);
+	CommandTable::addCppFunction("setCurrentSkillTitle",        commandFuncSetCurrentSkillTitle);
+
+	//misc ui
+	CommandTable::addCppFunction("permissionListModify",        commandFuncPermissionListModify);
+	CommandTable::addCppFunction("requestCharacterSheetInfo",   commandFuncRequestCharacterSheetInfo);
+	CommandTable::addCppFunction("removeBuff",					commandFuncRemoveBuff);
+
+	// npc conversation
+	CommandTable::addCppFunction("npcConversationStart",  commandFuncNpcConversationStart);
+	CommandTable::addCppFunction("npcConversationStop",   commandFuncNpcConversationStop);
+	CommandTable::addCppFunction("npcConversationSelect", commandFuncNpcConversationSelect);
+	CommandTable::addCppFunction("handleUnstick",               commandFuncUnstick);
+	CommandTable::addCppFunction("getAccountInfo",        commandFuncGetAccountInfo);
+	CommandTable::addCppFunction("lag", commandFuncLag);
+
+	//knowledgebase (i.e. holocron)
+	CommandTable::addCppFunction("executeKnowledgeBaseMessage", commandExecuteKnowledgeBaseMessage);
+	CommandTable::addCppFunction("reconnectToTransferServer", commandFuncReconnectToTransferServer);
+	CommandTable::addCppFunction("findFriend", commandFuncFindFriend);
+
+	// godclient-specific functions
+	CommandTable::addCppFunction(FormManager::getFormCommandName(), commandFuncFormCommand);
+
+	// space
+	CommandTable::addCppFunction("installShipComponent", commandFuncInstallShipComponents);
+	CommandTable::addCppFunction("uninstallShipComponent", commandFuncUninstallShipComponents);
+	CommandTable::addCppFunction("insertItemIntoShipComponentSlot", commandFuncInsertItemIntoShipComponentSlot);
+	CommandTable::addCppFunction("associateDroidControlDeviceWithShip", commandFuncAssociateDroidControlDeviceWithShip);
+	CommandTable::addCppFunction("unassociateDroidControlDeviceWithShip", commandFuncAssociateDroidControlDeviceWithShip);
+
+	CommandTable::addCppFunction("serverAsteroidDataListen"   ,        commandFuncServerAsteroidDataListen);
+	CommandTable::addCppFunction("serverAsteroidDataStopListening",    commandFuncServerAsteroidDataStopListening);
+
+	CommandTable::addCppFunction("boosterOn", commandFuncBoosterOn);
+	CommandTable::addCppFunction("boosterOff", commandFuncBoosterOff);
+
+	CommandTable::addCppFunction("setFormation", commandFuncSetFormation);
+	CommandTable::addCppFunction("setFormationSlot", commandFuncSetFormationSlot);
+	CommandTable::addCppFunction("undock", commandFuncUnDock);
+	CommandTable::addCppFunction("launchIntoSpace", commandFuncLaunchIntoSpace);
+	CommandTable::addCppFunction("acceptQuest", commandFuncAcceptQuest);
+	CommandTable::addCppFunction("completeQuest", commandFuncReceiveReward);
+	CommandTable::addCppFunction("abandonQuest", commandFuncAbandonQuest);
+
+	// exchange
+	CommandTable::addCppFunction("exchangeListCredits",   commandFuncExchangeListCredits);
+
+	// squelch
+	CommandTable::addCppFunction("squelch", commandFuncSquelch);
+	CommandTable::addCppFunction("unsquelch", commandFuncUnsquelch);
+
+	// warden
+	CommandTable::addCppFunction("grantWarden", commandFuncGrantWarden);
+	CommandTable::addCppFunction("revokeWarden", commandFuncRevokeWarden);
+	CommandTable::addCppFunction("spammer", commandFuncSpammer);
+	CommandTable::addCppFunction("unspammer", commandFuncUnspammer);
+	CommandTable::addCppFunction("deputizeWarden", commandFuncDeputizeWarden);
+	CommandTable::addCppFunction("undeputizeWarden", commandFuncUndeputizeWarden);
+
+	// unlocked slot management commands
+	CommandTable::addCppFunction("occupyUnlockedSlot", commandFuncOccupyUnlockedSlot);
+	CommandTable::addCppFunction("vacateUnlockedSlot", commandFuncVacateUnlockedSlot);
+	CommandTable::addCppFunction("swapUnlockedSlot", commandFuncSwapUnlockedSlot);
+}
+
+// ----------------------------------------------------------------------
+
+void CommandCppFuncs::remove()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/command/CommandCppFuncs.h b/engine/server/library/serverGame/src/shared/command/CommandCppFuncs.h
new file mode 100644
index 00000000..6398507c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/command/CommandCppFuncs.h
@@ -0,0 +1,24 @@
+// ======================================================================
+//
+// CommandCppFuncs.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_CommandCppFuncs_H
+#define INCLUDED_CommandCppFuncs_H
+
+class Command;
+class NetworkId;
+
+class CommandCppFuncs // static class
+{
+public:
+	static void install();
+	static void remove();
+
+	static void commandFuncTransferMisc(Command const & c, NetworkId const &actor, NetworkId const &target, Unicode::String const & params);
+};
+
+#endif // INCLUDED_CommandCppFuncs_H
diff --git a/engine/server/library/serverGame/src/shared/command/CommandQueue.cpp b/engine/server/library/serverGame/src/shared/command/CommandQueue.cpp
new file mode 100644
index 00000000..d581b8ae
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/command/CommandQueue.cpp
@@ -0,0 +1,1599 @@
+// ======================================================================
+//
+// CommandQueue.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CommandQueue.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/Chat.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureController.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ServerSecureTrade.h"
+#include "serverGame/WeaponObject.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedFoundation/Clock.h"
+#include "sharedFoundation/Crc.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedGame/Command.h"
+#include "sharedGame/CommandTable.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/MessageQueueCommandQueueRemove.h"
+#include "sharedNetworkMessages/MessageQueueCommandTimer.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedObject/NetworkIdManager.h"
+
+// --------------------------------------------------------------------------
+
+namespace CommandQueueNamespace
+{
+	/**
+	 * @brief whether or not to produce debug logging
+	 */
+#ifdef _DEBUG
+	const bool         cs_debug                   = false;
+#endif
+
+	/**
+	 * @brief used to assign sequence Ids to server-generated commands
+	 * that need to be replicated on the client.
+	 */
+	const uint32       cs_sequenceStart           = 0x40000000;
+	
+	/**
+	 * @brief the maximum number of combat commands that are allowed in
+	 * the queue at any given time.
+	 */
+	const uint32       cs_maxQueuedCombatCommands = 2;
+	
+	/**
+	 * @brief the number of seconds in a real-time day.
+	 *
+	 * This value is used for sanity checking
+	 * @see setCommandTimerValue
+	 */
+	const float        cs_secondsPerDay           = 86400.f;
+	
+	/**
+	 * @brief the current time is cached in this class variable.
+	 *
+	 * this is used to reduce the number of calls to Clock::getCurrentTime().
+	 * note it may not be appropriate to use this value in every
+	 * place in the code since there's guarantee that it's accurate from
+	 * every entry point in script.  
+	 *
+	 * @see Clock::getCurrentTime
+	 */
+	double             s_currentTime             = 0.f;
+	
+}
+using namespace CommandQueueNamespace;
+
+// --------------------------------------------------------------------------
+
+CommandQueue::CommandQueue(ServerObject & owner) :
+	Property(getClassPropertyId(), owner),
+	m_status              (Command::CEC_Success),
+	m_statusDetail        (0),
+	m_state               ( State_Waiting ),
+	m_nextEventTime       ( 0.f ),
+	m_queue               ( ),
+	m_cooldowns           ( ),
+	m_commandTimes        ( TimerClass_MAX ),
+	m_combatCount         ( 0 ),
+	m_eventStartTime      ( 0.0 ),
+	m_logCommandEnqueue   (false)
+{
+}
+
+// ----------------------------------------------------------------------
+PropertyId CommandQueue::getClassPropertyId()
+{
+	return PROPERTY_HASH(CommandQueue, 889825674);
+}
+
+// ----------------------------------------------------------------------
+
+bool CommandQueue::isFull() const
+{
+	// is it empty?
+	if ( m_combatCount.get() == 0 )
+	{
+		return false;
+	}
+	
+	// is it at the max?
+	if ( m_combatCount.get() >= cs_maxQueuedCombatCommands )
+	{
+		return true;
+	}
+	
+	// test to see if the current command is waiting on a cooldown.  we're considered
+	// full if we're waiting on a cooldown timer
+	
+	if ( m_state.get() == State_Waiting && !m_queue.empty() )
+	{
+		const CommandQueueEntry &entry = *(m_queue.begin());
+	
+		if ( (getCooldownTimeLeft( entry.m_command->m_coolGroup ) > 0.f) ||
+			 (getCooldownTimeLeft( entry.m_command->m_coolGroup2) > 0.f) )
+		{
+			return true;
+		}
+	}
+	
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void CommandQueue::enqueue(Command const &command, NetworkId const &targetId, Unicode::String const &params, uint32 sequenceId, bool clearable, Command::Priority priority)
+{
+	DEBUG_REPORT_LOG( cs_debug, ( "%f: CommandQueue::enqueue(%s, %s, %s, %d, %d, %d)\n",
+		Clock::getCurrentTime(),
+		command.m_commandName.c_str(),
+		targetId.getValueString().c_str(),
+		Unicode::wideToNarrow(params).c_str(),
+		static_cast<int>(sequenceId),
+		clearable ? 1 : 0,
+		static_cast<int>(priority) ));
+
+	// make sure the cooldown timer value is initialized if it's not in the map
+	
+    if(static_cast<int>(command.m_coolGroup) != -1)
+	{
+		if ( m_cooldowns.find( command.m_coolGroup ) == m_cooldowns.end() )
+		{
+			m_cooldowns.set( command.m_coolGroup, std::make_pair( 0.f, 0.f ) );
+		}
+	}
+	if(static_cast<int>(command.m_coolGroup2) != -1)
+	{
+		if ( m_cooldowns.find( command.m_coolGroup2 ) == m_cooldowns.end() )
+		{
+			m_cooldowns.set( command.m_coolGroup2, std::make_pair( 0.f, 0.f ) );
+		}
+	}
+
+	if ( priority == Command::CP_Default )
+	{
+		priority = command.m_defaultPriority;
+	}
+  	
+  	//
+  	// execute immediate commands imemdiately
+  	//
+  	if ( priority == Command::CP_Immediate )
+  	{
+  		Command::ErrorCode status       = Command::CEC_Success;
+  		int                statusDetail = 0;
+
+  		executeCommand(command, targetId, params, status, statusDetail, false);
+		notifyClientOfCommandRemoval(sequenceId, 0.0f, status, statusDetail);
+  	}
+  	else
+  	{
+	  	if ( command.m_addToCombatQueue && isFull() )
+		{
+			// we do special things if the command queue is full or the current command is waiting on a cooldown
+			// timer of combat actions and the player tries to add another
+			// combat action!
+			 
+			// look in the queue for a command to replace this with
+	
+			for ( EntryList::iterator it = m_queue.begin(); it != m_queue.end(); )
+			{
+				EntryList::iterator j = it++;
+				
+				// if there's a command warming up or executing then we can skip the first command in the queue
+				if ( m_state.get() != State_Waiting && j == m_queue.begin() )
+				{
+					continue;
+				}
+				
+				const CommandQueueEntry &entry = *j;
+				
+				// test to see of this command is a combat command
+				if ( entry.m_command->m_addToCombatQueue )
+				{					
+					// remove command from queue
+					m_queue.erase( j );
+					
+					// we want to end this loop
+					it = m_queue.end();
+				}
+			}
+		}
+		
+		// create the command queue entry object
+		const CommandQueueEntry entry( command, targetId, params, sequenceId, clearable, priority, false );
+	   			
+		m_queue.push( entry );
+		
+		if ( command.m_addToCombatQueue )
+		{
+			m_combatCount = m_combatCount.get() + 1;
+		}
+		
+		// debug - /spewCommandQueue available from console
+		if (m_logCommandEnqueue)
+			spew();
+		
+		 // if there's only one thing in the command queue ,
+		// then its okay to start execution immediately.
+		if ( ( m_queue.size() == 1 ) )
+		{
+			executeCommandQueue();
+		}
+	}
+}
+
+
+// ----------------------------------------------------------------------
+
+void CommandQueue::remove(uint32 sequenceId)
+{
+	DEBUG_REPORT_LOG( cs_debug, ( "CommandQueue::remove(0x%08x)\n", (int)sequenceId ) );
+	
+	if ( sequenceId == 0 )
+	{
+		// this would occur as a command from the client to cancel all pending combat actions
+		// as a result of the player hitting ESC
+		clearPendingCombatCommands();
+	}
+	else
+	{
+		// sometimes the game server wants to remove a specific command from the queue
+		
+		// iterate over each item in the queue
+		for ( EntryList::iterator it = m_queue.begin(); it != m_queue.end(); /* no action */ )
+		{
+			EntryList::iterator j = it++;
+
+						
+			if ( ( j != m_queue.begin() ) || ( m_state.get() != State_Execute ) ) // <- don't cancel an executing command
+			{			
+				const CommandQueueEntry &entry = *j;
+				
+				if ( entry.m_sequenceId == sequenceId )
+				{
+					if ( j == m_queue.begin() )
+					{
+						m_nextEventTime = 0;
+						m_state = State_Waiting;
+					}
+					
+					handleEntryRemoved(entry );
+					
+					m_queue.erase( j );
+					
+					// force this loop to terminate, since sequenceIds must be unique
+					// there's no way that if we removed a matching sequenceId that
+					// there are any more of them in the command queue
+					it = m_queue.end(); 
+				}
+			}
+		}
+	}
+
+}	
+
+// ----------------------------------------------------------------------
+
+void CommandQueue::update(float time)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("CommandQueue::update");
+	executeCommandQueue();
+}
+
+void CommandQueue::executeCommandQueue()
+{
+	// cache the current time, so that we don't have to hit the getCurrentTime() method every time
+	s_currentTime = Clock::getCurrentTime();
+	
+	//
+	// iterate through each command in the queue
+	//
+	while ( !m_queue.empty() )
+	{
+		CommandQueueEntry &entry = *(m_queue.begin());
+
+		// try to recover from having a null command
+		// maybe this should result in a fatal error?
+		if ( entry.m_command == 0 )
+		{
+			WARNING( true, ( "executeCommandQueue: entry.m_command was NULL! WTF?\n" ) );
+			m_queue.pop();
+			m_state = State_Waiting;
+			m_nextEventTime = 0.f;
+			continue;
+		}
+
+		// check the cooldown timer for this command's group
+
+		const unsigned int cooldownGroup = entry.m_command->m_coolGroup;
+		const unsigned int cooldownGroup2 = entry.m_command->m_coolGroup2;
+
+		// if this group is still cooling down, we need to break
+		// out of this loop and go do something else
+
+		if(static_cast<int>(cooldownGroup) != -1)
+		{		
+			float coolTimeLeft = getCooldownTimeLeft( cooldownGroup );
+			
+			if ( coolTimeLeft > FLT_EPSILON )
+			{
+				DEBUG_REPORT_LOG( cs_debug, ( "%f: CommandQueue::executeCommandQueue(): waiting on cooldown group 0x%u: %f seconds left!\n", s_currentTime, cooldownGroup, coolTimeLeft ) );
+				break;
+			}
+		}
+		if(static_cast<int>(cooldownGroup2) != -1)
+		{		
+			float coolTimeLeft2 = getCooldownTimeLeft( cooldownGroup2 );
+			
+			if ( coolTimeLeft2 > FLT_EPSILON )
+			{
+				DEBUG_REPORT_LOG( cs_debug, ( "%f: CommandQueue::executeCommandQueue(): waiting on cooldown group 2 0x%u: %f seconds left!\n", s_currentTime, cooldownGroup2, coolTimeLeft2 ) );
+				break;
+			}
+		}
+
+		// if we need to wait more time before switching states, we should
+		// just update the timer and leave now.
+		if ( m_nextEventTime.get() > s_currentTime )
+		{
+			DEBUG_REPORT_LOG( cs_debug, ( "%f: CommandQueue::executeCommandQueue(): waiting on state %s: %f seconds left!\n",
+				s_currentTime,
+				getStateAsString((State) m_state.get() ), 
+				m_nextEventTime.get() - s_currentTime ) );
+			break;
+		}
+
+		switchState();
+
+		switch ( m_state.get() )
+		{
+		case State_Waiting:
+			{
+				// don't call cancelCurrentCommand() here, because that method jacks with the command timer
+				// so we do the work manually
+				
+				// NOTE RHanz:
+				// this is the one place in this class that we're not calling
+				// handleEntryRemoved when we're getting rid of an entry.
+				// It was explicitly removed... if there seems to be a problem
+				// with entries not being removed, this might be the culprit.
+				// Leaving for the time being as it was explicitly removed.
+
+				// NOTE SWyckoff:
+				// Turns out that there were problems with not calling
+				// handleEntryRemoved here that would cause the client to
+				// trigger a cool down even if the command failed. Putting it
+				// back in now.
+
+				// This pop removes commands that were executed last frame and
+				// need to be taken off the queue
+
+				// switch state might have removed elements from the queue and invalidated entry
+				// so we can't assume that we're still safe
+				if(!m_queue.empty() && (&(*(m_queue.begin())) == &entry) && m_queue.begin()->m_command != NULL)
+				{
+					handleEntryRemoved(*(m_queue.begin()), true);
+					m_queue.pop();
+				}
+
+				break;
+			}
+		case State_Warmup:
+			{
+				// do something in script
+				bool result = doWarmupTrigger(entry );
+				
+				if ( result == false )
+				{
+					cancelCurrentCommand();
+				}
+				else
+				{
+					notifyClient();
+				}
+			}
+			break;
+		case State_Execute:
+			{
+				// The matching m_queue.pop() for this doExecute is in the next frame's State_Waiting
+				doExecute(entry );
+			}
+			break;
+		default:
+			FATAL( true, ( "command queue is in an invalid state. value=%d", (int)m_state.get() ) );
+			break;
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommandQueue::doExecute(const CommandQueueEntry &entry )
+{
+	// execute command here
+	m_status            = Command::CEC_Success;
+	m_statusDetail      = 0;
+	
+	// push the command on the stack
+	m_commandStack.push( &entry );
+
+	executeCommand( *entry.m_command, entry.m_targetId, entry.m_params, m_status, m_statusDetail, true );
+
+	FATAL( m_commandStack.empty(), ( "the command stack was empty!  something is horribly wrong with the command queue!" ) );
+	
+	// pop
+	m_commandStack.pop();
+
+	// check to see if the command was not removed from the queue
+	// or if the command failed
+
+	if ( !m_queue.empty() && (*(m_queue.begin())).m_sequenceId == entry.m_sequenceId && m_status == Command::CEC_Success )
+	{
+		// after executing the command, send execute and cooldown times to the client
+		notifyClient();
+	}
+	
+}
+
+// ----------------------------------------------------------------------
+
+void CommandQueue::updateClient(TimerClass timerClass )
+{
+	CreatureObject * const creatureOwner = getServerOwner().asCreatureObject();
+
+	if (   (creatureOwner == NULL)
+	    || !creatureOwner->getClient())
+	{
+		return;
+	}
+
+	//
+	// grab the command that's currently working
+	//
+
+	if ( m_queue.empty() )
+		return;
+
+	const CommandQueueEntry &entry = *(m_queue.begin());
+
+	if ( entry.m_command == 0 ) // woah that's bad news!
+	{
+		WARNING( true, ( "CommandQueue::updateClient(): command was NULL!\n" ) );
+		return;
+	}
+
+	// create a message
+	
+	MessageQueueCommandTimer *msg = new MessageQueueCommandTimer(
+		entry.m_sequenceId,
+		entry.m_command->m_coolGroup,
+		entry.m_command->m_coolGroup2,
+		Crc::normalizeAndCalculate(entry.m_command->m_commandName.c_str()) );
+
+	float currentTimer = 0.f;
+	
+	// figure out what to put in the message based on our current state
+	
+	if ( ( timerClass == TimerClass_Warmup && m_state.get() == State_Warmup ) || ( timerClass == TimerClass_Execute && m_state.get() == State_Execute ) )
+	{
+		currentTimer = static_cast< float > ( s_currentTime - m_eventStartTime.get() );
+	}
+	
+	switch ( timerClass )
+	{
+		case TimerClass_Warmup:
+			msg->setCurrentTime( MessageQueueCommandTimer::F_warmup, currentTimer );
+			msg->setMaxTime    ( MessageQueueCommandTimer::F_warmup, m_commandTimes[ TimerClass_Warmup ] );
+			break;
+		case TimerClass_Execute:
+			msg->setCurrentTime( MessageQueueCommandTimer::F_execute, currentTimer );
+			msg->setMaxTime    ( MessageQueueCommandTimer::F_execute, m_commandTimes[ TimerClass_Execute ] );
+			break;
+		case TimerClass_Cooldown:
+			msg->setCurrentTime( MessageQueueCommandTimer::F_cooldown, currentTimer );
+			msg->setMaxTime    ( MessageQueueCommandTimer::F_cooldown, m_commandTimes[ TimerClass_Cooldown ] );
+			if(static_cast<int>(entry.m_command->m_coolGroup2) != -1)
+			{			
+				msg->setCurrentTime( MessageQueueCommandTimer::F_cooldown2, currentTimer );
+				msg->setMaxTime    ( MessageQueueCommandTimer::F_cooldown2, m_commandTimes[ TimerClass_Cooldown2] );
+			}
+			break;
+		case TimerClass_Cooldown2:
+			DEBUG_WARNING(true, ("MessageQueueCommandTimer: updateClient; don't update cooldown 2 timer directly, please"));
+			break;
+		default:
+			break;
+	}
+	
+	// send message
+
+	creatureOwner->getController()->appendMessage(
+		static_cast< int >( CM_commandTimer ),
+		0.0f,
+		msg,
+		GameControllerMessageFlags::SEND |
+		GameControllerMessageFlags::RELIABLE |
+		GameControllerMessageFlags::DEST_AUTH_CLIENT );
+}
+	
+// ----------------------------------------------------------------------
+
+void CommandQueue::notifyClient()
+{
+	CreatureObject * const creatureOwner = getServerOwner().asCreatureObject();
+
+	if (   (creatureOwner == NULL)
+	    || !creatureOwner->getClient())
+	{
+		return;
+	}
+
+	if ( m_queue.empty() )
+	{
+		WARNING( true, ( "CommandQueue::notifyClient(): queue is empty!\n" ) );
+		return;
+	}
+
+	const CommandQueueEntry &entry = *(m_queue.begin());
+
+	if ( entry.m_command == 0 )
+	{
+		WARNING( true, ( "CommandQueue::notifyClient(): command was NULL!\n" ) );
+		return;
+	}
+
+	MessageQueueCommandTimer *msg = new MessageQueueCommandTimer( entry.m_sequenceId, entry.m_command->m_coolGroup,
+		entry.m_command->m_coolGroup2,
+		Crc::normalizeAndCalculate(entry.m_command->m_commandName.c_str()) );
+
+	DEBUG_REPORT_LOG( cs_debug && creatureOwner->getClient(), ( "%f: CommandQueue::notifyClient() [%f] warmup=%f execute=%f cooldown=%f cooldown2=%f\n",
+		s_currentTime,
+		s_currentTime - m_eventStartTime.get(),
+		m_commandTimes[ TimerClass_Warmup ],
+		m_commandTimes[ TimerClass_Execute ],
+		m_commandTimes[ TimerClass_Cooldown ],
+		m_commandTimes[ TimerClass_Cooldown2 ]) );
+		
+	switch ( m_state.get() )
+	{
+		case State_Warmup:
+			msg->setCurrentTime( MessageQueueCommandTimer::F_warmup, static_cast< float >( s_currentTime - m_eventStartTime.get() ) );
+			msg->setMaxTime    ( MessageQueueCommandTimer::F_warmup, m_commandTimes[ TimerClass_Warmup ] );
+			break;
+		case State_Execute:
+			msg->setCurrentTime( MessageQueueCommandTimer::F_execute, static_cast< float >( s_currentTime - m_eventStartTime.get() ) );
+			msg->setMaxTime    ( MessageQueueCommandTimer::F_execute, m_commandTimes[ TimerClass_Execute ] );
+			msg->setCurrentTime( MessageQueueCommandTimer::F_cooldown, 0.f );
+			msg->setMaxTime    ( MessageQueueCommandTimer::F_cooldown, m_commandTimes[ TimerClass_Cooldown ] );
+			msg->setCurrentTime( MessageQueueCommandTimer::F_cooldown2, 0.f );
+			msg->setMaxTime    ( MessageQueueCommandTimer::F_cooldown2, m_commandTimes[ TimerClass_Cooldown2 ] );
+			break;
+		default:
+			break;
+	}
+
+	creatureOwner->getController()->appendMessage(
+		static_cast< int >( CM_commandTimer ),
+		0.0f,
+		msg,
+		GameControllerMessageFlags::SEND |
+		GameControllerMessageFlags::RELIABLE |
+		GameControllerMessageFlags::DEST_AUTH_CLIENT );
+
+}
+
+// ----------------------------------------------------------------------
+
+bool CommandQueue::doWarmupTrigger(const CommandQueueEntry &entry )
+{
+	bool result = false;
+
+	// make sure we could actually execute this command
+	
+	m_status       = Command::CEC_Success;
+	m_statusDetail = 0;
+
+	CreatureObject * const creatureOwner = getServerOwner().asCreatureObject();
+	
+	if (creatureOwner != NULL)
+	{
+		creatureOwner->doWarmupChecks( *entry.m_command, entry.m_targetId, entry.m_params, m_status, m_statusDetail );
+	
+		// if everything is okay, start the warmup trigger
+			
+		if ( m_status == Command::CEC_Success )
+		{
+			FATAL( entry.m_command == 0, ( "entry had a null command\n" ) );
+		
+			std::vector<float> timeValues;
+			timeValues.push_back( entry.m_command->m_warmTime );
+			timeValues.push_back( entry.m_command->m_execTime );
+			timeValues.push_back( getCooldownTime(*entry.m_command) );
+			timeValues.push_back( entry.m_command->m_coolTime2 );
+		
+			ScriptParams params;
+		
+			std::string entryParams( Unicode::wideToNarrow( entry.m_params ) );
+			
+			params.addParam( entry.m_command->m_commandName.c_str() );
+			params.addParam( (int)entry.m_command->m_coolGroup );
+			params.addParam( (int)entry.m_command->m_coolGroup2 );
+			params.addParam( timeValues );
+			params.addParam( entryParams.c_str() );
+			params.addParam( entry.m_targetId );
+			
+			result = SCRIPT_OVERRIDE != creatureOwner->getScriptObject()->trigAllScripts( Scripting::TRIG_BEGIN_WARMUP, params );
+		}
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+uint32 CommandQueue::getCurrentCommand() const
+{
+	if ( m_queue.empty() )
+	{
+		return 0;
+	}
+	
+	const CommandQueueEntry &entry = *(m_queue.begin());
+	
+	if ( entry.m_command == 0 )
+	{
+		WARNING( true, ( "CommandQueue::getCurrentCommand(): command was NULL!\n" ) );
+		return 0;
+	}
+
+	return Crc::calculate( entry.m_command->m_commandName.c_str() );
+}
+
+// ----------------------------------------------------------------------
+
+void CommandQueue::switchState()
+{
+	if ( m_queue.empty() )
+	{
+		WARNING( true, ( "CommandQueue::switchState(): queue is empty!\n" ) );
+		return;
+	}
+
+	const CommandQueueEntry &entry = *(m_queue.begin());
+
+	if ( entry.m_command == 0 )
+	{
+		WARNING( true, ( "CommandQueue::switchState(): command was NULL!\n" ) );
+		return;
+	}
+
+#if defined(COMMAND_QUEUE_ENTRY_LOGGING)
+	CommandQueueEntry const entryCopy = entry;
+#endif
+
+	m_eventStartTime = s_currentTime;
+	
+	const unsigned int savedQueueSize = m_queue.size();
+	switch ( m_state.get() )
+	{
+		case State_Waiting:
+			// set timing info for execute and cooldown timers
+			m_commandTimes.set( TimerClass_Execute, entry.m_command->m_execTime );
+			m_commandTimes.set( TimerClass_Cooldown, getCooldownTime(*entry.m_command) );
+			m_commandTimes.set( TimerClass_Cooldown2, entry.m_command->m_coolTime2 );
+
+			DEBUG_REPORT_LOG( cs_debug, ( "CommandQueue::switchState(): cooldown timer setting id=%lu time=%f id2=%lu time2=%f\n", entry.m_command->m_coolGroup, getCooldownTime(*entry.m_command),
+				entry.m_command->m_coolGroup2, entry.m_command->m_coolTime2) );
+			
+			if ( entry.m_command->m_warmTime < FLT_EPSILON )
+			{
+				if( entry.m_command->m_execTime < FLT_EPSILON )
+				{
+					// skipping both warmup and execute if both the timers are 0					
+					m_nextEventTime = s_currentTime;
+
+					doExecute(entry );
+
+					bool entryIsTopOfQueue = true;
+					
+					if (!m_queue.empty())
+					{
+						entryIsTopOfQueue = &(*(m_queue.begin())) == &entry;
+
+#if defined(COMMAND_QUEUE_ENTRY_LOGGING)
+						if (!entryIsTopOfQueue && m_queue.size() == savedQueueSize)
+						{
+							REPORT_LOG(true, ("CommandQueue::switchState():QUEUE_ENTRY_INVALID: Entry does not match top of queue!\n"));
+
+							Object const * const target = NetworkIdManager::getObjectById(entryCopy.m_targetId);
+							bool const targetIsAuthoritative = target && target->isAuthoritative();
+
+							REPORT_LOG(true, ("CommandQueue::switchState():QUEUE_ENTRY_COMMAND: commandName=[%s] commandHash=[%lu] owner=[%s][%s][%s] target=[%s][%s][%s] sequenceId=[%lu] params=[%s] clearable=[%s] priority=[%d]\n",
+								entryCopy.m_command ? entryCopy.m_command->m_commandName.c_str() : "NULL",
+								entryCopy.m_command ? entryCopy.m_command->m_commandHash : 0,
+								NameManager::getInstance().getPlayerName(getOwner().getNetworkId()).c_str(),
+								getOwner().getNetworkId().getValueString().c_str(),
+								getOwner().isAuthoritative() ? "auth" : "proxy",
+								NameManager::getInstance().getPlayerName(entryCopy.m_targetId).c_str(),
+								entryCopy.m_targetId.getValueString().c_str(),
+								targetIsAuthoritative ? "auth" : "proxy",
+								entryCopy.m_sequenceId,
+								Unicode::wideToNarrow(entryCopy.m_params).c_str(),
+								entryCopy.m_clearable ? "true" : "false",
+								entryCopy.m_priority)
+								);
+
+							REPORT_LOG(true, ("CommandQueue::switchState():QUEUE_ENTRY_QUEUE: state=State_Waiting queueSize=%d\n", m_queue.size()));
+
+							EntryList::const_iterator itEntry = m_queue.begin();
+
+							for (; itEntry != m_queue.end(); ++itEntry)
+							{
+								REPORT_LOG(true, ("CommandQueue::switchState():QUEUE_ENTRY_QUEUE: commandName=[%s]\n", itEntry->m_command ? itEntry->m_command->m_commandName.c_str() : "NULL"));
+							}
+						}
+#endif
+					}
+					else
+						entryIsTopOfQueue = false;
+
+					//Check the size of the queue.  If it has shrunk then it means the entry was popped off the queue by cancelCurrentCommand,
+					//most likely because the command failed.  If this is the case, do not perform the following actions.
+					if (m_queue.size() == savedQueueSize && entryIsTopOfQueue)
+					{
+						m_state = State_Waiting;
+
+						// set the cooldown timer for this command group			
+						m_cooldowns.set( entry.m_command->m_coolGroup, std::make_pair( s_currentTime, s_currentTime + m_commandTimes[ TimerClass_Cooldown ] ) );
+						m_cooldowns.set( entry.m_command->m_coolGroup2, std::make_pair( s_currentTime, s_currentTime + m_commandTimes[ TimerClass_Cooldown2 ] ) );
+
+						// if the cool down value is large enough, persist it across
+						// server restarts and character unloading and reloading from the DB
+						if ( static_cast<int>( m_commandTimes[ TimerClass_Cooldown ] ) >= ConfigServerGame::getCoolDownPersistThresholdSeconds() )
+						{
+							persistCooldown( entry.m_command->m_coolGroup, static_cast<int>( m_commandTimes[ TimerClass_Cooldown ] ) );
+						}
+
+						if ( static_cast<int>( m_commandTimes[ TimerClass_Cooldown2 ] ) >= ConfigServerGame::getCoolDownPersistThresholdSeconds() )
+						{
+							persistCooldown( entry.m_command->m_coolGroup2, static_cast<int>( m_commandTimes[ TimerClass_Cooldown2 ] ) );
+						}
+
+						DEBUG_REPORT_LOG( cs_debug, ( "CommandQueue::switchState(): Waiting->Waiting all the way around : m_nextEventTime=%f m_commandTime=%f m_execTime=%f\n",
+							m_nextEventTime.get(),
+							m_commandTimes[ TimerClass_Execute ],
+							entry.m_command->m_execTime ) );
+						handleEntryRemoved(entry, true);
+						m_queue.pop();
+					}
+				}
+				else
+				{
+				
+					// here we skip the warmup state if the default warmup timer is 0
+					m_state = State_Execute;
+					
+					m_nextEventTime = s_currentTime + entry.m_command->m_execTime;
+					
+					m_commandTimes.set( TimerClass_Warmup, 0.f );
+					
+					DEBUG_REPORT_LOG( cs_debug, ( "CommandQueue::switchState(): Waiting->Execute\n" ) );
+				}
+			}
+			else
+			{
+				// otherwise we set up the warmup time
+				m_state = State_Warmup;
+
+				// set the command time state
+				// m_commandTimes[ TimerClass_Warmup ] = entry.m_command->m_warmTime;
+				m_commandTimes.set( TimerClass_Warmup, entry.m_command->m_warmTime );
+				
+				// update the next event time value
+				
+				m_nextEventTime = s_currentTime + entry.m_command->m_warmTime;
+					
+				DEBUG_REPORT_LOG( cs_debug, ( "CommandQueue::switchState(): Waiting->Warmup\n" ) );
+			}
+			
+			break;
+
+		case State_Warmup:
+		
+			if(entry.m_command->m_execTime < FLT_EPSILON)
+			{
+				m_nextEventTime = s_currentTime;
+
+				doExecute(entry );
+
+				bool entryIsTopOfQueue = true;
+
+				if (!m_queue.empty())
+				{
+					entryIsTopOfQueue = &(*(m_queue.begin())) == &entry;
+
+#if defined(COMMAND_QUEUE_ENTRY_LOGGING)
+					if (!entryIsTopOfQueue && m_queue.size() == savedQueueSize)
+					{
+						REPORT_LOG(true, ("CommandQueue::switchState():QUEUE_ENTRY_INVALID: Entry does not match top of queue!\n"));
+
+						Object const * const target = NetworkIdManager::getObjectById(entryCopy.m_targetId);
+						bool const targetIsAuthoritative = target && target->isAuthoritative();
+
+						REPORT_LOG(true, ("CommandQueue::switchState():QUEUE_ENTRY_COMMAND: commandName=[%s] commandHash=[%lu] owner=[%s][%s][%s] target=[%s][%s][%s] sequenceId=[%lu] params=[%s] clearable=[%s] priority=[%d]\n",
+							entryCopy.m_command ? entryCopy.m_command->m_commandName.c_str() : "NULL",
+							entryCopy.m_command ? entryCopy.m_command->m_commandHash : 0,
+							NameManager::getInstance().getPlayerName(getOwner().getNetworkId()).c_str(),
+							getOwner().getNetworkId().getValueString().c_str(),
+							getOwner().isAuthoritative() ? "auth" : "proxy",
+							NameManager::getInstance().getPlayerName(entryCopy.m_targetId).c_str(),
+							entryCopy.m_targetId.getValueString().c_str(),
+							targetIsAuthoritative ? "auth" : "proxy",
+							entryCopy.m_sequenceId,
+							Unicode::wideToNarrow(entryCopy.m_params).c_str(),
+							entryCopy.m_clearable ? "true" : "false",
+							entryCopy.m_priority)
+							);
+
+						REPORT_LOG(true, ("CommandQueue::switchState():QUEUE_ENTRY_QUEUE: state=State_Warmup queueSize=%d\n", m_queue.size()));
+
+						EntryList::const_iterator itEntry = m_queue.begin();
+
+						for (; itEntry != m_queue.end(); ++itEntry)
+						{
+							REPORT_LOG(true, ("CommandQueue::switchState():QUEUE_ENTRY_QUEUE: commandName=[%s]\n", itEntry->m_command ? itEntry->m_command->m_commandName.c_str() : "NULL"));
+						}
+					}
+#endif
+				}
+				else
+					entryIsTopOfQueue = false;
+
+				//Check the size of the queue.  If it has shrunk then it means the entry was popped off the queue by cancelCurrentCommand,
+				//most likely because the command failed.  If this is the case, do not perform the following actions.
+				if (m_queue.size() == savedQueueSize && entryIsTopOfQueue)
+				{
+					m_state = State_Waiting;
+
+					// set the cooldown timer for this command group			
+					m_cooldowns.set( entry.m_command->m_coolGroup, std::make_pair( s_currentTime, s_currentTime + m_commandTimes[ TimerClass_Cooldown ] ) );
+					m_cooldowns.set( entry.m_command->m_coolGroup2, std::make_pair( s_currentTime, s_currentTime + m_commandTimes[ TimerClass_Cooldown2 ] ) );
+					
+					// if the cool down value is large enough, persist it across
+					// server restarts and character unloading and reloading from the DB
+					if ( static_cast<int>( m_commandTimes[ TimerClass_Cooldown ] ) >= ConfigServerGame::getCoolDownPersistThresholdSeconds() )
+					{
+						persistCooldown( entry.m_command->m_coolGroup, static_cast<int>( m_commandTimes[ TimerClass_Cooldown ] ) );
+					}
+
+					if ( static_cast<int>( m_commandTimes[ TimerClass_Cooldown2 ] ) >= ConfigServerGame::getCoolDownPersistThresholdSeconds() )
+					{
+						persistCooldown( entry.m_command->m_coolGroup2, static_cast<int>( m_commandTimes[ TimerClass_Cooldown2 ] ) );
+					}
+
+					DEBUG_REPORT_LOG( cs_debug, ( "CommandQueue::switchState(): Warmup->Waiting m_nextEventTime=%f m_commandTime=%f m_execTime=%f\n",
+						m_nextEventTime.get(),
+						m_commandTimes[ TimerClass_Execute ],
+						entry.m_command->m_execTime ) );
+				}
+			}
+			else
+			{			
+				m_state = State_Execute;
+				
+				m_nextEventTime = s_currentTime + entry.m_command->m_execTime;
+				
+				DEBUG_REPORT_LOG( cs_debug, ( "CommandQueue::switchState(): Warmup->Execute m_nextEventTime=%f m_commandTime=%f m_execTime=%f\n",
+					m_nextEventTime.get(),
+					m_commandTimes[ TimerClass_Execute ],
+					entry.m_command->m_execTime ) );
+					
+			}
+			break;
+
+	case State_Execute:
+
+			m_state = State_Waiting;
+			
+			// set the cooldown timer for this command group			
+			m_cooldowns.set( entry.m_command->m_coolGroup, std::make_pair( s_currentTime, s_currentTime + m_commandTimes[ TimerClass_Cooldown ] ) );
+			m_cooldowns.set( entry.m_command->m_coolGroup2, std::make_pair( s_currentTime, s_currentTime + m_commandTimes[ TimerClass_Cooldown2 ] ) );
+			
+			DEBUG_REPORT_LOG( cs_debug, ( "CommandQueue::switchState(): Execute->%s\n", getStateAsString( (State)m_state.get() )  ) );
+
+			// if the cool down value is large enough, persist it across
+			// server restarts and character unloading and reloading from the DB
+			if ( static_cast<int>( m_commandTimes[ TimerClass_Cooldown ] ) >= ConfigServerGame::getCoolDownPersistThresholdSeconds() )
+			{
+				persistCooldown( entry.m_command->m_coolGroup, static_cast<int>( m_commandTimes[ TimerClass_Cooldown ] ) );
+			}
+
+			if ( static_cast<int>( m_commandTimes[ TimerClass_Cooldown2 ] ) >= ConfigServerGame::getCoolDownPersistThresholdSeconds() )
+			{
+				persistCooldown( entry.m_command->m_coolGroup2, static_cast<int>( m_commandTimes[ TimerClass_Cooldown2 ] ) );
+			}
+
+			break;
+			
+		default:
+			WARNING( true, ( "CommandQueue::switchState(): queue is in an invalid state!\n" ) );
+			break;
+	}
+
+}
+
+// ----------------------------------------------------------------------
+
+void CommandQueue::clearPendingCombatCommands()
+{
+	DEBUG_REPORT_LOG( cs_debug, ( "%s: attempting to cancel pending commands (queueSize=%d)\n", Unicode::wideToNarrow( getServerOwner().getObjectName() ).c_str(), m_queue.size() ) );
+	
+	for ( EntryList::iterator it = m_queue.begin(); it != m_queue.end(); )
+	{
+		EntryList::iterator j = it++;
+		
+		const CommandQueueEntry &entry = *j;
+
+		// if ( command is combat command )
+		// {
+		//    if ( ( command is at the top and is not executing ) or ( command is not at the top )
+		//    {
+		//       remove command		
+		//    }
+		// }
+
+		if ( entry.m_command->m_addToCombatQueue && ( j != m_queue.begin() || m_state.get() != State_Execute ) )
+		{
+
+			handleEntryRemoved(entry );
+			
+			if ( j == m_queue.begin() )
+			{
+				cancelCurrentCommand();
+			}
+			else
+			{
+				m_queue.erase( j );
+			}
+
+		}
+
+	}
+	
+}
+
+// ----------------------------------------------------------------------
+
+void CommandQueue::persistCooldown(uint32 cooldownGroupCrc, int cooldownTimeSeconds)
+{
+	if (cooldownTimeSeconds <= 0)
+		return;
+
+	CreatureObject * const creatureOwner = getServerOwner().asCreatureObject();
+	if (!creatureOwner)
+		return;
+
+	int const currentGameTime = static_cast<int>(ServerClock::getInstance().getGameTimeSeconds());
+
+	char buffer[256];
+
+	snprintf(buffer, sizeof(buffer)-1, "commandCooldown.beginTime.%lu", cooldownGroupCrc);
+	buffer[sizeof(buffer)-1] = '\0';
+	std::string const coolDownBeginTime = buffer;
+
+	snprintf(buffer, sizeof(buffer)-1, "commandCooldown.endTime.%lu", cooldownGroupCrc);
+	buffer[sizeof(buffer)-1] = '\0';
+	std::string const coolDownEndTime = buffer;
+
+	IGNORE_RETURN(creatureOwner->setObjVarItem(coolDownBeginTime, currentGameTime));
+	IGNORE_RETURN(creatureOwner->setObjVarItem(coolDownEndTime, (currentGameTime + cooldownTimeSeconds)));
+}
+
+// ----------------------------------------------------------------------
+
+void CommandQueue::depersistCooldown()
+{
+	CreatureObject * const creatureOwner = getServerOwner().asCreatureObject();
+	if (!creatureOwner)
+		return;
+
+	DynamicVariableList const & objvars = creatureOwner->getObjVars();
+	std::map<uint32, std::pair<int, int> > commandCooldownTimers;
+	for (DynamicVariableList::MapType::const_iterator iterObjVar = objvars.begin(); iterObjVar != objvars.end(); ++iterObjVar)
+	{
+		if (iterObjVar->first.find("commandCooldown.beginTime.") == 0)
+		{
+			uint32 cooldownGroupCrc = 0;
+			if (1 == sscanf(iterObjVar->first.c_str(), "commandCooldown.beginTime.%lu", &cooldownGroupCrc))
+			{
+				int beginTime = 0;
+				if (iterObjVar->second.get(beginTime))
+				{
+					std::map<uint32, std::pair<int, int> >::iterator iterFind = commandCooldownTimers.find(cooldownGroupCrc);
+					if (iterFind == commandCooldownTimers.end())
+					{
+						commandCooldownTimers[cooldownGroupCrc] = std::make_pair(beginTime, 0);
+					}
+					else
+					{
+						iterFind->second.first = beginTime;
+					}
+				}
+			}
+		}
+		else if (iterObjVar->first.find("commandCooldown.endTime.") == 0)
+		{
+			uint32 cooldownGroupCrc = 0;
+			if (1 == sscanf(iterObjVar->first.c_str(), "commandCooldown.endTime.%lu", &cooldownGroupCrc))
+			{
+				int endTime = 0;
+				if (iterObjVar->second.get(endTime))
+				{
+					std::map<uint32, std::pair<int, int> >::iterator iterFind = commandCooldownTimers.find(cooldownGroupCrc);
+					if (iterFind == commandCooldownTimers.end())
+					{
+						commandCooldownTimers[cooldownGroupCrc] = std::make_pair(0, endTime);
+					}
+					else
+					{
+						iterFind->second.second = endTime;
+					}
+				}
+			}
+		}
+	}
+
+	char buffer[256];
+	int const currentGameTime = static_cast<int>(ServerClock::getInstance().getGameTimeSeconds());
+	double const currentTime = Clock::getCurrentTime();
+	for (std::map<uint32, std::pair<int, int> >::const_iterator iterCooldown = commandCooldownTimers.begin(); iterCooldown != commandCooldownTimers.end(); ++iterCooldown)
+	{
+		// update the command queue with any unexpired cooldowns
+		if ((iterCooldown->second.first > 0) && (iterCooldown->second.second > 0) && (iterCooldown->second.first <= currentGameTime) && (currentGameTime < iterCooldown->second.second))
+		{
+			m_cooldowns.set(iterCooldown->first, std::make_pair(currentTime - static_cast<double>(currentGameTime - iterCooldown->second.first), currentTime + static_cast<double>(iterCooldown->second.second - currentGameTime)));
+		}
+		else
+		{
+			// cleanup the objvars for any expired/invalid cooldowns
+			snprintf(buffer, sizeof(buffer)-1, "commandCooldown.beginTime.%lu", iterCooldown->first);
+			buffer[sizeof(buffer)-1] = '\0';
+			creatureOwner->removeObjVarItem(buffer);
+
+			snprintf(buffer, sizeof(buffer)-1, "commandCooldown.endTime.%lu", iterCooldown->first);
+			buffer[sizeof(buffer)-1] = '\0';
+			creatureOwner->removeObjVarItem(buffer);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool CommandQueue::hasCommandFromGroup(uint32 groupHash) const
+{
+	for (EntryList::const_iterator i = m_queue.begin(); i != m_queue.end(); ++i)
+		if ((*i).m_command->m_commandGroup == groupHash)
+			return true;
+	return false;
+}
+
+
+// ----------------------------------------------------------------------
+
+void CommandQueue::clearCommandsFromGroup(uint32 groupHash, bool force)
+{
+	
+	// iterate over each command in the queue
+	for ( EntryList::iterator it = m_queue.begin(); it != m_queue.end(); /* nil */ )
+	{
+		EntryList::iterator j = it++;
+		
+		const CommandQueueEntry &entry = *j;
+		
+		if ( entry.m_command->m_commandGroup == groupHash && ( force || entry.m_clearable ) )
+		{
+			// decrement the combat entry count if this is a combat command
+			// and update client
+			handleEntryRemoved(entry );
+
+			// if this is the top of the queue, we need to put the queue into a waiting state
+			if ( j == m_queue.begin() )
+			{
+				cancelCurrentCommand();
+			}
+			else
+			{
+				// remove item from queue
+				m_queue.erase( j );
+			}
+
+		}
+	}
+			
+}
+
+// ----------------------------------------------------------------------
+
+void CommandQueue::handleEntryRemoved(CommandQueueEntry const &entry, bool notifyClient)
+{
+	DEBUG_REPORT_LOG( cs_debug, ( "CommandQueue::handleEntryRemoved(%s, %d)\n", entry.m_command->m_commandName.c_str(), notifyClient ? 1 : 0 ) );
+
+	ServerObject const & serverOwner = getServerOwner();
+	
+	if ( entry.m_command->m_addToCombatQueue && ( m_combatCount.get() > 0 ) )
+	{
+		m_combatCount = m_combatCount.get() - 1;
+	}
+
+
+	// If we have a sequenceId, then the owner's client is interested in
+	// hearing about the removal of that command.
+	if (serverOwner.isAuthoritative() && notifyClient)
+	{
+		notifyClientOfCommandRemoval(entry.m_sequenceId, 0.0f, m_status, m_statusDetail);
+	}
+	
+}
+
+// ----------------------------------------------------------------------
+
+void CommandQueue::notifyClientOfCommandRemoval(uint32 sequenceId, float waitTime, Command::ErrorCode status, int statusDetail)
+{
+	DEBUG_REPORT_LOG( cs_debug, ( "CommandQueue::notifyClientOfCommandRemoval(%d, %f, %d, %d)\n", static_cast<int>(sequenceId), waitTime, status, statusDetail ) );
+
+	CreatureObject * const creatureOwner = getServerOwner().asCreatureObject();
+
+	if (   (creatureOwner != NULL)
+	    && creatureOwner->getClient()
+	    && (sequenceId != 0))
+	{
+		WARNING(status < 0 || status >= Command::CEC_Max, ("CommandQueue::notifyClientOfCommandRemoval received invalid status %d", static_cast<int>(status)));
+
+		creatureOwner->getController()->appendMessage(
+			static_cast<int>(CM_commandQueueRemove),
+			0.0f,
+			new MessageQueueCommandQueueRemove(sequenceId, waitTime, static_cast<int>(status), statusDetail),
+			GameControllerMessageFlags::SEND |
+			GameControllerMessageFlags::RELIABLE |
+			GameControllerMessageFlags::DEST_AUTH_CLIENT);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+const char *CommandQueue::getStateAsString( State state )
+{
+	static const char * states[] =
+	{
+		"waiting",
+		"warmup",
+		"execute",
+		"?unknown?"
+	};
+
+	if ( state > State_MAX )
+	{
+		state = State_MAX;
+	}
+
+	return states[ state ];
+}
+
+// ----------------------------------------------------------------------
+
+bool CommandQueue::setCommandTimerValue(TimerClass timerClass, float newValue )
+{
+	FATAL( timerClass >= (int)m_commandTimes.size(), ( "CommandQueue::setCommandTimerValue(): invalid timer class %d\n", timerClass ) );
+	
+	FATAL( fabsf( newValue ) > cs_secondsPerDay, ( "tried to set a command timer outside allowed range. (value=%f)\n", newValue ) );
+	
+	if ( m_state.get() == State_Waiting )
+	{
+		return false;
+	}
+	
+	if ( ( timerClass == TimerClass_Warmup && m_state.get() == State_Warmup ) || ( timerClass == TimerClass_Execute && m_state.get() == State_Execute ) )
+	{
+		m_nextEventTime = m_eventStartTime.get() + newValue;
+	}
+
+	m_commandTimes.set( timerClass, newValue );
+	
+	DEBUG_REPORT_LOG( cs_debug, ( "CommandQueue::setCommandTimerValue() timerClass=%d m_nextEventTime=%f newValue=%f\n", timerClass, m_nextEventTime.get(), newValue ) );
+	
+	updateClient(timerClass );
+	
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void CommandQueue::cancelCurrentCommand()
+{
+	DEBUG_REPORT_LOG( cs_debug, ( "CommandQueue::cancelCurrentCommand()\n" ) );
+
+	WARNING( m_queue.empty(), ( "queue was empty.\n " ) );
+
+	if ( !m_queue.empty() )
+	{
+		const CommandQueueEntry &entry = *(m_queue.begin());
+		m_nextEventTime = 0.f;
+		m_status = Command::CEC_Cancelled;
+		m_state = State_Waiting;
+		handleEntryRemoved(entry, true);
+		m_queue.pop();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+CommandQueue::State CommandQueue::getCurrentCommandState() const
+{
+	return (State)m_state.get();
+}
+
+// ----------------------------------------------------------------------
+
+void CommandQueue::addToPackage(Archive::AutoDeltaByteStream &bs)
+{
+	bs.addVariable(m_queue);
+	bs.addVariable(m_state);
+	bs.addVariable(m_nextEventTime);
+	bs.addVariable(m_combatCount);
+	bs.addVariable(m_eventStartTime);
+	bs.addVariable(m_cooldowns);
+	bs.addVariable(m_commandTimes);
+}
+
+// ----------------------------------------------------------------------
+
+float CommandQueue::getCooldownTimeLeft( uint32 cooldownId ) const
+{
+	CooldownMapType::const_iterator it = m_cooldowns.find( cooldownId );
+
+	float result = 0.f;
+		
+	if ( it != m_cooldowns.end() )
+	{
+		result = static_cast< float > ( (*it).second.second - Clock::getCurrentTime() );
+	}
+	
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+float CommandQueue::getCooldownTimeLeft( const std::string &name ) const
+{
+	return getCooldownTimeLeft( Crc::normalizeAndCalculate( name.c_str() ) );
+}
+
+//-----------------------------------------------------------------------
+
+void CommandQueue::executeCommand(Command const &command, NetworkId const &targetId, Unicode::String const &params, Command::ErrorCode &status, int &statusDetail, bool commandIsFromCommandQueue)
+{
+	DEBUG_REPORT_LOG( cs_debug, ( "%f: CommandQueue::executeCommand(%s, %s, %s, %d, %d)\n",
+		Clock::getCurrentTime(),
+		command.m_commandName.c_str(),
+		targetId.getValueString().c_str(),
+		Unicode::wideToNarrow(params).c_str(),
+		status,
+		statusDetail));
+
+	status = Command::CEC_Success;
+
+	static bool s_tradeAllowedCommandsInit = false;
+	typedef stdvector<uint32>::fwd Uint32Vector;
+	static Uint32Vector s_tradeAllowedCommands;
+
+	if (!s_tradeAllowedCommandsInit)
+	{
+		s_tradeAllowedCommandsInit = true;
+
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("addFriend"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("addIgnore"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("closeContainer"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("combatSpam"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("find"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("gc"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("getAttributes"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("getAttributesBatch"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("getFriendList"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("getIgnoreList"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("groupChat"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("groupChat"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("gsay"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("gtell"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("guildsay"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("kneel"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("maskscent"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("meditate"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("newbiehelper"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("openContainer"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("prose"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("removeFriend"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("removeIgnore"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("requestBiography"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("requestCharacterMatch"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("requestDraftSlots"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("requestManfSchematicSlots"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("requestResourceWeights"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("setMatchMakingCharacterId"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("setMatchMakingPersonalId"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("setMood"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("setMoodInternal"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("setSpokenLanguage"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("sitServer"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("social"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("socialInternal"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("spatialChat"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("spatialChatInternal"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("stand"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("synchronizedUiListen"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("synchronizedUiStopListening"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("target"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("tip"));
+		s_tradeAllowedCommands.push_back (Crc::normalizeAndCalculate("waypoint"));
+
+		s_tradeAllowedCommands.push_back (CommandTable::getNullCommand().m_commandHash);
+
+		std::sort (s_tradeAllowedCommands.begin (), s_tradeAllowedCommands.end ());
+	}
+
+	CreatureObject * const creatureOwner = getServerOwner().asCreatureObject();
+
+	if (creatureOwner != NULL)
+	{
+		CreatureController * const creatureController = creatureOwner->getCreatureController();
+		if (creatureController && creatureController->getSecureTrade())
+		{
+			if (!std::binary_search (s_tradeAllowedCommands.begin (), s_tradeAllowedCommands.end (), command.m_commandHash))
+			{
+				LOG ("Command", ("CreatureObject [%s] trade canceled by [%s] command", creatureOwner->getNetworkId ().getValueString ().c_str (), command.m_commandName.c_str ()));
+
+				creatureController->getSecureTrade()->cancelTrade(*creatureOwner);
+			}
+		}
+
+		// posture and ability verification - don't execute the command
+		// if we're in a posture for which the command is not valid, or
+		// we do not have the ability required for the command (if any)
+		creatureOwner->doWarmupChecks( command, targetId, params, status, statusDetail );
+		
+		if (status == Command::CEC_Success && command.m_godLevel > 0)
+		{
+			Client const *client = creatureOwner->getClient();
+			if (!client)
+			{
+				status = Command::CEC_GodLevel;
+				LOGU("CustomerService", ("Avatar:%s tried to execute command %s >%s with no client", PlayerObject::getAccountDescription(creatureOwner).c_str(), command.m_commandName.c_str(), targetId.getValueString().c_str()), params);
+			}
+			else if (client->getGodLevel() < command.m_godLevel)
+			{
+				status = Command::CEC_GodLevel;
+				LOGU("CustomerService", ("Avatar:%s doesn't have adequate level for command %s >%s", PlayerObject::getAccountDescription(creatureOwner).c_str(), command.m_commandName.c_str(), targetId.getValueString().c_str()), params);
+			}
+			else
+			{
+				LOGU("CustomerService", ("Avatar:%s has executed command %s >%s", PlayerObject::getAccountDescription(creatureOwner).c_str(), command.m_commandName.c_str(), targetId.getValueString().c_str()), params);
+			}
+		}
+	}
+
+	TangibleObject * const tangibleOwner = getServerOwner().asTangibleObject();
+
+	if (tangibleOwner != NULL)
+	{
+		// Really execute the command - swap targets if necessary, and call
+		// forceExecuteCommand (which will handle messaging if not authoritative)
+		if (status == Command::CEC_Success)
+		{
+			if (!command.m_callOnTarget)
+			{
+				DEBUG_REPORT_LOG( cs_debug, ( "CommandQueue::executeCommand(): tangibleOwner->forceExecuteCommand(%s, %s, %s, %d)\n",
+					command.m_commandName.c_str(),
+					targetId.getValueString().c_str(),
+					Unicode::wideToNarrow(params).c_str(),
+					status));
+
+				tangibleOwner->forceExecuteCommand(command, targetId, params, status, commandIsFromCommandQueue);
+			}
+
+			else
+			{
+				TangibleObject * const tangibleTarget = TangibleObject::getTangibleObject(targetId);
+
+				if (tangibleTarget)
+				{
+					DEBUG_REPORT_LOG( cs_debug, ( "CommandQueue::executeCommand(): tangibleTarget->forceExecuteCommand(%s, %s, %s, %d)\n",
+						command.m_commandName.c_str(),
+						tangibleOwner->getNetworkId().getValueString().c_str(),
+						Unicode::wideToNarrow(params).c_str(),
+						status));
+
+					tangibleTarget->forceExecuteCommand(command, tangibleOwner->getNetworkId(), params, status, commandIsFromCommandQueue);
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+CommandQueue * CommandQueue::getCommandQueue(Object & object)
+{
+	Property * const property = object.getProperty(getClassPropertyId());
+
+	return (property != NULL) ? (static_cast<CommandQueue *>(property)) : NULL;
+}
+
+// ----------------------------------------------------------------------
+ServerObject & CommandQueue::getServerOwner()
+{
+	return *getOwner().asServerObject();
+}
+
+// ----------------------------------------------------------------------
+
+ServerObject const & CommandQueue::getServerOwner() const
+{
+	return *getOwner().asServerObject();
+}
+
+// ----------------------------------------------------------------------
+
+float CommandQueue::getCooldownTime(Command const &command)
+{
+	if(command.isPrimaryCommand())
+	{
+		CreatureObject * const creature = getServerOwner().asCreatureObject();
+		if(creature)
+		{
+			WeaponObject *weapon = creature->getCurrentWeapon();
+			if(weapon)
+				return weapon->getAttackTime();
+		}
+	}
+	return command.m_coolTime;
+}
+
+// ----------------------------------------------------------------------
+
+void CommandQueue::resetCooldowns()
+{
+	m_commandTimes.set( TimerClass_Cooldown, 0.0f );
+	updateClient( TimerClass_Cooldown );
+	for (CooldownMapType::const_iterator iterCooldown = m_cooldowns.begin(); iterCooldown != m_cooldowns.end(); ++iterCooldown)
+	{
+		//has not expired
+		if((*iterCooldown).second.second > (Clock::getCurrentTime() + FLT_EPSILON))
+		{
+			//Reset the end of the cooldown to be right now
+			m_cooldowns.set( (*iterCooldown).first, std::make_pair( (*iterCooldown).second.first, Clock::getCurrentTime() ) );
+
+			//notify client
+			MessageQueueCommandTimer *msg = new MessageQueueCommandTimer(
+				0,
+				(*iterCooldown).first,
+				-1,
+				0 );
+			
+			msg->setCurrentTime(MessageQueueCommandTimer::F_cooldown, 1.0f);
+			msg->setMaxTime    (MessageQueueCommandTimer::F_cooldown, 1.0f);
+
+			CreatureObject * const creature = getServerOwner().asCreatureObject();
+			if(creature)
+			{			
+				creature->getController()->appendMessage(
+					static_cast< int >( CM_commandTimer ),
+					0.0f,
+					msg,
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_CLIENT);
+			}
+
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommandQueue::spew(std::string * output)
+{
+	CreatureObject * const creature = getServerOwner().asCreatureObject();
+	if(creature)
+	{
+		FormattedString<1024> fsOutput;
+		char const * fsSprintfOutput;
+		double const currentTime = Clock::getCurrentTime();
+
+		fsSprintfOutput = fsOutput.sprintf("%s current time [%.10f], m_queue size [%d], m_cooldowns size [%d], m_combatCount [%u]", creature->getNetworkId().getValueString().c_str(), currentTime, m_queue.size(), m_cooldowns.size(), m_combatCount.get());
+		if (output)
+		{
+			*output += fsSprintfOutput;
+			*output += "\n";
+		}
+		else
+		{
+			LOG("CommandQueueSpew", ("%s", fsSprintfOutput));
+		}
+
+		for ( EntryList::iterator it = m_queue.begin(); it != m_queue.end(); )
+		{
+			EntryList::iterator j = it++;
+			
+			const CommandQueueEntry &entry = *j;
+
+			fsSprintfOutput = fsOutput.sprintf("%s commandName [%s] hash[%lu] cd1[%lu] cd2[%lu]",
+				creature->getNetworkId().getValueString().c_str(),
+				entry.m_command->m_commandName.c_str(),
+				entry.m_command->m_commandHash,
+				entry.m_command->m_coolGroup,
+				entry.m_command->m_coolGroup2);
+			if (output)
+			{
+				*output += fsSprintfOutput;
+				*output += "\n";
+			}
+			else
+			{
+				LOG("CommandQueueSpew", ("%s", fsSprintfOutput));
+			}
+		}
+
+		for (CooldownMapType::const_iterator iterCooldown = m_cooldowns.begin(); iterCooldown != m_cooldowns.end(); ++iterCooldown)
+		{
+			fsSprintfOutput = fsOutput.sprintf("%s cooldown key [%lu] value1[%.10f] value2[%.10f] duration[%.10f] remaining[%.10f]",
+				creature->getNetworkId().getValueString().c_str(),
+				iterCooldown->first,
+				iterCooldown->second.first,
+				iterCooldown->second.second,
+				iterCooldown->second.second - iterCooldown->second.first,
+				iterCooldown->second.second - currentTime);
+			if (output)
+			{
+				*output += fsSprintfOutput;
+				*output += "\n";
+			}
+			else
+			{
+				LOG("CommandQueueSpew", ("%s", fsSprintfOutput));
+			}
+		}
+
+		fsSprintfOutput = fsOutput.sprintf("%s m_commandTimes Warmup[%.10f] Execute[%.10f] Cooldown[%.10f] Cooldown2[%.10f]",
+			creature->getNetworkId().getValueString().c_str(),
+			m_commandTimes[TimerClass_Warmup],
+			m_commandTimes[TimerClass_Execute],
+			m_commandTimes[TimerClass_Cooldown],
+			m_commandTimes[TimerClass_Cooldown2]);
+		if (output)
+		{
+			*output += fsSprintfOutput;
+			*output += "\n";
+		}
+		else
+		{
+			LOG("CommandQueueSpew", ("%s", fsSprintfOutput));
+		}
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/command/CommandQueue.h b/engine/server/library/serverGame/src/shared/command/CommandQueue.h
new file mode 100644
index 00000000..bedf3717
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/command/CommandQueue.h
@@ -0,0 +1,428 @@
+// ======================================================================
+//
+// CommandQueue.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_CommandQueue_H
+#define INCLUDED_CommandQueue_H
+
+// ======================================================================
+
+#include "Archive/AutoDeltaQueue.h"
+#include "Archive/AutoDeltaVector.h"
+#include "Archive/AutoDeltaMap.h"
+#include "serverGame/CommandQueueEntry.h"
+#include "sharedGame/Command.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedObject/Property.h"
+
+#include <stack>
+
+// ======================================================================
+
+class Command;
+class CreatureObject;
+class ServerObject;
+
+// ======================================================================
+
+/**
+ * @brief this class is the spinal cord of the game server
+ */
+class CommandQueue : public Property
+{
+public:
+
+	static PropertyId getClassPropertyId();
+	static CommandQueue * getCommandQueue(Object & object);
+
+	/**
+	 * @brief The states that the command queue can be in.
+	 */
+	enum State
+	{
+		/**
+		 * The command queue is waiting for a command to start warming up.
+		 * The command queue may be empty in this state, or the current
+		 * command is waiting for a cooldown timer to end.
+		 */
+		State_Waiting,
+
+		/**
+		 * the current command is warming up
+		 */
+		State_Warmup,
+
+		/**
+		 * the current command is executing
+		 */
+		State_Execute,
+
+		/**
+		 * dummy value to indicate the number of states
+		 */
+		State_MAX,
+
+		State_Invalid = -1
+	};
+
+	/**
+	 * Each command has a different time value for each class.
+	 * This enum defines the different time value classes.  Note
+	 * that the time value classes may appear similar to but are
+	 * not the same as the timer states.
+	 */
+	enum TimerClass
+	{
+		TimerClass_Warmup,
+		TimerClass_Execute,
+		TimerClass_Cooldown,
+		TimerClass_Cooldown2,
+		TimerClass_MAX
+	};
+
+	//
+	//                               +----- this is the crc value of the cooldown timer name
+	//                               |
+	//                               |                 +----- this is the time when the cooldown started
+	//                               |                 |
+	//                               |                 |       +----- this is the time when the cooldown will end
+	//                               v                 v       v
+	typedef Archive::AutoDeltaMap< uint32, std::pair<double, double> > CooldownMapType;
+
+	static void install();
+	static void shutdown();
+
+	CommandQueue(ServerObject & owner);
+
+	/**
+	 * @brief adds a command to the command queue.
+	 */
+	void enqueue(Command const &command, NetworkId const &targetId, const Unicode::String &params, uint32 sequenceId = 0, bool clearable = true, Command::Priority priority = Command::CP_Default);
+
+	/**
+	 * @brief used to remove a specific command from the command queue
+	 */
+	void    remove(uint32 sequenceId);
+
+	/**
+	 * @brief called from the owning object
+	 *
+	 * Used to update the command queue.  Should be called once
+	 * for each queue at each server loop.
+	 */
+	void    update(float time);
+
+	/**
+	 * @brief used to tell if the command queue has a command with the given group
+	 *
+	 * It does not appear that this method is used anywhere
+	 */
+	bool    hasCommandFromGroup(uint32 groupHash) const;
+
+	/**
+	 * @brief removes commands of a specific group from the command queue
+	 *
+	 * Removes all of the commands that are currently in the command queue
+	 * that match the specified group ID.  If the command at the head of
+	 * the queue matches, it is cancelled even if the command is executing.
+	 */
+	void    clearCommandsFromGroup(uint32 groupHash, bool force = false);
+
+	/**
+	 * @brief autodelta packing
+	 */
+	void    addToPackage(Archive::AutoDeltaByteStream & bs);
+
+	/**
+	 * @brief changes the amount of time to use for a given
+	 * timer class for the command at the head of the command queue
+	 */
+	bool    setCommandTimerValue(TimerClass timerClass, float newValue );
+
+	/**
+	 * @brief returns the current state of the command queue
+	 *
+	 * This returns the current state of the command queue.  Currently
+	 * there is no way to tell why the command queue might be in
+	 * a particular state (this is a future feature).
+	 *
+	 * @return the state of the queue.
+	 *
+	 * @see CommandQueue::State
+	 */
+	State   getCurrentCommandState() const;
+
+	/**
+	 * @brief cancels the current command
+	 *
+	 * Causes the command at the top of the command queue
+	 * to stop executing, removes the command from the queue
+	 * and if necessary tells the client that the command
+	 * has been terminated.
+	 */
+	void    cancelCurrentCommand();
+
+	/**
+	 * @brief gets the crc value of the command at the head of the command queue
+	 *
+	 * @returns the crc value of the command at the head of the command queue.
+	 * if the command queue is empty, this method returns 0.
+	 */
+	uint32  getCurrentCommand() const;
+
+	/**
+	 * @brief returns the amount of cooldown time left
+	 * in the specified cooldown timer group
+	 *
+	 * this method is used by scripts
+	 */
+	float getCooldownTimeLeft( uint32 cooldownId ) const;
+
+	/**
+	 * @brief returns the amount of cooldown tim left
+	 * int the specified cooldown timer group
+	 *
+	 * this method is used by scripts
+	 */
+	float getCooldownTimeLeft( const std::string &cooldownName ) const;
+
+	/**
+	 * @brief gets the list of cooldowns
+	 *
+	 * @returns the list of cooldowns
+	 */
+	CooldownMapType const & getCooldowns() const;
+
+	/**
+	* @brief setter for m_logCommandEnqueue
+	*/
+	void setLogCommandEnqueue(bool logCommandEnqueue);
+
+	/**
+	 * @brief depersist command cooldowns which have been persisted
+	 *
+	 * if a cool down value is large enough, we persist
+	 * it across server restarts and character unloading
+	 * and reloading from the DB; we depersist the persisted
+	 * cooldowns when the character is reloaded from the DB
+	 */
+	void depersistCooldown();
+
+	/*
+	 * @brief resets all the cooldown timers to zero
+	 */
+	void resetCooldowns();
+
+	// debug diagnostic
+	void spew(std::string * output = NULL);
+
+private:
+	CommandQueue(CommandQueue const &);
+	CommandQueue &operator=(CommandQueue const &);
+
+private:
+
+	/**
+	 * @brief does command cleanup work
+	 *
+	 * This should be called any time a command is removed from the queue.  This method
+	 * keeps the combat command count syncronized and notifies the client if necessary
+	 * that a command has been removed.
+	 */
+	void handleEntryRemoved(CommandQueueEntry const &entry, bool notifyClient = true);
+
+	/**
+	 * @brief tells the client that a command has been removed from the queue
+	 */
+	void notifyClientOfCommandRemoval(uint32 sequenceId, float waitTime, Command::ErrorCode status = Command::CEC_Success, int statusDetail = 0);
+
+	/**
+	 * @brief returns true if the command queue contains the maximum number
+	 * of combat commands.
+	 */
+	bool isFull() const;
+
+	/**
+	 * @brief attempts to resolve the state of the command queue.
+	 */
+	void executeCommandQueue();
+
+	/**
+	 * @brief changes the state of the command queue.
+	 *
+	 * This determines what state the command queue should be in, and changes
+	 * the state.
+	 */
+	void switchState();
+
+	/**
+	 * @brief fires the warmup trigger in the script engine.
+	 *
+	 * This method is called to run the warmup trigger in the script engine.  It
+	 * is only called if the command has a warmup time.
+	 */
+	bool doWarmupTrigger(const CommandQueueEntry &entry );
+
+	/**
+	 * @brief starts the command handler in script for the action
+	 *
+	 * This method also performs the necessary initialization and
+	 * handles command failures for the command handlers.
+	 */
+	void doExecute(const CommandQueueEntry &entry );
+
+	/**
+	 * @brief tells the client that a new command has started executing.
+	 * @see updateClient
+	 */
+	void notifyClient();
+
+	/**
+	 * @brief sends the client a message indicating that timer values have changed.
+	 * @see notifyClient
+	 */
+	void updateClient(TimerClass timerClass );
+
+	/**
+	 * @brief removes pending combat commands
+	 *
+	 * This method removes any pending combat commands from
+	 * the command queue, including the combat command at
+	 * the top of the stack if it's in a waiting state
+	 * because it's unable to fire for some reason.
+	 */
+	void clearPendingCombatCommands();
+
+	/**
+	 * @brief persist a command cooldown
+	 *
+	 * if a cool down value is large enough, persist
+	 * it across server restarts and character unloading
+	 * and reloading from the DB
+	 */
+	void persistCooldown(uint32 cooldownGroupCrc, int cooldownTimeSeconds);
+
+	/**
+	 * @brief returns the current command queue state
+	 * as a human-readable string.
+	 */
+	static const char *getStateAsString( State state );
+
+	void executeCommand(Command const &command, NetworkId const &targetId, Unicode::String const &params, Command::ErrorCode &status, int &statusDetail, bool commandIsFromCommandQueue);
+
+	ServerObject & getServerOwner();
+	ServerObject const & getServerOwner() const;
+
+	float getCooldownTime(Command const &command);
+
+private:
+#define AUTO(type) Archive::AutoDeltaVariable<type>
+
+	typedef Archive::AutoDeltaQueue<CommandQueueEntry> EntryList;
+	typedef Archive::AutoDeltaVector< double > CooldownArrayType;
+	typedef Archive::AutoDeltaVector< float >  CommandTimeType;
+
+	/**
+	 * @brief temporary instance value used during command execution
+	 */
+	Command::ErrorCode    m_status;
+
+	/**
+	 * @brief temporary instance value used during command execution
+	 */
+	int                   m_statusDetail;
+
+	/**
+	 * @brief indicates the current state of the queue.
+	 */
+	AUTO(uint32)          m_state;
+
+	/**
+	 * @brief the time that the state of the queue should change.
+	 *
+	 * if the queue is empty, this value is undefined
+	 *
+	 * @see m_commandTimes
+	 */
+	AUTO(double)          m_nextEventTime;
+
+	/**
+	 * @brief the queue that stores the commands to be executed
+	 */
+	EntryList             m_queue;
+
+	/**
+	 * @brief an array of cooldown timer values.
+	 */
+	CooldownMapType       m_cooldowns;
+
+	/**
+	 * @brief modified command time values
+	 *
+	 * This is a small array of values that represent the
+	 * current time values for the current command.  This array
+	 * can be modified in script.  The values for this array
+	 * are used to set m_nextEventTime when the queue state
+	 * changes
+	 *
+	 * @see m_nextEventTime
+	 */
+	CommandTimeType       m_commandTimes;
+
+	/**
+	 * @brief keeps track of the number of combat commands
+	 * in the queue.
+	 *
+	 * We use this value so that we do not need to iterate
+	 * through the queue every time we want to see how many combat
+	 * commands are in there, which happens every time the player
+	 * adds a combat command to the queue.
+	 */
+	mutable AUTO(uint)    m_combatCount;
+
+	/**
+	 * @brief the time that the command queue last changed its state
+	 */
+	AUTO(double)          m_eventStartTime;
+
+	/**
+	 * @brief a stack of command pointers that are used during
+	 * command execution.
+	 */
+	std::stack< const CommandQueueEntry * > m_commandStack;
+
+	/**
+	* @brief for debugging, log detailed information every time a
+	* command is enqueued
+	*/
+	bool m_logCommandEnqueue;
+};
+
+// ----------------------------------------------------------------------
+
+inline Command::Priority CommandQueueEntry::getPriority() const
+{
+	return m_priority;
+}
+
+// ----------------------------------------------------------------------
+
+inline CommandQueue::CooldownMapType const & CommandQueue::getCooldowns() const
+{
+	return m_cooldowns;
+}
+
+// ----------------------------------------------------------------------
+
+inline void CommandQueue::setLogCommandEnqueue(bool logCommandEnqueue)
+{
+	m_logCommandEnqueue = logCommandEnqueue;
+}
+
+// ======================================================================
+
+#endif	// INCLUDED_CommandQueue_H
diff --git a/engine/server/library/serverGame/src/shared/command/CommandQueueEntry.cpp b/engine/server/library/serverGame/src/shared/command/CommandQueueEntry.cpp
new file mode 100644
index 00000000..4473f70f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/command/CommandQueueEntry.cpp
@@ -0,0 +1,112 @@
+// ======================================================================
+//
+// CommandQueueEntry.cpp
+//
+// Copyright 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CommandQueueEntry.h"
+#include "serverGame/CreatureObject.h"
+
+#include "Archive/ByteStream.h"
+#include "sharedGame/CommandTable.h"
+
+
+// ======================================================================
+
+CommandQueueEntry::CommandQueueEntry() :
+	m_command(&CommandTable::getNullCommand ()),
+	m_targetId(NetworkId::cms_invalid),
+	m_params(),
+	m_sequenceId(0),
+	m_clearable(true)
+{
+}
+
+// ----------------------------------------------------------------------
+
+CommandQueueEntry::CommandQueueEntry(
+	Command const &command,
+	NetworkId const &targetId,
+	Unicode::String const &params,
+	uint32 sequenceId,
+	bool clearable,
+	Command::Priority priority,
+	bool autoAttack ) :
+		
+	m_command(&command),
+	m_targetId(targetId),
+	m_params(params),
+	m_sequenceId(sequenceId),
+	m_clearable(clearable),
+	m_priority(priority)
+{
+}
+
+// ----------------------------------------------------------------------
+
+CommandQueueEntry::CommandQueueEntry(CommandQueueEntry const &entry) :
+	m_command(entry.m_command), //lint !e1554
+	m_targetId(entry.m_targetId),
+	m_params(entry.m_params),
+	m_sequenceId(entry.m_sequenceId),
+	m_clearable(entry.m_clearable),
+	m_priority(entry.m_priority)
+{
+}
+
+// ----------------------------------------------------------------------
+
+CommandQueueEntry &CommandQueueEntry::operator=(CommandQueueEntry const &rhs)
+{
+	if (&rhs != this)
+	{
+		m_command    = rhs.m_command; //lint !e1555
+		m_targetId   = rhs.m_targetId;
+		m_params     = rhs.m_params;
+		m_sequenceId = rhs.m_sequenceId;
+		m_clearable  = rhs.m_clearable;
+		m_priority   = rhs.m_priority;
+	}
+	return *this;
+}
+
+// ======================================================================
+
+namespace Archive
+{
+
+// ----------------------------------------------------------------------
+
+void get(ReadIterator &source, CommandQueueEntry &target)
+{
+	uint32 commandHash;
+
+	Archive::get(source, commandHash);
+	Archive::get(source, target.m_targetId);
+	Archive::get(source, target.m_params);
+	Archive::get(source, target.m_sequenceId);
+	Archive::get(source, target.m_clearable);
+	target.m_command = &CommandTable::getCommand(commandHash);
+}
+
+// ----------------------------------------------------------------------
+
+void put(ByteStream &target, CommandQueueEntry const &source)
+{
+	Archive::put(target, source.m_command->m_commandHash);
+	Archive::put(target, source.m_targetId);
+	Archive::put(target, source.m_params);
+	Archive::put(target, source.m_sequenceId);
+	Archive::put(target, source.m_clearable);
+}
+
+
+
+// ----------------------------------------------------------------------
+
+
+} // namespace Archive
diff --git a/engine/server/library/serverGame/src/shared/command/CommandQueueEntry.h b/engine/server/library/serverGame/src/shared/command/CommandQueueEntry.h
new file mode 100644
index 00000000..035529f2
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/command/CommandQueueEntry.h
@@ -0,0 +1,64 @@
+// ======================================================================
+//
+// CommandQueueEntry.h
+//
+// Copyright 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_CommandQueueEntry_H
+#define INCLUDED_CommandQueueEntry_H
+
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedGame/Command.h"
+
+// ======================================================================
+
+class CommandQueueEntry
+{
+public:
+	CommandQueueEntry();
+	
+	CommandQueueEntry( 
+		Command const &command,
+		NetworkId const &targetId,
+		Unicode::String const &params,
+		uint32 sequenceId,
+		bool clearable,
+		Command::Priority,
+		bool auto );
+		
+	CommandQueueEntry(CommandQueueEntry const &entry);
+	CommandQueueEntry& operator=(CommandQueueEntry const &);
+	
+	Command::Priority getPriority() const;
+
+public:
+	Command const *   m_command;
+	NetworkId         m_targetId;
+	Unicode::String   m_params;
+	uint32            m_sequenceId;
+	bool              m_clearable;
+	Command::Priority m_priority;
+
+};
+
+	
+// ======================================================================
+
+namespace Archive
+{
+	class ByteStream;
+	class ReadIterator;
+	
+	void put(Archive::ByteStream &target, CommandQueueEntry const &source);
+	void get(Archive::ReadIterator &source, CommandQueueEntry &target);
+}
+
+
+// ======================================================================
+
+#endif // INCLUDED_CommandQueueEntry_H
diff --git a/engine/server/library/serverGame/src/shared/command/CommandStringId.h b/engine/server/library/serverGame/src/shared/command/CommandStringId.h
new file mode 100644
index 00000000..4937cf59
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/command/CommandStringId.h
@@ -0,0 +1,41 @@
+// ======================================================================
+//
+// CommandStringId.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _CommandStringId_H_
+#define _CommandStringId_H_
+
+// ======================================================================
+
+namespace CommandStringId
+{
+	StringId SID_DUEL_CHALLENGE_SELF       ("duel", "challenge_self");
+	StringId SID_DUEL_CHALLENGE_TARGET     ("duel", "challenge_target");
+	StringId SID_DUEL_ALREADY_CHALLENGED   ("duel", "already_challenged");
+	StringId SID_DUEL_ACCEPT_SELF          ("duel", "accept_self");
+	StringId SID_DUEL_ACCEPT_TARGET        ("duel", "accept_target");
+	StringId SID_DUEL_END_SELF             ("duel", "end_self");
+	StringId SID_DUEL_END_TARGET           ("duel", "end_target");
+	StringId SID_DUEL_REJECT_SELF          ("duel", "reject_self");
+	StringId SID_DUEL_REJECT_TARGET        ("duel", "reject_target");
+	StringId SID_DUEL_CANCEL_SELF          ("duel", "cancel_self");
+	StringId SID_DUEL_CANCEL_TARGET        ("duel", "cancel_target");
+	StringId SID_DUEL_NOT_DUELING          ("duel", "not_dueling");
+	StringId SID_DUEL_ALREADY_DUELING      ("duel", "already_dueling");
+	StringId SID_DUEL_NOT_HERE             ("duel", "not_here");
+	StringId SID_DUEL_TARGET_CAN_ATTACK_YOU("duel", "target_can_attack_you");
+	StringId SID_DUEL_ALREADY_CAN_ATTACK   ("duel", "already_can_attack");
+	StringId SID_DUEL_NOT_AVAILABLE_TO_DUEL("duel", "not_available_to_duel");
+	StringId SID_DUEL_AUTO_DECLINED_DUEL   ("duel", "auto_declined_duel");
+	StringId SID_DUEL_CANNOT_DUEL_AUTO_DECLINE("duel", "cannot_duel_auto_decline");
+	StringId SID_DUEL_NOT_HOLOGRAM         ("duel", "cannot_duel_a_hologram");
+}
+
+// ======================================================================
+
+#endif // _CommandStringId_H_
+
diff --git a/engine/server/library/serverGame/src/shared/command/ServerCommandTable.cpp b/engine/server/library/serverGame/src/shared/command/ServerCommandTable.cpp
new file mode 100644
index 00000000..b5f1e77b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/command/ServerCommandTable.cpp
@@ -0,0 +1,76 @@
+// ======================================================================
+//
+// ServerCommandTable.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerCommandTable.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "sharedFile/Iff.h"
+#include "sharedFile/TreeFile.h"
+#include "sharedGame/CommandTable.h"
+#include "sharedUtility/DataTable.h"
+
+// ======================================================================
+
+namespace ServerCommandTableNamespace
+{
+	void getCommandTableListFromDataTable(std::string const &tableListFilename, std::vector<std::string> &results);
+}
+
+using namespace ServerCommandTableNamespace;
+
+// ======================================================================
+
+void ServerCommandTableNamespace::getCommandTableListFromDataTable(std::string const &tableListFilename, std::vector<std::string> &results)
+{
+	Iff iff;
+	if (iff.open(tableListFilename.c_str(), true))
+	{
+		DataTable dataTable;
+		dataTable.load(iff);
+
+		int numberOfRows = dataTable.getNumRows();
+		for (int row = 0; row < numberOfRows; ++row)
+		{
+			std::string const tableFilename = dataTable.getStringValue("tableFilename", row);
+			if (!tableFilename.empty())
+			{
+				if (!TreeFile::exists(tableFilename.c_str()))
+					WARNING(true, ("'%s' from command table list '%s' is not a valid command table.", tableFilename.c_str(), tableListFilename.c_str()));
+				else
+					results.push_back(tableFilename);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerCommandTable::load()
+{
+	std::vector<std::string> commandTablesToLoad;
+
+	getCommandTableListFromDataTable("datatables/command/command_tables_shared.iff", commandTablesToLoad);
+	getCommandTableListFromDataTable("datatables/command/command_tables_server.iff", commandTablesToLoad);
+
+	if (!strncmp(ConfigServerGame::getSceneID(), "space_", 6))
+	{
+		getCommandTableListFromDataTable("datatables/command/command_tables_shared_space.iff", commandTablesToLoad);
+		getCommandTableListFromDataTable("datatables/command/command_tables_server_space.iff", commandTablesToLoad);
+	}
+	else
+	{
+		getCommandTableListFromDataTable("datatables/command/command_tables_shared_ground.iff", commandTablesToLoad);
+		getCommandTableListFromDataTable("datatables/command/command_tables_server_ground.iff", commandTablesToLoad);
+	}
+
+	CommandTable::loadCommandTables(commandTablesToLoad);
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/command/ServerCommandTable.h b/engine/server/library/serverGame/src/shared/command/ServerCommandTable.h
new file mode 100644
index 00000000..c3fb3e11
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/command/ServerCommandTable.h
@@ -0,0 +1,23 @@
+// ======================================================================
+//
+// ServerCommandTable.h
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ServerCommandTable_H
+#define INCLUDED_ServerCommandTable_H
+
+// ======================================================================
+
+class ServerCommandTable
+{
+public:
+	static void load();
+};
+
+// ======================================================================
+
+#endif // INCLUDED_ServerCommandTable_H
+
diff --git a/engine/server/library/serverGame/src/shared/commoditiesMarket/AuctionInfo.h b/engine/server/library/serverGame/src/shared/commoditiesMarket/AuctionInfo.h
new file mode 100644
index 00000000..de1d580c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/commoditiesMarket/AuctionInfo.h
@@ -0,0 +1,30 @@
+// ======================================================================
+//
+// AuctionInfo.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _AuctionInfo_H_
+#define _AuctionInfo_H_
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkId.h"
+
+// ======================================================================
+
+struct AuctionInfo
+{
+	NetworkId   ownerId;
+	NetworkId   itemId;
+	int         minBid;
+	int         timer;
+	NetworkId   auctionContainerId;
+};
+
+// ======================================================================
+
+#endif // _AuctionInfo_H_
+
diff --git a/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp
new file mode 100644
index 00000000..0c6781ce
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp
@@ -0,0 +1,3769 @@
+// ======================================================================
+//
+// CommoditiesMarket.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CommoditiesMarket.h"
+
+#include "CommoditiesServerConnection.h"
+#include "serverGame/AuctionInfo.h"
+#include "serverGame/AuctionTokenServer.h"
+#include "serverGame/Chat.h"
+#include "serverGame/CommoditiesMarketListener.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "sharedGame/GameObjectTypes.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/IntangibleObject.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/ObjectIdManager.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/Region.h"
+#include "serverGame/RegionMaster.h"
+#include "serverGame/ResourceContainerObject.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerTangibleObjectTemplate.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverNetworkMessages/AuctionBase.h"
+#include "serverNetworkMessages/AuctionData.h"
+#include "serverNetworkMessages/SetEntranceChargeMessage.h"
+#include "serverNetworkMessages/FlagObjectForDeleteMessage.h"
+#include "serverNetworkMessages/QueryVendorItemCountMessage.h"
+#include "serverNetworkMessages/UpdateVendorSearchOptionMessage.h"
+#include "serverNetworkMessages/UpdateVendorStatusMessage.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptDictionary.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFoundation/Clock.h"
+#include "sharedFoundation/CrcLowerString.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedGame/AuctionManager.h"
+#include "sharedGame/AuctionToken.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+#include "sharedUtility/Location.h"
+#include "sharedGame/OutOfBand.h"
+#include "sharedGame/OutOfBandBase.h"
+#include "sharedGame/OutOfBandPackager.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/WaypointData.h"
+#include "sharedLog/Log.h"
+#include "sharedMath/Vector2d.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/AcceptAuctionResponseMessage.h"
+#include "sharedNetworkMessages/AuctionData.h"
+#include "sharedNetworkMessages/AuctionErrorCodes.h"
+#include "sharedNetworkMessages/AuctionQueryHeadersMessage.h"
+#include "sharedNetworkMessages/AuctionQueryHeadersResponseMessage.h"
+#include "sharedNetworkMessages/AuctionQueryResponseMessage.h"
+#include "sharedNetworkMessages/BidAuctionResponseMessage.h"
+#include "sharedNetworkMessages/CancelLiveAuctionResponseMessage.h"
+#include "sharedNetworkMessages/CreateAuctionResponseMessage.h"
+#include "sharedNetworkMessages/GetAuctionDetailsResponse.h"
+#include "sharedNetworkMessages/IsVendorOwnerResponseMessage.h"
+#include "sharedNetworkMessages/RetrieveAuctionItemResponseMessage.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/SceneChannelMessages.h"
+#include "sharedObject/Container.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/VolumeContainer.h"
+
+//----------------------------------------------------------------------
+
+#define ADD_AUCTION_COST 0
+
+// this must be kept in sync in the following files
+// src/engine/client/library/clientGame/src/shared/core/AuctionManagerClient.cpp (s_maxBid)
+// src/engine/server/application/CommoditiesServer/src/shared/Auction.cpp (MAX_BID)
+// src/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp (MAX_BID)
+#define MAX_BID 10000000
+#define MAX_VENDOR_PRICE 833333333
+
+//----------------------------------------------------------------------
+const std::string CommoditiesMarket::OBJVAR_VENDOR_REINITIALIZING("vendor_reinit");
+
+static const std::string OBJVAR_VENDOR_VALUE("vendor_value");
+static const std::string OBJVAR_VENDOR_INITIALIZED("vendor_initialized");
+static const std::string OBJVAR_VENDOR_DEACTIVATED("vendor_deactivated");
+
+
+static const NetworkId zeroNetworkId(static_cast<NetworkId::NetworkIdType>(0));
+static const std::string std_blank = std::string("");
+
+namespace CommoditiesMarketNamespace
+{
+
+	namespace AuctionStringIds
+	{
+#define MAKE_STRING_ID(a, b) const StringId b(#a,#b);
+
+		const StringId buyerAuctionSuccess("auction", "buyer_success");	
+		const StringId sellerAuctionFail("auction", "seller_fail");	
+		const StringId buyerAuctionFail("auction", "buyer_canceled");	
+		const StringId bidderOutbid("auction", "bidder_outbid");	
+		const StringId itemExpired("auction", "item_expired");	
+		const StringId subjectVendorSeller("auction", "subject_vendor_seller");
+		const StringId subjectInstantSeller("auction", "subject_instant_seller");
+		const StringId subjectAuctionSeller("auction", "subject_auction_seller");
+		
+		const StringId subjectVendorBuyer("auction", "subject_vendor_buyer");
+		const StringId subjectInstantBuyer("auction", "subject_instant_buyer");
+		const StringId subjectAuctionBuyer("auction", "subject_auction_buyer");
+		const StringId subjectAuctionUnsuccessful("auction", "subject_auction_unsuccessful");
+		const StringId subjectAuctionCancelled("auction", "subject_auction_cancelled");
+		const StringId subjectAuctionOutbid("auction", "subject_auction_outbid");
+		const StringId subjectAuctionItemExpired("auction", "subject_auction_item_expired");
+			
+		MAKE_STRING_ID (auction, seller_success);
+		MAKE_STRING_ID (auction, seller_success_location);
+		MAKE_STRING_ID (auction, seller_success_vendor);
+		MAKE_STRING_ID (auction, buyer_success_location);
+
+#undef MAKE_STRING_ID
+	}
+
+	bool isReinitializing(const ServerObject& vendor)
+ 	{
+ 		return vendor.getObjVars().hasItem(CommoditiesMarket::OBJVAR_VENDOR_REINITIALIZING);
+ 	}
+
+	struct SalesTaxInfo
+ 	{
+ 		NetworkId itemId;
+ 		NetworkId buyerId;
+ 		int salesTaxAmount;
+ 		NetworkId salesTaxBankId;
+ 	};
+   	
+	std::map<NetworkId, SalesTaxInfo*> s_pendingSalesTax;
+
+	struct ItemRestriction
+	{
+		std::set<int>         inclusionGameObjectType;
+		std::set<uint32>      inclusionTemplateItemType;
+		std::set<std::string> inclusionStaticItemType;
+
+		std::set<int>         exclusionGameObjectType;
+		std::set<uint32>      exclusionTemplateItemType;
+		std::set<std::string> exclusionStaticItemType;
+
+		std::string           rejectionMessage;
+	};
+	bool isVendorItemRestriction(ServerObject const & item, std::string const & itemRestrictionFile, bool checkInInclusionList, bool checkInExclusionList, std::string & itemRestrictedRejectionMessage);
+
+	bool canAuction(ServerObject& item, CreatureObject& owner, ServerObject& auctionContainer, int minBid, time_t timer, int auctionFee, AuctionResult& errorCode, std::string& itemRestrictedRejectionMessage)
+	{
+		errorCode = ar_OK;
+		itemRestrictedRejectionMessage.clear();
+
+		if (&owner != ContainerInterface::getFirstParentInWorld(item))
+		{
+			errorCode = ar_NOT_ITEM_OWNER;
+			return false;
+		}
+
+		if (minBid < 0)
+		{
+			errorCode = ar_INVALID_MINIMUM_BID;
+		}
+
+		if (timer <= 0)
+		{
+			errorCode = ar_INVALID_AUCTION_LENGTH;
+		}
+
+		if (auctionFee > owner.getTotalMoney())
+		{
+			errorCode = ar_NOT_ENOUGH_MONEY;
+		}
+
+		int const maxBid = (auctionContainer.isVendor() ? MAX_VENDOR_PRICE : MAX_BID);
+		if (minBid > maxBid)
+		{
+			errorCode = (auctionContainer.isVendor() ? ar_PRICE_TOO_HIGH : ar_BID_TOO_HIGH);
+		}
+
+		if (auctionContainer.getObjVars().hasItem(OBJVAR_VENDOR_DEACTIVATED))
+		{
+			errorCode = ar_VENDOR_DEACTIVATED;
+		}
+		
+		Container::ContainerErrorCode tmp = Container::CEC_Success;
+		ServerObject *bazaarContainer = auctionContainer.getBazaarContainer();
+		if (!bazaarContainer || !ContainerInterface::canTransferTo(bazaarContainer, item, NULL, tmp))
+		{
+			errorCode = ar_INVALID_ITEM_ID;
+		}
+		
+		//-- can't sell the special items inside crates
+		const ServerObject * const itemContainedBy = safe_cast<const ServerObject *>(ContainerInterface::getContainedByObject (item));
+		if (itemContainedBy && itemContainedBy->getGameObjectType () == SharedObjectTemplate::GOT_misc_factory_crate)
+		{
+			errorCode = ar_IN_CRATE;
+		}
+		
+		// disallow putting an item up for auction that is already in secure trade
+		if( item.isInSecureTrade() )
+		{
+			LOG("CustomerService", ("Auction:item %s was attempted to be placed for sale by %s but object is secure trade.",
+									ServerObject::getLogDescription(item.getNetworkId()).c_str(), PlayerObject::getAccountDescription(owner.getNetworkId()).c_str()));
+			errorCode = ar_IN_TRADE;
+		}
+		// make sure we have an authoritative item
+		if( !item.isAuthoritative() )
+		{
+			LOG("CustomerService", ("Auction:item %s was attempted to be placed for sale by %s but object is not authoritative on this server.",
+									ServerObject::getLogDescription(item.getNetworkId()).c_str(), PlayerObject::getAccountDescription(owner.getNetworkId()).c_str()));
+			errorCode = ar_INVALID_ITEM_ID;
+		}
+	
+		//can't sell no trade items
+		if (!item.canTradeRecursive(false))
+		{
+			errorCode = ar_NOT_ALLOWED;
+		}
+
+		// can't sell bio-linked items
+		if (item.isBioLinkedRecursive())
+		{
+			errorCode = ar_IS_BIOLINKED;
+		}
+
+		// can't sell equipped items
+		if (owner.isItemEquipped (item))
+		{
+			errorCode = ar_ITEM_EQUIPPED;
+		}
+
+#if 0
+		const VolumeContainer *vol = ContainerInterface::getVolumeContainer(item);
+		if (vol && vol->getCurrentVolume() > 0)
+		{
+			errorCode = ar_NOT_EMPTY;
+		}
+
+#endif
+
+		if ((errorCode == ar_OK) && auctionContainer.isVendor() && !auctionContainer.isBazaarTerminal())
+		{
+			// check to make sure the vendor isn't restricted from accepting this item
+			std::string itemRestrictionFile;
+			if (!auctionContainer.getObjVars().getItem("access_file", itemRestrictionFile))
+				itemRestrictionFile = ConfigServerGame::getDefaultVendorItemRestrictionFile();
+
+			if (isVendorItemRestriction(item, itemRestrictionFile, true, true, itemRestrictedRejectionMessage))
+			{
+				errorCode = ar_ITEM_RESTRICTED;
+			}
+		}
+
+		return errorCode == ar_OK;
+	}
+
+	int getItemObjectTemplateId(const ServerObject &item)
+	{
+		return (item.getObjectTemplate() ? static_cast<int>(item.getObjectTemplate()->getCrcName().getCrc()) : 0);
+	}
+
+	int getCrateContainedItemObjectTemplateId(const ServerObject &crate)
+	{
+		if (crate.getGameObjectType() != SharedObjectTemplate::GOT_misc_factory_crate)
+			return 0;
+
+		const Container* c = ContainerInterface::getContainer(crate);
+		if (!c)
+			return 0;
+
+		for (ContainerConstIterator i = c->begin(); i != c->end(); ++i)
+		{
+			if ((*i).getObject() && (*i).getObject()->getObjectTemplate())
+				return static_cast<int>((*i).getObject()->getObjectTemplate()->getCrcName().getCrc());
+		}
+
+		return 0;
+	}
+
+	Unicode::String convertSeparatorToNull(Unicode::String const & sourceString)
+	{
+		Unicode::String result;
+		for (Unicode::String::const_iterator i=sourceString.begin(); i!=sourceString.end(); ++i)
+			if (*i==uint16('\t'))
+				result += uint16(0);
+			else
+				result += *i;
+
+		return result;
+	}
+
+	std::map<int, std::map<int, std::pair<int, StringId> > > s_itemTypeMap;
+	int s_itemTypeMapVersionNumber = 0;
+
+	std::map<int, std::set<std::string> > s_resourceTypeMap;
+	int s_resourceTypeMapVersionNumber = 0;
+}
+
+using namespace CommoditiesMarketNamespace;
+
+// ======================================================================
+
+bool CommoditiesMarketNamespace::isVendorItemRestriction(ServerObject const & item, std::string const & itemRestrictionFile, bool checkInInclusionList, bool checkInExclusionList, std::string & itemRestrictedRejectionMessage)
+{
+	static std::map<std::string, ItemRestriction> itemRestrictionList;
+
+	if (!checkInInclusionList && !checkInExclusionList)
+	{
+		return false;
+	}
+
+	ItemRestriction const * itemRestriction = NULL;
+
+	std::map<std::string, ItemRestriction>::const_iterator const iterFind = itemRestrictionList.find(itemRestrictionFile);
+	if (iterFind != itemRestrictionList.end())
+	{
+		itemRestriction = &(iterFind->second);
+	}
+	else
+	{
+		ItemRestriction & ir = itemRestrictionList[itemRestrictionFile];
+		itemRestriction = &ir;
+		ir.inclusionGameObjectType.clear();
+		ir.inclusionTemplateItemType.clear();
+		ir.inclusionStaticItemType.clear();
+		ir.exclusionGameObjectType.clear();
+		ir.exclusionTemplateItemType.clear();
+		ir.exclusionStaticItemType.clear();
+		ir.rejectionMessage = ConfigServerGame::getDefaultVendorItemRestrictionRejectionMessage();
+
+		DataTable * const table = DataTableManager::getTable(itemRestrictionFile, true);
+		if (table)
+		{
+			int const columnInclusion = table->findColumnNumber("Inclusion");
+			int const columnExclusion = table->findColumnNumber("Exclusion");
+			int const columnRejectionMessage = table->findColumnNumber("Rejection Message");
+
+			if ((columnInclusion >= 0) && (columnExclusion >= 0) && (columnRejectionMessage >= 0))
+			{
+				std::string inclusion;
+				std::string exclusion;
+				std::string rejectionMessage;
+				int got;
+
+				for (int i = 0, numRows = table->getNumRows(); i < numRows; ++i)
+				{
+					inclusion = table->getStringValue(columnInclusion, i);
+					exclusion = table->getStringValue(columnExclusion, i);
+					rejectionMessage = table->getStringValue(columnRejectionMessage, i);
+
+					if (!inclusion.empty())
+					{
+						if (inclusion.find(".iff") != std::string::npos)
+						{
+							ir.inclusionTemplateItemType.insert(CrcLowerString::calculateCrc(inclusion.c_str()));
+						}
+						else
+						{
+							got = GameObjectTypes::getGameObjectType(inclusion);
+							if (got > 0)
+							{
+								ir.inclusionGameObjectType.insert(got);
+							}
+							else
+							{
+								ir.inclusionStaticItemType.insert(inclusion);
+							}
+						}
+					}
+
+					if (!exclusion.empty())
+					{
+						if (exclusion.find(".iff") != std::string::npos)
+						{
+							ir.exclusionTemplateItemType.insert(CrcLowerString::calculateCrc(exclusion.c_str()));
+						}
+						else
+						{
+							got = GameObjectTypes::getGameObjectType(exclusion);
+							if (got > 0)
+							{
+								ir.exclusionGameObjectType.insert(got);
+							}
+							else
+							{
+								ir.exclusionStaticItemType.insert(exclusion);
+							}
+						}
+					}
+
+					if (!rejectionMessage.empty())
+					{
+						ir.rejectionMessage = rejectionMessage;
+					}
+				}
+			}
+
+			DataTableManager::close(itemRestrictionFile);
+		}
+	}
+
+	itemRestrictedRejectionMessage.clear();
+	if (!itemRestriction)
+	{
+		return false;
+	}
+
+	if (itemRestriction->inclusionGameObjectType.empty() &&
+		itemRestriction->inclusionTemplateItemType.empty() &&
+		itemRestriction->inclusionStaticItemType.empty() &&
+		itemRestriction->exclusionGameObjectType.empty() &&
+		itemRestriction->exclusionTemplateItemType.empty() &&
+		itemRestriction->exclusionStaticItemType.empty())
+	{
+		return false;
+	}
+
+	// check for restriction because in exclusion list
+	if (checkInExclusionList)
+	{
+		if (!itemRestriction->exclusionGameObjectType.empty())
+		{
+			if (itemRestriction->exclusionGameObjectType.count(item.getGameObjectType()) >= 1)
+			{
+				itemRestrictedRejectionMessage = itemRestriction->rejectionMessage;
+				return true;
+			}
+
+			if (itemRestriction->exclusionGameObjectType.count(GameObjectTypes::getMaskedType(item.getGameObjectType())) >= 1)
+			{
+				itemRestrictedRejectionMessage = itemRestriction->rejectionMessage;
+				return true;
+			}
+		}
+
+		if (!itemRestriction->exclusionTemplateItemType.empty())
+		{
+			if (itemRestriction->exclusionTemplateItemType.count(item.getTemplateCrc()) >= 1)
+			{
+				itemRestrictedRejectionMessage = itemRestriction->rejectionMessage;
+				return true;
+			}
+		}
+
+		if (!itemRestriction->exclusionStaticItemType.empty())
+		{
+			std::string const & staticItemName = item.getStaticItemName();
+			if (!staticItemName.empty())
+			{
+				if (itemRestriction->exclusionStaticItemType.count(staticItemName) >= 1)
+				{
+					itemRestrictedRejectionMessage = itemRestriction->rejectionMessage;
+					return true;
+				}
+			}
+		}
+	}
+
+	// check for restriction because *NOT* in inclusion list
+	if (checkInInclusionList)
+	{
+		if (!itemRestriction->inclusionGameObjectType.empty() || !itemRestriction->inclusionTemplateItemType.empty() || !itemRestriction->inclusionStaticItemType.empty())
+		{
+			// restricted until proved otherwise by being in one of the inclusion lists
+			bool restricted = true;
+
+			if (restricted && !itemRestriction->inclusionGameObjectType.empty())
+			{
+				if (itemRestriction->inclusionGameObjectType.count(item.getGameObjectType()) >= 1)
+				{
+					restricted = false;
+				}
+				else if (itemRestriction->inclusionGameObjectType.count(GameObjectTypes::getMaskedType(item.getGameObjectType())) >= 1)
+				{
+					restricted = false;
+				}
+			}
+
+			if (restricted && !itemRestriction->inclusionTemplateItemType.empty())
+			{
+				if (itemRestriction->inclusionTemplateItemType.count(item.getTemplateCrc()) >= 1)
+				{
+					restricted = false;
+				}
+			}
+
+			if (restricted && !itemRestriction->inclusionStaticItemType.empty())
+			{
+				std::string const & staticItemName = item.getStaticItemName();
+				if (!staticItemName.empty())
+				{
+					if (itemRestriction->inclusionStaticItemType.count(staticItemName) >= 1)
+					{
+						restricted = false;
+					}
+				}
+			}
+
+			if (restricted)
+			{
+				itemRestrictedRejectionMessage = itemRestriction->rejectionMessage;
+				return true;
+			}
+		}
+	}
+
+	// check to see if any of the contained item is restricted
+	const Container * const container = ContainerInterface::getContainer(item);
+	if (container)
+	{
+		for (ContainerConstIterator i = container->begin(); i != container->end(); ++i)
+		{
+			const ServerObject * const content = safe_cast<const ServerObject *>((*i).getObject());
+			if (content)
+			{
+				// for items inside the container, just check them against the exclusion list
+				// as we assume that if a container is accepted, then all the items inside the
+				// container should not be excluded by the inclusion list, but still need to
+				// be excluded through the exclusion list
+				if (isVendorItemRestriction(*content, itemRestrictionFile, false, true, itemRestrictedRejectionMessage))
+					return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+//----------------------------------------------------------------------
+
+#ifdef _WIN32
+#define atoll(a) _atoi64(a)
+#endif
+
+// ======================================================================
+
+struct ItemLoadPair
+{
+	ItemLoadPair(const NetworkId &o, const std::string &l) : ownerId(o), location(l) {} 
+	NetworkId ownerId;
+	std::string location;
+};
+
+struct QueuedQuery
+{
+	// time that the previous query was sent off
+	unsigned long previousQueryTime;
+
+	// the most recent query that came in while
+	// the previous query was being processed
+	int requestId;
+	int type;
+	int category;
+	bool categoryExactMatch;
+	int itemTemplateId;
+	Unicode::String textFilterAll;
+	Unicode::String textFilterAny;
+	int priceFilterMin;
+	int priceFilterMax;
+	bool priceFilterIncludesFee;
+	std::list<AuctionQueryHeadersMessage::SearchCondition> advancedSearch;
+	AuctionQueryHeadersMessage::AdvancedSearchMatchAllAny advancedSearchMatchAllAny;
+	NetworkId container;
+	int locationSearchType;
+	bool searchMyVendorsOnly;
+	uint16 queryOffset;
+};
+
+//----------------------------------------------------------------------
+
+static CommoditiesServerConnection *                   s_market;
+static time_t                                          s_timeMarketConnectionCreated = 0;
+static std::map<int, std::pair<CachedNetworkId, int> > s_queries;
+static std::map<NetworkId, QueuedQuery *>              s_queryTime;
+static int                                             s_nextRequestId;
+static std::hash_map<NetworkId, ItemLoadPair, NetworkId::Hash>                  s_pendingLoads;
+static std::hash_map<int, int>                         s_pendingAdds; //sequence to cost map
+
+// all money transactions transfer money out of or to the bank of the player and never to or from the vendor/bazaar location except bazaar sale fees
+static const std::string COMMODITIES_NAMED_ACCOUNT("commodities_named_escrow_account");
+
+// ======================================================================
+
+// this function transfers money from a player to a named account.  It requires that the object exist on the this server to succeed.
+static bool transferFromBankToCommoditiesNamedAccount(const NetworkId &target, int32 amount)
+{
+	ServerObject *obj = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(target));
+	if( obj )
+	{
+		if( obj->transferBankCreditsTo(COMMODITIES_NAMED_ACCOUNT, amount))
+		{
+			LOG("CustomerService", ("Auction: transfered bid amount of %d from bank to commodities named account for player '%s' (%Ld)",
+				amount, PlayerObject::getAccountDescription(target).c_str(), target.getValue()));
+			return true;
+		}
+	}
+
+	LOG("CustomerService", ("Auction: failed commodities named account bank transfer for player '%s' (%Ld) in the bid amount of %d",
+		PlayerObject::getAccountDescription(target).c_str(), target.getValue(), amount));
+	return false;
+}
+
+// this function transfers money from a named account to the player.
+static void transferToBankFromCommoditiesNamedAccount(const NetworkId &target, const int32 amount, const std::string &reason)
+{
+	ServerObject *obj = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(target));
+	if( obj && obj->isAuthoritative() )
+	{
+		if( obj->transferBankCreditsFrom(COMMODITIES_NAMED_ACCOUNT, amount) )
+		{
+			LOG("CustomerService", ("Auction: successfully transfered %d credits to player '%s' (%Ld).  Transfer Reason = '%s'",
+				amount, PlayerObject::getAccountDescription(target).c_str(), target.getValue(), reason.c_str()));
+		}
+		else
+		{
+			LOG("CustomerService", ("Auction: failed to transfer %d credits to player '%s' (%Ld) because ServerObject::transferBankCreditsFrom() returned false.  Transfer Reason = '%s'",
+				amount, PlayerObject::getAccountDescription(target).c_str(), target.getValue(), reason.c_str()));
+		}
+	}
+	else
+	{	
+		LOG("CustomerService", ("Auction: Transferring %d credits to player '%s' (%Ld) using C++FromNamedAccountToBank message method.  Transfer Reason = '%s'",
+			amount, PlayerObject::getAccountDescription(target).c_str(), target.getValue(), reason.c_str()));
+		char buf[100];
+		snprintf(buf, sizeof(buf), "%s %d", COMMODITIES_NAMED_ACCOUNT.c_str(), (int)(amount));
+		MessageToQueue::getInstance().sendMessageToC(target, "C++FromNamedAccountToBank", buf, 0, true);
+	}
+}
+
+static void transferBank(const NetworkId &source, const NetworkId &dest, int32 amount)
+{
+	ServerObject *obj = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(source));
+	if (obj)
+	{
+		obj->transferBankCreditsTo(dest, amount);
+	}
+	else
+	{
+//		printf("Transfering %i bank from %Ld to %Ld\n", (int)amount, source.getValue(), dest.getValue());
+		char buf[100];
+		sprintf(buf, "%Ld %Ld", (int64)dest.getValue(), (int64)amount);
+		MessageToQueue::getInstance().sendMessageToC(source, "C++ModifyBank", buf, 0, true);
+	}
+}
+
+// ======================================================================
+
+static std::string getLocationString(const ServerObject &container)
+{
+	ServerObject *auctionContainer = const_cast<ServerObject *>(&container);
+	//std::string ret(auctionContainer->getNetworkId().getValueString());
+
+	if (!auctionContainer)
+	{
+		return "junk";
+	}
+	ServerObject *bazaarContainer = auctionContainer->getBazaarContainer();
+	ServerObject *parent = const_cast<ServerObject *>(dynamic_cast<const ServerObject *>(ContainerInterface::getFirstParentInWorld(container)));
+	if (parent && parent->asCreatureObject())
+	{
+		if (parent->getBazaarContainer() == auctionContainer)
+		{
+			//We got passed the container itself on a vendor, but we want auctionContainer to be the parent.
+			auctionContainer = parent;
+			bazaarContainer = parent->getBazaarContainer();
+		}
+	}
+
+	if (!bazaarContainer)
+	{
+		return "junk"; 
+	}
+	
+	PlanetObject * const planet = ServerUniverse::getInstance().getPlanetByName(ServerWorld::getSceneId());
+	if (!planet)
+	{
+		return std::string ("BADPLANET.@BADREGION.") + 
+			Unicode::wideToNarrow (auctionContainer->getEncodedObjectName ()) + 
+			"." + auctionContainer->getNetworkId().getValueString();
+	}
+
+	const Vector & pos_w = auctionContainer->findPosition_w();
+	Region * const r = const_cast<Region *>(RegionMaster::getSmallestVisibleRegionAtPoint(planet->getName(), pos_w.x, pos_w.z));
+
+	std::string regionName;
+
+	if (r)
+		regionName = Unicode::wideToNarrow (r->getName ());
+	else
+		regionName = std::string ("@planet_n:") + planet->getName ();
+
+	char positionString[256];
+	snprintf(positionString, sizeof (positionString), "#%i,%i", static_cast<int>(pos_w.x), static_cast<int>(pos_w.z));
+
+	
+	std::string ret = planet->getName() + ".";
+
+	if (!regionName.empty () && regionName [0] != '@')
+		ret.push_back ('@');
+
+	ret += regionName;
+	ret.push_back ('.');
+
+	ret += Unicode::wideToNarrow (auctionContainer->getEncodedObjectName ()) + "." + bazaarContainer->getNetworkId().getValueString() + positionString;
+	return ret;
+}
+
+// ======================================================================
+
+static void getLocationSearchString(ServerObject *auctionContainer, int locationSearchType, std::string & planetStr, std::string & regionStr, NetworkId & auctionLocationId)
+{
+	planetStr.clear();
+	regionStr.clear();
+	auctionLocationId = NetworkId::cms_invalid;
+
+	if (!auctionContainer)
+	{
+		return;
+	}
+
+	ServerObject *bazaarContainer = auctionContainer->getBazaarContainer();
+	ServerObject *parent = const_cast<ServerObject *>(dynamic_cast<const ServerObject *>(ContainerInterface::getFirstParentInWorld(*auctionContainer)));
+	if (parent && parent->asCreatureObject())
+	{
+		if (parent->getBazaarContainer() == auctionContainer)
+		{
+			//We got passed the container itself on a vendor, but we want auctionContainer to be the parent.
+			auctionContainer = parent;
+			bazaarContainer = parent->getBazaarContainer();
+		}
+	}
+
+	if (!bazaarContainer)
+	{
+		return;
+	}
+
+	const PlanetObject * const planet = ServerUniverse::getInstance().getPlanetByName(ServerWorld::getSceneId());
+	if (!planet)
+	{
+		return;
+	}
+
+	const Vector & pos_w = auctionContainer->findPosition_w();
+	Region * const r = const_cast<Region *>(RegionMaster::getSmallestVisibleRegionAtPoint(planet->getName(), pos_w.x, pos_w.z));
+
+	std::string regionName;
+
+	if (r)
+		regionName = Unicode::wideToNarrow (r->getName ());
+	else
+		regionName = std::string ("@planet_n:") + planet->getName ();
+
+	switch (locationSearchType)
+	{
+	case AuctionQueryHeadersMessage::ALS_Galaxy:
+		break;
+		
+	case AuctionQueryHeadersMessage::ALS_Planet:
+		planetStr = planet->getName();
+		break;
+		
+	case AuctionQueryHeadersMessage::ALS_Region:
+		planetStr = planet->getName();
+		regionStr = regionName;
+		break;
+		
+	case AuctionQueryHeadersMessage::ALS_Market:
+		auctionLocationId = bazaarContainer->getNetworkId();
+		break;
+	}
+
+	return;
+}
+
+// ======================================================================
+
+namespace Auction
+{
+	const uint16 maxPageSize = 100;
+
+	static const Unicode::String at = Unicode::narrowToWide("@");
+	static const std::string auctionSender("Auctioner");
+
+	//----------------------------------------------------------------------
+
+	void sendAuctionSuccessToSeller(
+		const std::string &     seller, 
+		const std::string &     buyer,
+		const std::string &     location,
+		const NetworkId &       buyerId,
+		const Unicode::String & itemName,
+		const NetworkId &       itemId,
+		int                     purchaseAmount,
+		bool                    immediate
+	)
+	{
+		std::string planetName;
+		std::string regionName;
+		std::string marketName;
+
+		AuctionManager::separateLocation (location, planetName, regionName, marketName);
+
+		static const Unicode::String subject_auction = Unicode::narrowToWide("@" + AuctionStringIds::subjectAuctionSeller.getCanonicalRepresentation());
+		static const Unicode::String subject_instant = Unicode::narrowToWide("@" + AuctionStringIds::subjectInstantSeller.getCanonicalRepresentation());
+		static const Unicode::String subject_vendor = Unicode::narrowToWide("@" + AuctionStringIds::subjectVendorSeller.getCanonicalRepresentation());
+
+		ProsePackage pp_location;
+		pp_location.stringId   = AuctionStringIds::seller_success_location;
+		pp_location.target.str = Unicode::narrowToWide (regionName);
+		pp_location.other.str  = Unicode::narrowToWide ("@planet_n:") + Unicode::narrowToWide (planetName);
+
+		//-- it is a vendor sale
+		if (!_strnicmp (marketName.c_str (), "vendor:", 7))
+		{
+			ProsePackage pp;
+			
+			pp.stringId     = AuctionStringIds::seller_success_vendor;
+
+			pp.actor.str    = Unicode::narrowToWide (marketName);
+			pp.target.id    = buyerId;
+			pp.target.str   = Unicode::narrowToWide(buyer);			
+			pp.other.id     = itemId;
+			pp.other.str    = itemName;
+			pp.digitInteger = purchaseAmount; 
+			
+			Unicode::String oob;
+			OutOfBandPackager::pack(pp, -1, oob);
+			OutOfBandPackager::pack(pp_location, -1, oob);
+
+			Chat::sendPersistentMessage(auctionSender, seller, subject_vendor, Unicode::emptyString, oob);
+		}
+		else
+		{
+			ProsePackage pp;
+			
+			pp.stringId     = AuctionStringIds::seller_success;
+			pp.target.id    = buyerId;
+			pp.target.str   = Unicode::narrowToWide(buyer);
+			
+			pp.other.id     = itemId;
+			pp.other.str    = itemName;
+			pp.digitInteger = purchaseAmount; 
+			
+			Unicode::String oob;
+			OutOfBandPackager::pack(pp, -1, oob);
+			OutOfBandPackager::pack(pp_location, -1, oob);
+
+			Unicode::String subject;
+			if (immediate)
+				subject = subject_instant;
+			else
+				subject = subject_auction;
+
+			Chat::sendPersistentMessage(auctionSender, seller, subject, Unicode::emptyString, oob); 
+		}
+	}
+
+	//----------------------------------------------------------------------
+
+	WaypointDataBase const getWaypointData(const std::string & locationString, const Unicode::String &itemName)
+	{
+		std::string planetName;
+		std::string regionName;
+		std::string marketName;
+		NetworkId   marketId;
+		int         marketX = 0;
+		int         marketZ = 0;
+
+		AuctionManager::separateLocation (locationString, planetName, regionName, marketName, marketId, marketX, marketZ);
+
+		const Vector coords (static_cast<float>(marketX), 0.0f, static_cast<float>(marketZ));
+
+		WaypointDataBase waypoint;
+		waypoint.m_location = Location (coords, NetworkId::cms_invalid, Location::getCrcBySceneName (planetName));
+		waypoint.setName(itemName);
+
+		return waypoint;
+	}
+
+	//----------------------------------------------------------------------
+
+	void sendAuctionSuccessToBuyer(
+		const std::string &     seller, 
+		const NetworkId &       sellerId,
+		const std::string &     buyer,
+		const std::string &     location,
+		const Unicode::String & itemName,
+		const NetworkId &       itemId,
+		int                     purchaseAmount,
+		bool                    immediate
+	)
+	{
+		ProsePackage pp;
+			
+		pp.stringId     = AuctionStringIds::buyerAuctionSuccess;
+		pp.target.id    = sellerId;
+		pp.target.str   = Unicode::narrowToWide(seller);
+
+		pp.other.id     = itemId;
+		pp.other.str    = itemName;
+		pp.digitInteger = purchaseAmount; 
+
+		static const Unicode::String subject_auction = Unicode::narrowToWide("@" + AuctionStringIds::subjectAuctionBuyer.getCanonicalRepresentation());
+		static const Unicode::String subject_instant = Unicode::narrowToWide("@" + AuctionStringIds::subjectInstantBuyer.getCanonicalRepresentation());
+		static const Unicode::String subject_vendor = Unicode::narrowToWide("@" + AuctionStringIds::subjectVendorBuyer.getCanonicalRepresentation());
+		
+		Unicode::String subject;
+
+		std::string planetName;
+		std::string regionName;
+		std::string marketName;
+
+		AuctionManager::separateLocation (location, planetName, regionName, marketName);
+
+		//-- it is a vendor sale
+		if (!_strnicmp (marketName.c_str (), "vendor:", 7))
+		{
+			subject = subject_vendor;
+		}
+		else
+		{
+			if (immediate)
+				subject = subject_instant;
+			else
+				subject = subject_auction;
+		}
+
+		Unicode::String oob;
+		OutOfBandPackager::pack(pp, -1, oob);
+		
+		ProsePackage pp_location;
+		pp_location.stringId   = AuctionStringIds::buyer_success_location;
+		pp_location.target.str = Unicode::narrowToWide (regionName);
+		pp_location.other.str  = Unicode::narrowToWide ("@planet_n:") + Unicode::narrowToWide (planetName);
+		OutOfBandPackager::pack (pp_location, -1, oob);
+
+		WaypointDataBase const &waypoint = getWaypointData(location, itemName);
+
+		OutOfBandPackager::pack(waypoint, -3, oob);
+
+		Chat::sendPersistentMessage(auctionSender, buyer, subject, Unicode::emptyString, oob); 
+	}
+
+	//----------------------------------------------------------------------
+
+	void sendAuctionFailedToSeller(
+		const std::string &     seller, 
+		const std::string &     locationString,
+		const Unicode::String & itemName,
+		const NetworkId &       itemId
+	)
+	{
+		UNREF (locationString);
+
+		ProsePackage pp;
+			
+		pp.stringId  = AuctionStringIds::sellerAuctionFail;
+		pp.other.id  = itemId;
+		pp.other.str = itemName;
+
+		static const Unicode::String subject = Unicode::narrowToWide("@" + AuctionStringIds::subjectAuctionUnsuccessful.getCanonicalRepresentation());
+		Unicode::String oob;
+		OutOfBandPackager::pack(pp, -1, oob);
+		Chat::sendPersistentMessage(auctionSender, seller, subject, Unicode::emptyString, oob); 
+	}
+
+	//----------------------------------------------------------------------
+
+	void sendAuctionFailedToBidder(
+		const std::string &     seller, 
+		const NetworkId &       sellerId,
+		const std::string &     buyer,
+		const std::string &     locationString,
+		const Unicode::String & itemName,
+		const NetworkId &       itemId
+	)
+	{
+		UNREF (locationString);
+
+		ProsePackage pp;
+			
+		pp.stringId   = AuctionStringIds::buyerAuctionFail;
+		pp.target.id  = sellerId;
+		pp.target.str = Unicode::narrowToWide(seller);
+
+		pp.other.id   = itemId;
+		pp.other.str  = itemName;
+
+		static const Unicode::String subject = Unicode::narrowToWide("@" + AuctionStringIds::subjectAuctionCancelled.getCanonicalRepresentation());		
+		Unicode::String oob;
+		OutOfBandPackager::pack(pp, -1, oob);
+		Chat::sendPersistentMessage(auctionSender, buyer, subject, Unicode::emptyString, oob); 
+	}
+
+	//----------------------------------------------------------------------
+
+	void sendAuctionBidToPreviousBidder(
+		const std::string &previousBidderName, 
+		const Unicode::String &itemName,
+		const NetworkId &itemId
+	)
+	{
+		ProsePackage pp;
+			
+		pp.stringId  = AuctionStringIds::bidderOutbid;
+		pp.other.id  = itemId;
+		pp.other.str = itemName;
+
+		static const Unicode::String subject = Unicode::narrowToWide("@" + AuctionStringIds::subjectAuctionOutbid.getCanonicalRepresentation());
+		Unicode::String oob;
+		OutOfBandPackager::pack(pp, -1, oob);
+		Chat::sendPersistentMessage(auctionSender, previousBidderName, subject, Unicode::emptyString, oob); 
+	}
+
+	//----------------------------------------------------------------------
+
+	void sendItemExpiredToOwner(
+		const std::string &ownerName, 
+		const Unicode::String &itemName,
+		const NetworkId &itemId
+	)
+	{
+		ProsePackage pp;
+			
+		pp.stringId  = AuctionStringIds::itemExpired;
+		pp.other.id  = itemId;
+		pp.other.str = itemName;
+
+		static const Unicode::String subject = Unicode::narrowToWide("@" + AuctionStringIds::subjectAuctionItemExpired.getCanonicalRepresentation());
+		Unicode::String oob;
+		OutOfBandPackager::pack(pp, -1, oob);
+		Chat::sendPersistentMessage(auctionSender, ownerName, subject, Unicode::emptyString, oob); 
+	}
+
+}
+// ----------------------------------------------------------------------
+
+// todo: might want to add pending message q here if connectivity problems are frequent
+// by passing in message that failed. Also would add q send mechanism on reconnect here
+
+void CommoditiesMarket::getCommoditiesServerConnection()
+{
+	// wait until the game server has received object ids before connecting
+	// to the commodities server, because as soon as the game server connects
+	// to the commodities server, the commodities server will start sending
+	// messages which will cause the game server to request an object
+	// id in the processing of the message, and we want to make sure
+	// that we have object ids available when that happens, or the game server
+	// will FATAL()
+	if (ObjectIdManager::hasAvailableObjectId())
+	{
+		s_market = new CommoditiesServerConnection(ConfigServerGame::getCommoditiesServerServiceBindInterface(), static_cast<unsigned short>(ConfigServerGame::getCommoditiesServerServiceBindPort()));
+		s_timeMarketConnectionCreated = ::time(NULL);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+int CommoditiesMarket::getCommoditiesServerConnectionAgeSeconds()
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return 0;
+
+	if (s_timeMarketConnectionCreated <= 0)
+		return 0;
+
+	if (s_market == NULL)
+		return 0;
+
+	return static_cast<int>(::time(NULL) - s_timeMarketConnectionCreated);
+}
+
+// ----------------------------------------------------------------------
+
+bool CommoditiesMarket::isCommoditiesServerAvailable()
+{
+	return (getCommoditiesServerConnectionAgeSeconds() > 30);
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::install()
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+
+	FATAL(s_market, ("CommoditiesMarket already installed.\n"));
+	getCommoditiesServerConnection();
+	time_t t = time(0);
+	
+	if (s_market)
+	{
+		s_market->SetGameTime(t);
+	}
+	else
+	{
+		WARNING(true, ("[Commodities API] : No commodities server connection to send SetGameTime.\n"));
+		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+	}
+	
+	s_pendingSalesTax.clear();
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::remove()
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+
+	//FATAL(!s_market, ("CommoditiesMarket not installed.\n"));
+	try
+	{
+		s_market = 0;
+		s_timeMarketConnectionCreated = 0;
+
+		for(std::map<NetworkId, SalesTaxInfo*>::iterator i = s_pendingSalesTax.begin(); i != s_pendingSalesTax.end(); ++i)
+		{
+			if (i->second)
+				delete i->second;
+		}
+		s_pendingSalesTax.clear();
+	}
+	catch (...)
+	{
+		;
+	}
+
+	for(std::map<NetworkId, QueuedQuery *>::iterator iter = s_queryTime.begin(); iter != s_queryTime.end(); ++iter)
+	{
+		delete iter->second;
+	}
+	s_queryTime.clear();
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::closeCommoditiesServerConnection()
+{
+	if (s_market)
+	{
+		s_market->disconnect();
+		s_market = 0;
+		s_timeMarketConnectionCreated = 0;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::giveTime()
+{
+	static unsigned long reconnectTime =0;
+	
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+
+	if (s_market)
+	{
+		s_market->GiveTime();
+	}
+	else
+	{
+		if (Clock::timeSeconds() - ConfigServerGame::getCommoditiesServerReconnectIntervalSec() > reconnectTime)
+		{
+			WARNING(true, ("[Commodities API] : No commodities server connection to send GiveTime.\n"));
+			getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+			reconnectTime = Clock::timeSeconds();
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+namespace Auction
+{
+	Unicode::String getItemAuctionName(const ServerObject *item, const Unicode::String &itemLocalizedName)
+	{
+		if (!item)
+		{
+			return Unicode::emptyString;
+		}
+		const Unicode::String objectName = ((itemLocalizedName.size() > 0) ? itemLocalizedName : item->getEncodedObjectName());
+		const ResourceContainerObject * const resourceContainer = dynamic_cast<const ResourceContainerObject *>(item);
+		if (resourceContainer)
+		{
+			ResourceTypeObject const * const rto = resourceContainer->getResourceType();
+			if (rto)
+			{
+				char buf[128];
+				const size_t buf_size = sizeof (buf);
+				snprintf(buf, buf_size, " (%s) %6d", rto->getResourceName().c_str(), resourceContainer->getQuantity());
+
+				return (objectName + uint16(0) + Unicode::narrowToWide(buf));
+			}
+
+			return objectName;
+		}
+		else
+		{
+
+			const TangibleObject * const tangible = item->asTangibleObject ();
+			if (tangible && tangible->getCount ())
+			{
+				char buf[32];
+				const size_t buf_size = sizeof (buf);
+
+				snprintf(buf, buf_size, " %6d", tangible->getCount ());				
+				return (objectName + uint16(0) + Unicode::narrowToWide(buf));				
+			}
+
+			const IntangibleObject * const intangible = !tangible ? dynamic_cast<const IntangibleObject *>(item) : 0;
+			if (intangible && intangible->getCount ())
+			{
+				char buf[32];
+				const size_t buf_size = sizeof (buf);
+
+				snprintf(buf, buf_size, " %6d", intangible->getCount ());				
+				return (objectName + uint16(0) + Unicode::narrowToWide(buf));				
+			}
+
+			return objectName;
+		}
+		return Unicode::emptyString;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+
+void CommoditiesMarket::auctionCreate(CreatureObject &actorCreature, NetworkId &itemId, const Unicode::String &itemLocalizedName, NetworkId &auctionContainerId, BidAmount minBid, time_t timer, const Unicode::String &userDescription, bool premium)
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+
+	AuctionResult errorCode = ar_OK;
+	std::string itemRestrictedRejectionMessage;
+
+	ServerObject * const itemTangible = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(itemId));
+
+	ServerObject *auctionContainer = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(auctionContainerId));
+	if (!auctionContainer)
+	{
+		errorCode = ar_INVALID_CONTAINER_ID;
+	}
+	else if (!itemTangible)
+	{
+		errorCode = ar_INVALID_ITEM_ID;
+	}
+	else
+	{
+		canAuction(*itemTangible, actorCreature, *auctionContainer, minBid, timer, 0, errorCode, itemRestrictedRejectionMessage);
+	}
+
+	if (errorCode == ar_OK)
+	{
+		auctionCreate(actorCreature, *itemTangible, itemLocalizedName, *auctionContainer, minBid, timer, userDescription, premium);
+	}
+	else
+	{
+		Client *client = actorCreature.getClient();
+		if (client)
+		{
+			CreateAuctionResponseMessage msg(itemId, errorCode, itemRestrictedRejectionMessage);
+			client->send(msg, true);
+		}
+	}	
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::onAddAuction(int sequence, int32 result, const NetworkId &auctionOwnerId, const std::string &ownerName, const NetworkId &itemId, const NetworkId &vendorId, const std::string &vendorName, const NetworkId &location)
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+
+	CreatureObject * const auctionCreator = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(auctionOwnerId));
+	ServerObject * const item             = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(itemId));
+	Client *client = NULL;
+	if (auctionCreator)
+		client = auctionCreator->getClient();
+
+	if (result == 0)
+	{
+		LOG("CustomerService", ("Auction:%s has put item %s for auction at location %Ld",
+			PlayerObject::getAccountDescription(auctionOwnerId).c_str(), ServerObject::getLogDescription(itemId).c_str(), location.getValue()));
+		if ((item) && (item->getVolume() > 1))
+		{
+			Container *container = ContainerInterface::getContainer(*item);
+			if (container)
+			{
+				for (ContainerIterator containerIterator = container->begin(); containerIterator != container->end(); ++containerIterator)
+				{
+					ServerObject * containedObject = safe_cast<ServerObject *>((*containerIterator).getObject());
+					if (containedObject)
+					{
+						LOG("CustomerService", ("Auction:%s has put item %s for auction at location %Ld inside container %s",
+							PlayerObject::getAccountDescription(auctionOwnerId).c_str(), 
+							ServerObject::getLogDescription(containedObject->getNetworkId()).c_str(), 
+							location.getValue(),
+							ServerObject::getLogDescription(itemId).c_str()
+						));
+					}
+				}
+			}
+		}
+		std::hash_map<int, int>::iterator f = s_pendingAdds.find(sequence);
+		int auctionFee = 0;
+		if (f != s_pendingAdds.end())
+		{
+			auctionFee = (*f).second;
+			s_pendingAdds.erase(f);
+		}
+		if (auctionCreator && auctionFee > 0)
+		{
+			//MLS transfer the bank credits
+			if (auctionFee > auctionCreator->getBankBalance())
+			{
+				auctionCreator->depositCashToBank(auctionFee - auctionCreator->getBankBalance());
+			}
+			transferBank(auctionOwnerId, location, auctionFee);
+		}
+	
+		// we unload the item and then transfer it to the auction container in the database
+		if (item)
+		{
+			ServerObject *container = dynamic_cast<ServerObject *>(NetworkIdManager::getObjectById(location));
+			if (container)
+			{
+				Container::ContainerErrorCode tmp = Container::CEC_Success;
+				bool result = ContainerInterface::transferItemToVolumeContainer(*container,*item, NULL, tmp);
+				if (!result)
+				{
+					LOG("CustomerService", ("Auction: Player %s transfer of item (%Ld) to auction container (%Ld) failed with code %d",
+											PlayerObject::getAccountDescription(auctionOwnerId).c_str(),
+											itemId.getValue(),
+											location.getValue(),
+											static_cast<int>(tmp)));
+					WARNING(!result, ("Transfer of item (%Ld) to auction container (%Ld) failed", itemId.getValue(), location.getValue()));
+				}
+			}
+			else
+			{
+				WARNING(true, ("Tried to transfer an item sold at a commodities terminal or vendor to the container, but the container was not found.  This is very bad since the object will simply stay in the player's inventory and the object will be for sale on the market."));	
+			}
+		}
+	}
+	if (client)
+	{
+		AuctionResult auctionResult = (AuctionResult)result;
+		if (result == ARC_TooManyAuctions)
+		{
+			auctionResult = ar_TOO_MANY_AUCTIONS;
+		}
+		else if (result == ARC_AuctionVendorLimitExceeded)
+		{
+			auctionResult = ar_TOO_MANY_VENDORS;
+		}
+		else if (result == ARC_AuctionVendorItemLimitExceeded)
+		{
+			auctionResult = ar_TOO_MANY_VENDOR_ITEMS;
+		}		
+		else if (result == ARC_InvalidBid)
+		{
+			auctionResult = ar_INVALID_MINIMUM_BID;
+		}
+		else if (result == ARC_AuctionAlreadyExists)
+		{
+			auctionResult = ar_ITEM_ALREADY_AUCTIONED;
+			LOG("CustomerService", ("Auction:%Ld has tried to auction the item %Ld, but it failed because the item was already for auction.  This comes about when the cluster comes down and the auction is written to the DB before the item transfer occurs.",  auctionOwnerId.getValue(), itemId.getValue()));
+			if (s_market)
+			{
+				s_market->CancelAuction(itemId, auctionOwnerId);
+			}	
+			else
+			{
+				WARNING(true, ("[Commodities API] : No commodities server connection to send CancelAuction.\n"));
+				getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+			}
+		}
+		CreateAuctionResponseMessage msg(NetworkId(itemId.getValue()),
+			auctionResult, std::string());
+		client->send(msg, true);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::auctionCreate(CreatureObject &owner, ServerObject &item, const Unicode::String &itemLocalizedName, ServerObject &auctionContainer, BidAmount minBid, time_t timer, const Unicode::String &userDescription, bool premium)
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+
+	ScriptParams params;
+	params.clear();
+	params.addParam(item.getNetworkId());
+	if (owner.getScriptObject()->trigAllScripts(Scripting::TRIG_AUCTION_ITEM, params) != SCRIPT_CONTINUE)
+	{
+
+		Client *client = owner.getClient();
+		if (client)
+		{
+			AuctionResult errorCode = (AuctionResult)params.getIntParam(1);
+			CreateAuctionResponseMessage msg(item.getNetworkId(), errorCode, std::string());
+			client->send(msg, true);
+		}
+		return;	
+	}
+
+	params.clear();
+	params.addParam(owner.getNetworkId());
+	params.addParam(auctionContainer.getNetworkId());
+	params.addParam(item.getNetworkId());
+	params.addParam(premium);
+	params.addParam(-1);
+	owner.getScriptObject()->trigAllScripts(Scripting::TRIG_REQUEST_AUCTION_FEE, params);
+
+	int auctionFee = params.getIntParam(4);
+
+	if (auctionFee <= 0)
+	{
+		auctionFee = ADD_AUCTION_COST;
+	}
+
+	int flags = 0;
+	if (premium)
+	{
+		flags |= AUCTION_PREMIUM_AUCTION;
+	}
+	const TangibleObject *tangibleObject = item.asTangibleObject();
+	if (tangibleObject && tangibleObject->hasCondition(ServerTangibleObjectTemplate::C_magicItem))
+	{
+		flags |= AUCTION_MAGIC_ITEM;
+	}
+
+	AuctionResult errorCode = ar_OK;
+	std::string itemRestrictedRejectionMessage;
+
+	bool canSell = canAuction(item, owner, auctionContainer, minBid, timer, auctionFee, errorCode, itemRestrictedRejectionMessage);
+	
+	Client *client = owner.getClient();
+	const NetworkId & itemId = item.getNetworkId();
+	if (canSell && errorCode == ar_OK)
+	{
+		if (item.getOwnerId() != owner.getNetworkId())
+		{
+			item.setOwnerId(owner.getNetworkId());
+		}
+		
+		timer = time(0) + timer;
+
+		const Unicode::String objectName = Auction::getItemAuctionName(&item, itemLocalizedName);
+
+		//--- Build attributes
+		ServerObject::AttributeVector attributes;
+		item.getAttributesForAuction(attributes);
+
+		int itemSize = static_cast<ServerObject &>(item).getVolume();
+		
+		if (s_market)
+		{	
+			const int got = item.getGameObjectType();
+			int itemObjectTemplateId = 0;
+
+			if (got == SharedObjectTemplate::GOT_misc_factory_crate)
+				itemObjectTemplateId = getCrateContainedItemObjectTemplateId(item);
+
+			if (itemObjectTemplateId == 0)
+				itemObjectTemplateId = getItemObjectTemplateId(item);
+
+			int sequence = s_market->AddAuction(
+				owner.getNetworkId(),
+				Unicode::wideToNarrow(owner.getAssignedObjectName()),
+				minBid,
+				timer,
+				itemId,
+				objectName.size(), objectName.data(),
+				got,
+				itemObjectTemplateId,
+				timer+ConfigServerGame::getUnclaimedAuctionItemDestroyTimeSec(),
+				auctionContainer.getNetworkId(),
+				getLocationString(auctionContainer),
+				flags,
+				userDescription.size(), userDescription.data(),
+				attributes,
+				itemSize,
+				owner.getModValue("manage_vendor"),
+				owner.getModValue("vendor_item_limit"));
+			s_pendingAdds[sequence] = auctionFee;
+		}
+		else
+		{
+			WARNING(true, ("[Commodities API] : No commodities server connection to send AddAuction.\n"));
+			getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+		}
+		
+	}
+	else if (client)
+	{
+		CreateAuctionResponseMessage msg(itemId, errorCode, itemRestrictedRejectionMessage);
+		client->send(msg, true);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::transferVendorItemFromStockroom(CreatureObject &owner, NetworkId &itemId, const Unicode::String &itemLocalizedName, BidAmount price, time_t timer, const Unicode::String &userDescription)
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+
+	AuctionResult errorCode = ar_OK;
+
+	// price of -1 means to use the current price and description of the item in the stockroom
+	if ((price < 0) && (price != -1))
+	{
+		errorCode = ar_INVALID_MINIMUM_BID;
+	}
+
+	if (price > MAX_VENDOR_PRICE)
+	{
+		errorCode = ar_PRICE_TOO_HIGH;
+	}
+
+	if (timer <= 0)
+	{
+		errorCode = ar_INVALID_AUCTION_LENGTH;
+	}
+
+	Client *client = owner.getClient();
+
+	if (errorCode == ar_OK)
+	{
+		timer = time(0) + timer;
+
+		if (s_market)
+		{
+			static std::vector<std::pair<std::string, Unicode::String> > const emptyAttributes;
+			
+			s_market->AddImmediateAuction(
+				owner.getNetworkId(),
+				Unicode::wideToNarrow(owner.getAssignedObjectName()),
+				price,
+				timer,
+				itemId,
+				itemLocalizedName.size(),
+				itemLocalizedName,
+				0,
+				0,
+				timer+ConfigServerGame::getUnclaimedAuctionItemDestroyTimeSec(),
+				zeroNetworkId,
+				std_blank,
+				AUCTION_VENDOR_TRANSFER,
+				userDescription.size(),
+				userDescription,
+				emptyAttributes,
+				0,  // will get set based on old itemSize value
+				owner.getModValue("manage_vendor"),
+				owner.getModValue("vendor_item_limit"));
+		}
+		else
+		{
+			WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n"));
+			getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+		}
+			
+	}
+	else if (client)
+	{
+		CreateAuctionResponseMessage msg(itemId, errorCode, std::string());
+		client->send(msg, true);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::auctionCreateImmediate(CreatureObject &actorCreature, NetworkId &itemId, const Unicode::String &itemLocalizedName, NetworkId &auctionContainerId, BidAmount price, time_t timer, const Unicode::String &userDescription, bool premium)
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+
+	AuctionResult errorCode = ar_OK;
+	std::string itemRestrictedRejectionMessage;
+
+	ServerObject *itemTangible = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(itemId));
+	ServerObject * const auctionContainer = safe_cast<ServerObject*> (NetworkIdManager::getObjectById(auctionContainerId));
+
+	if (!auctionContainer)
+	{
+		errorCode = ar_INVALID_CONTAINER_ID;
+	}
+	else if (!itemTangible)
+	{
+		errorCode = ar_INVALID_ITEM_ID;
+	}
+	else
+	{
+		canAuction(*itemTangible, actorCreature, *auctionContainer, price, timer, 0, errorCode, itemRestrictedRejectionMessage);
+	}
+
+	if (errorCode == ar_OK)
+	{
+		auctionCreateImmediate(actorCreature, *itemTangible, itemLocalizedName, *auctionContainer, price, timer, userDescription, premium);
+	}
+	else
+	{
+		Client *client = actorCreature.getClient();
+		if (client)
+		{
+			CreateAuctionResponseMessage msg(itemId, errorCode, itemRestrictedRejectionMessage);
+			client->send(msg, true);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::auctionCreateImmediate(CreatureObject &owner, ServerObject &item, const Unicode::String &itemLocalizedName, ServerObject &auctionContainer, BidAmount price, time_t timer, const Unicode::String &userDescription, bool premium)
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+
+	AuctionResult errorCode = ar_OK;
+	std::string itemRestrictedRejectionMessage;
+
+	ScriptParams params;
+	params.clear();
+	params.addParam(item.getNetworkId());
+	if (owner.getScriptObject()->trigAllScripts(Scripting::TRIG_AUCTION_ITEM, params) != SCRIPT_CONTINUE)
+	{
+		Client *client = owner.getClient();
+		if (client)
+		{
+			AuctionResult errorCode = (AuctionResult)params.getIntParam(1);
+			CreateAuctionResponseMessage msg(item.getNetworkId(), errorCode, std::string());
+			client->send(msg, true);
+		}
+		return;	
+	}
+
+	params.clear();
+	params.addParam(owner.getNetworkId());
+	params.addParam(auctionContainer.getNetworkId());
+	params.addParam(item.getNetworkId());
+	params.addParam(premium);
+	params.addParam(ADD_AUCTION_COST);
+	owner.getScriptObject()->trigAllScripts(Scripting::TRIG_REQUEST_AUCTION_FEE, params);
+
+	int auctionFee = params.getIntParam(4);
+	if (auctionFee <= 0)
+	{
+		auctionFee = ADD_AUCTION_COST;
+	}
+	int flags = 0;
+	if (premium)
+	{
+		flags |= AUCTION_PREMIUM_AUCTION;
+	}
+
+	const TangibleObject * const tangibleObject = item.asTangibleObject();
+	if (tangibleObject && tangibleObject->hasCondition(ServerTangibleObjectTemplate::C_magicItem))
+	{
+		flags |= AUCTION_MAGIC_ITEM;
+	}
+
+	// auction is a vendor offer
+	if (auctionContainer.isVendor())
+	{
+		NetworkId vendorOwnerId;
+		if (!auctionContainer.getObjVars().getItem("vendor_owner", vendorOwnerId))
+			vendorOwnerId = auctionContainer.getOwnerId();
+
+		if (owner.getNetworkId() != vendorOwnerId)
+		{
+			flags |= AUCTION_OFFERED_ITEM;
+		}
+	}
+
+	bool canSell = canAuction(item, owner, auctionContainer, price, timer, auctionFee, errorCode, itemRestrictedRejectionMessage);
+	
+	Client * const client = owner.getClient();
+	NetworkId itemId(item.getNetworkId());
+	if (canSell && errorCode == ar_OK)
+	{
+		// in order to auction an item, the auctioner must:
+		//   be the owner of the item
+		//   be the firstParentInWorld of the item
+		
+		if (item.getOwnerId() != owner.getNetworkId())
+		{
+			item.setOwnerId(owner.getNetworkId());
+		}
+		
+		timer = time(0) + timer;
+
+		const Unicode::String objectName = Auction::getItemAuctionName(&item, itemLocalizedName);
+
+		ServerObject::AttributeVector attributes;
+		item.getAttributesForAuction(attributes);
+		
+		int itemSize = static_cast<ServerObject &>(item).getVolume();
+		
+		if (s_market)
+		{	
+			const int got = item.getGameObjectType();
+			int itemObjectTemplateId = 0;
+
+			if (got == SharedObjectTemplate::GOT_misc_factory_crate)
+				itemObjectTemplateId = getCrateContainedItemObjectTemplateId(item);
+
+			if (itemObjectTemplateId == 0)
+				itemObjectTemplateId = getItemObjectTemplateId(item);
+
+			const int sequence = s_market->AddImmediateAuction(
+				owner.getNetworkId(),
+				Unicode::wideToNarrow(owner.getAssignedObjectName()),
+				price,
+				timer,
+				itemId,
+				objectName.size(), objectName,
+				got,
+				itemObjectTemplateId,
+				timer+ConfigServerGame::getUnclaimedAuctionItemDestroyTimeSec(),
+				auctionContainer.getNetworkId(),
+				getLocationString(auctionContainer),
+				flags,
+				userDescription.size(), userDescription.data(),
+				attributes,
+				itemSize,
+				owner.getModValue("manage_vendor"),
+				owner.getModValue("vendor_item_limit"));
+			s_pendingAdds[sequence] = auctionFee;
+		}
+		else
+		{
+			WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n"));
+			getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+		}
+		
+	} else if (client)
+	{
+		CreateAuctionResponseMessage msg(itemId, errorCode, itemRestrictedRejectionMessage);
+		client->send(msg, true);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::auctionCreatePermanent(const std::string &, const ServerObject &, const ServerObject &, BidAmount , const Unicode::String &, bool )
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+
+	WARNING(true, ("auctionCreatePermanent has been depricated and shouldn't be used.  If you see this WARNING, add a line to catch cheaters in the command in CommandCppFuncs.cpp"));
+	return;
+	
+#if 0
+	
+	const NetworkId & itemId = item.getNetworkId();
+	int flags = AUCTION_ALWAYS_PRESENT;
+	if (premium)
+	{
+		flags |= AUCTION_PREMIUM_AUCTION;
+	}
+	const TangibleObject *tangibleObject = item.asTangibleObject();
+	if (tangibleObject && tangibleObject->hasCondition(ServerTangibleObjectTemplate::C_magicItem))
+	{
+		flags |= AUCTION_MAGIC_ITEM;
+	}
+
+	const Unicode::String objectName = Auction::getItemAuctionName(&item);
+
+	const AuctionToken & token = AuctionTokenServer::createTokenFor(item);
+	Unicode::String oobData;			
+	OutOfBandPackager::pack(token, 0, oobData);
+
+	ServerObject::AttributeVector attributes;
+
+	//-- I don't know why this cast is necessary, but MSDEV is apparently confused otherwise
+	static_cast<const ServerObject &>(item).getAttributes(NetworkId::cms_invalid, attributes);
+	OutOfBandPackager::pack(attributes, 1, oobData);
+
+	OutOfBandPackager::pack(item.getTemplateName(), 2, oobData);
+
+	if (s_market)
+	{	
+		s_market->AddImmediateAuction(
+		-1,
+		ownerName,
+		price,
+		1,
+		itemId,
+		objectName.size(), objectName.data(),
+		item.getGameObjectType(),
+		ConfigServerGame::getUnclaimedAuctionItemDestroyTimeSec(),
+		auctionContainer.getNetworkId(),
+		getLocationString(auctionContainer),
+		flags,
+		userDescription.size(), userDescription.data(),
+		oobData.size(),
+		oobData);
+	}
+	else
+	{
+		WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n"));
+		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+	}
+#endif
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::auctionBid(CreatureObject &bidder, AuctionId auctionId, BidAmount bidAmount, BidAmount maxProxyBid)
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+	
+	AuctionResult errorCode = ar_OK;
+
+	if (bidAmount <= 0 || maxProxyBid < bidAmount)
+	{
+		errorCode = ar_INVALID_BID;
+	}
+	else if (maxProxyBid > bidder.getTotalMoney())
+	{
+		//insufficient funds
+		errorCode = ar_NOT_ENOUGH_MONEY;
+	}
+	else if (maxProxyBid > bidder.getBankBalance())
+	{
+		int additionalBankNeeded = maxProxyBid - bidder.getBankBalance();
+		if ((additionalBankNeeded + bidder.getBankBalance()) > ConfigServerGame::getMaxMoney())
+		{
+			additionalBankNeeded = ConfigServerGame::getMaxMoney() - bidder.getBankBalance();
+		}
+
+		if (additionalBankNeeded > bidder.getCashBalance())
+		{
+			additionalBankNeeded = bidder.getCashBalance();
+		}
+
+		if ((additionalBankNeeded > 0) && ((additionalBankNeeded + bidder.getBankBalance()) >= maxProxyBid))
+			bidder.depositCashToBank(additionalBankNeeded);
+	}
+
+	// transfer money from player to a named account to prevent them from moving it somewhere else during the transaction
+	// Resolve bug where player can transfer from their bank during an auction transaction and get things for free
+	// as well as cause the seller to not receive any money
+	if( errorCode == ar_OK && !transferFromBankToCommoditiesNamedAccount(bidder.getNetworkId(), maxProxyBid) )
+	{
+		errorCode = ar_NOT_ENOUGH_MONEY;
+	}
+
+	if (errorCode == ar_OK)
+	{
+		if (s_market)
+		{	
+			s_market->AddBid(
+			NetworkId(auctionId),
+			bidder.getNetworkId(),
+			Unicode::wideToNarrow(bidder.getAssignedObjectName()),
+			bidAmount,
+			maxProxyBid);
+		}
+		else
+		{
+			WARNING(true, ("[Commodities API] : No commodities server connection to send AddBid.\n"));
+			getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+		}
+		//response message will be sent in onAddBid
+	}
+	else
+	{
+		Client *client = bidder.getClient();
+		if (client)
+		{
+			NetworkId auctionNetworkId(auctionId);
+			BidAuctionResponseMessage msg(auctionNetworkId, errorCode); 	
+			client->send(msg, true);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::auctionCancel(CreatureObject &who, AuctionId auctionId)
+{
+	auctionCancel(who.getNetworkId(), auctionId);
+}
+
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::auctionCancel(const NetworkId &playerId, AuctionId auctionId)
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+
+	if (s_market)
+	{
+		s_market->CancelAuction (NetworkId(auctionId), playerId);
+	}
+	else
+	{
+		WARNING(true, ("[Commodities API] : No commodities server connection to send CancelAuction.\n"));
+		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::auctionAccept(CreatureObject &who, AuctionId auctionId)
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+
+	UNREF (who);
+	UNREF (auctionId);
+
+/*
+	if (s_market)
+	{
+		s_market->AcceptHighBid(
+			auctionId,
+			who.getNetworkId());
+	}
+	else
+	{
+		WARNING(true, ("[Commodities API] : No commodities server connection to send AcceptHighBid.\n"));
+		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+	}
+*/
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::auctionQueryHeaders(
+	CreatureObject &who,
+	int requestId,
+	int type,
+	int category,
+	bool categoryExactMatch,
+	int itemTemplateId,
+	const Unicode::String &textFilterAll,
+	const Unicode::String &textFilterAny,
+	int priceFilterMin,
+	int priceFilterMax,
+	bool priceFilterIncludesFee,
+	const std::list<AuctionQueryHeadersMessage::SearchCondition> & advancedSearch,
+	AuctionQueryHeadersMessage::AdvancedSearchMatchAllAny advancedSearchMatchAllAny,
+	const NetworkId &container,
+	int locationSearchType,
+	bool searchMyVendorsOnly,
+	uint16 queryOffset)
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+
+	// only allow a player to have one auction query header request at a time to prevent
+	// overloading the commodities server with a lot of backlogged request from the
+	// same player when the commodities server cannot process the request faster than
+	// the players can click the GUI; the only exception to this is if the outstanding
+	// request has exceeded a certain configurable time limit; this is so that if somehow
+	// the request got lost, we don't lock the player out of the commodities server forever
+	unsigned long const timeCurrent = Clock::timeSeconds();
+	std::map<NetworkId, QueuedQuery *>::iterator iter = s_queryTime.find(who.getNetworkId());
+	if (iter != s_queryTime.end())			
+	{
+		if ((iter->second->previousQueryTime + ConfigServerGame::getCommoditiesQueryTimeoutSec()) > timeCurrent)
+		{
+			if (ConfigServerGame::getCommoditiesShowAllDebugInfo())
+				LOG("AuctionList", ("Queueing auctionQueryHeaders request %d for %s because there is already an outstanding request that is %lus old", requestId, who.getNetworkId().getValueString().c_str(), (timeCurrent - iter->second->previousQueryTime)));
+
+			// hang on to the most recent request, because we want to service
+			// the most recent request after the previous request has been serviced
+			iter->second->requestId = requestId;
+			iter->second->type = type;
+			iter->second->category = category;
+			iter->second->categoryExactMatch = categoryExactMatch;
+			iter->second->itemTemplateId = itemTemplateId;
+			iter->second->textFilterAll = textFilterAll;
+			iter->second->textFilterAny = textFilterAny;
+			iter->second->priceFilterMin = priceFilterMin;
+			iter->second->priceFilterMax = priceFilterMax;
+			iter->second->priceFilterIncludesFee = priceFilterIncludesFee;
+			iter->second->advancedSearch = advancedSearch;
+			iter->second->advancedSearchMatchAllAny = advancedSearchMatchAllAny;
+			iter->second->container = container;
+			iter->second->locationSearchType = locationSearchType;
+			iter->second->searchMyVendorsOnly = searchMyVendorsOnly;
+			iter->second->queryOffset = queryOffset;
+
+			return;
+		}
+		else
+		{
+			// previous request has exceeded timeout, so send this request out
+			if (ConfigServerGame::getCommoditiesShowAllDebugInfo())
+				LOG("AuctionList", ("Sending auctionQueryHeaders request %d for %s even though there is already an outstanding request because outstanding request is %lus old which exceeds the request timeout threshold of %ds", requestId, who.getNetworkId().getValueString().c_str(), (timeCurrent - iter->second->previousQueryTime), ConfigServerGame::getCommoditiesQueryTimeoutSec()));
+
+			// no longer need to track the request that timed out
+			delete iter->second;
+			s_queryTime.erase(iter);
+		}
+	}
+
+	++s_nextRequestId;
+
+	ServerObject * const auctionContainer = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(container));
+
+	if (!auctionContainer)
+	{
+		Client * const client = who.getClient();
+		if (client)
+		{
+			static std::vector<Auction::ItemDataHeader> auctionDataVector;
+			const AuctionQueryHeadersResponseMessage message(requestId, type, auctionDataVector, queryOffset, false);
+			client->send(message, true);	
+		}
+		return;
+	}
+	else
+	{
+		ScriptParams params;
+		params.clear();
+		params.addParam(who.getNetworkId());
+		params.addParam(container);
+		who.getScriptObject()->trigAllScripts(Scripting::TRIG_QUERY_AUCTIONS, params);
+	}
+
+	if (s_market)
+	{	
+		ServerObject* vendorObject = auctionContainer->getBazaarContainer();
+		NetworkId vendorId;
+		if (!vendorObject)
+			vendorId = zeroNetworkId;
+		else
+			vendorId = vendorObject->getNetworkId();
+		DEBUG_REPORT_LOG(true, ("  [AuctionQueryHeadersMessage]: container = %s, vendorId = %s\n", container.getValueString().c_str(), vendorId.getValueString().c_str()));
+
+		std::string searchStringPlanet;
+		std::string searchStringRegion;
+		NetworkId searchAuctionLocationId;
+		getLocationSearchString(auctionContainer, locationSearchType, searchStringPlanet, searchStringRegion, searchAuctionLocationId);
+
+		s_nextRequestId = s_market->QueryAuctionHeaders(
+		s_nextRequestId,
+		who.getNetworkId(),
+		vendorId,
+		type,
+		category,
+		categoryExactMatch,
+		itemTemplateId,
+		textFilterAll,
+		textFilterAny,
+		priceFilterMin,
+		priceFilterMax,
+		priceFilterIncludesFee,
+		advancedSearch,
+		advancedSearchMatchAllAny,
+		searchStringPlanet,
+		searchStringRegion,
+		searchAuctionLocationId,
+		searchMyVendorsOnly,
+		// if the player has the "commodities.overrideVendorSearchFlag" objvar and is in god mode,
+		// set the following flag that will override the vendor specific "searchable" flag,
+		// which then allows all vendors to be searched; this is useful for support/debugging purpose
+		(who.getClient() && who.getClient()->isGod() && who.getObjVars().hasItem("commodities.overrideVendorSearchFlag")),
+		queryOffset);
+	}
+	else
+	{
+		WARNING(true, ("[Commodities API] : No commodities server connection to send QueryAuctionHeaders.\n"));
+		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+	}
+
+	// track the request
+	QueuedQuery * queuedQuery = new QueuedQuery();
+	queuedQuery->previousQueryTime = timeCurrent;
+
+	s_queryTime[who.getNetworkId()] = queuedQuery;
+
+	s_queries.insert(std::make_pair(s_nextRequestId, std::make_pair(CachedNetworkId(who), requestId)));
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::auctionRetrieve(CreatureObject &who, AuctionId auctionId, NetworkId const &itemId, ServerObject &auctionContainer)
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+
+	ServerObject * const item = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(itemId));
+	LOG("AuctionRetrieval", ("CommoditiesMarket::attempt to load object %s from DB for retrieval", itemId.getValueString().c_str()));
+	if (item)
+	{
+		s_pendingLoads.insert(std::make_pair(itemId,
+			ItemLoadPair(who.getNetworkId(), getLocationString(auctionContainer))));
+		checkPendingLoads(itemId);
+	}
+	else
+	{
+		auctionContainer.loadContainedObjectFromDB(itemId);		
+		s_pendingLoads.insert(std::make_pair(itemId,
+			ItemLoadPair(who.getNetworkId(), getLocationString(auctionContainer))));
+		//Note, once it is loaded we'll check volume and then call GetItem.
+	}
+
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::getAuctionDetails(CreatureObject &who, const NetworkId &itemId)
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+	if (s_market)
+	{
+		s_market->GetItemDetails(0, who.getNetworkId(), itemId);
+	}
+	else
+	{
+		WARNING(true, ("[Commodities API] : No commodities server connection to send GetItemDetails.\n"));
+		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+	}
+}
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::getVendorValue(ServerObject &container)
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+	if (s_market)
+	{
+		s_market->GetVendorValue(getLocationString(container));
+	}
+	else
+	{
+		WARNING(true, ("[Commodities API] : No commodities server connection to send GetVendorValue.\n"));
+		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::createVendorMarket(const CreatureObject &who, ServerObject &container, int entranceCharge)
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+	
+	if (s_market)
+	{
+		s_market->CreateVendorMarket(who.getNetworkId(), getLocationString(container), who.getModValue("manage_vendor"), entranceCharge);
+	}
+	else
+	{
+		WARNING(true, ("[Commodities API] : No commodities server connection to send CreateVendorMarket.\n"));
+		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+	}
+
+	LOG("CustomerService", ("Auction:Player %s created vendor '%s'.", PlayerObject::getAccountDescription(who.getNetworkId()).c_str(), getLocationString(container).c_str()));
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::destroyVendorMarket(const NetworkId &playerId, ServerObject &container)
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+
+	LOG("CustomerService", ("Auction:Player %s deleted vendor '%s'.", PlayerObject::getAccountDescription(playerId).c_str(), getLocationString(container).c_str()));
+
+	if (s_market)
+	{
+		s_market->DestroyVendorMarket(playerId, std_blank, getLocationString(container));
+	}
+	else
+	{
+		WARNING(true, ("[Commodities API] : No commodities server connection to send DestroyVendorMarket.\n"));
+		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::deleteAuctionLocation(const NetworkId& locationId, const std::string& whoRequested)
+{
+
+	LOG("CustomerService", ("Auction: Player %s deleted vendor '%s'.", whoRequested.c_str(), locationId.getValueString().c_str()));
+
+	if (s_market)
+	{
+		s_market->deleteAuctionLocation(locationId, whoRequested);
+	}
+	else
+	{
+		WARNING(true, ("[Commodities API] : No commodities server connection to send DestroyVendorMarket.\n"));
+		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::isVendorOwner(CreatureObject &who, const NetworkId &containerId)
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+	ServerObject *container = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(containerId));
+	if (container)
+	{
+		if (s_market)
+		{
+			s_market->GetVendorOwner(who.getNetworkId(), getLocationString(*container));
+		}
+		else
+		{
+			WARNING(true, ("[Commodities API] : No commodities server connection to send GetVendorOwner.\n"));
+			onIsVendorOwner(who.getNetworkId(), zeroNetworkId, zeroNetworkId);
+			getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::onAddBid(int32 result, NetworkId const &itemId, NetworkId const &newBidPlayerId, const NetworkId &previousBidderId, BidAmount newBidMaxProxy, BidAmount previousBid, const NetworkId &location, bool success, const NetworkId &auctionOwnerId, const std::string & ownerName, const std::string & previousBidderName, int itemNameLength, const Unicode::String & itemName, int32 salesTaxAmount, NetworkId const &salesTaxBankId)
+{
+	AuctionResult errorCode = ar_OK;
+	std::string errorReason;
+	if (result == ARC_AuctionDoesNotExist)
+	{
+		success = 0;	
+		errorCode = ar_INVALID_ITEM_ID;
+		//transferToBankFromCommoditiesNamedAccount(newBidPlayerId, newBidMaxProxy, "INVALID_ITEM_ID errorCode in CommoditiesMarket::onAddBid()");
+		errorReason = "INVALID_ITEM_ID errorCode in CommoditiesMarket::onAddBid()";
+	}
+	else if (result == ARC_BidTooHigh)
+	{
+		success = 0;
+		errorCode = ar_BID_TOO_HIGH;
+		//transferToBankFromCommoditiesNamedAccount(newBidPlayerId, newBidMaxProxy, "BID_TOO_HIGH errorCode in CommoditiesMarket::onAddBid()");
+		errorReason = "BID_TOO_HIGH  errorCode in CommoditiesMarket::onAddBid()";
+	}
+	else if (result == ARC_BidOutbid)
+	{
+		success = 0;
+		errorCode = ar_BID_OUTBID;
+		errorReason = "Refund to current bidder because bid was outbid by proxy";
+	}
+	else if (result == ARC_InvalidBid)
+	{
+		success = 0;
+		errorCode = ar_INVALID_BID;
+		errorReason = "Refund to current bidder because bid was invalid";
+	}
+	else if( !success )
+	{
+		errorCode = ar_INVALID_BID;
+		errorReason = "Refund to current bidder because bid did not succeed";
+	}
+	
+	if (success)
+	{
+		if (previousBidderId.getValue() != -1)
+		{
+			//Not an instant auction, send it to the bazaar/vendor
+			//Money was already transfered from the player to a named account
+			//transferBank(newBidPlayerId, location, newBidMaxProxy);
+			if (previousBidderId != NetworkId::cms_invalid)
+			{
+				transferToBankFromCommoditiesNamedAccount(previousBidderId, previousBid, "Previous bidder refund.");
+				//transferBank(location, previousBidderId, previousBid);
+			}
+		}
+		else
+		{
+
+			if (salesTaxAmount > 0)
+ 			{
+ 				SalesTaxInfo * s = new SalesTaxInfo();
+ 				s->itemId = itemId;
+ 				s->buyerId = newBidPlayerId;
+ 				s->salesTaxAmount = salesTaxAmount;
+ 				s->salesTaxBankId = salesTaxBankId;
+ 				s_pendingSalesTax[s->itemId] = s;
+ 			}
+
+		}
+		if (newBidPlayerId != previousBidderId && previousBidderName.size())
+		{
+			Auction::sendAuctionBidToPreviousBidder(
+				previousBidderName,
+				itemName,
+				itemId);
+		}
+	}
+	else
+	{
+		transferToBankFromCommoditiesNamedAccount(newBidPlayerId, newBidMaxProxy, errorReason);
+	}
+
+	CreatureObject *owner = dynamic_cast<CreatureObject*>
+		(NetworkIdManager::getObjectById(newBidPlayerId));
+	if (owner)
+	{
+		Client *client = owner->getClient();
+		if (client)
+		{
+			BidAuctionResponseMessage msg(itemId, errorCode); 	
+			client->send(msg, true);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::onAuctionComplete(NetworkId const &itemId, NetworkId const &sellerId, NetworkId const &buyerId, BidAmount purchaseAmount, BidAmount bidMaxProxy, const NetworkId &location, bool success, bool immediate, const std::string & locationString, const std::string & ownerName, const std::string & buyerName, int32 itemNameLength, const Unicode::String & itemName, const AuctionId& auctionId, bool sendSellerMail)
+{
+	int salesTax = 0;	
+	if (success)
+	{
+		LOG("CustomerService", ("Auction:player %s (%Ld) has won the auction of %s from %s at location %Ld",
+			PlayerObject::getAccountDescription(buyerId).c_str(), buyerId.getValue(), ServerObject::getLogDescription(itemId).c_str(), ServerObject::getLogDescription(sellerId).c_str(), location.getValue()));
+		if (!immediate)
+		{
+			if (bidMaxProxy > purchaseAmount)
+			{
+				transferToBankFromCommoditiesNamedAccount(buyerId, bidMaxProxy - purchaseAmount, "Refund amount overpaid in bid proxy to winning bidder");
+				//transferBank(location, buyerId, bidMaxProxy - purchaseAmount);
+			}
+			
+		}
+ 		else
+ 		{
+ 			std::map<NetworkId, SalesTaxInfo*>::iterator i = s_pendingSalesTax.find(itemId);
+ 			if (i != s_pendingSalesTax.end())
+ 			{
+ 				SalesTaxInfo * s = i->second;
+ 				if (s->salesTaxAmount > 0)
+ 				{
+ 				 	salesTax = s->salesTaxAmount;
+					transferToBankFromCommoditiesNamedAccount(s->salesTaxBankId, s->salesTaxAmount, "Credit the sales tax to the city for the sale");
+ 					LOG("CustomerService", ("Auction:Crediting sales tax of amount %d to bankId = %Ld from immediate sale of item %Ld to player %Ld",
+ 											s->salesTaxAmount, s->salesTaxBankId.getValue(), s->itemId.getValue(), buyerId.getValue() ));
+ 					if (buyerId != s->buyerId)
+ 					{
+ 						LOG("CustomerService", ("Auction: buyer id (%s) does not match stored sales tax id of %s.  Please contact the dev team.", buyerId.getValueString().c_str(), s->buyerId.getValueString().c_str()));
+ 					}
+ 				}
+ 				delete s;
+ 				s_pendingSalesTax.erase(i);
+ 			}
+   		}
+
+ 		transferToBankFromCommoditiesNamedAccount(sellerId, purchaseAmount - salesTax, "Credit the auction owner for the amount of the winning bid");
+		std::map<NetworkId, SalesTaxInfo*>::iterator i = s_pendingSalesTax.find(itemId);
+		if (i != s_pendingSalesTax.end())
+		{
+			SalesTaxInfo * s = i->second;
+			if (buyerId != s->buyerId)
+			{
+				LOG("CustomerService", ("Auction: Item cancellation! buyer id (%s) does not match stored sales tax id of %s.  Please contact the dev team.", buyerId.getValueString().c_str(), s->buyerId.getValueString().c_str()));
+			}
+			delete s;
+			s_pendingSalesTax.erase(i);
+		}
+
+ 		//transferBank(location, sellerId, purchaseAmount);
+
+
+		if (sendSellerMail)
+		{
+			Auction::sendAuctionSuccessToSeller(
+				ownerName,
+				buyerName,
+				locationString,
+				buyerId,
+				itemName,
+				itemId,
+				purchaseAmount,
+				immediate);
+		}
+
+		Auction::sendAuctionSuccessToBuyer(
+			ownerName,
+			sellerId,
+			buyerName,
+			locationString,
+			itemName,
+			itemId,
+			purchaseAmount,
+			immediate);
+		if (immediate)
+		{
+			CreatureObject *buyer = dynamic_cast<CreatureObject*>
+				(NetworkIdManager::getObjectById(buyerId));
+			ServerObject *auctionContainer = dynamic_cast<ServerObject*> (NetworkIdManager::getObjectById(location));
+			if (buyer && auctionContainer)
+			{
+//				auctionRetrieve(*buyer, auctionId, itemId, *auctionContainer);
+				// auctionRetrieve(CreatureObject &who, AuctionId auctionId, NetworkId const &itemId, ServerObject &auctionContainer)
+			}
+		}
+	}
+	else
+	{
+		if( bidMaxProxy > 0 && buyerId != NetworkId::cms_invalid && buyerId.getValue() != -1 )
+		{
+			transferToBankFromCommoditiesNamedAccount(buyerId, bidMaxProxy, "Refund amount to current highest bidder because of a canceled auction");
+			//transferBank(location, buyerId, bidMaxProxy);	
+		}
+
+		CreatureObject *owner = dynamic_cast<CreatureObject*>
+			(NetworkIdManager::getObjectById(sellerId));
+		if (owner)
+		{
+			Client * const client = owner->getClient();
+			if (client)
+			{
+				LOG("CustomerService", ("Auction:%s has canceled the auction of %s at location %Ld",
+					PlayerObject::getAccountDescription(sellerId).c_str(), ServerObject::getLogDescription(itemId).c_str(), location.getValue()));
+				CancelLiveAuctionResponseMessage msg(itemId, ar_OK); 	
+				client->send(msg, true);
+			}
+		}
+
+		if (sendSellerMail)
+		{
+			Auction::sendAuctionFailedToSeller(
+				ownerName,
+				locationString,
+				itemName,
+				itemId);
+		}
+		
+		if (buyerName.size() && buyerName[0] != 0)
+		{
+			Auction::sendAuctionFailedToBidder(
+				ownerName,
+				sellerId,
+				buyerName,
+				locationString,
+				itemName,
+				itemId);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::onItemExpired(NetworkId const &itemOwnerId, NetworkId const &itemId, const std::string & ownerName, int itemNameLength, const Unicode::String & itemName, const std::string &locationName, const NetworkId &locationId)
+{
+	FlagObjectForDeleteMessage const dm(itemId, DeleteReasons::Decay, false, false, false);
+	GameServer::getInstance().sendToDatabaseServer(dm);
+	LOG("CustomerService", ("Auction: Auction %s is being removed from vendor: %s (%s) because its owner: %s(%s) did not retrive it from the stockroom",
+		itemId.getValueString().c_str(),
+		locationId.getValueString().c_str(),
+		locationName.c_str(),
+		ownerName.c_str(),
+		itemOwnerId.getValueString().c_str()
+		));
+	Auction::sendItemExpiredToOwner(
+		ownerName,
+		itemName,
+		itemId);
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::checkPendingLoads(const NetworkId &itemId)
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return;
+	LOG("AuctionRetrieval", ("CommoditiesMarket::response from DB for loading object %s for retrieval", itemId.getValueString().c_str()));
+	std::hash_map<NetworkId, ItemLoadPair, NetworkId::Hash>::iterator f = s_pendingLoads.find(itemId);
+	if (f != s_pendingLoads.end())
+	{
+		CreatureObject *player = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById((*f).second.ownerId));
+		ServerObject *item   = dynamic_cast<ServerObject *>(NetworkIdManager::getObjectById(itemId));
+		if (player && item)
+		{
+			ServerObject *targetContainer = player->getInventory();
+			if (dynamic_cast<IntangibleObject *>(item))
+			{
+				targetContainer = player->getDatapad();
+			}
+			if (targetContainer)
+			{
+				VolumeContainer *inventoryContainer = ContainerInterface::getVolumeContainer(*targetContainer);
+				if (!inventoryContainer)
+				{
+					s_pendingLoads.erase(f);
+					return;
+				}	
+
+				bool transferAllowed = true;
+				Container::ContainerErrorCode error = Container::CEC_Success;
+				transferAllowed = ContainerInterface::canTransferTo(targetContainer, *item, NULL, error);
+
+				if (!transferAllowed)
+				{
+					//item->unload();
+					//error response
+					RetrieveAuctionItemResponseMessage msg(itemId, (AuctionResult)ar_INVENTORY_FULL); 	
+					Client *client = player->getClient();
+					if (client)
+					{
+						client->send(msg, true);
+					}
+				}
+				else
+				{
+					LOG("AuctionRetrieval", ("CommoditiesMarket::calling GetItem for loading object %s for retrieval", itemId.getValueString().c_str()));
+					if (s_market)
+					{
+						s_market->GetItem(itemId, player->getNetworkId(), (*f).second.location);
+					}
+					else
+					{
+						WARNING(true, ("[Commodities API] : No commodities server connection to send GetItem.\n"));
+						getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+					}
+				}
+			}
+		}
+		else
+		{
+			if( item )
+			{
+				WARNING(!player, ("After an auction purchased item was loaded, we tried to transfer it to the purchaser, but the purchaser was not found. itemId = %Ld", itemId.getValue()));
+			}
+
+			if (!item)
+			{
+				// signal the Commodities system to cleanup this item.
+				// If this was a canceled auction sale retrieval, then the item will simply be removed from the commodities system.
+				// If this was a purchased item retrieval, then the item will be removed and the player will be reimbursed.
+				// We can't do reimbursement here because we don't know how the item got into the stockroom.  Only the CommoditiesServer knows that.
+				
+				if (s_market)
+				{
+					s_market->CleanupInvalidItemRetrieval(itemId);
+				}
+				else
+				{
+					WARNING(true, ("[Commodities API] : No commodities server connection to send CleanupInvalidItemRetrieval.\n"));
+					getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+				}
+
+				LOG("CustomerService", ("Auction:%Ld has tried to retrieve an auction item %Ld, but it failed because the item could not be loaded.  The system will automatically cleanup this item and reimburse money or adjust bazaar slots depending on if this was a purchased auction item or a canceled auction sale.",  (*f).second.ownerId.getValue(), itemId.getValue()));
+			}
+		}
+		s_pendingLoads.erase(f);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::onGetItemReply(int32 result, int32 requestId, NetworkId  itemOwnerId, NetworkId itemId, NetworkId location)
+{
+	LOG("AuctionRetrieval", ("CommoditiesMarket::received onGetItemReply for loading object %s for retrieval", itemId.getValueString().c_str()));
+	AuctionResult auctionResult = ar_OK;
+	CreatureObject *player = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(itemOwnerId));
+	Client *client = player ? player->getClient() : NULL;
+	bool transactionFailed = false;
+
+	ServerObject* vendor = NULL;
+	ServerObject* item = NULL;
+	
+	if (result == ARC_AuctionDoesNotExist)
+	{
+		auctionResult = ar_ITEM_NOT_IN_CONTAINER;
+	}
+	else if (result == ARC_NotItemOwner)
+	{
+		auctionResult = ar_NOT_ITEM_OWNER;
+	}
+	if (result == ARC_Success)
+	{
+		if (player)
+		{
+			LOG("CustomerService", ("Auction: onGetItemReply - %s has retrieved auction item %s from location %Ld",
+									PlayerObject::getAccountDescription(itemOwnerId).c_str(), ServerObject::getLogDescription(itemId).c_str(), location.getValue()));
+			item = dynamic_cast<ServerObject *>(NetworkIdManager::getObjectById(itemId));
+			ServerObject *inventory = player->getInventory();
+			if (item && dynamic_cast<IntangibleObject *>(item))
+			{
+				inventory = player->getDatapad();
+			}
+			if (inventory)
+			{
+				if (item)
+				{
+					Container::ContainerErrorCode tmp = Container::CEC_Success;
+					vendor = safe_cast<ServerObject*>(ContainerInterface::getContainedByObject(*item));
+					if (vendor && vendor->getNetworkId() == location)
+					{
+						bool retval = ContainerInterface::transferItemToVolumeContainer(*inventory, *item, NULL, tmp, false);
+						if (retval)
+						{
+
+							ProxyList const & proxyList  = inventory->getExposedProxyList();
+							std::string vendorProxies;
+							std::string playerProxies;
+							char buf[32];
+
+							for (ProxyList::const_iterator j = proxyList.begin(); j != proxyList.end(); ++j)
+							{
+								_itoa(*j, buf, 10);
+								playerProxies += buf;
+								playerProxies += ",";
+							}
+
+							if (vendor)
+							{
+								ProxyList const &vendorProxyList = vendor->getExposedProxyList();
+								for (ProxyList::const_iterator i = vendorProxyList.begin(); i != vendorProxyList.end(); ++i)
+								{
+									_itoa(*i, buf, 10);
+									vendorProxies += buf;
+									vendorProxies += ",";
+								}
+							}
+
+							TangibleObject const * const itemAsTangible = item->asTangibleObject();
+							int const itemCount = itemAsTangible ? itemAsTangible->getCount() : -1;
+
+							Container const * const itemContainer = ContainerInterface::getContainer(*item);
+							int const itemContents = itemContainer ? itemContainer->getNumberOfItems() : -1;
+					
+							LOG("CustomerService", ("Auction: onGetItemReply - %s successfully retrieved auction item %s (count=%d,contents=%d) from vendor %s. Vendor %d(%s). Player %d(%s). Item %d.",
+													PlayerObject::getAccountDescription(itemOwnerId).c_str(),
+													ServerObject::getLogDescription(itemId).c_str(),
+													itemCount,
+													itemContents,
+													vendor ? vendor->getNetworkId().getValueString().c_str() : "unknown",
+													vendor ? vendor->isAuthoritative() : 0,
+													vendorProxies.c_str(),
+													inventory->isAuthoritative(),
+													playerProxies.c_str(),
+													item->isAuthoritative()));
+					
+						}
+						else
+						{
+							transactionFailed = true;
+							LOG("CustomerService", ("Auction: onGetItemReply - %s failed to retrieve auction item %s from location %s with error code %d",
+													PlayerObject::getAccountDescription(itemOwnerId).c_str(),
+													ServerObject::getLogDescription(itemId).c_str(),
+													location.getValueString().c_str(),
+													static_cast<int>(tmp)));
+						}
+
+					}
+					else
+					{
+						//someone else has purchaed the item.  Need to refund
+						//do NOT set transaction failed.
+						//and only refund the money if the owner is not the vendor owner and the owner if the item isn't the guy we're refunding.
+						//ugh, that won't work.  To dupe you just buy the item, give it away, then 'buy' it again
+						
+						LOG("CustomerService", ("Auction: onGetItemReply - %s failed to retrieve auction item %s from location %Ld because someone else has it.",
+												PlayerObject::getAccountDescription(itemOwnerId).c_str(),
+												ServerObject::getLogDescription(itemId).c_str(),
+												location.getValue()));
+						
+					}
+
+				}
+				else
+				{
+					transactionFailed = true;
+					LOG("CustomerService", ("Auction: onGetItemReply - item not found for player %s, item %s, location %Ld",
+											PlayerObject::getAccountDescription(itemOwnerId).c_str(),
+											ServerObject::getLogDescription(itemId).c_str(),
+											location.getValue()));
+				}
+			}	
+			else
+			{
+				transactionFailed = true;
+			
+				LOG("CustomerService", ("Auction: onGetItemReply - inventory not found for player %s, item %s, location %Ld",
+										PlayerObject::getAccountDescription(itemOwnerId).c_str(),
+										ServerObject::getLogDescription(itemId).c_str(),
+										location.getValue()));
+			}
+		}
+		else
+		{
+			transactionFailed = true;
+			LOG("CustomerService", ("Auction: onGetItemReply - player %s not found for item %s, location %Ld",
+									result,
+									itemOwnerId.getValueString().c_str(),
+									ServerObject::getLogDescription(itemId).c_str(),
+									location.getValue()));
+			
+		}
+	}
+	else
+	{
+		LOG("CustomerService", ("Auction: onGetItemReply - player (result %d) not found for player %s, item %s, location %Ld",
+								result,
+								PlayerObject::getAccountDescription(itemOwnerId).c_str(),
+								ServerObject::getLogDescription(itemId).c_str(),
+								location.getValue()));
+	}
+
+	if (transactionFailed && item && vendor)
+	{
+		TangibleObject * tangVendor = vendor->asTangibleObject();
+
+		if (tangVendor)
+		{
+			TangibleObject * tangItem = item->asTangibleObject();
+			if (tangItem)
+				tangItem->setOwnerId(itemOwnerId);
+			restoreItem(*item, *tangVendor);
+		}
+	}
+	
+	if (client)
+	{
+		RetrieveAuctionItemResponseMessage msg(itemId, auctionResult); 	
+		client->send(msg, true);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::onIsVendorOwner(const NetworkId & requesterId, const NetworkId & ownerId, const NetworkId &container)
+{
+	IsVendorOwnerResponseMessage::VendorOwnerResult result = IsVendorOwnerResponseMessage::vor_IsNotOwner;
+
+	CreatureObject * player = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(requesterId));
+	std::string marketName;
+
+	ServerObject * const auctionContainer = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(container));
+	NetworkId resultContainer = container;
+	const TangibleObject * resultContainerObject = auctionContainer ? auctionContainer->asTangibleObject() : NULL;
+	if (auctionContainer)
+	{
+		marketName = getLocationString(*auctionContainer);
+		ServerObject * const parent = const_cast<ServerObject *>(safe_cast<const ServerObject *>(ContainerInterface::getFirstParentInWorld(*auctionContainer)));
+		if (parent && parent->asCreatureObject())
+		{
+			if (parent->getBazaarContainer() == auctionContainer)
+			{
+				//We got passed the container itself on a vendor, but we want auctionContainer to be the resultContainer.
+				resultContainer = parent->getNetworkId();
+				resultContainerObject = parent->asTangibleObject();
+			}
+		}
+	}
+
+	if (ownerId == requesterId)
+ 	{
+ 		result = IsVendorOwnerResponseMessage::vor_IsOwner;
+ 	}
+ 	else if (resultContainerObject && ownerId.getValue() == 0)
+ 	{
+ 		//if we get into this state, our vendor may be fubarr'd
+ 		if (resultContainerObject->hasCondition (TangibleObject::C_vendor) ||
+ 			resultContainerObject->getGameObjectType () == SharedObjectTemplate::GOT_vendor)
+ 		{
+ 			if (player && auctionContainer && resultContainerObject->getOwnerId() == player->getNetworkId())
+ 			{
+ 				//if it is a vendor that we own fix it up
+ 				reinitializeVendor(*auctionContainer, player->getNetworkId());
+ 			}
+ 			else
+ 			{
+ 				LOG("CustomerService", ("Auction: %s Could not reinitialize vendor %s (owner %s)",
+ 					PlayerObject::getAccountDescription(player).c_str(),
+ 					resultContainerObject->getNetworkId().getValueString().c_str(),
+ 					auctionContainer ? resultContainerObject->getOwnerId().getValueString().c_str() : "invalid auction container"));
+ 				
+ 			}
+ 		}
+ 		else
+ 		{
+ 			LOG("CustomerService", ("Auction %s Invalid non-vendor object during reinitialization.", PlayerObject::getAccountDescription(player).c_str()));
+ 		}
+
+ 		result = IsVendorOwnerResponseMessage::vor_HasNoOwner;
+ 	}
+
+	AuctionResult resultCode = ar_OK;
+
+	if (!resultContainerObject)
+		resultCode = ar_INVALID_ITEM_ID;
+	else
+	{
+		if (!resultContainerObject->hasCondition (TangibleObject::C_vendor) &&
+			resultContainerObject->getGameObjectType () != SharedObjectTemplate::GOT_vendor &&
+			resultContainerObject->getGameObjectType () != SharedObjectTemplate::GOT_terminal_bazaar)
+ 		{
+ 			resultCode = ar_INVALID_ITEM_ID;
+ 		}
+
+	}
+
+	const IsVendorOwnerResponseMessage message(resultContainer, marketName, result, resultCode, Auction::maxPageSize);
+
+	if (player)
+	{
+		Client * const client = player->getClient();
+		if (client)
+			client->send(message, true);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::onQueryHeadersReply(int32 result, int requestId, int typeFlag, int numAuctions, const std::vector<AuctionDataHeader> & auctionData, uint32 queryOffset, bool hasMorePages)
+{
+	std::map<int, std::pair<CachedNetworkId, int> >::iterator i = s_queries.find(requestId);
+	if (i != s_queries.end())
+	{
+		std::pair<CachedNetworkId, int> &queryInfo = (*i).second;
+		CreatureObject * const obj = safe_cast<CreatureObject*>(queryInfo.first.getObject());
+		if (obj)
+		{
+			Client * const client = obj->getClient();
+			if (client)
+			{
+				std::vector<Auction::ItemDataHeader> auctionDataVector;
+				auctionDataVector.resize (numAuctions);
+				for (int i = 0; i < numAuctions; ++i)
+				{
+					const AuctionDataHeader      & header  = auctionData [i];
+					Auction::ItemDataHeader & data         = auctionDataVector [i];
+
+					data.itemId         = header.itemId;
+					data.itemName       = convertSeparatorToNull(header.itemName);
+					data.highBid        = static_cast<int32>(header.highBid);
+					data.timer          = header.timer;
+					data.buyNowPrice    = header.buyNowPrice;
+					data.location       = header.location;
+					data.ownerId        = header.ownerId;
+					data.ownerName      = NameManager::getInstance().getPlayerFullName(header.ownerId);
+					data.highBidderId   = header.highBidderId;
+					data.highBidderName = NameManager::getInstance().getPlayerFullName(header.highBidderId);
+					data.maxProxyBid    = static_cast<int32>(header.maxProxyBid);
+					data.myBid          = static_cast<int32>(header.myBid);
+					data.itemType       = header.itemType;
+					data.resourceContainerClassCrc = header.resourceContainerClassCrc;
+					data.flags          = header.flags;
+					data.entranceCharge = header.entranceCharge;
+				}
+				const AuctionQueryHeadersResponseMessage message(queryInfo.second, typeFlag, auctionDataVector, static_cast<uint16>(queryOffset), hasMorePages);
+				client->send(message, true);
+			}
+		}
+
+		std::map<NetworkId, QueuedQuery *>::iterator iter = s_queryTime.find(queryInfo.first);
+		if (iter != s_queryTime.end())
+		{
+			if ((ConfigServerGame::getCommoditiesShowAllDebugInfo()) && (obj))
+				LOG("AuctionList", ("Received response to auctionQueryHeaders request %d for %s in %lus", queryInfo.second, obj->getNetworkId().getValueString().c_str(), (Clock::timeSeconds() - iter->second->previousQueryTime)));
+
+			QueuedQuery * queuedQuery = iter->second;
+
+			// must be done before calling auctionQueryHeaders()
+			s_queryTime.erase(iter);
+
+			// if there is a queued request, send it out now
+			if ((queuedQuery) && (queuedQuery->container.isValid()) && (obj))
+				auctionQueryHeaders(*obj, queuedQuery->requestId, queuedQuery->type, queuedQuery->category, queuedQuery->categoryExactMatch, queuedQuery->itemTemplateId, queuedQuery->textFilterAll, queuedQuery->textFilterAny, queuedQuery->priceFilterMin, queuedQuery->priceFilterMax, queuedQuery->priceFilterIncludesFee, queuedQuery->advancedSearch, queuedQuery->advancedSearchMatchAllAny, queuedQuery->container, queuedQuery->locationSearchType, queuedQuery->searchMyVendorsOnly, queuedQuery->queryOffset);
+
+			delete queuedQuery;
+		}
+
+		s_queries.erase(i);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarket::onGetItemDetailsReply(int32 result, int32 requestId, NetworkId playerId, NetworkId itemId, int userDescriptionLength, const Unicode::String & userDescription, int oobLength, const Unicode::String & oobData, std::vector<std::pair<std::string, Unicode::String> > const & attributes)
+{
+	CreatureObject *owner = dynamic_cast<CreatureObject*>
+		(NetworkIdManager::getObjectById(playerId));
+	if (owner)
+	{
+		Client *client = owner->getClient();
+		if (client)
+		{
+			Auction::ItemDataDetails details;		
+			details.itemId = itemId;
+			details.userDescription = userDescription;
+	
+			if (oobLength!=0)
+			{
+				// Using the deprecated oobData system to pass the object's attributes
+				
+				Unicode::String oobDataString;
+				oobDataString = oobData;
+
+				OutOfBandPackager::OutOfBandBaseVector oobVector =
+					OutOfBandPackager::unpack(oobDataString);
+
+				OutOfBandPackager::OutOfBandBaseVector::const_iterator it = oobVector.begin();
+
+				if (it == oobVector.end())
+				{
+					WARNING(true, ("Invalid Out of Band data for Auction Details"));
+					return;
+				}
+				OutOfBandBase *base = *it;
+				if (!base)
+				{
+					WARNING(true, ("NULL OOB Base for Auction Data"));
+					return;
+				}
+				if (base->getTypeId() == OutOfBandPackager::OT_auctionToken)
+				{
+					const OutOfBand<AuctionToken> * const oobat =
+						safe_cast<const OutOfBand<AuctionToken> *>(base);	
+					const AuctionToken *const token = oobat->getObject();
+					details.templateName = token->sharedTemplateName;	
+					details.appearanceString = token->customizationData;
+				}
+				else
+				{
+					WARNING(true, ("Improper data order for OOB Auction Data"));
+					return;
+				}
+
+				//On to the vector of attributes
+				++it;
+				if (it == oobVector.end())
+				{
+					WARNING(true, ("Invalid Out of Band data for Auction Details"));
+					return;
+				}
+				base = *it;
+				if (!base)
+				{
+					WARNING(true, ("NULL OOB Base for Auction Data"));
+					return;
+				}
+				if (base->getTypeId() == OutOfBandPackager::OT_objectAttributes)
+				{
+					const OutOfBand<OutOfBandPackager::AttributeVector> * const oobav =
+						safe_cast<const OutOfBand<OutOfBandPackager::AttributeVector> *>(base);	
+					const OutOfBandPackager::AttributeVector *const attributes =
+						oobav->getObject();
+
+					details.propertyList = *attributes;	
+				}
+				else
+				{
+					WARNING(true,
+							("Improper data order for OOB Auction Data"));
+					return;
+				}
+			}
+			else
+			{
+				// Using the new attributes vector system		   
+				// Pull out two of the attributes to send separately:, pack the rest into details.propertyList
+				for (std::vector<std::pair<std::string, Unicode::String> >::const_iterator i=attributes.begin(); i!=attributes.end(); ++i)
+				{
+					static const std::string attributeClientSharedTemplateName("ClientSharedTemplateName");
+					static const std::string attributeAppearanceData("AppearanceData");
+
+					DEBUG_REPORT_LOG(true,("Attribute:  %s, %s\n",i->first.c_str(),Unicode::wideToNarrow(i->second).c_str()));
+					
+					if (i->first==attributeClientSharedTemplateName)
+						details.templateName = Unicode::wideToNarrow(i->second);
+					else if (i->first==attributeAppearanceData)
+						details.appearanceString = Unicode::wideToNarrow(i->second);
+					else
+						details.propertyList.push_back(*i);
+				}
+			}
+
+			GetAuctionDetailsResponse msg(details);
+			client->send(msg, true);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::onAcceptHighBid(int32 result, NetworkId itemId, NetworkId playerId)
+{
+	CreatureObject *player = dynamic_cast<CreatureObject*>
+		(NetworkIdManager::getObjectById(playerId));
+	if (player)
+	{
+		Client *client = player->getClient();
+		if (result == ARC_NoBids)
+		{
+			result = (int)ar_INVALID_BID;
+		}
+		else if (result == ARC_AuctionAlreadyCompleted)
+		{
+			result = (int)ar_AUCTION_ALREADY_COMPLETED;
+		}
+		if (client)
+		{
+			AcceptAuctionResponseMessage msg(itemId, (AuctionResult)result); 	
+			client->send(msg, true);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::onGetVendorValue(const NetworkId &location, int32 value)
+{
+	ServerObject *locationObject = dynamic_cast<ServerObject*>
+		(NetworkIdManager::getObjectById(location));
+	if (locationObject)
+	{
+		locationObject->setObjVarItem(OBJVAR_VENDOR_VALUE, static_cast<int>(value));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::onVendorRefuseItem(int32 result, const NetworkId & itemId, const NetworkId & vendorId, const NetworkId & itemOwnerId)
+{
+	UNREF(itemOwnerId);
+	CreatureObject *vendor = dynamic_cast<CreatureObject*>
+		(NetworkIdManager::getObjectById(vendorId));
+	if (vendor)
+	{
+		Client *client = vendor->getClient();
+		if (client)
+		{
+			CancelLiveAuctionResponseMessage msg(itemId, static_cast<AuctionResult>(result), true); 	
+			client->send(msg, true);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::onCancelAuction(int32 result, const NetworkId & playerId, const NetworkId & itemId)
+{
+	AuctionResult errorCode = ar_OK;
+	if (result == 0)
+	{
+		return;
+	}
+
+	if (result == (int)ARC_AuctionAlreadyCompleted)
+	{
+		errorCode = ar_AUCTION_ALREADY_COMPLETED;
+	}
+	else if( result == (int) ARC_VendorOwnerCanceledCompletedAuction )
+	{
+		errorCode = ar_AUCTION_ALREADY_COMPLETED;
+		LOG("CustomerService", ("VendorCreditDupeExploit:Player %s attempted to cancel vendor sale item %s which was already sold.", PlayerObject::getAccountDescription(playerId).c_str(), ServerObject::getLogDescription(itemId).c_str() ));
+
+	}
+	else
+	{
+		errorCode = (AuctionResult)result;
+	}
+
+	CreatureObject *owner = dynamic_cast<CreatureObject*>
+		(NetworkIdManager::getObjectById(playerId));
+	if (owner)
+	{
+		Client *client = owner->getClient();
+		if (client)
+		{
+			CancelLiveAuctionResponseMessage msg(itemId, errorCode); 	
+			client->send(msg, true);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::onCreateVendorMarket(int32 result, const NetworkId & playerId, const NetworkId & locationId)
+{
+	CreatureObject *owner = dynamic_cast<CreatureObject*> (NetworkIdManager::getObjectById(playerId));
+	if ((result == ARC_Success) || (result == ARC_LocationAlreadyExists))
+	{
+		ServerObject *vendor = dynamic_cast<ServerObject*>
+			(NetworkIdManager::getObjectById(locationId));
+		ServerObject *resultContainer = vendor;
+		if (!vendor)
+		{
+			return;
+		}
+		
+		ServerObject *parent = const_cast<ServerObject *>(dynamic_cast<const ServerObject *>(ContainerInterface::getFirstParentInWorld(*vendor)));
+		if (parent && parent->asCreatureObject())
+		{
+			if (parent->getBazaarContainer() == vendor)
+			{
+				resultContainer = parent;
+			}
+		}
+
+		if (resultContainer)
+		{
+			resultContainer->setObjVarItem(OBJVAR_VENDOR_INITIALIZED, 1);
+			
+			if (owner)
+			{
+				owner->removeObjVarItem("vendor_not_initialized");
+				StringId stringId = StringId("player_structure", "vendor_initialized");
+				Chat::sendSystemMessage(*owner, stringId, Unicode::emptyString);
+				LOG("CustomerService", ("CreateVendor response sent to client."));
+			}
+		}
+		else
+		{
+			if (owner)
+			{
+				StringId stringId = StringId("ui_auc", "err_vendor_terminal_no_owner");
+				Chat::sendSystemMessage(*owner, stringId, Unicode::emptyString);
+				LOG("CustomerService", ("CreateVendor response sent to client. - Can't find resultContainer"));
+			}
+		}
+	}
+	else if (result == ARC_LocationVendorLimitExceeded)
+	{
+		if (owner)
+		{
+			StringId stringId = StringId("player_structure", "full_vendors");
+			Chat::sendSystemMessage(*owner, stringId, Unicode::emptyString);
+			LOG("CustomerService", ("CreateVendor response sent to client. - Over Vendor Limit"));	
+		}
+	}
+	else
+	{
+		if (owner)
+		{
+			StringId stringId = StringId("ui_auc", "err_vendor_terminal_no_owner");
+			Chat::sendSystemMessage(*owner, stringId, Unicode::emptyString);
+			LOG("CustomerService", ("CreateVendor response sent to client. - Other Error"));
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::onPermanentAuctionPurchased (
+	NetworkId const &,
+	NetworkId const &,
+	BidAmount ,
+	const NetworkId &,
+	const NetworkId &,
+	const std::string &,
+	const std::string &,
+	int32 ,
+	const Unicode::String & ,
+	std::vector<std::pair<std::string, Unicode::String> > const &
+)
+{
+	FATAL(true,("onPermanentAuctionPurchased is deprecated."));
+}
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::onCleanupInvalidItemRetrieval(  const NetworkId &itemId, const NetworkId & playerId, const NetworkId &creatorId, int32 reimburseAmt )
+{
+
+	WARNING(true, ("Received OnCleanupInvalidItemRetrieval request.  item=%Ld, player=%Ld, creator=%Ld, reimburse=%d", itemId.getValue(), playerId.getValue(), creatorId.getValue(), reimburseAmt));
+	CreatureObject *player = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(playerId));
+	if( reimburseAmt>0  && playerId.getValue()>0 )
+	{
+		if( player )
+		{
+			RetrieveAuctionItemResponseMessage msg(itemId, (AuctionResult)ar_INVALID_ITEM_REIMBURSAL); 	
+			Client *client = player->getClient();
+			if (client)
+			{
+				client->send(msg, true);
+			}
+		}
+		char buffer[100];
+		snprintf(buffer,100,"%i", static_cast<int>(reimburseAmt));
+		if (reimburseAmt < ConfigServerGame::getMaxReimburseAmount())
+		{
+			MessageToQueue::getInstance().sendMessageToC(playerId, "C++FinishBankTransfer", buffer, 0, true);
+			LOG("CustomerService", ("Auction:Player %s was reimbursed as a result of an invalid auction item %Ld cleanup for the amount of %d.", PlayerObject::getAccountDescription(playerId).c_str(), itemId.getValue(), reimburseAmt));
+			LOG("CustomerService", ("Reimbursal:Player %s was reimbursed as a result of an invalid auction item %Ld cleanup for the amount of %d.", PlayerObject::getAccountDescription(playerId).c_str(), itemId.getValue(), reimburseAmt));
+		}
+		else
+		{
+			LOG("CustomerService", ("Reimbursal:Player %s may need to be reimbursed as a result of an invalid auction item %Ld cleanup for the amount of %d.  It was greater than the max allowed", PlayerObject::getAccountDescription(playerId).c_str(), itemId.getValue(), reimburseAmt));			
+		}
+
+	}
+
+	if( itemId.getValue()>0 )
+	{
+		if( player )
+		{
+			RetrieveAuctionItemResponseMessage msg(itemId, (AuctionResult)ar_ITEM_NOLONGER_EXISTS); 	
+			Client *client = player->getClient();
+			if (client)
+			{
+				client->send(msg, true);
+			}
+		}
+		LOG("CustomerService", ("Auction:Invalid auction item %Ld was cleaned from the system when attempted to be retrieved by player %Ld.", itemId.getValue(), playerId.getValue()));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::setSalesTax( int32 salesTax, const NetworkId &bankId, ServerObject &auctionContainer )
+{
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+	{
+		return;
+	}
+
+	LOG("CustomerService", ("Auction: Setting sales tax=%d and bankId=%Ld for vendor at location '%s'",
+				salesTax, bankId.getValue(), getLocationString(auctionContainer).c_str()));
+	if (s_market)
+	{
+		s_market->SetSalesTax( salesTax, bankId, getLocationString(auctionContainer));
+	}
+	else
+	{
+		WARNING(true, ("[Commodities API] : No commodities server connection to send SetSalesTax.\n"));
+		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+	}
+}
+
+//------------------------------------------------------------------------------------------
+
+void CommoditiesMarket::reinitializeVendor(ServerObject &vendor, const NetworkId& owner)
+{
+ 	if (isReinitializing(vendor))
+ 		return;
+
+ 	//set an objvar that the thing is re-initializing?
+ 	vendor.setObjVarItem(OBJVAR_VENDOR_REINITIALIZING, 1);
+ 	//load contents from db
+ 	if (!vendor.areContentsLoaded())
+	{
+		// support broken vendor unpack
+		if  (vendor.getObjVars().hasItem("vendor.needs_old_reinitialize"))
+			vendor.setLoadContents( false );
+
+ 		vendor.loadAllContentsFromDB();
+	}
+ 	else
+ 		reinitializeVendorContents(vendor);
+}
+//------------------------------------------------------------------------------------------
+
+void CommoditiesMarket::reinitializeVendorContents(ServerObject &vendor)
+{
+	//contents have loaded
+	//add all contents
+	//cancel all contents
+	Container * container = ContainerInterface::getContainer(vendor);
+	if (!container)
+		return;
+	
+	TangibleObject * tang = vendor.asTangibleObject();
+	if (!tang)
+		return;
+
+	CreatureObject * const owner = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(tang->getOwnerId()));
+	if (!owner)
+		return;
+	
+// 	destroyVendorMarket(owner->getNetworkId(), vendor);
+	ServerObject * houseObj = ContainerInterface::getTopmostContainer(vendor)->asServerObject();
+	if (! houseObj)
+		return;
+	BuildingObject * house = houseObj->asBuildingObject();
+
+	if (! house)
+		return;
+
+	int entranceCharge = 0;
+	if (houseObj->getObjVars().hasItem("turnstile.fee"))
+		houseObj->getObjVars().getItem("trunstile.fee", entranceCharge);
+
+	createVendorMarket(*owner, vendor, entranceCharge);
+	for(ContainerIterator i = container->begin(); i != container->end(); ++i)
+	{
+		ServerObject * obj = safe_cast<ServerObject*>((*i).getObject());
+		if (obj)
+		{
+			restoreItem(*obj, *tang);
+		}
+	}
+	vendor.removeObjVarItem(OBJVAR_VENDOR_REINITIALIZING);
+	vendor.removeObjVarItem("vendor.needs_old_reinitialize");
+}
+
+//----------------------------------------------------------------------
+
+bool CommoditiesMarket::restoreItem(ServerObject& item, TangibleObject & vendor)
+{
+	//first create the auction
+	if (!ConfigServerGame::getCommoditiesMarketEnabled())
+		return false;
+
+	TangibleObject* tang = dynamic_cast<TangibleObject*>(&item);
+	const NetworkId& trueOwnerId = tang ? tang->getOwnerId() : vendor.getOwnerId();
+	
+	CreatureObject * const owner = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(trueOwnerId));
+	
+	bool const needsOldReinitialize = vendor.getObjVars().hasItem("vendor.needs_old_reinitialize");
+
+	const Unicode::String objectName = needsOldReinitialize ?
+		Auction::getItemAuctionName(&item, Unicode::narrowToWide("")) : Unicode::narrowToWide("Restored Item");
+
+	Unicode::String userDescription = Unicode::narrowToWide("Restoring lost item");
+
+	ServerObject::AttributeVector attributes;
+	item.getAttributesForAuction(attributes);
+
+	int itemSize = item.getVolume();
+	
+	if (s_market)
+	{
+		if (owner)
+		{
+			const int got = item.getGameObjectType();
+			int itemObjectTemplateId = 0;
+
+			if (got == SharedObjectTemplate::GOT_misc_factory_crate)
+				itemObjectTemplateId = getCrateContainedItemObjectTemplateId(item);
+
+			if (itemObjectTemplateId == 0)
+				itemObjectTemplateId = getItemObjectTemplateId(item);
+
+			const int sequence = s_market->AddImmediateAuction(
+				trueOwnerId,
+				std::string("Restoring object"),
+				1000,
+				1000,
+				item.getNetworkId(),
+				objectName.size(),
+				objectName.data(),
+				got,
+				itemObjectTemplateId,
+				time(0) + ConfigServerGame::getUnclaimedAuctionItemDestroyTimeSec(),
+				vendor.getNetworkId(),
+				getLocationString(vendor),
+				0,
+				userDescription.size(),
+				userDescription.data(),
+				attributes,
+				itemSize,
+				owner->getModValue("manage_vendor"),
+				owner->getModValue("vendor_item_limit"));
+	
+			s_pendingAdds[sequence] = 0;
+		}
+		else
+		{
+			WARNING(true, ("[Commodities API] : Could not create Owner object in restore item.\n"));
+		}
+	}
+	else
+	{
+		WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n"));
+		getCommoditiesServerConnection(); //attempt to reconnect to commodities server
+		
+	}
+	
+	
+    //then cancel it
+	auctionCancel(trueOwnerId, item.getNetworkId().getValue());
+	return true;
+}
+ 
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::vendorStatusChange(const NetworkId& vendorId, int status)
+{
+	ServerObject* vendorContainer = ServerWorld::findObjectByNetworkId(vendorId);
+	if (!vendorContainer)
+	{
+		char buf[255];
+		snprintf(buf, sizeof(buf), "%d", status);
+		buf[sizeof(buf) - 1] = '\0';
+		MessageToQueue::getInstance().sendMessageToC(vendorId, "C++VendorStatusChange", buf, 1, true);
+		return;
+	}
+
+	ServerObject * vendor = vendorContainer;
+
+	// traverse the containment chain until we find the vendor object
+	while (vendor && !vendor->isVendor())
+		vendor = safe_cast<ServerObject*>(ContainerInterface::getContainedByObject(*vendor));
+
+	if (vendor)
+	{
+		if (vendor->isAuthoritative())
+		{
+			ScriptParams params;
+			params.clear();
+			params.addParam(status);
+			vendor->getScriptObject()->trigAllScripts(Scripting::TRIG_VENDOR_STATUS_CHANGE, params);
+		}
+		else
+		{
+			char buf[255];
+			snprintf(buf, sizeof(buf), "%d", status);
+			buf[sizeof(buf) - 1] = '\0';
+			MessageToQueue::getInstance().sendMessageToC(vendorId, "C++VendorStatusChange", buf, 1, true);
+		}
+	}
+}
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::vendorItemCountReply(const NetworkId& vendorId, int count, bool searchEnabled)
+{
+	ServerObject* vendor = ServerWorld::findObjectByNetworkId(vendorId);
+	if (vendor)
+	{
+		ServerObject * actualVendor = safe_cast<ServerObject*>(ContainerInterface::getFirstParentInWorld(*vendor));
+		if (actualVendor)
+		{
+			ScriptParams params;
+			params.clear();
+			params.addParam(count);
+			if (searchEnabled)
+				params.addParam(1);
+			else
+				params.addParam(0);
+			actualVendor->getScriptObject()->trigAllScripts(Scripting::TRIG_VENDOR_ITEM_COUNT_REPLY, params);
+		}
+	}
+
+}
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::requestVendorItemCount(const NetworkId& vendorId)
+{
+	ServerObject* vendorObject = ServerWorld::findObjectByNetworkId(vendorId);
+	if (!vendorObject)
+		return;
+
+	ServerObject* auctionContainer = vendorObject->getBazaarContainer();
+	if (!auctionContainer)
+		return;
+	
+	if (s_market)
+	{
+		QueryVendorItemCountMessage m(0, 0, auctionContainer->getNetworkId());
+		s_market->send(m, true);
+	}
+	else
+	{
+		//No commodities market.  Inform the script!
+		ScriptParams params;
+		params.clear();
+		params.addParam(-1);
+		params.addParam(-1);
+		vendorObject->getScriptObject()->trigAllScripts(Scripting::TRIG_VENDOR_ITEM_COUNT_REPLY, params);
+	}
+	
+}
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::requestPlayerVendorCount(const NetworkId& playerId)
+{
+	if (s_market)
+	{
+		s_market->GetPlayerVendorCount(playerId);
+	}
+	else
+	{
+		ServerObject* playerObject = ServerWorld::findObjectByNetworkId(playerId);
+		if (!playerObject)
+			return;
+		//No commodities market.  Inform the script!
+		ScriptParams params;
+		params.clear();
+		params.addParam(-1);
+		playerObject->getScriptObject()->trigAllScripts(Scripting::TRIG_PLAYER_VENDOR_COUNT_REPLY, params);
+	}
+}
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::playerVendorCountReply(const NetworkId& playerId, int vendorCount, const std::vector<NetworkId> vendorList)
+{
+	ServerObject* player = ServerWorld::findObjectByNetworkId(playerId);
+	if (player)
+	{
+		ScriptParams params;
+		params.clear();
+		params.addParam(vendorCount);
+		player->getScriptObject()->trigAllScripts(Scripting::TRIG_PLAYER_VENDOR_COUNT_REPLY, params);
+	}
+
+}
+
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::updateVendorSearchOption(const NetworkId& vendorId, const bool enabled)
+{
+	ServerObject* vendorObject = ServerWorld::findObjectByNetworkId(vendorId);
+	if (!vendorObject)
+		return;
+
+	ServerObject* auctionContainer = vendorObject->getBazaarContainer();
+	if (!auctionContainer)
+		return;
+	
+	if (s_market)
+	{
+		UpdateVendorSearchOptionMessage m(0, 0, auctionContainer->getNetworkId(), enabled, vendorObject->getOwnerId());
+		s_market->send(m, true);
+	}
+	else
+	{
+		//No commodities market.  Inform the script!
+		ScriptParams params;
+		params.clear();
+		params.addParam(-1);
+		params.addParam(-1);
+		vendorObject->getScriptObject()->trigAllScripts(Scripting::TRIG_VENDOR_ITEM_COUNT_REPLY, params);
+	}
+	
+}
+
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::setEntranceCharge(const NetworkId& vendorId, const int entranceCharge)
+{
+	ServerObject* vendorObject = ServerWorld::findObjectByNetworkId(vendorId);
+	if (!vendorObject)
+		return;
+
+	ServerObject* auctionContainer = vendorObject->getBazaarContainer();
+	if (!auctionContainer)
+		return;
+	
+	if (s_market)
+	{
+		SetEntranceChargeMessage m(0, 0, auctionContainer->getNetworkId(), entranceCharge);
+		s_market->send(m, true);
+	}
+	else
+	{
+		//No commodities market.  Inform the script!
+		ScriptParams params;
+		params.clear();
+		params.addParam(-1);
+		params.addParam(-1);
+		vendorObject->getScriptObject()->trigAllScripts(Scripting::TRIG_VENDOR_ITEM_COUNT_REPLY, params);
+	}
+	
+}
+
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::updateItemTypeMap(int itemTypeMapVersionNumber, const std::map<int, std::set<int> > & itemTypeMap)
+{
+	s_itemTypeMap.clear();
+
+	for (std::map<int, std::set<int> >::const_iterator iter = itemTypeMap.begin(); iter != itemTypeMap.end(); ++iter)
+	{
+		for (std::set<int>::const_iterator iter2 = iter->second.begin(); iter2 != iter->second.end(); ++iter2)
+		{
+			updateItemTypeMap(itemTypeMapVersionNumber, iter->first, *iter2);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::updateItemTypeMap(int itemTypeMapVersionNumber, int itemType, int itemTemplateId)
+{
+	if ((itemType == 0) || (itemTemplateId == 0))
+		return;
+
+	StringId objectName;
+	int gameObjectType = 0;
+
+	// get the server template
+	const ObjectTemplate * ot = ObjectTemplateList::fetch(static_cast<uint32>(itemTemplateId));
+	if (ot != NULL)
+	{
+		objectName = StringId(std::string(ot->getName()));
+
+		// get the shared template 
+		const ServerObjectTemplate * serverOt = ot->asServerObjectTemplate();
+		if (serverOt != NULL)
+		{
+			const std::string sharedTemplateName(serverOt->getSharedTemplate());
+			serverOt->releaseReference();
+			serverOt = NULL;
+			ot = ObjectTemplateList::fetch(sharedTemplateName);
+			if (ot != NULL)
+			{
+				const SharedObjectTemplate * sharedOt = ot->asSharedObjectTemplate();
+				if (sharedOt != NULL)
+				{
+					gameObjectType = static_cast<int>(sharedOt->getGameObjectType());
+					StringId const tempObjectName(objectName);
+					objectName = sharedOt->getObjectName();
+					if (!objectName.isValid())
+					{
+						objectName = tempObjectName;
+					}
+					sharedOt->releaseReference();
+					sharedOt = NULL;
+				}
+				else
+				{
+					ot->releaseReference();
+					ot = NULL;
+				}
+			}
+		}
+		else
+		{
+			ot->releaseReference();
+			ot = NULL;
+		}
+	}
+	else
+	{
+		char buffer[64];
+		snprintf(buffer, sizeof(buffer)-1, "Unknown Item (%d)", itemTemplateId);
+		buffer[sizeof(buffer)-1] = '\0';
+
+		objectName = StringId(std::string(buffer));
+	}
+
+	(s_itemTypeMap[itemType])[itemTemplateId] = std::make_pair(gameObjectType, objectName);
+	s_itemTypeMapVersionNumber = itemTypeMapVersionNumber;
+}
+
+//----------------------------------------------------------------------
+
+const std::map<int, std::map<int, std::pair<int, StringId> > > & CommoditiesMarket::getItemTypeMap()
+{
+	return s_itemTypeMap;
+}
+
+//----------------------------------------------------------------------
+
+int CommoditiesMarket::getItemTypeMapVersionNumber()
+{
+	return s_itemTypeMapVersionNumber;
+}
+
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::updateResourceTypeMap(int resourceTypeMapVersionNumber, const std::map<int, std::set<std::string> > & resourceTypeMap)
+{
+	s_resourceTypeMap.clear();
+	s_resourceTypeMap = resourceTypeMap;
+	s_resourceTypeMapVersionNumber = resourceTypeMapVersionNumber;
+}
+
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::updateResourceTypeMap(int resourceTypeMapVersionNumber, int resourceClassCrc, const std::string & resourceName)
+{
+	if ((resourceClassCrc == 0) || (resourceName.empty()))
+		return;
+
+	std::set<std::string> & resourceNameList = s_resourceTypeMap[resourceClassCrc];
+	if (resourceNameList.count(resourceName) == 0)
+	{
+		IGNORE_RETURN(resourceNameList.insert(resourceName));
+		s_resourceTypeMapVersionNumber = resourceTypeMapVersionNumber;
+	}
+}
+
+//----------------------------------------------------------------------
+
+const std::map<int, std::set<std::string> > & CommoditiesMarket::getResourceTypeMap()
+{
+	return s_resourceTypeMap;
+}
+
+//----------------------------------------------------------------------
+
+int CommoditiesMarket::getResourceTypeMapVersionNumber()
+{
+	return s_resourceTypeMapVersionNumber;
+}
+
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::updateVendorStatus(NetworkId const & vendorId, int status)
+{
+	ServerObject const * const vendorObject = ServerWorld::findObjectByNetworkId(vendorId);
+	if (!vendorObject)
+		return;
+
+	ServerObject const * const auctionContainer = vendorObject->getBazaarContainer();
+	if (!auctionContainer)
+		return;
+
+	if (s_market)
+	{
+		UpdateVendorStatusMessage message(auctionContainer->getNetworkId(), getLocationString(*auctionContainer), status);
+		s_market->send(message, true);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::updateVendorLocation(const ServerObject & vendor)
+{
+	// only needs to be done for initialized, unpacked vendor
+	if (!vendor.isInWorld())
+		return;
+
+	if (!vendor.getObjVars().hasItem(OBJVAR_VENDOR_INITIALIZED))
+		return;
+
+	const ServerObject * const parent = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(vendor));
+	if (!parent)
+		return;
+
+	if (!parent->asCellObject())
+		return;
+
+	if (!parent->isInWorld())
+		return;
+
+	const ServerObject * const auctionContainer = vendor.getBazaarContainer();
+	if (!auctionContainer)
+		return;
+
+	if (s_market)
+	{
+		GenericValueTypeMessage<std::pair<NetworkId, std::string> > const message("UpdateVendorLocationMessage", std::make_pair(auctionContainer->getNetworkId(), getLocationString(*auctionContainer)));
+		s_market->send(message, true);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CommoditiesMarket::sendToCommoditiesServer(const GameNetworkMessage & message)
+{
+	if (s_market)
+		s_market->send(message, true);
+}
+
+//----------------------------------------------------------------------
+
+const std::string & CommoditiesMarket::getCommoditiesNamedEscrowAccount()
+{
+	return COMMODITIES_NAMED_ACCOUNT;
+}
diff --git a/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.h b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.h
new file mode 100644
index 00000000..61f6f688
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.h
@@ -0,0 +1,128 @@
+// ======================================================================
+//
+// CommoditiesMarket.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _CommoditiesMarket_H_
+#define _CommoditiesMarket_H_
+
+#include "sharedNetworkMessages/AuctionQueryHeadersMessage.h"
+
+#include <list>
+
+// ======================================================================
+
+struct AuctionData;
+struct AuctionDataHeader;
+struct AuctionInfo;
+class CreatureObject;
+class NetworkId;
+class ServerObject;
+class StringId;
+class TangibleObject;
+class CommoditiesServerConnection;
+class GameNetworkMessage;
+
+// ======================================================================
+
+class CommoditiesMarket // static class
+{
+public:
+
+	static const std::string OBJVAR_VENDOR_REINITIALIZING;
+
+	typedef int64 AuctionId;
+	typedef int32 BidAmount;
+
+	static void install               ();
+	static void remove                ();
+	static void closeCommoditiesServerConnection();
+
+	static void getCommoditiesServerConnection ();
+
+	static int  getCommoditiesServerConnectionAgeSeconds();
+	static bool isCommoditiesServerAvailable();
+
+	static void giveTime              ();
+	static void checkPendingLoads     (const NetworkId &id);
+
+	static void auctionCreate         (CreatureObject &owner, ServerObject &item, const Unicode::String &itemLocalizedName, ServerObject &auctionContainer, BidAmount minBid, time_t timer, const Unicode::String &userDescription, bool premium = false);
+	static void auctionCreate         (CreatureObject &owner, NetworkId &item, const Unicode::String &itemLocalizedName, NetworkId &auctionContainer, BidAmount minBid, time_t timer, const Unicode::String &userDescription, bool premium = false);
+
+	static void auctionCreatePermanent(const std::string &ownerName, const ServerObject &objectTemplate, const ServerObject &auctionContainer, BidAmount cost, const Unicode::String &userDescription, bool premium = false);
+
+	static void auctionCreateImmediate         (CreatureObject &owner, ServerObject &item, const Unicode::String &itemLocalizedName, ServerObject &auctionContainer, BidAmount price, time_t timer, const Unicode::String &userDescription, bool premium = false);
+	static void auctionCreateImmediate         (CreatureObject &owner, NetworkId &item, const Unicode::String &itemLocalizedName, NetworkId &auctionContainer, BidAmount price, time_t timer, const Unicode::String &userDescription, bool premium = false);
+	static void transferVendorItemFromStockroom(CreatureObject &owner, NetworkId &item, const Unicode::String &itemLocalizedName, BidAmount price, time_t timer, const Unicode::String &userDescription);
+
+	static void auctionBid            (CreatureObject &bidder, AuctionId auctionId, BidAmount bidAmount, BidAmount maxProxyBid);
+	static void auctionCancel         (CreatureObject &who, AuctionId auctionId);
+	static void auctionCancel         (const NetworkId &playerId, AuctionId auctionId);
+	static void auctionAccept         (CreatureObject &who, AuctionId auctionId);
+	static void auctionQueryHeaders   (CreatureObject &who, int requestId, int type, int category, bool categoryExactMatch, int itemTemplateId, const Unicode::String &textFilterAll, const Unicode::String &textFilterAny, int priceFilterMin, int priceFilterMax, bool priceFilterIncludesFee, const std::list<AuctionQueryHeadersMessage::SearchCondition> & advancedSearch, AuctionQueryHeadersMessage::AdvancedSearchMatchAllAny advancedSearchMatchAllAny, const NetworkId &container, int locatioNSearchType, bool searchMyVendorsOnly, uint16 queryOffset);
+	static void auctionRetrieve       (CreatureObject &who, AuctionId auctionId, const NetworkId &itemId, ServerObject &auctionContainer);
+	static void getAuctionDetails     (CreatureObject &who, const NetworkId &itemId);
+	static void createVendorMarket    (const CreatureObject &who, ServerObject &container, int entranceCharge);
+	static void destroyVendorMarket   (const NetworkId &playerId, ServerObject &container);
+	static void isVendorOwner         (CreatureObject &who, const NetworkId &containerId);
+	static void getVendorValue        (ServerObject &containerId);
+	static void setSalesTax           (int32 salesTax, const NetworkId &bankId, ServerObject &auctionContainer);
+
+	static void reinitializeVendor    (ServerObject &vendor, const NetworkId &player);
+	static void reinitializeVendorContents(ServerObject &vendor);
+	static bool restoreItem           (ServerObject& item, TangibleObject & vendor);
+
+	static void requestVendorItemCount(const NetworkId& vendorId);
+	static void vendorStatusChange(const NetworkId& vendorId, int status);
+	static void vendorItemCountReply(const NetworkId& vendorId, int count, bool searchEnabled);
+	static void requestPlayerVendorCount(const NetworkId& playerId);
+	static void playerVendorCountReply(const NetworkId& playerId, int vendorCount, const std::vector<NetworkId> vendorList);
+	static void updateVendorSearchOption(const NetworkId& vendorId, bool enabled);
+	static void deleteAuctionLocation(const NetworkId& locationId, const std::string& whoRequested);
+	static void setEntranceCharge(const NetworkId& vendorId, int entranceCharge);
+	static void updateVendorStatus(const NetworkId & vendorId, int status);
+	static void updateVendorLocation(const ServerObject & vendor);
+
+	static void updateItemTypeMap(int itemTypeMapVersionNumber, const stdmap<int, stdset<int>::fwd >::fwd & itemTypeMap);
+	static void updateItemTypeMap(int itemTypeMapVersionNumber, int itemType, int itemTemplateId);
+	static const stdmap<int, stdmap<int, std::pair<int, StringId> >::fwd >::fwd & getItemTypeMap();
+	static int  getItemTypeMapVersionNumber();
+
+	static void updateResourceTypeMap(int resourceTypeMapVersionNumber, const stdmap<int, stdset<std::string>::fwd >::fwd & resourceTypeMap);
+	static void updateResourceTypeMap(int resourceTypeMapVersionNumber, int resourceClassCrc, const std::string & resourceName);
+	static const stdmap<int, stdset<std::string>::fwd >::fwd & getResourceTypeMap();
+	static int  getResourceTypeMapVersionNumber();
+
+	static void sendToCommoditiesServer(const GameNetworkMessage & message);
+
+	static const std::string & getCommoditiesNamedEscrowAccount();
+
+protected:
+	static void onAddBid              (int32 result, const NetworkId &itemId, const NetworkId &newBidPlayerId, const NetworkId &previousBidder, BidAmount newBidMaxProxy, BidAmount previousBid, const NetworkId &location, bool success, const NetworkId &auctionOwnerId, const std::string & ownerName, const std::string & previousBidderName, int itemNameLength, const Unicode::String & itemName, int32 salesTaxAmount, const NetworkId &salesTaxBankId);
+	static void onAuctionComplete     (const NetworkId &itemId, const NetworkId &sellerId, const NetworkId &buyerId, BidAmount purchaseAmount, BidAmount bidMaxProxy, const NetworkId &location, bool success, bool immediate, const std::string & locationString, const std::string & ownerName, const std::string & buyerName, int32 itemNameLength, const Unicode::String & itemName, const AuctionId& auctionId, bool sendSellerMail);
+	static void onItemExpired         (const NetworkId &itemOwnerId, const NetworkId &itemId, const std::string & ownerName, int itemNameLength, const Unicode::String & itemName, const std::string &locationName, const NetworkId &locationId);
+	static void onQueryHeadersReply   (int32 result, int requestId, int typeFlag, int numAuctions, const std::vector<AuctionDataHeader> & auctionData, uint32 queryOffset, bool hasMorePages);
+	static void onGetItemDetailsReply (int32 result, int32 requestId, NetworkId playerId, NetworkId itemId, int userDescriptionLength, const Unicode::String & userDescription, int oobLength, const Unicode::String & oobData, std::vector<std::pair<std::string, Unicode::String> > const & attributes);
+	static void onGetItemReply        (int32 result, int32 requestId, NetworkId playerId, NetworkId itemId, NetworkId location);
+
+	static void onAddAuction          (int sequence, int32 result, const NetworkId &auctionOwnerId, const std::string &ownerName, const NetworkId &itemId, const NetworkId &vendorId, const std::string &vendorName, const NetworkId &location);
+	static void onIsVendorOwner       (const NetworkId & requesterId, const NetworkId & ownerId, const NetworkId &container);
+	static void onAcceptHighBid       (int32 result, NetworkId itemId, NetworkId playerId);
+	static void onPermanentAuctionPurchased (const NetworkId &ownerId, const NetworkId &buyerID, BidAmount purchaseAmount, const NetworkId &itemId, const NetworkId &location, const std::string & ownerName, const std::string & buyerName, int32 itemNameLength, const Unicode::String & itemName, std::vector<std::pair<std::string, Unicode::String> > const & attributes);
+	static void onGetVendorValue      (const NetworkId &location, int32 value);
+	static void onVendorRefuseItem    (int32 result, const NetworkId & itemId, const NetworkId & vendorId, const NetworkId & itemOwnerId);
+	static void onCancelAuction       (int32 result, const NetworkId & playerId, const NetworkId & itemId);
+	static void onCreateVendorMarket  (int32 result, const NetworkId & playerId, const NetworkId & locationId);
+	static void onCleanupInvalidItemRetrieval(const NetworkId &itemId, const NetworkId & playerId, const NetworkId &creatorId, int32 reimburseAmt);
+
+	friend class CommoditiesMarketListener;
+
+};
+
+// ======================================================================
+
+#endif // _CommoditiesMarket_H_
+
diff --git a/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarketListener.cpp b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarketListener.cpp
new file mode 100644
index 00000000..9f3d2790
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarketListener.cpp
@@ -0,0 +1,234 @@
+// ======================================================================
+//
+// CommoditiesMarketListener.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CommoditiesMarketListener.h"
+
+#include "serverGame/Chat.h"
+#include "serverGame/CommoditiesMarket.h"
+#include "serverGame/GameServer.h"
+#include "serverNetworkMessages/TaskSpawnProcess.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "UnicodeUtils.h"
+#include "serverNetworkMessages/AuctionBase.h"
+
+#ifdef _WIN32
+#define atoll(a) _atoi64(a)
+#endif
+
+// ======================================================================
+
+static const char *findNetworkId(const char *locationString)
+{
+	static char str[1024];
+	strcpy(str, locationString);
+	char * poundPos = strstr(str, "#");
+	if (poundPos)
+	{
+		*poundPos = 0;	
+	}
+	int loc = strlen(str) - 1;
+	while (loc > 0)
+	{
+		if (str[loc] == '.')
+		{
+			return (&(str[loc + 1]));
+		}
+		--loc;
+	}
+	return str;
+}
+
+//-----------------------------------------------------------------------
+
+CommoditiesMarketListener::CommoditiesMarketListener()
+{
+}
+
+//-----------------------------------------------------------------------
+
+CommoditiesMarketListener::~CommoditiesMarketListener()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void CommoditiesMarketListener::OnAddAuction(int requestId, int result, const NetworkId & auctionId, const NetworkId & auctionOwnerId, const std::string & ownerName, const NetworkId & itemId, const NetworkId & vendorId, const std::string & vendorName, const std::string & location)
+{
+	UNREF(auctionId);
+	
+
+	if (vendorId.getValue() != -1 && (vendorId != auctionOwnerId))
+	{
+		Unicode::String message = Unicode::narrowToWide(ownerName + " has offered an item at your vendor market.");
+		Unicode::String oob;
+		Chat::sendSystemMessage(std::string(vendorName), message, oob); 
+			
+	}
+
+	CommoditiesMarket::onAddAuction(requestId, result, auctionOwnerId, ownerName, itemId, vendorId, vendorName, NetworkId(atoll(findNetworkId(location.c_str()))));
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarketListener::OnAddBid(int requestId, int result, const NetworkId & auctionOwnerId, const NetworkId & itemId, const NetworkId & bidPlayerId, const NetworkId & previousBidderId, int bidAmount, int previousBid, int maxProxyBidAmount, const std::string & location, const std::string & ownerName, const std::string & previousBidderName, int itemNameLength, const Unicode::String &  itemName, int salesTaxAmount, const NetworkId & salesTaxBankId)
+{
+	UNREF(requestId);
+
+	bool success = ((result != ARC_BidTooLow) && (bidAmount > 0));
+
+// Warning: not all state accounted for!
+
+/// success
+//  SuccessPermanentAuction
+//  expired
+//  toohigh
+//  toolow
+
+	
+	CommoditiesMarket::onAddBid(result, itemId, bidPlayerId, previousBidderId, maxProxyBidAmount, previousBid, NetworkId(atoll(findNetworkId(location.c_str()))), success, auctionOwnerId, ownerName, previousBidderName, itemNameLength, itemName, salesTaxAmount, salesTaxBankId);
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarketListener::OnItemExpired(const NetworkId & itemOwner, const NetworkId & itemId, const std::string & ownerName, int itemNameLength, const Unicode::String &  itemName, const std::string &locationName, const NetworkId &locationId)
+{
+	CommoditiesMarket::onItemExpired(itemOwner, itemId, ownerName, itemNameLength, itemName, locationName, locationId);
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarketListener::OnAuctionExpired(const NetworkId & auctionId, const NetworkId & auctionOwnerId, bool sold, const NetworkId & buyerId, int highBidAmount, const NetworkId & itemId, int highBidMaxProxy, const std::string & location, bool immediate, const std::string & ownerName, const std::string & buyerName, int itemNameLength, const Unicode::String & itemName, bool sendSellerMail)
+{
+	CommoditiesMarket::onAuctionComplete(itemId, auctionOwnerId, buyerId, highBidAmount, highBidMaxProxy, NetworkId(findNetworkId(location.c_str())), sold, immediate, location, ownerName, buyerName, itemNameLength, itemName, auctionId.getValue(), sendSellerMail);
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarketListener::OnQueryAuctionHeadersReply(int requestId, int result, const NetworkId & playerId, int typeFlag, int numAuctions, const std::vector<AuctionDataHeader> & auctionData, unsigned int queryOffset, bool hasMorePages)
+{
+	UNREF(playerId);
+
+	CommoditiesMarket::onQueryHeadersReply(result, requestId, typeFlag, numAuctions, auctionData, queryOffset, hasMorePages);
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarketListener::OnGetItemDetailsReply(int requestId, int result, const NetworkId & playerId, const NetworkId & itemId, int userDescriptionLength, const Unicode::String &userDescription, int oobLength, const Unicode::String & oobData, std::vector<std::pair<std::string, Unicode::String> > const & attributes)
+{
+	CommoditiesMarket::onGetItemDetailsReply(result, requestId, playerId, itemId, userDescriptionLength, userDescription, oobLength, oobData, attributes);
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarketListener::OnGetItemReply(int requestId, int result, const NetworkId & itemId, const NetworkId & playerId, const std::string & location)
+{
+	CommoditiesMarket::onGetItemReply(result, requestId, playerId, itemId, NetworkId(findNetworkId(location.c_str())));
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarketListener::OnGetVendorOwner(int requestId, int result, const NetworkId & ownerId, const std::string & ownerName, const std::string & location, const NetworkId & requesterId)
+{
+	UNREF(ownerName);
+	UNREF(result);
+	UNREF(requestId);
+
+	CommoditiesMarket::onIsVendorOwner(requesterId, ownerId, NetworkId(findNetworkId(location.c_str())));
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarketListener::OnAcceptHighBid(int requestId, int result, const NetworkId & itemId, const NetworkId & playerId)
+{
+	UNREF(requestId);
+
+	CommoditiesMarket::onAcceptHighBid(result, itemId, playerId);
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarketListener::OnPermanentAuctionPurchased(
+	const NetworkId & ownerId,
+	const NetworkId & buyerId,
+	int price,
+	const NetworkId & itemId,
+	const std::string & location,
+	const std::string & ownerName,
+	const std::string & buyerName,
+	int itemNameLength,
+	const Unicode::String &  itemName,
+	std::vector<std::pair<std::string, Unicode::String> > const & attributes
+)
+{
+	CommoditiesMarket::onPermanentAuctionPurchased(
+		ownerId,
+		buyerId,
+		price,
+		itemId,
+		NetworkId(findNetworkId(location.c_str())),
+		ownerName, buyerName, itemNameLength, itemName,
+		attributes);
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarketListener::OnGetVendorValue(int requestId, const std::string & location, int value)
+{
+	UNREF(requestId);
+
+	CommoditiesMarket::onGetVendorValue(NetworkId(findNetworkId(location.c_str())), value);
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarketListener::OnVendorRefuseItem(int requestId, int result, const NetworkId & itemId, const NetworkId & vendorId, const NetworkId & itemOwnerId)
+{
+	UNREF(requestId);
+
+	CommoditiesMarket::onVendorRefuseItem(result, itemId, vendorId, itemOwnerId);
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarketListener::OnCancelAuction(int requestId, int result, const NetworkId & itemId, const NetworkId & playerId, const NetworkId & highBidderId, int highBid, const std::string & location)
+{
+	UNREF(requestId); 
+	UNREF(highBidderId); 
+	UNREF(highBid); 
+	UNREF(location);
+
+	if (result != 0)
+	{
+		CommoditiesMarket::onCancelAuction(result, playerId, itemId);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+
+void CommoditiesMarketListener::OnCreateVendorMarket(int requestId, int result, const NetworkId & ownerId, const std::string & location)
+{
+	UNREF(requestId); 
+	UNREF(ownerId);
+
+	CommoditiesMarket::onCreateVendorMarket(result, ownerId, NetworkId(atoll(findNetworkId(location.c_str()))));
+}
+
+// ----------------------------------------------------------------------
+
+void CommoditiesMarketListener::OnCleanupInvalidItemRetrieval(int requestId, const NetworkId & itemId, const NetworkId & playerId, const NetworkId & creatorId, int reimburseAmt)
+{
+	UNREF(requestId);
+
+	CommoditiesMarket::onCleanupInvalidItemRetrieval(itemId, playerId, creatorId, reimburseAmt);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarketListener.h b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarketListener.h
new file mode 100644
index 00000000..4b12fe44
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarketListener.h
@@ -0,0 +1,51 @@
+// ======================================================================
+//
+// CommoditiesMarketListener.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _CommoditiesMarketListener_H_
+#define _CommoditiesMarketListener_H_
+
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+#include "serverNetworkMessages/AuctionData.h"
+
+// ======================================================================
+
+class CommoditiesMarketListener
+{
+public:
+
+	CommoditiesMarketListener();
+	~CommoditiesMarketListener();
+
+	void OnAddAuction                (int requestId, int result, const NetworkId & auctionId, const NetworkId & auctionOwnerId, const std::string & ownerName, const NetworkId & itemId, const NetworkId & vendorId, const std::string & vendorName, const std::string & location);
+	void OnAddBid                    (int requestId, int result, const NetworkId & auctionOwnerId, const NetworkId & itemId, const NetworkId & bidPlayerId, const NetworkId & previousBidderId, int bidAmount, int previousBidderAmount, int maxProxyBidAmount, const std::string & location, const std::string & ownerName, const std::string & previousBidderName, int itemNameLength, const Unicode::String &itemName, int salesTaxAmount, const NetworkId & salesTaxBankId);
+	void OnItemExpired               (const NetworkId & itemOwner, const NetworkId & itemId, const std::string & ownerName, int itemNameLength, const Unicode::String &itemName, const std::string &locationName, const NetworkId & locationId);
+	void OnAuctionExpired            (const NetworkId & auctionId, const NetworkId & auctionOwnerId, bool sold, const NetworkId & buyerId, int highBidAmount, const NetworkId & itemId, int highBidMaxProxy, const std::string & location, bool immediate, const std::string & ownerName, const std::string & buyerName, int itemNameLength, const Unicode::String &itemName, bool sendSellerMail);
+	void OnQueryAuctionHeadersReply  (int requestId, int result, const NetworkId & playerId, int typeFlag, int numAuctions, const std::vector<AuctionDataHeader> & auctionData, unsigned int queryAuctions, bool hasMorePages);
+	void OnGetItemDetailsReply       (int requestId, int result, const NetworkId & playerId, const NetworkId & itemId, int userDescriptionLength, const Unicode::String &userDescription, int oobLength, const Unicode::String & oobData, std::vector<std::pair<std::string, Unicode::String> > const & attributes);
+
+	void OnCancelAuction             (int requestId, int result, const NetworkId & itemId, const NetworkId & playerId, const NetworkId & highBidderId, int highBid, const std::string & location);
+	void OnVendorRefuseItem          (int requestId, int result, const NetworkId & itemId, const NetworkId & vendorId, const NetworkId & itemOwnerId);
+	void OnAcceptHighBid             (int requestId, int result, const NetworkId & itemId, const NetworkId & playerId);
+	void OnGetItemReply              (int requestId, int result, const NetworkId & itemId, const NetworkId & playerId, const std::string & location);
+	void OnCreateVendorMarket        (int requestId, int result, const NetworkId & ownerId, const std::string & location);
+	void OnGetVendorOwner            (int requestId, int result, const NetworkId & ownerId, const std::string & ownerName, const std::string & location, const NetworkId & requesterId);
+	void OnCleanupInvalidItemRetrieval (int requestId, const NetworkId & itemId, const NetworkId & playerId, const NetworkId & creatorId, int reimburseAmt);
+    void OnPermanentAuctionPurchased (const NetworkId & ownerId, const NetworkId & buyerId, int price, const NetworkId & itemId, const std::string & location, const std::string & ownerName, const std::string & buyerName, int itemNameLength, const Unicode::String &itemName, std::vector<std::pair<std::string, Unicode::String> > const & attributes);
+	void OnGetVendorValue            (int requestId, const std::string & location, int value);
+
+private:
+	CommoditiesMarketListener(const CommoditiesMarketListener&);
+	CommoditiesMarketListener& operator= (const CommoditiesMarketListener&);
+
+};
+
+// ======================================================================
+
+#endif // _CommoditiesMarketListener_H_
+
diff --git a/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesServerConnection.cpp b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesServerConnection.cpp
new file mode 100644
index 00000000..1b7b95c9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesServerConnection.cpp
@@ -0,0 +1,973 @@
+// ======================================================================
+//
+// CommoditiesServerConnection.cpp (refactor of original Commodities Market code)
+// The old CM API was depricated and all code for comminicating with the
+// CM Server now uses this class
+//
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "CommoditiesServerConnection.h"
+#include "boost/smart_ptr.hpp"
+#include "serverGame/CityInfo.h"
+#include "serverGame/CityInterface.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/NameManager.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptDictionary.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFoundation/Crc.h"
+#include "sharedGame/GameObjectTypes.h"
+#include "sharedGame/ResourceClassObject.h"
+#include "sharedGame/Universe.h"
+#include "sharedLog/Log.h"
+#include "sharedNetwork/NetworkSetupData.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "UnicodeUtils.h"
+#include "StringId.h"
+
+#include "serverGame/CommoditiesMarket.h"
+#include "serverGame/ConsoleManager.h"
+#include "serverGame/Chat.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerWorld.h"
+
+#include "serverNetworkMessages/AcceptHighBidMessage.h"
+#include "serverNetworkMessages/AddAuctionMessage.h"
+#include "serverNetworkMessages/AddBidMessage.h"
+#include "serverNetworkMessages/AddImmediateAuctionMessage.h"
+#include "serverNetworkMessages/CancelAuctionMessage.h"
+#include "serverNetworkMessages/CreateVendorMarketMessage.h"
+#include "serverNetworkMessages/DeleteAuctionLocationMessage.h"
+#include "serverNetworkMessages/DestroyVendorMarketMessage.h"
+#include "serverNetworkMessages/GetItemDetailsMessage.h"
+#include "serverNetworkMessages/GetItemMessage.h"
+#include "serverNetworkMessages/SetSalesTaxMessage.h"
+#include "serverNetworkMessages/GetPlayerVendorCountMessage.h"
+#include "serverNetworkMessages/GetVendorOwnerMessage.h"
+#include "serverNetworkMessages/GetVendorValueMessage.h"
+#include "serverNetworkMessages/QueryAuctionHeadersMessage.h"
+#include "serverNetworkMessages/SetGameTimeMessage.h"
+#include "serverNetworkMessages/CleanupInvalidItemRetrievalMessage.h"
+
+#include "serverNetworkMessages/OnAcceptHighBidMessage.h"
+#include "serverNetworkMessages/OnAddAuctionMessage.h"
+#include "serverNetworkMessages/OnAddBidMessage.h"
+#include "serverNetworkMessages/OnAuctionExpiredMessage.h"
+#include "serverNetworkMessages/OnCancelAuctionMessage.h"
+#include "serverNetworkMessages/OnCreateVendorMarketMessage.h"
+#include "serverNetworkMessages/OnGetItemDetailsMessage.h"
+#include "serverNetworkMessages/OnGetItemMessage.h"
+#include "serverNetworkMessages/OnGetPlayerVendorCountMessage.h"
+#include "serverNetworkMessages/OnGetVendorOwnerMessage.h"
+#include "serverNetworkMessages/OnGetVendorValueMessage.h"
+#include "serverNetworkMessages/OnItemExpiredMessage.h"
+#include "serverNetworkMessages/OnPermanentAuctionPurchasedMessage.h"
+#include "serverNetworkMessages/OnVendorRefuseItemMessage.h"
+#include "serverNetworkMessages/OnQueryAuctionHeadersMessage.h"
+#include "serverNetworkMessages/OnCleanupInvalidItemRetrievalMessage.h"
+#include "serverNetworkMessages/VendorStatusChangeMessage.h"
+#include "serverNetworkMessages/OnQueryVendorItemCountReplyMessage.h"
+#include "serverNetworkMessages/OnUpdateVendorSearchOptionMessage.h"
+
+// ======================================================================
+
+CommoditiesServerConnection::CommoditiesServerConnection(const std::string & a, const unsigned short p) :
+ServerConnection(a, p, NetworkSetupData()),
+m_nextRequest(0),
+listener(),
+m_commoditiesShowAllDebugInfo(ConfigServerGame::getCommoditiesShowAllDebugInfo())
+{
+}
+
+//-----------------------------------------------------------------------
+
+CommoditiesServerConnection::~CommoditiesServerConnection()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void CommoditiesServerConnection::onConnectionClosed()
+{
+	LOG("CMServerConnection", ("CommoditiesAPI : Connection with the Commodities server is closed"));
+	static MessageConnectionCallback m("CommoditiesServerConnectionClosed");
+	emitMessage(m);
+}
+
+//-----------------------------------------------------------------------
+
+void CommoditiesServerConnection::onConnectionOpened()
+{
+	LOG("CMServerConnection", ("CommoditiesAPI : Connection with the Commodities server is open"));
+	static MessageConnectionCallback m("CommoditiesServerConnectionOpened");
+	emitMessage(m);
+}
+
+//-----------------------------------------------------------------------
+
+void CommoditiesServerConnection::onReceive(const Archive::ByteStream & message)
+{
+	Archive::ReadIterator ri = message.begin();
+	GameNetworkMessage msg(ri);
+	ri = message.begin();
+
+
+	if(msg.isType("OnAddAuctionMessage"))
+	{
+		OnAddAuctionMessage oaa_message(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received OnAddAuctionMessage.\n"));
+		listener.OnAddAuction(oaa_message.GetResponseId(), oaa_message.GetResultCode(), oaa_message.GetItemId(), oaa_message.GetOwnerId(), oaa_message.GetOwnerName(), oaa_message.GetItemId(), oaa_message.GetVendorId(), NameManager::getInstance().getPlayerFullName(oaa_message.GetVendorId()), oaa_message.GetLocation());
+		
+	}
+	else if(msg.isType("OnAddBidMessage"))
+	{
+		OnAddBidMessage oab_message(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received OnAddBidMessage.\n"));
+		listener.OnAddBid(oab_message.GetResponseId(), oab_message.GetResultCode(), oab_message.GetOwnerId(), oab_message.GetItemId(), oab_message.GetBidderId(), oab_message.GetPreviousBidderId(), oab_message.GetBid(), oab_message.GetPreviousBid(), oab_message.GetMaxProxyBid(), oab_message.GetLocation(), NameManager::getInstance().getPlayerFullName(oab_message.GetOwnerId()), NameManager::getInstance().getPlayerFullName(oab_message.GetPreviousBidderId()), oab_message.GetItemNameLength(), oab_message.GetItemName(), oab_message.GetSalesTaxAmount(), oab_message.GetSalesTaxBankId());
+
+	}
+	else if(msg.isType("OnCancelAuctionMessage"))
+	{
+		OnCancelAuctionMessage oca_message(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received OnCancelAuctionMessage.\n"));
+		listener.OnCancelAuction(oca_message.GetResponseId(), oca_message.GetResultCode(), oca_message.GetItemId(), oca_message.GetPlayerId(), oca_message.GetHighBidderId(), oca_message.GetHighBid(), oca_message.GetLocation());
+
+	}
+	else if(msg.isType("OnAcceptHighBidMessage"))
+	{
+		OnAcceptHighBidMessage oahb_message(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received OnAcceptHighBidMessage.\n"));
+		listener.OnAcceptHighBid(oahb_message.GetResponseId(), oahb_message.GetResultCode(), oahb_message.GetItemId(), oahb_message.GetPlayerId());
+
+	}
+	else if(msg.isType("OnQueryAuctionHeadersMessage"))
+	{
+		OnQueryAuctionHeadersMessage oqah_message(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received OnQueryAuctionHeadersMessage.\n"));
+		listener.OnQueryAuctionHeadersReply(oqah_message.GetResponseId(), oqah_message.GetResultCode(), oqah_message.GetPlayerId(), oqah_message.GetQueryType(), oqah_message.GetNumAuctions(), oqah_message.GetAuctionData(), oqah_message.GetQueryOffset(), oqah_message.HasMorePages());
+
+	}
+	else if(msg.isType("OnGetItemDetailsMessage"))
+	{
+		OnGetItemDetailsMessage ogid_message(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API OnGetItemDetailsMessage] : Received OnGetItemDetailsMessage.\n"));
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API OnGetItemDetailsMessage] : Result : %d.\n", ogid_message.GetResultCode()));	
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API OnGetItemDetailsMessage] : ItemId : %s.\n", ogid_message.GetItemId().getValueString().c_str()));	
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API OnGetItemDetailsMessage] : PlayerId : %s.\n", ogid_message.GetPlayerId().getValueString().c_str()));
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API OnGetItemDetailsMessage] : UserDescriptionLength : %d.\n", ogid_message.GetUserDescriptionLength()));
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API OnGetItemDetailsMessage] : UserDescription : %s.\n", Unicode::wideToNarrow(ogid_message.GetUserDescription()).c_str()));
+//		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API OnGetItemDetailsMessage] : OobLength : %d.\n", ogid_message.GetOobLength()));
+//		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API OnGetItemDetailsMessage] : OobActualLength : %d.\n", ogid_message.GetOobData().size()));
+//		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API OnGetItemDetailsMessage] : OobData 	: %s.\n", Unicode::wideToNarrow(ogid_message.GetOobData()).c_str()));
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API OnGetItemDetailsMessage] : ResponseId : %d.\n", ogid_message.GetResponseId()));	
+		listener.OnGetItemDetailsReply(ogid_message.GetResponseId(), ogid_message.GetResultCode(), ogid_message.GetPlayerId(), ogid_message.GetItemId(), ogid_message.GetUserDescriptionLength(), ogid_message.GetUserDescription(), ogid_message.GetOobLength(), ogid_message.GetOobData(), ogid_message.GetAttributes());
+
+	}
+	else if(msg.isType("OnAuctionExpiredMessage"))
+	{
+		OnAuctionExpiredMessage oae_message(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received OnAuctionExpiredMessage.\n"));
+		DEBUG_REPORT_LOG(true, ("  -- OwnerId = %s, GetOwnerName = %s, BuyerId = %s, GetBuyerName = %s\n", oae_message.GetOwnerId().getValueString().c_str(),
+			NameManager::getInstance().getPlayerFullName(oae_message.GetOwnerId()).c_str(),
+			oae_message.GetBuyerId().getValueString().c_str(),
+			NameManager::getInstance().getPlayerFullName(oae_message.GetBuyerId()).c_str()));
+		listener.OnAuctionExpired(oae_message.GetItemId(), oae_message.GetOwnerId(), oae_message.IsSold(), oae_message.GetBuyerId(), oae_message.GetBid(), oae_message.GetItemId(), oae_message.GetMaxProxyBid(), oae_message.GetLocation(), oae_message.IsImmediate(), NameManager::getInstance().getPlayerFullName(oae_message.GetOwnerId()), NameManager::getInstance().getPlayerFullName(oae_message.GetBuyerId()), oae_message.GetItemNameLength(), oae_message.GetItemName(), oae_message.GetSendSellerMail());
+
+	}
+	else if(msg.isType("OnItemExpiredMessage"))
+	{
+		OnItemExpiredMessage oie_message(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received OnItemExpiredMessage.\n"));
+		listener.OnItemExpired(oie_message.GetOwnerId(), oie_message.GetItemId(),
+			NameManager::getInstance().getPlayerFullName(oie_message.GetOwnerId()),
+			oie_message.GetItemNameLength(), oie_message.GetItemName(),
+			oie_message.GetLocationName(), oie_message.GetLocationId());
+
+	}
+	else if(msg.isType("OnGetItemMessage"))
+	{
+		OnGetItemMessage ogi_message(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received OnGetItemMessage.\n"));
+		listener.OnGetItemReply(ogi_message.GetResponseId(), ogi_message.GetResultCode(), ogi_message.GetItemId(), ogi_message.GetPlayerId(), ogi_message.GetLocation());
+
+	}
+	else if(msg.isType("OnCreateVendorMarketMessage"))
+	{
+		OnCreateVendorMarketMessage ocvm_message(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received OnCreateVendorMarketMessage.\n"));
+		listener.OnCreateVendorMarket(ocvm_message.GetResponseId(), ocvm_message.GetResultCode(), ocvm_message.GetOwnerId(), ocvm_message.GetLocation());
+
+	}
+	else if(msg.isType("OnVendorRefuseItemMessage"))
+	{
+		OnVendorRefuseItemMessage ovri_message(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received OnVendorRefuseItemMessage.\n"));
+		listener.OnVendorRefuseItem(ovri_message.GetResponseId(), ovri_message.GetResultCode(), ovri_message.GetItemId(), ovri_message.GetVendorId(), ovri_message.GetItemOwnerId());
+
+	}
+	else if(msg.isType("OnGetVendorOwnerMessage"))
+	{
+		OnGetVendorOwnerMessage ogvo_message(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received OnGetVendorOwnerMessage.\n"));
+		listener.OnGetVendorOwner(ogvo_message.GetResponseId(), ogvo_message.GetResultCode(), ogvo_message.GetOwnerId(),
+		NameManager::getInstance().getPlayerFullName(ogvo_message.GetOwnerId()),
+		ogvo_message.GetLocation(), ogvo_message.GetRequesterId());
+
+	}
+	else if(msg.isType("OnGetVendorValueMessage"))
+	{
+		OnGetVendorValueMessage ogvv_message(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received OnGetVendorValueMessage.\n"));
+		listener.OnGetVendorValue(ogvv_message.GetResponseId(), ogvv_message.GetLocation(), ogvv_message.GetValue());
+
+	}
+	else if(msg.isType("OnPermanentAuctionPurchasedMessage"))
+	{
+		OnPermanentAuctionPurchasedMessage opa_message(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received OnPermanentAuctionPurchasedMessage.\n"));
+		listener.OnPermanentAuctionPurchased(
+			opa_message.GetOwnerId(), opa_message.GetBuyerId(), opa_message.GetPrice(), opa_message.GetItemId(), opa_message.GetLocation(),
+			NameManager::getInstance().getPlayerFullName(opa_message.GetOwnerId()),
+			NameManager::getInstance().getPlayerFullName(opa_message.GetBuyerId()),
+			opa_message.GetItemNameLength(), opa_message.GetItemName(), opa_message.GetAttributes());
+
+	}
+	else if(msg.isType("OnCleanupInvalidItemRetrievalMessage"))
+	{
+		OnCleanupInvalidItemRetrievalMessage ociir_message(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received OnCleanupInvalidItemRetrievalMessage.\n"));
+		listener.OnCleanupInvalidItemRetrieval(ociir_message.GetResponseId(), ociir_message.GetItemId(), ociir_message.GetPlayerId(), ociir_message.GetCreatorId(), ociir_message.GetReimburseAmt());
+
+	}
+	else if(msg.isType("OnGetPlayerVendorCountMessage"))
+	{
+		OnGetPlayerVendorCountMessage ogpvc_message(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received OnGetPlayerVendorCountMessage.\n"));
+		CommoditiesMarket::playerVendorCountReply(ogpvc_message.GetPlayerId(), ogpvc_message.GetVendorCount(), ogpvc_message.GetVendorList());
+	}
+	else if (msg.isType("VendorStatusChangeMessage"))
+	{
+		VendorStatusChangeMessage vscMessage(ri);
+		static char * vendorStatus[] = {"Empty", "Not Empty", "Unaccessed", "Endangered", "Removed"};
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received VendorStatusChangeMessage.\n"));
+		if (vscMessage.getStatus() >= ARC_VendorStatusEmpty && vscMessage.getStatus() <= ARC_VendorRemoved)
+		{
+			LOG("CustomerService", ("Vendor: Vendor %s status changed to %s", vscMessage.getVendorId().getValueString().c_str(), vendorStatus[vscMessage.getStatus() - ARC_VendorStatusEmpty]));
+		}
+		else
+		{
+			WARNING(true, ("[Commodities API] : Invalid vendor status %s %d.\n", vscMessage.getVendorId().getValueString().c_str(), vscMessage.getStatus()));
+		}
+		CommoditiesMarket::vendorStatusChange(vscMessage.getVendorId(), vscMessage.getStatus());
+	}
+	else if (msg.isType("OnQueryVendorItemCountReplyMessage"))
+	{
+		OnQueryVendorItemCountReplyMessage qvMessage(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received OnQueryVendorItemCountReplyMessage.\n"));
+		CommoditiesMarket::vendorItemCountReply(qvMessage.getVendorId(), qvMessage.getVendorItemCount(), qvMessage.getSearchEnabled());
+	}
+	else if (msg.isType("OnUpdateVendorSearchOptionMessage"))
+	{
+		OnUpdateVendorSearchOptionMessage uvsoMessage(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received OnUpdateVendorSearchOptionMessage.\n"));
+		ServerObject *player = ServerWorld::findObjectByNetworkId(uvsoMessage.GetPlayerId());
+		if (player)
+		{
+			StringId const VENDOR_SEARCH_ENABLED("player_structure", "vendor_search_enabled");
+			StringId const VENDOR_SEARCH_DISABLED("player_structure", "vendor_search_disabled");
+			if (uvsoMessage.GetEnabled())
+				Chat::sendSystemMessageSimple(*player , VENDOR_SEARCH_ENABLED, 0);
+			else
+				Chat::sendSystemMessageSimple(*player , VENDOR_SEARCH_DISABLED, 0);
+		}
+	}
+	else if(msg.isType("OnCommodityReplyMessage"))
+	{
+		ri = static_cast<const GameNetworkMessage &>(msg).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<std::string, std::string> > message(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received OnCommodityReplyMessage.\n"));
+
+		Chat::sendSystemMessage(message.getValue().first, Unicode::narrowToWide(message.getValue().second), Unicode::String());
+	}
+	else if (msg.isType("CommoditiesItemTypeMap"))
+	{
+		GenericValueTypeMessage<std::pair<int, std::map<int, std::set<int> > > > msg(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received CommoditiesItemTypeMap.\n"));
+		CommoditiesMarket::updateItemTypeMap(msg.getValue().first, msg.getValue().second);
+	}
+	else if (msg.isType("CommoditiesItemTypeAdded"))
+	{
+		GenericValueTypeMessage<std::pair<int, std::pair<int, int> > > msg(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received CommoditiesItemTypeAdded.\n"));
+		CommoditiesMarket::updateItemTypeMap(msg.getValue().first, msg.getValue().second.first, msg.getValue().second.second);
+	}
+	else if (msg.isType("CommoditiesResourceTypeMap"))
+	{
+		GenericValueTypeMessage<std::pair<int, std::map<int, std::set<std::string> > > > msg(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received CommoditiesResourceTypeMap.\n"));
+		CommoditiesMarket::updateResourceTypeMap(msg.getValue().first, msg.getValue().second);
+	}
+	else if (msg.isType("CommoditiesResourceTypeAdded"))
+	{
+		GenericValueTypeMessage<std::pair<int, std::pair<int, std::string> > > msg(ri);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received CommoditiesResourceTypeAdded.\n"));
+		CommoditiesMarket::updateResourceTypeMap(msg.getValue().first, msg.getValue().second.first, msg.getValue().second.second);
+	}
+	else if (msg.isType("RequestCommoditiesExcludedGotTypes"))
+	{
+		GenericValueTypeMessage<int> msg(ri);
+		UNREF(msg);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received RequestCommoditiesExcludedGotTypes.\n"));
+
+		GenericValueTypeMessage<std::map<int, std::string> > reply("ResponseCommoditiesExcludedGotTypes", GameObjectTypes::getTypesExcludedFromCommodities());
+		send(reply, true);
+	}
+	else if (msg.isType("RequestCommoditiesExcludedResourceClasses"))
+	{
+		GenericValueTypeMessage<int> msg(ri);
+		UNREF(msg);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received RequestCommoditiesExcludedResourceClasses.\n"));
+
+		GenericValueTypeMessage<std::set<std::string> > reply("ResponseCommoditiesExcludedResourceClasses", ResourceClassObject::getClassesExcludedFromCommodities());
+		send(reply, true);
+	}
+	else if (msg.isType("RequestResourceTreeHierarchy"))
+	{
+		GenericValueTypeMessage<int> msg(ri);
+		UNREF(msg);
+		DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Received RequestResourceTreeHierarchy.\n"));
+
+		ResourceClassObject const * resourceTreeRoot = Universe::getInstance().getResourceTreeRoot();
+		if (resourceTreeRoot)
+		{
+			std::vector<ResourceClassObject const *> leafChildren;
+			resourceTreeRoot->getLeafChildren(leafChildren);
+
+			std::map<int, std::set<int> > resourceTreeHierarchy;
+			ResourceClassObject const * parent;
+			for (std::vector<ResourceClassObject const *>::const_iterator iter = leafChildren.begin(); iter != leafChildren.end(); ++iter)
+			{
+				std::set<int> & parents = resourceTreeHierarchy[static_cast<int>(Crc::calculate((*iter)->getResourceClassName().c_str()))];
+				parent = (*iter)->getParent();
+				while (parent)
+				{
+					parents.insert(static_cast<int>(Crc::calculate(parent->getResourceClassName().c_str())));
+
+					if (parent->isRoot())
+						break;
+
+					parent = parent->getParent();
+				}
+			}
+
+			GenericValueTypeMessage<std::map<int, std::set<int> > > reply("ResponseResourceTreeHierarchy", resourceTreeHierarchy);
+			send(reply, true);
+		}
+	}
+	else if(msg.isType("GetItemAttributeDataRsp"))
+	{
+		GenericValueTypeMessage<std::pair<std::pair<NetworkId, std::string>, std::string> > const response(ri);
+
+		ServerObject * const requester = ServerWorld::findObjectByNetworkId(response.getValue().first.first);
+		if (requester && requester->getClient())
+		{
+			if (response.getValue().first.second == std::string("(~!@#$%^&*)system_mesage(*&^%$#@!~)"))
+			{
+				ConsoleMgr::broadcastString(response.getValue().second, requester->getClient());
+			}
+			else
+			{
+				GenericValueTypeMessage<std::pair<std::string, std::string> > const data("SaveTextOnClient", std::make_pair(response.getValue().first.second, response.getValue().second));
+				requester->getClient()->send(data, true);
+			}
+		}
+	}
+	else if(msg.isType("DisplayStringForPlayer"))
+	{
+		GenericValueTypeMessage<std::pair<NetworkId, std::string> > const response(ri);
+
+		ServerObject * const requester = ServerWorld::findObjectByNetworkId(response.getValue().first);
+		if (requester && requester->getClient())
+		{
+			ConsoleMgr::broadcastString(response.getValue().second, requester->getClient());
+		}
+	}
+	else if(msg.isType("GetVendorInfoForPlayerRsp"))
+	{
+		GenericValueTypeMessage<std::pair<std::pair<NetworkId, std::string>, std::map<std::string, std::vector<std::string> > > > const response(ri);
+
+		std::vector<const char *> name;
+		std::vector<const char *> location;
+		std::vector<const char *> tax;
+		std::vector<std::string>  taxCityTemp;
+		std::vector<const char *> taxCity;
+		std::vector<const char *> emptyDate;
+		std::vector<const char *> lastAccessDate;
+		std::vector<const char *> inactiveDate;
+		std::vector<const char *> status;
+		std::vector<const char *> searchable;
+		std::vector<const char *> entranceCharge;
+		std::vector<const char *> itemCount;
+		std::vector<const char *> offerCount;
+		std::vector<const char *> stockRoomCount;
+
+		std::map<std::string, std::vector<std::string> >::const_iterator iterFind = response.getValue().second.find("name");
+		if (iterFind != response.getValue().second.end())
+		{
+			for (std::vector<std::string>::const_iterator iter = iterFind->second.begin(); iter != iterFind->second.end(); ++iter)
+			{
+				name.push_back(iter->c_str());
+			}
+		}
+
+		iterFind = response.getValue().second.find("location");
+		if (iterFind != response.getValue().second.end())
+		{
+			for (std::vector<std::string>::const_iterator iter = iterFind->second.begin(); iter != iterFind->second.end(); ++iter)
+			{
+				location.push_back(iter->c_str());
+			}
+		}
+
+		iterFind = response.getValue().second.find("tax");
+		if (iterFind != response.getValue().second.end())
+		{
+			for (std::vector<std::string>::const_iterator iter = iterFind->second.begin(); iter != iterFind->second.end(); ++iter)
+			{
+				tax.push_back(iter->c_str());
+			}
+		}
+
+		iterFind = response.getValue().second.find("taxCity");
+		if (iterFind != response.getValue().second.end())
+		{
+			taxCityTemp = iterFind->second;
+			NetworkId cityHallId;
+			int cityId;
+			std::vector<std::string>::iterator iterTaxCity;
+			for (iterTaxCity = taxCityTemp.begin(); iterTaxCity != taxCityTemp.end(); ++iterTaxCity)
+			{
+				cityHallId = NetworkId(*iterTaxCity);
+				if (cityHallId.isValid())
+				{
+					cityId = CityInterface::findCityByCityHall(cityHallId);
+					if (cityId != 0)
+					{
+						*iterTaxCity = CityInterface::getCityInfo(cityId).getCityName();
+					}
+					else
+					{
+						*iterTaxCity = "";
+					}
+				}
+				else
+				{
+					*iterTaxCity = "";
+				}
+			}
+
+			for (iterTaxCity = taxCityTemp.begin(); iterTaxCity != taxCityTemp.end(); ++iterTaxCity)
+			{
+				taxCity.push_back(iterTaxCity->c_str());
+			}
+		}
+
+		iterFind = response.getValue().second.find("emptyDate");
+		if (iterFind != response.getValue().second.end())
+		{
+			for (std::vector<std::string>::const_iterator iter = iterFind->second.begin(); iter != iterFind->second.end(); ++iter)
+			{
+				emptyDate.push_back(iter->c_str());
+			}
+		}
+
+		iterFind = response.getValue().second.find("lastAccessDate");
+		if (iterFind != response.getValue().second.end())
+		{
+			for (std::vector<std::string>::const_iterator iter = iterFind->second.begin(); iter != iterFind->second.end(); ++iter)
+			{
+				lastAccessDate.push_back(iter->c_str());
+			}
+		}
+
+		iterFind = response.getValue().second.find("inactiveDate");
+		if (iterFind != response.getValue().second.end())
+		{
+			for (std::vector<std::string>::const_iterator iter = iterFind->second.begin(); iter != iterFind->second.end(); ++iter)
+			{
+				inactiveDate.push_back(iter->c_str());
+			}
+		}
+
+		iterFind = response.getValue().second.find("status");
+		if (iterFind != response.getValue().second.end())
+		{
+			for (std::vector<std::string>::const_iterator iter = iterFind->second.begin(); iter != iterFind->second.end(); ++iter)
+			{
+				status.push_back(iter->c_str());
+			}
+		}
+
+		iterFind = response.getValue().second.find("searchable");
+		if (iterFind != response.getValue().second.end())
+		{
+			for (std::vector<std::string>::const_iterator iter = iterFind->second.begin(); iter != iterFind->second.end(); ++iter)
+			{
+				searchable.push_back(iter->c_str());
+			}
+		}
+
+		iterFind = response.getValue().second.find("entranceCharge");
+		if (iterFind != response.getValue().second.end())
+		{
+			for (std::vector<std::string>::const_iterator iter = iterFind->second.begin(); iter != iterFind->second.end(); ++iter)
+			{
+				entranceCharge.push_back(iter->c_str());
+			}
+		}
+
+		iterFind = response.getValue().second.find("itemCount");
+		if (iterFind != response.getValue().second.end())
+		{
+			for (std::vector<std::string>::const_iterator iter = iterFind->second.begin(); iter != iterFind->second.end(); ++iter)
+			{
+				itemCount.push_back(iter->c_str());
+			}
+		}
+
+		iterFind = response.getValue().second.find("offerCount");
+		if (iterFind != response.getValue().second.end())
+		{
+			for (std::vector<std::string>::const_iterator iter = iterFind->second.begin(); iter != iterFind->second.end(); ++iter)
+			{
+				offerCount.push_back(iter->c_str());
+			}
+		}
+
+		iterFind = response.getValue().second.find("stockRoomCount");
+		if (iterFind != response.getValue().second.end())
+		{
+			for (std::vector<std::string>::const_iterator iter = iterFind->second.begin(); iter != iterFind->second.end(); ++iter)
+			{
+				stockRoomCount.push_back(iter->c_str());
+			}
+		}
+
+		ScriptParams params;
+		params.addParam(response.getValue().first.second.c_str(), "summary");
+		params.addParam(name, "name");
+		params.addParam(location, "location");
+		params.addParam(tax, "tax");
+		params.addParam(taxCity, "taxCity");
+		params.addParam(emptyDate, "emptyDate");
+		params.addParam(lastAccessDate, "lastAccessDate");
+		params.addParam(inactiveDate, "inactiveDate");
+		params.addParam(status, "status");
+		params.addParam(searchable, "searchable");
+		params.addParam(entranceCharge, "entranceCharge");
+		params.addParam(itemCount, "itemCount");
+		params.addParam(offerCount, "offerCount");
+		params.addParam(stockRoomCount, "stockRoomCount");
+
+		ScriptDictionaryPtr dictionary;
+		GameScriptObject::makeScriptDictionary(params, dictionary);
+		if (dictionary.get() != NULL)
+		{
+			dictionary->serialize();
+			MessageToQueue::getInstance().sendMessageToJava(response.getValue().first.first, 
+				"getVendorInfoForPlayerRsp", dictionary->getSerializedData(), 0, false);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+int CommoditiesServerConnection::GiveTime()
+{
+  // This used to re-establish connect using the udp manager
+  // if connection hadn't received ping from CM Server in 60 sec
+	return 1;
+}
+
+//-----------------------------------------------------------------------
+
+int CommoditiesServerConnection::SetGameTime(time_t gameTime)
+{
+    ++m_nextRequest;
+	SetGameTimeMessage message(m_nextRequest, int(gameTime));
+	DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Sending SetGameTimeMessage.\n"));
+	send(message, true);
+	return m_nextRequest;
+}
+
+//-----------------------------------------------------------------------
+
+int CommoditiesServerConnection::CancelAuction(const NetworkId & auctionId, const NetworkId & playerId)
+{
+	++m_nextRequest;
+	CancelAuctionMessage message(
+		m_nextRequest,
+		auctionId,
+		playerId);
+	DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Sending CancelAuctionMessage.\n"));
+	send(message, true);
+	return m_nextRequest;
+}
+
+//-----------------------------------------------------------------------
+
+int CommoditiesServerConnection::AddAuction(
+	const NetworkId &  ownerId,
+	const std::string & ownerName,
+	int  minBid,
+	time_t timer,
+	const NetworkId &  itemId,
+	int    itemNameLength,
+	const Unicode::String & itemName,
+	int  itemType,
+	int  itemTemplateId,
+	time_t itemTimer,
+	const NetworkId &  locationId,
+	const std::string &  location,
+	int flags,
+	int userDescriptionLength,
+	const Unicode::String & userDescription,
+	std::vector<std::pair<std::string, Unicode::String> > const & attributes,
+	int itemSize,
+	int vendorLimit,
+	int vendorItemLimit)
+{
+	++m_nextRequest;
+	AddAuctionMessage message(
+		m_nextRequest,
+		ownerId,
+		ownerName,
+		minBid,
+		(int)timer,
+		itemId,
+		itemNameLength,
+		itemName,
+		itemType,
+		itemTemplateId,
+		(int)itemTimer,
+		locationId,
+		location,
+		flags,
+		userDescriptionLength,
+		userDescription,
+		attributes,
+		itemSize,
+		vendorLimit,
+		vendorItemLimit);
+	DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Sending AddAuctionMessage.\n"));
+	send(message, true);
+    return m_nextRequest;
+}
+
+//-----------------------------------------------------------------------
+
+int CommoditiesServerConnection::AddImmediateAuction(
+	const NetworkId &  ownerId,
+	const std::string & ownerName,
+	int  price,
+	time_t timer,
+	const NetworkId &  itemId,
+	int    itemNameLength,
+	const Unicode::String & itemName,
+	int  itemType,
+	int  itemTemplateId,
+	time_t itemTimer,
+	const NetworkId &  locationId,
+	const std::string &  location,
+	int  flags,
+	int userDescriptionLength,
+	const Unicode::String & userDescription,
+	std::vector<std::pair<std::string, Unicode::String> > const & attributes,
+	int itemSize,
+	int vendorLimit,
+	int vendorItemLimit)
+{
+	++m_nextRequest;
+	AddImmediateAuctionMessage message(
+		m_nextRequest,
+		ownerId,
+		ownerName,
+		price,
+		int(timer),
+		itemId,
+		itemNameLength,
+		itemName,
+		itemType,
+		itemTemplateId,
+		(int)itemTimer,
+		locationId,
+		location,
+		flags,
+		userDescriptionLength,
+		userDescription,
+		attributes,
+		itemSize,
+		vendorLimit,
+		vendorItemLimit);
+	DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Sending AddImmediateAuctionMessage.\n"));
+	send(message, true);
+	return m_nextRequest;
+}
+
+//-----------------------------------------------------------------------
+
+int CommoditiesServerConnection::AddBid(const NetworkId & auctionId,
+	const NetworkId & playerId,
+	const std::string & playerName,
+	int bidAmount,
+	int maxProxyBid)
+{
+	++m_nextRequest;
+	AddBidMessage message(
+		m_nextRequest,
+		auctionId,
+		playerId,
+		bidAmount,
+		maxProxyBid,
+		playerName);
+	DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Sending AddBidMessage.\n"));
+	send(message, true);
+	return m_nextRequest;
+}
+
+//-----------------------------------------------------------------------
+
+int CommoditiesServerConnection::AcceptHighBid(const NetworkId & auctionId, const NetworkId & playerId)
+{
+	++m_nextRequest;
+	AcceptHighBidMessage message(
+		m_nextRequest,
+		auctionId,
+		playerId);
+	DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Sending AcceptHighBidMessage.\n"));
+	send(message, true);
+	return m_nextRequest;
+}
+
+//-----------------------------------------------------------------------
+
+int CommoditiesServerConnection::QueryAuctionHeaders(int requestId,
+	const NetworkId & playerId,
+	const NetworkId & vendorId,
+	int queryType,
+	int itemType,
+	bool itemTypeExactMatch,
+	int itemTemplateId,
+	const Unicode::String & textFilterAll,
+	const Unicode::String & textFilterAny,
+	int priceFilterMin,
+	int priceFilterMax,
+	bool priceFilterIncludesFee,
+	const std::list<AuctionQueryHeadersMessage::SearchCondition> & advancedSearch,
+	AuctionQueryHeadersMessage::AdvancedSearchMatchAllAny advancedSearchMatchAllAny,
+	const std::string & searchStringPlanet,
+	const std::string & searchStringRegion,
+	const NetworkId & searchAuctionLocationId,
+	bool searchMyVendorsOnly,
+	bool overrideVendorSearchFlag,
+	int queryOffset)
+{
+	UNREF(requestId);
+
+	++m_nextRequest;
+	QueryAuctionHeadersMessage message(
+		m_nextRequest,
+		playerId,
+		vendorId,
+		queryType,
+		itemType,
+		itemTypeExactMatch,
+		itemTemplateId,
+		textFilterAll,
+		textFilterAny,
+		priceFilterMin,
+		priceFilterMax,
+		priceFilterIncludesFee,
+		advancedSearch,
+		advancedSearchMatchAllAny,
+		searchStringPlanet,
+		searchStringRegion,
+		searchAuctionLocationId,
+		searchMyVendorsOnly,
+		overrideVendorSearchFlag,
+		queryOffset);
+	DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Sending QueryAuctionHeadersMessage.\n"));
+	send(message, true);
+	return m_nextRequest;
+}
+
+//-----------------------------------------------------------------------
+
+int CommoditiesServerConnection::GetItemDetails(int requestId, const NetworkId & playerId, const NetworkId & itemId)
+{
+	UNREF(requestId);
+	++m_nextRequest;
+	GetItemDetailsMessage message(
+		m_nextRequest,
+		itemId,
+		playerId);
+	DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Sending GetItemDetailsMessage.\n"));
+	send(message, true);
+	return m_nextRequest;
+}
+
+//-----------------------------------------------------------------------
+
+int CommoditiesServerConnection::GetVendorValue(
+	const std::string & location
+)
+{
+    ++m_nextRequest;
+	GetVendorValueMessage message(
+		m_nextRequest,
+		location);
+	DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Sending GetVendorValueMessage.\n"));
+	send(message, true);
+	return m_nextRequest;
+}
+
+//-----------------------------------------------------------------------
+
+int CommoditiesServerConnection::CreateVendorMarket(
+	const NetworkId & ownerId,
+	const std::string & location,
+	int playerVendorLimit,
+	int entranceCharge
+)
+{
+	++m_nextRequest;
+	CreateVendorMarketMessage message(
+		m_nextRequest,
+		ownerId,
+		location,
+		playerVendorLimit,
+		entranceCharge);
+	DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Sending CreateVendorMarketMessage.\n"));
+	send(message, true);
+	return m_nextRequest;
+}
+
+//-----------------------------------------------------------------------
+
+int CommoditiesServerConnection::DestroyVendorMarket(
+	const NetworkId & ownerId,
+	const std::string & ownerName,
+	const std::string & location
+)
+{
+	++m_nextRequest;
+	DestroyVendorMarketMessage message(
+		m_nextRequest,
+		ownerId,
+		ownerName,
+		location);
+	DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Sending DestroyVendorMarketMessage.\n"));
+	send(message, true);
+	return m_nextRequest;
+}
+
+//-----------------------------------------------------------------------
+
+int CommoditiesServerConnection::deleteAuctionLocation(
+	const NetworkId & locationId,
+	const std::string & whoRequested
+)
+{
+	++m_nextRequest;
+	DeleteAuctionLocationMessage message(
+		m_nextRequest,
+		locationId,
+		whoRequested);
+	DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Sending DeleteAuctionLocationMessage.\n"));
+	send(message, true);
+	return m_nextRequest;
+}
+
+//-----------------------------------------------------------------------
+
+int CommoditiesServerConnection::GetVendorOwner(
+	const NetworkId & requesterId,
+	const std::string & location
+)
+{
+    ++m_nextRequest;
+	GetVendorOwnerMessage message(
+		m_nextRequest,
+		requesterId,
+		location);
+	DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Sending GetVendorOwnerMessage.\n"));
+	send(message, true);
+	return m_nextRequest;
+}
+
+//-----------------------------------------------------------------------
+
+int CommoditiesServerConnection::GetItem(const NetworkId & itemId, const NetworkId & playerId, const std::string & location)
+{
+	++m_nextRequest;
+	GetItemMessage message(
+		m_nextRequest,
+		itemId,
+		playerId,
+		location);
+	DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Sending GetItemMessage.\n"));
+	send(message, true);
+	return m_nextRequest;
+}
+
+//-----------------------------------------------------------------------
+
+int CommoditiesServerConnection::CleanupInvalidItemRetrieval( const NetworkId & itemId)
+{
+	++m_nextRequest;
+	CleanupInvalidItemRetrievalMessage message(m_nextRequest, itemId);
+	DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Sending CleanupInvalidItemRetrievalMessage.\n"));
+	send(message, true);
+	return m_nextRequest;
+}
+
+//-----------------------------------------------------------------------
+
+int CommoditiesServerConnection::SetSalesTax(
+	int salesTax,
+	const NetworkId & bankId,
+	const std::string & location
+)
+{
+	++m_nextRequest;
+	SetSalesTaxMessage message(
+		m_nextRequest,
+		salesTax,
+		bankId,
+		location);
+	//printf("CommoditiesServerConnection: location for sales tax = '%s'\n", message.GetLocation());
+	DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Sending SetSalesTaxMessage.\n"));
+	send(message, true);
+	return m_nextRequest;
+}
+
+//-----------------------------------------------------------------------
+
+int CommoditiesServerConnection::GetPlayerVendorCount(const NetworkId & playerId)
+{
+	++m_nextRequest;
+	GetPlayerVendorCountMessage message(
+		m_nextRequest,
+		playerId);
+	
+	DEBUG_REPORT_LOG(m_commoditiesShowAllDebugInfo, ("[Commodities API] : Sending GetPlayerVendorCountMessage.\n"));
+	send(message, true);
+	return m_nextRequest;
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesServerConnection.h b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesServerConnection.h
new file mode 100644
index 00000000..f7e9958a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesServerConnection.h
@@ -0,0 +1,68 @@
+// ======================================================================
+//
+// CommoditiesServerConnection.h (refactor of original Commodities Market code)
+// The old CM API was depricated and all code for comminicating with the
+// CM Server now uses this class
+//
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_CommoditiesServerConnection_H
+#define	_CommoditiesServerConnection_H
+
+#include "serverGame/CommoditiesMarketListener.h"
+#include "serverUtility/ServerConnection.h"
+#include "sharedNetworkMessages/AuctionQueryHeadersMessage.h"
+
+#include <list>
+
+// ======================================================================
+
+class CommoditiesServerConnection : public ServerConnection
+{
+public:
+	CommoditiesServerConnection(const std::string & remoteAddress, const unsigned short remotePort);
+	~CommoditiesServerConnection();
+
+	void  onConnectionClosed();
+	void  onConnectionOpened();
+	void  onReceive(const Archive::ByteStream & message);
+
+	int   SetGameTime(time_t gameTime);
+	int   CancelAuction(const NetworkId & auctionId, const NetworkId & playerId);
+	int   AddAuction(const NetworkId &  ownerId, const std::string & ownerName, int  minBid, time_t timer, const NetworkId &  itemId, int itemNameLength, const Unicode::String & itemName, int  itemType, int  itemTemplateId, time_t itemTimer, const NetworkId &  locationId,  const std::string &  location, int flags, int userDescriptionLength, const Unicode::String & userDescription, std::vector<std::pair<std::string, Unicode::String> > const & attributes, int itemSize, int vendorLimit, int vendorItemLimit);
+	int   AddImmediateAuction(const NetworkId &  ownerId, const std::string & ownerName, int  price, time_t timer, const NetworkId &  itemId, int itemNameLength, const Unicode::String & itemName, int  itemType, int  itemTemplateId, time_t itemTimer, const NetworkId &  locationId, const std::string &  location, int  flags, int userDescriptionLength, const Unicode::String & userDescription, std::vector<std::pair<std::string, Unicode::String> > const & attributes, int itemSize, int vendorLimit, int vendorItemLimit);
+	int   AddBid(const NetworkId & auctionId, const NetworkId & playerId, const std::string & playerName, int bidAmount, int maxProxyBid);
+	int   AcceptHighBid(const NetworkId & auctionId, const NetworkId & playerId);
+	int   QueryAuctionHeaders(int requestId, const NetworkId & playerId, const NetworkId & vendorId, int queryType, int itemType, bool itemTypeExactMatch, int itemTemplateId, const Unicode::String & textFilterAll, const Unicode::String & textFilterAny, int priceFilterMin, int priceFilterMax, bool priceFilterIncludesFee, const std::list<AuctionQueryHeadersMessage::SearchCondition> & advancedSearch, AuctionQueryHeadersMessage::AdvancedSearchMatchAllAny advancedSearchMatchAllAny, const std::string & searchStringPlanet, const std::string & searchStringRegion, const NetworkId & searchAuctionLocationId, bool searchMyVendorsOnly, bool overrideVendorSearchFlag, int queryOffset);
+	int   GetItemDetails(int requestId, const NetworkId & playerId, const NetworkId & itemId);
+	int   GetVendorValue(const std::string & location);
+	int   CreateVendorMarket(const NetworkId & ownerId, const std::string & location, int playerVendorLimit, int entranceCharge);
+	int   DestroyVendorMarket(const NetworkId & ownerId, const std::string & ownerName, const std::string & location);
+	int   deleteAuctionLocation(const NetworkId & locationId, const std::string & whoRequested);
+	int   GetVendorOwner(const NetworkId & requesterId, const std::string & location);
+	int   GetItem(const NetworkId & itemId, const NetworkId & playerId, const std::string & location);
+	int   CleanupInvalidItemRetrieval( const NetworkId & itemId);
+	int   SetSalesTax(int salesTax, const NetworkId & bankId, const std::string & location);
+	int   GetPlayerVendorCount(const NetworkId & playerId);
+	int   GiveTime();
+	
+
+private:
+    // request tracking
+	int                             m_nextRequest;
+	CommoditiesMarketListener       listener;
+	bool                            m_commoditiesShowAllDebugInfo;
+
+
+	CommoditiesServerConnection(const CommoditiesServerConnection&);
+	CommoditiesServerConnection& operator= (const CommoditiesServerConnection&);
+
+}; //lint !e1712 default constructor not defined
+
+//-----------------------------------------------------------------------
+
+#endif	// _CommoditiesServerConnection_H
+
+
diff --git a/engine/server/library/serverGame/src/shared/console/CentralCommandParserGame.cpp b/engine/server/library/serverGame/src/shared/console/CentralCommandParserGame.cpp
new file mode 100644
index 00000000..d9389fd3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/CentralCommandParserGame.cpp
@@ -0,0 +1,291 @@
+// CentralCommandParserGame.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved.
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CentralCommandParserGame.h"
+
+#include "serverGame/Chat.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ObjectTracker.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverNetworkMessages/ReloadDatatableMessage.h"
+#include "serverNetworkMessages/ReloadScriptMessage.h"
+#include "serverNetworkMessages/ReloadTemplateMessage.h"
+#include "serverNetworkMessages/SetConnectionServerPublic.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFile/TreeFile.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedUtility/DataTableManager.h"
+#include "sharedUtility/DataTable.h"
+#include "UnicodeUtils.h"
+
+//-----------------------------------------------------------------------
+
+CentralCommandParserGame::CentralCommandParserGame() :
+CommandParser ("game", 0, "...", "game commands from the central server", 0)
+{
+}
+
+//-----------------------------------------------------------------------
+
+CentralCommandParserGame::~CentralCommandParserGame()
+{
+}
+
+//-----------------------------------------------------------------------
+
+bool CentralCommandParserGame::performParsing (const NetworkId &, const StringVector_t & argv, const String_t & originalMessage, String_t & result, const CommandParser *)
+{
+	LOG("ServerConsole", ("Parsing ServerConsole command."));
+	bool retval = false;
+	if(! argv.empty())
+	{
+		std::string cmd = Unicode::wideToNarrow(argv[2]);
+		LOG("ServerConsole", ("Attempting to execute command '%s'.", cmd.c_str()) );
+		if(cmd == "runScript")
+		{
+			// build arguments
+			if(argv.size() > 4)
+			{
+				// get script name
+				std::string scriptName = Unicode::wideToNarrow(argv[3]);
+				std::string methodName = Unicode::wideToNarrow(argv[4]);
+
+				// determine params
+				Unicode::String strParam = originalMessage.substr(originalMessage.find(argv[4]) + argv[4].length() + 1);
+				ScriptParams params;
+				params.addParam(strParam, "strParam");
+				std::string scriptResult = GameScriptObject::callScriptConsoleHandler(scriptName, methodName, "u", params);
+				result += Unicode::narrowToWide(scriptResult);
+				retval = true;
+			}
+		}
+		else if( cmd == "public" )
+		{
+//			LOG("ServerConsole", ("Setting cluster to public."));
+			SetConnectionServerPublic const p(true);
+			GameServer::getInstance().sendToCentralServer(p);
+			result += Unicode::narrowToWide("Cluster set to public.\n");
+			retval = true;
+		}
+		else if( cmd == "private" )
+		{
+//			LOG("ServerConsole", ("Setting cluster to private."));
+			SetConnectionServerPublic const p(false);
+			GameServer::getInstance().sendToCentralServer(p);
+			result += Unicode::narrowToWide("Cluster set to private.\n");
+			retval = true;
+		}
+		else if(cmd == "systemMessage")
+		{
+			std::string targetId = "SWG." + GameServer::getInstance().getClusterName() + ".SYSTEM";
+			static const Unicode::String oob;
+			Unicode::String output = originalMessage.substr(originalMessage.find(argv[2]) + argv[2].length() + 1);
+//			LOG("ServerConsole", ("Attempting to send system message."));
+			Chat::sendToRoom("SYSTEM", targetId, output, oob);
+			result += Unicode::narrowToWide("message \"");
+			result += output;
+			result += Unicode::narrowToWide("\" sent to chat system\n");
+			retval = true;
+		}
+		// reloads a script on all game servers
+		else if(cmd == "reloadScript")
+		{
+			std::string scriptName = Unicode::wideToNarrow(argv[3]);
+			if( GameScriptObject::reloadScript(scriptName) )
+			{
+				LOG("ServerConsole", ("Successfully reloaded script '%s'.", scriptName.c_str()));
+				result += Unicode::narrowToWide("reloadScript '");
+				result += Unicode::narrowToWide(scriptName);
+				result += Unicode::narrowToWide("' succeeded\n");
+				retval = true;
+			}
+			else
+			{
+				LOG("ServerConsole", ("Failed to reload script '%s'.", scriptName.c_str()));
+				result += Unicode::narrowToWide("reloadScript '");
+				result += Unicode::narrowToWide(scriptName);
+				result += Unicode::narrowToWide("' failed\n");
+				retval = false;
+			}
+
+			ServerMessageForwarding::beginBroadcast();
+
+			ReloadScriptMessage const reloadScriptMessage(scriptName);
+			ServerMessageForwarding::send(reloadScriptMessage);
+
+			ServerMessageForwarding::end();
+		}
+		else if( cmd == "reloadServerTemplate" )
+		{
+			std::string templateName = Unicode::wideToNarrow(argv[3]);
+			Iff templateFile;
+			if( !templateFile.open(templateName.c_str(), true))
+			{
+				result += Unicode::narrowToWide("Template '");
+				result += Unicode::narrowToWide(templateName);
+				result += Unicode::narrowToWide("' does not exist.\n");
+				retval = false;
+			}
+			else
+			{
+				if( !ObjectTemplateList::isLoaded(templateName) )
+				{
+					result += Unicode::narrowToWide("Template '");
+					result += Unicode::narrowToWide(templateName);
+					result += Unicode::narrowToWide("' can not be reloaded because it is not currently loaded.\n");
+					retval = false;
+				}
+				else
+				{
+					if( ObjectTemplateList::reload(templateFile) )
+					{
+						result += Unicode::narrowToWide("Template '");
+						result += Unicode::narrowToWide(templateName);
+						result += Unicode::narrowToWide("' reloaded.\n");
+						retval = true;
+					}
+					else
+					{
+						result += Unicode::narrowToWide("Template '");
+						result += Unicode::narrowToWide(templateName);
+						result += Unicode::narrowToWide("' reload failed.\n");
+						retval = false;
+					}
+				}
+			}
+
+			ServerMessageForwarding::beginBroadcast();
+
+			ReloadTemplateMessage const reloadTemplateMessage(templateName);
+			ServerMessageForwarding::send(reloadTemplateMessage);
+
+			ServerMessageForwarding::end();
+		}		
+		else if( cmd == "reloadTable" )
+		{
+			std::string tableName = Unicode::wideToNarrow(argv[3]);
+			if( !TreeFile::exists(tableName.c_str()) )
+			{
+				result += Unicode::narrowToWide("Table '");
+				result += Unicode::narrowToWide(tableName);
+				result += Unicode::narrowToWide("' does not exist.\n");
+				retval = false;
+			}
+			else
+			{
+				if( DataTableManager::reload(tableName) )
+				{
+					result += Unicode::narrowToWide("Reload for datatable '");
+					result += Unicode::narrowToWide(tableName);
+					result += Unicode::narrowToWide("' succeeded.\n");
+					retval = true;
+				}
+				else
+				{
+					result += Unicode::narrowToWide("Reload for datatable '");
+					result += Unicode::narrowToWide(tableName);
+					result += Unicode::narrowToWide("' failed.\n");
+					retval = false;
+				}
+			}
+
+			ServerMessageForwarding::beginBroadcast();
+
+			ReloadDatatableMessage const reloadDatatableMessage(tableName);
+			ServerMessageForwarding::send(reloadDatatableMessage);
+
+			ServerMessageForwarding::end();
+		}
+		else if( cmd == "public" )
+		{
+			LOG("ServerConsole", ("Setting cluster to public."));
+			SetConnectionServerPublic const p(true);
+			GameServer::getInstance().sendToCentralServer(p);
+			result += Unicode::narrowToWide("Cluster set to public.\n");
+			retval = true;
+		}
+		else if( cmd == "private" )
+		{
+			LOG("ServerConsole", ("Setting cluster to private."));
+			SetConnectionServerPublic const p(false);
+			GameServer::getInstance().sendToCentralServer(p);
+			result += Unicode::narrowToWide("Cluster set to private.\n");
+			retval = true;
+		}
+		else if(cmd == "info")
+		{
+			char numBuf[64] = {"\0"};
+			static const Unicode::String unl(Unicode::narrowToWide(std::string("\n")));
+
+
+			result += Unicode::narrowToWide("PID: ");
+			snprintf(numBuf, sizeof(numBuf), "%lu", GameServer::getInstance().getProcessId());
+			result += Unicode::narrowToWide(std::string(numBuf)) + unl;
+
+			result += Unicode::narrowToWide("Scene: ") + Unicode::narrowToWide(ConfigServerGame::getSceneID()) + unl;
+
+			snprintf(numBuf, sizeof(numBuf), "%d", ObjectTracker::getNumObjects());
+			result += Unicode::narrowToWide(std::string("Number of Objects: ") + std::string(numBuf)) + unl;
+
+			snprintf(numBuf, sizeof(numBuf), "%d", ObjectTracker::getNumAI());
+			result += Unicode::narrowToWide(std::string("Number of AI: ") + std::string(numBuf)) + unl;
+
+			snprintf(numBuf, sizeof(numBuf), "%d", ObjectTracker::getNumBuildings());
+			result += Unicode::narrowToWide(std::string("Number of Buildings: ") + std::string(numBuf)) + unl;
+
+			snprintf(numBuf, sizeof(numBuf), "%d", ObjectTracker::getNumCreatures());
+			result += Unicode::narrowToWide(std::string("Number of Creatures: ") + std::string(numBuf)) + unl;
+
+			snprintf(numBuf, sizeof(numBuf), "%d", ObjectTracker::getNumPlayers());
+			result += Unicode::narrowToWide(std::string("Number of Players: ") + std::string(numBuf)) + unl;
+
+			snprintf(numBuf, sizeof(numBuf), "%d", ObjectTracker::getNumTangibles());
+			result += Unicode::narrowToWide(std::string("Number of Tangibles: ") + std::string(numBuf)) + unl;
+
+			snprintf(numBuf, sizeof(numBuf), "%d", ObjectTracker::getNumUniverseObjects());
+			result += Unicode::narrowToWide(std::string("Number of UniverseObjects: ") + std::string(numBuf)) + unl;
+
+			snprintf(numBuf, sizeof(numBuf), "%d", ObjectTracker::getNumDynamicAI());
+			result += Unicode::narrowToWide(std::string("Number of Dynamic AI: ") + std::string(numBuf)) + unl;
+
+			snprintf(numBuf, sizeof(numBuf), "%d", ObjectTracker::getNumStaticAI());
+			result += Unicode::narrowToWide(std::string("Number of Dynamic AI: ") + std::string(numBuf)) + unl;
+
+			snprintf(numBuf, sizeof(numBuf), "%d", ObjectTracker::getNumIntangibles());
+			result += Unicode::narrowToWide(std::string("Number of Intangibles: ") + std::string(numBuf)) + unl;
+
+			snprintf(numBuf, sizeof(numBuf), "%d", ObjectTracker::getNumMissionDatas());
+			result += Unicode::narrowToWide(std::string("Number of MissionDatas: ") + std::string(numBuf)) + unl;
+
+			snprintf(numBuf, sizeof(numBuf), "%d", ObjectTracker::getNumMissionObjects());
+			result += Unicode::narrowToWide(std::string("Number of MissionObjects: ") + std::string(numBuf)) + unl;
+
+			snprintf(numBuf, sizeof(numBuf), "%d", ObjectTracker::getNumRunTimeRules());
+			result += Unicode::narrowToWide(std::string("Number of Runtime Rules: ") + std::string(numBuf)) + unl;
+
+			snprintf(numBuf, sizeof(numBuf), "%d", ObjectTracker::getNumGroupObjects());
+			result += Unicode::narrowToWide(std::string("Number of GroupObjects: ") + std::string(numBuf)) + unl;
+
+			snprintf(numBuf, sizeof(numBuf), "%d", ObjectTracker::getNumMissionListEntries());
+			result += Unicode::narrowToWide(std::string("Number of MissionListEntries: ") + std::string(numBuf)) + unl;
+
+			snprintf(numBuf, sizeof(numBuf), "%d", ObjectTracker::getNumWaypoints());
+			result += Unicode::narrowToWide(std::string("Number of Waypoints: ") + std::string(numBuf)) + unl;
+
+			snprintf(numBuf, sizeof(numBuf), "%d", ObjectTracker::getNumPlayerQuestObjects());
+			result += Unicode::narrowToWide(std::string("Number of PlayerQuestObjects: ") + std::string(numBuf)) + unl;
+		}
+	}
+	LOG("ServerConsole", ("Command parsing %s.", retval==true?"succeeded":"failed"));
+	return retval;
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverGame/src/shared/console/CentralCommandParserGame.h b/engine/server/library/serverGame/src/shared/console/CentralCommandParserGame.h
new file mode 100644
index 00000000..b0270e97
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/CentralCommandParserGame.h
@@ -0,0 +1,30 @@
+// CentralCommandParserGame.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_CentralCommandParserGame_H
+#define	_INCLUDED_CentralCommandParserGame_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedCommandParser/CommandParser.h"
+
+//-----------------------------------------------------------------------
+
+class CentralCommandParserGame : public CommandParser
+{
+public:
+	CentralCommandParserGame();
+	~CentralCommandParserGame();
+
+    virtual bool performParsing (const NetworkId & userId, const StringVector_t & argv,const String_t & originalCommand,String_t & result,const CommandParser * node);
+
+private:
+	CentralCommandParserGame & operator = (const CentralCommandParserGame & rhs);
+	CentralCommandParserGame(const CentralCommandParserGame & source);
+
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_CentralCommandParserGame_H
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserAi.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserAi.cpp
new file mode 100644
index 00000000..bed29504
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserAi.cpp
@@ -0,0 +1,676 @@
+// ======================================================================
+//
+// ConsoleCommandParserAi.cpp
+// Copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserAi.h"
+
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/AiShipController.h"
+#include "serverGame/Chat.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/HateList.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/WeaponObject.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedFile/FileNameUtils.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedGame/AiDebugString.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+#include "UnicodeUtils.h"
+
+// ======================================================================
+
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"info", 0, "[oid]", "Displays information about the specified AI. Assumes target if no oid specified."},
+	{"hatelist", 0, "[oid]", "Displays the specified object's hate list. Assumes target if no oid specified."},
+	{"kill", 0, "[oid]", "Kills the specified AI. Assumes target if no oid specified."},
+	{"log", 0, "[oid]", "Toggles log file data for the specified AI. Assumes target if no oid specified."},
+	{"retreat", 0, "[oid]", "Toggles whether the specified AI can auto retreat due to a player running away without attacking. Assumes target if no oid specified."},
+	{"walkspeed", 1, "<speed | oid speed>", "Displays the current walk speed or sets the walk speed for the specified AI. Assumes target if no oid specified."},
+	{"runspeed", 1, "<speed | oid speed>", "Displays the current run speed or sets the run speed for the specified AI. Assumes target if no oid specified."},
+#ifdef _DEBUG
+	{"killall", 0, "", "Kills all the AI on the server."},
+	{"debug", 0, "", "Toggles client AI debugging."},
+	{"debugText", 0, "", "Toggles the client AI debugging text."},
+#endif // _DEBUG
+	{"", 0, "", ""} // this must be last
+};
+
+// ======================================================================
+//
+// ConsoleCommandParserAiNamespace
+//
+// ======================================================================
+
+namespace ConsoleCommandParserAiNamespace
+{
+	CreatureObject * const getAiCreatureObject(CreatureObject const & user, std::vector<Unicode::String> const & argv);
+}
+
+//-----------------------------------------------------------------
+
+CreatureObject * const ConsoleCommandParserAiNamespace::getAiCreatureObject(CreatureObject const & user, std::vector<Unicode::String> const & argv)
+{
+	NetworkId aiNetworkId;
+
+	if (argv.size() > 1)
+	{
+		aiNetworkId = NetworkId(Unicode::wideToNarrow(argv[1]));
+	}
+	else
+	{
+		aiNetworkId = user.getLookAtTarget();
+	}
+
+	CreatureObject * const aiCreatureObject = CreatureObject::getCreatureObject(aiNetworkId);
+
+	if (   (aiCreatureObject == NULL)
+		|| aiCreatureObject->isPlayerControlled())
+	{
+		Chat::sendSystemMessage(user, Unicode::narrowToWide(FormattedString<1024>().sprintf("[FAILURE] Unable to resolve %s to an AI", aiNetworkId.getValueString().c_str())), Unicode::emptyString);
+	}
+
+	return aiCreatureObject;
+}
+
+using namespace ConsoleCommandParserAiNamespace;
+
+// ======================================================================
+//
+// ConsoleCommandParserAi
+//
+// ======================================================================
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserAi::ConsoleCommandParserAi()
+ : CommandParser("ai", 0, "...", "Ai related commands.", 0)
+{
+	createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------
+
+bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+	NOT_NULL (node);
+	UNREF (userId);
+	UNREF(originalCommand);
+
+	FormattedString<1024> fs;
+
+	if (isAbbrev(argv[0], "log"))
+	{
+		CreatureObject * const userCreatureObject = CreatureObject::getCreatureObject(userId);
+
+		if (userCreatureObject == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else
+		{
+			CreatureObject * const aiCreatureObject = getAiCreatureObject(*userCreatureObject, argv);
+
+			if (aiCreatureObject == NULL)
+			{
+				result += getErrorMessage(argv[0], ERR_FAIL);
+			}
+			else
+			{
+				AICreatureController * const aiCreatureController = AICreatureController::asAiCreatureController(aiCreatureObject->getController());
+
+				if (aiCreatureController == NULL)
+				{
+					Chat::sendSystemMessage(*userCreatureObject, Unicode::narrowToWide(fs.sprintf("[FAILURE] Unable to resolve %s to an AI", aiCreatureObject->getNetworkId().getValueString().c_str())), Unicode::emptyString);
+					result += getErrorMessage(argv[0], ERR_FAIL);
+				}
+				else
+				{
+					aiCreatureController->setLogging(!aiCreatureController->isLogging());
+					
+					Chat::sendSystemMessage(*userCreatureObject, Unicode::narrowToWide(fs.sprintf("[%s] Ai logging %s", (aiCreatureController->isLogging() ? "ENABLED" : "DISABLED"), aiCreatureObject->getNetworkId().getValueString().c_str())), Unicode::emptyString);
+					result += getErrorMessage(argv[0], ERR_SUCCESS);
+				}
+			}
+		}
+	}
+	else if (isAbbrev(argv[0], "info"))
+	{
+		CreatureObject * const userCreatureObject = CreatureObject::getCreatureObject(userId);
+
+		if (userCreatureObject == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else
+		{
+			NetworkId targetNetworkId;
+
+			if (argv.size () > 1)
+			{
+				targetNetworkId = NetworkId(Unicode::wideToNarrow(argv[1]));
+			}
+			else
+			{
+				targetNetworkId = userCreatureObject->getLookAtTarget();
+			}
+
+			AICreatureController * const aiCreatureController = AICreatureController::getAiCreatureController(targetNetworkId);
+			Unicode::String systemMessage;
+
+			if (aiCreatureController == NULL)
+			{
+				result = Unicode::narrowToWide(fs.sprintf("[FAILURE] Unable to resolve %s to an AI\n", targetNetworkId.getValueString().c_str()));
+				result += getErrorMessage(argv[0], ERR_FAIL);
+			}
+			else
+			{
+				CreatureObject const * const creatureOwner = aiCreatureController->getCreature();
+
+				result += Unicode::narrowToWide(fs.sprintf("\nobj_id: %s\n", aiCreatureController->getCreature()->getNetworkId().getValueString().c_str()));
+				result += Unicode::narrowToWide(fs.sprintf("creatureName: %s\n", aiCreatureController->getCreatureName().getString()));
+				result += Unicode::narrowToWide(fs.sprintf("level: %i\n", aiCreatureController->getCreature()->getLevel()));
+
+				// World position
+				{
+					Vector const & position_w = creatureOwner->getPosition_w();
+					result += Unicode::narrowToWide(fs.sprintf("world position: pos(%.1f, %.1f, %.1f)\n", position_w.x, position_w.y, position_w.z));
+				}
+
+				// Cell position
+				{
+					CellProperty const * const cellProperty = creatureOwner->getParentCell();
+
+					if (cellProperty != NULL)
+					{
+						Vector const & position_p = creatureOwner->getPosition_p();
+
+						result += Unicode::narrowToWide(fs.sprintf("cell location:  pos(%.1f, %.1f, %.1f) cell(%s:%s)\n", position_p.x, position_p.y, position_p.z, cellProperty->getOwner().getNetworkId().getValueString().c_str(), cellProperty->getCellName()));
+					}
+				}
+
+				Location const & location = aiCreatureController->getHomeLocation();
+				result += Unicode::narrowToWide(fs.sprintf("homeLocation: pos(%.1f, %.1f, %.1f) cell(%s:%s) scene(%s)\n", location.getCoordinates().x, location.getCoordinates().y, location.getCoordinates().z, location.getCell().getValueString().c_str(), (location.getCell() == NetworkId::cms_invalid) ? ":world" : "", location.getSceneId()));
+				result += Unicode::narrowToWide(fs.sprintf("invulnerable: %s\n", aiCreatureController->getCreature()->isInvulnerable() ? "yes" : "no"));
+				result += Unicode::narrowToWide(fs.sprintf("hibernating: %s\n", aiCreatureController->getHibernate() ? "yes" : "no"));
+				result += Unicode::narrowToWide(fs.sprintf("movement state: %s\n", AiMovementBase::getMovementString(aiCreatureController->getMovementType())));
+				result += Unicode::narrowToWide(fs.sprintf("walk speed(%.1f)\n", creatureOwner->getWalkSpeed()));
+				result += Unicode::narrowToWide(fs.sprintf("run speed(%.1f) modifier(%.2f)\n", creatureOwner->getRunSpeed(), aiCreatureController->getMovementSpeedPercent()));
+
+				if (aiCreatureController->isAggressive())
+				{
+					result += Unicode::narrowToWide(fs.sprintf("aggressive: yes @ %.1fm\n", aiCreatureController->getAggroRadius()));
+				}
+				else
+				{
+					result += Unicode::narrowToWide("aggressive: no\n");
+				}
+				if (aiCreatureController->isAssist())
+				{
+					result += Unicode::narrowToWide(fs.sprintf("assist: yes @ %.1fm\n", aiCreatureController->getAssistRadius()));
+				}
+				else
+				{
+					result += Unicode::narrowToWide("assist: no\n");
+				}
+				result += Unicode::narrowToWide(fs.sprintf("killer: %s\n", aiCreatureController->isKiller() ? "yes" : "no"));
+
+				// Hate List
+				{
+					HateList::SortedList hateList;
+					aiCreatureController->getCreature()->getSortedHateList(hateList);
+
+					if (hateList.empty())
+					{
+						result += Unicode::narrowToWide(fs.sprintf("* NO HATE TARGETS *\n"));
+					}
+					else
+					{
+						result += Unicode::narrowToWide(fs.sprintf("* HATE LIST *\n"));
+						
+						HateList::SortedList::const_iterator iterHateList = hateList.begin();
+
+						for (; iterHateList != hateList.end(); ++iterHateList)
+						{
+							CachedNetworkId const & hateTarget = iterHateList->first;
+							TangibleObject const * const hateTargetTangibleObject = TangibleObject::asTangibleObject(hateTarget.getObject());
+							float const hate = iterHateList->second;
+							std::string hateTargetName;
+							if (hateTargetTangibleObject != NULL)
+							{
+								hateTargetName = Unicode::wideToNarrow(hateTargetTangibleObject->getEncodedObjectName()).c_str();
+							}
+							else
+							{
+								hateTargetName = "NULL";
+							}
+
+							result += Unicode::narrowToWide(fs.sprintf("%s:%s(%.1f)\n", hateTargetName.c_str(), hateTarget.getValueString().c_str(), hate));
+						}
+					}
+				}
+
+				// Hate Over Time List
+				{
+					std::map<NetworkId, std::pair<float, std::pair<unsigned long, unsigned long> > > const & hateOverTime = aiCreatureController->getCreature()->getHateOverTime();
+					if (!hateOverTime.empty())
+					{
+						result += Unicode::narrowToWide(fs.sprintf("* HATE OVER TIME LIST currentGameTime=(%lu)*\n", ServerClock::getInstance().getGameTimeSeconds()));
+
+						for (std::map<NetworkId, std::pair<float, std::pair<unsigned long, unsigned long> > >::const_iterator iter = hateOverTime.begin(); iter != hateOverTime.end(); ++iter)
+						{
+							CachedNetworkId const hateTarget(iter->first);
+							TangibleObject const * const hateTargetTangibleObject = TangibleObject::asTangibleObject(hateTarget.getObject());
+							std::string hateTargetName;
+							if (hateTargetTangibleObject != NULL)
+							{
+								hateTargetName = Unicode::wideToNarrow(hateTargetTangibleObject->getEncodedObjectName()).c_str();
+							}
+							else
+							{
+								hateTargetName = "NULL";
+							}
+
+							result += Unicode::narrowToWide(fs.sprintf("%s:%s (%.2f, %lu, %lu)\n", hateTargetName.c_str(), hateTarget.getValueString().c_str(), iter->second.first, iter->second.second.first, iter->second.second.second));
+						}
+					}
+				}
+
+				result += Unicode::narrowToWide(aiCreatureController->getCombatActionsString());
+
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+			}
+		}
+	}
+	else if (isAbbrev(argv[0], "hatelist"))
+	{
+		CreatureObject * const userCreatureObject = CreatureObject::getCreatureObject(userId);
+
+		if (userCreatureObject == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else
+		{
+			NetworkId targetNetworkId;
+
+			if (argv.size () > 1)
+			{
+				targetNetworkId = NetworkId(Unicode::wideToNarrow(argv[1]));
+			}
+			else
+			{
+				targetNetworkId = userCreatureObject->getLookAtTarget();
+			}
+
+			TangibleObject const * const to = TangibleObject::asTangibleObject(NetworkIdManager::getObjectById(targetNetworkId));
+			if (to == NULL)
+			{
+				result += Unicode::narrowToWide(fs.sprintf("Target %s not found or not TangibleObject\n", targetNetworkId.getValueString().c_str()));
+			}
+			else
+			{
+				result += Unicode::narrowToWide(fs.sprintf("Displaying hate list for %s\n", targetNetworkId.getValueString().c_str()));
+
+				// Hate List
+				{
+					HateList::SortedList hateList;
+					to->getSortedHateList(hateList);
+
+					if (hateList.empty())
+					{
+						result += Unicode::narrowToWide(fs.sprintf("* NO HATE TARGETS *\n"));
+					}
+					else
+					{
+						result += Unicode::narrowToWide(fs.sprintf("* HATE LIST *\n"));
+
+						HateList::SortedList::const_iterator iterHateList = hateList.begin();
+
+						for (; iterHateList != hateList.end(); ++iterHateList)
+						{
+							CachedNetworkId const & hateTarget = iterHateList->first;
+							TangibleObject const * const hateTargetTangibleObject = TangibleObject::asTangibleObject(hateTarget.getObject());
+							float const hate = iterHateList->second;
+							std::string hateTargetName;
+							if (hateTargetTangibleObject != NULL)
+							{
+								hateTargetName = Unicode::wideToNarrow(hateTargetTangibleObject->getEncodedObjectName()).c_str();
+							}
+							else
+							{
+								hateTargetName = "NULL";
+							}
+
+							result += Unicode::narrowToWide(fs.sprintf("%s:%s(%.1f)\n", hateTargetName.c_str(), hateTarget.getValueString().c_str(), hate));
+						}
+					}
+				}
+
+				// Hate Over Time List
+				{
+					std::map<NetworkId, std::pair<float, std::pair<unsigned long, unsigned long> > > const & hateOverTime = to->getHateOverTime();
+					if (!hateOverTime.empty())
+					{
+						result += Unicode::narrowToWide(fs.sprintf("* HATE OVER TIME LIST currentGameTime=(%lu)*\n", ServerClock::getInstance().getGameTimeSeconds()));
+
+						for (std::map<NetworkId, std::pair<float, std::pair<unsigned long, unsigned long> > >::const_iterator iter = hateOverTime.begin(); iter != hateOverTime.end(); ++iter)
+						{
+							CachedNetworkId const hateTarget(iter->first);
+							TangibleObject const * const hateTargetTangibleObject = TangibleObject::asTangibleObject(hateTarget.getObject());
+							std::string hateTargetName;
+							if (hateTargetTangibleObject != NULL)
+							{
+								hateTargetName = Unicode::wideToNarrow(hateTargetTangibleObject->getEncodedObjectName()).c_str();
+							}
+							else
+							{
+								hateTargetName = "NULL";
+							}
+
+							result += Unicode::narrowToWide(fs.sprintf("%s:%s (%.2f, %lu, %lu)\n", hateTargetName.c_str(), hateTarget.getValueString().c_str(), iter->second.first, iter->second.second.first, iter->second.second.second));
+						}
+					}
+				}
+
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+			}
+		}
+	}
+	else if (isAbbrev(argv[0], "kill"))
+	{
+		CreatureObject * const userCreatureObject = CreatureObject::getCreatureObject(userId);
+
+		if (userCreatureObject == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else
+		{
+			CreatureObject * const aiCreatureObject = getAiCreatureObject(*userCreatureObject, argv);
+
+			if (aiCreatureObject == NULL)
+			{
+				result += getErrorMessage(argv[0], ERR_FAIL);
+			}
+			else
+			{
+				aiCreatureObject->setIncapacitated(true, NetworkId::cms_invalid);
+
+				Chat::sendSystemMessage(*userCreatureObject, Unicode::narrowToWide(fs.sprintf("[SUCCESS] AI %s terminated", aiCreatureObject->getNetworkId().getValueString().c_str())), Unicode::emptyString);
+
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+			}
+		}
+	}
+	else if (isAbbrev(argv[0], "retreat"))
+	{
+		CreatureObject * const userCreatureObject = CreatureObject::getCreatureObject(userId);
+
+		if (userCreatureObject == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else
+		{
+			CreatureObject * const aiCreatureObject = getAiCreatureObject(*userCreatureObject, argv);
+
+			if (aiCreatureObject == NULL)
+			{
+				result += getErrorMessage(argv[0], ERR_FAIL);
+			}
+			else
+			{
+				aiCreatureObject->setHateListAutoExpireTargetEnabled(!aiCreatureObject->isHateListAutoExpireTargetEnabled());
+
+				Chat::sendSystemMessage(*userCreatureObject, Unicode::narrowToWide(fs.sprintf("[SUCCESS] AI %s %s retreat", aiCreatureObject->getNetworkId().getValueString().c_str(), aiCreatureObject->isHateListAutoExpireTargetEnabled() ? "will now" : "will no longer")), Unicode::emptyString);
+
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+			}
+		}
+	}
+	else if (isAbbrev(argv[0], "walkspeed"))
+	{
+		CreatureObject * const userCreatureObject = CreatureObject::getCreatureObject(userId);
+
+		if (userCreatureObject == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else
+		{
+			NetworkId aiNetworkId;
+			CreatureObject * aiCreatureObject = NULL;
+
+			if (argv.size() > 2)
+			{
+				// Get the network id and speed
+
+				aiNetworkId = NetworkId(Unicode::wideToNarrow(argv[1]));
+				aiCreatureObject = CreatureObject::getCreatureObject(aiNetworkId);
+
+				if (   (aiCreatureObject != NULL)
+				    && !aiCreatureObject->isPlayerControlled())
+				{
+					aiCreatureObject->setBaseWalkSpeed(Unicode::toFloat(argv[2]));
+				}
+			}
+			else if (argv.size() > 1)
+			{
+				// Get the look at target and speed
+
+				aiNetworkId = userCreatureObject->getLookAtTarget();
+				aiCreatureObject = CreatureObject::getCreatureObject(aiNetworkId);
+
+				if (   (aiCreatureObject != NULL)
+				    && !aiCreatureObject->isPlayerControlled())
+				{
+					aiCreatureObject->setBaseWalkSpeed(Unicode::toFloat(argv[1]));
+				}
+			}
+
+			if (   (aiCreatureObject == NULL)
+				|| aiCreatureObject->isPlayerControlled())
+			{
+				Chat::sendSystemMessage(*userCreatureObject, Unicode::narrowToWide(fs.sprintf("[FAILURE] Unable to resolve %s to an AI", aiNetworkId.getValueString().c_str())), Unicode::emptyString);
+				result += getErrorMessage(argv[0], ERR_FAIL);
+			}
+			else
+			{
+				Chat::sendSystemMessage(*userCreatureObject, Unicode::narrowToWide(fs.sprintf("[SUCCESS] AI %s has a walk speed of %.1fm/s", aiCreatureObject->getNetworkId().getValueString().c_str(), aiCreatureObject->getBaseWalkSpeed())), Unicode::emptyString);
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+			}
+		}
+	}
+	else if (isAbbrev(argv[0], "runspeed"))
+	{
+		CreatureObject * const userCreatureObject = CreatureObject::getCreatureObject(userId);
+
+		if (userCreatureObject == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else
+		{
+			NetworkId aiNetworkId;
+			CreatureObject * aiCreatureObject = NULL;
+
+			if (argv.size() > 2)
+			{
+				// Get the network id and speed
+
+				aiNetworkId = NetworkId(Unicode::wideToNarrow(argv[1]));
+				aiCreatureObject = CreatureObject::getCreatureObject(aiNetworkId);
+
+				if (   (aiCreatureObject != NULL)
+				    && !aiCreatureObject->isPlayerControlled())
+				{
+					aiCreatureObject->setBaseRunSpeed(Unicode::toFloat(argv[2]));
+				}
+			}
+			else if (argv.size() > 1)
+			{
+				// Get the look at target and speed
+
+				aiNetworkId = userCreatureObject->getLookAtTarget();
+				aiCreatureObject = CreatureObject::getCreatureObject(aiNetworkId);
+
+				if (   (aiCreatureObject != NULL)
+				    && !aiCreatureObject->isPlayerControlled())
+				{
+					aiCreatureObject->setBaseRunSpeed(Unicode::toFloat(argv[1]));
+				}
+			}
+
+			if (   (aiCreatureObject == NULL)
+				|| aiCreatureObject->isPlayerControlled())
+			{
+				Chat::sendSystemMessage(*userCreatureObject, Unicode::narrowToWide(fs.sprintf("[FAILURE] Unable to resolve %s to an AI", aiNetworkId.getValueString().c_str())), Unicode::emptyString);
+				result += getErrorMessage(argv[0], ERR_FAIL);
+			}
+			else
+			{
+				Chat::sendSystemMessage(*userCreatureObject, Unicode::narrowToWide(fs.sprintf("[SUCCESS] AI %s has a run speed of %.1fm/s", aiCreatureObject->getNetworkId().getValueString().c_str(), aiCreatureObject->getBaseRunSpeed())), Unicode::emptyString);
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+			}
+		}
+	}
+#ifdef _DEBUG
+	else if (isAbbrev(argv[0], "killall"))
+	{
+		CreatureObject * const userCreatureObject = CreatureObject::getCreatureObject(userId);
+
+		if (userCreatureObject != NULL)
+		{
+			NetworkId sparedAiNetworkId;
+
+			// See if we need to spare any single AI
+			{
+				if (argv.size() > 1)
+				{
+					sparedAiNetworkId = NetworkId(Unicode::wideToNarrow(argv[1]));
+				}
+				else
+				{
+					sparedAiNetworkId = userCreatureObject->getLookAtTarget();
+				}
+			}
+
+			// Run through all the AI on the server and kill them
+
+			int const serverObjectCount = ServerWorld::getNumObjects();
+			int killCount = 0;
+
+			for (int i = 0; i < serverObjectCount; ++i)
+			{
+				ServerObject * const serverObject = ServerWorld::getObject(i);
+				CreatureObject * const creatureObject = (serverObject != NULL) ? serverObject->asCreatureObject() : NULL;
+
+				if (   (creatureObject != NULL)
+				    && !creatureObject->isDead()
+				    && !creatureObject->isPlayerControlled()
+				    && (creatureObject->getNetworkId() != sparedAiNetworkId))
+				{
+					creatureObject->setIncapacitated(true, NetworkId::cms_invalid);
+					++killCount;
+				}
+			}
+
+			Chat::sendSystemMessage(*userCreatureObject, Unicode::narrowToWide(fs.sprintf("[SUCCESS] %d AI terminated.", killCount)), Unicode::emptyString);
+
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+	}
+	else if (isAbbrev(argv[0], "debug"))
+	{
+		Object * const object = NetworkIdManager::getObjectById(userId);
+		ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL;
+		int temp;
+		
+		if (serverObject != NULL)
+		{
+		    if (   serverObject->getObjVars().getItem("ai_debug_string", temp)
+		        && (temp > 0))
+			{
+				if (!AiShipController::isClientDebugEnabled())
+				{
+					AiShipController::setClientDebugEnabled(true);
+
+					Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide("[ENABLED] Your client is requesting ai debugging."), Unicode::emptyString);
+				}
+				else
+				{
+					IGNORE_RETURN(serverObject->setObjVarItem("ai_debug_string", 0));
+
+					Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide("[DISABLED] Your client is NO LONGER requesting ai debugging."), Unicode::emptyString);
+
+					// Tell the client to remove all ai debugging
+
+					Client * const client = serverObject->getClient();
+
+					if (client != NULL)
+					{
+						AiDebugString aiDebugString;
+						aiDebugString.enableClearClientFlag();
+						bool const reliable = true;
+						GenericValueTypeMessage<std::pair<NetworkId, std::string> > message("AiDebugString", std::make_pair(serverObject->getNetworkId(), aiDebugString.toString()));
+					
+						client->send(message, reliable);
+					}
+				}
+			}
+			else
+			{
+				IGNORE_RETURN(serverObject->setObjVarItem("ai_debug_string", 1));
+
+				Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide("[ENABLED] Your client is requesting ai debugging."), Unicode::emptyString);
+
+				if (!AiShipController::isClientDebugEnabled())
+				{
+					AiShipController::setClientDebugEnabled(true);
+				}
+			}
+		}
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "debugText"))
+	{
+		Object * const object = NetworkIdManager::getObjectById(userId);
+		ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL;
+
+		if (serverObject != NULL)
+		{
+			AiDebugString::setTextEnabled(!AiDebugString::isTextEnabled());
+			
+			Unicode::String systemMessage;
+			systemMessage = Unicode::narrowToWide(AiDebugString::isTextEnabled() ? "[ENABLED] Client-side debug text is enabled." : "[DISABLED] Client-side debug text is disabled.");
+			Chat::sendSystemMessage(*serverObject, systemMessage, Unicode::emptyString);
+		}
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+#endif //_DEBUG
+	else
+	{
+		result += getErrorMessage(argv[0], ERR_NO_HANDLER);
+	}
+
+	return true;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserAi.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserAi.h
new file mode 100644
index 00000000..4c168d6c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserAi.h
@@ -0,0 +1,38 @@
+// ======================================================================
+//
+// ConsoleCommandParserAi.h
+// Copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserAi_H
+#define INCLUDED_ConsoleCommandParserAi_H
+
+#include "sharedCommandParser/CommandParser.h"
+#include "sharedFoundation/DynamicVariableList.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to objvars
+*/
+
+class ConsoleCommandParserAi : public CommandParser
+{
+public:
+
+	ConsoleCommandParserAi();
+	virtual bool performParsing(const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node);
+	
+private:
+
+	ConsoleCommandParserAi(const ConsoleCommandParserAi & rhs);
+	ConsoleCommandParserAi & operator =(const ConsoleCommandParserAi & rhs);
+	
+	int getArgumentType(const Unicode::NarrowString &arg) const;
+	void listObjvars(const DynamicVariableList::NestedList &objvarList, String_t &result, int tabCount, bool withPackingData);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserAi_H
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCity.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCity.cpp
new file mode 100644
index 00000000..7b4af2ef
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCity.cpp
@@ -0,0 +1,643 @@
+// ======================================================================
+//
+// ConsoleCommandParserCity.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserCity.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/CitizenInfo.h"
+#include "serverGame/CityInfo.h"
+#include "serverGame/CityInterface.h"
+#include "serverGame/CityStructureInfo.h"
+#include "serverGame/GameServer.h"
+#include "sharedFoundation/CalendarTime.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedGame/PvpData.h"
+
+// ======================================================================
+
+namespace ConsoleCommandParserCityNamespace
+{
+	std::string const getCityPermissionsText(int permissions);
+	std::string const getStructureTypeText(int type);
+	std::string const getFactionString(uint32 factionId);
+}
+using namespace ConsoleCommandParserCityNamespace;
+
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"listById",                          0, "", "List all cities by city id."},
+	{"listByName",                        0, "", "List all cities by city name."},
+	{"listByRank",                        0, "", "List all cities by city rank."},
+	{"listByPlanet",                      0, "", "List all cities by planet."},
+	{"listByCitizenCount",                0, "", "List all cities by citizen count."},
+	{"listByStructureCount",              0, "", "List all cities by structure count."},
+	{"listByCreationTime",                0, "", "List all cities by city creation time."},
+	{"listCitiesWithIllegalShuttleport",  0, "", "List all cities that are not rank 4 or 5 that have a shuttleport."},
+	{"showCityGcwRegionDefender",         0, "", "Display GCW region defender data for cities."},
+	{"showCityDetails",                   1, "<city id>", "Display city details for a city."},
+	{"setCityCreationTime",               7, "<city id> <yyyy> <mm> <dd> <h> <m> <s>", "Sets a city's creation time."},
+#ifdef _DEBUG
+	{"showCityRetroactiveCreationTime",   2, "<city id> <cluster>", "Show the retroactive city creation time for the specified city on the specified cluster."},
+#else
+	{"showCityRetroactiveCreationTime",   1, "<city id>", "Show the retroactive city creation time for the specified city."},
+#endif
+	{"",                                  0, "", ""} // this must be last
+};
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserCity::ConsoleCommandParserCity (void) :
+CommandParser ("city", 0, "...", "City related commands.", 0)
+{
+	createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------
+
+bool ConsoleCommandParserCity::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+	NOT_NULL (node);
+	UNREF (userId);
+
+	UNREF(originalCommand);
+
+	//-----------------------------------------------------------------
+
+	if (isCommand(argv [0], "listById"))
+	{
+		std::map<int, CityInfo> const & allCities = CityInterface::getAllCityInfo();
+
+		std::multimap<int, std::string> cityInfo;
+		for (std::map<int, CityInfo>::const_iterator iter = allCities.begin(); iter != allCities.end(); ++iter)
+		{
+			CityInfo const & ci = iter->second;
+			if (ci.getCityName().empty())
+				continue;
+
+			CitizenInfo const * const mayor = CityInterface::getCitizenInfo(iter->first, ci.getLeaderId());
+			cityInfo.insert(std::make_pair(iter->first, std::string(FormattedString<2048>().sprintf("%d, %s, %s (%s), %s, %s (%d, %d), %dm, %lu (%s), %d, %d, %d (%s)\n", iter->first, ci.getCityName().c_str(), ci.getLeaderId().getValueString().c_str(), (mayor ? mayor->m_citizenName.c_str() : ""), ci.getCityHallId().getValueString().c_str(), ci.getPlanet().c_str(), ci.getX(), ci.getZ(), ci.getRadius(), ci.getFaction(), getFactionString(ci.getFaction()).c_str(), ci.getCitizenCount(), ci.getStructureCount(), ci.getCreationTime(), ((ci.getCreationTime() > 0) ? CalendarTime::convertEpochToTimeStringLocal(ci.getCreationTime()).c_str() : "N/A")))));
+		}
+
+		for (std::multimap<int, std::string>::const_iterator iter2 = cityInfo.begin(); iter2 != cityInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		result += Unicode::narrowToWide(FormattedString<2048>().sprintf("%d cities listed\n", cityInfo.size()));
+
+		if (!cityInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, mayor, cityHallId, location, radius, faction, number of citizens, number of structures, creationTime\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listByName"))
+	{
+		std::map<int, CityInfo> const & allCities = CityInterface::getAllCityInfo();
+
+		std::multimap<std::string, std::string> cityInfo;
+		for (std::map<int, CityInfo>::const_iterator iter = allCities.begin(); iter != allCities.end(); ++iter)
+		{
+			CityInfo const & ci = iter->second;
+			if (ci.getCityName().empty())
+				continue;
+
+			CitizenInfo const * const mayor = CityInterface::getCitizenInfo(iter->first, ci.getLeaderId());
+			cityInfo.insert(std::make_pair(ci.getCityName(), std::string(FormattedString<2048>().sprintf("%d, %s, %s (%s), %s, %s (%d, %d), %dm, %lu (%s), %d, %d, %d (%s)\n", iter->first, ci.getCityName().c_str(), ci.getLeaderId().getValueString().c_str(), (mayor ? mayor->m_citizenName.c_str() : ""), ci.getCityHallId().getValueString().c_str(), ci.getPlanet().c_str(), ci.getX(), ci.getZ(), ci.getRadius(), ci.getFaction(), getFactionString(ci.getFaction()).c_str(), ci.getCitizenCount(), ci.getStructureCount(), ci.getCreationTime(), ((ci.getCreationTime() > 0) ? CalendarTime::convertEpochToTimeStringLocal(ci.getCreationTime()).c_str() : "N/A")))));
+		}
+
+		for (std::multimap<std::string, std::string>::const_iterator iter2 = cityInfo.begin(); iter2 != cityInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		result += Unicode::narrowToWide(FormattedString<2048>().sprintf("%d cities listed\n", cityInfo.size()));
+
+		if (!cityInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, mayor, cityHallId, location, radius, faction, number of citizens, number of structures, creationTime\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listByRank"))
+	{
+		std::map<int, CityInfo> const & allCities = CityInterface::getAllCityInfo();
+
+		std::multimap<int, std::string> cityInfo;
+		for (std::map<int, CityInfo>::const_iterator iter = allCities.begin(); iter != allCities.end(); ++iter)
+		{
+			CityInfo const & ci = iter->second;
+			if (ci.getCityName().empty())
+				continue;
+
+			CitizenInfo const * const mayor = CityInterface::getCitizenInfo(iter->first, ci.getLeaderId());
+			cityInfo.insert(std::make_pair(-ci.getRadius(), std::string(FormattedString<2048>().sprintf("%d, %s, %s (%s), %s, %s (%d, %d), %dm, %lu (%s), %d, %d, %d (%s)\n", iter->first, ci.getCityName().c_str(), ci.getLeaderId().getValueString().c_str(), (mayor ? mayor->m_citizenName.c_str() : ""), ci.getCityHallId().getValueString().c_str(), ci.getPlanet().c_str(), ci.getX(), ci.getZ(), ci.getRadius(), ci.getFaction(), getFactionString(ci.getFaction()).c_str(), ci.getCitizenCount(), ci.getStructureCount(), ci.getCreationTime(), ((ci.getCreationTime() > 0) ? CalendarTime::convertEpochToTimeStringLocal(ci.getCreationTime()).c_str() : "N/A")))));
+		}
+
+		for (std::multimap<int, std::string>::const_iterator iter2 = cityInfo.begin(); iter2 != cityInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		result += Unicode::narrowToWide(FormattedString<2048>().sprintf("%d cities listed\n", cityInfo.size()));
+
+		if (!cityInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, mayor, cityHallId, location, radius, faction, number of citizens, number of structures, creationTime\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listByPlanet"))
+	{
+		std::map<int, CityInfo> const & allCities = CityInterface::getAllCityInfo();
+
+		std::multimap<std::string, std::string> cityInfo;
+		for (std::map<int, CityInfo>::const_iterator iter = allCities.begin(); iter != allCities.end(); ++iter)
+		{
+			CityInfo const & ci = iter->second;
+			if (ci.getCityName().empty())
+				continue;
+
+			CitizenInfo const * const mayor = CityInterface::getCitizenInfo(iter->first, ci.getLeaderId());
+			cityInfo.insert(std::make_pair(ci.getPlanet(), std::string(FormattedString<2048>().sprintf("%d, %s, %s (%s), %s, %s (%d, %d), %dm, %lu (%s), %d, %d, %d (%s)\n", iter->first, ci.getCityName().c_str(), ci.getLeaderId().getValueString().c_str(), (mayor ? mayor->m_citizenName.c_str() : ""), ci.getCityHallId().getValueString().c_str(), ci.getPlanet().c_str(), ci.getX(), ci.getZ(), ci.getRadius(), ci.getFaction(), getFactionString(ci.getFaction()).c_str(), ci.getCitizenCount(), ci.getStructureCount(), ci.getCreationTime(), ((ci.getCreationTime() > 0) ? CalendarTime::convertEpochToTimeStringLocal(ci.getCreationTime()).c_str() : "N/A")))));
+		}
+
+		for (std::multimap<std::string, std::string>::const_iterator iter2 = cityInfo.begin(); iter2 != cityInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		result += Unicode::narrowToWide(FormattedString<2048>().sprintf("%d cities listed\n", cityInfo.size()));
+
+		if (!cityInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, mayor, cityHallId, location, radius, faction, number of citizens, number of structures, creationTime\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listByCitizenCount"))
+	{
+		std::map<int, CityInfo> const & allCities = CityInterface::getAllCityInfo();
+
+		std::multimap<int, std::string> cityInfo;
+		for (std::map<int, CityInfo>::const_iterator iter = allCities.begin(); iter != allCities.end(); ++iter)
+		{
+			CityInfo const & ci = iter->second;
+			if (ci.getCityName().empty())
+				continue;
+
+			CitizenInfo const * const mayor = CityInterface::getCitizenInfo(iter->first, ci.getLeaderId());
+			cityInfo.insert(std::make_pair(-ci.getCitizenCount(), std::string(FormattedString<2048>().sprintf("%d, %s, %s (%s), %s, %s (%d, %d), %dm, %lu (%s), %d, %d, %d (%s)\n", iter->first, ci.getCityName().c_str(), ci.getLeaderId().getValueString().c_str(), (mayor ? mayor->m_citizenName.c_str() : ""), ci.getCityHallId().getValueString().c_str(), ci.getPlanet().c_str(), ci.getX(), ci.getZ(), ci.getRadius(), ci.getFaction(), getFactionString(ci.getFaction()).c_str(), ci.getCitizenCount(), ci.getStructureCount(), ci.getCreationTime(), ((ci.getCreationTime() > 0) ? CalendarTime::convertEpochToTimeStringLocal(ci.getCreationTime()).c_str() : "N/A")))));
+		}
+
+		for (std::multimap<int, std::string>::const_iterator iter2 = cityInfo.begin(); iter2 != cityInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		result += Unicode::narrowToWide(FormattedString<2048>().sprintf("%d cities listed\n", cityInfo.size()));
+
+		if (!cityInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, mayor, cityHallId, location, radius, faction, number of citizens, number of structures, creationTime\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listByStructureCount"))
+	{
+		std::map<int, CityInfo> const & allCities = CityInterface::getAllCityInfo();
+
+		std::multimap<int, std::string> cityInfo;
+		for (std::map<int, CityInfo>::const_iterator iter = allCities.begin(); iter != allCities.end(); ++iter)
+		{
+			CityInfo const & ci = iter->second;
+			if (ci.getCityName().empty())
+				continue;
+
+			CitizenInfo const * const mayor = CityInterface::getCitizenInfo(iter->first, ci.getLeaderId());
+			cityInfo.insert(std::make_pair(-ci.getStructureCount(), std::string(FormattedString<2048>().sprintf("%d, %s, %s (%s), %s, %s (%d, %d), %dm, %lu (%s), %d, %d, %d (%s)\n", iter->first, ci.getCityName().c_str(), ci.getLeaderId().getValueString().c_str(), (mayor ? mayor->m_citizenName.c_str() : ""), ci.getCityHallId().getValueString().c_str(), ci.getPlanet().c_str(), ci.getX(), ci.getZ(), ci.getRadius(), ci.getFaction(), getFactionString(ci.getFaction()).c_str(), ci.getCitizenCount(), ci.getStructureCount(), ci.getCreationTime(), ((ci.getCreationTime() > 0) ? CalendarTime::convertEpochToTimeStringLocal(ci.getCreationTime()).c_str() : "N/A")))));
+		}
+
+		for (std::multimap<int, std::string>::const_iterator iter2 = cityInfo.begin(); iter2 != cityInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		result += Unicode::narrowToWide(FormattedString<2048>().sprintf("%d cities listed\n", cityInfo.size()));
+
+		if (!cityInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, mayor, cityHallId, location, radius, faction, number of citizens, number of structures, creationTime\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listByCreationTime"))
+	{
+		std::map<int, CityInfo> const & allCities = CityInterface::getAllCityInfo();
+
+		std::multimap<int, std::string> cityInfo;
+		for (std::map<int, CityInfo>::const_iterator iter = allCities.begin(); iter != allCities.end(); ++iter)
+		{
+			CityInfo const & ci = iter->second;
+			if (ci.getCityName().empty())
+				continue;
+
+			CitizenInfo const * const mayor = CityInterface::getCitizenInfo(iter->first, ci.getLeaderId());
+			cityInfo.insert(std::make_pair(ci.getCreationTime(), std::string(FormattedString<2048>().sprintf("%d, %s, %s (%s), %s, %s (%d, %d), %dm, %lu (%s), %d, %d, %d (%s)\n", iter->first, ci.getCityName().c_str(), ci.getLeaderId().getValueString().c_str(), (mayor ? mayor->m_citizenName.c_str() : ""), ci.getCityHallId().getValueString().c_str(), ci.getPlanet().c_str(), ci.getX(), ci.getZ(), ci.getRadius(), ci.getFaction(), getFactionString(ci.getFaction()).c_str(), ci.getCitizenCount(), ci.getStructureCount(), ci.getCreationTime(), ((ci.getCreationTime() > 0) ? CalendarTime::convertEpochToTimeStringLocal(ci.getCreationTime()).c_str() : "N/A")))));
+		}
+
+		for (std::multimap<int, std::string>::const_iterator iter2 = cityInfo.begin(); iter2 != cityInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		result += Unicode::narrowToWide(FormattedString<2048>().sprintf("%d cities listed\n", cityInfo.size()));
+
+		if (!cityInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, mayor, cityHallId, location, radius, faction, number of citizens, number of structures, creationTime\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listCitiesWithIllegalShuttleport"))
+	{
+		std::map<int, CityInfo> const & allCities = CityInterface::getAllCityInfo();
+
+		std::multimap<int, std::string> cityInfo;
+		for (std::map<int, CityInfo>::const_iterator iter = allCities.begin(); iter != allCities.end(); ++iter)
+		{
+			CityInfo const & ci = iter->second;
+			if (ci.getCityName().empty())
+				continue;
+
+			if (ci.getRadius() >= 400)
+				continue;
+
+			if (ci.getTravelCost() > 0)
+			{
+				CitizenInfo const * const mayor = CityInterface::getCitizenInfo(iter->first, ci.getLeaderId());
+				cityInfo.insert(std::make_pair(iter->first, std::string(FormattedString<2048>().sprintf("%d, %s, %s (%s), %s, %s (%d, %d), %dm, %lu (%s), %d, %d, %d (%s)\n", iter->first, ci.getCityName().c_str(), ci.getLeaderId().getValueString().c_str(), (mayor ? mayor->m_citizenName.c_str() : ""), ci.getCityHallId().getValueString().c_str(), ci.getPlanet().c_str(), ci.getX(), ci.getZ(), ci.getRadius(), ci.getFaction(), getFactionString(ci.getFaction()).c_str(), ci.getCitizenCount(), ci.getStructureCount(), ci.getCreationTime(), ((ci.getCreationTime() > 0) ? CalendarTime::convertEpochToTimeStringLocal(ci.getCreationTime()).c_str() : "N/A")))));
+			}
+		}
+
+		for (std::multimap<int, std::string>::const_iterator iter2 = cityInfo.begin(); iter2 != cityInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		result += Unicode::narrowToWide(FormattedString<2048>().sprintf("%d cities with illegal shuttleport listed\n", cityInfo.size()));
+
+		if (!cityInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, mayor, cityHallId, location, radius, faction, number of citizens, number of structures, creationTime\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "showCityGcwRegionDefender"))
+	{
+		result += Unicode::narrowToWide(FormattedString<2048>().sprintf("Version (%d)\n\n", CityInterface::getGcwRegionDefenderCitiesVersion()));
+
+		std::map<std::pair<std::string, int>, uint32> const & gcwRegionDefenderCities = CityInterface::getGcwRegionDefenderCities();
+		for (std::map<std::pair<std::string, int>, uint32>::const_iterator iterCity = gcwRegionDefenderCities.begin(); iterCity != gcwRegionDefenderCities.end(); ++iterCity)
+			result += Unicode::narrowToWide(FormattedString<2048>().sprintf("(%s) (%d, %s) (%lu) (%s)\n", iterCity->first.first.c_str(), iterCity->first.second, CityInterface::getCityInfo(iterCity->first.second).getCityName().c_str(), iterCity->second, getFactionString(iterCity->second).c_str()));
+
+		result += Unicode::narrowToWide("\n");
+
+		std::map<std::string, std::pair<int, int> > const & gcwRegionDefenderCitiesCount = CityInterface::getGcwRegionDefenderCitiesCount();
+		for (std::map<std::string, std::pair<int, int> >::const_iterator iterCount = gcwRegionDefenderCitiesCount.begin(); iterCount != gcwRegionDefenderCitiesCount.end(); ++iterCount)
+			result += Unicode::narrowToWide(FormattedString<2048>().sprintf("(%s) (Imperial=%d) (Rebel=%d)\n", iterCount->first.c_str(), iterCount->second.first, iterCount->second.second));
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "showCityDetails"))
+	{
+		int const cityId = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+		CityInfo const & ci = CityInterface::getCityInfo(cityId);
+
+		if (ci.getCityName().empty())
+		{
+			result += Unicode::narrowToWide(FormattedString<2048>().sprintf("no city with city id %d\n", cityId));
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else
+		{
+			// id
+			result += Unicode::narrowToWide(FormattedString<2048>().sprintf("id: %d\n", cityId));
+
+			// name
+			result += Unicode::narrowToWide(FormattedString<2048>().sprintf("name: %s\n", ci.getCityName().c_str()));
+
+			// mayor
+			CitizenInfo const * const mayor = CityInterface::getCitizenInfo(cityId, ci.getLeaderId());
+			result += Unicode::narrowToWide(FormattedString<2048>().sprintf("mayor: %s (%s)\n", ci.getLeaderId().getValueString().c_str(), (mayor ? mayor->m_citizenName.c_str() : "")));
+
+			// cityHallId
+			result += Unicode::narrowToWide(FormattedString<2048>().sprintf("city hall id: %s\n", ci.getCityHallId().getValueString().c_str()));
+
+			// location
+			result += Unicode::narrowToWide(FormattedString<2048>().sprintf("location: %s (%d, %d)\n", ci.getPlanet().c_str(), ci.getX(), ci.getZ()));
+
+			// radius
+			result += Unicode::narrowToWide(FormattedString<2048>().sprintf("radius: %dm\n", ci.getRadius()));
+
+			// faction
+			result += Unicode::narrowToWide(FormattedString<2048>().sprintf("faction: %lu (%s)\n", ci.getFaction(), getFactionString(ci.getFaction()).c_str()));
+
+			// GCW region defender
+			if (ci.getGcwDefenderRegion().empty())
+				result += Unicode::narrowToWide("GCW defender region: (NONE)\n");
+			else
+				result += Unicode::narrowToWide(FormattedString<2048>().sprintf("GCW defender region: %s [joined at %d (%s)]\n", ci.getGcwDefenderRegion().c_str(), ci.getTimeJoinedGcwDefenderRegion(), CalendarTime::convertEpochToTimeStringLocal(static_cast<time_t>(ci.getTimeJoinedGcwDefenderRegion())).c_str()));
+
+			// creationTime
+			result += Unicode::narrowToWide(FormattedString<2048>().sprintf("creation time: %d (%s)\n", ci.getCreationTime(), ((ci.getCreationTime() > 0) ? CalendarTime::convertEpochToTimeStringLocal(ci.getCreationTime()).c_str() : "N/A")));
+
+			// taxes
+			result += Unicode::narrowToWide(FormattedString<2048>().sprintf("taxes: income %d, property %d, sales %d\n", ci.getIncomeTax(), ci.getPropertyTax(), ci.getSalesTax()));
+
+			// travel
+			result += Unicode::narrowToWide(FormattedString<2048>().sprintf("travel: location (%.2f, %.2f, %.2f), cost %d, interplanetary %s\n", ci.getTravelLoc().x, ci.getTravelLoc().y, ci.getTravelLoc().z, ci.getTravelCost(), (ci.getTravelInterplanetary() ? "yes" : "no")));
+
+			// clone
+			result += Unicode::narrowToWide(FormattedString<2048>().sprintf("clone: cloner id %s, cloner location (%.2f, %.2f, %.2f), clone respawn location (%.2f, %.2f, %.2f), clone respawn cell %s\n", ci.getCloneId().getValueString().c_str(), ci.getCloneLoc().x, ci.getCloneLoc().y, ci.getCloneLoc().z, ci.getCloneRespawn().x, ci.getCloneRespawn().y, ci.getCloneRespawn().z, ci.getCloneRespawnCell().getValueString().c_str()));
+
+			// citizens
+			result += Unicode::narrowToWide("\nCitizens:\n");
+
+			std::map<std::pair<int, NetworkId>, CitizenInfo> const & allCitizens = CityInterface::getAllCitizensInfo();
+			std::string citizenRankInfo;
+			int citizenCount = 0;
+			for (std::map<std::pair<int, NetworkId>, CitizenInfo>::const_iterator iterCitizen = allCitizens.lower_bound(std::make_pair(cityId, NetworkId::cms_invalid)); iterCitizen != allCitizens.end(); ++iterCitizen)
+			{
+				if (iterCitizen->first.first != cityId)
+					break;
+
+				++citizenCount;
+
+				// citizen rank
+				iterCitizen->second.m_citizenRank.getAsDbTextString(citizenRankInfo);
+				citizenRankInfo += " (";
+
+				std::vector<std::string> ranks;
+				CityInterface::getCitizenRank(cityId, iterCitizen->first.second, ranks);
+				for (std::vector<std::string>::const_iterator iterRank = ranks.begin(); iterRank != ranks.end(); ++iterRank)
+				{
+					if (iterRank != ranks.begin())
+						citizenRankInfo += ", ";
+
+					citizenRankInfo += *iterRank;
+				}
+
+				citizenRankInfo += ")";
+
+				result += Unicode::narrowToWide(FormattedString<2048>().sprintf("%s, %s, %s, %d, %d (%s), %s, %s, %s\n", iterCitizen->first.second.getValueString().c_str(), iterCitizen->second.m_citizenName.c_str(), iterCitizen->second.m_citizenProfessionSkillTemplate.c_str(), iterCitizen->second.m_citizenLevel, iterCitizen->second.m_citizenPermissions, getCityPermissionsText(iterCitizen->second.m_citizenPermissions).c_str(), citizenRankInfo.c_str(), iterCitizen->second.m_citizenTitle.c_str(), iterCitizen->second.m_citizenAllegiance.getValueString().c_str()));
+			}
+
+			result += Unicode::narrowToWide(FormattedString<2048>().sprintf("%d citizens listed\n", citizenCount));
+
+			if (citizenCount > 0)
+				result += Unicode::narrowToWide("Output format is: \"id, name, profession, level, permissions, rank, title, allegiance\"\n");
+
+			// structures
+			result += Unicode::narrowToWide("\nStructures:\n");
+
+			std::map<std::pair<int, NetworkId>, CityStructureInfo> const & allStructures = CityInterface::getAllCityStructuresInfo();
+			int structureCount = 0;
+			for (std::map<std::pair<int, NetworkId>, CityStructureInfo>::const_iterator iterStructure = allStructures.lower_bound(std::make_pair(cityId, NetworkId::cms_invalid)); iterStructure != allStructures.end(); ++iterStructure)
+			{
+				if (iterStructure->first.first != cityId)
+					break;
+
+				++structureCount;
+
+				result += Unicode::narrowToWide(FormattedString<2048>().sprintf("%s, %s, %d (%s)\n", iterStructure->first.second.getValueString().c_str(), (iterStructure->second.getStructureValid() ? "valid" : "no valid"), iterStructure->second.getStructureType(), getStructureTypeText(iterStructure->second.getStructureType()).c_str()));
+			}
+
+			result += Unicode::narrowToWide(FormattedString<2048>().sprintf("%d structures listed\n", structureCount));
+
+			if (structureCount > 0)
+				result += Unicode::narrowToWide("Output format is: \"id, valid, type\"\n");
+
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+	}
+	else if (isCommand(argv [0], "setCityCreationTime"))
+	{
+		int const cityId = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+		CityInfo const & ci = CityInterface::getCityInfo(cityId);
+
+		if (ci.getCityName().empty())
+		{
+			result += Unicode::narrowToWide(FormattedString<2048>().sprintf("no city with city id %d\n", cityId));
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else
+		{
+			time_t const rawtime = ::time(NULL);
+			struct tm * timeinfo = ::localtime(&rawtime);
+			timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1900;
+			timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[3]).c_str()) - 1;
+			timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+			timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+			timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+			timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[7]).c_str());
+			time_t const specifiedTime = ::mktime(timeinfo);
+
+			if (specifiedTime <= 0)
+			{
+				result += Unicode::narrowToWide("specified time is invalid\n");
+				result += getErrorMessage(argv[0], ERR_FAIL);
+			}
+			else
+			{
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("setting city creation time for city %d (%s):\n", cityId, ci.getCityName().c_str()));
+
+				if (ci.getCreationTime() <= 0)
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("***FROM*** %d (N/A)\n", ci.getCreationTime()));
+				else
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("***FROM*** %d (%s, %s)\n", ci.getCreationTime(), CalendarTime::convertEpochToTimeStringLocal(ci.getCreationTime()).c_str(), CalendarTime::convertEpochToTimeStringGMT(ci.getCreationTime()).c_str()));
+
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("****TO**** %ld (%s, %s)\n", static_cast<long>(specifiedTime), CalendarTime::convertEpochToTimeStringLocal(specifiedTime).c_str(), CalendarTime::convertEpochToTimeStringGMT(specifiedTime).c_str()));
+
+				CityInterface::setCityCreationTime(cityId, static_cast<int>(specifiedTime));
+
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+			}
+		}
+	}
+	else if (isCommand(argv [0], "showCityRetroactiveCreationTime"))
+	{
+		int const cityId = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+
+#ifdef _DEBUG
+		std::string const clusterName = Unicode::wideToNarrow(argv[2]);
+#else
+		std::string const clusterName = GameServer::getInstance().getClusterName();
+#endif
+
+		time_t const retroactiveCreationTime = GameServer::getRetroactivePlayerCityCreationTime(clusterName, cityId);
+
+		if (retroactiveCreationTime <= 0)
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("no retroactive creation time for player city (%s, %d)\n", clusterName.c_str(), cityId));
+		else
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("retroactive creation time for player city (%s, %d) is %ld, %s\n", clusterName.c_str(), cityId, retroactiveCreationTime, CalendarTime::convertEpochToTimeStringLocal(retroactiveCreationTime).c_str()));
+	}
+
+	return true;
+}	// ConsoleCommandParserCity::performParsing
+
+// ----------------------------------------------------------------------
+
+std::string const ConsoleCommandParserCityNamespace::getCityPermissionsText(int permissions)
+{
+	std::string result;
+	if (permissions == static_cast<int>(CitizenPermissions::Citizen))
+	{
+		result = "Citizen";
+	}
+	else
+	{
+		if (permissions & static_cast<int>(CitizenPermissions::Militia))
+			result += "Militia ";
+
+		if (permissions & static_cast<int>(CitizenPermissions::AbsentWeek1))
+			result += "AbsentWeek1 ";
+
+		if (permissions & static_cast<int>(CitizenPermissions::AbsentWeek2))
+			result += "AbsentWeek2 ";
+
+		if (permissions & static_cast<int>(CitizenPermissions::AbsentWeek3))
+			result += "AbsentWeek3 ";
+
+		if (permissions & static_cast<int>(CitizenPermissions::AbsentWeek4))
+			result += "AbsentWeek4 ";
+
+		if (permissions & static_cast<int>(CitizenPermissions::AbsentWeek5))
+			result += "AbsentWeek5 ";
+
+		if (permissions & static_cast<int>(CitizenPermissions::InactiveProtected))
+			result += "InactiveProtected ";
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const ConsoleCommandParserCityNamespace::getStructureTypeText(int type)
+{
+	// from city.scriptlib
+
+	// Structure Flags
+	static const int			SF_PM_REGISTER					= 1;
+	static const int			SF_COST_CITY_HALL				= 2;	// 5000 (datatable entry 1)
+	static const int			SF_COST_CITY_HI					= 4;	// 1000
+	static const int			SF_COST_CITY_MED				= 8;	// 500
+	static const int			SF_COST_CITY_LOW				= 16;	// 250  (datatable entry 4)
+	static const int			SF_MISSION_TERMINAL				= 32;
+	static const int			SF_SKILL_TRAINER				= 64;
+	static const int			SF_DECORATION					= 128;
+
+	// BEGIN: City Hall ONLY flags.
+	// Must be synchronized with datatables/city/specializations.iff
+	static const int			SF_SPEC_SAMPLE_RICH				= 256;		/*Sample Rich*/
+	static const int			SF_SPEC_FARMING					= 512; 		/*removed*/
+	static const int			SF_SPEC_INDUSTRY				= 1024;		/*Manufacturing Center*/
+	static const int			SF_SPEC_RESEARCH				= 2048;		/*Research Center*/
+	static const int			SF_SPEC_CLONING					= 4096;		/*Clone Lab*/
+	static const int			SF_SPEC_MISSIONS				= 8192;		/*Improved Job Market*/	
+	static const int			SF_SPEC_ENTERTAINER				= 16384;	/*Entertainment Districtu*/
+	static const int			SF_SPEC_DOCTOR					= 32768; 	/*removed*/
+	static const int			SF_SPEC_STRONGHOLD				= 65536; 	/*removed*/
+	static const int			SF_SPEC_MASTER_MANUFACTURING	= 131072; 	/*removed*/
+	static const int			SF_SPEC_MASTER_HEALING			= 262144; 	/*removed*/
+	static const int			SF_SPEC_DECOR_INCREASE			= 524288; 	/*Outdoor Enhancements*/
+	static const int			SF_SPEC_STORYTELLER				= 1048576;	/*Encore Performance*/
+	static const int			SF_SPEC_INCUBATOR				= 2097152;	/*incubation-BMs*/
+	static const int			SF_SPEC_UNKNOWN_6				= 4194304;
+	static const int			SF_REQUIRE_ZONE_RIGHTS				= 8388608;
+	// END: City Hall ONLY flags.
+
+	static const int			SF_COST_CITY_GARDEN_SMALL		= 16777216;
+	static const int			SF_COST_CITY_GARDEN_LARGE		= 33554432;
+
+	std::string result;
+
+	if (type & SF_PM_REGISTER)
+		result += "SF_PM_REGISTER ";
+
+	if (type & SF_COST_CITY_HALL)
+		result += "SF_COST_CITY_HALL ";
+
+	if (type & SF_COST_CITY_HI)
+		result += "SF_COST_CITY_HI ";
+
+	if (type & SF_COST_CITY_MED)
+		result += "SF_COST_CITY_MED ";
+
+	if (type & SF_COST_CITY_LOW)
+		result += "SF_COST_CITY_LOW ";
+
+	if (type & SF_MISSION_TERMINAL)
+		result += "SF_MISSION_TERMINAL ";
+
+	if (type & SF_SKILL_TRAINER)
+		result += "SF_SKILL_TRAINER ";
+
+	if (type & SF_DECORATION)
+		result += "SF_DECORATION ";
+
+	if (type & SF_SPEC_SAMPLE_RICH)
+		result += "SF_SPEC_SAMPLE_RICH ";
+
+	if (type & SF_SPEC_FARMING)
+		result += "SF_SPEC_FARMING ";
+
+	if (type & SF_SPEC_INDUSTRY)
+		result += "SF_SPEC_INDUSTRY ";
+
+	if (type & SF_SPEC_RESEARCH)
+		result += "SF_SPEC_RESEARCH ";
+
+	if (type & SF_SPEC_CLONING)
+		result += "SF_SPEC_CLONING ";
+
+	if (type & SF_SPEC_MISSIONS)
+		result += "SF_SPEC_MISSIONS ";
+
+	if (type & SF_SPEC_ENTERTAINER)
+		result += "SF_SPEC_ENTERTAINER ";
+
+	if (type & SF_SPEC_DOCTOR)
+		result += "SF_SPEC_DOCTOR ";
+
+	if (type & SF_SPEC_STRONGHOLD)
+		result += "SF_SPEC_STRONGHOLD ";
+
+	if (type & SF_SPEC_MASTER_MANUFACTURING)
+		result += "SF_SPEC_MASTER_MANUFACTURING ";
+
+	if (type & SF_SPEC_MASTER_HEALING)
+		result += "SF_SPEC_MASTER_HEALING ";
+
+	if (type & SF_SPEC_DECOR_INCREASE)
+		result += "SF_SPEC_DECOR_INCREASE ";
+
+	if (type & SF_SPEC_STORYTELLER)
+		result += "SF_SPEC_STORYTELLER ";
+
+	if (type & SF_SPEC_INCUBATOR)
+		result += "SF_SPEC_INCUBATOR ";
+
+	if (type & SF_SPEC_UNKNOWN_6)
+		result += "SF_SPEC_UNKNOWN_6 ";
+
+	if (type & SF_REQUIRE_ZONE_RIGHTS)
+		result += "SF_REQUIRE_ZONE_RIGHTS ";
+
+	if (type & SF_COST_CITY_GARDEN_SMALL)
+		result += "SF_COST_CITY_GARDEN_SMALL ";
+
+	if (type & SF_COST_CITY_GARDEN_LARGE)
+		result += "SF_COST_CITY_GARDEN_LARGE ";
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const ConsoleCommandParserCityNamespace::getFactionString(uint32 factionId)
+{
+	if (PvpData::isNeutralFactionId(factionId))
+		return "Neutral";
+	else if (PvpData::isImperialFactionId(factionId))
+		return "Imperial";
+	else if (PvpData::isRebelFactionId(factionId))
+		return "Rebel";
+
+	return "Unknown";
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCity.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCity.h
new file mode 100644
index 00000000..8c8a9218
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCity.h
@@ -0,0 +1,32 @@
+// ======================================================================
+//
+// ConsoleCommandParserCity.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserCity_H
+#define INCLUDED_ConsoleCommandParserCity_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to the city system.
+*/
+
+class ConsoleCommandParserCity : public CommandParser
+{
+public:
+	                          ConsoleCommandParserCity ();
+	virtual bool              performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node);
+	
+private:
+	                          ConsoleCommandParserCity (const ConsoleCommandParserCity & rhs);
+	ConsoleCommandParserCity & operator= (const ConsoleCommandParserCity & rhs);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserCity_H
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCollection.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCollection.cpp
new file mode 100644
index 00000000..442bc622
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCollection.cpp
@@ -0,0 +1,885 @@
+// ======================================================================
+//
+// ConsoleCommandParserCollection.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserCollection.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedFoundation/CalendarTime.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/NetworkId.h"
+
+// ======================================================================
+ 
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"adjustSlotValue",                 3, "<oid> <slot name> <adjustment>",      "Modify the value of a collection slot by the specified adjustment value"},
+	{"grantAllSlotsForCollection",      2, "<oid> <collection name>",             "Mark all the collection slots in the specified collection as completed"},
+	{"grantAllSlotsForPage",            2, "<oid> <page name>",                   "Mark all the collection slots in the specified page as completed"},
+	{"grantAllSlotsForBook",            2, "<oid> <book name>",                   "Mark all the collection slots in the specified book as completed"},
+	{"revokeAllSlotsForCollection",     2, "<oid> <collection name>",             "Mark all the collection slots in the specified collection as not completed"},
+	{"revokeAllSlotsForPage",           2, "<oid> <page name>",                   "Mark all the collection slots in the specified page as not completed"},
+	{"revokeAllSlotsForBook",           2, "<oid> <book name>",                   "Mark all the collection slots in the specified book as not completed"},
+	{"displayCollections",              1, "<oid>",                               "Display collections for specified character"},
+	{"displayServerFirst",              0, "",                                    "Display collections \"server first\" information"},
+	{"addServerFirst",                  2, "<oid> <collection name>",             "Make the specified character \"server first\" for the collection"},
+	{"setServerFirstTime",              7, "<collection name> <yyyy> <mm> <dd> <h> <m> <s>", "Set the \"server first\" completion time for the collection"},
+	{"removeServerFirst",               1, "<collection name>",                   "Remove \"server first\" for the collection"},
+	{"",                                0, "", ""} // this must be last
+};
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserCollection::ConsoleCommandParserCollection (void) :
+CommandParser ("collection", 0, "...", "Collection related commands.", 0)
+{
+	createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------
+
+bool ConsoleCommandParserCollection::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+	NOT_NULL (node);
+	UNREF (userId);
+
+	UNREF(originalCommand);
+
+	// ----------------------------------------------------------------------
+
+	if (isCommand (argv [0], "adjustSlotValue"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject * c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		CollectionsDataTable::CollectionInfoSlot const * slot = CollectionsDataTable::getSlotByName(Unicode::wideToNarrow(argv[2]));
+		if (!slot)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a valid collection slot name\n", Unicode::wideToNarrow(argv[2]).c_str()));
+			return true;
+		}
+
+		// quickie way to convert to an int64
+		NetworkId const adjustment(Unicode::wideToNarrow(argv[3]));
+
+		// adjustment value of 0 means leave it alone
+		if (adjustment.getValue() == 0)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("adjustment value is 0, so will ***NOT*** adjust collection slot %s/%s/%s/%s for character object %s (%s)\n", slot->collection.page.book.name.c_str(), slot->collection.page.name.c_str(), slot->collection.name.c_str(), Unicode::wideToNarrow(argv[2]).c_str(), oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+			return true;
+		}
+
+		// bit-type slot
+		if (!slot->counterTypeSlot)
+		{
+			// set bit-type slot
+			if (adjustment.getValue() > 0)
+			{
+				if (p->hasCompletedCollectionSlot(*slot))
+				{
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("character object %s (%s) already has collection slot %s/%s/%s/%s\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), slot->collection.page.book.name.c_str(), slot->collection.page.name.c_str(), slot->collection.name.c_str(), Unicode::wideToNarrow(argv[2]).c_str()));
+					return true;
+				}
+
+				std::vector<CollectionsDataTable::CollectionInfoSlot const *> missingPrereqs;
+				if (!p->hasCompletedCollectionSlotPrereq(Unicode::wideToNarrow(argv[2]), &missingPrereqs))
+				{
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("cannot set collection slot %s/%s/%s/%s for character object %s (%s) because the following prerequisite collection slot(s) are not yet completed:\n", slot->collection.page.book.name.c_str(), slot->collection.page.name.c_str(), slot->collection.name.c_str(), Unicode::wideToNarrow(argv[2]).c_str(), oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+
+					for (std::vector<CollectionsDataTable::CollectionInfoSlot const *>::const_iterator iter = missingPrereqs.begin(); iter != missingPrereqs.end(); ++iter)
+						result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s/%s/%s/%s\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str()));
+
+					return true;
+				}
+
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("setting collection slot %s/%s/%s/%s for character object %s (%s)\n", slot->collection.page.book.name.c_str(), slot->collection.page.name.c_str(), slot->collection.name.c_str(), Unicode::wideToNarrow(argv[2]).c_str(), oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+				p->modifyCollectionSlotValue(Unicode::wideToNarrow(argv[2]), 1);
+			}
+			// clear bit-type slot
+			else if (adjustment.getValue() < 0)
+			{
+				if (!p->hasCompletedCollectionSlot(*slot))
+				{
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("character object %s (%s) doesn't have collection slot %s/%s/%s/%s\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), slot->collection.page.book.name.c_str(), slot->collection.page.name.c_str(), slot->collection.name.c_str(), Unicode::wideToNarrow(argv[2]).c_str()));
+					return true;
+				}
+
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("removing collection slot %s/%s/%s/%s for character object %s (%s)\n", slot->collection.page.book.name.c_str(), slot->collection.page.name.c_str(), slot->collection.name.c_str(), Unicode::wideToNarrow(argv[2]).c_str(), oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+				p->modifyCollectionSlotValue(Unicode::wideToNarrow(argv[2]), -1);
+			}
+		}
+		// counter-type slot
+		else
+		{
+			if (adjustment.getValue() > 0)
+			{
+				std::vector<CollectionsDataTable::CollectionInfoSlot const *> missingPrereqs;
+				if (!p->hasCompletedCollectionSlotPrereq(Unicode::wideToNarrow(argv[2]), &missingPrereqs))
+				{
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("cannot modify collection slot %s/%s/%s/%s for character object %s (%s) because the following prerequisite collection slot(s) are not yet completed:\n", slot->collection.page.book.name.c_str(), slot->collection.page.name.c_str(), slot->collection.name.c_str(), Unicode::wideToNarrow(argv[2]).c_str(), oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+
+					for (std::vector<CollectionsDataTable::CollectionInfoSlot const *>::const_iterator iter = missingPrereqs.begin(); iter != missingPrereqs.end(); ++iter)
+						result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s/%s/%s/%s\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str()));
+
+					return true;
+				}
+			}
+
+			unsigned long currentValue;
+			IGNORE_RETURN(p->getCollectionSlotValue(*slot, currentValue));
+
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("modifying collection slot %s/%s/%s/%s value of %lu by %s for character object %s (%s)\n", slot->collection.page.book.name.c_str(), slot->collection.page.name.c_str(), slot->collection.name.c_str(), Unicode::wideToNarrow(argv[2]).c_str(), currentValue, adjustment.getValueString().c_str(), oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+			p->modifyCollectionSlotValue(Unicode::wideToNarrow(argv[2]), adjustment.getValue());
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "grantAllSlotsForCollection"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject * c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & slots = CollectionsDataTable::getSlotsInCollection(Unicode::wideToNarrow(argv[2]));
+		if (slots.empty())
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a valid collection name\n", Unicode::wideToNarrow(argv[2]).c_str()));
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("granting collection slot(s) in collection %s which character object %s (%s) hasn't already completed\n", Unicode::wideToNarrow(argv[2]).c_str(), oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+
+		for (std::vector<CollectionsDataTable::CollectionInfoSlot const *>::const_iterator iter = slots.begin(); iter != slots.end(); ++iter)
+		{
+			if (!p->hasCompletedCollectionSlot(**iter))
+			{
+				// don't do anything for counter-type slot that can never be completed
+				if ((*iter)->counterTypeSlot && ((*iter)->maxSlotValue == 0))
+				{
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("ignoring collection slot %s/%s/%s/%s because it can never be completed\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str()));
+					continue;
+				}
+
+				// don't do anything for slot that haven't met prerequisite
+				if (!p->hasCompletedCollectionSlotPrereq(**iter))
+				{
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("ignoring collection slot %s/%s/%s/%s because its prerequisite collection slot(s) are not yet completed\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str()));
+					continue;
+				}
+
+				if (!(*iter)->counterTypeSlot)
+				{
+					// grant bit type slot
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("setting collection slot %s/%s/%s/%s\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str()));
+					p->modifyCollectionSlotValue((*iter)->name, 1);
+				}
+				else
+				{
+					// grant counter-type slot
+					unsigned long currentValue;
+					IGNORE_RETURN(p->getCollectionSlotValue(**iter, currentValue));
+
+					// quickie way to convert to an int64
+					NetworkId const adjustment(static_cast<int64>((*iter)->maxSlotValue) - static_cast<int64>(currentValue));
+
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("modifying collection slot %s/%s/%s/%s value of %lu by %s\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str(), currentValue, adjustment.getValueString().c_str()));
+					p->modifyCollectionSlotValue((*iter)->name, adjustment.getValue());
+				}
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "grantAllSlotsForPage"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject * c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & slots = CollectionsDataTable::getSlotsInPage(Unicode::wideToNarrow(argv[2]));
+		if (slots.empty())
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a valid page name\n", Unicode::wideToNarrow(argv[2]).c_str()));
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("granting collection slot(s) in page %s which character object %s (%s) hasn't already completed\n", Unicode::wideToNarrow(argv[2]).c_str(), oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+
+		for (std::vector<CollectionsDataTable::CollectionInfoSlot const *>::const_iterator iter = slots.begin(); iter != slots.end(); ++iter)
+		{
+			if (!p->hasCompletedCollectionSlot(**iter))
+			{
+				// don't do anything for counter-type slot that can never be completed
+				if ((*iter)->counterTypeSlot && ((*iter)->maxSlotValue == 0))
+				{
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("ignoring collection slot %s/%s/%s/%s because it can never be completed\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str()));
+					continue;
+				}
+
+				// don't do anything for slot that haven't met prerequisite
+				if (!p->hasCompletedCollectionSlotPrereq(**iter))
+				{
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("ignoring collection slot %s/%s/%s/%s because its prerequisite collection slot(s) are not yet completed\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str()));
+					continue;
+				}
+
+				if (!(*iter)->counterTypeSlot)
+				{
+					// grant bit type slot
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("setting collection slot %s/%s/%s/%s\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str()));
+					p->modifyCollectionSlotValue((*iter)->name, 1);
+				}
+				else
+				{
+					// grant counter-type slot
+					unsigned long currentValue;
+					IGNORE_RETURN(p->getCollectionSlotValue(**iter, currentValue));
+
+					// quickie way to convert to an int64
+					NetworkId const adjustment(static_cast<int64>((*iter)->maxSlotValue) - static_cast<int64>(currentValue));
+
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("modifying collection slot %s/%s/%s/%s value of %lu by %s\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str(), currentValue, adjustment.getValueString().c_str()));
+					p->modifyCollectionSlotValue((*iter)->name, adjustment.getValue());
+				}
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "grantAllSlotsForBook"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject * c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & slots = CollectionsDataTable::getSlotsInBook(Unicode::wideToNarrow(argv[2]));
+		if (slots.empty())
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a valid book name\n", Unicode::wideToNarrow(argv[2]).c_str()));
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("granting collection slot(s) in book %s which character object %s (%s) hasn't already completed\n", Unicode::wideToNarrow(argv[2]).c_str(), oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+
+		for (std::vector<CollectionsDataTable::CollectionInfoSlot const *>::const_iterator iter = slots.begin(); iter != slots.end(); ++iter)
+		{
+			if (!p->hasCompletedCollectionSlot(**iter))
+			{
+				// don't do anything for counter-type slot that can never be completed
+				if ((*iter)->counterTypeSlot && ((*iter)->maxSlotValue == 0))
+				{
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("ignoring collection slot %s/%s/%s/%s because it can never be completed\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str()));
+					continue;
+				}
+
+				// don't do anything for slot that haven't met prerequisite
+				if (!p->hasCompletedCollectionSlotPrereq(**iter))
+				{
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("ignoring collection slot %s/%s/%s/%s because its prerequisite collection slot(s) are not yet completed\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str()));
+					continue;
+				}
+
+				if (!(*iter)->counterTypeSlot)
+				{
+					// grant bit type slot
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("setting collection slot %s/%s/%s/%s\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str()));
+					p->modifyCollectionSlotValue((*iter)->name, 1);
+				}
+				else
+				{
+					// grant counter-type slot
+					unsigned long currentValue;
+					IGNORE_RETURN(p->getCollectionSlotValue(**iter, currentValue));
+
+					// quickie way to convert to an int64
+					NetworkId const adjustment(static_cast<int64>((*iter)->maxSlotValue) - static_cast<int64>(currentValue));
+
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("modifying collection slot %s/%s/%s/%s value of %lu by %s\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str(), currentValue, adjustment.getValueString().c_str()));
+					p->modifyCollectionSlotValue((*iter)->name, adjustment.getValue());
+				}
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "revokeAllSlotsForCollection"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject * c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & slots = CollectionsDataTable::getSlotsInCollection(Unicode::wideToNarrow(argv[2]));
+		if (slots.empty())
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a valid collection name\n", Unicode::wideToNarrow(argv[2]).c_str()));
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("revoking collection slot(s) in collection %s which character object %s (%s) has already completed\n", Unicode::wideToNarrow(argv[2]).c_str(), oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+
+		for (std::vector<CollectionsDataTable::CollectionInfoSlot const *>::const_iterator iter = slots.begin(); iter != slots.end(); ++iter)
+		{
+			if (p->hasCompletedCollectionSlot(**iter))
+			{
+				if (!(*iter)->counterTypeSlot)
+				{
+					// revoke bit type slot
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("removing collection slot %s/%s/%s/%s\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str()));
+					p->modifyCollectionSlotValue((*iter)->name, -1);
+				}
+				else
+				{
+					// revoke counter-type slot
+					unsigned long currentValue;
+					IGNORE_RETURN(p->getCollectionSlotValue(**iter, currentValue));
+
+					// quickie way to convert to an int64
+					NetworkId const adjustment(-(static_cast<int64>(currentValue)));
+
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("modifying collection slot %s/%s/%s/%s value of %lu by %s\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str(), currentValue, adjustment.getValueString().c_str()));
+					p->modifyCollectionSlotValue((*iter)->name, adjustment.getValue());
+				}
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "revokeAllSlotsForPage"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject * c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & slots = CollectionsDataTable::getSlotsInPage(Unicode::wideToNarrow(argv[2]));
+		if (slots.empty())
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a valid page name\n", Unicode::wideToNarrow(argv[2]).c_str()));
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("revoking collection slot(s) in page %s which character object %s (%s) has already completed\n", Unicode::wideToNarrow(argv[2]).c_str(), oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+
+		for (std::vector<CollectionsDataTable::CollectionInfoSlot const *>::const_iterator iter = slots.begin(); iter != slots.end(); ++iter)
+		{
+			if (p->hasCompletedCollectionSlot(**iter))
+			{
+				if (!(*iter)->counterTypeSlot)
+				{
+					// revoke bit type slot
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("removing collection slot %s/%s/%s/%s\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str()));
+					p->modifyCollectionSlotValue((*iter)->name, -1);
+				}
+				else
+				{
+					// revoke counter-type slot
+					unsigned long currentValue;
+					IGNORE_RETURN(p->getCollectionSlotValue(**iter, currentValue));
+
+					// quickie way to convert to an int64
+					NetworkId const adjustment(-(static_cast<int64>(currentValue)));
+
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("modifying collection slot %s/%s/%s/%s value of %lu by %s\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str(), currentValue, adjustment.getValueString().c_str()));
+					p->modifyCollectionSlotValue((*iter)->name, adjustment.getValue());
+				}
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "revokeAllSlotsForBook"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject * c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & slots = CollectionsDataTable::getSlotsInBook(Unicode::wideToNarrow(argv[2]));
+		if (slots.empty())
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a valid book name\n", Unicode::wideToNarrow(argv[2]).c_str()));
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("revoking collection slot(s) in book %s which character object %s (%s) has already completed\n", Unicode::wideToNarrow(argv[2]).c_str(), oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+
+		for (std::vector<CollectionsDataTable::CollectionInfoSlot const *>::const_iterator iter = slots.begin(); iter != slots.end(); ++iter)
+		{
+			if (p->hasCompletedCollectionSlot(**iter))
+			{
+				if (!(*iter)->counterTypeSlot)
+				{
+					// revoke bit type slot
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("removing collection slot %s/%s/%s/%s\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str()));
+					p->modifyCollectionSlotValue((*iter)->name, -1);
+				}
+				else
+				{
+					// revoke counter-type slot
+					unsigned long currentValue;
+					IGNORE_RETURN(p->getCollectionSlotValue(**iter, currentValue));
+
+					// quickie way to convert to an int64
+					NetworkId const adjustment(-(static_cast<int64>(currentValue)));
+
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("modifying collection slot %s/%s/%s/%s value of %lu by %s\n", (*iter)->collection.page.book.name.c_str(), (*iter)->collection.page.name.c_str(), (*iter)->collection.name.c_str(), (*iter)->name.c_str(), currentValue, adjustment.getValueString().c_str()));
+					p->modifyCollectionSlotValue((*iter)->name, adjustment.getValue());
+				}
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "displayCollections"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject * c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Displaying collections for character object %s (%s)\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+
+		std::string slotInfo;
+		std::string collectionInfo;
+		std::string pageInfo;
+
+		std::vector<CollectionsDataTable::CollectionInfoBook const *> const & books = CollectionsDataTable::getAllBooks();
+		for (std::vector<CollectionsDataTable::CollectionInfoBook const *>::const_iterator iterBook = books.begin(); iterBook != books.end(); ++iterBook)
+		{
+			std::vector<CollectionsDataTable::CollectionInfoPage const *> const & pages = CollectionsDataTable::getPagesInBook((*iterBook)->name);
+			pageInfo.clear();
+			for (std::vector<CollectionsDataTable::CollectionInfoPage const *>::const_iterator iterPage = pages.begin(); iterPage != pages.end(); ++iterPage)
+			{
+				std::vector<CollectionsDataTable::CollectionInfoCollection const *> const & collections = CollectionsDataTable::getCollectionsInPage((*iterPage)->name);
+				collectionInfo.clear();
+				for (std::vector<CollectionsDataTable::CollectionInfoCollection const *>::const_iterator iterCollection = collections.begin(); iterCollection != collections.end(); ++iterCollection)
+				{
+					std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & slots = CollectionsDataTable::getSlotsInCollection((*iterCollection)->name);
+					slotInfo.clear();
+					for (std::vector<CollectionsDataTable::CollectionInfoSlot const *>::const_iterator iterSlot = slots.begin(); iterSlot != slots.end(); ++iterSlot)
+					{
+						if (!(*iterSlot)->counterTypeSlot)
+						{
+							if (p->hasCompletedCollectionSlot(**iterSlot))
+								slotInfo += FormattedString<512>().sprintf("            %s\n", (*iterSlot)->name.c_str());
+						}
+						else
+						{
+							unsigned long value;
+							IGNORE_RETURN(p->getCollectionSlotValue(**iterSlot, value));
+							if (value == 0)
+								continue;
+
+							if ((*iterSlot)->maxSlotValue == 0)
+								slotInfo += FormattedString<512>().sprintf("            %s (%lu)\n", (*iterSlot)->name.c_str(), value);
+							else
+								slotInfo += FormattedString<512>().sprintf("            %s (%lu/%lu)\n", (*iterSlot)->name.c_str(), value, (*iterSlot)->maxSlotValue);
+						}
+					}
+
+					if (!slotInfo.empty())
+					{
+						if (p->hasCompletedCollection((*iterCollection)->name))
+							collectionInfo += FormattedString<512>().sprintf("        *%s\n", (*iterCollection)->name.c_str());
+						else
+							collectionInfo += FormattedString<512>().sprintf("        %s\n", (*iterCollection)->name.c_str());
+
+						collectionInfo += slotInfo;
+					}
+				}
+
+				if (!collectionInfo.empty())
+				{
+					pageInfo += FormattedString<512>().sprintf("    %s\n", (*iterPage)->name.c_str());
+					pageInfo += collectionInfo;
+				}
+			}
+
+			if (!pageInfo.empty())
+			{
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s\n", (*iterBook)->name.c_str()));
+				result += Unicode::narrowToWide(pageInfo);
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "displayServerFirst"))
+	{
+		std::map<std::string, CollectionsDataTable::CollectionInfoCollection const *> const & allServerFirstCollections = CollectionsDataTable::getAllServerFirstCollections();
+		std::map<std::string, CollectionsDataTable::CollectionInfoCollection const *>::const_iterator iter;
+		int discovered = 0;
+
+		for (iter = allServerFirstCollections.begin(); iter != allServerFirstCollections.end(); ++iter)
+		{
+			if (iter->second->serverFirstClaimTime > 0)
+				++discovered;
+		}
+
+		int const undiscovered = allServerFirstCollections.size() - discovered;
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d Discovered:\n", discovered));
+		for (iter = allServerFirstCollections.begin(); iter != allServerFirstCollections.end(); ++iter)
+		{
+			if (iter->second->serverFirstClaimTime > 0)
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s discovered by (%s, %s) at %ld (%s)\n", iter->second->name.c_str(), iter->second->serverFirstClaimantId.getValueString().c_str(), Unicode::wideToNarrow(iter->second->serverFirstClaimantName).c_str(), iter->second->serverFirstClaimTime, CalendarTime::convertEpochToTimeStringLocal(iter->second->serverFirstClaimTime).c_str()));
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d Undiscovered:\n", undiscovered));
+		for (iter = allServerFirstCollections.begin(); iter != allServerFirstCollections.end(); ++iter)
+		{
+			if (iter->second->serverFirstClaimTime <= 0)
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s\n", iter->second->name.c_str()));
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "addServerFirst"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject * c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		CollectionsDataTable::CollectionInfoCollection const * const collectionInfo = CollectionsDataTable::getCollectionByName(Unicode::wideToNarrow(argv[2]));
+		if (!collectionInfo)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a valid collection name\n", Unicode::wideToNarrow(argv[2]).c_str()));
+			return true;
+		}
+
+		if (!collectionInfo->trackServerFirst)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a \"server first\" tracked collection\n", Unicode::wideToNarrow(argv[2]).c_str()));
+			return true;
+		}
+
+		if (collectionInfo->serverFirstClaimTime > 0)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s has already been discovered by (%s, %s) at %ld (%s)\n", Unicode::wideToNarrow(argv[2]).c_str(), collectionInfo->serverFirstClaimantId.getValueString().c_str(), Unicode::wideToNarrow(collectionInfo->serverFirstClaimantName).c_str(), collectionInfo->serverFirstClaimTime, CalendarTime::convertEpochToTimeStringLocal(collectionInfo->serverFirstClaimTime).c_str()));
+			return true;
+		}
+
+		PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+		if (!planetObject)
+		{
+			result += Unicode::narrowToWide("could not locate the tatooine PlanetObject\n");
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("requesting character object %s (%s) be made \"server first\" for collection %s\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), Unicode::wideToNarrow(argv[2]).c_str()));
+		
+		planetObject->setCollectionServerFirst(*collectionInfo, oid, o->getAssignedObjectName(), p->getAccountDescription());
+		
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "setServerFirstTime"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[3]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[7]).c_str());
+		time_t const specifiedTime = ::mktime(timeinfo);
+
+		if (specifiedTime <= 0)
+		{
+			result += Unicode::narrowToWide("specified time is invalid\n");
+			return true;
+		}
+
+		CollectionsDataTable::CollectionInfoCollection const * const collectionInfo = CollectionsDataTable::getCollectionByName(Unicode::wideToNarrow(argv[1]));
+		if (!collectionInfo)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a valid collection name\n", Unicode::wideToNarrow(argv[1]).c_str()));
+			return true;
+		}
+
+		if (!collectionInfo->trackServerFirst)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a \"server first\" tracked collection\n", collectionInfo->name.c_str()));
+			return true;
+		}
+
+		if (collectionInfo->serverFirstClaimTime <= 0)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("collection %s has not yet been discovered\n", collectionInfo->name.c_str()));
+			return true;
+		}
+
+		PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+		if (!planetObject)
+		{
+			result += Unicode::narrowToWide("could not locate the tatooine PlanetObject\n");
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("setting \"server first\" time for collection %s:\n", collectionInfo->name.c_str()));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("***FROM*** %ld (%s, %s)\n", static_cast<long>(collectionInfo->serverFirstClaimTime), CalendarTime::convertEpochToTimeStringLocal(collectionInfo->serverFirstClaimTime).c_str(), CalendarTime::convertEpochToTimeStringGMT(collectionInfo->serverFirstClaimTime).c_str()));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("****TO**** %ld (%s, %s)\n", static_cast<long>(specifiedTime), CalendarTime::convertEpochToTimeStringLocal(specifiedTime).c_str(), CalendarTime::convertEpochToTimeStringGMT(specifiedTime).c_str()));
+
+		char buffer[1024];
+		snprintf(buffer, sizeof(buffer)-1, "%s|%ld", collectionInfo->name.c_str(), static_cast<long>(specifiedTime));
+		buffer[sizeof(buffer)-1] = '\0';
+
+		MessageToQueue::getInstance().sendMessageToC(planetObject->getNetworkId(),
+			"C++SetCollectionServerFirstTime",
+			buffer,
+			0,
+			false);
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "removeServerFirst"))
+	{
+		CollectionsDataTable::CollectionInfoCollection const * const collectionInfo = CollectionsDataTable::getCollectionByName(Unicode::wideToNarrow(argv[1]));
+		if (!collectionInfo)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a valid collection name\n", Unicode::wideToNarrow(argv[1]).c_str()));
+			return true;
+		}
+
+		if (!collectionInfo->trackServerFirst)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a \"server first\" tracked collection\n", Unicode::wideToNarrow(argv[1]).c_str()));
+			return true;
+		}
+
+		if (collectionInfo->serverFirstClaimTime <= 0)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s has not yet been discovered\n", Unicode::wideToNarrow(argv[1]).c_str()));
+			return true;
+		}
+
+		PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+		if (!planetObject)
+		{
+			result += Unicode::narrowToWide("could not locate the tatooine PlanetObject\n");
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("requesting clearing of \"server first\" for collection %s [discovered by (%s, %s) at %ld (%s)]\n", Unicode::wideToNarrow(argv[1]).c_str(), collectionInfo->serverFirstClaimantId.getValueString().c_str(), Unicode::wideToNarrow(collectionInfo->serverFirstClaimantName).c_str(), collectionInfo->serverFirstClaimTime, CalendarTime::convertEpochToTimeStringLocal(collectionInfo->serverFirstClaimTime).c_str()));
+
+		planetObject->removeCollectionServerFirst(*collectionInfo);
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else
+	{
+		result += getErrorMessage(argv[0], ERR_NO_HANDLER);
+	}
+	return true;
+
+}	// ConsoleCommandParserCollection::performParsing
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCollection.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCollection.h
new file mode 100644
index 00000000..36fbf8fb
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCollection.h
@@ -0,0 +1,32 @@
+// ======================================================================
+//
+// ConsoleCommandParserCollection.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserCollection_H
+#define INCLUDED_ConsoleCommandParserCollection_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to the Collection system.
+*/
+
+class ConsoleCommandParserCollection : public CommandParser
+{
+public:
+	                          ConsoleCommandParserCollection ();
+	virtual bool              performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node);
+	
+private:
+	                          ConsoleCommandParserCollection (const ConsoleCommandParserCollection & rhs);
+	ConsoleCommandParserCollection & operator= (const ConsoleCommandParserCollection & rhs);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserCollection_H
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraft.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraft.cpp
new file mode 100644
index 00000000..6a28b3eb
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraft.cpp
@@ -0,0 +1,193 @@
+// ======================================================================
+//
+// ConsoleCommandParserCraft.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserCraft.h"
+#include "UnicodeUtils.h"
+#include "serverGame/ConsoleCommandParserCraftStation.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedFoundation/GameControllerMessage.h"
+
+
+// ======================================================================
+
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"draft",                  1, "<number>",                          "Select a draft schematic to craft with"},
+	{"fillslot",               3, "<slot #> <slot option #> <ingredient oid>", "Fill a draft schematic slot with an ingredient"},
+	{"nextstage",              0, "",                                  "Go to the next stage of crafting"},
+	{"experiment",             3, "<attribute #> <experiment points> <core level>", "Experiment to improve an attribute"},
+	{"customize",              2, "<custom #> <value>",                "Set a customization property"},
+	{"makeprototype",          1, "<name>",                            "Create a prototype object"},
+	{"makeschematic",          1, "<name>",                            "Create manufacturing schematic"},
+	{"stop",                   0, "",                                  "Stops the current crafting session"},
+	{"enableSchematicFilter",  0, "",                                  "Enables schematic filtering (god mode only)"},
+	{"disableSchematicFilter", 0, "",                                  "Disables schematic filtering (god mode only)"},
+    {"", 0, "", ""} // this must be last
+};
+
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserCraft::ConsoleCommandParserCraft (void) :
+CommandParser ("craft", 0, "...", "Crafting related commands.", 0)
+{
+    createDelegateCommands (cmds);
+	addSubCommand(new ConsoleCommandParserCraftStation());
+}
+
+//-----------------------------------------------------------------
+
+
+bool ConsoleCommandParserCraft::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+    NOT_NULL (node);
+    UNREF(originalCommand);
+
+	CreatureObject * creatureObject = safe_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(userId));
+	PlayerObject * playerObject = const_cast<PlayerObject *>(PlayerCreatureController::getPlayerObject(creatureObject));
+
+	//-----------------------------------------------------------------
+
+    if (isAbbrev( argv [0], "draft"))
+    {
+		int index = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1;
+
+		playerObject->selectDraftSchematic(index);
+        result += getErrorMessage (argv[0], ERR_SUCCESS);
+    }
+
+	//-----------------------------------------------------------------
+
+    else if (isAbbrev( argv [0], "fillslot"))
+    {
+		int slot(atoi(Unicode::wideToNarrow(argv[1]).c_str()));
+		int option(atoi(Unicode::wideToNarrow(argv[2]).c_str())); 
+		NetworkId ingredient(Unicode::wideToNarrow(argv[3]));
+
+		if (playerObject->fillSlot(slot - 1, option - 1, ingredient))
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage (argv[0], ERR_FILLSLOT_FAIL);
+    }
+
+	//-----------------------------------------------------------------
+
+	else if (isAbbrev( argv [0], "nextstage"))
+	{
+		if (playerObject->goToNextCraftingStage())
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage (argv[0], ERR_FAIL);
+	}
+
+	//-----------------------------------------------------------------
+
+    else if (isAbbrev( argv [0], "experiment"))
+    {
+		int attribute(atoi(Unicode::wideToNarrow(argv[1]).c_str()));
+		int points(atoi(Unicode::wideToNarrow(argv[2]).c_str()));
+		int core(atoi(Unicode::wideToNarrow(argv[3]).c_str()));
+
+		std::vector<MessageQueueCraftExperiment::ExperimentInfo> experiment;
+		experiment.push_back(MessageQueueCraftExperiment::ExperimentInfo(attribute - 1, points));
+		if (playerObject->experiment(experiment, points, core))
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage (argv[0], ERR_FILLSLOT_FAIL);
+    }
+
+	//-----------------------------------------------------------------
+
+	else if (isAbbrev( argv [0], "customize"))
+	{
+		int property(atoi(Unicode::wideToNarrow(argv[1]).c_str()));
+		int value(atoi(Unicode::wideToNarrow(argv[2]).c_str()));
+
+		if (playerObject->customize(property - 1, value))
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage (argv[0], ERR_CUSTOMIZE_FAIL);
+	}
+
+	//-----------------------------------------------------------------
+
+    else if (isAbbrev( argv [0], "makeprototype"))
+    {
+		std::vector<Crafting::CustomValue> customizations;
+		if (playerObject->setCustomizationData(argv[1], -1, customizations, 1) == 
+			Crafting::CE_success && playerObject->createPrototype(true))
+		{
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		}
+		else
+			result += getErrorMessage (argv[0], ERR_FAIL);
+    }
+
+	//-----------------------------------------------------------------
+
+    else if (isAbbrev( argv [0], "makeschematic"))
+    {
+		result += getErrorMessage (argv[0], ERR_FAIL);
+    }
+
+	//-----------------------------------------------------------------
+
+    else if (isAbbrev( argv [0], "stop"))
+    {
+		playerObject->stopCrafting(true);
+		result += getErrorMessage (argv[0], ERR_SUCCESS);
+    }
+
+	//-----------------------------------------------------------------
+
+	else if (isAbbrev( argv [0], "enableSchematicFilter"))
+	{
+		if (creatureObject->getClient() == NULL || !creatureObject->getClient()->isGod())
+			result += getErrorMessage (argv[0], ERR_FAIL);
+		else
+		{
+			creatureObject->enableSchematicFiltering();
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		}
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isAbbrev( argv [0], "disableSchematicFilter"))
+	{
+		if (creatureObject->getClient() == NULL || !creatureObject->getClient()->isGod())
+			result += getErrorMessage (argv[0], ERR_FAIL);
+		else
+		{
+			creatureObject->disableSchematicFiltering();
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		}
+	}
+
+	//-----------------------------------------------------------------
+
+
+    else
+    {
+        result += getErrorMessage(argv[0], ERR_NO_HANDLER);
+    }
+
+    return true;
+}
+
+
+// ======================================================================
+
+
+
+
+
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraft.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraft.h
new file mode 100644
index 00000000..ebd456d1
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraft.h
@@ -0,0 +1,48 @@
+// ======================================================================
+//
+// ConsoleCommandParserCraft.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserCraft_H
+#define INCLUDED_ConsoleCommandParserCraft_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to scripts
+*/
+
+class ConsoleCommandParserCraft : public CommandParser
+{
+public:
+    ConsoleCommandParserCraft ();
+    virtual bool performParsing (const NetworkId & userId, 
+								 const StringVector_t & argv,
+                                 const String_t & originalCommand,
+                                 String_t & result,
+                                 const CommandParser * node);
+	
+private:
+    ConsoleCommandParserCraft (const ConsoleCommandParserCraft & rhs);
+    ConsoleCommandParserCraft &  operator= (const ConsoleCommandParserCraft & rhs);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserCraft_H
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraftStation.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraftStation.cpp
new file mode 100644
index 00000000..cc9bebd7
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraftStation.cpp
@@ -0,0 +1,184 @@
+// ======================================================================
+//
+// ConsoleCommandParserCraftStation.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserCraftStation.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/CreatureObject.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedFoundation/DynamicVariableList.h"
+
+
+// ======================================================================
+
+static const CommandParser::CmdInfo cmds[] =
+{
+//	{"add",      2, "<station oid> <ingredient oid>",  "Add an ingredient to a station"},
+//	{"remove",   2, "<station oid> <ingredient oid>",  "Remove an ingredient from a station"},
+//	{"list",     1, "<station oid>",                   "List a station's ingredients"},
+    {"", 0, "", ""} // this must be last
+};
+
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserCraftStation::ConsoleCommandParserCraftStation (void) :
+CommandParser ("station", 0, "...", "Crafting station related commands.", 0)
+{
+    createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------
+
+
+bool ConsoleCommandParserCraftStation::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+    NOT_NULL (node);
+
+    UNREF(originalCommand);
+
+//	CreatureObject * playerObject = safe_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(userId));
+
+	//-----------------------------------------------------------------
+
+    if (isAbbrev( argv [0], "add"))
+    {
+/*		// get the station
+		TangibleObject * station = getStation(argv, result);
+		if (station == NULL)
+			return true;
+
+		// get the ingredient
+		NetworkId ingredientId(Unicode::wideToNarrow (argv[2]));
+		ServerObject * object = ServerWorld::findObjectByNetworkId(ingredientId);
+		if (object == NULL)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_INGREDIENT);
+			return true;
+		}
+		TangibleObject * ingredient = dynamic_cast<TangibleObject *>(object);
+		if (ingredient == NULL)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_INGREDIENT);
+			return true;
+		}
+
+		station->addIngredientToHopper(*ingredient, playerObject);
+	    result += getErrorMessage (argv[0], ERR_SUCCESS);
+*/		
+    }
+
+	//-----------------------------------------------------------------
+
+	else if (isAbbrev( argv [0], "remove"))
+    {
+/*		// get the station
+		TangibleObject * station = getStation(argv, result);
+		if (station == NULL)
+			return true;
+
+		// get the ingredient
+		NetworkId ingredientId(Unicode::wideToNarrow (argv[2]));
+		ServerObject * object = ServerWorld::findObjectByNetworkId(ingredientId);
+		if (object == NULL)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_INGREDIENT);
+			return true;
+		}
+		TangibleObject * ingredient = dynamic_cast<TangibleObject *>(object);
+		if (ingredient == NULL)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_INGREDIENT);
+			return true;
+		}
+
+		station->removeIngredientFromHopper(*ingredient);
+        result += getErrorMessage (argv[0], ERR_SUCCESS);
+*/
+    }
+
+	//-----------------------------------------------------------------
+
+	else if (isAbbrev( argv [0], "list"))
+    {
+/*		// get the station
+		NetworkId id(Unicode::wideToNarrow (argv[1]));
+		ServerObject * object = ServerWorld::findObjectByNetworkId(id);
+		if (object == NULL)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		TangibleObject * station = dynamic_cast<TangibleObject *>(object);
+		if (station == NULL)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		station->listIngredientsInHopper(*playerObject);
+        result += getErrorMessage (argv[0], ERR_SUCCESS);
+*/
+    }
+
+	//-----------------------------------------------------------------
+
+    else
+    {
+        result += getErrorMessage(argv[0], ERR_NO_HANDLER);
+    }
+
+    return true;
+}
+
+//-----------------------------------------------------------------
+
+/**
+ * Finds the crafting station for a given id.
+ *
+ * @return the station or NULL on error
+ */
+TangibleObject * ConsoleCommandParserCraftStation::getStation(const StringVector_t & argv, String_t & result)
+{
+	NetworkId id(Unicode::wideToNarrow (argv[1]));
+	ServerObject * object = ServerWorld::findObjectByNetworkId(id);
+	if (object == NULL)
+	{
+		result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+		return NULL;
+	}
+	TangibleObject * station = dynamic_cast<TangibleObject *>(object);
+	if (station == NULL)
+	{
+		result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+		return NULL;
+	}
+	// make sure the station is a atation and that it isn't in use
+	if (!station->getObjVars().hasItem("crafting.station"))
+	{
+		result += getErrorMessage (argv [0], ERR_INVALID_STATION);
+		return NULL;
+	}
+	if (station->getObjVars().hasItem("crafting.crafter"))
+	{
+		result += getErrorMessage (argv [0], ERR_STATION_IN_USE);
+		return NULL;
+	}
+	return station;
+}	// ConsoleCommandParserCraftStation::getStation
+
+
+// ======================================================================
+
+
+
+
+
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraftStation.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraftStation.h
new file mode 100644
index 00000000..5362caad
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserCraftStation.h
@@ -0,0 +1,52 @@
+// ======================================================================
+//
+// ConsoleCommandParserCraftStation.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserCraftStation_H
+#define INCLUDED_ConsoleCommandParserCraftStation_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+class TangibleObject;
+
+// ======================================================================
+
+/**
+* Commands that are related to scripts
+*/
+
+class ConsoleCommandParserCraftStation : public CommandParser
+{
+public:
+    ConsoleCommandParserCraftStation ();
+    virtual bool performParsing (const NetworkId & userId, 
+								 const StringVector_t & argv,
+                                 const String_t & originalCommand,
+                                 String_t & result,
+                                 const CommandParser * node);
+	
+private:
+    ConsoleCommandParserCraftStation (const ConsoleCommandParserCraftStation & rhs);
+    ConsoleCommandParserCraftStation &  operator= (const ConsoleCommandParserCraftStation & rhs);
+
+	TangibleObject * getStation(const StringVector_t & argv, String_t & result);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserCraftStation_H
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserDefault.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserDefault.cpp
new file mode 100644
index 00000000..431fb622
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserDefault.cpp
@@ -0,0 +1,148 @@
+// ======================================================================
+//
+// ConsoleCommandParserDefault.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserDefault.h"
+
+#include "serverGame/Chat.h"
+#include "sharedFoundation/NetworkId.h"
+
+#ifdef __linux__
+#define _wcsicmp wcscasecmp
+#endif
+
+// ======================================================================
+
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"serverhelp", 0, "",                  "List serverside commands."},
+	{"",           0, "",                  ""} // this must be last
+};
+
+//-----------------------------------------------------------------
+
+/** 
+* Predicate for searching for a command by abbreviation.
+*/
+
+struct StrEqualsAbbrevNoCase
+{
+	const CommandParser::String_t & str;
+	
+	explicit                StrEqualsAbbrevNoCase (const CommandParser::String_t & theStr) : str (theStr) {}
+	
+	bool                    operator() (const ConsoleCommandParserDefault::AliasMap_t::value_type & t) const
+	{
+		return CommandParser::isAbbrev (str, t.first);
+	}
+	
+	                        StrEqualsAbbrevNoCase (const StrEqualsAbbrevNoCase & rhs) : str (rhs.str) {}
+	
+private:
+	StrEqualsAbbrevNoCase & operator= (const StrEqualsAbbrevNoCase & rhs); //lint !e754
+	                        StrEqualsAbbrevNoCase ();
+};
+
+
+//-----------------------------------------------------------------
+//--
+//--
+//-----------------------------------------------------------------
+
+
+ConsoleCommandParserDefault::ConsoleCommandParserDefault (void) :
+CommandParser ("", 0, "...", "all server commands", 0),
+m_aliases (),
+m_aliasGuard (false),
+m_aliasGuardSet ()
+{
+	createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------
+
+void ConsoleCommandParserDefault::setAlias (const String_t & key, const String_t & value)
+{
+	UNREF (key);
+	UNREF (value);
+	
+	const String_t &   aliasString = Unicode::narrowToWide ("\\#aaffaaalias\\#ffffff: ");
+	m_aliases [key] = value;
+	
+
+	StringVector_t vec;
+	vec.push_back (key);
+
+
+	addSubCommand ( new CommandParser (key, 0, String_t (), aliasString + value, this));
+}
+
+
+//-----------------------------------------------------------------
+
+bool ConsoleCommandParserDefault::removeAlias (const String_t & key)
+{
+
+	//AliasMap_t::iterator iter = std::find_if (m_aliases.begin (), m_aliases.end (), StrEqualsNoCase (key));
+	AliasMap_t::iterator iter = m_aliases.find (key); 
+
+	if (iter != m_aliases.end ())
+	{
+		m_aliases.erase (iter);
+
+		StringVector_t vec;
+		vec.push_back (key);
+
+		CommandParser * parser = findParser (vec, 0);
+		
+		if (parser != 0)
+		{
+			if (removeParser (parser))
+				delete parser;
+		}
+
+		return true;
+	}
+
+	return false;
+}
+
+
+//-----------------------------------------------------------------
+
+bool ConsoleCommandParserDefault::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+	NOT_NULL (node);
+	UNREF (originalCommand);
+	UNREF (userId);
+
+	//-----------------------------------------------------------------
+
+	if (isAbbrev( argv [0], "serverhelp"))
+	{
+		CommandParser * parser = findParser (argv, 1);
+
+		if (parser == 0)
+		{
+			String_t str;
+
+			for (size_t i = 1; i < argv.size (); ++i)
+			{
+				str.append (argv [i]).append (1, ' ');
+			}
+
+			result += getErrorMessage ( str, ERR_CMD_NOT_FOUND);
+		}
+		else
+			parser->showHelp (result);
+	}
+
+	return true;
+}
+
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserDefault.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserDefault.h
new file mode 100644
index 00000000..cd97c1eb
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserDefault.h
@@ -0,0 +1,58 @@
+// ======================================================================
+//
+// ConsoleCommandParserDefault.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserDefault_H
+#define INCLUDED_ConsoleCommandParserDefault_H
+
+#include "sharedCommandParser/CommandParser.h"
+#include <map>
+#include <hash_set>
+#include "UnicodeUtils.h"
+
+// ======================================================================
+class ConsoleCommandParserDefault : public CommandParser
+{
+public:
+	typedef std::map<String_t, String_t> AliasMap_t;
+	typedef std::hash_set<String_t>      AliasGuardSet_t;
+
+
+	explicit               ConsoleCommandParserDefault (void);
+	virtual bool           performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node);
+
+private:
+
+	                       ConsoleCommandParserDefault (const ConsoleCommandParserDefault & rhs);
+	                       ConsoleCommandParserDefault & operator= (const ConsoleCommandParserDefault & rhs);
+
+	void                   setAlias (const String_t & key, const String_t & value);
+	/**
+	* This method should be removed one day when localization rules the earth -- jww
+	*/
+	void                   setAlias (const char * key, const char * value);
+	bool                   removeAlias (const String_t & key);
+
+private:
+
+	AliasMap_t             m_aliases;
+	bool                   m_aliasGuard;
+	AliasGuardSet_t        m_aliasGuardSet;
+};
+
+// ======================================================================
+
+inline void  ConsoleCommandParserDefault::setAlias (const char * const key, const char * const value)
+{
+	NOT_NULL (key);
+	NOT_NULL (value);
+
+	setAlias (Unicode::narrowToWide (key), Unicode::narrowToWide (value));
+}
+//-----------------------------------------------------------------
+
+
+#endif	// INCLUDED_ConsoleCommandParserDefault_H
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserGuild.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserGuild.cpp
new file mode 100644
index 00000000..f2ca6349
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserGuild.cpp
@@ -0,0 +1,1633 @@
+// ======================================================================
+//
+// ConsoleCommandParserGuild.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserGuild.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GuildInfo.h"
+#include "serverGame/GuildInterface.h"
+#include "serverGame/GuildMemberInfo.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedFoundation/CalendarTime.h"
+
+// ======================================================================
+
+namespace ConsoleCommandParserGuildNamespace
+{
+	void buildGuildInfoSpec(int guildId, GuildInfo const & gi, std::string & giSpec, int & totalSize, int & totalSizeActive, int & totalSizeInactive, int & memberSize, int & memberSizeActive, int & memberSizeInactive, int & sponsoredSize, int & sponsoredSizeActive, int & sponsoredSizeInactive);
+	void getGuildSize(int guildId, GuildInfo const & gi, int & total, int & totalActive, int & totalInactive, int & member, int & memberActive, int & memberInactive, int & sponsored, int & sponsoredActive, int & sponsoredInactive);
+	std::string const getGuildPermissionsText(int permissions);
+	std::string const getFactionString(uint32 factionId);
+}
+using namespace ConsoleCommandParserGuildNamespace;
+ 
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"listById",                          0, "", "List all guilds by guild id."},
+	{"listByName",                        0, "", "List all guilds by guild name."},
+	{"listByAbbrev",                      0, "", "List all guilds by guild abbreviation."},
+	{"listByLeaderId",                    0, "", "List all guilds by guild leader id."},
+	{"listByLeaderName",                  0, "", "List all guilds by guild leader name."},
+	{"listByTotalSize",                   0, "", "List all guilds by guild total (member + sponsored) size."},
+	{"listByTotalActiveSize",             0, "", "List all guilds by guild total (member + sponsored) active size."},
+	{"listByTotalInactiveSize",           0, "", "List all guilds by guild total (member + sponsored) inactive size."},
+	{"listByMemberSize",                  0, "", "List all guilds by guild member size."},
+	{"listByMemberActiveSize",            0, "", "List all guilds by guild member active size."},
+	{"listByMemberInactiveSize",          0, "", "List all guilds by guild member inactive size."},
+	{"listBySponsoredSize",               0, "", "List all guilds by guild sponsored size."},
+	{"listBySponsoredActiveSize",         0, "", "List all guilds by guild sponsored active size."},
+	{"listBySponsoredInactiveSize",       0, "", "List all guilds by guild sponsored inactive size."},
+	{"showGuildGcwRegionDefender",        0, "", "Display GCW region defender data for guilds."},
+	{"showGuildDetails",                  1,"<guild id>","Display guild details for a guild."},
+	{"setGuildName",                      2,"<guild id> <guild name> [override]","Set guild name (if the guild name has embedded space(s), enclose it between double quotes). If the optional third parameter is the word 'override' then override the reserved name check."},
+	{"setGuildAbbrev",                    2,"<guild id> <guild abbrev>","Set guild abbreviation (if the guild abbreviation has embedded space(s), enclose it between double quotes)."},
+	{"setGuildLeader",                    2,"<guild id> <guild leader oid>","Set guild leader."},
+	{"findGuildMemberNameMismatch",       0, "", "(POTENTIALLY EXPENSIVE OPERATION!!!) Find all guild member whose guild member name doesn't match the character name."},
+	{"findGuildLeaderPermissionMismatch", 0, "", "Find all guild leader whose permission is not \"all\"."},
+	{"findGuildLeaderMismatch",           0, "", "Find all guild where the guild leader is not a guild member."},
+	{"findLeaderlessGuild",               0, "", "Find all guild where the guild leader no longer exists in the DB (i.e. character has been deleted and purged)."},
+	{"findOrphanedGuild",                 0, "", "Find all guild where there is no guild leader."},
+	{"",                                  0, "", ""} // this must be last
+};
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserGuild::ConsoleCommandParserGuild (void) :
+CommandParser ("guild", 0, "...", "Guild related commands.", 0)
+{
+	createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------
+
+bool ConsoleCommandParserGuild::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+	NOT_NULL (node);
+	UNREF (userId);
+
+	UNREF(originalCommand);
+
+	//-----------------------------------------------------------------
+
+	if (isCommand(argv [0], "listById"))
+	{
+		std::vector<int> guildIds;
+		GuildInterface::getAllGuildIds(guildIds);
+
+		std::map<int, std::string> guildInfo;
+		std::string giSpec;
+		int totalSize;
+		int totalSizeActive;
+		int totalSizeInactive;
+		int memberSize;
+		int memberSizeActive;
+		int memberSizeInactive;
+		int sponsoredSize;
+		int sponsoredSizeActive;
+		int sponsoredSizeInactive;
+		for (std::vector<int>::const_iterator iter = guildIds.begin(); iter != guildIds.end(); ++iter)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iter);
+			if (!gi || gi->m_name.empty())
+				continue;
+
+			buildGuildInfoSpec(*iter, *gi, giSpec, totalSize, totalSizeActive, totalSizeInactive, memberSize, memberSizeActive, memberSizeInactive, sponsoredSize, sponsoredSizeActive, sponsoredSizeInactive);
+
+			if (!giSpec.empty())
+			{
+				giSpec += "\n";
+				guildInfo[*iter] = giSpec;
+			}
+		}
+
+		for (std::map<int, std::string>::const_iterator iter2 = guildInfo.begin(); iter2 != guildInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		char buffer[1024];
+		snprintf(buffer, sizeof(buffer)-1, "%d guilds listed\n", guildInfo.size());
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		if (!guildInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, abbrev, leaderId, leaderName, total size (active/inactive), member size (active/inactive), sponsored size (active/inactive)\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listByName"))
+	{
+		std::vector<int> guildIds;
+		GuildInterface::getAllGuildIds(guildIds);
+
+		std::multimap<std::string, std::string> guildInfo;
+		std::string giSpec;
+		int totalSize;
+		int totalSizeActive;
+		int totalSizeInactive;
+		int memberSize;
+		int memberSizeActive;
+		int memberSizeInactive;
+		int sponsoredSize;
+		int sponsoredSizeActive;
+		int sponsoredSizeInactive;
+		for (std::vector<int>::const_iterator iter = guildIds.begin(); iter != guildIds.end(); ++iter)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iter);
+			if (!gi || gi->m_name.empty())
+				continue;
+
+			buildGuildInfoSpec(*iter, *gi, giSpec, totalSize, totalSizeActive, totalSizeInactive, memberSize, memberSizeActive, memberSizeInactive, sponsoredSize, sponsoredSizeActive, sponsoredSizeInactive);
+
+			if (!giSpec.empty())
+			{
+				giSpec += "\n";
+				guildInfo.insert(std::make_pair(Unicode::toLower(gi->m_name), giSpec));
+			}
+		}
+
+		for (std::multimap<std::string, std::string>::const_iterator iter2 = guildInfo.begin(); iter2 != guildInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		char buffer[1024];
+		snprintf(buffer, sizeof(buffer)-1, "%d guilds listed\n", guildInfo.size());
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		if (!guildInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, abbrev, leaderId, leaderName, total size (active/inactive), member size (active/inactive), sponsored size (active/inactive)\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listByAbbrev"))
+	{
+		std::vector<int> guildIds;
+		GuildInterface::getAllGuildIds(guildIds);
+
+		std::multimap<std::string, std::string> guildInfo;
+		std::string giSpec;
+		int totalSize;
+		int totalSizeActive;
+		int totalSizeInactive;
+		int memberSize;
+		int memberSizeActive;
+		int memberSizeInactive;
+		int sponsoredSize;
+		int sponsoredSizeActive;
+		int sponsoredSizeInactive;
+		for (std::vector<int>::const_iterator iter = guildIds.begin(); iter != guildIds.end(); ++iter)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iter);
+			if (!gi || gi->m_name.empty())
+				continue;
+
+			buildGuildInfoSpec(*iter, *gi, giSpec, totalSize, totalSizeActive, totalSizeInactive, memberSize, memberSizeActive, memberSizeInactive, sponsoredSize, sponsoredSizeActive, sponsoredSizeInactive);
+
+			if (!giSpec.empty())
+			{
+				giSpec += "\n";
+				guildInfo.insert(std::make_pair(Unicode::toLower(gi->m_abbrev), giSpec));
+			}
+		}
+
+		for (std::multimap<std::string, std::string>::const_iterator iter2 = guildInfo.begin(); iter2 != guildInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		char buffer[1024];
+		snprintf(buffer, sizeof(buffer)-1, "%d guilds listed\n", guildInfo.size());
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		if (!guildInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, abbrev, leaderId, leaderName, total size (active/inactive), member size (active/inactive), sponsored size (active/inactive)\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listByLeaderId"))
+	{
+		std::vector<int> guildIds;
+		GuildInterface::getAllGuildIds(guildIds);
+
+		std::multimap<NetworkId, std::string> guildInfo;
+		std::string giSpec;
+		int totalSize;
+		int totalSizeActive;
+		int totalSizeInactive;
+		int memberSize;
+		int memberSizeActive;
+		int memberSizeInactive;
+		int sponsoredSize;
+		int sponsoredSizeActive;
+		int sponsoredSizeInactive;
+		for (std::vector<int>::const_iterator iter = guildIds.begin(); iter != guildIds.end(); ++iter)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iter);
+			if (!gi || gi->m_name.empty())
+				continue;
+
+			buildGuildInfoSpec(*iter, *gi, giSpec, totalSize, totalSizeActive, totalSizeInactive, memberSize, memberSizeActive, memberSizeInactive, sponsoredSize, sponsoredSizeActive, sponsoredSizeInactive);
+
+			if (!giSpec.empty())
+			{
+				giSpec += "\n";
+				guildInfo.insert(std::make_pair(gi->m_leaderId, giSpec));
+			}
+		}
+
+		for (std::multimap<NetworkId, std::string>::const_iterator iter2 = guildInfo.begin(); iter2 != guildInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		char buffer[1024];
+		snprintf(buffer, sizeof(buffer)-1, "%d guilds listed\n", guildInfo.size());
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		if (!guildInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, abbrev, leaderId, leaderName, total size (active/inactive), member size (active/inactive), sponsored size (active/inactive)\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listByLeaderName"))
+	{
+		std::vector<int> guildIds;
+		GuildInterface::getAllGuildIds(guildIds);
+
+		std::multimap<std::string, std::string> guildInfo;
+		std::string leaderName;
+		std::string giSpec;
+		int totalSize;
+		int totalSizeActive;
+		int totalSizeInactive;
+		int memberSize;
+		int memberSizeActive;
+		int memberSizeInactive;
+		int sponsoredSize;
+		int sponsoredSizeActive;
+		int sponsoredSizeInactive;
+		for (std::vector<int>::const_iterator iter = guildIds.begin(); iter != guildIds.end(); ++iter)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iter);
+			if (!gi || gi->m_name.empty())
+				continue;
+
+			GuildMemberInfo const * const gmi = GuildInterface::getGuildMemberInfo(*iter, gi->m_leaderId);
+			if (gmi)
+				leaderName = gmi->m_name;
+			else
+				leaderName.clear();
+
+			buildGuildInfoSpec(*iter, *gi, giSpec, totalSize, totalSizeActive, totalSizeInactive, memberSize, memberSizeActive, memberSizeInactive, sponsoredSize, sponsoredSizeActive, sponsoredSizeInactive);
+
+			if (!giSpec.empty())
+			{
+				giSpec += "\n";
+				guildInfo.insert(std::make_pair(Unicode::toLower(leaderName), giSpec));
+			}
+		}
+
+		for (std::multimap<std::string, std::string>::const_iterator iter2 = guildInfo.begin(); iter2 != guildInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		char buffer[1024];
+		snprintf(buffer, sizeof(buffer)-1, "%d guilds listed\n", guildInfo.size());
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		if (!guildInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, abbrev, leaderId, leaderName, total size (active/inactive), member size (active/inactive), sponsored size (active/inactive)\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listByTotalSize"))
+	{
+		std::vector<int> guildIds;
+		GuildInterface::getAllGuildIds(guildIds);
+
+		std::multimap<int, std::string> guildInfo;
+		std::string giSpec;
+		int totalSize;
+		int totalSizeActive;
+		int totalSizeInactive;
+		int memberSize;
+		int memberSizeActive;
+		int memberSizeInactive;
+		int sponsoredSize;
+		int sponsoredSizeActive;
+		int sponsoredSizeInactive;
+		for (std::vector<int>::const_iterator iter = guildIds.begin(); iter != guildIds.end(); ++iter)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iter);
+			if (!gi || gi->m_name.empty())
+				continue;
+
+			buildGuildInfoSpec(*iter, *gi, giSpec, totalSize, totalSizeActive, totalSizeInactive, memberSize, memberSizeActive, memberSizeInactive, sponsoredSize, sponsoredSizeActive, sponsoredSizeInactive);
+
+			if (!giSpec.empty())
+			{
+				giSpec += "\n";
+				guildInfo.insert(std::make_pair(totalSize, giSpec));
+			}
+		}
+
+		for (std::multimap<int, std::string>::const_iterator iter2 = guildInfo.begin(); iter2 != guildInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		char buffer[1024];
+		snprintf(buffer, sizeof(buffer)-1, "%d guilds listed\n", guildInfo.size());
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		if (!guildInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, abbrev, leaderId, leaderName, total size (active/inactive), member size (active/inactive), sponsored size (active/inactive)\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listByTotalActiveSize"))
+	{
+		std::vector<int> guildIds;
+		GuildInterface::getAllGuildIds(guildIds);
+
+		std::multimap<int, std::string> guildInfo;
+		std::string giSpec;
+		int totalSize;
+		int totalSizeActive;
+		int totalSizeInactive;
+		int memberSize;
+		int memberSizeActive;
+		int memberSizeInactive;
+		int sponsoredSize;
+		int sponsoredSizeActive;
+		int sponsoredSizeInactive;
+		for (std::vector<int>::const_iterator iter = guildIds.begin(); iter != guildIds.end(); ++iter)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iter);
+			if (!gi || gi->m_name.empty())
+				continue;
+
+			buildGuildInfoSpec(*iter, *gi, giSpec, totalSize, totalSizeActive, totalSizeInactive, memberSize, memberSizeActive, memberSizeInactive, sponsoredSize, sponsoredSizeActive, sponsoredSizeInactive);
+
+			if (!giSpec.empty())
+			{
+				giSpec += "\n";
+				guildInfo.insert(std::make_pair(totalSizeActive, giSpec));
+			}
+		}
+
+		for (std::multimap<int, std::string>::const_iterator iter2 = guildInfo.begin(); iter2 != guildInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		char buffer[1024];
+		snprintf(buffer, sizeof(buffer)-1, "%d guilds listed\n", guildInfo.size());
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		if (!guildInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, abbrev, leaderId, leaderName, total size (active/inactive), member size (active/inactive), sponsored size (active/inactive)\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listByTotalInactiveSize"))
+	{
+		std::vector<int> guildIds;
+		GuildInterface::getAllGuildIds(guildIds);
+
+		std::multimap<int, std::string> guildInfo;
+		std::string giSpec;
+		int totalSize;
+		int totalSizeActive;
+		int totalSizeInactive;
+		int memberSize;
+		int memberSizeActive;
+		int memberSizeInactive;
+		int sponsoredSize;
+		int sponsoredSizeActive;
+		int sponsoredSizeInactive;
+		for (std::vector<int>::const_iterator iter = guildIds.begin(); iter != guildIds.end(); ++iter)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iter);
+			if (!gi || gi->m_name.empty())
+				continue;
+
+			buildGuildInfoSpec(*iter, *gi, giSpec, totalSize, totalSizeActive, totalSizeInactive, memberSize, memberSizeActive, memberSizeInactive, sponsoredSize, sponsoredSizeActive, sponsoredSizeInactive);
+
+			if (!giSpec.empty())
+			{
+				giSpec += "\n";
+				guildInfo.insert(std::make_pair(totalSizeInactive, giSpec));
+			}
+		}
+
+		for (std::multimap<int, std::string>::const_iterator iter2 = guildInfo.begin(); iter2 != guildInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		char buffer[1024];
+		snprintf(buffer, sizeof(buffer)-1, "%d guilds listed\n", guildInfo.size());
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		if (!guildInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, abbrev, leaderId, leaderName, total size (active/inactive), member size (active/inactive), sponsored size (active/inactive)\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listByMemberSize"))
+	{
+		std::vector<int> guildIds;
+		GuildInterface::getAllGuildIds(guildIds);
+
+		std::multimap<int, std::string> guildInfo;
+		std::string giSpec;
+		int totalSize;
+		int totalSizeActive;
+		int totalSizeInactive;
+		int memberSize;
+		int memberSizeActive;
+		int memberSizeInactive;
+		int sponsoredSize;
+		int sponsoredSizeActive;
+		int sponsoredSizeInactive;
+		for (std::vector<int>::const_iterator iter = guildIds.begin(); iter != guildIds.end(); ++iter)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iter);
+			if (!gi || gi->m_name.empty())
+				continue;
+
+			buildGuildInfoSpec(*iter, *gi, giSpec, totalSize, totalSizeActive, totalSizeInactive, memberSize, memberSizeActive, memberSizeInactive, sponsoredSize, sponsoredSizeActive, sponsoredSizeInactive);
+
+			if (!giSpec.empty())
+			{
+				giSpec += "\n";
+				guildInfo.insert(std::make_pair(memberSize, giSpec));
+			}
+		}
+
+		for (std::multimap<int, std::string>::const_iterator iter2 = guildInfo.begin(); iter2 != guildInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		char buffer[1024];
+		snprintf(buffer, sizeof(buffer)-1, "%d guilds listed\n", guildInfo.size());
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		if (!guildInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, abbrev, leaderId, leaderName, total size (active/inactive), member size (active/inactive), sponsored size (active/inactive)\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listByMemberActiveSize"))
+	{
+		std::vector<int> guildIds;
+		GuildInterface::getAllGuildIds(guildIds);
+
+		std::multimap<int, std::string> guildInfo;
+		std::string giSpec;
+		int totalSize;
+		int totalSizeActive;
+		int totalSizeInactive;
+		int memberSize;
+		int memberSizeActive;
+		int memberSizeInactive;
+		int sponsoredSize;
+		int sponsoredSizeActive;
+		int sponsoredSizeInactive;
+		for (std::vector<int>::const_iterator iter = guildIds.begin(); iter != guildIds.end(); ++iter)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iter);
+			if (!gi || gi->m_name.empty())
+				continue;
+
+			buildGuildInfoSpec(*iter, *gi, giSpec, totalSize, totalSizeActive, totalSizeInactive, memberSize, memberSizeActive, memberSizeInactive, sponsoredSize, sponsoredSizeActive, sponsoredSizeInactive);
+
+			if (!giSpec.empty())
+			{
+				giSpec += "\n";
+				guildInfo.insert(std::make_pair(memberSizeActive, giSpec));
+			}
+		}
+
+		for (std::multimap<int, std::string>::const_iterator iter2 = guildInfo.begin(); iter2 != guildInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		char buffer[1024];
+		snprintf(buffer, sizeof(buffer)-1, "%d guilds listed\n", guildInfo.size());
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		if (!guildInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, abbrev, leaderId, leaderName, total size (active/inactive), member size (active/inactive), sponsored size (active/inactive)\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listByMemberInactiveSize"))
+	{
+		std::vector<int> guildIds;
+		GuildInterface::getAllGuildIds(guildIds);
+
+		std::multimap<int, std::string> guildInfo;
+		std::string giSpec;
+		int totalSize;
+		int totalSizeActive;
+		int totalSizeInactive;
+		int memberSize;
+		int memberSizeActive;
+		int memberSizeInactive;
+		int sponsoredSize;
+		int sponsoredSizeActive;
+		int sponsoredSizeInactive;
+		for (std::vector<int>::const_iterator iter = guildIds.begin(); iter != guildIds.end(); ++iter)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iter);
+			if (!gi || gi->m_name.empty())
+				continue;
+
+			buildGuildInfoSpec(*iter, *gi, giSpec, totalSize, totalSizeActive, totalSizeInactive, memberSize, memberSizeActive, memberSizeInactive, sponsoredSize, sponsoredSizeActive, sponsoredSizeInactive);
+
+			if (!giSpec.empty())
+			{
+				giSpec += "\n";
+				guildInfo.insert(std::make_pair(memberSizeInactive, giSpec));
+			}
+		}
+
+		for (std::multimap<int, std::string>::const_iterator iter2 = guildInfo.begin(); iter2 != guildInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		char buffer[1024];
+		snprintf(buffer, sizeof(buffer)-1, "%d guilds listed\n", guildInfo.size());
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		if (!guildInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, abbrev, leaderId, leaderName, total size (active/inactive), member size (active/inactive), sponsored size (active/inactive)\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listBySponsoredSize"))
+	{
+		std::vector<int> guildIds;
+		GuildInterface::getAllGuildIds(guildIds);
+
+		std::multimap<int, std::string> guildInfo;
+		std::string giSpec;
+		int totalSize;
+		int totalSizeActive;
+		int totalSizeInactive;
+		int memberSize;
+		int memberSizeActive;
+		int memberSizeInactive;
+		int sponsoredSize;
+		int sponsoredSizeActive;
+		int sponsoredSizeInactive;
+		for (std::vector<int>::const_iterator iter = guildIds.begin(); iter != guildIds.end(); ++iter)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iter);
+			if (!gi || gi->m_name.empty())
+				continue;
+
+			buildGuildInfoSpec(*iter, *gi, giSpec, totalSize, totalSizeActive, totalSizeInactive, memberSize, memberSizeActive, memberSizeInactive, sponsoredSize, sponsoredSizeActive, sponsoredSizeInactive);
+
+			if (!giSpec.empty())
+			{
+				giSpec += "\n";
+				guildInfo.insert(std::make_pair(sponsoredSize, giSpec));
+			}
+		}
+
+		for (std::multimap<int, std::string>::const_iterator iter2 = guildInfo.begin(); iter2 != guildInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		char buffer[1024];
+		snprintf(buffer, sizeof(buffer)-1, "%d guilds listed\n", guildInfo.size());
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		if (!guildInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, abbrev, leaderId, leaderName, total size (active/inactive), member size (active/inactive), sponsored size (active/inactive)\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listBySponsoredActiveSize"))
+	{
+		std::vector<int> guildIds;
+		GuildInterface::getAllGuildIds(guildIds);
+
+		std::multimap<int, std::string> guildInfo;
+		std::string giSpec;
+		int totalSize;
+		int totalSizeActive;
+		int totalSizeInactive;
+		int memberSize;
+		int memberSizeActive;
+		int memberSizeInactive;
+		int sponsoredSize;
+		int sponsoredSizeActive;
+		int sponsoredSizeInactive;
+		for (std::vector<int>::const_iterator iter = guildIds.begin(); iter != guildIds.end(); ++iter)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iter);
+			if (!gi || gi->m_name.empty())
+				continue;
+
+			buildGuildInfoSpec(*iter, *gi, giSpec, totalSize, totalSizeActive, totalSizeInactive, memberSize, memberSizeActive, memberSizeInactive, sponsoredSize, sponsoredSizeActive, sponsoredSizeInactive);
+
+			if (!giSpec.empty())
+			{
+				giSpec += "\n";
+				guildInfo.insert(std::make_pair(sponsoredSizeActive, giSpec));
+			}
+		}
+
+		for (std::multimap<int, std::string>::const_iterator iter2 = guildInfo.begin(); iter2 != guildInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		char buffer[1024];
+		snprintf(buffer, sizeof(buffer)-1, "%d guilds listed\n", guildInfo.size());
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		if (!guildInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, abbrev, leaderId, leaderName, total size (active/inactive), member size (active/inactive), sponsored size (active/inactive)\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "listBySponsoredInactiveSize"))
+	{
+		std::vector<int> guildIds;
+		GuildInterface::getAllGuildIds(guildIds);
+
+		std::multimap<int, std::string> guildInfo;
+		std::string giSpec;
+		int totalSize;
+		int totalSizeActive;
+		int totalSizeInactive;
+		int memberSize;
+		int memberSizeActive;
+		int memberSizeInactive;
+		int sponsoredSize;
+		int sponsoredSizeActive;
+		int sponsoredSizeInactive;
+		for (std::vector<int>::const_iterator iter = guildIds.begin(); iter != guildIds.end(); ++iter)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iter);
+			if (!gi || gi->m_name.empty())
+				continue;
+
+			buildGuildInfoSpec(*iter, *gi, giSpec, totalSize, totalSizeActive, totalSizeInactive, memberSize, memberSizeActive, memberSizeInactive, sponsoredSize, sponsoredSizeActive, sponsoredSizeInactive);
+
+			if (!giSpec.empty())
+			{
+				giSpec += "\n";
+				guildInfo.insert(std::make_pair(sponsoredSizeInactive, giSpec));
+			}
+		}
+
+		for (std::multimap<int, std::string>::const_iterator iter2 = guildInfo.begin(); iter2 != guildInfo.end(); ++iter2)
+			result += Unicode::narrowToWide(iter2->second);
+
+		char buffer[1024];
+		snprintf(buffer, sizeof(buffer)-1, "%d guilds listed\n", guildInfo.size());
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		if (!guildInfo.empty())
+			result += Unicode::narrowToWide("Output format is: \"id, name, abbrev, leaderId, leaderName, total size (active/inactive), member size (active/inactive), sponsored size (active/inactive)\"\n");
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "showGuildGcwRegionDefender"))
+	{
+		char buffer[1024];
+
+		snprintf(buffer, sizeof(buffer)-1, "Version (%d)\n\n", GuildInterface::getGcwRegionDefenderGuildsVersion());
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		std::map<std::pair<std::string, int>, uint32> const & gcwRegionDefenderGuilds = GuildInterface::getGcwRegionDefenderGuilds();
+		for (std::map<std::pair<std::string, int>, uint32>::const_iterator iterGuild = gcwRegionDefenderGuilds.begin(); iterGuild != gcwRegionDefenderGuilds.end(); ++iterGuild)
+		{
+			snprintf(buffer, sizeof(buffer)-1, "(%s) (%d, %s) (%lu) (%s)\n", iterGuild->first.first.c_str(), iterGuild->first.second, GuildInterface::getGuildName(iterGuild->first.second).c_str(), iterGuild->second, getFactionString(iterGuild->second).c_str());
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+		}
+
+		result += Unicode::narrowToWide("\n");
+
+		std::map<std::string, std::pair<int, int> > const & gcwRegionDefenderGuildsCount = GuildInterface::getGcwRegionDefenderGuildsCount();
+		for (std::map<std::string, std::pair<int, int> >::const_iterator iterCount = gcwRegionDefenderGuildsCount.begin(); iterCount != gcwRegionDefenderGuildsCount.end(); ++iterCount)
+		{
+			snprintf(buffer, sizeof(buffer)-1, "(%s) (Imperial=%d) (Rebel=%d)\n", iterCount->first.c_str(), iterCount->second.first, iterCount->second.second);
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+		}
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "showGuildDetails"))
+	{
+		int const guildId = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+		GuildInfo const * const gi = GuildInterface::getGuildInfo(guildId);
+
+		if (!gi || gi->m_name.empty())
+		{
+			char buffer[1024];
+			snprintf(buffer, sizeof(buffer)-1, "no guild with guild id %d\n", guildId);
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else
+		{
+			// guild id
+			char buffer[1024];
+			snprintf(buffer, sizeof(buffer)-1, "id: %d\n", guildId);
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+
+			// guild name
+			result += Unicode::narrowToWide("name: ");
+			result += Unicode::narrowToWide(gi->m_name);
+			result += Unicode::narrowToWide("\n");
+
+			// guild abbreviation
+			result += Unicode::narrowToWide("abbrev: ");
+			result += Unicode::narrowToWide(gi->m_abbrev);
+			result += Unicode::narrowToWide("\n");
+
+			// guild leader
+			result += Unicode::narrowToWide("leader: ");
+			result += Unicode::narrowToWide(gi->m_leaderId.getValueString());
+			result += Unicode::narrowToWide(" (");
+
+			GuildMemberInfo const * const gmi = GuildInterface::getGuildMemberInfo(guildId, gi->m_leaderId);
+			if (gmi)
+				result += Unicode::narrowToWide(gmi->m_name);
+
+			result += Unicode::narrowToWide(")\n");
+
+			// previous election end time
+			result += Unicode::narrowToWide("guild election previous end time: ");
+
+			if (gi->m_guildElectionPreviousEndTime > 0)
+				result += Unicode::narrowToWide(CalendarTime::convertEpochToTimeStringLocal(static_cast<time_t>(gi->m_guildElectionPreviousEndTime)));
+			else
+				result += Unicode::narrowToWide("NONE");
+
+			result += Unicode::narrowToWide("\n");
+
+			// next election end time
+			result += Unicode::narrowToWide("guild election next end time: ");
+
+			if (gi->m_guildElectionNextEndTime > 0)
+				result += Unicode::narrowToWide(CalendarTime::convertEpochToTimeStringLocal(static_cast<time_t>(gi->m_guildElectionNextEndTime)));
+			else
+				result += Unicode::narrowToWide("NONE");
+
+			result += Unicode::narrowToWide("\n");
+
+			// guild faction
+			uint32 const currentFaction = GuildInterface::getGuildCurrentFaction(guildId);			
+			snprintf(buffer, sizeof(buffer)-1, "current faction: %lu (%s)\n", currentFaction, getFactionString(currentFaction).c_str());
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+
+			uint32 const previousFaction = GuildInterface::getGuildPreviousFaction(guildId);
+			if (!PvpData::isNeutralFactionId(previousFaction))
+			{
+				int const timeLeftPreviousFaction = GuildInterface::getTimeLeftGuildPreviousFaction(guildId);
+				snprintf(buffer, sizeof(buffer)-1, "previous faction: %lu (%s) [left at %d (%s)]\n", previousFaction, getFactionString(previousFaction).c_str(), timeLeftPreviousFaction, CalendarTime::convertEpochToTimeStringLocal(static_cast<time_t>(timeLeftPreviousFaction)).c_str());
+				buffer[sizeof(buffer)-1] = '\0';
+				result += Unicode::narrowToWide(buffer);
+			}
+
+			// guild GCW region defender
+			std::string const & currentGcwDefenderRegion = GuildInterface::getGuildCurrentGcwDefenderRegion(guildId);
+			result += Unicode::narrowToWide("current GCW defender region: ");
+			if (currentGcwDefenderRegion.empty())
+			{
+				result += Unicode::narrowToWide("(NONE)\n");
+			}
+			else
+			{
+				int const timeJoinedCurrentGcwDefenderRegion = GuildInterface::getTimeJoinedGuildCurrentGcwDefenderRegion(guildId);
+				snprintf(buffer, sizeof(buffer)-1, "%s [joined at %d (%s)]\n", currentGcwDefenderRegion.c_str(), timeJoinedCurrentGcwDefenderRegion, CalendarTime::convertEpochToTimeStringLocal(static_cast<time_t>(timeJoinedCurrentGcwDefenderRegion)).c_str());
+				buffer[sizeof(buffer)-1] = '\0';
+				result += Unicode::narrowToWide(buffer);
+			}
+
+			std::string const & previousGcwDefenderRegion = GuildInterface::getGuildPreviousGcwDefenderRegion(guildId);
+			if (!previousGcwDefenderRegion.empty())
+			{
+				int const timeLeftPreviousGcwDefenderRegion = GuildInterface::getTimeLeftGuildPreviousGcwDefenderRegion(guildId);
+				snprintf(buffer, sizeof(buffer)-1, "previous GCW defender region: %s [joined at %d (%s), left at %d (%s)]\n", previousGcwDefenderRegion.c_str(), gi->m_timeJoinedGuildGcwDefenderRegion, CalendarTime::convertEpochToTimeStringLocal(static_cast<time_t>(gi->m_timeJoinedGuildGcwDefenderRegion)).c_str(), timeLeftPreviousGcwDefenderRegion, CalendarTime::convertEpochToTimeStringLocal(static_cast<time_t>(timeLeftPreviousGcwDefenderRegion)).c_str());
+				buffer[sizeof(buffer)-1] = '\0';
+				result += Unicode::narrowToWide(buffer);
+			}
+
+			// sponsored count
+			snprintf(buffer, sizeof(buffer)-1, "sponsored count: %d\n", GuildInterface::getGuildCountSponsoredOnly(guildId));
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+
+			// members only count
+			snprintf(buffer, sizeof(buffer)-1, "members only count: %d\n", GuildInterface::getGuildCountMembersOnly(guildId));
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+
+			// sponsored + members
+			snprintf(buffer, sizeof(buffer)-1, "members and sponsored count: %d\n", GuildInterface::getGuildCountMembersAndSponsored(guildId));
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+
+			// guild war pvp enabled
+			snprintf(buffer, sizeof(buffer)-1, "guild pvp enabled count: %d\n", GuildInterface::getGuildCountMembersGuildWarPvPEnabled(guildId));
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+
+			// guild size
+			int totalSize;
+			int totalSizeActive;
+			int totalSizeInactive;
+			int memberSize;
+			int memberSizeActive;
+			int memberSizeInactive;
+			int sponsoredSize;
+			int sponsoredSizeActive;
+			int sponsoredSizeInactive;
+			getGuildSize(guildId, gi, totalSize, totalSizeActive, totalSizeInactive, memberSize, memberSizeActive, memberSizeInactive, sponsoredSize, sponsoredSizeActive, sponsoredSizeInactive);
+
+			snprintf(buffer, sizeof(buffer)-1, "size: %d (%d/%d) total, %d (%d/%d) member, %d (%d/%d) sponsored\n", totalSize, totalSizeActive, totalSizeInactive, memberSize, memberSizeActive, memberSizeInactive, sponsoredSize, sponsoredSizeActive, sponsoredSizeInactive);
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+
+			// members
+			result += Unicode::narrowToWide("\n");
+			result += Unicode::narrowToWide("members:\n");
+
+			std::vector<NetworkId> memberIds;
+			GuildInterface::getGuildMemberIds(guildId, memberIds);
+			std::string gmiSpec;
+			std::string rankStr;
+			std::vector<NetworkId>::const_iterator iter;
+			for (iter = memberIds.begin(); iter != memberIds.end(); ++iter)
+			{
+				GuildMemberInfo const * const gmi = GuildInterface::getGuildMemberInfo(guildId, *iter);
+				if (!gmi)
+					continue;
+
+				if (gmi->m_permissions != static_cast<int>(GuildInterface::None))
+				{
+					// member id and name
+					gmiSpec = iter->getValueString();
+					gmiSpec += " (";
+					gmiSpec += gmi->m_name;
+
+					// inactive
+					if (!NameManager::getInstance().isPlayer(*iter))
+						gmiSpec += ", INACTIVE";
+
+					gmiSpec += "), ";
+
+					// member profession
+					gmiSpec += gmi->m_professionSkillTemplate;
+					gmiSpec += ", ";
+
+					// member level
+					snprintf(buffer, sizeof(buffer)-1, "%d", gmi->m_level);
+					buffer[sizeof(buffer)-1] = '\0';
+					gmiSpec += buffer;
+					gmiSpec += ", ";
+
+					// member title
+					gmiSpec += gmi->m_title;
+					gmiSpec += ", ";
+
+					// member permission
+					snprintf(buffer, sizeof(buffer)-1, "%d", gmi->m_permissions);
+					buffer[sizeof(buffer)-1] = '\0';
+					gmiSpec += buffer;
+
+					gmiSpec += " (";
+					gmiSpec += getGuildPermissionsText(gmi->m_permissions);
+					gmiSpec += "), ";
+
+					// member allegiance
+					gmiSpec += gmi->m_allegiance.getValueString();
+					gmiSpec += " (";
+
+					{
+						GuildMemberInfo const * const gmiAllegiance = GuildInterface::getGuildMemberInfo(guildId, gmi->m_allegiance);
+						if (gmiAllegiance)
+							gmiSpec += gmiAllegiance->m_name;
+					}
+
+					gmiSpec += "), ";
+
+					// member rank
+					gmi->m_rank.getAsDbTextString(rankStr);
+					gmiSpec += rankStr;
+
+					std::string rankDesc;
+					std::vector<std::string> ranks;
+					GuildInterface::getGuildMemberRank(guildId, *iter, ranks);
+					for (std::vector<std::string>::const_iterator iterRank = ranks.begin(); iterRank != ranks.end(); ++iterRank)
+					{
+						if (!rankDesc.empty())
+							rankDesc += ", ";
+
+						rankDesc += *iterRank;
+					}
+
+					gmiSpec += " (";
+					gmiSpec += rankDesc;
+					gmiSpec += ")\n";
+
+					result += Unicode::narrowToWide(gmiSpec);
+				}
+			}
+
+			if (memberSize > 0)
+				result += Unicode::narrowToWide("Output format is: \"id (name), profession, level, title, permissions (description), allegiance id (name), rank (description)\"\n");
+
+			// sponsored
+			result += Unicode::narrowToWide("\n");
+			result += Unicode::narrowToWide("sponsored:\n");
+
+			for (iter = memberIds.begin(); iter != memberIds.end(); ++iter)
+			{
+				GuildMemberInfo const * const gmi = GuildInterface::getGuildMemberInfo(guildId, *iter);
+				if (!gmi)
+					continue;
+
+				if (gmi->m_permissions == static_cast<int>(GuildInterface::None))
+				{
+					// member id and name
+					gmiSpec = iter->getValueString();
+					gmiSpec += " (";
+					gmiSpec += gmi->m_name;
+
+					// inactive
+					if (!NameManager::getInstance().isPlayer(*iter))
+						gmiSpec += ", INACTIVE";
+
+					gmiSpec += "), ";
+
+					// member profession
+					gmiSpec += gmi->m_professionSkillTemplate;
+					gmiSpec += ", ";
+
+					// member level
+					snprintf(buffer, sizeof(buffer)-1, "%d", gmi->m_level);
+					buffer[sizeof(buffer)-1] = '\0';
+					gmiSpec += buffer;
+					gmiSpec += "\n";
+
+					result += Unicode::narrowToWide(gmiSpec);
+				}
+			}
+
+			if (sponsoredSize > 0)
+				result += Unicode::narrowToWide("Output format is: \"id (name), profession, level\"\n");
+
+			// enemies
+			result += Unicode::narrowToWide("\n");
+			result += Unicode::narrowToWide("enemies:\n");
+
+			std::vector<int> const & enemiesAToB = GuildInterface::getGuildEnemies(guildId);
+			std::vector<int> const & enemiesBToA = GuildInterface::getGuildsAtWarWith(guildId);
+
+			std::vector<int>::const_iterator iter2;
+			for (iter2 = enemiesAToB.begin(); iter2 != enemiesAToB.end(); ++iter2)
+			{
+				GuildInfo const * const geGuildInfo = GuildInterface::getGuildInfo(*iter2);
+				if (!geGuildInfo || geGuildInfo->m_name.empty())
+					continue;
+
+				if (std::find(enemiesBToA.begin(), enemiesBToA.end(), *iter2) == enemiesBToA.end())
+				{
+					snprintf(buffer, sizeof(buffer)-1, "this guild has declared war on guild %d (%s, %s)\n", *iter2, geGuildInfo->m_name.c_str(), geGuildInfo->m_abbrev.c_str());
+					buffer[sizeof(buffer)-1] = '\0';
+					result += Unicode::narrowToWide(buffer);
+				}
+				else
+				{
+					std::pair<int, time_t> const & killInfoAtoB = GuildInterface::getGuildEnemyKillInfo(guildId, *iter2);
+					std::pair<int, time_t> const & killInfoBtoA = GuildInterface::getGuildEnemyKillInfo(*iter2, guildId);
+					time_t const killInfoTime = std::max(killInfoAtoB.second, killInfoBtoA.second);
+
+					snprintf(buffer, sizeof(buffer)-1, "this guild is at war with guild %d (%s, %s) (%d kills vs %d kills as of %s)\n", *iter2, geGuildInfo->m_name.c_str(), geGuildInfo->m_abbrev.c_str(), killInfoAtoB.first, killInfoBtoA.first, ((killInfoTime > 0) ? CalendarTime::convertEpochToTimeStringLocal(killInfoTime).c_str() : "<no kills yet>"));
+					buffer[sizeof(buffer)-1] = '\0';
+					result += Unicode::narrowToWide(buffer);
+				}
+			}
+
+			for (iter2 = enemiesBToA.begin(); iter2 != enemiesBToA.end(); ++iter2)
+			{
+				GuildInfo const * const geGuildInfo = GuildInterface::getGuildInfo(*iter2);
+				if (!geGuildInfo || geGuildInfo->m_name.empty())
+					continue;
+
+				if (std::find(enemiesAToB.begin(), enemiesAToB.end(), *iter2) == enemiesAToB.end())
+				{
+					snprintf(buffer, sizeof(buffer)-1, "guild %d (%s, %s) has declared war on this guild\n", *iter2, geGuildInfo->m_name.c_str(), geGuildInfo->m_abbrev.c_str());
+					buffer[sizeof(buffer)-1] = '\0';
+					result += Unicode::narrowToWide(buffer);
+				}
+			}
+
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+	}
+	else if (isCommand(argv [0], "setGuildName"))
+	{
+		int const guildId = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+		std::string const guildName = Unicode::getTrim(Unicode::wideToNarrow(argv[2]), " \t");
+		bool const overrideReservedNameCheck = argv.size() == 4 && argv[3] == Unicode::narrowToWide("override");
+
+		std::string reasonReserved;
+		int existingGuildId;
+		char buffer[1024];
+		GuildInfo const * const gi = GuildInterface::getGuildInfo(guildId);
+
+		if (!gi || gi->m_name.empty())
+		{
+			snprintf(buffer, sizeof(buffer)-1, "no guild with guild id %d\n", guildId);
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else if ((guildName.size() < 1) || (guildName.size() > 25))
+		{
+			snprintf(buffer, sizeof(buffer)-1, "guild name (%s) must be between 1 and 25 characters in length\n", guildName.c_str());
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else if (!overrideReservedNameCheck && NameManager::getInstance().isNameReserved(Unicode::narrowToWide(guildName), reasonReserved))
+		{
+			snprintf(buffer, sizeof(buffer)-1, "guild name (%s) is reserved (", guildName.c_str());
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+			result += Unicode::narrowToWide(reasonReserved);
+			result += Unicode::narrowToWide(") - use 'override' as the last parameter to bypass this check\n");
+
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else if ((existingGuildId = GuildInterface::findGuild(guildName)) != 0)
+		{
+			snprintf(buffer, sizeof(buffer)-1, "guild name (%s) is already used as the name or abbreviation of guild %d\n", guildName.c_str(), existingGuildId);
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else
+		{
+			snprintf(buffer, sizeof(buffer)-1, "changing guild name for guild %d from (%s) to (%s)\n", guildId, gi->m_name.c_str(), guildName.c_str());
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+
+			GuildInterface::setGuildName(guildId, guildName);
+
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+	}
+	else if (isCommand(argv [0], "setGuildAbbrev"))
+	{
+		int const guildId = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+		std::string const guildAbbrev = Unicode::getTrim(Unicode::wideToNarrow(argv[2]), " \t");
+		std::string reasonReserved;
+		int existingGuildId;
+		char buffer[1024];
+		GuildInfo const * const gi = GuildInterface::getGuildInfo(guildId);
+
+		if (!gi || gi->m_name.empty())
+		{
+			snprintf(buffer, sizeof(buffer)-1, "no guild with guild id %d\n", guildId);
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else if ((guildAbbrev.size() < 1) || (guildAbbrev.size() > 5))
+		{
+			snprintf(buffer, sizeof(buffer)-1, "guild abbreviation (%s) must be between 1 and 5 characters in length\n", guildAbbrev.c_str());
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else if (NameManager::getInstance().isNameReserved(Unicode::narrowToWide(guildAbbrev), reasonReserved))
+		{
+			snprintf(buffer, sizeof(buffer)-1, "guild abbreviation (%s) is reserved (", guildAbbrev.c_str());
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+			result += Unicode::narrowToWide(reasonReserved);
+			result += Unicode::narrowToWide(")\n");
+
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else if ((existingGuildId = GuildInterface::findGuild(guildAbbrev)) != 0)
+		{
+			snprintf(buffer, sizeof(buffer)-1, "guild abbreviation (%s) is already used as the name or abbreviation of guild %d\n", guildAbbrev.c_str(), existingGuildId);
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else
+		{
+			snprintf(buffer, sizeof(buffer)-1, "changing guild abbreviation for guild %d from (%s) to (%s)\n", guildId, gi->m_abbrev.c_str(), guildAbbrev.c_str());
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+
+			GuildInterface::setGuildAbbrev(guildId, guildAbbrev);
+
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+	}
+	else if (isCommand(argv [0], "setGuildLeader"))
+	{
+		int const guildId = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+		NetworkId const leaderOid(Unicode::wideToNarrow(argv[2]));
+
+		char buffer[1024];
+		GuildInfo const * const gi = GuildInterface::getGuildInfo(guildId);
+
+		if (!gi || gi->m_name.empty())
+		{
+			snprintf(buffer, sizeof(buffer)-1, "no guild with guild id %d\n", guildId);
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else
+		{
+			// is new guild leader already current leader?
+			NetworkId const currentLeaderOid = GuildInterface::getGuildLeaderId(guildId);
+			if (currentLeaderOid == leaderOid)
+			{
+				snprintf(buffer, sizeof(buffer)-1, "%s is already the guild leader for guild %d\n", currentLeaderOid.getValueString().c_str(), guildId);
+				buffer[sizeof(buffer)-1] = '\0';
+				result += Unicode::narrowToWide(buffer);
+
+				result += getErrorMessage(argv[0], ERR_FAIL);
+			}
+			else
+			{
+				// is new guild leader an existing guild member or existing sponsored member?
+				GuildMemberInfo const * gmi = GuildInterface::getGuildMemberInfo(guildId, leaderOid);
+				if (gmi)
+				{
+					snprintf(buffer, sizeof(buffer)-1, "making existing guild %s %s (%s) the guild leader for guild %d\n", ((gmi->m_permissions == 0) ? "sponsored member" : "member"), leaderOid.getValueString().c_str(), gmi->m_name.c_str(), guildId);
+					buffer[sizeof(buffer)-1] = '\0';
+					result += Unicode::narrowToWide(buffer);
+
+					// make the existing guild member or existing sponsored member the guild leader
+					GuildInterface::setGuildLeader(guildId, leaderOid);
+
+					// set the new guild leader's permission to All
+					GuildInterface::setGuildMemberPermission(
+							guildId,
+							leaderOid,
+							(gmi->m_permissions | static_cast<int>(GuildInterface::AllAdministrativePermissions)));
+
+					// reset the previous guild leader's permission
+					GuildMemberInfo const * gmiPreviousGuildLeader = GuildInterface::getGuildMemberInfo(guildId, currentLeaderOid);
+					if (gmiPreviousGuildLeader)
+					{
+						GuildInterface::setGuildMemberPermission(
+							guildId,
+							currentLeaderOid,
+							(gmiPreviousGuildLeader->m_permissions & static_cast<int>(~(static_cast<unsigned int>(GuildInterface::AllAdministrativePermissions)))) | static_cast<int>(GuildInterface::Member));
+					}
+
+					result += getErrorMessage(argv[0], ERR_SUCCESS);
+				}
+				else
+				{
+					// new guild leader is not a guild member, so make a guild member first, then make guild leader
+					ServerObject const* o = dynamic_cast<ServerObject const*>(ServerWorld::findObjectByNetworkId(leaderOid));
+					CreatureObject const* c = (o ? o->asCreatureObject() : NULL);
+					PlayerObject const* p = (c ? PlayerCreatureController::getPlayerObject(c) : NULL);
+					if (o == NULL)
+					{
+						result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+					}
+					else if (c == NULL)
+					{
+						result += Unicode::narrowToWide("specified object is not a creature object\n");
+					}
+					else if (p == NULL)
+					{
+						result += Unicode::narrowToWide("specified object is not a character object\n");
+					}
+					else
+					{
+						std::string const objectName = Unicode::wideToNarrow(o->getAssignedObjectName());
+						if (objectName.empty())
+						{
+							result += Unicode::narrowToWide("could not determine character name for specified character object\n");
+						}
+						else
+						{
+							snprintf(buffer, sizeof(buffer)-1, "making %s (%s) the guild leader for guild %d\n", leaderOid.getValueString().c_str(), objectName.c_str(), guildId);
+							buffer[sizeof(buffer)-1] = '\0';
+							result += Unicode::narrowToWide(buffer);
+
+							// add the new guild leader
+							GuildInterface::addGuildCreatorMember(guildId, leaderOid);
+
+							// make a new guild leader
+							GuildInterface::setGuildLeader(guildId, leaderOid);
+
+							// reset the previous guild leader's permission
+							GuildMemberInfo const * gmiPreviousGuildLeader = GuildInterface::getGuildMemberInfo(guildId, currentLeaderOid);
+							if (gmiPreviousGuildLeader)
+							{
+								GuildInterface::setGuildMemberPermission(
+									guildId,
+									currentLeaderOid,
+									(gmiPreviousGuildLeader->m_permissions & static_cast<int>(~(static_cast<unsigned int>(GuildInterface::AllAdministrativePermissions)))) | static_cast<int>(GuildInterface::Member));
+							}
+
+							result += getErrorMessage(argv[0], ERR_SUCCESS);
+						}
+					}
+				}
+			}
+		}
+	}
+	else if (isCommand(argv [0], "findGuildMemberNameMismatch"))
+	{
+		char buffer[1024];
+		std::vector<int> guildIds;
+		std::string memberName;
+		int memberCount = 0;
+		int mismatchCount = 0;
+
+		GuildInterface::getAllGuildIds(guildIds);
+		for (std::vector<int>::const_iterator iterGuild = guildIds.begin(); iterGuild != guildIds.end(); ++iterGuild)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iterGuild);
+			if (gi && !gi->m_name.empty())
+			{
+				std::vector<NetworkId> memberIds;
+				GuildInterface::getGuildMemberIds(*iterGuild, memberIds);
+				for (std::vector<NetworkId>::const_iterator iterGuildMember = memberIds.begin(); iterGuildMember != memberIds.end(); ++iterGuildMember)
+				{
+					GuildMemberInfo const * const gmi = GuildInterface::getGuildMemberInfo(*iterGuild, *iterGuildMember);
+					if (!gmi)
+						continue;
+
+					++memberCount;
+
+					memberName = NameManager::getInstance().getPlayerFullName(*iterGuildMember);
+					if (memberName.empty())
+					{
+						CachedNetworkId memberId(*iterGuildMember);
+						ServerObject const * so = safe_cast<ServerObject const *>(memberId.getObject());
+						if (so)
+							memberName = Unicode::wideToNarrow(so->getAssignedObjectName());
+					}
+
+					if (!memberName.empty() && (memberName != gmi->m_name))
+					{
+						++mismatchCount;
+						snprintf(buffer, sizeof(buffer)-1, "object name (%s), guild member (%s, %s), guild %d (%s, %s)\n", memberName.c_str(), iterGuildMember->getValueString().c_str(), gmi->m_name.c_str(), *iterGuild, gi->m_name.c_str(), gi->m_abbrev.c_str());
+						buffer[sizeof(buffer)-1] = '\0';
+						result += Unicode::narrowToWide(buffer);
+					}
+				}
+			}
+		}
+
+		snprintf(buffer, sizeof(buffer)-1, "%d guild members searched, %d mismatches found\n", memberCount, mismatchCount);
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "findGuildLeaderPermissionMismatch"))
+	{
+		char buffer[1024];
+		std::vector<int> guildIds;
+		int leaderCount = 0;
+		int mismatchCount = 0;
+
+		GuildInterface::getAllGuildIds(guildIds);
+		for (std::vector<int>::const_iterator iterGuild = guildIds.begin(); iterGuild != guildIds.end(); ++iterGuild)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iterGuild);
+			if (gi && !gi->m_name.empty())
+			{
+				++leaderCount;
+
+				GuildMemberInfo const * const gmi = GuildInterface::getGuildMemberInfo(*iterGuild, gi->m_leaderId);
+				if (gmi)
+				{
+					if ((gmi->m_permissions & static_cast<int>(GuildInterface::AllAdministrativePermissions)) != static_cast<int>(GuildInterface::AllAdministrativePermissions))
+					{
+						++mismatchCount;
+						snprintf(buffer, sizeof(buffer)-1, "guild leader (%s, %s), guild %d (%s, %s), guild permission %d (%s)\n", gi->m_leaderId.getValueString().c_str(), gmi->m_name.c_str(), *iterGuild, gi->m_name.c_str(), gi->m_abbrev.c_str(), gmi->m_permissions, getGuildPermissionsText(gmi->m_permissions).c_str());
+						buffer[sizeof(buffer)-1] = '\0';
+						result += Unicode::narrowToWide(buffer);
+					}
+				}
+			}
+		}
+
+		snprintf(buffer, sizeof(buffer)-1, "%d guild leaders searched, %d mismatches found\n", leaderCount, mismatchCount);
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "findGuildLeaderMismatch"))
+	{
+		char buffer[1024];
+		std::vector<int> guildIds;
+		int guildCount = 0;
+		int mismatchCount = 0;
+
+		GuildInterface::getAllGuildIds(guildIds);
+		for (std::vector<int>::const_iterator iterGuild = guildIds.begin(); iterGuild != guildIds.end(); ++iterGuild)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iterGuild);
+			if (gi && !gi->m_name.empty())
+			{
+				++guildCount;
+
+				if (gi->m_leaderId.isValid())
+				{
+					GuildMemberInfo const * const gmi = GuildInterface::getGuildMemberInfo(*iterGuild, gi->m_leaderId);
+					if (!gmi)
+					{
+						++mismatchCount;
+						snprintf(buffer, sizeof(buffer)-1, "guild leader (%s) is not guild member, guild %d (%s, %s)\n", gi->m_leaderId.getValueString().c_str(), *iterGuild, gi->m_name.c_str(), gi->m_abbrev.c_str());
+						buffer[sizeof(buffer)-1] = '\0';
+						result += Unicode::narrowToWide(buffer);
+					}
+				}
+			}
+		}
+
+		snprintf(buffer, sizeof(buffer)-1, "%d guilds searched, %d guilds found where guild leader is not guild member\n", guildCount, mismatchCount);
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "findLeaderlessGuild"))
+	{
+		char buffer[1024];
+		std::vector<int> guildIds;
+		int guildCount = 0;
+		int mismatchCount = 0;
+
+		GuildInterface::getAllGuildIds(guildIds);
+		for (std::vector<int>::const_iterator iterGuild = guildIds.begin(); iterGuild != guildIds.end(); ++iterGuild)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iterGuild);
+			if (gi && !gi->m_name.empty())
+			{
+				++guildCount;
+
+				if (gi->m_leaderId.isValid())
+				{
+					if (!NameManager::getInstance().isPlayer(gi->m_leaderId))
+					{
+						++mismatchCount;
+						snprintf(buffer, sizeof(buffer)-1, "guild leader (%s) is not in DB, guild %d (%s, %s)\n", gi->m_leaderId.getValueString().c_str(), *iterGuild, gi->m_name.c_str(), gi->m_abbrev.c_str());
+						buffer[sizeof(buffer)-1] = '\0';
+						result += Unicode::narrowToWide(buffer);
+					}
+				}
+			}
+		}
+
+		snprintf(buffer, sizeof(buffer)-1, "%d guilds searched, %d guilds found where guild leader is not in DB\n", guildCount, mismatchCount);
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv [0], "findOrphanedGuild"))
+	{
+		char buffer[1024];
+		std::vector<int> guildIds;
+		int guildCount = 0;
+		int mismatchCount = 0;
+
+		GuildInterface::getAllGuildIds(guildIds);
+		for (std::vector<int>::const_iterator iterGuild = guildIds.begin(); iterGuild != guildIds.end(); ++iterGuild)
+		{
+			GuildInfo const * const gi = GuildInterface::getGuildInfo(*iterGuild);
+			if (gi && !gi->m_name.empty())
+			{
+				++guildCount;
+
+				if (!gi->m_leaderId.isValid())
+				{
+					++mismatchCount;
+					snprintf(buffer, sizeof(buffer)-1, "guild %d (%s, %s) has no leader\n", *iterGuild, gi->m_name.c_str(), gi->m_abbrev.c_str());
+					buffer[sizeof(buffer)-1] = '\0';
+					result += Unicode::narrowToWide(buffer);
+				}
+			}
+		}
+
+		snprintf(buffer, sizeof(buffer)-1, "%d guilds searched, %d guilds found with no guild leader\n", guildCount, mismatchCount);
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	return true;
+}	// ConsoleCommandParserGuild::performParsing
+
+//-----------------------------------------------------------------
+
+void ConsoleCommandParserGuildNamespace::buildGuildInfoSpec(int guildId, GuildInfo const & gi, std::string & giSpec, int & totalSize, int & totalSizeActive, int & totalSizeInactive, int & memberSize, int & memberSizeActive, int & memberSizeInactive, int & sponsoredSize, int & sponsoredSizeActive, int & sponsoredSizeInactive)
+{
+	giSpec.clear();
+	totalSize = 0;
+	memberSize = 0;
+	sponsoredSize = 0;
+
+	if (gi.m_name.empty())
+		return;
+
+	char buffer[1024];
+
+	// guild id
+	snprintf(buffer, sizeof(buffer)-1, "%d", guildId);
+	buffer[sizeof(buffer)-1] = '\0';
+
+	giSpec = buffer;
+	giSpec += ", ";
+
+	// guild name
+	giSpec += gi.m_name;
+	giSpec += ", ";
+
+	// guild abbreviation
+	giSpec += gi.m_abbrev;
+	giSpec += ", ";
+
+	// guild leader id
+	giSpec += gi.m_leaderId.getValueString();
+	giSpec += ", ";
+
+	// guild leader name
+	GuildMemberInfo const * const gmi = GuildInterface::getGuildMemberInfo(guildId, gi.m_leaderId);
+	if (gmi)
+		giSpec += gmi->m_name;
+
+	giSpec += ", ";
+
+	// guild size
+	getGuildSize(guildId, gi, totalSize, totalSizeActive, totalSizeInactive, memberSize, memberSizeActive, memberSizeInactive, sponsoredSize, sponsoredSizeActive, sponsoredSizeInactive);
+
+	snprintf(buffer, sizeof(buffer)-1, "%d (%d/%d), %d (%d/%d), %d (%d/%d)", totalSize, totalSizeActive, totalSizeInactive, memberSize, memberSizeActive, memberSizeInactive, sponsoredSize, sponsoredSizeActive, sponsoredSizeInactive);
+	buffer[sizeof(buffer)-1] = '\0';
+
+	giSpec += buffer;
+}
+
+// ----------------------------------------------------------------------
+
+void ConsoleCommandParserGuildNamespace::getGuildSize(int guildId, GuildInfo const & gi, int & total, int & totalActive, int & totalInactive, int & member, int & memberActive, int & memberInactive, int & sponsored, int & sponsoredActive, int & sponsoredInactive)
+{
+	total = 0;
+	totalActive = 0;
+	totalInactive = 0;
+
+	member = 0;
+	memberActive = 0;
+	memberInactive = 0;
+
+	sponsored = 0;
+	sponsoredActive = 0;
+	sponsoredInactive = 0;
+
+	if (gi.m_name.empty())
+		return;
+
+	std::vector<NetworkId> memberIds;
+	GuildInterface::getGuildMemberIds(guildId, memberIds);
+	if (memberIds.empty())
+		return;
+
+	bool active;
+	for (std::vector<NetworkId>::const_iterator iter = memberIds.begin(); iter != memberIds.end(); ++iter)
+	{
+		GuildMemberInfo const * const gmi = GuildInterface::getGuildMemberInfo(guildId, *iter);
+		if (!gmi)
+			continue;
+
+		active = NameManager::getInstance().isPlayer(*iter);
+
+		++total;
+		if (active)
+			++totalActive;
+		else
+			++totalInactive;
+
+		if (gmi->m_permissions == static_cast<int>(GuildInterface::None))
+		{
+			++sponsored;
+			if (active)
+				++sponsoredActive;
+			else
+				++sponsoredInactive;
+		}
+		else
+		{
+			++member;
+			if (active)
+				++memberActive;
+			else
+				++memberInactive;
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+std::string const ConsoleCommandParserGuildNamespace::getGuildPermissionsText(int permissions)
+{
+	std::string result;
+	if (permissions == static_cast<int>(GuildInterface::None))
+	{
+		result = "None";
+	}
+	else
+	{
+		if ((permissions & static_cast<int>(GuildInterface::AllAdministrativePermissions)) == static_cast<int>(GuildInterface::AllAdministrativePermissions))
+		{
+			result = "All ";
+		}
+		else
+		{
+			if (permissions & static_cast<int>(GuildInterface::Member))
+				result += "Member ";
+			if (permissions & static_cast<int>(GuildInterface::Sponsor))
+				result += "Sponsor ";
+			if (permissions & static_cast<int>(GuildInterface::Disband))
+				result += "Disband ";
+			if (permissions & static_cast<int>(GuildInterface::Accept))
+				result += "Accept ";
+			if (permissions & static_cast<int>(GuildInterface::Kick))
+				result += "Kick ";
+			if (permissions & static_cast<int>(GuildInterface::Mail))
+				result += "Mail ";
+			if (permissions & static_cast<int>(GuildInterface::Title))
+				result += "Title ";
+			if (permissions & static_cast<int>(GuildInterface::Namechange))
+				result += "Namechange ";
+			if (permissions & static_cast<int>(GuildInterface::War))
+				result += "War ";
+			if (permissions & static_cast<int>(GuildInterface::Rank))
+				result += "Rank ";
+		}
+
+		if (permissions & static_cast<int>(GuildInterface::ElectionCandidate))
+			result += "ElectionCandidate ";
+
+		if (permissions & static_cast<int>(GuildInterface::WarInclusion))
+			result += "WarInclusion ";
+
+		if (permissions & static_cast<int>(GuildInterface::WarExclusion))
+			result += "WarExclusion ";
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const ConsoleCommandParserGuildNamespace::getFactionString(uint32 factionId)
+{
+	if (PvpData::isNeutralFactionId(factionId))
+		return "Neutral";
+	else if (PvpData::isImperialFactionId(factionId))
+		return "Imperial";
+	else if (PvpData::isRebelFactionId(factionId))
+		return "Rebel";
+
+	return "Unknown";
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserGuild.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserGuild.h
new file mode 100644
index 00000000..fb142bb7
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserGuild.h
@@ -0,0 +1,32 @@
+// ======================================================================
+//
+// ConsoleCommandParserGuild.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserGuild_H
+#define INCLUDED_ConsoleCommandParserGuild_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to the guild system.
+*/
+
+class ConsoleCommandParserGuild : public CommandParser
+{
+public:
+	                          ConsoleCommandParserGuild ();
+	virtual bool              performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node);
+	
+private:
+	                          ConsoleCommandParserGuild (const ConsoleCommandParserGuild & rhs);
+	ConsoleCommandParserGuild & operator= (const ConsoleCommandParserGuild & rhs);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserGuild_H
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserManufacture.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserManufacture.cpp
new file mode 100644
index 00000000..1b405dd1
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserManufacture.cpp
@@ -0,0 +1,484 @@
+// ======================================================================
+//
+// ConsoleCommandParserManufacture.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserManufacture.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ManufactureInstallationObject.h"
+#include "serverGame/ManufactureSchematicObject.h"
+#include "serverGame/ResourceContainerObject.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "sharedObject/VolumeContainer.h"
+#include "serverGame/ServerWorld.h"
+
+// ======================================================================
+
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"addIngredient",    2, "<station oid> <ingredient oid>", "add an ingredient to a station's input hopper"},
+	{"removeIngredient", 2, "<station oid> <ingredient oid>", "remove an ingredient from a station's input hopper"},
+	{"listIngredients",  1, "<oid>", "list the ingredients in a station's input hopper"},
+	{"addSchematic",     2, "<station oid> <schematic oid>", "add a manufacturing schematic to a station"},
+	{"removeSchematic",  1, "<station oid>", "remove the manufacturing schematic from a station"},
+	{"listSchematic",    1, "<station oid>", "list the manufacturing schematic of a station"},
+	{"start",            1, "<oid>", "starts a station manufacturing"},
+	{"stop",             1, "<oid>", "stops a station manufacturing"},
+	{"getObjects",       1, "<oid>", "puts all the objects in a station's output hopper in your inventory"},
+	{"listObjects",      1, "<oid>", "lists all the objects in a station's output hopper"},
+    {"", 0, "", ""} // this must be last
+};
+
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserManufacture::ConsoleCommandParserManufacture (void) :
+CommandParser ("manf", 0, "...", "Manufacture station commands.", 0)
+{
+    createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------
+
+
+bool ConsoleCommandParserManufacture::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+    NOT_NULL (node);
+    UNREF(originalCommand);
+
+	CreatureObject * playerObject = safe_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(userId));
+
+	//-----------------------------------------------------------------
+
+    if (isAbbrev( argv [0], "addIngredient"))
+    {
+		CachedNetworkId stationId(Unicode::wideToNarrow(argv[1]));
+		CachedNetworkId ingredientId(Unicode::wideToNarrow(argv[2]));
+		
+		ManufactureInstallationObject * station = dynamic_cast<ManufactureInstallationObject *>(stationId.getObject());
+		ServerObject * ingredient = safe_cast<ServerObject *>(ingredientId.getObject());
+
+		if (station == NULL || ingredient == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		if (station->isActive())
+		{
+			result += getErrorMessage(argv[0], ERR_ACTIVE_MANF_STATION);
+			return true;
+		}
+
+		ServerObject * hopper = station->getInputHopper();
+		if (hopper == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		Container::ContainerErrorCode tmp = Container::CEC_Success;
+		if (ContainerInterface::transferItemToVolumeContainer(*hopper, *ingredient, playerObject, tmp))
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_CONTAINER_TRANSFER);
+    }
+
+	//-----------------------------------------------------------------
+
+    else if (isAbbrev( argv [0], "removeIngredient"))
+    {
+		CachedNetworkId stationId(Unicode::wideToNarrow(argv[1]));
+		CachedNetworkId ingredientId(Unicode::wideToNarrow(argv[2]));
+
+		ManufactureInstallationObject * station = dynamic_cast<ManufactureInstallationObject *>(stationId.getObject());
+		ServerObject * ingredient = safe_cast<ServerObject *>(ingredientId.getObject());
+
+		if (station == NULL || ingredient == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		if (station->isActive())
+		{
+			result += getErrorMessage(argv[0], ERR_ACTIVE_MANF_STATION);
+			return true;
+		}
+
+		ServerObject * hopper = station->getInputHopper();
+		if (hopper == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		if (hopper != ContainerInterface::getContainedByObject(*ingredient))
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		if (playerObject->getInventory() == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		Container::ContainerErrorCode tmp = Container::CEC_Success;				
+		if (ContainerInterface::transferItemToVolumeContainer(*playerObject->getInventory(), *ingredient, playerObject, tmp))
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_CONTAINER_TRANSFER);
+    }
+
+	//-----------------------------------------------------------------
+
+	else if (isAbbrev( argv [0], "listIngredients"))
+	{
+		CachedNetworkId stationId(Unicode::wideToNarrow(argv[1]));
+		
+		ManufactureInstallationObject * station = dynamic_cast<ManufactureInstallationObject *>(stationId.getObject());
+
+		if (station == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		if (station->isActive())
+		{
+			result += getErrorMessage(argv[0], ERR_ACTIVE_MANF_STATION);
+			return true;
+		}
+
+		ServerObject * hopper = station->getInputHopper();
+		if (hopper == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		VolumeContainer * container = ContainerInterface::getVolumeContainer(*hopper);
+		if (container == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		ContainerIterator iter = container->begin();
+		while (iter != container->end())
+		{
+			const Container::ContainedItem & itemId = *iter;
+			if (itemId.getObject() != NULL)
+			{
+				const ServerObject * item = safe_cast<const ServerObject *>(itemId.getObject());
+				result += Unicode::narrowToWide("(");
+				result += Unicode::narrowToWide(itemId.getValueString());
+				result += Unicode::narrowToWide(") - ");
+				const ResourceContainerObject * crate = dynamic_cast<
+					const ResourceContainerObject *>(item);
+				if (crate != NULL)
+				{
+					char buffer[32];
+					_itoa(crate->getQuantity(), buffer, 10);
+					result += Unicode::narrowToWide(buffer);
+					result += Unicode::narrowToWide(" units of resource ");
+					ResourceTypeObject const * const resourceType = crate->getResourceType();
+					if (resourceType)
+					{
+						result += Unicode::narrowToWide(resourceType->getResourceName());
+					}
+					else
+					{
+						result += Unicode::narrowToWide("<unknown type>");
+					}
+				}
+				else
+				{
+					result += item->getObjectName();
+				}
+				result += Unicode::narrowToWide("\n");
+			}
+			else
+			{
+				result += Unicode::narrowToWide("(");
+				result += Unicode::narrowToWide(itemId.getValueString());
+				result += Unicode::narrowToWide(") - unknown name\n");
+			}
+
+			++iter;
+		}
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	//-----------------------------------------------------------------
+
+    else if (isAbbrev( argv [0], "addSchematic"))
+    {
+		CachedNetworkId stationId(Unicode::wideToNarrow(argv[1]));
+		CachedNetworkId schematicId(Unicode::wideToNarrow(argv[2]));
+		
+		ManufactureInstallationObject * station = dynamic_cast<ManufactureInstallationObject *>(stationId.getObject());
+		ManufactureSchematicObject * schematic = dynamic_cast<ManufactureSchematicObject *>(schematicId.getObject());
+
+		if (station == NULL || schematic == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		if (station->isActive())
+		{
+			result += getErrorMessage(argv[0], ERR_ACTIVE_MANF_STATION);
+			return true;
+		}
+
+//		if (station->addSchematic(*schematic, playerObject))
+		if (station->addSchematic(*schematic, NULL))
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_CONTAINER_TRANSFER);			
+    }
+
+	//-----------------------------------------------------------------
+
+    else if (isAbbrev( argv [0], "removeSchematic"))
+    {
+		CachedNetworkId stationId(Unicode::wideToNarrow(argv[1]));
+		
+		ManufactureInstallationObject * station = dynamic_cast<ManufactureInstallationObject *>(stationId.getObject());
+
+		if (station == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		if (station->isActive())
+		{
+			result += getErrorMessage(argv[0], ERR_ACTIVE_MANF_STATION);
+			return true;
+		}
+
+		ManufactureSchematicObject * schematic = station->getSchematic();
+		if (schematic != NULL)
+		{
+			if (playerObject->getDatapad() == NULL)
+			{
+				result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+				return true;
+			}
+			Container::ContainerErrorCode tmp = Container::CEC_Success;					
+			if (ContainerInterface::transferItemToVolumeContainer(*playerObject->getDatapad(), *schematic, playerObject, tmp))
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+			else
+				result += getErrorMessage(argv[0], ERR_INVALID_CONTAINER_TRANSFER);			
+		}
+		else
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+    }
+
+	//-----------------------------------------------------------------
+
+    else if (isAbbrev( argv [0], "listSchematic"))
+    {
+		CachedNetworkId stationId(Unicode::wideToNarrow(argv[1]));
+		
+		ManufactureInstallationObject * station = dynamic_cast<ManufactureInstallationObject *>(stationId.getObject());
+
+		if (station == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		if (station->isActive())
+		{
+			result += getErrorMessage(argv[0], ERR_ACTIVE_MANF_STATION);
+			return true;
+		}
+
+		ManufactureSchematicObject * schematic = station->getSchematic();
+		if (schematic != NULL)
+		{
+			result += Unicode::narrowToWide("(");
+			result += Unicode::narrowToWide(schematic->getNetworkId().getValueString());
+			result += Unicode::narrowToWide(") - ");
+			result += schematic->getObjectName();
+			result += Unicode::narrowToWide("\n");
+		}
+		else
+			result += Unicode::narrowToWide("no schematic in station\n");
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+    }
+
+	//-----------------------------------------------------------------
+
+    else if (isAbbrev( argv [0], "start"))
+    {
+		CachedNetworkId stationId(Unicode::wideToNarrow(argv[1]));
+		
+		ManufactureInstallationObject * station = dynamic_cast<ManufactureInstallationObject *>(stationId.getObject());
+		
+		if (station == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		}
+		else
+		{
+			station->activate(NetworkId::cms_invalid);
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+    }
+
+	//-----------------------------------------------------------------
+
+	else if (isAbbrev( argv [0], "stop"))
+	{
+		CachedNetworkId stationId(Unicode::wideToNarrow(argv[1]));
+
+		ManufactureInstallationObject * station = dynamic_cast<ManufactureInstallationObject *>(stationId.getObject());
+
+		if (station == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		}
+		else
+		{
+			station->deactivate();
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+	}
+
+	//-----------------------------------------------------------------
+
+    else if (isAbbrev( argv [0], "getObjects"))
+    {
+		ServerObject * myInventory = playerObject->getInventory();
+		if (myInventory == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CachedNetworkId stationId(Unicode::wideToNarrow(argv[1]));
+
+		ManufactureInstallationObject * station = dynamic_cast<ManufactureInstallationObject *>(stationId.getObject());
+
+		if (station == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		ServerObject * hopper = station->getOutputHopper();
+		if (hopper == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		VolumeContainer * container = ContainerInterface::getVolumeContainer(*hopper);
+		if (container == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		Container::ContainerErrorCode tmp = Container::CEC_Success;
+		ContainerIterator iter = container->begin();
+		while (iter != container->end())
+		{
+			const Container::ContainedItem & itemId = *iter;
+			if (itemId.getObject() != NULL)
+			{
+				ContainerInterface::transferItemToVolumeContainer (*myInventory, *safe_cast<ServerObject *>(itemId.getObject()), playerObject, tmp);
+			}
+			else
+			{
+				result += Unicode::narrowToWide("No object for id ");
+				result += Unicode::narrowToWide(itemId.getValueString());
+				result += Unicode::narrowToWide("!\n");
+			}
+
+			++iter;
+		}
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+    }
+
+	//-----------------------------------------------------------------
+
+    else if (isAbbrev( argv [0], "listObjects"))
+    {
+		CachedNetworkId stationId(Unicode::wideToNarrow(argv[1]));
+
+		ManufactureInstallationObject * station = dynamic_cast<ManufactureInstallationObject *>(stationId.getObject());
+
+		if (station == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		ServerObject * hopper = station->getOutputHopper();
+		if (hopper == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		VolumeContainer * container = ContainerInterface::getVolumeContainer(*hopper);
+		if (container == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		ContainerIterator iter = container->begin();
+		while (iter != container->end())
+		{
+			const Container::ContainedItem & itemId = *iter;
+			if (itemId.getObject() != NULL)
+			{
+				const ServerObject * item = safe_cast<const ServerObject *>(itemId.getObject());
+				result += Unicode::narrowToWide("(");
+				result += Unicode::narrowToWide(itemId.getValueString());
+				result += Unicode::narrowToWide(") - ");
+				result += item->getObjectName();
+				result += Unicode::narrowToWide("\n");
+			}
+			else
+			{
+				result += Unicode::narrowToWide("(");
+				result += Unicode::narrowToWide(itemId.getValueString());
+				result += Unicode::narrowToWide(") - unknown name\n");
+			}
+
+			++iter;
+		}		
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+    }
+
+	//-----------------------------------------------------------------
+
+    else
+    {
+        result += getErrorMessage(argv[0], ERR_NO_HANDLER);
+    }
+
+    return true;
+}
+
+
+// ======================================================================
+
+
+
+
+
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserManufacture.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserManufacture.h
new file mode 100644
index 00000000..d8fe5868
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserManufacture.h
@@ -0,0 +1,48 @@
+// ======================================================================
+//
+// ConsoleCommandParserManufacture.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserManufacture_H
+#define INCLUDED_ConsoleCommandParserManufacture_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to scripts
+*/
+
+class ConsoleCommandParserManufacture : public CommandParser
+{
+public:
+    ConsoleCommandParserManufacture ();
+    virtual bool performParsing (const NetworkId & userId, 
+								 const StringVector_t & argv,
+                                 const String_t & originalCommand,
+                                 String_t & result,
+                                 const CommandParser * node);
+	
+private:
+    ConsoleCommandParserManufacture (const ConsoleCommandParserManufacture & rhs);
+    ConsoleCommandParserManufacture &  operator= (const ConsoleCommandParserManufacture & rhs);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserManufacture_H
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserMessageTo.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserMessageTo.cpp
new file mode 100644
index 00000000..7e7c8959
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserMessageTo.cpp
@@ -0,0 +1,104 @@
+// ======================================================================
+//
+// ConsoleCommandParserMessageTo.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserMessageTo.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/ServerObject.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedObject/NetworkIdManager.h"
+
+//-----------------------------------------------------------------------
+
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"listMessages",  1,"<object id>","Print a list of all the messages queued for the specified object."},
+	{"cancelMessage",  2,"<object id> <message name>","Cancel all instances of a specific message pending for a specific object.  USE WITH CAUTION."},
+	{"cancelMessageById", 2,"<object id> <message id>","Cancel a specific message pending for a specific object.  USE WITH CAUTION."},
+	{"viewLastKnownLocations",  0,"","Print a list of the last known locations of objects."},
+	{"viewScheduler",  0,"","Print the state of the object scheduler in MessageToQueue."},
+	{"",                    0, "", ""} // this must be last
+};
+
+ConsoleCommandParserMessageTo::ConsoleCommandParserMessageTo() :
+		CommandParser ("messageto", 0, "...", "commands for the MessageTo system", 0)
+{
+	createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------------
+
+bool ConsoleCommandParserMessageTo::performParsing (const NetworkId & /*userId*/, const StringVector_t & argv, const String_t & /* originalMessage */, String_t & result, const CommandParser *)
+{
+	if (isCommand( argv [0], "viewLastKnownLocations"))
+	{
+		result += Unicode::narrowToWide(MessageToQueue::getInstance().debugGetLastKnownLocations());
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	if (isCommand( argv [0], "viewScheduler"))
+	{
+		char temp[256];
+		snprintf(temp,sizeof(temp),"Current time is %li\n",ServerClock::getInstance().getGameTimeSeconds());
+		result += Unicode::narrowToWide(temp);
+		result += Unicode::narrowToWide(MessageToQueue::getInstance().debugGetSchedulerData());
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	if (isCommand( argv [0], "listMessages"))
+	{
+		NetworkId networkId(Unicode::wideToNarrow (argv[1]));
+		ServerObject const * const object = safe_cast<ServerObject const *>(NetworkIdManager::getObjectById(networkId));
+		if (object)
+		{
+			char temp[256];
+			snprintf(temp,sizeof(temp),"Current time is %li\n",ServerClock::getInstance().getGameTimeSeconds());
+			result += Unicode::narrowToWide(temp);
+			result += Unicode::narrowToWide(object->debugGetMessageToList());
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+			result += getErrorMessage(argv[0],ERR_INVALID_OBJECT);
+	}
+	if (isCommand( argv [0], "cancelMessage"))
+	{
+		NetworkId networkId(Unicode::wideToNarrow (argv[1]));
+		std::string message(Unicode::wideToNarrow (argv[2]));
+		ServerObject * const object = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(networkId));
+		if (object)
+		{
+			char buffer[255];
+			snprintf(buffer,sizeof(buffer)-1,"%i messages cancelled\n", object->cancelMessageTo(message));
+			buffer[sizeof(buffer)-1]='\0';
+			result += Unicode::narrowToWide(buffer);
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+			result += getErrorMessage(argv[0],ERR_INVALID_OBJECT);
+	}
+	if (isCommand( argv [0], "cancelMessageById"))
+	{
+		NetworkId networkId(Unicode::wideToNarrow (argv[1]));
+		NetworkId messageId(Unicode::wideToNarrow (argv[2]));
+		ServerObject * const object = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(networkId));
+		if (object)
+		{
+			char buffer[255];
+			snprintf(buffer,sizeof(buffer)-1,"%i messages cancelled\n", object->cancelMessageToByMessageId(messageId));
+			buffer[sizeof(buffer)-1]='\0';
+			result += Unicode::narrowToWide(buffer);
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+			result += getErrorMessage(argv[0],ERR_INVALID_OBJECT);
+	}
+
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserMessageTo.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserMessageTo.h
new file mode 100644
index 00000000..6f077ea0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserMessageTo.h
@@ -0,0 +1,32 @@
+// ======================================================================
+//
+// ConsoleCommandParserMessageTo.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserMessageTo_H
+#define INCLUDED_ConsoleCommandParserMessageTo_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to the MessageTo system.
+*/
+
+class ConsoleCommandParserMessageTo : public CommandParser
+{
+public:
+	                          ConsoleCommandParserMessageTo ();
+	virtual bool              performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node);
+	
+private:
+	                          ConsoleCommandParserMessageTo (const ConsoleCommandParserMessageTo & rhs);
+	ConsoleCommandParserMessageTo &  operator= (const ConsoleCommandParserMessageTo & rhs);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserMessageTo_H
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserMoney.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserMoney.cpp
new file mode 100644
index 00000000..33801387
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserMoney.cpp
@@ -0,0 +1,236 @@
+// ======================================================================
+//
+// ConsoleCommandParserMoney.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserMoney.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ServerObject.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "UnicodeUtils.h"
+
+#include <stdio.h>
+
+// ======================================================================
+
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"balance",1,"<oid>","Show how much money an object has (cash and bank)."},
+	{"bankTransfer",3,"<source oid> <target oid> <amount>","Transfers bank credits from one object to another."},
+	{"cashTransfer",3,"<source oid> <target oid> <amount>","Transfers cash from one object to another."},
+	{"deposit",2,"<oid> <amount>","Deposit money to the bank."},
+	{"namedTransfer",3,"<source oid> <target account> <amount>","Transfers bank credits from an object to a named account."},
+	{"withdraw",2,"<oid> <amount>","Withdraw money from the bank."},
+	{"setGalacticReserve",2,"<oid> <amount>","Sets the galactic reserve balance (in billion of credits) for the specified player character object."},
+	{"", 0, "", ""} // this must be last
+};
+
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserMoney::ConsoleCommandParserMoney (void) :
+CommandParser ("money", 0, "...", "Money related commands.", 0)
+{
+	createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------
+
+
+bool ConsoleCommandParserMoney::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+	NOT_NULL (node);
+	UNREF (userId);
+
+	UNREF(originalCommand);
+
+	//-----------------------------------------------------------------
+
+	if (isAbbrev( argv [0], "cashTransfer"))
+	{
+		NetworkId sourceId(Unicode::wideToNarrow (argv[1]));
+		NetworkId targetId(Unicode::wideToNarrow (argv[2]));
+		int amount(strtoul(Unicode::wideToNarrow (argv[3]).c_str (), NULL, 10));
+
+		ServerObject* source = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(sourceId));
+		if (!source)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		if (source->transferCashTo(targetId,amount))
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_CONTAINER_TRANSFER);
+	}
+	else if (isAbbrev( argv [0], "bankTransfer"))
+	{
+		NetworkId sourceId(Unicode::wideToNarrow (argv[1]));
+		NetworkId targetId(Unicode::wideToNarrow (argv[2]));
+		int amount(strtoul(Unicode::wideToNarrow (argv[3]).c_str (), NULL, 10));
+
+		ServerObject* source = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(sourceId));
+		if (!source)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		if (source->transferBankCreditsTo(targetId,amount))
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_CONTAINER_TRANSFER);
+	}
+	else if (isAbbrev( argv [0], "namedTransfer"))
+	{
+		NetworkId sourceId(Unicode::wideToNarrow (argv[1]));
+		int amount(strtol(Unicode::wideToNarrow (argv[3]).c_str (), NULL, 10));
+
+		ServerObject* source = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(sourceId));
+		if (!source)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		if (amount > 0)
+		{
+			if (source->transferBankCreditsTo(Unicode::wideToNarrow(argv[2]),amount))
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+			else
+				result += getErrorMessage(argv[0], ERR_INVALID_CONTAINER_TRANSFER);
+		}
+		else
+		{
+			if (source->transferBankCreditsFrom(Unicode::wideToNarrow(argv[2]),-amount))
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+			else
+				result += getErrorMessage(argv[0], ERR_INVALID_CONTAINER_TRANSFER);
+		}	
+	}
+	else if (isAbbrev( argv [0], "withdraw"))
+	{
+		NetworkId sourceId(Unicode::wideToNarrow (argv[1]));
+		int amount(strtoul(Unicode::wideToNarrow (argv[2]).c_str (), NULL, 10));
+
+		ServerObject* source = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(sourceId));
+		if (!source)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		if (source->withdrawCashFromBank(amount))
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_CONTAINER_TRANSFER);
+	}
+	else if (isAbbrev( argv [0], "deposit"))
+	{
+		NetworkId sourceId(Unicode::wideToNarrow (argv[1]));
+		int amount(strtoul(Unicode::wideToNarrow (argv[2]).c_str (), NULL, 10));
+
+		ServerObject* source = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(sourceId));
+		if (!source)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		if (source->depositCashToBank(amount))
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_CONTAINER_TRANSFER);
+	}
+	else if (isAbbrev( argv [0], "balance"))
+	{
+		NetworkId objectId(Unicode::wideToNarrow (argv[1]));
+		ServerObject const * const object = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(objectId));
+		if (!object)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		char buffer[30];
+		sprintf(buffer,"%i",object->getCashBalance());
+		result += Unicode::narrowToWide("Cash ") + Unicode::narrowToWide(buffer) + Unicode::narrowToWide("\n");
+		sprintf(buffer,"%i",object->getBankBalance());
+		result += Unicode::narrowToWide("Bank ") + Unicode::narrowToWide(buffer) + Unicode::narrowToWide("\n");
+		sprintf(buffer,"%i",object->getTotalMoney());
+		result += Unicode::narrowToWide("Total ") + Unicode::narrowToWide(buffer) + Unicode::narrowToWide("\n");
+
+		PlayerObject const * const po = PlayerCreatureController::getPlayerObject(object->asCreatureObject());
+		if (po)
+		{
+			sprintf(buffer,"%i",static_cast<int>(po->getGalacticReserveDeposit()));
+			result += Unicode::narrowToWide("Galactic Reserve ") + Unicode::narrowToWide(buffer) + Unicode::narrowToWide("\n");
+		}
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev( argv [0], "setGalacticReserve"))
+	{
+		int const newGalacticReserve(strtoul(Unicode::wideToNarrow (argv[2]).c_str (), NULL, 10));
+		if ((newGalacticReserve < 0) || (newGalacticReserve > ConfigServerGame::getMaxGalacticReserveDepositBillion()))
+		{
+			result += Unicode::narrowToWide(FormattedString<1024>().sprintf("specified galactic reserve balance (%d) must be in the (inclusive) range (0, %d)\n", newGalacticReserve, ConfigServerGame::getMaxGalacticReserveDepositBillion()));
+			return true;
+		}
+
+		NetworkId const id(Unicode::wideToNarrow (argv[1]));
+		ServerObject * const so = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(id));
+		if (!so)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		PlayerObject * const po = PlayerCreatureController::getPlayerObject(so->asCreatureObject());
+		if (!po)
+		{
+			result += Unicode::narrowToWide(FormattedString<1024>().sprintf("object (%s) is not a player character object\n", so->getNetworkId().getValueString().c_str()));
+			return true;
+		}
+
+		if (!so->isAuthoritative() || !po->isAuthoritative())
+		{
+			result += Unicode::narrowToWide(FormattedString<1024>().sprintf("object (%s) is not authoritative\n", so->getNetworkId().getValueString().c_str()));
+			return true;
+		}
+
+		int currentGalacticReserve = 0;
+		if (!so->getObjVars().getItem("galactic_reserve", currentGalacticReserve))
+		{
+			currentGalacticReserve = 0;
+		}
+
+		if (currentGalacticReserve != newGalacticReserve)
+		{
+			result += Unicode::narrowToWide(FormattedString<1024>().sprintf("modifying player character object (%s) galactic reserve balance from (%d) to (%d)\n", so->getNetworkId().getValueString().c_str(), currentGalacticReserve, newGalacticReserve));
+
+			if (newGalacticReserve > 0)
+				so->setObjVarItem("galactic_reserve", newGalacticReserve);
+			else
+				so->removeObjVarItem("galactic_reserve");
+
+			po->depersistGalacticReserveDeposit();
+		}
+		else
+		{
+			result += Unicode::narrowToWide(FormattedString<1024>().sprintf("player character object (%s) already has a galactic reserve balance of (%d)\n", so->getNetworkId().getValueString().c_str(), newGalacticReserve));
+		}
+	}
+	else
+	{
+		result += getErrorMessage(argv[0], ERR_NO_HANDLER);
+	}
+
+	return true;
+}	// ConsoleCommandParserMoney::performParsing
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserMoney.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserMoney.h
new file mode 100644
index 00000000..32e691df
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserMoney.h
@@ -0,0 +1,32 @@
+// ======================================================================
+//
+// ConsoleCommandParserMoney.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserMoney_H
+#define INCLUDED_ConsoleCommandParserMoney_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to the resource system.
+*/
+
+class ConsoleCommandParserMoney : public CommandParser
+{
+public:
+	                          ConsoleCommandParserMoney ();
+	virtual bool              performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node);
+	
+private:
+	                          ConsoleCommandParserMoney (const ConsoleCommandParserMoney & rhs);
+	ConsoleCommandParserMoney &  operator= (const ConsoleCommandParserMoney & rhs);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserMoney_H
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserNpc.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserNpc.cpp
new file mode 100644
index 00000000..929f6413
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserNpc.cpp
@@ -0,0 +1,106 @@
+// ======================================================================
+//
+// ConsoleCommandParserNpc.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserNpc.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/CreatureObject.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ServerWorld.h"
+
+
+// ======================================================================
+
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"hail",    1, "<oid>",        "Hail an NPC"},
+	{"goodbye", 0, "",             "End the current conversation"},
+	{"respond", 1, "<response #>", "Select a conversation response"},
+    {"", 0, "", ""} // this must be last
+};
+
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserNpc::ConsoleCommandParserNpc (void) :
+CommandParser ("npc", 0, "...", "NPC related commands.", 0)
+{
+    createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------
+
+
+bool ConsoleCommandParserNpc::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+    NOT_NULL (node);
+    UNREF (userId);
+
+    UNREF(originalCommand);
+
+	//-----------------------------------------------------------------
+
+    if (isAbbrev( argv [0], "hail"))
+    {
+		TangibleObject * const playerObject = safe_cast<TangibleObject *>(ServerWorld::findObjectByNetworkId(userId));
+
+		NetworkId const oid(Unicode::wideToNarrow(argv[1]));
+        ServerObject * const object = ServerWorld::findObjectByNetworkId(oid);
+        if (object == NULL)
+        {
+            result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+            return true;
+        }
+		TangibleObject * const npc = object->asTangibleObject();
+		if (npc == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+            return true;
+		}
+
+		playerObject->startNpcConversation(*npc, NULL, NpcConversationData::CS_Player, 0);
+        result += getErrorMessage (argv[0], ERR_SUCCESS);
+    }
+
+	//-----------------------------------------------------------------
+
+    else if (isAbbrev( argv [0], "goodbye"))
+    {
+		TangibleObject * const playerObject = safe_cast<TangibleObject *>(ServerWorld::findObjectByNetworkId(userId));
+		playerObject->endNpcConversation();
+        result += getErrorMessage (argv[0], ERR_SUCCESS);
+    }
+
+	//-----------------------------------------------------------------
+
+    else if (isAbbrev( argv [0], "respond"))
+    {
+		TangibleObject * const playerObject = safe_cast<TangibleObject *>(ServerWorld::findObjectByNetworkId(userId));
+		int const response = strtol(Unicode::wideToNarrow(argv[1]).c_str (), NULL, 10);
+		playerObject->respondToNpc(response);
+        result += getErrorMessage (argv[0], ERR_SUCCESS);
+    }
+
+	//-----------------------------------------------------------------
+
+    else
+    {
+        result += getErrorMessage(argv[0], ERR_NO_HANDLER);
+    }
+
+    return true;
+}
+
+
+// ======================================================================
+
+
+
+
+
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserNpc.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserNpc.h
new file mode 100644
index 00000000..b76fc7a1
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserNpc.h
@@ -0,0 +1,48 @@
+// ======================================================================
+//
+// ConsoleCommandParserNpc.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserNpc_H
+#define INCLUDED_ConsoleCommandParserNpc_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to scripts
+*/
+
+class ConsoleCommandParserNpc : public CommandParser
+{
+public:
+    ConsoleCommandParserNpc ();
+    virtual bool performParsing (const NetworkId & userId, 
+								 const StringVector_t & argv,
+                                 const String_t & originalCommand,
+                                 String_t & result,
+                                 const CommandParser * node);
+	
+private:
+    ConsoleCommandParserNpc (const ConsoleCommandParserNpc & rhs);
+    ConsoleCommandParserNpc &  operator= (const ConsoleCommandParserNpc & rhs);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserNpc_H
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObject.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObject.cpp
new file mode 100644
index 00000000..83b60902
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObject.cpp
@@ -0,0 +1,4261 @@
+// ======================================================================
+//
+// ConsoleCommandParserObject.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserObject.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/BattlefieldMarkerObject.h"
+#include "serverGame/BuildingObject.h"
+#include "serverGame/Chat.h"
+#include "serverGame/Client.h"
+#include "serverGame/CommandQueue.h"
+#include "serverGame/CommoditiesMarket.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ConsentManager.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/InstallationObject.h"
+#include "serverGame/IntangibleObject.h"
+#include "serverGame/MoveSimManager.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/NewbieTutorial.h"
+#include "serverGame/ObjectCommandParserGetAttributes.h"
+#include "serverGame/ObjectCommandParserSetAttributes.h"
+#include "serverGame/PlayerCreationManagerServer.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ProsePackageManagerServer.h"
+#include "serverGame/Region.h"
+#include "serverGame/RegionMaster.h"
+#include "serverGame/ServerController.h"
+#include "serverGame/ServerManufactureSchematicObjectTemplate.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerShipObjectTemplate.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/TangibleObject.h"
+#include "serverGame/TriggerVolume.h"
+#include "serverGame/UniverseObject.h"
+#include "serverNetworkMessages/AccountFeatureIdRequest.h"
+#include "serverNetworkMessages/AdjustAccountFeatureIdRequest.h"
+#include "serverNetworkMessages/LocateStructureMessage.h"
+#include "serverNetworkMessages/ReloadTemplateMessage.h"
+#include "serverNetworkMessages/RenameCharacterMessage.h"
+#include "serverNetworkMessages/TransferCharacterData.h"
+#include "serverNetworkMessages/TransferCharacterDataArchive.h"
+#include "serverNetworkMessages/UnloadObjectMessage.h"
+#include "serverPathfinding/CityPathGraphManager.h"
+#include "serverPathfinding/PathAutoGenerator.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/LocationData.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedCollision/Footprint.h"
+#include "sharedFile/FileManifest.h"
+#include "sharedFoundation/CalendarTime.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/Crc.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/Production.h"
+#include "sharedGame/CommandTable.h"
+#include "sharedGame/PlatformFeatureBits.h"
+#include "sharedGame/PlayerData.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/SharedStringIds.h"
+#include "sharedLog/Log.h"
+#include "sharedMath/Quaternion.h"
+#include "sharedNetworkMessages/AIDebuggingMessages.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/MessageQueueDataTransform.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/ContainedByProperty.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/VolumeContainer.h"
+#include "sharedObject/VolumeContainmentProperty.h"
+#include "sharedSkillSystem/SkillObject.h"
+#include "sharedTerrain/TerrainObject.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+#include <cstdio>
+
+#if defined(_WIN32) && PRODUCTION == 0
+#include "sharedDebug/VTune.h"
+#endif
+
+namespace ConsoleCommandParserObjectNamespace
+{
+	//test handler, this should eventually be removed
+	void testConsentHandler(const NetworkId& player, int id, bool response)
+	{
+		int i = 0;
+		if (response == true)
+			i = 1;
+		DEBUG_REPORT_LOG(true, ("We received a test consent back with values NetworkId:%s Id:%d Response:%d\n", player.getValueString().c_str(), id, i));
+	}
+
+	ServerObjectTemplate const *getObjectTemplateForCreation(std::string const &templateName)
+	{
+		// only allow non-ship ServerObjectTemplates
+		ObjectTemplate const * const ot = ObjectTemplateList::fetch(templateName);
+		if (ot)
+		{
+			ServerObjectTemplate const * const sot = ot->asServerObjectTemplate();
+
+			if (!sot)
+			{
+				WARNING(true, ("ConsoleCommandParserObject invalid object template [%s]", templateName.c_str()));
+				ot->releaseReference();
+				return NULL;
+			}
+
+			if (sot->getId() == ServerShipObjectTemplate::ServerShipObjectTemplate_tag)
+			{
+				SharedObjectTemplate const * const sharedTemplate = safe_cast<SharedObjectTemplate const *>(ObjectTemplateList::fetch(sot->getSharedTemplate()));
+				if (NULL == sharedTemplate || 
+					(sharedTemplate->getGameObjectType() != SharedObjectTemplate::GOT_ship_mining_asteroid_dynamic &&
+					sharedTemplate->getGameObjectType() != SharedObjectTemplate::GOT_ship_mining_asteroid_static))
+				{
+					ot->releaseReference();
+					return NULL;
+				}
+			}
+			return sot;
+		}
+		return NULL;
+	}
+
+	void checkBadBuildClusterObject(ServerObject *& o)
+	{
+		if (   ConfigServerGame::getBuildCluster()
+		    && o
+		    && !o->asTangibleObject()
+		    && !o->asStaticObject())
+		{
+			o->permanentlyDestroy(DeleteReasons::SetupFailed);
+			o = 0;
+		}
+	}
+
+	typedef std::vector<std::string> StringVector;
+	typedef std::vector<std::string> StoredStrings;
+	typedef std::map<NetworkId , StoredStrings> PlayerStoredStringMap;
+	PlayerStoredStringMap s_playerObjectTemplateMap;
+	PlayerStoredStringMap s_playerCreatureNameMap;
+	int const MAX_STORED_STRINGS = 50;
+
+	std::string getStringShortcut(NetworkId const & userId, std::string const & tmpString, PlayerStoredStringMap const & playerStoredStringMap)
+	{
+		int stringIndex = 0;
+		sscanf(tmpString.c_str(), "%d", &stringIndex);
+		// decrement the string index so it starts at 0
+		--stringIndex;
+
+		// if no shortcut number was entered, return the original string
+		if (stringIndex < 0)
+			return tmpString;
+
+		PlayerStoredStringMap::const_iterator objectMapIter = playerStoredStringMap.find(userId);
+
+		if (objectMapIter != playerStoredStringMap.end())
+		{
+			const StoredStrings & storedStrings = objectMapIter->second;
+
+			if (stringIndex >= 0  && stringIndex < (int)storedStrings.size())
+			{
+				return storedStrings[stringIndex];
+			}
+		}
+
+		return tmpString;
+	}
+
+	std::string getObjectTemplateShortcut(NetworkId const & userId, std::string const & tmpString)
+	{
+		return getStringShortcut(userId, tmpString, s_playerObjectTemplateMap);
+	}
+
+	std::string getCreatureNameShortcut(NetworkId const & userId, std::string const & tmpString)
+	{
+		return getStringShortcut(userId, tmpString, s_playerCreatureNameMap);
+	}
+
+	char const * const s_creaureDataTable = "datatables/mob/creatures.iff";
+
+	typedef std::string (*searchNamesFormatterFunction) (std::string const & preFormattedString, int const index);
+
+	std::string searchNamesCreatureFormatter(std::string const & creatureName, int const index)
+	{
+		bool const openIfNotFound = true;
+		DataTable const * const dataTable = DataTableManager::getTable(s_creaureDataTable, openIfNotFound);
+
+		std::string result;
+
+		if (dataTable)
+		{
+			int const row = dataTable->searchColumnString(0, creatureName);
+
+			if (row > -1)
+			{
+				int const baseLevel = dataTable->getIntValue("BaseLevel", row);
+				int const difficultyClass = dataTable->getIntValue("difficultyClass", row);
+				std::string const socialGroup = dataTable->getStringValue("socialGroup", row);
+				std::string const pvpFaction = dataTable->getStringValue("pvpFaction", row);
+				bool const invulnerable = dataTable->getIntValue("invulnerable", row);
+				float const aggressive = dataTable->getFloatValue("aggressive", row);
+				float const assist = dataTable->getFloatValue("assist", row);
+				int const deathBlow = dataTable->getIntValue("death_blow", row);
+
+				FormattedString<512> fs;
+
+				result += fs.sprintf("\t%4d - L:%3d (%-7s) %s (%s,%s",
+					index, baseLevel,
+					difficultyClass == 0 ? "NORMAL" : difficultyClass == 1 ? "ELITE" : difficultyClass == 2 ? "BOSS" : "UNKNOWN",
+					creatureName.c_str(),
+					socialGroup.empty() ? "NONE" : socialGroup.c_str(),
+					pvpFaction.empty() ? "NONE" : pvpFaction.c_str());
+
+				if (aggressive > 0)
+					result += fs.sprintf(",AGGRO:%.0f", aggressive);
+
+				if (assist > 0)
+					result += fs.sprintf(",ASSIST:%.0f", assist);
+
+				if (deathBlow > 0)
+					result += ",DB";
+
+				if (invulnerable)
+					result += ",INV";
+
+				result += ")\n";
+			}
+		}
+
+		return result.empty() ? FormattedString<512>().sprintf("\t%4d - %s\n", index, creatureName.c_str()) : result;
+	}
+
+	std::string searchNamesDefaultFormatter(std::string const & preFormattedString, int const index)
+	{
+		return FormattedString<512>().sprintf("\t%4d - %s\n", index, preFormattedString.c_str());
+	}
+
+	//-- given a vector of string names
+	std::string searchNames(StringVector const & namesToSearch, StringVector const & desiredSubStrings,
+		char const * const exclusionString, StringVector & foundNames, searchNamesFormatterFunction formatterFunction = searchNamesDefaultFormatter)
+	{
+		std::string result;
+		bool tooManyEntries = false;
+
+		StringVector::const_iterator itName = namesToSearch.begin();
+		for (; itName != namesToSearch.end(); ++itName)
+		{
+			if (!itName->empty())
+			{
+				std::string const name(*itName);
+
+				// if it matches the exclusion string, skip
+				if (exclusionString && name.find(exclusionString) != std::string::npos)
+					continue;
+
+				// check all desired substrings
+				bool skipName = false;
+				for (int i = 0; i < (int)desiredSubStrings.size(); ++i)
+				{
+					if (name.find(desiredSubStrings[i]) == std::string::npos)
+					{
+						skipName = true;
+						break;
+					}
+				}
+
+				if (skipName)
+					continue;
+
+				// check for too many entries
+				if (foundNames.size() >= (int)MAX_STORED_STRINGS)
+				{
+					tooManyEntries = true;
+					break;
+				}
+
+				// otherwise, we have one we want, add it to the vector
+				foundNames.push_back(name);
+			}
+		}
+
+		if (foundNames.size() == 0)
+		{
+			result += "Unable to find any matching objects.\n";
+		}
+		else
+		{
+			std::sort(foundNames.begin(), foundNames.end());
+			for (int k = 0; k < (int)foundNames.size(); ++k)
+			{
+				result += formatterFunction ? formatterFunction(foundNames[k], k+1) : searchNamesDefaultFormatter(foundNames[k], k+1);
+			}
+
+			if (tooManyEntries)
+				result += "\tToo many entries!  Please refine search.\n";
+		}
+
+		return result;
+	}
+
+#ifdef USE_ALTERNATE_BUILD_REGION_CALCULATION
+	bool isInNoBuildRegion( real x, real y )
+	{
+		DEBUG_REPORT_LOG_PRINT( true, ( "isInNoBuildRegion: %f, %f\n", x, y ) );
+
+		RegionMaster::RegionVector v;
+		RegionMaster::getRegionsAtPoint( ConfigServerGame::getSceneID(), x, y, v );
+
+		RegionMaster::RegionVector::const_iterator it;
+
+		for ( it = v.begin(); it != v.end(); ++it )
+		{
+			DEBUG_REPORT_LOG_PRINT( true, ( "checking region '%s' %d\n", Unicode::wideToNarrow( (*it)->getName() ).c_str(), (*it)->getBuildable() ) );
+			if ( (*it)->getBuildable() == 0 )
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+#endif
+
+	std::set<std::string> s_unmoveable;
+}
+
+using namespace ConsoleCommandParserObjectNamespace;
+
+// ======================================================================
+
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"addLocationTarget",               6, "<oid> <name> <x> <y> <z> <radius>",  "Sets a location target for an object. onArrivedAtLocation will be triggered on the object, and messageHandler OnArrivedAtLocation() invoked on attached scripts."},
+	{"authority",                       2, "<oid> <gameserver process id>",      "Transfer authority of object <oid> to gameserver <id>."},
+	{"create",                          4, "<templatename> <x> <y> <z>",         "Create a new object."},
+	{"cellCreate",                      4, "<templatename> <cell> <x> <y> <z>",  "Create a new object in a cell."},
+	{"count",                           0, "",                           "Returns the number of objects allocated on this game server"},
+	{"createAt",                        1, "<templatename>",             "Create a new object where you are standing."},
+	{"createManyAt",                    2, "<count> <templatename>",     "Create new objects around where you are standing."},
+	{"createIn",                        2, "<templatename> <oid>",       "Create a new object in a container."},
+	{"createTranslateRotate",           8, "<templatename> <x> <y> <z> <quaternionW> <quaternionX> <quaternionY> <quaternionZ>", "Create a new object."},
+	{"cellCreateTranslateRotate",       8, "<templatename> <cell> <x> <y> <z> <quaternionW> <quaternionX> <quaternionY> <quaternionZ>", "Create a new object in a cell."},
+	{"createTriggerVolume",             3, "<oid> <name> <radius>",      "Create a new trigger volume on the specified object."},
+	{"destroy",                         1, "<oid>",                      "Destroy an existing object."},
+	{"destroyAllMobsExcept",            1, "<oid>",                      "Destroy all mobs except the given one."},
+	{"destroyAllWorldMobs",             0, "",                           "Destroy all mobs in the world cell."},
+	{"find",                            1, "<oid>",                      "Find the coords of an existing object."},
+	{"findCreature",                    1, "<string1> [string2] ...",    "Search for creature names containing all string arguments. Index may be used instead of string name for commands that use a creature name (like spawn). Output displays:\n\tindex - L:level (difficulty class) name (social group, pvp faction, [aggro radius, assist radius, Death Blow, INVulernable]) where square bracketed [] fields display only if applicable."},
+	{"findTemplate",                    1, "<templatename>",             "Find ."},
+	{"findRelative_w",                  1, "<oid>",                      "Find the your coords relative to an existing object."},
+	{"fixHouseItemLimit",               1, "<oid>",                      "Fixup item limit."},
+	{"getHeight",                       0, "",                           "Get the height where the user is standing."},
+	{"getInventoryId",                  1, "<oid>",                      "Get the inventory object for the specified creature."},
+	{"getDatapadId",                    1, "<oid>",                      "Get the datapad object for the specified player."},
+	{"getServerTemplate",               1, "<oid>",                      "Get the server template name of an object."},
+	{"getExposedProxyList",             1, "<oid>",                      "Get the exposed list of servers the specified object is proxied on."},
+	{"getPrivateProxyList",             1, "<oid>",                      "Get the private list of servers the specified object is proxied on."},
+	{"getObservers",                    1, "<oid>",                      "Get the list of clients currently observing the specified object on this game server."},
+	{"getObserving",                    1, "<oid>",                      "Get the list of objects this client is observing. (brief version)"},
+	{"getObservingDetailed",            1, "<oid>",                      "Get the list of objects this client is observing. (detailed version)"},
+	{"getObservingPvpSync",             1, "<oid>",                      "Get the list of pvp sync objects this client is observing. (brief version)"},
+	{"getObservingPvpSyncDetailed",     1, "<oid>",                      "Get the list of pvp sync objects this client is observing. (detailed version)"},
+	{"getLoadWith",                     1, "<oid>",                      "Get the loadWith container of an object.h"},
+	{"getVolume",                       1, "<oid>",                      "Get the volume of an object"},
+	{"gotoObject",                      1, "<oid>",                      "Goto the coords of an existing object. currently disabled."},
+	{"isIncapacitated",                 1, "<oid>",                      "Gets the incapacitated state of a creature"},
+	{"isProxy",                         1, "<oid>",                      "Query as to whether this is a proxy on the avatar's server."},
+	{"listContainer",                   1, "<oid>",                      "Lists the contents of a volume container object."},
+	{"loadContents",                    1, "<container> [oid]",          "Load an object in the specified demand-load container.  If oid is not specified, the entire contents are loaded."},
+	{"move",                            4, "<oid> <x> <y> <z>",          "Move an existing object."},
+	{"moveToMe",                        1, "<oid>",                      "Move an existing object to my coordinates."},
+	{"persist",                         1, "<oid>",                      "Persist an object."},
+	{"reloadServerTemplate",            1, "<templatename>",             "Reloads the given server object template."},
+	{"removeLocationTarget",            2, "<oid> <name>",               "Removes a location target from an object."},
+	{"removeTriggerVolume",             2, "<oid> <name>",               "Remove the named trigger volume from the specified object."},
+	{"renamePlayer",                    2, "<oid> <name>",               "Rename a player.  Naming rules and uniqueness are not enforced."},
+	{"rotate",                          4, "<oid> <yaw> <pitch> <roll>", "Rotate an existing object."},
+	{"scaleMovement",                   2, "<oid> <scale>",              "Set the movement scale on a creature."},
+	{"scaleSize",                       2, "<oid> <scale>",              "Set the size scale of a creature."},
+	{"snap",                            1, "<oid>",                      "Snap an object to the terrain."},
+	{"spawn",                           1, "<creature/poi name> [number] [distance] [spacing]", "Create [number](1) creature objects at [distance](1.25) meters with [spacing](creature's collision diameter) meters from the player's position and heading."},
+	{"stopWatching",                    1, "<oid>",                      "Stops watching an object."},
+	{"triggerVolumes",                  1, "<oid>",                      "List trigger volumes on an object"},
+	{"setName"    ,                     1, "<oid> <name>",               "Set name."},
+	{"watch",                           1, "<oid>",                      "Watches an object. Prevents it from unloading on the server (it will still be removed from the client) when there are no players in range."},
+	{"watchAIPath",                     2, "<oid> <bool>",               "Enable or disable sending of the selected object's path"},
+	{"watchPathMap",                    1, "<bool>",                     "Enable or disable sending the path map"},
+	{"unstick",                         0, "",                           "Ask the server to get this object un-stuck if it's become stuck due to collision problems"},
+	{"attribs",                         1, "<oid>",                      "Prints the attributes of a creature."},
+	{"enqueueCommand",                  4, "<actor_oid> <commandName> <target_oid> <params>",    "enqueue a command in the actor's command queue"},
+	{"hide",                            2, "<oid> <bool>",               "Set the target as invisible (1) or visible(0)"},
+	{"setCoverVisibility",              2, "<oid> <bool>",               "Set the target cover visibility as visible (1) or invisible(0)"},
+	{"getAttributes",                   1, "<oid>",                      "Get the list of attributes that would be sent in a AttributesMessage for the specified object"},
+	{"createPathNodes",                 1, "<oid>",                      "Create city path nodes for the given object"},
+	{"destroyPathNodes",                1, "<oid>",                      "Destroy city path nodes for the given object"},
+	{"reloadPathNodes",                 0, "",                           "Reload all city path nodes from the database"},
+	{"relinkPathGraph",                 0, "",                           "Relink all path nodes in the current city"},
+	{"setPathLinkDistance",             1, "<distance>",                 "Set the maximum distance that path nodes will link"},
+	{"markCityEntrance",                1, "<oid>",                      "Mark the given object as a city entrance node"},
+	{"unmarkCityEntrance",              1, "<oid>",                      "Remove the city entrance mark from the given object"},
+	{"setOwner",                        1, "<oid> [owner]",              "Sets the owner of an object"},
+	{"getOwner",                        1, "<oid>",                      "gets the owner of an object"},
+	{"askConsent",                      0, "",                           "TEST: ask a test consent question"},
+	{"debugFar",                        2, "<oid> <bool> <optional radius>",  "Create or destroy a far volume on an object. If a radius is specified, the object will use that radius."},
+	{"addJediSlot",                     1, "<oid>",                      "Test a character earning a Jedi slot for his player (oid is the objectId of the player's creature object)"},
+	{"getJediSlotInfo",                 1, "<oid>",                      "Get various information about the Jedi slot for the character"},
+	{"makeSpectral",                    1, "<oid>",                      "Test making a character spectral in the account database."},
+	{"getHibernating",                  1, "<oid>",                      "Get the hibernate flag for a creature"},
+	{"getBehavior",                     1, "<oid>",                      "Get the behavior type for a creature"},
+	{"getStandingOn",                   1, "<oid>",                      "Get the network ID of the object a creature is standing on"},
+	{"getPower",                        1, "<oid>",                      "Get the amount of power in an installation"},
+	{"setPower",                        2, "<oid> power",                "Set the amount of power in an installation"},
+	{"getPowerRate",                    1, "<oid>",                      "Get the power consuption (units/hr) of an installation"},
+	{"setPowerRate",                    2, "<oid> rate",                 "Set the power consuption (units/hr) of an installation"},
+	{"getBattlefieldMarkerRegionName",  1, "<oid>",                      "Get the region name of a battlefield marker"},
+	{"setBattlefieldMarkerRegionName",  2, "<oid> <region name>",        "Set the region name of a battlefield marker"},
+	{"unload",                          1, "<oid>",                      "Unload an object on all servers"},
+	{"moveToPlayerAndUnload",           2, "<oid> <target player>",      "Move an object to the specified offline player and unload the object"},
+	{"resetStats",                      1, "<oid>",                      "Resets the stats of the given player to their starting values"},
+	{"restoreHouse",                    1, "<house oid>",                "Restore a house in the database.  (Do not use this to restore any other type of object.)"},
+	{"restoreCharacter",                1, "<character oid>",            "Restore a character in the database.  (Do not use this to restore any other type of object.)"},
+	{"enableCharacter",                 2, "<StationId> <PlayerId>",     "enable a character to play"},
+	{"disableCharacter",                2, "<StationId> <PlayerId>",     "disable a character to play"},
+	{"loginCharacter",                  1, "<PlayerId>",                 "logs in a character"},
+	{"undeleteItem",                    1, "<item oid>",		         "Undelete an item including house or character."},
+	{"loadStructure",                   1, "<item oid>",                 "Load a structure into game.  This structure must not exist in game."},
+	{"deleteAuctionLocation",           1, "<LocationId>",               "Delete an auction location from commodities server and database.  The LocationId is either vendorId for droid vendors, or vendorInventoryId for NPC vendors"},
+	{"moveToPlayer",                    2, "<oid> <playerOID>",          "Move an object to a player"},
+	{"moveSimStart",                    4, "<countNPC> <countPC> <radius> <speed>",                           ""},
+	{"moveSimClear",                    0, "",                           ""},
+	{"deletePersistedContents",         1, "<building oid>",             "Delete all the persisted contents in a house. (useful for objects in walls etc)"},
+	{"moveItemInHouseToMe",             2, "<building oid> <index>",     "Moves the first item in a house to me. An index of 0 indicates first item"},
+	{"reinitializeVendor",              1, "<vendor oid>",               "Reinitialize a vendor moving all items to the stockroom"},
+	{"testVendorStatus",                2, "<vendor oid> <status>",      "Status test"},
+	{"setAdminTitle",                   1, "<0=none, 1=csr, 2=dev, 3=qa>",     "Set your development title 0=none, 1=csr, 2=dev, 3=qa"},
+	{"playUiEffect",                    0, "<player oid> <effect string>", "Play a UI effect on the target client."},
+	{"rollupStructure",                 2, "<house oid> <owner oid>",    "Rollup a house and transfer the contents to the specified player's bank box."},
+	{"regionList",                      0, "",                           "List regions at point."},
+	{"canMove",                         0, "",                           "Can move to target"},
+	{"pathAutoGenerate",                2, "<node dist> <obstacle dist>", "gen"},
+	{"pathAutoCleanup",                 0, "",                           "clean"},
+	{"getStaticInfo",                   1, "<oid>",                      "Get the Static Item Information of an object"},
+	{"getBroadcastInfo",                1, "<oid>",                      "Get the broadcasting information of an object"},
+	{"getAge",                          1, "<oid>",                      "Get the age (in days) for the specified character"},
+	{"adjustAge",                       2, "<oid> <adjustment>",         "Adjust the age (in days) for the specified character"},
+	{"getBadge",                        1, "<oid>",                      "Get the earned and unearned badges for the specified character"},
+	{"getPassiveReveal",                1, "<stealth/hidden object oid>", "Get the passive reveal list for the specified stealth/hidden object"},
+	{"addPassiveReveal",                3, "<stealth/hidden object oid> <target oid> <range>", "Add the target object to the passive reveal list for the specified stealth/hidden object"},
+	{"removePassiveReveal",             2, "<stealth/hidden object oid> <target oid>", "Remove the target object from the passive reveal list for the specified stealth/hidden object"},
+	{"clearPassiveReveal",              1, "<stealth/hidden object oid>", "Clear the passive reveal list for the specified stealth/hidden object"},
+	{"getInvulnerabilityTimer",         1, "<oid>", "Get the invulnerability timer for the specified creature object"},
+	{"spewCommandQueue",                1, "<oid>", "Dumps the command queue for the specified creature object"},
+	{"fixLoadWith",                     3, "<topmost_object_oid> <starting_loadwith_oid> <max_depth>", "Fix the load_with for topmost_object and its contents by setting them to starting_loadwith using max_depth"},
+	{"getChatStatistics",               1, "<oid>", "Get the chat statistics for the specified character"},
+	{"getOpenedContainers",             1, "<oid>", "Get the set of opened containers for the specified character"},
+	{"adjustSwgAccountFeatureId",       3, "<oid> <feature Id number> <adjustment>", "Adjust the specified SWG feature Id number of the account of the specified character by the specified amount"},
+	{"reloadSwgAccountFeatureId",       1, "<oid>", "Retrieve the SWG account feature Ids for the specified character"},
+	{"reloadSwgTcgAccountFeatureId",    1, "<oid>", "Retrieve the SWG TCG account feature Ids for the specified character"},
+	{"unloadBuildingContents",          1, "<oid>", "Unload the contents of a player-placed authoritative demand-loaded building"},
+	{"isOnSolidFloor",                  1, "<oid>", "Checks to see if the specified object is \"on solid floor\""},
+
+	{"", 0, "", ""} // this must be last
+};
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserObject::ConsoleCommandParserObject (void) :
+CommandParser ("object", 0, "...", "Object related commands.", 0),
+Emitter()
+{
+	createDelegateCommands (cmds);
+	addSubCommand(new ObjectCommandParserGetAttributes());
+	addSubCommand(new ObjectCommandParserSetAttributes());
+}
+
+//-----------------------------------------------------------------
+
+
+bool ConsoleCommandParserObject::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+	CreatureObject * const playerObject = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(userId));
+	if (!playerObject)
+	{
+		WARNING_STRICT_FATAL(true, ("Console command executed on invalid player object %s", userId.getValueString().c_str()));
+		return false;
+	}
+		
+	UNREF(originalCommand);
+
+	if (s_unmoveable.empty())
+	{
+		// if you add an item type here, also add it to move_item_to_player() in admin.plsql
+		IGNORE_RETURN(s_unmoveable.insert("object/tangible/inventory/character_inventory.iff"));
+		IGNORE_RETURN(s_unmoveable.insert("object/tangible/mission_bag/mission_bag.iff"));
+		IGNORE_RETURN(s_unmoveable.insert("object/tangible/datapad/character_datapad.iff"));
+		IGNORE_RETURN(s_unmoveable.insert("object/tangible/bank/character_bank.iff"));
+		IGNORE_RETURN(s_unmoveable.insert("object/weapon/melee/unarmed/unarmed_default_player.iff"));
+		IGNORE_RETURN(s_unmoveable.insert("object/player/player.iff"));
+		IGNORE_RETURN(s_unmoveable.insert("object/cell/cell.iff"));
+		IGNORE_RETURN(s_unmoveable.insert("object/tangible/inventory/vendor_inventory.iff"));
+	}
+
+	//-----------------------------------------------------------------
+
+	if (isCommand (argv [0], "getOpenedContainers"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject const * const obj = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (obj == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		Client const * const client = obj->getClient();
+
+		if(client == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a client object\n");
+			return true;
+		}
+
+		std::set<ServerObject*> const& opened = client->getOpenedContainers();
+
+		Unicode::String text;
+
+		for(std::set<ServerObject*>::const_iterator i = opened.begin(); i != opened.end(); ++i)
+		{
+			ServerObject const * const openedobj = *i;
+
+			if(openedobj)
+			{
+				text += Unicode::narrowToWide(openedobj->getNetworkId().getValueString());
+
+				const char *objectTemplateName = openedobj->getObjectTemplateName();
+				if (objectTemplateName)
+				{
+					text += Unicode::narrowToWide(std::string(", "));
+					text += Unicode::narrowToWide(std::string(objectTemplateName));
+				}
+
+				text += Unicode::narrowToWide(std::string("\n"));
+			}
+		}
+
+		const char *objectTemplateName = obj->getObjectTemplateName();
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("object %s (%s) has %d total opened objects\n", obj->getNetworkId().getValueString().c_str(), (objectTemplateName ? objectTemplateName : "NULL object template"), opened.size()));
+
+		if(!text.empty())
+		{
+			result += text;
+		}
+
+		return true;
+	}
+
+	//-----------------------------------------------------------------
+	if (isCommand( argv [0], "spawn"))
+	{
+		const int optionalParameterIndex = 2;
+		const uint argvSize = argv.size();
+
+		Unicode::String tmpString = Unicode::narrowToWide("create ");
+
+		// append the creature name which may be a shortcut
+		std::string creatureName = getCreatureNameShortcut(userId, Unicode::wideToNarrow(argv[1]));
+		tmpString.append(Unicode::narrowToWide(creatureName));
+
+		// concatenate the optional arguments
+		for (uint i=optionalParameterIndex; i < argvSize; ++i)
+		{
+			tmpString.append(Unicode::narrowToWide(" ").append(argv[i]));
+		}
+		
+		ServerObject * userObject = ServerWorld::findObjectByNetworkId(userId);
+		if (!userObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_USER);
+			return true;
+		}
+
+		GameScriptObject* gso = userObject->getScriptObject();
+		if (gso)
+		{
+			gso->attachScript("beta.test_create", true);
+			ScriptParams params;
+			params.addParam(tmpString);
+			IGNORE_RETURN (gso->trigAllScripts(Scripting::TRIG_SPEAKING, params) != SCRIPT_CONTINUE);
+			gso->detachScript("beta.test_create");
+		}
+		
+		result += getErrorMessage (argv[0], ERR_SUCCESS);
+	}
+
+	else if (isCommand(argv[0], "authority"))
+	{
+		NetworkId const oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * const object = dynamic_cast<ServerObject *>(NetworkIdManager::getObjectById(oid));
+		if (object)
+		{
+			uint32 const pid = (strtoul(Unicode::wideToNarrow(argv[2]).c_str (), NULL, 10));
+			GenericValueTypeMessage<std::pair<NetworkId, uint32> > const msg(
+				"RequestAuthTransfer",
+				std::make_pair(
+					ContainerInterface::getTopmostContainer(*object)->getNetworkId(),
+					pid));
+			GameServer::getInstance().sendToPlanetServer(msg);
+
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		}
+		
+	}
+
+	else if (isCommand( argv [0], "create"))
+	{
+		//Should be server object
+		std::string tmpString(getObjectTemplateShortcut(userId, Unicode::wideToNarrow(argv[1])));
+
+		//Should be Server object
+		ServerObject * userObject = ServerWorld::findObjectByNetworkId(userId);
+		if (!userObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_USER);
+			return true;
+		}
+
+		real x,y,z;
+		x = static_cast<real>(strtod(Unicode::wideToNarrow(argv[2]).c_str(), NULL));
+		y = static_cast<real>(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL));
+		z = static_cast<real>(strtod(Unicode::wideToNarrow(argv[4]).c_str(), NULL));
+
+		ServerObject *newObject = 0;
+		ServerObjectTemplate const * const ot = getObjectTemplateForCreation(tmpString);
+		if (ot)
+		{
+			if (ConfigServerGame::getStripNonFreeAssetsFromPlayersInTutorial() && NewbieTutorial::isInTutorialArea(userObject))
+			{
+				std::string sharedTemplate = ot->getSharedTemplate(false);
+
+				if (!FileManifest::contains(sharedTemplate.c_str()))
+				{
+					result += getErrorMessage (argv[0], ERR_NOT_SKUFREE_TEMPLATE);
+					ot->releaseReference();
+					return true;
+				}
+			}
+			
+			Transform tr;
+			tr.setPosition_p(x, y, z);
+			newObject = ServerWorld::createNewObject(*ot, tr, 0, false);
+			checkBadBuildClusterObject(newObject);
+			ot->releaseReference();
+		}
+
+		if (!newObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_TEMPLATE);
+			return true;
+		}
+		else
+		{
+			newObject->addToWorld();
+		}
+
+		if (ConfigServerGame::getAdminPersistAllCreates())
+			newObject->persist();
+
+		result += Unicode::narrowToWide("NetworkId: ");
+		result += Unicode::narrowToWide(newObject->getNetworkId().getValueString());
+		result += Unicode::narrowToWide("\n");
+		result += getErrorMessage (argv[0], ERR_SUCCESS);
+	}
+
+	else if (isCommand( argv [0], "createTranslateRotate"))
+	{
+		//Should be server object
+		std::string tmpString(getObjectTemplateShortcut(userId, Unicode::wideToNarrow(argv[1])));
+
+		//Should be Server object
+		ServerObject * userObject = ServerWorld::findObjectByNetworkId(userId);
+		if (!userObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_USER);
+			return true;
+		}
+
+		real x,y,z;
+		x = static_cast<real>(strtod(Unicode::wideToNarrow(argv[2]).c_str(), NULL));
+		y = static_cast<real>(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL));
+		z = static_cast<real>(strtod(Unicode::wideToNarrow(argv[4]).c_str(), NULL));
+
+		// check to see if we're in a region we shouldn't be building in
+		if ( ConfigServerGame::getBlockBuildRegionPlacement() )
+		{
+			const Region * const r = RegionMaster::getSmallestRegionAtPoint( ConfigServerGame::getSceneID(), x, z );
+
+			if ( r && r->getBuildable() )
+			{
+				DEBUG_REPORT_LOG_PRINT( true, ( "unable to place object in %s\n", Unicode::wideToNarrow( r->getName() ).c_str() ) );
+				result += Unicode::narrowToWide("Unable to place object: the region '");
+				result += r->getName();
+				result += Unicode::narrowToWide("' is marked Buildable.\n");
+				return true;
+			}
+		}
+ 
+		real quatW,quatX,quatY,quatZ;
+		quatW = static_cast<real>(strtod(Unicode::wideToNarrow(argv[5]).c_str(), NULL));
+		quatX = static_cast<real>(strtod(Unicode::wideToNarrow(argv[6]).c_str(), NULL));
+		quatY = static_cast<real>(strtod(Unicode::wideToNarrow(argv[7]).c_str(), NULL));
+		quatZ = static_cast<real>(strtod(Unicode::wideToNarrow(argv[8]).c_str(), NULL));
+
+		ServerObject * const cell = safe_cast<ServerObject *>(ContainerInterface::getContainingCellObject(*playerObject));
+
+		ServerObject *newObject = 0;
+		ServerObjectTemplate const * const ot = getObjectTemplateForCreation(tmpString);
+		if (ot)
+		{
+			if (ConfigServerGame::getStripNonFreeAssetsFromPlayersInTutorial() && NewbieTutorial::isInTutorialArea(userObject))
+			{
+				std::string sharedTemplate = ot->getSharedTemplate(false);
+
+				if (!FileManifest::contains(sharedTemplate.c_str()))
+				{
+					result += getErrorMessage (argv[0], ERR_NOT_SKUFREE_TEMPLATE);
+					ot->releaseReference();
+					return true;
+				}
+			}
+
+			Quaternion q(quatW, quatX, quatY, quatZ);
+			Transform tr(Transform::IF_none);
+			//get quaternion rotation as a transform
+			q.getTransform(&tr);
+			// set the position
+			tr.setPosition_p(x, y, z);
+			newObject = ServerWorld::createNewObject(*ot, tr, cell, false);
+			checkBadBuildClusterObject(newObject);
+			ot->releaseReference();
+		}
+
+		if (!newObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_TEMPLATE);
+			return true;
+		}
+		else if (!cell)
+			{
+				newObject->addToWorld();
+			}
+
+		if (ConfigServerGame::getAdminPersistAllCreates())
+		{
+			newObject->persist();
+		}
+		else
+		{
+			newObject->setIncludeInBuildout( true );
+		}
+
+		result += Unicode::narrowToWide("NetworkId: ");
+		result += Unicode::narrowToWide(newObject->getNetworkId().getValueString());
+		result += Unicode::narrowToWide("\n");
+		result += getErrorMessage (argv[0], ERR_SUCCESS);
+	}
+
+	else if (isCommand( argv [0], "createAt"))
+	{
+		//Should be Server object
+		ServerObject * userObject = ServerWorld::findObjectByNetworkId(userId);
+		if (!userObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_USER);
+			return true;
+		}
+		
+		// Look for a matching template in the template map first.
+		std::string tmpString(getObjectTemplateShortcut(userId, Unicode::wideToNarrow(argv[1])));
+
+		ServerObjectTemplate const * const ot = getObjectTemplateForCreation(tmpString);
+		if (!ot || ot->getId() == ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTemplate_tag)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_TEMPLATE);
+			if (ot)
+				ot->releaseReference();
+			return true;
+		}
+
+		if (ConfigServerGame::getStripNonFreeAssetsFromPlayersInTutorial() && NewbieTutorial::isInTutorialArea(userObject))
+		{
+			std::string sharedTemplate = ot->getSharedTemplate(false);
+
+			if (!FileManifest::contains(sharedTemplate.c_str()))
+			{
+				result += getErrorMessage (argv[0], ERR_NOT_SKUFREE_TEMPLATE);
+				ot->releaseReference();
+				return true;
+			}
+		}
+
+		//if the user is a creature and they're piloting a ship, use the ship's location
+		CreatureObject * const creatureUserObject = userObject->asCreatureObject();
+		if(creatureUserObject)
+		{
+			ShipObject * const shipUserObject = creatureUserObject->getPilotedShip();
+			if(shipUserObject)
+				userObject = shipUserObject;
+		}
+
+		ServerObject * const cell = safe_cast<ServerObject *>(ContainerInterface::getContainingCellObject(*userObject));
+
+		Transform tr;
+		tr.setPosition_p(userObject->getPosition_p());
+		ServerObject *newObject = ServerWorld::createNewObject(*ot, tr, cell, false);
+		checkBadBuildClusterObject(newObject);
+		ot->releaseReference();
+
+		if (!newObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_TEMPLATE);
+			return true;
+		}
+		else if (!cell)
+			{
+				newObject->addToWorld();
+			}
+
+		if (ConfigServerGame::getAdminPersistAllCreates())
+			newObject->persist();
+
+		result += Unicode::narrowToWide("NetworkId: ");
+		result += Unicode::narrowToWide(newObject->getNetworkId().getValueString());
+		result += Unicode::narrowToWide("\n");
+		result += getErrorMessage (argv[0], ERR_SUCCESS);
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isCommand( argv [0], "createManyAt"))
+	{
+		// should be Server object
+		ServerObject * const userObject = ServerWorld::findObjectByNetworkId(userId);
+		if (!userObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_USER);
+			return true;
+		}
+
+		if (ContainerInterface::getContainedByObject(*userObject))
+		{
+			result += getErrorMessage (argv[0], ERR_FAIL);
+			return true;
+		}
+
+		Vector const      position  = userObject->getPosition_p();
+		int const         count     = atoi(Unicode::wideToNarrow (argv [1]).c_str());
+		std::string const tmpString = getObjectTemplateShortcut(userId, Unicode::wideToNarrow(argv[2]));
+
+#if defined(_WIN32) && PRODUCTION == 0
+		VTune::resume();
+#endif
+
+		ServerObjectTemplate const * const ot = getObjectTemplateForCreation(tmpString);
+		if (ot)
+		{
+			if (ConfigServerGame::getStripNonFreeAssetsFromPlayersInTutorial() && NewbieTutorial::isInTutorialArea(userObject))
+			{
+				std::string sharedTemplate = ot->getSharedTemplate(false);
+
+				if (!FileManifest::contains(sharedTemplate.c_str()))
+				{
+					result += getErrorMessage (argv[0], ERR_NOT_SKUFREE_TEMPLATE);
+					ot->releaseReference();
+					return true;
+				}
+			}
+			
+			for (int i = 0; i < count; ++i)
+			{
+				Vector const offset(static_cast<float>(i / 10), 0.0f, static_cast<float>(i % 10));
+				Transform tr;
+				tr.setPosition_p(position+offset);
+
+				ServerObject * newObject = ServerWorld::createNewObject(*ot, tr, 0, false);
+				checkBadBuildClusterObject(newObject);
+
+				if (newObject)
+				{
+					newObject->addToWorld();
+				}
+			}
+			ot->releaseReference();
+		}
+
+#if defined(_WIN32) && PRODUCTION == 0
+		VTune::pause();
+#endif
+
+		result += getErrorMessage (argv[0], ERR_SUCCESS);
+		return true;
+	}
+
+	//-----------------------------------------------------------------
+	else if (isCommand(argv[0], "createIn"))
+	{
+		//Create a new object in a container.
+		ServerObject * userObject = ServerWorld::findObjectByNetworkId(userId);
+		if (!userObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_USER);
+			return true;
+		}
+
+		NetworkId oid(Unicode::wideToNarrow(argv[2]));
+		ServerObject* object = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(oid));
+		if (object == NULL)
+		{
+			//container does not exist
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		VolumeContainer * volContainer = ContainerInterface::getVolumeContainer(*object);
+		int oldCapacity = 0;
+		if (volContainer)
+			oldCapacity = volContainer->debugDoNotUseSetCapacity(-1);
+
+		std::string tmpString(getObjectTemplateShortcut(userId, Unicode::wideToNarrow(argv[1])));
+
+		ServerObject *newObject = 0;
+		ServerObjectTemplate const * const ot = getObjectTemplateForCreation(tmpString);
+		if (ot)
+		{
+			if (ConfigServerGame::getStripNonFreeAssetsFromPlayersInTutorial() && NewbieTutorial::isInTutorialArea(userObject))
+			{
+				std::string sharedTemplate = ot->getSharedTemplate(false);
+
+				if (!FileManifest::contains(sharedTemplate.c_str()))
+				{
+					result += getErrorMessage (argv[0], ERR_NOT_SKUFREE_TEMPLATE);
+					ot->releaseReference();
+					return true;
+				}
+			}
+
+			newObject = ServerWorld::createNewObject(*ot, *object, false, true);
+			checkBadBuildClusterObject(newObject);
+
+			ot->releaseReference();
+		}
+
+		if (volContainer)
+		{
+			volContainer->debugDoNotUseSetCapacity(oldCapacity);
+			volContainer->recalculateVolume();
+		}
+
+		if (!newObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_TEMPLATE);
+			return true;
+		}
+
+		if (ConfigServerGame::getAdminPersistAllCreates())
+			newObject->persist();
+
+		result += Unicode::narrowToWide("NetworkId: ");
+		result += Unicode::narrowToWide(newObject->getNetworkId().getValueString());
+		result += Unicode::narrowToWide("\n");
+	  
+		result += getErrorMessage (argv[0], ERR_SUCCESS);		
+	}
+	else if (isCommand(argv[0], "cellCreate"))
+	{
+		NetworkId cellId(Unicode::wideToNarrow(argv[2]));
+		ServerObject* cell = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(cellId));
+		if (cell == NULL && cellId != NetworkId::cms_invalid)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		std::string tmpString(Unicode::wideToNarrow(argv[1]));
+
+		//Should be Server object
+		ServerObject * userObject = ServerWorld::findObjectByNetworkId(userId);
+		if (!userObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_USER);
+			return true;
+		}
+
+		real x,y,z;
+		x = static_cast<real>(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL));
+		y = static_cast<real>(strtod(Unicode::wideToNarrow(argv[4]).c_str(), NULL));
+		z = static_cast<real>(strtod(Unicode::wideToNarrow(argv[5]).c_str(), NULL));
+
+		ServerObject *newObject = 0;
+		ServerObjectTemplate const * const ot = getObjectTemplateForCreation(tmpString);
+		if (ot)
+		{
+			if (ConfigServerGame::getStripNonFreeAssetsFromPlayersInTutorial() && NewbieTutorial::isInTutorialArea(userObject))
+			{
+				std::string sharedTemplate = ot->getSharedTemplate(false);
+
+				if (!FileManifest::contains(sharedTemplate.c_str()))
+				{
+					result += getErrorMessage (argv[0], ERR_NOT_SKUFREE_TEMPLATE);
+					ot->releaseReference();
+					return true;
+				}
+			}
+			
+			Transform tr;
+			tr.setPosition_p(x, y, z);
+			newObject = ServerWorld::createNewObject(*ot, tr, cell, false);
+			checkBadBuildClusterObject(newObject);
+			ot->releaseReference();
+		}
+		
+		if (!newObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_TEMPLATE);
+			return true;
+		}
+		if (cellId == NetworkId::cms_invalid)
+			newObject->addToWorld();
+
+		if (ConfigServerGame::getAdminPersistAllCreates())
+			newObject->persist();
+
+		result += Unicode::narrowToWide("NetworkId: ");
+		result += Unicode::narrowToWide(newObject->getNetworkId().getValueString());
+		result += Unicode::narrowToWide("\n");
+		result += getErrorMessage (argv[0], ERR_SUCCESS);
+		
+	}
+	else if (isCommand(argv[0], "cellCreateTranslateRotate"))
+	{
+		//Should be server object
+		std::string tmpString(Unicode::wideToNarrow(argv[1]));
+
+		//Should be Server object
+		ServerObject * userObject = ServerWorld::findObjectByNetworkId(userId);
+		if (!userObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_USER);
+			return true;
+		}
+
+		NetworkId cellId(Unicode::wideToNarrow(argv[2]));
+		ServerObject * const cell = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(cellId));
+		if (cell == NULL && cellId != NetworkId::cms_invalid)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		real x,y,z;
+		x = static_cast<real>(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL));
+		y = static_cast<real>(strtod(Unicode::wideToNarrow(argv[4]).c_str(), NULL));
+		z = static_cast<real>(strtod(Unicode::wideToNarrow(argv[5]).c_str(), NULL));
+
+		real quatW,quatX,quatY,quatZ;
+		quatW = static_cast<real>(strtod(Unicode::wideToNarrow(argv[6]).c_str(), NULL));
+		quatX = static_cast<real>(strtod(Unicode::wideToNarrow(argv[7]).c_str(), NULL));
+		quatY = static_cast<real>(strtod(Unicode::wideToNarrow(argv[8]).c_str(), NULL));
+		quatZ = static_cast<real>(strtod(Unicode::wideToNarrow(argv[9]).c_str(), NULL));
+
+		ServerObject *newObject = 0;
+		ServerObjectTemplate const * const ot = getObjectTemplateForCreation(tmpString);
+		if (ot)
+		{
+			if (ConfigServerGame::getStripNonFreeAssetsFromPlayersInTutorial() && NewbieTutorial::isInTutorialArea(userObject))
+			{
+				std::string sharedTemplate = ot->getSharedTemplate(false);
+
+				if (!FileManifest::contains(sharedTemplate.c_str()))
+				{
+					result += getErrorMessage (argv[0], ERR_NOT_SKUFREE_TEMPLATE);
+					ot->releaseReference();
+					return true;
+				}
+			}
+			
+			Quaternion q(quatW, quatX, quatY, quatZ);
+			Transform tr(Transform::IF_none);
+			//get quaternion rotation as a transform
+			q.getTransform(&tr);
+			//complete transform with position
+			tr.setPosition_p(x, y, z);
+			//apply to object
+			newObject = ServerWorld::createNewObject(*ot, tr, cell, false);
+			checkBadBuildClusterObject(newObject);
+			ot->releaseReference();
+		}
+
+		if (!newObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_TEMPLATE);
+			return true;
+		}
+		else if (!cell)
+		{
+				newObject->addToWorld();
+		}
+
+		if (ConfigServerGame::getAdminPersistAllCreates())
+		{
+			newObject->persist();
+		}
+		else
+		{
+			newObject->setIncludeInBuildout( true );
+		}
+
+		result += Unicode::narrowToWide("NetworkId: ");
+		result += Unicode::narrowToWide(newObject->getNetworkId().getValueString());
+		result += Unicode::narrowToWide("\n");
+		result += getErrorMessage (argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand( argv[0], "getHeight"))
+	{
+		ServerObject * userObject = ServerWorld::findObjectByNetworkId(userId);
+		if (!userObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_USER);
+			return true;
+		}
+		Vector pos = userObject->getPosition_w();
+		pos.y = 100000;
+		real hgt = 0;
+		const TerrainObject* terr = TerrainObject::getConstInstance();
+		if (!terr->getHeight (pos, hgt))
+		{
+			result += getErrorMessage(argv[0], ERR_TERRAIN_GENERATION);
+			return true;
+		}
+		char tmpBuf[256];
+		sprintf(tmpBuf, "Height: %f\n", hgt);
+		result += Unicode::narrowToWide(tmpBuf);
+		return true;
+	}
+	else if (isCommand( argv[0], "getInventoryId"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject* object = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(oid));
+		if (object == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		SlottedContainer * const slotContainer = ContainerInterface::getSlottedContainer(*object);
+		if (!slotContainer)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		const SlotId invenSlot = SlotIdManager::findSlotId(ConstCharCrcLowerString("inventory"));		
+				
+		Container::ContainerErrorCode ctmp = Container::CEC_Success;
+		ServerObject* inventory = dynamic_cast<ServerObject*>(slotContainer->getObjectInSlot(invenSlot, ctmp).getObject());
+		std::string text;
+		if (!inventory)
+		{
+			text = "This Object has no inventory\n";
+			result += Unicode::narrowToWide(text);
+			return true;
+		}
+		char tmp[128];
+		sprintf(tmp, "%s\n", inventory->getNetworkId().getValueString().c_str());
+		text = tmp;
+		result += Unicode::narrowToWide(text);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+		return true;
+	}
+
+	else if (isCommand( argv[0], "getDatapadId"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject* object = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(oid));
+		if (object == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		SlottedContainer * const slotContainer = ContainerInterface::getSlottedContainer(*object);
+		if (!slotContainer)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		const SlotId datapadSlot = SlotIdManager::findSlotId(ConstCharCrcLowerString("datapad"));		
+		Container::ContainerErrorCode ctmp = Container::CEC_Success;
+		ServerObject* datapad = dynamic_cast<ServerObject*>(slotContainer->getObjectInSlot(datapadSlot, ctmp).getObject());
+		std::string text;
+		if (!datapad)
+		{
+			text = "This Object has no datapad\n";
+			result += Unicode::narrowToWide(text);
+			return true;
+		}
+		char tmp[128];
+		sprintf(tmp, "%s\n", datapad->getNetworkId().getValueString().c_str());
+		text = tmp;
+		result += Unicode::narrowToWide(text);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+		return true;
+	}
+	
+	//----------------------------------------------------------------------
+	
+	else if (isCommand( argv [0], "destroy"))
+	{
+		const NetworkId oid (Unicode::wideToNarrow(argv[1]));
+		ServerObject* const object = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(oid));
+		
+		if (object == NULL)
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		else if (object->getClient())
+			result += getErrorMessage(argv[0], ERR_INVALID_USER);
+		else 
+		{
+			ProsePackage pp;
+			bool sendResponse = argv.size () > 2;
+			
+			if (sendResponse)
+				ProsePackageManagerServer::createSimpleProsePackage (*object, SharedStringIds::rsp_object_deleted_prose, pp);
+			
+			if (object->permanentlyDestroy(DeleteReasons::God))
+			{
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+				if (sendResponse)
+					Chat::sendSystemMessage (*playerObject, pp);
+			}
+			else
+				result += Unicode::narrowToWide("Internal Error encountered while deleting object");
+		}		
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand( argv [0], "destroyAllMobsExcept"))
+	{
+		const NetworkId oid (Unicode::wideToNarrow(argv[1]));
+
+		ServerObject* const object = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(oid));
+		
+		if (object == NULL)
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+
+		// ----------
+
+		int objectCount = ServerWorld::getNumObjects();
+
+		for(int i = 0; i < objectCount; i++)
+		{
+			ServerObject * object = ServerWorld::getObject(i);
+
+			if(object == NULL) continue;
+
+			CreatureObject * creature = object->asCreatureObject();
+
+			if(creature == NULL) continue;
+
+			if(creature->getNetworkId() == oid) continue;
+
+			if(creature->getClient()) continue;
+
+			creature->permanentlyDestroy(DeleteReasons::God);
+		}
+
+		result += Unicode::narrowToWide("Deleted all creatures but the given one");
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand( argv [0], "destroyAllWorldMobs"))
+	{
+		int objectCount = ServerWorld::getNumObjects();
+
+		for(int i = 0; i < objectCount; i++)
+		{
+			ServerObject * object = ServerWorld::getObject(i);
+
+			if(object == NULL) continue;
+
+			CreatureObject * creature = object->asCreatureObject();
+
+			if(creature == NULL) continue;
+
+			if(creature->getParentCell() != CellProperty::getWorldCellProperty()) continue;
+
+			if(creature->getClient()) continue;
+
+			creature->permanentlyDestroy(DeleteReasons::God);
+		}
+
+		result += Unicode::narrowToWide("Deleted all world creatures");
+
+		return true;
+	}
+	
+	//-----------------------------------------------------------------
+	
+	else if (isCommand( argv[0], "move"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		Vector pos;
+		pos.x = static_cast<real>(strtod(Unicode::wideToNarrow(argv[2]).c_str(), NULL));
+		pos.y = static_cast<real>(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL));
+		pos.z = static_cast<real>(strtod(Unicode::wideToNarrow(argv[4]).c_str(), NULL));
+
+		// disallow certain object types from being "move"
+		bool allowMove = true;
+		ServerObject const *o = ServerWorld::findObjectByNetworkId(oid);
+		if (o)
+		{
+			const char *objectTemplateName = o->getObjectTemplateName();
+			if (objectTemplateName && (s_unmoveable.count(objectTemplateName) > 0))
+			{
+				char buffer[256];
+				snprintf(buffer, sizeof(buffer)-1, "Object id cannot be %s\n", objectTemplateName);
+				buffer[sizeof(buffer)-1] = '\0';
+
+				result += Unicode::narrowToWide(buffer);
+				result += getErrorMessage(argv[0], ERR_FAIL);
+				allowMove = false;
+			}
+		}
+
+		if (allowMove)
+		{
+			if (moveObject(oid, pos, NetworkId::cms_invalid, Vector()))
+			{
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+			}
+			else
+			{
+				result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			}
+		}
+	}
+	
+	//-----------------------------------------------------------------
+	
+	else if (isCommand( argv[0], "moveToMe"))
+	{
+		ServerObject * userObject = ServerWorld::findObjectByNetworkId(userId);
+		if (userObject)
+			userObject = safe_cast<ServerObject *>(ContainerInterface::getFirstParentInWorld(*userObject));
+		if (!userObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_USER);
+			return true;
+		}
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+
+		// disallow certain object types from being "moveToMe"
+		bool allowMove = true;
+		ServerObject const *o = ServerWorld::findObjectByNetworkId(oid);
+		if (o)
+		{
+			const char *objectTemplateName = o->getObjectTemplateName();
+			if (objectTemplateName && (s_unmoveable.count(objectTemplateName) > 0))
+			{
+				char buffer[256];
+				snprintf(buffer, sizeof(buffer)-1, "Object id cannot be %s\n", objectTemplateName);
+				buffer[sizeof(buffer)-1] = '\0';
+
+				result += Unicode::narrowToWide(buffer);
+				result += getErrorMessage(argv[0], ERR_FAIL);
+				allowMove = false;
+			}
+		}
+
+		if (allowMove)
+		{
+			Object *topmost = ContainerInterface::getTopmostContainer(*userObject);
+			Object *containerObj = ContainerInterface::getContainedByObject(*userObject);
+			if (moveObject(oid, topmost->getPosition_w(), containerObj ? containerObj->getNetworkId() : NetworkId::cms_invalid, userObject->getPosition_p()))
+			{
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+			}
+			else
+			{
+				result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			}
+		}
+	}
+	//-----------------------------------------------------------------
+	
+	else if (isCommand( argv[0], "persist"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject* o = ServerWorld::findObjectByNetworkId(oid);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		o->persist();
+		result += getErrorMessage(argv[0], ERR_SUCCESS);		
+	}
+	
+	//-----------------------------------------------------------------
+	
+	else if (isCommand( argv[0], "rotate"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		real r,p,y;
+		r = static_cast<real>(strtod(Unicode::wideToNarrow(argv[2]).c_str(), NULL));
+		p = static_cast<real>(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL));
+		y = static_cast<real>(strtod(Unicode::wideToNarrow(argv[4]).c_str(), NULL));
+		if (rotateObject(oid, r, p, y))
+		{
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		}
+	}
+
+	else if (isCommand( argv[0], "find"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject* o = ServerWorld::findObjectByNetworkId(oid);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		Vector pos = o->getPosition_p();
+		char locationString[94];
+		
+		const NetworkId & containedBy = ContainerInterface::getContainedByProperty(*o)->getContainedByNetworkId();
+		
+		sprintf(locationString, "Object %s: (%.1f %.1f %.1f) in %s", oid.getValueString().c_str(), pos.x, pos.y, pos.z, containedBy.getValueString().c_str());
+		result += Unicode::narrowToWide(locationString);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand(argv[0], "findCreature"))
+	{
+		CreatureObject * const userObject = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(userId));
+		if (!userObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_USER);
+			return true;
+		}
+
+		bool const openIfNotFound = true;
+		DataTable * const dataTable = DataTableManager::getTable(s_creaureDataTable, openIfNotFound);
+
+		// erase keys assigned to this player.
+		s_playerCreatureNameMap.erase(userId);
+
+		if (dataTable != NULL)
+		{
+			StringVector creatureStrings;
+			{
+				std::vector<const char *> creatureNames;
+				dataTable->getStringColumn("creatureName", creatureNames);
+
+				std::vector<const char *>::const_iterator itName = creatureNames.begin();
+				for (; itName != creatureNames.end(); ++itName)
+				{
+					creatureStrings.push_back(std::string(*itName));
+				}
+			}
+
+			StringVector desiredSubStrings;
+			for (int j = 1; j < (int)argv.size(); ++j)
+				desiredSubStrings.push_back(Unicode::wideToNarrow(argv[j]));
+
+			StringVector foundCreatureNames;
+			result += Unicode::narrowToWide(searchNames(creatureStrings, desiredSubStrings, 0, foundCreatureNames, searchNamesCreatureFormatter));
+
+			if (foundCreatureNames.size() > 0)
+				s_playerCreatureNameMap.insert(std::make_pair(userId, foundCreatureNames));
+
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+
+			DataTableManager::close(s_creaureDataTable);
+		}
+	}
+	else if (isCommand(argv[0], "findTemplate"))
+	{
+		CreatureObject * const userObject = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(userId));
+		if (!userObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_USER);
+			return true;
+		}
+
+		// erase keys assigned to this player.
+		s_playerObjectTemplateMap.erase(userId);
+
+		StringVector objectTemplateStrings;
+		{
+			std::vector<const char *> objectTemplateNames;
+			ObjectTemplateList::getAllTemplateNamesFromCrcStringTable(objectTemplateNames);
+
+			std::vector<const char *>::const_iterator itName = objectTemplateNames.begin();
+			for (; itName != objectTemplateNames.end(); ++itName)
+				objectTemplateStrings.push_back(*itName);
+		}
+
+		result += Unicode::narrowToWide("Matching object template listing...\n");
+
+		StringVector desiredTemplateSubStrings;
+		for (int j = 1; j < (int)argv.size(); ++j)
+			desiredTemplateSubStrings.push_back(Unicode::wideToNarrow(argv[j]));
+
+		StringVector foundTemplateNames;
+		result += Unicode::narrowToWide(searchNames(objectTemplateStrings, desiredTemplateSubStrings, "shared_", foundTemplateNames));
+
+		if (foundTemplateNames.size() > 0)
+			s_playerObjectTemplateMap.insert(std::make_pair(userId, foundTemplateNames));
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand( argv[0], "findRelative_w"))
+	{
+		NetworkId const oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject* const o = ServerWorld::findObjectByNetworkId(oid);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		Vector const & pos = playerObject->getPosition_w() - o->getPosition_w();
+		
+		char locationString[94];
+		snprintf(locationString, sizeof(locationString), "Object %s: relative_w (%.1f %.1f %.1f) ", oid.getValueString().c_str(), pos.x, pos.y, pos.z);
+		result += Unicode::narrowToWide(locationString);
+	}
+	else if (isCommand( argv[0], "fixHouseItemLimit"))
+	{
+		NetworkId const oid(Unicode::wideToNarrow(argv[1]));
+		TangibleObject * const o = dynamic_cast<TangibleObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (!o || !o->getPortalProperty())
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		o->fixUpPobItemLimit();
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand( argv[0], "deletePersistedContents"))
+	{
+		NetworkId const oid(Unicode::wideToNarrow(argv[1]));
+		TangibleObject * const o = dynamic_cast<TangibleObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (!o || !o->getPortalProperty())
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		o->deletePobPersistedContents(NULL, DeleteReasons::God);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand( argv[0], "moveItemInHouseToMe"))
+	{
+		CreatureObject * const userObject = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(userId));
+		if (!userObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_USER);
+			return true;
+		}
+
+		NetworkId const oid(Unicode::wideToNarrow(argv[1]));
+		TangibleObject * const o = dynamic_cast<TangibleObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (!o || !o->getPortalProperty())
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		int index = atoi(Unicode::wideToNarrow(argv[2]).c_str());
+		o->movePobItemToPlayer(*userObject, index, true); // Note: no need to check for gold oids here, because moveItemToPlayer() only succeeds if the house is player-placed
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isCommand( argv[0], "reinitializeVendor"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		TangibleObject* vendor = dynamic_cast<TangibleObject*>(ServerWorld::findObjectByNetworkId(oid));
+		if (vendor == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CommoditiesMarket::reinitializeVendor(*vendor, vendor->getOwnerId());
+		
+        result += getErrorMessage(argv[0], ERR_SUCCESS);
+    }
+    else if (isCommand( argv[0], "testVendorStatus"))
+    {
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+        TangibleObject* vendor = dynamic_cast<TangibleObject*>(ServerWorld::findObjectByNetworkId(oid));
+        if (vendor == NULL)
+        {
+            result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+            return true;
+        }
+		int status  = atoi (Unicode::wideToNarrow (argv [2]).c_str ());
+		CommoditiesMarket::vendorStatusChange(oid, status);
+		
+        result += getErrorMessage(argv[0], ERR_SUCCESS);
+    }
+	else if (isCommand(argv[0], "setAdminTitle"))
+	{
+		int which  = atoi (Unicode::wideToNarrow (argv [1]).c_str ());
+		if (which < 0 || which > 3)
+		{
+			result += Unicode::narrowToWide("Invalid argument.  0=none, 1=csr, 2=dev, 3=qa");
+			return true;
+		}
+		CreatureObject * userObject = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(userId));
+		if (!userObject)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_USER);
+			return true;
+		}
+		PlayerObject* playerObject = PlayerCreatureController::getPlayerObject(userObject);
+		if (!playerObject)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		switch(which)
+		{
+			case 0:
+				playerObject->setPriviledgedTitle(static_cast<int8>(PlayerDataPriviledgedTitle::NormalPlayer));
+				break;
+			case 1:
+				playerObject->setPriviledgedTitle(static_cast<int8>(PlayerDataPriviledgedTitle::CustomerServiceRepresentative));
+				break;
+			case 2:
+				playerObject->setPriviledgedTitle(static_cast<int8>(PlayerDataPriviledgedTitle::Developer));
+				break;
+			case 3:
+				playerObject->setPriviledgedTitle(static_cast<int8>(PlayerDataPriviledgedTitle::QualityAssurance));
+				break;
+			default:
+				playerObject->setPriviledgedTitle(static_cast<int8>(PlayerDataPriviledgedTitle::NormalPlayer));
+				break;
+		}
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+		return true;
+	}
+
+	else if (isCommand(argv[0], "gotoObject"))
+	{
+			
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject* o = ServerWorld::findObjectByNetworkId(oid);
+		if (!o)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		Object *topmost = ContainerInterface::getTopmostContainer(*o);
+		Object *containerObj = ContainerInterface::getContainedByObject(*o);
+		if (moveObject(userId, topmost->getPosition_w(), containerObj ? containerObj->getNetworkId() : NetworkId::cms_invalid, o->getPosition_p()))
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_USER);
+			return true;
+		}
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	//-----------------------------------------------------------------
+	
+	else if (isCommand( argv[0], "scaleMovement"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		CreatureObject* o = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		real scale;
+		scale = static_cast<real>(strtod(Unicode::wideToNarrow(argv[2]).c_str(), NULL));
+		o->setMovementScale(scale);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isCommand( argv[0], "scaleSize"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		CreatureObject* o = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		real scale;
+		scale = static_cast<real>(strtod(Unicode::wideToNarrow(argv[2]).c_str(), NULL));
+		o->setScaleFactor(scale);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	//-----------------------------------------------------------------
+	else if (isCommand(argv[0], "snap"))
+	{
+		const TerrainObject* terr = TerrainObject::getConstInstance();
+
+		if (!terr)
+		{
+			//@todo need an error message for no terrain!
+			result += getErrorMessage(argv[0], ERR_NO_TERRAIN);
+			return true;
+		}
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject* o = ServerWorld::findObjectByNetworkId(oid);
+		if (!o || ContainerInterface::getContainedByObject(*o))
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		Vector pos = o->getPosition_p();
+		pos.y = 100000;
+		real hgt = 0;
+		
+		if (!terr->getHeight (pos, hgt))
+		{
+			//@todo need an error message for no terrain!
+			result += getErrorMessage(argv[0], ERR_TERRAIN_GENERATION);
+			return true;
+		}
+		pos.y = hgt;
+		moveObject(oid, pos, NetworkId::cms_invalid, Vector()); //@todo...doing two oid lookups is inefficient.
+		
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	//-----------------------------------------------------------------
+
+	else if (isCommand(argv[0], "isProxy"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject* o = ServerWorld::findObjectByNetworkId(oid);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else
+		{
+			std::string text;
+			if (!o->isAuthoritative())
+			    text = "1";
+			else
+			    text = "0";
+			result += Unicode::narrowToWide(text);
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+			return true;
+			
+		}
+	}
+
+	else if (isCommand(argv[0], "listContainer"))
+	{
+		CachedNetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(oid.getObject());
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		Container const * const container = ContainerInterface::getContainer(*o);
+		if (container == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		std::string text;
+		container->debugPrint(text);
+
+		result += Unicode::narrowToWide(text);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	else if(isCommand(argv[0], "triggerVolumes"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = ServerWorld::findObjectByNetworkId(oid);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else
+		{
+			ServerObject::TriggerVolumeMap const & volumes = o->getTriggerVolumeMap();
+			char radius[1024];
+			sprintf(radius, "%i", volumes.size());
+			result = Unicode::narrowToWide("Listing ");
+			result += Unicode::narrowToWide(radius);
+			result += Unicode::narrowToWide(" trigger volumes for object ");
+			result += argv[1].c_str();
+			result += Unicode::narrowToWide(":\n");
+			for (ServerObject::TriggerVolumeMap::const_iterator v = volumes.begin(); v != volumes.end(); ++v)
+			{
+				result += Unicode::narrowToWide("trigger volume for object ");
+				result += argv[1].c_str();
+				result += Unicode::narrowToWide(" ");
+				result += Unicode::narrowToWide((*v).first.c_str());
+				result += Unicode::narrowToWide(" ");
+				sprintf(radius, "%f", (*v).second->getRadius());
+				result += Unicode::narrowToWide(radius);
+				result += Unicode::narrowToWide("\n");
+			}
+			result += Unicode::narrowToWide("Trigger Volume list for object ");
+			result += argv[1].c_str();
+			result += Unicode::narrowToWide("complete\n");
+		}		
+	}
+	else if(isCommand(argv[0], "createTriggerVolume"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = ServerWorld::findObjectByNetworkId(oid);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else
+		{
+			const TriggerVolume * t = o->getTriggerVolume(Unicode::wideToNarrow(argv[2]));
+			if(t == 0)
+			{
+				const std::string name = Unicode::wideToNarrow(argv[2]);
+				const float radius = static_cast<float>(atof(Unicode::wideToNarrow(argv[3].c_str()).c_str()));
+				o->createTriggerVolume(radius, name, true);
+				result = Unicode::narrowToWide("Created a new trigger volume named ");
+				result += argv[2];
+				result += Unicode::narrowToWide(" with a radius of ");
+				result += argv[3];
+				result += Unicode::narrowToWide(" on object ");
+				result += argv[1];
+				result += Unicode::narrowToWide("\n");
+			}
+			else
+			{
+				result = Unicode::narrowToWide("A trigger volume named ");
+				result += argv[2];
+				result += Unicode::narrowToWide(" already exists on object ");
+				result += argv[1];
+				result += Unicode::narrowToWide("\n");
+			}
+		}
+	}
+	else if(isCommand(argv[0], "removeTriggerVolume"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = ServerWorld::findObjectByNetworkId(oid);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else
+		{
+			const TriggerVolume * t = o->getTriggerVolume(Unicode::wideToNarrow(argv[2]));
+			if(t != 0)
+			{
+				const std::string name = Unicode::wideToNarrow(argv[2]);
+				o->removeTriggerVolume(name);
+				result = Unicode::narrowToWide("Removed trigger volume named ");
+				result += argv[2];
+				result += Unicode::narrowToWide(" from object ");
+				result += argv[1];
+				result += Unicode::narrowToWide("\n");
+			}
+			else
+			{
+				result = Unicode::narrowToWide("A trigger volume named ");
+				result += argv[2];
+				result += Unicode::narrowToWide(" does not exists on object ");
+				result += argv[1];
+				result += Unicode::narrowToWide("\n");
+			}
+		}
+	}
+	
+	else if (isCommand(argv[0], "setName"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		TangibleObject* o = dynamic_cast<TangibleObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else if (o->isPlayerControlled())
+		{
+			result += Unicode::narrowToWide("You cannot use this command on a player");
+			return true;
+		}
+		else
+		{
+			o->setObjectName(argv[2]);
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		
+		return true;
+		
+	}
+	
+	//-----------------------------------------------------------------
+
+	else if (isCommand(argv[0], "getServerTemplate"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		const ServerObject* o = dynamic_cast<const ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else
+		{
+			result += argv[1];
+			result += Unicode::narrowToWide(" ");
+			result += Unicode::narrowToWide(o->getTemplateName());
+			result += Unicode::narrowToWide("\n");
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+
+		return true;
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isCommand(argv[0], "reloadServerTemplate"))
+	{
+		std::string tmpString(Unicode::wideToNarrow(argv[1]));
+		Iff templateFile;
+		if (!templateFile.open(tmpString.c_str(), true))
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_TEMPLATE);
+			return true;
+		}
+
+		ServerMessageForwarding::beginBroadcast();
+
+		ReloadTemplateMessage const reloadTemplateMessage(tmpString);
+		ServerMessageForwarding::send(reloadTemplateMessage);
+
+		ServerMessageForwarding::end();
+
+		if (ObjectTemplateList::reload(templateFile) == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_TEMPLATE_NOT_LOADED);
+			return true;
+		}
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+		return true;
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isCommand(argv[0], "isIncapacitated"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		CreatureObject * creature = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (creature == NULL || !creature->isIncapacitated())
+			result += Unicode::narrowToWide("no");
+		else if (creature->isDead())
+			result += Unicode::narrowToWide("dead");
+		else
+			result += Unicode::narrowToWide("incapacitated");
+		return true;
+	}
+
+	//-----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "addLocationTarget"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		TangibleObject * o = dynamic_cast<TangibleObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if(o)
+		{
+			LocationData d;
+			d.name = argv[2];
+			Vector pos;
+			pos.x = static_cast<real>(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL));
+			pos.y = static_cast<real>(strtod(Unicode::wideToNarrow(argv[4]).c_str(), NULL));
+			pos.z = static_cast<real>(strtod(Unicode::wideToNarrow(argv[5]).c_str(), NULL));
+			d.location.setCenter(pos);
+			float radius = static_cast<real>(strtod(Unicode::wideToNarrow(argv[6]).c_str(), NULL));
+			d.location.setRadius(radius);
+			o->addLocationTarget(d);			
+		}
+		else
+		{
+			result += Unicode::narrowToWide("Object does not exist or is not derived from TangibleObject");
+		}
+	}
+
+	//-----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "removeLocationTarget"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		TangibleObject * o = dynamic_cast<TangibleObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if(o)
+		{
+			o->removeLocationTarget(argv[2]);
+		}
+	}
+
+	//-----------------------------------------------------------------
+
+	else if(isCommand(argv[0], "watchAIPath"))
+	{
+		RequestWatchObjectPath rwop;
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		bool enable = strtoul(Unicode::wideToNarrow(argv[2]).c_str(), 0, 10) != 0;
+		rwop.setClientId(userId);
+		rwop.setObjectId(NetworkId(oid));
+		rwop.setEnable(enable);
+		emitMessage(rwop);
+	}
+
+	//-----------------------------------------------------------------
+
+	else if(isCommand(argv[0], "watchPathMap"))
+	{
+		RequestWatchPathMap rwpm;
+		bool enable = strtoul(Unicode::wideToNarrow(argv[1]).c_str(), 0, 10) != 0;
+		rwpm.setClientId(userId);
+		rwpm.setEnable(enable);
+		emitMessage(rwpm);
+	}
+
+	//-----------------------------------------------------------------
+
+	else if(isCommand(argv[0], "unstick"))
+	{
+		RequestUnstick request;
+		request.setClientId(userId);
+		emitMessage(request);
+	}
+
+	//-----------------------------------------------------------------
+
+	else if(isCommand(argv[0], "attribs"))
+	{
+		CachedNetworkId oid(Unicode::wideToNarrow(argv[1]));
+		const TangibleObject * tangible = dynamic_cast<const TangibleObject *>(
+			oid.getObject());
+		const CreatureObject * creature = dynamic_cast<const CreatureObject *>(
+			tangible);
+		if (creature != NULL)
+		{
+			char buffer[1024];
+			sprintf(buffer, "he:%d, co=%d, ac=%d, st=%d, mi=%d, wi=%d", 
+					creature->getAttribute(Attributes::Health),
+					creature->getAttribute(Attributes::Constitution),
+					creature->getAttribute(Attributes::Action),
+					creature->getAttribute(Attributes::Stamina),
+					creature->getAttribute(Attributes::Mind),
+					creature->getAttribute(Attributes::Willpower));
+			result += Unicode::narrowToWide(buffer);
+		}
+		else if (tangible != NULL)
+		{
+			char buffer[1024];
+			sprintf(buffer, "max hp = %d, damage taken = %d",
+					tangible->getMaxHitPoints(),
+					tangible->getDamageTaken());
+			result += Unicode::narrowToWide(buffer);
+		}
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+	}
+
+	//-----------------------------------------------------------------------
+
+	else if (isCommand(argv[0], "count"))
+	{
+		char buf[32] = {"\0"};
+		snprintf(buf, sizeof(buf), "%lu objects allocated\n", ServerObject::getObjectCount());
+		result += Unicode::narrowToWide(std::string(buf));
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isCommand(argv[0], "enqueueCommand"))
+	{
+		CachedNetworkId actorId(Unicode::wideToNarrow(argv[1]));
+		CachedNetworkId targetId(Unicode::wideToNarrow(argv[3]));
+
+		CreatureObject *actorObj = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(actorId));
+		if (actorObj)
+		{
+			Command const &command = CommandTable::getCommand(Crc::normalizeAndCalculate(Unicode::wideToNarrow(argv[2]).c_str()));
+			if (!command.isNull())
+				actorObj->commandQueueEnqueue(command, targetId, argv[4]);
+			else
+				result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+	}
+
+	//-----------------------------------------------------------------
+	else if (isCommand(argv[0], "hide"))
+	{
+		NetworkId actorId(Unicode::wideToNarrow(argv[1]));
+		bool value = strtoul(Unicode::wideToNarrow(argv[2]).c_str(), 0, 10) != 0;
+
+		TangibleObject *actorObj = dynamic_cast<TangibleObject *>(ServerWorld::findObjectByNetworkId(actorId));
+		if (actorObj)
+		{
+			actorObj->setVisible(!value);
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		}
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isCommand(argv[0], "setCoverVisibility"))
+	{
+		NetworkId actorId(Unicode::wideToNarrow(argv[1]));
+		bool value = strtoul(Unicode::wideToNarrow(argv[2]).c_str(), 0, 10) != 0;
+
+		ServerObject * const o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(actorId));
+		CreatureObject * const c = (o ? o->asCreatureObject() : NULL);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("setting creature object (%s) cover visibility to (%s)\n", actorId.getValueString().c_str(), (value ? "true" : "false")));
+		c->setCoverVisibility(value);
+	}
+
+	//-----------------------------------------------------------------
+
+	else if(isCommand(argv[0], "getExposedProxyList") || isCommand(argv[0], "getPrivateProxyList"))
+	{
+		bool const usePrivateList = isCommand(argv[0], "getPrivateProxyList");
+
+		CachedNetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * obj = dynamic_cast<ServerObject *>(oid.getObject());
+		if(obj)
+		{
+			ProxyList const &proxyList = usePrivateList ? obj->getPrivateProxyList() : obj->getExposedProxyList();
+			char objbuf[1024];
+			if (usePrivateList)
+				snprintf(objbuf, sizeof(objbuf) - 1, "Private proxy list for (%s : %s):\n", obj->getObjectTemplateName(), oid.getValueString().c_str());
+			else
+				snprintf(objbuf, sizeof(objbuf) - 1, "Exposed proxy list for (%s : %s):\n", obj->getObjectTemplateName(), oid.getValueString().c_str());
+			objbuf[sizeof(objbuf) - 1] = '\0';
+
+			result += Unicode::narrowToWide(std::string(objbuf));
+			for (ProxyList::const_iterator i = proxyList.begin(); i != proxyList.end(); ++i)
+			{
+				char numbuf[16] = {"\0"};
+				snprintf(numbuf, sizeof(numbuf), "%li", (*i));
+				result += Unicode::narrowToWide(std::string(numbuf));
+				result += Unicode::narrowToWide(std::string("\n"));
+			}
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	else
+	{
+		// ConsoleCommandParserObject::performParsing() is getting too big for the compiler to handle
+		// so some of the message handling is done in the private helper performParsing2()
+		return performParsing2(userId, argv, originalCommand, result, node);
+	}
+
+	return true;
+}
+
+// ---------------------------------------------------------------------
+// ConsoleCommandParserObject::performParsing() is getting too big for the compiler to handle
+// so some of the message handling is done in this private helper performParsing2()
+
+bool ConsoleCommandParserObject::performParsing2(const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser *)
+{
+	CreatureObject * const playerObject = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(userId));
+	if (!playerObject)
+	{
+		WARNING_STRICT_FATAL(true, ("Console command executed on invalid player object %s", userId.getValueString().c_str()));
+		return false;
+	}
+
+	UNREF(originalCommand);
+
+	if(isCommand(argv[0], "getObservers"))
+	{
+		CachedNetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * obj = dynamic_cast<ServerObject *>(oid.getObject());
+		if (obj)
+		{
+			std::string observers;
+			const std::set<Client *>& observerList = obj->getObservers();
+			std::set<Client *>::const_iterator j;
+			for (j = observerList.begin(); j != observerList.end(); ++j)
+			{
+				const Client* observerClient = (*j);
+				if (observerClient)
+				{
+					observers += observerClient->getCharacterObjectId().getValueString();
+					observers += " (";
+
+					ServerObject const* observer = observerClient->getCharacterObject();
+					if (observer)
+					{
+						observers += Unicode::wideToNarrow(observer->getAssignedObjectName()).c_str();
+					}
+
+					observers += ")\n";
+				}
+			}
+
+			const char *objectTemplateName = obj->getObjectTemplateName();
+
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("object %s (%s) has %d total observers (%d observers on this game server)\n", obj->getNetworkId().getValueString().c_str(), (objectTemplateName ? objectTemplateName : "NULL object template"), obj->getObserversCount(), observerList.size()));
+
+			if (!observers.empty())
+			{
+				result += Unicode::narrowToWide(observers);
+			}
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "getObserving"))
+	{
+		CachedNetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * obj = dynamic_cast<ServerObject *>(oid.getObject());
+		if (obj && obj->getClient())
+		{
+			Client::ObservingList const &observing = obj->getClient()->getObserving();
+			char objbuf[1024] = {"\0"};
+			snprintf(objbuf, sizeof(objbuf), "Observing list (%d items) for %s:\n", observing.size(), oid.getValueString().c_str());
+			result += Unicode::narrowToWide(std::string(objbuf));
+			int count = 1;
+			for (Client::ObservingList::const_iterator i = observing.begin(); i != observing.end(); ++i)
+			{
+				snprintf(objbuf, sizeof(objbuf), "%d: ", count++);
+				result += Unicode::narrowToWide(std::string(objbuf));
+
+				result += Unicode::narrowToWide((*i)->getNetworkId().getValueString());
+				result += Unicode::narrowToWide(std::string("\n"));
+			}
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "getObservingDetailed"))
+	{
+		CachedNetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * obj = dynamic_cast<ServerObject *>(oid.getObject());
+		if (obj && obj->getClient())
+		{
+			Client::ObservingList const &observing = obj->getClient()->getObserving();
+			char objbuf[1024] = {"\0"};
+			snprintf(objbuf, sizeof(objbuf), "Observing list (%d items) for %s:\n", observing.size(), oid.getValueString().c_str());
+			result += Unicode::narrowToWide(std::string(objbuf));
+			int count = 1;
+			for (Client::ObservingList::const_iterator i = observing.begin(); i != observing.end(); ++i)
+			{
+				snprintf(objbuf, sizeof(objbuf), "%d: ", count++);
+				result += Unicode::narrowToWide(std::string(objbuf));
+
+				result += Unicode::narrowToWide((*i)->getNetworkId().getValueString());
+
+				const char *objectTemplateName = (*i)->getObjectTemplateName();
+				if (objectTemplateName)
+				{
+					result += Unicode::narrowToWide(std::string(", "));
+					result += Unicode::narrowToWide(std::string(objectTemplateName));
+				}
+
+				result += Unicode::narrowToWide(std::string("\n"));
+			}
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "getObservingPvpSync"))
+	{
+		CachedNetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * obj = dynamic_cast<ServerObject *>(oid.getObject());
+		if (obj && obj->getClient())
+		{
+			Client::ObservingListPvpSync const &observing = obj->getClient()->getObservingPvpSync();
+			char objbuf[1024] = {"\0"};
+			snprintf(objbuf, sizeof(objbuf), "Observing (pvp sync) list (%d items) for %s:\n", observing.size(), oid.getValueString().c_str());
+			result += Unicode::narrowToWide(std::string(objbuf));
+			int count = 1;
+			for (Client::ObservingListPvpSync::const_iterator i = observing.begin(); i != observing.end(); ++i)
+			{
+				snprintf(objbuf, sizeof(objbuf), "%d: ", count++);
+				result += Unicode::narrowToWide(std::string(objbuf));
+
+				result += Unicode::narrowToWide((*i)->getNetworkId().getValueString());
+				result += Unicode::narrowToWide(std::string("\n"));
+			}
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "getObservingPvpSyncDetailed"))
+	{
+		CachedNetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * obj = dynamic_cast<ServerObject *>(oid.getObject());
+		if (obj && obj->getClient())
+		{
+			Client::ObservingListPvpSync const &observing = obj->getClient()->getObservingPvpSync();
+			char objbuf[1024] = {"\0"};
+			snprintf(objbuf, sizeof(objbuf), "Observing (pvp sync) list (%d items) for %s:\n", observing.size(), oid.getValueString().c_str());
+			result += Unicode::narrowToWide(std::string(objbuf));
+			int count = 1;
+			for (Client::ObservingListPvpSync::const_iterator i = observing.begin(); i != observing.end(); ++i)
+			{
+				snprintf(objbuf, sizeof(objbuf), "%d: ", count++);
+				result += Unicode::narrowToWide(std::string(objbuf));
+
+				result += Unicode::narrowToWide((*i)->getNetworkId().getValueString());
+
+				const char *objectTemplateName = (*i)->getObjectTemplateName();
+				if (objectTemplateName)
+				{
+					result += Unicode::narrowToWide(std::string(", "));
+					result += Unicode::narrowToWide(std::string(objectTemplateName));
+				}
+
+				result += Unicode::narrowToWide(std::string("\n"));
+			}
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		}
+	}
+
+	//------------------------------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "getVolume"))
+	{
+		CachedNetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * obj = dynamic_cast<ServerObject *>(oid.getObject());
+		if (obj)
+		{
+			VolumeContainmentProperty* prop = ContainerInterface::getVolumeContainmentProperty(*obj);
+			if (prop)
+			{
+				char tmp[50];
+				snprintf(tmp, 50, "%d\n", prop->getVolume());
+				result += Unicode::narrowToWide(tmp);
+			}
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	else if(isCommand(argv[0], "getLoadWith"))
+	{
+		CachedNetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * obj = dynamic_cast<ServerObject *>(oid.getObject());
+		if (obj)
+		{
+			char tmp[50];
+			NetworkId loadWithId = ContainerInterface::getLoadWithContainerId(*obj);
+			snprintf(tmp, 50, "Value: %s, result: %s\n", obj->getLoadWith().getValueString().c_str(), loadWithId.getValueString().c_str());
+			result += Unicode::narrowToWide(tmp);
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "renamePlayer"))
+	{
+		const NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		if (!NameManager::getInstance().isPlayer(oid))
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a player character\n", oid.getValueString().c_str()));
+		}
+		else
+		{
+			PlayerCreationManagerServer::renamePlayer(static_cast<int8>(RenameCharacterMessageEx::RCMS_console_god_command),NameManager::getInstance().getPlayerStationId(oid),oid,argv[2],Unicode::narrowToWide(NameManager::getInstance().getPlayerFullName(oid)),userId);
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		}
+	}
+
+	//-----------------------------------------------------------------
+
+	else if(isCommand(argv[0], "loadContents"))
+	{
+		const CachedNetworkId container(Unicode::wideToNarrow(argv[1]));
+		const ServerObject *obj=dynamic_cast<const ServerObject*>(container.getObject());
+		if (!obj)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		}
+		else
+		{
+			if (argv.size() >= 3)
+			{
+				NetworkId oid(Unicode::wideToNarrow(argv[2]));
+				if (oid!=NetworkId::cms_invalid)
+				{
+					obj->loadContainedObjectFromDB(oid);
+					result += getErrorMessage (argv[0], ERR_SUCCESS);
+				}
+				else
+					result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);				
+			}
+			else
+			{
+				obj->loadAllContentsFromDB();
+				result += getErrorMessage (argv[0], ERR_SUCCESS);
+			}
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "getAttributes"))
+	{
+		CachedNetworkId container(Unicode::wideToNarrow(argv[1]));
+		const ServerObject *obj=dynamic_cast<const ServerObject*>(container.getObject());
+		if (!obj)
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		else
+		{
+			std::vector<std::pair<std::string, Unicode::String> > data;
+			obj->getAttributes(userId, data);
+			for (std::vector<std::pair<std::string, Unicode::String> >::iterator i=data.begin(); i!=data.end(); ++i)
+			{
+				result += Unicode::narrowToWide(i->first + ":  ") + i->second + Unicode::narrowToWide("\n");
+			}
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "createPathNodes"))
+	{
+		NetworkId const oid(Unicode::wideToNarrow(argv[1]));
+
+		ServerObject * object = ServerWorld::findObjectByNetworkId(oid);
+
+		if(CityPathGraphManager::createPathNodes(object))
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "destroyPathNodes"))
+	{
+		NetworkId const oid(Unicode::wideToNarrow(argv[1]));
+
+		ServerObject * object = ServerWorld::findObjectByNetworkId(oid);
+
+		if(CityPathGraphManager::destroyPathNodes(object))
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "reloadPathNodes"))
+	{
+		if(CityPathGraphManager::reloadPathNodes())
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "relinkPathGraph"))
+	{
+		CityPathGraph const * graph = CityPathGraphManager::getCityGraphFor(playerObject);
+
+		if(graph)
+		{
+			CityPathGraphManager::relinkGraph(graph);
+
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		}
+		else
+		{
+			result += getErrorMessage (argv[0], ERR_FAIL);
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "setPathLinkDistance"))
+	{
+		float dist = static_cast<real>(strtod(Unicode::wideToNarrow(argv[1]).c_str(), NULL));
+
+		CityPathGraphManager::setLinkDistance(dist);
+
+		result += getErrorMessage (argv[0], ERR_SUCCESS);
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "markCityEntrance"))
+	{
+		NetworkId const oid(Unicode::wideToNarrow(argv[1]));
+
+		ServerObject * object = ServerWorld::findObjectByNetworkId(oid);
+
+		if(CityPathGraphManager::markCityEntrance(object))
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand(argv[0], "unmarkCityEntrance"))
+	{
+		NetworkId const oid(Unicode::wideToNarrow(argv[1]));
+
+		ServerObject * object = ServerWorld::findObjectByNetworkId(oid);
+
+		if(CityPathGraphManager::unmarkCityEntrance(object))
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand(argv[0], "setOwner"))
+	{
+		CachedNetworkId const oid(Unicode::wideToNarrow(argv[1]));
+		TangibleObject * object = dynamic_cast<TangibleObject *>(oid.getObject());
+		if (object == NULL)
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		else
+		{
+			NetworkId ownerId(playerObject->getNetworkId());
+			if (argv.size() == 3)
+			{
+				ownerId = NetworkId(Unicode::wideToNarrow(argv[2]));
+			}
+			object->setOwnerId(ownerId);
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		}
+	}
+
+	else if (isCommand(argv[0], "getOwner"))
+	{
+		CachedNetworkId const oid(Unicode::wideToNarrow(argv[1]));
+		TangibleObject * object = dynamic_cast<TangibleObject *>(oid.getObject());
+		if (object == NULL)
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		else
+		{
+			NetworkId ownerId = object->getOwnerId();
+			result += Unicode::narrowToWide("Owner is: ");
+			result += Unicode::narrowToWide(ownerId.getValueString());
+			result += Unicode::narrowToWide("\n");
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		}
+	}
+	// ----------------------------------------------------------------------
+
+	else if (isCommand(argv[0], "askConsent"))
+	{
+		ProsePackage p;
+		p.stringId = StringId("ui", "testaskconsent");
+		ConsentManager::getInstance().askConsent(userId, p, &ConsoleCommandParserObjectNamespace::testConsentHandler);
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "debugFar"))
+	{
+		CachedNetworkId oid(Unicode::wideToNarrow(argv[1]));
+		bool create = strtoul(Unicode::wideToNarrow(argv[2]).c_str(), 0, 10) != 0;
+		
+		float overrideVal = 0.0f;
+		if(argv.size() > 3)
+			overrideVal = static_cast<float>(atof(Unicode::wideToNarrow(argv[3]).c_str()));
+
+
+		ServerObject * object = dynamic_cast<TangibleObject *>(oid.getObject());
+		CreatureObject * creature = dynamic_cast<CreatureObject *>(object);
+		if (object == NULL)
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		else
+		{
+			if(create && creature)
+			{
+				creature->createFarNetworkUpdateVolume(overrideVal);
+			}
+			else if (create)
+			{
+				object->createFarNetworkUpdateVolume();
+			}
+			else
+				object->destroyFarNetworkUpdateVolume();
+		}
+
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand(argv[0], "multiplyBuildingRadius"))
+	{
+		float const multiplier = static_cast<float>(atof (Unicode::wideToNarrow (argv [1]).c_str ()));
+		ServerObject::setBuildingUpdateRadiusMultiplier(multiplier);
+		result += getErrorMessage (argv[0], ERR_SUCCESS);		
+	}
+
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "addJediSlot"))
+	{
+		Client * client = playerObject->getClient();
+		if (!client->isGod())
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		CreatureObject *creature  = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(oid));
+		PlayerObject *player = NULL;
+		if (creature)
+			player = PlayerCreatureController::getPlayerObject(creature);
+		if (player)
+		{
+			player->addJediToAccount();
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		}
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);			
+	}
+
+	else if(isCommand(argv[0], "getJediSlotInfo"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		CreatureObject const * creature  = dynamic_cast<CreatureObject const *>(NetworkIdManager::getObjectById(oid));
+		if (creature)
+		{
+			Client const * client = creature->getClient();
+			if (client)
+			{
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s, hasUnoccupiedJediSlot=%s, isJediSlotCharacter=%s\n", PlayerObject::getAccountDescription(creature).c_str(), (client->getHasUnoccupiedJediSlot() ? "yes" : "no"), (client->getIsJediSlotCharacter() ? "yes" : "no")));
+			}
+			else
+			{
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("object %s doesn't have a Client object (possible causes are may not be a player character object, may not be authoritative, or may not be connected)\n", oid.getValueString().c_str()));
+			}
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);	
+		}
+	}
+
+	else if(isCommand(argv[0], "makeSpectral"))
+	{
+		Client * client = playerObject->getClient();
+		if (!client->isGod())
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		CreatureObject *creature  = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(oid));
+		PlayerObject *player = NULL;
+		if (creature)
+			player = PlayerCreatureController::getPlayerObject(creature);
+		if (player)
+		{
+			player->makeSpectralOnAccount();
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		}
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);			
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "getHibernating"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		CreatureObject *creature  = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(oid));
+
+		if(creature)
+		{
+			AICreatureController * controller = dynamic_cast<AICreatureController*>(creature->getController());
+
+			if(controller)
+			{
+				if(controller->getHibernate())
+				{
+					result += Unicode::narrowToWide("true\n");
+				}
+				else
+				{
+					result += Unicode::narrowToWide("false\n");
+				}
+
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+			}
+			else
+			{
+				result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			}
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "getBehavior"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		CreatureObject *creature  = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(oid));
+
+		if(creature)
+		{
+			AICreatureController * controller = dynamic_cast<AICreatureController*>(creature->getController());
+
+			if(controller)
+			{
+				std::string temp;
+
+				controller->getBehaviorDebugInfo(temp);
+
+				result += Unicode::narrowToWide(temp.c_str());
+				result += Unicode::narrowToWide("\n");
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+			}
+			else
+			{
+				result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			}
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "getStandingOn"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		CreatureObject *creature  = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(oid));
+
+		if(creature)
+		{
+			CollisionProperty const * collision = creature->getCollisionProperty();
+
+			if(collision)
+			{
+				Object const * object = collision->getStandingOn();
+
+				if(object)
+				{
+					NetworkId const & id = object->getNetworkId();
+
+					result += Unicode::narrowToWide(id.getValueString().c_str());
+					result += Unicode::narrowToWide("\n");
+					result += getErrorMessage(argv[0], ERR_SUCCESS);
+				}
+				else
+				{
+					result += Unicode::narrowToWide("Creature is not standing on anyting\n");
+					result += getErrorMessage(argv[0], ERR_SUCCESS);
+				}
+			}
+			else
+			{
+				result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			}
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "getPower"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		const InstallationObject* o = dynamic_cast<const InstallationObject*>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		char buffer[32];
+		sprintf(buffer, "%.1f\n", o->getPower());
+		result += Unicode::narrowToWide(buffer);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "setPower"))
+	{
+		Client * client = playerObject->getClient();
+		if (!client->isGod())
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		InstallationObject* o = dynamic_cast<InstallationObject*>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		float power = static_cast<float>(atof(Unicode::wideToNarrow(argv[2].c_str()).c_str()));
+		o->setPower(power);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "getPowerRate"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		const InstallationObject* o = dynamic_cast<const InstallationObject*>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		char buffer[32];
+		sprintf(buffer, "%.1f\n", o->getPowerRate());
+		result += Unicode::narrowToWide(buffer);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "setPowerRate"))
+	{
+		Client * client = playerObject->getClient();
+		if (!client->isGod())
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		InstallationObject* o = dynamic_cast<InstallationObject*>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		float powerRate = static_cast<float>(atof(Unicode::wideToNarrow(argv[2].c_str()).c_str()));
+		o->setPowerRate(powerRate);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	else if(isCommand(argv[0], "getBattlefieldMarkerRegionName"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		BattlefieldMarkerObject *o = dynamic_cast<BattlefieldMarkerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		result += Unicode::narrowToWide(o->getRegionName());
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	else if(isCommand(argv[0], "setBattlefieldMarkerRegionName"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		BattlefieldMarkerObject *o = dynamic_cast<BattlefieldMarkerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		o->setRegionName(Unicode::wideToNarrow(argv[2]));
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	else if(isCommand(argv[0], "unload"))
+	{
+		// Unload an object on all servers.  Tell *every* gameserver to unload it, since this is
+		// normally to be used to correct objects in a bad state.
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+
+		ServerObject * const o = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(oid));
+		if (o)
+			o->unload();
+
+		ServerMessageForwarding::beginBroadcast();
+
+		UnloadObjectMessage const unloadObjectMessage(oid);
+		ServerMessageForwarding::send(unloadObjectMessage);
+
+		ServerMessageForwarding::end();
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "moveToPlayerAndUnload"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		NetworkId player(Unicode::wideToNarrow(argv[2]));
+
+		if (oid < ConfigServerGame::getMaxGoldNetworkId())
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		else
+		{
+			ServerObject *o = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(oid));
+			if (o && !dynamic_cast<UniverseObject*>(o) && !o->asCreatureObject() && !dynamic_cast<IntangibleObject*>(o))
+			{
+				const ServerObjectTemplate * const targetTemplate = safe_cast<const ServerObjectTemplate *>(o->getObjectTemplate());
+
+				bool canMoveInWorld = false;
+				if (targetTemplate)
+				{
+					for (size_t i = 0; i < targetTemplate->getMoveFlagsCount(); ++i)
+					{
+						if (targetTemplate->getMoveFlags(i) == ServerObjectTemplate::MF_player)
+						{
+							canMoveInWorld = true;
+						}
+					}
+				}
+
+				if (canMoveInWorld && o->getCacheVersion() == 0)
+				{
+					// disallow certain object types from being "moveToPlayerAndUnload"
+					const char *objectTemplateName = o->getObjectTemplateName();
+					if (objectTemplateName && (s_unmoveable.count(objectTemplateName) > 0))
+					{
+						char buffer[256];
+						snprintf(buffer, sizeof(buffer)-1, "Object id cannot be %s\n", objectTemplateName);
+						buffer[sizeof(buffer)-1] = '\0';
+
+						result += Unicode::narrowToWide(buffer);
+						result += getErrorMessage(argv[0], ERR_FAIL);
+					}
+					else
+					{
+						o->moveToPlayerAndUnload(player);
+						result += getErrorMessage(argv[0], ERR_SUCCESS);
+						LOG("CustomerService", ("Player:object %s is being given to offline player %s by %s", o->getNetworkId().getValueString().c_str(), player.getValueString().c_str(), PlayerObject::getAccountDescription(userId).c_str()));
+					}
+				}
+				else
+				{
+					result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+				}
+			}
+			else
+				result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "resetStats"))
+	{
+		// make sure the person using the command is an admin
+		Client * client = playerObject->getClient();
+		if (!client->isGod())
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject *o = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(oid));
+		if (o != NULL && o->asCreatureObject() != NULL && o->isPlayerControlled())
+		{
+			CreatureObject * creatureTarget = o->asCreatureObject();
+
+			// find the 1st skill the player has that is a profession
+			std::string professionName;
+			const CreatureObject::SkillList & skills = creatureTarget->getSkillList();
+			if (!skills.empty())
+			{
+				for (CreatureObject::SkillList::const_iterator i = skills.begin(); i != skills.end(); ++i)
+				{
+					const SkillObject * profession = (*i)->findProfessionForSkill();
+					if (profession != NULL)
+						professionName = profession->getSkillName();
+				}
+			}
+			if (professionName.empty())
+			{
+				// just get the 1st profession available
+				PlayerCreationManager::StringVector professions;
+				PlayerCreationManager::getProfessionVector (professions, "");
+				if (professions.empty())
+				{
+					WARNING(true, ("Could not find any profession handling "
+						"resetStats command"));
+					result += getErrorMessage(argv[0], ERR_FAIL);
+					return true;
+				}
+				professionName = professions[0];
+			}
+
+			std::vector<int> racialModifiers;
+			std::vector<int> professionModifiers;
+
+			if (!PlayerCreationManager::getRacialModifiers(creatureTarget->getSharedTemplateName(), racialModifiers))
+			{
+				WARNING(true, ("Could not get racial modifiers for template "
+					"%s handling resetStats command",
+					creatureTarget->getSharedTemplateName()));
+				result += getErrorMessage(argv[0], ERR_FAIL);
+				return true;
+			}
+			if (!PlayerCreationManager::getProfessionModifiers(professionName.c_str(), 
+				professionModifiers))
+			{
+				WARNING(true, ("Could not get profession modifiers for "
+					"profession %s handling resetStats command",
+					professionName.c_str()));
+				result += getErrorMessage(argv[0], ERR_FAIL);
+				return true;
+			}
+			if (racialModifiers.size() != professionModifiers.size() ||
+				racialModifiers.size() != static_cast<size_t>(Attributes::NumberOfAttributes))
+			{
+				WARNING(true, ("Invalid racial (%d) or profession (%d) data "
+					"handling resetStats command", racialModifiers.size(),
+					professionModifiers.size()));
+				result += getErrorMessage(argv[0], ERR_FAIL);
+				return true;
+			}
+			for (int i = 0; i < Attributes::NumberOfAttributes; ++i)
+			{
+				creatureTarget->resetAttribute(i, static_cast<Attributes::Value>(
+					racialModifiers[i] + professionModifiers[i]));
+			}
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "restoreHouse"))
+	{
+		NetworkId houseId(Unicode::wideToNarrow(argv[1]));
+
+		GenericValueTypeMessage<std::pair<NetworkId, std::string> > const msg("RestoreHouseMessage", std::make_pair(houseId, Unicode::wideToNarrow(playerObject->getAssignedObjectFirstName())));
+		GameServer::getInstance().sendToDatabaseServer(msg);
+
+		result += Unicode::narrowToWide("Request sent.  Please wait for reply.  This may take several minutes if a save cycle is in progress.");
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "restoreCharacter"))
+	{
+		NetworkId characterId(Unicode::wideToNarrow(argv[1]));
+
+		GenericValueTypeMessage<std::pair<NetworkId, std::string> > const msg("RestoreCharacterMessage", std::make_pair(characterId, Unicode::wideToNarrow(playerObject->getAssignedObjectFirstName())));
+		GameServer::getInstance().sendToDatabaseServer(msg);
+
+		result += Unicode::narrowToWide("Request sent.  Please wait for reply.  This may take several minutes if a save cycle is in progress.");
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "enableCharacter"))
+	{
+		StationId stationId = static_cast<StationId>(atoi (Unicode::wideToNarrow (argv [1]).c_str ()));
+		NetworkId playerId(Unicode::wideToNarrow(argv[2]));
+
+		GenericValueTypeMessage<std::pair<std::pair<StationId, NetworkId>, std::string> > msg("EnableCharacterMessage", std::make_pair(std::make_pair(stationId, playerId), Unicode::wideToNarrow(playerObject->getAssignedObjectFirstName())));
+		GameServer::getInstance().sendToCentralServer(msg);
+
+		result += Unicode::narrowToWide("Request sent.  Please wait for reply.");
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "disableCharacter"))
+	{
+		StationId stationId = static_cast<StationId>(atoi (Unicode::wideToNarrow (argv [1]).c_str ()));
+		NetworkId playerId(Unicode::wideToNarrow(argv[2]));
+
+		GenericValueTypeMessage<std::pair<std::pair<StationId, NetworkId>, std::string> > msg("DisableCharacterMessage", std::make_pair(std::make_pair(stationId, playerId), Unicode::wideToNarrow(playerObject->getAssignedObjectFirstName())));
+		GameServer::getInstance().sendToCentralServer(msg);
+
+		result += Unicode::narrowToWide("Request sent.  Please wait for reply.");
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "loginCharacter"))
+	{
+		NetworkId const playerId(Unicode::wideToNarrow(argv[1]));
+
+		// get the StationId for the specified NetworkId
+		StationId const stationId = NameManager::getInstance().getPlayerStationId(playerId);
+		if (stationId == 0)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("There is no character with id (%s) on this cluster\n", playerId.getValueString().c_str()));
+		}
+		else
+		{
+			std::string const & sourceCharacterName = NameManager::getInstance().getPlayerFullName(playerId);
+
+			TransferCharacterData data(TransferRequestMoveValidation::TRS_transfer_server);
+			data.setCharacterId(playerId);
+			data.setSourceStationId(stationId);
+			data.setSourceCharacterName(sourceCharacterName);
+			data.setSourceGalaxy(GameServer::getInstance().getClusterName());
+			data.setCSToolId(GameServer::getInstance().getProcessId());
+			const GenericValueTypeMessage<TransferCharacterData> loginCharacter("TransferGetLoginLocationData", data);
+			GameServer::getInstance().sendToDatabaseServer(loginCharacter);
+
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("Request to login character (%s, %s), station id (%lu) sent\n", playerId.getValueString().c_str(), sourceCharacterName.c_str(), stationId));
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "undeleteItem"))
+	{
+		NetworkId itemId(Unicode::wideToNarrow(argv[1]));
+		GenericValueTypeMessage<std::pair<NetworkId, std::string> > msg("UndeleteItemMessage", std::make_pair(itemId, Unicode::wideToNarrow(playerObject->getAssignedObjectFirstName())));
+		GameServer::getInstance().sendToDatabaseServer(msg);
+
+		result += Unicode::narrowToWide("Request sent.  Please wait for reply.  This may take several minutes if a save cycle is in progress.");
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "loadStructure"))
+	{
+		NetworkId itemId(Unicode::wideToNarrow(argv[1]));
+
+		LocateStructureMessage msg(itemId, 0, 0, "", Unicode::wideToNarrow(playerObject->getAssignedObjectFirstName()));
+		GameServer::getInstance().sendToDatabaseServer(msg);
+		result += Unicode::narrowToWide("Request sent.  Please wait for reply.  This may take several minutes if a save cycle is in progress.");
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "deleteAuctionLocation"))
+	{
+		NetworkId locationId(Unicode::wideToNarrow(argv[1]));
+
+		CommoditiesMarket::deleteAuctionLocation(locationId, Unicode::wideToNarrow(playerObject->getAssignedObjectFirstName()));
+
+		result += Unicode::narrowToWide("Request sent.  Please wait for reply.");
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "moveToPlayer"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		NetworkId player(Unicode::wideToNarrow(argv[2]));
+
+		if (oid < ConfigServerGame::getMaxGoldNetworkId())
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		else
+		{
+			GenericValueTypeMessage<std::pair<std::pair<NetworkId, NetworkId>, std::string> > msg("MoveToPlayerMessage", std::make_pair(std::make_pair(oid, player), Unicode::wideToNarrow(playerObject->getAssignedObjectFirstName())));
+			GameServer::getInstance().sendToDatabaseServer(msg);
+
+			result += Unicode::narrowToWide("Request sent.  Please wait for reply.  This may take several minutes if a save cycle is in progress.");
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "fixLoadWith"))
+	{
+		NetworkId topmostObject(Unicode::wideToNarrow(argv[1]));
+		NetworkId startingLoadWith(Unicode::wideToNarrow(argv[2]));
+		int maxDepth = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+
+		if (topmostObject < ConfigServerGame::getMaxGoldNetworkId() || startingLoadWith < ConfigServerGame::getMaxGoldNetworkId())
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		else
+		{
+			GenericValueTypeMessage<std::pair<std::pair<NetworkId, NetworkId>, int> > msg("FixLoadWith",
+				std::make_pair(std::make_pair(topmostObject, startingLoadWith), maxDepth));
+			GameServer::getInstance().sendToDatabaseServer(msg);
+
+			result += Unicode::narrowToWide("Request sent.  Please wait for reply.  This may take several minutes if a save cycle is in progress.");
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "moveSimStart"))
+	{
+		int countNpc    = 1;
+		int countPc     = 1;
+		float radius    = 20.0f;
+		float moveSpeed = 1.0f;
+
+		if (argv.size () > 3)
+		{
+			countNpc  = atoi (Unicode::wideToNarrow (argv [1]).c_str ());
+			countPc   = atoi (Unicode::wideToNarrow (argv [2]).c_str ());
+			radius    = static_cast<float>(atof (Unicode::wideToNarrow (argv [3]).c_str ()));
+			moveSpeed = static_cast<float>(atof (Unicode::wideToNarrow (argv [4]).c_str ()));
+		}
+
+		MoveSimManager::start (userId, countNpc, countPc, radius, moveSpeed);
+	}
+
+	//----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "moveSimClear"))
+	{
+		MoveSimManager::clear ();
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "playUiEffect"))
+	{
+		if (argv.size() < 2)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_PARAMETER_COUNT);
+			return false;
+		}
+
+		NetworkId oid (Unicode::wideToNarrow(argv[1]));
+		ServerObject* const object = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(oid));
+
+		if (object == NULL)
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		else if (!object->getClient())
+			result += getErrorMessage(argv[0], ERR_INVALID_USER);
+		else 
+		{
+			Unicode::String resultString;
+			static Unicode::String const spaceString = Unicode::narrowToWide(" ");
+
+			for(StringVector_t::const_iterator itString = (argv.begin() + 2); itString != argv.end(); ++itString)
+			{
+				resultString += *itString;
+				resultString += spaceString;
+			}
+
+			//format the message.
+			MessageQueueGenericValueType<std::pair<NetworkId, std::string> > * msg = new MessageQueueGenericValueType<std::pair<NetworkId, std::string> >(std::make_pair(oid, Unicode::wideToNarrow(resultString)));
+			object->appendMessage(CM_uiPlayEffect, 0.0f, msg);
+		}		
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "rollupStructure"))
+	{
+		NetworkId houseId (Unicode::wideToNarrow(argv[1]));
+		NetworkId ownerId (Unicode::wideToNarrow(argv[2]));
+
+		ServerObject * const object = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(houseId));
+		TangibleObject * const tangible = object ? object->asTangibleObject() : NULL;
+		if (!tangible)
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		else
+			tangible->rollupStructure(ownerId, false);
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "regionList"))
+	{
+		ServerObject * object = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(playerObject->getLookAtTarget()));
+
+		if (NULL == object)
+			object = playerObject;
+
+		RegionMaster::RegionVector rv;
+		std::string const & planetName = ServerWorld::getSceneId();
+		Vector const & pos_w = object->getPosition_w();
+
+		RegionMaster::getRegionsAtPoint(planetName, pos_w.x, pos_w.z, rv);
+
+		char buf[64];
+
+		for (RegionMaster::RegionVector::const_iterator it = rv.begin(); it != rv.end(); ++it)
+		{
+			Region const * const r = *it;
+			if (NULL != r)
+			{
+				_itoa(r->getGeography(), buf, 10);
+				result += Unicode::narrowToWide(buf);
+				result += Unicode::narrowToWide(" \\>32 ");
+				result += r->getName();
+				result += Unicode::narrowToWide("\\>000\n");
+			}
+		}
+	}
+
+	//----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "canMove"))
+	{
+		ServerObject * const target = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(playerObject->getLookAtTarget()));
+
+		if (NULL == target)
+		{
+			result += Unicode::narrowToWide("Invalid target");
+			return true;
+		}
+
+		Vector const & goal_w = target->getPosition_w();
+
+		CanMoveResult cmr = CollisionWorld::canMove(playerObject, goal_w, 1.0f, false, false, false);
+
+		result += Unicode::narrowToWide("result=");
+
+		switch (cmr)
+		{
+		case CMR_MoveOK:
+			result += Unicode::narrowToWide("CMR_MoveOK");
+			break;
+		case CMR_HitFloorEdge:
+			result += Unicode::narrowToWide("CMR_HitFloorEdge");
+			break;
+		case CMR_HitObstacle:
+			result += Unicode::narrowToWide("CMR_HitObstacle");
+			break;
+		case CMR_MissedGoal:
+			result += Unicode::narrowToWide("CMR_MissedGoal");
+			break;
+		case CMR_Error:
+			result += Unicode::narrowToWide("CMR_Error");
+			break;
+		case CMR_Invalid:
+			result += Unicode::narrowToWide("CMR_Invalid");
+			break;
+		}
+	}
+
+	//----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "pathAutoGenerate"))
+	{
+		float const nodeDistance = static_cast<float>(atof(Unicode::wideToNarrow(argv[1]).c_str()));
+		float const obstacleDistance = static_cast<float>(atof(Unicode::wideToNarrow(argv[2]).c_str()));
+
+		ServerObject * object = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(playerObject->getLookAtTarget()));
+
+		if (NULL == object)
+			object = playerObject;
+
+		Vector const & pos_w = object->getPosition_w();
+
+		PathAutoGenerator::pathAutoCleanup(pos_w, result);
+		PathAutoGenerator::pathAutoGenerate(pos_w, nodeDistance, obstacleDistance, result);
+	}
+
+	//----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "pathAutoCleanup"))
+	{
+		ServerObject * object = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(playerObject->getLookAtTarget()));
+
+		if (NULL == object)
+			object = playerObject;
+
+		Vector const & pos_w = object->getPosition_w();
+
+		PathAutoGenerator::pathAutoCleanup(pos_w, result);
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "pathAutoCleanup"))
+	{
+		ServerObject * object = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(playerObject->getLookAtTarget()));
+
+		if (NULL == object)
+			object = playerObject;
+
+		Vector const & pos_w = object->getPosition_w();
+
+		PathAutoGenerator::pathAutoCleanup(pos_w, result);
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "getStaticInfo"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		const ServerObject* o = dynamic_cast<const ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else
+		{
+			result += argv[1];
+			result += Unicode::narrowToWide(" ");
+			result += Unicode::narrowToWide(o->getStaticItemName());
+			char tmpBuf[256];
+			sprintf(tmpBuf, ":%d\n", o->getStaticItemVersion());
+			result += Unicode::narrowToWide(tmpBuf);
+			result += Unicode::narrowToWide("\n");
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "getBroadcastInfo"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		const ServerObject* o = dynamic_cast<const ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else
+		{
+			typedef std::map<std::string, std::set<NetworkId> > BroadcastMap;
+
+			result += Unicode::narrowToWide("listening to:\n");
+			BroadcastMap broadcastMap;
+
+			{
+				ServerObject::BroadcastMap const & broadcasters = o->getBroadcastBroadcasters();
+
+				for (ServerObject::BroadcastMap::const_iterator i = broadcasters.begin(); i != broadcasters.end(); ++i)
+					IGNORE_RETURN(broadcastMap[i->first].insert(i->second));
+
+				for (BroadcastMap::const_iterator j = broadcastMap.begin(); j != broadcastMap.end(); ++j)
+				{
+					result += Unicode::narrowToWide(j->first);
+					result += Unicode::narrowToWide(":");
+
+					for (std::set<NetworkId>::const_iterator k = j->second.begin(); k != j->second.end(); ++k)
+					{
+						if (k != j->second.begin())
+							result += Unicode::narrowToWide(" ");
+
+						result += Unicode::narrowToWide(k->getValueString());
+					}
+
+					result += Unicode::narrowToWide("\n");
+				}
+			}
+
+			result += Unicode::narrowToWide("broadcasting to:\n");
+			broadcastMap.clear();
+
+			{
+				ServerObject::BroadcastMap const & listeners = o->getBroadcastListeners();
+
+				for (ServerObject::BroadcastMap::const_iterator i = listeners.begin(); i != listeners.end(); ++i)
+					IGNORE_RETURN(broadcastMap[i->first].insert(i->second));
+
+				for (BroadcastMap::const_iterator j = broadcastMap.begin(); j != broadcastMap.end(); ++j)
+				{
+					result += Unicode::narrowToWide(j->first);
+					result += Unicode::narrowToWide(":");
+
+					for (std::set<NetworkId>::const_iterator k = j->second.begin(); k != j->second.end(); ++k)
+					{
+						if (k != j->second.begin())
+							result += Unicode::narrowToWide(" ");
+
+						result += Unicode::narrowToWide(k->getValueString());
+					}
+
+					result += Unicode::narrowToWide("\n");
+				}
+			}
+
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "getAge"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject const* o = dynamic_cast<ServerObject const*>(ServerWorld::findObjectByNetworkId(oid));
+		CreatureObject const* c = (o ? o->asCreatureObject() : NULL);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+		else
+		{
+			PlayerObject const* p = PlayerCreatureController::getPlayerObject(c);
+			if (p == NULL)
+			{
+				result += Unicode::narrowToWide("specified object is not a character object\n");
+				return true;
+			}
+			else
+			{
+				int const currentBornDate = PlayerObject::getCurrentBornDate();
+				int const bornDate = p->getBornDate();
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character object %s (%s) is (current born date = %d, %s) - (born date = %d, %s) = (%d days old)\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), currentBornDate, CalendarTime::getCharacerBirthDateString(currentBornDate).c_str(), bornDate, CalendarTime::getCharacerBirthDateString(bornDate).c_str(), (currentBornDate - bornDate)));
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "adjustAge"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject* o = dynamic_cast<ServerObject*>(ServerWorld::findObjectByNetworkId(oid));
+		CreatureObject* c = (o ? o->asCreatureObject() : NULL);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else if (!o->isAuthoritative())
+		{
+			result += Unicode::narrowToWide("specified object is not authoritative on this game server\n");
+			return true;
+		}
+		else if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+		else
+		{
+			PlayerObject* p = PlayerCreatureController::getPlayerObject(c);
+			if (p == NULL)
+			{
+				result += Unicode::narrowToWide("specified object is not a character object\n");
+				return true;
+			}
+			else
+			{
+				int const adjustment = atoi(Unicode::wideToNarrow(argv[2]).c_str());
+				int const existingBornDate = p->getBornDate();
+				int const todayBornDate = PlayerObject::getCurrentBornDate();
+				int const currentAge = todayBornDate - existingBornDate;
+				int const newBornDate = existingBornDate - adjustment; // to adjust age, must adjust the born date appropriately
+
+				if ((newBornDate <= 0) || (newBornDate > todayBornDate))
+				{
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("cannot adjust character object %s (%s) (%d days old) age by %d days because that would make the character too young or too old\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), currentAge, adjustment));
+					return true;
+				}
+				else
+				{
+					p->adjustBornDate(-adjustment); // to adjust age, must adjust the born date appropriately
+
+					const int newAge = todayBornDate - p->getBornDate();
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("character object %s (%s) age has been adjusted from %d days old to %d days old\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), currentAge, newAge));
+				}
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "getBadge"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		CreatureObject * c = (o ? o->asCreatureObject() : NULL);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		// earned badges
+		std::vector<CollectionsDataTable::CollectionInfoSlot const *> earnedBadges;
+		IGNORE_RETURN(p->getCompletedCollectionSlotCountInBook("badge_book", &earnedBadges));
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d Earned Badges:\n", earnedBadges.size()));
+
+		std::vector<CollectionsDataTable::CollectionInfoSlot const *>::const_iterator iter;
+		for (iter = earnedBadges.begin(); iter != earnedBadges.end(); ++iter)
+		{
+			result += Unicode::narrowToWide((*iter)->name);
+			result += Unicode::narrowToWide("|");
+			result += CollectionsDataTable::localizeCollectionName((*iter)->name);
+
+			if (!(*iter)->titles.empty())
+			{
+				result += Unicode::narrowToWide("|");
+
+				for (std::vector<std::string>::const_iterator iterTitle = (*iter)->titles.begin(); iterTitle != (*iter)->titles.end(); ++iterTitle)
+				{
+					if (iterTitle != (*iter)->titles.begin())
+						result += Unicode::narrowToWide(", ");
+
+					result += CollectionsDataTable::localizeCollectionTitle(*iterTitle);
+				}
+			}
+
+			result += Unicode::narrowToWide("\n");
+		}
+
+		// unearned badges
+		std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & allBadges = CollectionsDataTable::getSlotsInBook("badge_book");
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("\n%d Unearned Badges:\n", (allBadges.size() - earnedBadges.size())));
+
+		for (iter = allBadges.begin(); iter != allBadges.end(); ++iter)
+		{
+			if (!p->hasCompletedCollectionSlot(**iter))
+			{
+				result += Unicode::narrowToWide((*iter)->name);
+				result += Unicode::narrowToWide("|");
+				result += CollectionsDataTable::localizeCollectionName((*iter)->name);
+
+				if (!(*iter)->titles.empty())
+				{
+					result += Unicode::narrowToWide("|");
+
+					for (std::vector<std::string>::const_iterator iterTitle = (*iter)->titles.begin(); iterTitle != (*iter)->titles.end(); ++iterTitle)
+					{
+						if (iterTitle != (*iter)->titles.begin())
+							result += Unicode::narrowToWide(", ");
+
+						result += CollectionsDataTable::localizeCollectionTitle(*iterTitle);
+					}
+				}
+
+				result += Unicode::narrowToWide("\n");
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "getPassiveReveal"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject const* o = dynamic_cast<ServerObject const*>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		TangibleObject const* t = o->asTangibleObject();
+		if (t == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a tangible object\n");
+			return true;
+		}
+
+		std::map<NetworkId, int> const & passiveReveal = t->getPassiveReveal();
+		std::set<NetworkId> const & passiveRevealPlayerCharacter = t->getPassiveRevealPlayerCharacter();
+
+		if (passiveReveal.empty())
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s has an empty passive reveal list\n", t->getNetworkId().getValueString().c_str()));
+		}
+		else
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("Displaying passive reveal list (size=%d) for %s\n", passiveReveal.size(), t->getNetworkId().getValueString().c_str()));
+
+			for (std::map<NetworkId, int>::const_iterator iter = passiveReveal.begin(); iter != passiveReveal.end(); ++iter)
+			{
+				if (passiveRevealPlayerCharacter.count(iter->first) > 0)
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("oid=%s (PC), range=%d\n", iter->first.getValueString().c_str(), iter->second));
+				else
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("oid=%s (NPC), range=%d\n", iter->first.getValueString().c_str(), iter->second));
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "addPassiveReveal"))
+	{
+		NetworkId sourceOid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * sourceSo = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(sourceOid));
+		if (sourceSo == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is an invalid object\n", sourceOid.getValueString().c_str()));
+			return true;
+		}
+
+		TangibleObject * sourceTo = sourceSo->asTangibleObject();
+		if (sourceTo == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a tangible object\n", sourceOid.getValueString().c_str()));
+			return true;
+		}
+
+		NetworkId targetOid(Unicode::wideToNarrow(argv[2]));
+		ServerObject * targetSo = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(targetOid));
+		if (targetSo == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is an invalid object\n", targetOid.getValueString().c_str()));
+			return true;
+		}
+
+		TangibleObject * targetTo = targetSo->asTangibleObject();
+		if (targetTo == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a tangible object\n", targetOid.getValueString().c_str()));
+			return true;
+		}
+
+		int const range = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Updating %s's passive reveal list: adding %s, range=%d\n", sourceTo->getNetworkId().getValueString().c_str(), targetTo->getNetworkId().getValueString().c_str(), range));
+		sourceTo->addPassiveReveal(*targetTo, range);
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "removePassiveReveal"))
+	{
+		NetworkId sourceOid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * sourceSo = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(sourceOid));
+		if (sourceSo == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is an invalid object\n", sourceOid.getValueString().c_str()));
+			return true;
+		}
+
+		TangibleObject * sourceTo = sourceSo->asTangibleObject();
+		if (sourceTo == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a tangible object\n", sourceOid.getValueString().c_str()));
+			return true;
+		}
+
+		NetworkId targetOid(Unicode::wideToNarrow(argv[2]));
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Updating %s's passive reveal list: removing %s\n", sourceTo->getNetworkId().getValueString().c_str(), targetOid.getValueString().c_str()));
+		sourceTo->removePassiveReveal(targetOid);
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "clearPassiveReveal"))
+	{
+		NetworkId sourceOid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * sourceSo = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(sourceOid));
+		if (sourceSo == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is an invalid object\n", sourceOid.getValueString().c_str()));
+			return true;
+		}
+
+		TangibleObject * sourceTo = sourceSo->asTangibleObject();
+		if (sourceTo == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a tangible object\n", sourceOid.getValueString().c_str()));
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Clearing %s's passive reveal list\n", sourceTo->getNetworkId().getValueString().c_str()));
+		sourceTo->removeAllPassiveReveal();
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "getInvulnerabilityTimer"))
+	{
+		NetworkId sourceOid(Unicode::wideToNarrow(argv[1]));
+		ServerObject const * sourceSo = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(sourceOid));
+		if (sourceSo == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is an invalid object\n", sourceOid.getValueString().c_str()));
+			return true;
+		}
+
+		CreatureObject const * sourceCo = sourceSo->asCreatureObject();
+		if (sourceCo == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a creature object\n", sourceOid.getValueString().c_str()));
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s's invulnerability timer is %.10f\n", sourceCo->getNetworkId().getValueString().c_str(), sourceCo->getInvulnerabilityTimer()));
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "spewCommandQueue"))
+	{
+		NetworkId sourceOid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * sourceSo = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(sourceOid));
+		if (sourceSo == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is an invalid object\n", sourceOid.getValueString().c_str()));
+			return true;
+		}
+
+		CreatureObject * sourceCo = sourceSo->asCreatureObject();
+		if (sourceCo == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s is not a creature object\n", sourceOid.getValueString().c_str()));
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("dumping %s's command queue contents\n", sourceCo->getNetworkId().getValueString().c_str()));
+
+		CommandQueue * queue = sourceCo->getCommandQueue();
+		if (queue != NULL)
+		{
+			std::string output;
+			queue->spew(&output);
+			result += Unicode::narrowToWide(output);
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "getChatStatistics"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		CreatureObject * c = (o ? o->asCreatureObject() : NULL);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		time_t const timeNow = ::time(NULL);
+		time_t const timeStartInterval = ((p->getChatSpamTimeEndInterval() > 0) ? static_cast<time_t>(p->getChatSpamTimeEndInterval() - (ConfigServerGame::getChatSpamLimiterIntervalMinutes() * 60)) : 0);
+
+		if ((timeStartInterval <= 0) || (timeNow < timeStartInterval))
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("chat statistics for character object %s (%s) since %s:\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), CalendarTime::convertEpochToTimeStringLocal(timeStartInterval).c_str()));
+		else
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("chat statistics for character object %s (%s) since %s (%s ago):\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), CalendarTime::convertEpochToTimeStringLocal(timeStartInterval).c_str(), CalendarTime::convertSecondsToMS(static_cast<unsigned int>(timeNow - timeStartInterval)).c_str()));
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("spatial character count: %d\n", p->getChatSpamSpatialNumCharacters()));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("non-spatial character count: %d (excluding tell and group chat)\n", p->getChatSpamNonSpatialNumCharacters()));
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "adjustSwgAccountFeatureId"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject const * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject const * c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject const * p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		Client * client = o->getClient();
+		if (client == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("specified character object %s (%s) doesn't have a Client object (possible causes are may not be authoritative, or may not be connected)\n", o->getNetworkId().getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+			return true;
+		}
+
+		uint32 const featureId = static_cast<uint32>(::atoi(Unicode::wideToNarrow(argv[2]).c_str()));
+		int const adjustment = ::atoi(Unicode::wideToNarrow(argv[3]).c_str());
+
+		if (featureId == 0)
+		{
+			result += Unicode::narrowToWide("feature Id value must be non-zero\n");
+			return true;
+		}
+
+		if (adjustment == 0)
+		{
+			result += Unicode::narrowToWide("adjustment value must be non-zero\n");
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<1024>().sprintf("requesting adjustment of (%d) for SWG feature Id (%lu) on character object %s (%s) account (%lu)... please wait for reply.\n", adjustment, featureId, o->getNetworkId().getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), p->getStationId()));
+
+		AdjustAccountFeatureIdRequest const msg(userId, GameServer::getInstance().getProcessId(), o->getNetworkId(), std::string(), p->getStationId(), NetworkId::cms_invalid, std::string(), PlatformGameCode::SWG, featureId, adjustment);
+		client->sendToConnectionServer(msg);
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "reloadSwgAccountFeatureId"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject const * c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject const * p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		Client * client = o->getClient();
+		if (client == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("specified character object %s (%s) doesn't have a Client object (possible causes are may not be authoritative, or may not be connected)\n", o->getNetworkId().getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<1024>().sprintf("requesting SWG account feature Id for character object %s (%s) account (%lu)... please wait for reply.\n", o->getNetworkId().getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), p->getStationId()));
+
+		AccountFeatureIdRequest const req(userId, GameServer::getInstance().getProcessId(), oid, p->getStationId(), PlatformGameCode::SWG, AccountFeatureIdRequest::RR_ConsoleCommandReloadRequest);
+		client->sendToConnectionServer(req);
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "reloadSwgTcgAccountFeatureId"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject const * c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject const * p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		Client * client = o->getClient();
+		if (client == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("specified character object %s (%s) doesn't have a Client object (possible causes are may not be authoritative, or may not be connected)\n", o->getNetworkId().getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<1024>().sprintf("requesting SWG TCG account feature Id for character object %s (%s) account (%lu)... please wait for reply.\n", o->getNetworkId().getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), p->getStationId()));
+
+		AccountFeatureIdRequest const req(userId, GameServer::getInstance().getProcessId(), oid, p->getStationId(), PlatformGameCode::SWGTCG, AccountFeatureIdRequest::RR_ConsoleCommandReloadRequest);
+		client->sendToConnectionServer(req);
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "unloadBuildingContents"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		bool unloaded = false;
+
+		ServerObject * const o = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(oid));
+		if (o)
+		{
+			BuildingObject * const building = o->asBuildingObject();
+
+			if (building)
+				unloaded = building->unloadContents();
+		}
+
+		if (unloaded)
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage(argv[0], ERR_FAIL);
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if(isCommand(argv[0], "isOnSolidFloor"))
+	{
+		NetworkId const oid(Unicode::wideToNarrow(argv[1]));
+		Object const * const o = NetworkIdManager::getObjectById(oid);
+		if (o)
+		{
+			CollisionProperty const * const collisionProperty = o->getCollisionProperty();
+			if (collisionProperty)
+			{
+				Footprint const * const footprint = collisionProperty->getFootprint();
+				if (footprint)
+				{
+					result += Unicode::narrowToWide(FormattedString<1024>().sprintf("object (%s) isOnSolidFloor() = %s.\n", oid.getValueString().c_str(), (footprint->isOnSolidFloor() ? "TRUE" : "FALSE")));
+					result += Unicode::narrowToWide(FormattedString<1024>().sprintf("object (%s) isStandingOnFloor() = %s.\n", oid.getValueString().c_str(), (CollisionWorld::getFloorStandingOn(*o) ? "TRUE" : "FALSE")));
+
+					bool success;
+					float height;
+
+					success = footprint->getTerrainHeight(height);
+					if (success)
+						result += Unicode::narrowToWide(FormattedString<1024>().sprintf("object (%s) getTerrainHeight() = %.10g.\n", oid.getValueString().c_str(), height));
+					else
+						result += Unicode::narrowToWide(FormattedString<1024>().sprintf("object (%s) getTerrainHeight() = NONE.\n", oid.getValueString().c_str()));
+
+					success = footprint->getFloorHeight(height);
+					if (success)
+						result += Unicode::narrowToWide(FormattedString<1024>().sprintf("object (%s) getFloorHeight() = %.10g.\n", oid.getValueString().c_str(), height));
+					else
+						result += Unicode::narrowToWide(FormattedString<1024>().sprintf("object (%s) getFloorHeight() = NONE.\n", oid.getValueString().c_str()));
+
+					success = footprint->getGroundHeight(height);
+					if (success)
+						result += Unicode::narrowToWide(FormattedString<1024>().sprintf("object (%s) getGroundHeight() = %.10g.\n", oid.getValueString().c_str(), height));
+					else
+						result += Unicode::narrowToWide(FormattedString<1024>().sprintf("object (%s) getGroundHeight() = NONE.\n", oid.getValueString().c_str()));
+				}
+				else
+				{
+					result += Unicode::narrowToWide(FormattedString<1024>().sprintf("object (%s) getFootprint() returns NULL.\n", oid.getValueString().c_str()));
+				}
+			}
+			else
+			{
+				result += Unicode::narrowToWide(FormattedString<1024>().sprintf("object (%s) getCollisionProperty() returns NULL.\n", oid.getValueString().c_str()));
+			}
+		}
+		else
+		{
+			result += Unicode::narrowToWide(FormattedString<1024>().sprintf("object (%s) not found.\n", oid.getValueString().c_str()));
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	else
+	{
+		result += getErrorMessage(argv[0], ERR_NO_HANDLER);
+	}
+
+	return true;
+}
+
+// ---------------------------------------------------------------------
+
+bool ConsoleCommandParserObject::moveObject (const NetworkId & oid, const Vector & position_w, const NetworkId & targetContainer, const Vector & position_p) const
+{
+	if (oid < ConfigServerGame::getMaxGoldNetworkId())
+		return false;
+	
+	ServerObject *o = ServerWorld::findObjectByNetworkId(oid);
+
+	if (o)
+	{
+		// no moving cells
+		if (o->asCellObject())
+			return false;
+		// no moving buildings or ships to containers
+		if (targetContainer != NetworkId::cms_invalid && (o->asBuildingObject() || o->asShipObject()))
+			return false;
+		// no moving contained ships
+		if (o->asShipObject() && ContainerInterface::getContainedByObject(*o))
+			return false;
+		// no moving creatures in space
+		if (ServerWorld::isSpaceScene() && o->asCreatureObject())
+			return false;
+		// no moving objects that aren't ships into the world in space
+		if (ServerWorld::isSpaceScene() && targetContainer==NetworkId::cms_invalid && !o->asShipObject())
+			return false;
+
+		o->teleportObject(position_w, targetContainer, "", position_p, "");
+		return true;
+	}
+	return false;
+}
+
+//----------------------------------------------------------------------
+
+bool ConsoleCommandParserObject::rotateObject (const NetworkId & oid, real yaw, real pitch, real roll) const
+{
+	bool retval = false;
+	Object *o = ServerWorld::findObjectByNetworkId(oid);
+
+	if (o)
+	{
+		Transform t(o->getTransform_o2p());
+		t.yaw_l(yaw);
+		t.pitch_l(pitch);
+		t.roll_l(roll);
+		o->setTransform_o2p(t);
+		retval = true;
+	}
+	return retval;
+	
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObject.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObject.h
new file mode 100644
index 00000000..e6b6252e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObject.h
@@ -0,0 +1,66 @@
+// ======================================================================
+//
+// ConsoleCommandParserObject.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserObject_H
+#define INCLUDED_ConsoleCommandParserObject_H
+
+#include "sharedCommandParser/CommandParser.h"
+#include "sharedMessageDispatch/Emitter.h"
+
+class NetworkId;
+class ServerObject;
+class Transform;
+class Vector;
+
+// ======================================================================
+
+/**
+* Commands that are related to scripts
+*/
+
+class ConsoleCommandParserObject : 
+public CommandParser, 
+public MessageDispatch::Emitter
+{
+public:
+    ConsoleCommandParserObject ();
+    virtual bool performParsing (const NetworkId & userId, 
+								 const StringVector_t & argv,
+                                 const String_t & originalCommand,
+                                 String_t & result,
+                                 const CommandParser * node);
+	
+private:
+    ConsoleCommandParserObject (const ConsoleCommandParserObject & rhs);
+    ConsoleCommandParserObject &  operator= (const ConsoleCommandParserObject & rhs);
+
+	bool performParsing2 (const NetworkId & userId, 
+		const StringVector_t & argv,
+		const String_t & originalCommand,
+		String_t & result,
+		const CommandParser * node);
+
+    bool moveObject            (const NetworkId & oid, const Vector & position_w, const NetworkId & targetContainer, const Vector & position_p) const;
+    bool rotateObject            (const NetworkId & oid, real yaw, real pitch, real roll) const;
+    
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserObject_H
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObjvar.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObjvar.cpp
new file mode 100644
index 00000000..e4a928c5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObjvar.cpp
@@ -0,0 +1,751 @@
+// ======================================================================
+//
+// ConsoleCommandParserObjvar.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserObjvar.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedFoundation/DynamicVariableListNestedList.h"
+#include "sharedFoundation/DynamicVariableLocationData.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedGame/GameObjectTypes.h"
+#include <cstdio>
+
+// ======================================================================
+
+//TODO:  A lot of this file could be replaced by calls to ObjectVariable::debugPrint(), but need to make sure the formatting is consistent whith
+// what the god client expects
+
+// value types for set objvar
+enum
+{
+	INT_ARGUMENT,
+	REAL_ARGUMENT,
+	STRING_ARGUMENT
+};
+
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"set",    3, "<oid> <name> <value>",  "Sets an objvar for an object."},
+	{"setlist",2, "<oid> <name>",          "Creates a new objvar list."},
+	{"get",    2, "<oid> <name>",          "Prints the value of an objvar."},
+	{"list",   0, "",                      "Lists all the objvars on an object."},
+	{"listWithPacking", 1, "<oid>",      "Lists all the objvars on an object, showing which are packed into the OBJECTS table in the database."},
+	{"remove", 2, "<oid> <name>",          "Removes an objvar from an object."},
+	{"", 0, "", ""} // this must be last
+};
+
+//-----------------------------------------------------------------
+
+static std::string getDebugString(Transform const &tr)
+{
+	Vector i(tr.getLocalFrameI_p());
+	Vector j(tr.getLocalFrameJ_p());
+	Vector k(tr.getLocalFrameK_p());
+	Vector p(tr.getPosition_p());
+
+	std::string ret("\n");
+	char buf[256];
+
+	snprintf(buf, 256, "[%g %g %g %g]\n", static_cast<double>(i.x), static_cast<double>(j.x), static_cast<double>(k.x), static_cast<double>(p.x));
+	ret += buf;
+	snprintf(buf, 256, "[%g %g %g %g]\n", static_cast<double>(i.y), static_cast<double>(j.y), static_cast<double>(k.y), static_cast<double>(p.y));
+	ret += buf;
+	snprintf(buf, 256, "[%g %g %g %g]\n", static_cast<double>(i.z), static_cast<double>(j.z), static_cast<double>(k.z), static_cast<double>(p.z));
+	ret += buf;
+
+	return ret;
+}
+
+//-----------------------------------------------------------------
+
+static std::string getDebugString(Vector const &v)
+{
+	char buf[256];
+	snprintf(buf, 256, "[%g %g %g]", static_cast<double>(v.x), static_cast<double>(v.y), static_cast<double>(v.z));
+	return std::string(buf);
+}
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserObjvar::ConsoleCommandParserObjvar (void) :
+CommandParser ("objvar", 0, "...", "Objvar related commands.", 0)
+{
+	createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------
+
+
+bool ConsoleCommandParserObjvar::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+	NOT_NULL (node);
+	UNREF (userId);
+
+	UNREF(originalCommand);
+
+	//-----------------------------------------------------------------
+
+	if (isAbbrev( argv [0], "set"))
+	{
+		NetworkId oid (Unicode::wideToNarrow (argv[1]));
+		ServerObject* object = ServerWorld::findObjectByNetworkId(oid);
+		if (object == NULL)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		const Unicode::NarrowString &objvarName = Unicode::wideToNarrow(argv[2]);
+
+		// can't dork around with the "resourceData" objvar on a resource container
+		// or a manufacturing schematic or an incubator, since it contains resource
+		// data for "imported" resources that *MUST* remain the same as the
+		// corresponding objvar on every other resource container or a manufacturing
+		// schematic that references that "imported" resource.
+		if (objvarName == "power.resourceData")
+		{
+			const char *objectTemplateName = object->getObjectTemplateName();
+			if (objectTemplateName && (std::string(objectTemplateName) == "object/tangible/crafting/station/incubator_station.iff"))
+			{
+				result += Unicode::narrowToWide("You cannot set the \"resourceData\" objvar on an incubator\n");
+				return true;
+			}
+		}
+
+		int const gameObjectType = object->getGameObjectType();
+		if (GameObjectTypes::isTypeOf(gameObjectType, SharedObjectTemplate::GOT_resource_container) || (gameObjectType == SharedObjectTemplate::GOT_data_manufacturing_schematic))
+		{
+			std::string::size_type const pos = objvarName.rfind("resourceData");
+			if (pos == (objvarName.size() - sizeof("resourceData") + 1))
+			{
+				result += Unicode::narrowToWide("You cannot set the \"resourceData\" objvar on a resource crate or a manufacturing schematic\n");
+				return true;
+			}
+		}
+
+		if (!object->getObjVars().hasItem(objvarName))
+		{
+			// create a new objvar, deduce type from argument string
+			const Unicode::NarrowString &nString = Unicode::wideToNarrow(argv[3]);
+			switch (getArgumentType(nString))
+			{
+				case INT_ARGUMENT:
+					object->setObjVarItem(objvarName, atoi(nString.c_str()));
+					break;
+				case REAL_ARGUMENT:
+					object->setObjVarItem(objvarName, static_cast<real>(atof(nString.c_str())));
+					break;
+				case STRING_ARGUMENT:
+					object->setObjVarItem(objvarName, argv[3]);
+					break;
+				default:
+					break;
+			}
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+		{
+			// verify that the argument passed in is the same type as the objvar
+			switch (object->getObjVars().getType(objvarName))
+			{
+				case DynamicVariable::INT:
+					{
+						const Unicode::NarrowString &nString = Unicode::wideToNarrow(argv[3]);
+						if (getArgumentType(nString) == INT_ARGUMENT)
+						{
+							object->setObjVarItem(objvarName, atoi(nString.c_str()));
+							result += getErrorMessage(argv[0], ERR_SUCCESS);
+						}
+						else
+							result += getErrorMessage(argv[0], ERR_INVALID_INT_OBJVAR);
+					}
+					break;
+				case DynamicVariable::INT_ARRAY:
+					result += getErrorMessage(argv[0], ERR_CMD_NOT_FOUND);
+					break;
+				case DynamicVariable::REAL:
+					{
+						const Unicode::NarrowString &nString = Unicode::wideToNarrow(argv[3]);
+						if (getArgumentType(nString) == REAL_ARGUMENT)
+						{
+							object->setObjVarItem(objvarName, static_cast<real>(atof(nString.c_str())));
+							result += getErrorMessage(argv[0], ERR_SUCCESS);
+						}
+						else
+							result += getErrorMessage(argv[0], ERR_INVALID_REAL_OBJVAR);
+					}
+					break;
+				case DynamicVariable::REAL_ARRAY:
+					result += getErrorMessage(argv[0], ERR_CMD_NOT_FOUND);
+					break;
+				case DynamicVariable::STRING:
+					{
+						object->setObjVarItem(objvarName, argv[3]);
+						result += getErrorMessage(argv[0], ERR_SUCCESS);
+					}
+					break;
+				case DynamicVariable::STRING_ARRAY:
+					result += getErrorMessage(argv[0], ERR_CMD_NOT_FOUND);
+					break;
+				case DynamicVariable::NETWORK_ID:
+				case DynamicVariable::NETWORK_ID_ARRAY:
+				case DynamicVariable::LOCATION:
+				case DynamicVariable::LOCATION_ARRAY:
+				case DynamicVariable::STRING_ID:
+				case DynamicVariable::STRING_ID_ARRAY:
+				case DynamicVariable::TRANSFORM:
+				case DynamicVariable::TRANSFORM_ARRAY:
+				case DynamicVariable::VECTOR:
+				case DynamicVariable::VECTOR_ARRAY:
+					result += getErrorMessage(argv[0], ERR_CMD_NOT_FOUND);
+					break;
+				case DynamicVariable::LIST:
+					result += getErrorMessage(argv[0], ERR_LIST_OBJVAR_NOT_SUPPORTED);
+					break;
+			}			
+		}
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isAbbrev( argv [0], "setlist"))
+	{
+		// This is now a no-op, but left in to avoid breaking the god client
+// 		NetworkId oid (Unicode::wideToNarrow (argv[1]));
+// 		ServerObject* object = ServerWorld::findObjectByNetworkId(oid);
+// 		if (object == NULL)
+// 		{
+// 			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+// 			return true;
+// 		}
+
+// 		const Unicode::NarrowString &listName = Unicode::wideToNarrow(argv[2]);
+// 		object->addNestedObjVarList(listName);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isAbbrev( argv [0], "get"))
+	{
+		NetworkId oid (Unicode::wideToNarrow(argv[1]));
+		ServerObject* object = ServerWorld::findObjectByNetworkId(oid);
+		if (object == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		std::string objvarName(Unicode::wideToNarrow(argv[2]));
+		if (object->getObjVars().hasItem(objvarName))
+		{
+			char buffer[32];
+			switch (object->getObjVars().getType(objvarName))
+			{
+				case DynamicVariable::INT:
+					{
+						int value = 0;
+						object->getObjVars().getItem(objvarName,value);
+						IGNORE_RETURN(_itoa(value, buffer, 10));
+						result += Unicode::narrowToWide(buffer);
+					}
+					break;
+				case DynamicVariable::INT_ARRAY:
+					result += getErrorMessage(argv[0], ERR_CMD_NOT_FOUND);
+					break;
+				case DynamicVariable::REAL:
+					{
+						float value = 0;
+						object->getObjVars().getItem(objvarName,value);
+						sprintf(buffer, "%f", value);
+						result += Unicode::narrowToWide(buffer);
+					}
+					break;
+				case DynamicVariable::REAL_ARRAY:
+					result += getErrorMessage(argv[0], ERR_CMD_NOT_FOUND);
+					break;
+				case DynamicVariable::STRING:
+					{
+						Unicode::String value;
+						object->getObjVars().getItem(objvarName,value);
+						result += value;
+					}
+					break;
+				case DynamicVariable::STRING_ARRAY:
+					result += getErrorMessage(argv[0], ERR_CMD_NOT_FOUND);
+					break;
+				case DynamicVariable::NETWORK_ID:
+				case DynamicVariable::NETWORK_ID_ARRAY:
+				case DynamicVariable::LOCATION:
+				case DynamicVariable::LOCATION_ARRAY:
+				case DynamicVariable::STRING_ID:
+				case DynamicVariable::STRING_ID_ARRAY:
+				case DynamicVariable::TRANSFORM:
+				case DynamicVariable::TRANSFORM_ARRAY:
+				case DynamicVariable::VECTOR:
+				case DynamicVariable::VECTOR_ARRAY:
+					result += getErrorMessage(argv[0], ERR_CMD_NOT_FOUND);
+					break;
+				case DynamicVariable::LIST:
+					 char buf[256]; 
+					 sprintf (buf, "objvar list\n");
+					 result += Unicode::narrowToWide(buf);
+					 listObjvars(DynamicVariableList::NestedList(object->getObjVars(),objvarName),
+						result, 0, false);
+					break;
+			}
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJVAR);
+		}
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isAbbrev(argv[0], "list"))
+	{
+		ServerObject * const userServerObject = ServerWorld::findObjectByNetworkId(userId);
+
+		if (userServerObject != NULL)
+		{
+			NetworkId specifiedNetworkId;
+
+			if (argv.size () > 1)
+			{
+				specifiedNetworkId = NetworkId(Unicode::wideToNarrow(argv[1]));
+			}
+			else
+			{
+				CreatureObject * const userCreatureObject = CreatureObject::asCreatureObject(userServerObject);
+
+				if (userCreatureObject != NULL)
+				{
+					specifiedNetworkId = userCreatureObject->getLookAtTarget();
+				}
+			}
+
+			ServerObject * const specifiedServerObject = ServerWorld::findObjectByNetworkId(specifiedNetworkId);
+
+			if (specifiedServerObject != NULL)
+			{
+				DynamicVariableList const & objVarList = specifiedServerObject->getObjVars();
+				FormattedString<1024> fs;
+				result += Unicode::narrowToWide(fs.sprintf("objvar list for object %s, num %d\n", specifiedServerObject->getNetworkId().getValueString().c_str(), objVarList.size()));
+				listObjvars(DynamicVariableList::NestedList(objVarList), result, 0, false);
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+
+				return true;
+			}
+		}
+
+		result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+	}
+	// ----------------------------------------------------------------------
+
+	else if (isAbbrev(argv[0], "listWithPacking"))
+	{
+		NetworkId oid = NetworkId(Unicode::wideToNarrow(argv[1]));
+		ServerObject* object = ServerWorld::findObjectByNetworkId(oid);
+		if (object == NULL)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		char buf[256]; 
+		sprintf (buf, "objvar list\n");
+		result += Unicode::narrowToWide(buf);
+		listObjvars(DynamicVariableList::NestedList(object->getObjVars()), result, 0, true);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	
+	//-----------------------------------------------------------------
+
+	else if (isAbbrev(argv[0], "remove"))
+	{
+		NetworkId oid = NetworkId(Unicode::wideToNarrow(argv[1]));
+		ServerObject* object = ServerWorld::findObjectByNetworkId(oid);
+		if (object == NULL)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		
+		const Unicode::NarrowString &objvarName = Unicode::wideToNarrow(argv[2]);
+
+		// can't dork around with the "resourceData" objvar on a resource container
+		// or a manufacturing schematic or an incubator, since it contains resource
+		// data for "imported" resources that *MUST* remain the same as the
+		// corresponding objvar on every other resource container or a manufacturing
+		// schematic that references that "imported" resource.
+		if (objvarName == "power.resourceData")
+		{
+			const char *objectTemplateName = object->getObjectTemplateName();
+			if (objectTemplateName && (std::string(objectTemplateName) == "object/tangible/crafting/station/incubator_station.iff"))
+			{
+				result += Unicode::narrowToWide("You cannot remove the \"resourceData\" objvar on an incubator\n");
+				return true;
+			}
+		}
+
+		int const gameObjectType = object->getGameObjectType();
+		if (GameObjectTypes::isTypeOf(gameObjectType, SharedObjectTemplate::GOT_resource_container) || (gameObjectType == SharedObjectTemplate::GOT_data_manufacturing_schematic))
+		{
+			std::string::size_type const pos = objvarName.rfind("resourceData");
+			if (pos == (objvarName.size() - sizeof("resourceData") + 1))
+			{
+				result += Unicode::narrowToWide("You cannot remove the \"resourceData\" objvar on a resource crate or a manufacturing schematic\n");
+				return true;
+			}
+		}
+
+		object->removeObjVarItem(objvarName);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	//-----------------------------------------------------------------
+
+	else
+	{
+		result += getErrorMessage(argv[0], ERR_NO_HANDLER);
+	}
+
+	return true;
+}	// ConsoleCommandParserObjvar::performParsing
+
+//-----------------------------------------------------------------
+
+/**
+ * Determines the data type of an argument string.
+ *
+ * @param arg		the string to analize
+ *
+ * @return INT_ARGUMENT if the string is all digits, 
+ *         REAL_ARGUMENT if the string is all digits plus one '.',
+ *         STRING_ARGUMENT for everthing else
+ */
+int ConsoleCommandParserObjvar::getArgumentType(const Unicode::NarrowString &arg) const
+{
+	bool foundDecimal = false;
+
+	size_t const count = arg.size();
+	for (size_t i = 0; i < count; ++i)
+	{
+		if (!isdigit(arg[i]))
+		{
+			if ((i == 0) && (arg[i] == '-') && (count > 1))
+				continue;
+
+			if (arg[i] != '.' || foundDecimal)
+				return STRING_ARGUMENT;
+			foundDecimal = true;
+		}
+	}
+	if (foundDecimal)
+		return REAL_ARGUMENT;
+	return INT_ARGUMENT;
+}	// ConsoleCommandParserObjvar::getArgumentType
+
+//-----------------------------------------------------------------
+
+/**
+ * Prints out to a string all the objvars in an objvar list.
+ *
+ * @param objvarList		the list to print
+ * @param result			string to print the list to
+ * @param tabCount          how many tabs to print before the data
+ */
+void ConsoleCommandParserObjvar::listObjvars(const DynamicVariableList::NestedList &objvarList, String_t &result, int tabCount, bool withPackingData)
+{
+static const String_t space = Unicode::narrowToWide(" ");
+static const String_t spaces = Unicode::narrowToWide("  ");
+static const String_t newline = Unicode::narrowToWide("\n");
+static const String_t tabs = Unicode::narrowToWide("\t");
+static const String_t islist = Unicode::narrowToWide("<list>\n");
+char buffer[32];
+
+	for (DynamicVariableList::NestedList::const_iterator objVar(objvarList.begin()); objVar!=objvarList.end(); ++objVar)
+	{
+		// pad the objvar
+		for (int j = 0; j < tabCount; ++j)
+			result += spaces;
+
+		// print the name
+		result += Unicode::narrowToWide(objVar.getName());
+		result += tabs;
+		if (withPackingData)
+		{
+			char buffer[100];
+			sprintf(buffer,"%i",objVar.getPackedPosition());
+			result += Unicode::narrowToWide(std::string(buffer));
+			result += tabs;
+		}
+			
+		// print the data
+		switch (objVar.getType())
+		{
+			case DynamicVariable::INT:
+				{
+					int value=0;
+					objVar.getValue(value);
+					IGNORE_RETURN(_itoa(value, buffer, 10));
+					result += Unicode::narrowToWide(buffer);
+					result += newline;
+				}
+				break;
+			case DynamicVariable::INT_ARRAY:
+				{
+					std::vector<int> value;
+					objVar.getValue(value);
+					std::string text = "[";
+					size_t count = value.size();
+					for (size_t j = 0; j < count; ++j)
+					{
+						IGNORE_RETURN(_itoa(value[j], buffer, 10));
+						text += buffer;
+						if (j + 1 < count)
+							text += ", ";
+					}
+					text += "]\n";
+					result += Unicode::narrowToWide(text);
+				}
+				break;
+			case DynamicVariable::REAL:
+				{
+					real value = 0;
+					objVar.getValue(value);
+					sprintf(buffer, "%f\n", value);
+					result += Unicode::narrowToWide(buffer);
+				}
+				break;
+			case DynamicVariable::REAL_ARRAY:
+				{
+					std::vector<real> value;
+					objVar.getValue(value);
+					std::string text = "[";
+					size_t count = value.size();
+					for (size_t j = 0; j < count; ++j)
+					{
+						sprintf(buffer, "%f", value[j]);
+						text += buffer;
+						if (j + 1 < count)
+							text += ", ";
+					}
+					text += "]\n";
+					result += Unicode::narrowToWide(text);
+				}
+				break;
+			case DynamicVariable::STRING:
+				{
+					Unicode::String value;
+					objVar.getValue(value);
+					result += value;
+					result += newline;
+				}
+				break;
+			case DynamicVariable::STRING_ARRAY:
+				{
+					std::vector<Unicode::String> value;
+					objVar.getValue(value);
+					int k;
+					int nameLength = objVar.getName().size();
+					result += Unicode::narrowToWide("[\n");
+					size_t count = value.size();
+					for (size_t j = 0; j < count; ++j)
+					{
+						for (k = 0; k < tabCount; ++k)
+							result += spaces;
+						for (k = 0; k < nameLength; ++k)
+							result += space;
+						result += tabs;
+						result += value[j];
+						result += newline;
+					}
+					for (k = 0; k < tabCount; ++k)
+						result += spaces;
+					for (k = 0; k < nameLength; ++k)
+						result += space;
+					result += tabs;
+					result += Unicode::narrowToWide("]\n");
+				}
+				break;
+			case DynamicVariable::NETWORK_ID:
+				{
+					NetworkId value;
+					objVar.getValue(value);
+					result += Unicode::narrowToWide("(NetworkId)");
+					result += Unicode::narrowToWide(value.getValueString());
+					result += newline;
+				}
+				break;
+			case DynamicVariable::NETWORK_ID_ARRAY:
+				{
+					std::vector<NetworkId> value;
+					objVar.getValue(value);
+					std::string text = "(NetworkId)[";
+					size_t count = value.size();
+					for (size_t j = 0; j < count; ++j)
+					{
+						text += value[j].getValueString();
+						if (j + 1 < count)
+							text += ", ";
+					}
+					text += "]\n";
+					result += Unicode::narrowToWide(text);
+				}
+				break;
+			case DynamicVariable::LOCATION:
+				{
+					DynamicVariableLocationData value;
+					objVar.getValue(value);
+					result += Unicode::narrowToWide("(x=");
+					sprintf(buffer, "%f", value.pos.x);
+					result += Unicode::narrowToWide(buffer);
+					result += Unicode::narrowToWide(", y=");
+					sprintf(buffer, "%f", value.pos.y);
+					result += Unicode::narrowToWide(buffer);
+					result += Unicode::narrowToWide(", z=");
+					sprintf(buffer, "%f", value.pos.z);
+					result += Unicode::narrowToWide(buffer);
+					result += Unicode::narrowToWide(", scene=");
+					result += Unicode::narrowToWide(value.scene);
+					result += Unicode::narrowToWide(", cell=");
+					result += Unicode::narrowToWide(value.cell.getValueString());
+					result += Unicode::narrowToWide(")\n");
+				}
+				break;
+			case DynamicVariable::LOCATION_ARRAY:
+				{
+					std::vector<DynamicVariableLocationData> value;
+					objVar.getValue(value);
+					int k;
+					int nameLength = objVar.getName().size();
+					result += Unicode::narrowToWide("[\n");
+					size_t count = value.size();
+					for (size_t j = 0; j < count; ++j)
+					{
+						for (k = 0; k < tabCount; ++k)
+							result += spaces;
+						for (k = 0; k < nameLength; ++k)
+							result += space;
+						result += tabs;
+						result += Unicode::narrowToWide("(x=");
+						sprintf(buffer, "%f", value[j].pos.x);
+						result += Unicode::narrowToWide(buffer);
+						result += Unicode::narrowToWide(", y=");
+						sprintf(buffer, "%f", value[j].pos.y);
+						result += Unicode::narrowToWide(buffer);
+						result += Unicode::narrowToWide(", z=");
+						sprintf(buffer, "%f", value[j].pos.z);
+						result += Unicode::narrowToWide(buffer);
+						result += Unicode::narrowToWide(", scene=");
+						result += Unicode::narrowToWide(value[j].scene);
+						result += Unicode::narrowToWide(", cell=");
+						result += Unicode::narrowToWide(value[j].cell.getValueString());
+						result += Unicode::narrowToWide(")\n");
+					}
+					for (k = 0; k < tabCount; ++k)
+						result += spaces;
+					for (k = 0; k < nameLength; ++k)
+						result += space;
+					result += tabs;
+					result += Unicode::narrowToWide("]\n");					
+				}
+				break;
+			case DynamicVariable::LIST:
+				result += islist;
+				listObjvars(objVar.getNestedList(),
+					result, tabCount + 1, withPackingData);
+				break;
+			case DynamicVariable::STRING_ID:
+				{
+					StringId value;
+					objVar.getValue(value);
+					result += Unicode::narrowToWide("(StringId)");
+					result += Unicode::narrowToWide(value.getDebugString());
+					result += newline;
+				}
+				break;
+			case DynamicVariable::STRING_ID_ARRAY:
+				{
+					std::vector<StringId> value;
+					objVar.getValue(value);
+					std::string text = "(StringId)[";
+					size_t count = value.size();
+					for (size_t j = 0; j < count; ++j)
+					{
+						text += value[j].getDebugString();
+						if (j + 1 < count)
+							text += ", ";
+					}
+					text += "]\n";
+					result += Unicode::narrowToWide(text);
+				}
+				break;
+			case DynamicVariable::TRANSFORM:
+				{
+					Transform value;
+					objVar.getValue(value);
+					result += Unicode::narrowToWide("(Transform)");
+					result += Unicode::narrowToWide(getDebugString(value));
+					result += newline;
+				}
+				break;
+			case DynamicVariable::TRANSFORM_ARRAY:
+				{
+					std::vector<Transform> value;
+					objVar.getValue(value);
+					std::string text = "(Transform)[";
+					size_t count = value.size();
+					for (size_t j = 0; j < count; ++j)
+					{
+						text += getDebugString(value[j]);
+						if (j + 1 < count)
+							text += ", ";
+					}
+					text += "]\n";
+					result += Unicode::narrowToWide(text);
+				}
+				break;
+			case DynamicVariable::VECTOR:
+				{
+					Vector value;
+					objVar.getValue(value);
+					result += Unicode::narrowToWide("(Vector)");
+					result += Unicode::narrowToWide(getDebugString(value));
+					result += newline;
+				}
+				break;
+			case DynamicVariable::VECTOR_ARRAY:
+				{
+					std::vector<Vector> value;
+					objVar.getValue(value);
+					std::string text = "(Vector)[";
+					size_t count = value.size();
+					for (size_t j = 0; j < count; ++j)
+					{
+						text += getDebugString(value[j]);
+						if (j + 1 < count)
+							text += ", ";
+					}
+					text += "]\n";
+					result += Unicode::narrowToWide(text);
+				}
+				break;
+		}		
+	}		
+}	// ConsoleCommandParserObjvar::listObjvars
+
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObjvar.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObjvar.h
new file mode 100644
index 00000000..63ef1842
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserObjvar.h
@@ -0,0 +1,36 @@
+// ======================================================================
+//
+// ConsoleCommandParserObjvar.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserObjvar_H
+#define INCLUDED_ConsoleCommandParserObjvar_H
+
+#include "sharedCommandParser/CommandParser.h"
+#include "sharedFoundation/DynamicVariableList.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to objvars
+*/
+
+class ConsoleCommandParserObjvar : public CommandParser
+{
+public:
+	                          ConsoleCommandParserObjvar ();
+	virtual bool              performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node);
+	
+private:
+	                          ConsoleCommandParserObjvar (const ConsoleCommandParserObjvar & rhs);
+	ConsoleCommandParserObjvar &  operator= (const ConsoleCommandParserObjvar & rhs);
+	
+	int                       getArgumentType(const Unicode::NarrowString &arg) const;
+	void                      listObjvars(const DynamicVariableList::NestedList &objvarList, String_t &result, int tabCount, bool withPackingData);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserObjvar_H
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserPvp.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserPvp.cpp
new file mode 100644
index 00000000..d212d0ca
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserPvp.cpp
@@ -0,0 +1,1118 @@
+// ======================================================================
+//
+// ConsoleCommandParserPvp.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserPvp.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/Pvp.h"
+#include "serverGame/PvpInternal.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipObject.h"
+#include "serverScript/GameScriptObject.h"
+#include "sharedFoundation/CalendarTime.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedGame/PvpData.h"
+
+// ======================================================================
+ 
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"showGcwRankTable",                0, "",                           "Display the GCW rating/rank/rank title translation table"},
+	{"showGcwFormulasTable",            0, "",                           "Display the GCW formulas table for calculating rating and rating decay"},
+	{"showGcwRankDecayExclusionTimeTable", 0, "",                        "Display information about when GCW rank loss due to rank decay is disabled"},
+	{"getGcwInfo",                      1, "<oid>",                      "Get the GCW info for the specified character"},
+	{"adjustCurrentGcwPoint",           2, "<oid> <adjustment>",         "Adjust the current GCW point for the specified character (only factioned character has GCW point; doing this on a non-factioned character will set the character's GCW points to 0)"},
+	{"adjustCurrentGcwRating",          2, "<oid> <adjustment>",         "Adjust the current GCW rating for the specified character (only factioned character has rating; doing this on a non-factioned character will set the character's rating to -1)"},
+	{"adjustCurrentPvpKill",            2, "<oid> <adjustment>",         "Adjust the current PvP kill for the specified character"},
+	{"adjustLifetimeGcwPoint",          2, "<oid> <adjustment>",         "Adjust the lifetime GCW point for the specified character"},
+	{"adjustMaxGcwImperialRating",      2, "<oid> <adjustment>",         "Adjust the maximum attained GCW Imperial rating for the specified character"},
+	{"adjustMaxGcwRebelRating",         2, "<oid> <adjustment>",         "Adjust the maximum attained GCW Rebel rating for the specified character"},
+	{"adjustLifetimePvpKill",           2, "<oid> <adjustment>",         "Adjust the lifetime PvP kill for the specified character"},
+	{"adjustNextGcwRatingCalcTime",     2, "<oid> <number of weeks>",    "If the character has current GCW points or is at a decayable rank, adjust the time that the next GCW rating calculation will occur for the specified character (the adjustment value is entered in number of weeks in the range of -1000 weeks to +1000 weeks, with 0 to set the next calculation time to now)"},
+	{"testGcwPointToRatingConversion",  2, "<gcw points> <current rating>", "Specify the number of GCW points and the current rating value and see what would happen to the rating when the GCW points are converted to rating"},
+	{"getCombatSpamFilter",             1, "<oid>",                      "Get the combat spam filter value for the specified character"},
+	{"makeCovertImperialMercenary",     1, "<oid>",                      "Make the specified neutral player character a covert imperial mercenary"},
+	{"makeOvertImperialMercenary",      1, "<oid>",                      "Make the specified neutral player character an overt imperial mercenary"},
+	{"makeCovertRebelMercenary",        1, "<oid>",                      "Make the specified neutral player character a covert rebel mercenary"},
+	{"makeOvertRebelMercenary",         1, "<oid>",                      "Make the specified neutral player character an overt rebel mercenary"},
+	{"makeMercenaryNone",               1, "<oid>",                      "Removes factional mercenary status from the specified neutral player character"},
+	{"getMaster",                       1, "<oid>",                      "Gets the master of a pet"},
+	{"pvpCanAttack",                    2, "<actor> <target>",           "Performs a pvpCanAttack test on the specified objects"},
+	{"pvpAttackPerformed",              2, "<actor> <target>",           "Performs a pvpAttackPerformed operation on the specified objects, as if the actor had attacked the target"},
+	{"spaceMakeOvert",                  1, "<oid>",                      "Make the ship the specified character is in overt"},
+	{"spaceClearOvert",                 1, "<oid>",                      "Make the ship the specified character is in non-overt"},
+	{"",                                0, "", ""} // this must be last
+};
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserPvp::ConsoleCommandParserPvp (void) :
+CommandParser ("pvp", 0, "...", "Pvp related commands.", 0)
+{
+	createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------
+
+bool ConsoleCommandParserPvp::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+	NOT_NULL (node);
+	UNREF (userId);
+
+	UNREF(originalCommand);
+
+	// ----------------------------------------------------------------------
+
+	if (isCommand (argv [0], "showGcwRankTable"))
+	{
+		result += Unicode::narrowToWide(Pvp::debugGetGcwRankTable());
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "showGcwFormulasTable"))
+	{
+		result += Unicode::narrowToWide(Pvp::debugGetGcwFormulasTable());
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "showGcwRankDecayExclusionTimeTable"))
+	{
+		result += Unicode::narrowToWide(Pvp::debugGetGcwRankDecayExclusion());
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "getGcwInfo"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject const* o = dynamic_cast<ServerObject const*>(ServerWorld::findObjectByNetworkId(oid));
+		CreatureObject const* c = (o ? o->asCreatureObject() : NULL);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+		else
+		{
+			PlayerObject const* p = PlayerCreatureController::getPlayerObject(c);
+			if (p == NULL)
+			{
+				result += Unicode::narrowToWide("specified object is not a character object\n");
+				return true;
+			}
+			else
+			{
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character object %s (%s) GCW info\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+
+				if (PvpData::isImperialFactionId(c->getPvpFaction()))
+					result += Unicode::narrowToWide("current faction:                        Imperial\n");
+				else if (PvpData::isRebelFactionId(c->getPvpFaction()))
+					result += Unicode::narrowToWide("current faction:                        Rebel\n");
+				else
+					result += Unicode::narrowToWide("current faction:                        None\n");
+
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("current GCW points:                     %ld\n",p->getCurrentGcwPoints()));
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("current GCW rating:                     %ld\n",p->getCurrentGcwRating()));
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("current GCW rank:                       %d",p->getCurrentGcwRank()));
+				if (p->getCurrentGcwRank() > 0)
+				{
+					Pvp::PvpRankInfo const & pvpRankInfo = Pvp::getRankInfo(p->getCurrentGcwRating());
+
+					if (PvpData::isImperialFactionId(c->getPvpFaction()))
+						result += Unicode::narrowToWide(FormattedString<512>().sprintf(" (%s: %d - %d)\n",pvpRankInfo.imperialTitle.c_str(), pvpRankInfo.minRating, pvpRankInfo.maxRating));
+					else if (PvpData::isRebelFactionId(c->getPvpFaction()))
+						result += Unicode::narrowToWide(FormattedString<512>().sprintf(" (%s: %d - %d)\n",pvpRankInfo.rebelTitle.c_str(), pvpRankInfo.minRating, pvpRankInfo.maxRating));
+					else
+						result += Unicode::narrowToWide("\n");
+				}
+				else
+				{
+					result += Unicode::narrowToWide("\n");
+				}
+
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("current GCW rank progress:              %0.2f%%\n",p->getCurrentGcwRankProgress()));
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("current PvP kills:                      %ld\n",p->getCurrentPvpKills()));
+
+				result += Unicode::narrowToWide("lifetime GCW points:                    ");
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf(INT64_FORMAT_SPECIFIER,p->getLifetimeGcwPoints()));
+				result += Unicode::narrowToWide("\n");
+
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("max GCW imperial rating:                %ld\n",p->getMaxGcwImperialRating()));
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("max GCW imperial rank:                  %d",p->getMaxGcwImperialRank()));
+				if (p->getMaxGcwImperialRank() > 0)
+				{
+					Pvp::PvpRankInfo const & pvpRankInfo = Pvp::getRankInfo(p->getMaxGcwImperialRating());
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf(" (%s: %d - %d)\n",pvpRankInfo.imperialTitle.c_str(), pvpRankInfo.minRating, pvpRankInfo.maxRating));
+				}
+				else
+				{
+					result += Unicode::narrowToWide("\n");
+				}
+
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("max GCW rebel rating:                   %ld\n",p->getMaxGcwRebelRating()));
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("max GCW rebel rank:                     %d",p->getMaxGcwRebelRank()));
+				if (p->getMaxGcwRebelRank() > 0)
+				{
+					Pvp::PvpRankInfo const & pvpRankInfo = Pvp::getRankInfo(p->getMaxGcwRebelRating());
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf(" (%s: %d - %d)\n",pvpRankInfo.rebelTitle.c_str(), pvpRankInfo.minRating, pvpRankInfo.maxRating));
+				}
+				else
+				{
+					result += Unicode::narrowToWide("\n");
+				}
+
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("lifetime PvP kills:                     %ld\n",p->getLifetimePvpKills()));
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("next GCW rating calculation time:       %ld",p->getNextGcwRatingCalcTime()));
+				int32 const now = static_cast<int32>(::time(NULL));
+				if (p->getNextGcwRatingCalcTime() > 0)
+				{
+					if (p->getNextGcwRatingCalcTime() >= now)
+						result += Unicode::narrowToWide(FormattedString<512>().sprintf(" (%s)",CalendarTime::convertSecondsToDHMS(static_cast<unsigned int>(p->getNextGcwRatingCalcTime() - now)).c_str()));
+					else
+						result += Unicode::narrowToWide(FormattedString<512>().sprintf(" (-%s)",CalendarTime::convertSecondsToDHMS(static_cast<unsigned int>(now - p->getNextGcwRatingCalcTime())).c_str()));
+
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf(" (%s) (%s)\n",CalendarTime::convertEpochToTimeStringGMT(static_cast<time_t>(p->getNextGcwRatingCalcTime())).c_str(), CalendarTime::convertEpochToTimeStringLocal(static_cast<time_t>(p->getNextGcwRatingCalcTime())).c_str()));
+				}
+				else
+				{
+					result += Unicode::narrowToWide("\n");
+				}
+
+				if (p->getGcwRatingActualCalcTime() > 0)
+				{
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("actual GCW rating calculation time:     %ld",p->getGcwRatingActualCalcTime()));
+
+					if (p->getGcwRatingActualCalcTime() >= now)
+						result += Unicode::narrowToWide(FormattedString<512>().sprintf(" (%s)",CalendarTime::convertSecondsToDHMS(static_cast<unsigned int>(p->getGcwRatingActualCalcTime() - now)).c_str()));
+					else
+						result += Unicode::narrowToWide(FormattedString<512>().sprintf(" (-%s)",CalendarTime::convertSecondsToDHMS(static_cast<unsigned int>(now - p->getGcwRatingActualCalcTime())).c_str()));
+
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf(" (%s) (%s)\n",CalendarTime::convertEpochToTimeStringGMT(static_cast<time_t>(p->getGcwRatingActualCalcTime())).c_str(), CalendarTime::convertEpochToTimeStringLocal(static_cast<time_t>(p->getGcwRatingActualCalcTime())).c_str()));
+				}
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "adjustCurrentGcwPoint"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		CreatureObject * c = (o ? o->asCreatureObject() : NULL);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+		else
+		{
+			PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+			if (p == NULL)
+			{
+				result += Unicode::narrowToWide("specified object is not a character object\n");
+				return true;
+			}
+			else
+			{
+				int const adjustment = atoi(Unicode::wideToNarrow(argv[2]).c_str());
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character object %s (%s) adjusting current GCW point (%ld) by (%d)\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), p->getCurrentGcwPoints(), adjustment));
+				p->modifyCurrentGcwPoints(adjustment, false);
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "adjustCurrentGcwRating"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		CreatureObject * c = (o ? o->asCreatureObject() : NULL);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+		else
+		{
+			PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+			if (p == NULL)
+			{
+				result += Unicode::narrowToWide("specified object is not a character object\n");
+				return true;
+			}
+			else
+			{
+				int const adjustment = atoi(Unicode::wideToNarrow(argv[2]).c_str());
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character object %s (%s) adjusting current GCW rating (%ld) by (%d)\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), p->getCurrentGcwRating(), adjustment));
+				p->modifyCurrentGcwRating(adjustment, false);
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "adjustCurrentPvpKill"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		CreatureObject * c = (o ? o->asCreatureObject() : NULL);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+		else
+		{
+			PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+			if (p == NULL)
+			{
+				result += Unicode::narrowToWide("specified object is not a character object\n");
+				return true;
+			}
+			else
+			{
+				int const adjustment = atoi(Unicode::wideToNarrow(argv[2]).c_str());
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character object %s (%s) adjusting current PvP kill (%ld) by (%d)\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), p->getCurrentPvpKills(), adjustment));
+				p->modifyCurrentPvpKills(adjustment, false);
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "adjustLifetimeGcwPoint"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		CreatureObject * c = (o ? o->asCreatureObject() : NULL);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+		else
+		{
+			PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+			if (p == NULL)
+			{
+				result += Unicode::narrowToWide("specified object is not a character object\n");
+				return true;
+			}
+			else
+			{
+				int const adjustment = atoi(Unicode::wideToNarrow(argv[2]).c_str());
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character object %s (%s) adjusting lifetime GCW point (", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf(INT64_FORMAT_SPECIFIER,p->getLifetimeGcwPoints()));
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf(") by (%d)\n", adjustment));
+				p->modifyLifetimeGcwPoints(adjustment);
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "adjustMaxGcwImperialRating"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		CreatureObject * c = (o ? o->asCreatureObject() : NULL);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+		else
+		{
+			PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+			if (p == NULL)
+			{
+				result += Unicode::narrowToWide("specified object is not a character object\n");
+				return true;
+			}
+			else
+			{
+				int const adjustment = atoi(Unicode::wideToNarrow(argv[2]).c_str());
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character object %s (%s) adjusting maximum attained Imperial rating (%ld) by (%d)\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), p->getMaxGcwImperialRating(), adjustment));
+				p->modifyMaxGcwImperialRating(adjustment);
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "adjustMaxGcwRebelRating"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		CreatureObject * c = (o ? o->asCreatureObject() : NULL);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+		else
+		{
+			PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+			if (p == NULL)
+			{
+				result += Unicode::narrowToWide("specified object is not a character object\n");
+				return true;
+			}
+			else
+			{
+				int const adjustment = atoi(Unicode::wideToNarrow(argv[2]).c_str());
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character object %s (%s) adjusting maximum attained Rebel rating (%ld) by (%d)\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), p->getMaxGcwRebelRating(), adjustment));
+				p->modifyMaxGcwRebelRating(adjustment);
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "adjustLifetimePvpKill"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		CreatureObject * c = (o ? o->asCreatureObject() : NULL);
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+		else
+		{
+			PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+			if (p == NULL)
+			{
+				result += Unicode::narrowToWide("specified object is not a character object\n");
+				return true;
+			}
+			else
+			{
+				int const adjustment = atoi(Unicode::wideToNarrow(argv[2]).c_str());
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character object %s (%s) adjusting lifetime PvP kill (%ld) by (%d)\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), p->getLifetimePvpKills(), adjustment));
+				p->modifyLifetimePvpKills(adjustment);
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "adjustNextGcwRatingCalcTime"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject * c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject * p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		// ignore command if the player doesn't need rating recalculated
+		if (!p->needsGcwRatingRecalculated())
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("request rejected because character object %s (%s) doesn't require rating calculation (i.e. has no current GCW points and has no current PvP kills and is not at a decayable rank)\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str()));
+			return true;
+		}
+
+		int const adjustment = atoi(Unicode::wideToNarrow(argv[2]).c_str());
+
+		if ((p->getNextGcwRatingCalcTime() <= 0) && (adjustment != 0))
+		{
+			result += Unicode::narrowToWide("there is currently no next GCW rating calculation time for the character object.  Set the next GCW rating calculation time to \"now\" first (adjustNextGcwRatingCalcTime 0) before adjusting it\n");
+			return true;
+		}
+
+		if (adjustment != 0)
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("character object %s (%s) adjusting next GCW rating calculation time (%ld) by (%d) weeks\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), p->getNextGcwRatingCalcTime(), adjustment));
+		else
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("character object %s (%s) adjusting next GCW rating calculation time (%ld) to now\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), p->getNextGcwRatingCalcTime()));
+
+		p->modifyNextGcwRatingCalcTime(adjustment);
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "testGcwPointToRatingConversion"))
+	{
+		int const gcwPoints = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+		int const currentRating = atoi(Unicode::wideToNarrow(argv[2]).c_str());
+
+		int totalEarnedRating, totalEarnedRatingAfterDecay, cappedRatingAdjustment;
+		int const ratingAdjustment = Pvp::calculateRatingAdjustment(gcwPoints, currentRating, totalEarnedRating, totalEarnedRatingAfterDecay, cappedRatingAdjustment);
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("GCW points:                      %d\n", gcwPoints));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("current GCW rating:              %d\n", currentRating));
+
+		Pvp::PvpRankInfo const & pvpCurrentRankInfo = Pvp::getRankInfo(currentRating);
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("current GCW rank:                %d", pvpCurrentRankInfo.rank));
+		if (pvpCurrentRankInfo.rank > 0)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf(" (%d - %d) (%s / %s)\n", pvpCurrentRankInfo.minRating, pvpCurrentRankInfo.maxRating, pvpCurrentRankInfo.imperialTitle.c_str(), pvpCurrentRankInfo.rebelTitle.c_str()));
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("current GCW rank progress:       %0.2f%%\n", static_cast<float>(currentRating - pvpCurrentRankInfo.minRating) * 100.0f / static_cast<float>(pvpCurrentRankInfo.maxRating - pvpCurrentRankInfo.minRating + 1)));
+		}
+		else
+		{
+			result += Unicode::narrowToWide("\n");
+		}
+
+		result += Unicode::narrowToWide("\n");
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("total earned rating:             %d\n", totalEarnedRating));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("total earned rating after decay: %d\n", totalEarnedRatingAfterDecay));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("capped rating adjustment:        %d\n", cappedRatingAdjustment));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("final rating adjustment:         %d\n", ratingAdjustment));
+
+		result += Unicode::narrowToWide("\n");
+
+		int newRating = currentRating + ratingAdjustment;
+
+		// make sure updated rating is in range of valid rating
+		newRating = std::max(newRating, Pvp::getMinRatingForRank());
+		newRating = std::min(newRating, Pvp::getMaxRatingForRank());
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("new GCW rating:                  %d\n", newRating));
+
+		Pvp::PvpRankInfo const & pvpNewRankInfo = Pvp::getRankInfo(newRating);
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("new GCW rank:                    %d", pvpNewRankInfo.rank));
+		if (pvpNewRankInfo.rank > 0)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf(" (%d - %d) (%s / %s)\n", pvpNewRankInfo.minRating, pvpNewRankInfo.maxRating, pvpNewRankInfo.imperialTitle.c_str(), pvpNewRankInfo.rebelTitle.c_str()));
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("new GCW rank progress:           %0.2f%%\n", static_cast<float>(newRating - pvpNewRankInfo.minRating) * 100.0f / (pvpNewRankInfo.maxRating - pvpNewRankInfo.minRating + 1)));
+		}
+		else
+		{
+			result += Unicode::narrowToWide("\n");
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "getCombatSpamFilter"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		else
+		{
+			Client * c = o->getClient();
+			if (c)
+			{
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("combat spam filter value for character object %s (%s) is (%d, %.2f)\n", oid.getValueString().c_str(), Unicode::wideToNarrow(o->getAssignedObjectName()).c_str(), static_cast<int>(c->getCombatSpamFilter()), sqrt(static_cast<float>(c->getCombatSpamRangeSquaredFilter()))));
+			}
+			else
+			{
+				result += Unicode::narrowToWide("specified object has no Client object\n");
+			}
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "makeCovertImperialMercenary"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * const o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject * const c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject * const p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		if (!PvpData::isNeutralFactionId(static_cast<uint32>(c->getPvpFaction())))
+		{
+			result += Unicode::narrowToWide("specified object is not neutral faction\n");
+			return true;
+		}
+
+		if (!ConfigServerGame::getEnableCovertImperialMercenary())
+		{
+			result += Unicode::narrowToWide("covert imperial mercenary functionality is currently disabled\n");
+			return true;
+		}
+
+		Pvp::setNeutralMercenaryFaction(*c, PvpData::getImperialFactionId(), PvpType_Covert);
+
+		if (p->isAuthoritative() && p->hasCompletedCollectionSlot("covert_imperial_mercenary"))
+		{
+			p->setTitle("covert_imperial_mercenary");
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Making (%s) covert imperial mercenary\n", oid.getValueString().c_str()));
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "makeOvertImperialMercenary"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * const o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject * const c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject * const p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		if (!PvpData::isNeutralFactionId(static_cast<uint32>(c->getPvpFaction())))
+		{
+			result += Unicode::narrowToWide("specified object is not neutral faction\n");
+			return true;
+		}
+
+		if (!ConfigServerGame::getEnableOvertImperialMercenary())
+		{
+			result += Unicode::narrowToWide("overt imperial mercenary functionality is currently disabled\n");
+			return true;
+		}
+
+		Pvp::setNeutralMercenaryFaction(*c, PvpData::getImperialFactionId(), PvpType_Declared);
+
+		if (p->isAuthoritative() && p->hasCompletedCollectionSlot("overt_imperial_mercenary"))
+		{
+			p->setTitle("overt_imperial_mercenary");
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Making (%s) overt imperial mercenary\n", oid.getValueString().c_str()));
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "makeCovertRebelMercenary"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * const o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject * const c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject * const p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		if (!PvpData::isNeutralFactionId(static_cast<uint32>(c->getPvpFaction())))
+		{
+			result += Unicode::narrowToWide("specified object is not neutral faction\n");
+			return true;
+		}
+
+		if (!ConfigServerGame::getEnableCovertRebelMercenary())
+		{
+			result += Unicode::narrowToWide("covert rebel mercenary functionality is currently disabled\n");
+			return true;
+		}
+
+		Pvp::setNeutralMercenaryFaction(*c, PvpData::getRebelFactionId(), PvpType_Covert);
+
+		if (p->isAuthoritative() && p->hasCompletedCollectionSlot("covert_rebel_mercenary"))
+		{
+			p->setTitle("covert_rebel_mercenary");
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Making (%s) covert rebel mercenary\n", oid.getValueString().c_str()));
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "makeOvertRebelMercenary"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * const o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject * const c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject * const p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		if (!PvpData::isNeutralFactionId(static_cast<uint32>(c->getPvpFaction())))
+		{
+			result += Unicode::narrowToWide("specified object is not neutral faction\n");
+			return true;
+		}
+
+		if (!ConfigServerGame::getEnableOvertRebelMercenary())
+		{
+			result += Unicode::narrowToWide("overt rebel mercenary functionality is currently disabled\n");
+			return true;
+		}
+
+		Pvp::setNeutralMercenaryFaction(*c, PvpData::getRebelFactionId(), PvpType_Declared);
+
+		if (p->isAuthoritative() && p->hasCompletedCollectionSlot("overt_rebel_mercenary"))
+		{
+			p->setTitle("overt_rebel_mercenary");
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Making (%s) overt rebel mercenary\n", oid.getValueString().c_str()));
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "makeMercenaryNone"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * const o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject * const c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject * const p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		if (!PvpData::isNeutralFactionId(static_cast<uint32>(c->getPvpFaction())))
+		{
+			result += Unicode::narrowToWide("specified object is not neutral faction\n");
+			return true;
+		}
+
+		Pvp::setNeutralMercenaryFaction(*c, PvpData::getNeutralFactionId(), PvpType_Neutral);
+
+		if (p->isAuthoritative())
+		{
+			std::string const & currentTitle = p->getTitle();
+			if ((currentTitle == "covert_imperial_mercenary") || (currentTitle == "overt_imperial_mercenary") || (currentTitle == "covert_rebel_mercenary") || (currentTitle == "overt_rebel_mercenary") ||
+			    (currentTitle == "covert_imperial_sympathizer") || (currentTitle == "overt_imperial_sympathizer") || (currentTitle == "covert_rebel_sympathizer") || (currentTitle == "overt_rebel_sympathizer") ||
+			    (currentTitle == "covert_imperial_loyalist") || (currentTitle == "overt_imperial_loyalist") || (currentTitle == "covert_rebel_insurgent") || (currentTitle == "overt_rebel_insurgent"))
+			{
+				p->setTitle(std::string());
+			}
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Removing all mercenary status for (%s)\n", oid.getValueString().c_str()));
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "getMaster"))
+	{
+		NetworkId const oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject const * const o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject const * const c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("getMasterId() for (%s) returns (%s)\n", c->getNetworkId().getValueString().c_str(), c->getMasterId().getValueString().c_str()));
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "pvpCanAttack"))
+	{
+		NetworkId const actorOid(Unicode::wideToNarrow(argv[1]));
+		ServerObject const * const actorSo = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(actorOid));
+		if (actorSo == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		TangibleObject const * const actorTo = actorSo->asTangibleObject();
+		if (actorTo == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("(%s) is not a TangibleObject\n", actorOid.getValueString().c_str()));
+			return true;
+		}
+
+		NetworkId const targetOid(Unicode::wideToNarrow(argv[2]));
+		ServerObject const * const targetSo = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(targetOid));
+		if (targetSo == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		TangibleObject const * const targetTo = targetSo->asTangibleObject();
+		if (targetTo == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("(%s) is not a TangibleObject\n", targetOid.getValueString().c_str()));
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Pvp::canAttack() for (actor=%s) (target=%s) (%s)\n", actorTo->getNetworkId().getValueString().c_str(), targetTo->getNetworkId().getValueString().c_str(), (Pvp::canAttack(*actorTo, *targetTo) ? "true" : "false")));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Pvp::canAttack() for (actor=%s) (target=%s) (%s)\n\n", targetTo->getNetworkId().getValueString().c_str(), actorTo->getNetworkId().getValueString().c_str(), (Pvp::canAttack(*targetTo, *actorTo) ? "true" : "false")));
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Pvp::canHelp() for (actor=%s) (target=%s) (%s)\n", actorTo->getNetworkId().getValueString().c_str(), targetTo->getNetworkId().getValueString().c_str(), (Pvp::canHelp(*actorTo, *targetTo) ? "true" : "false")));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Pvp::canHelp() for (actor=%s) (target=%s) (%s)\n\n", targetTo->getNetworkId().getValueString().c_str(), actorTo->getNetworkId().getValueString().c_str(), (Pvp::canHelp(*targetTo, *actorTo) ? "true" : "false")));
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Pvp::wouldAttackCauseAlignedEnemyFlag() for (actor=%s) (target=%s) (%s)\n", actorTo->getNetworkId().getValueString().c_str(), targetTo->getNetworkId().getValueString().c_str(), (Pvp::wouldAttackCauseAlignedEnemyFlag(*actorTo, *targetTo) ? "true" : "false")));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Pvp::wouldAttackCauseAlignedEnemyFlag() for (actor=%s) (target=%s) (%s)\n\n", targetTo->getNetworkId().getValueString().c_str(), actorTo->getNetworkId().getValueString().c_str(), (Pvp::wouldAttackCauseAlignedEnemyFlag(*targetTo, *actorTo) ? "true" : "false")));
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Pvp::wouldHelpCauseAlignedEnemyFlag() for (actor=%s) (target=%s) (%s)\n", actorTo->getNetworkId().getValueString().c_str(), targetTo->getNetworkId().getValueString().c_str(), (Pvp::wouldHelpCauseAlignedEnemyFlag(*actorTo, *targetTo) ? "true" : "false")));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Pvp::wouldHelpCauseAlignedEnemyFlag() for (actor=%s) (target=%s) (%s)\n\n", targetTo->getNetworkId().getValueString().c_str(), actorTo->getNetworkId().getValueString().c_str(), (Pvp::wouldHelpCauseAlignedEnemyFlag(*targetTo, *actorTo) ? "true" : "false")));
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Pvp::isEnemy() for (actor=%s) (target=%s) (%s)\n", actorTo->getNetworkId().getValueString().c_str(), targetTo->getNetworkId().getValueString().c_str(), (Pvp::isEnemy(*actorTo, *targetTo) ? "true" : "false")));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Pvp::isEnemy() for (actor=%s) (target=%s) (%s)\n", targetTo->getNetworkId().getValueString().c_str(), actorTo->getNetworkId().getValueString().c_str(), (Pvp::isEnemy(*targetTo, *actorTo) ? "true" : "false")));
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "pvpAttackPerformed"))
+	{
+		NetworkId const actorOid(Unicode::wideToNarrow(argv[1]));
+		ServerObject * const actorSo = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(actorOid));
+		if (actorSo == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		TangibleObject * const actorTo = actorSo->asTangibleObject();
+		if (actorTo == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("(%s) is not a TangibleObject\n", actorOid.getValueString().c_str()));
+			return true;
+		}
+
+		NetworkId const targetOid(Unicode::wideToNarrow(argv[2]));
+		ServerObject * const targetSo = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(targetOid));
+		if (targetSo == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		TangibleObject * const targetTo = targetSo->asTangibleObject();
+		if (targetTo == NULL)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("(%s) is not a TangibleObject\n", targetOid.getValueString().c_str()));
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("calling pvpAttackPerformed() for (actor=%s) (target=%s)\n", actorTo->getNetworkId().getValueString().c_str(), targetTo->getNetworkId().getValueString().c_str()));
+		Pvp::attackPerformed(*actorTo, *targetTo);
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "spaceMakeOvert"))
+	{
+		if (!ServerWorld::isSpaceScene())
+		{
+			result += Unicode::narrowToWide("command can only be used in a space zone\n");
+			return true;
+		}
+
+		NetworkId const oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject const * const o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject const * const c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject const * const p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		ShipObject const * const ship = ShipObject::getContainingShipObject(c);
+		if (ship == NULL)
+		{
+			result += Unicode::narrowToWide("specified character object is not in a ship\n");
+			return true;
+		}
+
+		if (!ship->isPlayerShip())
+		{
+			result += Unicode::narrowToWide("ship is not a player ship\n");
+			return true;
+		}
+
+		if (ship->isInvulnerable())
+		{
+			result += Unicode::narrowToWide("ship is invulnerable\n");
+			return true;
+		}
+
+		uint32 const shipFaction = ship->getSpaceFaction();
+		if (!PvpData::isImperialFactionId(shipFaction) && !PvpData::isRebelFactionId(shipFaction))
+		{
+			result += Unicode::narrowToWide("ship faction is not Imperial or Rebel\n");
+			return true;
+		}
+
+		if (PvpInternal::isDeclared(*ship))
+		{
+			result += Unicode::narrowToWide("ship is already overt\n");
+			return true;
+		}
+
+		if (ship->timeUntilMessageTo("checkSpacePVPStatus") >= 0)
+		{
+			result += Unicode::narrowToWide("ship currently has a pending overt status change request\n");
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Requesting to make ship (%s) containing (%s) overt.  Please wait for confirmation.\n", ship->getNetworkId().getValueString().c_str(), c->getNetworkId().getValueString().c_str()));
+		GameScriptObject::callSpaceMakeOvert(c->getNetworkId());
+	}
+
+	// ----------------------------------------------------------------------
+
+	else if (isCommand (argv [0], "spaceClearOvert"))
+	{
+		if (!ServerWorld::isSpaceScene())
+		{
+			result += Unicode::narrowToWide("command can only be used in a space zone\n");
+			return true;
+		}
+
+		NetworkId const oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject const * const o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject const * const c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject const * const p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		ShipObject const * const ship = ShipObject::getContainingShipObject(c);
+		if (ship == NULL)
+		{
+			result += Unicode::narrowToWide("specified character object is not in a ship\n");
+			return true;
+		}
+
+		if (!ship->isPlayerShip())
+		{
+			result += Unicode::narrowToWide("ship is not a player ship\n");
+			return true;
+		}
+
+		if (ship->isInvulnerable())
+		{
+			result += Unicode::narrowToWide("ship is invulnerable\n");
+			return true;
+		}
+
+		uint32 const shipFaction = ship->getSpaceFaction();
+		if (!PvpData::isImperialFactionId(shipFaction) && !PvpData::isRebelFactionId(shipFaction))
+		{
+			result += Unicode::narrowToWide("ship faction is not Imperial or Rebel\n");
+			return true;
+		}
+
+		if (!PvpInternal::isDeclared(*ship))
+		{
+			result += Unicode::narrowToWide("ship is not overt\n");
+			return true;
+		}
+
+		if (ship->timeUntilMessageTo("checkSpacePVPStatus") >= 0)
+		{
+			result += Unicode::narrowToWide("ship currently has a pending overt status change request\n");
+			return true;
+		}
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Requesting to make ship (%s) containing (%s) non-overt.  Please wait for confirmation.\n", ship->getNetworkId().getValueString().c_str(), c->getNetworkId().getValueString().c_str()));
+		GameScriptObject::callSpaceClearOvert(ship->getNetworkId());
+	}
+
+	// ----------------------------------------------------------------------
+
+	else
+	{
+		result += getErrorMessage(argv[0], ERR_NO_HANDLER);
+	}
+
+	return true;
+
+}	// ConsoleCommandParserPvp::performParsing
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserPvp.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserPvp.h
new file mode 100644
index 00000000..ed7d3fd7
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserPvp.h
@@ -0,0 +1,32 @@
+// ======================================================================
+//
+// ConsoleCommandParserPvp.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserPvp_H
+#define INCLUDED_ConsoleCommandParserPvp_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to the Pvp system.
+*/
+
+class ConsoleCommandParserPvp : public CommandParser
+{
+public:
+	                          ConsoleCommandParserPvp ();
+	virtual bool              performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node);
+	
+private:
+	                          ConsoleCommandParserPvp (const ConsoleCommandParserPvp & rhs);
+	ConsoleCommandParserPvp & operator= (const ConsoleCommandParserPvp & rhs);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserPvp_H
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserResource.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserResource.cpp
new file mode 100644
index 00000000..2d22864d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserResource.cpp
@@ -0,0 +1,335 @@
+// ======================================================================
+//
+// ConsoleCommandParserResource.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserResource.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/HarvesterInstallationObject.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/ResourceContainerObject.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerResourceClassObject.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/SurveySystem.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedObject/Controller.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "swgServerNetworkMessages/MessageQueueActivateInstallation.h"
+#include "swgServerNetworkMessages/MessageQueueDeactivateInstallation.h"
+#include "swgServerNetworkMessages/MessageQueueInstallationHarvest.h"
+
+// ======================================================================
+
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"activate",            2,"<harvester oid> <resource name>","Activates a harvester."},
+	{"addtocontainer",      4,"<container oid> <resource name> <quantity> <source player id>","Add resources to a container."},
+	{"fillcontainer",       1,"<container oid> [source player id]", "Fills a resource container with its resource."},
+	{"recycle",             1,"<container oid>", "Convert a container of resource to the recycled version (for debugging)."},
+	{"deactivate",          1,"<harvester oid>","Deactivates a harvester."},
+	{"discardHopper",       1,"<harvester>","Empties the contents of a harvester's hopper."},
+	{"getSurveyList",       2,"<resource class name> <surveytoolId>","For testing surveys, get the resource list for the survey screen."},
+	{"harvest",             1,"<harvester oid>","Causes a harvester to collect resources."},
+	{"name",                2,"<resource type oid> <name>","Set the name of a resource."},
+	{"pools",               1,"<planet>","List all resource pools on a particular planet."},
+	{"removefromcontainer", 3,"<container oid> <resource name> <quantity>","Remove resources from a container."},
+	{"survey",              1,"<resource class name> <resource type name> <survey range> <number of points>","For testing surveys, take a survey."},
+	{"tree",                0,"","List resource hierarchy."},
+	{"viewcontainer",       1,"<container object id>","View the contents of a resource container."},
+	{"deplete",             1,"<resource type oid>","Cause a resource type to deplete."},
+	{"",                    0, "", ""} // this must be last
+};
+
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserResource::ConsoleCommandParserResource (void) :
+CommandParser ("resource", 0, "...", "Resource related commands.", 0)
+{
+	createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------
+
+
+bool ConsoleCommandParserResource::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+	NOT_NULL (node);
+	UNREF (userId);
+
+	UNREF(originalCommand);
+
+	//-----------------------------------------------------------------
+
+	if (isCommand( argv [0], "activate"))
+	{
+		CachedNetworkId harvester(Unicode::wideToNarrow (argv[1]));
+
+		ServerObject* harvesterObject = safe_cast<ServerObject*>(harvester.getObject());
+		if (harvesterObject == NULL)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		Controller *const controller = harvesterObject->getController();
+		NOT_NULL(controller);
+		controller->appendMessage(static_cast<int>(CM_activateInstallation),0.0f,new MessageQueueActivateInstallation(), GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+		
+	else if (isCommand( argv [0], "harvest"))
+	{
+		CachedNetworkId harvester(Unicode::wideToNarrow (argv[1]));
+
+		ServerObject* harvesterObject = safe_cast<ServerObject*>(harvester.getObject());
+		if (harvesterObject == NULL)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+			return true;
+		}
+			//TODO:  Make all of these into function calls instead of sending messages
+
+		Controller *const controller = harvesterObject->getController();
+		NOT_NULL(controller);
+		controller->appendMessage(static_cast<int>(CM_installationHarvest),0.0f,new MessageQueueInstallationHarvest(), GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER); 
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	
+	else if (isCommand( argv [0], "discardHopper"))
+	{
+		CachedNetworkId harvester(Unicode::wideToNarrow (argv[1]));
+		
+		HarvesterInstallationObject* harvesterObject = dynamic_cast<HarvesterInstallationObject*>(harvester.getObject());
+		if (!harvesterObject)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		harvesterObject->discardAllHopperContents ();
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	else if (isCommand( argv [0], "deactivate"))
+	{
+		CachedNetworkId harvester(Unicode::wideToNarrow (argv[1]));
+
+		ServerObject* harvesterObject = safe_cast<ServerObject*>(harvester.getObject());
+		if (harvesterObject == NULL)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		Controller *const controller = harvesterObject->getController();
+		NOT_NULL(controller);
+		controller->appendMessage(static_cast<int>(CM_deactivateInstallation),0.0f,new MessageQueueDeactivateInstallation(), GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	else if (isCommand( argv [0], "tree"))
+	{
+		ServerUniverse & universe = ServerUniverse::getInstance();
+		ResourceClassObject * root = 0;
+
+		if (argv.size () > 1)
+			root = universe.getResourceClassByName (Unicode::wideToNarrow (argv [1]));
+		else
+			root = universe.getResourceTreeRoot();
+
+		if (root)
+		{
+			std::string temp;
+			root->debugOutput(temp);
+			result += Unicode::narrowToWide(temp);
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+		
+	}
+	
+	else if (isCommand( argv [0], "pools"))
+	{
+		PlanetObject* planet=ServerUniverse::getInstance().getPlanetByName(Unicode::wideToNarrow(argv[1]));
+		if (planet)
+		{
+			std::string temp;
+			planet->debugOutputPools(temp);
+			result += Unicode::narrowToWide(temp);
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);	
+		}
+	}
+
+	else if (isCommand( argv [0], "name"))
+	{
+		NetworkId resourceId(Unicode::wideToNarrow (argv[1]));
+		ResourceTypeObject * const resource = ServerUniverse::getInstance().getResourceTypeById(resourceId);
+		if (resource)
+		{
+			resource->setName(Unicode::wideToNarrow(argv[2]));
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);	
+		}
+	}
+
+	else if (isCommand( argv [0], "viewcontainer"))
+	{
+		CachedNetworkId contId (Unicode::wideToNarrow (argv[1]));
+		ResourceContainerObject* container=dynamic_cast<ResourceContainerObject*>(contId.getObject());
+		if (container)
+		{
+			result += Unicode::narrowToWide(container->debugPrint()+'\n');
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);	
+		}
+	}
+
+	else if (isCommand( argv [0], "addtocontainer"))
+	{
+		NetworkId const contId (Unicode::wideToNarrow (argv[1]));
+		ResourceContainerObject * const container = dynamic_cast<ResourceContainerObject*>(NetworkIdManager::getObjectById(contId));
+		std::string const & resourcePath = Unicode::wideToNarrow(argv[2]);
+		ResourceTypeObject * const resType = ServerUniverse::getInstance().getResourceTypeByName(resourcePath);
+		int const amount = strtol(Unicode::wideToNarrow (argv[3]).c_str (), NULL, 10);
+		NetworkId const source(Unicode::wideToNarrow (argv[4]));
+		
+		if (container && resType)
+		{
+			if (container->addResource(CachedNetworkId(resType->getNetworkId()),amount, source))
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+			else
+				result += getErrorMessage(argv[0], ERR_INVALID_CONTAINER_TRANSFER);
+		}
+		else
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);	
+		}
+	}
+
+	else if (isCommand( argv [0], "fillcontainer"))
+	{
+		NetworkId contId (Unicode::wideToNarrow (argv[1]));
+		ResourceContainerObject* container=dynamic_cast<ResourceContainerObject*>(NetworkIdManager::getObjectById(contId));
+		if (container != NULL)
+		{
+			NetworkId sourceId;
+			if (argv.size() >= 3)
+				sourceId = NetworkId(Unicode::wideToNarrow (argv[2]));
+
+			if (container->addResource(container->getResourceType(), 
+				container->getMaxQuantity() - container->getQuantity(), 
+				sourceId))
+			{
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+			}
+			else
+				result += getErrorMessage(argv[0], ERR_INVALID_CONTAINER_TRANSFER);
+		}
+		else
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);	
+	}
+
+	else if (isCommand( argv [0], "recycle"))
+	{
+		NetworkId contId (Unicode::wideToNarrow (argv[1]));
+		ResourceContainerObject* container=dynamic_cast<ResourceContainerObject*>(NetworkIdManager::getObjectById(contId));
+		if (container != NULL)
+		{
+			if (container->debugRecycle())
+					result += getErrorMessage(argv[0], ERR_SUCCESS);
+			else
+				result += Unicode::narrowToWide("The resource in the container could not be recycled.\n");
+		}
+		else
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);	
+	}
+
+	else if (isCommand( argv [0], "removefromcontainer"))
+	{
+		CachedNetworkId contId (Unicode::wideToNarrow (argv[1]));
+		ResourceContainerObject* container=dynamic_cast<ResourceContainerObject*>(contId.getObject());
+		ResourceTypeObject *resType=ServerUniverse::getInstance().getResourceTypeByName(Unicode::wideToNarrow(argv[2]));
+		int amount=strtol(Unicode::wideToNarrow (argv[3]).c_str (), NULL, 10);
+		
+		if (container && resType)
+		{
+			NetworkId sourcePlayer(NetworkId::cms_invalid);
+
+			typedef std::vector<std::pair<NetworkId, int> > SourcesType;
+			SourcesType sources;
+			if (container->removeResource(resType->getNetworkId(),amount,&sources))
+			{
+				char buffer[50];
+				for(SourcesType::iterator i=sources.begin(); i!=sources.end(); ++i)
+				{
+					IGNORE_RETURN(snprintf(buffer,50,"%i",i->second));
+					result += Unicode::narrowToWide(std::string("Removed ") + buffer + " resources harvested by player " + i->first.getValueString() + '\n');
+				}
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+			}
+			else
+				result += getErrorMessage(argv[0], ERR_INVALID_CONTAINER_TRANSFER);
+		}
+		else
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);	
+		}
+	}
+
+	else if (isCommand( argv [0], "getSurveyList"))
+	{
+		std::string parentResourceClassName(Unicode::wideToNarrow(argv[1]));
+		CachedNetworkId tool(Unicode::wideToNarrow (argv[2]));
+
+		SurveySystem::getInstance().requestResourceListForSurvey(userId, tool, parentResourceClassName);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	
+	else if (isCommand( argv [0], "survey"))
+	{
+		const std::string       parentResourceClassName   (Unicode::wideToNarrow(argv[1]));
+		const std::string       resourceTypeName          (Unicode::wideToNarrow(argv[2]));
+		const int               surveyRange             = strtol(Unicode::wideToNarrow(argv[3]).c_str(),NULL,10);
+		const int               numPoints               = strtol(Unicode::wideToNarrow(argv[4]).c_str(),NULL,10);
+		const Object *          player                  = NetworkIdManager::getObjectById(userId);
+
+		if (player)
+		{
+			SurveySystem::getInstance().requestSurvey(userId, parentResourceClassName, resourceTypeName, player->getPosition_w(), surveyRange, numPoints);
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+			result += getErrorMessage(argv [0], ERR_INVALID_OBJECT);
+	}
+
+	else if (isCommand( argv [0], "deplete"))
+	{
+		NetworkId resourceId (Unicode::wideToNarrow (argv[1]));
+		if (ServerUniverse::getInstance().manualDepleteResource(resourceId))
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);	
+	}
+	
+	return true;
+}	// ConsoleCommandParserResource::performParsing
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserResource.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserResource.h
new file mode 100644
index 00000000..e1cf632d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserResource.h
@@ -0,0 +1,32 @@
+// ======================================================================
+//
+// ConsoleCommandParserResource.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserResource_H
+#define INCLUDED_ConsoleCommandParserResource_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to the resource system.
+*/
+
+class ConsoleCommandParserResource : public CommandParser
+{
+public:
+	                          ConsoleCommandParserResource ();
+	virtual bool              performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node);
+	
+private:
+	                          ConsoleCommandParserResource (const ConsoleCommandParserResource & rhs);
+	ConsoleCommandParserResource &  operator= (const ConsoleCommandParserResource & rhs);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserResource_H
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserScript.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserScript.cpp
new file mode 100644
index 00000000..a2703595
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserScript.cpp
@@ -0,0 +1,324 @@
+// ======================================================================
+//
+// ConsoleCommandParserScript.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserScript.h"
+
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerWorld.h"
+#include "serverNetworkMessages/ReloadScriptMessage.h"
+#include "serverScript/GameScriptObject.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedUtility/DataTableManager.h"
+#include "UnicodeUtils.h"
+
+#include <stdio.h>
+
+// ======================================================================
+
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"attach",           2, "<name> <oid>",                 "Attach a script to an object."},
+	{"detach",           2, "<name> <oid>",                 "Detach a script from an object."},
+	{"list",             0, "",                             "List the scripts attached to an object."},
+	{"pause",            1, "<on|off>",                     "Turn scripting on/off (globally)."},
+	{"reload",           1, "<name>",                       "Reload a script that has changed."},
+	{"triggerAll",       2, "<trigger> <oid> <...>",        "Run a trigger on all scripts attached to an object"},
+	{"triggerOne",       3, "<trigger> <name> <oid> <...>", "Run a trigger on a script attached to an object"},
+	{"scriptingEnabled", 0, "",                             "Checks if the scripting system is enabled or not"},
+	{"enableLogging",    1, "<on|off>",                     "Turns script logging on or off"},
+	{"", 0, "", ""} // this must be last
+};
+
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserScript::ConsoleCommandParserScript (void) :
+CommandParser ("script", 0, "...", "Script related commands.", 0)
+{
+	createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------
+
+
+bool ConsoleCommandParserScript::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+	NOT_NULL (node);
+
+	UNREF(originalCommand);
+	UNREF(userId);
+
+	//-----------------------------------------------------------------
+
+	if (isAbbrev( argv [0], "attach"))
+	{
+		NetworkId oid(Unicode::wideToNarrow (argv[2]));
+		ServerObject* object = ServerWorld::findObjectByNetworkId(oid);
+		if (object == NULL)
+		{
+			result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		if (!object->getScriptObject()->attachScript(Unicode::wideToNarrow(argv[1]), true))
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_SCRIPT);
+			return true;
+		}
+		result += getErrorMessage (argv[0], ERR_SUCCESS);
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isAbbrev( argv [0], "detach"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[2]));
+		ServerObject* object = ServerWorld::findObjectByNetworkId(oid);
+		if (object == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		if (!object->getScriptObject()->detachScript(Unicode::wideToNarrow(argv[1])))
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_SCRIPT);
+			return true;
+		}
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isAbbrev(argv[0], "list"))
+	{
+		ServerObject * const userServerObject = ServerWorld::findObjectByNetworkId(userId);
+
+		if (userServerObject != NULL)
+		{
+			NetworkId specifiedNetworkId;
+
+			if (argv.size () > 1)
+			{
+				specifiedNetworkId = NetworkId(Unicode::wideToNarrow(argv[1]));
+			}
+			else
+			{
+				CreatureObject * const userCreatureObject = CreatureObject::asCreatureObject(userServerObject);
+
+				if (userCreatureObject != NULL)
+				{
+					specifiedNetworkId = userCreatureObject->getLookAtTarget();
+				}
+			}
+
+			ServerObject * const specifiedServerObject = ServerObject::getServerObject(specifiedNetworkId);
+
+			if (specifiedServerObject != NULL)
+			{
+				ScriptList const & scripts = specifiedServerObject->getScriptObject()->getScripts();
+				FormattedString<1024> fs;
+				result += Unicode::narrowToWide(fs.sprintf("script list for object %s, num %d\n", specifiedServerObject->getNetworkId().getValueString().c_str(), scripts.size()));
+
+				if (scripts.size() == 0)
+				{
+					result += Unicode::narrowToWide("none\n");
+				}
+				else
+				{
+					for (ScriptList::const_iterator i = scripts.begin(); i != scripts.end(); ++i)
+					{
+						result += Unicode::narrowToWide(fs.sprintf("%s\n", (*i).getScriptName().c_str()));
+					}
+				}
+
+				result += getErrorMessage(argv[0], ERR_SUCCESS);
+				return true;
+			}
+		}
+
+		result += getErrorMessage (argv [0], ERR_INVALID_OBJECT);
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isAbbrev(argv[0], "pause"))
+	{
+		bool flag;
+		if (strcmp(Unicode::wideToNarrow(argv[1]).c_str(), "on") == 0)
+			flag = true;
+		else if (strcmp(Unicode::wideToNarrow(argv[1]).c_str(), "off") == 0)
+			flag = false;
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_ARGUMENTS);
+			return true;
+		}
+		GameScriptObject::pauseScripting(flag);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isAbbrev(argv[0], "reload"))
+	{
+		std::string script(Unicode::wideToNarrow(argv[1]));
+		if (GameScriptObject::reloadScript(script))
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_SCRIPT);
+
+		ServerMessageForwarding::beginBroadcast();
+
+		ReloadScriptMessage const reloadScriptMessage(script);
+		ServerMessageForwarding::send(reloadScriptMessage);
+
+		ServerMessageForwarding::end();
+	}
+
+	//-----------------------------------------------------------------
+	else if (isAbbrev(argv[0], "triggerAll") || isAbbrev(argv[0], "triggerOne"))
+	{
+		int i;
+		bool all = isAbbrev(argv[0], "triggerAll");
+
+		// get the trigger id
+		int trigger = Scripting::TRIG_LAST_TRIGGER;
+		std::string triggerName = Unicode::wideToNarrow(argv[1]).c_str();
+		if (isdigit(triggerName[0]))
+			trigger = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+		else
+		{
+			Scripting::_ScriptFuncHashMap::const_iterator iter;
+			for (iter = Scripting::ScriptFuncHashMap->begin();
+				iter != Scripting::ScriptFuncHashMap->end();
+				++iter)
+			{
+				if (std::string((*iter).second->name) == triggerName)
+				{
+					trigger = (*iter).first;
+					break;
+				}
+			}
+		}
+		if (trigger < 0 || trigger >= Scripting::TRIG_LAST_TRIGGER)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_TRIGGER);
+			return true;
+		}
+
+		int oidIndex = 2;
+		int paramIndex = 3;
+		std::string scriptName;
+		if (!all)
+		{
+			oidIndex = 3;
+			paramIndex = 4;
+			scriptName = Unicode::wideToNarrow(argv[2]);
+		}
+
+		// get the object id
+		NetworkId oid(Unicode::wideToNarrow(argv[oidIndex]));
+		ServerObject* object = ServerWorld::findObjectByNetworkId(oid);
+		if (object == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		// get the parameter template for the trigger
+		Scripting::_ScriptFuncHashMap::const_iterator funcIter = Scripting::ScriptFuncHashMap->find(trigger);
+		if (funcIter == Scripting::ScriptFuncHashMap->end())
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_TRIGGER);
+			return true;
+		}
+		const Scripting::ScriptFuncTable *func = (*funcIter).second;
+
+		// make sure we have the correct parameter count
+		int paramCount = argv.size() - paramIndex;
+		int paramDesired = 0;
+		for (i = 0; func->argList[i] != 0; ++i)
+		{
+			if (func->argList[i] != ']')
+				++paramDesired;
+			// don't let a trigger that takes a slotData or attribMod
+			if (func->argList[i] == 'E' || func->argList[i] == 'A')
+			{
+				result += getErrorMessage(argv[0], ERR_UNSUPPORTED_TRIGGER);
+				return true;
+			}
+		}
+		if (paramCount != paramDesired)
+		{
+			char buffer[16];
+			result += getErrorMessage(argv[0], ERR_INVALID_PARAMETER_COUNT);
+			_itoa(paramDesired, buffer, 10);
+			result += Unicode::narrowToWide(buffer);
+			return true;
+		}
+
+		// copy the parameters
+		StringVector_t params;
+		for (i = 0; i < paramCount; ++i)
+			params.push_back(argv[paramIndex + i]);
+		
+
+		// invoke the trigger
+		int trigResult = object->getScriptObject()->trigScriptFromConsole(
+			static_cast<Scripting::TrigId>(trigger),
+			scriptName,
+			params
+			);
+
+		if (trigResult == SCRIPT_CONTINUE)
+			result += getErrorMessage(argv[0], ERR_SCRIPT_CONTINUE);
+		else
+			result += getErrorMessage(argv[0], ERR_SCRIPT_OVERRIDE);
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isAbbrev(argv[0], "scriptingEnabled"))
+	{
+		if (GameScriptObject::isScriptingEnabled())
+			result += getErrorMessage(argv[0], ERR_SCRIPTING_ENABLED);
+		else
+			result += getErrorMessage(argv[0], ERR_SCRIPTING_DISABLED);
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isAbbrev(argv[0], "enableLogging"))
+	{
+		bool flag;
+		if (strcmp(Unicode::wideToNarrow(argv[1]).c_str(), "on") == 0)
+			flag = true;
+		else if (strcmp(Unicode::wideToNarrow(argv[1]).c_str(), "off") == 0)
+			flag = false;
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_ARGUMENTS);
+			return true;
+		}
+		GameScriptObject::enableLogging(flag);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+
+	//-----------------------------------------------------------------
+
+	else
+	{
+		result += getErrorMessage(argv[0], ERR_NO_HANDLER);
+	}
+
+	return true;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserScript.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserScript.h
new file mode 100644
index 00000000..dc5549c9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserScript.h
@@ -0,0 +1,32 @@
+// ======================================================================
+//
+// ConsoleCommandParserScript.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserScript_H
+#define INCLUDED_ConsoleCommandParserScript_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to scripts
+*/
+
+class ConsoleCommandParserScript : public CommandParser
+{
+public:
+	                          ConsoleCommandParserScript ();
+	virtual bool              performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node);
+	
+private:
+	                          ConsoleCommandParserScript (const ConsoleCommandParserScript & rhs);
+	ConsoleCommandParserScript &  operator= (const ConsoleCommandParserScript & rhs);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserScript_H
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.cpp
new file mode 100644
index 00000000..d99af85f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.cpp
@@ -0,0 +1,3490 @@
+// ======================================================================
+//
+// ConsoleCommandParserServer.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserServer.h"
+
+#include "serverGame/AiCombatPulseQueue.h"
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/Chat.h"
+#include "serverGame/Client.h"
+#include "serverGame/CommoditiesMarket.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/FormManagerServer.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/GuildObject.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/PlayerSanityChecker.h"
+#include "serverGame/Region.h"
+#include "serverGame/RegionMaster.h"
+#include "serverGame/ServerBuildoutManager.h"
+#include "serverGame/ServerCommandTable.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerObjectTemplate.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/TriggerVolume.h"
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "serverNetworkMessages/ChangeUniverseProcessMessage.h"
+#include "serverNetworkMessages/EnableNewJediTrackingMessage.h"
+#include "serverNetworkMessages/ExcommunicateGameServerMessage.h"
+#include "serverNetworkMessages/ProfilerOperationMessage.h"
+#include "serverNetworkMessages/ReleaseAuthoritativeMessage.h"
+#include "serverNetworkMessages/ReloadAdminTableMessage.h"
+#include "serverNetworkMessages/ReloadCommandTableMessage.h"
+#include "serverNetworkMessages/ReloadDatatableMessage.h"
+#include "serverNetworkMessages/RestartServerMessage.h"
+#include "serverNetworkMessages/SetConnectionServerPublic.h"
+#include "serverNetworkMessages/TransferRequestMoveValidation.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverUtility/AdminAccountManager.h"
+#include "sharedDebug/DebugFlags.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFoundation/CalendarTime.h"
+#include "sharedFoundation/Clock.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedGame/GameObjectTypes.h"
+#include "sharedGame/QuestManager.h"
+#include "sharedMath/Sphere.h"
+#include "sharedNetworkMessages/ConsoleChannelMessages.h"
+#include "sharedNetworkMessages/EnterStructurePlacementModeMessage.h"
+#include "sharedNetworkMessages/ErrorMessage.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/MessageRegionListCircleResponse.h"
+#include "sharedNetworkMessages/MessageRegionListRectResponse.h"
+#include "sharedNetworkMessages/WhoListMessage.h"
+#include "sharedObject/CachedNetworkId.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedTerrain/TerrainObject.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+#include "serverUtility/FreeCtsDataTable.h"
+
+#include <stdio.h>
+
+// ======================================================================
+
+namespace ConsoleCommandParserServerNamespace
+{
+	const char* const ms_testStructurePlacement = "testStructurePlacement";
+}
+
+using namespace ConsoleCommandParserServerNamespace;
+
+// ======================================================================
+
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"kill",                 1,  "<1: local, 2: planet, 3: cluster",  "Shutdown the server, planet, or cluster immediately."},
+	{"shutdown",                 3,  "<secs to wait> <secs max> <system message to broadcast>",  "Shutdown the cluster gracefully.  System message will be broadcast to players each minute until <secs to wait> has passed then all players will be disconnected and the database will perform a final save and shutdown.  If <secs max> time passes, cluster will shutdown without waiting any more."},
+	{"abortShutdown",            0,  "",  "abortShutdown"},
+	{"error",                    1,  "<error message>",                   "Display an error message."},
+	{"getPlanetId",              0,  "[planet]",                          "Get the current obj_id of the planet for this server (or for the specified planet)."},
+	{"memUsage",                 0,  "",                                  "Query memory usage statistics."},
+	{"memoryReport",             0,  "",                                  "Dump memory manager (call MemoryManager::report())."},
+	{"dumpMemToFile",            2,  "<fileName> <leaksOnly>",            "Dump memory report to file on server, can be called to dump all allocations or only known leaks."},
+	{"clock",                    0,  "",                                  "Query clock statistics."},
+	{"releaseAuth",              1,  "<oid>",                             "Release Authority for object with oid."},
+	{"showObjectSpheres",        0,  "",                                  "dump the server object sphere tree"},
+	{"showTriggerSpheres",       0,  "",                                  "dump the server trigger sphere tree"},
+	{"snapAllObjectsToTerrain",  0,  "",                                  "Snap all objects to the terrain"},
+	{"getSceneId",               0,  "",                                  "Get the name of the scene we are running in"},
+	{"setGodMode",               1,  "<1 or 0>",                          "Set the client as god or not."},
+	{"reloadCommandTable",       0,  "",                                  "Reload the command table."},
+	{"reloadAdminTable",         0,  "",                                  "Reload the admin permissions table."},
+	{"reloadTable",              1,  "<tableName>",                       "Reload a given datatable."},
+	{"dataTableGetString",       3,  "<table> <col> <row>",               "GetString from table."},
+	{"reloadTerrain",            0,  "",                                  "Reload the terrain"},
+	{"listRegions",              0,  "[planet]",                          "Lists the regions for a planet"},
+	{"messageCount",             0,  "",                                  "Enumerate messages by name and count"},
+	{"setPublic",                1, "0 | 1", "Set the cluster public or non-public. The cluster is closed (private) if the first parameter is 0"},
+	{"profiler",                 1, "<up|down|toggle|expand|collapse|enable|disable|enableOutput|disableOutput|showAll|showNormal|displayMinimum <percent>> <processId or 0 for all>", "modify profiler state"},
+	{"setFrameRateLimit",        1, "<float>",                            "Set the maximum framerate the server will run at"},
+	{ms_testStructurePlacement,  1,  "<template name>",                   "Put the client into structure placement mode"},
+	{"setDebugFlag",             3, "<section> <name> <0 | 1>",           "Toggle a debugFlag on the server"},
+	{"validateWorld",            0, "",                                   "Run a sanity check on the world"},
+	{"setUniverseProcess",       1, "<int>",                              "Change universe authority to that process id"},                 
+	{"getRegionsAt",             2, "<x> <z>",                            "List the regions at the given point"},
+	{"enableNewJedi",            1, "<true | false>",                     "Enable/disable tracking of players to see if they can become Jedi"},
+	{"setMessageToTimeLimit",    1, "<time limit in ms>",                 "Sets the time limit we will process messageTos in a frame. <= 0 means process all messages"},
+	{"setMessageToBacklogThreshold", 1, "<time limit in ms>",             "Sets the time limit to print backlogged messages <= 0 means never print messages"},
+	{"startSave",                0, "",                                   "Begin saving data to the database, if a save is not already in progress"},
+	{"enablePlayerSanityChecker",1, "<true | false>",                     "Enable/disable checking players for authority problems (cluster-wide)"},
+	{"getNameList",              0, "",                                   "Print the list of all player names on this cluster."},
+	{"getCharacterInfo",         1, "<oid | name>",                       "Get info for the specified character, even if the character is not currently online (can specify either the character's oid or name)"},
+	{"reloadForms",              0, "",                                   "Reload the server's GodClient Form data"},
+	{"setAiCombatPulseQueueNumber", 1,"<number>",                         "Set the number of AI pulses per frame"},
+	{"setAiCombatPulseQueueMaxWaitTimeMs", 1,"<number>",                  "Set the max time that an AI has to wait for an AI pulse"},
+	{"reloadQuests",             0, "",                                   "Reload SERVER quest data"},
+	{"saveBuildoutArea",         6, "<server_table> <client_table> <x1> <z1> <x2> <z2>", "Save out an area for buildout datatables"},
+	{"clientSaveBuildoutArea",   6, "<scene> <area_name> <x1> <z1> <x2> <z2>", "Create area buildout datatables and send to requesting client (for use by god client)"},
+	{"destroyPersistedBuildoutAreaDuplicates", 0, "",                     "Destroy persisted objects which are duplicates of loaded buildout area objects"},
+	{"editBuildoutArea",         1, "<area_name>",                        "Make all objects for a buildout area not be client cached (for use by god client)"},
+	{"setQuestDebugging",        1, "<1 or 0>",                           "Set the quest system to output debug info or not"},
+	{"restartServer",            1, "<server process id> | <planet> <server number> | <planet> <x> <z>", "Restart a game server, specified by server id, planet and number, or by geographic location."},
+	{"restartPlanet",            1, "<planet>",                           "Restart the planet server and all game servers for the specified planet."},
+	{"dumpCreatures",            1, "<filename>",                         "Get a list of all creatures on the current game server (with tab delimited info about each creature)."},
+	{"getNumberOfMoveObjectLists", 0, "",                                 "Get the number of move object lists"},
+	{"setNumberOfMoveObjectLists", 1, "<number>",                         "Set the number of move object lists"},
+	{"getSystemClockTimeFromAllGameServers", 0, "",                       "Ask every game server to report the system clock time of the box it is running on, which is useful to detect out of sync system clock"},
+	{"getPlanetaryTimeFromAllGameServers", 0, "",                         "Ask every game server to report its planetary time"},
+	{"requestSameServer",        2, "<oid1> <oid2>",                      "Send a request to the planet server to ask for either oid1 or oid2 to be moved, if possible, to the same game server. Either or neither may be moved."},
+	{"displayTerrain",           1, "<range in meters>",                  "Display the generated/ungenerated status of terrain chunks around the current location"},
+	{"generateTerrain",          1, "<range in meters>",                  "Generate terrain chunks (if the terrain chunks are not currently generated) around the current location"},
+	{"purgeTerrain",             0, "",                                   "Purge all generated terrain chunks (***FOR DEBUGGING ONLY***)"},
+	{"listConnectedCharacters",  0, "",                                   "List all characters currently connected to the cluster."},
+	{"listConnectedCharacterData", 1, "<oid>",                            "List the character data for a connected character."},
+	{"listTravelPoints",         0, "[<planet name> <x> <y> <z>]",        "List all the travel points on the current or specified planet sorted by the distance from the current or specified location"},
+	{"listCharacterLastLoginTimeBrief", 1, "<within the past nnn number of days>", "List the count of all characters on this cluster who last logged in within the specified number of days"},
+	{"listCharacterLastLoginTimeAfterBrief", 6, "<yyyy> <mm> <dd> <h> <m> <s>", "List the count of all characters on this cluster who last logged in after the specified date/time"},
+	{"listCharacterLastLoginTimeBeforeBrief", 6, "<yyyy> <mm> <dd> <h> <m> <s>", "List the count of all characters on this cluster who last logged in before the specified date/time"},
+	{"listCharacterLastLoginTimeBetweenBrief", 12, "<yyyy> <mm> <dd> <h> <m> <s> <yyyy> <mm> <dd> <h> <m> <s>", "List the count of all characters on this cluster who last logged in between the specified date/time"},
+	{"listCharacterLastLoginTimeDetailed", 1, "<within the past nnn number of days>", "List the characters on this cluster who last logged in within the specified number of days (this could be a long list and cause you to get disconnected because too much information is sent to your client)"},
+	{"listCharacterLastLoginTimeAfterDetailed", 6, "<yyyy> <mm> <dd> <h> <m> <s>", "List the characters on this cluster who last logged in after the specified date/time (this could be a long list and cause you to get disconnected because too much information is sent to your client)"},
+	{"listCharacterLastLoginTimeBeforeDetailed", 6, "<yyyy> <mm> <dd> <h> <m> <s>", "List the characters on this cluster who last logged in before the specified date/time (this could be a long list and cause you to get disconnected because too much information is sent to your client)"},
+	{"listCharacterLastLoginTimeBetweenDetailed", 12, "<yyyy> <mm> <dd> <h> <m> <s> <yyyy> <mm> <dd> <h> <m> <s>", "List the characters on this cluster who last logged in between the specified date/time (this could be a long list and cause you to get disconnected because too much information is sent to your client)"},
+	{"sendMailToCharacterLastLoginTime", 4, "<within the past nnn number of days> <from name> <mail subject> <mail body paragraph> ... <mail body paragraph>", "Sends mail to characters on this cluster who last logged in within the specified number of days"},
+	{"sendMailToCharacterLastLoginTimeAfter", 9, "<yyyy> <mm> <dd> <h> <m> <s> <from name> <mail subject> <mail body paragraph> ... <mail body paragraph>", "Sends mail to characters on this cluster who last logged in after the specified date/time"},
+	{"sendMailToCharacterLastLoginTimeBefore", 9, "<yyyy> <mm> <dd> <h> <m> <s> <from name> <mail subject> <mail body paragraph> ... <mail body paragraph>", "Sends mail to characters on this cluster who last logged in before the specified date/time"},
+	{"sendMailToCharacterLastLoginTimeBetween", 15, "<yyyy> <mm> <dd> <h> <m> <s> <yyyy> <mm> <dd> <h> <m> <s> <from name> <mail subject> <mail body paragraph> ... <mail body paragraph>", "Sends mail to characters on this cluster who last logged in between the specified date/time"},
+	{"listCharacterCreateTimeBrief", 1, "<within the past nnn number of days>", "List the count of all characters on this cluster created within the specified number of days"},
+	{"listCharacterCreateTimeAfterBrief", 6, "<yyyy> <mm> <dd> <h> <m> <s>", "List the count of all characters on this cluster created after the specified date/time"},
+	{"listCharacterCreateTimeBeforeBrief", 6, "<yyyy> <mm> <dd> <h> <m> <s>", "List the count of all characters on this cluster created before the specified date/time"},
+	{"listCharacterCreateTimeBetweenBrief", 12, "<yyyy> <mm> <dd> <h> <m> <s> <yyyy> <mm> <dd> <h> <m> <s>", "List the count of all characters on this cluster created between the specified date/time"},
+	{"listCharacterCreateTimeDetailed", 1, "<within the past nnn number of days>", "List the characters on this cluster created within the specified number of days (this could be a long list and cause you to get disconnected because too much information is sent to your client)"},
+	{"listCharacterCreateTimeAfterDetailed", 6, "<yyyy> <mm> <dd> <h> <m> <s>", "List the characters on this cluster created after the specified date/time (this could be a long list and cause you to get disconnected because too much information is sent to your client)"},
+	{"listCharacterCreateTimeBeforeDetailed", 6, "<yyyy> <mm> <dd> <h> <m> <s>", "List the characters on this cluster created before the specified date/time (this could be a long list and cause you to get disconnected because too much information is sent to your client)"},
+	{"listCharacterCreateTimeBetweenDetailed", 12, "<yyyy> <mm> <dd> <h> <m> <s> <yyyy> <mm> <dd> <h> <m> <s>", "List the characters on this cluster created between the specified date/time (this could be a long list and cause you to get disconnected because too much information is sent to your client)"},
+	{"sendMailToCharacterCreateTime", 4, "<within the past nnn number of days> <from name> <mail subject> <mail body paragraph> ... <mail body paragraph>", "Sends mail to characters on this cluster created within the specified number of days"},
+	{"sendMailToCharacterCreateTimeAfter", 9, "<yyyy> <mm> <dd> <h> <m> <s> <from name> <mail subject> <mail body paragraph> ... <mail body paragraph>", "Sends mail to characters on this cluster created after the specified date/time"},
+	{"sendMailToCharacterCreateTimeBefore", 9, "<yyyy> <mm> <dd> <h> <m> <s> <from name> <mail subject> <mail body paragraph> ... <mail body paragraph>", "Sends mail to characters on this cluster created before the specified date/time"},
+	{"sendMailToCharacterCreateTimeBetween", 15, "<yyyy> <mm> <dd> <h> <m> <s> <yyyy> <mm> <dd> <h> <m> <s> <from name> <mail subject> <mail body paragraph> ... <mail body paragraph>", "Sends mail to characters on this cluster created between the specified date/time"},
+	{"freeCtsTest", 5, "<character create time> <source station id> <source cluster> <target station id> <target cluster>", "Tests to see if a CTS transaction would be free"},
+	{"isFreeCtsSourceCluster", 1, "<source cluster>",                     "Checks to see if the specified cluster is a free CTS source cluster"},
+	{"freeCtsInfo", 0, "",                                                "Display information about what CTS transactions are free"},
+#ifdef _DEBUG
+	{"listRetroactiveCtsHistory", 2, "<oid> <cluster>",                   "List the retroactive CTS history for the specified character on the specified cluster (the character does not have to be logged in or nearby)."},
+#else
+	{"listRetroactiveCtsHistory", 1, "<oid>",                             "List the retroactive CTS history for the specified character (the character does not have to be logged in or nearby)."},
+#endif
+	{"transferCharacter", 1, "<destination galaxy> [<destination character name>] [<destination station id>]", "Transfers this character to the specified destination galaxy (which can be the same as the current galaxy).  Optionally specify the destination character name (surrounded in quotes if there is embedded space in the character's name).  Optionally specify the destination station id if you want to transfer the character to a different station id."},
+	{"showGcwScore",             0, "",                                   "Display the GCW score for this cluster"},
+	{"adjustGcwImperialScore",   2, "<category> <adjustment>",            "Adjust the GCW Imperial score for this cluster"},
+	{"adjustGcwRebelScore",      2, "<category> <adjustment>",            "Adjust the GCW Rebel score for this cluster"},
+	{"decayGcwScore",            1, "<category>",                         "Force an immediate decay of the GCW score"},
+	{"showGcwFactionalPresence", 0, "",                                   "Display the GCW contested regions that have factional presence"},
+	{"hasGcwFactionalPresence",  1, "<oid>",                              "Checks to see if the specified player character would have factional presence in its current state"},
+	{"hasGcwRegionDefenderBonus", 1, "<oid>",                             "Checks to see if the specified player character would have GCW Region Defender bonus in its current state"},
+	{"getCommoditiesItemAttributeData", 1, "<output filename> [<got=xxx>] [<got_exact=xxx>] [<ignore_searchable_attribute>] [<throttle count>]", "Writes a summary of the item attribute name of all items on the commodities server to the specified filename on the client.  Specify got=xxx or got_exact=xxx (like got=weapon_ranged_pistol) to only include items of the specified GOT type.  got_exact= will only include items whose GOT type exactly matches the specified GOT type.  got= will also use the item's masked GOT type to check for a GOT match.  Specify ignore_searchable_attribute to ignore attributes that are already flagged as searchable.  Throttle count (default 100) specifies how many item to process per frame, to spread out the load over multiple frames."},
+	{"getCommoditiesItemAttribute", 1, "<oid>",                           "Gets the attribute data for the specified commodities item"},
+	{"getCommoditiesItemAttributeDataValues", 2, "<game object type> <attribute name> [<got_exact>] [<throttle count>]", "For all items in the commodities system with the given game object type, get the attribute value for the given attribute name.  Specify got_exact to only include items whose GOT type exactly matches the specified GOT type (GOT types derived from the specified GOT type will be excluded).  Throttle count (default 100) specifies how many item to process per frame, to spread out the load over multiple frames."},
+	{"getCommoditiesAuctionLocationPriorityQueue", 1, "<count>",          "Gets the top <count> items in the auction location priority queue"},
+	{"getCommoditiesItemTypeMap", 1, "<game object type>",                "For the specified game object type, gets the list of item type"},
+	{"setCompletedTutorial",      1, "<oid>",                             "Mark the account belonging to the specified character (character does not have to be logged in) as having completed the tutorial, so that the skip tutorial option will be available during character creation for that account"},
+#ifdef _DEBUG
+	{"setExtraDelayPerFrameMs",   1, "<ms>",                              "Do an intentional sleep each frame, to emulate long loop time"},
+#endif
+	{"", 0, "", ""} // this must be last
+};
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserServer::ConsoleCommandParserServer (void) :
+CommandParser ("server", 0, "...", "Server related commands.", 0)
+{
+	createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------
+
+bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+	NOT_NULL (node);
+	
+	UNREF(originalCommand);
+
+	ServerObject * user = safe_cast<ServerObject *>(NetworkIdManager::getObjectById (userId));
+
+	//-----------------------------------------------------------------
+
+	if (isAbbrev (argv [0], ms_testStructurePlacement))
+	{
+		//-- make sure the user is valid
+		if (!user)
+		{
+			result += Unicode::narrowToWide ("invalid user");
+			return true;
+		}
+
+		if (!user->getClient ())
+		{
+			result += Unicode::narrowToWide ("invalid client");
+			return true;
+		}
+
+		if (!user->getClient ()->isGod ())
+		{
+			result += Unicode::narrowToWide ("user does not have admin privileges");
+			return true;
+		}
+
+		const std::string serverObjectTemplateName = Unicode::wideToNarrow(argv [1]);
+
+		//-- make sure the name is not empty
+		if (serverObjectTemplateName.empty ())
+		{
+			result += Unicode::narrowToWide ("serverObjectTemplateName is empty");
+			return true;
+		}
+
+		//-- fetch the object template
+		const ObjectTemplate* const objectTemplate = ObjectTemplateList::fetch (serverObjectTemplateName);
+		if (!objectTemplate)
+		{
+			result += Unicode::narrowToWide ("serverObjectTemplate does not exist");
+			return true;
+		}
+
+		//-- fetch the server object template
+		const ServerObjectTemplate* const serverObjectTemplate = dynamic_cast<const ServerObjectTemplate*> (objectTemplate);
+		if (!serverObjectTemplate)
+		{
+			objectTemplate->releaseReference ();
+
+			result += Unicode::narrowToWide ("serverObjectTemplate is not a server object template");
+			return true;
+		}
+
+		//-- fetch the shared object template
+		const std::string sharedObjectTemplateName = serverObjectTemplate->getSharedTemplate ();
+		serverObjectTemplate->releaseReference ();
+		if (sharedObjectTemplateName.empty ())
+		{
+			result += Unicode::narrowToWide ("serverObjectTemplate specifies no sharedObjectTemplateName");
+			return true;
+		}
+
+		//-- send the message to the client
+		EnterStructurePlacementModeMessage const msg(NetworkId::cms_invalid, sharedObjectTemplateName);
+		user->getClient()->send(msg, true);
+	}
+	else if (isAbbrev(argv[0], "setPublic"))
+	{
+		//-- make sure the user is valid
+		if (!user)
+		{
+			result += Unicode::narrowToWide ("invalid user");
+			return true;
+		}
+
+		if (!user->getClient ())
+		{
+			result += Unicode::narrowToWide ("invalid client");
+			return true;
+		}
+
+		if (!user->getClient ()->isGod ())
+		{
+			result += Unicode::narrowToWide ("user does not have admin privileges");
+			return true;
+		}
+
+		unsigned long val = strtoul(Unicode::wideToNarrow(argv[1]).c_str(), NULL, 10);
+		const bool isPublic = (val != 0);
+		SetConnectionServerPublic const p(isPublic);
+		
+		GameServer::getInstance().sendToCentralServer(p);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if( isAbbrev( argv[0], "abortShutdown"))
+	{	
+		if (!user)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_USER);
+			return true;
+		}
+		if (!user->getClient())
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		if (!user->getClient()->isGod())
+		{
+			result += Unicode::narrowToWide("User is not a god");
+			return true;
+		}
+		AbortShutdown const msg;
+		GameServer::getInstance().sendToCentralServer(msg);
+		result += getErrorMessage (argv[0], ERR_SUCCESS);			
+	}
+	else if( isAbbrev( argv[0], "shutdown"))
+	{	
+		if (!user)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_USER);
+			return true;
+		}
+		if (!user->getClient())
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		if (!user->getClient()->isGod())
+		{
+			result += Unicode::narrowToWide("User is not a god");
+			return true;
+		}
+		if( argv.size() < 4 )
+		{
+			result += Unicode::narrowToWide("Not enough parameters.  usage is \"shutdown [secsToWait] [maxSecs] [systemMessage]\"");
+			return true;
+		}
+	
+		unsigned long secsToWait = strtoul(Unicode::wideToNarrow(argv[1]).c_str(), NULL, 10);
+		unsigned long maxSecs = strtoul(Unicode::wideToNarrow(argv[2]).c_str(), NULL, 10);
+		Unicode::String systemMessage;
+		for( size_t i=3; i< argv.size(); ++i)
+		{
+			systemMessage += argv[i] + Unicode::narrowToWide(" ");
+		}
+
+		ShutdownCluster const msg(secsToWait, maxSecs, systemMessage);
+		GameServer::getInstance().sendToCentralServer(msg);
+		result += getErrorMessage (argv[0], ERR_SUCCESS);			
+	}
+	//-----------------------------------------------------------------
+	else if (isAbbrev( argv [0], "kill"))
+	{
+		if (!user)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_USER);
+			return true;
+		}
+		if (!user->getClient())
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		if (!user->getClient()->isGod())
+		{
+			result += Unicode::narrowToWide("User is not a god");
+			return true;
+		}
+		
+		unsigned long val = strtoul(Unicode::wideToNarrow(argv[1]).c_str (), NULL, 10);
+		switch (val)
+		{
+			case 1:
+			{
+				ExcommunicateGameServerMessage exmsg(GameServer::getInstance().getProcessId(), 0, "");
+				GameServer::getInstance().sendToCentralServer(exmsg);
+				result += getErrorMessage (argv[0], ERR_SUCCESS);		
+				break;
+			}
+			case 2:
+			{
+				GenericValueTypeMessage<int> const msg("ShutdownMessage", 0); 
+				GameServer::getInstance().sendToPlanetServer(msg);
+				result += getErrorMessage (argv[0], ERR_SUCCESS);		
+				break;
+			}
+			case 3:
+			{
+				GenericValueTypeMessage<int> const msg("RequestClusterShutdown", 0);
+				GameServer::getInstance().sendToCentralServer(msg);
+				result += getErrorMessage (argv[0], ERR_SUCCESS);		
+				break;
+			}
+			default:
+				result += getErrorMessage (argv[0], ERR_SUCCESS);			
+		}
+	}
+	//-----------------------------------------------------------------
+	else if (isAbbrev( argv[0], "error"))
+	{
+		if (user && user->getClient ())
+		{
+			ErrorMessage const em("GameServer Console", Unicode::wideToNarrow(argv[1]).c_str());
+			user->getClient()->send(em, true);
+		}
+	}
+
+	//-----------------------------------------------------------------------
+
+	else if(isAbbrev(argv[0], "getPlanetId"))
+	{
+		PlanetObject * p = ServerUniverse::getInstance().getCurrentPlanet();
+		if (argv.size() > 1)
+			p = ServerUniverse::getInstance().getPlanetByName(Unicode::wideToNarrow(argv[1]));
+
+		NetworkId pid;
+		if(p)
+		{
+			pid = p->getNetworkId();
+		}
+		result += Unicode::narrowToWide(pid.getValueString());
+	}
+
+	//-----------------------------------------------------------------
+	else if (isAbbrev( argv[0], "memUsage"))
+	{
+		char text[256];
+		sprintf(text, "Bytes: %lu Allocations: %d\n", MemoryManager::getCurrentNumberOfBytesAllocated(), MemoryManager::getCurrentNumberOfAllocations());
+		
+		result += Unicode::narrowToWide(text);
+		result += getErrorMessage (argv[0], ERR_SUCCESS);
+	}
+	
+	//-----------------------------------------------------------------
+	else if (isAbbrev( argv[0], "memoryReport"))
+	{
+		MemoryManager::report();
+		result += getErrorMessage (argv[0], ERR_SUCCESS);
+	}
+	
+	//-----------------------------------------------------------------
+	else if (isAbbrev( argv[0], "dumpMemToFile"))
+	{	
+		std::string fileName(Unicode::wideToNarrow(argv[1]));
+		std::string leakStr(Unicode::wideToNarrow(argv[2]));
+		bool leak = (leakStr == "true" || leakStr == "1");
+			
+		MemoryManager::reportToFile(fileName.c_str(), leak);
+		result += getErrorMessage (argv[0], ERR_SUCCESS);
+	}
+	
+	//-----------------------------------------------------------------
+	else if (isAbbrev( argv[0], "clock"))
+	{
+		char text[128];
+		sprintf(text, "FPS: %f FrameTime: %f\n", Clock::framesPerSecond(), Clock::frameTime());
+		result += Unicode::narrowToWide(text);
+		result += getErrorMessage (argv[0], ERR_SUCCESS);
+	}
+	
+	//-----------------------------------------------------------------
+	else if (isAbbrev( argv[0], "releaseAuth"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject* object = ServerWorld::findObjectByNetworkId(oid);
+		if (object == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		if (!object->isAuthoritative() || object->getProxyCount() < 1)
+		{
+			result += getErrorMessage(argv[0], ERR_CANNOT_XFER_AUTH);
+			return true;
+		}
+		ReleaseAuthoritativeMessage const msg(object->getNetworkId());
+		GameServer::getInstance().sendToCentralServer(msg);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if(isAbbrev( argv[0], "showObjectSpheres"))
+	{
+		std::vector<std::pair<ServerObject *, Sphere> > results;
+		ServerWorld::dumpObjectSphereTree(results);
+		result = Unicode::narrowToWide("Sending ");
+		char count[1024];
+		sprintf(count, "%i", results.size());
+		result += Unicode::narrowToWide(count);
+		result += Unicode::narrowToWide(" object sphere tree nodes to client\n");
+
+		std::vector<std::pair<ServerObject *, Sphere> >::iterator i;
+		for(i = results.begin(); i != results.end(); ++i)
+		{
+			std::string name = "SPHERE NODE";
+			NetworkId id(NetworkId::cms_invalid);
+
+			if((*i).first)
+			{
+				name = Unicode::wideToNarrow((*i).first->getObjectName());
+				id = (*i).first->getNetworkId();
+			}
+			sprintf(
+				count, 
+				"Sphere id=[%lu] origin=[%f, %f, %f] radius=[%f] OID=[%s] %s\n", 
+				reinterpret_cast<unsigned long>(i), 
+				(*i).second.getCenter().x, 
+				(*i).second.getCenter().y, 
+				(*i).second.getCenter().z, 
+				(*i).second.getRadius(),
+				id.getValueString().c_str(),
+				name.c_str()
+				);
+			result += Unicode::narrowToWide(count);
+		}
+	}
+	else if(isAbbrev( argv[0], "showTriggerSpheres"))
+	{
+		std::vector<std::pair<TriggerVolume *, Sphere> > results;
+		ServerWorld::dumpTriggerSphereTree(results);
+		result = Unicode::narrowToWide("Sending ");
+		char count[128];
+		sprintf(count, "%i", results.size());
+		result += Unicode::narrowToWide(count);
+		result += Unicode::narrowToWide(" trigger sphere tree nodes to client\n");
+
+
+		std::vector<std::pair<TriggerVolume *, Sphere> >::iterator i;
+		for(i = results.begin(); i != results.end(); ++i)
+		{
+			std::string name = "SPHERE NODE";
+			NetworkId id(NetworkId::cms_invalid);
+			if((*i).first)
+			{
+				name = Unicode::wideToNarrow((*i).first->getOwner().getObjectName());
+				id = (*i).first->getOwner().getNetworkId();
+			}
+
+			sprintf(
+				count, 
+				"Sphere id=[%lu] origin=[%f, %f, %f] radius=[%f] OID=[%s] %s\n", 
+				reinterpret_cast<unsigned long>(i), 
+				(*i).second.getCenter().x, 
+				(*i).second.getCenter().y, 
+				(*i).second.getCenter().z, 
+				(*i).second.getRadius(),
+				id.getValueString().c_str(),
+				name.c_str()
+				);
+			result += Unicode::narrowToWide(count);
+		}
+	}
+	else if (isAbbrev (argv[0], "snapAllObjectsToTerrain"))
+	{
+		ServerWorld::snapAllObjectsToTerrain ();
+		result += getErrorMessage (argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev (argv[0], "getSceneId"))
+	{
+		if (user == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+		result += Unicode::narrowToWide(user->getSceneId());
+		result += Unicode::narrowToWide("\n");
+		result += getErrorMessage (argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev (argv[0], "setGodMode"))
+	{
+		if (!user)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_USER);
+			return true;
+		}
+		if (!user->getClient())
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		unsigned long val = strtoul(Unicode::wideToNarrow(argv[1]).c_str (), NULL, 10);
+		if (user->getClient()->setGodMode(val != 0))
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		else
+			result += Unicode::narrowToWide("Cannot set god mode on unvalidated client\n");
+
+	}
+	else if (isAbbrev(argv[0], "reloadCommandTable"))
+	{
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+			
+		ServerCommandTable::load();
+
+		// send a message to other servers to reload the table
+
+		ServerMessageForwarding::beginBroadcast();
+
+		ReloadCommandTableMessage const reloadCommandTableMessage;
+		ServerMessageForwarding::send(reloadCommandTableMessage);
+
+		ServerMessageForwarding::end();
+	}
+	else if (isAbbrev(argv[0], "reloadAdminTable"))
+	{
+		AdminAccountManager::reload();
+
+		// send a message to other servers to reload the table
+
+		ServerMessageForwarding::beginBroadcast();
+
+		ReloadAdminTableMessage const reloadAdminTableMessage;
+		ServerMessageForwarding::send(reloadAdminTableMessage);
+
+		ServerMessageForwarding::end();
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "reloadTable"))
+	{
+		std::string tableName;
+		tableName = Unicode::wideToNarrow(argv[1]);
+		if (DataTableManager::reload(tableName) != NULL)
+		{
+			ServerMessageForwarding::beginBroadcast();
+
+			ReloadDatatableMessage const reloadDatatableMessage(tableName);
+			ServerMessageForwarding::send(reloadDatatableMessage);
+
+			ServerMessageForwarding::end();
+
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+			result += getErrorMessage(argv[0], ERR_FAIL);
+	}
+	else if (isAbbrev(argv[0], "dataTableGetString"))
+	{
+		std::string tableName;
+		tableName = Unicode::wideToNarrow(argv[1]);
+		int col = atoi(Unicode::wideToNarrow(argv[2]).c_str ());
+		int row = atoi(Unicode::wideToNarrow(argv[3]).c_str ());
+		DataTable * dt = DataTableManager::getTable(tableName);
+		if (dt)
+		{
+			result +=  Unicode::narrowToWide(dt->getStringValue(col, row));
+		}
+		else
+			result += Unicode::narrowToWide("No such table");
+	}
+	else if (isAbbrev(argv[0], "reloadTerrain"))
+	{
+		GameServer::getInstance().loadTerrain();
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if(isAbbrev(argv[0], "messageCount"))
+	{
+		std::vector<std::pair<std::string, int> > messages = GameNetworkMessage::getMessageCount();
+		std::vector<std::pair<std::string, int> >::iterator i;
+		char buf[128] = {"\0"};
+		for(i = messages.begin(); i != messages.end(); ++i)
+		{
+			IGNORE_RETURN(snprintf(buf, sizeof(buf), "[%9d] - \"%s\"\n", (*i).second, (*i).first.c_str()));
+			result += Unicode::narrowToWide(buf);
+		}
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "listRegions"))
+	{
+		Client * client = user->getClient();
+		if(client)
+		{
+			//get all the regions, and build messages, and sender to client (should be priveledged client, i.e. godclient user)
+			std::string planetName;
+			if (argv.size() > 1)
+				planetName = Unicode::wideToNarrow(argv[1]);
+			else
+			{
+				PlanetObject * planet = ServerUniverse::getInstance().getCurrentPlanet();
+				if (planet == NULL)
+				{
+					result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+					return true;
+				}
+				planetName = planet->getName();
+			}
+
+			std::vector<const Region *> regions;
+			RegionMaster::getRegionsForPlanet(planetName, regions);
+
+			for (std::vector<const Region *>::const_iterator i = regions.begin();	i != regions.end(); ++i)
+			{
+				const RegionRectangle * ro = dynamic_cast<const RegionRectangle*>(*i);
+				if (ro != NULL)
+				{
+					float minX, minY, maxX, maxY;
+					ro->getExtent(minX, minY, maxX, maxY);
+
+					MessageRegionListRectResponse const mrgrr(minX, minY, maxX, maxY, ro->getPvp(), ro->getMunicipal(), ro->getBuildable(), ro->getGeography(), ro->getMinDifficulty(), ro->getMaxDifficulty(), ro->getSpawn(), ro->getMission(), ro->getName(), ro->getPlanet());
+					client->send(mrgrr, true);
+				}
+				const RegionCircle* co = dynamic_cast<const RegionCircle*>(*i);
+				if (co != NULL)
+				{
+					float centerX, centerY, radius;
+					co->getExtent(centerX, centerY, radius);
+
+					MessageRegionListCircleResponse const mrgcr(centerX, centerY, radius, co->getPvp(), co->getMunicipal(), co->getBuildable(), co->getGeography(), co->getMinDifficulty(), co->getMaxDifficulty(), co->getSpawn(), co->getMission(), co->getName(), co->getPlanet());
+					client->send(mrgcr, true);
+				}
+			}
+		}
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "profiler"))
+	{
+		if (argv.size() > 1)
+		{
+			if (isAbbrev(argv[1], "get"))
+			{
+				result += Unicode::narrowToWide(PROFILER_GET_LAST_FRAME_DATA());
+			}
+			else if (isAbbrev(argv[1], "displayMinimum"))
+			{
+				if (argv.size() > 2)
+				{
+					uint32 processId = GameServer::getInstance().getProcessId();
+					if (argv.size() > 3)
+						processId = strtoul(Unicode::wideToNarrow(argv[3]).c_str(), NULL, 10);
+
+					std::string op = Unicode::wideToNarrow(argv[1]) + " " + Unicode::wideToNarrow(argv[2]);
+
+					if (processId == GameServer::getInstance().getProcessId())
+						Profiler::handleOperation(op.c_str());
+					else
+					{
+						ProfilerOperationMessage const msg(processId, op.c_str());
+						GameServer::getInstance().sendToCentralServer(msg);
+					}
+				}
+			}
+			else
+			{
+				uint32 processId = GameServer::getInstance().getProcessId();
+				if (argv.size() > 2)
+					processId = strtoul(Unicode::wideToNarrow(argv[2]).c_str(), NULL, 10);
+
+				std::string op(Unicode::wideToNarrow(argv[1]));
+				if (processId == GameServer::getInstance().getProcessId())
+					Profiler::handleOperation(op.c_str());
+				else
+				{
+					ProfilerOperationMessage const msg(processId, op.c_str());
+					GameServer::getInstance().sendToCentralServer(msg);
+				}
+			}
+		}
+	}
+	else if (isAbbrev(argv[0], "setFrameRateLimit"))
+	{
+		if(argv.size() > 1)
+		{
+			float newLimit = static_cast<float>(atof(Unicode::wideToNarrow(argv[1]).c_str()));
+
+			Clock::setFrameRateLimit(newLimit);
+
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+	}
+	else if (isAbbrev(argv[0], "setDebugFlag"))
+	{
+		if (!user->getClient ()->isGod ())
+		{
+			result += Unicode::narrowToWide ("user does not have admin privileges");
+		}
+		else if(argv.size() > 3)
+		{
+			const std::string section = Unicode::wideToNarrow(argv[1]);
+			const std::string name = Unicode::wideToNarrow(argv[2]);
+			const bool value = argv[3][0] != '0';
+
+			bool * const flag = DebugFlags::findFlag(section.c_str(), name.c_str());
+			if(flag)
+			{
+				*flag = value;
+				result += Unicode::narrowToWide("set flag " + section + "/" + name + " to ");
+				if(value)
+				{
+					result += Unicode::narrowToWide("true");
+				}
+				else
+				{
+					result += Unicode::narrowToWide("false");
+				}
+												
+			}
+			else
+			{
+				result += Unicode::narrowToWide("setDebugFlag: could not find flag " + section + "/" + name);
+			}
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_FAIL);
+		}
+	}
+	else if(isAbbrev(argv[0], "validateWorld"))
+	{
+		World::validate();
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "setUniverseProcess"))
+	{
+		int processId = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+		//Send message to central
+		ChangeUniverseProcessMessage const m(processId);
+		GameServer::getInstance().sendToCentralServer(m);
+	}
+	else if (isAbbrev(argv[0], "getRegionsAt"))
+	{
+		float x = static_cast<real>(strtod(Unicode::wideToNarrow(argv[1]).c_str(), NULL));
+		float z = static_cast<real>(strtod(Unicode::wideToNarrow(argv[2]).c_str(), NULL));
+
+		std::vector<const Region *> results;
+
+		RegionMaster::getRegionsAtPoint(ServerWorld::getSceneId(), x, z, results);
+
+		size_t resultCount = results.size();
+
+		if(resultCount)
+		{
+			for(size_t i = 0; i < resultCount; i++)
+			{
+				result += results[i]->getName();
+				result += Unicode::narrowToWide("\n");
+			}
+		}
+		else
+		{
+			result += Unicode::narrowToWide("No regions at the given point\n");
+		}	
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "enableNewJedi"))
+	{
+		std::string flag(Unicode::wideToNarrow(argv[1]));
+		if (flag == "true" || flag == "false")
+		{
+			bool enableTracking = (flag == "true");
+			GameScriptObject::enableNewJediTracking(enableTracking);
+
+			ServerMessageForwarding::beginBroadcast();
+
+			EnableNewJediTrackingMessage const enableNewJediTrackingMessage(enableTracking);
+			ServerMessageForwarding::send(enableNewJediTrackingMessage);
+
+			ServerMessageForwarding::end();
+
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_ARGUMENTS);
+	}
+	else if (isAbbrev(argv[0], "startSave"))
+	{
+		GenericValueTypeMessage<NetworkId> const msg("StartSaveMessage", userId); 
+		GameServer::getInstance().sendToDatabaseServer(msg);
+
+		result += Unicode::narrowToWide("Request sent.  Please wait for reply");
+	}
+	else if (isAbbrev(argv[0], "getNameList"))
+	{
+		result += Unicode::narrowToWide(NameManager::getInstance().debugGetNameList());
+	}
+	else if (isAbbrev(argv[0], "getCharacterInfo"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		if (oid.isValid())
+		{
+			if (NameManager::getInstance().isPlayer(oid))
+			{
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character oid:             %s\n", oid.getValueString().c_str()));
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character station id:      %lu\n", NameManager::getInstance().getPlayerStationId(oid)));
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character first name:      %s\n", NameManager::getInstance().getPlayerName(oid).c_str()));
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character full name:       %s\n", NameManager::getInstance().getPlayerFullName(oid).c_str()));
+
+				time_t const createTime = static_cast<time_t>(NameManager::getInstance().getPlayerCreateTime(oid));
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character create time:     %ld, %s, %s\n", createTime, CalendarTime::convertEpochToTimeStringLocal(createTime).c_str(), CalendarTime::convertEpochToTimeStringGMT(createTime).c_str()));
+
+				time_t const lastLoginTime = static_cast<time_t>(NameManager::getInstance().getPlayerLastLoginTime(oid));
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character last login time: %ld, %s, %s\n", lastLoginTime, CalendarTime::convertEpochToTimeStringLocal(lastLoginTime).c_str(), CalendarTime::convertEpochToTimeStringGMT(lastLoginTime).c_str()));
+			}
+			else
+			{
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("no player with id (%s)\n", oid.getValueString().c_str()));
+			}
+		}
+		else
+		{
+			oid = NameManager::getInstance().getPlayerId(Unicode::wideToNarrow(Unicode::toLower(argv[1])));
+			if (oid.isValid())
+			{
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character oid:             %s\n", oid.getValueString().c_str()));
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character station id:      %lu\n", NameManager::getInstance().getPlayerStationId(oid)));
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character first name:      %s\n", NameManager::getInstance().getPlayerName(oid).c_str()));
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character full name:       %s\n", NameManager::getInstance().getPlayerFullName(oid).c_str()));
+
+				time_t const createTime = static_cast<time_t>(NameManager::getInstance().getPlayerCreateTime(oid));
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character create time:     %ld, %s, %s\n", createTime, CalendarTime::convertEpochToTimeStringLocal(createTime).c_str(), CalendarTime::convertEpochToTimeStringGMT(createTime).c_str()));
+
+				time_t const lastLoginTime = static_cast<time_t>(NameManager::getInstance().getPlayerLastLoginTime(oid));
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("character last login time: %ld, %s, %s\n", lastLoginTime, CalendarTime::convertEpochToTimeStringLocal(lastLoginTime).c_str(), CalendarTime::convertEpochToTimeStringGMT(lastLoginTime).c_str()));
+			}
+			else
+			{
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("no player with name (%s)\n", Unicode::wideToNarrow(argv[1]).c_str()));
+			}
+		}
+	}
+	else if (isAbbrev(argv[0], "enablePlayerSanityChecker"))
+	{
+		std::string flag(Unicode::wideToNarrow(argv[1]));
+		if (flag == "true" || flag == "false")
+		{
+			bool enableFlag = (flag == "true");
+			PlayerSanityChecker::enable(enableFlag);
+
+			ServerMessageForwarding::beginBroadcast();
+
+			GenericValueTypeMessage<bool> const enablePlayerSanityCheckerMessage("EnablePlayerSanityCheckerMessage",enableFlag);
+			ServerMessageForwarding::send(enablePlayerSanityCheckerMessage);
+
+			ServerMessageForwarding::end();
+
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+			result += getErrorMessage(argv[0], ERR_INVALID_ARGUMENTS);
+	}
+	else if (isAbbrev(argv[0], "reloadForms"))
+	{
+		FormManagerServer::reloadData();
+	}
+	else if (isAbbrev(argv[0], "setAiCombatPulseQueueNumber"))
+	{
+		int limit = atol(Unicode::wideToNarrow(argv[1]).c_str());
+		AiCombatPulseQueue::setAiPerFrame(limit);
+	}
+	else if (isAbbrev(argv[0], "setAiCombatPulseQueueMaxWaitTimeMs"))
+	{
+		int limit = atol(Unicode::wideToNarrow(argv[1]).c_str());
+		AiCombatPulseQueue::setAiMaxWaitTimeMs(limit);
+	}
+	else if (isAbbrev(argv[0], "reloadQuests"))
+	{
+		QuestManager::reloadQuests();
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "setQuestDebugging"))
+	{
+		bool const debugging = Unicode::wideToNarrow(argv[1]) == "1";
+		QuestManager::setDebugging(debugging);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "saveBuildoutArea"))
+	{
+		//"<server_table> <client_table> <x1> <z1> <x2> <z2>", "Save out an area for buildout datatables"
+		std::string const &serverFilename = Unicode::wideToNarrow(argv[1]);
+		std::string const &clientFilename = Unicode::wideToNarrow(argv[2]);
+		float x1 = static_cast<float>(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL));
+		float z1 = static_cast<float>(strtod(Unicode::wideToNarrow(argv[4]).c_str(), NULL));
+		float x2 = static_cast<float>(strtod(Unicode::wideToNarrow(argv[5]).c_str(), NULL));
+		float z2 = static_cast<float>(strtod(Unicode::wideToNarrow(argv[6]).c_str(), NULL));
+		ServerBuildoutManager::saveArea(serverFilename, clientFilename, x1, z1, x2, z2);
+	}
+	else if (isAbbrev(argv[0], "clientSaveBuildoutArea"))
+	{
+		//"<scene> <area_name> <x1> <z1> <x2> <z2>"
+		std::string const &scene = Unicode::wideToNarrow(argv[1]);
+		std::string const &areaName = Unicode::wideToNarrow(argv[2]);
+		float x1 = static_cast<float>(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL));
+		float z1 = static_cast<float>(strtod(Unicode::wideToNarrow(argv[4]).c_str(), NULL));
+		float x2 = static_cast<float>(strtod(Unicode::wideToNarrow(argv[5]).c_str(), NULL));
+		float z2 = static_cast<float>(strtod(Unicode::wideToNarrow(argv[6]).c_str(), NULL));
+		if (scene == ConfigServerGame::getSceneID() && user->getClient())
+			ServerBuildoutManager::clientSaveArea(*user->getClient(), areaName, x1, z1, x2, z2);
+	}
+	else
+	{
+		// ConsoleCommandParserServer::performParsing() is getting too big for the compiler to handle
+		// so some of the message handling is done in the private helper performParsing2()
+		return performParsing2(userId, argv, originalCommand, result, node);
+	}
+
+	return true;
+}
+
+//-----------------------------------------------------------------
+// ConsoleCommandParserServer::performParsing() is getting too big for the compiler to handle
+// so some of the message handling is done in this private helper performParsing2()
+
+bool ConsoleCommandParserServer::performParsing2(const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+	NOT_NULL (node);
+
+	UNREF(originalCommand);
+
+	ServerObject * user = safe_cast<ServerObject *>(NetworkIdManager::getObjectById (userId));
+
+	if (isAbbrev(argv[0], "destroyPersistedBuildoutAreaDuplicates"))
+	{
+		ServerBuildoutManager::destroyPersistedDuplicates();
+	}
+	else if (isAbbrev(argv[0], "editBuildoutArea"))
+	{
+		std::string const &areaName = Unicode::wideToNarrow(argv[1]);
+		ServerBuildoutManager::editBuildoutArea(areaName);
+	}
+	else if (isAbbrev(argv[0], "restartServer"))
+	{
+		if (argv.size() == 2)
+		{
+			// specify server by process id
+			uint32 serverId = strtoul(Unicode::wideToNarrow(argv[1]).c_str(), NULL, 10);
+			if (serverId != 0)
+			{
+				ExcommunicateGameServerMessage exmsg(serverId, 0, "");
+				GameServer::getInstance().sendToCentralServer(exmsg);
+				result += getErrorMessage (argv[0], ERR_SUCCESS);	
+			}
+			else
+				result += Unicode::narrowToWide("Invalid server number");
+		}
+		else if (argv.size() == 3)
+		{
+			// specify server by scene & preload role number
+			std::string const &scene = Unicode::wideToNarrow(argv[1]);
+			uint32 preloadRole = strtoul(Unicode::wideToNarrow(argv[2]).c_str(), NULL, 10);
+
+			GenericValueTypeMessage<std::pair<std::string, uint32> > msg("RestartServerByRoleMessage", std::make_pair(scene, preloadRole));
+			if (scene == ConfigServerGame::getSceneID())
+				GameServer::getInstance().sendToPlanetServer(msg);
+			else
+				GameServer::getInstance().sendToCentralServer(msg);
+
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else if (argv.size() == 4)
+		{
+			// specify server by geographic location
+			std::string const &scene = Unicode::wideToNarrow(argv[1]);
+			int x = static_cast<int>(strtod(Unicode::wideToNarrow(argv[2]).c_str(), NULL));
+			int z = static_cast<int>(strtod(Unicode::wideToNarrow(argv[3]).c_str(), NULL));
+		
+			RestartServerMessage msg(scene, x, z);
+			if (scene == ConfigServerGame::getSceneID())
+				GameServer::getInstance().sendToPlanetServer(msg);
+			else
+				GameServer::getInstance().sendToCentralServer(msg);
+
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+	}
+	else if (isAbbrev(argv[0], "restartPlanet"))
+	{
+		if (argv.size() == 2)
+		{
+			std::string const &scene = Unicode::wideToNarrow(argv[1]);
+
+			GenericValueTypeMessage<std::string> msg("RestartPlanetMessage",scene);
+
+			if (scene == ConfigServerGame::getSceneID())
+			{
+				GenericValueTypeMessage<int> const msg("ShutdownMessage", 0); 
+				GameServer::getInstance().sendToPlanetServer(msg);
+			}
+			else
+				GameServer::getInstance().sendToCentralServer(msg);
+		
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+			result += Unicode::narrowToWide("Syntax:  remote server restartPlanet <sceneId>");
+	}
+	else if (isAbbrev(argv [0], "dumpCreatures"))
+	{
+		// This is potentially an expensive command, so make sure that this can only be done in god mode
+		if (!user)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_USER);
+			return true;
+		}
+		if (!user->getClient())
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		std::string resultNarrowString;
+
+		const CreatureObject::AllCreaturesSet& creatureList = CreatureObject::getAllCreatures();
+
+		// Compose a "header" so that people can decipher the tab delimited columns
+		resultNarrowString += "Object ID\t";
+		resultNarrowString += "Authoritative\t";
+		resultNarrowString += "Parent ID\t";
+		resultNarrowString += "Object Template\t";
+		resultNarrowString += "World X\t";
+		resultNarrowString += "World Y\t";
+		resultNarrowString += "World Z\t";
+		resultNarrowString += "Creature Name\t";
+		resultNarrowString += "Creature Level\t";
+		resultNarrowString += "Invulnerable\t";
+		resultNarrowString += "Hibernating\t";
+		resultNarrowString += "Movement State\t";
+		resultNarrowString += "Observer Count\t";
+		resultNarrowString += "Observer List\t";
+		resultNarrowString += "\n";
+
+		CreatureObject::AllCreaturesSet::const_iterator i;
+		for (i = creatureList.begin(); i != creatureList.end(); ++i)
+		{
+			const CreatureObject* creatureObj = (*i);
+
+			// Object ID
+			resultNarrowString += creatureObj->getNetworkId().getValueString();
+			resultNarrowString += "\t";
+
+			// Authoritative
+			resultNarrowString += creatureObj->isAuthoritative() ? "yes" : "no";
+			resultNarrowString += "\t";
+
+			// Parent ID
+			resultNarrowString += ((creatureObj->getRootParent() != creatureObj) ? creatureObj->getRootParent()->getNetworkId().getValueString() : "none");
+			resultNarrowString += "\t";
+
+			// Object Template
+			resultNarrowString += creatureObj->getObjectTemplateName() ? creatureObj->getObjectTemplateName() : "<NO OBJECT TEMPLATE NAME>";
+			resultNarrowString += "\t";
+
+			// World coordinates
+			{
+				char buffer[32];
+
+				// World X
+				sprintf(buffer, "%.1f", creatureObj->getPosition_w().x);
+				resultNarrowString += buffer;
+				resultNarrowString += "\t";
+
+				// World Y
+				sprintf(buffer, "%.1f", creatureObj->getPosition_w().y);
+				resultNarrowString += buffer;
+				resultNarrowString += "\t";
+
+				// World Z
+				sprintf(buffer, "%.1f", creatureObj->getPosition_w().z);
+				resultNarrowString += buffer;
+				resultNarrowString += "\t";
+			}
+
+			// AI Information
+			const AICreatureController * controller = dynamic_cast<const AICreatureController*>(creatureObj->getController());
+			if (controller)
+			{
+				char buffer[512];
+
+				// Creature name
+				sprintf(buffer, "%s", controller->getCreatureName().getString());
+				resultNarrowString += buffer;
+				resultNarrowString += "\t";
+
+				// Creature level
+				sprintf(buffer, "%d", creatureObj->getLevel());
+				resultNarrowString += buffer;
+				resultNarrowString += "\t";
+
+				// Invulnerable
+				sprintf(buffer, "%s", creatureObj->isInvulnerable() ? "yes" : "no");
+				resultNarrowString += buffer;
+				resultNarrowString += "\t";
+
+				// Hibernating
+				sprintf(buffer, "%s", controller->getHibernate() ? "yes" : "no");
+				resultNarrowString += buffer;
+				resultNarrowString += "\t";
+
+				// Movement state
+				sprintf(buffer, "%s", AiMovementBase::getMovementString(controller->getMovementType()));
+				resultNarrowString += buffer;
+				resultNarrowString += "\t";
+			}
+			else
+			{
+				// Creature name
+				resultNarrowString += "\t";
+
+				// Creature level
+				resultNarrowString += "\t";
+
+				// Invulnerable
+				resultNarrowString += "\t";
+
+				// Hibernating
+				resultNarrowString += "\t";
+
+				// Movement state
+				resultNarrowString += "\t";
+			}
+
+			// Observer count
+			{
+				char buffer[32];
+				sprintf(buffer, "%d", creatureObj->getObserversCount());
+				resultNarrowString += buffer;
+				resultNarrowString += "\t";
+			}
+
+			// Observer list
+			const std::set<Client *>& observerList = creatureObj->getObservers();
+			std::set<Client *>::const_iterator j;
+			for (j = observerList.begin(); j != observerList.end(); ++j)
+			{
+				const Client* observerClient = (*j);
+				if (observerClient)
+				{
+					resultNarrowString += observerClient->getCharacterObjectId().getValueString();
+					resultNarrowString += " ";
+				}
+			}
+
+			// End the row of creature info
+			resultNarrowString += "\n";
+		}
+
+		// Parse the parameters to get the filename
+		const std::string & filename = Unicode::wideToNarrow(argv[1]);
+
+		// Save the data in a text file on the client
+		GenericValueTypeMessage<std::pair<std::string, std::string> > const msg("SaveTextOnClient", std::make_pair(filename, resultNarrowString));
+		user->getClient()->send(msg, true);
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+
+		return true;
+	}
+	else if (isAbbrev(argv[0], "getNumberOfMoveObjectLists"))
+	{
+		char buffer[128];
+		std::vector<int> moveListSize;
+
+		snprintf(buffer, sizeof(buffer)-1, "%d move object lists\n", ServerWorld::getNumMoveLists(moveListSize));
+		buffer[sizeof(buffer)-1] = '\0';
+		result += Unicode::narrowToWide(buffer);
+
+		int moveListIndex = 1;
+		for (std::vector<int>::const_iterator i = moveListSize.begin(); i != moveListSize.end(); ++i)
+		{
+			snprintf(buffer, sizeof(buffer)-1, "list #%d size: %d\n", moveListIndex++, *i);
+			buffer[sizeof(buffer)-1] = '\0';
+			result += Unicode::narrowToWide(buffer);
+		}
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "setNumberOfMoveObjectLists"))
+	{
+		int numMoveLists = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+
+		ServerWorld::setNumMoveLists(numMoveLists);
+
+		char buffer[128];
+		snprintf(buffer, sizeof(buffer)-1, "setting the number of move object lists to %d\n", numMoveLists);
+		buffer[sizeof(buffer)-1] = '\0';
+
+		result += Unicode::narrowToWide(buffer);
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "getSystemClockTimeFromAllGameServers"))
+	{
+		GenericValueTypeMessage<std::pair<uint32, NetworkId> > rsct(
+			"ReportSystemClockTime", std::make_pair(GameServer::getInstance().getProcessId(), userId));
+		GameServer::getInstance().sendToCentralServer(rsct);
+
+		result += Unicode::narrowToWide("Asking every game server to report the system clock time of the box it is running on\n");
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "getPlanetaryTimeFromAllGameServers"))
+	{
+		GenericValueTypeMessage<std::pair<uint32, NetworkId> > rpt(
+			"ReportPlanetaryTime", std::make_pair(GameServer::getInstance().getProcessId(), userId));
+		GameServer::getInstance().sendToCentralServer(rpt);
+
+		result += Unicode::narrowToWide("Asking every game server to report its planetary time\n");
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "requestSameServer"))
+	{
+		NetworkId oid1(Unicode::wideToNarrow(argv[1]));
+		NetworkId oid2(Unicode::wideToNarrow(argv[2]));
+
+		ServerObject const * const object1 = ServerWorld::findObjectByNetworkId(oid1);
+		if (object1 == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		ServerObject const * const object2 = ServerWorld::findObjectByNetworkId(oid2);
+		if (object2 == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		if (!object1->isAuthoritative() || !object2->isAuthoritative())
+		{
+			GenericValueTypeMessage<std::pair<NetworkId, NetworkId> > const rssMessage(
+				"RequestSameServer",
+				std::make_pair(oid1, oid2));
+
+			GameServer::getInstance().sendToPlanetServer(rssMessage);
+		}
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "displayTerrain"))
+	{
+		if (!user)
+		{
+			result += Unicode::narrowToWide("invalid user\n");
+			return true;
+		}
+
+		int const range = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+		if (range < 0)
+		{
+			result += Unicode::narrowToWide("range must be >= 0\n");
+			return true;
+		}
+
+		Vector const location = user->findPosition_w();
+
+		TerrainObject const * terrain = TerrainObject::getConstInstance();
+		if (!terrain)
+		{
+			result += Unicode::narrowToWide("terrain object is NULL\n");
+			return true;
+		}
+
+		float const chunkWidthInMeters = terrain->getChunkWidthInMeters();
+		if (chunkWidthInMeters < 0.1f)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("terrain chunk width %.2fm is too small for this operation\n", chunkWidthInMeters));
+			return true;
+		}
+
+		int numberOfChunks = static_cast<int>(static_cast<float>(range) / chunkWidthInMeters);
+		if (numberOfChunks > 71)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("the specified range (%dm) results in too many chunks (%d, limit is 71) of chunk width (%.2fm)\n", range, numberOfChunks, chunkWidthInMeters));
+			return true;
+		}
+
+		float currentX = 0.0f;
+		float currentZ = location.z + (numberOfChunks * chunkWidthInMeters);
+		for (int z = -numberOfChunks; z <= numberOfChunks; ++z)
+		{
+			currentX = location.x - (numberOfChunks * chunkWidthInMeters);
+			for (int x = -numberOfChunks; x <= numberOfChunks; ++x)
+			{
+				Vector const v(currentX, 0.0f, currentZ);
+				float height;
+				bool const hasChunk = terrain->getHeight(v, height); // this will fail if the terrain chunk is not yet generated
+
+				if ((x == 0) && (z == 0))
+				{
+					if (hasChunk)
+						result += Unicode::narrowToWide("*");
+					else
+						result += Unicode::narrowToWide("X");
+				}
+				else
+				{
+					if (hasChunk)
+						result += Unicode::narrowToWide("+");
+					else
+						result += Unicode::narrowToWide("-");
+				}
+
+				currentX += chunkWidthInMeters;
+			}
+
+			currentZ -= chunkWidthInMeters;
+
+			result += Unicode::narrowToWide("\n");
+		}
+
+		result += Unicode::narrowToWide("\n");
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("chunk width (%.2fm)\n", chunkWidthInMeters));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("x-range (%.2f, %.2f)\n", (location.x - (numberOfChunks * chunkWidthInMeters)), (currentX - chunkWidthInMeters)));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("z-range (%.2f, %.2f)\n", (location.z + (numberOfChunks * chunkWidthInMeters)), (currentZ + chunkWidthInMeters)));
+	}
+	else if (isAbbrev(argv[0], "generateTerrain"))
+	{
+		if (!user)
+		{
+			result += Unicode::narrowToWide("invalid user\n");
+			return true;
+		}
+
+		int const range = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+		if (range < 0)
+		{
+			result += Unicode::narrowToWide("range must be >= 0\n");
+			return true;
+		}
+
+		Vector const location = user->findPosition_w();
+
+		TerrainObject const * terrain = TerrainObject::getConstInstance();
+		if (!terrain)
+		{
+			result += Unicode::narrowToWide("terrain object is NULL\n");
+			return true;
+		}
+
+		float const chunkWidthInMeters = terrain->getChunkWidthInMeters();
+		if (chunkWidthInMeters < 0.1f)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("terrain chunk width %.2fm is too small for this operation\n", chunkWidthInMeters));
+			return true;
+		}
+
+		int numberOfChunks = static_cast<int>(static_cast<float>(range) / chunkWidthInMeters);
+		if (numberOfChunks > 71)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("the specified range (%dm) results in too many chunks (%d, limit is 71) of chunk width (%.2fm)\n", range, numberOfChunks, chunkWidthInMeters));
+			return true;
+		}
+
+		float currentX = 0.0f;
+		float currentZ = location.z + (numberOfChunks * chunkWidthInMeters);
+		for (int z = -numberOfChunks; z <= numberOfChunks; ++z)
+		{
+			currentX = location.x - (numberOfChunks * chunkWidthInMeters);
+			for (int x = -numberOfChunks; x <= numberOfChunks; ++x)
+			{
+				Vector const v(currentX, 0.0f, currentZ);
+				float height;
+				if (!terrain->getHeightForceChunkCreation(v, height)) // this will force terrain chunk creation, if necessary
+				{
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("getHeightForceChunkCreation() failed at (%.2f, %.2f)\n", currentX, currentZ));
+				}
+
+				currentX += chunkWidthInMeters;
+			}
+
+			currentZ -= chunkWidthInMeters;
+		}
+
+		result += Unicode::narrowToWide("\n");
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("chunk width (%.2fm)\n", chunkWidthInMeters));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("x-range (%.2f, %.2f)\n", (location.x - (numberOfChunks * chunkWidthInMeters)), (currentX - chunkWidthInMeters)));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("z-range (%.2f, %.2f)\n", (location.z + (numberOfChunks * chunkWidthInMeters)), (currentZ + chunkWidthInMeters)));
+	}
+	else if (isAbbrev(argv[0], "purgeTerrain"))
+	{
+		TerrainObject * terrain = TerrainObject::getInstance();
+		if (!terrain)
+		{
+			result += Unicode::narrowToWide("terrain object is NULL\n");
+			return true;
+		}
+
+		result += Unicode::narrowToWide("purging all generated terrain chunks\n");
+		terrain->purgeChunks();
+	}
+	else if (isAbbrev(argv[0], "listConnectedCharacters"))
+	{
+		std::multimap<std::pair<Unicode::String, NetworkId>, Unicode::String> orderedList;
+		std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData();
+		for (std::map<NetworkId, LfgCharacterData>::const_iterator iter = connectedCharacterLfgData.begin(); iter != connectedCharacterLfgData.end(); ++iter)
+		{
+			IGNORE_RETURN(orderedList.insert(std::make_pair(std::make_pair(Unicode::toUpper(iter->second.characterName), iter->first), iter->second.characterName)));
+		}
+
+		for (std::multimap<std::pair<Unicode::String, NetworkId>, Unicode::String>::const_iterator iter2 = orderedList.begin(); iter2 != orderedList.end(); ++iter2)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s, %s\n", Unicode::wideToNarrow(iter2->second).c_str(), iter2->first.second.getValueString().c_str()));
+		}
+
+		if (!connectedCharacterLfgData.empty())
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("\nPopulation statistics: %d total\n", connectedCharacterLfgData.size()));
+
+			std::map<std::string, int> const & statistics = LfgCharacterData::calculateStatistics(connectedCharacterLfgData);
+			std::map<std::string, int>::const_iterator iterStatistics;
+
+			size_t maxStatisticsLength = 0;
+			for (iterStatistics = statistics.begin(); iterStatistics != statistics.end(); ++iterStatistics)
+			{
+				if ((iterStatistics->second >= 0) && (iterStatistics->first.size() > maxStatisticsLength))
+					maxStatisticsLength = iterStatistics->first.size();
+			}
+
+			for (iterStatistics = statistics.begin(); iterStatistics != statistics.end(); ++iterStatistics)
+			{
+				if (iterStatistics->second < 0)
+				{
+					result += Unicode::narrowToWide("\n");
+					continue;
+				}
+
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s", iterStatistics->first.c_str()));
+
+				std::string padding;
+				for (size_t i = iterStatistics->first.size(); i < maxStatisticsLength; ++i)
+					padding += ".";
+
+				if (!padding.empty())
+					result += Unicode::narrowToWide(padding);
+
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf(": %4d\n", iterStatistics->second));	
+			}
+		}
+	}
+	else if (isAbbrev(argv[0], "listConnectedCharacterData"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData();
+
+		std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = connectedCharacterLfgData.find(oid);
+		if (iterFind != connectedCharacterLfgData.end())
+		{
+			result += Unicode::narrowToWide(iterFind->second.getDebugString());
+
+			ServerObject const * const soGroupObject = (iterFind->second.groupId.isValid() ? safe_cast<ServerObject const *>(NetworkIdManager::getObjectById(iterFind->second.groupId)) : NULL);
+			GroupObject const * const groupObject = (soGroupObject ? soGroupObject->asGroupObject() : NULL);
+			if (groupObject)
+			{
+				unsigned int const secondsLeftOnGroupPickup = groupObject->getSecondsLeftOnGroupPickup();
+				if (secondsLeftOnGroupPickup)
+				{
+					std::pair<int32, int32> const & groupPickupTimer = groupObject->getGroupPickupTimer();
+					std::pair<std::string, Vector> const & groupPickupLocation = groupObject->getGroupPickupLocation();
+
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("Group (%s) Pickup Point: %s (%.2f, %.2f, %.2f), (%ld - %ld) (%u seconds left)\n", groupObject->getNetworkId().getValueString().c_str(), groupPickupLocation.first.c_str(), groupPickupLocation.second.x, groupPickupLocation.second.y, groupPickupLocation.second.z, groupPickupTimer.first, groupPickupTimer.second, secondsLeftOnGroupPickup));
+				}
+
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("Group (%s) Members:\n", groupObject->getNetworkId().getValueString().c_str()));
+
+				std::multimap<std::pair<std::string, NetworkId>, std::string> orderedMemberList;
+				NetworkId const groupLeaderId = groupObject->getGroupLeaderId();
+				GroupObject::GroupMemberVector const & groupMembers = groupObject->getGroupMembers();
+				unsigned int groupMemberIndex = 0;
+				for (GroupObject::GroupMemberVector::const_iterator iter = groupMembers.begin(); iter != groupMembers.end(); ++iter)
+				{
+					std::string groupMemberName = iter->second;
+					if (iter->first == groupLeaderId)
+						groupMemberName += " (Leader)";
+					if (!groupObject->isMemberPC(iter->first))
+						groupMemberName += " (NPC)";
+
+					groupMemberName += FormattedString<512>().sprintf(" (%s), %d, %s", iter->first.getValueString().c_str(), groupObject->getMemberLevelByMemberIndex(groupMemberIndex), LfgCharacterData::getProfessionDebugString(static_cast<LfgCharacterData::Profession>(groupObject->getMemberProfessionByMemberIndex(groupMemberIndex))).c_str());
+
+					++groupMemberIndex;
+
+					IGNORE_RETURN(orderedMemberList.insert(std::make_pair(std::make_pair(Unicode::toUpper(iter->second), iter->first), groupMemberName)));
+
+				}
+
+				for (std::multimap<std::pair<std::string, NetworkId>, std::string>::const_iterator iter2 = orderedMemberList.begin(); iter2 != orderedMemberList.end(); ++iter2)
+				{
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("    %s\n", iter2->second.c_str()));
+				}
+			}
+			else
+			{
+				if (iterFind->second.groupId.isValid())
+					result += Unicode::narrowToWide(FormattedString<512>().sprintf("(invalid group %s)\n", iterFind->second.groupId.getValueString().c_str()));
+				else
+					result += Unicode::narrowToWide("(ungrouped)\n");
+			}
+
+			std::map<NetworkId, Unicode::String> const & connectedCharacterBiographyData = ServerUniverse::getConnectedCharacterBiographyData();
+			std::map<NetworkId, Unicode::String>::const_iterator iterFindBiography = connectedCharacterBiographyData.find(oid);
+			if (iterFindBiography != connectedCharacterBiographyData.end())
+			{
+				result += Unicode::narrowToWide("Biography:\n");
+				result += iterFindBiography->second;
+				result += Unicode::narrowToWide("\n");
+			}
+			else
+			{
+				result += Unicode::narrowToWide("(no biography)\n");
+			}
+		}
+		else
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("no connected character with oid %s\n", oid.getValueString().c_str()));
+		}
+	}
+	else if (isAbbrev(argv[0], "listTravelPoints"))
+	{
+		std::string planetName;
+		Vector location;
+		if (argv.size() >= 5)
+		{
+			planetName = Unicode::wideToNarrow(argv[1]);
+			location.x = static_cast<real>(atof(Unicode::wideToNarrow(argv[2]).c_str()));
+			location.y = static_cast<real>(atof(Unicode::wideToNarrow(argv[3]).c_str()));
+			location.z = static_cast<real>(atof(Unicode::wideToNarrow(argv[4]).c_str()));
+		}
+		else
+		{
+			planetName = ServerWorld::getSceneId();
+
+			if (user)
+				location = user->findPosition_w();
+		}
+
+		PlanetObject const * const planetObject = ServerUniverse::getInstance().getPlanetByName(planetName);
+		if (planetObject)
+		{
+			std::multimap<float, TravelPoint const *> sortedTravelPoint;
+			int const numberOfTravelPoints = planetObject->getNumberOfTravelPoints();
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d travel points for planet (%s)\n", numberOfTravelPoints, planetName.c_str()));
+
+			for (int i = 0; i < numberOfTravelPoints; ++i)
+			{
+				TravelPoint const * tp = planetObject->getTravelPoint(i);
+				if (tp)
+					IGNORE_RETURN(sortedTravelPoint.insert(std::make_pair(location.magnitudeBetween(tp->getPosition_w()), tp)));
+			}
+
+			for (std::multimap<float, TravelPoint const *>::const_iterator iter = sortedTravelPoint.begin(); iter != sortedTravelPoint.end(); ++iter)
+			{
+				std::string tpType;
+				if (iter->second->getType() == TravelPoint::TPT_Unknown)
+				{
+					tpType = "TPT_Unknown";
+				}
+				else
+				{
+					if (iter->second->getType() & TravelPoint::TPT_NPC_Starport)
+					{
+						if (tpType.empty())
+							tpType += ", ";
+
+						tpType = "TPT_NPC_Starport";
+					}
+
+					if (iter->second->getType() & TravelPoint::TPT_NPC_Shuttleport)
+					{
+						if (tpType.empty())
+							tpType += ", ";
+
+						tpType = "TPT_NPC_Shuttleport";
+					}
+
+					if (iter->second->getType() & TravelPoint::TPT_NPC_StaticBaseBeacon)
+					{
+						if (tpType.empty())
+							tpType += ", ";
+
+						tpType = "TPT_NPC_StaticBaseBeacon";
+					}
+
+					if (iter->second->getType() & TravelPoint::TPT_PC_Shuttleport)
+					{
+						if (tpType.empty())
+							tpType += ", ";
+
+						tpType = "TPT_PC_Shuttleport";
+					}
+
+					if (iter->second->getType() & TravelPoint::TPT_PC_CampShuttleBeacon)
+					{
+						if (tpType.empty())
+							tpType += ", ";
+
+						tpType = "TPT_PC_CampShuttleBeacon";
+					}
+				}
+
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("%s (%s) (%s) (%s) (%.2f, %.2f, %.2f) (cost=%d) [%.2fm away from (%.2f, %.2f, %.2f)]\n", iter->second->getName().c_str(), iter->second->getGcwContestedRegion().c_str(), tpType.c_str(), (iter->second->getInterplanetary() ? "interplanetary" : "intraplanetary"), iter->second->getPosition_w().x, iter->second->getPosition_w().y, iter->second->getPosition_w().z, iter->second->getCost(), iter->first, location.x, location.y, location.z));
+			}
+		}
+		else
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("couldn't find PlanetObject for planet (%s)\n", planetName.c_str()));
+		}
+	}
+	else if (isAbbrev(argv[0], "listCharacterLastLoginTimeBrief"))
+	{
+		int const days = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+		time_t const cutoff = std::max(static_cast<time_t>(0), static_cast<time_t>(::time(NULL) - (60 * 60 * 24 * days)));
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithLastLoginTimeAfter(cutoff, resultList);
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d (out of %d total) characters have logged in since %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+	}
+	else if (isAbbrev(argv[0], "listCharacterLastLoginTimeAfterBrief"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		time_t const cutoff = ::mktime(timeinfo);
+
+		if (cutoff <= 0)
+		{
+			result += Unicode::narrowToWide("specified time is invalid\n");
+			return true;
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithLastLoginTimeAfter(cutoff, resultList);
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d (out of %d total) characters have logged in since %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+	}
+	else if (isAbbrev(argv[0], "listCharacterLastLoginTimeBeforeBrief"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		time_t const cutoff = ::mktime(timeinfo);
+
+		if (cutoff <= 0)
+		{
+			result += Unicode::narrowToWide("specified time is invalid\n");
+			return true;
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithLastLoginTimeBefore(cutoff, resultList);
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d (out of %d total) characters logged in before %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+	}
+	else if (isAbbrev(argv[0], "listCharacterLastLoginTimeBetweenBrief"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		time_t const cutoffLower = ::mktime(timeinfo);
+
+		if (cutoffLower <= 0)
+		{
+			result += Unicode::narrowToWide("specified start time is invalid\n");
+			return true;
+		}
+
+		timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[7]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[8]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[9]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[10]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[11]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[12]).c_str());
+		time_t const cutoffUpper = ::mktime(timeinfo);
+
+		if (cutoffUpper <= 0)
+		{
+			result += Unicode::narrowToWide("specified end time is invalid\n");
+			return true;
+		}
+
+		if (cutoffLower > cutoffUpper)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("specified start time (%s, %s) is after specified end time (%s, %s)\n", CalendarTime::convertEpochToTimeStringLocal(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringLocal(cutoffUpper).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffUpper).c_str()));
+			return true;
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithLastLoginTimeBetween(cutoffLower, cutoffUpper, resultList);
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d (out of %d total) characters logged in between %s, %s and %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringLocal(cutoffUpper).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffUpper).c_str()));
+	}
+	else if (isAbbrev(argv[0], "listCharacterLastLoginTimeDetailed"))
+	{
+		int const days = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+		time_t const cutoff = std::max(static_cast<time_t>(0), static_cast<time_t>(::time(NULL) - (60 * 60 * 24 * days)));
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithLastLoginTimeAfter(cutoff, resultList);
+
+		for (std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::const_iterator iter = resultList.begin(); iter != resultList.end(); ++iter)
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("[%s, %s] %s, %lu, %s\n", CalendarTime::convertEpochToTimeStringLocal(iter->first).c_str(), CalendarTime::convertEpochToTimeStringGMT(iter->first).c_str(), iter->second.first.first.getValueString().c_str(), iter->second.first.second, iter->second.second.c_str()));
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d (out of %d total) characters have logged in since %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+	}
+	else if (isAbbrev(argv[0], "listCharacterLastLoginTimeAfterDetailed"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		time_t const cutoff = ::mktime(timeinfo);
+
+		if (cutoff <= 0)
+		{
+			result += Unicode::narrowToWide("specified time is invalid\n");
+			return true;
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithLastLoginTimeAfter(cutoff, resultList);
+
+		for (std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::const_iterator iter = resultList.begin(); iter != resultList.end(); ++iter)
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("[%s, %s] %s, %lu, %s\n", CalendarTime::convertEpochToTimeStringLocal(iter->first).c_str(), CalendarTime::convertEpochToTimeStringGMT(iter->first).c_str(), iter->second.first.first.getValueString().c_str(), iter->second.first.second, iter->second.second.c_str()));
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d (out of %d total) characters have logged in since %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+	}
+	else if (isAbbrev(argv[0], "listCharacterLastLoginTimeBeforeDetailed"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		time_t const cutoff = ::mktime(timeinfo);
+
+		if (cutoff <= 0)
+		{
+			result += Unicode::narrowToWide("specified time is invalid\n");
+			return true;
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithLastLoginTimeBefore(cutoff, resultList);
+
+		for (std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::const_iterator iter = resultList.begin(); iter != resultList.end(); ++iter)
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("[%s, %s] %s, %lu, %s\n", CalendarTime::convertEpochToTimeStringLocal(iter->first).c_str(), CalendarTime::convertEpochToTimeStringGMT(iter->first).c_str(), iter->second.first.first.getValueString().c_str(), iter->second.first.second, iter->second.second.c_str()));
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d (out of %d total) characters logged in before %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+	}
+	else if (isAbbrev(argv[0], "listCharacterLastLoginTimeBetweenDetailed"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		time_t const cutoffLower = ::mktime(timeinfo);
+
+		if (cutoffLower <= 0)
+		{
+			result += Unicode::narrowToWide("specified start time is invalid\n");
+			return true;
+		}
+
+		timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[7]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[8]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[9]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[10]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[11]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[12]).c_str());
+		time_t const cutoffUpper = ::mktime(timeinfo);
+
+		if (cutoffUpper <= 0)
+		{
+			result += Unicode::narrowToWide("specified end time is invalid\n");
+			return true;
+		}
+
+		if (cutoffLower > cutoffUpper)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("specified start time (%s, %s) is after specified end time (%s, %s)\n", CalendarTime::convertEpochToTimeStringLocal(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringLocal(cutoffUpper).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffUpper).c_str()));
+			return true;
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithLastLoginTimeBetween(cutoffLower, cutoffUpper, resultList);
+
+		for (std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::const_iterator iter = resultList.begin(); iter != resultList.end(); ++iter)
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("[%s, %s] %s, %lu, %s\n", CalendarTime::convertEpochToTimeStringLocal(iter->first).c_str(), CalendarTime::convertEpochToTimeStringGMT(iter->first).c_str(), iter->second.first.first.getValueString().c_str(), iter->second.first.second, iter->second.second.c_str()));
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d (out of %d total) characters logged in between %s, %s and %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringLocal(cutoffUpper).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffUpper).c_str()));
+	}
+	else if (isAbbrev(argv[0], "sendMailToCharacterLastLoginTime"))
+	{
+		int const days = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+		time_t const cutoff = std::max(static_cast<time_t>(0), static_cast<time_t>(::time(NULL) - (60 * 60 * 24 * days)));
+
+		int const argc = argv.size();
+		Unicode::String mailBody;
+		for (int i = 4; i < argc; ++i)
+		{
+			if (i > 4)
+				mailBody += Unicode::narrowToWide("\n");
+
+			mailBody += argv[i];
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithLastLoginTimeAfter(cutoff, resultList);
+
+		// to prevent accidentally sending mass spam to muliple players, command must be entered
+		// a second time as confirmation with the exact same parameters within 60 seconds
+		static int s_days = -1;
+		static std::string s_fromName;
+		static Unicode::String s_mailSubject;
+		static Unicode::String s_mailBody;
+		static time_t s_confirmationTimeout = 0;
+
+		time_t const timeNow = ::time(NULL);
+
+		if ((s_days == days) && (s_confirmationTimeout > timeNow) && (s_fromName == Unicode::wideToNarrow(argv[2])) && (s_mailSubject == argv[3]) && (s_mailBody == mailBody))
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("Sending mail to %d (out of %d total) characters who have logged in since %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+
+			for (std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::const_iterator iter = resultList.begin(); iter != resultList.end(); ++iter)
+			{
+				if (!iter->second.second.empty())
+					Chat::sendPersistentMessage(s_fromName, iter->second.second, s_mailSubject, s_mailBody, Unicode::String());
+			}
+
+			s_days = -1;
+			s_fromName.clear();
+			s_mailSubject.clear();
+			s_mailBody.clear();
+			s_confirmationTimeout = 0;
+		}
+		else
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("The following is the mail that ***WILL BE SENT*** to %d (out of %d total) characters who have logged in since %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+			result += Unicode::narrowToWide("\nPlease confirm that you ***REALLY WANT TO SEND*** this mail and run the command again with the same arguments within 60 seconds to send the mail\n\n");
+
+			s_days = days;
+			s_fromName = Unicode::wideToNarrow(argv[2]);
+			s_mailSubject = argv[3];
+			s_mailBody = mailBody;
+			s_confirmationTimeout = timeNow + 60;
+
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("Sender: %s\n", s_fromName.c_str()));
+			result += Unicode::narrowToWide("Subject: ");
+			result += s_mailSubject;
+			result += Unicode::narrowToWide("\n\n");
+			result += s_mailBody;
+			result += Unicode::narrowToWide("\n");
+		}
+	}
+	else if (isAbbrev(argv[0], "sendMailToCharacterLastLoginTimeAfter"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		time_t const cutoff = ::mktime(timeinfo);
+
+		if (cutoff <= 0)
+		{
+			result += Unicode::narrowToWide("specified time is invalid\n");
+			return true;
+		}
+
+		int const argc = argv.size();
+		Unicode::String mailBody;
+		for (int i = 9; i < argc; ++i)
+		{
+			if (i > 9)
+				mailBody += Unicode::narrowToWide("\n");
+
+			mailBody += argv[i];
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithLastLoginTimeAfter(cutoff, resultList);
+
+		// to prevent accidentally sending mass spam to muliple players, command must be entered
+		// a second time as confirmation with the exact same parameters within 60 seconds
+		static time_t s_cutoff = -1;
+		static std::string s_fromName;
+		static Unicode::String s_mailSubject;
+		static Unicode::String s_mailBody;
+		static time_t s_confirmationTimeout = 0;
+
+		time_t const timeNow = ::time(NULL);
+
+		if ((s_cutoff == cutoff) && (s_confirmationTimeout > timeNow) && (s_fromName == Unicode::wideToNarrow(argv[7])) && (s_mailSubject == argv[8]) && (s_mailBody == mailBody))
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("Sending mail to %d (out of %d total) characters who have logged in since %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+
+			for (std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::const_iterator iter = resultList.begin(); iter != resultList.end(); ++iter)
+			{
+				if (!iter->second.second.empty())
+					Chat::sendPersistentMessage(s_fromName, iter->second.second, s_mailSubject, s_mailBody, Unicode::String());
+			}
+
+			s_cutoff = -1;
+			s_fromName.clear();
+			s_mailSubject.clear();
+			s_mailBody.clear();
+			s_confirmationTimeout = 0;
+		}
+		else
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("The following is the mail that ***WILL BE SENT*** to %d (out of %d total) characters who have logged in since %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+			result += Unicode::narrowToWide("\nPlease confirm that you ***REALLY WANT TO SEND*** this mail and run the command again with the same arguments within 60 seconds to send the mail\n\n");
+
+			s_cutoff = cutoff;
+			s_fromName = Unicode::wideToNarrow(argv[7]);
+			s_mailSubject = argv[8];
+			s_mailBody = mailBody;
+			s_confirmationTimeout = timeNow + 60;
+
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("Sender: %s\n", s_fromName.c_str()));
+			result += Unicode::narrowToWide("Subject: ");
+			result += s_mailSubject;
+			result += Unicode::narrowToWide("\n\n");
+			result += s_mailBody;
+			result += Unicode::narrowToWide("\n");
+		}
+	}
+	else if (isAbbrev(argv[0], "sendMailToCharacterLastLoginTimeBefore"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		time_t const cutoff = ::mktime(timeinfo);
+
+		if (cutoff <= 0)
+		{
+			result += Unicode::narrowToWide("specified time is invalid\n");
+			return true;
+		}
+
+		int const argc = argv.size();
+		Unicode::String mailBody;
+		for (int i = 9; i < argc; ++i)
+		{
+			if (i > 9)
+				mailBody += Unicode::narrowToWide("\n");
+
+			mailBody += argv[i];
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithLastLoginTimeBefore(cutoff, resultList);
+
+		// to prevent accidentally sending mass spam to muliple players, command must be entered
+		// a second time as confirmation with the exact same parameters within 60 seconds
+		static time_t s_cutoff = -1;
+		static std::string s_fromName;
+		static Unicode::String s_mailSubject;
+		static Unicode::String s_mailBody;
+		static time_t s_confirmationTimeout = 0;
+
+		time_t const timeNow = ::time(NULL);
+
+		if ((s_cutoff == cutoff) && (s_confirmationTimeout > timeNow) && (s_fromName == Unicode::wideToNarrow(argv[7])) && (s_mailSubject == argv[8]) && (s_mailBody == mailBody))
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("Sending mail to %d (out of %d total) characters who logged in before %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+
+			for (std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::const_iterator iter = resultList.begin(); iter != resultList.end(); ++iter)
+			{
+				if (!iter->second.second.empty())
+					Chat::sendPersistentMessage(s_fromName, iter->second.second, s_mailSubject, s_mailBody, Unicode::String());
+			}
+
+			s_cutoff = -1;
+			s_fromName.clear();
+			s_mailSubject.clear();
+			s_mailBody.clear();
+			s_confirmationTimeout = 0;
+		}
+		else
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("The following is the mail that ***WILL BE SENT*** to %d (out of %d total) characters who logged in before %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+			result += Unicode::narrowToWide("\nPlease confirm that you ***REALLY WANT TO SEND*** this mail and run the command again with the same arguments within 60 seconds to send the mail\n\n");
+
+			s_cutoff = cutoff;
+			s_fromName = Unicode::wideToNarrow(argv[7]);
+			s_mailSubject = argv[8];
+			s_mailBody = mailBody;
+			s_confirmationTimeout = timeNow + 60;
+
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("Sender: %s\n", s_fromName.c_str()));
+			result += Unicode::narrowToWide("Subject: ");
+			result += s_mailSubject;
+			result += Unicode::narrowToWide("\n\n");
+			result += s_mailBody;
+			result += Unicode::narrowToWide("\n");
+		}
+	}
+	else if (isAbbrev(argv[0], "sendMailToCharacterLastLoginTimeBetween"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		time_t const cutoffLower = ::mktime(timeinfo);
+
+		if (cutoffLower <= 0)
+		{
+			result += Unicode::narrowToWide("specified start time is invalid\n");
+			return true;
+		}
+
+		timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[7]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[8]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[9]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[10]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[11]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[12]).c_str());
+		time_t const cutoffUpper = ::mktime(timeinfo);
+
+		if (cutoffUpper <= 0)
+		{
+			result += Unicode::narrowToWide("specified end time is invalid\n");
+			return true;
+		}
+
+		if (cutoffLower > cutoffUpper)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("specified start time (%s, %s) is after specified end time (%s, %s)\n", CalendarTime::convertEpochToTimeStringLocal(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringLocal(cutoffUpper).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffUpper).c_str()));
+			return true;
+		}
+
+		int const argc = argv.size();
+		Unicode::String mailBody;
+		for (int i = 15; i < argc; ++i)
+		{
+			if (i > 15)
+				mailBody += Unicode::narrowToWide("\n");
+
+			mailBody += argv[i];
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithLastLoginTimeBetween(cutoffLower, cutoffUpper, resultList);
+
+		// to prevent accidentally sending mass spam to muliple players, command must be entered
+		// a second time as confirmation with the exact same parameters within 60 seconds
+		static time_t s_cutoffLower = -1;
+		static time_t s_cutoffUpper = -1;
+		static std::string s_fromName;
+		static Unicode::String s_mailSubject;
+		static Unicode::String s_mailBody;
+		static time_t s_confirmationTimeout = 0;
+
+		time_t const timeNow = ::time(NULL);
+
+		if ((s_cutoffLower == cutoffLower) && (s_cutoffUpper == cutoffUpper) && (s_confirmationTimeout > timeNow) && (s_fromName == Unicode::wideToNarrow(argv[13])) && (s_mailSubject == argv[14]) && (s_mailBody == mailBody))
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("Sending mail to %d (out of %d total) characters who logged in between %s, %s and %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringLocal(cutoffUpper).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffUpper).c_str()));
+
+			for (std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::const_iterator iter = resultList.begin(); iter != resultList.end(); ++iter)
+			{
+				if (!iter->second.second.empty())
+					Chat::sendPersistentMessage(s_fromName, iter->second.second, s_mailSubject, s_mailBody, Unicode::String());
+			}
+
+			s_cutoffLower = -1;
+			s_cutoffUpper = -1;
+			s_fromName.clear();
+			s_mailSubject.clear();
+			s_mailBody.clear();
+			s_confirmationTimeout = 0;
+		}
+		else
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("The following is the mail that ***WILL BE SENT*** to %d (out of %d total) characters who logged in between %s, %s and %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringLocal(cutoffUpper).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffUpper).c_str()));
+			result += Unicode::narrowToWide("\nPlease confirm that you ***REALLY WANT TO SEND*** this mail and run the command again with the same arguments within 60 seconds to send the mail\n\n");
+
+			s_cutoffLower = cutoffLower;
+			s_cutoffUpper = cutoffUpper;
+			s_fromName = Unicode::wideToNarrow(argv[13]);
+			s_mailSubject = argv[14];
+			s_mailBody = mailBody;
+			s_confirmationTimeout = timeNow + 60;
+
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("Sender: %s\n", s_fromName.c_str()));
+			result += Unicode::narrowToWide("Subject: ");
+			result += s_mailSubject;
+			result += Unicode::narrowToWide("\n\n");
+			result += s_mailBody;
+			result += Unicode::narrowToWide("\n");
+		}
+	}
+	else if (isAbbrev(argv[0], "listCharacterCreateTimeBrief"))
+	{
+		int const days = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+		time_t const cutoff = std::max(static_cast<time_t>(0), static_cast<time_t>(::time(NULL) - (60 * 60 * 24 * days)));
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithCreateTimeAfter(cutoff, resultList);
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d (out of %d total) characters created since %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+	}
+	else if (isAbbrev(argv[0], "listCharacterCreateTimeAfterBrief"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		time_t const cutoff = ::mktime(timeinfo);
+
+		if (cutoff <= 0)
+		{
+			result += Unicode::narrowToWide("specified time is invalid\n");
+			return true;
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithCreateTimeAfter(cutoff, resultList);
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d (out of %d total) characters created since %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+	}
+	else if (isAbbrev(argv[0], "listCharacterCreateTimeBeforeBrief"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		time_t const cutoff = ::mktime(timeinfo);
+
+		if (cutoff <= 0)
+		{
+			result += Unicode::narrowToWide("specified time is invalid\n");
+			return true;
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithCreateTimeBefore(cutoff, resultList);
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d (out of %d total) characters created before %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+	}
+	else if (isAbbrev(argv[0], "listCharacterCreateTimeBetweenBrief"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		time_t const cutoffLower = ::mktime(timeinfo);
+
+		if (cutoffLower <= 0)
+		{
+			result += Unicode::narrowToWide("specified start time is invalid\n");
+			return true;
+		}
+
+		timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[7]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[8]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[9]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[10]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[11]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[12]).c_str());
+		time_t const cutoffUpper = ::mktime(timeinfo);
+
+		if (cutoffUpper <= 0)
+		{
+			result += Unicode::narrowToWide("specified end time is invalid\n");
+			return true;
+		}
+
+		if (cutoffLower > cutoffUpper)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("specified start time (%s, %s) is after specified end time (%s, %s)\n", CalendarTime::convertEpochToTimeStringLocal(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringLocal(cutoffUpper).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffUpper).c_str()));
+			return true;
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithCreateTimeBetween(cutoffLower, cutoffUpper, resultList);
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d (out of %d total) characters created between %s, %s and %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringLocal(cutoffUpper).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffUpper).c_str()));
+	}
+	else if (isAbbrev(argv[0], "listCharacterCreateTimeDetailed"))
+	{
+		int const days = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+		time_t const cutoff = std::max(static_cast<time_t>(0), static_cast<time_t>(::time(NULL) - (60 * 60 * 24 * days)));
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithCreateTimeAfter(cutoff, resultList);
+
+		for (std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::const_iterator iter = resultList.begin(); iter != resultList.end(); ++iter)
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("[%s, %s] %s, %lu, %s\n", CalendarTime::convertEpochToTimeStringLocal(iter->first).c_str(), CalendarTime::convertEpochToTimeStringGMT(iter->first).c_str(), iter->second.first.first.getValueString().c_str(), iter->second.first.second, iter->second.second.c_str()));
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d (out of %d total) characters created since %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+	}
+	else if (isAbbrev(argv[0], "listCharacterCreateTimeAfterDetailed"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		time_t const cutoff = ::mktime(timeinfo);
+
+		if (cutoff <= 0)
+		{
+			result += Unicode::narrowToWide("specified time is invalid\n");
+			return true;
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithCreateTimeAfter(cutoff, resultList);
+
+		for (std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::const_iterator iter = resultList.begin(); iter != resultList.end(); ++iter)
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("[%s, %s] %s, %lu, %s\n", CalendarTime::convertEpochToTimeStringLocal(iter->first).c_str(), CalendarTime::convertEpochToTimeStringGMT(iter->first).c_str(), iter->second.first.first.getValueString().c_str(), iter->second.first.second, iter->second.second.c_str()));
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d (out of %d total) characters created since %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+	}
+	else if (isAbbrev(argv[0], "listCharacterCreateTimeBeforeDetailed"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		time_t const cutoff = ::mktime(timeinfo);
+
+		if (cutoff <= 0)
+		{
+			result += Unicode::narrowToWide("specified time is invalid\n");
+			return true;
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithCreateTimeBefore(cutoff, resultList);
+
+		for (std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::const_iterator iter = resultList.begin(); iter != resultList.end(); ++iter)
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("[%s, %s] %s, %lu, %s\n", CalendarTime::convertEpochToTimeStringLocal(iter->first).c_str(), CalendarTime::convertEpochToTimeStringGMT(iter->first).c_str(), iter->second.first.first.getValueString().c_str(), iter->second.first.second, iter->second.second.c_str()));
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d (out of %d total) characters created before %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+	}
+	else if (isAbbrev(argv[0], "listCharacterCreateTimeBetweenDetailed"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		time_t const cutoffLower = ::mktime(timeinfo);
+
+		if (cutoffLower <= 0)
+		{
+			result += Unicode::narrowToWide("specified start time is invalid\n");
+			return true;
+		}
+
+		timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[7]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[8]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[9]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[10]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[11]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[12]).c_str());
+		time_t const cutoffUpper = ::mktime(timeinfo);
+
+		if (cutoffUpper <= 0)
+		{
+			result += Unicode::narrowToWide("specified end time is invalid\n");
+			return true;
+		}
+
+		if (cutoffLower > cutoffUpper)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("specified start time (%s, %s) is after specified end time (%s, %s)\n", CalendarTime::convertEpochToTimeStringLocal(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringLocal(cutoffUpper).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffUpper).c_str()));
+			return true;
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithCreateTimeBetween(cutoffLower, cutoffUpper, resultList);
+
+		for (std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::const_iterator iter = resultList.begin(); iter != resultList.end(); ++iter)
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("[%s, %s] %s, %lu, %s\n", CalendarTime::convertEpochToTimeStringLocal(iter->first).c_str(), CalendarTime::convertEpochToTimeStringGMT(iter->first).c_str(), iter->second.first.first.getValueString().c_str(), iter->second.first.second, iter->second.second.c_str()));
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("%d (out of %d total) characters created between %s, %s and %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringLocal(cutoffUpper).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffUpper).c_str()));
+	}
+	else if (isAbbrev(argv[0], "sendMailToCharacterCreateTime"))
+	{
+		int const days = atoi(Unicode::wideToNarrow(argv[1]).c_str());
+		time_t const cutoff = std::max(static_cast<time_t>(0), static_cast<time_t>(::time(NULL) - (60 * 60 * 24 * days)));
+
+		int const argc = argv.size();
+		Unicode::String mailBody;
+		for (int i = 4; i < argc; ++i)
+		{
+			if (i > 4)
+				mailBody += Unicode::narrowToWide("\n");
+
+			mailBody += argv[i];
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithCreateTimeAfter(cutoff, resultList);
+
+		// to prevent accidentally sending mass spam to muliple players, command must be entered
+		// a second time as confirmation with the exact same parameters within 60 seconds
+		static int s_days = -1;
+		static std::string s_fromName;
+		static Unicode::String s_mailSubject;
+		static Unicode::String s_mailBody;
+		static time_t s_confirmationTimeout = 0;
+
+		time_t const timeNow = ::time(NULL);
+
+		if ((s_days == days) && (s_confirmationTimeout > timeNow) && (s_fromName == Unicode::wideToNarrow(argv[2])) && (s_mailSubject == argv[3]) && (s_mailBody == mailBody))
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("Sending mail to %d (out of %d total) characters created since %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+
+			for (std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::const_iterator iter = resultList.begin(); iter != resultList.end(); ++iter)
+			{
+				if (!iter->second.second.empty())
+					Chat::sendPersistentMessage(s_fromName, iter->second.second, s_mailSubject, s_mailBody, Unicode::String());
+			}
+
+			s_days = -1;
+			s_fromName.clear();
+			s_mailSubject.clear();
+			s_mailBody.clear();
+			s_confirmationTimeout = 0;
+		}
+		else
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("The following is the mail that ***WILL BE SENT*** to %d (out of %d total) characters created since %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+			result += Unicode::narrowToWide("\nPlease confirm that you ***REALLY WANT TO SEND*** this mail and run the command again with the same arguments within 60 seconds to send the mail\n\n");
+
+			s_days = days;
+			s_fromName = Unicode::wideToNarrow(argv[2]);
+			s_mailSubject = argv[3];
+			s_mailBody = mailBody;
+			s_confirmationTimeout = timeNow + 60;
+
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("Sender: %s\n", s_fromName.c_str()));
+			result += Unicode::narrowToWide("Subject: ");
+			result += s_mailSubject;
+			result += Unicode::narrowToWide("\n\n");
+			result += s_mailBody;
+			result += Unicode::narrowToWide("\n");
+		}
+	}
+	else if (isAbbrev(argv[0], "sendMailToCharacterCreateTimeAfter"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		time_t const cutoff = ::mktime(timeinfo);
+
+		if (cutoff <= 0)
+		{
+			result += Unicode::narrowToWide("specified time is invalid\n");
+			return true;
+		}
+
+		int const argc = argv.size();
+		Unicode::String mailBody;
+		for (int i = 9; i < argc; ++i)
+		{
+			if (i > 9)
+				mailBody += Unicode::narrowToWide("\n");
+
+			mailBody += argv[i];
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithCreateTimeAfter(cutoff, resultList);
+
+		// to prevent accidentally sending mass spam to muliple players, command must be entered
+		// a second time as confirmation with the exact same parameters within 60 seconds
+		static time_t s_cutoff = -1;
+		static std::string s_fromName;
+		static Unicode::String s_mailSubject;
+		static Unicode::String s_mailBody;
+		static time_t s_confirmationTimeout = 0;
+
+		time_t const timeNow = ::time(NULL);
+
+		if ((s_cutoff == cutoff) && (s_confirmationTimeout > timeNow) && (s_fromName == Unicode::wideToNarrow(argv[7])) && (s_mailSubject == argv[8]) && (s_mailBody == mailBody))
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("Sending mail to %d (out of %d total) characters created since %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+
+			for (std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::const_iterator iter = resultList.begin(); iter != resultList.end(); ++iter)
+			{
+				if (!iter->second.second.empty())
+					Chat::sendPersistentMessage(s_fromName, iter->second.second, s_mailSubject, s_mailBody, Unicode::String());
+			}
+
+			s_cutoff = -1;
+			s_fromName.clear();
+			s_mailSubject.clear();
+			s_mailBody.clear();
+			s_confirmationTimeout = 0;
+		}
+		else
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("The following is the mail that ***WILL BE SENT*** to %d (out of %d total) characters created since %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+			result += Unicode::narrowToWide("\nPlease confirm that you ***REALLY WANT TO SEND*** this mail and run the command again with the same arguments within 60 seconds to send the mail\n\n");
+
+			s_cutoff = cutoff;
+			s_fromName = Unicode::wideToNarrow(argv[7]);
+			s_mailSubject = argv[8];
+			s_mailBody = mailBody;
+			s_confirmationTimeout = timeNow + 60;
+
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("Sender: %s\n", s_fromName.c_str()));
+			result += Unicode::narrowToWide("Subject: ");
+			result += s_mailSubject;
+			result += Unicode::narrowToWide("\n\n");
+			result += s_mailBody;
+			result += Unicode::narrowToWide("\n");
+		}
+	}
+	else if (isAbbrev(argv[0], "sendMailToCharacterCreateTimeBefore"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		time_t const cutoff = ::mktime(timeinfo);
+
+		if (cutoff <= 0)
+		{
+			result += Unicode::narrowToWide("specified time is invalid\n");
+			return true;
+		}
+
+		int const argc = argv.size();
+		Unicode::String mailBody;
+		for (int i = 9; i < argc; ++i)
+		{
+			if (i > 9)
+				mailBody += Unicode::narrowToWide("\n");
+
+			mailBody += argv[i];
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithCreateTimeBefore(cutoff, resultList);
+
+		// to prevent accidentally sending mass spam to muliple players, command must be entered
+		// a second time as confirmation with the exact same parameters within 60 seconds
+		static time_t s_cutoff = -1;
+		static std::string s_fromName;
+		static Unicode::String s_mailSubject;
+		static Unicode::String s_mailBody;
+		static time_t s_confirmationTimeout = 0;
+
+		time_t const timeNow = ::time(NULL);
+
+		if ((s_cutoff == cutoff) && (s_confirmationTimeout > timeNow) && (s_fromName == Unicode::wideToNarrow(argv[7])) && (s_mailSubject == argv[8]) && (s_mailBody == mailBody))
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("Sending mail to %d (out of %d total) characters created before %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+
+			for (std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::const_iterator iter = resultList.begin(); iter != resultList.end(); ++iter)
+			{
+				if (!iter->second.second.empty())
+					Chat::sendPersistentMessage(s_fromName, iter->second.second, s_mailSubject, s_mailBody, Unicode::String());
+			}
+
+			s_cutoff = -1;
+			s_fromName.clear();
+			s_mailSubject.clear();
+			s_mailBody.clear();
+			s_confirmationTimeout = 0;
+		}
+		else
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("The following is the mail that ***WILL BE SENT*** to %d (out of %d total) characters created before %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoff).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoff).c_str()));
+			result += Unicode::narrowToWide("\nPlease confirm that you ***REALLY WANT TO SEND*** this mail and run the command again with the same arguments within 60 seconds to send the mail\n\n");
+
+			s_cutoff = cutoff;
+			s_fromName = Unicode::wideToNarrow(argv[7]);
+			s_mailSubject = argv[8];
+			s_mailBody = mailBody;
+			s_confirmationTimeout = timeNow + 60;
+
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("Sender: %s\n", s_fromName.c_str()));
+			result += Unicode::narrowToWide("Subject: ");
+			result += s_mailSubject;
+			result += Unicode::narrowToWide("\n\n");
+			result += s_mailBody;
+			result += Unicode::narrowToWide("\n");
+		}
+	}
+	else if (isAbbrev(argv[0], "sendMailToCharacterCreateTimeBetween"))
+	{
+		time_t const rawtime = ::time(NULL);
+		struct tm * timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[1]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[2]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[3]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[4]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[5]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[6]).c_str());
+		time_t const cutoffLower = ::mktime(timeinfo);
+
+		if (cutoffLower <= 0)
+		{
+			result += Unicode::narrowToWide("specified start time is invalid\n");
+			return true;
+		}
+
+		timeinfo = ::localtime(&rawtime);
+		timeinfo->tm_year = atoi(Unicode::wideToNarrow(argv[7]).c_str()) - 1900;
+		timeinfo->tm_mon = atoi(Unicode::wideToNarrow(argv[8]).c_str()) - 1;
+		timeinfo->tm_mday = atoi(Unicode::wideToNarrow(argv[9]).c_str());
+		timeinfo->tm_hour = atoi(Unicode::wideToNarrow(argv[10]).c_str());
+		timeinfo->tm_min = atoi(Unicode::wideToNarrow(argv[11]).c_str());
+		timeinfo->tm_sec = atoi(Unicode::wideToNarrow(argv[12]).c_str());
+		time_t const cutoffUpper = ::mktime(timeinfo);
+
+		if (cutoffUpper <= 0)
+		{
+			result += Unicode::narrowToWide("specified end time is invalid\n");
+			return true;
+		}
+
+		if (cutoffLower > cutoffUpper)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("specified start time (%s, %s) is after specified end time (%s, %s)\n", CalendarTime::convertEpochToTimeStringLocal(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringLocal(cutoffUpper).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffUpper).c_str()));
+			return true;
+		}
+
+		int const argc = argv.size();
+		Unicode::String mailBody;
+		for (int i = 15; i < argc; ++i)
+		{
+			if (i > 15)
+				mailBody += Unicode::narrowToWide("\n");
+
+			mailBody += argv[i];
+		}
+
+		std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > resultList;
+		NameManager::getInstance().getPlayerWithCreateTimeBetween(cutoffLower, cutoffUpper, resultList);
+
+		// to prevent accidentally sending mass spam to muliple players, command must be entered
+		// a second time as confirmation with the exact same parameters within 60 seconds
+		static time_t s_cutoffLower = -1;
+		static time_t s_cutoffUpper = -1;
+		static std::string s_fromName;
+		static Unicode::String s_mailSubject;
+		static Unicode::String s_mailBody;
+		static time_t s_confirmationTimeout = 0;
+
+		time_t const timeNow = ::time(NULL);
+
+		if ((s_cutoffLower == cutoffLower) && (s_cutoffUpper == cutoffUpper) && (s_confirmationTimeout > timeNow) && (s_fromName == Unicode::wideToNarrow(argv[13])) && (s_mailSubject == argv[14]) && (s_mailBody == mailBody))
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("Sending mail to %d (out of %d total) characters created between %s, %s and %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringLocal(cutoffUpper).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffUpper).c_str()));
+
+			for (std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::const_iterator iter = resultList.begin(); iter != resultList.end(); ++iter)
+			{
+				if (!iter->second.second.empty())
+					Chat::sendPersistentMessage(s_fromName, iter->second.second, s_mailSubject, s_mailBody, Unicode::String());
+			}
+
+			s_cutoffLower = -1;
+			s_cutoffUpper = -1;
+			s_fromName.clear();
+			s_mailSubject.clear();
+			s_mailBody.clear();
+			s_confirmationTimeout = 0;
+		}
+		else
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("The following is the mail that ***WILL BE SENT*** to %d (out of %d total) characters created between %s, %s and %s, %s\n", resultList.size(), NameManager::getInstance().getTotalPlayerCount(), CalendarTime::convertEpochToTimeStringLocal(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffLower).c_str(), CalendarTime::convertEpochToTimeStringLocal(cutoffUpper).c_str(), CalendarTime::convertEpochToTimeStringGMT(cutoffUpper).c_str()));
+			result += Unicode::narrowToWide("\nPlease confirm that you ***REALLY WANT TO SEND*** this mail and run the command again with the same arguments within 60 seconds to send the mail\n\n");
+
+			s_cutoffLower = cutoffLower;
+			s_cutoffUpper = cutoffUpper;
+			s_fromName = Unicode::wideToNarrow(argv[13]);
+			s_mailSubject = argv[14];
+			s_mailBody = mailBody;
+			s_confirmationTimeout = timeNow + 60;
+
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("Sender: %s\n", s_fromName.c_str()));
+			result += Unicode::narrowToWide("Subject: ");
+			result += s_mailSubject;
+			result += Unicode::narrowToWide("\n\n");
+			result += s_mailBody;
+			result += Unicode::narrowToWide("\n");
+		}
+	}
+	else if (isAbbrev(argv[0], "freeCtsTest"))
+	{
+		time_t const sourceCharacterCreateTime = static_cast<time_t>(atoi(Unicode::wideToNarrow(argv[1]).c_str()));
+		uint32 const sourceStationId = static_cast<uint32>(atoi(Unicode::wideToNarrow(argv[2]).c_str()));
+		std::string const sourceCluster = Unicode::wideToNarrow(argv[3]);
+		uint32 const targetStationId = static_cast<uint32>(atoi(Unicode::wideToNarrow(argv[4]).c_str()));
+		std::string const targetCluster = Unicode::wideToNarrow(argv[5]);
+
+		time_t const timeNow = ::time(NULL);
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("              currentTime: %ld, %s\n", timeNow, CalendarTime::convertEpochToTimeStringLocal(timeNow).c_str()));
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("\n      characterCreateTime: %ld\n", sourceCharacterCreateTime));
+		if (sourceCharacterCreateTime > 0)
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("      characterCreateTime: %s\n", CalendarTime::convertEpochToTimeStringLocal(sourceCharacterCreateTime).c_str()));
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("\n          sourceStationId: %lu\n", sourceStationId));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("            sourceCluster: %s\n", sourceCluster.c_str()));
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("\n          targetStationId: %lu\n", targetStationId));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("            targetCluster: %s\n", targetCluster.c_str()));
+
+		FreeCtsDataTable::FreeCtsInfo const * freeCtsInfo = FreeCtsDataTable::wouldCharacterTransferBeFree(sourceCharacterCreateTime, sourceStationId, sourceCluster, targetStationId, targetCluster, false);
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("\n                     free: %s\n", (freeCtsInfo ? "true" : "false")));
+
+		if (freeCtsInfo)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("\n       free CTS info file: %s\n", FreeCtsDataTable::getFreeCtsFileName().c_str()));
+
+			std::string targetClusters;
+			for (std::map<std::string, std::string>::const_iterator iter = freeCtsInfo->targetCluster.begin(); iter != freeCtsInfo->targetCluster.end(); ++iter)
+			{
+				if (!targetClusters.empty())
+					targetClusters += ", ";
+
+				targetClusters += iter->first;
+			}
+
+			std::string startDate("NA");
+			std::string endDate("NA");
+
+			if (freeCtsInfo->startTime > 0)
+				startDate = CalendarTime::convertEpochToTimeStringLocal(freeCtsInfo->startTime);
+
+			if (freeCtsInfo->endTime > 0)
+				endDate = CalendarTime::convertEpochToTimeStringLocal(freeCtsInfo->endTime);
+
+			std::string characterCreateDateLower("NA");
+			std::string characterCreateDateUpper("NA");
+
+			if (freeCtsInfo->sourceCharacterCreateTimeLower > 0)
+				characterCreateDateLower = CalendarTime::convertEpochToTimeStringLocal(freeCtsInfo->sourceCharacterCreateTimeLower);
+
+			if (freeCtsInfo->sourceCharacterCreateTimeUpper > 0)
+				characterCreateDateUpper = CalendarTime::convertEpochToTimeStringLocal(freeCtsInfo->sourceCharacterCreateTimeUpper);
+
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("\n                     rule: %s, %s\n", freeCtsInfo->ruleName.c_str(), freeCtsInfo->ruleDescription.c_str()));
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("           source cluster: %s\n", sourceCluster.c_str()));
+			result += Unicode::narrowToWide(FormattedString<8192>().sprintf("          target clusters: %s\n", targetClusters.c_str()));
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("               start time: %ld, %s\n", freeCtsInfo->startTime, startDate.c_str()));
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("                 end time: %ld, %s\n", freeCtsInfo->endTime, endDate.c_str()));
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("character create time min: %ld, %s\n", freeCtsInfo->sourceCharacterCreateTimeLower, characterCreateDateLower.c_str()));
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("character create time max: %ld, %s\n", freeCtsInfo->sourceCharacterCreateTimeUpper, characterCreateDateUpper.c_str()));
+		}
+	}
+	else if (isAbbrev(argv[0], "isFreeCtsSourceCluster"))
+	{
+		std::string const sourceCluster = Unicode::wideToNarrow(argv[1]);
+
+		time_t const timeNow = ::time(NULL);
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("              currentTime: %ld, %s\n", timeNow, CalendarTime::convertEpochToTimeStringLocal(timeNow).c_str()));
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("            sourceCluster: %s\n", sourceCluster.c_str()));
+
+		FreeCtsDataTable::FreeCtsInfo const * freeCtsInfo = FreeCtsDataTable::isFreeCtsSourceCluster(sourceCluster);
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("\n  free CTS source cluster: %s\n", (freeCtsInfo ? "true" : "false")));
+
+		if (freeCtsInfo)
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("\n       free CTS info file: %s\n", FreeCtsDataTable::getFreeCtsFileName().c_str()));
+
+			std::string targetClusters;
+			for (std::map<std::string, std::string>::const_iterator iter = freeCtsInfo->targetCluster.begin(); iter != freeCtsInfo->targetCluster.end(); ++iter)
+			{
+				if (!targetClusters.empty())
+					targetClusters += ", ";
+
+				targetClusters += iter->first;
+			}
+
+			std::string startDate("NA");
+			std::string endDate("NA");
+
+			if (freeCtsInfo->startTime > 0)
+				startDate = CalendarTime::convertEpochToTimeStringLocal(freeCtsInfo->startTime);
+
+			if (freeCtsInfo->endTime > 0)
+				endDate = CalendarTime::convertEpochToTimeStringLocal(freeCtsInfo->endTime);
+
+			std::string characterCreateDateLower("NA");
+			std::string characterCreateDateUpper("NA");
+
+			if (freeCtsInfo->sourceCharacterCreateTimeLower > 0)
+				characterCreateDateLower = CalendarTime::convertEpochToTimeStringLocal(freeCtsInfo->sourceCharacterCreateTimeLower);
+
+			if (freeCtsInfo->sourceCharacterCreateTimeUpper > 0)
+				characterCreateDateUpper = CalendarTime::convertEpochToTimeStringLocal(freeCtsInfo->sourceCharacterCreateTimeUpper);
+
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("\n                     rule: %s, %s\n", freeCtsInfo->ruleName.c_str(), freeCtsInfo->ruleDescription.c_str()));
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("           source cluster: %s\n", sourceCluster.c_str()));
+			result += Unicode::narrowToWide(FormattedString<8192>().sprintf("          target clusters: %s\n", targetClusters.c_str()));
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("               start time: %ld, %s\n", freeCtsInfo->startTime, startDate.c_str()));
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("                 end time: %ld, %s\n", freeCtsInfo->endTime, endDate.c_str()));
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("character create time min: %ld, %s\n", freeCtsInfo->sourceCharacterCreateTimeLower, characterCreateDateLower.c_str()));
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("character create time max: %ld, %s\n", freeCtsInfo->sourceCharacterCreateTimeUpper, characterCreateDateUpper.c_str()));
+		}
+	}
+	else if (isAbbrev(argv[0], "freeCtsInfo"))
+	{
+		std::multimap<std::string, FreeCtsDataTable::FreeCtsInfo> const & freeCtsInfo = FreeCtsDataTable::getFreeCtsInfo();
+
+		if (!freeCtsInfo.empty())
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("       free CTS info file: %s\n", FreeCtsDataTable::getFreeCtsFileName().c_str()));
+
+			time_t const timeNow = ::time(NULL);
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("              currentTime: %ld, %s\n", timeNow, CalendarTime::convertEpochToTimeStringLocal(timeNow).c_str()));
+		}
+
+		for (std::multimap<std::string, FreeCtsDataTable::FreeCtsInfo>::const_iterator iter = freeCtsInfo.begin(); iter != freeCtsInfo.end(); ++iter)
+		{
+			std::string targetClusters;
+			for (std::map<std::string, std::string>::const_iterator iter2 = iter->second.targetCluster.begin(); iter2 != iter->second.targetCluster.end(); ++iter2)
+			{
+				if (!targetClusters.empty())
+					targetClusters += ", ";
+
+				targetClusters += iter2->first;
+			}
+
+			std::string startDate("NA");
+			std::string endDate("NA");
+
+			if (iter->second.startTime > 0)
+				startDate = CalendarTime::convertEpochToTimeStringLocal(iter->second.startTime);
+
+			if (iter->second.endTime > 0)
+				endDate = CalendarTime::convertEpochToTimeStringLocal(iter->second.endTime);
+
+			std::string characterCreateDateLower("NA");
+			std::string characterCreateDateUpper("NA");
+
+			if (iter->second.sourceCharacterCreateTimeLower > 0)
+				characterCreateDateLower = CalendarTime::convertEpochToTimeStringLocal(iter->second.sourceCharacterCreateTimeLower);
+
+			if (iter->second.sourceCharacterCreateTimeUpper > 0)
+				characterCreateDateUpper = CalendarTime::convertEpochToTimeStringLocal(iter->second.sourceCharacterCreateTimeUpper);
+
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("\n                     rule: %s, %s\n", iter->second.ruleName.c_str(), iter->second.ruleDescription.c_str()));
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("           source cluster: %s\n", iter->first.c_str()));
+			result += Unicode::narrowToWide(FormattedString<8192>().sprintf("          target clusters: %s\n", targetClusters.c_str()));
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("               start time: %ld, %s\n", iter->second.startTime, startDate.c_str()));
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("                 end time: %ld, %s\n", iter->second.endTime, endDate.c_str()));
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("character create time min: %ld, %s\n", iter->second.sourceCharacterCreateTimeLower, characterCreateDateLower.c_str()));
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("character create time max: %ld, %s\n", iter->second.sourceCharacterCreateTimeUpper, characterCreateDateUpper.c_str()));
+		}
+
+		if (freeCtsInfo.empty())
+			result += Unicode::narrowToWide("there is no free CTS info\n");
+	}
+	else if (isAbbrev(argv[0], "listRetroactiveCtsHistory"))
+	{
+		NetworkId const oid(Unicode::wideToNarrow(argv[1]));
+#ifdef _DEBUG
+		std::string const clusterName = Unicode::wideToNarrow(argv[2]);
+#else
+		std::string const clusterName = GameServer::getInstance().getClusterName();
+#endif
+
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("retroactive CTS history for (%s, %s):\n\n", clusterName.c_str(), oid.getValueString().c_str()));
+
+		std::string const ctsHistory = GameServer::getRetroactiveCtsHistory(clusterName, oid);
+		if (ctsHistory.empty())
+		{
+			result += Unicode::narrowToWide("(no retroactive CTS history)\n");
+		}
+		else
+		{
+			result += Unicode::narrowToWide(ctsHistory);
+			result += Unicode::narrowToWide("\n");
+		}
+	}
+	else if (isAbbrev(argv[0], "transferCharacter"))
+	{
+		std::string const destGalaxy = Unicode::wideToNarrow(argv[1]);
+		std::string destCharacterName;
+		unsigned int sourceStationId = 0;
+		unsigned int destStationId = 0;
+		bool parseSuccess = true;
+
+		if (argv.size() >= 3)
+		{
+			destCharacterName = Unicode::wideToNarrow(argv[2]);
+
+			if (argv.size() >= 4)
+			{
+				if (argv.size() == 4)
+				{
+					destStationId = static_cast<unsigned int>(::atoi(Unicode::wideToNarrow(argv[3]).c_str()));
+
+					if (destStationId == 0)
+					{
+						parseSuccess = false;
+						result += Unicode::narrowToWide(FormattedString<512>().sprintf("invalid destination station id (%s) specified\n", Unicode::wideToNarrow(argv[3]).c_str()));
+					}
+				}
+				else
+				{
+					parseSuccess = false;
+					result += Unicode::narrowToWide("too many parameters specified in command\n");
+				}
+			}
+		}
+
+		if (parseSuccess)
+		{
+			if (!user)
+			{
+				parseSuccess = false;
+				result += Unicode::narrowToWide ("invalid user\n");
+			}
+
+			if (parseSuccess)
+			{
+				if (!user->getClient())
+				{
+					parseSuccess = false;
+					result += Unicode::narrowToWide ("invalid client\n");
+				}
+			}
+
+			if (parseSuccess)
+			{
+				PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(user->asCreatureObject());
+				if (!playerObject)
+				{
+					parseSuccess = false;
+					result += Unicode::narrowToWide ("invalid player object\n");
+				}
+				else
+				{
+					if (destCharacterName.empty())
+					{
+						destCharacterName = Unicode::wideToNarrow(user->getAssignedObjectName());
+					}
+
+					sourceStationId = playerObject->getStationId();
+
+					if (destStationId == 0)
+					{
+						destStationId = playerObject->getStationId();
+					}
+				}
+			}
+
+			if (parseSuccess)
+			{
+				static std::set<std::string> s_tenOriginalGroundPlanets;
+				if (s_tenOriginalGroundPlanets.empty())
+				{
+					IGNORE_RETURN(s_tenOriginalGroundPlanets.insert("tatooine"));
+					IGNORE_RETURN(s_tenOriginalGroundPlanets.insert("naboo"));
+					IGNORE_RETURN(s_tenOriginalGroundPlanets.insert("corellia"));
+					IGNORE_RETURN(s_tenOriginalGroundPlanets.insert("rori"));
+					IGNORE_RETURN(s_tenOriginalGroundPlanets.insert("talus"));
+					IGNORE_RETURN(s_tenOriginalGroundPlanets.insert("yavin4"));
+					IGNORE_RETURN(s_tenOriginalGroundPlanets.insert("endor"));
+					IGNORE_RETURN(s_tenOriginalGroundPlanets.insert("lok"));
+					IGNORE_RETURN(s_tenOriginalGroundPlanets.insert("dantooine"));
+					IGNORE_RETURN(s_tenOriginalGroundPlanets.insert("dathomir"));
+				}
+
+				if (s_tenOriginalGroundPlanets.count(ServerWorld::getSceneId()) <= 0)
+				{
+					parseSuccess = false;
+					result += Unicode::narrowToWide ("you must be on one of the 10 original ground planets for character transfer\n");
+				}
+			}
+
+			if (parseSuccess)
+			{
+				result += Unicode::narrowToWide(FormattedString<1024>().sprintf("requesting transfer of this character [%u, %s, %s (%s)] to [%u, %s, %s]\n", sourceStationId, GameServer::getInstance().getClusterName().c_str(), Unicode::wideToNarrow(user->getAssignedObjectName()).c_str(), user->getNetworkId().getValueString().c_str(), destStationId, destGalaxy.c_str(), destCharacterName.c_str()));
+				result += Unicode::narrowToWide ("you will be disconnected once the transfer is validated and the transfer process begins.\n");
+
+				TransferRequestMoveValidation const trmv(TransferRequestMoveValidation::TRS_console_god_command, GameServer::getInstance().getProcessId(), sourceStationId, destStationId, GameServer::getInstance().getClusterName(), destGalaxy, Unicode::wideToNarrow(user->getAssignedObjectName()), user->getNetworkId(), user->getTemplateCrc(), destCharacterName, std::string("en"));
+				GameServer::getInstance().sendToCentralServer(trmv);
+			}
+		}
+	}
+	else if (isAbbrev(argv[0], "showGcwScore"))
+	{
+		PlanetObject const * const tatooine = ServerUniverse::getInstance().getTatooinePlanet();
+		if (tatooine)
+		{
+			std::map<std::string, std::pair<int64, int64> > const & gcwImperialScore = tatooine->getGcwImperialScore();
+			result += Unicode::narrowToWide("Imperial:\n");
+			for (std::map<std::string, std::pair<int64, int64> >::const_iterator iterImp = gcwImperialScore.begin(); iterImp != gcwImperialScore.end(); ++iterImp)
+				result += Unicode::narrowToWide(FormattedString<1024>().sprintf("%s (cumulative = %s, current = %s)\n", iterImp->first.c_str(), NetworkId(iterImp->second.first).getValueString().c_str(), NetworkId(iterImp->second.second).getValueString().c_str()));
+
+			std::map<std::string, std::pair<int64, int64> > const & gcwRebelScore = tatooine->getGcwRebelScore();
+			result += Unicode::narrowToWide("\nRebel:\n");
+			for (std::map<std::string, std::pair<int64, int64> >::const_iterator iterReb = gcwRebelScore.begin(); iterReb != gcwRebelScore.end(); ++iterReb)
+				result += Unicode::narrowToWide(FormattedString<1024>().sprintf("%s (cumulative = %s, current = %s)\n", iterReb->first.c_str(), NetworkId(iterReb->second.first).getValueString().c_str(), NetworkId(iterReb->second.second).getValueString().c_str()));
+		}
+		else
+		{
+			result += Unicode::narrowToWide("couldn't find the tatooine planet object.\n");
+		}
+
+		{
+			result += Unicode::narrowToWide("\nGuildObject::m_gcwGroupImperialScoreRawThisGalaxy\n");
+			std::map<std::string, int> const & gcwGroupImperialScoreRawThisGalaxy = ServerUniverse::getInstance().getMasterGuildObject()->getGcwGroupImperialScoreRaw();
+			for (std::map<std::string, int>::const_iterator iter = gcwGroupImperialScoreRawThisGalaxy.begin(); iter != gcwGroupImperialScoreRawThisGalaxy.end(); ++iter)
+			{
+				result += Unicode::narrowToWide(FormattedString<1024>().sprintf("(%s) (%d)\n", iter->first.c_str(), iter->second));
+			}
+		}
+
+		{
+			result += Unicode::narrowToWide("\nGuildObject::m_gcwGroupCategoryImperialScoreRawThisGalaxy\n");
+			std::map<std::pair<std::string, std::string>, int> const & gcwGroupCategoryImperialScoreRawThisGalaxy = ServerUniverse::getInstance().getMasterGuildObject()->getGcwGroupCategoryImperialScoreRaw();
+			for (std::map<std::pair<std::string, std::string>, int>::const_iterator iter = gcwGroupCategoryImperialScoreRawThisGalaxy.begin(); iter != gcwGroupCategoryImperialScoreRawThisGalaxy.end(); ++iter)
+			{
+				result += Unicode::narrowToWide(FormattedString<1024>().sprintf("(%s) (%s) (%d)\n", iter->first.first.c_str(), iter->first.second.c_str(), iter->second));
+			}
+		}
+	}
+	else if (isAbbrev(argv[0], "adjustGcwImperialScore"))
+	{
+		std::string category = Unicode::wideToNarrow(argv[1]);
+		int adjustment = ::atoi(Unicode::wideToNarrow(argv[2]).c_str());
+
+		if (!Pvp::getGcwScoreCategory(category))
+		{
+			result += Unicode::narrowToWide(FormattedString<1024>().sprintf("(%s) is not a valid GCW score category.\n", category.c_str()));
+			result += Unicode::narrowToWide("\nThe GCW score categories are as follows:\n");
+
+			std::map<std::string, Pvp::GcwScoreCategory const *> const & allGcwScoreCategory = Pvp::getAllGcwScoreCategory(); 
+			for (std::map<std::string, Pvp::GcwScoreCategory const *>::const_iterator iter = allGcwScoreCategory.begin(); iter != allGcwScoreCategory.end(); ++iter)
+			{
+				result += Unicode::narrowToWide(iter->first);
+				result += Unicode::narrowToWide("\n");
+			}
+		}
+		else
+		{
+			result += Unicode::narrowToWide(FormattedString<1024>().sprintf("Requesting adjustment of imperial score for GCW score category (%s) by (%d).  It can take up to 1 minute for the adjustment request to be completed.\n", category.c_str(), adjustment));
+			ServerUniverse::getInstance().adjustGcwImperialScore("remote server adjustGcwImperialScore", NULL, category, adjustment);
+		}
+	}
+	else if (isAbbrev(argv[0], "adjustGcwRebelScore"))
+	{
+		std::string category = Unicode::wideToNarrow(argv[1]);
+		int adjustment = ::atoi(Unicode::wideToNarrow(argv[2]).c_str());
+
+		if (!Pvp::getGcwScoreCategory(category))
+		{
+			result += Unicode::narrowToWide(FormattedString<1024>().sprintf("(%s) is not a valid GCW score category.\n", category.c_str()));
+			result += Unicode::narrowToWide("\nThe GCW score categories are as follows:\n");
+
+			std::map<std::string, Pvp::GcwScoreCategory const *> const & allGcwScoreCategory = Pvp::getAllGcwScoreCategory(); 
+			for (std::map<std::string, Pvp::GcwScoreCategory const *>::const_iterator iter = allGcwScoreCategory.begin(); iter != allGcwScoreCategory.end(); ++iter)
+			{
+				result += Unicode::narrowToWide(iter->first);
+				result += Unicode::narrowToWide("\n");
+			}
+		}
+		else
+		{
+			result += Unicode::narrowToWide(FormattedString<1024>().sprintf("Requesting adjustment of rebel score for GCW score category (%s) by (%d).  It can take up to 1 minute for the adjustment request to be completed.\n", category.c_str(), adjustment));
+			ServerUniverse::getInstance().adjustGcwRebelScore("remote server adjustGcwRebelScore", NULL, category, adjustment);
+		}
+	}
+	else if (isAbbrev(argv[0], "decayGcwScore"))
+	{
+		std::string category = Unicode::wideToNarrow(argv[1]);
+
+		if (!Pvp::getGcwScoreCategory(category))
+		{
+			result += Unicode::narrowToWide(FormattedString<1024>().sprintf("(%s) is not a valid GCW score category.\n", category.c_str()));
+			result += Unicode::narrowToWide("\nThe GCW score categories are as follows:\n");
+
+			std::map<std::string, Pvp::GcwScoreCategory const *> const & allGcwScoreCategory = Pvp::getAllGcwScoreCategory(); 
+			for (std::map<std::string, Pvp::GcwScoreCategory const *>::const_iterator iter = allGcwScoreCategory.begin(); iter != allGcwScoreCategory.end(); ++iter)
+			{
+				result += Unicode::narrowToWide(iter->first);
+				result += Unicode::narrowToWide("\n");
+			}
+		}
+		else
+		{
+			result += Unicode::narrowToWide(FormattedString<1024>().sprintf("Requesting immediate GCW score decay for category (%s).\n", category.c_str()));
+			PlanetObject const * const tatooine = ServerUniverse::getInstance().getTatooinePlanet();
+			if (tatooine)
+			{
+				MessageToQueue::sendMessageToC(tatooine->getNetworkId(), "C++DoGcwDecayImmediate", category, 0, false);
+			}
+		}
+	}
+	else if (isAbbrev(argv[0], "showGcwFactionalPresence"))
+	{
+		PlanetObject const * const tatooine = ServerUniverse::getInstance().getTatooinePlanet();
+		if (tatooine)
+		{
+			std::map<std::string, std::pair<int, int> > const & connectedCharacterLfgDataFactionalPresence = tatooine->getConnectedCharacterLfgDataFactionalPresence();
+			if (connectedCharacterLfgDataFactionalPresence.empty())
+			{
+				result += Unicode::narrowToWide("no GCW contested region has factional presence.\n");
+			}
+			else
+			{
+				for (std::map<std::string, std::pair<int, int> >::const_iterator iter = connectedCharacterLfgDataFactionalPresence.begin(); iter != connectedCharacterLfgDataFactionalPresence.end(); ++iter)
+					result += Unicode::narrowToWide(FormattedString<1024>().sprintf("(%s) imp=%d, reb=%d\n", iter->first.c_str(), iter->second.first, iter->second.second));
+			}
+		}
+		else
+		{
+			result += Unicode::narrowToWide("couldn't find the tatooine planet object.\n");
+		}
+	}
+	else if (isAbbrev(argv[0], "hasGcwFactionalPresence"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject const * const o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject const * const c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		if (PlayerCreatureController::getPlayerObject(c) == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		LfgCharacterData lfgCharacterData;
+		c->getLfgCharacterData(lfgCharacterData);
+
+		if (lfgCharacterData.locationFactionalPresenceGcwRegion.empty())
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("object %s does not have factional presence in its current state\n", o->getNetworkId().getValueString().c_str()));
+		}
+		else
+		{
+			if (::strncmp("space_", lfgCharacterData.locationPlanet.c_str(), 6))
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("object %s has factional presence for GCW contested region %s (%d, %d) [grid (%d, %d) -> (%d, %d)] in its current state\n", o->getNetworkId().getValueString().c_str(), lfgCharacterData.locationFactionalPresenceGcwRegion.c_str(), lfgCharacterData.locationFactionalPresenceGridX, lfgCharacterData.locationFactionalPresenceGridZ, (lfgCharacterData.locationFactionalPresenceGridX - (PvpData::getGcwFactionalPresenceGridSize() / 2)), (lfgCharacterData.locationFactionalPresenceGridZ - (PvpData::getGcwFactionalPresenceGridSize() / 2)), (lfgCharacterData.locationFactionalPresenceGridX + (PvpData::getGcwFactionalPresenceGridSize() / 2)), (lfgCharacterData.locationFactionalPresenceGridZ + (PvpData::getGcwFactionalPresenceGridSize() / 2))));
+			else
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("object %s has factional presence for GCW contested region %s in its current state\n", o->getNetworkId().getValueString().c_str(), lfgCharacterData.locationFactionalPresenceGcwRegion.c_str()));
+		}
+	}
+	else if (isAbbrev(argv[0], "hasGcwRegionDefenderBonus"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		ServerObject const * const o = dynamic_cast<ServerObject *>(ServerWorld::findObjectByNetworkId(oid));
+		if (o == NULL)
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		CreatureObject const * const c = o->asCreatureObject();
+		if (c == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a creature object\n");
+			return true;
+		}
+
+		PlayerObject const * const p = PlayerCreatureController::getPlayerObject(c);
+		if (p == NULL)
+		{
+			result += Unicode::narrowToWide("specified object is not a character object\n");
+			return true;
+		}
+
+		float bonus = 0.0f;
+		if (Pvp::getGcwDefenderRegionBonus(*c, *p, bonus))
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("object %s has GCW Region Defender bonus of %.10g%% in its current state\n", o->getNetworkId().getValueString().c_str(), bonus));
+		else
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("object %s does not have GCW Region Defender bonus in its current state\n", o->getNetworkId().getValueString().c_str()));
+	}
+	else if (isAbbrev(argv[0], "getCommoditiesItemAttribute"))
+	{
+		if (!ConfigServerGame::getCommoditiesMarketEnabled() || !CommoditiesMarket::isCommoditiesServerAvailable())
+		{
+			result += Unicode::narrowToWide("The commodities server is currently unavailable.\n");
+		}
+		else
+		{
+			GenericValueTypeMessage<std::pair<NetworkId, NetworkId> > const msg("GetItemAttribute", std::make_pair(userId, NetworkId(Unicode::wideToNarrow(argv[1]))));
+			CommoditiesMarket::sendToCommoditiesServer(msg);
+
+			result += Unicode::narrowToWide("getCommoditiesItemAttribute request sent to the commodities server.  Please wait for reply.\n");
+		}
+	}
+	else if (isAbbrev(argv[0], "getCommoditiesItemAttributeData"))
+	{
+		if (!ConfigServerGame::getCommoditiesMarketEnabled() || !CommoditiesMarket::isCommoditiesServerAvailable())
+		{
+			result += Unicode::narrowToWide("The commodities server is currently unavailable.\n");
+		}
+		else
+		{
+			int got = 0;
+			bool exactGotMatch = false;
+			bool ignoreSearchableAttribute = false;
+			int throttle = 100;
+
+			if (argv.size() >= 3)
+			{
+				std::string argvNarrow;
+				for (size_t i = 2, size = argv.size(); i < size; ++i)
+				{
+					argvNarrow = Unicode::wideToNarrow(argv[i]);
+
+					if (argvNarrow == "ignore_searchable_attribute")
+					{
+						ignoreSearchableAttribute = true;
+						continue;
+					}
+
+					std::string::size_type pos = argvNarrow.find("got_exact=");
+					if (pos == 0)
+					{
+						argvNarrow = argvNarrow.substr(10);
+						got = GameObjectTypes::getGameObjectType(argvNarrow);
+						if (got <= 0)
+						{
+							result += Unicode::narrowToWide(FormattedString<1024>().sprintf("argument (%s) contains an invalid game object type\n", Unicode::wideToNarrow(argv[i]).c_str()));
+							return true;
+						}
+
+						exactGotMatch = true;
+						continue;
+					}
+
+					pos = argvNarrow.find("got=");
+					if (pos == 0)
+					{
+						argvNarrow = argvNarrow.substr(4);
+						got = GameObjectTypes::getGameObjectType(argvNarrow);
+						if (got <= 0)
+						{
+							result += Unicode::narrowToWide(FormattedString<1024>().sprintf("argument (%s) contains an invalid game object type\n", Unicode::wideToNarrow(argv[i]).c_str()));
+							return true;
+						}
+
+						exactGotMatch = false;
+						continue;
+					}
+
+					throttle = ::atoi(argvNarrow.c_str());
+					if (throttle <= 0)
+						throttle = 100;
+				}
+			}
+
+			GenericValueTypeMessage<std::pair<std::pair<NetworkId, std::string>, std::pair<std::pair<int, bool>, std::pair<bool, int> > > > const msg("GetItemAttributeData", std::make_pair(std::make_pair(userId, Unicode::wideToNarrow(argv[1])), std::make_pair(std::make_pair(got, exactGotMatch), std::make_pair(ignoreSearchableAttribute, throttle))));
+			CommoditiesMarket::sendToCommoditiesServer(msg);
+
+			result += Unicode::narrowToWide("getCommoditiesItemAttributeData request sent to the commodities server.  Please wait for reply.\n");
+		}
+	}
+	else if (isAbbrev(argv[0], "getCommoditiesItemAttributeDataValues"))
+	{
+		if (!ConfigServerGame::getCommoditiesMarketEnabled() || !CommoditiesMarket::isCommoditiesServerAvailable())
+		{
+			result += Unicode::narrowToWide("The commodities server is currently unavailable.\n");
+		}
+		else
+		{
+			int const got = GameObjectTypes::getGameObjectType(Unicode::wideToNarrow(argv[1]));
+			if (got <= 0)
+			{
+				result += Unicode::narrowToWide(FormattedString<1024>().sprintf("invalid game object type (%s) specified\n", Unicode::wideToNarrow(argv[1]).c_str()));
+			}
+			else
+			{
+				bool exactGotMatch = false;
+				int throttle = 100;
+				if (argv.size() >= 4)
+				{
+					std::string argvNarrow;
+					for (size_t i = 3, size = argv.size(); i < size; ++i)
+					{
+						argvNarrow = Unicode::wideToNarrow(argv[i]);
+
+						if (argvNarrow == "got_exact")
+						{
+							exactGotMatch = true;
+							continue;
+						}
+
+						throttle = ::atoi(argvNarrow.c_str());
+						if (throttle <= 0)
+							throttle = 100;
+					}
+				}
+
+				GenericValueTypeMessage<std::pair<std::pair<NetworkId, std::pair<int, bool> >, std::pair<std::string, int> > > const msg("GetItemAttributeDataValues", std::make_pair(std::make_pair(userId, std::make_pair(got, exactGotMatch)), std::make_pair(Unicode::wideToNarrow(argv[2]), throttle)));
+				CommoditiesMarket::sendToCommoditiesServer(msg);
+
+				result += Unicode::narrowToWide("getCommoditiesItemAttributeDataValues request sent to the commodities server.  Please wait for reply.\n");
+			}
+		}
+	}
+	else if (isAbbrev(argv[0], "getCommoditiesAuctionLocationPriorityQueue"))
+	{
+		if (!ConfigServerGame::getCommoditiesMarketEnabled() || !CommoditiesMarket::isCommoditiesServerAvailable())
+		{
+			result += Unicode::narrowToWide("The commodities server is currently unavailable.\n");
+		}
+		else
+		{
+			GenericValueTypeMessage<std::pair<NetworkId, int> > const msg("GetALPQ", std::make_pair(userId, atoi(Unicode::wideToNarrow(argv[1]).c_str())));
+			CommoditiesMarket::sendToCommoditiesServer(msg);
+
+			result += Unicode::narrowToWide("getCommoditiesAuctionLocationPriorityQueue request sent to the commodities server.  Please wait for reply.\n");
+		}
+	}
+	else if (isAbbrev(argv[0], "getCommoditiesItemTypeMap"))
+	{
+		if (!ConfigServerGame::getCommoditiesMarketEnabled() || !CommoditiesMarket::isCommoditiesServerAvailable())
+		{
+			result += Unicode::narrowToWide("The commodities server is currently unavailable.\n");
+		}
+		else
+		{
+			int const got = GameObjectTypes::getGameObjectType(Unicode::wideToNarrow(argv[1]));
+			if (got <= 0)
+			{
+				result += Unicode::narrowToWide(FormattedString<1024>().sprintf("invalid game object type (%s) specified\n", Unicode::wideToNarrow(argv[1]).c_str()));
+			}
+			else
+			{
+				result += Unicode::narrowToWide(FormattedString<1024>().sprintf("item types for game object type (%d, %s)\n", got, GameObjectTypes::getCanonicalName(got).c_str()));
+
+				std::map<int, std::map<int, std::pair<int, StringId> > > const & itemTypeMap = CommoditiesMarket::getItemTypeMap();
+				std::map<int, std::map<int, std::pair<int, StringId> > >::const_iterator const iterFind = itemTypeMap.find(got);
+				if (iterFind != itemTypeMap.end())
+				{
+					std::set<std::pair<std::string, std::pair<std::pair<int, int>, std::string> > > output;
+
+					for (std::map<int, std::pair<int, StringId> >::const_iterator iter = iterFind->second.begin(); iter != iterFind->second.end(); ++iter)
+					{
+						std::string const name(Unicode::wideToNarrow(iter->second.second.localize()));
+						output.insert(std::make_pair(Unicode::toLower(name), std::make_pair(std::make_pair(iter->first, iter->second.first), name)));
+					}
+
+					for (std::set<std::pair<std::string, std::pair<std::pair<int, int>, std::string> > >::const_iterator iterOutput = output.begin(); iterOutput != output.end(); ++iterOutput)
+					{
+						result += Unicode::narrowToWide(FormattedString<1024>().sprintf("(%d, %s) [%d, %s]\n", iterOutput->second.first.first, iterOutput->second.second.c_str(), iterOutput->second.first.second, GameObjectTypes::getCanonicalName(iterOutput->second.first.second).c_str()));
+					}
+
+					result += Unicode::narrowToWide(FormattedString<1024>().sprintf("count=%d\n", output.size()));
+				}
+				else
+				{
+					result += Unicode::narrowToWide("count=0\n");
+				}
+			}
+		}
+	}
+	else if (isAbbrev(argv[0], "setCompletedTutorial"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		if (NameManager::getInstance().isPlayer(oid))
+		{
+			unsigned int const stationId = static_cast<unsigned int>(NameManager::getInstance().getPlayerStationId(oid));
+			if (stationId != 0)
+			{
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("Marking station id (%u) for character (%s, %s) as having completed the tutorial\n", stationId, oid.getValueString().c_str(), NameManager::getInstance().getPlayerFullName(oid).c_str()));
+
+				GenericValueTypeMessage< std::pair<unsigned int, bool> > const updateTutorial("LoginToggleCompletedTutorial", std::pair<unsigned int, bool>(stationId, true));
+				GameServer::getInstance().sendToCentralServer(updateTutorial);
+			}
+			else
+			{
+				result += Unicode::narrowToWide(FormattedString<512>().sprintf("Invalid station id (%u) found for character (%s, %s)\n", stationId, oid.getValueString().c_str(), NameManager::getInstance().getPlayerFullName(oid).c_str()));
+			}
+		}
+		else
+		{
+			result += Unicode::narrowToWide(FormattedString<512>().sprintf("There is no character on this galaxy with id (%s)\n", oid.getValueString().c_str()));
+		}
+	}
+#ifdef _DEBUG
+	else if (isAbbrev(argv[0], "setExtraDelayPerFrameMs"))
+	{
+		int const ms = ::atoi(Unicode::wideToNarrow(argv[1]).c_str());
+		result += Unicode::narrowToWide(FormattedString<512>().sprintf("Setting extra sleep time per frame to %dms.\n", ms));
+		GameServer::setExtraDelayPerFrameMs(ms);
+	}
+#endif
+	else
+	{
+		result += getErrorMessage(argv[0], ERR_NO_HANDLER);
+	}
+
+	return true;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.h
new file mode 100644
index 00000000..a55f60d0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.h
@@ -0,0 +1,42 @@
+// ======================================================================
+//
+// ConsoleCommandParserServer.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserServer_H
+#define INCLUDED_ConsoleCommandParserServer_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to scripts
+*/
+
+class ConsoleCommandParserServer : public CommandParser
+{
+public:
+    ConsoleCommandParserServer ();
+    virtual bool performParsing (const NetworkId & userId, 
+								 const StringVector_t & argv,
+                                 const String_t & originalCommand,
+                                 String_t & result,
+                                 const CommandParser * node);
+	
+private:
+    ConsoleCommandParserServer (const ConsoleCommandParserServer & rhs);
+    ConsoleCommandParserServer &  operator= (const ConsoleCommandParserServer & rhs);
+
+	bool performParsing2 (const NetworkId & userId, 
+		const StringVector_t & argv,
+		const String_t & originalCommand,
+		String_t & result,
+		const CommandParser * node);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserServer_H
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserShip.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserShip.cpp
new file mode 100644
index 00000000..38efa02a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserShip.cpp
@@ -0,0 +1,569 @@
+//======================================================================
+//
+// ConsoleCommandParserShip.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserShip.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipComponentDataManager.h"
+#include "serverGame/ShipInternalDamageOverTime.h"
+#include "serverGame/ShipInternalDamageOverTimeManager.h"
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/Crc.h"
+#include "sharedFoundation/PersistentCrcString.h"
+#include "sharedGame/ShipChassis.h"
+#include "sharedGame/ShipChassisSlot.h"
+#include "sharedGame/ShipComponentAttachmentManager.h"
+#include "sharedGame/ShipComponentData.h"
+#include "sharedGame/ShipComponentDescriptor.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedNetworkMessages/ShipDamageMessage.h"
+#include "sharedObject/Controller.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+
+#include <cstdio>
+
+// ======================================================================
+
+//lint -e641
+
+namespace
+{
+	namespace CommandNames
+	{
+#define MAKE_COMMAND(a) const char * const a = #a
+		MAKE_COMMAND(getSlotList);
+		MAKE_COMMAND(install);
+		MAKE_COMMAND(pseudoInstall);
+		MAKE_COMMAND(uninstall);
+		MAKE_COMMAND(purge);
+		MAKE_COMMAND(getComponentDescriptor);
+		MAKE_COMMAND(pseudoDamageShip);
+		MAKE_COMMAND(idotList);
+		MAKE_COMMAND(idotSet);
+		MAKE_COMMAND(idotRemove);
+#undef MAKE_COMMAND
+	}
+
+	const CommandParser::CmdInfo cmds[] =
+	{
+		{CommandNames::getSlotList,            0, "[slot name] [ship OID]",                   "Lists slots on a ship"},
+		{CommandNames::install,                2, "<component id> <slot> [ship OID]",         "Installs a component in a ship."},
+		{CommandNames::pseudoInstall,          2, "<component name> <slot> [ship OID]",       "Installs a psuedo component in a ship."},
+		{CommandNames::uninstall,              1, "<slot> [target container Id] [ship OID]",  "Uninstalls a component from a ship."},
+		{CommandNames::purge,                  1, "<slot> [ship OID]",                        "Purges a component from a ship."},
+		{CommandNames::getComponentDescriptor, 0, "[component OID]",                          "View component descriptor info for a component"},
+		{CommandNames::pseudoDamageShip,       0, "",                                         "Send a hit message to your piloted ship by the lookAt target."},
+		{CommandNames::idotList,               0, "[networkId]",                              "List all active IDOTS."},
+		{CommandNames::idotSet,                3, "<slot> <damage rate> <damage threshold> [networkId]",  "Set an active IDOT."},
+		{CommandNames::idotRemove,             1, "<slot> [networkId]",                                   "Remove an active IDOT."},
+
+		{"", 0, "", ""} // this must be last
+	};
+
+	//----------------------------------------------------------------------
+
+	TangibleObject * findTangible (const NetworkId & defaultId, const CommandParser::StringVector_t & argv, int index)
+	{
+		if (index < 0)
+			return 0;
+
+		NetworkId oid = defaultId;
+
+		if (argv.size () > static_cast<size_t>(index))
+			oid = NetworkId (Unicode::wideToNarrow (argv [static_cast<size_t>(index)]));
+
+		return dynamic_cast<TangibleObject *>(NetworkIdManager::getObjectById(oid));
+	}
+}
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserShip::ConsoleCommandParserShip (void) :
+CommandParser ("ship", 0, "...", "Ship related commands.", 0)
+{
+	createDelegateCommands (cmds);
+}
+
+//----------------------------------------------------------------------
+
+
+bool ConsoleCommandParserShip::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & , String_t & result, const CommandParser *)
+{			
+	CreatureObject const * const user = dynamic_cast<const CreatureObject *>(NetworkIdManager::getObjectById (userId));
+
+	if (!user)
+		return false;
+	// ----------------------------------------------------------------
+	
+	if (isCommand (argv[0], CommandNames::getSlotList))
+	{
+		ShipObject * const ship = dynamic_cast<ShipObject *>(findTangible (user->getLookAtTarget (), argv, 2));
+
+		std::string slotNameToken;
+		if (argv.size () > 1)
+		{
+			slotNameToken = Unicode::wideToNarrow (argv [1]);
+			if (!slotNameToken.empty () && slotNameToken [0] == '*')
+				slotNameToken.clear ();
+		}
+
+		if (ship == NULL)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		uint32 const chassisType = ship->getChassisType    ();
+
+		ShipChassis const * const shipChassis = ShipChassis::findShipChassisByCrc    (chassisType);
+
+		if (shipChassis == NULL)
+		{
+			result += Unicode::narrowToWide ("No chassis");
+			return true;
+		}
+
+		ShipChassis::SlotVector const & slotVector = shipChassis->getSlots ();
+
+		char buf [1024];
+		const size_t buf_size = sizeof (buf);
+
+		snprintf (buf, buf_size, 
+			"Chassis type [%s] (%lu)\n"
+			"       Slot count [%d], Hitpoints [%5.2f/%5.2f], Mass [%5.2f/%5.2f]\n",
+			shipChassis->getName ().getString (), shipChassis->getCrc (),
+			static_cast<int>(slotVector.size ()),
+			ship->getCurrentChassisHitPoints(), ship->getMaximumChassisHitPoints(),
+			ship->getChassisComponentMassCurrent(), ship->getChassisComponentMassMaximum());
+
+		result += Unicode::narrowToWide (buf);
+
+		for (int chassisSlot = ShipChassisSlotType::SCST_first; chassisSlot < ShipChassisSlotType::SCST_num_types; ++chassisSlot)
+		{
+			int effectiveCompatibilitySlot = chassisSlot;
+			// weapon slots beyond 7 wrap back to slot 0 for the purposes of compatibility checking on captial ships
+			if (ship->isCapitalShip() && chassisSlot >= ShipChassisSlotType::SCST_num_explicit_types && chassisSlot <= ShipChassisSlotType::SCST_weapon_last)
+				effectiveCompatibilitySlot = ShipChassisSlotType::SCST_weapon_first+((chassisSlot-ShipChassisSlotType::SCST_weapon_first)&7);
+
+			ShipChassisSlot const * const slot = shipChassis->getSlot(static_cast<ShipChassisSlotType::Type>(effectiveCompatibilitySlot));
+
+			if (!slot)
+				continue;
+
+			if (!slotNameToken.empty() && ShipChassisSlotType::getNameFromType(slot->getSlotType ()) != slotNameToken)
+				continue;
+
+			snprintf (buf, buf_size,
+				"        \\#pcontrast1 [SLOT %s (%d)]\\#.\n"
+				"                Hitweight [%d], compats: ",
+				ShipChassisSlotType::getNameFromType(static_cast<ShipChassisSlotType::Type>(chassisSlot)).c_str(),
+				chassisSlot,
+				slot->getHitWeight());
+
+			result += Unicode::narrowToWide (buf);
+			result += Unicode::narrowToWide(slot->getCompatibilityString());
+			result.push_back ('\n');
+
+			ShipComponentData * shipComponentData = 0;
+
+			if (ship->isSlotInstalled(chassisSlot))
+				shipComponentData = ship->createShipComponentData(chassisSlot);
+
+			if (shipComponentData == NULL)
+			{
+				result += Unicode::narrowToWide ("                Loaded NONE\n");
+			}
+			else
+			{
+				result += Unicode::narrowToWide ("                Loaded:\n");
+				shipComponentData->printDebugString (result, Unicode::narrowToWide ("                     "));
+				ShipComponentAttachmentManager::TemplateHardpointPairVector const & thpv = 
+					ShipComponentAttachmentManager::getAttachmentsForShip (chassisType, shipComponentData->getDescriptor ().getCrc(), chassisSlot);
+
+				if (!thpv.empty ())
+				{
+					result += Unicode::narrowToWide ("                   Attachments: ");
+
+					for (ShipComponentAttachmentManager::TemplateHardpointPairVector::const_iterator thpv_it = thpv.begin (); thpv_it != thpv.end (); ++thpv_it)
+					{
+						uint32 const objectTemplateCrc  = (*thpv_it).first;
+						CrcString const & hardpointName = (*thpv_it).second;
+
+						CrcString const & objectTemplateCrcString = ObjectTemplateList::lookUp(objectTemplateCrc);
+
+						result += Unicode::narrowToWide (objectTemplateCrcString.getString ());
+						result.push_back (':');
+						result += Unicode::narrowToWide (hardpointName.getString ());
+						result.push_back (',');
+						result.push_back (' ');
+					}
+
+					result.push_back ('\n');
+				}
+
+				delete shipComponentData;
+
+			}
+		}
+		return true;
+	}
+
+	//----------------------------------------------------------------------
+
+	else if (isCommand (argv[0], CommandNames::getComponentDescriptor))
+	{
+		TangibleObject * const component = findTangible (user->getLookAtTarget (), argv, 1);
+
+		if (component == NULL)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_OBJECT);
+			return true;
+		}
+
+		ShipComponentData * const shipComponentData = ShipComponentDataManager::create (*component);
+
+		if (shipComponentData == NULL)
+		{
+			result += Unicode::narrowToWide ("Not a ship component");
+			return true;
+		}
+
+		shipComponentData->printDebugString (result, Unicode::emptyString);
+
+		delete shipComponentData;
+		return true;
+
+	}
+
+	//----------------------------------------------------------------------
+
+	else if (isCommand (argv[0], CommandNames::install))
+	{
+		ShipObject * const ship          = dynamic_cast<ShipObject *>(findTangible (user->getLookAtTarget (), argv, 3));
+		TangibleObject * const component = findTangible (NetworkId::cms_invalid, argv, 1);
+		std::string const & slotName     = Unicode::wideToNarrow (argv [2]);
+
+		if (ship == NULL)
+		{
+			result += Unicode::narrowToWide ("no ship");
+			return true;
+		}
+
+		if (component == NULL)
+		{
+			result += Unicode::narrowToWide ("no component");
+			return true;
+		}
+
+		ShipChassisSlotType::Type shipChassisSlotType = ShipChassisSlotType::getTypeFromName (slotName);
+
+		if (shipChassisSlotType == ShipChassisSlotType::SCST_num_types)
+		{
+			result += Unicode::narrowToWide ("not a valid slot name");
+			return true;
+		}
+
+		if (ship->isSlotInstalled (shipChassisSlotType))
+		{
+			result += Unicode::narrowToWide ("That slot is already filled");
+			return true;
+		}
+
+		ShipChassis const * const shipChassis = ShipChassis::findShipChassisByCrc (ship->getChassisType ());
+		if (shipChassis == NULL)
+		{
+			result += Unicode::narrowToWide ("Ship chassis invalid");
+			return true;
+		}
+
+		ShipChassisSlot const * const slot = shipChassis->getSlot (shipChassisSlotType);
+		if (slot == NULL)
+		{
+			result += Unicode::narrowToWide ("Ship chassis does not support that slot");
+			return true;
+		}
+		
+		ShipComponentData * const shipComponentData = ShipComponentDataManager::create (*component);
+
+		if (shipComponentData == NULL)
+		{
+			result += Unicode::narrowToWide ("Not a ship component");
+			return true;
+		}
+
+		if (!slot->canAcceptComponent (shipComponentData->getDescriptor ()))
+		{
+			result += Unicode::narrowToWide ("Component cannot be installed here, may not be compatible.");
+			delete shipComponentData;
+			return true;
+		}
+
+		if (!ship->installComponent (user->getNetworkId(), static_cast<int>(shipChassisSlotType), *component))
+			result += Unicode::narrowToWide ("Installation failed.  Check warnings");
+		else
+			result += Unicode::narrowToWide ("Installation Success");
+		
+
+		delete shipComponentData;
+		return true;
+	}
+
+	//----------------------------------------------------------------------
+
+	else if (isCommand (argv[0], CommandNames::pseudoInstall))
+	{
+		ShipObject * const ship                = dynamic_cast<ShipObject *>(findTangible (user->getLookAtTarget (), argv, 3));
+		std::string const & componentName      = Unicode::wideToNarrow (argv [1]);
+		std::string const & slotName           = Unicode::wideToNarrow (argv [2]);
+		
+		if (ship == NULL)
+		{
+			result += Unicode::narrowToWide ("no ship");
+			return true;
+		}
+		
+		uint32 const componentCrc = Crc::normalizeAndCalculate (componentName.c_str ());
+
+		ShipComponentDescriptor const * const shipComponentDescriptor = ShipComponentDescriptor::findShipComponentDescriptorByCrc (componentCrc);
+		if (shipComponentDescriptor == NULL)
+		{
+			result += Unicode::narrowToWide ("Invalid component name");
+			return true;
+		}
+
+		ShipChassisSlotType::Type const shipChassisSlotType = ShipChassisSlotType::getTypeFromName (slotName);
+
+		if (shipChassisSlotType == ShipChassisSlotType::SCST_num_types)
+		{
+			result += Unicode::narrowToWide ("not a valid slot name");
+			return true;
+		}
+
+		if (!ship->pseudoInstallComponent (static_cast<int>(shipChassisSlotType), componentCrc))
+			result += Unicode::narrowToWide ("Installation Failed... check warnings");
+		else		
+			result += Unicode::narrowToWide ("Installation Success");
+
+		return true;
+	}
+
+	//----------------------------------------------------------------------
+
+	else if (isCommand (argv[0], CommandNames::uninstall))
+	{
+		ShipObject * const ship                = dynamic_cast<ShipObject *>(findTangible (user->getLookAtTarget (), argv, 3));
+		TangibleObject * const targetContainer = findTangible (user->getInventory ()->getNetworkId (), argv, 2);
+		std::string const & slotName           = Unicode::wideToNarrow (argv [1]);
+
+		if (ship == NULL)
+		{
+			result += Unicode::narrowToWide ("no ship");
+			return true;
+		}
+
+		if (targetContainer == NULL)
+		{
+			result += Unicode::narrowToWide ("no target container");
+			return true;
+		}
+
+		ShipChassisSlotType::Type shipChassisSlotType = ShipChassisSlotType::getTypeFromName (slotName);
+
+		if (shipChassisSlotType == ShipChassisSlotType::SCST_num_types)
+		{
+			result += Unicode::narrowToWide ("not a valid slot name");
+			return true;
+		}
+
+		if (!ship->isSlotInstalled (shipChassisSlotType))
+		{
+			result += Unicode::narrowToWide ("That slot is not filled");
+			return true;
+		}
+
+		if (!ship->uninstallComponent (user->getNetworkId(), static_cast<int>(shipChassisSlotType), *targetContainer))
+			result += Unicode::narrowToWide ("Uninstallation failed.  Check warnings");
+		else
+			result += Unicode::narrowToWide ("Uninstallation Success");
+		
+		return true;
+	}
+	
+	//----------------------------------------------------------------------
+	
+	else if (isCommand (argv[0], CommandNames::purge))
+	{
+		ShipObject * const ship                = dynamic_cast<ShipObject *>(findTangible (user->getLookAtTarget (), argv, 2));
+		std::string const & slotName           = Unicode::wideToNarrow (argv [1]);
+		
+		if (ship == NULL)
+		{
+			result += Unicode::narrowToWide ("no ship");
+			return true;
+		}
+		
+		ShipChassisSlotType::Type shipChassisSlotType = ShipChassisSlotType::getTypeFromName (slotName);
+		
+		if (shipChassisSlotType == ShipChassisSlotType::SCST_num_types)
+		{
+			result += Unicode::narrowToWide ("not a valid slot name");
+			return true;
+		}
+		
+		if (!ship->isSlotInstalled (shipChassisSlotType))
+		{
+			result += Unicode::narrowToWide ("That slot is not filled");
+			return true;
+		}
+		
+		ship->purgeComponent (static_cast<int>(shipChassisSlotType));
+		result += Unicode::narrowToWide ("Purge Success");
+		
+		return true;
+	}
+	
+	//----------------------------------------------------------------------
+	
+	else if (isCommand (argv[0], CommandNames::pseudoDamageShip))
+	{
+		ShipObject const * const victimShipObject = user->getPilotedShip();
+		if (victimShipObject == NULL)
+		{
+			result += Unicode::narrowToWide ("You are not piloting a ship.");
+			return true;
+		}
+		
+		ShipObject const * const attackerShipObject = dynamic_cast<ShipObject *>(findTangible (user->getLookAtTarget (), argv, 2));
+		if (attackerShipObject == NULL)
+		{
+			result += Unicode::narrowToWide ("You don't have attacker ship targeted.");
+			return true;
+		}
+		
+		Controller * const victimShipController = const_cast<Controller * const>(victimShipObject->getController());
+		if (victimShipController)
+		{
+			ShipDamageMessage shipDamage(attackerShipObject->getNetworkId(),
+											attackerShipObject->getPosition_w(),
+											1.0f );
+
+			MessageQueueGenericValueType<ShipDamageMessage> * const damageMessage = new MessageQueueGenericValueType<ShipDamageMessage>(shipDamage);
+			
+			victimShipController->appendMessage(CM_shipDamageMessage, 0.0f, damageMessage, 
+												GameControllerMessageFlags::SEND | 
+												GameControllerMessageFlags::RELIABLE | 
+												GameControllerMessageFlags::DEST_AUTH_CLIENT);
+		}
+
+		return true;
+	}
+	
+	//----------------------------------------------------------------------
+
+	else if (isCommand (argv[0], CommandNames::idotList))
+	{
+		ShipObject * const ship                = dynamic_cast<ShipObject *>(findTangible (user->getLookAtTarget (), argv, 1));
+
+		ShipInternalDamageOverTimeManager::IdotVector const & idotVector = ShipInternalDamageOverTimeManager::getActiveShipInternalDamageOverTime();
+
+		char buf[1024];
+		size_t const buf_size = sizeof(buf);
+
+		int displayCount = 0;
+
+		for (ShipInternalDamageOverTimeManager::IdotVector::const_iterator it = idotVector.begin(); it != idotVector.end(); ++it)
+		{
+			ShipInternalDamageOverTime const & idot = *it;
+
+			ShipObject const * const idotShip = idot.getShipObject();
+
+			if (ship != NULL && ship != idotShip)
+				continue;
+
+			uint32 const chassisType = idotShip->getChassisType();
+			ShipChassis const * const chassis = ShipChassis::findShipChassisByCrc(chassisType);			
+			std::string const chassisTypeName = (chassis != NULL) ? chassis->getName().getString() : "<NO VALID CHASSIS>";
+
+			float hpCur = 0.0f;
+			float hpMax = 0.0f;
+	
+			IGNORE_RETURN(idot.checkValidity(hpCur, hpMax));
+
+			float hpPercent = (hpMax > 0.0f) ? hpCur / hpMax : -1.0f;
+
+			snprintf(buf, buf_size, 
+				"[%15s] [%15s]:[%-10s] rate=[%3.1f], threshold=[%3.1f], hp cur/max/pct=[%5.1f/%5.1f/%3.3f\n",
+				idotShip->getNetworkId().getValueString().c_str(), chassisTypeName.c_str(), 
+				ShipChassisSlotType::getNameFromType(static_cast<ShipChassisSlotType::Type>(idot.getChassisSlot())).c_str(),
+				idot.getDamageRate(), idot.getDamageThreshold(), hpCur, hpMax, hpPercent); 
+			buf[buf_size-1] = 0;
+			result += Unicode::narrowToWide(buf);
+			++displayCount;
+		}
+
+		snprintf(buf, buf_size, "%d/%d displayed", displayCount, idotVector.size());
+		buf[buf_size-1] = 0;
+		result += Unicode::narrowToWide(buf);
+		return true;
+	}
+
+	//----------------------------------------------------------------------
+
+	else if (isCommand (argv[0], CommandNames::idotSet))
+	{
+		ShipObject * const ship                = dynamic_cast<ShipObject *>(findTangible (user->getLookAtTarget (), argv, 4));
+
+		if (ship == NULL)
+		{
+			result += Unicode::narrowToWide ("no ship");
+			return true;
+		}
+
+		std::string const & slotName           = Unicode::wideToNarrow (argv [1]);		
+		ShipChassisSlotType::Type const shipChassisSlotType = ShipChassisSlotType::getTypeFromName (slotName);
+		
+		float const damageRate = static_cast<float>(atof(Unicode::wideToNarrow(argv[2]).c_str()));
+		float const damageThreshold = static_cast<float>(atof(Unicode::wideToNarrow(argv[3]).c_str()));
+
+		if (!ShipInternalDamageOverTimeManager::setEntry(*ship, static_cast<int>(shipChassisSlotType), damageRate, damageThreshold))
+			result += Unicode::narrowToWide("failed to set the IDOT entry");
+
+		return true;
+	}
+
+	//----------------------------------------------------------------------
+
+	else if (isCommand (argv[0], CommandNames::idotRemove))
+	{
+		ShipObject * const ship                = dynamic_cast<ShipObject *>(findTangible (user->getLookAtTarget (), argv, 4));
+
+		if (ship == NULL)
+		{
+			result += Unicode::narrowToWide ("no ship");
+			return true;
+		}
+
+		std::string const & slotName           = Unicode::wideToNarrow (argv [1]);		
+		ShipChassisSlotType::Type const shipChassisSlotType = ShipChassisSlotType::getTypeFromName (slotName);
+
+		if (!ShipInternalDamageOverTimeManager::removeEntry(*ship, static_cast<int>(shipChassisSlotType)))
+			result += Unicode::narrowToWide("failed to remove the IDOT entry");
+
+		return true;
+	}
+
+	//----------------------------------------------------------------------
+		
+	return false;
+}
+	
+//----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserShip.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserShip.h
new file mode 100644
index 00000000..f755abee
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserShip.h
@@ -0,0 +1,31 @@
+//======================================================================
+//
+// ConsoleCommandParserShip.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserShip_H
+#define INCLUDED_ConsoleCommandParserShip_H
+
+//======================================================================
+
+#include "sharedCommandParser/CommandParser.h"
+
+//----------------------------------------------------------------------
+
+class ConsoleCommandParserShip : 
+public CommandParser
+{
+public:
+                                 ConsoleCommandParserShip ();
+    virtual bool                 performParsing (const NetworkId & userId, const StringVector_t & argv,const String_t & originalCommand,String_t & result,const CommandParser * node);
+	
+private:
+                                 ConsoleCommandParserShip (const ConsoleCommandParserShip & rhs);
+    ConsoleCommandParserShip &  operator= (const ConsoleCommandParserShip & rhs);    
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSkill.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSkill.cpp
new file mode 100644
index 00000000..fc1a1a49
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSkill.cpp
@@ -0,0 +1,470 @@
+// ======================================================================
+//
+// ConsoleCommandParserSkill.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserSkill.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedSkillSystem/SkillManager.h"
+#include "sharedSkillSystem/SkillObject.h"
+
+#include <cstdio>
+
+// ======================================================================
+
+namespace
+{
+	namespace CommandNames
+	{
+#define MAKE_COMMAND(a) const char * const a = #a
+		MAKE_COMMAND(getCommandList);
+		MAKE_COMMAND(getSkillMods);
+		MAKE_COMMAND(getSkillList);
+		MAKE_COMMAND(grantExperience);
+		MAKE_COMMAND(grantSkill);
+		MAKE_COMMAND(grantSkillMod);
+		MAKE_COMMAND(grantCommand);
+		MAKE_COMMAND(revokeSkill);
+		MAKE_COMMAND(revokeSkillMod);
+		MAKE_COMMAND(getSchematics);
+		MAKE_COMMAND(grantSchematicGroup);
+		MAKE_COMMAND(revokeSchematicGroup);
+		MAKE_COMMAND(grantSchematic);
+		MAKE_COMMAND(revokeSchematic);
+		MAKE_COMMAND(getLevel);
+#undef MAKE_COMMAND
+	}
+
+	const CommandParser::CmdInfo cmds[] =
+	{
+		{CommandNames::getCommandList,        0, "[creature OID]",                     "Lists commands on creature."},
+		{CommandNames::getSkillMods,          0, "[creature OID]",                     "List all mods on a creature."},
+		{CommandNames::getSkillList,          0, "[creature OID]",                     "Lists commands on creature."},
+		{CommandNames::grantExperience,       3, "[creature OID] [experience type] [amount]", "Grants/remove experience to/from creature"},
+		{CommandNames::grantSkill,            1, "<skill name> [creature OID]",        "Grants skill to creature"},
+		{CommandNames::grantSkillMod,         2, "<skill mod name> <mod value> [creature OID]",        "Grants skill mod to creature"},
+		{CommandNames::grantCommand,          1, "<command name> [creature OID]",      "Grants command to creature"},
+		{CommandNames::revokeSkill,           1, "<skill name> [creature OID]",        "Remove skill from creature"},
+		{CommandNames::revokeSkillMod,        1, "<skill mod name> [creature OID]",    "Remove skill mod from creature"},
+		{CommandNames::getSchematics,         0, "[creature OID]",                     "Lists draft schematics owned by a creature"},
+		{CommandNames::grantSchematicGroup,   1, "<group name> [creature OID]",        "Grants a schematic group to a creature"},
+		{CommandNames::revokeSchematicGroup,  1, "<group name> [creature OID]",        "Removes a schematic group from a creature"},
+		{CommandNames::grantSchematic,        1, "<schematic name> [creature OID]",    "Grants a draftt schematic to a creature"},
+		{CommandNames::revokeSchematic,       1, "<schematic name> [creature OID]",    "Removes a draftt schematic from a creature"},
+		{CommandNames::getLevel,              0, "[creature OID]",                     "List creature's current level."},
+		{"", 0, "", ""} // this must be last
+	};
+
+	//----------------------------------------------------------------------
+
+	CreatureObject * findCreature (const NetworkId & userId, const CommandParser::StringVector_t & argv, int index)
+	{
+		if (index < 0)
+			return 0;
+
+		NetworkId oid = userId;
+
+		if (argv.size () > static_cast<size_t>(index))
+			oid = NetworkId (Unicode::wideToNarrow (argv [index]));
+
+		return dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(oid));
+	}
+}
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserSkill::ConsoleCommandParserSkill (void) :
+CommandParser ("skill", 0, "...", "Skill related commands.", 0)
+{
+	createDelegateCommands (cmds);
+}
+
+//----------------------------------------------------------------------
+
+
+bool ConsoleCommandParserSkill::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & , String_t & result, const CommandParser *)
+{			
+	// ----------------------------------------------------------------
+	
+	if (isCommand (argv[0], CommandNames::grantSkill))
+	{
+		CreatureObject * const creature = findCreature (userId, argv, 2);
+
+		if (creature == NULL)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_OBJECT);
+		}
+		else
+		{
+			const std::string skillName = Unicode::wideToNarrow (argv[1]);
+			const SkillObject * const skill = SkillManager::getInstance ().getSkill (skillName);
+			if (skill == NULL)
+			{
+				result += Unicode::narrowToWide ("unknown skill");
+			}
+			else
+			{
+				creature->grantSkill (*skill);
+				result += getErrorMessage (argv[0], ERR_SUCCESS);
+			}
+		}
+		return true;
+	}
+	
+	// ----------------------------------------------------------------
+
+	else if (isCommand (argv[0], CommandNames::grantSkillMod))
+	{
+		CreatureObject * const creature = findCreature (userId, argv, 3);
+
+		if (creature == NULL)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_OBJECT);
+		}
+		else
+		{
+			const std::string skillModName = Unicode::wideToNarrow (argv[1]);
+			int value = atoi (Unicode::wideToNarrow (argv [2]).c_str ());
+			creature->setModValue(skillModName, value);
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		}
+		return true;
+	}
+
+	// ----------------------------------------------------------------
+	
+	else if (isCommand (argv[0], CommandNames::grantCommand))
+	{
+		CreatureObject * const creature = findCreature (userId, argv, 2);
+
+		if (creature == NULL)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_OBJECT);
+		}
+		else
+		{
+			const std::string commandName = Unicode::wideToNarrow (argv[1]);
+			if (creature->grantCommand (commandName, false))
+				result += getErrorMessage (argv[0], ERR_SUCCESS);
+			else
+				result += getErrorMessage (argv[0], ERR_FAIL);
+		}
+		return true;
+	}
+	
+	//-----------------------------------------------------------------------
+	
+	else if (isCommand (argv[0], CommandNames::getSkillMods))
+	{
+		const CreatureObject * const creature = findCreature (userId, argv, 2);
+		if(creature)
+		{
+			std::map<std::string, std::pair<int, int> >::const_iterator i;
+			const std::map<std::string, std::pair<int, int> > & modmap = creature->getModMap();
+
+			char valbuf[32] = {"\0"};
+			int count = 0;
+			for(i = modmap.begin(); i != modmap.end(); ++i, ++count)
+			{
+				snprintf(valbuf, sizeof(valbuf), "%i/%i", (*i).second.first, (*i).second.second);
+				result += Unicode::narrowToWide((*i).first);
+				result += Unicode::narrowToWide(std::string(" "));
+				result += Unicode::narrowToWide(std::string(valbuf));
+				result += Unicode::narrowToWide(std::string("\n"));
+			}
+			snprintf(valbuf, sizeof(valbuf), "%i", count);
+			result += Unicode::narrowToWide(std::string(valbuf));
+			result += Unicode::narrowToWide(std::string(" mods returned\n"));
+			return true;
+		}
+		else
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_OBJECT);
+		}
+	}
+
+	// ----------------------------------------------------------------
+	
+	else if (isCommand (argv[0], CommandNames::grantExperience))
+	{
+		CreatureObject * const creature = findCreature (userId, argv, 1);
+
+		if (creature == NULL)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_OBJECT);
+		}
+		else
+		{
+			const std::string expType = Unicode::wideToNarrow (argv[2]);
+			
+			if (argv.size () > 3)
+			{
+				const int amount = atoi (Unicode::wideToNarrow (argv [3]).c_str ());
+				creature->grantExperiencePoints (expType, amount);
+				result += Unicode::narrowToWide ("granted");
+			}
+			else
+			{
+				const int amount = creature->getExperiencePoints (expType);
+				result += Unicode::narrowToWide (expType);
+				result.append (1, ' ');
+				result.append (1, ':');
+				result.append (1, ' ');
+				
+				char buf[64];
+				result += Unicode::narrowToWide (_itoa (amount, buf, 10));
+			}
+		}
+		return true;
+	}
+	
+	//-----------------------------------------------------------------------
+	
+	else if (isCommand (argv[0], CommandNames::getSkillList))
+	{
+		CreatureObject * const creature = findCreature (userId, argv, 1);
+		
+		if (creature == NULL)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_OBJECT);
+		}
+		else
+		{
+			char buf[1024];
+			sprintf (buf, "skill list object %s, num %d\n", creature->getNetworkId ().getValueString ().c_str (), creature->getSkillList ().size ());
+			result += Unicode::narrowToWide (buf);
+			for (CreatureObject::SkillList::const_iterator i = creature->getSkillList ().begin (); i != creature->getSkillList ().end (); ++i)
+			{
+				if (*i)
+				{
+					result += Unicode::narrowToWide ( (*i)->getSkillName ());
+					result += Unicode::narrowToWide ("\n");
+				}
+				else
+					result += Unicode::narrowToWide ("[invalid]\n");
+			}
+		}
+		return true;
+	}
+	
+	//-----------------------------------------------------------------------
+	
+	else if (isCommand (argv[0], CommandNames::getCommandList))
+	{
+		CreatureObject * const creature = findCreature (userId, argv, 1);
+		
+		if (creature == NULL)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_OBJECT);
+		}
+		else
+		{
+			char buf[1024];
+			sprintf (buf, "command list object %s, num %d\n", creature->getNetworkId ().getValueString ().c_str (), creature->getCommandList ().size ());
+			result += Unicode::narrowToWide (buf);
+			std::map<std::string, int>::const_iterator i;
+			for (i = creature->getCommandList ().begin (); i != creature->getCommandList ().end (); ++i)
+			{
+				result += Unicode::narrowToWide ((*i).first);
+				result += Unicode::narrowToWide ("\n");
+			}
+		}
+
+		return true;
+	}
+	
+	// ----------------------------------------------------------------
+	
+	else if (isCommand (argv[0], CommandNames::revokeSkill))
+	{
+		CreatureObject * const creature = findCreature (userId, argv, 2);
+
+		if (creature == NULL)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_OBJECT);
+		}
+		else
+		{
+			std::string skillName = Unicode::wideToNarrow (argv[1]);
+			const SkillObject * skill = SkillManager::getInstance ().getSkill (skillName);
+			if (skill == NULL)
+			{
+				result += Unicode::narrowToWide ("unknown skill");
+			}
+			else
+			{
+				LOG("CustomerService", ("Skill: A GOD has requested the revocation of skill %s from character %s.", 
+					skillName.c_str(), creature->getNetworkId().getValueString().c_str()));
+				creature->revokeSkill (*skill);
+				result += getErrorMessage (argv[0], ERR_SUCCESS);
+			}
+		}
+		return true;
+	}
+
+	// ----------------------------------------------------------------
+
+	else if (isCommand (argv[0], CommandNames::revokeSkillMod))
+	{
+		CreatureObject * const creature = findCreature (userId, argv, 2);
+
+		if (creature == NULL)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_OBJECT);
+		}
+		else
+		{
+			const std::string skillModName = Unicode::wideToNarrow (argv[1]);
+			creature->setModValue(skillModName, 0);
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		}
+		return true;
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isCommand (argv[0], CommandNames::getSchematics))
+	{
+		CreatureObject * const creature = findCreature (userId, argv, 1);
+		
+		if (creature == NULL)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_OBJECT);
+		}
+		else
+		{
+			const std::map<std::pair<uint32, uint32>,int> & schematics = creature->getDraftSchematics();
+			if (!schematics.empty())
+			{
+				std::map<std::pair<uint32, uint32>,int>::const_iterator iter;
+				for (iter = schematics.begin(); iter != schematics.end(); ++iter)
+				{
+					const ConstCharCrcString & crcString = ObjectTemplateList::lookUp((*iter).first.first);
+					if (!crcString.isEmpty())
+					{
+						result += Unicode::narrowToWide(crcString.getString());
+						result += Unicode::narrowToWide("\n");
+					}
+				}
+			}
+			else
+				result += Unicode::narrowToWide("No schematics available");
+		}
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isCommand (argv[0], CommandNames::grantSchematicGroup))
+	{
+		CreatureObject * const creature = findCreature (userId, argv, 2);
+		
+		if (creature == NULL)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_OBJECT);
+		}
+		else
+		{
+			creature->grantSchematicGroup("+" + Unicode::wideToNarrow(argv[1]), false);
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		}
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isCommand (argv[0], CommandNames::revokeSchematicGroup))
+	{
+		CreatureObject * const creature = findCreature (userId, argv, 2);
+		
+		if (creature == NULL)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_OBJECT);
+		}
+		else
+		{
+			creature->grantSchematicGroup("-" + Unicode::wideToNarrow(argv[1]), false);
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		}
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isCommand (argv[0], CommandNames::grantSchematic))
+	{
+		CreatureObject * const creature = findCreature (userId, argv, 2);
+		
+		if (creature == NULL)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_OBJECT);
+		}
+		else
+		{
+			creature->grantSchematic(Unicode::wideToNarrow(argv[1]), false);
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		}
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isCommand (argv[0], CommandNames::revokeSchematic))
+	{
+		CreatureObject * const creature = findCreature (userId, argv, 2);
+		
+		if (creature == NULL)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_OBJECT);
+		}
+		else
+		{
+			creature->revokeSchematic(Unicode::wideToNarrow(argv[1]), false);
+			result += getErrorMessage (argv[0], ERR_SUCCESS);
+		}
+	}
+
+	//-----------------------------------------------------------------
+
+	else if (isCommand (argv[0], CommandNames::getLevel))
+	{
+		CreatureObject * const creature = findCreature (userId, argv, 1);
+		
+		if (creature == NULL)
+		{
+			result += getErrorMessage (argv[0], ERR_INVALID_OBJECT);
+		}
+		else
+		{
+			char valbuf[32] = {"\0"};
+			result += Unicode::narrowToWide(std::string("Level "));
+			snprintf(valbuf, sizeof(valbuf), "%i", creature->getLevel());
+			result += Unicode::narrowToWide(std::string(valbuf));
+
+			result += Unicode::narrowToWide(std::string(" TotalLevelXp "));
+			snprintf(valbuf, sizeof(valbuf), "%i", creature->getLevelXp());
+			result += Unicode::narrowToWide(std::string(valbuf));
+		}
+	}
+
+	//-----------------------------------------------------------------
+
+	else
+	{
+		result += getErrorMessage (argv[0], ERR_NO_HANDLER);
+	}
+	
+	return true;
+}
+
+// ======================================================================
+
+
+
+
+
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSkill.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSkill.h
new file mode 100644
index 00000000..7e0721aa
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSkill.h
@@ -0,0 +1,45 @@
+// ======================================================================
+//
+// ConsoleCommandParserSkill.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserSkill_H
+#define INCLUDED_ConsoleCommandParserSkill_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to skills
+*/
+
+class ConsoleCommandParserSkill : 
+public CommandParser
+{
+public:
+                                 ConsoleCommandParserSkill ();
+    virtual bool                 performParsing (const NetworkId & userId, const StringVector_t & argv,const String_t & originalCommand,String_t & result,const CommandParser * node);
+	
+private:
+                                 ConsoleCommandParserSkill (const ConsoleCommandParserSkill & rhs);
+    ConsoleCommandParserSkill &  operator= (const ConsoleCommandParserSkill & rhs);    
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserSkill_H
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpaceAi.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpaceAi.cpp
new file mode 100644
index 00000000..d596f78c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpaceAi.cpp
@@ -0,0 +1,321 @@
+// ======================================================================
+//
+// ConsoleCommandParserSpaceAi.cpp
+// Copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserSpaceAi.h"
+
+#include "serverGame/AiServerShipObjectInterface.h"
+#include "serverGame/AiShipBehaviorAttackFighter.h"
+#include "serverGame/AiShipBehaviorAttackFighter_Maneuver.h"
+#include "serverGame/AiShipBehaviorBase.h"
+#include "serverGame/AiShipController.h"
+#include "serverGame/AiShipPilotData.h"
+#include "serverGame/Chat.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/SpacePath.h"
+#include "serverGame/SpaceAttackSquad.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedGame/AiDebugString.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "UnicodeUtils.h"
+
+// ======================================================================
+
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"war", 0, "", "Sets all AI to resume attacking"},
+	{"peace", 0, "", "Sets all AI to stop attacking."},
+	{"path", 1, "", "Sends the pathing points for the specified AI to the client."},
+	{"reloaddata", 0, "", "Reloads pilottype.tab"},
+#ifdef _DEBUG
+	{"clientDebug", 0, "", "Toggles client AI debugging."},
+	{"serverDebug", 0, "", "Toggles the server to send AI debugging."},
+	{"clientDebugText", 0, "", "Toggles the client AI debugging text."},
+	{"maneuver", 1, "", "Forces the target ship to use evade, leash, or attack maneuvers."},
+	{"fastAxis", 0, "", "Ships rotate toward the target along the fast axis of rotation."},
+	//{"logall", 0, "", "Logs all AI to the server output log file."},
+	//{"log", 0, "", "Logs the specified objectIds to the server output log file."},
+#endif // _DEBUG
+	{"", 0, "", ""} // this must be last
+};
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserSpaceAi::ConsoleCommandParserSpaceAi()
+ : CommandParser("spaceai", 0, "...", "Space Ai related commands.", 0)
+{
+	createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------
+
+bool ConsoleCommandParserSpaceAi::performParsing(const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+	NOT_NULL (node);
+	UNREF (userId);
+	UNREF(originalCommand);
+
+	if (isAbbrev(argv[0], "war"))
+	{
+		AiShipController::setAttackingEnabled(true);
+
+		Object * const object = NetworkIdManager::getObjectById(userId);
+		ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL;
+		
+		if (serverObject != NULL)
+		{
+			Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide("[WAR] AI will now attack."), Unicode::emptyString);
+		}
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "peace"))
+	{
+		AiShipController::setAttackingEnabled(false);
+
+		Object * const object = NetworkIdManager::getObjectById(userId);
+		ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL;
+		
+		if (serverObject != NULL)
+		{
+			Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide("[PEACE] AI will no longer attack."), Unicode::emptyString);
+		}
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "path"))
+	{
+		Object * const object = NetworkIdManager::getObjectById(userId);
+		ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL;
+
+		if (   (serverObject != NULL)
+		    && (argv.size () > 1))
+		{
+			NetworkId networkId(Unicode::wideToNarrow(argv[1]));
+
+			AiShipController * const aiShipController = AiShipController::getAiShipController(networkId);
+
+			if (aiShipController != NULL)
+			{
+				SpacePath * const spacePath = aiShipController->getPath();
+
+				if (spacePath != NULL)
+				{
+					SpacePath::TransformList const & transformList = spacePath->getTransformList();
+					SpacePath::TransformList::const_iterator iterTransformList = transformList.begin();
+					FormattedString<512> formattedString;
+					int index = 1;
+					std::string message;
+
+					message += formattedString.sprintf("Path of size(%u) for unit(%s)\n", transformList.size(), networkId.getValueString().c_str());
+
+					for (; iterTransformList != transformList.end(); ++iterTransformList)
+					{
+						Vector const & position_w = iterTransformList->getPosition_p();
+
+						message += formattedString.sprintf("[%d] %.2f, %.2f, %.2f%s", index++, position_w.x, position_w.y, position_w.z, (index < static_cast<int>(transformList.size())) ? "\n" : "");
+					}
+
+					Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide(message.c_str()), Unicode::emptyString);
+				}
+				else
+				{
+					Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide("NULL path"), Unicode::emptyString);
+				}
+			}
+			else
+			{
+				Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide("[ERROR] Unable to resolve the obj_id for a path."), Unicode::emptyString);
+			}
+		}
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "reloaddata"))
+	{
+		Object * const object = NetworkIdManager::getObjectById(userId);
+		ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL;
+
+		if (serverObject != NULL)
+		{
+			AiShipPilotData::reload();
+
+			Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide("[RELOAD DATA] pilottype.tab was reloaded"), Unicode::emptyString);
+		}
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+#ifdef _DEBUG
+	else if (isAbbrev(argv[0], "clientDebug"))
+	{
+		Object * const object = NetworkIdManager::getObjectById(userId);
+		ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL;
+		int temp;
+		
+		if (serverObject != NULL)
+		{
+		    if (   serverObject->getObjVars().getItem("ai_debug_string", temp)
+		        && (temp > 0))
+			{
+				if (!AiShipController::isClientDebugEnabled())
+				{
+					AiShipController::setClientDebugEnabled(true);
+
+					Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide("[ENABLED] Your client is requesting ai debugging."), Unicode::emptyString);
+				}
+				else
+				{
+					IGNORE_RETURN(serverObject->setObjVarItem("ai_debug_string", 0));
+
+					Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide("[DISABLED] Your client is NO LONGER requesting ai debugging."), Unicode::emptyString);
+
+					// Tell the client to remove all ai debugging
+
+					Client * const client = serverObject->getClient();
+
+					if (client != NULL)
+					{
+						AiDebugString aiDebugString;
+						aiDebugString.enableClearClientFlag();
+						bool const reliable = true;
+						GenericValueTypeMessage<std::pair<NetworkId, std::string> > message("AiDebugString", std::make_pair(serverObject->getNetworkId(), aiDebugString.toString()));
+					
+						client->send(message, reliable);
+					}
+				}
+			}
+			else
+			{
+				IGNORE_RETURN(serverObject->setObjVarItem("ai_debug_string", 1));
+
+				Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide("[ENABLED] Your client is requesting ai debugging."), Unicode::emptyString);
+
+				if (!AiShipController::isClientDebugEnabled())
+				{
+					AiShipController::setClientDebugEnabled(true);
+				}
+			}
+		}
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "serverDebug"))
+	{
+		Object * const object = NetworkIdManager::getObjectById(userId);
+		ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL;
+
+		if (serverObject != NULL)
+		{
+			AiShipController::setClientDebugEnabled(!AiShipController::isClientDebugEnabled());
+			
+			Unicode::String systemMessage;
+			systemMessage = Unicode::narrowToWide(AiShipController::isClientDebugEnabled() ? "[ENABLED] Server is sending debug ai to requesting clients." : "[DISABLED] Server is NO LONGER sending debug ai to requesting clients.");
+			Chat::sendSystemMessage(*serverObject, systemMessage, Unicode::emptyString);
+		}
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "clientDebugText"))
+	{
+		Object * const object = NetworkIdManager::getObjectById(userId);
+		ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL;
+
+		if (serverObject != NULL)
+		{
+			AiDebugString::setTextEnabled(!AiDebugString::isTextEnabled());
+			
+			Unicode::String systemMessage;
+			systemMessage = Unicode::narrowToWide(AiDebugString::isTextEnabled() ? "[ENABLED] Client-side debug text is enabled." : "[DISABLED] Client-side debug text is disabled.");
+			Chat::sendSystemMessage(*serverObject, systemMessage, Unicode::emptyString);
+		}
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "maneuver"))
+	{
+		Object * const object = NetworkIdManager::getObjectById(userId);
+		ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL;
+		CreatureObject const * const creatureObject = serverObject ? serverObject->asCreatureObject() : NULL;
+
+		if (serverObject)
+		{
+			if ((creatureObject != NULL) && (argv.size () > 1))
+			{
+				AiShipController const * const lookAtAiShipController = AiShipController::getAiShipController(creatureObject->getLookAtTarget());
+				
+				if (lookAtAiShipController)
+				{
+					SpaceAttackSquad const & attackSquad = lookAtAiShipController->getAttackSquad();
+					AiShipController * const squadLeaderAiShipController = AiShipController::getAiShipController(attackSquad.getLeader());
+
+					bool success = false;
+					
+					if (isAbbrev(argv[1], "evade"))
+					{
+						success = squadLeaderAiShipController->debug_forceFighterAttackManeuver(static_cast<int>(AiShipBehaviorAttackFighter::Maneuver::FM_evade));
+					}
+					else if (isAbbrev(argv[1], "chase"))
+					{
+						success = squadLeaderAiShipController->debug_forceFighterAttackManeuver(static_cast<int>(AiShipBehaviorAttackFighter::Maneuver::FM_chase));
+					}
+					else if (isAbbrev(argv[1], "leash"))
+					{
+						success = squadLeaderAiShipController->debug_forceFighterAttackManeuver(static_cast<int>(AiShipBehaviorAttackFighter::Maneuver::FM_leash));
+					}
+					else if (isAbbrev(argv[1], "none"))
+					{
+						success = squadLeaderAiShipController->debug_forceFighterAttackManeuver(static_cast<int>(AiShipBehaviorAttackFighter::Maneuver::FM_none));
+					}
+					else
+					{
+						Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide("Valid parameters are: [evade], [attack] or [chase], [leash], and [none]."), Unicode::emptyString);
+					}
+
+					if (!success)
+					{
+						Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide("Failed to set the maneuver on the target. The target must be in the AiShipBehaviorAttackFighter state. This fails on a bomber or capship behavior."), Unicode::emptyString);
+					}
+				}
+				else
+				{
+					Chat::sendSystemMessage(*serverObject, Unicode::narrowToWide("Incorrect number of arguments."), Unicode::emptyString);
+				}
+			}
+		}
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	else if (isAbbrev(argv[0], "fastAxis"))
+	{
+		Object * const object = NetworkIdManager::getObjectById(userId);
+		ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL;
+		
+		if (serverObject != NULL)
+		{
+			Unicode::String systemMessage;
+
+			AiServerShipObjectInterface::setFastAxisEnabled(!AiServerShipObjectInterface::isFastAxisEnabled());
+
+			systemMessage += Unicode::narrowToWide(AiServerShipObjectInterface::isFastAxisEnabled() ? "[ENABLED] AI ships now use the fast axis." : "[DISABLED] AI ships are no longer using the fast axis.");
+			
+			Chat::sendSystemMessage(*serverObject, systemMessage, Unicode::emptyString);
+		}
+
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+#endif //_DEBUG
+	else
+	{
+		result += getErrorMessage(argv[0], ERR_NO_HANDLER);
+	}
+
+	return true;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpaceAi.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpaceAi.h
new file mode 100644
index 00000000..260c5528
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpaceAi.h
@@ -0,0 +1,38 @@
+// ======================================================================
+//
+// ConsoleCommandParserSpaceAi.h
+// Copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserSpaceAi_H
+#define INCLUDED_ConsoleCommandParserSpaceAi_H
+
+#include "sharedCommandParser/CommandParser.h"
+#include "sharedFoundation/DynamicVariableList.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to objvars
+*/
+
+class ConsoleCommandParserSpaceAi : public CommandParser
+{
+public:
+
+	ConsoleCommandParserSpaceAi();
+	virtual bool performParsing(const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node);
+	
+private:
+
+	ConsoleCommandParserSpaceAi(const ConsoleCommandParserSpaceAi & rhs);
+	ConsoleCommandParserSpaceAi & operator =(const ConsoleCommandParserSpaceAi & rhs);
+	
+	int getArgumentType(const Unicode::NarrowString &arg) const;
+	void listObjvars(const DynamicVariableList::NestedList &objvarList, String_t &result, int tabCount, bool withPackingData);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserSpaceAi_H
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpawner.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpawner.cpp
new file mode 100644
index 00000000..bfa49123
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpawner.cpp
@@ -0,0 +1,130 @@
+// ======================================================================
+//
+// ConsoleCommandParserSpawner.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserSpawner.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/CreatureObject.h"
+
+#include <cstdio>
+#include <hash_set>
+
+// ======================================================================
+
+namespace
+{
+	namespace CommandNames
+	{
+#define MAKE_COMMAND(a) const char * const a = #a
+		MAKE_COMMAND(showQueue);
+		MAKE_COMMAND(showCreatures);
+#undef MAKE_COMMAND
+	}
+
+	const CommandParser::CmdInfo cmds[] =
+	{
+		{CommandNames::showQueue,        0, "",                     "Lists players on the spawn queue."},
+		{CommandNames::showCreatures,    0, "[pc|npc]",             "Lists all creatures on the server."},
+		{"", 0, "", ""} // this must be last
+	};
+
+}
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserSpawner::ConsoleCommandParserSpawner (void) :
+CommandParser ("Spawner", 0, "...", "Spawner related commands.", 0)
+{
+	createDelegateCommands (cmds);
+}
+
+//----------------------------------------------------------------------
+
+
+bool ConsoleCommandParserSpawner::performParsing (const NetworkId &, const StringVector_t & argv, const String_t & , String_t & result, const CommandParser *)
+{			
+	// ----------------------------------------------------------------
+	
+	if (isCommand (argv[0], CommandNames::showQueue))
+	{
+		CreatureObject::showSpawnQueue(result);
+		return true;
+	}
+
+	else if(isCommand (argv[0], CommandNames::showCreatures))
+	{
+		bool npcOnly = false;
+		bool pcOnly = false;
+		if(argv.size() >= 2)
+		{
+			std::string arg2 = Unicode::wideToNarrow(argv[1]);
+			if(arg2 == "npc")
+			{
+				npcOnly = true;
+			}
+			else if(arg2 == "pc")
+			{
+				pcOnly = true;
+			}
+		}
+
+		static const Unicode::String header(Unicode::narrowToWide(std::string("Creature Listing - ID: POS: Auth Server: Template Name\n")));
+		result += header;
+		const CreatureObject::AllCreaturesSet & creatureList = CreatureObject::getAllCreatures();
+		CreatureObject::AllCreaturesSet::const_iterator i;
+		int count = 0;
+		for(i = creatureList.begin(); i != creatureList.end(); ++i)
+		{
+			const CreatureObject * creature = (*i);
+			if(creature)
+			{
+				if(pcOnly && (!creature->isPlayerControlled()) )
+					continue;
+				if(npcOnly && creature->isPlayerControlled())
+					continue;
+
+				std::string creatureEntry = creature->getNetworkId().getValueString();
+				creatureEntry += ": ";
+
+				char locBuffer[32] = {"\0"};
+				Vector loc = creature->getTransform_o2w().getPosition_p();
+				snprintf(locBuffer, sizeof(locBuffer), "%.0f, %.0f: ", loc.x, loc.z);
+				creatureEntry += locBuffer;
+
+				snprintf(locBuffer, sizeof(locBuffer), "%lu: ", creature->getAuthServerProcessId());
+				creatureEntry += locBuffer;
+				creatureEntry += creature->getObjectTemplateName();
+
+				creatureEntry += "\n";
+
+				result += Unicode::narrowToWide(creatureEntry);
+				count++;
+			}
+		}
+		char countBuffer[32] = {"\0"};
+		snprintf(countBuffer, sizeof(countBuffer), "%d creatures listed: ", count);
+		result += Unicode::narrowToWide(std::string(countBuffer));
+		return true;
+	}
+
+	
+	else
+	{
+		result += getErrorMessage (argv[0], ERR_NO_HANDLER);
+		return false;
+	}
+	
+	return true;
+}
+
+// ======================================================================
+
+
+
+
+
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpawner.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpawner.h
new file mode 100644
index 00000000..d4b5c960
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpawner.h
@@ -0,0 +1,45 @@
+// ======================================================================
+//
+// ConsoleCommandParserSpawner.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserSpawner_H
+#define INCLUDED_ConsoleCommandParserSpawner_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to Spawners
+*/
+
+class ConsoleCommandParserSpawner : 
+public CommandParser
+{
+public:
+                                 ConsoleCommandParserSpawner ();
+    virtual bool                 performParsing (const NetworkId & userId, const StringVector_t & argv,const String_t & originalCommand,String_t & result,const CommandParser * node);
+	
+private:
+                                 ConsoleCommandParserSpawner (const ConsoleCommandParserSpawner & rhs);
+    ConsoleCommandParserSpawner &  operator= (const ConsoleCommandParserSpawner & rhs);    
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserSpawner_H
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserVeteran.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserVeteran.cpp
new file mode 100644
index 00000000..0152e24d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserVeteran.cpp
@@ -0,0 +1,157 @@
+// ======================================================================
+//
+// ConsoleCommandParserVeteran.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleCommandParserVeteran.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/VeteranRewardManager.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedObject/NetworkIdManager.h"
+
+//-----------------------------------------------------------------------
+
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"getRewardInfo",       1,"<player oid>","Get the reward status of a player."},
+	{"claimReward",         3,"<player oid> <event tag> <reward item tag>","For testing, claim a reward using the specified event."},
+	{"launchBrowser",       1,"<url>","Test launching a web browser."},
+	{"setOverrideAccountAge",1,"<age>","For testing, set all accounts as being the speficied age (in days)"},
+	{"",                    0, "", ""} // this must be last
+};
+
+ConsoleCommandParserVeteran::ConsoleCommandParserVeteran() :
+		CommandParser ("veteran", 0, "...", "commands for the veteran reward system", 0)
+{
+	createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------------
+
+bool ConsoleCommandParserVeteran::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & /* originalMessage */, String_t & result, const CommandParser *)
+{
+	if (isCommand( argv [0], "getRewardInfo"))
+	{
+		NetworkId targetPlayer(Unicode::wideToNarrow (argv[1]));
+		ServerObject const * const so = safe_cast<ServerObject const *>(NetworkIdManager::getObjectById(targetPlayer));
+		Client const * const client = so ? so->getClient() : NULL;
+		if (client)
+		{
+			std::string output;
+
+			// Claimed Rewards:
+			std::vector<std::pair<NetworkId, std::string> > const & accountConsumedRewardEvents = client->getConsumedRewardEvents();
+			std::vector<std::pair<NetworkId, std::string> > const & accountClaimedRewardItems = client->getClaimedRewardItems();
+			std::vector<std::string> localConsumedRewardEvents;
+			VeteranRewardManager::getConsumedEvents(*so, localConsumedRewardEvents);
+			std::vector<std::string> localClaimedRewardItems;
+			VeteranRewardManager::getClaimedItems(*so, localClaimedRewardItems);
+
+			std::vector<std::pair<NetworkId, std::string> >::const_iterator i;
+			output += "Consumed reward events (login server db):  ";
+			for (i = accountConsumedRewardEvents.begin(); i != accountConsumedRewardEvents.end(); ++i)
+			{
+				if (i != accountConsumedRewardEvents.begin())
+					output += ", ";
+				output += '(' + i->first.getValueString() + ") " + i->second;
+			}
+			output += "\nClaimed reward items (login server db):  ";
+			for (i = accountClaimedRewardItems.begin(); i != accountClaimedRewardItems.end(); ++i)
+			{
+				if (i != accountClaimedRewardItems.begin())
+					output += ", ";
+				output += '(' + i->first.getValueString() + ") " + i->second;
+			}
+
+			std::vector<std::string>::const_iterator j;
+			output += "\nConsumed reward events (cluster db):  ";
+			for (j = localConsumedRewardEvents.begin(); j != localConsumedRewardEvents.end(); ++j)
+			{
+				if (j != localConsumedRewardEvents.begin())
+					output += ", ";
+				output += *j;
+			}
+			output += "\nClaimed reward items (cluster db):  ";
+			for (j = localClaimedRewardItems.begin(); j != localClaimedRewardItems.end(); ++j)
+			{
+				if (j != localClaimedRewardItems.begin())
+					output += ", ";
+				output += *j;
+			}
+			output += "\n";
+
+			// Criteria used for granting rewards:
+			unsigned int const entitledTime = client->getEntitlementEntitledTime();
+			uint32 const gameFeatures = client->getGameFeatures();
+			bool const adminLogin = client->isUsingAdminLogin();
+			char buffer[256];
+			snprintf(buffer,sizeof(buffer),"Entitled time:  %u\nGame features:  %lu\nUsing admin login:  %s\n",
+					 entitledTime, gameFeatures, adminLogin ? "true" : "false");
+			buffer[sizeof(buffer)-1]='\0';
+			output += buffer;
+
+			result += Unicode::narrowToWide(output);
+		}
+		else
+			result += getErrorMessage(argv[0],ERR_INVALID_OBJECT);
+	}
+	if (isCommand( argv [0], "claimReward"))
+	{
+		NetworkId targetPlayer(Unicode::wideToNarrow(argv[1]));
+		ServerObject const * const so = safe_cast<ServerObject const *>(NetworkIdManager::getObjectById(targetPlayer));
+		CreatureObject const * const playerCreature = so ? so->asCreatureObject() : NULL;
+		if (!playerCreature)
+			result += getErrorMessage(argv[0],ERR_INVALID_OBJECT);
+		else
+		{
+			std::string event(Unicode::wideToNarrow(argv[2]));
+			std::string item(Unicode::wideToNarrow(argv[3]));
+
+			std::string resultMessage;
+			if (VeteranRewardManager::claimRewards(*playerCreature, event, item, &resultMessage))
+				result += Unicode::narrowToWide("returned true");
+			else
+				result += Unicode::narrowToWide("returned false, message:  " + resultMessage);
+		}
+	}
+	if (isCommand( argv [0], "launchBrowser"))
+	{
+		std::string url(Unicode::wideToNarrow(argv[1]));
+		ServerObject const * const so = safe_cast<ServerObject const *>(NetworkIdManager::getObjectById(userId));
+		Client const * const client = so ? so->getClient() : NULL;
+		if (client)
+		{
+			client->launchWebBrowser(url);
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+			result+=Unicode::narrowToWide("Could not get Client object");		
+	}
+	if (isCommand( argv [0], "setOverrideAccountAge"))
+	{
+		if (ConfigServerGame::getVeteranDebugEnableOverrideAccountAge())
+		{
+			int age(atoi(Unicode::wideToNarrow(argv[1]).c_str()));
+			VeteranRewardManager::setOverrideAccountAge(age);
+			ServerMessageForwarding::beginBroadcast();
+			ServerMessageForwarding::send(GenericValueTypeMessage<int>("SetOverrideAccountAgeMessage",age));
+			ServerMessageForwarding::end();
+			
+			result += getErrorMessage(argv[0], ERR_SUCCESS);
+		}
+		else
+			result += Unicode::narrowToWide("\"veteranDebugEnableOverrideAccountAge\" must be set to \"true\" in the server config file to use this feature.");
+	}
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserVeteran.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserVeteran.h
new file mode 100644
index 00000000..03b68ea8
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserVeteran.h
@@ -0,0 +1,32 @@
+// ======================================================================
+//
+// ConsoleCommandParserVeteran.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserVeteran_H
+#define INCLUDED_ConsoleCommandParserVeteran_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to the veteran rewards system.
+*/
+
+class ConsoleCommandParserVeteran : public CommandParser
+{
+public:
+	                          ConsoleCommandParserVeteran ();
+	virtual bool              performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node);
+	
+private:
+	                          ConsoleCommandParserVeteran (const ConsoleCommandParserVeteran & rhs);
+	ConsoleCommandParserVeteran &  operator= (const ConsoleCommandParserVeteran & rhs);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserVeteran_H
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserVoice.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserVoice.cpp
new file mode 100644
index 00000000..50fee94b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserVoice.cpp
@@ -0,0 +1,238 @@
+// ======================================================================
+//
+// ConsoleCommandParserVoice.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ConsoleCommandParserVoice.h"
+#include "UnicodeUtils.h"
+#include "serverGame/Chat.h"
+#include "sharedLog/Log.h"
+//#include "serverGame/PlayerCreatureController.h"
+//#include "serverGame/PlayerObject.h"
+//#include "serverGame/ServerWorld.h"
+#include "sharedNetworkMessages/VoiceChatMiscMessages.h"
+
+
+// ======================================================================
+
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"channelannounce", 3, "<oid> <channelName> <channelURI>", "Tell a client about a channel without checking if it exitsts."},
+	{"channeljoin", 4, "<oid> <channelName> <channelURI> <channelPassword>", "Force a client to join a channel"},
+	{"channelleave", 2, "<oid> <channelName>", "Tell a client to forget about and leave a channel"},
+	{"channelcreate", 1, "<channelName>", "Create a voice chat room. Give full path ie. SWG.cluster.chanName"},
+	{"channeldestroy", 1, "<channelName>", "Destroy a voice chat room (name must be fully qualified ie SWG.clustername.channelname)"},
+	{"addtochannel", 2, "<oid> <channelName>", "Give a client access to a channel. Channel must exist."},
+	{"removefromchannel", 2, "<oid> <channelName>", "Remove a client's access to a channel"},
+	{"channelcommand", 3, "<destUser> <channelName> <command> <banTimeout>", "Execute a moderator command in the given channel (fully qualify channel name). Commands are [mute unmute kick hangup invite ban unban chan_lock chan_unlock mute_all unmute_all add_moderator delete_moderator add_acl delete_acl]"},
+	{"globalchannelmessage", 2, "<channelName> <message> [remove]", "Broadcast a global channel message to everyone on this cluster. Removes if remove != 0."},
+	{"allclusterglobalchannelmessage", 2, "<channelName> <message> [remove]", "Broadcast a global channel message to everyone on ALL CLUSTERS. Removes if remove != 0."},
+	{"", 0, "", ""} // this must be last
+};
+
+
+//-----------------------------------------------------------------
+
+ConsoleCommandParserVoice::ConsoleCommandParserVoice (void) :
+CommandParser ("voice", 0, "...", "Voice chat related commands.", 0)
+{
+    createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------
+
+
+bool ConsoleCommandParserVoice::performParsing (const NetworkId & userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+    NOT_NULL (node);
+    UNREF(originalCommand);
+	UNREF(userId);
+
+	//CreatureObject * creatureObject = safe_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(userId));
+	//PlayerObject * playerObject = const_cast<PlayerObject *>(PlayerCreatureController::getPlayerObject(creatureObject));
+
+	//-----------------------------------------------------------------
+
+	static Unicode::String requestSubmittedMessage = Unicode::narrowToWide("request successfully submitted");
+
+	if (isAbbrev(argv[0], "channelannounce"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		std::string name = Unicode::wideToNarrow(argv[2]);
+		std::string uri = Unicode::wideToNarrow(argv[3]);
+		std::string password = "";
+
+		if(Chat::debugTellClientAboutRoom(oid, name, uri, password, false, false))
+		{
+			result += requestSubmittedMessage;
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		}
+		return true;
+	}
+
+	if (isAbbrev(argv[0], "channeljoin"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		std::string name = Unicode::wideToNarrow(argv[2]);
+		std::string uri = Unicode::wideToNarrow(argv[3]);
+		std::string password = Unicode::wideToNarrow(argv[4]);
+		if(Chat::debugTellClientAboutRoom(oid, name, uri, password, true, false))
+		{
+			result += requestSubmittedMessage;
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		}
+		return true;
+	}
+
+	if (isAbbrev(argv[0], "channelleave"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		std::string name = Unicode::wideToNarrow(argv[2]);
+		std::string uri = "";
+		std::string password = "";
+		if(Chat::debugTellClientAboutRoom(oid, name, uri, password, false, true))
+		{
+			result += requestSubmittedMessage;
+		}
+		else
+		{
+			result += getErrorMessage(argv[0], ERR_INVALID_OBJECT);
+		}
+		return true;
+	}
+
+	if (isAbbrev(argv[0], "addtochannel"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		std::string channelName = Unicode::wideToNarrow(argv[2]);
+		Chat::requestAddClientToChannel(oid, "", channelName, false);
+		result += requestSubmittedMessage;
+
+		return true;
+	}
+
+	if (isAbbrev(argv[0], "removefromchannel"))
+	{
+		NetworkId oid(Unicode::wideToNarrow(argv[1]));
+		std::string channelName = Unicode::wideToNarrow(argv[2]);
+		Chat::requestRemoveClientFromChannel(oid, "", channelName);
+		result += requestSubmittedMessage;
+
+		return true;
+	}
+
+	if (isAbbrev(argv[0], "channelcreate"))
+	{
+		std::string name = Unicode::wideToNarrow(argv[1]);
+
+		Chat::requestGetChannel(name, name,"",false);
+		result += requestSubmittedMessage;
+
+		return true;
+	}
+
+	if (isAbbrev(argv[0], "channeldestroy"))
+	{
+		std::string name = Unicode::wideToNarrow(argv[1]);
+
+		Chat::requestDestroyChannel(name);
+		result += requestSubmittedMessage;
+
+		return true;
+	}
+
+	if(isAbbrev(argv[0], "channelcommand"))
+	{
+		static bool mapInited = false;
+		static std::map<std::string, uint32> commandTypeLookupMap;
+		if(!mapInited)
+		{
+			commandTypeLookupMap["mute"] = COMMAND_MUTE;
+			commandTypeLookupMap["unmute"] = COMMAND_UNMUTE;
+			commandTypeLookupMap["kick"] = COMMAND_KICK;
+			commandTypeLookupMap["hangup"] = COMMAND_HANGUP;
+			commandTypeLookupMap["invite"] = COMMAND_INVITE;
+			commandTypeLookupMap["ban"] = COMMAND_BAN;
+			commandTypeLookupMap["unban"] = COMMAND_UNBAN;
+			commandTypeLookupMap["chan_lock"] = COMMAND_CHAN_LOCK;
+			commandTypeLookupMap["chan_unlock"] = COMMAND_CHAN_UNLOCK;
+			commandTypeLookupMap["mute_all"] = COMMAND_MUTE_ALL;
+			commandTypeLookupMap["unmute_all"] = COMMAND_UNMUTE_ALL;
+			commandTypeLookupMap["add_moderator"] = COMMAND_ADD_MODERATOR;
+			commandTypeLookupMap["delete_moderaror"] = COMMAND_DELETE_MODERATOR;
+			commandTypeLookupMap["add_acl"] = COMMAND_ADD_ACL;
+			commandTypeLookupMap["delete_acl"] = COMMAND_DELETE_ACL;
+			mapInited = true;
+		}
+
+		std::string destUser = Unicode::wideToNarrow(argv[1]);
+		std::string destChan = Unicode::wideToNarrow(argv[2]);
+		std::string strCommandType = Unicode::wideToNarrow(argv[3]);
+		uint32 banTimeout = argv.size() > 4 ? static_cast<uint32>(atoi(Unicode::wideToNarrow(argv[4]).c_str())) : 0;
+
+		std::map<std::string,uint32>::const_iterator i = commandTypeLookupMap.find(strCommandType);
+		if(i != commandTypeLookupMap.end())
+		{
+			//@TODO: send a valid source user that will always have moderator powers
+			uint32 commandType = i->second;
+			Chat::requestChannelCommand("",destUser,destChan,commandType,banTimeout);
+			result += requestSubmittedMessage;
+		}
+		else
+		{
+			result += Unicode::narrowToWide("Unknown channel command type");
+		}
+		return true;
+	}
+
+	if (isAbbrev(argv[0], "globalchannelmessage"))
+	{
+		std::string name = Unicode::getTrim(Unicode::wideToNarrow(argv[1]));
+		std::string message = Unicode::wideToNarrow(argv[2]);
+		bool isRemove = argv.size() > 3 ? (atoi(Unicode::wideToNarrow(argv[3]).c_str()) != 0) : 0;
+
+		LOG("CustomerService", ("BroadcastVoiceChannel: GameServer::globalchannelmessage issued by id(%s) chan(%s) text(%s) remove(%d)", 
+			userId.getValueString().c_str(), name.c_str(), message.c_str(), (isRemove ? 1 : 0)));
+
+		Chat::requestBroadcastGlobalChannelMessage(name, message, isRemove, false);
+		result += requestSubmittedMessage;
+
+		return true;
+	}
+
+	if(isAbbrev(argv[0], "allclusterglobalchannelmessage"))
+	{
+		std::string name = Unicode::getTrim(Unicode::wideToNarrow(argv[1]));
+		std::string message = Unicode::wideToNarrow(argv[2]);
+		bool isRemove = argv.size() > 3 ? (atoi(Unicode::wideToNarrow(argv[3]).c_str()) != 0) : 0;
+
+		LOG("CustomerService", ("BroadcastVoiceChannel: GameServer::allclusterglobalchannelmessage issued by id(%s) chan(%s) text(%s) remove(%d)", 
+			userId.getValueString().c_str(), name.c_str(), message.c_str(), (isRemove ? 1 : 0)));
+
+		Chat::requestBroadcastGlobalChannelMessage(name, message, isRemove, true);
+		result += requestSubmittedMessage;
+
+		return true;
+	}
+
+	result += getErrorMessage(argv[0], ERR_NO_HANDLER);
+
+    return true;
+}
+
+
+// ======================================================================
+
+
+
+
+
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserVoice.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserVoice.h
new file mode 100644
index 00000000..f4dcce0c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserVoice.h
@@ -0,0 +1,48 @@
+// ======================================================================
+//
+// ConsoleCommandParserVoice.h
+// copyright (c) 2008 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsoleCommandParserVoice_H
+#define INCLUDED_ConsoleCommandParserVoice_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to voice chat
+*/
+
+class ConsoleCommandParserVoice : public CommandParser
+{
+public:
+    ConsoleCommandParserVoice ();
+    virtual bool performParsing (const NetworkId & userId, 
+								 const StringVector_t & argv,
+                                 const String_t & originalCommand,
+                                 String_t & result,
+                                 const CommandParser * node);
+	
+private:
+    ConsoleCommandParserVoice (const ConsoleCommandParserVoice & rhs);
+    ConsoleCommandParserVoice &  operator= (const ConsoleCommandParserVoice & rhs);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ConsoleCommandParserVoice_H
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleManager.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleManager.cpp
new file mode 100644
index 00000000..46e4a6fd
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleManager.cpp
@@ -0,0 +1,142 @@
+// ConsoleMgr.cpp
+// copyright 2000 Verant Interactive
+// Author: Chris Mayer
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsoleManager.h"
+
+#include <cstdio>
+#include <cstdlib>
+
+#include "SwgGameServer/ConsoleCommandParserCombatEngine.h"
+#include "SwgGameServer/ConsoleCommandParserCombatEngine.h"
+#include "serverGame/Client.h"
+#include "serverGame/ConsoleCommandParserAi.h"
+#include "serverGame/ConsoleCommandParserCity.h"
+#include "serverGame/ConsoleCommandParserCollection.h"
+#include "serverGame/ConsoleCommandParserCraft.h"
+#include "serverGame/ConsoleCommandParserDefault.h"
+#include "serverGame/ConsoleCommandParserGuild.h"
+#include "serverGame/ConsoleCommandParserManufacture.h"
+#include "serverGame/ConsoleCommandParserMessageTo.h"
+#include "serverGame/ConsoleCommandParserMoney.h"
+#include "serverGame/ConsoleCommandParserNpc.h"
+#include "serverGame/ConsoleCommandParserObject.h"
+#include "serverGame/ConsoleCommandParserObjvar.h"
+#include "serverGame/ConsoleCommandParserPvp.h"
+#include "serverGame/ConsoleCommandParserResource.h"
+#include "serverGame/ConsoleCommandParserScript.h"
+#include "serverGame/ConsoleCommandParserServer.h"
+#include "serverGame/ConsoleCommandParserShip.h"
+#include "serverGame/ConsoleCommandParserSkill.h"
+#include "serverGame/ConsoleCommandParserSpaceAi.h"
+#include "serverGame/ConsoleCommandParserSpawner.h"
+#include "serverGame/ConsoleCommandParserVeteran.h"
+#include "serverGame/ConsoleCommandParserVoice.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedCommandParser/CommandParser.h"
+#include "sharedNetworkMessages/ConsoleChannelMessages.h"
+
+CommandParser * ConsoleMgr::ms_parser = NULL;
+
+
+//-----------------------------------------------------------------------
+
+void ConsoleMgr::install()
+{
+	if (ms_parser == NULL)
+	{
+		ms_parser = new ConsoleCommandParserDefault();
+		ms_parser->addSubCommand(new ConsoleCommandParserCombatEngine ());
+		ms_parser->addSubCommand(new ConsoleCommandParserCraft        ());
+		ms_parser->addSubCommand(new ConsoleCommandParserManufacture  ());
+		ms_parser->addSubCommand(new ConsoleCommandParserMoney        ());
+		ms_parser->addSubCommand(new ConsoleCommandParserNpc          ());
+		ms_parser->addSubCommand(new ConsoleCommandParserObject       ());
+		ms_parser->addSubCommand(new ConsoleCommandParserObjvar       ());
+		ms_parser->addSubCommand(new ConsoleCommandParserResource     ());
+		ms_parser->addSubCommand(new ConsoleCommandParserScript       ());
+		ms_parser->addSubCommand(new ConsoleCommandParserServer       ());
+		ms_parser->addSubCommand(new ConsoleCommandParserSkill        ());
+		ms_parser->addSubCommand(new ConsoleCommandParserSpawner      ());
+		ms_parser->addSubCommand(new ConsoleCommandParserShip         ());
+		ms_parser->addSubCommand(new ConsoleCommandParserSpaceAi      ());
+		ms_parser->addSubCommand(new ConsoleCommandParserAi           ());
+		ms_parser->addSubCommand(new ConsoleCommandParserVeteran      ());
+		ms_parser->addSubCommand(new ConsoleCommandParserMessageTo    ());
+		ms_parser->addSubCommand(new ConsoleCommandParserPvp          ());
+		ms_parser->addSubCommand(new ConsoleCommandParserGuild        ());
+		ms_parser->addSubCommand(new ConsoleCommandParserCollection   ());
+		ms_parser->addSubCommand(new ConsoleCommandParserVoice        ());
+		ms_parser->addSubCommand(new ConsoleCommandParserCity         ());
+	}
+}	// ConsoleMgr::install
+
+//-----------------------------------------------------------------------
+
+void ConsoleMgr::remove()
+{
+	if (ms_parser != NULL)
+	{
+		delete ms_parser;
+		ms_parser = NULL;
+	}
+}	// ConsoleMgr::remove
+
+//-----------------------------------------------------------------------
+
+void ConsoleMgr::processString(const std::string & msg, Client *from, uint32 msgId)
+{
+    DEBUG_REPORT_LOG_PRINT(true, ("Console Message Received: %s\n",(msg.c_str())));
+
+	if (ms_parser == NULL)
+	{
+		DEBUG_WARNING(true, ("Console command parser has not been created!"));
+		return;
+	}
+
+	CommandParser::String_t wideMsg = Unicode::narrowToWide(msg);
+	CommandParser::String_t result;
+
+	const CommandParser::ErrorType retval = ms_parser->parse(from->getCharacterObjectId (), wideMsg, result);
+	if (retval == CommandParser::ERR_NO_HANDLER)
+	{
+		// @todo: make this message lookup from string table
+		result += Unicode::narrowToWide("Console Parser Failed!");
+	}
+	else if (result.empty())
+		result += Unicode::narrowToWide("Command [%s%s] succeeded.") + wideMsg.substr(0, 8) + ((wideMsg.size() > 8) ? Unicode::narrowToWide("...") : Unicode::emptyString);
+
+	broadcastString(result, from, msgId);
+}
+
+//-----------------------------------------------------------------------
+
+void ConsoleMgr::broadcastString(const std::string & msg, Client *to, uint32 msgId)
+{
+    ConGenericMessage m(msg, msgId);
+
+	DEBUG_WARNING(! to, ("Do not BROADCAST messages anymore! specify which client to send to or don't send the message\n"));
+	if (to)
+	{
+		to->send(m, true);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ConsoleMgr::broadcastString(const std::string & msg, NetworkId to, uint32 msgId)
+{
+	ServerObject * object = ServerWorld::findObjectByNetworkId(to, true);
+	if (object)
+	{
+		if (object->getClient())
+			broadcastString(msg, object->getClient(), msgId);
+	}
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleManager.h b/engine/server/library/serverGame/src/shared/console/ConsoleManager.h
new file mode 100644
index 00000000..f32ac0a3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ConsoleManager.h
@@ -0,0 +1,41 @@
+// ConsoleMgr.h
+// copyright 2000 Verant Interactive
+// Author: Chris Mayer
+
+#ifndef INCLUDED_ConsoleMgr_H
+#define INCLUDED_ConsoleMgr_H
+
+#include "sharedCommandParser/CommandParser.h"
+#include "UnicodeUtils.h"
+
+class Client;
+
+
+class ConsoleMgr
+{
+public:
+	static void install();
+	static void remove();
+
+	static void processString(const std::string & msg, Client *from = NULL,uint32 msgId = 0);
+	static void broadcastString(const std::string & msg, Client *to = NULL, uint32 msgId = 0);
+	static void broadcastString(const CommandParser::String_t & msg, Client *to = NULL, uint32 msgId = 0);
+	static void broadcastString(const std::string & msg, NetworkId to, uint32 msgId = 0);
+
+private:
+    ConsoleMgr();
+    ~ConsoleMgr();
+
+    static CommandParser *          ms_parser;
+};
+
+
+inline void ConsoleMgr::broadcastString(const CommandParser::String_t & msg, Client *to, uint32 msgId)
+{
+    broadcastString(Unicode::wideToNarrow(msg), to, msgId);
+}
+
+
+#endif // INCLUDED_ConsoleMgr_H
+
+
diff --git a/engine/server/library/serverGame/src/shared/console/ObjectCommandParserGetAttributes.cpp b/engine/server/library/serverGame/src/shared/console/ObjectCommandParserGetAttributes.cpp
new file mode 100644
index 00000000..c7340fb7
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ObjectCommandParserGetAttributes.cpp
@@ -0,0 +1,58 @@
+// ======================================================================
+//
+// ObjectCommandParserGetAttributes.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ObjectCommandParserGetAttributes.h"
+
+#include "serverScript/GameScriptObject.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ServerObject.h"
+
+
+// ======================================================================
+
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"hitpoints",  2, "<oid> <value>",                "View an object's hitpoints."},
+	{"", 0, "", ""} // this must be last
+};
+
+
+//-----------------------------------------------------------------
+
+ObjectCommandParserGetAttributes::ObjectCommandParserGetAttributes (void) :
+CommandParser ("getAttribute", 0, "...", "Commands to set attributes on objects", 0)
+{
+	createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------
+
+
+bool ObjectCommandParserGetAttributes::performParsing (NetworkId userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+	NOT_NULL (node);
+
+	UNREF(originalCommand);
+	UNREF (userId);
+
+	//-----------------------------------------------------------------
+
+	if (isAbbrev( argv [0], "hitpoints"))
+	{
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	//-----------------------------------------------------------------
+	else
+	{
+		result += getErrorMessage(argv[0], ERR_NO_HANDLER);
+	}
+
+	return true;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/console/ObjectCommandParserGetAttributes.h b/engine/server/library/serverGame/src/shared/console/ObjectCommandParserGetAttributes.h
new file mode 100644
index 00000000..b3b4a8aa
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ObjectCommandParserGetAttributes.h
@@ -0,0 +1,32 @@
+// ======================================================================
+//
+// ObjectCommandParserGetAttributes.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ObjectCommandParserGetAttributes_H
+#define INCLUDED_ObjectCommandParserGetAttributes_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to scripts
+*/
+
+class ObjectCommandParserGetAttributes : public CommandParser
+{
+public:
+	                          ObjectCommandParserGetAttributes ();
+	virtual bool              performParsing (NetworkId userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node);
+	
+private:
+	                          ObjectCommandParserGetAttributes (const ObjectCommandParserGetAttributes & rhs);
+	ObjectCommandParserGetAttributes &  operator= (const ObjectCommandParserGetAttributes & rhs);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ObjectCommandParserGetAttributes_H
diff --git a/engine/server/library/serverGame/src/shared/console/ObjectCommandParserSetAttributes.cpp b/engine/server/library/serverGame/src/shared/console/ObjectCommandParserSetAttributes.cpp
new file mode 100644
index 00000000..698eb5dd
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ObjectCommandParserSetAttributes.cpp
@@ -0,0 +1,58 @@
+// ======================================================================
+//
+// ObjectCommandParserSetAttributes.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ObjectCommandParserSetAttributes.h"
+
+#include "serverScript/GameScriptObject.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ServerObject.h"
+
+
+// ======================================================================
+
+static const CommandParser::CmdInfo cmds[] =
+{
+	{"hitpoints",  2, "<oid> <value>",                "Modify an object's hitpoints."},
+	{"", 0, "", ""} // this must be last
+};
+
+
+//-----------------------------------------------------------------
+
+ObjectCommandParserSetAttributes::ObjectCommandParserSetAttributes (void) :
+CommandParser ("setAttribute", 0, "...", "Commands to set attributes on objects", 0)
+{
+	createDelegateCommands (cmds);
+}
+
+//-----------------------------------------------------------------
+
+
+bool ObjectCommandParserSetAttributes::performParsing (NetworkId userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node)
+{
+	NOT_NULL (node);
+
+	UNREF(originalCommand);
+	UNREF (userId);
+
+	//-----------------------------------------------------------------
+
+	if (isAbbrev( argv [0], "hitpoints"))
+	{
+		result += getErrorMessage(argv[0], ERR_SUCCESS);
+	}
+	//-----------------------------------------------------------------
+	else
+	{
+		result += getErrorMessage(argv[0], ERR_NO_HANDLER);
+	}
+
+	return true;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/console/ObjectCommandParserSetAttributes.h b/engine/server/library/serverGame/src/shared/console/ObjectCommandParserSetAttributes.h
new file mode 100644
index 00000000..0cb48748
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ObjectCommandParserSetAttributes.h
@@ -0,0 +1,32 @@
+// ======================================================================
+//
+// ObjectCommandParserSetAttributes.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ObjectCommandParserSetAttributes_H
+#define INCLUDED_ObjectCommandParserSetAttributes_H
+
+#include "sharedCommandParser/CommandParser.h"
+
+// ======================================================================
+
+/**
+* Commands that are related to scripts
+*/
+
+class ObjectCommandParserSetAttributes : public CommandParser
+{
+public:
+	                          ObjectCommandParserSetAttributes ();
+	virtual bool              performParsing (NetworkId userId, const StringVector_t & argv, const String_t & originalCommand, String_t & result, const CommandParser * node);
+	
+private:
+	                          ObjectCommandParserSetAttributes (const ObjectCommandParserSetAttributes & rhs);
+	ObjectCommandParserSetAttributes &  operator= (const ObjectCommandParserSetAttributes & rhs);
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_ObjectCommandParserSetAttributes_H
diff --git a/engine/server/library/serverGame/src/shared/console/ServerCommandPermissionManager.cpp b/engine/server/library/serverGame/src/shared/console/ServerCommandPermissionManager.cpp
new file mode 100644
index 00000000..a2917e41
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ServerCommandPermissionManager.cpp
@@ -0,0 +1,89 @@
+// ======================================================================
+//
+// ServerCommandPermissionManager.cpp
+// copyright (c) 2003 Sony Online Entertainment
+//
+// =====================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerCommandPermissionManager.h"
+
+#include "serverGame/Client.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedCommandParser/CommandParser.h"
+#include "sharedLog/Log.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+
+#include "UnicodeUtils.h"
+
+ServerCommandPermissionManager::ServerCommandPermissionManager() :
+		CommandPermissionManager(),
+		m_permissionTable(0)
+{
+	m_permissionTable = DataTableManager::getTable("datatables/admin/command_permissions.iff", true);
+	DEBUG_FATAL(!m_permissionTable, ("Could not open command permissions table"));
+	CommandParser::setPermissionManager(this);
+}
+
+//------------------------------------------------------------------------------------------
+
+ServerCommandPermissionManager::~ServerCommandPermissionManager()
+{
+	DataTableManager::close("command_permissions.iff");
+	CommandParser::setPermissionManager(0);
+}
+
+
+//------------------------------------------------------------------------------------------
+
+bool ServerCommandPermissionManager::isCommandAllowed (const NetworkId & userId, const Unicode::String & commandPath) const
+{
+	// commands sent from the ServerConsole program don't have a client associated from them
+	// although it is possible to  resolve to a ServerObject
+	std::string cmd = Unicode::wideToNarrow(commandPath);
+	if( cmd == "game" )
+	{
+		ServerObject * tmpu = ServerWorld::findObjectByNetworkId(userId);
+		// a ServerConsole command sometimes won't have a ServerObject (first time a cluster receives a command)
+		// a ServerConsole command will never have a Client associated with it
+		if( !tmpu || !tmpu->getClient())
+		{
+			LOG("ServerCommandPermissionManager", ("Allowing permission to execute ServerConsole command.") );
+			return true;
+		}
+		else
+		{
+			LOG("ServerCommandPermissionManager", ("Disallowing permission to execute ServerConsole command because it has a Client associated with it."));
+			return false;
+		}
+	}
+
+	ServerObject * user = ServerWorld::findObjectByNetworkId(userId);
+	if (!user)
+		return false;
+
+	Client* client = user->getClient();
+	if (!client)
+		return false;
+
+	int clientLevel = client->getGodLevel();
+	std::string command = Unicode::wideToNarrow(commandPath);
+	int row = m_permissionTable->searchColumnString( 0, command);
+	int commandLevel = 5;
+	
+	if (row != -1)
+		commandLevel = m_permissionTable->getIntValue(1, row);
+
+	bool retval =  (commandLevel <= clientLevel);
+	if (!retval)
+	{
+		LOG("CustomerService",("Avatar:%s denied command %s because the command level is %d and they are %d", PlayerObject::getAccountDescription(userId).c_str(), command.c_str(), commandLevel, clientLevel));
+	}
+	return retval;
+}
+
+
+//------------------------------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/console/ServerCommandPermissionManager.h b/engine/server/library/serverGame/src/shared/console/ServerCommandPermissionManager.h
new file mode 100644
index 00000000..37a4033b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/console/ServerCommandPermissionManager.h
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// ServerCommandPermissionManager.h
+// copyright (c) 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ServerCommandPermissionManager_H
+#define INCLUDED_ServerCommandPermissionManager_H
+
+
+#include "sharedCommandParser/CommandPermissionManager.h"
+
+class DataTable;
+
+class ServerCommandPermissionManager : public CommandPermissionManager
+{
+
+public:
+	ServerCommandPermissionManager ();
+	virtual ~ServerCommandPermissionManager ();
+
+	/**
+	* the commandPath is a period-seperated path down through the command tree
+	*/
+
+	virtual bool                 isCommandAllowed         (const NetworkId & userId, const Unicode::String & commandPath) const;
+
+protected:
+	ServerCommandPermissionManager (const ServerCommandPermissionManager & rhs);
+	ServerCommandPermissionManager &   operator=(const ServerCommandPermissionManager & rhs);
+
+private:
+
+	DataTable*                  m_permissionTable;
+};
+
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/container/IntangibleVolumeContainer.cpp b/engine/server/library/serverGame/src/shared/container/IntangibleVolumeContainer.cpp
new file mode 100644
index 00000000..556ea540
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/container/IntangibleVolumeContainer.cpp
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// IntangibleVolumeContainer.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/IntangibleVolumeContainer.h"
+
+#include "serverGame/IntangibleObject.h"
+
+// ======================================================================
+
+IntangibleVolumeContainer::IntangibleVolumeContainer(Object & owner, int totalVolume) :
+	VolumeContainer(owner, totalVolume)
+{
+}
+
+//-----------------------------------------------------------------------
+
+IntangibleVolumeContainer::~IntangibleVolumeContainer()
+{
+}
+
+//-----------------------------------------------------------------------
+
+bool IntangibleVolumeContainer::mayAdd(Object const &item, ContainerErrorCode &error) const
+{
+	error = CEC_Success;
+
+	ServerObject const * const so = item.asServerObject();
+	if (so && so->asIntangibleObject())
+		return VolumeContainer::mayAdd(item, error);
+
+	error = CEC_WrongType;
+	return false;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/container/IntangibleVolumeContainer.h b/engine/server/library/serverGame/src/shared/container/IntangibleVolumeContainer.h
new file mode 100644
index 00000000..3f164772
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/container/IntangibleVolumeContainer.h
@@ -0,0 +1,32 @@
+// ===============================================================
+// IntangibleVolumeContainer.h
+// copyright 2002 SonyOnline Interactive
+// All rights reserved
+// ===============================================================
+
+#ifndef	INCLUDED_IntangibleVolumeContainer_H
+#define	INCLUDED_IntangibleVolumeContainer_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedObject/VolumeContainer.h"
+
+
+class IntangibleVolumeContainer : public VolumeContainer
+{
+
+public:
+	IntangibleVolumeContainer(Object& owner, int totalVolume);
+	~IntangibleVolumeContainer();
+
+	virtual bool           mayAdd (const Object& item, ContainerErrorCode& error) const;
+
+private:
+	IntangibleVolumeContainer();
+	IntangibleVolumeContainer(const IntangibleVolumeContainer&);
+	IntangibleVolumeContainer & operator= (const IntangibleVolumeContainer &);
+
+};
+
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/container/TangibleVolumeContainer.cpp b/engine/server/library/serverGame/src/shared/container/TangibleVolumeContainer.cpp
new file mode 100644
index 00000000..1186b2c7
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/container/TangibleVolumeContainer.cpp
@@ -0,0 +1,42 @@
+// ======================================================================
+//
+// TangibleVolumeContainer.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/TangibleVolumeContainer.h"
+
+#include "serverGame/TangibleObject.h"
+
+// ======================================================================
+
+TangibleVolumeContainer::TangibleVolumeContainer(Object &owner, int totalVolume) :
+	VolumeContainer(owner, totalVolume)
+{
+}
+
+// ----------------------------------------------------------------------
+
+TangibleVolumeContainer::~TangibleVolumeContainer()
+{
+}
+
+// ----------------------------------------------------------------------
+
+bool TangibleVolumeContainer::mayAdd(Object const &item, ContainerErrorCode &error) const
+{
+	error = CEC_Success;
+
+	ServerObject const * const so = item.asServerObject();
+	if (so && so->asTangibleObject())
+		return VolumeContainer::mayAdd(item, error);
+
+	error = CEC_WrongType;
+	return false;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/container/TangibleVolumeContainer.h b/engine/server/library/serverGame/src/shared/container/TangibleVolumeContainer.h
new file mode 100644
index 00000000..de989ff6
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/container/TangibleVolumeContainer.h
@@ -0,0 +1,32 @@
+// ===============================================================
+// TangibleVolumeContainer.h
+// copyright 2002 SonyOnline Interactive
+// All rights reserved
+// ===============================================================
+
+#ifndef	INCLUDED_TangibleVolumeContainer_H
+#define	INCLUDED_TangibleVolumeContainer_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedObject/VolumeContainer.h"
+
+
+class TangibleVolumeContainer : public VolumeContainer
+{
+
+public:
+	TangibleVolumeContainer(Object& owner, int totalVolume);
+	~TangibleVolumeContainer();
+
+	virtual bool           mayAdd (const Object& item, ContainerErrorCode& error) const;
+
+private:
+	TangibleVolumeContainer();
+	TangibleVolumeContainer(const TangibleVolumeContainer&);
+	TangibleVolumeContainer & operator= (const TangibleVolumeContainer &);
+
+};
+
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/controller/AiCreatureController.cpp b/engine/server/library/serverGame/src/shared/controller/AiCreatureController.cpp
new file mode 100644
index 00000000..834ac1e2
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/AiCreatureController.cpp
@@ -0,0 +1,3030 @@
+// ======================================================================
+//
+// AiCreatureController.cpp
+//
+// copyright 2003, sony online entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiCreatureController.h"
+
+#include "serverGame/AiMovementBase.h"
+#include "serverGame/AiMovementSwarm.h"
+#include "serverGame/AiMovementFace.h"
+#include "serverGame/AiMovementFlee.h"
+#include "serverGame/AiMovementFollow.h"
+#include "serverGame/AiMovementIdle.h"
+#include "serverGame/AiMovementLoiter.h"
+#include "serverGame/AiMovementMove.h"
+#include "serverGame/AiMovementPathFollow.h"
+#include "serverGame/AiMovementPatrol.h"
+#include "serverGame/AiMovementWander.h"
+#include "serverGame/AiMovementWanderInterior.h"
+#include "serverGame/AiCreatureCombatProfile.h"
+#include "serverGame/AiCreatureData.h"
+#include "serverGame/AiLogManager.h"
+#include "serverGame/CellObject.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/ObjectTracker.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/WeaponObject.h"
+#include "serverNetworkMessages/AiMovementMessage.h"
+#include "serverNetworkMessages/AiCreatureStateMessage.h"
+#include "serverPathfinding/CityPathGraphManager.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedCollision/CollisionUtils.h"
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedCollision/Floor.h"
+#include "sharedCollision/FloorLocator.h"
+#include "sharedCollision/Footprint.h"
+#include "sharedDebug/PerformanceTimer.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFile/FileNameUtils.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/Os.h"
+#include "sharedGame/AiDebugString.h"
+#include "sharedGame/SharedCreatureObjectTemplate.h"
+#include "sharedUtility/Location.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/AIDebuggingMessages.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedObject/AlterResult.h"
+#include "sharedObject/Appearance.h"
+#include "sharedObject/AppearanceTemplate.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedUtility/Location.h"
+#include "UnicodeUtils.h"
+
+#include <algorithm>
+
+using namespace Scripting;
+
+// ======================================================================
+//
+// AiCreatureControllerNamespace
+//
+// ======================================================================
+
+namespace AiCreatureControllerNamespace
+{
+	bool s_installed = false;
+	typedef std::set<Client *> ObserverList;
+
+	PersistentCrcString * s_defaultCreatureName = NULL;
+
+	void remove();
+	Location getLocation(ServerObject const & serverObject);
+}
+
+using namespace AiCreatureControllerNamespace;
+
+//-----------------------------------------------------------------------
+void AiCreatureControllerNamespace::remove()
+{
+	DEBUG_FATAL(!s_installed, ("Not installed."));
+
+	delete s_defaultCreatureName;
+	s_defaultCreatureName = NULL;
+
+	s_installed = false;
+}
+
+//-----------------------------------------------------------------------
+Location AiCreatureControllerNamespace::getLocation(ServerObject const & serverObject)
+{
+	CellProperty const * const cellProperty = serverObject.getParentCell();
+	Object const * const cellObject = (cellProperty != NULL) ? &cellProperty->getOwner() : NULL;
+	Vector const & positionRelativeToCellOrWorld = (cellObject != NULL) ? serverObject.getPosition_c() : serverObject.getPosition_w();
+	NetworkId const & networkIdForCellOrWorld = (cellObject != NULL) ? cellObject->getNetworkId() : NetworkId::cms_invalid;
+
+	return Location(positionRelativeToCellOrWorld, networkIdForCellOrWorld, Location::getCrcBySceneName(serverObject.getSceneId()));
+}
+
+// ======================================================================
+//
+// AiCreatureController
+//
+// ======================================================================
+
+//-----------------------------------------------------------------------
+AICreatureController::AICreatureController(CreatureObject * newOwner)
+ : CreatureController(newOwner)
+ , m_movement(NULL)
+ , m_pendingMovement(NULL)
+ , m_suspendedMovement(NULL)
+ , m_lastStartPosition(newOwner->getPosition_p())
+ , m_lastEndPosition(newOwner->getPosition_p())
+ , m_sleepTimer(0.0f)
+ , m_inPathfindingRegion(false)
+ , m_stuckCounter(0)
+ , m_authority(false)
+ , m_speed(0.0f)
+ , m_aiCreatureData(&AiCreatureData::getDefaultCreatureData())
+ , m_primaryWeaponActions()
+ , m_secondaryWeaponActions()
+ , m_running(false)
+ , m_homeLocation()
+ , m_primaryWeapon()
+ , m_secondaryWeapon()
+ , m_frozen(false)
+ , m_combatStartLocation()
+ , m_retreating(false)
+ , m_retreatingStartTime(0)
+ , m_logging(false)
+ , m_creatureName()
+ , m_hibernationDelay(0)
+ , m_hibernationTimer(0)
+#ifdef _DEBUG
+ , m_aiDebugStringCrc(0)
+#endif // _DEBUG
+ , m_invalidTarget(false)
+{
+	m_creatureName.setSourceObject(this);
+}
+
+//-----------------------------------------------------------------------
+AICreatureController::~AICreatureController()
+{
+	m_movement          = AiMovementBaseNullPtr;
+	m_pendingMovement   = AiMovementBaseNullPtr;
+	m_suspendedMovement = AiMovementBaseNullPtr;
+
+	Object * const owner = getOwner();
+
+	if (owner != NULL && owner->isAuthoritative() && !getHibernate() && m_hibernationDelay.get() > 0 && m_hibernationTimer.get() > 0)
+		ObjectTracker::removeDelayedHibernatingAI();
+
+	if (   (owner != NULL)
+	    && AiLogManager::isLogging(owner->getNetworkId()))
+	{
+		AiLogManager::setLogging(owner->getNetworkId(), false);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void AICreatureController::install()
+{
+	DEBUG_FATAL(s_installed, ("Already installed."));
+
+	LOGC(ConfigServerGame::isAiLoggingEnabled(), "debug_ai", (""));
+	LOGC(ConfigServerGame::isAiLoggingEnabled(), "debug_ai", ("-------- AI DEBUG - NEW SESSION --------"));
+	LOGC(ConfigServerGame::isAiLoggingEnabled(), "debug_ai", (""));
+
+	AiCreatureCombatProfile::install();
+	AiCreatureData::install();
+
+	s_defaultCreatureName = new PersistentCrcString("NonCombatAI", false);
+
+	ExitChain::add(AiCreatureControllerNamespace::remove, "AiCreatureControllerNamespace::remove");
+	s_installed = true;
+}
+
+//-----------------------------------------------------------------------
+
+void AICreatureController::CreatureNameChangedCallback::modified(AICreatureController & target, std::string const & /*oldValue*/, std::string const & newValue, bool /*local*/) const
+{
+	target.onCreatureNameChanged(newValue);
+}
+
+//-----------------------------------------------------------------------
+
+void AICreatureController::handleMessage (int message, float value, const MessageQueue::Data* const data, uint32 flags)
+{
+	CreatureObject * const owner = static_cast<CreatureObject*>(getOwner());
+	if (owner == NULL)
+	{
+		DEBUG_FATAL(true, ("Owner is NULL in AiCreatureController::handleMessage\n"));
+		return;
+	}
+
+	switch (message)
+	{
+		case CM_aiSetMovement:
+			{
+				LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::handleMessage(CM_aiSetMovement) owner(%s)", getDebugInformation().c_str()));
+
+				AiMovementMessage const * const msg = safe_cast<const AiMovementMessage *>(data);
+
+				if (msg != NULL)
+				{
+					if (owner->isAuthoritative())
+					{
+						WARNING(true, ("AICreatureController::handleMessage() owner(%s) Received CM_aiSetMovement(%d) for an authoritative object. Only proxied objects should receive this controller message.", getDebugInformation().c_str(), static_cast<int>(msg->getMovementType())));
+					}
+					else
+					{
+						if (msg->getMovement() != AiMovementBaseNullPtr)
+						{
+							changeMovement(msg->getMovement());
+						}
+						else
+						{
+							changeMovement(AiMovementBaseNullPtr);
+						}
+					}
+				}
+			}
+			break;
+		case CM_aiSetMovementRun:
+			{
+				LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::handleMessage(CM_aiSetMovementRun) owner(%s)", getDebugInformation().c_str()));
+				setMovementRun();
+			}
+			break;
+		case CM_aiSetMovementWalk:
+			{
+				LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::handleMessage(CM_aiSetMovementWalk) owner(%s)", getDebugInformation().c_str()));
+				setMovementWalk();
+			}
+			break;
+		case CM_aiSetCreatureName:
+			{
+				LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::handleMessage(CM_aiSetCreatureName) owner(%s)", getDebugInformation().c_str()));
+				MessageQueueGenericValueType<std::string> const * const msg = safe_cast<MessageQueueGenericValueType<std::string> const *>(data);
+
+				if (msg != NULL)
+				{
+					setCreatureName(msg->getValue());
+				}
+			}
+			break;
+		case CM_aiSetHomeLocation:
+			{
+				LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::handleMessage(CM_aiSetHomeLocation) owner(%s)", getDebugInformation().c_str()));
+				MessageQueueGenericValueType<Location> const * const msg = safe_cast<MessageQueueGenericValueType<Location> const *>(data);
+
+				if (msg != NULL)
+				{
+					setHomeLocation(msg->getValue());
+				}
+			}
+			break;
+		case CM_aiSetFrozen:
+			{
+				LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::handleMessage(CM_aiSetFrozen) owner(%s)", getDebugInformation().c_str()));
+				MessageQueueGenericValueType<bool> const * const msg = safe_cast<MessageQueueGenericValueType<bool> const *>(data);
+
+				if (msg != NULL)
+				{
+					setFrozen(msg->getValue());
+				}
+			}
+			break;
+		case CM_aiSetRetreating:
+			{
+				LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::handleMessage(CM_aiSetRetreating) owner(%s)", getDebugInformation().c_str()));
+				MessageQueueGenericValueType<bool> const * const msg = safe_cast<MessageQueueGenericValueType<bool> const *>(data);
+
+				if (msg != NULL)
+				{
+					setRetreating(msg->getValue());
+				}
+			}
+			break;
+		case CM_aiSetLogging:
+			{
+				LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::handleMessage(CM_aiSetLogging) owner(%s)", getDebugInformation().c_str()));
+				MessageQueueGenericValueType<bool> const * const msg = safe_cast<MessageQueueGenericValueType<bool> const *>(data);
+
+				if (msg != NULL)
+				{
+					setLogging(msg->getValue());
+				}
+			}
+			break;
+		case CM_aiMarkCombatStartLocation:
+			{
+				LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::handleMessage(CM_aiMarkCombatStartLocation) owner(%s)", getDebugInformation().c_str()));
+				markCombatStartLocation();
+			}
+			break;
+		case CM_aiEquipPrimaryWeapon:
+			{
+				LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::handleMessage(CM_aiEquipPrimaryWeapon) owner(%s)", getDebugInformation().c_str()));
+				equipPrimaryWeapon();
+			}
+			break;
+		case CM_aiEquipSecondaryWeapon:
+			{
+				LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::handleMessage(CM_aiEquipSecondaryWeapon) owner(%s)", getDebugInformation().c_str()));
+				equipSecondaryWeapon();
+			}
+			break;
+		case CM_aiUnEquipWeapons:
+			{
+				LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::handleMessage(CM_aiUnEquipWeapons) owner(%s)", getDebugInformation().c_str()));
+				unEquipWeapons();
+			}
+			break;
+		case CM_setHibernationDelay:
+			{
+				MessageQueueGenericValueType<float> const * const msg = safe_cast<MessageQueueGenericValueType<float> const *>(data);
+				if (msg != NULL)
+					setHibernationDelay(msg->getValue());
+			}
+			break;
+		default:
+			CreatureController::handleMessage(message, value, data, flags);
+			break;
+	}
+}
+
+//-----------------------------------------------------------------------
+void AICreatureController::setSpeed(float const speed)
+{
+	m_speed = speed;
+}
+
+//-----------------------------------------------------------------------
+float AICreatureController::getSpeed() const
+{
+	return m_speed;
+}
+
+// ----------------------------------------------------------------------
+
+bool AICreatureController::isRunning ( void ) const
+{
+	float runSpeed = getCreature()->getRunSpeed();
+	float walkSpeed = getCreature()->getWalkSpeed();
+
+	// This is a hack to make swimming always go at a constant speed.
+
+	if (m_running.get())
+	{
+		return (runSpeed != 0);
+	}
+	else
+	{
+		return (walkSpeed == 0);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+float AICreatureController::getAcceleration ( void ) const
+{
+	float base;
+
+	if (isRunning())
+	{
+		base = getCreature()->getAcceleration(SharedCreatureObjectTemplate::MT_run);
+	}
+	else
+	{
+		base = getCreature()->getAcceleration(SharedCreatureObjectTemplate::MT_walk);
+	}
+
+	float scale = getCreature()->getAccelScale();
+	float modifier = getCreature()->getAccelPercent();
+
+	return base * scale * modifier;
+}
+
+// ----------------------------------------------------------------------
+
+void AICreatureController::moveTowards( CellProperty const * cell, Vector const & position, float time )
+{
+	turnToward(cell, position);
+
+	float const stepDistance = getSpeed() * time;
+	IGNORE_RETURN(moveAlongGround( cell, position, stepDistance ));
+}
+
+// ----------------------------------------------------------------------
+
+float AICreatureController::getDistanceToLocationSquared(CellProperty const * cell, Vector const & point) const
+{
+	Vector localPoint = CollisionUtils::transformToCell( cell, point, getCreatureCell() );
+	Vector creaturePos = getCreaturePosition_p();
+
+	return creaturePos.magnitudeBetweenSquared(localPoint);
+}
+
+// ----------------------------------------------------------------------
+
+bool AICreatureController::reachedPoint ( CellProperty const * cell, Vector const & point, float radius ) const
+{
+	float const distanceSquared = getDistanceToLocationSquared(cell, point);
+
+	// We are giving a little tolerance here for floating point error
+
+	return (distanceSquared <= (std::max(0.0f, sqr(radius)) + 0.01f));
+}
+
+// ----------------------------------------------------------------------
+
+void AICreatureController::updateMovementType ( void )
+{
+	CreatureObject * const creature = getCreature();
+
+	Vector newHeading = creature->getPosition_w() - m_lastStartPosition;
+
+	float speed = getSpeed();
+
+	if (newHeading.normalize() && (speed > 0))
+	{
+		setCurrentVelocity(newHeading * speed);
+
+		if (creature->isAuthoritative())
+		{
+			if (isRunning())
+				creature->setMovementRun();
+			else
+				creature->setMovementWalk();
+		}
+	}
+	else
+	{
+		setCurrentVelocity(Vector::zero);
+		if (creature->isAuthoritative())
+			creature->setMovementStationary();
+	}
+}
+
+
+// ----------------------------------------------------------------------
+
+float AICreatureController::realAlter(float time)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiCreatureController::realAlter");
+
+	//DEBUG_REPORT_LOG(true, ("%u\n", Os::getProcessId()));
+
+	float alterResult = CreatureController::realAlter(time);
+	CreatureObject * const creatureOwner = getCreature();
+
+#ifdef _DEBUG
+	AiDebugString * aiDebugString = NULL;
+	if (!creatureOwner->getObservers().empty())
+	{
+		aiDebugString = new AiDebugString;
+	}
+#endif // _DEBUG
+
+	// tick down our hibernation timer
+	if (m_hibernationTimer.get() > 0 && creatureOwner->isAuthoritative())
+	{
+		if (shouldHibernate())
+		{
+//			DEBUG_REPORT_LOG(true, ("[aitest] Hibernation timer countdown, timer = %f, time = %f\n", m_hibernationTimer.get(), time));
+			if (m_hibernationTimer.get() <= m_hibernationDelay.get())
+				m_hibernationTimer = std::max(m_hibernationTimer.get() - time, 0.0f);
+			else
+			{
+				// we want to skip the first frame, due to coming out of hibernation
+				m_hibernationTimer = m_hibernationDelay.get();
+			}
+			if (m_hibernationTimer.get() == 0)
+			{
+				if (!getHibernate())
+					ObjectTracker::removeDelayedHibernatingAI();
+				updateHibernate();
+			}
+		}
+		else
+		{
+			// we are counting down, but we don't need to hibernate anyway; stop the count
+			m_hibernationTimer = -1.0f;
+			ObjectTracker::removeDelayedHibernatingAI();
+		}
+	}
+
+	// creatures not in the world and hibernating creatures should go no further
+	if (!creatureOwner->isInWorld() || getHibernate())
+	{
+#ifdef _DEBUG
+		if (aiDebugString != NULL)
+		{
+			sendDebugAiToClients(*aiDebugString);
+			delete aiDebugString;
+		}
+#endif // _DEBUG
+
+//		DEBUG_REPORT_LOG(true, ("[aitest] Hibernating %s from alter\n", creatureOwner->getNetworkId().getValueString().c_str()));
+		return alterResult;
+	}
+	
+	// check floating
+	{
+		CollisionProperty const * const collision = creatureOwner->getCollisionProperty();
+		Footprint const * const foot = (collision != NULL) ? collision->getFootprint() : NULL;
+		bool floating = (foot != NULL) ? foot->isFloating() : false;
+
+		if (floating)
+		{
+			return alterResult;
+		}
+	}
+
+	// check sleeping
+	if (m_sleepTimer > 0.0f)
+	{
+		m_sleepTimer -= time;
+//		DEBUG_REPORT_LOG(true, ("[aitest] Sleeping %s for %f from alter\n", creatureOwner->getNetworkId().getValueString().c_str(), m_sleepTimer));
+		AlterResult::incorporateLongAlterResult(alterResult, m_sleepTimer);
+		return alterResult;
+	}
+
+	// change behaviors
+	if (getPendingMovementType() != AMT_invalid)
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("AiCreatureController::realAlter: getPendingMovementType() != AMT_invalid");
+
+		// Update our inPathfindingRegion flag whenever the behavior changes
+		CityPathGraph const * graph = CityPathGraphManager::getCityGraphFor(creatureOwner);
+		m_inPathfindingRegion = (graph != NULL);
+		applyMovementChange();
+	}
+
+	// alter behaviors
+	Vector newStartPosition = getCreature()->getPosition_w();
+
+	if (   !creatureOwner->isDead()
+	    && creatureOwner->isAuthoritative())
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("AiCreatureController::realAlter: !creatureOwner->isDead() && creatureOwner->isAuthoritative()");
+
+		// This is to help catch and prevent bugs with retreating until all the kinks are worked out
+		{
+			if (isRetreating())
+			{
+				PROFILER_AUTO_BLOCK_DEFINE("AiCreatureController::realAlter: isRetreating()");
+
+				int const retreatingTime = static_cast<int>(Os::getRealSystemTime() - m_retreatingStartTime.get());
+				int const maxRetreatTime = 80;
+
+				if (retreatingTime > maxRetreatTime)
+				{
+					AiLocation location(m_combatStartLocation.get().getCell(), m_combatStartLocation.get().getCoordinates(), 0.0f);
+					warpTo(location.getCell(), location.getPosition_p());
+
+					setRetreating(false);
+
+					WARNING(true, ("AICreatureController::realAlter() owner(%s) inCombat(%s) Retreating has lasted(%d) > %d seconds. Auto-releasing retreat.", getDebugInformation().c_str(), getCreature()->isInCombat() ? "yes" : "no", retreatingTime, maxRetreatTime));
+				}
+			}
+		}
+
+		// Retreating - See if the hate list timer needs to be reset
+		{
+			if (!creatureOwner->isHateListEmpty())
+			{
+				PROFILER_AUTO_BLOCK_DEFINE("AiCreatureController::realAlter: !creatureOwner->isHateListEmpty()");
+
+				bool resetHateTimer = false;
+				CachedNetworkId const & hateTarget = creatureOwner->getHateTarget();
+				CreatureObject * const hateTargetCreatureObject = CreatureObject::asCreatureObject(hateTarget.getObject());
+				CreatureController const * const hateTargetCreatureController = (hateTargetCreatureObject != NULL) ? CreatureController::asCreatureController(hateTargetCreatureObject->getController()) : NULL;
+
+				if (   (hateTargetCreatureObject != NULL)
+					&& (hateTargetCreatureController != NULL))
+				{
+					float const hateTargetMovementSpeedSquared = hateTargetCreatureController->getCurrentVelocity().magnitudeSquared();
+					float const hateTargetWalkSpeedSquared = sqr(hateTargetCreatureObject->getWalkSpeed());
+
+					if (hateTargetMovementSpeedSquared <= hateTargetWalkSpeedSquared)
+					{
+						resetHateTimer = true;
+					}
+					else
+					{
+						Object * const combatStartLocationCell = NetworkIdManager::getObjectById(m_combatStartLocation.get().getCell());
+						Vector const & combatStartPosition_c = m_combatStartLocation.get().getCoordinates();
+						Vector const & combatStartPosition_w = (combatStartLocationCell != NULL) ? combatStartLocationCell->rotateTranslate_o2w(combatStartPosition_c) : combatStartPosition_c;
+						float const distanceToCombatStartLocationSquared = creatureOwner->getPosition_w().magnitudeBetweenSquared(combatStartPosition_w);
+						float const aggroRadius = getAggroRadius();
+
+						if (distanceToCombatStartLocationSquared <= sqr(aggroRadius * 1.2f))
+						{
+							resetHateTimer = true;
+						}
+					}
+
+					if (resetHateTimer)
+					{
+						creatureOwner->resetHateTimer();
+						hateTargetCreatureObject->resetHateTimer();
+					}
+				}
+				else if (hateTarget.getObject() != NULL)
+				{
+					// AI don't need to lose interest in stationary AI
+
+					creatureOwner->resetHateTimer();
+				}
+
+				// Fix up a bad hate list / no available target state.
+				if(!hateTarget.isValid())
+				{
+					if(m_invalidTarget)
+					{
+						creatureOwner->clearHateList();
+						m_invalidTarget = false;
+					}
+					else
+						m_invalidTarget = true; // give the system 1 frame to try and aquire a new valid target.
+				}
+				else
+					m_invalidTarget = false;
+			}
+		}
+
+		if (m_movement != AiMovementBaseNullPtr)
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("AiCreatureController::realAlter: m_movement != AiMovementBaseNullPtr");
+
+			PerformanceTimer timer;
+			timer.start();
+
+			// it's somehow possible that m_movement will get deleted during its
+			// alter, so increment its ref count to prevent that
+			{
+				AiMovementBasePtr temp(m_movement);
+
+				if (!m_frozen.get())
+				{
+					m_movement->alter(time);
+				}
+
+#ifdef _DEBUG
+				if (aiDebugString != NULL)
+				{
+					m_movement->addDebug(*aiDebugString);
+				}
+#endif // _DEBUG
+				temp = AiMovementBaseNullPtr;
+			}
+
+			timer.stop();
+
+			float msec = timer.getElapsedTime() * 1000.0f;
+
+			// AI movements should hopefully never take 30 milliseconds
+
+			if (   (m_movement != AiMovementBaseNullPtr)
+#ifdef _DEBUG
+				&& (msec >= 60.0f))
+#else
+				&& (msec >= 30.0f))
+#endif // _DEBUG
+			{
+				std::string warningString;
+				m_movement->getDebugInfo(warningString);
+
+				WARNING(true, (FormattedString<4096>().sprintf("AICreatureController::realAlter() owner(%s) movement(%s) alter took %.0fms. Dumping movement info - %s\n", getDebugInformation().c_str(), AiMovementBase::getMovementString(m_movement->getType()), msec, warningString.c_str())));
+			}
+		}
+	}
+
+	m_lastStartPosition = newStartPosition;
+	m_lastEndPosition = creatureOwner->getPosition_w();
+
+	updateMovementType();
+
+#ifdef _DEBUG
+	if (aiDebugString != NULL)
+	{
+		sendDebugAiToClients(*aiDebugString);
+		delete aiDebugString;
+	}
+#endif // _DEBUG
+
+	// done
+	return alterResult;
+}
+
+//----------------------------------------------------------------------
+void AICreatureController::changeMovement(AiMovementBasePtr newMovement)
+{
+	LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::changeMovement() movement(%s)", (newMovement != AiMovementBaseNullPtr) ? AiMovementBase::getMovementString(newMovement->getType()) : "NULL"));
+
+	if (getOwner()->isAuthoritative())
+	{
+		if (m_pendingMovement != newMovement)
+		{
+			m_pendingMovement = newMovement;
+			m_sleepTimer = 0.0f;
+
+			getOwner()->scheduleForAlter();
+		}
+	}
+	else
+	{
+		m_movement = newMovement;
+		m_pendingMovement = AiMovementBaseNullPtr;
+	}
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Stops the current movement type of the creature, allowing it to be resumed at a 
+ * later time. 
+ * 
+ * NOTE: Only one movement can be suspended at a time. If this function 
+ * is called while a previous movement is suspended, it will fail.
+ *
+ * @return true if the movement has been suspended, false if not.
+ */
+bool AICreatureController::suspendMovement()
+{
+	bool result = true;
+	if (m_suspendedMovement == AiMovementBaseNullPtr)
+	{
+		m_suspendedMovement = m_movement;
+		stop();
+	}
+	else if (m_movement != AiMovementBaseNullPtr)
+	{
+		result = false;
+		WARNING(true, ("AICreatureController::suspendMovement called for creature %s when there is already a suspended movement type %d", 
+			getOwner()->getNetworkId().getValueString().c_str(), static_cast<int>(m_movement->getType())));
+	}
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Resumes a previously suspended movement.
+ *
+ * @return true if the movement was resumed, false if there was no previous movement.
+ */
+bool AICreatureController::resumeMovement()
+{
+	bool result = false;
+	if (m_suspendedMovement != AiMovementBaseNullPtr)
+	{
+		result = true;
+		m_pendingMovement = m_suspendedMovement;
+		m_suspendedMovement = AiMovementBaseNullPtr;
+	}
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+bool AICreatureController::hasSuspendedMovement()
+{
+	return m_suspendedMovement != AiMovementBaseNullPtr;
+}
+
+//-----------------------------------------------------------------------
+void AICreatureController::applyMovementChange()
+{
+	if (m_movement != m_pendingMovement)
+	{
+		m_movement = m_pendingMovement;
+
+		if (getOwner()->isAuthoritative())
+		{
+			if (m_movement != AiMovementBaseNullPtr)
+			{
+				sendMessageToProxyServer(CM_aiSetMovement, new AiMovementMessage(getOwner()->getNetworkId(), m_movement));
+				(safe_cast<ServerObject*>(getOwner()))->setDefaultAlterTime(m_movement->getDefaultAlterTime());
+			}
+			else
+			{
+				sendMessageToProxyServer(CM_aiSetMovement, new AiMovementMessage(getOwner()->getNetworkId()));
+				(safe_cast<ServerObject*>(getOwner()))->setDefaultAlterTime(AlterResult::cms_keepNoAlter);
+			}
+			// note: we need to do this now or updateHibernate will fail
+			m_pendingMovement = AiMovementBaseNullPtr;
+			updateHibernate();
+		}
+	}
+
+	m_pendingMovement = AiMovementBaseNullPtr;
+}
+
+//-----------------------------------------------------------------------
+
+bool AICreatureController::hasPendingMovement() const
+{
+	return m_pendingMovement != AiMovementBaseNullPtr;
+}
+
+//-----------------------------------------------------------------------
+
+void AICreatureController::getBehaviorDebugInfo (std::string & outString) const
+{
+	if (m_movement != AiMovementBaseNullPtr)
+	{
+		m_movement->getDebugInfo(outString);
+   	}
+	else
+	{
+		outString += "No Behavior\n";
+	}
+}
+
+// ======================================================================
+// Wander
+// ======================================================================
+
+//-----------------------------------------------------------------------
+bool AICreatureController::wander( float minDistance, float maxDistance, float minAngle, float maxAngle, float minDelay, float maxDelay)
+{
+	if (isRetreating())
+	{
+		WARNING(true, ("AICreatureController::wander() owner(%s) minDistance(%.2f) maxDistance(%.2f) minAngle(%.2f) maxAngle(%.2f) minDelay(%.2f) maxDelay(%.2f) Trying to wander while retreating, failing request.", getDebugInformation().c_str(), minDistance, maxDistance, minAngle, maxAngle, minDelay, maxDelay));
+		return false;
+	}
+
+	LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::wander() owner(%s) minDistance(%.2f) maxDistance(%.2f) minAngle(%.2f) maxAngle(%.2f) minDelay(%.2f) maxDelay(%.2f)", getDebugInformation().c_str(), minDistance, maxDistance, minAngle, maxAngle, minDelay, maxDelay));
+
+	if((minDistance == 0) && (maxDistance == 0))
+	{
+		return false;
+	}
+
+	if (getCreature()->getParentCell() != CellProperty::getWorldCellProperty())
+	{
+		AiMovementBasePtr movement(new AiMovementWanderInterior(this));
+		changeMovement(movement);
+	}
+	else
+	{
+		AiMovementBasePtr movement(new AiMovementWander(this, minDistance, maxDistance, minAngle, maxAngle, minDelay, maxDelay));
+		changeMovement(movement);
+	}
+
+	return true; //lint !e429 // custodial pointer 'behavior' has not been freed or returned // okay: ownership transfers via changeMovement().
+}
+
+// ======================================================================
+// Loiter
+// ======================================================================
+
+//-----------------------------------------------------------------------
+void AICreatureController::loiter(CellProperty const * homeCell, Vector const & home_p, float const minDistance, float const maxDistance, float const minDelay, float const maxDelay)
+{
+	if (isRetreating())
+	{
+		WARNING(true, ("AICreatureController::loiter() owner(%s) cell(%s) home(%.0f, %.0f, %.0f) distance[%.2f...%.2f] delay[%.0f...%.0f] Trying to loiter while retreating, failing request.", getDebugInformation().c_str(), ((homeCell != NULL) ? homeCell->getCellName() : "NULL"), home_p.x, home_p.y, home_p.z, minDistance, maxDistance, minDelay, maxDelay));
+		return;
+	}
+
+	LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::loiter() owner(%s) cell(%s) home(%.0f, %.0f, %.0f) distance[%.2f...%.2f] delay[%.0f...%.0f]", getDebugInformation().c_str(), ((homeCell != NULL) ? homeCell->getCellName() : "NULL"), home_p.x, home_p.y, home_p.z, minDistance, maxDistance, minDelay, maxDelay));
+
+	AiMovementBasePtr movement(new AiMovementLoiter(this, homeCell, home_p, minDistance, maxDistance, minDelay, maxDelay));
+
+	changeMovement(movement);
+}
+
+//-----------------------------------------------------------------------
+void AICreatureController::loiter(NetworkId const & homeId, float const minDistance, float const maxDistance, float const minDelay, float const maxDelay)
+{
+	if (isRetreating())
+	{
+		WARNING(true, ("AICreatureController::loiter() owner(%s) home(%s) distance[%.2f...%.2f] delay[%.0f...%.0f] Trying to loiter while retreating, failing request.", getDebugInformation().c_str(), homeId.getValueString().c_str(), minDistance, maxDistance, minDelay, maxDelay));
+		return;
+	}
+
+	LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::loiter() owner(%s) home(%s) distance[%.2f...%.2f] delay[%.0f...%.0f]", getDebugInformation().c_str(), homeId.getValueString().c_str(), minDistance, maxDistance, minDelay, maxDelay));
+
+	ServerObject const * const home = ServerWorld::findObjectByNetworkId(homeId);
+	AiMovementBasePtr movement(new AiMovementLoiter(this,home,minDistance,maxDistance,minDelay,maxDelay));
+
+	changeMovement(movement);
+}
+
+//-----------------------------------------------------------------------
+
+void AICreatureController::moveTo(CellProperty const * cell, Vector const & target_p, float const radius)
+{
+	if (isRetreating())
+	{
+		WARNING(true, ("AICreatureController::moveTo() owner(%s) cell(%s) position(%.0f, %.0f, %.0f) radius(%.2f) Trying to moveTo while retreating, failing request.", getDebugInformation().c_str(), ((cell != NULL) ? cell->getCellName() : "NULL"), target_p.x, target_p.y, target_p.z, radius));
+		return;
+	}
+
+	bool duplicateMovement = false;
+
+	if (getMovementType() == AMT_move)
+	{
+		AiMovementMove * const aiMovementMove = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementMove() : NULL;
+
+		if (aiMovementMove != NULL)
+		{
+			AiLocation const & target = aiMovementMove->getTarget();
+
+			if (   (target.getCell() == cell)
+			    && (target.getPosition_p() == target_p)
+			    && (target.getRadius() == radius))
+			{
+				duplicateMovement = true;
+			}
+		}
+	}
+
+	if (!duplicateMovement)
+	{
+		LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::moveTo() owner(%s) cell(%s) position(%.0f, %.0f, %.0f) radius(%.2f)", getDebugInformation().c_str(), ((cell != NULL) ? cell->getCellName() : "NULL"), target_p.x, target_p.y, target_p.z, radius));
+
+		AiMovementBasePtr movement(new AiMovementMove(this, cell, target_p, radius));
+
+		changeMovement(movement);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void AICreatureController::moveTo(Unicode::String const & targetName)
+{
+	if (isRetreating())
+	{
+		WARNING(true, ("AICreatureController::moveTo() owner(%s) target(%s) Trying to moveTo while retreating, failing request.", getDebugInformation().c_str(), Unicode::wideToNarrow(targetName).c_str()));
+		return;
+	}
+
+	bool duplicateMovement = false;
+
+	if (getMovementType() == AMT_move)
+	{
+		AiMovementMove * const aiMovementMove = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementMove() : NULL;
+
+		if (aiMovementMove != NULL)
+		{
+			if (aiMovementMove->getTargetName() == targetName)
+			{
+				duplicateMovement = true;
+			}
+		}
+	}
+
+	if (!duplicateMovement)
+	{
+		LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::moveTo() owner(%s) targetName(%s)", getDebugInformation().c_str(), Unicode::wideToNarrow(targetName).c_str()));
+
+		AiMovementBasePtr behavior(new AiMovementMove(this, targetName));
+
+		changeMovement(behavior);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void AICreatureController::patrol( std::vector<Location> const & locations, bool random, bool flip, bool repeat, int startPoint)
+{
+	if (isRetreating())
+	{
+		WARNING(true, ("AICreatureController::patrol() owner(%s) Trying to patrol while retreating, failing request.", getDebugInformation().c_str()));
+		return;
+	}
+
+	bool duplicateMovement = false;
+
+	if (getMovementType() == AMT_patrol)
+	{
+		AiMovementPatrol * const aiMovementPatrol = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementPatrol() : NULL;
+		if (aiMovementPatrol != NULL)
+		{
+//			if ()
+//			{
+//				duplicateMovement = true;
+//			}
+		}
+	}
+
+	if (!duplicateMovement)
+	{
+		LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::patrol() owner(%s)", getDebugInformation().c_str()));
+
+		AiMovementBasePtr movement(new AiMovementPatrol(this, locations, random, flip, repeat, startPoint));
+
+		changeMovement(movement);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void AICreatureController::patrol( std::vector<Unicode::String> const & locations, bool random, bool flip, bool repeat, int startPoint)
+{
+	if (isRetreating())
+	{
+		WARNING(true, ("AICreatureController::patrol() owner(%s) Trying to patrol while retreating, failing request.", getDebugInformation().c_str()));
+		return;
+	}
+
+	bool duplicateMovement = false;
+
+	if (getMovementType() == AMT_patrol)
+	{
+		AiMovementPatrol * const aiMovementPatrol = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementPatrol() : NULL;
+		if (aiMovementPatrol != NULL)
+		{
+//			if ()
+//			{
+//				duplicateMovement = true;
+//			}
+		}
+	}
+
+	if (!duplicateMovement)
+	{
+		LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::patrol() owner(%s)", getDebugInformation().c_str()));
+
+		AiMovementBasePtr movement(new AiMovementPatrol(this, locations, random, flip, repeat, startPoint));
+
+		changeMovement(movement);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void AICreatureController::stop()
+{
+	if (isRetreating())
+	{
+		WARNING(true, ("AICreatureController::stop() owner(%s) Trying to stop while retreating, failing request.", getDebugInformation().c_str()));
+		return;
+	}
+
+	if (getMovementType() != AMT_idle)
+	{
+		LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::stop() owner(%s)", getDebugInformation().c_str()));
+
+		AiMovementBasePtr behavior(new AiMovementIdle(this));
+
+		changeMovement(behavior);
+	}
+}
+
+//-----------------------------------------------------------------------
+bool AICreatureController::faceTo(CellProperty const * targetCell, Vector const & target_p)
+{
+	if (isRetreating())
+	{
+		WARNING(true, ("AICreatureController::faceTo() owner(%s) cell(%s) position(%.0f, %.0f, %.0f) Trying to faceTo while retreating, failing faceTo request.", getDebugInformation().c_str(), ((targetCell != NULL) ? targetCell->getCellName() : "NULL"), target_p.x, target_p.y, target_p.z));
+		return false;
+	}
+
+	bool duplicateMovement = false;
+
+	if (getMovementType() == AMT_face)
+	{
+		AiMovementFace * const aiMovementFace = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementFace() : NULL;
+
+		if (aiMovementFace != NULL)
+		{
+			AiLocation const & target = aiMovementFace->getTarget();
+
+			if (   (target.getCell() == targetCell)
+			    && (target.getPosition_p() == target_p))
+			{
+				duplicateMovement = true;
+			}
+		}
+	}
+
+	if (!duplicateMovement)
+	{
+		LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::faceTo() owner(%s) cell(%s) position(%.0f, %.0f, %.0f)", getDebugInformation().c_str(), ((targetCell != NULL) ? targetCell->getCellName() : "NULL"), target_p.x, target_p.y, target_p.z));
+
+		AiMovementBasePtr behavior(new AiMovementFace(this, targetCell, target_p));
+
+		changeMovement(behavior);
+	}
+
+	return true; //lint !e429 // custodial pointer 'behavior' has not been freed or returned // okay: ownership transfers via changeMovement().
+}
+
+//-----------------------------------------------------------------------
+bool AICreatureController::faceTo( NetworkId const & targetId )
+{
+	if (isRetreating())
+	{
+		WARNING(true, ("AICreatureController::faceTo() owner(%s) Trying to faceTo the target(%s) while retreating, failing request.", getDebugInformation().c_str(), targetId.getValueString().c_str()));
+		return false;
+	}
+
+	ServerObject const * target = ServerWorld::findObjectByNetworkId(targetId);
+
+	if (!target)
+	{
+		WARNING(true, ("AICreatureController::faceTo() owner(%s) Unable to resolve target(%s) to a ServerObject", getDebugInformation().c_str(), targetId.getValueString().c_str()));
+		return false;
+	}
+
+	bool duplicateMovement = false;
+
+	if (getMovementType() == AMT_face)
+	{
+		AiMovementFace * const aiMovementFace = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementFace() : NULL;
+
+		if (aiMovementFace != NULL)
+		{
+			AiLocation const & target = aiMovementFace->getTarget();
+
+			if (target.getObjectId() == targetId)
+			{
+				duplicateMovement = true;
+			}
+		}
+	}
+
+	if (!duplicateMovement)
+	{
+		LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::faceTo() owner(%s) target(%s)", getDebugInformation().c_str(), targetId.getValueString().c_str()));
+
+		AiMovementBasePtr behavior(new AiMovementFace(this, target));
+		changeMovement(behavior);
+	}
+
+	return true; //lint !e429 // custodial pointer 'behavior' has not been freed or returned // okay: ownership transfers via changeMovement().
+}
+
+//----------------------------------------------------------------------
+bool AICreatureController::follow( NetworkId const & targetId, float minDistance, float maxDistance )
+{
+	if (isRetreating())
+	{
+		WARNING(true, ("AICreatureController::follow() owner(%s) distance[%.2f...%.2f] Trying to follow the target(%s) while retreating, failing request.", getDebugInformation().c_str(), minDistance, maxDistance, targetId.getValueString().c_str()));
+		return false;
+	}
+
+	ServerObject const * target = ServerWorld::findObjectByNetworkId(targetId);
+
+	if (!target)
+	{
+		WARNING(true, ("AICreatureController::follow() owner(%s) distance[%.2f...%.2f] Unable to resolve target(%s) to a ServerObject", getDebugInformation().c_str(), minDistance, maxDistance, targetId.getValueString().c_str()));
+		return false;
+	}
+
+	bool duplicateMovement = false;
+
+	if (getMovementType() == AMT_follow)
+	{
+		AiMovementFollow * const aiMovementFollow = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementFollow() : NULL;
+
+		if (aiMovementFollow != NULL)
+		{
+			AiLocation const & target = aiMovementFollow->getTarget();
+
+			if (   (targetId == target.getObjectId())
+			    && (WithinEpsilonInclusive(minDistance, aiMovementFollow->getMinDistance(), 0.001f))
+			    && (WithinEpsilonInclusive(maxDistance, aiMovementFollow->getMaxDistance(), 0.001f)))
+			{
+				duplicateMovement = true;
+			}
+		}
+	}
+
+	if (!duplicateMovement)
+	{
+		LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::follow() owner(%s) target(%s) distance[%.2f...%.2f]", getDebugInformation().c_str(), targetId.getValueString().c_str(), minDistance, maxDistance));
+
+		AiMovementBasePtr behavior(new AiMovementFollow(this, target, minDistance, maxDistance));
+
+		changeMovement(behavior);
+	}
+
+	return true; //lint !e429 // custodial pointer 'behavior' has not been freed or returned // okay: ownership transfers via changeMovement().
+}
+
+//----------------------------------------------------------------------
+bool AICreatureController::follow( NetworkId const & targetId, Vector const & offset )
+{
+	if (isRetreating())
+	{
+		WARNING(true, ("AICreatureController::follow() owner(%s) offset(%.0f, %.0f, %.0f) Trying to follow the target(%s) while retreating, failing request.", getDebugInformation().c_str(), offset.x, offset.y, offset.z, targetId.getValueString().c_str()));
+		return false;
+	}
+
+	ServerObject const * target = ServerWorld::findObjectByNetworkId(targetId);
+
+	if (!target)
+	{
+		WARNING(true, ("AICreatureController::follow() owner(%s) offset(%.0f, %.0f, %.0f) Unable to resolve target(%s) to a ServerObject", getDebugInformation().c_str(), offset.x, offset.y, offset.z, targetId.getValueString().c_str()));
+		return false;
+	}
+
+	bool duplicateMovement = false;
+
+	if (getMovementType() == AMT_follow)
+	{
+		AiMovementFollow * const aiMovementFollow = (m_movement != AiMovementBaseNullPtr) ? m_movement->asAiMovementFollow() : NULL;
+
+		if (aiMovementFollow != NULL)
+		{
+			AiLocation const & offsetTarget = aiMovementFollow->getOffsetTarget();
+
+			if (   (targetId == offsetTarget.getObjectId())
+			    && (offset == offsetTarget.getOffset()))
+			{
+				duplicateMovement = true;
+			}
+		}
+	}
+
+	if (!duplicateMovement)
+	{
+		LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::follow() owner(%s) target(%s) offset(%.0f, %.0f, %.0f)", getDebugInformation().c_str(), targetId.getValueString().c_str(), offset.x, offset.y, offset.z));
+
+		bool relativeOffset = true;
+		float minDistance = 0.0f;
+		float maxDistance = 0.0f;
+
+		AiMovementBasePtr behavior(new AiMovementFollow(this, target, offset, relativeOffset, minDistance, maxDistance));
+
+		changeMovement(behavior);
+	}
+
+	return true; //lint !e429 // custodial pointer 'behavior' has not been freed or returned // okay: ownership transfers via changeMovement().
+}
+
+// ----------------------------------------------------------------------
+bool AICreatureController::swarm( NetworkId const & targetId )
+{
+	if (isRetreating())
+	{
+		WARNING(true, ("AICreatureController::swarm() owner(%s) Trying to flee the target(%s) while retreating, failing request.", getDebugInformation().c_str(), targetId.getValueString().c_str()));
+		return false;
+	}
+
+	LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::swarm() owner(%s) target(%s)", getDebugInformation().c_str(), targetId.getValueString().c_str()));
+
+	if(!targetId) return false;
+
+	ServerObject const * target = ServerWorld::findObjectByNetworkId(targetId);
+
+	if(!target) return false;
+
+	// ----------
+	// Check if we're already swarming the specified object.
+	if (getMovementType() == AMT_swarm)
+	{
+		AiMovementSwarm *swarmBehavior = safe_cast<AiMovementSwarm*>(m_movement.get());
+		if (swarmBehavior && (swarmBehavior->getTarget().getObjectId() == targetId))
+		{
+			// We're already swarming this object, keep swarming it with the same behavior.
+			return true;
+		}
+	}
+
+	AiMovementBasePtr behavior(new AiMovementSwarm(this,target));
+
+	changeMovement(behavior);
+
+	return true; //lint !e429 // custodial pointer 'behavior' has not been freed or returned // okay: ownership transfers via changeMovement().
+}
+
+// ----------------------------------------------------------------------
+bool AICreatureController::swarm( NetworkId const & targetId, float offset )
+{
+	if (isRetreating())
+	{
+		WARNING(true, ("AICreatureController::swarm() owner(%s) offset(%.2f) Trying to flee the target(%s) while retreating, failing request.", getDebugInformation().c_str(), offset, targetId.getValueString().c_str()));
+		return false;
+	}
+
+	LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::swarm() owner(%s) target(%s) offset(%.2f)", getDebugInformation().c_str(), targetId.getValueString().c_str(), offset));
+
+	if(!targetId) return false;
+
+	ServerObject const * target = ServerWorld::findObjectByNetworkId(targetId);
+
+	if(!target) return false;
+
+	AiMovementBasePtr behavior(new AiMovementSwarm(this, target, offset));
+
+	changeMovement(behavior);
+
+	return true; //lint !e429 // custodial pointer 'behavior' has not been freed or returned // okay: ownership transfers via changeMovement().
+}
+
+// ----------------------------------------------------------------------
+bool AICreatureController::flee( NetworkId const & targetId, float minDistance, float maxDistance )
+{
+	if (isRetreating())
+	{
+		WARNING(true, ("AICreatureController::flee() owner(%s) distance[%.2f...%.2f] Trying to flee the target(%s) while retreating, failing request.", getDebugInformation().c_str(), minDistance, maxDistance, targetId.getValueString().c_str(), targetId.getValueString().c_str()));
+		return false;
+	}
+
+	LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::flee() owner(%s) target(%s) distance[%.2f...%.2f]", getDebugInformation().c_str(), targetId.getValueString().c_str(), minDistance, maxDistance));
+
+	if(getCreatureCell() != CellProperty::getWorldCellProperty())
+	{
+		AiMovementBasePtr behavior(new AiMovementIdle(this));
+
+		changeMovement(behavior);
+
+		return false;
+	}
+
+	if(!targetId) return false;
+
+	ServerObject const * target = ServerWorld::findObjectByNetworkId(targetId);
+
+	if(!target) return false;
+
+	// ----------
+
+	AiMovementBasePtr behavior(new AiMovementFlee(this, target, minDistance, maxDistance));
+
+	changeMovement(behavior);
+
+	return true; //lint !e429 // custodial pointer 'behavior' has not been freed or returned // okay: ownership transfers via changeMovement().
+}
+
+// ----------------------------------------------------------------------
+CreatureObject const * AICreatureController::getCreature ( void ) const
+{
+	return safe_cast< CreatureObject const * >( getOwner() );
+}
+
+CreatureObject * AICreatureController::getCreature ( void )
+{
+	return safe_cast< CreatureObject * >( getOwner() );
+}
+
+CellProperty const * AICreatureController::getCreatureCell ( void  ) const
+{
+	return getOwner()->getParentCell();
+}
+
+Vector AICreatureController::getCreaturePosition_p ( void ) const
+{
+	return getCreature()->getPosition_p();
+}
+
+Vector AICreatureController::getCreaturePosition_w ( void ) const
+{
+	return getCreature()->getPosition_w();
+}
+
+float AICreatureController::getCreatureRadius ( void ) const
+{
+	return getCreature()->getRadius();
+}
+
+// ----------------------------------------------------------------------
+
+void AICreatureController::moveCreature( CellProperty const * newCell, Vector const & inNewPosition, bool testMove )
+{
+	if(testMove)
+	{
+		CanMoveResult result = CollisionWorld::canMove(getCreature(),inNewPosition,0.05f,false,true,false);
+
+		if((result == CMR_MoveOK) || (result == CMR_HitObstacle))
+		{
+			m_stuckCounter = 0;
+		}
+		else
+		{
+			m_stuckCounter++;
+
+			return;
+		}
+	}
+	else
+	{
+		m_stuckCounter = 0;
+	}
+
+	Vector newPosition = inNewPosition;
+
+	CellProperty * currentCell = getOwner()->getParentCell();
+
+	CellObject * newCellObject = NULL;
+
+	if( (newCell != NULL) && (newCell != CellProperty::getWorldCellProperty()) )
+	{
+		newCellObject = const_cast<CellObject*>(safe_cast<CellObject const *>(&newCell->getOwner()));
+	}
+
+	Vector oldPosition = getCreaturePosition_p();
+
+	// ----------
+
+	if(currentCell == newCell)
+	{
+		float dummy;
+
+		Vector offset(0.0f,1.0f,0.0f);
+
+		CellProperty const * destCell = getCreatureCell()->getDestinationCell(oldPosition+offset,newPosition+offset,dummy);
+
+		if((destCell != NULL) && (destCell != newCell))
+		{
+			newPosition = CollisionUtils::transformToCell(newCell,newPosition,destCell);
+			newCell = destCell;
+
+			newCellObject = NULL;
+
+			if(newCell != CellProperty::getWorldCellProperty())
+			{
+				newCellObject = const_cast<CellObject*>(safe_cast<CellObject const *>(&newCell->getOwner()));
+			}
+		}
+	}
+
+	if (currentCell == newCell)
+	{
+		Transform objectToCell = getOwner()->getTransform_o2p();
+		objectToCell.setPosition_p(newPosition);
+		setGoal(objectToCell, newCellObject);
+	}
+	else
+	{
+		Transform objectToWorld = getOwner()->getTransform_o2w();
+
+		Transform cellToWorld = newCellObject ? newCellObject->getTransform_o2w() : Transform::identity;
+
+		Transform worldToCell;
+
+		worldToCell.invert(cellToWorld);
+
+		Transform objectToCell;
+		objectToCell.multiply(worldToCell, objectToWorld);
+
+		objectToCell.setPosition_p(newPosition);
+
+		setGoal(objectToCell, newCellObject);
+	}
+}
+
+//----------------------------------------------------------------------
+
+bool stepTowards(Vector const & startPosition, Vector const & goalPosition, float stepDistance, Vector & newPosition)
+{
+	bool reachedGoal = true;
+	Vector directionToGoal = Vector(goalPosition.x, 0.0f, goalPosition.z) - Vector(startPosition.x, 0.0f, startPosition.z);
+	float const distanceToGoalSquared = directionToGoal.magnitudeSquared();
+
+	if (distanceToGoalSquared <= sqr(stepDistance)) 
+	{
+		// We have overshot our goal, so just snap to the goal position
+
+		newPosition = goalPosition;
+	}
+	else
+	{
+		// We are not to our goal yet so step towards it
+
+		reachedGoal = false;
+
+		// Create a unit vector towards the goal
+
+		directionToGoal.normalize();
+		
+		// Move along the unit vector the requested distance
+
+		directionToGoal *= stepDistance;
+
+		newPosition = startPosition + directionToGoal;
+	}
+
+	return reachedGoal;
+}
+
+//----------------------------------------------------------------------
+//----------------------------------------------------------------------
+
+bool AICreatureController::moveAlongGround( CellProperty const * targetCell, Vector const & target, float stepDistance)
+{
+	if (stepDistance <= 0)
+		return true;
+
+	CellProperty const * creatureCell = getOwner()->getParentCell();
+	Vector localTarget = CollisionUtils::transformToCell( targetCell, target, creatureCell );
+	Vector creaturePos = getOwner()->getPosition_p();
+	Vector stepGoal;
+
+	bool reachedGoal = stepTowards(creaturePos,localTarget,stepDistance,stepGoal);
+
+
+	// For warping to work properly even when we are not in a pathfinding region
+	// we still need to warp if we are in a behavior like follow or flee.
+	// Not warping in these cases was causing ai to get stuck in Tansarii and would 
+	// also cause problems anywhere there is not a CityPathGraphManager
+	AiMovementType curMoveType = AMT_invalid;
+	if (m_movement != AiMovementBaseNullPtr)
+	{
+		curMoveType = m_movement->getType();
+	}
+
+	bool testCollisions = m_inPathfindingRegion || curMoveType == AMT_follow || curMoveType == AMT_flee;
+
+	moveCreature(creatureCell,stepGoal,testCollisions);
+
+	return reachedGoal;
+}
+
+//----------------------------------------------------------------------
+
+void AICreatureController::turnToward( CellProperty const * targetCell, Vector const & target )
+{
+	CellProperty const * creatureCell = getOwner()->getParentCell();
+
+	Vector localTarget = CollisionUtils::transformToCell( targetCell, target, creatureCell );
+
+	Vector result = getOwner()->rotateTranslate_p2o(localTarget);
+
+	float angle = result.theta();
+
+	getOwner()->yaw_o(angle);
+}
+
+//----------------------------------------------------------------------
+
+float AICreatureController::getGroundDistance( Vector const & A, Vector const & B )
+{
+	float dx = A.x - B.x;
+	float dz = A.z - B.z;
+
+	return sqrt(dx*dx+dz*dz);
+}
+
+//--------------------------------------------------------------------
+void AICreatureController::setMovementRun()
+{
+	if (getOwner()->isAuthoritative())
+	{
+		LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::setMovementRun() owner(%s)", getDebugInformation().c_str()));
+
+		m_running = true;
+	}
+	else
+	{
+		sendMessageToAuthServer(CM_aiSetMovementRun);
+	}
+}
+
+//--------------------------------------------------------------------
+void AICreatureController::setMovementWalk()
+{
+	if (getOwner()->isAuthoritative())
+	{
+		LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::setMovementWalk() owner(%s)", getDebugInformation().c_str()));
+
+		m_running = false;
+	}
+	else
+	{
+		sendMessageToAuthServer(CM_aiSetMovementWalk);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AICreatureController::warpTo( CellProperty const * newCell, Vector const & newPosition )
+{
+	DEBUG_WARNING((!newCell || newCell == CellProperty::getWorldCellProperty()) && newPosition == Vector::zero, ("AICreatureController::warpTo tried to send a creature to the origin."));
+
+	moveCreature(newCell,newPosition,false);
+
+	CollisionWorld::objectWarped(getOwner());
+
+	m_lastStartPosition = newPosition;
+	m_lastEndPosition = newPosition;
+}
+
+// ----------------------------------------------------------------------
+
+void AICreatureController::sleep ( float sleepTime )
+{
+	m_sleepTimer = sleepTime;
+}
+
+// ----------------------------------------------------------------------
+
+bool AICreatureController::shouldHibernate ( void ) const
+{
+	if (m_movement != AiMovementBaseNullPtr && !m_movement->getHibernateOk())
+		return false;
+
+	if (m_pendingMovement != AiMovementBaseNullPtr)
+		return false;
+
+	if (isRetreating())
+	{
+		return false;
+	}
+
+	return CreatureController::shouldHibernate();
+}
+
+// ----------------------------------------------------------------------
+
+void AICreatureController::setHibernate(bool hibernate)
+{
+	bool oldHibernate = getHibernate();
+	float oldHibernationTimer = m_hibernationTimer.get();
+	if (!oldHibernate && hibernate && m_hibernationDelay.get() > 0 && oldHibernationTimer != 0)
+	{
+		// check if we want to start our hibernation timer
+		if (oldHibernationTimer < 0)
+		{
+			m_hibernationTimer = m_hibernationDelay.get();
+		}
+	}
+	else
+	{
+		CreatureController::setHibernate(hibernate);
+		bool newHibernate = getHibernate();
+
+		// if we're coming out of hibernation, reset our alter time
+		if (!newHibernate && oldHibernate)
+		{
+			// flag the hibernate timer as ready to use
+			if (m_hibernationDelay.get() > 0)
+				m_hibernationTimer = -1.0f;
+			if (m_movement != AiMovementBaseNullPtr)
+				(safe_cast<ServerObject*>(getOwner()))->setDefaultAlterTime(m_movement->getDefaultAlterTime());
+			else
+				(safe_cast<ServerObject*>(getOwner()))->setDefaultAlterTime(AlterResult::cms_keepNoAlter);
+		}
+	}
+	if (hibernate && !oldHibernate && !getHibernate() && oldHibernationTimer <= 0 && m_hibernationTimer.get() > 0)
+		ObjectTracker::addDelayedHibernatingAI();
+}
+
+// ----------------------------------------------------------------------
+
+void AICreatureController::setHibernationDelay(float delay)
+{
+	if (getOwner()->isAuthoritative())
+	{
+		if (delay < 0)
+			delay = 0;
+		m_hibernationDelay = delay;
+		float oldTimer = m_hibernationTimer.get();
+		if (delay > 0)
+		{
+			if (!getHibernate() && oldTimer == 0)
+			{
+				// flag us as ready to delay the next time we want to hibernate
+				m_hibernationTimer = -1.0f;
+			}
+			else
+			{
+				// we need to set the hibernation timer > than the delay to flag skipping the first alter, which will be a large number
+				delay += 1.0f;
+				m_hibernationTimer = delay;
+			}
+		}
+		else
+		{
+			if (!getHibernate() && oldTimer > 0)
+				ObjectTracker::removeDelayedHibernatingAI();
+			m_hibernationTimer = 0;
+		}
+		// see if we need to change our hibernate state
+		if (oldTimer > 0 && delay == 0)
+			updateHibernate();
+		else if (delay > 0 && getHibernate())
+		{
+			setHibernate(false);
+			updateHibernate();
+			// updateHibernate() can modify m_hibernationTimer, so we have to set it again
+			m_hibernationTimer = delay;
+		}
+	}
+	else
+	{
+		sendMessageToAuthServer(CM_setHibernationDelay, new MessageQueueGenericValueType<float>(delay));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+int AICreatureController::getStuckCounter ( void ) const
+{
+	return m_stuckCounter;
+}
+
+// ----------------------------------------------------------------------
+
+void AICreatureController::setAuthority ( bool newAuthority )
+{
+	LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::setAuthority() authority(%s) inCombat(%s) owner(%s) ", newAuthority ? "yes" : "no", getCreature()->isInCombat() ? "yes" : "no", getDebugInformation().c_str()));
+
+	// if we are being made authoritative, refresh our ai behavior
+	if (newAuthority && !m_authority && m_movement != AiMovementBaseNullPtr)
+	{
+		m_movement->refresh();
+	}
+	m_authority = newAuthority;
+}
+
+// ----------------------------------------------------------------------
+
+void AICreatureController::forwardServerObjectSpecificBaselines() const
+{
+	AiCreatureStateMessage aiCreatureStateMessage;
+	aiCreatureStateMessage.m_networkId = getOwner()->getNetworkId();
+	aiCreatureStateMessage.m_movement = AiMovementMessage(getOwner()->getNetworkId(), m_movement);
+
+	GenericValueTypeMessage<AiCreatureStateMessage> const genericMessage("AiCreatureStateMessage", aiCreatureStateMessage);
+	ServerMessageForwarding::send(genericMessage);
+}
+
+// ----------------------------------------------------------------------
+
+typedef std::map< int, std::string > TriggerNameLookup;
+
+char const * const getStringForTrigger( int trigger )
+{
+	static TriggerNameLookup lookup;
+	static bool initialized = false;
+
+	if(!initialized)
+	{
+#define add(A) lookup[static_cast<int>(A)] = #A
+
+		add( TRIG_WANDER_MOVING );
+		add( TRIG_WANDER_WAYPOINT );
+		add( TRIG_WANDER_WAITING );
+		add( TRIG_WANDER_PATH_NOT_FOUND );
+		add( TRIG_LOITER_MOVING );
+		add( TRIG_LOITER_WAYPOINT );
+		add( TRIG_LOITER_WAITING );
+		add( TRIG_FOLLOW_TARGET_LOST );
+		add( TRIG_FOLLOW_WAITING );
+		add( TRIG_FOLLOW_MOVING );
+		add( TRIG_FOLLOW_PATH_NOT_FOUND );
+		add( TRIG_FLEE_TARGET_LOST );
+		add( TRIG_FLEE_WAYPOINT );
+		add( TRIG_FLEE_PATH_NOT_FOUND );
+		add( TRIG_MOVE_PATH_COMPLETE );
+		add( TRIG_MOVE_MOVING );
+		add( TRIG_MOVE_PATH_NOT_FOUND );
+		add( TRIG_MADE_AUTHORITATIVE );
+
+#undef add
+
+		initialized = true;
+	}
+
+	return lookup[trigger].c_str();
+}
+
+void AICreatureController::triggerScriptsSimple( int intId )
+{
+	TrigId id = static_cast<TrigId>(intId);
+
+	//LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::triggerScriptsSimple : %s\n", getStringForTrigger(intId)));
+
+	ScriptParams params;
+	IGNORE_RETURN(getServerOwner()->getScriptObject()->trigAllScripts(id, params));
+}
+
+// ----------------------------------------------------------------------
+
+void AICreatureController::triggerScriptsWithTarget( int intId, NetworkId const & targetId )
+{
+	//LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::triggerScriptsWithTarget : %s\n", getStringForTrigger(intId)));
+
+	TrigId id = static_cast<TrigId>(intId);
+
+	ScriptParams params;
+	params.addParam(targetId);
+	IGNORE_RETURN(getServerOwner()->getScriptObject()->trigAllScripts(id, params));
+}
+
+// ----------------------------------------------------------------------
+
+void AICreatureController::triggerScriptsWithParam ( int intId, float & io_param )
+{
+	//LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::triggerScriptsWithParam: %s, %f\n", getStringForTrigger(intId),io_param));
+
+	TrigId id = static_cast<TrigId>(intId);
+
+	ScriptParams params;
+	params.addParam(io_param);
+	IGNORE_RETURN(getServerOwner()->getScriptObject()->trigAllScripts(id, params));
+	io_param = params.getFloatParam(0);
+}
+
+// ----------------------------------------------------------------------
+
+AICreatureController * AICreatureController::getAiCreatureController(NetworkId const & networkId)
+{
+	Object * const object = NetworkIdManager::getObjectById(networkId);
+
+	return (object != NULL) ? AICreatureController::asAiCreatureController(object->getController()) : NULL;
+}
+
+// ----------------------------------------------------------------------
+
+AICreatureController * AICreatureController::asAiCreatureController(Controller * controller)
+{
+	CreatureController * const creatureController = (controller != NULL) ? controller->asCreatureController() : NULL;
+	AICreatureController * const aiCreatureController = (creatureController != NULL) ? creatureController->asAiCreatureController() : NULL;
+
+	return aiCreatureController;
+}
+
+// ----------------------------------------------------------------------
+
+AICreatureController const * AICreatureController::asAiCreatureController(Controller const * controller)
+{
+	CreatureController const * const creatureController = (controller != NULL) ? controller->asCreatureController() : NULL;
+	AICreatureController const * const aiCreatureController = (creatureController != NULL) ? creatureController->asAiCreatureController() : NULL;
+
+	return aiCreatureController;
+}
+
+//----------------------------------------------------------------------
+
+AICreatureController * AICreatureController::asAiCreatureController()
+{
+	return this;
+}
+
+//----------------------------------------------------------------------
+
+AICreatureController const * AICreatureController::asAiCreatureController() const
+{
+	return this;
+}
+
+//----------------------------------------------------------------------
+
+float AICreatureController::getAggroRadius() const
+{
+	float result = ConfigServerGame::getAiBaseAggroRadius();
+
+	if (m_aiCreatureData->m_aggressive > 0.0f)
+	{
+		result = m_aiCreatureData->m_aggressive;
+	}
+
+	return clamp(0.0f, result, ConfigServerGame::getAiMaxAggroRadius());
+}
+
+// ----------------------------------------------------------------------
+
+float AICreatureController::getRespectRadius(NetworkId const & target) const
+{
+	float const aggroRadius = getAggroRadius();
+	float result = aggroRadius;
+
+	CreatureObject const * respectCreatureObject = CreatureObject::getCreatureObject(target);
+
+	if (respectCreatureObject != NULL)
+	{
+		// If the target has a master, then use the master's level for the respect calculation
+
+		NetworkId const & masterId = respectCreatureObject->getMasterId();
+
+		if (masterId != NetworkId::cms_invalid)
+		{
+			respectCreatureObject = CreatureObject::getCreatureObject(masterId);
+		}
+
+		// Respect is only towards players
+
+		if (   (respectCreatureObject != NULL)
+		    && respectCreatureObject->isPlayerControlled())
+		{
+			CreatureObject const * const creatureOwner = getCreature();
+			int const ownerLevel = creatureOwner->getLevel();
+			int const targetLevel = respectCreatureObject->getLevel();
+			float const levelDifference = static_cast<float>(targetLevel) - static_cast<float>(ownerLevel);
+			float const respectPercent = clamp(0.04f, (1.0f - (levelDifference / 20.0f)), 1.20f);
+
+			result = respectPercent * aggroRadius;
+		}
+		else
+		{
+			WARNING(true, ("AICreatureController::getRespectRadius() owner(%s) master(%s) The owner has a master who is not a player. Why does this happen?", getDebugInformation().c_str(), (respectCreatureObject != NULL) ? respectCreatureObject->getDebugInformation().c_str() : masterId.getValueString().c_str()));
+		}
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+float AICreatureController::getAssistRadius() const
+{
+	float assistRadius = ConfigServerGame::getAiAssistRadius();
+
+	if (m_aiCreatureData->m_assist > 0.0f)
+	{
+		assistRadius = m_aiCreatureData->m_assist;
+	}
+
+	return clamp(0.0f, assistRadius, ConfigServerGame::getAiMaxAggroRadius());
+}
+
+#ifdef _DEBUG
+// ----------------------------------------------------------------------
+
+void AICreatureController::sendDebugAiToClients(AiDebugString & aiDebugString)
+{
+	ServerObject * const serverOwner = getServerOwner();
+	const ObserverList & observerList = serverOwner->getObservers();
+
+	if (serverOwner->isAuthoritative() && !observerList.empty())
+	{
+		CreatureObject * const creatureOwner = serverOwner->asCreatureObject();
+		FormattedString<512> fs;
+
+		// Display the name and level
+		{
+			aiDebugString.addText(fs.sprintf("%d %s\n", creatureOwner->getLevel(), (getCreatureName().isEmpty() ? "NULL" : getCreatureName().getString())), PackedRgb::solidWhite);
+		}
+
+		// Display the look at target
+		//{
+		//	aiDebugString.addText(fs.sprintf("lookAtTarget(%s)\n", creatureOwner->getLookAtTarget().getValueString().c_str()), PackedRgb::solidWhite);
+		//}
+
+		// Display the trigger volumes
+		//{
+		//	aiDebugString.addText("Trigger Volumes\n", PackedRgb::solidWhite);
+		//	ServerObject::TriggerVolumeMap::const_iterator iterTriggerVolumes = creatureOwner->getTriggerVolumeMap().begin();
+		//	int index = 1;
+		//
+		//	for (; iterTriggerVolumes != creatureOwner->getTriggerVolumeMap().end(); ++iterTriggerVolumes)
+		//	{
+		//		aiDebugString.addText(fs.sprintf("%i %s\n", index, iterTriggerVolumes->first.c_str()), PackedRgb::solidWhite);
+		//		++index;
+		//	}
+		//}
+
+		if (creatureOwner->isInvulnerable())
+		{
+			aiDebugString.addText("INVULNERABLE\n", PackedRgb::solidMagenta);
+		}
+
+		if (isFrozen())
+		{
+			aiDebugString.addText("FROZEN\n", PackedRgb::solidCyan);
+		}
+
+		if (creatureOwner->isDead())
+		{
+			aiDebugString.addText("DEAD\n", PackedRgb::solidRed);
+		}
+		else
+		{
+			if (isRetreating())
+			{
+				int const retreatingTime = static_cast<int>(Os::getRealSystemTime() - m_retreatingStartTime.get());
+
+				aiDebugString.addText(fs.sprintf("RETREATING %d\n", retreatingTime), PackedRgb::solidMagenta);
+			}
+
+			// Show the floorId
+			{
+				Floor const * const floor = CollisionWorld::getFloorStandingOn(*creatureOwner);
+
+				aiDebugString.addText(fs.sprintf("floor (%s)\n", (floor == NULL) ? "none" : floor->getId().getValueString().c_str()), PackedRgb::solidWhite);
+			}
+
+			// Display the AI movement speed
+			{
+				float const movementPercent = (creatureOwner->getMovementPercent() * 100.0f);
+
+				aiDebugString.addText(fs.sprintf("mv (%.0f%%:%.1f)%s%s%s\n", movementPercent, getCurrentVelocity().magnitude(), (creatureOwner->isStopped() ? " stopped" : ""), (creatureOwner->isWalking() ? " walking" : ""), (creatureOwner->isRunning() ? " running" : "")), PackedRgb::solidWhite);
+				aiDebugString.addText(fs.sprintf("walk %.1f run %.1f\n", creatureOwner->getWalkSpeed(), creatureOwner->getRunSpeed()), PackedRgb::solidWhite);
+			}
+
+			Vector const & ownerPosition_w = serverOwner->getPosition_w();
+
+			if (creatureOwner->isInCombat())
+			{
+				// Primary Weapon
+				{
+					ServerObject const * const primaryServerObject = ServerObject::getServerObject(getPrimaryWeapon());
+					WeaponObject const * const primaryWeaponObject = (primaryServerObject != NULL) ? primaryServerObject->asWeaponObject() : NULL;
+
+					if (primaryWeaponObject != NULL)
+					{
+						aiDebugString.addText(fs.sprintf("%s pri(%s) [%.0f...%.0f] sp(%s)\n", (usingPrimaryWeapon() ? "->" : ""), FileNameUtils::get(primaryWeaponObject->getObjectTemplateName(), FileNameUtils::fileName).c_str(), primaryWeaponObject->getMinRange(), primaryWeaponObject->getMaxRange(), m_aiCreatureData->m_primarySpecials.isEmpty() ? "none" : m_aiCreatureData->m_primarySpecials.getString()), PackedRgb::solidWhite);
+					}
+					else
+					{
+						aiDebugString.addText(fs.sprintf("pri(NULL:ERROR)\n"), PackedRgb::solidWhite);
+					}
+
+					//if (usingPrimaryWeapon())
+					//{
+						//float const ownerRadius = creatureOwner->getRadius();
+						//float const minRange = primaryWeaponObject->getMinRange() + ownerRadius;
+						//float const maxRange = primaryWeaponObject->getMaxRange() + ownerRadius;
+						//
+						//if (minRange > ownerRadius)
+						//{
+						//	aiDebugString.addCircleAtObjectOffset(creatureOwner->getNetworkId(), Vector::zero, minRange, PackedRgb::solidMagenta);
+						//}
+						//
+						//if (maxRange > ownerRadius)
+						//{
+						//	aiDebugString.addCircleAtObjectOffset(creatureOwner->getNetworkId(), Vector::zero, maxRange, PackedRgb::solidRed);
+						//}
+					//}
+				}
+
+				// Secondary Weapon
+				{
+					ServerObject const * const secondaryServerObject = ServerObject::getServerObject(getSecondaryWeapon());
+					WeaponObject const * const secondaryWeaponObject = (secondaryServerObject != NULL) ? secondaryServerObject->asWeaponObject() : NULL;
+
+					if (secondaryWeaponObject != NULL)
+					{
+						aiDebugString.addText(fs.sprintf("%s sec (%s) [%.0f...%.0f] sp(%s)\n", (usingSecondaryWeapon() ? "->" : ""), FileNameUtils::get(secondaryWeaponObject->getObjectTemplateName(), FileNameUtils::fileName).c_str(), secondaryWeaponObject->getMinRange(), secondaryWeaponObject->getMaxRange(), m_aiCreatureData->m_secondarySpecials.isEmpty() ? "none" : m_aiCreatureData->m_secondarySpecials.getString()), PackedRgb::solidWhite);
+					}
+					else
+					{
+						aiDebugString.addText(fs.sprintf("sec (NONE)\n"), PackedRgb::solidWhite);
+					}
+
+					//if (usingSecondaryWeapon())
+					//{
+						//float const ownerRadius = creatureOwner->getRadius();
+						//float const minRange = secondaryWeaponObject->getMinRange() + ownerRadius;
+						//float const maxRange = secondaryWeaponObject->getMaxRange() + ownerRadius;
+						//
+						//if (minRange > ownerRadius)
+						//{
+						//	aiDebugString.addCircleAtObjectOffset(creatureOwner->getNetworkId(), Vector::zero, minRange, PackedRgb::solidMagenta);
+						//}
+						//
+						//if (maxRange > ownerRadius)
+						//{
+						//	aiDebugString.addCircleAtObjectOffset(creatureOwner->getNetworkId(), Vector::zero, maxRange, PackedRgb::solidRed);
+						//}
+					//}
+				}
+
+				// Display the leash length
+				{
+					aiDebugString.addLineToPosition(CellProperty::getPosition_w(m_combatStartLocation.get()), PackedRgb::solidGreen);
+					//aiDebugString.addCircle(m_combatStartLocation.get().getCoordinates(), getLeashRadius(), PackedRgb::solidGreen);
+
+					//float const leashLength = m_combatStartLocation.get().getCoordinates().magnitudeBetween(ownerPosition_w);
+					//float const leashRemaining = (floorf(getLeashRadius() - leashLength) / 2.0f) * 2.0f;
+					//aiDebugString.addText(fs.sprintf("leashRemaining(%.0fm)\n", leashRemaining), PackedRgb::solidCyan);
+				}
+
+				{
+					aiDebugString.addText(fs.sprintf("combat duration (%d)\n", creatureOwner->getCombatDuration()), PackedRgb::solidWhite);
+				}
+
+				// Display the AI hate list
+				{
+					//aiDebugString.addText(fs.sprintf("in combat: %s\n", (creatureOwner->isInCombat() ? "YES" : "NO")), PackedRgb::solidWhite);
+
+					HateList::SortedList hateList;
+					creatureOwner->getSortedHateList(hateList);
+
+					if (hateList.empty())
+					{
+						aiDebugString.addText("* NO HATE TARGETS *\n", PackedRgb::solidYellow);
+					}
+					else
+					{
+						if (creatureOwner->isHateListAutoExpireTargetEnabled())
+						{
+							aiDebugString.addText(fs.sprintf("* HATE LIST * %d\n", creatureOwner->getHateListAutoExpireTargetDuration() - creatureOwner->getTimeSinceLastHateListUpdate()), PackedRgb::solidRed);
+						}
+						else
+						{
+							aiDebugString.addText("* HATE LIST * no expire\n", PackedRgb::solidRed);
+						}
+
+						HateList::SortedList::const_iterator iterHateList = hateList.begin();
+
+						for (; iterHateList != hateList.end(); ++iterHateList)
+						{
+							CachedNetworkId const & hateTarget = iterHateList->first;
+							TangibleObject const * const hateTargetTangibleObject = TangibleObject::asTangibleObject(hateTarget.getObject());
+							float const hate = iterHateList->second;
+							std::string hateTargetName;
+							if (hateTargetTangibleObject != NULL)
+							{
+								hateTargetName = Unicode::wideToNarrow(hateTargetTangibleObject->getEncodedObjectName()).c_str();
+							}
+							else
+							{
+								hateTargetName = "NULL";
+							}
+
+							aiDebugString.addText(fs.sprintf("%s:%s(%.1f)\n", hateTargetName.c_str(), hateTarget.getValueString().c_str(), hate), (iterHateList == hateList.begin()) ? PackedRgb::solidGreen : PackedRgb::solidRed);
+						}
+					}
+				}
+			}
+			else
+			{
+				if (isAggressive())
+				{
+					aiDebugString.addText(fs.sprintf("Aggro %.0fm\n", getAggroRadius()), PackedRgb::solidRed);
+					aiDebugString.addCircleAtObjectOffset(creatureOwner->getNetworkId(), Vector::zero, getAggroRadius(), PackedRgb::solidRed);
+				}
+
+				if (isAssist())
+				{
+					aiDebugString.addText(fs.sprintf("Assist %.0fm\n", getAssistRadius()), PackedRgb::solidOrange);
+					aiDebugString.addCircleAtObjectOffset(creatureOwner->getNetworkId(), Vector::zero, getAssistRadius(), PackedRgb::solidOrange);
+				}
+
+				//if (isStalker())
+				//{
+				//	aiDebugString.addText("S", PackedRgb::solidYellow);
+				//}
+
+				if (isKiller())
+				{
+					aiDebugString.addText("DeathBlow", PackedRgb::solidYellow);
+				}
+			}
+
+			// Line to server position
+
+			aiDebugString.addLineToPosition(ownerPosition_w, PackedRgb::solidYellow);
+		}
+
+		std::string finalString;
+		uint32 const crc = aiDebugString.toString(finalString);
+
+		if (m_aiDebugStringCrc != crc)
+		{
+			m_aiDebugStringCrc = crc;
+
+			ObserverList::iterator iterObserverList = observerList.begin();
+
+			for (; iterObserverList != observerList.end(); ++iterObserverList)
+			{
+				Client * const client = NON_NULL(*iterObserverList);
+				ServerObject * const characterObject = client->getCharacterObject();
+
+				// Only send to the client if the objvar is set
+
+				int temp = 0;
+				if (   (characterObject != NULL)
+				    && characterObject->getObjVars().getItem("ai_debug_string", temp))
+				{
+					if (temp > 0)
+					{
+						bool const reliable = true;
+						GenericValueTypeMessage<std::pair<NetworkId, std::string> > message("AiDebugString", std::make_pair(getOwner()->getNetworkId(), finalString));
+
+						client->send(message, reliable);
+					}
+				}
+			}
+		}
+	}
+}
+#endif // _DEBUG
+
+// ----------------------------------------------------------------------
+void AICreatureController::setHomeLocation(Location const & location)
+{
+	if (getOwner()->isAuthoritative())
+	{
+		LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::setHomeLocation() owner(%s) sceneId(%u:%s) cell(%s) coordinates(%.2f, %.2f, %.2f)", getDebugInformation().c_str(), location.getSceneIdCrc(), (location.getSceneId() != NULL) ? location.getSceneId() : "NULL", location.getCell().getValueString().c_str(), location.getCoordinates().x, location.getCoordinates().y, location.getCoordinates().z));
+
+		m_homeLocation = location;
+	}
+	else
+	{
+		sendMessageToAuthServer(CM_aiSetHomeLocation, new MessageQueueGenericValueType<Location>(location));
+	}
+}
+
+// ----------------------------------------------------------------------
+Location const & AICreatureController::getHomeLocation() const
+{
+	return m_homeLocation.get();
+}
+
+// ----------------------------------------------------------------------
+void AICreatureController::markCombatStartLocation()
+{
+	CreatureObject const * const creatureOwner = getCreature();
+
+	if (creatureOwner->isAuthoritative())
+	{
+		m_combatStartLocation = getLocation(*creatureOwner);
+
+		LOGC(AiLogManager::isLogging(creatureOwner->getNetworkId()), "debug_ai", ("AICreatureController::markCombatStartLocation() owner(%s) sceneId(%u:%s) cell(%s) coordinates(%.2f, %.2f, %.2f)", getDebugInformation().c_str(), m_combatStartLocation.get().getSceneIdCrc(), (m_combatStartLocation.get().getSceneId() != NULL) ? m_combatStartLocation.get().getSceneId() : "NULL", m_combatStartLocation.get().getCell().getValueString().c_str(), m_combatStartLocation.get().getCoordinates().x, m_combatStartLocation.get().getCoordinates().y, m_combatStartLocation.get().getCoordinates().z));
+
+		m_primaryWeaponActions.reset();
+		m_secondaryWeaponActions.reset();
+	}
+	else
+	{
+		sendMessageToAuthServer(CM_aiMarkCombatStartLocation);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+Location const & AICreatureController::getCombatStartLocation() const
+{
+	return m_combatStartLocation.get();
+}
+
+// ----------------------------------------------------------------------
+
+float AICreatureController::getLeashRadius()
+{
+	return ConfigServerGame::getAiLeashRadius();
+}
+
+// ----------------------------------------------------------------------
+
+void AICreatureController::setCreatureName(std::string const & creatureName)
+{
+	if (getCreature()->isAuthoritative())
+	{
+		m_creatureName = creatureName;
+	}
+	else
+	{
+		sendMessageToAuthServer(CM_aiSetCreatureName, new MessageQueueGenericValueType<std::string>(creatureName));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AICreatureController::onCreatureNameChanged(std::string const & creatureName)
+{
+	CreatureObject * const creatureOwner = getCreature();
+
+	// creatureName should be the creature name as defined in creatures_datatable.xml
+
+	m_aiCreatureData = &AiCreatureData::getCreatureData(TemporaryCrcString(creatureName.c_str(), false));
+
+	if (creatureOwner && creatureOwner->isAuthoritative())
+	{
+		setPrimaryWeapon(m_aiCreatureData->m_primaryWeapon);
+		setSecondaryWeapon(m_aiCreatureData->m_secondaryWeapon);
+		creatureOwner->setDifficulty(m_aiCreatureData->m_difficulty);
+	}
+
+	AiCreatureCombatProfile const * const primaryWeaponCombatProfile = AiCreatureCombatProfile::getCombatProfile(m_aiCreatureData->m_primarySpecials);
+
+	if (primaryWeaponCombatProfile != NULL)
+	{
+		m_primaryWeaponActions.setCombatProfile(*creatureOwner, *primaryWeaponCombatProfile);
+	}
+	
+	AiCreatureCombatProfile const * const secondaryWeaponCombatProfile = AiCreatureCombatProfile::getCombatProfile(m_aiCreatureData->m_secondarySpecials);
+
+	if (secondaryWeaponCombatProfile != NULL)
+	{
+		m_secondaryWeaponActions.setCombatProfile(*creatureOwner, *secondaryWeaponCombatProfile);
+	}
+
+	LOGC(AiLogManager::isLogging(creatureOwner->getNetworkId()), "debug_ai", ("AICreatureController::setCreatureName() owner(%s) creatureName(%s) level(%d) primaryWeapon(%s:%s) secondaryWeapon(%s:%s)", getDebugInformation().c_str(), creatureName.c_str(), creatureOwner->getLevel(), m_primaryWeapon.get().getValueString().c_str(), m_aiCreatureData->m_primaryWeapon.getString(), m_secondaryWeapon.get().getValueString().c_str(), m_aiCreatureData->m_secondaryWeapon.getString()));
+}
+
+// ----------------------------------------------------------------------
+
+void AICreatureController::setPrimaryWeapon(CrcString const & objectTemplate)
+{
+	bool const required = true;
+	NetworkId const newPrimaryWeapon = createWeapon("setPrimaryWeapon", objectTemplate, required);
+
+	if (newPrimaryWeapon == NetworkId::cms_invalid)
+	{
+		WARNING(true, ("AICreatureController::setPrimaryWeapon() owner(%s) Unable to create the requested primary weapon(%s)", getDebugInformation().c_str(), objectTemplate.getString()));
+	}
+	else
+	{
+		bool const primaryWeaponEquipped = usingPrimaryWeapon();
+
+		destroyPrimaryWeapon();
+
+		m_primaryWeapon = newPrimaryWeapon;
+
+		if (primaryWeaponEquipped)
+		{
+			equipPrimaryWeapon();
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AICreatureController::destroyPrimaryWeapon()
+{
+	WeaponObject * const primaryWeapon = WeaponObject::getWeaponObject(getPrimaryWeapon());
+
+	if (primaryWeapon != NULL)
+	{
+		unEquipWeapons();
+		primaryWeapon->permanentlyDestroy(DeleteReasons::God);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AICreatureController::setSecondaryWeapon(CrcString const & objectTemplate)
+{
+	bool const required = false;
+	NetworkId const newSecondaryWeapon = createWeapon("setSecondaryWeapon", objectTemplate, required);
+
+	if (newSecondaryWeapon != NetworkId::cms_invalid)
+	{
+		bool const secondaryWeaponEquipped = usingSecondaryWeapon();
+
+		destroySecondaryWeapon();
+
+		m_secondaryWeapon = newSecondaryWeapon;
+
+		if (secondaryWeaponEquipped)
+		{
+			equipSecondaryWeapon();
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AICreatureController::destroySecondaryWeapon()
+{
+	WeaponObject * const secondaryWeapon = WeaponObject::getWeaponObject(getSecondaryWeapon());
+
+	if (secondaryWeapon != NULL)
+	{
+		unEquipWeapons();
+		secondaryWeapon->permanentlyDestroy(DeleteReasons::God);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+PersistentCrcString const & AICreatureController::getCreatureName() const
+{
+	if (m_aiCreatureData->m_name == NULL)
+	{
+		return *s_defaultCreatureName;
+	}
+
+	return *m_aiCreatureData->m_name;
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & AICreatureController::getPrimaryWeapon() const
+{
+	return m_primaryWeapon.get();
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & AICreatureController::getSecondaryWeapon() const
+{
+	return m_secondaryWeapon.get();
+}
+
+//-----------------------------------------------------------------------
+NetworkId AICreatureController::createWeapon(char const * const functionName, CrcString const & weaponName, bool const required)
+{
+	NetworkId result;
+	CreatureObject * const creatureOwner = getCreature();
+	ServerObject * const inventory = creatureOwner->getInventory();
+
+	if (inventory == NULL)
+	{
+		WARNING(true, ("AICreatureController::%s() Unable to find inventory for (%s) to place a weapon(%s)", functionName, getDebugInformation().c_str(), weaponName.getString()));
+	}
+	else
+	{
+		if (weaponName == TemporaryCrcString("none", false))
+		{
+			if (required)
+			{
+				WARNING(required, ("debug_ai: AICreatureController::%s() A required weapon is specified as ""none"" for (%s), defaulting to ""unarmed""", functionName, getDebugInformation().c_str()));
+				result = getUnarmedWeapon();
+			}
+			else
+			{
+				result = NetworkId::cms_invalid;
+			}
+		}
+		else
+		{
+			result = getUnarmedWeapon();
+
+			if (weaponName != TemporaryCrcString("unarmed", false))
+			{
+				std::string const weaponTemplateName(AiCreatureData::getWeaponTemplateName(weaponName));
+
+				if (weaponTemplateName != "unarmed")
+				{
+					ConstCharCrcString const weaponCrcName(ObjectTemplateList::lookUp(weaponTemplateName.c_str()));
+
+					if (weaponCrcName.getCrc() == 0)
+					{
+						WARNING(true, ("AICreatureController::%s() Unable to resolve a weapon(%s) crc for (%s)", functionName, weaponTemplateName.c_str(), getDebugInformation().c_str()));
+					}
+					else
+					{
+						bool const persisted = false;
+						ServerObject * const newObject = ServerWorld::createNewObject(weaponCrcName.getCrc(), *inventory, persisted);
+
+						if (newObject != NULL)
+						{
+							result = newObject->getNetworkId();
+						}
+						else
+						{
+							WARNING(true, ("AICreatureController::%s() Unable to create a WeaponObject(%s) for (%s)", functionName, weaponTemplateName.c_str(), getDebugInformation().c_str()));
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return result;
+}
+
+//-----------------------------------------------------------------------
+NetworkId AICreatureController::getUnarmedWeapon()
+{
+	NetworkId result;
+	CreatureObject * const creatureOwner = getCreature();
+	WeaponObject * const defaultWeapon = creatureOwner->getDefaultWeapon();
+
+	if (defaultWeapon != NULL)
+	{
+		result = defaultWeapon->getNetworkId();
+	}
+	else
+	{
+		WARNING(true, ("AICreatureController::getUnarmedWeapon() Unable to find a default weapon for (%s)", getDebugInformation().c_str()));
+	}
+
+	return result;
+}
+
+//-----------------------------------------------------------------------
+void AICreatureController::equipPrimaryWeapon()
+{
+	CreatureObject * const creatureOwner = getCreature();
+
+	if (creatureOwner->isAuthoritative())
+	{
+		if (!isCombatAi())
+		{
+			WARNING(true, ("AICreatureController::equipPrimaryWeapon() owner(%s) A non-combat AI is trying to equip a weapon", getDebugInformation().c_str()));
+			return;
+		}
+
+		if (!usingPrimaryWeapon())
+		{
+			ServerObject * const primaryWeaponServerObject = ServerObject::getServerObject(getPrimaryWeapon());
+			WeaponObject * const primaryWeaponObject = (primaryWeaponServerObject != NULL) ? primaryWeaponServerObject->asWeaponObject() : NULL;
+
+			if (primaryWeaponObject != NULL)
+			{
+				unEquipWeapons();
+
+				CreatureObject * const creatureOwner = getCreature();
+
+				if (primaryWeaponObject == creatureOwner->getDefaultWeapon())
+				{
+					creatureOwner->setCurrentWeapon(*primaryWeaponObject);
+				}
+				else
+				{
+					Container::ContainerErrorCode errorCode;
+
+					if (ContainerInterface::transferItemToGeneralContainer(*creatureOwner, *primaryWeaponServerObject, NULL, errorCode))
+					{
+						LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::equipPrimaryWeapon() owner(%s) primaryWeapon(%s)\n", getDebugInformation().c_str(), primaryWeaponServerObject->getDebugInformation().c_str()));
+
+						creatureOwner->setCurrentWeapon(*primaryWeaponObject);
+
+						GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(creatureOwner);
+
+						if (gameScriptObject != NULL)
+						{
+							ScriptParams scriptParams;
+							scriptParams.addParam(primaryWeaponObject->getNetworkId());
+							IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_AI_PRIMARY_WEAPON_EQUIPPED, scriptParams));
+						}
+					}
+					else
+					{
+						WARNING(true, ("AICreatureController::equipPrimaryWeapon() owner(%s) Transfer of primaryWeapon(%s) to the visible equipped slot failed(%d).", getDebugInformation().c_str(), primaryWeaponServerObject->getDebugInformation().c_str(), errorCode));
+					}
+				}
+			}
+			else
+			{
+				WARNING(true, ("AICreatureController::equipPrimaryWeapon() owner(%s) Unable to resolve primaryWeapon(%s:%s) to a WeaponObject.", getDebugInformation().c_str(), m_primaryWeapon.get().getValueString().c_str(), m_aiCreatureData->m_primaryWeapon.getString()));
+			}
+		}
+	}
+	else
+	{
+		sendMessageToAuthServer(CM_aiEquipPrimaryWeapon);
+	}
+}
+
+//-----------------------------------------------------------------------
+void AICreatureController::equipSecondaryWeapon()
+{
+	CreatureObject * const creatureOwner = getCreature();
+
+	if (creatureOwner->isAuthoritative())
+	{
+		if (!isCombatAi())
+		{
+			WARNING(true, ("AICreatureController::equipSecondaryWeapon() owner(%s) A non-combat AI is trying to equip a weapon", getDebugInformation().c_str()));
+			return;
+		}
+
+		if (!usingSecondaryWeapon())
+		{
+			ServerObject * const secondaryWeaponServerObject = ServerObject::getServerObject(getSecondaryWeapon());
+			WeaponObject * const secondaryWeaponObject = (secondaryWeaponServerObject != NULL) ? secondaryWeaponServerObject->asWeaponObject() : NULL;
+
+			if (secondaryWeaponObject != NULL)
+			{
+				unEquipWeapons();
+
+				CreatureObject * const creatureOwner = getCreature();
+
+				if (secondaryWeaponObject == creatureOwner->getDefaultWeapon())
+				{
+					creatureOwner->setCurrentWeapon(*secondaryWeaponObject);
+				}
+				else
+				{
+					Container::ContainerErrorCode errorCode;
+
+					if (ContainerInterface::transferItemToGeneralContainer(*creatureOwner, *secondaryWeaponServerObject, NULL, errorCode))
+					{
+						LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::equipSecondaryWeapon() owner(%s) secondaryWeapon(%s) errorCode(%d)\n", getDebugInformation().c_str(), secondaryWeaponServerObject->getDebugInformation().c_str()));
+
+						creatureOwner->setCurrentWeapon(*secondaryWeaponObject);
+
+						GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(creatureOwner);
+
+						if (gameScriptObject != NULL)
+						{
+							ScriptParams scriptParams;
+							scriptParams.addParam(secondaryWeaponObject->getNetworkId());
+							IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_AI_SECONDARY_WEAPON_EQUIPPED, scriptParams));
+						}
+					}
+					else
+					{
+						WARNING(true, ("AICreatureController::equipSecondaryWeapon() owner(%s) Transfer of secondaryWeapon(%s) to the visible equipped slot failed(%d).", getDebugInformation().c_str(), secondaryWeaponServerObject->getDebugInformation().c_str(), errorCode));
+					}
+				}
+			}
+			else
+			{
+				WARNING(true, ("AICreatureController::equipSecondaryWeapon() owner(%s) Unable to resolve secondaryWeapon(%s:%s) to a WeaponObject.", getDebugInformation().c_str(), m_secondaryWeapon.get().getValueString().c_str(), m_aiCreatureData->m_secondaryWeapon.getString()));
+			}
+		}
+	}
+	else
+	{
+		sendMessageToAuthServer(CM_aiEquipSecondaryWeapon);
+	}
+}
+
+//-----------------------------------------------------------------------
+void AICreatureController::unEquipWeapons()
+{
+	CreatureObject * const creatureOwner = getCreature();
+
+	if (creatureOwner->isAuthoritative())
+	{
+		if (!isCombatAi())
+		{
+			WARNING(true, ("AICreatureController::unEquipWeapons() owner(%s) A non-combat AI is trying to unequip a weapon", getDebugInformation().c_str()));
+			return;
+		}
+
+		LOGC(AiLogManager::isLogging(getOwner()->getNetworkId()), "debug_ai", ("AICreatureController::unEquipWeapons() owner(%s)\n", getDebugInformation().c_str()));
+
+		CreatureObject * const creatureOwner = getCreature();
+		WeaponObject * const currentWeaponObject = creatureOwner->getCurrentWeapon();
+		WeaponObject * const defaultWeapon = creatureOwner->getDefaultWeapon();
+
+		if (currentWeaponObject != defaultWeapon)
+		{
+			// Put the current weapon back in the inventory
+			{
+				ServerObject * const inventory = creatureOwner->getInventory();
+
+				if (inventory != NULL)
+				{
+					Container::ContainerErrorCode error;
+
+					if (!ContainerInterface::transferItemToVolumeContainer(*inventory, *currentWeaponObject, creatureOwner, error))
+					{
+						WARNING(true, ("AICreatureController::unEquipWeapons() owner(%s) Transfer of the currentWeapon(%s) to the inventory failed(%d).", getDebugInformation().c_str(), currentWeaponObject->getDebugInformation().c_str(), error));
+					}
+				}
+				else
+				{
+					WARNING(true, ("AICreatureController::unEquipWeapons() owner(%s) Unable to find an inventory.", getDebugInformation().c_str()));
+				}
+			}
+
+			// Equip the default weapon
+			{
+				if (defaultWeapon != NULL)
+				{
+					creatureOwner->setCurrentWeapon(*defaultWeapon);
+				}
+				else
+				{
+					WARNING(true, ("AICreatureController::unEquipWeapons() owner(%s) NULL default weapon", getDebugInformation().c_str()));
+				}
+			}
+		}
+	}
+	else
+	{
+		sendMessageToAuthServer(CM_aiUnEquipWeapons);
+	}
+}
+
+//-----------------------------------------------------------------------
+bool AICreatureController::hasPrimaryWeapon() const
+{
+	bool const result = (getPrimaryWeapon() != NetworkId::cms_invalid);
+
+	return result;
+}
+
+//-----------------------------------------------------------------------
+bool AICreatureController::hasSecondaryWeapon() const
+{
+	bool const result = (getSecondaryWeapon() != NetworkId::cms_invalid);
+
+	return result;
+}
+
+//-----------------------------------------------------------------------
+bool AICreatureController::usingPrimaryWeapon()
+{
+	bool result = false;
+
+	if (hasPrimaryWeapon())
+	{
+		WeaponObject const * const currentWeaponObject = getCreature()->getCurrentWeapon();
+
+		if (currentWeaponObject != NULL)
+		{
+			result = (getPrimaryWeapon() == currentWeaponObject->getNetworkId());
+		}
+	}
+
+	return result;
+}
+
+//-----------------------------------------------------------------------
+bool AICreatureController::usingSecondaryWeapon()
+{
+	bool result = false;
+
+	if (hasSecondaryWeapon() && !usingPrimaryWeapon())
+	{
+		WeaponObject const * const currentWeaponObject = getCreature()->getCurrentWeapon();
+
+		if (currentWeaponObject != NULL)
+		{
+			result = (getSecondaryWeapon() == currentWeaponObject->getNetworkId());
+		}
+	}
+
+	return result;
+}
+
+//-----------------------------------------------------------------------
+void AICreatureController::setFrozen(bool const frozen)
+{
+	if (getOwner()->isAuthoritative())
+	{
+		m_frozen = frozen;
+	}
+	else
+	{
+		sendMessageToAuthServer(CM_aiSetFrozen, new MessageQueueGenericValueType<bool>(frozen));
+	}
+}
+
+//-----------------------------------------------------------------------
+bool AICreatureController::isFrozen() const
+{
+	return m_frozen.get();
+}
+
+//-----------------------------------------------------------------------
+float AICreatureController::getMovementSpeedPercent() const
+{
+	return m_aiCreatureData->m_movementSpeedPercent;
+}
+
+//-----------------------------------------------------------------------
+void AICreatureController::addServerNpAutoDeltaVariables(Archive::AutoDeltaByteStream & stream)
+{
+	stream.addVariable(m_running);
+	stream.addVariable(m_homeLocation);
+	stream.addVariable(m_primaryWeapon);
+	stream.addVariable(m_secondaryWeapon);
+	stream.addVariable(m_frozen);
+	stream.addVariable(m_combatStartLocation);
+	stream.addVariable(m_retreating);
+	stream.addVariable(m_retreatingStartTime);
+	stream.addVariable(m_logging);
+	stream.addVariable(m_creatureName);
+	stream.addVariable(m_hibernationDelay);
+	stream.addVariable(m_hibernationTimer);
+
+	m_primaryWeaponActions.addServerNpAutoDeltaVariables(stream);
+	m_secondaryWeaponActions.addServerNpAutoDeltaVariables(stream);
+}
+
+//-----------------------------------------------------------------------
+bool AICreatureController::isAggressive() const
+{
+	CreatureObject const * const creatureOwner = getCreature();
+
+	return (!creatureOwner->isInvulnerable() && (m_aiCreatureData->m_aggressive > 0.0f));
+}
+
+//-----------------------------------------------------------------------
+bool AICreatureController::isAssist() const
+{
+	CreatureObject const * const creatureOwner = getCreature();
+
+	return (!creatureOwner->isInvulnerable() && (m_aiCreatureData->m_assist > 0.0f));
+}
+
+//-----------------------------------------------------------------------
+bool AICreatureController::isStalker() const
+{
+	CreatureObject const * const creatureOwner = getCreature();
+
+	return (!creatureOwner->isInvulnerable() && m_aiCreatureData->m_stalker);
+}
+
+//-----------------------------------------------------------------------
+bool AICreatureController::isKiller() const
+{
+	CreatureObject const * const creatureOwner = getCreature();
+
+	return (!creatureOwner->isInvulnerable() && (m_aiCreatureData->m_deathBlow == AiCreatureData::DB_instant));
+}
+
+//-----------------------------------------------------------------------
+void AICreatureController::setRetreating(bool const retreating)
+{
+	CreatureObject * const creatureOwner = getCreature();
+
+	if (creatureOwner->isAuthoritative())
+	{
+		bool const retreatStart = !m_retreating.get() && retreating;
+		bool const retreatComplete = m_retreating.get() && !retreating;
+
+		if (retreatStart)
+		{
+			// Start the AI towards its anchor position
+
+			NetworkId const & cellId = m_combatStartLocation.get().getCell();
+			Vector const & position_c = m_combatStartLocation.get().getCoordinates();
+
+			if (cellId != NetworkId::cms_invalid)
+			{
+				CellObject const * const cellObject = CellObject::getCellObject(cellId);
+
+				if (cellObject != NULL)
+				{
+					CellProperty const * const cellProperty = cellObject->getCellProperty();
+
+					moveTo(cellProperty, position_c);
+				}
+				else
+				{
+					WARNING(true, ("AICreatureController::setRetreating() ai(%s) Unable to resolve the cellId(%s) to a CellObject", creatureOwner->getDebugInformation().c_str(), cellId.getValueString().c_str()));
+				}
+			}
+			else
+			{
+				moveTo(CellProperty::getWorldCellProperty(), position_c);
+			}
+		}
+
+		m_retreating = retreating;
+
+		if (retreatStart)
+		{
+			m_retreatingStartTime = Os::getRealSystemTime();
+
+			creatureOwner->clearHateList();
+
+			triggerScriptsSimple(TRIG_AI_RETREAT_START);
+		}
+		else if (retreatComplete)
+		{
+			triggerScriptsSimple(TRIG_AI_RETREAT_COMPLETE);
+		}
+	}
+	else
+	{
+		sendMessageToAuthServer(CM_aiSetRetreating, new MessageQueueGenericValueType<bool>(retreating));
+	}
+}
+
+//-----------------------------------------------------------------------
+void AICreatureController::setLogging(bool const logging)
+{
+	CreatureObject * const creatureOwner = getCreature();
+
+	if (creatureOwner->isAuthoritative())
+	{
+		m_logging = logging;
+
+		AiLogManager::setLogging(creatureOwner->getNetworkId(), logging);
+	}
+	else
+	{
+		sendMessageToAuthServer(CM_aiSetLogging, new MessageQueueGenericValueType<bool>(logging));
+	}
+}
+
+//-----------------------------------------------------------------------
+bool AICreatureController::isLogging() const
+{
+	return m_logging.get();
+}
+
+//-----------------------------------------------------------------------
+bool AICreatureController::isRetreating() const
+{
+	return m_retreating.get();
+}
+
+//-----------------------------------------------------------------------
+bool AICreatureController::isCombatAi() const
+{
+	return (m_aiCreatureData != &AiCreatureData::getDefaultCreatureData());
+}
+
+// ----------------------------------------------------------------------
+
+std::string AICreatureController::getDebugInformation() const
+{
+	return FormattedString<1024>().sprintf("creatureName=%s %s", getCreatureName().getString(), getOwner()->getDebugInformation().c_str());
+}
+
+//-----------------------------------------------------------------------
+void AICreatureController::sendMessageToAuthServer(GameControllerMessage const gameControllerMessage)
+{
+	int const flags = GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER;
+
+	appendMessage(gameControllerMessage, 0, flags);
+}
+
+//-----------------------------------------------------------------------
+void AICreatureController::sendMessageToAuthServer(GameControllerMessage const gameControllerMessage, MessageQueue::Data * messageQueue)
+{
+	int const flags = GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER;
+
+	appendMessage(gameControllerMessage, 0, messageQueue, flags);
+}
+
+//-----------------------------------------------------------------------
+void AICreatureController::sendMessageToProxyServer(GameControllerMessage const gameControllerMessage, MessageQueue::Data * messageQueue)
+{
+	int const flags = GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_PROXY_SERVER;
+
+	appendMessage(gameControllerMessage, 0, messageQueue, flags);
+}
+
+//-----------------------------------------------------------------------
+AiMovementType AICreatureController::getMovementType() const
+{
+	AiMovementType result = AMT_invalid;
+
+	if (m_movement != AiMovementBaseNullPtr)
+	{
+		result = m_movement->getType();
+	}
+
+	return result;
+}
+
+//-----------------------------------------------------------------------
+AiMovementType AICreatureController::getPendingMovementType() const
+{
+	AiMovementType result = AMT_invalid;
+
+	if (m_pendingMovement != AiMovementBaseNullPtr)
+	{
+		result = m_pendingMovement->getType();
+	}
+
+	return result;
+}
+
+//-----------------------------------------------------------------------
+PersistentCrcString const & AICreatureController::getCombatAction()
+{
+	if (usingPrimaryWeapon())
+	{
+		return m_primaryWeaponActions.getCombatAction();
+	}
+	else if (usingSecondaryWeapon())
+	{
+		return m_secondaryWeaponActions.getCombatAction();
+	}
+
+	return PersistentCrcString::empty;
+}
+
+//-----------------------------------------------------------------------
+time_t AICreatureController::getKnockDownRecoveryTime() const
+{
+	AiCreatureCombatProfile const * const combatProfile = AiCreatureCombatProfile::getCombatProfile(m_aiCreatureData->m_primarySpecials);
+
+	return (combatProfile != NULL) ? combatProfile->m_knockDownRecoveryTime : 0;
+}
+//-----------------------------------------------------------------------
+std::string const AICreatureController::getCombatActionsString()
+{
+	std::string result;
+	FormattedString<4096> fs;
+
+	result += fs.sprintf("knockDownRecoveryTime: %u\n", static_cast<unsigned int>(getKnockDownRecoveryTime()));
+
+	// Primary Weapon
+	{
+		WeaponObject const * const primaryWeaponObject = WeaponObject::getWeaponObject(getPrimaryWeapon());
+
+		if (primaryWeaponObject != NULL)
+		{
+			result += fs.sprintf("PRIMARY WEAPON >>> %s range[%.0f...%.0f] %s\n", FileNameUtils::get(primaryWeaponObject->getObjectTemplateName(), FileNameUtils::fileName).c_str(), primaryWeaponObject->getMinRange(), primaryWeaponObject->getMaxRange(), usingPrimaryWeapon() ? "(active)" : "");
+		}
+		else
+		{
+			result += fs.sprintf("PRIMARY WEAPON >>> ERROR NO WEAPON\n");
+		}
+
+		AiCreatureCombatProfile const * const primaryWeaponCombatProfile = AiCreatureCombatProfile::getCombatProfile(m_aiCreatureData->m_primarySpecials);
+		if (primaryWeaponCombatProfile != NULL)
+		{
+			result += primaryWeaponCombatProfile->toString();
+		}
+		else
+		{
+			result += fs.sprintf(" no special attacks\n");
+		}
+	}
+
+	// Secondary Weapon
+	{
+		WeaponObject const * const secondaryWeaponObject = WeaponObject::getWeaponObject(getSecondaryWeapon());
+
+		if (secondaryWeaponObject != NULL)
+		{
+			result += fs.sprintf("SECONDARY WEAPON >>> %s range[%.0f...%.0f] %s\n", FileNameUtils::get(secondaryWeaponObject->getObjectTemplateName(), FileNameUtils::fileName).c_str(), secondaryWeaponObject->getMinRange(), secondaryWeaponObject->getMaxRange(), usingSecondaryWeapon() ? "(active)" : "");
+		}
+		else
+		{
+			result += fs.sprintf("SECONDARY WEAPON >>> NONE\n");
+		}
+
+		AiCreatureCombatProfile const * const secondaryWeaponCombatProfile = AiCreatureCombatProfile::getCombatProfile(m_aiCreatureData->m_secondarySpecials);
+
+		if (secondaryWeaponCombatProfile != NULL)
+		{
+			result += secondaryWeaponCombatProfile->toString();
+		}
+		else
+		{
+			result += fs.sprintf(" no special attacks\n");
+		}
+	}
+
+	return result;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/controller/AiCreatureController.h b/engine/server/library/serverGame/src/shared/controller/AiCreatureController.h
new file mode 100644
index 00000000..bb0260f1
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/AiCreatureController.h
@@ -0,0 +1,276 @@
+// ======================================================================
+//
+// AiCreatureController.h
+//
+// copyright 2003, sony online entertainment
+//
+// ======================================================================
+
+#ifndef	INCLUDED_AiCreatureController_H
+#define	INCLUDED_AiCreatureController_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/AiCreatureWeaponActions.h"
+#include "serverGame/AiMovementBase.h"
+#include "serverGame/CreatureController.h"
+#include "serverGame/ServerCreatureObjectTemplate.h"
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedGame/SharedCreatureObjectTemplate.h"
+#include "sharedUtility/Location.h"
+
+//----------------------------------------------------------------------
+
+class AiMovementBase;
+class AiCreatureData;
+class AiDebugString;
+class CrcString;
+class CreatureObject;
+class FloorLocator;
+class TargetPathNode;
+class WeightedTerrainPathEvaluator;
+
+// ----------------------------------------------------------------------
+
+class AICreatureController : public CreatureController
+{
+public:
+
+	static void install();
+
+	static AICreatureController * getAiCreatureController(NetworkId const & networkId);
+	static AICreatureController * asAiCreatureController(Controller * controller);
+	static AICreatureController const * asAiCreatureController(Controller const * controller);
+
+	static float getLeashRadius();
+
+public:
+	explicit AICreatureController (CreatureObject * newOwner);
+	~AICreatureController   ();
+
+	virtual AICreatureController * asAiCreatureController();
+	virtual AICreatureController const * asAiCreatureController() const;
+
+	virtual void handleMessage (int message, float value, const MessageQueue::Data *data, uint32 flags);
+
+	// ----------
+	// Script Hooks
+
+	void setCreatureName(std::string const & creatureName);
+	PersistentCrcString const & getCreatureName() const; // The "creatureName" column from creatures_datatable.xml
+
+	// Movement commands for scripting use - Action States
+
+	const AiMovementBase * getCurrentMovement() const;
+
+	void                 moveTo                  (CellProperty const * cell, Vector const & target_p, float const radius = 0.0f);
+	void                 moveTo                  (Unicode::String const & targetName);
+	void                 patrol                  ( stdvector<Location>::fwd const & locations, bool random, bool flip, bool repeat, int startPoint);
+	void                 patrol                  ( stdvector<Unicode::String>::fwd const & locations, bool random, bool flip, bool repeat, int startPoint);
+	bool                 wander                  ( float minLength, float maxLength, float minAngle, float maxAngle, float minDelay, float maxDelay );
+	void                 loiter                  (CellProperty const * homeCell, Vector const & home_p, float const minDistance, float const maxDistance, float const minDelay, float const maxDelay);
+	void                 loiter                  (NetworkId const & target, float const minDistance, float const maxDistance, float const minDelay, float const maxDelay);
+	bool                 follow                  ( NetworkId const & target, float minDistance, float maxDistance );
+	bool                 follow                  ( NetworkId const & target, Vector const & offset );
+	bool                 swarm                   ( NetworkId const & target );
+	bool                 swarm                   ( NetworkId const & target, float offset );
+	bool                 flee                    ( NetworkId const & target, float minDistance, float maxDistance );
+	bool                 faceTo                  ( CellProperty const * targetCell, Vector const & target_p );
+	bool                 faceTo                  ( NetworkId const & target );
+	void                 stop                    ();
+
+	void                 setMovementRun          ( void );
+	void                 setMovementWalk         ( void );
+
+	// ----------
+
+	void                 moveCreature            ( CellProperty const * newCell, Vector const & newPosition, bool testMove );
+
+	void                 getBehaviorDebugInfo    ( std::string & outString ) const;
+	void 				 changeMovement          (AiMovementBasePtr newMovement);
+	bool 				 hasPendingMovement      () const;
+	bool                 suspendMovement         ();
+	bool                 resumeMovement          ();
+	bool                 hasSuspendedMovement    ();
+
+	float                getSpeed                () const;
+	void                 setSpeed                (float const newSpeed);
+
+	bool                 isRunning               ( void ) const;
+	float                getAcceleration         ( void ) const;
+
+	void                 moveTowards             ( CellProperty const * cell, Vector const & position, float time );
+	bool                 moveAlongGround         ( CellProperty const * cell, Vector const & target, float distance );
+	void                 turnToward              ( CellProperty const * cell, Vector const & target );
+	float                getDistanceToLocationSquared(CellProperty const * cell, Vector const & target) const;
+	bool                 reachedPoint            ( CellProperty const * cell, Vector const & point, float radius ) const;
+	void                 warpToTarget            ( void );
+	void                 warpToPathpoint         ( void );
+	void                 warpToWaypoint          ( void );
+	void                 warpTo                  ( CellProperty const * cell, Vector const & position );
+
+	void                 updateMovementType      ( void );
+
+	// ----------
+
+	CreatureObject const * getCreature           ( void ) const;
+	CreatureObject *     getCreature             ( void );
+
+	CellProperty const * getCreatureCell         ( void ) const;
+	Vector               getCreaturePosition_p   ( void ) const;
+	Vector               getCreaturePosition_w   ( void ) const;
+	float                getCreatureRadius       ( void ) const;
+
+	// ----------
+
+	void                 triggerScriptsSimple    ( int scriptId );
+	void                 triggerScriptsWithTarget( int scriptId, NetworkId const & targetId );
+	void                 triggerScriptsWithParam ( int scriptId, float & io_param );
+
+	void                 sleep                   ( float sleepTime );
+
+	virtual bool         shouldHibernate         ( void ) const;
+	virtual void         setHibernate            (bool hibernate);
+
+	void                 setHibernationDelay     (float delay);
+//	float                getHibernationDelay     () const;
+
+	int                  getStuckCounter         ( void ) const;
+
+	void                 setAuthority            ( bool authority );
+	void                 forwardServerObjectSpecificBaselines() const;
+
+	void equipPrimaryWeapon();
+	void equipSecondaryWeapon();
+	void unEquipWeapons();
+	bool hasPrimaryWeapon() const;
+	bool hasSecondaryWeapon() const;
+	bool usingPrimaryWeapon();
+	bool usingSecondaryWeapon();
+	NetworkId const & getPrimaryWeapon() const;
+	NetworkId const & getSecondaryWeapon() const;
+
+	void setHomeLocation(Location const & homeLocation);
+	Location const & getHomeLocation() const;
+
+	void markCombatStartLocation();
+	Location const & getCombatStartLocation() const;
+
+	float getMovementSpeedPercent() const; // Percent relative to an unarmed player
+
+	void setFrozen(bool const frozen);
+	bool isFrozen() const;
+
+	void addServerNpAutoDeltaVariables(Archive::AutoDeltaByteStream & stream);
+
+	bool isAggressive() const;
+	bool isAssist() const;
+	bool isStalker() const;
+	bool isKiller() const;
+
+	void setRetreating(bool const retreating);
+	bool isRetreating() const;
+	bool isCombatAi() const;
+
+	void setLogging(bool const logging);
+	bool isLogging() const;
+
+	void setMovementPaused(bool const paused);
+	bool isMovementPaused() const;
+
+	float getAggroRadius() const;
+	float getRespectRadius(NetworkId const & target) const;
+	float getAssistRadius() const;
+
+	AiMovementType getMovementType() const;
+	AiMovementType getPendingMovementType() const;
+
+	PersistentCrcString const & getCombatAction();
+	time_t getKnockDownRecoveryTime() const;
+
+	std::string const getCombatActionsString();
+
+protected:
+
+	static float         getGroundDistance       ( Vector const & A, Vector const & B );
+
+	virtual float        realAlter               ( float time );
+
+private:
+
+#ifdef _DEBUG
+	void sendDebugAiToClients(AiDebugString & aiDebugString);
+#endif // _DEBUG
+
+	void setPrimaryWeapon(CrcString const & objectTemplate);
+	void setSecondaryWeapon(CrcString const & objectTemplate);
+	void destroyPrimaryWeapon();
+	void destroySecondaryWeapon();
+
+	void applyMovementChange();
+
+	void setupCreatureData(std::string const & creatureName);
+	NetworkId createWeapon(char const * const functionName, CrcString const & weaponName, bool const required);
+	NetworkId getUnarmedWeapon();
+	std::string getDebugInformation() const;
+	void sendMessageToAuthServer(GameControllerMessage const gameControllerMessage);
+	void sendMessageToAuthServer(GameControllerMessage const gameControllerMessage, MessageQueue::Data * messageQueue);
+	void sendMessageToProxyServer(GameControllerMessage const gameControllerMessage, MessageQueue::Data * messageQueue);
+	void onCreatureNameChanged(std::string const & creatureName);
+
+	struct CreatureNameChangedCallback
+	{
+		void modified(AICreatureController & target, std::string const & oldValue, std::string const & newValue, bool local) const;
+	};
+	friend struct CreatureNameChangedCallback;
+
+	AiMovementBasePtr    m_movement;
+	AiMovementBasePtr    m_pendingMovement;
+	AiMovementBasePtr    m_suspendedMovement;
+	Vector               m_lastStartPosition;
+	Vector               m_lastEndPosition;
+	float                m_sleepTimer;
+	bool                 m_inPathfindingRegion;
+	int                  m_stuckCounter;
+	bool                 m_authority;
+	float m_speed;
+	AiCreatureData const * m_aiCreatureData;
+	AiCreatureWeaponActions m_primaryWeaponActions;
+	AiCreatureWeaponActions m_secondaryWeaponActions;
+
+	Archive::AutoDeltaVariable<bool> m_running;
+	Archive::AutoDeltaVariable<Location> m_homeLocation;
+	Archive::AutoDeltaVariable<NetworkId> m_primaryWeapon;
+	Archive::AutoDeltaVariable<NetworkId> m_secondaryWeapon;
+	Archive::AutoDeltaVariable<bool> m_frozen;
+	Archive::AutoDeltaVariable<Location> m_combatStartLocation;
+	Archive::AutoDeltaVariable<bool> m_retreating;
+	Archive::AutoDeltaVariable<time_t> m_retreatingStartTime;
+	Archive::AutoDeltaVariable<bool> m_logging;
+	Archive::AutoDeltaVariableCallback<std::string, CreatureNameChangedCallback, AICreatureController> m_creatureName;
+	Archive::AutoDeltaVariable<float> m_hibernationDelay;
+	Archive::AutoDeltaVariable<float> m_hibernationTimer;
+
+#ifdef _DEBUG
+	uint32 m_aiDebugStringCrc;
+#endif // _DEBUG
+
+	bool   m_invalidTarget;
+private:
+	AICreatureController();
+	AICreatureController(AICreatureController const & rhs);
+	AICreatureController & operator =(AICreatureController const & rhs);
+
+};
+
+//-----------------------------------------------------------------------
+
+inline const AiMovementBase * AICreatureController::getCurrentMovement() const
+{
+	return m_movement.get();
+}
+
+
+//-----------------------------------------------------------------------
+
+#endif	// INCLUDED_AiCreatureController_H
diff --git a/engine/server/library/serverGame/src/shared/controller/AiShipController.cpp b/engine/server/library/serverGame/src/shared/controller/AiShipController.cpp
new file mode 100644
index 00000000..329a0069
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/AiShipController.cpp
@@ -0,0 +1,1925 @@
+// ======================================================================
+//
+// AiShipController.cpp
+// asommers
+//
+// copyright 2003, sony online entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiShipController.h"
+
+#include "serverGame/AiPilotManager.h"
+#include "serverGame/AiShipAttackTargetList.h"
+#include "serverGame/AiShipBehaviorAttackBomber.h"
+#include "serverGame/AiShipBehaviorAttackCapitalShip.h"
+#include "serverGame/AiShipBehaviorAttackFighter.h"
+#include "serverGame/AiShipBehaviorDock.h"
+#include "serverGame/AiShipBehaviorFollow.h"
+#include "serverGame/AiShipBehaviorIdle.h"
+#include "serverGame/AiShipBehaviorTrack.h"
+#include "serverGame/AiShipBehaviorWaypoint.h"
+#include "serverGame/AiShipPilotData.h"
+#include "serverGame/AiShipTurretTargetingSystem.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/MissileManager.h"
+#include "serverGame/Pvp.h"
+#include "serverGame/AiServerShipObjectInterface.h"
+#include "serverGame/ShipAiEnemySearchManager.h"
+#include "serverGame/ShipAiReactionManager.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/SpaceAttackSquad.h"
+#include "serverGame/SpacePath.h"
+#include "serverGame/SpacePathManager.h"
+#include "serverGame/SpaceSquad.h"
+#include "serverGame/SpaceSquadManager.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedCollision/BaseExtent.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedCollision/SpaceAvoidanceManager.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/Os.h"
+#include "sharedFoundation/PersistentCrcString.h"
+#include "sharedGame/AiDebugString.h"
+#include "sharedGame/SharedShipObjectTemplate.h"
+#include "sharedGame/ShipDynamicsModel.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedObject/AlterResult.h"
+#include "sharedObject/Appearance.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedTerrain/TerrainObject.h"
+
+#include "UnicodeUtils.h"
+
+#include <map>
+#include <vector>
+
+// ======================================================================
+//
+// AiShipControllerNamespace
+//
+// ======================================================================
+
+namespace AiShipControllerNamespace
+{
+	typedef std::set<Client *> ObserverList;
+	typedef std::vector<ServerObject *> VisibilityList;
+	typedef std::vector<NetworkId> EnemyList;
+
+	bool s_installed = false;
+	VisibilityList s_visibilityList;
+	EnemyList s_enemyList;
+	bool s_attackingEnabled = true;
+	float const s_goalStopDistance = 4.0f;
+	float const s_slowdownThrottlePositionMin = 0.6f;
+	bool s_spaceAiClientDebugEnabled = false;
+	float s_slowDownTurnRadiusGain = 0.5f;
+	float s_throttleTurnRadiusGain = 0.8f;
+	float const s_playerGroupDamageTakenPercent = 0.1f;
+	float const s_squadDamageTakenPercent = 0.05f;
+	float const s_guardSquadDamageTakenPercent = 1.2f;
+}
+
+using namespace AiShipControllerNamespace;
+
+// ======================================================================
+//
+// AiShipController
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+
+void AiShipController::install()
+{
+	DEBUG_FATAL(s_installed, ("Already installed."));
+
+	AiShipPilotData::install();
+	AiPilotManager::install();
+
+	s_spaceAiClientDebugEnabled = ConfigServerGame::isAiClientDebugEnabled();
+
+	s_installed = true;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::setClientDebugEnabled(bool const enabled)
+{
+	s_spaceAiClientDebugEnabled = enabled;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipController::isClientDebugEnabled()
+{
+	return s_spaceAiClientDebugEnabled;
+}
+
+// ----------------------------------------------------------------------
+
+AiShipController * AiShipController::getAiShipController(NetworkId const & unit)
+{
+	Object * const object = NetworkIdManager::getObjectById(unit);
+
+	return (object != NULL) ? AiShipController::asAiShipController(object->getController()) : NULL;
+}
+
+// ----------------------------------------------------------------------
+
+AiShipController * AiShipController::asAiShipController(Controller * const controller)
+{
+	ShipController * const shipController = (controller != NULL) ? controller->asShipController() : NULL;
+	AiShipController * const aiShipController = (shipController != NULL) ? shipController->asAiShipController() : NULL;
+	
+	return aiShipController;
+}
+
+// ----------------------------------------------------------------------
+
+AiShipController const * AiShipController::asAiShipController(Controller const * const controller)
+{
+	ShipController const * const shipController = (controller != NULL) ? controller->asShipController() : NULL;
+	AiShipController const * const aiShipController = (shipController != NULL) ? shipController->asAiShipController() : NULL;
+	
+	return aiShipController;
+}
+
+// ----------------------------------------------------------------------
+
+AiShipController::AiShipController(ShipObject * const owner) :
+	ShipController(owner),
+	m_pilotData(&AiShipPilotData::getDefaultPilotData()),
+	m_pendingNonAttackBehavior(NULL),
+	m_nonAttackBehavior(NULL),
+	m_pendingAttackBehavior(NULL),
+	m_attackBehavior(NULL),
+	m_shipName(),
+	m_shipClass(ShipAiReactionManager::SC_invalid),
+	m_requestedSlowDown(false),
+	m_squad(NULL),
+	m_attackSquad(NULL),
+	m_formationPosition_l(),
+	m_attackFormationPosition_l(),
+	m_path(NULL),
+	m_currentPathIndex(0),
+	m_aggroRadius(200.0f),
+	m_countermeasureState(CS_none),
+	m_reactToMissileTimer(new Timer),
+#ifdef _DEBUG
+	m_aiDebugStringCrc(0),
+#endif // _DEBUG
+	m_moveToGoalPosition_w(),
+	m_lastAttackUpdate(-1),
+	m_pilotManagerInfo(new AiPilotManager),
+	m_attackOrders(AO_attackFreely),
+	m_exclusiveAggroSet(new CachedNetworkIdSet)
+{
+}
+
+// ----------------------------------------------------------------------
+
+AiShipController::~AiShipController()
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::~AiShipController() owner(%s) DESTROYING UNIT", getOwner()->getDebugInformation().c_str()));
+
+	// Remove this unit from its squad
+
+	if (m_squad != NULL)
+	{
+		// The owner of the squad is SpaceSquadManager
+
+		getSquad().removeUnit(getOwner()->getNetworkId());
+		m_squad = NULL;
+	}
+
+	// Remove this unit from its attack squad
+
+	if (m_attackSquad != NULL)
+	{
+		// The owner of the attack squad is SpaceSquad
+
+		m_attackSquad->removeUnit(getOwner()->getNetworkId());
+		m_attackSquad = NULL;
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::~AiShipController() owner(%s) ERROR: Why was this unit not in an attack squad?", getOwner()->getDebugInformation().c_str()));
+	}
+
+	// Remove path here.
+	SpacePathManager::release(m_path, getOwner());
+
+	m_path = NULL;
+	m_pilotData = NULL;
+
+	delete m_nonAttackBehavior;
+	m_nonAttackBehavior = NULL;
+	delete m_pendingNonAttackBehavior;
+	m_pendingNonAttackBehavior = NULL;
+	delete m_pendingAttackBehavior;
+	m_pendingAttackBehavior = NULL;
+	delete m_attackBehavior;
+	m_attackBehavior = NULL;
+	delete m_reactToMissileTimer;
+	delete m_pilotManagerInfo;
+	delete m_exclusiveAggroSet;
+}
+
+// ----------------------------------------------------------------------
+void AiShipController::endBaselines()
+{
+	DEBUG_FATAL((m_squad != NULL), ("m_squad should be NULL"));
+	m_squad = SpaceSquadManager::createSquad();
+
+	getSquad().addUnit(getOwner()->getNetworkId());
+
+	// Always default the ship to the idle non-attacking behavior
+
+	idle();
+}
+
+// ----------------------------------------------------------------------
+
+float AiShipController::realAlter(float const elapsedTime)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("AiShipController::realAlter");
+
+#ifdef _DEBUG
+
+	AiDebugString * aiDebugString = NULL;
+	if (   s_spaceAiClientDebugEnabled
+	    && !getShipOwner()->getObservers().empty())
+	{
+		aiDebugString = new AiDebugString;
+	}
+
+#endif // _DEBUG
+
+	// We have to have a pending behavior because while in a behavior a trigger can get called which can then kill that behavior, so we have to wait until the next frame to switch behaviors so they don't stomp each other from triggers.
+
+	if (m_pendingNonAttackBehavior != NULL)
+	{
+		delete m_nonAttackBehavior;
+		m_nonAttackBehavior = m_pendingNonAttackBehavior;
+		m_pendingNonAttackBehavior = NULL;
+	}
+
+	if (m_pendingDockingBehavior != NULL)
+	{
+		delete m_dockingBehavior;
+		m_dockingBehavior = m_pendingDockingBehavior;
+		m_pendingDockingBehavior = NULL;
+	}
+
+	if (   (m_dockingBehavior != NULL)
+	    && (m_dockingBehavior->isDockFinished()))
+	{
+		delete m_dockingBehavior;
+		m_dockingBehavior = NULL;
+	}
+
+	m_yawPosition = 0.f;
+	m_pitchPosition = 0.f;
+	m_rollPosition = 0.f;
+	setThrottle(0.0f);
+
+	ShipObject * const shipOwner = NON_NULL(getShipOwner());
+
+	PROFILER_AUTO_BLOCK_DEFINE("behaviors");
+	if (m_attackBehavior != NULL) // This was added for ships that are contructed for AI but not fully contructed proper using the space_mobile.tab
+	{
+		if (isAttacking()) // Capital ships never go into attack mode as such, always follow their non-attacking behavior (although they may fire turrets as they go)
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("attack behaviors");
+
+			// See if we need to send out the enter combat trigger
+
+			if (m_lastAttackUpdate != (Os::getNumberOfUpdates() - 1))
+			{
+				triggerEnterCombat(getPrimaryAttackTarget());
+			}
+
+			m_lastAttackUpdate = Os::getNumberOfUpdates();
+
+			//-- Open wings
+
+			if (shipOwner->hasWings() && !shipOwner->wingsOpened())
+			{
+				shipOwner->openWings();
+			}
+
+			if (m_dockingBehavior != NULL)
+			{
+				m_dockingBehavior->unDock();
+			}
+
+			if (   isAttackSquadLeader()
+			    || !getAttackSquad().isInFormation())
+			{
+				m_attackBehavior->alter(elapsedTime);
+
+#ifdef _DEBUG
+				if (aiDebugString != NULL)
+				{
+					m_attackBehavior->addDebug(*aiDebugString);
+				}
+#endif // _DEBUG
+			}
+			else
+			{
+				// Follow the attack squad leader
+
+				Object * const leaderObject = getAttackSquad().getLeader().getObject();
+				ShipController * const leaderShipController = leaderObject->getController()->asShipController();
+				AiShipController * const leaderAiShipController = (leaderShipController != NULL) ? leaderShipController->asAiShipController() : NULL;
+
+				if (leaderAiShipController != NULL)
+				{
+					Transform transform(leaderObject->getTransform_o2w());
+					transform.setPosition_p(leaderAiShipController->getMoveToGoalPosition_w());
+
+					Vector const & goalPosition_w = Formation::getPosition_w(transform, getAttackFormationPosition_l());
+					float const throttle = calculateThrottleToPosition_w(goalPosition_w, getLargestTurnRadius());
+
+					moveTo(goalPosition_w, throttle, elapsedTime);
+				}
+				else
+				{
+					LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::realAlter() ERROR: shipOwner(%s) Trying to follow a non-existent attack squad leader.", getOwner()->getNetworkId().getValueString().c_str()));
+				}
+			}
+
+			// If the attack behavior changes, switch it immediately after alter.  Don't wait for the next frame, because we don't want to lose state changes
+			// that might happen during this frame
+			if (m_pendingAttackBehavior)
+			{
+				delete m_attackBehavior;
+				m_attackBehavior = m_pendingAttackBehavior;
+				m_pendingAttackBehavior = NULL;
+			}
+		}
+		else if (isBeingDocked())
+		{
+			// Hold the AI ship while it is being docked
+
+			setThrottle(0.0f);
+		}
+		else if (m_dockingBehavior != NULL)
+		{
+			m_dockingBehavior->alter(elapsedTime);
+
+#ifdef _DEBUG
+			if (aiDebugString != NULL)
+			{
+				m_dockingBehavior->addDebug(*aiDebugString);
+			}
+#endif // _DEBUG
+		}
+		else if (m_nonAttackBehavior != NULL)
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("non-attack behaviors");
+
+			//-- Close wings
+
+			if (shipOwner->hasWings() && shipOwner->wingsOpened())
+			{
+				shipOwner->closeWings();
+			}
+
+			// Check for enemies periodically
+
+			if (   !m_enemyCheckQueued
+			    && shouldCheckForEnemies())
+			{
+				m_enemyCheckQueued = true;
+				ShipAiEnemySearchManager::add(*shipOwner);
+			}
+
+#ifdef _DEBUG
+			if (!s_attackingEnabled)
+			{
+				m_attackTargetList->clear();
+			}
+#endif // _DEBUG
+
+			if (isSquadLeader())
+			{
+				m_nonAttackBehavior->alter(elapsedTime);
+
+#ifdef _DEBUG
+				if (aiDebugString != NULL)
+				{
+					m_nonAttackBehavior->addDebug(*aiDebugString);
+				}
+#endif // _DEBUG
+			}
+			else
+			{
+				// Follow the squad leader
+
+				Object * const squadLeader = getSquad().getLeader().getObject();
+
+				if (squadLeader != NULL)
+				{
+					Vector goalPosition_w(Formation::getPosition_w(squadLeader->getTransform_o2w(), getFormationPosition_l()));
+
+					// Determine if we need to request the unit we are following to slow down
+
+					if (getOwner()->getPosition_w().magnitudeBetweenSquared(goalPosition_w) > sqr(getLargestTurnRadius() * s_slowDownTurnRadiusGain))
+					{
+						ShipController * const followedUnitShipController = squadLeader->getController()->asShipController();
+						AiShipController * const followedUnitAiShipController = (followedUnitShipController != NULL) ? followedUnitShipController->asAiShipController() : NULL;
+						
+						if (followedUnitAiShipController != NULL)
+						{
+							followedUnitAiShipController->requestSlowDown();
+						}
+						else
+						{
+							LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::realAlter() ERROR: shipOwner(%s) The followed unit does not have an AiShipController.", getOwner()->getNetworkId().getValueString().c_str()));
+						}
+					}
+
+					float const throttle = calculateThrottleToPosition_w(goalPosition_w, getLargestTurnRadius() * s_throttleTurnRadiusGain);
+
+					if (throttle <= 0.0f)
+					{
+						//-- The vehicle is at its destination position, so face the same direction as the squad leader
+
+						moveTo(squadLeader->rotateTranslate_o2w(Vector(0.0f, 0.0f, 10000.0f)), 0.0f, elapsedTime);
+					}
+					else
+					{
+						//-- The vehicle is trying to get to its goal position
+
+						moveTo(goalPosition_w, throttle, elapsedTime);
+					}
+
+#ifdef _DEBUG
+					if (aiDebugString != NULL)
+					{
+						m_nonAttackBehavior->addDebug(*aiDebugString);
+					}
+#endif // _DEBUG
+				}
+				else
+				{
+					LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::realAlter() ERROR: shipOwner(%s) Trying to follow a non-existent squad leader.", getOwner()->getNetworkId().getValueString().c_str()));
+				}
+			}
+		}
+		else
+		{
+			DEBUG_WARNING(true, ("debug_ai: There should never be a NULL non-attacking behavior %s", getOwner()->getDebugInformation().c_str()));
+		}
+	}
+
+	// If this ship is the squad leader and it can't move, pick a new squad leader
+
+	if (isSquadLeader())
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("check squadLeader");
+		if (   isAttacking()
+		    || !hasFunctionalEngines())
+		{
+			getSquad().assignNewLeader();
+		}
+	}
+
+	// If this ship is the attack squad leader and it can't move, pick a new attack squad leader
+
+	if (isAttackSquadLeader())
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("check attackSquadLeader");
+		if (!hasFunctionalEngines())
+		{
+			getAttackSquad().assignNewLeader();
+		}
+	}
+
+	//-- Manage countermeasures
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("Manage countermeasures");
+		switch (m_countermeasureState)
+		{
+			case CS_reacting:
+				if (m_reactToMissileTimer->updateZero(elapsedTime))
+					m_countermeasureState = CS_launching;
+				break;
+
+			case CS_launching:
+				if (MissileManager::getInstance().isTargetedByMissile(getOwner()->getNetworkId()))
+				{
+					for (int weaponIndex = 0; weaponIndex < ShipChassisSlotType::cms_numWeaponIndices; ++weaponIndex)
+					{
+						PROFILER_AUTO_BLOCK_DEFINE("countermeasures missile loop");
+						if (NON_NULL(getShipOwner())->isCountermeasure(weaponIndex))
+							getShipOwner()->fireShotNonTurretServer(weaponIndex, NetworkId::cms_invalid, ShipChassisSlotType::SCST_invalid);
+					}
+				}
+				else
+					m_countermeasureState = CS_none;
+				break;
+				
+			case CS_none:
+			default:
+				break;
+		}
+	}
+
+	//-- Update flight model
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("update dynamics model");
+
+		bool const modifySpeed = isAttacking();
+		AiServerShipObjectInterface const aiServerShipObjectInterface(shipOwner, *m_pilotData, modifySpeed);
+		float const throttle = getThrottle();
+
+		m_shipDynamicsModel->model(elapsedTime, m_yawPosition, m_pitchPosition, m_rollPosition, throttle, aiServerShipObjectInterface);
+	}
+
+	//-- Update the server position based on the model
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("set transform");
+		shipOwner->setTransform_o2p(m_shipDynamicsModel->getTransform());
+	}
+
+#ifdef _DEBUG
+	if (   (m_attackBehavior != NULL)
+	    && (aiDebugString != NULL))
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("sendDebugAiToClients");
+		sendDebugAiToClients(*aiDebugString);
+		delete aiDebugString;
+	}
+#endif // _DEBUG
+
+	//-- Chain back up to parent
+	float alterResult = ShipController::realAlter(elapsedTime);
+	AlterResult::incorporateAlterResult(alterResult, AlterResult::cms_alterNextFrame);
+	return alterResult;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::moveTo(Vector const & position_w, float const throttle, float const deltaTime)
+{
+	bool slowDown = false;
+
+	// If we are not following a unit, see if we need to slow down for someone
+
+	if (   (m_nonAttackBehavior != NULL)
+	    && (m_nonAttackBehavior->getBehaviorType() != ASBT_follow)
+	    && m_requestedSlowDown
+		&& !isAttacking())
+	{
+		slowDown = true;
+	}
+	else
+	{
+		setThrottle(throttle);
+	}
+
+	// If we need to slow down for a following unit, then lets set the new throttle
+
+	if (slowDown)
+	{
+		m_requestedSlowDown = false;
+		static float throttleGain = 1.0f;
+		setThrottle(clamp(s_slowdownThrottlePositionMin, getThrottle() - (getThrottle() * deltaTime * throttleGain), 1.0f));
+	}
+
+	// See if we need to avoid an obstacle
+
+	Vector resultAvoidancePosition_w;
+	Vector const & shipVelocity = getShipOwner()->getCurrentVelocity_p();
+	
+	if (SpaceAvoidanceManager::getAvoidancePosition(*getOwner(), shipVelocity, position_w, resultAvoidancePosition_w))
+	{
+		IGNORE_RETURN(face(resultAvoidancePosition_w, deltaTime));
+	}
+	else
+	{
+		// See if we need to avoid another squad member
+
+		Vector const squadAvoidanceVector(getSquad().getAvoidanceVector(*getShipOwner()));
+
+		if (squadAvoidanceVector != Vector::zero)
+		{
+			Vector const squadAvoidancePosition_w(getOwnerPosition_w() + squadAvoidanceVector);
+			IGNORE_RETURN(face(squadAvoidancePosition_w, deltaTime));
+		}
+		else
+		{
+			IGNORE_RETURN(face(position_w, deltaTime));
+		}
+	}
+
+	m_moveToGoalPosition_w = position_w;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipController::addDamageTaken(NetworkId const & attackingUnit, float const damage, bool const verifyAttacker)
+{
+	return ShipController::addDamageTaken(attackingUnit, damage, verifyAttacker);
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipController::addDamageTaken(NetworkId const & attackingUnit, float const damage, bool const verifyAttacker, bool const notifySquad, bool const checkPlayerAttacker)
+{
+	bool const result = addDamageTaken(attackingUnit, damage, verifyAttacker);
+
+	if (result)
+	{
+		// If this is a player attacking, take damage from all the group members
+
+		if (checkPlayerAttacker)
+		{
+			ShipObject const * const attackingShipObject = ShipObject::asShipObject(NetworkIdManager::getObjectById(attackingUnit));
+
+			if (attackingShipObject != NULL)
+			{
+				CreatureObject const * const attackingPilotCreatureObject = attackingShipObject->getPilot();
+
+				if (   (attackingPilotCreatureObject != NULL)
+					&& attackingPilotCreatureObject->isPlayerControlled())
+				{
+					GroupObject * const groupObject = attackingPilotCreatureObject->getGroup();
+
+					if (groupObject != NULL)
+					{
+						GroupObject::GroupMemberVector const & groupMembers = groupObject->getGroupMembers();
+						GroupObject::GroupMemberVector::const_iterator iterGroupMembers = groupMembers.begin();
+
+						for (; iterGroupMembers != groupMembers.end(); ++iterGroupMembers)
+						{
+							GroupObject::GroupMember const & groupMember = (*iterGroupMembers);
+							NetworkId const & groupMemberPilotNetworkId = groupMember.first;
+							CreatureObject const * const groupMemberPilotCreatureObject = CreatureObject::asCreatureObject(NetworkIdManager::getObjectById(groupMemberPilotNetworkId));
+
+							if (groupMemberPilotCreatureObject != NULL)
+							{
+								ShipObject const * const groupMemberShipObject = groupMemberPilotCreatureObject->getPilotedShip();
+
+								if (groupMemberShipObject != NULL)
+								{
+									if (groupMemberShipObject != attackingShipObject)
+									{
+										bool const checkPlayerAttacker = false;
+
+										IGNORE_RETURN(addDamageTaken(groupMemberShipObject->getNetworkId(), damage * s_playerGroupDamageTakenPercent, verifyAttacker, notifySquad, checkPlayerAttacker));
+									}
+								}
+							}
+							else
+							{
+								DEBUG_WARNING(true, ("debug_ai: AiShipController::addDamageTaken() owner(%s) Why does this group member (%s) not resolve to a CreatureObject?", getOwner()->getDebugInformation().c_str(), groupMemberPilotNetworkId.getValueString().c_str()));
+							}
+						}
+					}
+				}
+			}
+		}
+
+		if (notifySquad)
+		{
+			// Let the squad know a member is taking damage
+
+			SpaceSquad & squad = getSquad();
+
+			squad.addDamageTaken(attackingUnit, damage * s_squadDamageTakenPercent);
+
+			// Tell all the units guarding me that I am being attacked
+
+			SpaceSquad::SpaceSquadList & guardedByList = squad.getGuardedByList();
+			SpaceSquad::SpaceSquadList::iterator iterGuardedByList = guardedByList.begin();
+
+			for (; iterGuardedByList != guardedByList.end(); ++iterGuardedByList)
+			{
+				SpaceSquad * const guardSquad = NON_NULL(*iterGuardedByList);
+
+				guardSquad->setGuarding(true);
+				guardSquad->addDamageTaken(attackingUnit, damage * s_guardSquadDamageTakenPercent);
+			}
+		}
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::setAttackOrders(AiShipController::AttackOrders const attackOrders)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::setAttackOrders() owner(%s) attackOrders(%s)", getOwner()->getNetworkId().getValueString().c_str(), AiShipController::getAttackOrdersString(attackOrders)));
+
+	m_attackOrders = attackOrders;
+
+	getSquad().assignAttackSquad(*this);
+}
+
+// ----------------------------------------------------------------------
+
+AiShipController::AttackOrders AiShipController::getAttackOrders() const
+{
+	return m_attackOrders;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::setLeashRadius(float const radius)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::setLeashRadius() owner(%s) radius(%.2f)", getOwner()->getNetworkId().getValueString().c_str(), radius));
+
+	NON_NULL(m_attackBehavior)->setLeashRadius(radius);
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::follow(NetworkId const & followedUnit, Vector const & direction_l, float const distance)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::follow() owner(%s) followedUnit(%s) direction_o(%.1f, %.1f, %.1f) offset(%.1f)", getOwner()->getNetworkId().getValueString().c_str(), followedUnit.getValueString().c_str(), direction_l.x, direction_l.y, direction_l.z, distance));
+
+	SpacePathManager::release(m_path, getOwner());
+	m_path = NULL;
+
+	float appearanceRadius = 0.0f;
+	Object const * const followedObject = NetworkIdManager::getObjectById(followedUnit);
+
+	if (followedObject != NULL)
+	{
+		//-- This needs to be improved to cast a ray from this position back towards the ship and get the actual collision position
+
+		CollisionProperty const * const ownerCollisionProperty = getOwner()->getCollisionProperty();
+		CollisionProperty const * const followedObjectCollisionProperty = followedObject->getCollisionProperty();
+		
+		if (ownerCollisionProperty != NULL)
+		{
+			appearanceRadius += ownerCollisionProperty->getBoundingSphere_l().getRadius();
+		}
+
+		if (followedObjectCollisionProperty != NULL)
+		{
+			appearanceRadius += followedObjectCollisionProperty ->getBoundingSphere_l().getRadius();
+		}
+	}
+
+	setFormationPosition_l(direction_l * (distance + appearanceRadius));
+
+	delete m_pendingNonAttackBehavior;
+	m_pendingNonAttackBehavior = new AiShipBehaviorFollow(*this, followedUnit);
+
+	triggerBehaviorChanged(ASBT_follow);
+}
+
+// ----------------------------------------------------------------------
+
+int AiShipController::getBehaviorType() const
+{
+	AiShipBehaviorType result = ASBT_idle;
+
+	if (m_nonAttackBehavior != NULL)
+	{
+		result = m_nonAttackBehavior->getBehaviorType();
+	}
+	
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::getBehaviorType() owner(%s) behavior(%s)", getOwner()->getNetworkId().getValueString().c_str(), AiShipBehaviorBase::getBehaviorString(static_cast<AiShipBehaviorType>(result))));
+
+	return static_cast<int>(result);
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::idle()
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::idle() owner(%s)", getOwner()->getNetworkId().getValueString().c_str()));
+
+	SpacePathManager::release(m_path, getOwner());
+	m_path = NULL;
+
+	delete m_pendingNonAttackBehavior;
+	m_pendingNonAttackBehavior = new AiShipBehaviorIdle(*this);;
+
+	triggerBehaviorChanged(ASBT_idle);
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::track(Object const & target)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::track() owner(%s) target(%s)", getOwner()->getNetworkId().getValueString().c_str(), target.getNetworkId().getValueString().c_str()));
+
+	SpacePathManager::release(m_path, getOwner());
+	m_path = NULL;
+
+	delete m_pendingNonAttackBehavior;
+	m_pendingNonAttackBehavior = new AiShipBehaviorTrack(*this, target);
+
+	triggerBehaviorChanged(ASBT_track);
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::moveTo(SpacePath * const path)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::moveTo() owner(%s) path(0x%p)", getOwner()->getNetworkId().getValueString().c_str(), path));
+	
+	if (path != m_path)
+	{
+		SpacePathManager::release(m_path, getOwner());
+		m_path = SpacePathManager::fetch(path, getOwner(), getShipRadius());
+		setCurrentPathIndex(0);
+	}
+
+	delete m_pendingNonAttackBehavior;
+	m_pendingNonAttackBehavior = new AiShipBehaviorWaypoint(*this, false);
+
+	triggerBehaviorChanged(ASBT_moveTo);
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::addPatrolPath(SpacePath * const path)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::addPatrolPath() unit(%s) path(0x%p)", getOwner()->getNetworkId().getValueString().c_str(), path));
+
+	if (path != m_path)
+	{
+		SpacePathManager::release(m_path, getOwner());
+		m_path = SpacePathManager::fetch(path, getOwner(), getShipRadius());
+	}
+
+	// If we are already patrolling, don't change the behavior
+
+	delete m_pendingNonAttackBehavior;
+	m_pendingNonAttackBehavior = new AiShipBehaviorWaypoint(*this, true);
+
+	triggerBehaviorChanged(ASBT_patrol);
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::clearPatrolPath()
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::clearPatrolPath() owner(%s)", getOwner()->getNetworkId().getValueString().c_str()));
+
+	if (m_path != NULL)
+	{
+		m_path->clear();
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::clearPatrolPath() Unable to find path(0x%p)", m_path));
+	}
+
+	setCurrentPathIndex(0);
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::requestSlowDown()
+{
+	m_requestedSlowDown = true;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::triggerBehaviorChanged(AiShipBehaviorType const newBehavior)
+{
+	// Only send the trigger if the new behavior is different from the old behavior
+
+	AiShipBehaviorType const oldBehavior = (m_nonAttackBehavior != NULL) ? m_nonAttackBehavior->getBehaviorType() : ASBT_idle;
+
+	if (oldBehavior != newBehavior)
+	{
+		Object * const object = getOwner();
+		ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL;
+		GameScriptObject * const gameScriptObject = (serverObject != NULL) ? serverObject->getScriptObject() : NULL;
+
+		if (gameScriptObject != NULL)
+		{
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::triggerBehaviorChanged() unit(%s) old(%s) new(%s)", getOwner()->getNetworkId().getValueString().c_str(), AiShipBehaviorBase::getBehaviorString(oldBehavior), AiShipBehaviorBase::getBehaviorString(newBehavior)));
+
+			ScriptParams scriptParams;
+			scriptParams.addParam(static_cast<int>(newBehavior));
+			scriptParams.addParam(static_cast<int>(oldBehavior));
+			IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_SPACE_UNIT_BEHAVIOR_CHANGED, scriptParams));
+		}
+		else
+		{
+			WARNING(true, ("Unable to get the ScriptObject for this object."));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::triggerEnterCombat(NetworkId const & attackTarget)
+{
+	Object * const object = getOwner();
+	ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL;
+	GameScriptObject * const gameScriptObject = (serverObject != NULL) ? serverObject->getScriptObject() : NULL;
+
+	if (gameScriptObject != NULL)
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::triggerEnterCombat() unit(%s) attackTarget(%s)", getOwner()->getNetworkId().getValueString().c_str(), attackTarget.getValueString().c_str()));
+
+		ScriptParams scriptParams;
+		scriptParams.addParam(attackTarget);
+		IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_SPACE_UNIT_ENTER_COMBAT, scriptParams));
+	}
+	else
+	{
+		WARNING(true, ("Unable to get the ScriptObject for this object."));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+PersistentCrcString const & AiShipController::getShipName() const
+{
+	return m_shipName;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::setPilotType(std::string const & pilotType)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::setPilotType() unit(%s) pilotType(%s)", getOwner()->getNetworkId().getValueString().c_str(), pilotType.c_str()));
+
+	ShipObject * const shipObject = getShipOwner();
+
+	if (pilotType.empty())
+	{
+		DEBUG_WARNING(true, ("AiShipController::setPilotType empty pilotType for ship [%s]", 
+			shipObject ? shipObject->getDebugInformation().c_str() : "NONE"));
+		return;
+	}
+
+	m_pilotData = &AiShipPilotData::getPilotData(pilotType);
+	AiPilotManager::getPilotData(*m_pilotData, *m_pilotManagerInfo);
+
+	// Make sure the ship name is set
+	if (shipObject != NULL)
+	{
+		std::string shipName;
+
+		if (shipObject->getObjVars().getItem("ship.shipName", shipName))
+		{
+			m_shipName.set(shipName.c_str(), false);
+			ShipAiReactionManager::setShipSpaceMobileType(*shipObject, m_shipName);
+		}
+		else
+		{
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::setPilotType() Unable to find ship.shipName objvar for ai %s", getOwner()->getNetworkId().getValueString().c_str()));
+		}
+	}
+
+	// Create the attack behavior based on the ship class
+
+	delete m_attackBehavior;
+	m_attackBehavior = NULL;
+
+	m_shipClass = ShipAiReactionManager::getShipClass(m_shipName);
+
+	switch (m_shipClass)
+	{
+		case ShipAiReactionManager::SC_invalid: 
+		default: { FATAL(true, ("Invalid ship name(%s)", m_shipName.getString())); }
+		case ShipAiReactionManager::SC_fighter: { m_attackBehavior = new AiShipBehaviorAttackFighter(*this); } break;
+		case ShipAiReactionManager::SC_bomber: { m_attackBehavior = new AiShipBehaviorAttackBomber(*this); } break;
+		case ShipAiReactionManager::SC_capitalShip: { m_attackBehavior = new AiShipBehaviorAttackCapitalShip(*this); } break;
+		case ShipAiReactionManager::SC_transport: { m_attackBehavior = new AiShipBehaviorAttackFighter(*this); } break;
+	}
+
+	// Create the turreting target system, if appropriate
+	
+	if (shipObject && shipObject->hasTurrets())
+		addTurretTargetingSystem(new AiShipTurretTargetingSystem(*this));
+
+	// Set the default aggro distance
+
+	setAggroRadius(m_pilotData->m_aggroRadius);
+		
+	FATAL((m_attackBehavior == NULL), ("The attack behavior can not be NULL."));
+}
+
+// ----------------------------------------------------------------------
+
+CachedNetworkId const & AiShipController::getPrimaryAttackTarget() const
+{
+	if (isAttackSquadLeader())
+	{
+		return getAttackTargetList().getPrimaryTarget();
+	}
+
+	return getAttackSquad().getPrimaryAttackTarget();
+}
+
+// ----------------------------------------------------------------------
+
+ShipObject const * AiShipController::getPrimaryAttackTargetShipObject() const
+{
+	Object const * const targetObject = getPrimaryAttackTarget().getObject();
+	ServerObject const * const targetServerObject = (targetObject != NULL) ? targetObject->asServerObject() : NULL;
+	ShipObject const * const targetShipObject = (targetServerObject != NULL) ? targetServerObject->asShipObject() : NULL;
+
+	return targetShipObject;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipController::isAttacking() const
+{
+	bool result = false;
+
+	if (hasFunctionalEngines())
+	{
+		bool const attackSquadLeader = isAttackSquadLeader();
+
+		if (attackSquadLeader)
+		{
+			float const weaponAttackRange = getAttackSquad().getWeaponAttackRange();
+			bool const hasWeapons = (weaponAttackRange > 0.0f);
+			bool const shouldAttack = (getAttackOrders() != AiShipController::AO_holdFire);
+			bool const hasTarget = !getAttackTargetList().isEmpty();
+			bool const capitalShip = getShipOwner()->isCapitalShip();
+
+			result = (hasWeapons && shouldAttack && hasTarget && s_attackingEnabled && !capitalShip);
+		}
+		else
+		{
+			result = getAttackSquad().isAttacking();
+		}
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::setAttackingEnabled(bool const enabled)
+{
+	s_attackingEnabled = enabled;
+}
+
+// ----------------------------------------------------------------------
+
+Vector AiShipController::getOwnerPosition_w() const
+{
+	return getOwner()->getPosition_w();
+}
+
+// ----------------------------------------------------------------------
+
+Vector AiShipController::getOwnerObjectFrameK_w() const
+{
+	return getOwner()->getObjectFrameK_w();
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::setSquad(SpaceSquad * const squad)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::setSquad() unit(%s) squadId(%d) objTemplate(%s)", getOwner()->getNetworkId().getValueString().c_str(), NON_NULL(squad)->getId(), getOwner()->getObjectTemplateName()));
+
+	// Make sure we are not putting the unit in it's current squad
+
+	if (m_squad != NON_NULL(squad))
+	{
+		// Remove the unit from its previous squad
+
+		if (   (m_squad != NULL)
+		    && !m_squad->isEmpty())
+		{
+			m_squad->removeUnit(getOwner()->getNetworkId());
+		}
+
+		// Set the new squad
+
+		m_squad = squad;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+SpaceSquad & AiShipController::getSquad()
+{
+	return *NON_NULL(m_squad);
+}
+
+// ----------------------------------------------------------------------
+
+SpaceSquad const & AiShipController::getSquad() const
+{
+	return *NON_NULL(m_squad);
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::setFormationPosition_l(Vector const & position_l)
+{
+	m_formationPosition_l = position_l;
+}
+
+// ----------------------------------------------------------------------
+
+Vector const & AiShipController::getFormationPosition_l() const
+{
+	return m_formationPosition_l;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::setAttackFormationPosition_l(Vector const & position_l)
+{
+	m_attackFormationPosition_l = position_l;
+}
+
+// ----------------------------------------------------------------------
+
+Vector const & AiShipController::getAttackFormationPosition_l() const
+{
+	return m_attackFormationPosition_l;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipController::isSquadLeader() const
+{
+	return (getSquad().getLeader() == getOwner()->getNetworkId());
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::setAttackSquad(SpaceAttackSquad * const attackSquad)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::setAttackSquad() unit(%s) attackSquad(%d)", getOwner()->getNetworkId().getValueString().c_str(), NON_NULL(attackSquad)->getId()));
+
+	// Make sure we are not putting the unit in it's current attack squad
+
+	if (m_attackSquad != NON_NULL(attackSquad))
+	{
+		// Remove the unit from its pervious attack squad
+
+		if (m_attackSquad != NULL)
+		{
+			m_attackSquad->removeUnit(getOwner()->getNetworkId());
+		}
+
+		// Set the new attack squad
+
+		m_attackSquad = attackSquad;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+SpaceAttackSquad & AiShipController::getAttackSquad()
+{
+	return *NON_NULL(m_attackSquad);
+}
+
+// ----------------------------------------------------------------------
+
+SpaceAttackSquad const & AiShipController::getAttackSquad() const
+{
+	return *NON_NULL(m_attackSquad);
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipController::isAttackSquadLeader() const
+{
+	return (getAttackSquad().getLeader() == getOwner()->getNetworkId());
+}
+
+// ----------------------------------------------------------------------
+
+float AiShipController::getShipRadius() const
+{
+	float result = 1.0f;
+	ShipObject const * const shipObject = getShipOwner();
+	CollisionProperty const * const shipCollision = shipObject->getCollisionProperty();
+	
+	if (shipCollision != NULL)
+	{
+		result = shipCollision->getBoundingSphere_l().getRadius();
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+SpacePath * AiShipController::getPath()
+{
+	return m_path;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipController::shouldCheckForEnemies() const
+{
+	bool result = false;
+
+	if (s_attackingEnabled)
+	{
+		bool const capitalShip = getShipOwner()->isCapitalShip();
+
+		if (capitalShip)
+		{
+			bool const turrets = getShipOwner()->hasTurrets();
+
+			if (turrets)
+			{
+				result = true;
+			}
+		}
+		else
+		{
+			bool const wantsToAttack = (getAttackOrders() != AiShipController::AO_holdFire);
+
+			if (wantsToAttack)
+			{
+				bool const attackSquadLeader = isAttackSquadLeader();
+
+				if (attackSquadLeader)
+				{
+					bool const attacking = isAttacking();
+
+					if (!attacking)
+					{
+						bool const functionalEngines = hasFunctionalEngines();
+						float const weaponAttackRange = getAttackSquad().getWeaponAttackRange();
+						bool const hasWeapons = (weaponAttackRange > 0.0f);
+
+						if (functionalEngines && hasWeapons)
+						{
+							result = true;
+						}
+						else
+						{
+							bool const turrets = getShipOwner()->hasTurrets();
+
+							if (!functionalEngines && turrets)
+							{
+								result = true;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::setCurrentPathIndex(unsigned int const index)
+{
+	//LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::setCurrentPathIndex() unit(%s) pathIndex(%u) pathSize(%u)", getOwner()->getNetworkId().getValueString().c_str(), index, (m_path != NULL) ? m_path->getTransformList().size() : 0));
+
+	if (   (m_path != NULL)
+	    && !m_path->isEmpty())
+	{
+		m_currentPathIndex = index;
+	}
+	else
+	{
+		m_currentPathIndex = 0;
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled() && (m_currentPathIndex > 0), "debug_ai", ("AiShipController::setCurrentPathIndex() Setting a non-zero path index(%d) on a NULL or empty path", index));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+unsigned int AiShipController::getCurrentPathIndex() const
+{
+	return m_currentPathIndex;
+}
+
+// ----------------------------------------------------------------------
+
+float AiShipController::calculateThrottleToPosition_w(Vector const & position_w, float const slowDownDistance) const
+{
+	float result = 0.0f;
+	
+	Object const * const object = getOwner();
+
+	if (object != NULL)
+	{
+		float const distanceToGoalSquared = object->getPosition_w().magnitudeBetweenSquared(position_w);
+
+		if (   (distanceToGoalSquared < sqr(slowDownDistance))
+			&& (slowDownDistance > 0.0f))
+		{
+			static float scale = 0.5f;
+			float const distanceToGoal = sqrt(distanceToGoalSquared);
+			result = clamp(0.0f, (distanceToGoal / slowDownDistance) * scale, 1.0f);
+
+			if (   (result < 0.5f)
+				&& (distanceToGoal < getGoalStopDistance()))
+			{
+				result = 0.0f;
+			}
+		}
+		else
+		{
+			result = 1.0f;
+		}
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+float AiShipController::getGoalStopDistance()
+{
+	return s_goalStopDistance;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::dock(ShipObject & dockTarget, float const secondsAtDock)
+{
+	ShipController::dock(dockTarget, secondsAtDock);
+
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::dock() owner(%s) dockTarget(%s) secondsAtDock(%.2f)", getOwner()->getNetworkId().getValueString().c_str(), dockTarget.getNetworkId().getValueString().c_str(), secondsAtDock));
+
+	// If we are the squad leader, assign a new unit as the squad leader so we can go dock without everyone in the squad following
+
+	if (isSquadLeader())
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::dock() owner(%s) Requesting a new squad leader.", getOwner()->getNetworkId().getValueString().c_str()));
+
+		getSquad().assignNewLeader();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & AiShipController::getPilotType() const
+{
+	return NON_NULL(m_pilotData)->m_name;
+}
+
+// ----------------------------------------------------------------------
+
+float AiShipController::getPilotSkill() const
+{
+	return NON_NULL(m_pilotData)->m_skill;
+}
+
+// ----------------------------------------------------------------------
+
+float AiShipController::getPilotAggression() const
+{
+	return NON_NULL(m_pilotData)->m_aggression;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Switch the current attack behavior to a fighter behavior.  Called if
+ * a bomber has to attack fighters, for example.
+ */
+void AiShipController::switchToFighterAttack()
+{
+	DEBUG_FATAL(dynamic_cast<AiShipBehaviorAttackFighter*>(m_attackBehavior),("Programmer bug:  called switchToFighterAttack() when already using a fighter attack"));
+	delete m_pendingAttackBehavior; // in case we tried to switch twice
+	m_pendingAttackBehavior = new AiShipBehaviorAttackFighter(*NON_NULL(m_attackBehavior));
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Switch the current attack behavior to a fighter behavior.  Called if
+ * a fighter has to make bombing runs on a capital ship, for example.
+ */
+void AiShipController::switchToBomberAttack()
+{
+	DEBUG_FATAL(dynamic_cast<AiShipBehaviorAttackBomber*>(m_attackBehavior),("Programmer bug:  called switchToBomberAttack() when already using a bomber attack"));
+	delete m_pendingAttackBehavior; // in case we tried to switch twice
+	m_pendingAttackBehavior = new AiShipBehaviorAttackBomber(*NON_NULL(m_attackBehavior));
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipController::removeAttackTarget(NetworkId const & unit)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::removeAttackTarget() owner(%s) unit(%s)", getOwner()->getNetworkId().getValueString().c_str(), unit.getValueString().c_str()));
+	DEBUG_WARNING((unit == NetworkId::cms_invalid), ("debug_ai: owner(%s) ERROR: Trying to remove a NULL unit(%s) from the attack target list.", getOwner()->getNetworkId().getValueString().c_str(), unit.getValueString().c_str()));
+
+	return ShipController::removeAttackTarget(unit);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Start launch countermeasures if appropriate.
+ *
+ * If this becomes any more complicated, we should probably make a
+ * CountermeasureSystem that works like TurretTargetingSystem, to avoid
+ * putting too much "behavior" logic into AiShipController.
+ */
+void AiShipController::onTargetedByMissile(int const /*missileId*/)
+{
+	// if not already launching countermeasures, start reacting after a little time has passed
+	if (m_countermeasureState == CS_none)
+	{
+		AiShipPilotData const * const pilotData = NON_NULL(getPilotData());
+		m_reactToMissileTimer->setExpireTime(Random::randomReal(0.0f, pilotData->m_countermeasureReactionTime) + Random::randomReal(0.0f, pilotData->m_countermeasureReactionTime)); // react after a random interval that averages to m_countermeasureReactionTime.  Use two die rolls to give more of a bell-shaped distribution
+		m_reactToMissileTimer->reset();
+		m_countermeasureState = CS_reacting;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+float AiShipController::getAggroRadius() const
+{
+	return m_aggroRadius;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::setAggroRadius(float const aggroRadius)
+{
+	TerrainObject const * const terrain = TerrainObject::getInstance();
+	DEBUG_FATAL(!terrain, ("Unable to get a terrain object"));
+
+	float const mapSideLength = terrain->getMapWidthInMeters();
+	IGNORE_RETURN(WithinRangeInclusiveInclusive(0.00001f, aggroRadius, mapSideLength));
+
+	m_aggroRadius = aggroRadius;
+}
+
+// ----------------------------------------------------------------------
+
+AiShipController * AiShipController::asAiShipController()
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+AiShipController const * AiShipController::asAiShipController() const
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+Vector const & AiShipController::getMoveToGoalPosition_w() const
+{
+	return m_moveToGoalPosition_w;
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::onAttackTargetListEmpty()
+{
+	// If my whole squad has stopped fighting, then we can mark all
+	// squads guarding me as not needing to gaurd my squad anymore.
+
+	SpaceSquad::SpaceSquadList const & guardedByList = getSquad().getGuardedByList();
+
+	if (   !guardedByList.empty()
+	    && getSquad().isAttackTargetListEmpty())
+	{
+		SpaceSquad::SpaceSquadList::iterator iterGuardedByList = guardedByList.begin();
+
+		for (; iterGuardedByList != guardedByList.end(); ++iterGuardedByList)
+		{
+			SpaceSquad * const spaceSquad = NON_NULL(*iterGuardedByList);
+
+			spaceSquad->setGuarding(false);
+		}
+	}
+}
+
+#ifdef _DEBUG
+// ----------------------------------------------------------------------
+
+void AiShipController::sendDebugAiToClients(AiDebugString & aiDebugString)
+{
+	NOT_NULL(m_attackBehavior);
+	ShipObject * const shipOwner = getShipOwner();
+	const ObserverList & observerList = shipOwner->getObservers();
+
+	if (!observerList.empty())
+	{
+		FormattedString<512> formattedString;
+
+		//if (!isAttackSquadLeader())
+		//{
+		//	if (getSquad().hasTarget())
+		//	{
+		//		// Attack formation position
+		//
+		//		aiDebugString.addLineToPosition(Formation::getPosition_w(getAttackSquad().getLeader().getObject()->getTransform_o2w(), getAttackFormationPosition_l()), PackedRgb::solidMagenta);
+		//	}
+		//	else
+		//	{
+		//		// Squad formation position
+		//
+		//		aiDebugString.addLineToPosition(Formation::getPosition_w(getSquad().getLeader().getObject()->getTransform_o2w(), getFormationPosition_l()), PackedRgb::solidMagenta);
+		//	}
+		//}
+
+		//{
+		//	// Guarding info
+		//
+		//	std::string guardString("gb: ");
+		//	SpaceSquad::SpaceSquadList::const_iterator iterGuardedByList = getSquad().getGuardedByList()->begin();
+		//
+		//	for (; iterGuardedByList != getSquad().getGuardedByList()->end(); ++iterGuardedByList)
+		//	{
+		//		guardString += formattedString.sprintf("%d, ", (*iterGuardedByList)->getId());
+		//	}
+		//
+		//	if (getSquad().getGuardTarget())
+		//	{
+		//		guardString += formattedString.sprintf("gt: %d\n", getSquad().getGuardTarget()->getId());
+		//	}
+		//	else
+		//	{
+		//		guardString += "gt: 0\n";
+		//	}
+		//
+		//	aiDebugString.addText(guardString, PackedRgb::solidYellow);
+		//}
+		
+		// Are my engines functional?
+
+		if (!shipOwner->isComponentFunctional(ShipChassisSlotType::SCST_engine))
+		{
+			aiDebugString.addText("NON-FUNCTIONAL ENGINE\n", PackedRgb::solidMagenta);
+		}
+		else if (shipOwner->getShipActualSpeedMaximum() <= 0.0f)
+		{
+			aiDebugString.addText("ZERO MAX SPEED ENGINE\n", PackedRgb::solidMagenta);
+		}
+
+		// Am I currently in the process of guarding another squad
+
+		if (getSquad().isGuarding())
+		{
+			aiDebugString.addText("GUARDING\n", PackedRgb::solidWhite);
+		}
+
+		// Am I auto aggro immune?
+
+		if (getShipOwner()->isAutoAggroImmune())
+		{
+			aiDebugString.addText("AUTO AGGRO IMMUNE\n", PackedRgb::solidWhite);
+		}
+
+		// Am I damage aggro immune?
+
+		if (getShipOwner()->isDamageAggroImmune())
+		{
+			aiDebugString.addText("DAMAGE AGGRO IMMUNE\n", PackedRgb::solidWhite);
+		}
+
+		// Am I being docked?
+
+		if (isBeingDocked())
+		{
+			aiDebugString.addText("BEING DOCKED\n", PackedRgb::solidCyan);
+		}
+
+		// Am I the squad leader?
+		{
+			if (isSquadLeader())
+			{
+				aiDebugString.addText("Squad Leader\n", PackedRgb::solidYellow);
+			}
+		}
+
+		// Am I the attack squad leader?
+		{
+			if (isAttackSquadLeader())
+			{
+				aiDebugString.addText("Attack Squad Leader\n", PackedRgb::solidRed);
+			}
+		}
+
+		// Tier, ship name, and ship class
+		{
+			aiDebugString.addText(formattedString.sprintf("%s %s (%s)\n", getPilotType().c_str(), m_shipName.getString(), ShipAiReactionManager::getShipClassString(m_shipClass)), PackedRgb::solidWhite);
+		}
+
+		// Squad and Attack squad
+		{
+			aiDebugString.addText(formattedString.sprintf("Squad(%d:%d) Attack Squad(%d:%d)\n", getSquad().getId(), getSquad().getUnitCount(), getAttackSquad().getId(), getAttackSquad().getUnitCount()));
+		}
+
+		// Attack orders, aggro distance and leash distance
+		{
+			bool const includeMissiles = true;
+			float const attackRange = shipOwner->getApproximateAttackRange(includeMissiles);
+
+			if (attackRange > 0.0f)
+			{
+				bool const checkForEnemies = shouldCheckForEnemies();
+				float const leashRadius = m_attackBehavior->getLeashRadius();
+
+				aiDebugString.addText(formattedString.sprintf("%s agg(%.0f) lsh(%.0f) %s\n", AiShipController::getAttackOrdersString(getAttackOrders()), m_aggroRadius, leashRadius, (m_attackBehavior == NULL) ? " [NO ATTACK BEHAVIOR]" : (checkForEnemies ? " [LFE]" : "")));
+			}
+		}
+
+		// Turrets
+		{
+			if (shipOwner->hasTurrets())
+			{
+				float const turretMissChance = getTurretMissChance() * 100.0f;
+				float const turretMissAngleDegrees = convertRadiansToDegrees(getTurretMissAngle());
+
+				aiDebugString.addText(formattedString.sprintf("turret miss(%.0f%% @ %.0f°)\n", turretMissChance, turretMissAngleDegrees));
+			}
+		}
+		
+		//int ammoCurrent = 0;
+		//int ammoMax = 0;
+		//
+		//for (int chassisSlot = ShipChassisSlotType::SCST_weapon_first; chassisSlot < ShipChassisSlotType::SCST_weapon_last; ++chassisSlot)
+		//{
+		//	int const weaponIndex = ShipChassisSlotType::getWeaponIndex(chassisSlot);
+		//	
+		//	if (parentShipObject->isMissile(weaponIndex))
+		//	{
+		//		ammoCurrent += parentShipObject->getWeaponAmmoCurrent(static_cast<int>(chassisSlot));
+		//		ammoMax += parentShipObject->getWeaponAmmoMaximum(static_cast<int>(chassisSlot));
+		//	}
+		//}
+		//
+		//weaponString += FormattedString<256>().sprintf("Missiles(%d/%d)", ammoCurrent, ammoMax);
+
+		//aiDebugString.addText(formattedString.sprintf("\nlpos(%.0f,%.0f,%.0f) gpos(%.0f,%.0f,%.0f)", m_leashAnchorPosition_w.x, m_leashAnchorPosition_w.y, m_leashAnchorPosition_w.z, m_moveToGoalPosition_w.x, m_moveToGoalPosition_w.y, m_moveToGoalPosition_w.z));
+
+		std::string finalString;
+		uint32 const crc = aiDebugString.toString(finalString);
+
+		if (m_aiDebugStringCrc != crc)
+		{
+			m_aiDebugStringCrc = crc;
+
+			ObserverList::iterator iterObserverList = observerList.begin();
+
+			for (; iterObserverList != observerList.end(); ++iterObserverList)
+			{
+				Client * const client = NON_NULL(*iterObserverList);
+				ServerObject * const characterObject = client->getCharacterObject();
+
+				// Only send to the client if the objvar is set
+
+				int temp = 0;
+				if (   (characterObject != NULL)
+				    && characterObject->getObjVars().getItem("ai_debug_string", temp))
+				{
+					if (temp > 0)
+					{
+						bool const reliable = true;
+						GenericValueTypeMessage<std::pair<NetworkId, std::string> > message("AiDebugString", std::make_pair(getOwner()->getNetworkId(), finalString));
+					
+						client->send(message, reliable);
+					}
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipController::debug_forceFighterAttackManeuver(int const maneuverType)
+{
+	bool success = false;
+
+	AiShipBehaviorAttackFighter * const aiFighterBehavior = dynamic_cast<AiShipBehaviorAttackFighter *>(m_attackBehavior);
+	if (aiFighterBehavior)
+	{
+		aiFighterBehavior->debug_forceManeuver(maneuverType);
+		success = true;
+	}	
+
+	return success;
+}
+
+#endif // _DEBUG
+
+// ----------------------------------------------------------------------
+void AiShipController::clampPositionToZone(Vector & position_w) const
+{
+	TerrainObject const * const terrain = NON_NULL(TerrainObject::getInstance());
+	float const mapSideHalfWidth = terrain->getMapWidthInMeters() * 0.50f;
+	float const turnRadius = getLargestTurnRadius();
+	float const min = -(mapSideHalfWidth - (turnRadius * 2.0f));
+	float const max = +(mapSideHalfWidth - (turnRadius * 2.0f));
+
+	position_w.x = clamp(min, position_w.x, max);
+	position_w.y = clamp(min, position_w.y, max);
+	position_w.z = clamp(min, position_w.z, max);
+}
+
+// ----------------------------------------------------------------------
+
+char const * AiShipController::getAttackOrdersString(AttackOrders const attackOrders)
+{
+	switch (attackOrders)
+	{
+		case AO_holdFire: { return "HOLD FIRE"; }
+		case AO_returnFire: { return "RETURN FIRE"; }
+		case AO_attackFreely: { return "ATTACK FREELY"; }
+		case AO_count:
+		default: break;
+	}
+
+	return "INVALID ATTACK ORDER";
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipController::hasFunctionalEngines() const
+{
+	return getShipOwner()->isComponentFunctional(ShipChassisSlotType::SCST_engine);
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::addExclusiveAggro(NetworkId const & unit)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::addExclusiveAggro() owner(%s) unit(%s) m_exclusiveAggroSet->size(%u+1)", getOwner()->getNetworkId().getValueString().c_str(), unit.getValueString().c_str(), m_exclusiveAggroSet->size()));
+#ifdef _DEBUG
+	{
+		// Make sure this is a player
+
+		Object * const unitObject = NetworkIdManager::getObjectById(unit);
+		ServerObject * const unitServerObject = (unitObject != NULL) ? unitObject->asServerObject() : NULL;
+		CreatureObject * const unitCreatureObject = (unitServerObject != NULL) ? unitServerObject->asCreatureObject() : NULL;
+
+		if (   !unitCreatureObject
+		    || !unitCreatureObject->isPlayerControlled())
+		{
+			DEBUG_WARNING(true, ("debug_ai: AiShipController::addExclusiveAggro() owner(%s) ERROR: The unit(%s) must be a player.", getOwner()->getDebugInformation().c_str(), unit.getValueString().c_str()));
+			return;
+		}
+	}
+
+#endif // _DEBUG
+	bool verifyTargetList = false;
+
+	if (m_exclusiveAggroSet->empty())
+	{
+		verifyTargetList = true;
+	}
+
+	IGNORE_RETURN(m_exclusiveAggroSet->insert(CachedNetworkId(unit)));
+
+	if (verifyTargetList)
+	{
+		// Make sure only exclusive aggros are in the target list
+
+		m_attackTargetList->verify();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipController::removeExclusiveAggro(NetworkId const & unit)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("AiShipController::removeExclusiveAggro() owner(%s) unit(%s) m_exclusiveAggroSet->size(%u-1)", getOwner()->getNetworkId().getValueString().c_str(), unit.getValueString().c_str(), m_exclusiveAggroSet->size()));
+
+	IGNORE_RETURN(m_exclusiveAggroSet->erase(CachedNetworkId(unit)));
+}
+
+// ----------------------------------------------------------------------
+
+bool AiShipController::isExclusiveAggro(CreatureObject const & pilot) const
+{
+	bool result = false;
+	CachedNetworkIdSet::const_iterator iterExclusiveAggroSet = m_exclusiveAggroSet->begin();
+
+	for (; iterExclusiveAggroSet != m_exclusiveAggroSet->end(); ++iterExclusiveAggroSet)
+	{
+		CachedNetworkId const & aggroCachedNetworkId = (*iterExclusiveAggroSet);
+
+		if (pilot.getNetworkId() == aggroCachedNetworkId)
+		{
+			// Found a matching player
+
+			result = true;
+			break;
+		}
+
+		// Check the group members of this player
+
+		CreatureObject const * const aggroCreatureObject = CreatureObject::asCreatureObject(aggroCachedNetworkId.getObject());
+
+		if (aggroCreatureObject != NULL)
+		{
+			GroupObject * const groupObject = aggroCreatureObject->getGroup();
+
+			if (groupObject != NULL)
+			{
+				GroupObject::GroupMemberVector const & groupMembers = groupObject->getGroupMembers();
+				GroupObject::GroupMemberVector::const_iterator iterGroupMembers = groupMembers.begin();
+
+				for (; iterGroupMembers != groupMembers.end(); ++iterGroupMembers)
+				{
+					GroupObject::GroupMember const & groupMember = (*iterGroupMembers);
+					NetworkId const & memberNetworkId = groupMember.first;
+
+					if (pilot.getNetworkId() == memberNetworkId)
+					{
+						// Found a matching group member
+
+						result = true;
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+bool AiShipController::hasExclusiveAggros() const
+{
+	return !m_exclusiveAggroSet->empty();
+}
+
+// ----------------------------------------------------------------------
+bool AiShipController::isValidTarget(ShipObject const & unit) const
+{
+	bool result = false;
+
+	CreatureObject const * const pilotCreatureObject = unit.getPilot();
+
+	if (pilotCreatureObject != NULL)
+	{
+		if (pilotCreatureObject->isPlayerControlled())
+		{
+			bool const exclusiveAggros = hasExclusiveAggros();
+
+			if (exclusiveAggros)
+			{
+				bool const validExclusiveAggro = isExclusiveAggro(*pilotCreatureObject);
+
+				if (validExclusiveAggro)
+				{
+					result = true;
+				}
+			}
+			else
+			{
+				result = true;
+			}
+		}
+		else
+		{
+			result = true;
+		}
+	}
+	else
+	{
+		result = true;
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+ShipAiReactionManager::ShipClass AiShipController::getShipClass() const
+{
+	return m_shipClass;
+}
+
+// ----------------------------------------------------------------------
+float AiShipController::getTurretMissChance() const
+{
+	return m_pilotData->m_turretMissChance;
+}
+
+// ----------------------------------------------------------------------
+float AiShipController::getTurretMissAngle() const
+{
+	return m_pilotData->m_turretMissAngle;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/controller/AiShipController.h b/engine/server/library/serverGame/src/shared/controller/AiShipController.h
new file mode 100644
index 00000000..d3053774
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/AiShipController.h
@@ -0,0 +1,235 @@
+// ======================================================================
+//
+// AiShipController.h
+// asommers
+//
+// copyright 2003, sony online entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AiShipController_H
+#define INCLUDED_AiShipController_H
+
+
+// ======================================================================
+
+#include "serverGame/AiShipBehaviorAttack.h"
+#include "serverGame/ShipAiReactionManager.h"
+#include "serverGame/ShipController.h"
+#include "sharedFoundation/PersistentCrcString.h"
+
+class AiDebugString;
+class AiPilotManager;
+class AiShipBehaviorAttack;
+class AiShipBehaviorBase;
+class AiShipBehaviorDock;
+class CachedNetworkId;
+class ShipObject;
+class SpaceAttackSquad;
+class SpacePath;
+class SpaceSquad;
+class Timer;
+struct AiShipPilotData;
+
+// ======================================================================
+
+class AiShipController : public ShipController
+{
+public:
+
+	enum AttackOrders
+	{
+		AO_holdFire,
+		AO_returnFire,
+		AO_attackFreely,
+		AO_count
+	};
+
+	typedef stdvector<Transform>::fwd TransformList;
+	typedef stdvector<CachedNetworkId>::fwd CachedNetworkIdList;
+	typedef stdvector<NetworkId>::fwd NetworkIdList;
+
+	static void install();
+
+	static void setClientDebugEnabled(bool const enabled);
+	static bool isClientDebugEnabled();
+
+	static AiShipController * getAiShipController(NetworkId const & unit);
+
+	static AiShipController * asAiShipController(Controller * controller);
+	static AiShipController const * asAiShipController(Controller const * controller);
+
+	static void setAttackingEnabled(bool const enabled);
+	static float getGoalStopDistance();
+	static char const * getAttackOrdersString(AttackOrders const attackOrders);
+
+public:
+
+	explicit AiShipController(ShipObject * const owner);
+	virtual ~AiShipController();
+
+	virtual AiShipController * asAiShipController();
+	virtual AiShipController const * asAiShipController() const;
+
+	virtual void endBaselines();
+	virtual void onTargetedByMissile(int const missileId);
+	virtual void onAttackTargetListEmpty();
+
+	void setSquad(SpaceSquad * const squad);
+	SpaceSquad & getSquad();
+	SpaceSquad const & getSquad() const;
+
+	bool isSquadLeader() const;
+
+	void setAttackSquad(SpaceAttackSquad * const attackSquad);
+	SpaceAttackSquad & getAttackSquad();
+	SpaceAttackSquad const & getAttackSquad() const;
+
+	bool isAttackSquadLeader() const;
+
+	PersistentCrcString const & getShipName() const;
+	void setPilotType(std::string const & pilotType);
+	std::string const & getPilotType() const;
+	AiShipPilotData const * getPilotData(void) const;
+	float getPilotSkill() const;
+	float getPilotAggression() const;
+
+	int getBehaviorType() const;
+
+	virtual bool addDamageTaken(NetworkId const & attackingUnit, float const damage, bool const verifyAttacker);
+	bool addDamageTaken(NetworkId const & attackingUnit, float const damage, bool const verifyAttacker, bool const notifySquad, bool const checkPlayerAttacker);
+	CachedNetworkId const & getPrimaryAttackTarget() const;
+	ShipObject const * getPrimaryAttackTargetShipObject() const;
+	virtual bool removeAttackTarget(NetworkId const & targetUnit);
+	bool isValidTarget(ShipObject const & unit) const;
+	bool isAttacking() const;
+
+	void setAttackOrders(AttackOrders const attackOrders);
+	AttackOrders getAttackOrders() const;
+
+	void setLeashRadius(float const radius);
+
+	void moveTo(SpacePath * const path);
+	void addPatrolPath(SpacePath * const path);
+	void clearPatrolPath();
+	void follow(NetworkId const & followedUnit, Vector const & direction_l, float const distance);
+	void idle();
+	void track(Object const & target);
+	void requestSlowDown();
+	virtual void dock(ShipObject & dockTarget, float const secondsAtDock);
+
+	float getAggroRadius() const;
+	void setAggroRadius(float const radius);
+
+	void moveTo(Vector const & position_w, float const throttle, float const deltaTime);
+	Vector const & getMoveToGoalPosition_w() const;
+
+	Vector getOwnerPosition_w() const;
+	Vector getOwnerObjectFrameK_w() const;
+
+	virtual bool shouldCheckForEnemies() const;
+
+	void setFormationPosition_l(Vector const & position_l);
+	Vector const & getFormationPosition_l() const;
+
+	void setAttackFormationPosition_l(Vector const & position_l);
+	Vector const & getAttackFormationPosition_l() const;
+
+	float getShipRadius() const;
+	SpacePath * getPath();
+	void setCurrentPathIndex(unsigned int const index);
+	unsigned int getCurrentPathIndex() const;
+	float calculateThrottleToPosition_w(Vector const & position_w, float const slowDownDistance) const;
+
+	void switchToFighterAttack();
+	void switchToBomberAttack();
+
+	AiPilotManager const & getPilotManagerInfo() const;
+
+	void clampPositionToZone(Vector & position_w) const;
+
+	void addExclusiveAggro(NetworkId const & unit);
+	void removeExclusiveAggro(NetworkId const & unit);
+	bool isExclusiveAggro(CreatureObject const & pilot) const;
+	bool hasExclusiveAggros() const;
+
+	ShipAiReactionManager::ShipClass getShipClass() const;
+
+	virtual float getTurretMissChance() const;
+	virtual float getTurretMissAngle() const;
+
+#ifdef _DEBUG
+	bool debug_forceFighterAttackManeuver(int maneuverType);
+#endif // _DEBUG
+
+protected:
+
+	virtual float realAlter(float elapsedTime);
+
+private:
+
+	typedef stdset<CachedNetworkId>::fwd CachedNetworkIdSet;
+
+	enum CountermeasureState
+	{
+		CS_none,
+		CS_reacting,
+		CS_launching
+	};
+
+	void triggerBehaviorChanged(AiShipBehaviorType const newBehavior);
+	void triggerEnterCombat(NetworkId const & attackTarget);
+	bool hasFunctionalEngines() const;
+
+#ifdef _DEBUG
+	void sendDebugAiToClients(AiDebugString & aiDebugString);
+#endif // _DEBUG
+
+	AiShipPilotData const * m_pilotData;
+	AiShipBehaviorBase * m_pendingNonAttackBehavior;
+	AiShipBehaviorBase * m_nonAttackBehavior;
+	AiShipBehaviorAttack * m_pendingAttackBehavior;
+	AiShipBehaviorAttack * m_attackBehavior;
+	PersistentCrcString m_shipName;
+	ShipAiReactionManager::ShipClass m_shipClass;
+	bool m_requestedSlowDown;
+	SpaceSquad * m_squad;
+	SpaceAttackSquad * m_attackSquad;
+	Vector m_formationPosition_l;
+	Vector m_attackFormationPosition_l;
+	SpacePath * m_path;
+	unsigned int m_currentPathIndex;
+	float m_aggroRadius;
+	CountermeasureState m_countermeasureState;
+	Timer * const m_reactToMissileTimer;
+#ifdef _DEBUG
+	uint32 m_aiDebugStringCrc;
+#endif // _DEBUG
+	Vector m_moveToGoalPosition_w;
+	int m_lastAttackUpdate;
+	AiPilotManager * const m_pilotManagerInfo;
+	AttackOrders m_attackOrders;
+	CachedNetworkIdSet * const m_exclusiveAggroSet;
+
+	// Disabled
+
+	AiShipController();
+	AiShipController(AiShipController const &);
+	AiShipController & operator =(AiShipController const &);
+};
+
+// ----------------------------------------------------------------------
+
+inline AiShipPilotData const * AiShipController::getPilotData(void) const
+{
+	return m_pilotData;
+}
+
+inline AiPilotManager const & AiShipController::getPilotManagerInfo() const
+{
+	return *m_pilotManagerInfo;
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/controller/AiShipControllerInterface.cpp b/engine/server/library/serverGame/src/shared/controller/AiShipControllerInterface.cpp
new file mode 100644
index 00000000..3e4549aa
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/AiShipControllerInterface.cpp
@@ -0,0 +1,194 @@
+// ======================================================================
+//
+// AiShipControllerInterface.cpp
+//
+// copyright 2004, sony online entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiShipControllerInterface.h"
+
+#include "serverGame/AiShipController.h"
+#include "serverGame/ConfigServerGame.h"
+#include "sharedLog/Log.h"
+
+// ======================================================================
+//
+// AiShipControllerInterface
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+bool AiShipControllerInterface::addDamageTaken(NetworkId const & unit, NetworkId const & attackingUnit, float const damage, bool const notifySquad, bool const checkPlayerAttacker)
+{
+	bool result = false;
+	AiShipController * const aiShipController = AiShipController::getAiShipController(unit);
+
+	if (aiShipController != NULL)
+	{
+		bool const verifyAttacker = false;
+
+		result = aiShipController->addDamageTaken(attackingUnit, damage, verifyAttacker, notifySquad, checkPlayerAttacker);
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipControllerInterface::addDamageTaken() ERROR: Unable to resolve networkId(%s) to AiShipController.", unit.getValueString().c_str()));
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+bool AiShipControllerInterface::setAttackOrders(NetworkId const & unit, AiShipController::AttackOrders const attackOrders)
+{
+	bool result = false;
+	AiShipController * const aiShipController = AiShipController::getAiShipController(unit);
+
+	if (aiShipController != NULL)
+	{
+		result = true;
+		aiShipController->setAttackOrders(attackOrders);
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipControllerInterface::setAttackOrders() ERROR: Unable to resolve networkId(%s) to AiShipController.", unit.getValueString().c_str()));
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+bool AiShipControllerInterface::idle(NetworkId const & unit)
+{
+	bool result = false;
+	AiShipController * const aiShipController = AiShipController::getAiShipController(unit);
+
+	if (aiShipController != NULL)
+	{
+		result = true;
+		aiShipController->idle();
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipControllerInterface::idle() ERROR: Unable to resolve networkId(%s) to AiShipController.", unit.getValueString().c_str()));
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+bool AiShipControllerInterface::track(NetworkId const & unit, Object const & target)
+{
+	bool result = false;
+	AiShipController * const aiShipController = AiShipController::getAiShipController(unit);
+
+	if (aiShipController != NULL)
+	{
+		result = true;
+		aiShipController->track(target);
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipControllerInterface::idle() ERROR: Unable to resolve networkId(%s) to AiShipController.", unit.getValueString().c_str()));
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+bool AiShipControllerInterface::setLeashRadius(NetworkId const & unit, float const radius)
+{
+	bool result = false;
+	AiShipController * const aiShipController = AiShipController::getAiShipController(unit);
+
+	if (aiShipController != NULL)
+	{
+		result = true;
+		aiShipController->setLeashRadius(radius);
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipControllerInterface::setLeashRadius() ERROR: Unable to resolve networkId(%s) to AiShipController.", unit.getValueString().c_str()));
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+bool AiShipControllerInterface::follow(NetworkId const & unit, NetworkId const & followedUnit, Vector const & direction_o, float const direction)
+{
+	bool result = false;
+	AiShipController * const aiShipController = AiShipController::getAiShipController(unit);
+
+	if (aiShipController != NULL)
+	{
+		result = true;
+		aiShipController->follow(followedUnit, direction_o, direction);
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipControllerInterface::follow() ERROR: Unable to resolve networkId(%s) to AiShipController.", unit.getValueString().c_str()));
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+bool AiShipControllerInterface::addPatrolPath(NetworkId const & unit, SpacePath * const path)
+{
+	bool result = false;
+	AiShipController * const aiShipController = AiShipController::getAiShipController(unit);
+
+	if (aiShipController != NULL)
+	{
+		result = true;
+		aiShipController->addPatrolPath(path);
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipControllerInterface::addPatrolPath() ERROR: Unable to resolve networkId(%s) to AiShipController.", unit.getValueString().c_str()));
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+bool AiShipControllerInterface::clearPatrolPath(NetworkId const & unit)
+{
+	bool result = false;
+	AiShipController * const aiShipController = AiShipController::getAiShipController(unit);
+
+	if (aiShipController != NULL)
+	{
+		result = true;
+		aiShipController->clearPatrolPath();
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipControllerInterface::clearPatrolPath() ERROR: Unable to resolve networkId(%s) to AiShipController.", unit.getValueString().c_str()));
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+bool AiShipControllerInterface::moveTo(NetworkId const & unit, SpacePath * const path)
+{
+	bool result = false;
+	AiShipController * const aiShipController = AiShipController::getAiShipController(unit);
+
+	if (aiShipController != NULL)
+	{
+		result = true;
+		aiShipController->moveTo(path);
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("AiShipControllerInterface::moveTo() ERROR: Unable to resolve networkId(%s) to AiShipController.", unit.getValueString().c_str()));
+	}
+
+	return result;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/controller/AiShipControllerInterface.h b/engine/server/library/serverGame/src/shared/controller/AiShipControllerInterface.h
new file mode 100644
index 00000000..9a820594
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/AiShipControllerInterface.h
@@ -0,0 +1,45 @@
+// ======================================================================
+//
+// AiShipControllerInterface.h
+//
+// copyright 2004, sony online entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AiShipControllerInterface_H
+#define INCLUDED_AiShipControllerInterface_H
+
+#include "serverGame/AiShipController.h"
+
+class NetworkId;
+class Object;
+class SpacePath;
+class Vector;
+
+// ----------------------------------------------------------------------
+class AiShipControllerInterface
+{
+public:
+
+	static bool addDamageTaken(NetworkId const & unit, NetworkId const & attackingUnit, float const damage, bool const notifySquad, bool const checkPlayerAttacker);
+	static bool setAttackOrders(NetworkId const & unit, AiShipController::AttackOrders attackOrders);
+	static bool setLeashRadius(NetworkId const & unit, float radius);
+	static bool idle(NetworkId const & unit);
+	static bool track(NetworkId const & unit, Object const & target);
+	static bool follow(NetworkId const & unit, NetworkId const & followedUnit, Vector const & direction, float offset);
+	static bool addPatrolPath(NetworkId const & unit, SpacePath * const path);
+	static bool clearPatrolPath(NetworkId const & unit);
+	static bool moveTo(NetworkId const & unit, SpacePath * const path);
+
+private:
+
+	// Disabled
+
+	AiShipControllerInterface();
+	AiShipControllerInterface(AiShipControllerInterface const &);
+	AiShipControllerInterface & operator =(AiShipControllerInterface const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_AiShipControllerInterface_H
diff --git a/engine/server/library/serverGame/src/shared/controller/BattlefieldMarkerController.cpp b/engine/server/library/serverGame/src/shared/controller/BattlefieldMarkerController.cpp
new file mode 100644
index 00000000..fa927a66
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/BattlefieldMarkerController.cpp
@@ -0,0 +1,59 @@
+// ======================================================================
+//
+// BattlefieldMarkerController.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/BattlefieldMarkerController.h"
+
+#include "serverGame/BattlefieldMarkerObject.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+
+// ======================================================================
+
+BattlefieldMarkerController::BattlefieldMarkerController(BattlefieldMarkerObject *newOwner) :
+	TangibleController(newOwner)
+{
+}
+
+// ----------------------------------------------------------------------
+
+BattlefieldMarkerController::~BattlefieldMarkerController()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void BattlefieldMarkerController::handleMessage(const int message, const float value, const MessageQueue::Data* const data, const uint32 flags)
+{
+	BattlefieldMarkerObject *owner = dynamic_cast<BattlefieldMarkerObject *>(getOwner());
+	NOT_NULL(owner);
+
+	switch (message)
+	{
+	case CM_setBattlefieldParticipant:
+		{
+			MessageQueueGenericValueType<std::pair<NetworkId, uint32> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<NetworkId, uint32> > const *>(data);
+			owner->setBattlefieldParticipant(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+		
+	case CM_clearBattlefieldParticipants:
+		{
+			owner->clearBattlefieldParticipants();
+		}
+		break;
+		
+	default:
+		TangibleController::handleMessage(message, value, data, flags);
+		break;
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/controller/BattlefieldMarkerController.h b/engine/server/library/serverGame/src/shared/controller/BattlefieldMarkerController.h
new file mode 100644
index 00000000..1a01242e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/BattlefieldMarkerController.h
@@ -0,0 +1,40 @@
+// ======================================================================
+//
+// BattlefieldMarkerController.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_BattlefieldMarkerController_H
+#define	_INCLUDED_BattlefieldMarkerController_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/TangibleController.h"
+
+//----------------------------------------------------------------------
+
+class BattlefieldMarkerObject;
+
+//-----------------------------------------------------------------------
+
+class BattlefieldMarkerController : public TangibleController
+{
+public:
+	explicit BattlefieldMarkerController(BattlefieldMarkerObject *newOwner);
+	virtual ~BattlefieldMarkerController();
+
+protected:
+	virtual void handleMessage(int message, float value, const MessageQueue::Data* data, uint32 flags);
+	
+private:
+	BattlefieldMarkerController();
+	BattlefieldMarkerController(BattlefieldMarkerController const &);
+	BattlefieldMarkerController &operator=(BattlefieldMarkerController const &);
+};
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/controller/BuildingController.cpp b/engine/server/library/serverGame/src/shared/controller/BuildingController.cpp
new file mode 100644
index 00000000..a87ce3e0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/BuildingController.cpp
@@ -0,0 +1,88 @@
+//BuildingController.cpp
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/BuildingController.h"
+#include "serverGame/BuildingObject.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+
+//-----------------------------------------------------------------------
+
+BuildingController::BuildingController(BuildingObject * newOwner) :
+		TangibleController(newOwner)
+{
+}
+
+//-----------------------------------------------------------------------
+
+BuildingController::~BuildingController()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void BuildingController::handleMessage (int message, float value, const MessageQueue::Data* data, uint32 flags)
+{
+	BuildingObject * owner = dynamic_cast<BuildingObject *>(getOwner());
+	NOT_NULL(owner);
+	
+	switch (message)
+	{
+	case CM_addAllowed:
+		{
+			const MessageQueueGenericValueType<std::string> * const msg = safe_cast<const MessageQueueGenericValueType<std::string> *>(data);
+			if(msg)
+			{
+				owner->addAllowed(msg->getValue());
+			}
+		}
+		break;
+	case CM_removeAllowed:
+		{
+			const MessageQueueGenericValueType<std::string> * const msg = safe_cast<const MessageQueueGenericValueType<std::string> *>(data);
+			if(msg)
+			{
+				owner->removeAllowed(msg->getValue());
+			}
+		}
+		break;
+	case CM_addBanned:
+		{
+			const MessageQueueGenericValueType<std::string> * const msg = safe_cast<const MessageQueueGenericValueType<std::string> *>(data);
+			if(msg)
+			{
+				owner->addBanned(msg->getValue());
+			}
+		}
+		break;
+	case CM_removeBanned:
+		{
+			const MessageQueueGenericValueType<std::string> * const msg = safe_cast<const MessageQueueGenericValueType<std::string> *>(data);
+			if(msg)
+			{
+				owner->removeBanned(msg->getValue());
+			}
+		}
+		break;
+	case CM_setBuildingIsPublic:
+		{
+			MessageQueueGenericValueType<bool> const *msg = safe_cast<MessageQueueGenericValueType<bool> const *>(data);
+			if (msg)
+				owner->setIsPublic(msg->getValue());
+		}
+		break;
+	case CM_setBuildingCityId:
+		{
+			MessageQueueGenericValueType<int> const *msg = safe_cast<MessageQueueGenericValueType<int> const *>(data);
+			if (msg)
+				owner->setCityId(msg->getValue());
+		}
+		break;
+	default:
+		TangibleController::handleMessage(message, value, data, flags);
+		break;
+	}
+}
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverGame/src/shared/controller/BuildingController.h b/engine/server/library/serverGame/src/shared/controller/BuildingController.h
new file mode 100644
index 00000000..6150193f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/BuildingController.h
@@ -0,0 +1,33 @@
+//BuildingController.h
+
+#ifndef	_BUILDING_CONTROLLER_H
+#define	_BUILDING_CONTROLLER_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/TangibleController.h"
+
+//----------------------------------------------------------------------
+
+class BuildingObject;
+
+//-----------------------------------------------------------------------
+
+class BuildingController : public TangibleController
+{
+public:
+    explicit BuildingController         (BuildingObject * newOwner);
+    ~BuildingController                 (void);
+
+protected:
+	virtual void handleMessage (int message, float value, const MessageQueue::Data* data, uint32 flags);
+	
+private:
+    BuildingController				(void);
+    BuildingController				(const BuildingController & other);
+    BuildingController&	operator=	(const BuildingController & other);
+};
+
+//-----------------------------------------------------------------------
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/controller/CellController.cpp b/engine/server/library/serverGame/src/shared/controller/CellController.cpp
new file mode 100644
index 00000000..7737ee55
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/CellController.cpp
@@ -0,0 +1,84 @@
+// CellController.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CellController.h"
+#include "serverGame/CellObject.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+
+//-----------------------------------------------------------------------
+
+CellController::CellController(CellObject * newOwner) :
+ServerController(newOwner)
+{
+}
+
+//-----------------------------------------------------------------------
+
+CellController::~CellController()
+{
+}
+
+//-----------------------------------------------------------------------
+
+
+void CellController::handleMessage (int message, float value, const MessageQueue::Data* data, uint32 flags)
+{
+	CellObject * owner = dynamic_cast<CellObject *>(getOwner());
+	NOT_NULL(owner);
+	
+	switch (message)
+	{
+	case CM_addAllowed:
+		{
+			const MessageQueueGenericValueType<std::string> * const msg = safe_cast<const MessageQueueGenericValueType<std::string> *>(data);
+			if(msg)
+			{
+				owner->addAllowed(msg->getValue());
+			}
+		}
+		break;
+	case CM_removeAllowed:
+		{
+			const MessageQueueGenericValueType<std::string> * const msg = safe_cast<const MessageQueueGenericValueType<std::string> *>(data);
+			if(msg)
+			{
+				owner->removeAllowed(msg->getValue());
+			}
+		}
+		break;
+	case CM_addBanned:
+		{
+			const MessageQueueGenericValueType<std::string> * const msg = safe_cast<const MessageQueueGenericValueType<std::string> *>(data);
+			if(msg)
+			{
+				owner->addBanned(msg->getValue());
+			}
+		}
+		break;
+	case CM_removeBanned:
+		{
+			const MessageQueueGenericValueType<std::string> * const msg = safe_cast<const MessageQueueGenericValueType<std::string> *>(data);
+			if(msg)
+			{
+				owner->removeBanned(msg->getValue());
+			}
+		}
+		break;
+	default:
+		ServerController::handleMessage(message, value, data, flags);
+		break;
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void CellController::setGoal(Transform const & , ServerObject *  )
+{
+	DEBUG_WARNING(true, ("Cell setGoal was called for CellObject %s. Cells may not have goals!",getOwner()->getNetworkId().getValueString().c_str()));
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/controller/CellController.h b/engine/server/library/serverGame/src/shared/controller/CellController.h
new file mode 100644
index 00000000..996e4f99
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/CellController.h
@@ -0,0 +1,34 @@
+// CellController.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_CellController_H
+#define	_INCLUDED_CellController_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/ServerController.h"
+
+class CellObject;
+
+//-----------------------------------------------------------------------
+
+class CellController : public ServerController
+{
+public:
+	explicit CellController(CellObject * newOwner);
+	~CellController();
+
+protected:
+	virtual void handleMessage (int message, float value, const MessageQueue::Data* data, uint32 flags);
+	virtual void setGoal (Transform const & newGoal, ServerObject * goalCellObject );
+	
+private:
+	CellController & operator = (const CellController & rhs);
+	CellController(const CellController & source);
+
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_CellController_H
diff --git a/engine/server/library/serverGame/src/shared/controller/CityController.cpp b/engine/server/library/serverGame/src/shared/controller/CityController.cpp
new file mode 100644
index 00000000..91f20981
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/CityController.cpp
@@ -0,0 +1,238 @@
+// ======================================================================
+//
+// CityController.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CityController.h"
+
+#include "serverGame/CityObject.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+
+// ======================================================================
+
+CityController::CityController(CityObject *newOwner) :
+	UniverseController(newOwner)
+{
+}
+
+// ----------------------------------------------------------------------
+
+CityController::~CityController()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void CityController::handleMessage(const int message, const float value, const MessageQueue::Data* const data, const uint32 flags)
+{
+	CityObject *owner = dynamic_cast<CityObject *>(getOwner());
+	NOT_NULL(owner);
+
+	switch (message)
+	{
+	case CM_cityCreate:
+		{
+			MessageQueueGenericValueType<std::pair<int, CityInfo> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, CityInfo> > const *>(data);
+			const CityInfo & ci = msg->getValue().second;
+			IGNORE_RETURN(owner->createCity(ci.getCityName(),
+				ci.getCityHallId(),
+				ci.getPlanet(),
+				ci.getX(),
+				ci.getZ(),
+				ci.getRadius(),
+				ci.getLeaderId(),
+				ci.getIncomeTax(),
+				ci.getPropertyTax(),
+				ci.getSalesTax(),
+				ci.getTravelLoc(),
+				ci.getTravelCost(),
+				ci.getTravelInterplanetary(),
+				ci.getCloneLoc(),
+				ci.getCloneRespawn(),
+				ci.getCloneRespawnCell(),
+				ci.getCloneId(),
+				msg->getValue().first));
+		}
+		break;
+	case CM_citySetName:
+		{
+			MessageQueueGenericValueType<std::pair<int, std::string> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, std::string> > const *>(data);
+			owner->setCityName(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_citySetCityHall:
+		{
+			MessageQueueGenericValueType<std::pair<int, NetworkId> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, NetworkId> > const *>(data);
+			owner->setCityHall(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_citySetLocation:
+		{
+			MessageQueueGenericValueType<std::pair<int, std::pair<std::string, std::pair<int, int> > > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, std::pair<std::string, std::pair<int, int> > > > const *>(data);
+			owner->setCityLocation(
+				msg->getValue().first,
+				msg->getValue().second.first,
+				msg->getValue().second.second.first,
+				msg->getValue().second.second.second);
+		}
+		break;
+	case CM_citySetRadius:
+		{
+			MessageQueueGenericValueType<std::pair<int, int> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, int> > const *>(data);
+			owner->setCityRadius(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_citySetFaction:
+		{
+			MessageQueueGenericValueType<std::pair<int, std::pair<uint32, bool> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, std::pair<uint32, bool> > > const *>(data);
+			owner->setCityFaction(msg->getValue().first, msg->getValue().second.first, msg->getValue().second.second);
+		}
+		break;
+	case CM_citySetGcwDefenderRegion:
+		{
+			MessageQueueGenericValueType<std::pair<std::pair<int, std::string>, std::pair<int, bool> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::pair<int, std::string>, std::pair<int, bool> > > const *>(data);
+			owner->setCityGcwDefenderRegion(msg->getValue().first.first, msg->getValue().first.second, msg->getValue().second.first, msg->getValue().second.second);
+		}
+		break;
+	case CM_citySetCreationTime:
+		{
+			MessageQueueGenericValueType<std::pair<int, int> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, int> > const *>(data);
+			owner->setCityCreationTime(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_citySetLeader:
+		{
+			MessageQueueGenericValueType<std::pair<int, NetworkId> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, NetworkId> > const *>(data);
+			owner->setCityLeader(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_citySetIncomeTax:
+		{
+			MessageQueueGenericValueType<std::pair<int, int> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, int> > const *>(data);
+			owner->setCityIncomeTax(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_citySetPropertyTax:
+		{
+			MessageQueueGenericValueType<std::pair<int, int> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, int> > const *>(data);
+			owner->setCityPropertyTax(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_citySetSalesTax:
+		{
+			MessageQueueGenericValueType<std::pair<int, int> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, int> > const *>(data);
+			owner->setCitySalesTax(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_citySetTravelInfo:
+		{
+			MessageQueueGenericValueType<std::pair<int, std::pair<Vector, std::pair<int, bool> > > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, std::pair<Vector, std::pair<int, bool> > > > const *>(data);
+			owner->setCityTravelInfo(
+				msg->getValue().first,
+				msg->getValue().second.first,
+				msg->getValue().second.second.first,
+				msg->getValue().second.second.second);
+		}
+		break;
+	case CM_citySetCloneInfo:
+		{
+			MessageQueueGenericValueType<std::pair<int, std::pair<Vector, std::pair<Vector, std::pair<NetworkId, NetworkId> > > > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, std::pair<Vector, std::pair<Vector, std::pair<NetworkId, NetworkId> > > > > const *>(data);
+			owner->setCityCloneInfo(
+				msg->getValue().first,
+				msg->getValue().second.first,
+				msg->getValue().second.second.first,
+				msg->getValue().second.second.second.first,
+				msg->getValue().second.second.second.second);
+		}
+		break;
+	case CM_cityRemove:
+		{
+			MessageQueueGenericValueType<int> const *msg = safe_cast<MessageQueueGenericValueType<int> const *>(data);
+			owner->removeCity(msg->getValue());
+		}
+		break;
+	case CM_citySetCitizen:
+		{
+			MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::pair<NetworkId, int> > > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::pair<NetworkId, int> > > > const *>(data);
+			owner->setCitizen(msg->getValue().first.first, msg->getValue().first.second, msg->getValue().second.first, msg->getValue().second.second.first, msg->getValue().second.second.second);
+		}
+		break;
+	case CM_citySetCitizenProfessionInfo:
+		{
+			MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > > const *>(data);
+			owner->setCitizenProfessionInfo(msg->getValue().first.first, msg->getValue().first.second, msg->getValue().second.first, msg->getValue().second.second);
+		}
+		break;
+	case CM_citySetCitizenAddRank:
+		{
+			MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > > const *>(data);
+			owner->addCitizenRank(msg->getValue().second.second, msg->getValue().second.first, msg->getValue().first);
+		}
+		break;
+	case CM_citySetCitizenRemoveRank:
+		{
+			MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > > const *>(data);
+			owner->removeCitizenRank(msg->getValue().second.second, msg->getValue().second.first, msg->getValue().first);
+		}
+		break;
+	case CM_citySetCitizenTitle:
+		{
+			MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > > const *>(data);
+			owner->setCitizenTitle(msg->getValue().second.second, msg->getValue().second.first, msg->getValue().first);
+		}
+		break;
+	case CM_cityRemoveCitizen:
+		{
+			MessageQueueGenericValueType<std::pair<int, NetworkId> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, NetworkId> > const *>(data);
+			owner->removeCitizen(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_citySetStructure:
+		{
+			MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<int, bool> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<int, bool> > > const *>(data);
+			owner->setCityStructure(msg->getValue().first.first, msg->getValue().first.second, msg->getValue().second.first, msg->getValue().second.second);
+		}
+		break;
+	case CM_cityRemoveStructure:
+		{
+			MessageQueueGenericValueType<std::pair<int, NetworkId> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, NetworkId> > const *>(data);
+			owner->removeCityStructure(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_adjustPgcRating:
+		{
+			MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > > const *>(data);
+			owner->adjustPgcRating(msg->getValue().second.first, msg->getValue().first, msg->getValue().second.second);
+		}
+		break;
+	case CM_adjustPgcRatingData:
+		{
+			MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > > const *>(data);
+			owner->adjustPgcRatingData(msg->getValue().first.second, msg->getValue().second.first, msg->getValue().first.first, msg->getValue().second.second);
+		}
+		break;
+	case CM_setPgcRatingData:
+		{
+			MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > > const *>(data);
+			owner->setPgcRatingData(msg->getValue().first.second, msg->getValue().second.first, msg->getValue().first.first, msg->getValue().second.second);
+		}
+		break;
+	case CM_fixPgcChroniclerName:
+		{
+			MessageQueueGenericValueType<std::pair<std::string, NetworkId> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::string, NetworkId> > const *>(data);
+			owner->verifyPgcChroniclerName(msg->getValue().second, msg->getValue().first);
+		}
+		break;
+	default:
+		UniverseController::handleMessage(message, value, data, flags);
+		break;
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/controller/CityController.h b/engine/server/library/serverGame/src/shared/controller/CityController.h
new file mode 100644
index 00000000..78ad2aba
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/CityController.h
@@ -0,0 +1,40 @@
+// ======================================================================
+//
+// CityController.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	INCLUDED_CityController_H
+#define	INCLUDED_CityController_H
+
+// ======================================================================
+
+#include "serverGame/UniverseController.h"
+
+// ======================================================================
+
+class CityObject;
+
+// ======================================================================
+
+class CityController: public UniverseController
+{
+public:
+	explicit CityController(CityObject *newOwner);
+	~CityController();
+
+protected:
+	virtual void handleMessage(int message, float value, const MessageQueue::Data* data, uint32 flags);
+
+private:
+	CityController();
+	CityController(CityController const &);
+	CityController& operator=(CityController const &);
+};
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/controller/CreatureController.cpp b/engine/server/library/serverGame/src/shared/controller/CreatureController.cpp
new file mode 100644
index 00000000..067da019
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/CreatureController.cpp
@@ -0,0 +1,2192 @@
+//========================================================================
+//
+// CreatureController.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CreatureController.h"
+
+#include "SwgGameServer/CombatEngine.h"
+#include "SwgGameServer/ConfigCombatEngine.h"
+#include "serverGame/Chat.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/HarvesterInstallationObject.h"
+#include "serverGame/InstallationObject.h"
+#include "serverGame/ObjectTracker.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ServerSecureTrade.h"
+#include "serverGame/ServerSecureTradeManager.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWeaponObjectTemplate.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/WeaponObject.h"
+#include "serverNetworkMessages/MessageQueueAlterAttribute.h"
+#include "serverNetworkMessages/MessageQueueCommandQueueEnqueueFwd.h"
+#include "serverNetworkMessages/MessageQueueSetState.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedCollision/Footprint.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedLog/Log.h"
+#include "sharedGame/CommandTable.h"
+#include "sharedUtility/Location.h"
+#include "sharedGame/GameObjectTypes.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/Waypoint.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/IncubatorCommitMessage.h"
+#include "sharedNetworkMessages/MessageQueueCombatCommand.h"
+#include "sharedNetworkMessages/MessageQueueCommandQueueEnqueue.h"
+#include "sharedNetworkMessages/MessageQueueCommandQueueRemove.h"
+#include "sharedNetworkMessages/MessageQueueCyberneticsChangeRequest.h"
+#include "sharedNetworkMessages/MessageQueueDataTransform.h"
+#include "sharedNetworkMessages/MessageQueueDataTransformWithParent.h"
+#include "sharedNetworkMessages/MessageQueueGeneric.h"
+#include "sharedNetworkMessages/MessageQueueGenericIntResponse.h"
+#include "sharedNetworkMessages/MessageQueueGenericResponse.h"
+#include "sharedNetworkMessages/MessageQueueGenericString.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedNetworkMessages/MessageQueueHarvesterResourceData.h"
+#include "sharedNetworkMessages/MessageQueueNetworkId.h"
+#include "sharedNetworkMessages/MessageQueueNetworkIdPair.h"
+#include "sharedNetworkMessages/MessageQueuePosture.h"
+#include "sharedNetworkMessages/MessageQueuePushCreature.h"
+#include "sharedNetworkMessages/MessageQueueResourceEmptyHopper.h"
+#include "sharedNetworkMessages/MessageQueueSecureTrade.h"
+#include "sharedNetworkMessages/MessageQueueSitOnObject.h"
+#include "sharedNetworkMessages/MessageQueueSlowDownEffect.h"
+#include "sharedNetworkMessages/ObjectChannelMessages.h"
+#include "sharedNetworkMessages/UpdateTransformMessage.h"
+#include "sharedNetworkMessages/UpdateTransformWithParentMessage.h"
+#include "sharedObject/AlterResult.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/MovementTable.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedSkillSystem/SkillManager.h"
+#include "sharedTerrain/TerrainObject.h"
+#include "sharedTerrain/WaterTypeManager.h"
+#include "swgSharedNetworkMessages/MessageQueueCombatAction.h"
+#include "Unicode.h"
+#include "UnicodeUtils.h"
+
+
+//-----------------------------------------------------------------------
+
+namespace CreatureControllerNamespace 
+{
+	template<typename ObjectType>
+		ObjectType & getOwner(Controller * controller)
+	{
+		NOT_NULL(controller);
+		NOT_NULL(controller->getOwner());
+		ObjectType * owner = static_cast<ObjectType *>(controller->getOwner());
+		return *owner;
+	}
+}
+
+//-----------------------------------------------------------------------
+
+CreatureController::CreatureController(CreatureObject * newOwner) :
+	TangibleController(newOwner),
+	m_secureTrade(0),
+	m_secureTradeInitiator(0)
+{
+}
+
+//-----------------------------------------------------------------------
+
+CreatureController::~CreatureController()
+{
+	if (getHibernate())
+		ObjectTracker::removeHibernatingAI();
+
+	if (m_secureTrade)
+		m_secureTrade->cancelTrade(*getCreature());
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureController::handleMessage (const int message, const float value, const MessageQueue::Data* const data, const uint32 flags)
+{
+	CreatureObject * const owner = static_cast<CreatureObject*>(getOwner());
+	DEBUG_FATAL(!owner, ("Owner is NULL in CreatureController::handleMessage\n"));
+
+	switch(message)
+	{
+	case CM_netUpdateTransform:
+		{
+			// if the auth server sent this to us, forward it to clients
+			const MessageQueueDataTransform * const msg = NON_NULL (dynamic_cast<const MessageQueueDataTransform *>(data));
+			owner->setLookAtYaw(msg->getLookAtYaw(), msg->getUseLookAtYaw());
+			if (flags&GameControllerMessageFlags::SOURCE_REMOTE_SERVER)
+			{
+				// If we're not contained by what we are attached to, then transform
+				// updates are not relevant to clients because our position is
+				// dictated purely by our containing object.
+				if (owner->getAttachedTo() == ContainerInterface::getContainedByObject(*owner))
+				{
+					UpdateTransformMessage utm(owner->getNetworkId(), msg->getSequenceNumber(), msg->getTransform(), static_cast<int8>(msg->getSpeed()), msg->getLookAtYaw(), msg->getUseLookAtYaw());
+					owner->sendToClientsInUpdateRange(utm, flags & GameControllerMessageFlags::RELIABLE, false);
+				}
+			}
+			TangibleController::handleMessage(message, value, data, flags);
+		}
+		break;
+	case CM_netUpdateTransformWithParent:
+		{
+			// if the auth server sent this to us, forward it to clients
+			const MessageQueueDataTransformWithParent * const msg = NON_NULL (dynamic_cast<const MessageQueueDataTransformWithParent *>(data));
+			owner->setLookAtYaw(msg->getLookAtYaw(), msg->getUseLookAtYaw());
+			if (flags&GameControllerMessageFlags::SOURCE_REMOTE_SERVER)
+			{
+				// If we're not contained by what we are attached to, then transform
+				// updates are not relevant to clients because our position is
+				// dictated purely by our containing object.
+				if (owner->getAttachedTo() == ContainerInterface::getContainedByObject(*owner))
+				{
+					UpdateTransformWithParentMessage utm(owner->getNetworkId(), msg->getSequenceNumber(), msg->getParent(), msg->getTransform(), static_cast<int8>(msg->getSpeed()), msg->getLookAtYaw(), msg->getUseLookAtYaw());
+					owner->sendToClientsInUpdateRange(utm, flags & GameControllerMessageFlags::RELIABLE, false);
+				}
+			}
+			TangibleController::handleMessage(message, value, data, flags);
+		}
+		break;
+		
+	case CM_clientResourceHarvesterActivate:
+		{
+			const MessageQueueNetworkId * const msg = NON_NULL (dynamic_cast<const MessageQueueNetworkId *>(data));
+			
+			InstallationObject * const harvester = dynamic_cast<InstallationObject *>(ServerWorld::findObjectByNetworkId (msg->getNetworkId ()));
+			
+			UNREF (harvester);
+			
+			if (harvester && harvester->isOnAdminList(*owner))
+				harvester->activate (owner->getNetworkId());
+		}
+		break;
+		
+	case CM_clientResourceHarvesterDeactivate:
+		{
+			const MessageQueueNetworkId * const msg = NON_NULL (dynamic_cast<const MessageQueueNetworkId *>(data));
+			
+			InstallationObject * const harvester = dynamic_cast<InstallationObject *>(ServerWorld::findObjectByNetworkId (msg->getNetworkId ()));
+			
+			if (harvester && harvester->isOnAdminList(*owner))
+				harvester->deactivate ();
+		}
+		break;
+		
+	case CM_clientResourceHarvesterListen:
+		{
+			const MessageQueueNetworkId * const msg = NON_NULL (dynamic_cast<const MessageQueueNetworkId *>(data));
+			
+			HarvesterInstallationObject * const harvester = dynamic_cast<HarvesterInstallationObject *>(ServerWorld::findObjectByNetworkId (msg->getNetworkId ()));
+			
+			if (harvester && owner)
+				harvester->addSynchronizedUiClient (*owner);
+		}
+		break;
+		
+	case CM_clientResourceHarvesterStopListening:
+		{
+			const MessageQueueNetworkId * const msg = NON_NULL (dynamic_cast<const MessageQueueNetworkId *>(data));
+			
+			HarvesterInstallationObject * const harvester = dynamic_cast<HarvesterInstallationObject *>(ServerWorld::findObjectByNetworkId (msg->getNetworkId ()));
+			
+			if (harvester && owner)
+				harvester->removeSynchronizedUiClient (owner->getNetworkId ());
+		}
+		break;
+		
+	case CM_clientResourceHarvesterResourceSelect:
+		{
+			const MessageQueueNetworkIdPair * const msg = NON_NULL (dynamic_cast<const MessageQueueNetworkIdPair *>(data));
+			
+			HarvesterInstallationObject * const harvester = dynamic_cast<HarvesterInstallationObject *>(ServerWorld::findObjectByNetworkId (msg->getFirstNetworkId ()));
+			
+			harvester->selectResource (msg->getSecondNetworkId (), owner->getNetworkId());
+		}
+		break;
+		
+	case CM_clientResourceHarvesterGetResourceData:
+		{
+			const MessageQueueNetworkId * const msg = NON_NULL (dynamic_cast<const MessageQueueNetworkId *>(data));
+			
+			typedef stdvector<InstallationResourceData>::fwd DataVector;
+			DataVector dv;
+			
+			HarvesterInstallationObject * const harvester = dynamic_cast<HarvesterInstallationObject *>(ServerWorld::findObjectByNetworkId (msg->getNetworkId ()));
+			ServerObject * const player = owner;
+			
+			if (harvester && player)
+			{
+				harvester->getResourceData (dv);
+				
+				if (!dv.empty ())
+				{
+					MessageQueueHarvesterResourceData * const newData = new MessageQueueHarvesterResourceData (msg->getNetworkId (), dv);
+					appendMessage(static_cast<int>(CM_clientResourceHarvesterResourceData), 0.0f, newData, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+				}
+			}
+		}
+		break;
+		
+	case CM_clientResourceHarvesterEmptyHopper:
+		{
+			const MessageQueueResourceEmptyHopper * const msg = NON_NULL (dynamic_cast<const MessageQueueResourceEmptyHopper *>(data));
+			
+			HarvesterInstallationObject * const harvester = dynamic_cast<HarvesterInstallationObject *>(ServerWorld::findObjectByNetworkId (msg->getHarvesterId ()));
+			
+			if (harvester && owner && harvester->isOnHopperList(*owner))
+				harvester->emptyHopper (msg->getPlayerId(),msg->getResourceId(), msg->getAmount(),msg->getDiscard(),msg->getSequenceId());
+		}
+		break;
+	case CM_getTokenForObject:
+		{
+			WARNING_STRICT_FATAL(true, ("Received CM_getTokenForObject controller message. This message is depracated"));
+		}
+		break;
+
+	case CM_getWaypointForObject:
+		{
+			const MessageQueueNetworkId * const msg = NON_NULL (dynamic_cast<const MessageQueueNetworkId *>(data));
+			if(msg)
+			{
+				if(owner)
+				{
+					PlayerObject * player = PlayerCreatureController::getPlayerObject(owner);
+					if(player)
+					{
+						const ServerObject * target = ServerWorld::findObjectByNetworkId(msg->getNetworkId());
+						if(target)
+						{
+							const Object * topMost = ContainerInterface::getFirstParentInWorld(*target);
+							if(topMost)
+							{
+								const Vector pos = topMost->getPosition_w();
+								IGNORE_RETURN(player->createWaypoint(Location(pos, NetworkId::cms_invalid, Location::getCrcBySceneName(ServerWorld::getSceneId())), true));
+							}
+						}
+					}
+				}
+			}
+		}
+		break;
+	case CM_secureTrade:
+		{
+			if (owner->isAuthoritative())
+			{
+				handleSecureTradeMessage(dynamic_cast<const MessageQueueSecureTrade *>(data));
+			}
+			// @todo else
+				//resend to auth
+
+		}
+		break;
+	case CM_clientLookAtTarget:
+		{
+			const MessageQueueNetworkId * const msg = NON_NULL (dynamic_cast<const MessageQueueNetworkId *>(data));
+			owner->setLookAtTarget (msg->getNetworkId ());
+		}
+		break;
+	case CM_clientIntendedTarget:
+		{
+			const MessageQueueNetworkId * const msg = NON_NULL (dynamic_cast<const MessageQueueNetworkId *>(data));
+			owner->setIntendedTarget (msg->getNetworkId ());
+		}
+		break;
+	case CM_clientMoodChange:
+		if (value < 0.0f || value > 255.0f)			
+			WARNING (true, ("Out of range mood: %f", value));
+		else
+			owner->setMood (static_cast<uint32>(value));
+		
+		break;
+		
+	case CM_setState:
+		{
+			if (!(flags&GameControllerMessageFlags::SOURCE_REMOTE_CLIENT))
+			{
+				MessageQueueSetState const *msg = safe_cast<MessageQueueSetState const *>(data);
+				owner->setState(static_cast<States::Enumerator>(msg->getState()), msg->getValue());
+			}
+		}
+		break;
+	case CM_setAttribute:
+		{
+			const MessageQueueGenericValueType<std::pair<Attributes::Enumerator, Attributes::Value> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<Attributes::Enumerator, Attributes::Value> > *>(data);
+			if(owner)
+			{
+				const std::pair<Attributes::Enumerator, Attributes::Value> & attributePair = msg->getValue();
+				if(msg)
+				{
+					owner->setAttribute(attributePair.first, attributePair.second);
+				}
+				DEBUG_WARNING(! msg, ("CreatureController (%s:%s) received a CM_setAttribute message but could not retrieve data from the message supplied", owner->getObjectTemplateName(), owner->getNetworkId().getValueString().c_str()));
+			}
+		}
+		break;
+	case CM_setMaxAttribute:
+		{
+			const MessageQueueGenericValueType<std::pair<Attributes::Enumerator, Attributes::Value> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<Attributes::Enumerator, Attributes::Value> > *>(data);
+			// set the object value and send a message to all it's proxies
+			if(msg)
+			{
+				owner->setMaxAttribute(msg->getValue().first, msg->getValue().second);
+			}
+			DEBUG_WARNING(! msg, ("CreatureController (%s:%s) received a CM_setMaxAttribute message but could not retrieve data from the message supplied", owner->getObjectTemplateName(), owner->getNetworkId().getValueString().c_str()));
+		}
+		break;
+	case CM_setMentalState:
+		{
+			const MessageQueueGenericValueType<std::pair<MentalStates::Enumerator, MentalStates::Value> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<MentalStates::Enumerator, MentalStates::Value> > *>(data);
+			// set the object value and send a message to all it's proxies
+			if(msg)
+			{
+				owner->setMentalState(msg->getValue().first, msg->getValue().second);
+			}
+			DEBUG_WARNING(! msg, ("CreatureController (%s:%s) received a CM_setMentalState message but could not retrieve data from the message supplied", owner->getObjectTemplateName(), owner->getNetworkId().getValueString().c_str()));
+		}
+		break;
+	case CM_setMentalStateToward:
+		{
+			const MessageQueueGenericValueType<std::pair<NetworkId, std::pair<MentalStates::Enumerator, MentalStates::Value> > > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, std::pair<MentalStates::Enumerator, MentalStates::Value> > > *>(data);
+			if(msg)
+			{
+				owner->setMentalStateToward(msg->getValue().first, msg->getValue().second.first, msg->getValue().second.second);			
+			}
+			DEBUG_WARNING(! msg, ("CreatureController (%s:%s) received a CM_setMentalStateToward message but could not retrieve data from the message supplied", owner->getObjectTemplateName(), owner->getNetworkId().getValueString().c_str()));
+		}
+		break;
+	case CM_setCover:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if(msg)
+			{
+				owner->setCover(msg->getValue());
+			}
+			DEBUG_WARNING(! msg, ("CreatureController (%s:%s) received a CM_setCover message but could not retrieve data from the message supplied", owner->getObjectTemplateName(), owner->getNetworkId().getValueString().c_str()));
+		}
+		break;
+	case CM_setMentalStateTowardClampBehavior:
+		{
+			const MessageQueueGenericValueType<std::pair<NetworkId, std::pair<MentalStates::Enumerator, std::pair<MentalStates::Value, Behaviors::Enumerator> > > > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, std::pair<MentalStates::Enumerator, std::pair<MentalStates::Value, Behaviors::Enumerator> > > > *>(data);
+			if(msg)
+			{
+				owner->setMentalStateTowardClampBehavior(
+					msg->getValue().first, 
+					msg->getValue().second.first, 
+					msg->getValue().second.second.first, 
+					msg->getValue().second.second.second);
+			}
+			DEBUG_WARNING(! msg, ("CreatureController (%s:%s) received a CM_setMentalStateTowardClampBehavior message but could not retrieve data from the message supplied", owner->getObjectTemplateName(), owner->getNetworkId().getValueString().c_str()));
+		}
+		break;
+	case CM_setMaxMentalState:
+		{
+			const MessageQueueGenericValueType<std::pair<MentalStates::Enumerator, MentalStates::Value> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<MentalStates::Enumerator, MentalStates::Value> > *>(data);
+			if(msg)
+			{
+				owner->setMaxMentalState(msg->getValue().first, msg->getValue().second);
+			}
+			DEBUG_WARNING(! msg, ("CreatureController (%s:%s) received a CM_setMaxMentalState message but could not retrieve data from the message supplied", owner->getObjectTemplateName(), owner->getNetworkId().getValueString().c_str()));
+		}
+		break;
+	case CM_setMentalStateDecay:
+		{
+			const MessageQueueGenericValueType<std::pair<MentalStates::Enumerator, float> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<MentalStates::Enumerator, float> > *>(data);
+			if(msg)
+			{
+				owner->setMentalStateDecay(msg->getValue().first, msg->getValue().second);
+			}
+			DEBUG_WARNING(! msg, ("CreatureController (%s:%s) received a CM_setMentalStateDecay message but could not retrieve data from the message supplied", owner->getObjectTemplateName(), owner->getNetworkId().getValueString().c_str()));
+		}
+		break;
+	case CM_setPosture:
+		{
+			const MessageQueuePosture * const msg = safe_cast<const MessageQueuePosture *>(data);
+			
+			if(msg)
+			{
+				owner->setPosture(msg->getPosture(), msg->isClientImmediate());
+			}
+			DEBUG_WARNING(! msg, ("CreatureController (%s:%s) received a CM_setPosture message but could not retrieve data from the message supplied", owner->getObjectTemplateName(), owner->getNetworkId().getValueString().c_str()));
+		}
+		break;
+	case CM_setLocomotion:
+		{
+			const MessageQueueGenericValueType<Locomotions::Enumerator> * const msg = safe_cast<const MessageQueueGenericValueType<Locomotions::Enumerator> *>(data);
+			if(msg)
+			{
+				owner->setLocomotion(msg->getValue());
+			}
+			DEBUG_WARNING(! msg, ("CreatureController (%s:%s) received a CM_setLocomotion message but could not retrieve data from the message supplied", owner->getObjectTemplateName(), owner->getNetworkId().getValueString().c_str()));
+		}
+		break;
+	case CM_setGroupInviter:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, NetworkId> > > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, NetworkId> > > *>(data);
+			if (msg)
+			{
+				owner->setGroupInviter(msg->getValue().second.first, msg->getValue().first, msg->getValue().second.second);
+			}
+		}
+		break;
+	case CM_setPerformanceType:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if (msg)
+			{
+				owner->setPerformanceType(msg->getValue());
+			}
+		}
+		break;
+	case CM_setPerformanceStartTime:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if (msg)
+			{
+				owner->setPerformanceStartTime(msg->getValue());
+			}
+		}
+		break;
+	case CM_setPerformanceListenTarget:
+		{
+			const MessageQueueGenericValueType<NetworkId> * const msg = safe_cast<const MessageQueueGenericValueType<NetworkId> *>(data);
+			if (msg)
+			{
+				owner->setPerformanceListenTarget(msg->getValue());
+			}
+		}
+		break;
+	case CM_setPerformanceWatchTarget:
+		{
+			const MessageQueueGenericValueType<NetworkId> * const msg = safe_cast<const MessageQueueGenericValueType<NetworkId> *>(data);
+			if (msg)
+			{
+				owner->setPerformanceWatchTarget(msg->getValue());
+			}
+		}
+		break;
+	case CM_setModValue:
+		{
+			const 
+				MessageQueueGenericValueType<std::pair<std::string, int> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, int> > *>(data);
+			if(msg)
+			{
+				owner->setModValue(msg->getValue().first, msg->getValue().second);
+			}
+		}
+		break;
+	case CM_grantCommand:
+		{
+			const MessageQueueGenericValueType<std::string> * const msg = safe_cast<const MessageQueueGenericValueType<std::string> *>(data);
+			if(msg)
+			{
+				owner->grantCommand(msg->getValue(), false);
+			}
+		}
+		break;
+	case CM_grantExperiencePoints:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, int> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, int> > *>(data);
+			if(msg)
+			{
+				owner->grantExperiencePoints(msg->getValue().first, msg->getValue().second);
+			}
+		}
+		break;
+	case CM_incrementKillMeter:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if(msg)
+			{
+				owner->incrementKillMeter(msg->getValue());
+			}
+		}
+		break;
+	case CM_grantSkill:
+		{
+			const MessageQueueGenericValueType<std::string> * const msg = safe_cast<const MessageQueueGenericValueType<std::string> *>(data);
+			if(msg)
+			{
+				const SkillObject * newSkill = SkillManager::getInstance().getSkill(msg->getValue());
+				if(newSkill)
+				{
+					owner->grantSkill(*newSkill);
+				}
+			}
+		}
+		break;
+	case CM_revokeCommand:
+		{
+			const MessageQueueGenericValueType<std::string> * const msg = safe_cast<const MessageQueueGenericValueType<std::string> *>(data);
+			if(msg)
+			{
+				owner->revokeCommand(msg->getValue(), false);
+			}
+		}
+		break;
+	case CM_revokeSkill:
+		{
+			const MessageQueueGenericValueType<std::string> * const msg = safe_cast<const MessageQueueGenericValueType<std::string> *>(data);
+			if(msg)
+			{
+				const SkillObject * oldSkill = SkillManager::getInstance().getSkill(msg->getValue());
+				if(oldSkill)
+				{
+					LOG("CustomerService", ("Skill: Removing skill %s from character %s via controller message.", 
+						msg->getValue().c_str(), owner->getNetworkId().getValueString().c_str()));
+					owner->revokeSkill(*oldSkill);
+				}
+			}
+		}
+		break;
+	case CM_alterAttribute:
+		{
+			const MessageQueueAlterAttribute * const msg = safe_cast<const MessageQueueAlterAttribute *>(data);
+			if(msg)
+			{
+				owner->alterAttribute(msg->getAttrib(),
+				                      msg->getDelta(),
+				                      msg->getCheckIncapacitation(),
+				                      msg->getSource()
+				                     );
+			}
+		}
+		break;
+	case CM_addAttributeModifier:
+		{
+			const MessageQueueGenericValueType<AttribMod::AttribMod> * const msg = safe_cast<const MessageQueueGenericValueType<AttribMod::AttribMod> *>(data);
+			if(msg)
+			{
+				owner->addAttributeModifier(msg->getValue());
+			}
+		}
+		break;
+	case CM_removeAttributeModifiers:
+		{
+			const MessageQueueGenericValueType<Attributes::Enumerator> * const msg = safe_cast<const MessageQueueGenericValueType<Attributes::Enumerator> *>(data);
+			if(msg)
+			{
+				owner->removeAttributeModifiers(msg->getValue());
+			}
+		}
+		break;
+	case CM_removeAllAttributeModifiers:
+		{
+			owner->removeAllAttributeModifiers();
+		}
+		break;
+	case CM_removeAllAttributeAndSkillmodModifiers:
+		{
+			owner->removeAllAttributeAndSkillmodMods();
+		}
+		break;
+	case CM_setCurrentWeapon:
+		{
+			const MessageQueueGenericValueType<NetworkId> * const msg = safe_cast<const MessageQueueGenericValueType<NetworkId> *>(data);
+			if(msg)
+			{
+				WeaponObject * weapon = safe_cast<WeaponObject *>(NetworkIdManager::getObjectById(msg->getValue()));
+				if(weapon)
+					owner->setCurrentWeapon(*weapon);
+			}
+		}
+		break;
+	case CM_setGroup:
+		{
+			const MessageQueueGenericValueType<std::pair<bool, NetworkId> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<bool, NetworkId> > *>(data);
+			if(msg)
+			{
+				GroupObject * group = safe_cast<GroupObject *>(NetworkIdManager::getObjectById(msg->getValue().second));
+
+				if (group)
+				{
+					owner->setGroup(group, msg->getValue().first);
+				}
+				else if (!msg->getValue().second.isValid())
+				{
+					if (owner->getGroup())
+						owner->getGroup()->onGroupMemberRemoved(owner->getNetworkId(), msg->getValue().first);
+				}
+			}
+		}
+		break;
+	case CM_setIncapacitated:
+		{
+			const MessageQueueGenericValueType<std::pair<bool, NetworkId> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<bool, NetworkId> > *>(data);
+			if (msg != NULL)
+				owner->setIncapacitated(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_setSayMode:
+		{
+			const MessageQueueGenericValueType<unsigned long> * const msg = safe_cast<const MessageQueueGenericValueType<unsigned long> *>(data);
+			if(msg)
+			{
+				owner->setSayMode(msg->getValue());
+			}
+		}
+		break;
+	case CM_setAnimationMood:
+		{
+			const MessageQueueGenericValueType<std::string> * const msg = safe_cast<const MessageQueueGenericValueType<std::string> *>(data);
+			if(msg)
+			{
+				owner->setAnimationMood(msg->getValue());
+			}
+		}
+		break;
+	case CM_setScaleFactor:
+		{
+			const MessageQueueGenericValueType<float> * const msg = safe_cast<const MessageQueueGenericValueType<float> *>(data);
+			if(msg)
+			{
+				owner->setScaleFactor(msg->getValue());
+			}
+		}
+		break;
+	case CM_setShockWounds:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if(msg)
+			{
+				owner->setShockWounds(msg->getValue());
+			}
+		}
+		break;
+	case CM_setLookAtTarget:
+		{
+			const MessageQueueGenericValueType<NetworkId> * const msg = safe_cast<const MessageQueueGenericValueType<NetworkId> *>(data);
+			if(msg)
+			{
+				owner->setLookAtTarget(msg->getValue());
+			}
+		}
+		break;	
+	case CM_setIntendedTarget:
+		{
+			const MessageQueueGenericValueType<NetworkId> * const msg = safe_cast<const MessageQueueGenericValueType<NetworkId> *>(data);
+			if(msg)
+			{
+				owner->setIntendedTarget(msg->getValue());
+			}
+		}
+		break;
+	case CM_setMovementStationary:
+		{
+			owner->setMovementStationary();
+		}
+		break;
+	case CM_setMovementWalk:
+		{
+			owner->setMovementWalk();
+		}
+		break;
+	case CM_setMovementRun:
+		{
+			owner->setMovementRun();
+		}
+		break;
+	case CM_setSlopeModAngle:
+		{
+			const MessageQueueGenericValueType<float> * const msg = safe_cast<const MessageQueueGenericValueType<float> *>(data);
+			if(msg)
+			{
+				owner->setSlopeModAngle(msg->getValue());
+			}
+		}
+		break;
+	case CM_setSlopeModPercent:
+		{
+			const MessageQueueGenericValueType<float> * const msg = safe_cast<const MessageQueueGenericValueType<float> *>(data);
+			if(msg)
+			{
+				owner->setSlopeModPercent(msg->getValue());
+			}
+		}
+		break;
+	case CM_setWaterModPercent:
+		{
+			const MessageQueueGenericValueType<float> * const msg = safe_cast<const MessageQueueGenericValueType<float> *>(data);
+			if(msg)
+			{
+				owner->setWaterModPercent(msg->getValue());
+			}
+		}
+		break;
+	case CM_setMovementScale:
+		{
+			const MessageQueueGenericValueType<float> * const msg = safe_cast<const MessageQueueGenericValueType<float> *>(data);
+			if(msg)
+			{
+				owner->setMovementScale(msg->getValue());
+			}
+		}
+		break;
+	case CM_setMovementPercent:
+		{
+			const MessageQueueGenericValueType<float> * const msg = safe_cast<const MessageQueueGenericValueType<float> *>(data);
+			if(msg)
+			{
+				owner->setMovementPercent(msg->getValue());
+			}
+		}
+		break;
+	case CM_setTurnPercent:
+		{
+			const MessageQueueGenericValueType<float> * const msg = safe_cast<const MessageQueueGenericValueType<float> *>(data);
+			if(msg)
+			{
+				owner->setTurnPercent(msg->getValue());
+			}
+		}
+		break;
+	case CM_setAccelScale:
+		{
+			const MessageQueueGenericValueType<float> * const msg = safe_cast<const MessageQueueGenericValueType<float> *>(data);
+			if(msg)
+			{
+				owner->setAccelScale(msg->getValue());
+			}
+		}
+		break;
+	case CM_setAccelPercent:
+		{
+			const MessageQueueGenericValueType<float> * const msg = safe_cast<const MessageQueueGenericValueType<float> *>(data);
+			if(msg)
+			{
+				owner->setAccelPercent(msg->getValue());
+			}
+		}
+		break;
+	case CM_sitOnObject:
+		{
+			const MessageQueueSitOnObject * const msg = safe_cast<const MessageQueueSitOnObject *>(data);
+			if(msg)
+			{
+				owner->sitOnObject(msg->getChairCellId(), msg->getChairPosition_p());
+			}
+		}
+		break;
+	case CM_setMasterId:
+		{
+			const MessageQueueGenericValueType<NetworkId> * const msg = safe_cast<const MessageQueueGenericValueType<NetworkId> *>(data);
+			if (msg)
+			{
+				owner->setMasterId(msg->getValue());
+			}
+		}
+		break;
+	case CM_setHouse:
+		{
+			const MessageQueueGenericValueType<NetworkId> * const msg = safe_cast<const MessageQueueGenericValueType<NetworkId> *>(data);
+			if (msg)
+			{
+				owner->setHouse(CachedNetworkId(msg->getValue()));
+			}
+		}
+		break;
+
+	case CM_setDifficulty:
+	case CM_setLevel:
+		{
+			MessageQueueGenericValueType<int> const *msg = safe_cast<MessageQueueGenericValueType<int> const *>(data);
+			if (msg)
+				owner->setLevel(static_cast<int16>(msg->getValue()));
+		}
+		break;
+	case CM_recalculateLevel:
+		{
+			MessageQueueGenericValueType<int> const *msg = safe_cast<MessageQueueGenericValueType<int> const *>(data);
+			if (msg)
+				owner->recalculateLevel();
+		}
+		break;
+
+
+	case CM_creatureSetBaseWalkSpeed:
+		owner->setBaseWalkSpeed(value);
+		break;
+
+	case CM_creatureSetBaseRunSpeed:
+		owner->setBaseRunSpeed(value);
+		break;
+
+	case CM_emergencyDismountForRider:
+		owner->emergencyDismountForRider();
+		break;
+
+	case CM_detachRiderForMount:
+		{
+			typedef MessageQueueGenericValueType<NetworkId> Message;
+			Message const * const msg = safe_cast<Message const *>(data);
+
+			if (msg != 0)
+			{
+				owner->detachRider(msg->getValue());
+			}
+			break;
+		}
+
+	case CM_detachAllRidersForMount:
+		owner->detachAllRiders();
+		break;
+
+	case CM_setAppearanceFromObjectTemplate:
+		{
+			MessageQueueGenericValueType<std::string> const *const msg = dynamic_cast<MessageQueueGenericValueType<std::string> const *>(data);
+			if (owner && msg)
+				owner->setAlternateAppearance(msg->getValue());
+			else
+				WARNING(true, ("CreatureController: received CM_setAppearanceFromObjectTemplate but owner or message was NULL."));
+		}
+		break;
+
+	case CM_makeDead:
+		{
+			const MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> > * msg = dynamic_cast<const MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> > *>(data);
+			if (msg)
+			{
+				owner->makeDead(msg->getValue().first, msg->getValue().second);
+			}
+		}
+		break;
+
+	case CM_pushCreature:
+		{
+			const MessageQueuePushCreature * const msg = safe_cast<const MessageQueuePushCreature *>(data);
+			if (msg)
+			{
+				ServerObject * defender = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(msg->getDefender()));
+				if (defender != NULL)
+				{
+					if (defender->asCreatureObject() != NULL)
+					{
+						defender->asCreatureObject()->pushedMe(msg->getAttacker(), msg->getAttackerPos(), msg->getDefenderPos(), msg->getDistance());
+					}
+					else
+					{
+						WARNING(true, ("Received MessageQueuePushCreature for non-creature defender %s", msg->getDefender().getValueString().c_str()));
+					}
+				}
+			}
+		}
+		break;
+
+	case CM_slowDownEffect:
+		{
+			const MessageQueueSlowDownEffect * const msg = safe_cast<const MessageQueueSlowDownEffect * const>(data);
+			if (msg)
+			{
+				ServerObject * target = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(msg->getTarget()));
+				if (target != NULL && target->asTangibleObject() != NULL)
+				{
+					if (owner->isAuthoritative())
+						owner->addSlowDownEffect(*(target->asTangibleObject()), msg->getConeLength(), msg->getConeAngle(), msg->getSlopeAngle(), msg->getExpireTime());
+					else
+						owner->addSlowDownEffectProxy(*(target->asTangibleObject()), msg->getConeLength(), msg->getConeAngle(), msg->getSlopeAngle(), msg->getExpireTime());
+				}
+				else
+				{
+					WARNING(true, ("Received slow down effect messge for creature %s "
+						"with unknown target %s", 
+						owner->getNetworkId().getValueString().c_str(), 
+						msg->getTarget().getValueString().c_str()));
+				}
+			}
+		}
+		break;
+
+	case CM_removeSlowDownEffect:
+		{
+			if (owner->isAuthoritative())
+				owner->removeSlowDownEffect();
+			else
+			{
+				WARNING(true, ("CM_removeSlowDownEffect message recieved by proxy object %s", owner->getNetworkId().getValueString().c_str()));
+			}
+		}
+		break;
+
+	case CM_removeSlowDownEffectProxy:
+		{
+			if (!owner->isAuthoritative())
+				owner->removeSlowDownEffectProxy();
+			else
+			{
+				WARNING(true, ("CM_removeSlowDownEffectProxy message recieved by authoritative object %s", owner->getNetworkId().getValueString().c_str()));
+			}
+		}
+		break;
+
+	case CM_groupLotteryWindowCloseResults:
+		{
+			typedef std::pair<NetworkId, std::vector<NetworkId> > Payload;
+
+			MessageQueueGenericValueType<Payload> const * const msg = safe_cast<MessageQueueGenericValueType<Payload> const *>(data);
+			if (msg != 0)
+			{
+				Payload const & incomingPayload = msg->getValue();
+
+				typedef std::vector<NetworkId> Ids;
+
+				NetworkId const & player = incomingPayload.first;
+				Ids const & selectedItems = incomingPayload.second;
+
+				GameScriptObject * const scriptObject = owner->getScriptObject();
+				if (scriptObject != 0)
+				{
+					ScriptParams params;
+					params.addParam(player);
+					params.addParam(selectedItems);
+					IGNORE_RETURN(scriptObject->trigAllScripts(Scripting::TRIG_LOOT_LOTTERY_SELECTED, params));
+				}
+			}
+		}
+		break;
+
+	case CM_cyberneticsChangeRequestToNPC:
+		{
+			MessageQueueCyberneticsChangeRequest const * const msg = safe_cast<MessageQueueCyberneticsChangeRequest const *>(data);
+			NOT_NULL(msg);
+			if (msg != NULL)
+			{
+				NetworkId const & playerId = msg->getTarget();
+				GameScriptObject * const scriptObject = owner->getScriptObject();
+				if (scriptObject)
+				{
+					ScriptParams params;
+					params.addParam(playerId);
+					params.addParam(static_cast<int>(msg->getChangeType()));
+					params.addParam(msg->getCyberneticPiece());
+					
+					IGNORE_RETURN(scriptObject->trigAllScripts(Scripting::TRIG_CYBERNETIC_CHANGE_REQUEST, params));
+				}
+			}
+		}
+		break;
+
+	case CM_setCurrentQuest:
+		{
+			MessageQueueGenericValueType<uint32> const * const msg = safe_cast<MessageQueueGenericValueType<uint32> const *>(data);
+			if (msg != NULL)
+			{
+				PlayerObject * player = PlayerCreatureController::getPlayerObject(owner);
+				if (player != NULL)
+				{
+					player->setCurrentQuest(msg->getValue());
+				}
+				else
+				{
+					DEBUG_WARNING(true, ("Non-player creature %s sent CM_setCurrentQuest message (%u)",
+						owner->getNetworkId().getValueString().c_str(), msg->getValue()));
+				}
+			}
+		}
+		break;
+
+	case CM_setRegenRate:
+		{
+			MessageQueueGenericValueType<std::pair<int, float> > const * const msg = safe_cast<MessageQueueGenericValueType<std::pair<int, float> > const *>(data);
+			if (msg != NULL)
+			{
+				owner->setRegenRate(static_cast<Attributes::Enumerator>(msg->getValue().first), msg->getValue().second);
+			}
+		}
+		break;
+
+	case CM_modifyCurrentGcwPoints:
+		{
+			const MessageQueueGenericValueType<std::pair<int, int> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<int, int> > *>(data);
+			if(msg)
+			{
+				PlayerObject * player = PlayerCreatureController::getPlayerObject(owner);
+				if(player)
+				{
+					player->modifyCurrentGcwPoints(msg->getValue().first, (msg->getValue().second != 0));
+				}
+			}
+		}
+		break;
+
+	case CM_modifyCurrentGcwRating:
+		{
+			const MessageQueueGenericValueType<std::pair<int, int> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<int, int> > *>(data);
+			if(msg)
+			{
+				PlayerObject * player = PlayerCreatureController::getPlayerObject(owner);
+				if(player)
+				{
+					player->modifyCurrentGcwRating(msg->getValue().first, (msg->getValue().second != 0));
+				}
+			}
+		}
+		break;
+
+	case CM_modifyCurrentPvpKills:
+		{
+			const MessageQueueGenericValueType<std::pair<int, int> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<int, int> > *>(data);
+			if(msg)
+			{
+				PlayerObject * player = PlayerCreatureController::getPlayerObject(owner);
+				if(player)
+				{
+					player->modifyCurrentPvpKills(msg->getValue().first, (msg->getValue().second != 0));
+				}
+			}
+		}
+		break;
+
+	case CM_modifyLifetimeGcwPoints:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if(msg)
+			{
+				PlayerObject * player = PlayerCreatureController::getPlayerObject(owner);
+				if(player)
+				{
+					player->modifyLifetimeGcwPoints(msg->getValue());
+				}
+			}
+		}
+		break;
+
+	case CM_modifyMaxGcwImperialRating:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if(msg)
+			{
+				PlayerObject * player = PlayerCreatureController::getPlayerObject(owner);
+				if(player)
+				{
+					player->modifyMaxGcwImperialRating(msg->getValue());
+				}
+			}
+		}
+		break;
+
+	case CM_modifyMaxGcwRebelRating:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if(msg)
+			{
+				PlayerObject * player = PlayerCreatureController::getPlayerObject(owner);
+				if(player)
+				{
+					player->modifyMaxGcwRebelRating(msg->getValue());
+				}
+			}
+		}
+		break;
+
+	case CM_modifyLifetimePvpKills:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if(msg)
+			{
+				PlayerObject * player = PlayerCreatureController::getPlayerObject(owner);
+				if(player)
+				{
+					player->modifyLifetimePvpKills(msg->getValue());
+				}
+			}
+		}
+		break;
+
+	case CM_modifyNextGcwRatingCalcTime:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if(msg)
+			{
+				PlayerObject * player = PlayerCreatureController::getPlayerObject(owner);
+				if(player)
+				{
+					player->modifyNextGcwRatingCalcTime(msg->getValue());
+				}
+			}
+		}
+		break;
+
+	case CM_customizeFinished:
+		{
+			typedef std::pair<NetworkId, std::string > Payload;
+
+			MessageQueueGenericValueType<Payload> const * const msg = safe_cast<MessageQueueGenericValueType<Payload> const *>(data);
+			if (msg != 0)
+			{
+				Payload const & incomingPayload = msg->getValue();
+
+				NetworkId const & object = incomingPayload.first;
+				std::string const & msgValue = incomingPayload.second;
+
+				GameScriptObject * const scriptObject = owner->getScriptObject();
+				if (scriptObject != 0)
+				{
+					ScriptParams params;
+					params.addParam(object);
+					params.addParam(msgValue.c_str());
+					IGNORE_RETURN(scriptObject->trigAllScripts(Scripting::TRIG_ON_CUSTOMIZE_FINISHED, params));
+				}
+			}
+		}
+		break;
+
+	case CM_clearSessionActivity:
+		{
+			PlayerObject * player = PlayerCreatureController::getPlayerObject(owner);
+			if(player)
+			{
+				player->clearSessionActivity();
+			}
+		}
+		break;
+
+	case CM_addSessionActivity:
+		{
+			const MessageQueueGenericValueType<unsigned long> * const msg = safe_cast<const MessageQueueGenericValueType<unsigned long> *>(data);
+			if(msg)
+			{
+				PlayerObject * player = PlayerCreatureController::getPlayerObject(owner);
+				if(player)
+				{
+					player->addSessionActivity(static_cast<uint32>(msg->getValue()));
+				}
+			}
+		}
+		break;
+
+	case CM_modifyHologramType:
+		{
+			MessageQueueGenericValueType<int32> const *msg = safe_cast<MessageQueueGenericValueType<int32> const *>(data);
+			if (msg)
+				owner->setHologramType(msg->getValue());
+		}
+		break;
+
+	case CM_modifyVisibleOnMapAndRadar:
+		{
+			MessageQueueGenericValueType<bool> const *msg = safe_cast<MessageQueueGenericValueType<bool> const *>(data);
+			if (msg)
+				owner->setVisibleOnMapAndRadar(msg->getValue());
+		}
+		break;
+
+	case CM_setCoverVisibility:
+		{
+			const MessageQueueGenericValueType<bool> * const msg = safe_cast<const MessageQueueGenericValueType<bool> *>(data);
+			if (msg)
+			{
+				owner->setCoverVisibility(msg->getValue());
+			}
+		}
+		break;
+
+	case CM_incubatorCancel:
+		{
+			IncubatorCommitMessage const * const msg = safe_cast<IncubatorCommitMessage const *>(data);
+			if (msg)
+			{
+				ServerObject * incubatorSo = ServerWorld::findObjectByNetworkId(msg->getTerminalId());
+				if (incubatorSo)
+				{
+					TangibleObject * incubatorTo = incubatorSo->asTangibleObject();
+
+					if (incubatorTo)
+						incubatorTo->handleIncubatorCancel(*owner);
+				}
+			}
+		}
+		break;
+
+	case CM_incubatorCommit:
+		{
+			IncubatorCommitMessage const * const msg = safe_cast<IncubatorCommitMessage const *>(data);
+			if (msg)
+			{
+				ServerObject * incubatorSo = ServerWorld::findObjectByNetworkId(msg->getTerminalId());
+				if (incubatorSo)
+				{
+					TangibleObject * incubatorTo = incubatorSo->asTangibleObject();
+
+					if (incubatorTo)
+						incubatorTo->handleIncubatorCommit(*owner, *msg);
+				}
+			}
+		}
+		break;
+
+	case CM_modifyCollectionSlotValue:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, int64> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, int64> > *>(data);
+			if(msg)
+			{
+				PlayerObject * player = PlayerCreatureController::getPlayerObject(owner);
+				if(player)
+				{
+					player->modifyCollectionSlotValue(msg->getValue().first, msg->getValue().second);
+				}
+			}
+		}
+		break;
+
+	case CM_adjustLotCount:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if(msg)
+			{
+				PlayerObject * player = PlayerCreatureController::getPlayerObject(owner);
+				if(player)
+				{
+					player->adjustLotCount(msg->getValue());
+				}
+			}
+		}
+		break;
+
+	case CM_squelch:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > > *>(data);
+			if(msg)
+			{
+				PlayerObject * player = PlayerCreatureController::getPlayerObject(owner);
+				if(player)
+				{
+					player->squelch(msg->getValue().second.first, msg->getValue().first, msg->getValue().second.second);
+				}
+			}
+		}
+		break;
+
+	case CM_unsquelch:
+		{
+			PlayerObject * player = PlayerCreatureController::getPlayerObject(owner);
+			if(player)
+			{
+				player->unsquelch();
+			}
+		}
+		break;
+
+	case CM_setPriviledgedTitle:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if(msg)
+			{
+				PlayerObject * player = PlayerCreatureController::getPlayerObject(owner);
+				if(player)
+				{
+					player->setPriviledgedTitle(static_cast<int8>(msg->getValue()));
+				}
+			}
+		}
+		break;
+
+	case CM_addBuff:
+		{
+			const MessageQueueGenericValueType<std::pair<int, std::pair<float, std::pair<float, std::pair< float, NetworkId > > > > > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<int, std::pair<float, std::pair<float, std::pair< float, NetworkId > > > > > *>(data);
+			if(msg)
+			{
+				owner->addBuff (static_cast<uint32>(msg->getValue ().first), msg->getValue ().second.first, msg->getValue ().second.second.first, msg->getValue ().second.second.second.first, msg->getValue ().second.second.second.second);
+			}
+		}
+		break;
+
+	case CM_removeBuff:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> * >(data);
+			if(msg)
+			{
+				owner->removeBuff (static_cast<uint32>(msg->getValue ()));
+			}
+		}
+		break;
+
+	case CM_ratingFinished:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> * >(data);
+			if(msg)
+			{
+				if(owner->getScriptObject())
+				{
+					ScriptParams params;
+					params.addParam(msg->getValue());
+					IGNORE_RETURN(owner->getScriptObject()->trigAllScripts(Scripting::TRIG_ON_RATING_FINISHED, params));
+				}
+			}
+		}
+		break;
+	case CM_abandonPlayerQuest:
+		{
+			const MessageQueueGenericValueType<NetworkId> * const msg = safe_cast<const MessageQueueGenericValueType<NetworkId> * >(data);
+			if(msg)
+			{
+				if(owner->getScriptObject())
+				{
+					ScriptParams params;
+					params.addParam(msg->getValue());
+					IGNORE_RETURN(owner->getScriptObject()->trigAllScripts(Scripting::TRIG_ON_ABANDON_PLAYER_QUEST, params));
+				}
+			}		
+		}
+		break;
+
+	default:
+		TangibleController::handleMessage(message, value, data, flags);
+		break;
+	}
+}
+
+//-----------------------------------------------------------------------
+
+float CreatureController::realAlter(float time)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("CreatureController::realAlter");
+
+	float alterResult = TangibleController::realAlter(time);
+
+	CreatureObject * const owner = NON_NULL(getCreature());
+
+	if(getHibernate())
+		return alterResult;
+
+	if (owner->isAuthoritative())
+		owner->decayAttributes(time);
+	
+	if (owner->isInWorld())
+	{
+		bool isBurning = false;
+		float lavaResistance = 0.0f;
+
+		if (owner->isAuthoritative())
+		{
+			//owner->decayMentalStates(time);
+			owner->reportMonitoredCreatures(time);
+
+			//-- Handle swimming state.
+			bool const currentSwimState = owner->getState(States::Swimming);
+			bool newSwimState = false;
+			float waterHeight = 0.0f;
+			calculateWaterState(newSwimState,isBurning,lavaResistance,waterHeight);
+
+			bool const isVehicle = GameObjectTypes::isTypeOf (owner->getGameObjectType (), static_cast<int>(SharedObjectTemplate::GOT_vehicle));
+			if(!isVehicle) // make everything but vehicles walk on lava
+			{
+				const Vector & position = owner->getPosition_w ();
+				Footprint *const footprint = owner->getFootprint();
+				if(footprint)
+				{
+					if(isBurning) 
+					{
+						footprint->setSwimHeight(owner->getSwimHeight() * 0.2f);
+						owner->move_p(Vector::unitY * (waterHeight - position.y));
+					}
+					else
+					{
+						footprint->setSwimHeight(owner->getSwimHeight());	
+					}
+				}
+			}
+
+			if (currentSwimState && !newSwimState)
+			{
+				// We've just detected that the owner stopped swimming.
+				onExitSwimming();
+			}
+			else if (!currentSwimState && newSwimState)
+			{
+				// We've just detected that the owner started swimming.
+				onEnterSwimming();
+			}
+
+			setObjectStopWalkRun();
+		}
+
+		CollisionProperty *const collisionProperty = owner->getCollisionProperty();
+		if (owner->getState(States::RidingMount))
+		{
+			// Tell the rider's CollisionProperty to update its extent.  Since
+			// the rider is yanked out of the CollisionWorld, the
+			// CollisionProperty doesn't get updated properly.  Failure to
+			// update the rider's CollisionProperty extent causes line of sight
+			// to fail (line of sight ends up using the value present in CollisionProperty
+			// at the time of mounting).
+			
+			if (collisionProperty)
+				collisionProperty->updateExtents();
+		}
+
+		const bool isPlayerControlled = (collisionProperty && collisionProperty->isPlayerControlled());
+
+		// lava damage
+		if(WaterTypeManager::getCausesDamage(TGWT_lava) 
+			&& isBurning 
+			&& (isPlayerControlled || owner->isBeast())
+		)
+		{
+			const unsigned long serverTime = ServerClock::getInstance().getGameTimeSeconds();
+			const unsigned long lastBurnTime = owner->getLastWaterDamageTime();
+			const unsigned long waterDamageInterval = WaterTypeManager::getDamageInterval(TGWT_lava);
+
+			if(serverTime - lastBurnTime > (waterDamageInterval*3)) // skip the first lava damage frame
+			{
+				owner->setLastWaterDamageTime(serverTime - waterDamageInterval);
+				//DEBUG_WARNING(true,("LAVA DAMAGE SLUSH TIME- serverTime=%ul, lastBurnTime=%ul, diff=%d",serverTime,lastBurnTime,serverTime-lastBurnTime));
+			} 
+			else if(serverTime - lastBurnTime > waterDamageInterval && !owner->isDead())
+			{
+				owner->setLastWaterDamageTime(serverTime);
+				const float percentWaterDamagePerInterval = WaterTypeManager::getDamagePerInterval(TGWT_lava)/100.0f;
+				const float lavaResistanceModifier = 1.0f - lavaResistance/100.0f;
+					
+				const int damageValue = 
+					static_cast<int> (
+						-( owner->getMaxAttribute(Attributes::Health) 
+							* percentWaterDamagePerInterval 
+							* lavaResistanceModifier
+						)
+					);
+					
+				StringId stringId = StringId("combat_effects", "environment_damage_lava");
+				owner->showFlyText(stringId,5.0f,255,0,0);
+				
+				if(WaterTypeManager::getDamageKills(TGWT_lava) 
+					&& (owner->getAttribute(Attributes::Health) + damageValue) <= 0)
+				{
+					owner->makeDead(NetworkId::cms_invalid, NetworkId::cms_invalid); 
+					ScriptParams params;
+					owner->getScriptObject()->trigAllScripts(Scripting::TRIG_ENVIRONMENTAL_DEATH,params);
+				}
+				else
+				{
+					CombatEngineData::DamageData damageData;
+					struct AttribMod::AttribMod damage;
+					damage.tag = 0;
+					damage.attrib = Attributes::Health;
+					damage.attack = 0;
+					damage.sustain = 0;
+					damage.decay = AttribMod::AMDS_pool;
+					damage.flags = AttribMod::AMF_directDamage;
+					damage.value = damageValue;
+					damageData.damage.push_back(damage);
+					owner->applyDamage(damageData);
+				}
+			}
+		}
+	}
+	return alterResult;
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureController::conclude()
+{
+	PROFILER_AUTO_BLOCK_DEFINE("CreatureController::conclude");
+	
+	MessageQueue::Data* data;
+
+	int        message;
+	real       value;
+	uint32     flags;
+	NetworkId  networkId;
+
+	int const messageCount = getNumberOfMessages();
+	for(int i = 0; i < messageCount; ++i)
+	{
+		//-- Get the message.
+		getMessage(i, &message, &value, &data, &flags); //@todo why does getMessage need a signed size?
+
+		if(message == CM_combatAction)
+		{
+			//-- Check if it's a combat action message.  If so, the message's end postures for the
+			//   combatants must be adjusted to reflect the server's idea of the post-alter end posture.
+			//   This information was not known at the time the message was constructed.
+			MessageQueueCombatAction * combatMessage = safe_cast<MessageQueueCombatAction *>(data);
+			if (combatMessage != NULL)
+			{
+				//-- Fix up end postures in messages.
+				
+				// @todo: change postures to locomotion
+				// set the attacker's posture
+				MessageQueueCombatAction::AttackerData & attackerData = 
+					const_cast<MessageQueueCombatAction::AttackerData &>(
+						combatMessage->getAttacker());
+				const CreatureObject * attacker = dynamic_cast<const CreatureObject *>(
+					NetworkIdManager::getObjectById(attackerData.id));
+				attackerData.endPosture = (attacker != NULL) ? attacker->getPosture() : static_cast<Postures::Enumerator>(0);
+				
+				// set the defenders' posture
+				const MessageQueueCombatAction::DefenderDataVector & defenderData = 
+					combatMessage->getDefenders();
+				for (MessageQueueCombatAction::DefenderDataVector::const_iterator 
+						 iter(defenderData.begin()); iter != defenderData.end(); ++iter)
+				{
+					MessageQueueCombatAction::DefenderData & defenderData = 
+						const_cast<MessageQueueCombatAction::DefenderData &>(*iter);
+					const CreatureObject * defender = dynamic_cast<const CreatureObject *>(
+						NetworkIdManager::getObjectById(defenderData.id));
+					defenderData.endPosture = (defender != NULL) ? defender->getPosture() : static_cast<Postures::Enumerator>(0);
+				}
+			}
+		}
+	}
+
+	CreatureObject * const owner = static_cast<CreatureObject*>(getOwner());
+	if(owner)
+	{
+		owner->checkNotifyRegions();
+	}
+	//-- Chain up to parent controller.
+	TangibleController::conclude();
+}
+
+//--------------------------------------------------------------------
+
+void CreatureController::setObjectStopWalkRun()
+{
+	float vel = getCurrentVelocity().magnitude();
+	CreatureObject* owner = static_cast<CreatureObject *>(getOwner());
+	float walkSpeed = owner->getWalkSpeed();
+	float runSpeed = owner->getRunSpeed();
+	if (vel == 0)
+		owner->setMovementStationary();
+	else if (runSpeed == 0 || (vel < (walkSpeed + runSpeed) * 0.5f))
+		owner->setMovementWalk();
+	else
+		owner->setMovementRun();
+}
+
+//----------------------------------------------------------------------
+
+void CreatureController::setOwner(Object *newOwner)
+{
+	NOT_NULL(safe_cast<CreatureObject*>(newOwner));
+	Controller::setOwner(newOwner);
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureController::setSecureTrade(ServerSecureTrade * t)
+{
+	m_secureTrade = t;
+}
+
+//----------------------------------------------------------
+
+ServerSecureTrade* CreatureController::getSecureTrade() const
+{
+	return m_secureTrade;
+}
+
+//----------------------------------------------------------
+
+void CreatureController::handleSecureTradeMessage(const MessageQueueSecureTrade * data)
+{
+	if (!data)
+		return;
+
+	CreatureObject * owner = getCreature();
+	NOT_NULL(owner);
+
+	switch (data->getTradeMessageId())
+	{
+	case MessageQueueSecureTrade::TMI_RequestTrade:
+		{
+			if (data->getRecipient() == owner->getNetworkId())
+			{
+				DEBUG_REPORT_LOG(true, ("Creature %s tried to trade with himself.", getOwner()->getNetworkId().getValueString().c_str()));
+				return;
+			}
+			if (m_secureTrade)
+			{
+				DEBUG_REPORT_LOG(true, ("Creature %s is already trading\n", getOwner()->getNetworkId().getValueString().c_str()));
+				return;
+			}
+
+			CreatureObject * recipient = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(data->getRecipient()));
+			if (!recipient)
+			{
+				DEBUG_REPORT_LOG(true, ("Could not find recipient for secure trade message\n"));
+				MessageQueueSecureTrade * m = new MessageQueueSecureTrade(MessageQueueSecureTrade::TMI_DeniedPlayerUnreachable, owner->getNetworkId(), data->getRecipient());
+				appendMessage(static_cast<int>(CM_secureTrade), 0.0f, m, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+				return;
+			}
+
+			if (owner->isIncapacitated() || owner->isDead()) 
+			{
+				DEBUG_REPORT_LOG(true, ("Owner creature %s is incapacitated or dead.\n", getOwner()->getNetworkId().getValueString().c_str()));
+				MessageQueueSecureTrade * m = new MessageQueueSecureTrade(MessageQueueSecureTrade::TMI_DeniedPlayerUnreachable, owner->getNetworkId(), data->getRecipient());
+				appendMessage(static_cast<int>(CM_secureTrade), 0.0f, m, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+				return;
+			}
+			else if (recipient->isIncapacitated() || recipient->isDead()) 
+			{
+				DEBUG_REPORT_LOG(true, ("Recipient creature %s is incapacitated or dead.\n", getOwner()->getNetworkId().getValueString().c_str()));
+				MessageQueueSecureTrade * m = new MessageQueueSecureTrade(MessageQueueSecureTrade::TMI_DeniedPlayerUnreachable, owner->getNetworkId(), data->getRecipient());
+				appendMessage(static_cast<int>(CM_secureTrade), 0.0f, m, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+				return;
+			}
+
+			if (! recipient->isAuthoritative())
+			{
+				if (owner->isInWorldCell())
+				{
+					// transfer player to authoritative server
+					owner->transferAuthority(recipient->getAuthServerProcessId(), true, false, true);
+					owner->sendControllerMessageToAuthServer(CM_secureTrade, new MessageQueueSecureTrade(MessageQueueSecureTrade::TMI_RequestTrade, owner->getNetworkId(), data->getRecipient()));
+				}
+				else if (recipient->isInWorldCell())
+				{
+					recipient->sendControllerMessageToAuthServer(CM_secureTrade, new MessageQueueSecureTrade(MessageQueueSecureTrade::TMI_RequestTradeReversed, owner->getNetworkId(), data->getRecipient()));
+				}
+				else
+				{
+					DEBUG_REPORT_LOG(true, ("Player %s tried to trade with player "
+						"%s, but both were in interiors that are on different "
+						"servers. Cell/server= (%s/%lu), (%s/%lu)",
+						owner->getNetworkId().getValueString().c_str(),
+						recipient->getNetworkId().getValueString().c_str(),
+						ContainerInterface::getTopmostContainer(*owner)->getNetworkId().getValueString().c_str(),
+						owner->getAuthServerProcessId(),
+						ContainerInterface::getTopmostContainer(*recipient)->getNetworkId().getValueString().c_str(),
+						recipient->getAuthServerProcessId()
+						));
+				}
+			}
+			else if (recipient->getClient() == NULL)
+			{
+//				GameServer::getInstance().sendToPlanetServer(
+//					GenericValueTypeMessage<std::pair<NetworkId, NetworkId> >(
+//						"RequestSameServer",
+//						std::make_pair(
+//							ContainerInterface::getTopmostContainer(*owner)->getNetworkId(),
+//							ContainerInterface::getTopmostContainer(*recipient)->getNetworkId())),
+//					true);
+
+				// transfer player to authoritative server
+				//owner->transferAuthority(recipient->getAuthServerProcessId(), true, false);
+				//owner->sendControllerMessageToAuthServer(CM_secureTrade, new MessageQueueSecureTrade(MessageQueueSecureTrade::TMI_RequestTrade, owner->getNetworkId(), data->getRecipient()));
+
+				// try again next frame
+				owner->sendControllerMessageToAuthServer(CM_secureTrade, new MessageQueueSecureTrade(MessageQueueSecureTrade::TMI_RequestTrade, owner->getNetworkId(), data->getRecipient()));
+			}
+			else if (!ServerSecureTradeManager::requestTradeWith(*owner, *recipient))
+			{
+				MessageQueueSecureTrade * m = new MessageQueueSecureTrade(MessageQueueSecureTrade::TMI_DeniedPlayerBusy, owner->getNetworkId(), recipient->getNetworkId());
+				appendMessage(static_cast<int>(CM_secureTrade), 0.0f, m, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+
+			}
+		}
+		break;
+
+	// we get this when the traders are on different servers, but the trade 
+	// initiator can't be moved to our server
+	case MessageQueueSecureTrade::TMI_RequestTradeReversed:
+		{
+			CreatureObject * initiator = dynamic_cast<CreatureObject*>(ServerWorld::findObjectByNetworkId(data->getInitiator()));
+			if (!initiator)
+			{
+				DEBUG_REPORT_LOG(true, ("Could not find initiator for reversed secure trade message\n"));
+				return;
+			}
+			if (! initiator->isAuthoritative())
+			{
+				if (owner->isInWorldCell())
+				{
+					// transfer player to authoritative server
+					owner->transferAuthority(initiator->getAuthServerProcessId(), true, false, true);
+					owner->sendControllerMessageToAuthServer(CM_secureTrade, new MessageQueueSecureTrade(MessageQueueSecureTrade::TMI_RequestTradeReversed, initiator->getNetworkId(), owner->getNetworkId()));
+				}
+				else
+				{
+					WARNING(true, ("Got TMI_RequestTradeReversed, but we are not in the world! Trade request abandoned."));
+					return;
+				}
+			}
+			else
+				initiator->sendControllerMessageToAuthServer(CM_secureTrade, new MessageQueueSecureTrade(MessageQueueSecureTrade::TMI_RequestTrade, initiator->getNetworkId(), owner->getNetworkId()));
+		}
+		break;
+
+	case MessageQueueSecureTrade::TMI_TradeRequested:
+		{
+			WARNING_STRICT_FATAL(true, ("Server should not receive this message\n"));
+			return;
+		}
+		break;
+
+	case MessageQueueSecureTrade::TMI_AcceptTrade:
+		{
+			if (m_secureTrade || !m_secureTradeInitiator)
+			{
+				DEBUG_REPORT_LOG(true, ("Trade acceptance denied because of previous trade or failed startup steps\n"));
+				return;
+			}
+			ServerSecureTradeManager::acceptTradeRequest(*m_secureTradeInitiator, *(static_cast<CreatureObject *>(getOwner())));
+			m_secureTradeInitiator = 0;
+
+		}
+		break;
+	case MessageQueueSecureTrade::TMI_DeniedTrade:
+		{
+			if (m_secureTrade || !m_secureTradeInitiator)
+			{
+				DEBUG_REPORT_LOG(true, ("Trade acceptance denied because of previous trade or failed startup steps\n"));
+				return;
+			}
+			ServerSecureTradeManager::refuseTrade(*m_secureTradeInitiator, *(static_cast<CreatureObject *>(getOwner())));
+			m_secureTradeInitiator = 0;
+
+		}
+		break;
+	default:
+		{
+			DEBUG_REPORT_LOG(true, ("Unhandled secure trade message type\n"));
+		}
+		break;
+	}
+}
+
+//----------------------------------------------------------
+
+bool CreatureController::tradeRequested(CreatureObject & initiator)
+{
+	//Check for outstanding trade requests.
+	if (m_secureTradeInitiator || m_secureTrade)
+		return false;
+
+	m_secureTradeInitiator = &initiator;
+
+	MessageQueueSecureTrade * m = new MessageQueueSecureTrade(MessageQueueSecureTrade::TMI_TradeRequested, initiator.getNetworkId(), getOwner()->getNetworkId());
+	appendMessage(static_cast<int>(CM_secureTrade), 0.0f, m, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void CreatureController::sendGenericResponse (int responseType, int requestType, bool success, uint8 sequenceId)
+{
+	// send result back to player
+	MessageQueueGenericResponse * response = new MessageQueueGenericResponse (requestType, success, sequenceId);
+	appendMessage(responseType, 0.0f, response, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+}
+
+//----------------------------------------------------------------------
+
+void CreatureController::steeringChanged()
+{
+	return;
+}
+
+//-----------------------------------------------------------------------
+
+bool CreatureController::setSlopeModAngle(float angle)
+{
+	CreatureObject * owner = static_cast<CreatureObject *>(getOwner());
+	bool result = owner->setSlopeModAngle(angle);
+	steeringChanged();
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+bool CreatureController::setSlopeModPercent(float percent)
+{
+	CreatureObject * owner = static_cast<CreatureObject *>(getOwner());
+	bool result = owner->setSlopeModPercent(percent);
+	steeringChanged();
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+bool CreatureController::setWaterModPercent(float percent)
+{
+	CreatureObject * owner = static_cast<CreatureObject *>(getOwner());
+	bool result = owner->setWaterModPercent(percent);
+	steeringChanged();
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+bool CreatureController::setMovementScale(float scale)
+{
+	CreatureObject * owner = static_cast<CreatureObject *>(getOwner());
+	return owner->setMovementScale(scale);
+}
+
+//-----------------------------------------------------------------------
+
+bool CreatureController::setMovementPercent(float percent)
+{
+	CreatureObject * owner = static_cast<CreatureObject *>(getOwner());
+	return owner->setMovementPercent(percent);
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureController::setAccelScale(float scale)
+{
+	CreatureObject * owner = static_cast<CreatureObject *>(getOwner());
+	return owner->setAccelScale(scale);
+}
+
+//-----------------------------------------------------------------------
+
+bool CreatureController::setAccelPercent(float percent)
+{
+	CreatureObject * owner = static_cast<CreatureObject *>(getOwner());
+	return owner->setAccelPercent(percent);
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureController::setAppearanceFromObjectTemplate(std::string const &serverObjectTemplateName)
+{
+	CreatureObject * owner = dynamic_cast<CreatureObject *>(getOwner());
+	if (!owner)
+	{
+		WARNING(true, ("setAppearanceFromObjectTemplate(): owner is NULL or not a CreatureObject."));
+		return;
+	}
+
+	if (owner->isAuthoritative())
+		owner->setAlternateAppearance(serverObjectTemplateName);
+	else
+		owner->sendControllerMessageToAuthServer(CM_setAppearanceFromObjectTemplate, new MessageQueueGenericValueType<std::string>(serverObjectTemplateName));
+}
+
+//-----------------------------------------------------------------------
+
+CreatureObject * CreatureController::getCreature()
+{
+	return safe_cast<CreatureObject *>(getOwner());
+}
+
+//-----------------------------------------------------------------------
+
+CreatureObject const * CreatureController::getCreature() const
+{
+	return safe_cast<CreatureObject const *>(getOwner());
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureController::endBaselines()
+{
+	updateHibernate();
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureController::updateHibernate()
+{
+	if (getOwner()->isAuthoritative())
+	{
+		setHibernate(shouldHibernate());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureController::shouldHibernate() const
+{
+	if(!ConfigServerGame::getHibernateEnabled())
+		return false;
+
+	// ----------
+
+	CreatureObject const * creature = getCreature();
+	NOT_NULL(creature);
+	
+	// If the creature is static, it hibernates.
+
+	if(creature->getIsStatic())
+		return true;
+
+	// If proxied creatures aren't allowed to hibernate and this creature is proxied,
+	// it's not hibernating.
+
+	if(!ConfigServerGame::getHibernateProxies() && (creature->getProxyCount() > 0))
+		return false;
+
+	// if any players are observing me, don't hibernate
+	return creature->getObserversCount() <= 0;
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureController::getHibernate() const
+{
+	CreatureObject const * owner = static_cast<CreatureObject const *>(getOwner());
+
+	return owner->hasCondition(ServerTangibleObjectTemplate::C_hibernating);
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureController::setHibernate(bool newHibernate)
+{
+	bool oldHibernate = getHibernate();
+	if (oldHibernate == newHibernate) 
+		return;
+
+	CreatureObject * owner = static_cast<CreatureObject*>(getOwner());
+	if (!owner->isAuthoritative())
+		return;
+
+	// ----------
+
+	bool transitionOk = true;
+
+	if(newHibernate)
+	{
+		ScriptParams params;
+		int result = getServerOwner()->getScriptObject()->trigAllScripts(Scripting::TRIG_HIBERNATE_BEGIN, params);
+
+		if(result == SCRIPT_OVERRIDE) transitionOk = false;
+	}
+	else
+	{
+		ScriptParams params;
+		int result = getServerOwner()->getScriptObject()->trigAllScripts(Scripting::TRIG_HIBERNATE_END, params);
+
+		if(result == SCRIPT_OVERRIDE) transitionOk = false;
+	}
+
+	// ----------
+
+	if(transitionOk)
+	{
+		if(newHibernate)
+		{
+//			DEBUG_REPORT_LOG(true, ("[aitest] Hibernating %s\n", owner->getNetworkId().getValueString().c_str()));
+			owner->setCondition(ServerTangibleObjectTemplate::C_hibernating);
+			owner->setDefaultAlterTime(AlterResult::cms_keepNoAlter);
+		}
+		else
+		{
+//			DEBUG_REPORT_LOG(true, ("[aitest] Waking up %s\n", owner->getNetworkId().getValueString().c_str()));
+			owner->clearCondition(ServerTangibleObjectTemplate::C_hibernating);
+			if (owner->isPlayerControlled())
+				owner->setDefaultAlterTime(0);
+			else
+				owner->setDefaultAlterTime(AlterResult::cms_alterQuickly);
+		}
+		owner->scheduleForAlter();
+		// update the planet server for our hibernation change
+		owner->updatePlanetServerInternal(true);
+	}
+}
+
+//====================================================================
+
+void CreatureController::calculateWaterState(bool& isSwimming, bool &isBurning, float& lavaResistance, float& waterHeight) const
+{
+	//-- Mounts: if this is a rider, take the swim state from the mount.
+	CreatureObject const *const ownerCreature = safe_cast<CreatureObject const*>(getOwner());
+	if (!ownerCreature)
+		return;
+
+	if (ownerCreature->getState(States::RidingMount))
+	{
+		CreatureObject const     *const mountCreature = ownerCreature->getMountedCreature();
+		CreatureController const *const mountCreatureController = mountCreature ? safe_cast<CreatureController const*>(mountCreature->getController()) : NULL;
+		if (mountCreatureController)
+		{
+			// Note: we do the real computation for the mount here because the rider gets
+			// an alter prior to the mount.  If we just checked the mount's swim state here,
+			// we would be a frame behind on determining the player's swim state.
+			mountCreatureController->calculateWaterState(isSwimming,isBurning,lavaResistance,waterHeight);
+			return;
+		}
+	}
+
+	//-- Determine if the owner is swimming.
+	CollisionProperty const * const collisionProperty = ownerCreature->getCollisionProperty ();
+	if (!collisionProperty)
+		return;
+
+// JU_TODO: disabled - possibly make burning a persistant state
+#if 0
+	//-- Don't recompute if we're idle --- it shouldn't have changed.
+	bool const isIdle = collisionProperty && collisionProperty->isIdle();
+	if (isIdle)
+		return ownerCreature->getState(States::Swimming);
+#endif
+// JU_TODO: end disabled
+
+	TerrainObject const * const terrainObject = TerrainObject::getConstInstance ();
+	bool const isOnSolidFloor = collisionProperty && collisionProperty->getFootprint () && collisionProperty->getFootprint ()->isOnSolidFloor ();
+
+	isSwimming = false;
+	
+	if (collisionProperty && ownerCreature->isInWorldCell () && !isOnSolidFloor)
+	{
+		Vector const position = ownerCreature->getPosition_w ();
+		float terrainHeight;
+		Footprint const * foot = collisionProperty->getFootprint();
+	
+		lavaResistance = ownerCreature->getLavaResistance();
+		bool const isImmuneToLava = (lavaResistance == 100.0f);
+		
+		TerrainGeneratorWaterType waterType = terrainObject->getWaterType(position);
+		if(!foot || !foot->getTerrainHeight(terrainHeight))
+		{
+			if(!terrainObject->getHeight(position,terrainHeight))
+			{
+				if(!terrainObject->getHeightForceChunkCreation(position,terrainHeight))
+				{
+					return;
+				}
+			}
+		}
+		
+		//-- see if the object is swimming and/or burning
+		if (terrainObject->getWaterHeight (position, waterHeight))
+		{
+			if(position.y - waterHeight < 1.0f && waterHeight >= terrainHeight)
+			{
+				float const swimHeight = ownerCreature->getSwimHeight ();
+				isSwimming = (terrainHeight + swimHeight) < waterHeight;
+
+				if(waterType == TGWT_lava)
+				{
+					isSwimming = false;
+					if(!isImmuneToLava)
+					{
+						isBurning = true;
+					}
+				}
+			}
+		}
+	}	
+}
+
+// ----------------------------------------------------------------------
+/**
+ * Called when the owner CreatureObject has first been detected to start swimming.
+ */
+
+void CreatureController::onEnterSwimming()
+{
+	CreatureObject *const owner = safe_cast<CreatureObject*>(getOwner());
+	if (!owner)
+		return;
+	
+	//-- Set the state to swimming.
+	owner->setState(States::Swimming, true);
+	
+	//-- Fire off the script trigger indicating that the owner is now swimming.
+	ScriptParams params;
+	IGNORE_RETURN(owner->getScriptObject()->trigAllScripts(Scripting::TRIG_ENTER_SWIMMING, params));
+}
+
+// ----------------------------------------------------------------------
+/**
+ * Called when the owner CreatureObject has first been detected to stop swimming.
+ */
+
+void CreatureController::onExitSwimming()
+{
+	CreatureObject *const owner = safe_cast<CreatureObject*>(getOwner());
+	if (!owner)
+		return;
+	
+	//-- Clear the state to swimming.
+	owner->setState(States::Swimming, false);
+	
+	//-- Fire off the script trigger indicating that the owner is no longer swimming.
+	ScriptParams params;
+	IGNORE_RETURN(owner->getScriptObject()->trigAllScripts(Scripting::TRIG_EXIT_SWIMMING, params));
+}
+
+//----------------------------------------------------------------------
+
+CreatureController * CreatureController::asCreatureController()
+{
+	return this;
+}
+
+//----------------------------------------------------------------------
+
+CreatureController const * CreatureController::asCreatureController() const
+{
+	return this;
+}
+
+//----------------------------------------------------------------------
+
+PlayerCreatureController * CreatureController::asPlayerCreatureController()
+{
+	return NULL;
+}
+
+//----------------------------------------------------------------------
+
+PlayerCreatureController const * CreatureController::asPlayerCreatureController() const
+{
+	return NULL;
+}
+
+//----------------------------------------------------------------------
+
+AICreatureController * CreatureController::asAiCreatureController()
+{
+	return NULL;
+}
+
+//----------------------------------------------------------------------
+
+AICreatureController const * CreatureController::asAiCreatureController() const
+{
+	return NULL;
+}
+
+//-----------------------------------------------------------------------
+
+CreatureController * CreatureController::getCreatureController(NetworkId const & networkId)
+{
+	return getCreatureController(NetworkIdManager::getObjectById(networkId));
+}
+
+//-----------------------------------------------------------------------
+
+CreatureController * CreatureController::getCreatureController(Object * object)
+{
+	Controller * controller = (object != NULL) ? object->getController() : NULL;
+
+	return (controller != NULL) ? controller->asCreatureController() : NULL;
+}
+
+// ----------------------------------------------------------------------
+
+CreatureController * CreatureController::asCreatureController(Controller * controller)
+{
+	return (controller != NULL) ? controller->asCreatureController() : NULL;
+}
+
+// ----------------------------------------------------------------------
+
+CreatureController const * CreatureController::asCreatureController(Controller const * controller)
+{
+	return (controller != NULL) ? controller->asCreatureController() : NULL;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/controller/CreatureController.h b/engine/server/library/serverGame/src/shared/controller/CreatureController.h
new file mode 100644
index 00000000..bd2b9fd1
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/CreatureController.h
@@ -0,0 +1,120 @@
+//========================================================================
+//
+// CreatureController.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	INCLUDED_CreatureController_H
+#define	INCLUDED_CreatureController_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/TangibleController.h"
+#include "swgSharedUtility/Behaviors.def"
+#include "swgSharedUtility/MentalStates.def"
+#include "swgSharedUtility/Locomotions.def"
+#include "swgSharedUtility/Postures.def"
+#include "swgSharedUtility/States.def"
+
+//-----------------------------------------------------------------------
+
+class AICreatureController;
+class CellObject;
+class CreatureObject;
+class MessageQueueSecureTrade;
+class MessageQueueCommandQueueEnqueue;
+class MessageQueueCommandQueueEnqueueFwd;
+class PlayerCreatureController;
+class ServerSecureTrade;
+class WeaponObject;
+
+//-----------------------------------------------------------------------
+
+class CreatureController : public TangibleController
+{
+public:
+	explicit        CreatureController (CreatureObject * newOwner);
+	               ~CreatureController ();
+
+	static CreatureController * getCreatureController(NetworkId const & networkId);
+	static CreatureController * getCreatureController(Object * object);
+
+	static CreatureController const * asCreatureController(Controller const * controller);
+	static CreatureController * asCreatureController(Controller * controller);
+
+	virtual CreatureController * asCreatureController();
+	virtual CreatureController const * asCreatureController() const;
+	virtual PlayerCreatureController * asPlayerCreatureController();
+	virtual PlayerCreatureController const * asPlayerCreatureController() const;
+	virtual AICreatureController * asAiCreatureController();
+	virtual AICreatureController const * asAiCreatureController() const;
+
+	virtual void    conclude           ();
+
+	/** object modification functions that should only be called on authoritative
+	 *  objects
+	 */
+	bool            setSlopeModAngle(float angle);
+	bool            setSlopeModPercent(float percent);
+	bool            setWaterModPercent(float percent);
+	bool            setMovementScale(float scale);
+	bool            setMovementPercent(float percent);
+	bool            setAccelScale(float scale);
+	bool            setAccelPercent(float percent);
+
+	void            setAppearanceFromObjectTemplate(std::string const &serverObjectTemplateFilename);
+
+	virtual void    setObjectStopWalkRun();
+	virtual void    setOwner(Object *newOwner);
+
+	CreatureObject       * getCreature();
+	CreatureObject const * getCreature() const;
+
+	virtual void    endBaselines();
+	        bool    getHibernate() const;
+	virtual void    setHibernate(bool hibernate);
+	virtual void    updateHibernate();
+
+private:
+
+	//-----------------------------------------------------------
+	// Secure Trade methods
+public:
+	void                setSecureTrade(ServerSecureTrade *);
+	ServerSecureTrade*  getSecureTrade() const;
+	void                handleSecureTradeMessage(const MessageQueueSecureTrade * data);
+	bool                tradeRequested(CreatureObject&);
+
+private:
+	ServerSecureTrade*          m_secureTrade;
+	Watcher<CreatureObject>     m_secureTradeInitiator;
+
+protected:
+	virtual float realAlter(real time);
+	virtual void handleMessage (int message, float value, const MessageQueue::Data* data, uint32 flags);
+
+	virtual void steeringChanged();
+
+	virtual bool    shouldHibernate() const;
+
+protected:
+	void         sendGenericResponse (int responseType, int requestType, bool success, uint8 sequenceId);
+
+private:
+
+	void            calculateWaterState(bool& isSwimming,bool& isBurning,float& lavaResistance, float& waterHeight) const;
+	void            onEnterSwimming();
+	void            onExitSwimming();
+
+	// Disabled.
+	CreatureController            (void);
+	CreatureController            (const CreatureController & other);
+	CreatureController&	operator= (const CreatureController & other);
+};
+
+//--------------------------------------------------------------------
+
+#endif	// INCLUDED_CreatureController_H
+
diff --git a/engine/server/library/serverGame/src/shared/controller/FactoryController.cpp b/engine/server/library/serverGame/src/shared/controller/FactoryController.cpp
new file mode 100644
index 00000000..475c4533
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/FactoryController.cpp
@@ -0,0 +1,46 @@
+// FactoryController.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/FactoryController.h"
+#include "serverGame/FactoryObject.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedObject/NetworkIdManager.h"
+
+//-----------------------------------------------------------------------
+
+FactoryController::FactoryController(FactoryObject * o) :
+TangibleController(o)
+{
+}
+
+//-----------------------------------------------------------------------
+
+FactoryController::~FactoryController()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void FactoryController::handleMessage (int message, float value, const MessageQueue::Data* data, uint32 flags)
+{
+	FactoryObject * owner = safe_cast<FactoryObject *>(getOwner());
+	if(! owner)
+	{
+		TangibleController::handleMessage(message, value, data, flags);
+		return;
+	}
+
+//	switch(message)
+//	{
+//	default:
+		TangibleController::handleMessage(message, value, data, flags);
+//		break;
+//	}
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverGame/src/shared/controller/FactoryController.h b/engine/server/library/serverGame/src/shared/controller/FactoryController.h
new file mode 100644
index 00000000..a85e98a6
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/FactoryController.h
@@ -0,0 +1,33 @@
+// FactoryController.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_FactoryController_H
+#define	_INCLUDED_FactoryController_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/TangibleController.h"
+
+class FactoryObject;
+
+//-----------------------------------------------------------------------
+
+class FactoryController : public TangibleController
+{
+public:
+	explicit FactoryController(FactoryObject * owner);
+	~FactoryController();
+
+protected:
+	virtual void handleMessage (int message, float value, const MessageQueue::Data* data, uint32 flags);
+
+private:
+	FactoryController & operator = (const FactoryController & rhs);
+	FactoryController(const FactoryController & source);
+
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_FactoryController_H
diff --git a/engine/server/library/serverGame/src/shared/controller/GroundVehicleController.cpp b/engine/server/library/serverGame/src/shared/controller/GroundVehicleController.cpp
new file mode 100644
index 00000000..35d9a194
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/GroundVehicleController.cpp
@@ -0,0 +1,31 @@
+// GroundVehicleController.cpp
+// copyright 2000 Verant Interactive
+
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "serverGame/GroundVehicleController.h"
+#include "serverGame/VehicleObject.h"
+
+//-----------------------------------------------------------------------
+
+GroundVehicleController::GroundVehicleController(VehicleObject * newOwner) :
+	VehicleController(newOwner),
+	yawPitchRollRates(convertDegreesToRadians(60.0f),
+					  convertDegreesToRadians(60.0f), 
+					  convertDegreesToRadians(60.0f)
+					  ),
+	maxForwardVelocity(60)
+{
+}
+
+//-----------------------------------------------------------------------
+
+GroundVehicleController::~GroundVehicleController()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverGame/src/shared/controller/GroundVehicleController.h b/engine/server/library/serverGame/src/shared/controller/GroundVehicleController.h
new file mode 100644
index 00000000..32686b98
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/GroundVehicleController.h
@@ -0,0 +1,37 @@
+// GroundVehicleController.h
+// copyright 2000 Verant Interactive
+// Author: Justin Randall
+
+#ifndef	_GroundVehicleController_H
+#define	_GroundVehicleController_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/VehicleController.h"
+#include "sharedMath/Vector.h"
+
+//-----------------------------------------------------------------------
+
+class VehicleObject;
+
+//-----------------------------------------------------------------------
+
+class GroundVehicleController : public VehicleController
+{
+public:
+	explicit		GroundVehicleController		(VehicleObject * newOwner);
+					~GroundVehicleController		();
+
+protected:
+	Vector          yawPitchRollRates;
+	real            maxForwardVelocity;
+
+private:
+	GroundVehicleController						(void);
+	GroundVehicleController						(const GroundVehicleController & other);
+	GroundVehicleController&	operator=			(const GroundVehicleController & other);
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _GroundVehicleController_H
diff --git a/engine/server/library/serverGame/src/shared/controller/GroupController.cpp b/engine/server/library/serverGame/src/shared/controller/GroupController.cpp
new file mode 100644
index 00000000..c71f84b2
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/GroupController.cpp
@@ -0,0 +1,157 @@
+// ======================================================================
+//
+// GroupController.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/GroupController.h"
+
+#include "serverGame/GroupObject.h"
+#include "serverNetworkMessages/GroupMemberParam.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+
+// ======================================================================
+
+GroupController::GroupController(GroupObject *newOwner) :
+	UniverseController(newOwner)
+{
+}
+
+// ----------------------------------------------------------------------
+
+GroupController::~GroupController()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void GroupController::handleMessage(const int message, const float value, const MessageQueue::Data* const data, const uint32 flags)
+{
+	GroupObject *owner = dynamic_cast<GroupObject *>(getOwner());
+	NOT_NULL(owner);
+
+	switch (message)
+	{
+	case CM_groupSetName:
+		{
+			MessageQueueGenericValueType<std::string> const *msg = safe_cast<MessageQueueGenericValueType<std::string> const *>(data);
+			if (msg)
+				owner->setGroupName(msg->getValue());
+		}
+		break;
+	case CM_groupAddMember:
+		{
+			MessageQueueGenericValueType<GroupMemberParam> const *msg = safe_cast<MessageQueueGenericValueType<GroupMemberParam> const *>(data);
+			if (msg)
+			{
+				owner->addGroupMember(msg->getValue());
+			}
+		}
+		break;
+	case CM_groupRemoveMember:
+		{
+			MessageQueueGenericValueType<NetworkId> const *msg = safe_cast<MessageQueueGenericValueType<NetworkId> const *>(data);
+			if (msg)
+				owner->removeGroupMember(msg->getValue());
+		}
+		break;
+	case CM_groupDisband:
+		{
+			owner->disbandGroup();
+		}
+		break;
+	case CM_groupMakeLeader:
+		{
+			MessageQueueGenericValueType<NetworkId> const *msg = safe_cast<MessageQueueGenericValueType<NetworkId> const *>(data);
+			if (msg)
+				owner->makeLeader(msg->getValue());
+		}
+		break;
+	case CM_setGroupMemberDifficulty:
+		{
+			MessageQueueGenericValueType<std::pair<NetworkId, int> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<NetworkId, int> > const *>(data);
+			if (msg)
+				owner->setMemberLevel(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_setGroupMemberProfession:
+		{
+			MessageQueueGenericValueType<std::pair<NetworkId, uint32> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<NetworkId, uint32> > const *>(data);
+			if (msg)
+				owner->setMemberProfession(msg->getValue().first, static_cast<uint8>(msg->getValue().second));
+		}
+		break;
+	case CM_setGroupShipForMember:
+		{
+			MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> > const *>(data);
+			if (msg)
+				owner->setShipForMember(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+
+	case CM_setGroupShipFormationSlotForMember:
+		{
+			MessageQueueGenericValueType<std::pair<NetworkId, int> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<NetworkId, int> > const *>(data);
+			if (msg)
+				owner->setShipFormationSlotForMember(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_addGroupPOBShipAndOwner:
+		{
+			MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> > const *>(data);
+			if (msg)
+				owner->addPOBShipAndOwner(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_removeGroupPOBShip:
+		{
+			MessageQueueGenericValueType<NetworkId> const *msg = safe_cast<MessageQueueGenericValueType<NetworkId> const *>(data);
+			if (msg)
+				owner->removePOBShip(msg->getValue());
+		}
+		break;
+
+	case CM_groupMakeLootMaster:
+		{
+			MessageQueueGenericValueType<NetworkId> const *msg = safe_cast<MessageQueueGenericValueType<NetworkId> const *>(data);
+			if (msg)
+				owner->makeLootMaster(msg->getValue());
+		}
+		break;
+
+	case CM_groupSetLootRule:
+		{
+			MessageQueueGenericValueType<int> const *msg = safe_cast<MessageQueueGenericValueType<int> const *>(data);
+			if (msg)
+				owner->setLootRule(msg->getValue());
+		}
+		break;
+
+	case CM_setGroupPickupTimer:
+		{
+			MessageQueueGenericValueType<std::pair<int32, int32> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int32, int32> > const *>(data);
+			if (msg)
+				owner->setGroupPickupTimer(static_cast<time_t>(msg->getValue().first), static_cast<time_t>(msg->getValue().second));
+		}
+		break;
+
+	case CM_setGroupPickupLocation:
+		{
+			MessageQueueGenericValueType<std::pair<std::string, Vector> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::string, Vector> > const *>(data);
+			if (msg)
+				owner->setGroupPickupLocation(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+
+	default:
+		UniverseController::handleMessage(message, value, data, flags);
+		break;
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/controller/GroupController.h b/engine/server/library/serverGame/src/shared/controller/GroupController.h
new file mode 100644
index 00000000..3b560c63
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/GroupController.h
@@ -0,0 +1,40 @@
+// ======================================================================
+//
+// GroupController.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	INCLUDED_GroupController_H
+#define	INCLUDED_GroupController_H
+
+// ======================================================================
+
+#include "serverGame/UniverseController.h"
+
+// ======================================================================
+
+class GroupObject;
+
+// ======================================================================
+
+class GroupController: public UniverseController
+{
+public:
+	explicit GroupController(GroupObject *newOwner);
+	~GroupController();
+
+protected:
+	virtual void handleMessage(int message, float value, const MessageQueue::Data* data, uint32 flags);
+
+private:
+	GroupController();
+	GroupController(GroupController const &);
+	GroupController& operator=(GroupController const &);
+};
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/controller/GuildController.cpp b/engine/server/library/serverGame/src/shared/controller/GuildController.cpp
new file mode 100644
index 00000000..19c90c7f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/GuildController.cpp
@@ -0,0 +1,177 @@
+// ======================================================================
+//
+// GuildController.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/GuildController.h"
+
+#include "serverGame/GuildObject.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+
+// ======================================================================
+
+GuildController::GuildController(GuildObject *newOwner) :
+	UniverseController(newOwner)
+{
+}
+
+// ----------------------------------------------------------------------
+
+GuildController::~GuildController()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void GuildController::handleMessage(const int message, const float value, const MessageQueue::Data* const data, const uint32 flags)
+{
+	GuildObject *owner = dynamic_cast<GuildObject *>(getOwner());
+	NOT_NULL(owner);
+
+	switch (message)
+	{
+	case CM_guildCreate:
+		{
+			MessageQueueGenericValueType<std::pair<int, std::pair<std::string, std::string> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, std::pair<std::string, std::string> > > const *>(data);
+			owner->createGuild(msg->getValue().second.first, msg->getValue().second.second, msg->getValue().first);
+		}
+		break;
+	case CM_guildDisband:
+		{
+			MessageQueueGenericValueType<int> const *msg = safe_cast<MessageQueueGenericValueType<int> const *>(data);
+			owner->disbandGuild(msg->getValue());
+		}
+		break;
+	case CM_guildRemoveMember:
+		{
+			MessageQueueGenericValueType<std::pair<int, NetworkId> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, NetworkId> > const *>(data);
+			owner->removeGuildMember(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_guildAddCreatorMember:
+		{
+			MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::pair<std::string, int> > > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::pair<std::string, int> > > > const *>(data);
+			owner->addGuildCreatorMember(msg->getValue().first.first, msg->getValue().first.second, msg->getValue().second.first, msg->getValue().second.second.first, msg->getValue().second.second.second);
+		}
+		break;
+	case CM_guildAddSponsorMember:
+		{
+			MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::pair<std::string, int> > > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::pair<std::string, int> > > > const *>(data);
+			owner->addGuildSponsorMember(msg->getValue().first.first, msg->getValue().first.second, msg->getValue().second.first, msg->getValue().second.second.first, msg->getValue().second.second.second);
+		}
+		break;
+	case CM_guildSetMemberPermission:
+		{
+			MessageQueueGenericValueType<std::pair<std::pair<int, int>, NetworkId> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::pair<int, int>, NetworkId> > const *>(data);
+			owner->setGuildMemberPermission(msg->getValue().first.first, msg->getValue().second, msg->getValue().first.second);
+		}
+		break;
+	case CM_guildSetMemberTitle:
+		{
+			MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > > const *>(data);
+			owner->setGuildMemberTitle(msg->getValue().second.second, msg->getValue().second.first, msg->getValue().first);
+		}
+		break;
+	case CM_guildSetMemberAllegiance:
+		{
+			MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, NetworkId> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, NetworkId> > const *>(data);
+			owner->setGuildMemberAllegiance(msg->getValue().first.first, msg->getValue().first.second, msg->getValue().second);
+		}
+		break;
+	case CM_guildSetMemberPermissionAndAllegiance:
+		{
+			MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<int, NetworkId> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<int, NetworkId> > > const *>(data);
+			owner->setGuildMemberPermissionAndAllegiance(msg->getValue().first.first, msg->getValue().first.second, msg->getValue().second.first, msg->getValue().second.second);
+		}
+		break;
+	case CM_guildSetMemberNameAndPermission:
+		{
+			MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > > const *>(data);
+			owner->setGuildMemberNameAndPermision(msg->getValue().first.first, msg->getValue().first.second, msg->getValue().second.first, msg->getValue().second.second);
+		}
+		break;
+	case CM_guildSetMemberProfessionInfo:
+		{
+			MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > > const *>(data);
+			owner->setGuildMemberProfessionInfo(msg->getValue().first.first, msg->getValue().first.second, msg->getValue().second.first, msg->getValue().second.second);
+		}
+		break;
+	case CM_guildAddMemberRank:
+		{
+			MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > > const *>(data);
+			owner->addGuildMemberRank(msg->getValue().second.second, msg->getValue().second.first, msg->getValue().first);
+		}
+		break;
+	case CM_guildRemoveMemberRank:
+		{
+			MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > > const *>(data);
+			owner->removeGuildMemberRank(msg->getValue().second.second, msg->getValue().second.first, msg->getValue().first);
+		}
+		break;
+	case CM_guildSetLeader:
+		{
+			MessageQueueGenericValueType<std::pair<int, NetworkId> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, NetworkId> > const *>(data);
+			owner->setGuildLeader(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_guildSetGuildElectionEndTime:
+		{
+			MessageQueueGenericValueType<std::pair<std::pair<int, int>, int> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::pair<int, int>, int> > const *>(data);
+			owner->setGuildElectionEndTime(msg->getValue().second, msg->getValue().first.first, msg->getValue().first.second);
+		}
+		break;
+	case CM_guildSetGuildFaction:
+		{
+			MessageQueueGenericValueType<std::pair<int, int> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, int> > const *>(data);
+			owner->setGuildFaction(msg->getValue().first, static_cast<uint32>(msg->getValue().second));
+		}
+		break;
+	case CM_guildSetGuildGcwDefenderRegion:
+		{
+			MessageQueueGenericValueType<std::pair<int, std::string> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, std::string> > const *>(data);
+			owner->setGuildGcwDefenderRegion(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_guildRemoveEnemy:
+		{
+			MessageQueueGenericValueType<std::pair<int, int> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, int> > const *>(data);
+			owner->removeGuildEnemy(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_guildSetEnemy:
+		{
+			MessageQueueGenericValueType<std::pair<int, int> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, int> > const *>(data);
+			owner->setGuildEnemy(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_guildUpdateGuildWarKillTrackingData:
+		{
+			MessageQueueGenericValueType<std::pair<std::pair<int, int>, std::pair<int, int> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::pair<int, int>, std::pair<int, int> > > const *>(data);
+			owner->modifyGuildWarKillTracking(msg->getValue().first.first, msg->getValue().first.second, msg->getValue().second.first, msg->getValue().second.second);
+		}
+		break;
+	case CM_guildSetName:
+		{
+			MessageQueueGenericValueType<std::pair<int, std::string> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, std::string> > const *>(data);
+			owner->setGuildName(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_guildSetAbbrev:
+		{
+			MessageQueueGenericValueType<std::pair<int, std::string> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, std::string> > const *>(data);
+			owner->setGuildAbbrev(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	default:
+		UniverseController::handleMessage(message, value, data, flags);
+		break;
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/controller/GuildController.h b/engine/server/library/serverGame/src/shared/controller/GuildController.h
new file mode 100644
index 00000000..b13dd82d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/GuildController.h
@@ -0,0 +1,40 @@
+// ======================================================================
+//
+// GuildController.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	INCLUDED_GuildController_H
+#define	INCLUDED_GuildController_H
+
+// ======================================================================
+
+#include "serverGame/UniverseController.h"
+
+// ======================================================================
+
+class GuildObject;
+
+// ======================================================================
+
+class GuildController: public UniverseController
+{
+public:
+	explicit GuildController(GuildObject *newOwner);
+	~GuildController();
+
+protected:
+	virtual void handleMessage(int message, float value, const MessageQueue::Data* data, uint32 flags);
+
+private:
+	GuildController();
+	GuildController(GuildController const &);
+	GuildController& operator=(GuildController const &);
+};
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/controller/HarvesterInstallationController.cpp b/engine/server/library/serverGame/src/shared/controller/HarvesterInstallationController.cpp
new file mode 100644
index 00000000..cc64eaaa
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/HarvesterInstallationController.cpp
@@ -0,0 +1,81 @@
+//========================================================================
+//
+// HarvesterInstallationController.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/HarvesterInstallationController.h"
+
+#include "serverGame/HarvesterInstallationObject.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "swgServerNetworkMessages/MessageQueueResourceAdd.h"
+#include "swgServerNetworkMessages/MessageQueueResourceSetInstalledEfficiency.h"
+
+//-----------------------------------------------------------------------
+
+HarvesterInstallationController::HarvesterInstallationController(HarvesterInstallationObject * newOwner) :
+	InstallationController(newOwner)
+{
+}
+
+//-----------------------------------------------------------------------
+
+HarvesterInstallationController::~HarvesterInstallationController()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void HarvesterInstallationController::handleMessage (const int message, const float value, const MessageQueue::Data* const data, const uint32 flags)
+{
+	HarvesterInstallationObject* owner = dynamic_cast<HarvesterInstallationObject *>(getOwner());
+	NOT_NULL(owner);
+
+	switch (message)
+	{
+		case CM_resourceSetInstalledEfficiency:
+		{
+			const MessageQueueResourceSetInstalledEfficiency *msg=
+				dynamic_cast<const MessageQueueResourceSetInstalledEfficiency *>(data);
+			NOT_NULL(msg);
+			DEBUG_REPORT_LOG(true,("Got MessageQueueResourceSetInstalledEfficiency with value %f\n",msg->getInstalledEfficiency()));
+
+			owner->finishActivate(msg->getInstalledEfficiency(), msg->getTickCount());
+		}
+		break;
+
+		case CM_addResource:
+		{
+			const MessageQueueGenericValueType<std::pair<NetworkId, int> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, int> > *>(data);
+			if(msg)
+			{
+				owner->addResource(msg->getValue().first, static_cast<float>(msg->getValue().second));
+			}
+		}
+		break;
+
+		case CM_resourceAdd:
+		{
+			if (owner->isAuthoritative())
+			{
+				const MessageQueueResourceAdd *msg=
+					dynamic_cast<const MessageQueueResourceAdd *>(data);
+				NOT_NULL(msg);
+				
+				owner->addResource(msg->getResourceId(),static_cast<float>(msg->getAmount()));
+			}
+		}
+		break;
+
+		default:
+			InstallationController::handleMessage(message, value, data, flags);
+			break;
+	}
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverGame/src/shared/controller/HarvesterInstallationController.h b/engine/server/library/serverGame/src/shared/controller/HarvesterInstallationController.h
new file mode 100644
index 00000000..7bdd32d3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/HarvesterInstallationController.h
@@ -0,0 +1,39 @@
+//========================================================================
+//
+// HarvesterInstallationController.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_HarvesterInstallationController_H
+#define	_INCLUDED_HarvesterInstallationController_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/InstallationController.h"
+
+//----------------------------------------------------------------------
+
+class HarvesterInstallationObject;
+
+//-----------------------------------------------------------------------
+
+class HarvesterInstallationController : public InstallationController
+{
+public:
+    explicit HarvesterInstallationController (HarvesterInstallationObject * newOwner);
+    virtual ~HarvesterInstallationController (void);
+
+protected:
+	virtual void handleMessage (int message, float value, const MessageQueue::Data* data, uint32 flags);
+	
+private:
+    HarvesterInstallationController				(void);
+    HarvesterInstallationController				(const HarvesterInstallationController & other);
+    HarvesterInstallationController&	operator=	(const HarvesterInstallationController & other);
+};
+
+//-----------------------------------------------------------------------
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/controller/InstallationController.cpp b/engine/server/library/serverGame/src/shared/controller/InstallationController.cpp
new file mode 100644
index 00000000..ce1ca2e3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/InstallationController.cpp
@@ -0,0 +1,78 @@
+//========================================================================
+//
+// InstallationController.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/InstallationController.h"
+
+#include "serverGame/InstallationObject.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "swgServerNetworkMessages/MessageQueueActivateInstallation.h"
+#include "swgServerNetworkMessages/MessageQueueDeactivateInstallation.h"
+#include "swgServerNetworkMessages/MessageQueueInstallationHarvest.h"
+
+//-----------------------------------------------------------------------
+
+InstallationController::InstallationController(InstallationObject * newOwner) :
+	TangibleController(newOwner)
+{
+}
+
+//-----------------------------------------------------------------------
+
+InstallationController::~InstallationController()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void InstallationController::handleMessage (const int message, const float value, const MessageQueue::Data* const data, const uint32 flags)
+{
+	InstallationObject* owner = dynamic_cast<InstallationObject *>(getOwner());
+	NOT_NULL(owner);
+
+	switch (message)
+	{
+		case CM_activateInstallation:
+		{
+			const MessageQueueActivateInstallation *msg=
+				dynamic_cast<const MessageQueueActivateInstallation *>(data);
+			NOT_NULL(msg);
+			DEBUG_REPORT_LOG(true,("Got MessageQueueActivateInstallation\n"));
+
+			owner->activate(NetworkId::cms_invalid);
+		}
+		break;
+		
+		case CM_installationHarvest:
+		{
+			const MessageQueueInstallationHarvest *msg=
+				dynamic_cast<const MessageQueueInstallationHarvest *>(data);
+			NOT_NULL(msg);
+			
+			owner->harvest();
+		}
+		break;
+
+		case CM_deactivateInstallation:
+		{
+			const MessageQueueDeactivateInstallation *msg=
+				dynamic_cast<const MessageQueueDeactivateInstallation *>(data);
+			NOT_NULL(msg);
+
+			owner->deactivate();
+		}
+		break;
+		
+		default:
+			TangibleController::handleMessage(message, value, data, flags);
+			break;
+	}
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/controller/InstallationController.h b/engine/server/library/serverGame/src/shared/controller/InstallationController.h
new file mode 100644
index 00000000..06d64926
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/InstallationController.h
@@ -0,0 +1,39 @@
+//========================================================================
+//
+// InstallationController.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_InstallationController_H
+#define	_INCLUDED_InstallationController_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/TangibleController.h"
+
+//----------------------------------------------------------------------
+
+class InstallationObject;
+
+//-----------------------------------------------------------------------
+
+class InstallationController : public TangibleController
+{
+public:
+    explicit InstallationController     (InstallationObject * newOwner);
+    virtual ~InstallationController     (void);
+
+protected:
+	virtual void handleMessage (int message, float value, const MessageQueue::Data* data, uint32 flags);
+	
+private:
+    InstallationController				(void);
+    InstallationController				(const InstallationController & other);
+    InstallationController&	operator=	(const InstallationController & other);
+};
+
+//-----------------------------------------------------------------------
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/controller/ManufactureInstallationController.cpp b/engine/server/library/serverGame/src/shared/controller/ManufactureInstallationController.cpp
new file mode 100644
index 00000000..0062be0e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/ManufactureInstallationController.cpp
@@ -0,0 +1,62 @@
+// ManufactureInstallationController.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ManufactureInstallationController.h"
+#include "serverGame/ManufactureInstallationObject.h"
+#include "serverGame/ManufactureSchematicObject.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedObject/NetworkIdManager.h"
+
+//-----------------------------------------------------------------------
+
+ManufactureInstallationController::ManufactureInstallationController(ManufactureInstallationObject * owner) :
+InstallationController(owner)
+{
+}
+
+//-----------------------------------------------------------------------
+
+ManufactureInstallationController::~ManufactureInstallationController()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void ManufactureInstallationController::handleMessage(int message, float value, const MessageQueue::Data * data, uint32 flags)
+{
+	ManufactureInstallationObject * owner = safe_cast<ManufactureInstallationObject *>(getOwner());
+	NOT_NULL(owner);
+
+	switch(message)
+	{
+	case CM_addSchematic:
+		{
+			const MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> > *>(data);
+			if(msg)
+			{
+				ManufactureSchematicObject * schematic = safe_cast<ManufactureSchematicObject *>(NetworkIdManager::getObjectById(msg->getValue().first));
+				if(schematic)
+				{
+					ServerObject * transferer = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(msg->getValue().second));
+					owner->addSchematic(*schematic, transferer);
+				}
+			}
+		}
+		break;
+	case CM_manufactureInstallationCreateObject:
+		{
+			owner->createObject();
+		}
+		break;
+	default:
+		InstallationController::handleMessage(message, value, data, flags);
+		break;
+	}
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverGame/src/shared/controller/ManufactureInstallationController.h b/engine/server/library/serverGame/src/shared/controller/ManufactureInstallationController.h
new file mode 100644
index 00000000..63dda534
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/ManufactureInstallationController.h
@@ -0,0 +1,33 @@
+// ManufactureInstallationController.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ManufactureInstallationController_H
+#define	_INCLUDED_ManufactureInstallationController_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/InstallationController.h"
+
+class ManufactureInstallationObject;
+
+//-----------------------------------------------------------------------
+
+class ManufactureInstallationController : public InstallationController
+{
+public:
+	explicit ManufactureInstallationController(ManufactureInstallationObject * owner);
+	~ManufactureInstallationController();
+
+protected:
+	virtual void handleMessage (int message, float value, const MessageQueue::Data* data, uint32 flags);
+
+private:
+	ManufactureInstallationController & operator = (const ManufactureInstallationController & rhs);
+	ManufactureInstallationController(const ManufactureInstallationController & source);
+
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ManufactureInstallationController_H
diff --git a/engine/server/library/serverGame/src/shared/controller/MissionTerminalController.cpp b/engine/server/library/serverGame/src/shared/controller/MissionTerminalController.cpp
new file mode 100644
index 00000000..d3a128f2
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/MissionTerminalController.cpp
@@ -0,0 +1,24 @@
+// MissionTerminalController.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/MissionTerminalController.h"
+
+//-----------------------------------------------------------------------
+
+MissionTerminalController::MissionTerminalController(TangibleObject * o) :
+TangibleController(o)
+{
+}
+
+//-----------------------------------------------------------------------
+
+MissionTerminalController::~MissionTerminalController()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverGame/src/shared/controller/MissionTerminalController.h b/engine/server/library/serverGame/src/shared/controller/MissionTerminalController.h
new file mode 100644
index 00000000..395ea0cc
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/MissionTerminalController.h
@@ -0,0 +1,28 @@
+// MissionTerminalController.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_MissionTerminalController_H
+#define	_INCLUDED_MissionTerminalController_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/TangibleController.h"
+
+//-----------------------------------------------------------------------
+
+class MissionTerminalController : public TangibleController
+{
+public:
+	MissionTerminalController(TangibleObject * owner);
+	~MissionTerminalController();
+
+private:
+	MissionTerminalController & operator = (const MissionTerminalController & rhs);
+	MissionTerminalController(const MissionTerminalController & source);
+
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_MissionTerminalController_H
diff --git a/engine/server/library/serverGame/src/shared/controller/MoveSimController.cpp b/engine/server/library/serverGame/src/shared/controller/MoveSimController.cpp
new file mode 100644
index 00000000..ab0d0330
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/MoveSimController.cpp
@@ -0,0 +1,139 @@
+//======================================================================
+//
+// MoveSimController.cpp
+// copyright (c) 2003 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/MoveSimController.h"
+
+#include "serverGame/CreatureObject.h"
+#include "sharedObject/AlterResult.h"
+#include "sharedTerrain/TerrainObject.h"
+
+//-----------------------------------------------------------------------
+
+/**
+*
+* @param centerPoint the point to wander around
+* @param roamRadius the radius around the point to wander around, limited by the edges of the map
+*/
+
+MoveSimController::MoveSimController (CreatureObject * newOwner, const Vector & centerPoint, float roamRadius) : 
+CreatureController (newOwner),
+m_centerPoint (centerPoint),
+m_roamRadius  (roamRadius),
+m_lastPoint   (),
+m_lastUnstuckTimer (0.0f)
+{
+	m_lastPoint = newOwner->getPosition_w ();
+}
+
+//-----------------------------------------------------------------------
+
+/**
+*
+* Reverse the object's direction and bias it toward the center 
+*/
+
+void MoveSimController::reverse (float towardsCenterFactor)
+{
+	const CreatureObject * const creature = safe_cast<CreatureObject *>(getOwner ());
+	
+	NOT_NULL (creature);
+
+	const Vector & pos_w = getOwner ()->getPosition_w ();	
+	Vector heading = getOwner ()->getObjectFrameK_w ();
+	
+	Vector vectorToCenter = m_centerPoint - pos_w;
+	vectorToCenter.normalize ();
+	heading = - heading;
+	heading += vectorToCenter * towardsCenterFactor;
+	heading.normalize ();
+	const float theta = heading.theta ();
+
+	getOwner ()->resetRotate_o2p ();
+	getOwner ()->yaw_o (theta);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+*
+* Keep the object moving my moving its goal ahead of it.
+* If we are outside the desired area, reverse
+*/
+
+float MoveSimController::realAlter(float time)
+{
+	const float retval = CreatureController::realAlter (time);
+
+	const CreatureObject * const creature = safe_cast<CreatureObject *>(getOwner ());
+
+	if (!creature || !creature->isAuthoritative ())
+		return retval;
+
+	const float runspeed = creature->getRunSpeed ();
+	const float frameDistance = runspeed * time;
+	
+	const Vector & pos_w = getOwner ()->getPosition_w ();
+	const float magSquaredCenter = pos_w.magnitudeBetweenSquared (m_centerPoint);
+	
+	Vector heading = getOwner ()->getObjectFrameK_w ();
+	
+	float halfMapWidth = 32.0f;
+		
+	TerrainObject * const terrainObject = TerrainObject::getInstance ();	
+	if (terrainObject)
+	{
+		//- subtract a 512 meter invalid band around the edge of the map
+		halfMapWidth = (terrainObject->getMapWidthInMeters () * 0.5f) - 512.0f;
+	}
+	
+	Vector vectorToCenter = m_centerPoint - pos_w;	
+	vectorToCenter.normalize ();
+	const float heading_dot = vectorToCenter.dot (heading);
+	
+	//-- if we've moved less than 1% of our frame distance last frame, then consider ourselves
+	//-- stuck, so turn around
+	const float stuckThresholdSquared = sqr (frameDistance * 0.01f);	
+	if (m_lastUnstuckTimer < 0.0f && m_lastPoint.magnitudeBetweenSquared (pos_w) < stuckThresholdSquared)
+	{
+		reverse (2.0f);
+		//-- don't try to unstick for another 2 seconds
+		m_lastUnstuckTimer = 2.0f;
+	}
+	
+	//-- if we're out of range and moving away from the center, turn around
+	else if (
+		magSquaredCenter > sqr (m_roamRadius) ||
+		pos_w.x < -halfMapWidth ||
+		pos_w.x > halfMapWidth ||
+		pos_w.z < -halfMapWidth ||
+		pos_w.z > halfMapWidth)
+	{		
+		if (heading_dot < 0.0f)
+			reverse (2.0f);
+		else if (heading_dot < 0.5)
+		{
+			const float theta = vectorToCenter.theta ();
+
+			getOwner ()->resetRotate_o2p ();
+			getOwner ()->yaw_o (theta);
+		}
+	}
+	
+	m_lastPoint = pos_w;
+	
+	Transform t = getOwner ()->getTransform_o2w ();
+	//-multiply frame distance by 110% fudge factor
+	t.move_l (Vector::unitZ * frameDistance * 1.1f);
+	setGoal (t, 0);
+	
+	m_lastUnstuckTimer -= time;
+
+	return AlterResult::cms_alterNextFrame;
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/controller/MoveSimController.h b/engine/server/library/serverGame/src/shared/controller/MoveSimController.h
new file mode 100644
index 00000000..2d1572ff
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/MoveSimController.h
@@ -0,0 +1,39 @@
+//========================================================================
+//
+// MoveSimController.h
+//
+// copyright 2003 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	INCLUDED_MoveSimController_H
+#define	INCLUDED_MoveSimController_H
+
+#include "serverGame/CreatureController.h"
+
+class Vector;
+
+//-----------------------------------------------------------------------
+
+class MoveSimController : public CreatureController
+{
+public:
+
+	MoveSimController (CreatureObject * newOwner, const Vector & centerPoint, float roamRadius);
+	virtual float realAlter(real time);
+
+private:
+
+	MoveSimController (const MoveSimController& rhs);
+	MoveSimController & operator= (const MoveSimController & rhs);
+
+	void               reverse (float towardsCenterFactor);
+
+	Vector m_centerPoint;
+	float  m_roamRadius;
+	Vector m_lastPoint;
+	float  m_lastUnstuckTimer;
+};
+
+//-----------------------------------------------------------------------
+#endif
diff --git a/engine/server/library/serverGame/src/shared/controller/PlanetController.cpp b/engine/server/library/serverGame/src/shared/controller/PlanetController.cpp
new file mode 100644
index 00000000..97a826ba
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/PlanetController.cpp
@@ -0,0 +1,307 @@
+//========================================================================
+//
+// PlanetController.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PlanetController.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/GameServer.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedNetworkMessages/ObjectChannelMessages.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedObject/AlterResult.h"
+#include "sharedObject/Object.h"
+#include "swgServerNetworkMessages/MessageQueuePlanetAddTravelPoint.h"
+
+//-----------------------------------------------------------------------
+
+PlanetController::PlanetController(PlanetObject * newOwner) :
+		UniverseController(newOwner)
+{
+}
+
+//-----------------------------------------------------------------------
+
+PlanetController::~PlanetController()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void PlanetController::handleMessage (const int message, const float value, const MessageQueue::Data* const data, const uint32 flags)
+{
+	PlanetObject* const owner = dynamic_cast<PlanetObject *>(getOwner());
+	NOT_NULL(owner);
+
+    switch(message)
+    {
+		case CM_planetAddTravelPoint:
+			{
+				const MessageQueuePlanetAddTravelPoint* const message = safe_cast<const MessageQueuePlanetAddTravelPoint*> (data);
+				if (message)
+					owner->addTravelPoint (message->getTravelPointName (), message->getPosition_w (), message->getCost (), message->getInterplanetary (), static_cast<TravelPoint::TravelPointType>(message->getType()));
+			}
+			break;
+
+		case CM_planetRemoveTravelPoint:
+			{
+				const MessageQueueGenericValueType<std::string>* const message = safe_cast<const MessageQueueGenericValueType<std::string>*> (data);
+				if (message)
+					owner->removeTravelPoint (message->getValue ());
+			}
+			break;
+
+		case CM_setWeather:
+			{
+				const MessageQueueGenericValueType<std::pair<int, Vector> >* const message = safe_cast<const MessageQueueGenericValueType<std::pair<int, Vector> >*> (data);
+				if (message != NULL)
+				{
+					owner->setWeather(
+						message->getValue().first, 
+						message->getValue().second.x, 
+						message->getValue().second.y, 
+						message->getValue().second.z);
+				}
+			}
+			break;
+
+		case CM_serverRemovePlanetMapLocation:
+			{
+				const MessageQueueGenericValueType<NetworkId> * const message = safe_cast<const MessageQueueGenericValueType<NetworkId> *> (data);
+				if (message)
+					owner->removeMapLocation (message->getValue ());
+			}
+			break;
+
+		case CM_serverAddPlanetMapLocation:
+			{
+				const MessageQueueGenericValueType<std::pair<MapLocation, std::pair<int, int> > > * const message = safe_cast<const MessageQueueGenericValueType<std::pair<MapLocation, std::pair<int, int> > > *> (data);
+				if (message)
+					owner->addMapLocation (message->getValue ().first, message->getValue ().second.first, (message->getValue ().second.second ? true : false));
+			}
+			break;
+
+		case CM_collectionRequestServerFirst:
+			{
+				const MessageQueueGenericValueType<std::pair<std::pair<std::string, NetworkId>, std::pair<Unicode::String, std::string> > > * const message = safe_cast<const MessageQueueGenericValueType<std::pair<std::pair<std::string, NetworkId>, std::pair<Unicode::String, std::string> > > *> (data);
+				if (message)
+				{
+					CollectionsDataTable::CollectionInfoCollection const * const collectionInfo = CollectionsDataTable::getCollectionByName (message->getValue ().first.first);
+					if (collectionInfo)
+						owner->setCollectionServerFirst (*collectionInfo, message->getValue ().first.second, message->getValue ().second.first, message->getValue ().second.second);
+				}
+			}
+			break;
+
+		case CM_collectionRevokeServerFirst:
+			{
+				const MessageQueueGenericValueType<std::string> * const message = safe_cast<const MessageQueueGenericValueType<std::string> *> (data);
+				if (message)
+				{
+					CollectionsDataTable::CollectionInfoCollection const * const collectionInfo = CollectionsDataTable::getCollectionByName (message->getValue ());
+					if (collectionInfo)
+						owner->removeCollectionServerFirst (*collectionInfo);
+				}
+			}
+			break;
+
+		case CM_setConnectedCharacterLfgData:
+			{
+				const MessageQueueGenericValueType<std::pair<NetworkId, LfgCharacterData> > * const message = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, LfgCharacterData> > *> (data);
+				if (message)
+				{
+					owner->setConnectedCharacterLfgData(message->getValue().first, message->getValue().second);
+				}
+			}
+			break;
+
+		case CM_removeConnectedCharacterData:
+			{
+				const MessageQueueGenericValueType<NetworkId> * const message = safe_cast<const MessageQueueGenericValueType<NetworkId> *> (data);
+				if (message)
+				{
+					owner->removeConnectedCharacterData(message->getValue());
+				}
+			}
+			break;
+
+		case CM_setConnectedCharacterGroupData:
+			{
+				const MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> > * const message = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> > *> (data);
+				if (message)
+				{
+					owner->setConnectedCharacterGroupData(message->getValue().first, message->getValue().second);
+				}
+			}
+			break;
+
+		case CM_setConnectedCharacterPlanetData:
+			{
+				const MessageQueueGenericValueType<std::pair<std::string, NetworkId> > * const message = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, NetworkId> > *> (data);
+				if (message)
+				{
+					owner->setConnectedCharacterPlanetData(message->getValue().second, message->getValue().first);
+				}
+			}
+			break;
+
+		case CM_setConnectedCharacterRegionData:
+			{
+				const MessageQueueGenericValueType<std::pair<std::string, NetworkId> > * const message = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, NetworkId> > *> (data);
+				if (message)
+				{
+					owner->setConnectedCharacterRegionData(message->getValue().second, message->getValue().first);
+				}
+			}
+			break;
+
+		case CM_setConnectedCharacterPlayerCityData:
+			{
+				const MessageQueueGenericValueType<std::pair<std::string, NetworkId> > * const message = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, NetworkId> > *> (data);
+				if (message)
+				{
+					owner->setConnectedCharacterPlayerCityData(message->getValue().second, message->getValue().first);
+				}
+			}
+			break;
+
+		case CM_setConnectedCharacterBiographyData:
+			{
+				const MessageQueueGenericValueType<std::pair<Unicode::String, NetworkId> > * const message = safe_cast<const MessageQueueGenericValueType<std::pair<Unicode::String, NetworkId> > *> (data);
+				if (message)
+				{
+					owner->setConnectedCharacterBiographyData(message->getValue().second, message->getValue().first);
+				}
+			}
+			break;
+
+		case CM_removeConnectedCharacterBiographyData:
+			{
+				const MessageQueueGenericValueType<NetworkId> * const message = safe_cast<const MessageQueueGenericValueType<NetworkId> *> (data);
+				if (message)
+				{
+					owner->removeConnectedCharacterBiographyData(message->getValue());
+				}
+			}
+			break;
+
+		case CM_setConnectedCharacterLevelData:
+			{
+				const MessageQueueGenericValueType<std::pair<NetworkId, int> > * const message = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, int> > *> (data);
+				if (message)
+				{
+					owner->setConnectedCharacterLevelData(message->getValue().first, static_cast<int16>(message->getValue().second));
+				}
+			}
+			break;
+
+		case CM_setConnectedCharacterProfessionData:
+			{
+				const MessageQueueGenericValueType<std::pair<NetworkId, int> > * const message = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, int> > *> (data);
+				if (message)
+				{
+					owner->setConnectedCharacterProfessionData(message->getValue().first, static_cast<LfgCharacterData::Profession>(message->getValue().second));
+				}
+			}
+			break;
+
+		case CM_setConnectedCharacterSearchableByCtsSourceGalaxyData:
+			{
+				const MessageQueueGenericValueType<std::pair<NetworkId, int> > * const message = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, int> > *> (data);
+				if (message)
+				{
+					owner->setConnectedCharacterSearchableByCtsSourceGalaxyData(message->getValue().first, (message->getValue().second == 0) ? false : true);
+				}
+			}
+			break;
+
+		case CM_setConnectedCharacterDisplayLocationInSearchResultsData:
+			{
+				const MessageQueueGenericValueType<std::pair<NetworkId, int> > * const message = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, int> > *> (data);
+				if (message)
+				{
+					owner->setConnectedCharacterDisplayLocationInSearchResultsData(message->getValue().first, (message->getValue().second == 0) ? false : true);
+				}
+			}
+			break;
+
+		case CM_setConnectedCharacterAnonymousData:
+			{
+				const MessageQueueGenericValueType<std::pair<NetworkId, int> > * const message = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, int> > *> (data);
+				if (message)
+				{
+					owner->setConnectedCharacterAnonymousData(message->getValue().first, (message->getValue().second == 0) ? false : true);
+				}
+			}
+			break;
+
+		case CM_setConnectedCharacterInterestsData:
+			{
+				const MessageQueueGenericValueType<std::pair<NetworkId, BitArray> > * const message = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, BitArray> > *> (data);
+				if (message)
+				{
+					owner->setConnectedCharacterInterestsData(message->getValue().first, message->getValue().second);
+				}
+			}
+			break;
+
+		case CM_addUniverseEvent:
+			{
+				const MessageQueueGenericValueType<std::string> * const message = safe_cast<const MessageQueueGenericValueType<std::string> *> (data);
+				if (message)
+				{
+					owner->addUniverseEvent(message->getValue());
+				}
+			}
+			break;
+
+		case CM_removeUniverseEvent:
+			{
+				const MessageQueueGenericValueType<std::string> * const message = safe_cast<const MessageQueueGenericValueType<std::string> *> (data);
+				if (message)
+				{
+					owner->removeUniverseEvent(message->getValue());
+				}
+			}
+			break;
+
+		case CM_adjustGcwImperialScore:
+			{
+				const MessageQueueGenericValueType<std::map<std::string, int64> > * const message = safe_cast<const MessageQueueGenericValueType<std::map<std::string, int64> > *> (data);
+				if (message)
+				{
+					const std::map<std::string, int64> & data = message->getValue();
+
+					for (std::map<std::string, int64>::const_iterator iter = data.begin(); iter != data.end(); ++iter)
+						owner->adjustGcwImperialScore("CM_adjustGcwImperialScore", NULL, iter->first, iter->second);
+				}
+			}
+			break;
+
+		case CM_adjustGcwRebelScore:
+			{
+				const MessageQueueGenericValueType<std::map<std::string, int64> > * const message = safe_cast<const MessageQueueGenericValueType<std::map<std::string, int64> > *> (data);
+				if (message)
+				{
+					const std::map<std::string, int64> & data = message->getValue();
+
+					for (std::map<std::string, int64>::const_iterator iter = data.begin(); iter != data.end(); ++iter)
+						owner->adjustGcwRebelScore("CM_adjustGcwRebelScore", NULL, iter->first, iter->second);
+				}
+			}
+			break;
+
+		default:
+			UniverseController::handleMessage(message, value, data, flags);
+            break;
+    }
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/controller/PlanetController.h b/engine/server/library/serverGame/src/shared/controller/PlanetController.h
new file mode 100644
index 00000000..a2eace63
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/PlanetController.h
@@ -0,0 +1,37 @@
+//========================================================================
+//
+// PlanetController.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	INCLUDED_PlanetController_H
+#define	INCLUDED_PlanetController_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "serverGame/PlanetObject.h" 
+#include "serverGame/UniverseController.h"
+
+//-----------------------------------------------------------------------
+
+class PlanetController : public UniverseController
+{
+public:
+	explicit		PlanetController	(PlanetObject * newOwner);
+					~PlanetController	();
+
+protected:
+	virtual void  handleMessage  (int message, float value, const MessageQueue::Data* data, uint32 flags);
+
+private:
+	PlanetController					(void);
+	PlanetController					(const PlanetController & other);
+	PlanetController&	operator=		(const PlanetController & other);
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// INCLUDED_PlanetController_H
diff --git a/engine/server/library/serverGame/src/shared/controller/PlayerCreatureController.cpp b/engine/server/library/serverGame/src/shared/controller/PlayerCreatureController.cpp
new file mode 100644
index 00000000..26ab51a9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/PlayerCreatureController.cpp
@@ -0,0 +1,2439 @@
+// ======================================================================
+//
+// PlayerCreatureController.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PlayerCreatureController.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/BuildingObject.h"
+#include "serverGame/CellObject.h"
+#include "serverGame/Chat.h"
+#include "serverGame/Client.h"
+#include "serverGame/CommandQueue.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/MissionObject.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ServerBuffBuilderManager.h"
+#include "serverGame/ServerImageDesignerManager.h"
+#include "serverGame/ServerSecureTrade.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipObject.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptDictionary.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedGame/CustomizationManager.h"
+#include "sharedGame/GameObjectTypes.h"
+#include "sharedGame/RadialMenuManager.h"
+#include "sharedGame/SharedBuffBuilderManager.h"
+#include "sharedGame/SharedImageDesignerManager.h"
+#include "sharedGame/SharedStringIds.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/AIDebuggingMessages.h"
+#include "sharedNetworkMessages/BuffBuilderChangeMessage.h"
+#include "sharedNetworkMessages/DroidCommandProgrammingMessage.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/ImageDesignChangeMessage.h"
+#include "sharedNetworkMessages/MessageQueueChangeRoleIconChoice.h"
+#include "sharedNetworkMessages/MessageQueueCraftCustomization.h"
+#include "sharedNetworkMessages/MessageQueueCraftEmptySlot.h"
+#include "sharedNetworkMessages/MessageQueueCraftFillSlot.h"
+#include "sharedNetworkMessages/MessageQueueCraftRequestSession.h"
+#include "sharedNetworkMessages/MessageQueueCraftSelectSchematic.h"
+#include "sharedNetworkMessages/MessageQueueCreateSaga.h"
+#include "sharedNetworkMessages/MessageQueueCyberneticsChangeRequest.h"
+#include "sharedNetworkMessages/MessageQueueDataTransform.h"
+#include "sharedNetworkMessages/MessageQueueDataTransformWithParent.h"
+#include "sharedNetworkMessages/MessageQueueGeneric.h"
+#include "sharedNetworkMessages/MessageQueueGenericIntResponse.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedNetworkMessages/MessageQueueMissionCreateRequest.h"
+#include "sharedNetworkMessages/MessageQueueMissionCreateRequestData.h"
+#include "sharedNetworkMessages/MessageQueueMissionDetailsRequest.h"
+#include "sharedNetworkMessages/MessageQueueMissionDetailsResponse.h"
+#include "sharedNetworkMessages/MessageQueueMissionGenericRequest.h"
+#include "sharedNetworkMessages/MessageQueueMissionGenericResponse.h"
+#include "sharedNetworkMessages/MessageQueueMissionListRequest.h"
+#include "sharedNetworkMessages/MessageQueueNetworkId.h"
+#include "sharedNetworkMessages/MessageQueueObjectMenuRequest.h"
+#include "sharedNetworkMessages/MessageQueueSelectCurrentWorkingSkill.h"
+#include "sharedNetworkMessages/MessageQueueSelectProfessionTemplate.h"
+#include "sharedNetworkMessages/MessageQueueSpaceMiningSellResource.h"
+#include "sharedNetworkMessages/MessageQueueTeleportAck.h"
+#include "sharedNetworkMessages/ObjectChannelMessages.h"
+#include "sharedNetworkMessages/ServerTimeMessage.h"
+#include "sharedNetworkMessages/ServerWeatherMessage.h"
+#include "sharedObject/AlterResult.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/ContainedByProperty.h"
+#include "sharedObject/CustomizationData.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/Portal.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/VolumeContainer.h"
+#include "sharedTerrain/TerrainObject.h"
+#include "sharedUtility/ValueTypeBool.h"
+#include "sharedUtility/ValueDictionary.h"
+#include "sharedUtility/ValueTypeSignedInt.h"
+#include "sharedUtility/ValueTypeObjId.h"
+#include "sharedUtility/ValueTypeString.h"
+
+#include <limits>
+
+// ======================================================================
+
+namespace PlayerCreatureControllerNamespace
+{
+	std::string const minigameResultTargetName("table");
+	std::string const minigameResultDictionaryName("result");
+
+	int syncStampLongDeltaTime(uint32 stamp1, uint32 stamp2)
+	{
+		uint32 const delta = stamp1 - stamp2;
+		if (delta > 0x7fffffff)
+			return static_cast<int>(0xffffffff-delta);
+		return static_cast<int>(delta);
+	}
+
+// ----------------------------------------------------------------------
+
+	CellObject *getCellObject(NetworkId const &id)
+	{
+		if (id != NetworkId::cms_invalid)
+		{
+			Object * const o = NetworkIdManager::getObjectById(id);
+			if (o)
+			{
+				ServerObject * const so = o->asServerObject();
+				if (so)
+					return so->asCellObject();
+			}
+		}
+		return 0;
+	}
+
+// ----------------------------------------------------------------------
+
+	CellProperty const *getCellProperty(NetworkId const &id)
+	{
+		if (id == NetworkId::cms_invalid)
+			return CellProperty::getWorldCellProperty();
+		Object * const cellObj = NetworkIdManager::getObjectById(id);
+		if (!cellObj)
+			return 0;
+		return cellObj->getCellProperty();
+	}
+
+	bool isMissionTerminal(const ServerObject& obj)
+	{
+		if (GameObjectTypes::isTypeOf (obj.getGameObjectType(), SharedObjectTemplate::GOT_terminal_mission) ||
+			(obj.getScriptObject() && obj.getScriptObject()->hasScript("systems.missions.base.mission_terminal")))
+		{
+			return true;
+		}
+		return false;
+	}
+
+	bool isCreaturePassenger(CreatureObject const & creature)
+	{
+		if(!creature.getState(States::RidingMount))
+		{
+			return false;
+		}
+
+		CreatureObject const * const mount = creature.getMountedCreature();
+
+		if(!mount)
+		{
+			LOG("mounts-bug", ("PlayerCreatureControllerNamespace::isCreaturePassenger(): server id=[%d],object id=[%s] creature has state RidingMount but getMountedCreature() returns NULL.", static_cast<int>(GameServer::getInstance().getProcessId()), creature.getNetworkId().getValueString().c_str()));
+			return false;
+		}
+
+		CreatureObject const * const primaryRider = mount->getPrimaryMountingRider();
+
+		if(!primaryRider)
+		{
+			LOG("mounts-bug", ("PlayerCreatureControllerNamespace::isCreaturePassenger(): server id=[%d],object id=[%s] creature has state RidingMount but mount->getPrimaryMountingRider() returns NULL.", static_cast<int>(GameServer::getInstance().getProcessId()), creature.getNetworkId().getValueString().c_str()));
+			return false;
+		}
+
+		return (primaryRider != &creature);
+	}
+}
+// ======================================================================
+
+using namespace PlayerCreatureControllerNamespace;
+
+// ======================================================================
+
+PlayerCreatureController::PlayerCreatureController(CreatureObject *newOwner) :
+	CreatureController(newOwner),
+	m_teleportIds(),
+	m_lastVerifiedMove(),
+	m_lastTimeSynchronization(0),
+	m_lastWeatherIndex(0),
+	m_lastWeatherWindVelocity_w (),
+	m_speedMaximum(0.f, ConfigServerGame::getMoveSpeedCheckFrequencyMs(), ConfigServerGame::getMoveSlowdownFudgeTimeMs()),
+	m_movingTimeout(2.0f),
+	m_lastMoveSyncStamp(0),
+	m_lastSpeed(0),
+	m_lastSpeedCheckFailureTime(0),
+	m_speedCheckConsecutiveFailureCount(0),
+	m_resendSpeedMax (false)
+{
+	preventMovementUpdates();
+}
+
+// ----------------------------------------------------------------------
+
+PlayerCreatureController::~PlayerCreatureController()
+{
+}
+
+// ----------------------------------------------------------------------
+
+PlayerObject *PlayerCreatureController::getPlayerObjectInternal(CreatureObject const * creature)
+{
+	static SlotId const playerSlot = SlotIdManager::findSlotId(ConstCharCrcLowerString("ghost"));
+
+	if (creature)
+	{
+		SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*creature);
+	
+		if (container)
+		{
+			Container::ContainerErrorCode tmp = Container::CEC_Success;
+			Object * const o = container->getObjectInSlot(playerSlot, tmp).getObject();
+			if (o)
+			{
+				ServerObject * const so = o->asServerObject();
+				if (so)
+					return so->asPlayerObject();
+			}
+		}
+	}
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+PlayerObject *PlayerCreatureController::getPlayerObject(CreatureObject * creature)
+{
+	return getPlayerObjectInternal(creature);
+}
+
+// ----------------------------------------------------------------------
+
+PlayerObject const * PlayerCreatureController::getPlayerObject(CreatureObject const * creature)
+{
+	return getPlayerObjectInternal(creature);
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerCreatureController::isGod() const
+{
+	//-- Get the creature owner.
+	CreatureObject const *const creature = NON_NULL(getCreature());
+
+	//-- Get the client for the owner.
+	Client const *const client = creature->getClient();
+	if (!client)
+		return false;
+
+	//-- Find out if this client is in god mode.
+	return client->isGod();
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerCreatureController::isTeleporting() const
+{
+	return !m_teleportIds.empty();
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerCreatureController::preventMovementUpdates()
+{
+	m_teleportIds.clear();
+	IGNORE_RETURN(m_teleportIds.insert(-1));
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerCreatureController::resyncMovementUpdates()
+{
+	ServerObject * const netObject = NON_NULL(getServerOwner());
+	Client * const client = netObject->getClient();
+	FATAL(!client || !netObject->isAuthoritative(), ("Tried to resync movement updates either while nonauth or without a client!"));
+	m_teleportIds.clear();
+	// Get a sequenceId, and negate it, signalling that we aren't actually updating a transform, just have movement locked out until
+	// we're resynced.  Also assure we don't use -1, as it is used for locking out updates while we're missing either authority or a client.
+	int sequenceId = -1;
+	while (sequenceId == -1)
+		sequenceId = -static_cast<int>(netObject->getAndIncrementMoveSequenceNumber());
+	IGNORE_RETURN(m_teleportIds.insert(sequenceId));
+	appendMessage(
+		CM_netUpdateTransform,
+		0.0f,
+		new MessageQueueDataTransform(0, sequenceId, Transform(), 0.f, 0.f, false),
+			GameControllerMessageFlags::RELIABLE |
+			GameControllerMessageFlags::SEND |
+			GameControllerMessageFlags::DEST_AUTH_CLIENT);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerCreatureController::teleport(Transform const &goal, ServerObject *goalObj)
+{
+	ServerObject * const netObject = NON_NULL(getServerOwner());
+	Client * const client = netObject->getClient();
+	if (client)
+	{
+		int sequenceId = netObject->getAndIncrementMoveSequenceNumber();
+		IGNORE_RETURN(m_teleportIds.insert(sequenceId));
+		if (goalObj)
+		{
+			appendMessage(
+				CM_netUpdateTransformWithParent,
+				0.0f,
+				new MessageQueueDataTransformWithParent(0, sequenceId, goalObj->getNetworkId(), goal, 0.f, 0.f, false),
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::DEST_AUTH_CLIENT);
+		}
+		else
+		{
+			appendMessage(
+				CM_netUpdateTransform,
+				0.0f,
+				new MessageQueueDataTransform(0, sequenceId, goal, 0.f, 0.f, false),
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::DEST_AUTH_CLIENT);
+		}
+	}
+	setGoal(goal, goalObj, true);
+	m_lastVerifiedMove.clear();
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerCreatureController::setAuthoritative(bool newAuthoritative)
+{
+	CreatureController::setAuthoritative(newAuthoritative);
+
+	if (!newAuthoritative)
+		preventMovementUpdates();
+
+	//-- Ensure movement validation doesn't keep around any leftover state
+	//   if this was previously a proxy, and before that was authoritative.
+	m_lastVerifiedMove.clear();
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerCreatureController::onClientReady()
+{
+	// This means we are both authoritative and have a client now.  We can start accepting client transforms.
+	resyncMovementUpdates();
+
+	// Control our ship if we have one
+	CreatureObject * const creature = NON_NULL(getCreature());
+	
+	ShipObject * const shipObject = creature->getPilotedShip();
+	if (shipObject)
+		NON_NULL(creature->getClient())->addControlledObject(*shipObject);
+
+	// Fix up link-dead status
+	PlayerObject * const player = getPlayerObject(creature);
+	if (player)
+		player->setLinkDead(false);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerCreatureController::onClientLost()
+{
+	// Note: this function can be called when the owner has been partially
+	// destructed, so we need to handle that case.
+
+	CreatureObject * const creature = NON_NULL(getServerOwner())->asCreatureObject();
+
+	if (creature && creature->isAuthoritative())
+	{
+		preventMovementUpdates();
+
+		// Fix up link-dead status
+		PlayerObject * const player = getPlayerObject(creature);
+		if (player)
+			player->setLinkDead(true);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerCreatureController::handleTeleportAck(MessageQueueTeleportAck const &msg)
+{
+	IGNORE_RETURN(m_teleportIds.erase(msg.getSequenceId()));
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerCreatureController::logMoveFailed(char const *reason)
+{
+	CreatureObject const * const creature = NON_NULL(getCreature());
+	PlayerObject const * const player = getPlayerObject(creature);
+
+	unsigned int const stationId = player ? static_cast<unsigned int>(player->getStationId()) : 0;
+
+	LOG(
+		"movement",
+		(
+			"move fail - object %s stationId %u - %s",
+			creature ? creature->getNetworkId().getValueString().c_str() : "<null>",
+			stationId,
+			reason));
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerCreatureController::isLocationValid(Vector const &position_w, CellObject const *cell) const
+{
+	// don't allow people too close to the origin
+	if (position_w.withinEpsilon(Vector::zero, 0.1f))
+		return false;
+
+	TerrainObject const *const terrainObject = TerrainObject::getConstInstance();
+	if (NULL != terrainObject && (NULL == cell || cell->getCellProperty()->isWorldCell()))
+	{
+		if (!terrainObject->isPassableForceChunkCreation(position_w))
+			return false;
+	}
+
+	if (ConfigServerGame::getMoveCheckDestinationCollision())
+	{
+		// Translate the player's local collision sphere to the world-space test 
+		// position and see if there's anything there. If so, the location isn't valid.
+
+		CollisionProperty const * const collision = getOwner()->getCollisionProperty();
+
+		if (!collision)
+			return false;
+
+		Sphere localSphere = collision->getBoundingSphere_l();
+
+		Sphere testSphere(position_w + localSphere.getCenter(), localSphere.getRadius());
+
+		if (CollisionWorld::query(testSphere, NULL)) 
+			return false;
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+/*
+ * checkValidMove returns whether the move was valid, but also calls
+ * handleInvalidMove in those cases where warping back to the last
+ * valid spot is the desired behavior.
+ */
+bool PlayerCreatureController::checkValidMove(MoveSnapshot const &m, float const reportedSpeed)
+{
+	uint32 const currentClientSyncStamp = m.getSyncStamp();
+	CreatureObject * const creature = NON_NULL(getCreature());
+
+	// update the velocity in the serverController
+	if (creature != NULL)
+	{
+		Vector moveDistance = m.getPosition_w() - creature->getPosition_w();
+		moveDistance.y = 0.0f;
+
+		int moveTimeDiffMs = syncStampLongDeltaTime(m_lastMoveSyncStamp, currentClientSyncStamp);
+
+		setCurrentVelocity(moveDistance / (moveTimeDiffMs / 1000.0f));
+		//DEBUG_REPORT_LOG(true, ("distance: %1.2f %1.2f time: %1.2f\n", moveDistance.x, moveDistance.y, moveTimeDiffMs / 1000.f));
+
+		m_lastMoveSyncStamp = currentClientSyncStamp;
+	}
+
+	// gods can move however they like
+	if (isGod())
+	{
+		// can't move into world cell in space
+		if (ServerWorld::isSpaceScene() && !m.getCell())
+			return false;
+
+		m_lastVerifiedMove = m;
+		return true;
+	}
+
+	// only check if checking is turned on	
+	if (!ConfigServerGame::getMoveValidationEnabled())
+		return true;
+
+	if (!m.isValid())
+		return handleInvalidMove("invalid destination");
+
+	if (creature == NULL)
+		return handleInvalidMove("creature is null");
+	
+	if (!m.isAllowed(*creature))
+		return handleInvalidMove("not allowed in dest cell");
+
+	// check to see whether it's possible to exist at the destination
+	if (!isLocationValid(m.getPosition_w(), m.getCell()))
+		return handleInvalidMove("tried to move to an illegal location");
+
+	// check to see whether it's possible to get from the current pob to the destination pob
+	{
+		Object const *sourcePob = ContainerInterface::getTopmostContainer(*creature);
+		PortalProperty const *sourcePortalProperty = sourcePob ? sourcePob->getPortalProperty() : 0;
+		CellObject const * const destCell = m.getCell();
+		PortalProperty const *destPortalProperty = destCell ? ContainerInterface::getContainedByObject(*destCell)->getPortalProperty() : 0;
+		if (sourcePortalProperty != destPortalProperty)
+		{
+			// Moving between pobs.  This is only valid if one of these is null, since pobs only connect to the world
+			if (sourcePortalProperty && destPortalProperty)
+				return handleInvalidMove("tried to move from one pob to another without passing through the world cell");
+			if (sourcePortalProperty && !sourcePortalProperty->hasPassablePortalToParentCell())
+				return handleInvalidMove("tried to move into the world cell from a pob with no exits");
+			if (destPortalProperty && !destPortalProperty->hasPassablePortalToParentCell())
+				return handleInvalidMove("tried to move from the world cell into a pob with no entrance");
+		}
+	}
+
+	Vector distanceToMoveSnapshot = m.getPosition_w() - creature->getPosition_w();
+	distanceToMoveSnapshot.y = 0.0f;
+
+	if (distanceToMoveSnapshot.magnitudeSquared () > sqr(ConfigServerGame::getMoveMaxDistance()) && !isCreaturePassenger(*creature))
+		return handleInvalidMove("tried to move too far");
+
+	// fail move validation if the inventory is overloaded
+	ServerObject *const inventoryObject = creature->getInventory();
+	if (inventoryObject)
+	{
+		VolumeContainer *const inventoryContainer = ContainerInterface::getVolumeContainer(*inventoryObject);
+		if ((inventoryContainer) && (inventoryContainer->getCurrentVolume() >= (inventoryContainer->getTotalVolume() + ConfigServerGame::getMoveValidationMaxInventoryOverload())))
+		{
+			Chat::sendSystemMessage(*creature, StringId("system_msg", "move_fail_inventory_overloaded"), Unicode::emptyString);
+
+			char buffer[128];
+			snprintf(buffer, sizeof(buffer)-1, "full inventory %d/%d", inventoryContainer->getCurrentVolume(), inventoryContainer->getTotalVolume());
+			buffer[sizeof(buffer)-1] = '\0';
+
+			return handleInvalidMove(buffer);
+		}		
+	}
+
+	Client * const client = creature->getClient();
+	if (!client)
+		return handleInvalidMove("Creature's client is NULL");
+	
+	uint32 const currentServerSyncStamp = client->getServerSyncStampLong();
+	
+	// tolerance to account for variations
+	float const maxSpeed = m_speedMaximum.getRecentMaximum(currentServerSyncStamp) * ConfigServerGame::getMoveSpeedTolerance();
+
+	if(creature->isDead() || creature->isIncapacitated())
+		return handleInvalidMove("Player is dead, or incapped");
+
+	bool doSpeedCheck = true;
+
+	if (!m_lastVerifiedMove.isValid())
+	{
+		// We don't have a valid last verified move, so assume our current
+		// location is valid, but don't do a speed check since we have no idea
+		// when this move occurred.  
+		m_lastVerifiedMove = MoveSnapshot(
+			creature->getPosition_p(),
+			safe_cast<CellObject *>(creature->getAttachedTo()),
+			currentServerSyncStamp);
+		doSpeedCheck = false;
+	}
+
+	if (doSpeedCheck)
+	{
+		uint32 const previousClientSyncStamp = m_lastVerifiedMove.getSyncStamp();
+		int timeDiffMs = syncStampLongDeltaTime(previousClientSyncStamp, currentClientSyncStamp);
+
+		bool const sitting = creature->getPosture() == Postures::Sitting;
+		// This sitting animation can actually move the character and we want to make
+		// sure that these small movements are actually verified and that
+		// m_lastVerifiedMove will actually be updated while these small
+		// movements occur.  Otherwise we'll eventually generate an invalid
+		// location when the client updates itself at the 300 second mark
+		// due to the location differences from the sit.
+		if (!sitting)
+		{
+			if (timeDiffMs < ConfigServerGame::getMoveSpeedCheckFrequencyMs())
+			{
+				// assume we're ok to move, but don't update the last verified
+				return true;
+			}
+		}
+
+		// check for bogus timestamps, making sure to handle timestamp rollover
+		if (ConfigServerGame::getMoveValidationCheckForPastTimestamp())
+		{
+			// new timestamp from client must be greater than previous timestamp from client (i.e. cannot travel back in time)
+			if (currentClientSyncStamp < previousClientSyncStamp)
+			{
+				uint32 const rolloverFudgeFactor = static_cast<uint32>(100000); // 100 seconds
+
+				// pretty sure that timestamp did not rollover
+				if ((previousClientSyncStamp > rolloverFudgeFactor) && ((std::numeric_limits<uint32>::max() - rolloverFudgeFactor) > previousClientSyncStamp))
+				{
+					int const timeDiffMs = syncStampLongDeltaTime(previousClientSyncStamp, currentClientSyncStamp);
+
+					// only fail movement if the difference is beyond a certain threshold,
+					// to account for network latency, UDP unreliability, clock drift, etc.
+					if (timeDiffMs > ConfigServerGame::getMoveValidationPastTimestampThresholdMs())
+					{
+						char buf[256];
+						snprintf(buf, sizeof(buf)-1, "out of order timestamps (%dms), oss=%lu, css=%lu (%lud:%luh:%lum:%lus), ssc=%lu",
+							timeDiffMs,
+							previousClientSyncStamp,
+							currentServerSyncStamp,
+							(currentServerSyncStamp / 1000) / (60 * 60 * 24),
+							((currentServerSyncStamp / 1000) % (60 * 60 * 24)) / (60 * 60),
+							((currentServerSyncStamp / 1000) % (60 * 60)) / 60,
+							(currentServerSyncStamp / 1000) % 60,
+							currentClientSyncStamp);
+						buf[sizeof(buf)-1] = '\0';
+
+						return handleInvalidMove(buf);
+					}
+				}
+			}
+		}
+
+		// check for bogus timestamps, making sure to handle timestamp rollover
+		if (ConfigServerGame::getMoveValidationCheckForFutureTimestamp())
+		{
+			// new timestamp from client must be less than the current server timestamp (i.e. cannot travel into the future)
+			if (currentClientSyncStamp > currentServerSyncStamp)
+			{
+				uint32 const rolloverFudgeFactor = static_cast<uint32>(100000); // 100 seconds
+
+				// pretty sure that timestamp did not rollover
+				if ((currentServerSyncStamp > rolloverFudgeFactor) && ((std::numeric_limits<uint32>::max() - rolloverFudgeFactor) > currentServerSyncStamp))
+				{
+					int const timeDiffMs = syncStampLongDeltaTime(currentClientSyncStamp, currentServerSyncStamp);
+
+					// only fail movement if the difference is beyond a certain threshold,
+					// to account for network latency, UDP unreliability, clock drift, etc.
+					if (timeDiffMs > ConfigServerGame::getMoveValidationFutureTimestampThresholdMs())
+					{
+						char buf[256];
+						snprintf(buf, sizeof(buf)-1, "timestamp from the future (%dms), oss=%lu, css=%lu (%lud:%luh:%lum:%lus), ssc=%lu",
+							timeDiffMs,
+							previousClientSyncStamp,
+							currentServerSyncStamp,
+							(currentServerSyncStamp / 1000) / (60 * 60 * 24),
+							((currentServerSyncStamp / 1000) % (60 * 60 * 24)) / (60 * 60),
+							((currentServerSyncStamp / 1000) % (60 * 60)) / 60,
+							(currentServerSyncStamp / 1000) % 60,
+							currentClientSyncStamp);
+						buf[sizeof(buf)-1] = '\0';
+
+						return handleInvalidMove(buf);
+					}
+				}
+			}
+		}
+
+		// make sure the client and server time hasn't drifted too far apart
+		if (ConfigServerGame::getMoveValidationCheckForTimestampDrift())
+		{
+			int const clientServerTimeDiff = syncStampLongDeltaTime(currentClientSyncStamp, currentServerSyncStamp);
+			if (clientServerTimeDiff > ConfigServerGame::getMoveValidationTimestampDriftThresholdMs())
+			{
+				char buf[256];
+				snprintf(buf, sizeof(buf)-1, "timestamp drift (%dms), oss=%lu, css=%lu (%lud:%luh:%lum:%lus), ssc=%lu",
+					clientServerTimeDiff,
+					previousClientSyncStamp,
+					currentServerSyncStamp,
+					(currentServerSyncStamp / 1000) / (60 * 60 * 24),
+					((currentServerSyncStamp / 1000) % (60 * 60 * 24)) / (60 * 60),
+					((currentServerSyncStamp / 1000) % (60 * 60)) / 60,
+					(currentServerSyncStamp / 1000) % 60,
+					currentClientSyncStamp);
+				buf[sizeof(buf)-1] = '\0';
+
+				return handleInvalidMove(buf);
+			}
+		}
+
+		// check if moving from last verified location to goal location exceeds max speed
+		// we should never be dealing with moves that are shorter than 1 ms
+		if (timeDiffMs < 1)
+			timeDiffMs = 1;
+		// We enforce a maximum check distance of twice the check interval, to disallow 'saving up' movement
+		// and warping all at once.  This still allows for a substantial amount of that, unfortunately.
+		if (timeDiffMs >= ConfigServerGame::getMoveSpeedCheckFrequencyMs() * 2)
+			timeDiffMs = ConfigServerGame::getMoveSpeedCheckFrequencyMs() * 2;
+
+		// add in some padding for the case that we're sitting.  This will allow
+		// a little more flexibility while playing the sitting animation which
+		// will update the character's position on the client.  Because the
+		// character is moving at such a low speed it becomes very easy to cause
+		// the conditions to generate an invalid move.
+		float const maxDistSqr = sitting ? sqr((maxSpeed*timeDiffMs/1000.0f) + 0.1f) : sqr(maxSpeed*timeDiffMs/1000.0f);
+
+		// use only xz for speed
+		Vector const oldV = m_lastVerifiedMove.getPosition_w();
+		Vector const newV = m.getPosition_w();
+		float distSqr = sqr(newV.x-oldV.x) + sqr(newV.z-oldV.z);
+
+		if (distSqr > maxDistSqr)
+		{
+			time_t const previousSpeedCheckFailureTime = m_lastSpeedCheckFailureTime;
+
+			// Our player has moved too far. Now we check if his move is just outrageous. If so, we are going to skip the leeway count and immediate correct him.
+			// The math is the exact code we used above - we're just using a different scalar for the time value.
+			float const maxSpeedPerUpdateLimit = m_speedMaximum.getRecentMaximum(currentServerSyncStamp) * ConfigServerGame::getMoveMaxDistanceLeewayPerUpdate();
+			float const maxDistSqrPerUpdate = sitting ? sqr((maxSpeedPerUpdateLimit*timeDiffMs/1000.0f) + 0.1f) : sqr(maxSpeedPerUpdateLimit*timeDiffMs/1000.0f);
+
+			if(distSqr > maxDistSqrPerUpdate)
+			{
+
+				Vector const serverLoc = creature->getPosition_w();
+				char buf[512];
+				snprintf(buf, sizeof(buf)-1, "too fast (dist=%g, maxDistLower=%g, maxDistUpper=%g, legalSpeed=%g, maxSpeedLower=%g, maxSpeedUpper=%g, reportedSpeed=%g, clientTimeDiff=%d, serverTimeDiff=%d, clientServerTimeDiff=%d, failureInterval=%lds, failureCount=%d, lastVerifiedLoc=(%g,%g,%g,%lu), reportedLoc=(%g,%g,%g,%lu), serverLoc=(%g,%g,%g,%lu))",
+					sqrt(distSqr),
+					sqrt(maxDistSqr),
+					sqrt(maxDistSqrPerUpdate),
+					m_speedMaximum.getRecentMaximum(currentServerSyncStamp),
+					maxSpeed,
+					maxSpeedPerUpdateLimit,
+					reportedSpeed,
+					timeDiffMs,
+					syncStampLongDeltaTime(previousClientSyncStamp, currentServerSyncStamp),
+					syncStampLongDeltaTime(currentClientSyncStamp, currentServerSyncStamp),
+					(m_lastSpeedCheckFailureTime - previousSpeedCheckFailureTime),
+					m_speedCheckConsecutiveFailureCount,
+					oldV.x, oldV.y, oldV.z, previousClientSyncStamp,
+					newV.x, newV.y, newV.z, currentClientSyncStamp,
+					serverLoc.x, serverLoc.y, serverLoc.z, currentServerSyncStamp);
+				buf[sizeof(buf)-1] = '\0';
+				return handleInvalidMove(buf);
+			}
+
+			
+			m_lastSpeedCheckFailureTime = ::time(NULL);
+			++m_speedCheckConsecutiveFailureCount;
+
+			// if this is the first validation failure "in a while", let it pass, because it may be a false positive
+			if ((previousSpeedCheckFailureTime + ConfigServerGame::getMoveSpeedCheckFailureLeewaySeconds()) >= m_lastSpeedCheckFailureTime)
+			{
+				if (m_speedCheckConsecutiveFailureCount >= ConfigServerGame::getMoveSpeedCheckFailureLeewayCount())
+				{
+
+					Vector const serverLoc = creature->getPosition_w();
+					char buf[512];
+					snprintf(buf, sizeof(buf)-1, "too fast (dist=%g, maxDistLower=%g, maxDistUpper=%g, legalSpeed=%g, maxSpeedLower=%g, maxSpeedUpper=%g, reportedSpeed=%g, clientTimeDiff=%d, serverTimeDiff=%d, clientServerTimeDiff=%d, failureInterval=%lds, failureCount=%d, lastVerifiedLoc=(%g,%g,%g,%lu), reportedLoc=(%g,%g,%g,%lu), serverLoc=(%g,%g,%g,%lu))",
+						sqrt(distSqr),
+						sqrt(maxDistSqr),
+						sqrt(maxDistSqrPerUpdate),
+						m_speedMaximum.getRecentMaximum(currentServerSyncStamp),
+						maxSpeed,
+						maxSpeedPerUpdateLimit,
+						reportedSpeed,
+						timeDiffMs,
+						syncStampLongDeltaTime(previousClientSyncStamp, currentServerSyncStamp),
+						syncStampLongDeltaTime(currentClientSyncStamp, currentServerSyncStamp),
+						(m_lastSpeedCheckFailureTime - previousSpeedCheckFailureTime),
+						m_speedCheckConsecutiveFailureCount,
+						oldV.x, oldV.y, oldV.z, previousClientSyncStamp,
+						newV.x, newV.y, newV.z, currentClientSyncStamp,
+						serverLoc.x, serverLoc.y, serverLoc.z, currentServerSyncStamp);
+					buf[sizeof(buf)-1] = '\0';
+					return handleInvalidMove(buf);
+				}
+			}
+			else
+			{
+				m_speedCheckConsecutiveFailureCount = 0;
+			}
+		}
+		else
+		{
+			m_speedCheckConsecutiveFailureCount = 0;
+		}
+	}
+
+	// set last verified location
+	m_lastVerifiedMove = m;
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerCreatureController::handleInvalidMove(char const *failReason)
+{
+	if (isGod())
+	{
+		//-- Don't move gods back but do log the reason.
+		logMoveFailed(failReason);
+		return true;
+	}
+	
+	CreatureObject * const creature = NON_NULL(getCreature());
+
+	// if we are the passenger on a mount then the mount's location, not our last
+	// good location should be the destination of any warps.
+	{
+		bool const isPassenger = isCreaturePassenger(*creature);
+		CreatureObject * const mountCreature = creature->getMountedCreature();
+		if(isPassenger && mountCreature)
+		{
+			m_lastVerifiedMove = MoveSnapshot(
+				mountCreature->getPosition_p(),
+				safe_cast<CellObject *>(mountCreature->getAttachedTo()),
+				getCurSyncStamp());
+		}
+	// if we don't have a last verified move, set one from the current location
+		else if (!m_lastVerifiedMove.isValid())
+	{
+		m_lastVerifiedMove = MoveSnapshot(
+			creature->getPosition_p(),
+			safe_cast<CellObject *>(creature->getAttachedTo()),
+			getCurSyncStamp());
+	}
+	}
+
+	// if the last valid location doesn't reject us, warp to it
+	CellObject * const cell = m_lastVerifiedMove.getCell();
+	if (cell)
+	{
+		if (cell->isAllowed(*creature))
+		{
+			// Previously in a cell, and still allowed in, so send them back to the
+			// old location, but at the new orientation.
+			Transform t(cell->getTransform_o2w().rotateTranslate_p2l(creature->getTransform_o2w()));
+			t.setPosition_p(m_lastVerifiedMove.getPosition_p());
+			teleport(t, cell);
+		}
+		else
+		{
+			// previously in a cell, but no longer allowed, so expel from the building of that cell
+			cell->getOwnerBuilding()->expelObject(*creature);
+		}
+	}
+	else if (isLocationValid(m_lastVerifiedMove.getPosition_w(), m_lastVerifiedMove.getCell()))
+	{
+		Transform objectToWorld(creature->getTransform_o2w());
+		objectToWorld.setPosition_p(m_lastVerifiedMove.getPosition_w());
+		teleport(objectToWorld, 0);
+	}
+	else
+	{
+		// we can't come up with a place we're allowed to be, so let them move
+		m_lastVerifiedMove.clear();
+		return true;
+	}
+
+	logMoveFailed(failReason);
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerCreatureController::handleMove(Vector const &position_w, uint32 syncStamp, float const reportedSpeed)
+{
+	if (isTeleporting() || getCreature()->getInvulnerabilityTimer() > 0.f)
+		return false;
+
+	return checkValidMove(MoveSnapshot(position_w, 0, syncStamp), reportedSpeed);
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerCreatureController::handleMove(Vector const &position_p, NetworkId const &cellObjectId, uint32 syncStamp, float const reportedSpeed)
+{
+	if (isTeleporting() || getCreature()->getInvulnerabilityTimer() > 0.f)
+		return false;
+
+	CellObject * const cell = getCellObject(cellObjectId);
+	if (cell)
+		return checkValidMove(MoveSnapshot(position_p, cell, syncStamp), reportedSpeed);
+
+	//-- Build a description of what's wrong.
+	char buffer[512];
+	snprintf(buffer, sizeof(buffer) - 1, "player specified non-existent cell with id=[%s].", cellObjectId.getValueString().c_str());
+	buffer[sizeof(buffer) - 1] = '\0';
+
+	//-- Log the invalid move.
+	return handleInvalidMove(buffer);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerCreatureController::handleMessage (const int message, const float value, const MessageQueue::Data* const data, const uint32 flags)
+{
+	CreatureObject * const owner = NON_NULL(getCreature());
+	PlayerObject * const playerOwner = getPlayerObject(owner);
+
+	switch (message)
+	{
+	case CM_teleportAck:
+		{
+			const MessageQueueTeleportAck *const msg = dynamic_cast<const MessageQueueTeleportAck *>(data);
+			if (msg)
+				handleTeleportAck(*msg);
+		}
+		break;
+	case CM_netUpdateTransform:
+		{
+			// player creatures cannot move if not in the world (pilots, gunners)
+			if (!owner->isInWorld())
+				break;
+
+			const MessageQueueDataTransform *const msg = dynamic_cast<const MessageQueueDataTransform *>(data);
+			if (msg)
+			{
+				bool const fromClient = (flags&GameControllerMessageFlags::SOURCE_REMOTE_CLIENT) ? true : false;
+				if ((!owner->isAuthoritative()) ^ fromClient)
+				{
+					if (flags & GameControllerMessageFlags::RELIABLE)
+						m_sendReliableTransformThisFrame = true;
+
+					if (   !fromClient
+					    || handleMove(msg->getTransform().getPosition_p(), msg->getSyncStamp(), msg->getSpeed()))
+					{
+						DEBUG_REPORT_LOG(ConfigServerGame::getDebugMovement(), ("nut (%g,%g,%g) %s\n",
+							msg->getTransform().getPosition_p().x,
+							msg->getTransform().getPosition_p().y,
+							msg->getTransform().getPosition_p().z,
+							fromClient ? "client" : "server"));
+						CreatureController::handleMessage(message, value, data, flags);
+					}
+				}
+
+				Vector p1(msg->getTransform().getPosition_p());
+				Vector p2(owner->getPosition_p());
+				if (p1.magnitudeBetweenSquared(p2) > 0.0001f)
+				{
+					if ( fromClient )
+					{
+						playerMovedAndNeedsToCancelWarmup( *owner );
+					}
+					m_movingTimeout = 2.0f;
+				}
+				m_lastSpeed = msg->getSpeed();
+			}
+		}
+		break;
+	case CM_netUpdateTransformWithParent:
+		{
+			// player creatures cannot move if not in the world (pilots, gunners)
+			if (!owner->isInWorld())
+				break;
+
+			const MessageQueueDataTransformWithParent *const msg = dynamic_cast<const MessageQueueDataTransformWithParent *>(data);
+			if (msg)
+			{
+				bool const fromClient = (flags&GameControllerMessageFlags::SOURCE_REMOTE_CLIENT) ? true : false;
+				if ((!owner->isAuthoritative()) ^ fromClient)
+				{
+					if (flags & GameControllerMessageFlags::RELIABLE)
+						m_sendReliableTransformThisFrame = true;
+
+					if (   !fromClient
+					    || handleMove(msg->getTransform().getPosition_p(), msg->getParent(), msg->getSyncStamp(), msg->getSpeed()))
+					{
+						DEBUG_REPORT_LOG(ConfigServerGame::getDebugMovement(), ("nutwp (%g,%g,%g) %s %s\n",
+							msg->getTransform().getPosition_p().x,
+							msg->getTransform().getPosition_p().y,
+							msg->getTransform().getPosition_p().z,
+							msg->getParent().getValueString().c_str(),
+							fromClient ? "client" : "server"));
+						CreatureController::handleMessage(message, value, data, flags);
+					}
+				}
+
+				if (msg->getTransform().getPosition_p() != owner->getPosition_p())
+				{
+					if ( fromClient )
+					{
+						playerMovedAndNeedsToCancelWarmup( *owner );
+					}
+					m_movingTimeout = 2.0f;
+				}
+			}
+		}
+		break;
+	case CM_objectMenuRequest:
+		{
+			MessageQueueObjectMenuRequest const * const msg = safe_cast<MessageQueueObjectMenuRequest const *>(data);
+			if (msg)
+				handleObjectMenuRequest(msg);
+		}
+		break;
+	case CM_missionAbort:
+		{
+			MessageQueueNetworkId const * const msg = safe_cast<MessageQueueNetworkId const *>(data);
+			MissionObject * const missionObject = dynamic_cast<MissionObject *>(NetworkIdManager::getObjectById(msg->getNetworkId()));
+			if (missionObject)
+			{
+				MessageQueueNetworkId * const rsp = new MessageQueueNetworkId(msg->getNetworkId());
+				missionObject->abortMission();
+				appendMessage(static_cast<int>(CM_missionAbort), 0.0f, rsp, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+			}
+		}
+		break;
+	case CM_missionListRequest:
+		{
+			// get mission listing from the mission board
+			if (owner->isPlayerControlled())
+			{
+				MessageQueueMissionListRequest const * const msg = dynamic_cast<MessageQueueMissionListRequest const *>(data);
+				
+				if (msg)
+				{
+					// get the mission terminal
+					ServerObject * const terminal = ServerWorld::findObjectByNetworkId(msg->getTerminalId());
+					Container::ContainerErrorCode tmp = Container::CEC_Success;
+
+					//hack since some mission terminals are placed sort of inside pillars, they fail LOS checks.  So allow
+					//players to use mission terminals they can't see.  This is ok, because we don't care about permissions
+					//which are the only things checked in canManipulate after the LOS check.
+					if (   terminal
+					    && isMissionTerminal(*terminal)
+					    && (   owner->canManipulateObject(*terminal, false, false, false, 12.0f, tmp)
+					        || tmp == Container::CEC_CantSee))
+					{
+						owner->setMissionBoardUISequenceId(msg->getSequenceId());
+						owner->addToMissionRequestQueue(terminal->getNetworkId());
+					}
+				}
+			}
+		}
+		break;
+	case CM_missionAcceptRequest:
+		{
+			MessageQueueMissionGenericRequest const * const msg = dynamic_cast<MessageQueueMissionGenericRequest const *>(data);
+			if (msg)
+			{
+				MessageQueueMissionGenericResponse * const rsp = new MessageQueueMissionGenericResponse(msg->getMissionObjectId(), false, msg->getSequenceId ());
+				MissionObject * const missionObject = safe_cast<MissionObject *>(ServerWorld::findObjectByNetworkId(msg->getMissionObjectId()));
+				ServerObject * const missionTerminal = ServerWorld::findObjectByNetworkId(msg->getTerminalId());
+				Container::ContainerErrorCode tmp = Container::CEC_Success;
+				if (   missionObject
+				    && missionTerminal
+				    && isMissionTerminal(*missionTerminal)
+				    && (   owner->canManipulateObject(*missionTerminal, false, false, false, 12.0f, tmp)
+				        || tmp == Container::CEC_CantSee))
+				{
+					missionObject->grantMissionTo(owner->getNetworkId());
+					rsp->setSuccess(true);
+				}
+				
+				appendMessage(static_cast<int>(CM_missionAcceptResponse), 0.0f, rsp, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+			}
+		}
+		break;
+	case CM_fillSchematicSlotMessage:
+		{
+			MessageQueueCraftFillSlot const * const msg = NON_NULL (dynamic_cast<MessageQueueCraftFillSlot const *>(data));
+			if (owner->isAuthoritative())
+			{
+				if (getSecureTrade())
+					getSecureTrade()->cancelTrade(*owner);
+				Crafting::CraftingError result = playerOwner->fillSlot(msg->getSlot(), msg->getOption(), msg->getIngredient());
+				MessageQueueGenericIntResponse * const response = new MessageQueueGenericIntResponse(message, result, msg->getSequenceId());
+				appendMessage(CM_craftingResult, 0.0f, response, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+			}
+		}
+		break;
+	case CM_emptySchematicSlotMessage:
+		{
+			MessageQueueCraftEmptySlot const * const msg = NON_NULL(dynamic_cast<MessageQueueCraftEmptySlot const *>(data));
+			if (owner->isAuthoritative())
+			{
+				if (getSecureTrade())
+					getSecureTrade()->cancelTrade(*owner);
+				Crafting::CraftingError result = playerOwner->emptySlot(msg->getSlot(), msg->getTargetContainer());
+				MessageQueueGenericIntResponse * const response = new MessageQueueGenericIntResponse(message, result, msg->getSequenceId());
+				appendMessage(CM_craftingResult, 0.0f, response, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+			}
+		}
+		break;
+	case CM_changeRoleIconChoice:
+		{
+			MessageQueueChangeRoleIconChoice const * const msg = NON_NULL(dynamic_cast<MessageQueueChangeRoleIconChoice const *>(data));
+			if (owner->isAuthoritative() && playerOwner)
+			{
+				playerOwner->setRoleIconChoice(msg->getRoleIconChoice());
+			}
+		}
+		break;
+	case CM_experimentMessage:
+		{
+			MessageQueueCraftExperiment const * const msg = NON_NULL(dynamic_cast<MessageQueueCraftExperiment const *>(data));
+			if (owner->isAuthoritative())
+			{
+				if (getSecureTrade())
+					getSecureTrade()->cancelTrade(*owner);
+				int coreLevel = msg->getCoreLevel();
+				Crafting::CraftingResult result = playerOwner->experiment(msg->getExperiments(), msg->getTotalPoints(), coreLevel);
+				MessageQueueGenericIntResponse * const response = new MessageQueueGenericIntResponse(message, result, msg->getSequenceId());
+				appendMessage(CM_experimentResult, 0.0f, response, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+			}
+		}
+		break;
+	case CM_setCustomizationData:
+		{
+			MessageQueueCraftCustomization const * const msg = NON_NULL(dynamic_cast<MessageQueueCraftCustomization const *>(data));
+			if (owner->isAuthoritative())
+			{
+				if (getSecureTrade())
+					getSecureTrade()->cancelTrade(*owner);
+				int const result = playerOwner->setCustomizationData(msg->getName(), msg->getAppearance(), msg->getCustomization(), msg->getItemCount());
+				MessageQueueGenericIntResponse * const response = new MessageQueueGenericIntResponse(message, result, 0);
+				appendMessage(CM_craftingResult, 0.0f, response, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+			}
+		}
+		break;
+	case CM_setMaxForcePower:
+		{
+			MessageQueueGenericValueType<int> const * const msg = safe_cast<MessageQueueGenericValueType<int> const *>(data);
+			// set the object value and send a message to all it's proxies
+			if (msg)
+				playerOwner->setMaxForcePower(msg->getValue());
+			DEBUG_WARNING(!msg, ("PlayerCreatureController (%s:%s) received a CM_setMaxForcePower message but could not retrieve data from the message supplied", owner->getObjectTemplateName(), owner->getNetworkId().getValueString().c_str()));
+		}
+		break;
+	case CM_setForcePower:
+		{
+			MessageQueueGenericValueType<int> const * const msg = safe_cast<MessageQueueGenericValueType<int> const *>(data);
+			// set the object value and send a message to all it's proxies
+			if (msg)
+				playerOwner->setForcePower(msg->getValue());
+			DEBUG_WARNING(!msg, ("PlayerCreatureController (%s:%s) received a CM_setForcePower message but could not retrieve data from the message supplied", owner->getObjectTemplateName(), owner->getNetworkId().getValueString().c_str()));
+		}
+		break;
+	case CM_setForceRegenRate:
+		{
+			MessageQueueGenericValueType<float> const * const msg = safe_cast<MessageQueueGenericValueType<float> const *>(data);
+			// set the object value and send a message to all it's proxies
+			if (msg)
+				playerOwner->setForcePowerRegenRate(msg->getValue());
+			DEBUG_WARNING(!msg, ("PlayerCreatureController (%s:%s) received a CM_setForceRegen message but could not retrieve data from the message supplied", owner->getObjectTemplateName(), owner->getNetworkId().getValueString().c_str()));
+		}
+		break;
+
+	case CM_imageDesignerChange:
+		{
+			ImageDesignChangeMessage const * const inMsg = safe_cast<ImageDesignChangeMessage const *>(data);
+			if (inMsg)
+			{
+				NetworkId const & myId = owner->getNetworkId();
+				NetworkId const & designerId = inMsg->getDesignerId();
+				NetworkId const & recipientId = inMsg->getRecipientId();
+				Object const * const designerObj = NetworkIdManager::getObjectById(designerId);
+				ServerObject const * const designerServer = designerObj ? designerObj->asServerObject() : NULL;
+				CreatureObject const * const designer = designerServer ? designerServer->asCreatureObject() : NULL;
+				Object * const recipientObj = NetworkIdManager::getObjectById(recipientId);
+				ServerObject * const recipientServer = recipientObj ? recipientObj->asServerObject() : NULL;
+				CreatureObject * const recipient = recipientServer ? recipientServer->asCreatureObject() : NULL;
+				if(designer && recipient)
+				{
+					//designer-sent message, either data to sync to the recipient, or committed data to check and apply
+					if(myId == designerId)
+					{
+						if(!inMsg->getAccepted())
+						{
+							//designer hasn't accepted yet, send change to the client so they can see it before agreeing
+							Object * const recipientObject = NetworkIdManager::getObjectById(inMsg->getRecipientId());
+							Controller * const recipientController = recipientObject ? recipientObject->getController() : NULL;
+							if(recipientController)
+							{
+								ImageDesignChangeMessage * outMsg = new ImageDesignChangeMessage();
+								if(outMsg)
+								{
+									*outMsg = *inMsg;
+									recipientController->appendMessage(CM_imageDesignerChange, 0, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+								}
+							}
+						}
+						else
+						{
+							if(designer != recipient)
+							{
+								//check and apply this data once the recipient also accepts
+								Object * const recipientObject = NetworkIdManager::getObjectById(inMsg->getRecipientId());
+								Controller * const recipientController = recipientObject ? recipientObject->getController() : NULL;
+								if(recipientController)
+								{
+									ImageDesignChangeMessage * outMsg = new ImageDesignChangeMessage();
+									if(outMsg)
+									{
+										*outMsg = *inMsg;
+										recipientController->appendMessage(CM_imageDesignerChange, 0, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+									}
+								}
+							}
+						}
+					}
+					//recipient-sent message, either sending the amount of money to pay, or accepted data to check and apply
+					if(myId == recipientId)
+					{
+						if(!inMsg->getAccepted())
+						{
+							//recipient hasn't accepted yet, send the data to the designer to update the recipient-sent amount of money
+							//designer hasn't accepted yet, send change to the client so they can see it before agreeing
+							Object * const designerObject = NetworkIdManager::getObjectById(inMsg->getDesignerId());
+							Controller * const designerController = designerObject ? designerObject->getController() : NULL;
+							if(designerController)
+							{
+								ImageDesignChangeMessage * outMsg = new ImageDesignChangeMessage();
+								if(outMsg)
+								{
+									*outMsg = *inMsg;
+									outMsg->setOrigin(ImageDesignChangeMessage::O_SERVER);
+									designerController->appendMessage(CM_imageDesignerChange, 0, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+								}
+							}
+						}
+						else
+						{
+							//check and apply this data once the designer also accepts
+							SharedImageDesignerManager::Session session(*inMsg);
+
+							//get the server-stored session, so we can get the real starting time
+							SharedImageDesignerManager::Session serverSession;
+							bool const result = SharedImageDesignerManager::getSession(session.designerId, serverSession);
+							if(result)
+								session.startingTime = serverSession.startingTime;
+							//ensure we validate against the server's skill mod data
+							SharedImageDesignerManager::SkillMods const skillMods = ServerImageDesignerManager::getSkillModsForDesigner(session.designerId);
+							session.bodySkillMod = skillMods.bodySkillMod;
+							session.faceSkillMod = skillMods.faceSkillMod;
+							session.markingsSkillMod = skillMods.markingsSkillMod;
+							session.hairSkillMod = skillMods.hairSkillMod;
+							SharedImageDesignerManager::updateSession(session);
+
+							std::string const recipientSpeciesGender = CustomizationManager::getServerSpeciesGender(*recipient);
+							CustomizationData * const customizationData = recipient->fetchCustomizationData();
+							ServerObject * const hair = recipient->getHair();
+							TangibleObject * const tangibleHair = hair ? hair->asTangibleObject() : NULL;
+							CustomizationData * customizationDataHair = NULL;
+							if(tangibleHair)
+								customizationDataHair = tangibleHair->fetchCustomizationData();
+							if(customizationData)
+							{
+								if(SharedImageDesignerManager::isSessionValid(session, skillMods, recipientSpeciesGender, customizationData, customizationDataHair))
+								{
+									time_t const timeLeft = SharedImageDesignerManager::getTimeRemaining(session.designerId);
+									if(timeLeft <= 0)
+									{
+										ServerImageDesignerManager::sendSessionToScriptForValidation(session);
+									}
+									else
+									{
+										Chat::sendSystemMessage(*designer, SharedStringIds::imagedesigner_not_enough_time_passed, Unicode::emptyString);
+										if(designer != recipient)
+											Chat::sendSystemMessage(*recipient, SharedStringIds::imagedesigner_not_enough_time_passed, Unicode::emptyString);
+										ServerImageDesignerManager::cancelSession(designer->getNetworkId(), recipient->getNetworkId());
+									}
+								}
+								else
+								{
+									Chat::sendSystemMessage(*designer, SharedStringIds::imagedesigner_session_not_valid, Unicode::emptyString);
+									if(designer != recipient)
+										Chat::sendSystemMessage(*recipient, SharedStringIds::imagedesigner_session_not_valid, Unicode::emptyString);
+									ServerImageDesignerManager::cancelSession(designer->getNetworkId(), recipient->getNetworkId());
+								}
+								customizationData->release();
+							}
+							else
+							{
+								ServerImageDesignerManager::cancelSession(designer->getNetworkId(), recipient->getNetworkId());
+							}
+						}
+					}
+				}
+			}
+		}
+		break;
+
+	case CM_imageDesignerCancel:
+		{
+			ImageDesignChangeMessage const * const inMsg = safe_cast<ImageDesignChangeMessage const *>(data);
+			if (inMsg)
+			{
+				//cancel the session on the server
+				SharedImageDesignerManager::Session session;
+				bool const result = SharedImageDesignerManager::getSession(inMsg->getDesignerId(), session);
+				if(result)
+				{
+					//if the recipient canceled the session, tell the designer
+					Object const * const designerObject = NetworkIdManager::getObjectById(session.designerId);
+					ServerObject const * const designer = designerObject ? designerObject->asServerObject() : NULL;
+					if(designer && (owner->getNetworkId() != session.designerId))
+						Chat::sendSystemMessage(*designer, SharedStringIds::imagedesigner_canceled_by_recip, Unicode::emptyString);
+
+					ServerImageDesignerManager::cancelSession(inMsg->getDesignerId(), inMsg->getRecipientId());
+				}
+			}
+		}
+		break;
+
+	case CM_buffBuilderChange:
+		{
+			BuffBuilderChangeMessage const * const inMsg = safe_cast<BuffBuilderChangeMessage const *>(data);
+			if (inMsg)
+			{
+				NetworkId const & myId = owner->getNetworkId();
+				NetworkId const & bufferId = inMsg->getBufferId();
+				NetworkId const & recipientId = inMsg->getRecipientId();
+				Object const * const bufferObj = NetworkIdManager::getObjectById(bufferId);
+				ServerObject const * const bufferServer = bufferObj ? bufferObj->asServerObject() : NULL;
+				CreatureObject const * const buffer = bufferServer ? bufferServer->asCreatureObject() : NULL;
+				Object * const recipientObj = NetworkIdManager::getObjectById(recipientId);
+				ServerObject * const recipientServer = recipientObj ? recipientObj->asServerObject() : NULL;
+				CreatureObject * const recipient = recipientServer ? recipientServer->asCreatureObject() : NULL;
+				if(buffer && recipient)
+				{
+					//buffer-sent message, either data to sync to the recipient, or committed data to check and apply
+					if(myId == bufferId)
+					{
+						if(!inMsg->getAccepted())
+						{
+							//buffer hasn't accepted yet, send change to the client so they can see it before agreeing
+							Object * const recipientObject = NetworkIdManager::getObjectById(inMsg->getRecipientId());
+							Controller * const recipientController = recipientObject ? recipientObject->getController() : NULL;
+							if(recipientController)
+							{
+								BuffBuilderChangeMessage * outMsg = new BuffBuilderChangeMessage();
+								if(outMsg)
+								{
+									*outMsg = *inMsg;
+									recipientController->appendMessage(CM_buffBuilderChange, 0, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+								}
+							}
+						}
+						else
+						{
+							if(buffer != recipient)
+							{
+								//check and apply this data once the recipient also accepts
+								Object * const recipientObject = NetworkIdManager::getObjectById(inMsg->getRecipientId());
+								Controller * const recipientController = recipientObject ? recipientObject->getController() : NULL;
+								if(recipientController)
+								{
+									BuffBuilderChangeMessage * outMsg = new BuffBuilderChangeMessage();
+									if(outMsg)
+									{
+										*outMsg = *inMsg;
+										recipientController->appendMessage(CM_buffBuilderChange, 0, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+									}
+								}
+							}
+						}
+					}
+					//recipient-sent message, either sending the amount of money to pay, or accepted data to check and apply
+					if(myId == recipientId)
+					{
+						if(!inMsg->getAccepted())
+						{
+							//recipient hasn't accepted yet, send the data to the buffer to update the recipient-sent amount of money
+							//buffer hasn't accepted yet, send change to the client so they can see it before agreeing
+							Object * const bufferObject = NetworkIdManager::getObjectById(inMsg->getBufferId());
+							Controller * const bufferController = bufferObject ? bufferObject->getController() : NULL;
+							if(bufferController)
+							{
+								BuffBuilderChangeMessage * outMsg = new BuffBuilderChangeMessage();
+								if(outMsg)
+								{
+									*outMsg = *inMsg;
+									outMsg->setOrigin(BuffBuilderChangeMessage::O_SERVER);
+									bufferController->appendMessage(CM_buffBuilderChange, 0, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+								}
+							}
+						}
+						else
+						{
+							//check and apply this data once the buffer also accepts
+							SharedBuffBuilderManager::Session session(*inMsg);
+
+							//get the server-stored session, so we can get the real starting time
+							SharedBuffBuilderManager::Session serverSession;
+							bool const result = SharedBuffBuilderManager::getSession(session.bufferId, serverSession);
+							if(result)
+							{
+								session.startingTime = serverSession.startingTime;
+							}
+							
+							SharedBuffBuilderManager::updateSession(session);
+
+							if(SharedBuffBuilderManager::isSessionValid(session))
+							{
+								time_t const timeLeft = SharedBuffBuilderManager::getTimeRemaining(session.bufferId);
+								if(timeLeft <= 0)
+								{
+									ServerBuffBuilderManager::sendSessionToScriptForValidation(session);
+								}
+								else
+								{
+									// JU_TODO: change to a buff builder specific message
+									Chat::sendSystemMessage(*buffer, SharedStringIds::imagedesigner_not_enough_time_passed, Unicode::emptyString);
+									if(buffer != recipient)
+									{
+										// JU_TODO: change to a buff builder specific message
+										Chat::sendSystemMessage(*recipient, SharedStringIds::imagedesigner_not_enough_time_passed, Unicode::emptyString);
+									}
+									ServerBuffBuilderManager::cancelSession(buffer->getNetworkId(), recipient->getNetworkId());
+								}
+							}
+							else
+							{
+								// JU_TODO: change to a buff builder specific message
+								Chat::sendSystemMessage(*buffer, SharedStringIds::imagedesigner_session_not_valid, Unicode::emptyString);
+								if(buffer != recipient)
+								{
+									// JU_TODO: change to a buff builder specific message
+									Chat::sendSystemMessage(*recipient, SharedStringIds::imagedesigner_session_not_valid, Unicode::emptyString);
+								}
+								ServerBuffBuilderManager::cancelSession(buffer->getNetworkId(), recipient->getNetworkId());
+							}	
+						}
+					}
+				}
+			}
+		}
+		break;
+
+	case CM_buffBuilderCancel:
+		{
+			BuffBuilderChangeMessage const * const inMsg = safe_cast<BuffBuilderChangeMessage const *>(data);
+			if (inMsg)
+			{
+				//cancel the session on the server
+				SharedBuffBuilderManager::Session session;
+				bool const result = SharedBuffBuilderManager::getSession(inMsg->getBufferId(), session);
+				if(result)
+				{
+					//if the recipient canceled the session, tell the designer
+					Object const * const bufferObject = NetworkIdManager::getObjectById(session.bufferId);
+					ServerObject const * const buffer = bufferObject ? bufferObject->asServerObject() : NULL;
+					
+					if(buffer && (owner->getNetworkId() != session.bufferId))
+					{
+						Chat::sendSystemMessage(*buffer, SharedStringIds::buffbuilder_canceled_by_recip, Unicode::emptyString);
+					}
+
+					ServerBuffBuilderManager::cancelSession(inMsg->getBufferId(), inMsg->getRecipientId());
+				}
+			}
+		}
+		break;
+
+	case CM_spaceTerminalRequest:
+		{
+			CreatureObject const * const owner = NON_NULL(getCreature());
+			if(owner)
+			{
+				const MessageQueueGenericValueType<NetworkId> * const msg = dynamic_cast<MessageQueueGenericValueType<NetworkId> const *>(data);
+				if(msg)
+				{
+					Object const * const terminalO = NetworkIdManager::getObjectById(msg->getValue());
+					ServerObject const * const terminal = terminalO ? terminalO->asServerObject() : NULL;
+					if(terminal)
+					{
+						Client const * const client = owner->getClient();
+						if(!client)
+						{
+							Chat::sendSystemMessage(*owner, Unicode::narrowToWide("(unlocalized) Could not get the player for finding ship parking data, unexpected behavior may occur."), Unicode::emptyString);
+							return;
+						}
+						typedef std::vector<std::pair<NetworkId, std::string > > Payload;
+						Payload outData;
+						if(!client->isGod())
+						{
+							Object const * const buildingO = ContainerInterface::getTopmostContainer(*terminal);
+							ServerObject const * const building = buildingO ? buildingO->asServerObject() : NULL;
+							if(building)
+							{
+								DynamicVariableList const & buildingObjVars = building->getObjVars();
+								std::string terminalParkingLocation;
+								bool const result = buildingObjVars.getItem("travel.point_name", terminalParkingLocation);
+
+								if(result)
+									outData.push_back(std::make_pair(terminal->getNetworkId(), terminalParkingLocation));
+								else
+									Chat::sendSystemMessage(*owner, Unicode::narrowToWide("(unlocalized) This terminal is not registered with the planet, unexpected behavior may occur."), Unicode::emptyString);
+
+								std::vector<NetworkId> ships;
+								owner->getAllShipsInDatapad(ships);
+								for(std::vector<NetworkId>::const_iterator i = ships.begin(); i != ships.end(); ++i)
+								{
+									Object const * const shipO = NetworkIdManager::getObjectById(*i);
+									ServerObject const * const shipSO = shipO ? shipO->asServerObject() : NULL;
+									ShipObject const * const ship = shipSO ? shipSO->asShipObject() : NULL;
+									if(ship)
+									{
+										ContainedByProperty const * const contained = ship->getContainedByProperty();
+										Object const * const containerO = contained ? contained->getContainedBy() : NULL;
+										ServerObject const * const container = containerO ? containerO->asServerObject() : NULL;
+										if(container)
+										{
+											DynamicVariableList const & shipControlDeviceObjVars = container->getObjVars();
+											std::string shipParkingLocation;
+											IGNORE_RETURN(shipControlDeviceObjVars.getItem("strParkingLocation", shipParkingLocation));
+											//push the data in, even if the parking location is empty (empty is acceptable, and used for newly-created ships)
+											outData.push_back(std::make_pair(ship->getNetworkId(), shipParkingLocation));
+										}
+									}
+								}
+							}
+							else
+							{
+								Chat::sendSystemMessage(*owner, Unicode::narrowToWide("(unlocalized) Could not find building that space terminal is in, cannot resolve parking information."), Unicode::emptyString);
+							}
+						}
+						else
+						{
+							Chat::sendSystemMessage(*owner, Unicode::narrowToWide("(unlocalized) Bypassing ship parking location checks due to GOD mode."), Unicode::emptyString);
+						}
+						MessageQueueGenericValueType<Payload> * const msg = new MessageQueueGenericValueType<Payload>(outData);
+						appendMessage(static_cast<int>(CM_spaceTerminalResponse), 0.0f, msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+					}
+					else
+					{
+						Chat::sendSystemMessage(*owner, Unicode::narrowToWide("(unlocalized) Bad space terminal received, cannot resolve parking information."), Unicode::emptyString);
+					}
+				}
+				else
+				{
+					Chat::sendSystemMessage(*owner, Unicode::narrowToWide("(unlocalized) Unexpected message, cannot resolve parking information."), Unicode::emptyString);
+				}
+			}
+		}
+		break;
+
+	case CM_droidCommandProgramming:
+		{
+			DroidCommandProgrammingMessage const * const inMsg = safe_cast<DroidCommandProgrammingMessage const *>(data);
+			if (inMsg)
+			{
+				CreatureObject * const owner = NON_NULL(getCreature());
+				if(owner)
+				{
+					GameScriptObject * const scriptObject = owner->getScriptObject();
+					if (scriptObject)
+					{
+						std::vector<std::string> const & commands = inMsg->getCommands();
+						std::vector<NetworkId> const & chipsToAdd = inMsg->getChipsToAdd();
+						std::vector<NetworkId> const & chipsToRemove = inMsg->getChipsToRemove();
+						NetworkId const & droidControlDevice = inMsg->getDroidControlDevice();
+
+						ScriptParams params;
+						params.addParam(droidControlDevice);
+						std::vector<char const *> commandStrs;
+						for(std::vector<std::string>::const_iterator i = commands.begin(); i != commands.end(); ++i)
+						{
+							commandStrs.push_back(i->c_str());
+						}
+						params.addParam(commandStrs);
+						params.addParam(chipsToAdd);
+						params.addParam(chipsToRemove);
+						IGNORE_RETURN(scriptObject->trigAllScripts(Scripting::TRIG_PROGRAM_DROID_COMMANDS, params));
+					}
+				}
+			}
+		}
+		break;
+
+	case CM_inviteOtherGroupMembersToLaunchIntoSpace:
+		{
+			CreatureObject const * const owner = NON_NULL(getCreature());
+			if(owner != 0)
+			{
+				MessageQueueGenericValueType<NetworkId> const * const msg = safe_cast<MessageQueueGenericValueType<NetworkId> const *>(data);
+				if (msg != 0)
+				{
+					NetworkId const & playerToAsk = msg->getValue();
+
+					Object * const playerToAskObject = NetworkIdManager::getObjectById(playerToAsk);
+					Controller * const playerToAskController = (playerToAskObject != 0) ? playerToAskObject->getController() : 0;
+
+					if (playerToAskController != 0)
+					{
+						MessageQueueGenericValueType<NetworkId> * data = new MessageQueueGenericValueType<NetworkId>(owner->getNetworkId());
+
+						playerToAskController->appendMessage(CM_askGroupMemberToLaunchIntoSpace,
+														0.0f,
+														data,
+														GameControllerMessageFlags::SEND |
+														GameControllerMessageFlags::RELIABLE |
+														GameControllerMessageFlags::DEST_AUTH_CLIENT);
+					}
+				}
+			}
+		}
+		break;
+
+	case CM_groupMemberInvitationToLaunchIntoSpaceResponse:
+		{
+			NetworkId const & acceptingPlayer = NON_NULL(getCreature())->getNetworkId();
+
+			typedef std::pair<NetworkId, bool> Payload;
+
+			MessageQueueGenericValueType<Payload> const * const msg = safe_cast<MessageQueueGenericValueType<Payload> const *>(data);
+			if (msg != 0)
+			{
+				Payload const incomingPayload = msg->getValue();
+
+				Object * const invitingPlayerObject = NetworkIdManager::getObjectById(incomingPayload.first);
+				Controller * const invitingPlayerController = (invitingPlayerObject != 0) ? invitingPlayerObject->getController() : 0;
+
+				if (invitingPlayerController != 0)
+				{
+					Payload outgoingPayload;
+					outgoingPayload.first = acceptingPlayer;
+					outgoingPayload.second = incomingPayload.second;
+
+					MessageQueueGenericValueType<Payload> * data = new MessageQueueGenericValueType<Payload>(outgoingPayload);
+
+					invitingPlayerController->appendMessage(CM_relayGroupMemberInvitationToLaunchAnswer,
+															0.0f,
+															data,
+															GameControllerMessageFlags::SEND |
+															GameControllerMessageFlags::RELIABLE |
+															GameControllerMessageFlags::DEST_AUTH_CLIENT);
+				}
+			}
+		}
+		break;
+
+	case CM_groupLotteryWindowCloseResults:
+		{
+			// forward to the mob/container so that the loot script
+			// trigger can be called on the corpse
+			typedef std::pair<NetworkId, std::vector<NetworkId> > Payload;
+
+			MessageQueueGenericValueType<Payload> const * const msg = safe_cast<MessageQueueGenericValueType<Payload> const *>(data);
+			if (msg != 0)
+			{
+				Payload const & incomingPayload = msg->getValue();
+
+				typedef std::vector<NetworkId> Ids;
+
+				NetworkId const & containerId = incomingPayload.first;
+				Ids const & selectedIds = incomingPayload.second;
+
+				ServerObject * const container = ServerWorld::findObjectByNetworkId(containerId);
+				Object * const containerOwner = (container != 0) ? ContainerInterface::getContainedByObject(*container) : 0;
+				Controller * const controller = (containerOwner != 0) ? containerOwner->getController() : 0;
+
+				if (controller != 0)
+				{
+					Payload payload;
+					payload.first = NON_NULL(getCreature())->getNetworkId();
+					payload.second = selectedIds;
+
+					typedef MessageQueueGenericValueType<Payload> Message;
+					Message * const message = new Message(payload);
+
+					controller->appendMessage(
+						CM_groupLotteryWindowCloseResults,
+						0.0f,
+						message,
+						GameControllerMessageFlags::SEND |
+						GameControllerMessageFlags::RELIABLE |
+						GameControllerMessageFlags::DEST_AUTH_SERVER);
+				}
+				else
+				{
+					Chat::sendSystemMessage(*owner, StringId("group", "too_far_away_for_lottery"), Unicode::emptyString);
+				}
+			}
+		}
+		break;
+
+	case CM_cyberneticsChangeRequest:
+		{
+			MessageQueueCyberneticsChangeRequest const * const msg = dynamic_cast<MessageQueueCyberneticsChangeRequest const *>(data);
+			NOT_NULL(msg);
+			if (msg != NULL)
+			{
+				CreatureObject * const owner = NON_NULL(getCreature());
+				if(owner)
+				{
+					NetworkId const & npcId = msg->getTarget();
+					Object * const o = NetworkIdManager::getObjectById(npcId);
+					ServerObject * const so = o ? o->asServerObject() : NULL;
+					if(so)
+					{
+						Controller * const npcController = so->getController();
+						if(npcController)
+						{
+							MessageQueueCyberneticsChangeRequest * const msgToNPC = new MessageQueueCyberneticsChangeRequest(msg->getChangeType(), msg->getCyberneticPiece(), owner->getNetworkId());
+							npcController->appendMessage(
+								CM_cyberneticsChangeRequestToNPC,
+								0.0f,
+								msgToNPC,
+								GameControllerMessageFlags::SEND |
+								GameControllerMessageFlags::RELIABLE |
+								GameControllerMessageFlags::DEST_AUTH_SERVER);
+						}
+					}
+				}
+			}
+		}
+		break;
+
+	case CM_spaceMiningSaleSellResource:
+		{
+			MessageQueueSpaceMiningSellResource const * const msg = dynamic_cast<MessageQueueSpaceMiningSellResource const *>(data);
+			if (msg != NULL)
+			{
+				ServerObject * const spaceStation = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(msg->m_spaceStationId));
+				if (NULL == spaceStation)
+				{
+					WARNING(true, ("PlayerCreatureController CM_spaceMiningSaleSellResource invalid station [%s]", msg->m_spaceStationId.getValueString().c_str()));
+				}
+				else
+				{
+					GameScriptObject * const scriptObject = spaceStation->getScriptObject();
+					if (scriptObject)
+					{
+						ScriptParams params;
+						params.addParam(getOwner()->getNetworkId());
+						params.addParam(msg->m_shipId);
+						params.addParam(msg->m_spaceStationId);
+						params.addParam(msg->m_resourceId);
+						params.addParam(msg->m_amount);
+						scriptObject->trigAllScripts(Scripting::TRIG_SPACE_MINING_SELL_RESOURCE, params);
+					}
+				}
+			}
+		}
+		break;
+
+	case CM_setCurrentWorkingSkill:
+		{
+			MessageQueueSelectCurrentWorkingSkill const * const msg = NON_NULL(dynamic_cast<MessageQueueSelectCurrentWorkingSkill const *>(data));
+			if (owner->isAuthoritative() && playerOwner)
+			{
+				playerOwner->setWorkingSkill(msg->getCurrentWorkingSkill(), true);
+			}
+		}
+		break;
+
+	case CM_setProfessionTemplate:
+		{
+			MessageQueueSelectProfessionTemplate const * const msg = NON_NULL(dynamic_cast<MessageQueueSelectProfessionTemplate const *>(data));
+			if (owner->isAuthoritative() && playerOwner)
+			{
+				playerOwner->setSkillTemplate(msg->getProfessionTemplate(), true);
+			}
+		}
+		break;
+
+	case CM_clientMinigameOpen:
+		{
+			typedef ValueDictionary Payload;
+			MessageQueueGenericValueType<Payload> const * const msg = dynamic_cast<MessageQueueGenericValueType<Payload> const *>(data);
+			if(msg)
+			{
+				CreatureObject * creature = getCreature();
+				if(creature)
+				{
+					creature->clientMinigameOpen(msg->getValue());
+				}
+			}
+		}
+		break;
+
+	case CM_clientMinigameClose:
+		{
+			typedef ValueDictionary Payload;
+			MessageQueueGenericValueType<Payload> const * const msg = dynamic_cast<MessageQueueGenericValueType<Payload> const *>(data);
+			if(msg)
+			{
+				CreatureObject * creature = getCreature();
+				if(creature)
+				{
+					creature->clientMinigameClose(msg->getValue());
+				}
+			}
+		}
+		break;
+
+	case CM_clientMinigameResult:
+		{
+			typedef ValueDictionary Payload;
+			MessageQueueGenericValueType<Payload> const * const msg = dynamic_cast<MessageQueueGenericValueType<Payload> const *>(data);
+			if(msg)
+			{
+				//extract the target object
+				ValueDictionary const & data = msg->getValue();
+
+				DictionaryValueMap const & valueMap = data.get();
+
+				DictionaryValueMap::const_iterator itr = valueMap.find(minigameResultTargetName);
+
+				if(itr != valueMap.end() && itr->second != NULL)
+				{
+					if(itr->second->getType() == ValueTypeObjId::ms_type)
+					{
+						ValueTypeObjId * container = static_cast<ValueTypeObjId*>(itr->second);
+						NetworkId tableOid = container->getValue();
+						
+						if(tableOid.isValid())
+						{
+							ScriptParams params;
+							params.addParam(data, minigameResultDictionaryName);
+
+							ScriptDictionaryPtr dictionary;
+							GameScriptObject::makeScriptDictionary(params, dictionary);
+							if (dictionary.get() != NULL)
+							{
+								dictionary->serialize();
+								MessageToQueue::getInstance().sendMessageToJava(tableOid, 
+									"clientMinigameResult", dictionary->getSerializedData(), 0, false);
+							}
+						}
+					}
+				}
+			}
+		}
+		break;
+
+	case CM_createSaga:
+		{
+			MessageQueueCreateSaga const * const msg = dynamic_cast<MessageQueueCreateSaga const *>(data);
+			if(msg)
+			{
+				CreatureObject * const owner = NON_NULL(getCreature());
+				if(owner)
+				{
+					GameScriptObject * const scriptObject = owner->getScriptObject();
+					if (scriptObject)
+					{
+						ValueDictionary paramsDict;
+						ScriptParams params;
+						
+						paramsDict.insert("questName", ValueTypeString(msg->getQuestName()));
+						paramsDict.insert("questDescription", ValueTypeString(msg->getQuestDescription()));
+						paramsDict.insert("totalTasks", ValueTypeSignedInt(msg->getTotalTasks()));
+						paramsDict.insert("rewards", ValueTypeString(msg->getRewards()));
+						paramsDict.insert("recipe", ValueTypeBool(msg->isRecipe()));
+						paramsDict.insert("oldRecipeObject", ValueTypeObjId(msg->getRecipeOID()));
+						paramsDict.insert("share", ValueTypeSignedInt(msg->getShareAmount()));
+
+						const std::vector<MessageQueueCreateSaga::TaskInfo> & tasks = msg->getTasks();
+						for(unsigned int i = 0; i < tasks.size(); ++i)
+						{
+							char task[32];
+							memset(task, 0, 32);
+							sprintf(task, "%d", i);
+
+							
+							std::string paramString;
+
+							char taskType[64];
+							memset(taskType, 0, 64);
+							sprintf(taskType, "%d",tasks[i].numParameters);
+							paramString.append(taskType);
+
+							for(int j = 0; j < tasks[i].numParameters; ++j)
+							{
+								paramString.append("~", 1);
+								paramString.append(tasks[i].parameters[j].c_str());
+							}
+
+							paramsDict.insert(task, ValueTypeString(paramString));
+						}
+						params.addParam(paramsDict, "taskDictionary");
+						ScriptDictionaryPtr dictionary;
+						GameScriptObject::makeScriptDictionary(params, dictionary);
+						if (dictionary.get() != NULL)
+						{
+							dictionary->serialize();
+							MessageToQueue::getInstance().sendMessageToJava(owner->getNetworkId(), 
+								"OnCreateSaga", dictionary->getSerializedData(), 0, false);
+						}
+					}
+				}
+				
+			}
+		}
+		break;
+
+	default:
+		CreatureController::handleMessage(message, value, data, flags);
+		break;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+float PlayerCreatureController::realAlter(float time)
+{
+	float alterResult = CreatureController::realAlter(time);
+
+	CreatureObject const * const owner = NON_NULL(getCreature());
+	Client * const client = owner->getClient();
+	
+	if (m_lastTimeSynchronization + 30 < ServerClock::getInstance().getGameTimeSeconds())
+	{
+		m_lastTimeSynchronization = ServerClock::getInstance().getGameTimeSeconds();
+
+		if (client)
+		{
+			ServerTimeMessage timeSync(static_cast<int64>(ServerClock::getInstance().getGameTimeSeconds()));
+			client->send(timeSync, true);
+
+			// @todo: this should no be called every alter
+			int weather;
+			float windVelocityX, windVelocityY, windVelocityZ;
+			PlanetObject const * const planet = ServerUniverse::getInstance().getCurrentPlanet();
+			if (planet)
+			{
+				planet->getWeather(weather, windVelocityX, windVelocityY, windVelocityZ);
+				if (m_lastWeatherIndex != weather)
+				{
+					m_lastWeatherIndex            = weather;
+					m_lastWeatherWindVelocity_w.x = windVelocityX;
+					m_lastWeatherWindVelocity_w.y = windVelocityY;
+					m_lastWeatherWindVelocity_w.z = windVelocityZ;
+
+					client->send(ServerWeatherMessage(m_lastWeatherIndex, m_lastWeatherWindVelocity_w), true);
+				}
+			}
+		}
+	}
+
+#ifdef _DEBUG
+	if (client && ConfigServerGame::getSendPlayerTransform())
+	{
+		Transform const & transform = owner->getTransform_o2p();
+
+		CellProperty const * const cell = owner->getParentCell();
+
+		NetworkId id = (cell && (cell != CellProperty::getWorldCellProperty())) ? cell->getOwner().getNetworkId() : NetworkId();
+
+		DebugTransformMessage message(transform, id);
+
+		client->send(message, true);
+	}
+#endif
+
+	updateMaxMoveSpeed();
+
+	updateMovementType(time);
+
+	if(m_resendSpeedMax && client)
+	{
+		GenericValueTypeMessage<float> const msg("fca11a62d23041008a4f0df36aa7dca6", m_speedMaximum.getLastSetValue());
+		client->send(msg, true);
+		m_resendSpeedMax = false;
+	}
+
+	return alterResult;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerCreatureController::updateMovementType ( float time )
+{
+	CreatureObject * const owner = NON_NULL(getCreature());
+
+	if (!owner->isAuthoritative())
+		return;
+
+	m_movingTimeout -= time;
+
+	if (m_movingTimeout <= 0.0f)
+	{
+		owner->setMovementStationary();
+		m_movingTimeout = 0.0f;
+	}
+	else
+	{
+		owner->setMovementRun();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerCreatureController::onMoveFailed()
+{
+	CreatureObject * const owner = NON_NULL(getCreature());
+	if (owner->isAuthoritative() && owner->isInWorld())
+		teleport(owner->getTransform_o2p(), dynamic_cast<ServerObject *>(&(owner->getParentCell()->getOwner())));
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerCreatureController::updateHibernate()
+{
+	// do nothing, only ai update their hibernate state
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerCreatureController::shouldHibernate() const
+{
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerCreatureController::updateMaxMoveSpeed()
+{
+	CreatureObject * const owner = NON_NULL(getCreature());
+
+	//-- If owner is riding a mount/vehicle, use the mount/vehicle's movement rate;
+	//   otherwise, use the owner's movement rate..
+	CreatureObject *const mountForOwner        = owner->getMountedCreature();
+	CreatureObject *const movementSourceObject = mountForOwner ? mountForOwner : owner;
+	
+	float walkSpeed = movementSourceObject->getWalkSpeed();
+	float runSpeed = movementSourceObject->getRunSpeed();
+	float speed = runSpeed > 0.0f ? runSpeed : walkSpeed;
+
+	if (speed != m_speedMaximum.getLastSetValue()) //lint !e777 // yep, testing for equality is in fact what we want.
+	{
+		m_speedMaximum.setValue(speed, getCurSyncStamp());
+		GenericValueTypeMessage<float> const msg("fca11a62d23041008a4f0df36aa7dca6", m_speedMaximum.getLastSetValue());
+		Client const * const client = owner->getClient();
+		if (client)
+			return client->send(msg, true);	// Tell the Client about it's new speed according to the server.
+		else
+			m_resendSpeedMax = true; // Try to send our new speed as soon as our client is ready.
+	}
+}
+
+// ----------------------------------------------------------------------
+
+
+uint32 PlayerCreatureController::getCurSyncStamp() const
+{
+	CreatureObject const * const creature = NON_NULL(getCreature());
+	Client const * const client = creature->getClient();
+	if (client)
+		return client->getServerSyncStampLong();
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerCreatureController::handleObjectMenuRequest(MessageQueueObjectMenuRequest const *msg)
+{
+	CreatureObject * const creatureOwner = NON_NULL(getCreature());
+	if (msg && creatureOwner->isAuthoritative())
+	{
+		ServerObject * const target = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(msg->getTargetId()));
+		if (target)
+		{
+			if (!target->isAuthoritative())
+			{
+				GenericValueTypeMessage<std::pair<NetworkId, NetworkId> > const rssMessage(
+					"RequestSameServer",
+					std::make_pair(
+						ContainerInterface::getTopmostContainer(*creatureOwner)->getNetworkId(),
+						ContainerInterface::getTopmostContainer(*target)->getNetworkId()));
+				GameServer::getInstance().sendToPlanetServer(rssMessage);
+			}
+			else
+			{
+				GameScriptObject * const scriptObject = target->getScriptObject();
+				if (scriptObject)
+				{
+					static const int move_type           = RadialMenuManager::getMenuTypeByName ("ITEM_MOVE");
+					static const int move_forward_type   = RadialMenuManager::getMenuTypeByName ("ITEM_MOVE_FORWARD");
+					static const int move_back_type      = RadialMenuManager::getMenuTypeByName ("ITEM_MOVE_BACK");
+					static const int move_left_type      = RadialMenuManager::getMenuTypeByName ("ITEM_MOVE_LEFT");
+					static const int move_right_type     = RadialMenuManager::getMenuTypeByName ("ITEM_MOVE_RIGHT");
+					static const int move_up_type        = RadialMenuManager::getMenuTypeByName ("ITEM_MOVE_UP");
+					static const int move_down_type      = RadialMenuManager::getMenuTypeByName ("ITEM_MOVE_DOWN");
+					static const int move_copy_location_type = RadialMenuManager::getMenuTypeByName ("ITEM_MOVE_COPY_LOCATION");
+					static const int move_copy_height_type = RadialMenuManager::getMenuTypeByName ("ITEM_MOVE_COPY_HEIGHT");
+					static const int rotate_type         = RadialMenuManager::getMenuTypeByName ("ITEM_ROTATE");
+					static const int rotate_left_type    = RadialMenuManager::getMenuTypeByName ("ITEM_ROTATE_LEFT");
+					static const int rotate_right_type   = RadialMenuManager::getMenuTypeByName ("ITEM_ROTATE_RIGHT");
+					static const int rotate_forward_type = RadialMenuManager::getMenuTypeByName ("ITEM_ROTATE_FORWARD");
+					static const int rotate_backward_type = RadialMenuManager::getMenuTypeByName ("ITEM_ROTATE_BACKWARD");
+					static const int rotate_clockwise_type = RadialMenuManager::getMenuTypeByName ("ITEM_ROTATE_CLOCKWISE");
+					static const int rotate_counterclockwise_type = RadialMenuManager::getMenuTypeByName ("ITEM_ROTATE_COUNTERCLOCKWISE");
+					static const int rotate_random_type  = RadialMenuManager::getMenuTypeByName ("ITEM_ROTATE_RANDOM");
+					static const int rotate_random_yaw_type = RadialMenuManager::getMenuTypeByName ("ITEM_ROTATE_RANDOM_YAW");
+					static const int rotate_random_pitch_type = RadialMenuManager::getMenuTypeByName ("ITEM_ROTATE_RANDOM_PITCH");
+					static const int rotate_random_roll_type = RadialMenuManager::getMenuTypeByName ("ITEM_ROTATE_RANDOM_ROLL");
+					static const int rotate_reset_type   = RadialMenuManager::getMenuTypeByName ("ITEM_ROTATE_RESET");
+					static const int rotate_copy_type    = RadialMenuManager::getMenuTypeByName ("ITEM_ROTATE_COPY");
+
+					// Holocron check.
+					Object const * const containedByObj = ContainerInterface::getContainedByObject(*target);
+					if(containedByObj && containedByObj->asServerObject() && ( containedByObj->asServerObject()->getGameObjectType() == SharedObjectTemplate::GOT_chronicles_quest_holocron || containedByObj->asServerObject()->getGameObjectType() == SharedObjectTemplate::GOT_chronicles_quest_holocron_recipe ) )
+						return; // No menus for Holocron contained items.
+
+					bool addedRotateMenuItems = false;
+					std::string positiveRotateDegree;
+					std::string negativeRotateDegree;
+
+					RadialMenuManager::DataVector dv(msg->getData());
+
+					//-- see if we need the pickup, move, or rotate options
+					//-- these are governed by building permisisons if the object is in a building
+					//-- if the object is not in a building, it can probably be picked up.
+					bool blockedByNoTrade = false;
+					bool showPickUpMenu = false;
+					if (objectMenuRequestCanManipulateObject(*creatureOwner, *target, blockedByNoTrade, showPickUpMenu))
+					{
+						if (showPickUpMenu)
+						{
+							static const int pickup_type = RadialMenuManager::getMenuTypeByName ("ITEM_PICKUP");
+							if (!RadialMenuManager::addRootMenu (dv, pickup_type, Unicode::emptyString, false))
+								WARNING (true, ("ServerController unable to apply pickup menu [%d] to menu for %s", pickup_type, target->getNetworkId ().getValueString ().c_str ()));
+						}
+
+						if (!target->isInWorldCell())
+						{
+							const int move_id = RadialMenuManager::addRootMenu (dv, move_type, Unicode::emptyString, true);
+								
+							if (!move_id)
+								WARNING (true, ("ServerController unable to apply move menu [%d] to menu for %s", move_type, target->getNetworkId ().getValueString ().c_str ()));
+							else
+							{
+								IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, move_id, move_forward_type, Unicode::emptyString, false));
+								IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, move_id, move_back_type,    Unicode::emptyString, false));
+								IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, move_id, move_left_type,    Unicode::emptyString, false));
+								IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, move_id, move_right_type,   Unicode::emptyString, false));
+								IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, move_id, move_up_type,      Unicode::emptyString, false));
+								IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, move_id, move_down_type,    Unicode::emptyString, false));
+								IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, move_id, move_copy_location_type, Unicode::emptyString, false));
+								IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, move_id, move_copy_height_type, Unicode::emptyString, false));
+							}
+
+							const int rotate_id = RadialMenuManager::addRootMenu (dv, rotate_type, Unicode::emptyString, true);
+								
+							if (!rotate_id)
+								WARNING (true, ("ServerController unable to apply rotate menu [%d] to menu for %s", rotate_type, target->getNetworkId ().getValueString ().c_str ()));
+							else
+							{
+								int rotateDegrees = 90;
+								if (creatureOwner->getClient())
+									rotateDegrees = abs(creatureOwner->getClient()->getFurnitureRotationDegree());
+
+								positiveRotateDegree = FormattedString<32>().sprintf(" +%d", rotateDegrees);
+								negativeRotateDegree = FormattedString<32>().sprintf(" -%d", rotateDegrees);
+
+								addedRotateMenuItems = true;
+								IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, rotate_id, rotate_left_type, Unicode::narrowToWide(std::string("@ui_radial:item_rotate_yaw") + positiveRotateDegree), false));
+								IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, rotate_id, rotate_right_type, Unicode::narrowToWide(std::string("@ui_radial:item_rotate_yaw") + negativeRotateDegree), false));
+								IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, rotate_id, rotate_random_yaw_type, Unicode::emptyString, false));
+
+								PlayerObject const * const playerObject = getPlayerObject(creatureOwner);
+								if ((playerObject && playerObject->hasCompletedCollection("force_shui_tier_02")) || (creatureOwner->getClient() && creatureOwner->getClient()->isGod()))
+								{
+									IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, rotate_id, rotate_forward_type, Unicode::narrowToWide(std::string("@ui_radial:item_rotate_pitch") + positiveRotateDegree), false));
+									IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, rotate_id, rotate_backward_type, Unicode::narrowToWide(std::string("@ui_radial:item_rotate_pitch") + negativeRotateDegree), false));
+									IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, rotate_id, rotate_random_pitch_type, Unicode::emptyString, false));
+									IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, rotate_id, rotate_clockwise_type, Unicode::narrowToWide(std::string("@ui_radial:item_rotate_roll") + positiveRotateDegree), false));
+									IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, rotate_id, rotate_counterclockwise_type, Unicode::narrowToWide(std::string("@ui_radial:item_rotate_roll") + negativeRotateDegree), false));
+									IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, rotate_id, rotate_random_roll_type, Unicode::emptyString, false));
+									IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, rotate_id, rotate_random_type, Unicode::emptyString, false));
+								}
+								
+								IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, rotate_id, rotate_reset_type, Unicode::emptyString, false));
+								IGNORE_RETURN(RadialMenuManager::addSubMenu(dv, rotate_id, rotate_copy_type, Unicode::emptyString, false));
+							}
+						}
+					}
+
+					ScriptParams params;
+					params.addParam(creatureOwner->getNetworkId());
+					params.addParam(dv);
+					IGNORE_RETURN(scriptObject->trigAllScripts(Scripting::TRIG_OBJECT_MENU_REQUEST, params));
+
+					RadialMenuManager::DataVector resultMenuInfo (params.getObjectMenuRequestDataArrayParam(1));
+					RadialMenuManager::DataVector::iterator it;
+					for(it = resultMenuInfo.begin(); it != resultMenuInfo.end(); ++it)
+					{
+						ObjectMenuRequestData & requestData = *it;						
+						if(!requestData.m_labelId.getTable().empty())
+						{
+							requestData.m_label = Unicode::narrowToWide (std::string ("@") + requestData.m_labelId.getCanonicalRepresentation ());
+						}
+
+						// calling into script causes the customized label that
+						// we set above to get blown away, so we need to reset it
+						else if (addedRotateMenuItems && requestData.m_label.empty())
+						{
+							if (requestData.m_menuItemType == rotate_left_type)
+								requestData.m_label = Unicode::narrowToWide(std::string("@ui_radial:item_rotate_yaw") + positiveRotateDegree);
+							else if (requestData.m_menuItemType == rotate_right_type)
+								requestData.m_label = Unicode::narrowToWide(std::string("@ui_radial:item_rotate_yaw") + negativeRotateDegree);
+							else if (requestData.m_menuItemType == rotate_forward_type)
+								requestData.m_label = Unicode::narrowToWide(std::string("@ui_radial:item_rotate_pitch") + positiveRotateDegree);
+							else if (requestData.m_menuItemType == rotate_backward_type)
+								requestData.m_label = Unicode::narrowToWide(std::string("@ui_radial:item_rotate_pitch") + negativeRotateDegree);
+							else if (requestData.m_menuItemType == rotate_clockwise_type)
+								requestData.m_label = Unicode::narrowToWide(std::string("@ui_radial:item_rotate_roll") + positiveRotateDegree);
+							else if (requestData.m_menuItemType == rotate_counterclockwise_type)
+								requestData.m_label = Unicode::narrowToWide(std::string("@ui_radial:item_rotate_roll") + negativeRotateDegree);
+						}
+					}
+
+					appendMessage(
+						CM_objectMenuResponse,
+						0.0f,
+						new MessageQueueObjectMenuRequest(target->getNetworkId(), creatureOwner->getNetworkId(), resultMenuInfo, msg->m_sequence),
+						GameControllerMessageFlags::SEND|GameControllerMessageFlags::RELIABLE|GameControllerMessageFlags::DEST_AUTH_CLIENT);
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerCreatureController::objectMenuRequestCanManipulateObject(CreatureObject const & player, ServerObject const & item, bool & blockedByNoTrade, bool & showPickUpMenu)
+{
+	blockedByNoTrade = false;
+	showPickUpMenu = false;
+	Container::ContainerErrorCode code = Container::CEC_Success;
+
+	// call canManipulateObject telling it to skip the no trade check;
+	// we'll do the no trade check separately if canManipulateObject passes
+	bool allowedByGodMode = false;
+	if (item.isInWorld() && player.canManipulateObject(item, true, true, true, 100.0f, code, true, &allowedByGodMode))
+	{
+		// check for no trade
+		blockedByNoTrade = false;
+		showPickUpMenu = true;
+		if (!allowedByGodMode && item.markedNoTrade())
+		{
+			blockedByNoTrade = true;
+			showPickUpMenu = false;
+
+			// the item must be owned by this creature
+			NetworkId ownerId;
+			if (item.asIntangibleObject())
+			{
+				ServerObject const * const containedBy = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(item));
+				ownerId = containedBy ? containedBy->getOwnerId() : NetworkId::cms_invalid;
+			}
+			else
+			{
+				ownerId = item.getOwnerId();
+			}
+
+			if (ownerId == player.getNetworkId())
+			{
+				blockedByNoTrade = false;
+				showPickUpMenu = true;
+			}
+
+			// show the pick up menu item if the no trade item is a "shared" no trade
+			// item, and is immediately contained in a structure cell, and is being
+			// accessed by a character on the same account as the current owner of the item
+			if (!showPickUpMenu && ownerId.isValid() && item.markedNoTradeShared(true))
+			{
+				ServerObject const * const containedBy = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(item));
+				if (containedBy && containedBy->asCellObject())
+				{
+					PlayerObject const * const playerObject = getPlayerObject(&player);
+					if (playerObject && (playerObject->getStationId() == NameManager::getInstance().getPlayerStationId(ownerId)))
+						showPickUpMenu = true;
+				}
+			}
+		}
+
+		// creatures cannot be picked up, with special exception made for NPC vendor below
+		if (item.asCreatureObject())
+			showPickUpMenu = false;
+
+		// vendors have special pickup rules
+		if (item.isVendor())
+		{
+			// the only vendors that can be picked up are
+			// uninitialized vendor, but only by the vendor owner
+			showPickUpMenu = false;
+			if (!item.getObjVars().hasItem("vendor_initialized"))
+			{
+				NetworkId vendorOwner;
+				if (item.getObjVars().getItem("vendor_owner", vendorOwner) && (vendorOwner == player.getNetworkId()))
+					showPickUpMenu = true;
+			}
+		}
+
+		return true;
+	}
+
+	return false;
+}
+
+// ======================================================================
+
+PlayerCreatureController::MoveSnapshot::MoveSnapshot() :
+	m_inited(false),
+	m_cell(),
+	m_position_p(),
+	m_position_w(),
+	m_syncStamp(0)
+{
+}
+
+// ----------------------------------------------------------------------
+
+PlayerCreatureController::MoveSnapshot::MoveSnapshot(Vector const &position_p, CellObject *cell, uint32 syncStamp) :
+	m_inited(true),
+	m_cell(cell),
+	m_position_p(position_p),
+	m_position_w(cell ? cell->getTransform_o2w().rotateTranslate_l2p(position_p) : position_p),
+	m_syncStamp(syncStamp)
+{
+}
+
+// ----------------------------------------------------------------------
+
+PlayerCreatureController::MoveSnapshot::MoveSnapshot(MoveSnapshot const &rhs) :
+	m_inited(rhs.m_inited),
+	m_cell(rhs.m_cell),
+	m_position_p(rhs.m_position_p),
+	m_position_w(rhs.m_position_w),
+	m_syncStamp(rhs.m_syncStamp)
+{
+}
+
+// ----------------------------------------------------------------------
+
+PlayerCreatureController::MoveSnapshot &PlayerCreatureController::MoveSnapshot::operator=(MoveSnapshot const &rhs)
+{
+	if (&rhs != this)
+	{
+		m_inited = rhs.m_inited;
+		m_cell = rhs.m_cell;
+		m_position_p = rhs.m_position_p;
+		m_position_w = rhs.m_position_w;
+		m_syncStamp = rhs.m_syncStamp;
+	}
+	return *this;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerCreatureController::MoveSnapshot::clear()
+{
+	m_inited = false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerCreatureController::MoveSnapshot::isValid() const
+{
+	return m_inited;
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerCreatureController::MoveSnapshot::isAllowed(CreatureObject const &who) const
+{
+	CellObject const * const cell = m_cell.getPointer();
+	return !cell || cell->isAllowed(who);
+}
+
+// ----------------------------------------------------------------------
+
+CellObject *PlayerCreatureController::MoveSnapshot::getCell()
+{
+	return m_cell.getPointer();
+} //lint !e1762 // logically nonconst
+
+// ----------------------------------------------------------------------
+
+CellObject const *PlayerCreatureController::MoveSnapshot::getCell() const
+{
+	return m_cell.getPointer();
+}
+
+// ----------------------------------------------------------------------
+
+Vector const &PlayerCreatureController::MoveSnapshot::getPosition_p() const
+{
+	return m_position_p;
+}
+
+// ----------------------------------------------------------------------
+
+Vector const PlayerCreatureController::MoveSnapshot::getPosition_w() const
+{
+	// if cell can be resolved, return world position relative to current position of cell
+	CellObject const * const cell = m_cell.getPointer();
+	if (cell)
+		return cell->getTransform_o2w().rotateTranslate_l2p(m_position_p);
+
+	// if no cell, or no longer able to resolve cell, use original world position
+	return m_position_w;
+}
+
+// ----------------------------------------------------------------------
+
+uint32 PlayerCreatureController::MoveSnapshot::getSyncStamp() const
+{
+	return m_syncStamp;
+}
+
+//----------------------------------------------------------------------
+
+PlayerCreatureController * PlayerCreatureController::asPlayerCreatureController()
+{
+	return this;
+}
+
+//----------------------------------------------------------------------
+
+PlayerCreatureController const * PlayerCreatureController::asPlayerCreatureController() const
+{
+	return this;
+}
+
+//----------------------------------------------------------------------
+
+void PlayerCreatureController::playerMovedAndNeedsToCancelWarmup( CreatureObject &owner )
+{
+	CommandQueue * const queue = owner.getCommandQueue();
+
+	if ( queue->getCurrentCommandState() == CommandQueue::State_Warmup )
+	{
+		queue->cancelCurrentCommand();
+	}
+}
+
+//----------------------------------------------------------------------
+
+float PlayerCreatureController::getLastSpeed() const
+{
+	return m_lastSpeed;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/controller/PlayerCreatureController.h b/engine/server/library/serverGame/src/shared/controller/PlayerCreatureController.h
new file mode 100644
index 00000000..bb8780d0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/PlayerCreatureController.h
@@ -0,0 +1,134 @@
+// ======================================================================
+//
+// PlayerCreatureController.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef PlayerCreatureController_H
+#define PlayerCreatureController_H
+
+// ======================================================================
+
+#include "serverGame/CellObject.h"
+#include "serverGame/CreatureController.h"
+#include "serverUtility/RecentMaxSyncedValue.h"
+
+// ======================================================================
+
+class MessageQueueTeleportAck;
+class MessageQueueObjectMenuRequest;
+
+// ======================================================================
+
+class PlayerCreatureController : public CreatureController
+{
+public:
+	explicit PlayerCreatureController(CreatureObject *newOwner);
+	virtual ~PlayerCreatureController();
+
+	static PlayerObject * getPlayerObject(CreatureObject *creature);
+	static PlayerObject const * getPlayerObject(CreatureObject const *creature);
+
+	static bool objectMenuRequestCanManipulateObject(CreatureObject const & player, ServerObject const & item, bool & blockedByNoTrade, bool & showPickUpMenu);
+
+	virtual PlayerCreatureController * asPlayerCreatureController();
+	virtual PlayerCreatureController const * asPlayerCreatureController() const;
+
+	virtual void   teleport           (Transform const &goal, ServerObject *goalObj);
+	virtual void   setAuthoritative   (bool newAuthoritative);
+	virtual void   onClientReady      ();
+	virtual void   onClientLost       ();
+
+	float getLastSpeed       () const;
+	float const getServerSpeedForPlayer() const;
+protected:
+
+	virtual float  realAlter (float time);
+	virtual void   onMoveFailed ();
+
+	virtual void   updateHibernate();
+	virtual bool   shouldHibernate() const;
+
+private:
+	PlayerCreatureController(PlayerCreatureController const &);
+	PlayerCreatureController &operator=(PlayerCreatureController const &);
+
+private:
+
+	class MoveSnapshot
+	{
+	public:
+		MoveSnapshot();
+		MoveSnapshot(Vector const &position_p, CellObject *cell, uint32 syncStamp);
+		MoveSnapshot(MoveSnapshot const &rhs);
+		MoveSnapshot &operator=(MoveSnapshot const &rhs);
+
+		void              clear          ();
+		CellObject *      getCell        ();
+		CellObject const *getCell        () const;
+
+		bool            isValid        () const;
+		bool            isAllowed      (CreatureObject const &who) const;
+		Vector const    getPosition_w  () const;
+		Vector const &  getPosition_p  () const;
+		uint32          getSyncStamp   () const;
+
+	private:
+		bool m_inited;
+		Watcher<CellObject> m_cell;
+		Vector m_position_p;
+		Vector m_position_w;
+		uint32 m_syncStamp;
+	};
+
+	bool isGod               () const;
+	bool isTeleporting       () const;
+	void handleTeleportAck   (MessageQueueTeleportAck const &msg);
+	void preventMovementUpdates();
+	void resyncMovementUpdates();
+	bool shouldValidateMove  () const;
+	bool checkValidMove      (MoveSnapshot const &m, float reportedSpeed);
+	bool isLocationValid     (Vector const &position_w, CellObject const *cell) const;
+	void logMoveFailed       (char const *reason);
+	bool handleInvalidMove   (char const *reason);
+	bool handleMove          (Vector const &position_w, uint32 syncStamp, float reportedSpeed);
+	bool handleMove          (Vector const &position_p, NetworkId const &cellObjectId, uint32 syncStamp, float reportedSpeed);
+	void updateMaxMoveSpeed  ();
+	uint32 getCurSyncStamp   () const;
+	void updateMovementType  (float time);
+	void handleObjectMenuRequest(MessageQueueObjectMenuRequest const *msg);
+	void playerMovedAndNeedsToCancelWarmup( CreatureObject &owner );
+
+	static PlayerObject * getPlayerObjectInternal(CreatureObject const * creature);
+
+protected:
+	virtual void handleMessage (int message, float value, const MessageQueue::Data* data, uint32 flags);
+
+private:
+	std::set<int>  m_teleportIds;
+	MoveSnapshot   m_lastVerifiedMove;
+	int64          m_lastTimeSynchronization;
+	int            m_lastWeatherIndex;
+	Vector         m_lastWeatherWindVelocity_w;
+	RecentMaxSyncedValue m_speedMaximum;
+	float          m_movingTimeout;
+	uint32         m_lastMoveSyncStamp;
+	float          m_lastSpeed;
+	time_t         m_lastSpeedCheckFailureTime;
+	int            m_speedCheckConsecutiveFailureCount;
+	bool           m_resendSpeedMax;
+};
+
+// ----------------------------------------------------------------------
+
+inline float const PlayerCreatureController::getServerSpeedForPlayer() const
+{
+	return m_speedMaximum.getLastSetValue();
+}
+
+// ======================================================================
+
+#endif // PlayerCreatureController_H
+
diff --git a/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp b/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp
new file mode 100644
index 00000000..2d62f13d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp
@@ -0,0 +1,827 @@
+// ======================================================================
+//
+// PlayerShipController.cpp
+// asommers
+//
+// copyright 2003, sony online entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PlayerShipController.h"
+
+#include "serverGame/AiShipBehaviorDock.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/PlayerShipTurretTargetingSystem.h"
+#include "serverGame/ServerShipObjectInterface.h"
+#include "serverGame/ShipAiEnemySearchManager.h"
+#include "serverGame/ShipClientUpdateTracker.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/TangibleObject.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedDebug/DebugFlags.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedGame/ShipDynamicsModel.h"
+#include "sharedLog/Log.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/MessageQueueDataTransform.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedNetworkMessages/MessageQueueSpaceMiningSellResource.h"
+#include "sharedNetworkMessages/MessageQueueTeleportAck.h"
+#include "sharedNetworkMessages/ShipUpdateTransformCollisionMessage.h"
+#include "sharedNetworkMessages/ShipUpdateTransformMessage.h"
+#include "sharedObject/AlterResult.h"
+#include "sharedObject/NetworkIdManager.h"
+
+#include <map>
+
+// ======================================================================
+// PlayerShipControllerNamespace
+// ======================================================================
+
+namespace PlayerShipControllerNamespace
+{
+	bool ms_logHandleNetUpdateTransform;
+
+	void remove();
+
+	float const s_targetedByAiExpireTime = 20.0f;
+
+	int syncStampLongDeltaTime(uint32 stamp1, uint32 stamp2)
+	{
+		uint32 const delta = stamp1 - stamp2;
+		if (delta > 0x7fffffff)
+			return static_cast<int>(0xffffffff-delta);
+		return static_cast<int>(delta);
+	}
+
+}
+
+using namespace PlayerShipControllerNamespace;
+
+// ======================================================================
+
+void PlayerShipController::install()
+{
+	DebugFlags::registerFlag(ms_logHandleNetUpdateTransform, "ServerGame/RemoteShipController", "logHandleNetUpdateTransform*");
+	ExitChain::add(&remove, "PlayerShipController::remove");
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipControllerNamespace::remove()
+{
+	DebugFlags::unregisterFlag(ms_logHandleNetUpdateTransform);
+}
+
+// ======================================================================
+// PUBLIC PlayerShipController
+// ======================================================================
+
+PlayerShipController::PlayerShipController(ShipObject * const owner) :
+	ShipController(owner),
+	m_clientToServerLastSyncStamp(0),
+	m_teleportIds(),
+	m_shipAccelRate(owner->getShipActualAccelerationRate(), ConfigServerGame::getShipMoveCheckIntervalMs(), ConfigServerGame::getShipMoveCheckFudgeTimeMs()),
+	m_shipDecelRate(owner->getShipActualDecelerationRate(), ConfigServerGame::getShipMoveCheckIntervalMs(), ConfigServerGame::getShipMoveCheckFudgeTimeMs()),
+	m_shipYprMaximum(owner->getShipActualYprRateMaximum(), ConfigServerGame::getShipMoveCheckIntervalMs(), ConfigServerGame::getShipMoveCheckFudgeTimeMs()),
+	m_shipSpeedMaximum(owner->getShipActualSpeedMaximum(), ConfigServerGame::getShipMoveCheckIntervalMs(), ConfigServerGame::getShipMoveCheckFudgeTimeMs()),
+	m_lastVerifiedTransform(),
+	m_lastVerifiedSpeed(0.f),
+	m_lastVerifiedSyncStamp(0),
+	m_gunnerWeaponIndexList(new GunnerWeaponIndexList),
+	m_targetedByAiTimer(s_targetedByAiExpireTime)
+{
+	preventMovementUpdates();
+}
+
+// ----------------------------------------------------------------------
+
+PlayerShipController::~PlayerShipController()
+{
+	delete m_gunnerWeaponIndexList;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::endBaselines()
+{
+	if (getAuthoritative())
+	{
+		ShipObject * const ship = getShipOwner();
+		ship->clearCondition(static_cast<int>(TangibleObject::C_docking));
+
+		m_shipAccelRate.setValue(ship->getShipActualAccelerationRate(), 0);
+		m_shipDecelRate.setValue(ship->getShipActualDecelerationRate(), 0);
+		m_shipYprMaximum.setValue(ship->getShipActualYprRateMaximum(), 0);
+		m_shipSpeedMaximum.setValue(ship->getShipActualSpeedMaximum(), 0);
+	}
+
+	m_yawPosition = 0.f;
+	m_pitchPosition = 0.f;
+	m_rollPosition = 0.f;
+	m_throttlePosition = 0.f;
+
+	ShipController::endBaselines();
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::setAuthoritative(bool newAuthoritative)
+{
+	ShipController::setAuthoritative(newAuthoritative);
+
+	if (!newAuthoritative)
+		preventMovementUpdates();
+	else
+	{
+		ShipObject const * const ship = NON_NULL(getShipOwner());
+		if (ship->getClient())
+			resyncMovementUpdates();
+
+		m_shipAccelRate.setValue(ship->getShipActualAccelerationRate(), 0);
+		m_shipDecelRate.setValue(ship->getShipActualDecelerationRate(), 0);
+		m_shipYprMaximum.setValue(ship->getShipActualYprRateMaximum(), 0);
+		m_shipSpeedMaximum.setValue(ship->getShipActualSpeedMaximum(), 0);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::onClientReady()
+{
+	m_clientToServerLastSyncStamp = 0;
+	if (getAuthoritative())
+		resyncMovementUpdates();
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::onClientLost()
+{
+	m_yawPosition = 0.f;
+	m_pitchPosition = 0.f;
+	m_rollPosition = 0.f;
+	m_throttlePosition = 0.f;
+	preventMovementUpdates();
+	unDock();
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::receiveTransform(ShipUpdateTransformMessage const & shipUpdateTransformMessage)
+{
+	if (isTeleporting())
+		return;
+
+	ShipObject * const owner = NON_NULL(getShipOwner());
+
+	if (owner->hasCondition(static_cast<int>(TangibleObject::C_docking)))
+		return;
+
+	uint32 const syncStamp = shipUpdateTransformMessage.getSyncStampLong();
+	if (   m_clientToServerLastSyncStamp == 0
+	    || syncStampLongDeltaTime(m_clientToServerLastSyncStamp, syncStamp) > 0)
+	{
+		m_clientToServerLastSyncStamp = syncStamp;
+
+		Transform const &transform = shipUpdateTransformMessage.getTransform();
+		Vector const &velocity = shipUpdateTransformMessage.getVelocity();
+		float const speed = velocity.magnitude();
+
+		if (!checkValidMove(transform, velocity, speed, syncStamp))
+			teleport(m_lastVerifiedTransform, 0);
+		else
+		{
+			m_shipDynamicsModel->setTransform(transform);
+			m_shipDynamicsModel->setVelocity(velocity);
+
+			ServerShipObjectInterface const serverShipObjectInterface(owner);
+
+			//-- Transform speeds into throttle positions and compute delta time
+			m_throttlePosition = 0.f;
+			m_yawPosition = 0.f;
+			m_pitchPosition = 0.f;
+			m_rollPosition = 0.f;
+			float deltaTime = 0.f;
+
+			Client const * const client = owner->getClient();
+			if (client)
+			{
+				CreatureObject const * const pilot = safe_cast<CreatureObject const *>(client->getCharacterObject());
+				if (pilot && !pilot->getState(States::Frozen))
+				{
+					if (serverShipObjectInterface.getMaximumSpeed() > 0.f)
+						m_throttlePosition = clamp(0.f, speed / serverShipObjectInterface.getMaximumSpeed(), 1.f);
+					if (serverShipObjectInterface.getMaximumYaw() > 0.f)
+						m_yawPosition = clamp(-1.f, shipUpdateTransformMessage.getYawRate() / serverShipObjectInterface.getMaximumYaw(), 1.f);
+					if (serverShipObjectInterface.getMaximumPitch() > 0.f)
+						m_pitchPosition = clamp(-1.f, shipUpdateTransformMessage.getPitchRate() / serverShipObjectInterface.getMaximumPitch(), 1.f);
+					if (serverShipObjectInterface.getMaximumRoll() > 0.f)
+						m_rollPosition = clamp(-1.f, shipUpdateTransformMessage.getRollRate() / serverShipObjectInterface.getMaximumRoll(), 1.f);
+
+					deltaTime = client->computeDeltaTimeInSeconds(syncStamp);
+				}
+			}
+
+			//-- Advance by delta time
+			m_shipDynamicsModel->model(deltaTime, m_yawPosition, m_pitchPosition, m_rollPosition, m_throttlePosition, serverShipObjectInterface);
+
+			DEBUG_REPORT_LOG(ms_logHandleNetUpdateTransform, ("PlayerShipController::handleNetUpdateTransform[%s]: %1.2f\n", owner->getNetworkId().getValueString().c_str(), m_throttlePosition));
+		}
+	}
+	else
+		DEBUG_REPORT_LOG(true, ("PlayerShipController::handleNetUpdateTransform[%s]: disregarding older packet\n", owner->getNetworkId().getValueString().c_str()));
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::teleport(Transform const &goal, ServerObject *goalObj)
+{
+	ShipObject * const ship = NON_NULL(getShipOwner());
+	Client * const client = ship->getClient();
+
+	if (client && !goalObj)
+	{
+		int const sequenceId = static_cast<int>(ship->getAndIncrementMoveSequenceNumber());
+		IGNORE_RETURN(m_teleportIds.insert(sequenceId));
+
+		appendMessage(
+			CM_netUpdateTransform,
+			0.f,
+			new MessageQueueDataTransform(0, sequenceId, goal, 0.f, 0.f, false),
+			GameControllerMessageFlags::RELIABLE|GameControllerMessageFlags::SEND|GameControllerMessageFlags::DEST_AUTH_CLIENT);
+
+		m_lastVerifiedTransform = goal;
+		m_lastVerifiedSpeed = 0;
+		m_lastVerifiedSyncStamp = getCurSyncStamp();
+	}
+
+	ShipController::teleport(goal, goalObj);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::handleMessage(int const message, float const value, MessageQueue::Data const * const data, uint32 const flags)
+{
+	switch (message)
+	{
+	case CM_teleportAck:
+		{
+			MessageQueueTeleportAck const * const msg = dynamic_cast<MessageQueueTeleportAck const *>(data);
+			if (msg)
+				handleTeleportAck(msg->getSequenceId());
+		}
+		break;
+	case CM_shipStopFiring:
+		{
+			ShipObject * const ship = NON_NULL(getShipOwner());
+
+			typedef MessageQueueGenericValueType<int> MessageType;			
+			MessageType const * const msg = dynamic_cast<MessageType const *>(data);
+
+			if (msg)
+			{
+				int const weaponIndex = msg->getValue();
+				ship->stopFiringWeapon(weaponIndex);
+			}
+		}
+		break;
+
+	case CM_spaceMiningSaleSellResource:
+		{
+			MessageQueueSpaceMiningSellResource const * const msg = dynamic_cast<MessageQueueSpaceMiningSellResource const *>(data);
+			if (msg != NULL)
+			{
+				ServerObject * const spaceStation = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(msg->m_spaceStationId));
+				if (NULL == spaceStation)
+				{
+					WARNING(true, ("PlayerCreatureController CM_spaceMiningSaleSellResource invalid station [%s]", msg->m_spaceStationId.getValueString().c_str()));
+				}
+				else
+				{
+					GameScriptObject * const scriptObject = spaceStation->getScriptObject();
+					if (scriptObject)
+					{
+						ScriptParams params;
+						params.addParam(getOwner()->getNetworkId());
+						params.addParam(msg->m_shipId);
+						params.addParam(msg->m_spaceStationId);
+						params.addParam(msg->m_resourceId);
+						params.addParam(msg->m_amount);
+						scriptObject->trigAllScripts(Scripting::TRIG_SPACE_MINING_SELL_RESOURCE, params);
+					}
+				}
+			}
+		}
+		break;
+
+	default:
+		ShipController::handleMessage(message, value, data, flags);
+		break;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::onShipAccelerationRateChanged(float value)
+{
+	m_shipAccelRate.setValue(value, getCurSyncStamp());
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::onShipDecelerationRateChanged(float value)
+{
+	m_shipDecelRate.setValue(value, getCurSyncStamp());
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::onShipYprMaximumChanged(float value)
+{
+	m_shipYprMaximum.setValue(value, getCurSyncStamp());
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::onShipSpeedMaximumChanged(float value)
+{
+	m_shipSpeedMaximum.setValue(value, getCurSyncStamp());
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerShipController::isTeleporting() const
+{
+	return !m_teleportIds.empty();
+}
+
+// ======================================================================
+// PROTECTED PlayerShipController
+// ======================================================================
+
+float PlayerShipController::realAlter(float const elapsedTime)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("PlayerShipController::realAlter");
+
+	ShipObject * const owner = getShipOwner();
+
+	if (!owner || !owner->isInWorld())
+		return ShipController::realAlter(elapsedTime);
+
+	if (owner && owner->isInitialized())
+	{
+		if (m_pendingDockingBehavior != NULL)
+		{
+			delete m_dockingBehavior;
+			m_dockingBehavior = m_pendingDockingBehavior;
+			m_pendingDockingBehavior = NULL;
+
+			getShipOwner()->setCondition(static_cast<int>(TangibleObject::C_docking));
+			Client * const client = owner->getClient();
+
+			if (client != NULL)
+			{
+				ShipClientUpdateTracker::queueForUpdate(*client, *owner);
+			}
+			else
+			{
+				unDock();
+			}
+		}
+
+		if (   (m_dockingBehavior != NULL)
+		    && m_dockingBehavior->isDockFinished())
+		{
+			delete m_dockingBehavior;
+			m_dockingBehavior = NULL;
+
+			getShipOwner()->clearCondition(static_cast<int>(TangibleObject::C_docking));
+		}
+
+		if (m_dockingBehavior != NULL)
+		{
+			//-- The docking behavior will calculate new values for m_yaw/m_pitch/m_roll/m_throttle[Position] implicitly through calling ShipController members
+			m_dockingBehavior->alter(elapsedTime);
+		}
+
+		//-- Update flight model
+		ServerShipObjectInterface const serverShipObjectInterface(owner);
+		m_shipDynamicsModel->model(elapsedTime, m_yawPosition, m_pitchPosition, m_rollPosition, m_throttlePosition, serverShipObjectInterface);
+
+		//-- Update the server position based on the model
+		owner->setTransform_o2p(m_shipDynamicsModel->getTransform());
+
+		// Request new enemies for any turrets
+
+		if (   hasTurretTargetingSystem()
+		    && !m_enemyCheckQueued)
+		{
+			m_enemyCheckQueued = true;
+			ShipAiEnemySearchManager::add(*owner);
+		}
+
+		if (m_targetedByAiTimer.updateNoReset(elapsedTime))
+		{
+			owner->clearCondition(static_cast<int>(TangibleObject::C_spaceCombatMusic));
+		}
+	}
+
+	//-- Chain back up to parent
+	float alterResult = ShipController::realAlter(elapsedTime);
+
+	AlterResult::incorporateAlterResult(alterResult, AlterResult::cms_alterNextFrame);
+	return alterResult;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::handleNetUpdateTransform(MessageQueueDataTransform const & /*message*/)
+{
+	//-- This message should be handled in handleMessage
+	DEBUG_FATAL(true, ("PlayerShipController::handleNetUpdateTransform: not implemented (nor should it be)"));
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::handleNetUpdateTransformWithParent(MessageQueueDataTransformWithParent const & /*message*/)
+{
+	//-- This message should be handled in handleMessage
+	DEBUG_FATAL(true, ("PlayerShipController::handleNetUpdateTransformWithParent: not implemented (nor should it be)"));
+}
+
+// ======================================================================
+// PRIVATE PlayerShipController
+// ======================================================================
+
+void PlayerShipController::preventMovementUpdates()
+{
+	m_teleportIds.clear();
+	IGNORE_RETURN(m_teleportIds.insert(-1));
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::handleTeleportAck(int sequenceId)
+{
+	IGNORE_RETURN(m_teleportIds.erase(sequenceId));
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::resyncMovementUpdates()
+{
+	// We resync updates by doing a fake teleport, giving a negative
+	// sequence so the client does not actually do the movement.
+	// This locks out movement updates until the teleport is acknowledged.
+
+	ShipObject * const ship = NON_NULL(getShipOwner());
+	Client * const client = ship->getClient();
+
+	FATAL(!client || !ship->isAuthoritative(), ("Tried to resync ship movement updates either while nonauth or without a client!"));
+
+	m_teleportIds.clear();
+
+	int sequenceId = -1;
+	while (sequenceId == -1)
+		sequenceId = -static_cast<int>(ship->getAndIncrementMoveSequenceNumber());
+
+	IGNORE_RETURN(m_teleportIds.insert(sequenceId));
+
+	appendMessage(
+		CM_netUpdateTransform,
+		0.f,
+		new MessageQueueDataTransform(0, sequenceId, Transform::identity, 0.f, 0.f, false),
+		GameControllerMessageFlags::RELIABLE|GameControllerMessageFlags::SEND|GameControllerMessageFlags::DEST_AUTH_CLIENT);
+
+	m_lastVerifiedTransform = m_shipDynamicsModel->getTransform();
+	m_lastVerifiedSpeed = m_shipDynamicsModel->getSpeed();
+	m_lastVerifiedSyncStamp = getCurSyncStamp();
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::experiencedCollision()
+{
+	ShipObject * const owner = getShipOwner();
+	if (owner != 0)
+	{
+		Client* client = owner->getClient();
+
+		if (client != 0)
+		{
+			ShipUpdateTransformCollisionMessage const collisionMessage(
+				owner->getNetworkId(),
+				getTransform(),
+				getVelocity(),
+				client->getServerSyncStampLong());
+			client->send(collisionMessage, false);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+uint32 PlayerShipController::getCurSyncStamp() const
+{
+	Client const * const client = NON_NULL(getShipOwner())->getClient();
+	return client ? client->getServerSyncStampLong() : 0;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::logMoveFail(char const *reasonFmt, ...) const
+{
+	ShipObject const * const ship = NON_NULL(getShipOwner());
+	Client const * const client = NON_NULL(ship->getClient());
+
+	char reason[512];
+	va_list ap;
+	va_start(ap, reasonFmt);
+	IGNORE_RETURN(_vsnprintf(reason, sizeof(reason)-1, reasonFmt, ap));
+	reason[sizeof(reason)-1] = '\0';
+
+	LOG(
+		"shipmove",
+		(
+			"fail - ship %s creature %s stationId %u - %s",
+			ship->getNetworkId().getValueString().c_str(),
+			client->getCharacterObjectId().getValueString().c_str(),
+			client->getStationId(),
+			reason));
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerShipController::checkValidMove(Transform const &transform, Vector const &velocity, float speed, uint32 const currentClientSyncStamp)
+{
+	if (!ConfigServerGame::getShipMoveValidationEnabled())
+		return true;
+
+	ShipObject * const owner = NON_NULL(getShipOwner());
+	Client const * const client = NON_NULL(owner->getClient());
+
+	// gods can move however they like, and assume their moves are valid
+	if (!client->isGod())
+	{
+		uint32 const currentServerSyncStamp = client->getServerSyncStampLong();
+		uint32 const previousClientSyncStamp = m_lastVerifiedSyncStamp;
+		int const timeDiffMs = syncStampLongDeltaTime(previousClientSyncStamp, currentClientSyncStamp);
+		float const timeDiffSec = static_cast<float>(timeDiffMs)*0.001f;
+		float const tolerance = ConfigServerGame::getShipMoveCheckTolerance();
+		float const timeTolerance = ConfigServerGame::getShipMoveCheckTimeToleranceSeconds();
+
+		// is our new speed valid?
+		float const speedMaximum = m_shipSpeedMaximum.getRecentMaximum(currentServerSyncStamp);
+		if (speed > speedMaximum*tolerance)
+		{
+			logMoveFail("too fast (speed=%g, speedMax=%g, timeDiff=%g, time %u)", speed, speedMaximum, timeDiffSec, currentClientSyncStamp);
+			return false;
+		}
+
+		// Only do position/rotation validation periodically, since their timestamps
+		// can be affected by latency variation.
+		if (timeDiffMs < ConfigServerGame::getShipMoveCheckIntervalMs())
+		{
+			// assume we're ok to move, but don't update the last verified
+			return true;
+		}
+
+		// check for bogus timestamps, making sure to handle timestamp rollover
+		if (ConfigServerGame::getMoveValidationCheckForPastTimestamp())
+		{
+			// new timestamp from client must be greater than previous timestamp from client (i.e. cannot travel back in time)
+			if (currentClientSyncStamp < previousClientSyncStamp)
+			{
+				uint32 const rolloverFudgeFactor = static_cast<uint32>(100000); // 100 seconds
+
+				// pretty sure that timestamp did not rollover
+				if ((previousClientSyncStamp > rolloverFudgeFactor) && ((std::numeric_limits<uint32>::max() - rolloverFudgeFactor) > previousClientSyncStamp))
+				{
+					int const timeDiffMs = syncStampLongDeltaTime(previousClientSyncStamp, currentClientSyncStamp);
+
+					// only fail movement if the difference is beyond a certain threshold,
+					// to account for network latency, UDP unreliability, clock drift, etc.
+					if (timeDiffMs > ConfigServerGame::getMoveValidationPastTimestampThresholdMs())
+					{
+						logMoveFail("out of order timestamps (%dms), oss=%lu, css=%lu (%lud:%luh:%lum:%lus), ssc=%lu",
+							timeDiffMs,
+							previousClientSyncStamp,
+							currentServerSyncStamp,
+							(currentServerSyncStamp / 1000) / (60 * 60 * 24),
+							((currentServerSyncStamp / 1000) % (60 * 60 * 24)) / (60 * 60),
+							((currentServerSyncStamp / 1000) % (60 * 60)) / 60,
+							(currentServerSyncStamp / 1000) % 60,
+							currentClientSyncStamp);
+
+						return false;
+					}
+				}
+			}
+		}
+
+		// check for bogus timestamps, making sure to handle timestamp rollover
+		if (ConfigServerGame::getMoveValidationCheckForFutureTimestamp())
+		{
+			// new timestamp from client must be less than the current server timestamp (i.e. cannot travel into the future)
+			if (currentClientSyncStamp > currentServerSyncStamp)
+			{
+				uint32 const rolloverFudgeFactor = static_cast<uint32>(100000); // 100 seconds
+
+				// pretty sure that timestamp did not rollover
+				if ((currentServerSyncStamp > rolloverFudgeFactor) && ((std::numeric_limits<uint32>::max() - rolloverFudgeFactor) > currentServerSyncStamp))
+				{
+					int const timeDiffMs = syncStampLongDeltaTime(currentClientSyncStamp, currentServerSyncStamp);
+
+					// only fail movement if the difference is beyond a certain threshold,
+					// to account for network latency, UDP unreliability, clock drift, etc.
+					if (timeDiffMs > ConfigServerGame::getMoveValidationFutureTimestampThresholdMs())
+					{
+						logMoveFail("timestamp from the future (%dms), oss=%lu, css=%lu (%lud:%luh:%lum:%lus), ssc=%lu",
+							timeDiffMs,
+							previousClientSyncStamp,
+							currentServerSyncStamp,
+							(currentServerSyncStamp / 1000) / (60 * 60 * 24),
+							((currentServerSyncStamp / 1000) % (60 * 60 * 24)) / (60 * 60),
+							((currentServerSyncStamp / 1000) % (60 * 60)) / 60,
+							(currentServerSyncStamp / 1000) % 60,
+							currentClientSyncStamp);
+
+						return false;
+					}
+				}
+			}
+		}
+
+		// make sure the client and server time hasn't drifted too far apart
+		if (ConfigServerGame::getMoveValidationCheckForTimestampDrift())
+		{
+			int const clientServerTimeDiff = syncStampLongDeltaTime(currentClientSyncStamp, currentServerSyncStamp);
+			if (clientServerTimeDiff > ConfigServerGame::getMoveValidationTimestampDriftThresholdMs())
+			{
+				logMoveFail("timestamp drift (%dms), oss=%lu, css=%lu (%lud:%luh:%lum:%lus), ssc=%lu",
+					clientServerTimeDiff,
+					previousClientSyncStamp,
+					currentServerSyncStamp,
+					(currentServerSyncStamp / 1000) / (60 * 60 * 24),
+					((currentServerSyncStamp / 1000) % (60 * 60 * 24)) / (60 * 60),
+					((currentServerSyncStamp / 1000) % (60 * 60)) / 60,
+					(currentServerSyncStamp / 1000) % 60,
+					currentClientSyncStamp);
+
+				return false;
+			}
+		}
+
+		// could we possibly have changed position enough?
+		Vector const &lastPosition = m_lastVerifiedTransform.getPosition_p();
+		Vector const &position = transform.getPosition_p();
+		float const distanceSquared = lastPosition.magnitudeBetweenSquared(position);
+		if (distanceSquared > sqr(speedMaximum*(timeDiffSec+timeTolerance)*tolerance)+0.2f)
+		{
+			logMoveFail(
+				"too far (distSquared=%g, maxDistSquared=%g, timeDiff=%g from [%g,%g,%g] to [%g,%g,%g], time %u)",
+				distanceSquared, sqr(speedMaximum*timeDiffSec), timeDiffSec,
+				lastPosition.x, lastPosition.y, lastPosition.z,
+				position.x, position.y, position.z, currentClientSyncStamp);
+			return false;
+		}
+
+		// could we possibly have changed speeds enough?
+		float const oldSpeed = m_lastVerifiedSpeed;
+		if (speed > oldSpeed)
+		{
+			float const accel = (oldSpeed-speed)/(timeDiffSec+timeTolerance);
+			float const maxAccel = m_shipAccelRate.getRecentMaximum(currentServerSyncStamp);
+			if (accel > maxAccel*tolerance)
+			{
+				logMoveFail("too much acceleration (accel=%g, maxAccel=%g, time %u)", accel, maxAccel, currentClientSyncStamp);
+				return false;
+			}
+		}
+		else if (speed < oldSpeed)
+		{
+			float const decel = (speed-oldSpeed)/(timeDiffSec+timeTolerance);
+			float const maxDecel = m_shipDecelRate.getRecentMaximum(currentServerSyncStamp);
+			if (decel > maxDecel*tolerance)
+			{
+				logMoveFail("too much deceleration (decel=%g, maxDecel=%g, time %u)", decel, maxDecel, currentClientSyncStamp);
+				return false;
+			}
+		}
+
+		// could we possibly have changed orientation enough?
+		float const rotation = acos(transform.getLocalFrameK_p().dot(m_lastVerifiedTransform.getLocalFrameK_p()))/(timeDiffSec+timeTolerance);
+		float const maxRotation = m_shipYprMaximum.getRecentMaximum(currentServerSyncStamp);
+		// Actual max rotation is roughly sqrt(2*sqr(maxRotation))+0.001f, to allow
+		// for pitch/yaw/roll together being applied toward the same direction, and
+		// adjust slightly for precision.
+		if (sqr(rotation) > 2*sqr(maxRotation*tolerance)+0.001f)
+		{
+			logMoveFail("too much rotation (rotation=%g, maxRotation=%g, time %u)", rotation, maxRotation, currentClientSyncStamp);
+			return false;
+		}
+	}
+
+	UNREF(velocity);
+	m_lastVerifiedTransform = transform;
+	m_lastVerifiedSpeed = speed;
+	m_lastVerifiedSyncStamp = currentClientSyncStamp;
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+PlayerShipController * PlayerShipController::asPlayerShipController()
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+PlayerShipController const * PlayerShipController::asPlayerShipController() const
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerShipController::shouldCheckForEnemies() const
+{
+	return (getShipOwner()->hasTurrets());
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::updateGunnerWeaponIndex(NetworkId const & player, int const gunnerWeaponIndex)
+{
+	GunnerWeaponIndexList::iterator iterGunnerWeaponIndexList = m_gunnerWeaponIndexList->find(player);
+
+	if (iterGunnerWeaponIndexList != m_gunnerWeaponIndexList->end())
+	{
+		int const previousGunnerWeaponIndex = iterGunnerWeaponIndexList->second;
+		iterGunnerWeaponIndexList->second = gunnerWeaponIndex;
+
+		if (   (previousGunnerWeaponIndex >= 0)
+			&& (gunnerWeaponIndex == -1))
+		{
+			// Gunner is exiting a gun
+
+			setWeaponIndexPlayerControlled(previousGunnerWeaponIndex, false);
+			m_gunnerWeaponIndexList->erase(iterGunnerWeaponIndexList);
+		}
+		else if (previousGunnerWeaponIndex != gunnerWeaponIndex)
+		{
+			// Gunner was previously in a gun and is moving to a new gun
+
+			setWeaponIndexPlayerControlled(previousGunnerWeaponIndex, false);
+			setWeaponIndexPlayerControlled(gunnerWeaponIndex, true);
+		}
+	}
+	else
+	{
+		if (gunnerWeaponIndex >= 0)
+		{
+			// Gunner is entering a gun and was previously not in a gun
+
+			setWeaponIndexPlayerControlled(gunnerWeaponIndex, true);
+			IGNORE_RETURN(m_gunnerWeaponIndexList->insert(std::make_pair(player, gunnerWeaponIndex)));
+		}
+		else
+		{
+			// Gunner is not entering a gun and was not previously in a gun
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::setWeaponIndexPlayerControlled(int const weaponIndex, bool const playerControlled)
+{
+	DEBUG_FATAL((weaponIndex < 0), ("Invalid weaponIndex(%d)", weaponIndex));
+
+	if (m_turretTargetingSystem != NULL)
+	{
+		safe_cast<PlayerShipTurretTargetingSystem*>(m_turretTargetingSystem)->setWeaponIndexPlayerControlled(weaponIndex, playerControlled);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerShipController::addAiTargetingMe(NetworkId const & unit)
+{
+	ShipController::addAiTargetingMe(unit);
+
+	if (m_targetedByAiTimer.isExpired())
+	{
+		getShipOwner()->setCondition(static_cast<int>(TangibleObject::C_spaceCombatMusic));
+	}
+
+	m_targetedByAiTimer.reset();
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/controller/PlayerShipController.h b/engine/server/library/serverGame/src/shared/controller/PlayerShipController.h
new file mode 100644
index 00000000..fdf02467
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/PlayerShipController.h
@@ -0,0 +1,100 @@
+// ======================================================================
+//
+// PlayerShipController.h
+// asommers
+//
+// copyright 2004, sony online entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_PlayerShipController_H
+#define INCLUDED_PlayerShipController_H
+
+// ======================================================================
+
+#include "serverGame/ShipController.h"
+#include "serverUtility/RecentMaxSyncedValue.h"
+#include "sharedFoundation/Timer.h"
+
+// ======================================================================
+
+class ShipUpdateTransformMessage;
+
+// ======================================================================
+
+class PlayerShipController : public ShipController
+{
+public:
+
+	static void install();
+
+public:
+
+	explicit PlayerShipController(ShipObject * const owner);
+	virtual ~PlayerShipController();
+
+	virtual void endBaselines();
+	virtual void setAuthoritative(bool newAuthoritative);
+	virtual void onClientReady();
+	virtual void onClientLost();
+	virtual void teleport(Transform const &goal, ServerObject *goalObj);
+
+	virtual PlayerShipController * asPlayerShipController();
+	virtual PlayerShipController const * asPlayerShipController() const;
+
+	void receiveTransform(ShipUpdateTransformMessage const & shipUpdateTransformMessage);
+	void onShipAccelerationRateChanged(float value);
+	void onShipDecelerationRateChanged(float value);
+	void onShipYprMaximumChanged(float value);
+	void onShipSpeedMaximumChanged(float value);
+
+	virtual bool shouldCheckForEnemies() const;
+	void updateGunnerWeaponIndex(NetworkId const & player, int const gunnerWeaponIndex);
+	void setWeaponIndexPlayerControlled(int const weaponIndex, bool const playerControlled);
+
+	virtual void addAiTargetingMe(NetworkId const & unit);
+	bool isTeleporting() const;
+
+protected:
+	virtual void handleMessage(int message, float value, const MessageQueue::Data* data, uint32 flags);
+
+	virtual float realAlter(float elapsedTime);
+	virtual void handleNetUpdateTransform(MessageQueueDataTransform const & message);
+	virtual void handleNetUpdateTransformWithParent(MessageQueueDataTransformWithParent const & message);
+
+private:
+
+	PlayerShipController();
+	PlayerShipController(PlayerShipController const &);
+	PlayerShipController & operator=(PlayerShipController const &);
+
+	void preventMovementUpdates();
+	void handleTeleportAck(int sequenceId);
+	void resyncMovementUpdates();
+
+	virtual void experiencedCollision();
+
+	uint32 getCurSyncStamp() const;
+	bool checkValidMove(Transform const &transform, Vector const &velocity, float speed, uint32 syncStamp);
+	void logMoveFail(char const *reasonFmt, ...) const;
+
+private:
+
+	typedef stdmap<NetworkId, int>::fwd GunnerWeaponIndexList;
+
+	uint32 m_clientToServerLastSyncStamp;
+	std::set<int> m_teleportIds;
+	RecentMaxSyncedValue m_shipAccelRate;
+	RecentMaxSyncedValue m_shipDecelRate;
+	RecentMaxSyncedValue m_shipYprMaximum;
+	RecentMaxSyncedValue m_shipSpeedMaximum;
+	Transform m_lastVerifiedTransform;
+	float m_lastVerifiedSpeed;
+	uint32 m_lastVerifiedSyncStamp;
+	GunnerWeaponIndexList * const m_gunnerWeaponIndexList;
+	Timer m_targetedByAiTimer;
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/controller/ResourceContainerController.cpp b/engine/server/library/serverGame/src/shared/controller/ResourceContainerController.cpp
new file mode 100644
index 00000000..4ed0d48a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/ResourceContainerController.cpp
@@ -0,0 +1,26 @@
+// ======================================================================
+//
+// ResourceContainerController.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ResourceContainerController.h"
+
+#include "serverGame/ResourceContainerObject.h"
+
+//-----------------------------------------------------------------------
+
+ResourceContainerController::ResourceContainerController(ResourceContainerObject * newOwner) :
+		TangibleController(newOwner)
+{
+}
+
+//-----------------------------------------------------------------------
+
+ResourceContainerController::~ResourceContainerController()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/controller/ResourceContainerController.h b/engine/server/library/serverGame/src/shared/controller/ResourceContainerController.h
new file mode 100644
index 00000000..7807928c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/ResourceContainerController.h
@@ -0,0 +1,30 @@
+//ResourceContainerController.h
+
+#ifndef	_WEAPON_CONTROLLER_H
+#define	_WEAPON_CONTROLLER_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/TangibleController.h"
+
+//----------------------------------------------------------------------
+
+class ResourceContainerObject;
+
+//-----------------------------------------------------------------------
+
+class ResourceContainerController : public TangibleController
+{
+public:
+    explicit ResourceContainerController         (ResourceContainerObject * newOwner);
+    ~ResourceContainerController                 (void);
+
+private:
+    ResourceContainerController				(void);
+    ResourceContainerController				(const ResourceContainerController & other);
+    ResourceContainerController	operator=	(const ResourceContainerController & other);
+};
+
+//-----------------------------------------------------------------------
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/controller/ServerController.cpp b/engine/server/library/serverGame/src/shared/controller/ServerController.cpp
new file mode 100644
index 00000000..bd5ffc3f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/ServerController.cpp
@@ -0,0 +1,1316 @@
+// ======================================================================
+//
+// ServerController.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerController.h"
+
+#include "LocalizationManager.h"
+#include "UnicodeUtils.h"
+#include "serverGame/CellObject.h"
+#include "serverGame/Client.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ServerCreatureObjectTemplate.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerWorld.h"
+#include "serverNetworkMessages/MessageQueueScriptTrigger.h"
+#include "serverNetworkMessages/MessageQueueTeleportObject.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/ChatLogManager.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedFoundation/DynamicVariableLocationData.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/Timer.h"
+#include "sharedGame/GameObjectTypes.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/MessageQueueCombatSpam.h"
+#include "sharedNetworkMessages/MessageQueueDataTransform.h"
+#include "sharedNetworkMessages/MessageQueueDataTransformWithParent.h"
+#include "sharedNetworkMessages/MessageQueueNetworkIdAndTransform.h"
+#include "sharedNetworkMessages/MessageQueueSocial.h"
+#include "sharedNetworkMessages/MessageQueueSpatialChat.h"
+#include "sharedNetworkMessages/MessageQueueString.h"
+#include "sharedNetworkMessages/ObjectChannelMessages.h"
+#include "sharedNetworkMessages/UpdateTransformMessage.h"
+#include "sharedNetworkMessages/UpdateTransformWithParentMessage.h"
+#include "sharedObject/AlterResult.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "swgServerNetworkMessages/MessageQueueScriptTransferMoney.h"
+
+//----------------------------------------------------------------------
+
+CellProperty const * getCell(Object const * obj)
+{
+	if(obj == NULL) return NULL;
+
+	return obj->getCellProperty();
+}
+
+//----------------------------------------------------------------------
+
+// ----------
+// This isn't being used yet...
+
+Vector		movePointBetweenCells ( Object const * oldCellObject, Object const * newCellObject, Vector position )
+{
+	if(oldCellObject == newCellObject) return position;
+
+	// ----------
+
+	Transform toWorld = Transform::identity;
+	Transform toCell = Transform::identity;
+
+	if(oldCellObject != NULL)
+	{
+		CellProperty const * oldCell = getCell(oldCellObject);
+
+		if(oldCell)
+		{
+			toWorld = oldCell->getOwner().getTransform_o2w();
+		}
+	}
+
+	if(newCellObject != NULL)
+	{
+		CellProperty const * newCell = getCell(newCellObject);
+
+		if(newCell)
+		{
+			toCell = newCell->getOwner().getTransform_o2w();
+		}
+	}
+
+	// ----------
+
+	Vector worldPos = toWorld.rotateTranslate_l2p(position);
+
+	Vector newCellPos = toCell.rotateTranslate_p2l(worldPos);
+
+	return newCellPos;
+}
+
+// ----------------------------------------------------------------------
+// This isn't being used yet...
+
+Transform	moveTransformBetweenCells ( Object const * oldCellObject, Object const * newCellObject, Transform const & inTransform )
+{
+	if(oldCellObject == newCellObject) return inTransform;
+
+	// ----------
+
+	Transform toWorld = Transform::identity;
+	Transform toCell = Transform::identity;
+
+	if(oldCellObject != NULL)
+	{
+		CellProperty const * oldCell = getCell(oldCellObject);
+
+		if(oldCell)
+		{
+			toWorld = oldCell->getOwner().getTransform_o2w();
+		}
+	}
+
+	if(newCellObject != NULL)
+	{
+		CellProperty const * newCell = getCell(newCellObject);
+
+		if(newCell)
+		{
+			toCell = newCell->getOwner().getTransform_o2w();
+		}
+	}
+
+	// ----------
+
+	// Out transform = toCell * toWorld * inTransform
+
+	Transform temp;
+
+	temp.multiply(toCell,toWorld);
+
+	Transform out;
+
+	out.multiply(temp,inTransform);
+
+	return out;
+}
+
+
+//-----------------------------------------------------------------------
+
+ServerController::MessageQueueNotification::MessageQueueNotification() :
+	Notification(),
+	m_serverController(0)
+{
+}
+
+//-----------------------------------------------------------------------
+
+ServerController::MessageQueueNotification::~MessageQueueNotification()
+{
+	m_serverController = 0;
+}
+
+//-----------------------------------------------------------------------
+
+void ServerController::MessageQueueNotification::setController(ServerController* serverController)
+{
+	m_serverController = serverController;
+}
+
+//-----------------------------------------------------------------------
+
+void ServerController::MessageQueueNotification::onChanged() const
+{
+	NOT_NULL(m_serverController);
+	m_serverController->onAppendMessage();
+}
+
+// ----------------------------------------------------------------------
+
+ServerController::ServerController(Object *newOwner) :
+		NetworkController         (newOwner),
+		m_sendReliableTransformThisFrame(true),
+		m_moveSequenceNumber      (0),
+		m_currentVelocity         (Vector::zero),
+		m_oldVelocity             (Vector::zero),
+		m_goalTransform           (Transform::identity),
+		m_goalCellObject          (),
+		m_bProcessingMessages     (false),
+		m_bHasGoal                (false),
+		m_bAtGoal                 (false),
+		m_bTeleport               (false),
+		m_alteredSinceConclude    (false),
+		m_notification            ()
+{
+	m_notification.setController (this);
+	setMessageQueueNotification (&m_notification);
+}
+
+// ----------------------------------------------------------------------
+
+ServerController::~ServerController(void)
+{
+}
+
+// ----------------------------------------------------------------------
+
+void ServerController::endBaselines()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void ServerController::setAuthoritative(bool newAuthoritative)
+{
+	if (!newAuthoritative && m_bHasGoal && m_goalCellObject)
+	{
+		m_goalCellObject = NULL;
+		m_bHasGoal = false;
+		m_bAtGoal = true;
+	}
+
+	NetworkController::setAuthoritative(newAuthoritative);
+}	// ServerController::setAuthoritative
+
+// ----------------------------------------------------------------------
+
+void ServerController::setOwner(Object *newOwner)
+{
+	NOT_NULL(safe_cast<ServerObject*>(newOwner));
+	Controller::setOwner(newOwner);
+}
+
+// ----------------------------------------------------------------------
+
+int ServerController::elevatorMove( int nFloors )
+{
+	CollisionProperty * collision = getOwner()->getCollisionProperty();
+
+	if(collision)
+	{
+		Transform elevatorTransform;
+
+		int movedFloors = collision->elevatorMove(nFloors,elevatorTransform);
+
+		if(movedFloors)
+		{
+			ServerObject * cellObject = dynamic_cast<ServerObject *>(&(getOwner()->getParentCell()->getOwner()));
+			teleport(elevatorTransform,cellObject);
+		}
+
+		return movedFloors;
+	}
+	else
+	{
+		return 0;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+float ServerController::realAlter(float time)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerController::realAlter");
+
+	int message;
+	real value;
+	MessageQueue::Data* data;
+	uint32 flags;
+
+	ServerObject *target = static_cast<ServerObject *>(getOwner());
+
+	// ----------
+
+	m_bProcessingMessages = true;
+
+	int i;
+	int const messageCount = getNumberOfMessages();
+	for (i = 0; i < messageCount; ++i)
+	{
+		getMessage(i, &message, &value, &data, &flags);
+		if (message)
+		{
+			// if the message is for an authoritative/proxy, make sure we are
+			// the right type
+			bool processMessage = false;
+			if (flags & GameControllerMessageFlags::DEST_AUTH_SERVER)
+			{
+				if (target->isAuthoritative())
+					processMessage = true;
+				else
+				{
+					if(ConfigServerGame::getEnableDebugControllerMessageSpam())
+					{
+						if(messageCount > 1000)
+						{
+							if(message == CM_scriptTrigger)
+							{
+								const MessageQueueScriptTrigger * const triggerMessage = dynamic_cast<const MessageQueueScriptTrigger *>(data);
+								if(triggerMessage)
+								{
+									const Scripting::TrigId trigId = static_cast<const Scripting::TrigId>(triggerMessage->getTriggerId());
+									LOG("ObjControllerMessageSTORM:CM_scriptTrigger", ("(%s:%s) received a CM_scriptTrigger. The object is not authoritative and there are over 1000 messages pending in the queue! script TrigId=%d", target->getObjectTemplateName(), target->getNetworkId().getValueString().c_str(), trigId));
+									if (!target->isPlayerControlled() && target->asCreatureObject())
+										target->unload();
+								}							
+							}
+						}
+					}
+				}
+			}
+			if (flags & GameControllerMessageFlags::DEST_PROXY_SERVER)
+			{
+				if (!target->isAuthoritative())
+					processMessage = true;
+			}
+			if (flags & GameControllerMessageFlags::DEST_SERVER)
+			{
+				processMessage = true;
+			}
+			if (processMessage)
+			{
+				handleMessage(message, value, data, flags);
+				//@todo clear if flags are not SEND messageQueue->clearMessage(i);
+			}
+		}
+	}
+
+	if(i > 0)
+	{
+		safe_cast<ServerObject *>(getOwner())->addObjectToConcludeList();
+	}
+
+	m_bProcessingMessages = false;
+
+	moveToGoal();
+
+	// ----------
+
+	m_alteredSinceConclude = true;
+
+	// No reason to force an alter next frame here.  Controller ensures
+	// we get an alter() if there are any messages in the message queue.
+	float alterResult = NetworkController::realAlter(time);
+	float defaultAlterTime = safe_cast<ServerObject *>(getOwner())->getDefaultAlterTime();
+	if (defaultAlterTime == AlterResult::cms_alterQuickly)
+		defaultAlterTime = Random::randomReal(0.25f, 0.45f);
+	AlterResult::incorporateExactAlterResult(alterResult, defaultAlterTime);
+	return alterResult;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerController::teleport(Transform const &goal, ServerObject *goalObject)
+{
+	setGoal(goal, goalObject, true);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerController::setGoal ( Transform const & newGoal, ServerObject * goalCellObject, bool teleport )
+{
+	m_goalTransform = newGoal;
+	m_goalCellObject = goalCellObject;
+
+	m_bHasGoal = true;
+	m_bAtGoal = false;
+	m_bTeleport = teleport;
+
+	// If setGoal isn't called while we're processing our message queue,
+	// set the creature to the goal position immediately instead of
+	// waiting until after all messages have been handled.
+
+	if(!m_bProcessingMessages)
+	{
+		moveToGoal();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool changeCells(ServerObject &object, ServerObject *newCellObject)
+{
+	bool result = false;
+
+	if (!object.isInWorld())
+	{
+		if (!newCellObject)
+		{
+			Container::ContainerErrorCode tmp = Container::CEC_Success;
+			result = ContainerInterface::transferItemToWorld(
+				object,
+				ContainerInterface::getTopmostContainer(object)->getTransform_o2p(),
+				0,
+				tmp);
+		}
+		else
+		{
+			Container::ContainerErrorCode tmp = Container::CEC_Success;
+			result = ContainerInterface::transferItemToCell(
+				*newCellObject,
+				object,
+				Transform::identity,
+				0,
+				tmp);
+		}
+
+		return result;
+	}
+
+  Object * const oldCellObject = object.getAttachedTo();
+
+	if (oldCellObject == newCellObject)
+		return true;
+
+	// ----------
+
+	if (newCellObject == NULL)
+	{
+		// Object was in a cell and is moving to the world, transfer from cell container to world
+
+		Transform const objectTransform = object.getTransform_o2p();
+		Transform const &newTransform = oldCellObject->getTransform_o2w().rotateTranslate_l2p(objectTransform);
+
+		Container::ContainerErrorCode tmp = Container::CEC_Success;
+		result = ContainerInterface::transferItemToWorld(object, newTransform, NULL, tmp);
+
+		if (!result)
+		{
+			DEBUG_REPORT_LOG(true, ("Object %s (id=%s) transfer to world was denied via ContainerInterface::transferItemToWorld()\n", object.getObjectTemplateName(), object.getNetworkId().getValueString().c_str()));
+
+			// The failed transfer may have mucked up the transform, so restore it now.
+			object.setTransform_o2p(objectTransform);
+		}
+	}
+	else
+	{
+		// Object is moving to a different cell
+
+		CellProperty * const pCell = ContainerInterface::getCell(*newCellObject);
+
+		DEBUG_REPORT_LOG(pCell == NULL, ("changeCells - Received transform with parent to a non-cell object.  This should only happen from the DB\n"));
+
+		if (pCell)
+		{
+			Transform objectTransform = object.getTransform_o2p();
+			Container::ContainerErrorCode tmp = Container::CEC_Success;
+			result = ContainerInterface::transferItemToCell(*newCellObject, object, NULL, tmp);
+
+			if (!result)
+			{
+				DEBUG_REPORT_LOG(true, ("Object %s (id=%s) transfer to cell (id=%s) was denied via ContainerInterface::transferItemToCell()\n", object.getObjectTemplateName(), object.getNetworkId().getValueString().c_str(), newCellObject->getNetworkId().getValueString().c_str()));
+
+				// The failed transfer may have mucked up the transform, so restore it now.
+				object.setTransform_o2p(objectTransform);
+			}
+		}
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerController::setObjectCell(ServerObject *pCellObject)
+{
+	ServerObject * const object = NON_NULL(static_cast<ServerObject *>(getOwner()));
+
+	return changeCells(*object, pCellObject);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerController::moveToGoal( void )
+{
+	if((m_bAtGoal) || (!m_bHasGoal))
+	{
+		return;
+	}
+
+	//@todo - This really needs to try and move the object to the goal first, and then
+	// if doing so doesn't put the object in the right cell, teleport the object to
+	// the correct cell. Same sort of thing as RemoteCreatureController.
+	ServerObject *owner = static_cast<ServerObject *>(getOwner());
+	if (m_goalCellObject)
+	{
+		if (!m_goalCellObject->isAuthoritative() && owner->isAuthoritative())
+		{
+			GenericValueTypeMessage<std::pair<NetworkId, NetworkId> > const rssMessage(
+				"RequestSameServer",
+				std::make_pair(
+					ContainerInterface::getTopmostContainer(*owner)->getNetworkId(),
+					ContainerInterface::getTopmostContainer(*m_goalCellObject)->getNetworkId()));
+			GameServer::getInstance().sendToPlanetServer(rssMessage);
+			return;
+		}
+	}
+
+	if (!setObjectCell(m_goalCellObject))
+	{
+		m_bHasGoal = false;
+		m_bAtGoal = true;
+		m_bTeleport = false;
+		onMoveFailed();
+		return;
+	}
+
+	Transform oldTransform = owner->getTransform_o2p();
+
+	if(oldTransform != m_goalTransform)
+	{
+		owner->setTransform_o2p(m_goalTransform);
+	}
+
+	if(m_bTeleport)
+	{
+		CollisionWorld::objectWarped(getOwner());
+	}
+
+	m_bHasGoal = false;
+	m_bAtGoal = true;
+	m_bTeleport = false;
+}
+
+//-----------------------------------------------------------------------
+
+void ServerController::handleNetUpdateTransform(const MessageQueueDataTransform& message)
+{
+	if (!getServerOwner()->isInitialized())
+	{
+		getServerOwner()->setTransform_o2p(message.getTransform());
+		return;
+	}
+
+	setGoal( message.getTransform(), NULL );
+}
+
+//-----------------------------------------------------------------------
+
+void ServerController::handleNetUpdateTransformWithParent(const MessageQueueDataTransformWithParent& message)
+{
+	if (!getServerOwner()->isInitialized())
+	{
+		getServerOwner()->setTransform_o2p(message.getTransform());
+		return;
+	}
+
+	const NetworkId &cellNetworkId = message.getParent();
+
+	Object *cellObject = NetworkIdManager::getObjectById(cellNetworkId);
+	ServerObject * serverCellObject = safe_cast<ServerObject*>(cellObject);
+
+	// ----------
+	//@todo remove after we have depersisting to interiors
+	//We don't want to depersist into non existant cell objects
+
+	if(!cellObject)
+	{
+		WARNING_STRICT_FATAL(true, ("WARNING: db or authoritative player says to depersist %s into a cell %s but we cannot because cell does not exist.", getOwner()->getNetworkId().getValueString().c_str(), cellNetworkId.getValueString().c_str()));
+		//@todo big demo hack.  If depersisting into a cell, set the transform to start lcoation
+#if 1
+		Transform start = Transform::identity;
+		start.setPosition_p(ConfigServerGame::getStartingPosition());
+		setGoal( start, NULL );
+#endif
+		return;
+	}
+	setGoal( message.getTransform(), serverCellObject );
+}
+
+//-----------------------------------------------------------------------
+
+void ServerController::handleMessage (const int message, const float value, const MessageQueue::Data* const data, const uint32 flags)
+{
+	ServerObject* const owner = static_cast<ServerObject*>(getOwner());
+
+	switch(message)
+    {
+	case CM_spatialChatSend:
+		{
+			const MessageQueueSpatialChat * const spatialChat = dynamic_cast<const MessageQueueSpatialChat *>(data);
+			NOT_NULL (spatialChat);
+
+			if (spatialChat->getSourceId () != getOwner ()->getNetworkId ())
+			{
+				WARNING (true, ("Received a CM_spatialChatSend message on object %s from object %s",
+					owner->getNetworkId ().getValueString ().c_str (), spatialChat->getSourceId ().getValueString ().c_str ()));
+				break;
+			}
+
+			owner->speakText (*spatialChat);
+		}
+		break;
+
+	case CM_spatialChatReceive:
+		{
+			const MessageQueueSpatialChat * const spatialChat = dynamic_cast<const MessageQueueSpatialChat *>(data);
+			NOT_NULL (spatialChat);
+			ServerObject * const sourceObject = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(spatialChat->getSourceId()));
+			if (sourceObject)
+				owner->hearText(*sourceObject, *spatialChat, ChatLogManager::getNextMessageIndex());
+		}
+		break;
+
+	case CM_socialSend:
+		{
+			const MessageQueueSocial * const socialMsg = NON_NULL (dynamic_cast<const MessageQueueSocial *>(data));
+
+			if (socialMsg->getSourceId () != owner->getNetworkId ())
+			{
+				WARNING (true, ("Received a CM_spatialChatSend message on object %s from object %s",
+					owner->getNetworkId ().getValueString ().c_str (), socialMsg->getSourceId ().getValueString ().c_str ()));
+				break;
+			}
+
+			owner->performSocial (*socialMsg);
+		}
+		break;
+
+	case CM_socialReceive:
+		{
+			const MessageQueueSocial * const socialMsg = NON_NULL (dynamic_cast<const MessageQueueSocial *>(data));
+			owner->seeSocial (*socialMsg);
+		}
+		break;
+
+	case CM_scriptTrigger:
+		{
+			const MessageQueueScriptTrigger * const triggerMessage = dynamic_cast<const MessageQueueScriptTrigger *>(data);
+			if(triggerMessage)
+			{
+				ServerObject * object = getServerOwner();
+				if(object)
+				{
+					GameScriptObject * scriptObject = object->getScriptObject();
+					if(scriptObject)
+					{
+						const Archive::ByteStream & paramData = triggerMessage->getScriptParamData();
+						const Scripting::TrigId trigId = static_cast<const Scripting::TrigId>(triggerMessage->getTriggerId());
+						ScriptParams p;
+						Archive::ReadIterator ri = paramData.begin();
+						Archive::get(ri, p);
+						scriptObject->trigAllScripts(trigId, p);
+					}
+				}
+
+			}
+		}
+		break;
+	case CM_attachScript:
+		{
+			if(data)
+			{
+				const MessageQueueString * const msg = static_cast<const MessageQueueString *>(data);
+				owner->getScriptObject()->attachScript(msg->getString(), true);
+			}
+		}
+		break;
+	case CM_detachScript:
+		{
+			if(data)
+			{
+				const MessageQueueString * const msg = static_cast<const MessageQueueString *>(data);
+				owner->getScriptObject()->detachScript(msg->getString());
+			}
+		}
+		break;
+
+	case CM_scriptTransferMoney:
+	{
+		const MessageQueueScriptTransferMoney * const msg = safe_cast<const MessageQueueScriptTransferMoney *>(data);
+		if(msg)
+		{
+			ServerObject * owner = safe_cast<ServerObject *>(getOwner());
+			if(owner)
+				switch (msg->getTypeId())
+				{
+					case MessageQueueScriptTransferMoney::TT_bankTransfer:
+						owner->scriptTransferBankCreditsTo(msg->getTarget(), msg->getAmount(), msg->getReplyTo(),
+														   msg->getSuccessCallback(), msg->getFailCallback(), msg->getPackedDictionary());
+						break;
+					case MessageQueueScriptTransferMoney::TT_cashTransfer:
+						owner->scriptTransferCashTo(msg->getTarget(), msg->getAmount(), msg->getReplyTo(),
+													msg->getSuccessCallback(), msg->getFailCallback(), msg->getPackedDictionary());
+						break;
+					case MessageQueueScriptTransferMoney::TT_bankWithdrawal:
+						owner->scriptWithdrawCashFromBank(msg->getAmount(), msg->getReplyTo(),
+														  msg->getSuccessCallback(), msg->getFailCallback(), msg->getPackedDictionary());
+						break;
+					case MessageQueueScriptTransferMoney::TT_bankDeposit:
+						owner->scriptDepositCashToBank(msg->getAmount(), msg->getReplyTo(),
+													   msg->getSuccessCallback(), msg->getFailCallback(), msg->getPackedDictionary());
+						break;
+					case MessageQueueScriptTransferMoney::TT_bankTransferToNamedAccount:
+						owner->scriptTransferBankCreditsTo(msg->getNamedAccount(), msg->getAmount(), msg->getReplyTo(),
+														   msg->getSuccessCallback(), msg->getFailCallback(), msg->getPackedDictionary());
+						break;
+					case MessageQueueScriptTransferMoney::TT_bankTransferFromNamedAccount:
+						owner->scriptTransferBankCreditsFrom(msg->getNamedAccount(), msg->getAmount(), msg->getReplyTo(),
+															 msg->getSuccessCallback(), msg->getFailCallback(), msg->getPackedDictionary());
+						break;
+					default:
+						DEBUG_FATAL(true,("MessageQueueScriptTransferMoney transaction type %i was not recognized.  Object is %s",
+										  msg->getTypeId(), owner->getNetworkId().getValueString().c_str()));
+				}
+		}
+	}
+	case CM_persistObject:
+		{
+			owner->persist();
+		}
+		break;
+	case CM_setCacheVersion:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if(msg)
+			{
+				owner->setCacheVersion(msg->getValue());
+			}
+		}
+		break;
+	case CM_transferAuthority:
+		{
+			const MessageQueueGenericValueType<std::pair<uint32, bool> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<uint32, bool> > *>(data);
+			if(msg)
+			{
+				owner->transferAuthority(msg->getValue().first, msg->getValue().second, false, false);
+			}
+		}
+		break;
+	case CM_setObjectName:
+		{
+			const MessageQueueGenericValueType<Unicode::String> * const msg = safe_cast<const MessageQueueGenericValueType<Unicode::String> *>(data);
+			if(msg)
+			{
+				owner->setObjectName(msg->getValue());
+			}
+		}
+		break;
+	case CM_setObjectNameStringId:
+		{
+			const MessageQueueGenericValueType<StringId> * const msg = safe_cast<const MessageQueueGenericValueType<StringId> *>(data);
+			if(msg)
+			{
+				owner->setObjectNameStringId(msg->getValue());
+			}
+		}
+		break;
+	case CM_teleportObject:
+		{
+			const MessageQueueTeleportObject * const msg = safe_cast<const MessageQueueTeleportObject *>(data);
+			if(msg)
+			{
+				owner->teleportObject(msg->getPosition_w(), msg->getTargetContainerId(), msg->getTargetCellName(), msg->getPosition_p(), msg->getScriptCallback());
+			}
+		}
+		break;
+	case CM_updatePositionOnPlanetServer:
+		{
+			const MessageQueueGenericValueType<bool> * const msg = safe_cast<const MessageQueueGenericValueType<bool> *>(data);
+			if(msg)
+			{
+				owner->updatePositionOnPlanetServer(msg->getValue());
+			}
+		}
+		break;
+	case CM_setPlayerControlled:
+		{
+			const MessageQueueGenericValueType<bool> * const msg = safe_cast<const MessageQueueGenericValueType<bool> *>(data);
+			if(msg)
+			{
+				owner->setPlayerControlled(msg->getValue());
+			}
+		}
+		break;
+	case CM_customize:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, int> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, int> > *>(data);
+			if(msg)
+			{
+				owner->customize(msg->getValue().first, msg->getValue().second);
+			}
+		}
+		break;
+	case CM_permanentlyDestroy:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if (msg)
+			{
+				owner->permanentlyDestroy(msg->getValue());
+			}
+		}
+		break;
+	case CM_setIntDynamicVariable:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, int> >* const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, int> > *>(data);
+			if(msg)
+			{
+				owner->setObjVarItem(msg->getValue().first, msg->getValue().second);
+			}
+		}
+		break;
+	case CM_setIntArrayDynamicVariable:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, std::vector<int> > >* const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::vector<int> > > *>(data);
+			if(msg)
+			{
+				owner->setObjVarItem(msg->getValue().first, msg->getValue().second);
+			}
+		}
+		break;
+	case CM_setFloatDynamicVariable:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, float> >* const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, float> > *>(data);
+			if(msg)
+			{
+				owner->setObjVarItem(msg->getValue().first, msg->getValue().second);
+			}
+		}
+		break;
+	case CM_setFloatArrayDynamicVariable:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, std::vector<float> > >* const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::vector<float> > > *>(data);
+			if(msg)
+			{
+				owner->setObjVarItem(msg->getValue().first, msg->getValue().second);
+			}
+		}
+		break;
+	case CM_setStringDynamicVariable:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, Unicode::String> >* const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, Unicode::String> > *>(data);
+			if(msg)
+			{
+				owner->setObjVarItem(msg->getValue().first, msg->getValue().second);
+			}
+		}
+		break;
+	case CM_setStringArrayDynamicVariable:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, std::vector<Unicode::String> > >* const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::vector<Unicode::String> > > *>(data);
+			if(msg)
+			{
+				owner->setObjVarItem(msg->getValue().first, msg->getValue().second);
+			}
+		}
+		break;
+	case CM_setObjIdDynamicVariable:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, NetworkId> >* const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, NetworkId> > *>(data);
+			if(msg)
+			{
+				owner->setObjVarItem(msg->getValue().first, msg->getValue().second);
+			}
+		}
+		break;
+	case CM_setObjIdArrayDynamicVariable:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, std::vector<NetworkId> > >* const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::vector<NetworkId> > > *>(data);
+			if(msg)
+			{
+				owner->setObjVarItem(msg->getValue().first, msg->getValue().second);
+			}
+		}
+		break;
+	case CM_setLocationDynamicVariable:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, DynamicVariableLocationData> >* const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, DynamicVariableLocationData> > *>(data);
+			if(msg)
+			{
+				owner->setObjVarItem(msg->getValue().first, msg->getValue().second);
+			}
+		}
+		break;
+	case CM_setLocationArrayDynamicVariable:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, std::vector<DynamicVariableLocationData> > >* const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::vector<DynamicVariableLocationData> > > *>(data);
+			if(msg)
+			{
+				owner->setObjVarItem(msg->getValue().first, msg->getValue().second);
+			}
+		}
+		break;
+	case CM_setStringIdDynamicVariable:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, StringId> >* const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, StringId> > *>(data);
+			if(msg)
+			{
+				owner->setObjVarItem(msg->getValue().first, msg->getValue().second);
+			}
+		}
+		break;
+	case CM_setStringIdArrayDynamicVariable:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, std::vector<StringId> > >* const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::vector<StringId> > > *>(data);
+			if(msg)
+			{
+				owner->setObjVarItem(msg->getValue().first, msg->getValue().second);
+			}
+		}
+		break;
+	case CM_setTransformDynamicVariable:
+		{
+			MessageQueueGenericValueType<std::pair<std::string, Transform> > const * msg = safe_cast<MessageQueueGenericValueType<std::pair<std::string, Transform> > const *>(data);
+			if (msg)
+				owner->setObjVarItem(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_setTransformArrayDynamicVariable:
+		{
+			MessageQueueGenericValueType<std::pair<std::string, std::vector<Transform> > > const * msg = safe_cast<MessageQueueGenericValueType<std::pair<std::string, std::vector<Transform> > > const *>(data);
+			if (msg)
+				owner->setObjVarItem(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_setVectorDynamicVariable:
+		{
+			MessageQueueGenericValueType<std::pair<std::string, Vector> > const * msg = safe_cast<MessageQueueGenericValueType<std::pair<std::string, Vector> > const *>(data);
+			if (msg)
+				owner->setObjVarItem(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_setVectorArrayDynamicVariable:
+		{
+			MessageQueueGenericValueType<std::pair<std::string, std::vector<Vector> > > const * msg = safe_cast<MessageQueueGenericValueType<std::pair<std::string, std::vector<Vector> > > const *>(data);
+			if (msg)
+				owner->setObjVarItem(msg->getValue().first, msg->getValue().second);
+		}
+		break;
+	case CM_copyDynamicVariable:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, NetworkId> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, NetworkId> > *>(data);
+			if(msg)
+			{
+				ServerObject* fromObject = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(msg->getValue().second));
+				if(fromObject)
+				{
+					owner->copyObjVars(msg->getValue().first, *fromObject, msg->getValue().first);
+				}
+			}
+		}
+		break;
+	case CM_copyDynamicVariableToSubList:
+		{
+			const MessageQueueGenericValueType<std::pair<std::string, std::pair<std::string, NetworkId> > > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::pair<std::string, NetworkId> > > *>(data);
+			if(msg)
+			{
+				ServerObject* fromObject = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(msg->getValue().second.second));
+				if(fromObject)
+				{
+					owner->copyObjVars(msg->getValue().first, *fromObject, msg->getValue().second.first);
+				}
+			}
+		}
+		break;
+	case CM_addNestedObjVarList:
+		{
+			const MessageQueueGenericValueType<std::string>* const msg = safe_cast<const MessageQueueGenericValueType<std::string> *>(data);
+			if(msg)
+			{
+				//owner->addNestedObjVarList(msg->getValue()); // This operation is now a no-op
+			}
+		}
+		break;
+	case CM_removeObjVarItem:
+		{
+			const MessageQueueGenericValueType<std::string>* const msg = safe_cast<const MessageQueueGenericValueType<std::string> *>(data);
+			if(msg)
+			{
+				owner->removeObjVarItem(msg->getValue());
+			}
+		}
+		break;
+	case CM_eraseObjVarListEntries:
+		{
+			const MessageQueueGenericValueType<std::string>* const msg = safe_cast<const MessageQueueGenericValueType<std::string> *>(data);
+			if(msg)
+			{
+				owner->eraseObjVarListEntries(msg->getValue());
+			}
+		}
+		break;
+	case CM_setObjVarItemVar:
+		{
+		}
+		break;
+
+	case CM_disconnect:
+		owner->disconnect();
+		break;
+
+	case CM_updateObserversCount:
+		{
+			const MessageQueueGenericValueType<int>* const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if(msg)
+			{
+				owner->updateObserversCount(msg->getValue());
+			}
+		}
+		break;
+
+	case CM_cancelMessageTo:
+		{
+			const MessageQueueGenericValueType<std::string>* const msg = safe_cast<const MessageQueueGenericValueType<std::string> *>(data);
+			if(msg)
+			{
+				NetworkId const possibleNetworkId = NetworkId(msg->getValue());
+				if (possibleNetworkId.getValueString() == msg->getValue())
+					owner->cancelMessageToByMessageId(possibleNetworkId);
+				else
+					owner->cancelMessageTo(msg->getValue());
+			}
+		}
+		break;
+
+	case CM_combatSpam:
+		{
+			const MessageQueueCombatSpam * const msg = safe_cast<const MessageQueueCombatSpam *>(data);
+			if (msg)
+			{
+				owner->seeCombatSpam(*msg);
+			}
+		}
+		break;
+
+	default:
+		NetworkController::handleMessage(message, value, data, flags);
+		break;
+    }
+}
+
+//-----------------------------------------------------------------------
+
+void ServerController::conclude()
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerController::conclude");
+
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("updateTransform");
+		updateTransform();
+	}
+
+	ServerObject * const netObject = NON_NULL(getOwner())->asServerObject();
+	netObject->sendDeltas();
+
+	if (m_alteredSinceConclude)
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("NetworkController::conclude");
+		NetworkController::conclude();
+		m_alteredSinceConclude = false;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerController::onClientReady()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void ServerController::onClientLost()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void ServerController::onAppendMessage()
+{
+	ServerObject *owner = static_cast<ServerObject *>(getOwner());
+	if(owner)
+		owner->addObjectToConcludeList();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Send a controller message to wherever it is supposed to go.
+ *
+ * @param msg		the message to send
+ */
+void ServerController::sendControllerMessage(ObjControllerMessage const &msg)
+{
+	uint32 const destFlags = (msg.getFlags() & GameControllerMessageFlags::DESTINATIONS);
+	bool const reliable = ((msg.getFlags() & GameControllerMessageFlags::RELIABLE) > 0);
+
+	ServerObject * const owner = static_cast<ServerObject *>(getOwner());
+
+	// Note: in the case where we are sending to both auth and proxy clients,
+	// sendToAuthClients is NOT set, because the sendToProxyClients handling
+	// also covers the auth client, and can do so potentially with fewer messages.
+
+	bool const sendToAuthClients = (   owner->isAuthoritative()
+	                                && (destFlags & GameControllerMessageFlags::DEST_AUTH_CLIENT)
+	                                && !(destFlags & GameControllerMessageFlags::DEST_PROXY_CLIENT));
+	bool const sendToProxyClients = (destFlags & GameControllerMessageFlags::DEST_PROXY_CLIENT);
+	bool const sendToAuthServer = (   !owner->isAuthoritative()
+	                               && (   (destFlags & GameControllerMessageFlags::DEST_AUTH_SERVER)
+	                                   || (   (destFlags & GameControllerMessageFlags::DEST_AUTH_CLIENT)
+	                                       && !(destFlags & GameControllerMessageFlags::DEST_PROXY_CLIENT))));
+	bool const sendToProxyServers = (   owner->isAuthoritative()
+	                                 && (destFlags & (GameControllerMessageFlags::DEST_PROXY_CLIENT|GameControllerMessageFlags::DEST_PROXY_SERVER)));
+
+	if (sendToAuthClients)
+	{
+		std::set<Client const *> authClients;
+		owner->getAuthClients(authClients);
+
+		// need to do special handling for CM_combatSpam controller
+		// message to determine if the client should get the message
+		bool isCombatSpamMessage = false;
+		NetworkId combatSpamAttacker, combatSpamDefender;
+		Vector combatSpamAttackerPosition_w, combatSpamDefenderPosition_w;
+		if (!authClients.empty())
+		{
+			if (msg.getMessage() == CM_combatSpam)
+			{
+				MessageQueueCombatSpam const * mqcs = static_cast<MessageQueueCombatSpam const *>(msg.getData());
+
+				if (mqcs)
+				{
+					isCombatSpamMessage = true;
+					combatSpamAttacker = mqcs->m_attacker;
+					combatSpamAttackerPosition_w = mqcs->m_attackerPosition_w;
+					combatSpamDefender = mqcs->m_defender;
+					combatSpamDefenderPosition_w = mqcs->m_defenderPosition_w;
+				}
+			}
+		}
+
+		for (std::set<Client const *>::const_iterator i = authClients.begin(); i != authClients.end(); ++i)
+		{
+			if (isCombatSpamMessage && !(*i)->shouldReceiveCombatSpam(combatSpamAttacker, combatSpamAttackerPosition_w, combatSpamDefender, combatSpamDefenderPosition_w))
+				continue;
+
+			(*i)->send(msg, reliable);
+		}
+	}
+
+	if (sendToProxyClients)
+	{
+		// NOTE: This will not behave correctly if a DEST_PROXY_CLIENT message is sent from a non-authoritative object!
+		// Currently we do not need this behavior, but if we do at some point, this will need to be changed.
+		bool const sendToAuthoritativeClient = (destFlags & GameControllerMessageFlags::DEST_AUTH_CLIENT) != 0;
+		owner->sendToClientsInUpdateRange(msg, reliable, sendToAuthoritativeClient);
+	}
+
+	if (sendToAuthServer || sendToProxyServers)
+	{
+		std::vector<uint32> serverList;
+		if (sendToAuthServer)
+			serverList.push_back(owner->getAuthServerProcessId());
+		if (sendToProxyServers)
+		{
+			ProxyList const &proxyList = owner->getExposedProxyList();
+			for (ProxyList::const_iterator i = proxyList.begin(); i != proxyList.end(); ++i)
+				serverList.push_back(*i);
+		}
+		if (!serverList.empty())
+		{
+			ServerMessageForwarding::begin(serverList);
+
+			ServerMessageForwarding::send(msg);
+
+			ServerMessageForwarding::end();
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sets an object's name.
+ *
+ * @param name		the new name
+ */
+void ServerController::setObjectName(const Unicode::String &name)
+{
+	ServerObject* owner = static_cast<ServerObject *>(getOwner());
+
+	if (!owner->isAuthoritative())
+	{
+		// @todo: what to do here
+		DEBUG_WARNING(true, ("setObjectName on non-authoritative object!\n"));
+		return;
+	}
+
+	owner->setObjectName(name);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerController::updateTransform()
+{
+	// Note: only the auth server sends updates from here.  Non-creatures use DEST_PROXY_CLIENT controller messages
+	// to get the messages to all clients, and CreatureControllers receiving transforms from other servers forward
+	// to local clients, since creatures don't use controller messages to the clients.
+	ServerObject * const owner = static_cast<ServerObject *>(getOwner());
+
+	if (!owner->getTransformChanged() && m_oldVelocity == getCurrentVelocity())
+		return;
+
+	DEBUG_FATAL(owner->getCellProperty() && !owner->getKill(), ("A cell object is trying to update its transform! Cells aren't EVER supposed to do that!"));
+
+	if (owner->getClient())
+		owner->getClient()->resetIdleTime();
+
+	owner->setTransformChanged(false);
+	m_oldVelocity = getCurrentVelocity();
+
+	if (!owner->isAuthoritative())
+		return;
+
+	// bail out if we're not in the world --- no reason to send updates.
+	if (!owner->isInWorld())
+		return;
+
+	synchronizeTransform();
+}
+
+//-----------------------------------------------------------------------
+
+void ServerController::synchronizeTransform()
+{
+	ServerObject * const owner = safe_cast<ServerObject *>(getOwner());
+	NOT_NULL(owner);
+
+	m_moveSequenceNumber = owner->getAndIncrementMoveSequenceNumber();
+
+	Transform const & tr = getOwner()->getTransform_o2p();
+
+	bool isCreature = owner->getObjectTemplate()->getId() == ServerCreatureObjectTemplate::ServerCreatureObjectTemplate_tag;
+	ServerObject *attachedTo = safe_cast<ServerObject*>(owner->getAttachedTo());
+
+	int flags = GameControllerMessageFlags::SEND | GameControllerMessageFlags::DEST_PROXY_SERVER;
+
+	if (m_sendReliableTransformThisFrame || owner->alwaysSendReliableTransform())
+	{
+		flags |= GameControllerMessageFlags::RELIABLE;
+		m_sendReliableTransformThisFrame = false;
+	}
+
+	// If we're contained by something other than what we're attached to, then transforms are
+	// not relevant to clients since they will be pulling their positions purely from their parent.
+	bool sendPositionUpdateToClients = ContainerInterface::getContainedByObject(*owner) == attachedTo;
+
+	// We only send the controller message to clients if the position update is useful to clients
+	// and it is also not a creature, as creatures have it sent to clients in a different message.
+	if (sendPositionUpdateToClients && !isCreature)
+		flags |= GameControllerMessageFlags::DEST_PROXY_CLIENT;
+
+	float lookAtYaw = 0.f;
+	bool useLookAtYaw = false;
+	if(isCreature)
+	{
+		CreatureObject *creatureObject = safe_cast<CreatureObject *>(owner);
+		lookAtYaw = creatureObject->getLookAtYaw();
+		useLookAtYaw = creatureObject->getUseLookAtYaw();		
+	}
+	if (attachedTo)
+	{
+		MessageQueueDataTransformWithParent message(0, m_moveSequenceNumber, attachedTo->getNetworkId(), tr, getCurrentVelocity ().magnitude (), lookAtYaw, useLookAtYaw);
+
+		ObjControllerMessage c(owner->getNetworkId(),
+							   CM_netUpdateTransformWithParent,
+							   0.0f,
+							   flags,
+							   &message);
+
+		sendControllerMessage(c);
+		if (sendPositionUpdateToClients && isCreature)
+		{
+			//Special smaller packet for updating creature movement.
+			UpdateTransformWithParentMessage utm(owner->getNetworkId(), m_moveSequenceNumber, attachedTo->getNetworkId(), tr, static_cast<int8>(getCurrentVelocity().magnitude()), lookAtYaw, useLookAtYaw);
+			owner->sendToClientsInUpdateRange(utm, flags & GameControllerMessageFlags::RELIABLE, false);
+		}
+	}
+	else
+	{
+		MessageQueueDataTransform message(0, m_moveSequenceNumber, tr, getCurrentVelocity ().magnitude (), lookAtYaw, useLookAtYaw);
+
+		ObjControllerMessage c(owner->getNetworkId(),
+						   CM_netUpdateTransform,
+						   0.0f,
+						   flags,
+						   &message);
+
+		sendControllerMessage(c);
+		if (sendPositionUpdateToClients && isCreature)
+		{
+			//Special smaller packet for updating creature movement.
+			UpdateTransformMessage utm(owner->getNetworkId(), m_moveSequenceNumber, tr, static_cast<int8>(getCurrentVelocity().magnitude()), lookAtYaw, useLookAtYaw);
+			owner->sendToClientsInUpdateRange(utm, flags & GameControllerMessageFlags::RELIABLE, false);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+int ServerController::getMoveSequenceNumber() const
+{
+	return m_moveSequenceNumber;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerController::onMoveFailed()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/controller/ServerController.h b/engine/server/library/serverGame/src/shared/controller/ServerController.h
new file mode 100644
index 00000000..f7779c36
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/ServerController.h
@@ -0,0 +1,174 @@
+// ======================================================================
+//
+// ServerController.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ServerController_H
+#define INCLUDED_ServerController_H
+
+// ======================================================================
+
+#include "serverGame/ServerObject.h"
+#include "sharedFoundation/Watcher.h"
+#include "sharedObject/NetworkController.h"
+#include "sharedMath/Transform.h"
+
+//-----------------------------------------------------------------------
+
+class CellProperty;
+
+//----------------------------------------------------------------------
+
+/**
+ * The base class for server-side controllers.
+ *
+ */
+class ServerController : public NetworkController
+{
+public:
+	explicit                ServerController	(Object * newOwner);
+	virtual                 ~ServerController	(void);
+
+	virtual void            conclude            ();
+	virtual void            onClientReady       ();
+	virtual void            onClientLost        ();
+
+	virtual void            sendControllerMessage(const ObjControllerMessage& msg);
+
+	virtual const Vector &  getCurrentVelocity() const;
+	virtual void            setAuthoritative	(bool newAuthoritative);
+	virtual void            setOwner(Object *newOwner);
+	
+	virtual void            endBaselines();
+	
+	virtual int             elevatorMove (int nFloors);
+	virtual void            teleport(Transform const &goal, ServerObject *goalObj);
+
+
+	/** object modification functions that should only be called on authoritative
+	 *  objects
+	 */
+	void                   setObjectName(const Unicode::String &name);
+	ServerObject *         getServerOwner();
+	const ServerObject *   getServerOwner() const;
+
+	virtual void           onAppendMessage();
+	virtual void           handleMessage (int message, float value, const MessageQueue::Data* data, uint32 flags);
+	virtual ServerObject const * getGoalCellObject () const;
+
+	int getMoveSequenceNumber() const;
+
+protected:
+
+	virtual float           realAlter          (float time);
+	virtual void            onMoveFailed       ();
+	virtual void            handleNetUpdateTransform (const MessageQueueDataTransform& message);
+	virtual void            handleNetUpdateTransformWithParent (const MessageQueueDataTransformWithParent& message);
+
+	virtual void            setCurrentVelocity (const Vector & newVelocity);
+	virtual void            setGoal            (Transform const & newGoal, ServerObject * goalCellObject, bool teleport = false );
+	virtual void            moveToGoal         ();
+
+	virtual bool            setObjectCell      (ServerObject * newCellObject);
+
+	virtual Transform const &    getGoalTransform  () const;
+
+	virtual void synchronizeTransform();
+
+protected:
+	bool       m_sendReliableTransformThisFrame;
+	int        m_moveSequenceNumber;
+
+private:
+	ServerController ();
+	ServerController (const ServerController & other);
+	ServerController&	operator= (const ServerController & rhs);
+
+	void updateTransform();
+
+private:
+
+	class MessageQueueNotification: public MessageQueue::Notification
+	{
+	public:
+		MessageQueueNotification();
+		virtual ~MessageQueueNotification();
+
+		void setController(ServerController *serverController);
+		virtual void onChanged() const;
+
+	private:
+		MessageQueueNotification(MessageQueueNotification const &);
+		MessageQueueNotification& operator=(MessageQueueNotification const &);
+
+	private:
+		ServerController *m_serverController;
+	};
+
+	Vector      m_currentVelocity;
+	Vector      m_oldVelocity;
+
+
+	Transform       m_goalTransform;        // where the client wants to move the server object to
+	Watcher<ServerObject> m_goalCellObject;
+	bool            m_bProcessingMessages;  // true while the controller is processing its message queue
+	bool            m_bHasGoal;
+	bool            m_bAtGoal;
+	bool            m_bTeleport;
+	bool            m_alteredSinceConclude;
+
+	MessageQueueNotification m_notification;
+};
+
+// ----------------------------------------------------------------------
+
+inline const Vector & ServerController::getCurrentVelocity() const
+{
+	return m_currentVelocity;
+}
+
+//-----------------------------------------------------------------------
+
+inline void ServerController::setCurrentVelocity(const Vector& v)
+{
+	m_currentVelocity = v;
+}
+
+
+//-----------------------------------------------------------------------
+
+inline const ServerObject * ServerController::getServerOwner() const
+{
+	return safe_cast<const ServerObject *>(getOwner());
+}
+
+// ----------------------------------------------------------------------
+
+inline ServerObject * ServerController::getServerOwner()
+{
+	return safe_cast<ServerObject *>(getOwner());
+}
+
+// ----------------------------------------------------------------------
+
+inline Transform const & ServerController::getGoalTransform() const
+{
+	return m_goalTransform;
+}
+
+// ----------------------------------------------------------------------
+
+inline ServerObject const * ServerController::getGoalCellObject() const
+{
+	return m_goalCellObject;
+}
+
+
+// ======================================================================
+
+
+#endif	//_ServerController_H
+
+
diff --git a/engine/server/library/serverGame/src/shared/controller/ShipController.cpp b/engine/server/library/serverGame/src/shared/controller/ShipController.cpp
new file mode 100644
index 00000000..7b397f12
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/ShipController.cpp
@@ -0,0 +1,938 @@
+// ======================================================================
+//
+// ShipController.cpp
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipController.h"
+
+#include "serverGame/AiServerShipObjectInterface.h"
+#include "serverGame/AiShipAttackTargetList.h"
+#include "serverGame/AiShipBehaviorDock.h"
+#include "serverGame/AiShipController.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/PlayerShipTurretTargetingSystem.h"
+#include "serverGame/ServerShipObjectInterface.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/ShipTurretTargetingSystem.h"
+#include "sharedGame/ShipDynamicsModel.h"
+#include "sharedLog/Log.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedNetworkMessages/MessageQueueNetworkId.h"
+#include "sharedNetworkMessages/ShipUpdateTransformMessage.h"
+#include "sharedObject/NetworkIdManager.h"
+
+#include <set>
+
+// ======================================================================
+//
+// ShipControllerNamespace
+//
+// ======================================================================
+
+namespace ShipControllerNamespace
+{
+	typedef std::vector<CachedNetworkId> PurgeList;
+	static PurgeList s_purgeList;
+	time_t const s_maxTargetAge = 60 * 2;
+
+	// If we are less than 5 degrees from the target orientation, don't roll.
+	// This prevents "wobbling."
+	float const s_fastOrientationDeltaRadians = convertDegreesToRadians(5.0f);
+}
+
+using namespace ShipControllerNamespace;
+
+// ======================================================================
+// PUBLIC ShipController
+// ======================================================================
+
+ShipController::ShipController(ShipObject * newOwner) :
+	TangibleController(newOwner),
+	m_shipDynamicsModel(new ShipDynamicsModel),
+	m_yawPosition(0.0f),
+	m_pitchPosition(0.0f),
+	m_rollPosition(0.0f),
+	m_throttlePosition(0.0f),
+	m_pendingDockingBehavior(NULL),
+	m_dockingBehavior(NULL),
+	m_attackTargetList(new AiShipAttackTargetList(newOwner)),
+	m_attackTargetDecayTimer(new Timer(static_cast<float>(s_maxTargetAge))),
+	m_enemyCheckQueued(false),
+	m_turretTargetingSystem(NULL),
+	m_dockedByList(new DockedByList),
+	m_aiTargetingMeList(new CachedNetworkIdList)
+{
+	m_attackTargetDecayTimer->setElapsedTime(Random::randomReal() * m_attackTargetDecayTimer->getExpireTime());
+}
+
+// ----------------------------------------------------------------------
+
+ShipController::~ShipController()
+{
+	// The turret targeting system must be deleted before clearAiTargetingMeList(), because
+	// otherwise it will try to acquire new targets as the list is being cleared
+	delete m_turretTargetingSystem;
+	m_turretTargetingSystem = NULL;
+
+	clearAiTargetingMeList();
+
+	delete m_shipDynamicsModel;
+	delete m_dockedByList;
+	delete m_aiTargetingMeList;
+	delete m_pendingDockingBehavior;
+	m_pendingDockingBehavior = NULL;
+	delete m_dockingBehavior;
+	m_dockingBehavior = NULL;
+	delete m_attackTargetList;
+	delete m_attackTargetDecayTimer;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::endBaselines()
+{
+	Object const * const owner = getOwner();
+	if (owner)
+	{
+		m_shipDynamicsModel->setTransform(owner->getTransform_o2p());
+		m_shipDynamicsModel->makeStationary();
+	}
+
+	TangibleController::endBaselines();
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::teleport(Transform const &goal, ServerObject *goalObj)
+{
+	if (!goalObj)
+		m_shipDynamicsModel->setTransform(goal);
+	TangibleController::teleport(goal, goalObj);
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::onAddedToWorld()
+{
+	Object const * const owner = getOwner();
+	if (owner)
+	{
+		m_shipDynamicsModel->setTransform(owner->getTransform_o2p());
+		m_shipDynamicsModel->makeStationary();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+Transform const &ShipController::getTransform() const
+{
+	return m_shipDynamicsModel->getTransform();
+}
+
+// ----------------------------------------------------------------------
+
+Vector const &ShipController::getVelocity() const
+{
+	return m_shipDynamicsModel->getVelocity();
+}
+
+// ----------------------------------------------------------------------
+
+float ShipController::getSpeed() const
+{
+	return m_shipDynamicsModel->getSpeed();
+}
+
+// ----------------------------------------------------------------------
+
+float ShipController::getYawRate() const
+{
+	return m_shipDynamicsModel->getYawRate();
+}
+
+// ----------------------------------------------------------------------
+
+float ShipController::getPitchRate() const
+{
+	return m_shipDynamicsModel->getPitchRate();
+}
+
+// ----------------------------------------------------------------------
+
+float ShipController::getRollRate() const
+{
+	return m_shipDynamicsModel->getRollRate();
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::respondToCollision(Vector const & deltaToMove_p, Vector const & newReflection_p, Vector const & /* normalOfSurface_p */)
+{
+	// this is identical to the clients ShipController::respondToCollision.
+	// the difference it that the server also must call the virtual method
+	// ShipController::experiencedCollision at the end of execution
+	Transform transform_p(m_shipDynamicsModel->getTransform());
+	transform_p.move_p(deltaToMove_p);
+
+	m_shipDynamicsModel->setTransform(transform_p);
+	m_shipDynamicsModel->setVelocity(newReflection_p * m_shipDynamicsModel->getVelocity().magnitude());
+
+	ShipObject * const owner = getShipOwner();
+	NOT_NULL(owner);
+	owner->setTransform_o2p(transform_p);
+
+	experiencedCollision();
+}
+
+// ----------------------------------------------------------------------
+
+float ShipController::realAlter(float elapsedTime)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ShipController::realAlter");
+	ShipObject const * const owner = getShipOwner();
+
+	if (owner->isInWorld())
+	{
+		if (m_turretTargetingSystem)
+		{
+			m_turretTargetingSystem->alter(elapsedTime);
+		}
+
+		// Decay the attack targets
+		if (m_attackTargetDecayTimer->updateZero(elapsedTime))
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("attackTargetList");
+			m_attackTargetList->purge(s_maxTargetAge);
+
+			if (m_attackTargetList->isEmpty())
+			{
+				onAttackTargetListEmpty();
+			}
+		}
+	}
+
+	return TangibleController::realAlter(elapsedTime);
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::handleMessage (const int message, const float value, const MessageQueue::Data* const data, const uint32 flags)
+{
+	UNREF(flags);
+	UNREF(value);
+	ShipObject * const owner = getShipOwner();
+	DEBUG_FATAL(!owner, ("Owner is NULL in ShipController::handleMessage\n"));
+	switch(message)
+	{
+	case CM_clientLookAtTarget:
+		{
+			const MessageQueueNetworkId * const msg = NON_NULL (dynamic_cast<const MessageQueueNetworkId *>(data));
+			owner->setPilotLookAtTarget (msg->getNetworkId ());
+		}
+		break;
+
+	case CM_clientLookAtTargetComponent:
+		{
+			const MessageQueueGenericValueType<int> * const msg = NON_NULL (dynamic_cast<const MessageQueueGenericValueType<int> *>(data));
+			owner->setPilotLookAtTargetSlot (static_cast<ShipChassisSlotType::Type>(msg->getValue()));
+		}
+		break;
+
+	default:
+		ServerController::handleMessage(message, value, data, flags);
+		break;
+	}
+}
+
+
+// ----------------------------------------------------------------------
+
+void ShipController::addTurretTargetingSystem(ShipTurretTargetingSystem * newSystem)
+{
+	DEBUG_FATAL(&newSystem->getShipController() != this,("Programmer bug:  called addTurretTargetingSystem with a ShipTurretTargetingSystem whose owner did not match the controller it tried to attach to."));
+	removeTurretTargetingSystem();
+
+	m_turretTargetingSystem = newSystem;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::removeTurretTargetingSystem()
+{
+	delete m_turretTargetingSystem;
+	m_turretTargetingSystem = NULL;
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipController::isBeingDocked() const
+{
+	return !m_dockedByList->empty();
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::addDockedBy(Object const & unit)
+{
+	IGNORE_RETURN(m_dockedByList->insert(CachedNetworkId(unit)));
+
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("ShipController::addDockedBy() owner(%s) dockedBy(%s) dockedByListSize(%u)", (getOwner() != NULL) ? getOwner()->getNetworkId().getValueString().c_str() : "NULL", unit.getNetworkId().getValueString().c_str(), m_dockedByList->size()));
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::removeDockedBy(Object const & unit)
+{
+	DockedByList::iterator iterDockedByList = m_dockedByList->find(CachedNetworkId(unit));
+
+	if (iterDockedByList != m_dockedByList->end())
+	{
+		m_dockedByList->erase(iterDockedByList);
+
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("ShipController::removeDockedBy() owner(%s) dockedBy(%s) dockedByListSize(%u)", (getOwner() != NULL) ? getOwner()->getNetworkId().getValueString().c_str() : "NULL", unit.getNetworkId().getValueString().c_str(), m_dockedByList->size()));
+	}
+	else
+	{
+		DEBUG_WARNING(true, ("debug_ai: ERROR: Trying to remove a docking unit(%s) that is not actually in the process of docking.", unit.getDebugInformation().c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+ShipController::DockedByList const & ShipController::getDockedByList() const
+{
+	return *m_dockedByList;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::addAiTargetingMe(NetworkId const & unit)
+{
+	//LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("ShipController::addAiTargetingMe() owner(%s) unit(%s) m_aiTargetingMeList->size(%u+1)", getOwner()->getNetworkId().getValueString().c_str(), unit.getValueString().c_str(), m_aiTargetingMeList->size()));
+	DEBUG_FATAL((NetworkIdManager::getObjectById(unit) == NULL), ("ShipController::addAiTargetingMe() owner(%s) unit(%s) ERROR: The Ai who is targeting you is not a valid networkId", getOwner()->getNetworkId().getValueString().c_str(), unit.getValueString().c_str()));
+
+	// Make sure this is a valid networkId of an alive object
+
+	IGNORE_RETURN(m_aiTargetingMeList->insert(CachedNetworkId(unit)));
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::removeAiTargetingMe(NetworkId const & unit)
+{
+	//LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("ShipController::removeAiTargetingMe() owner(%s) unit(%s) m_aiTargetingMeList->size(%u-1)", getOwner()->getNetworkId().getValueString().c_str(), unit.getValueString().c_str(), m_aiTargetingMeList->size()));
+
+	CachedNetworkIdList::iterator iterTargetByList = m_aiTargetingMeList->find(CachedNetworkId(unit));
+
+	if (iterTargetByList != m_aiTargetingMeList->end())
+	{
+		m_aiTargetingMeList->erase(iterTargetByList);
+	}
+	else
+	{
+		// If you hit this fatal, then there is an removeAiTargetingMe() called without a matching addAiTargetingMe().
+
+		DEBUG_FATAL(true, ("Unable to find unit."));
+	}
+
+	// If no one else is targeting me (player's only), stop combat music
+
+	if (m_aiTargetingMeList->empty())
+	{
+		ShipObject * const shipOwner = getShipOwner();
+
+		if (shipOwner != NULL)
+		{
+			CreatureObject * const pilotOwner = CreatureObject::asCreatureObject(shipOwner->getPilot());
+
+			if (   (pilotOwner != NULL)
+			    && pilotOwner->isPlayerControlled())
+			{
+				shipOwner->clearCondition(static_cast<int>(TangibleObject::C_spaceCombatMusic));
+
+				//LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("ShipController::removeAiTargetingMe() owner(%s) Clearing TangibleObject::C_spaceCombatMusic", getOwner()->getNetworkId().getValueString().c_str()));
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+ShipController::CachedNetworkIdList const & ShipController::getAiTargetingMeList() const
+{
+	return *m_aiTargetingMeList;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::setPosition_w(Vector const & position, bool const allowOrientation)
+{
+	Transform transform(m_shipDynamicsModel->getTransform());
+	transform.setPosition_p(position);
+	m_shipDynamicsModel->setTransform(transform);
+	
+	if (allowOrientation)
+	{
+		m_shipDynamicsModel->stop();
+	}
+	else
+	{
+		m_shipDynamicsModel->makeStationary();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipController::face(Vector const & goalPosition_w, float elapsedTime)
+{
+	//DEBUG_REPORT_LOG(true, ("ShipController::face() owner(%s)\n", getOwner()->getNetworkId().getValueString().c_str()));
+
+	ShipObject * const shipObject = NON_NULL(getShipOwner());
+	ServerShipObjectInterface const shipInterface(shipObject);
+	Transform shipTransform = shipObject->getTransform_o2w();
+	bool reachedYaw = false;
+	bool reachedPitch = false;
+
+	if (shipInterface.getMaximumYaw() > 0.f)
+	{
+		Vector const goal_o = shipTransform.rotateTranslate_p2l(goalPosition_w);
+		float const goalYaw = goal_o.theta();
+		float const goalYawRate = goalYaw / elapsedTime;
+		float const maxYawRate = shipInterface.getMaximumYaw();
+
+		if((goalYawRate >= -maxYawRate) && (goalYawRate <= maxYawRate))
+			reachedYaw = true;
+
+		float const actualYawRate = clamp(-maxYawRate, goalYawRate, maxYawRate);
+		float const actualYaw = actualYawRate * elapsedTime;
+
+		m_yawPosition = actualYawRate / maxYawRate;
+
+		shipTransform.yaw_l(actualYaw);
+	}
+
+	if (shipInterface.getMaximumPitch() > 0.f)
+	{
+		Vector const goal_o = shipTransform.rotateTranslate_p2l(goalPosition_w);
+		float const goalPitch = goal_o.phi();
+		float const goalPitchRate  = goalPitch / elapsedTime;
+		float const maxPitchRate = shipInterface.getMaximumPitch();
+
+		if((goalPitchRate >= -maxPitchRate) && (goalPitchRate <= maxPitchRate))
+			reachedPitch = true;
+
+		float const actualPitchRate = clamp(-maxPitchRate, goalPitchRate, maxPitchRate);
+		float const actualPitch = actualPitchRate * elapsedTime;
+
+		m_pitchPosition = actualPitchRate / maxPitchRate;
+
+		shipTransform.pitch_l(actualPitch);
+	}
+
+	// If enabled, rotate on the "fast" axis of the ship.
+	bool isRollSet = false;
+
+	if (AiServerShipObjectInterface::isFastAxisEnabled()) 
+	{
+		bool useFastAxis = true;
+		AiShipController const * const aiShipController = asAiShipController();
+
+		if (aiShipController != NULL)
+		{
+			if (   (aiShipController->getShipClass() == ShipAiReactionManager::SC_capitalShip)
+				|| (aiShipController->getShipClass() == ShipAiReactionManager::SC_transport)
+				|| !aiShipController->isAttacking())
+			{
+				useFastAxis = false;
+			}
+		}
+
+		if (useFastAxis)
+		{
+			Vector desiredOrientation(m_pitchPosition, m_yawPosition, 0.0f);
+			Vector fastOrientation(shipInterface.getMaximumPitch(), shipInterface.getMaximumYaw(), 0.0f);
+			
+			// Validate the normalized vectors and rotate along fast axis iff the vectors differ significantly.
+			if (desiredOrientation.normalize() && fastOrientation.normalize() && ((desiredOrientation.dot(fastOrientation) + s_fastOrientationDeltaRadians) < 1.0f))
+			{
+				Vector const & targetOrientation = desiredOrientation.cross(fastOrientation);
+				m_rollPosition = clamp(-1.0f, targetOrientation.z, 1.0f);
+				isRollSet = true;
+			}
+		}
+	}
+
+	// If the roll wasn't set, use the original roll calculation.
+	if (!isRollSet && shipInterface.getMaximumRoll() > 0.f)
+	{
+		Vector const goal_o = shipTransform.rotateTranslate_p2l(goalPosition_w);
+		float goalRoll = 0.f;
+		float const d = sqrt(sqr(goal_o.x) + sqr(goal_o.y));
+		float const phi = atan2(d,goal_o.z);
+
+		if(phi > convertDegreesToRadians(10.f))
+		{
+			goalRoll = -atan2(goal_o.x,goal_o.y);
+		}
+		else
+		{
+			// if we're not trying to align with the target, try to align with the Y axis,
+			// but only if we're not heading nearly straight up or down
+
+			Vector const upPoint_w = shipTransform.getPosition_p() + Vector::unitY;
+			Vector const upPoint_o = shipTransform.rotateTranslate_p2l(upPoint_w);
+			float d2 = sqrt(sqr(upPoint_o.x) + sqr(upPoint_o.y));
+			float phi2 = atan2(d2,abs(upPoint_o.z));
+
+			if(phi2 > convertDegreesToRadians(10.f))
+			{
+				goalRoll = -atan2(upPoint_o.x,upPoint_o.y);
+			}
+		}
+
+		float const goalRollRate = goalRoll / elapsedTime;
+		float const maxRollRate = shipInterface.getMaximumRoll();
+		float const actualRollRate = clamp(-maxRollRate, goalRollRate, maxRollRate);
+
+		//float const actualRoll = actualRollRate * elapsedTime;
+
+		m_rollPosition = actualRollRate / maxRollRate;
+	}
+
+	return reachedYaw && reachedPitch;
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipController::face(Vector const & goalPosition_w, Vector const & up_w, float const elapsedTime)
+{
+	//DEBUG_REPORT_LOG(true, ("ShipController::face(up_w) owner(%s)\n", getOwner()->getNetworkId().getValueString().c_str()));
+
+	ShipObject * const shipObject = NON_NULL(getShipOwner());
+	ServerShipObjectInterface const shipInterface(shipObject);
+	Transform shipTransform(shipObject->getTransform_o2w());
+
+	// Yaw
+
+	bool reachedYaw = false;
+	{
+		if (shipInterface.getMaximumYaw() > 0.f)
+		{
+			Vector const goal_o = shipTransform.rotateTranslate_p2l(goalPosition_w);
+			float const goalYaw = goal_o.theta();
+			float const goalYawRate = goalYaw / elapsedTime;
+			float const maxYawRate = shipInterface.getMaximumYaw();
+
+			if((goalYawRate >= -maxYawRate) && (goalYawRate <= maxYawRate))
+				reachedYaw = true;
+
+			float const actualYawRate = clamp(-maxYawRate, goalYawRate, maxYawRate);
+			float const actualYaw = actualYawRate * elapsedTime;
+
+			m_yawPosition = actualYawRate / maxYawRate;
+
+			shipTransform.yaw_l(actualYaw);
+		}
+	}
+
+	// Pitch
+
+	bool reachedPitch = false;
+	{
+		if (shipInterface.getMaximumPitch() > 0.f)
+		{
+			Vector const goal_o = shipTransform.rotateTranslate_p2l(goalPosition_w);
+			float const goalPitch = goal_o.phi();
+			float const goalPitchRate  = goalPitch / elapsedTime;
+			float const maxPitchRate = shipInterface.getMaximumPitch();
+
+			if((goalPitchRate >= -maxPitchRate) && (goalPitchRate <= maxPitchRate))
+				reachedPitch = true;
+
+			float const actualPitchRate = clamp(-maxPitchRate, goalPitchRate, maxPitchRate);
+			float const actualPitch = actualPitchRate * elapsedTime;
+
+			m_pitchPosition = actualPitchRate / maxPitchRate;
+
+			shipTransform.pitch_l(actualPitch);
+		}
+	}
+
+	// Roll
+
+	bool reachedRoll = false;
+	{
+		float const maxRollRate = shipInterface.getMaximumRoll();
+
+		if (maxRollRate > 0.f)
+		{
+			Vector goalUp_o = shipTransform.rotateTranslate_p2l(up_w);
+			goalUp_o.normalize();
+
+			float const dot = Vector::unitY.dot(goalUp_o);
+			float const angleBetween = acos(dot);
+
+			if (   (goalUp_o.y > 0.0f)
+			    && (angleBetween < convertDegreesToRadians(1.0f)))
+			{
+				m_rollPosition = 0.0f;
+				reachedRoll = true;
+			}
+			else if (goalUp_o.x > 0.0f)
+			{
+				m_rollPosition = -1.0f;
+			}
+			else if (goalUp_o.x < 0.0f)
+			{
+				m_rollPosition = 1.0f;
+			}
+
+			if (   (m_rollPosition > 0.0f)
+			    || (m_rollPosition < 0.0f))
+			{
+				float const goalRollRate = angleBetween * elapsedTime * 10.0f;
+				float const actualRollRate = clamp(-maxRollRate, goalRollRate, maxRollRate);
+				m_rollPosition *= actualRollRate / maxRollRate;
+			}
+		}
+	}
+
+	return reachedYaw && reachedPitch && reachedRoll;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::setThrottle(float throttle)
+{
+	m_throttlePosition = clamp(0.0f,throttle,1.0f);
+}
+
+// ----------------------------------------------------------------------
+
+float ShipController::getLargestTurnRadius() const
+{
+	float result = 0.0f;
+
+	ShipObject const * const shipObject = getShipOwner();
+
+	if (shipObject != NULL)
+	{
+		float const maxYawRate = shipObject->getShipActualYawRateMaximum();
+		float const maxPitchRate = shipObject->getShipActualPitchRateMaximum();
+		float const maxRollRate = shipObject->getShipActualRollRateMaximum();
+		float const maxTurnRate = std::min(std::min(maxYawRate, maxPitchRate), maxRollRate);
+		float const speedMaximum = shipObject->getShipActualSpeedMaximum();
+
+		result = (maxTurnRate > 0.0f) ? (speedMaximum / maxTurnRate) : 0.0f;
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::dock(ShipObject & dockTarget, float const secondsAtDock)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("ShipController::dock() owner(%s) dockTarget(%s) secondsAtDock(%.2f)", getOwner()->getNetworkId().getValueString().c_str(), dockTarget.getNetworkId().getValueString().c_str(), secondsAtDock));
+
+	// Create the docking behavior
+
+	delete m_pendingDockingBehavior;
+	m_pendingDockingBehavior = new AiShipBehaviorDock(*this, dockTarget, secondsAtDock);
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::unDock()
+{
+	if (m_pendingDockingBehavior != NULL)
+	{
+		m_pendingDockingBehavior->unDock();
+	}
+	else if (m_dockingBehavior != NULL)
+	{
+		m_dockingBehavior->unDock();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipController::isDocking() const
+{
+	return (m_dockingBehavior != NULL) || (m_pendingDockingBehavior != NULL);
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipController::isDocked() const
+{
+	return ((m_dockingBehavior != NULL) && m_dockingBehavior->isDocked());
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::onTargetedByMissile(int const /*missileId*/)
+{
+}
+
+//----------------------------------------------------------------------
+
+ShipController * ShipController::asShipController()
+{
+	return this;
+}
+
+//----------------------------------------------------------------------
+
+ShipController const * ShipController::asShipController() const
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+PlayerShipController * ShipController::asPlayerShipController()
+{
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+PlayerShipController const * ShipController::asPlayerShipController() const
+{
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+AiShipController * ShipController::asAiShipController()
+{
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+AiShipController const * ShipController::asAiShipController() const
+{
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+AiShipAttackTargetList const & ShipController::getAttackTargetList() const
+{
+	return *m_attackTargetList;
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipController::addDamageTaken(NetworkId const & attackingUnit, float const damage, bool const verifyAttacker)
+{
+	bool result = false;
+	ShipObject * const attackingUnitShipObject = ShipObject::asShipObject(NetworkIdManager::getObjectById(attackingUnit));
+
+	if (   (attackingUnitShipObject != NULL)
+	    && !attackingUnitShipObject->isDamageAggroImmune())
+	{
+		result = verifyAttacker ? Pvp::canAttack(*attackingUnitShipObject, *NON_NULL(getShipOwner())) : true;
+
+		if (result)
+		{
+			m_attackTargetList->add(*attackingUnitShipObject, damage);
+		}																		    
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipController::hasTurretTargetingSystem() const
+{
+	return (m_turretTargetingSystem != NULL);
+}
+
+// ----------------------------------------------------------------------
+
+float ShipController::getTurretMissChance() const
+{
+	return 0.5f;
+}
+
+// ----------------------------------------------------------------------
+
+float ShipController::getTurretMissAngle() const
+{
+	// Once player auto-turrets come online, this needs to be overloaded in PlayerShipController
+	return tan(convertDegreesToRadians(10.0f));
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::clearEnemyCheckQueuedFlag()
+{
+	m_enemyCheckQueued = false;
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipController::removeAttackTarget(NetworkId const & unit)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("ShipController::removeAttackTarget() owner(%s) unit(%s)", getOwner()->getNetworkId().getValueString().c_str(), unit.getValueString().c_str()));
+
+	return m_attackTargetList->remove(unit);
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::onAttackTargetChanged(NetworkId const & target)
+{
+	if (m_turretTargetingSystem != NULL)
+	{
+		m_turretTargetingSystem->onTargetChanged(target);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::onAttackTargetLost(NetworkId const & target)
+{
+	if (m_turretTargetingSystem != NULL)
+	{
+		m_turretTargetingSystem->onTargetLost(target);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::onAttackTargetListEmpty()
+{
+	// This is intentionally left blank
+}
+
+// ----------------------------------------------------------------------
+
+float ShipController::getThrottle() const
+{
+	return m_throttlePosition;
+}
+
+// ----------------------------------------------------------------------
+
+int ShipController::getNumberOfAiUnitsAttackingMe() const
+{
+	int result = 0;
+	CachedNetworkIdList::const_iterator iterAiTargetingMeList = m_aiTargetingMeList->begin();
+
+	for (; iterAiTargetingMeList != m_aiTargetingMeList->end(); ++iterAiTargetingMeList)
+	{
+		CachedNetworkId const & ai = (*iterAiTargetingMeList);
+		Object const * const aiObject = ai.getObject();
+
+		if (aiObject != NULL)
+		{
+			ShipController const * const shipController = aiObject->getController()->asShipController();
+			AiShipController const * const aiShipController = (shipController != NULL) ? shipController->asAiShipController() : NULL;
+
+			if (aiShipController != NULL)
+			{
+				if (aiShipController->getPrimaryAttackTarget() == getOwner()->getNetworkId())
+				{
+					++result;
+				}
+			}
+		}
+		else
+		{
+			DEBUG_WARNING(true, ("ShipController::getNumberOfAiShipAttackingMe() ERROR: Why am I(%s) being targeted by a NULL object(%s)?", getOwner()->getDebugInformation().c_str(), ai.getValueString().c_str()));
+		}
+	}
+
+	return result;
+}
+
+// ======================================================================
+// PROTECTED ShipController
+// ======================================================================
+
+ShipObject * ShipController::getShipOwner()
+{
+	Object * const object = getOwner();
+	ServerObject * const serverObject = object ? object->asServerObject() : 0;
+	return serverObject ? serverObject->asShipObject() : 0;
+}
+
+// ----------------------------------------------------------------------
+
+ShipObject const * ShipController::getShipOwner() const
+{
+	return const_cast<ShipController *>(this)->getShipOwner();
+}
+
+// ======================================================================
+// PRIVATE ShipController
+// ======================================================================
+
+void ShipController::synchronizeTransform()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::experiencedCollision()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::clearAiTargetingMeList()
+{
+	// Notify all the ships targeting me that I am no longer valid
+	
+	s_purgeList.clear();
+	CachedNetworkIdList::const_iterator iterTargetByAiList = m_aiTargetingMeList->begin();
+
+	for (; iterTargetByAiList != m_aiTargetingMeList->end(); ++iterTargetByAiList)
+	{
+		CachedNetworkId const & id = *iterTargetByAiList;
+
+		s_purgeList.push_back(id);
+	}
+
+	PurgeList::const_iterator iterPurgeList = s_purgeList.begin();
+
+	for (; iterPurgeList != s_purgeList.end(); ++iterPurgeList)
+	{
+		CachedNetworkId const & id = (*iterPurgeList);
+
+		if (id.getObject() != NULL)
+		{
+			ShipController * const shipController = id.getObject()->getController()->asShipController();
+
+			if (shipController != NULL)
+			{
+				IGNORE_RETURN(shipController->removeAttackTarget(getOwner()->getNetworkId()));
+			}
+			else
+			{
+				LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("ShipController::~ShipController() ERROR: owner(%s) targetedByUnit(%s) Why does this unit not have a ShipController?", getOwner()->getNetworkId().getValueString().c_str(), id.getValueString().c_str()));
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ShipController::getApproximateFutureTransform(Transform & transform, Vector & velocity, float elapsedTime) const
+{
+	ServerShipObjectInterface const serverShipObjectInterface(getShipOwner());
+
+	m_shipDynamicsModel->getApproximateFutureTransform(transform, velocity, elapsedTime, serverShipObjectInterface);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/controller/ShipController.h b/engine/server/library/serverGame/src/shared/controller/ShipController.h
new file mode 100644
index 00000000..6fd1dccf
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/ShipController.h
@@ -0,0 +1,140 @@
+// ======================================================================
+//
+// ShipController.h
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	INCLUDED_ShipController_H
+#define	INCLUDED_ShipController_H
+
+// ======================================================================
+
+#include "serverGame/TangibleController.h"
+#include "sharedFoundation/MessageQueue.h"
+
+class AiShipAttackTargetList;
+class AiShipBehaviorDock;
+class AiShipController;
+class CachedNetworkId;
+class NetworkId;
+class PlayerShipController;
+class ShipDynamicsModel;
+class ShipObject;
+class ShipTurretTargetingSystem;
+class Timer;
+
+// ======================================================================
+
+class ShipController : public TangibleController
+{
+public:
+
+	typedef stdset<CachedNetworkId>::fwd CachedNetworkIdList;
+	typedef stdmultiset<CachedNetworkId>::fwd DockedByList;
+
+	explicit ShipController(ShipObject * newOwner);
+	virtual ~ShipController();
+
+	virtual void endBaselines();
+	virtual void teleport(Transform const &goal, ServerObject *goalObj);
+	virtual void onAddedToWorld();
+	virtual void onTargetedByMissile(int const missileId);
+
+	virtual ShipController * asShipController();
+	virtual ShipController const * asShipController() const;
+	virtual PlayerShipController * asPlayerShipController();
+	virtual PlayerShipController const * asPlayerShipController() const;
+	virtual AiShipController * asAiShipController();
+	virtual AiShipController const * asAiShipController() const;
+
+	Transform const &getTransform() const;
+	Vector const &getVelocity() const;
+	float getSpeed() const;
+	float getYawRate() const;
+	float getPitchRate() const;
+	float getRollRate() const;
+
+	void respondToCollision(Vector const & deltaToMove_p, Vector const & newReflection_p, Vector const & normalOfSurface_p);
+
+	ShipObject * getShipOwner();
+	ShipObject const * getShipOwner() const;
+
+	void addTurretTargetingSystem(ShipTurretTargetingSystem * newSystem);
+	void removeTurretTargetingSystem();
+	bool hasTurretTargetingSystem() const;
+	virtual float getTurretMissChance() const;
+	virtual float getTurretMissAngle() const;
+
+	virtual void addAiTargetingMe(NetworkId const & unit);
+	void removeAiTargetingMe(NetworkId const & unit);
+	CachedNetworkIdList const & getAiTargetingMeList() const;
+	AiShipAttackTargetList const & getAttackTargetList() const;
+	int getNumberOfAiUnitsAttackingMe() const;
+
+	void setPosition_w(Vector const & position, bool allowOrientation);
+	bool face(Vector const & goalPosition_w, float const elapsedTime);
+	bool face(Vector const & goalPosition_w, Vector const & up_w, float const elapsedTime);
+
+	void setThrottle(float const position);
+	float getThrottle() const;
+	float getLargestTurnRadius() const;
+
+	virtual void dock(ShipObject & dockTarget, float const secondsAtDock);
+	void unDock();
+	bool isDocking() const;
+	bool isDocked() const;
+	bool isBeingDocked() const;
+	void addDockedBy(Object const & unit);
+	void removeDockedBy(Object const & unit);
+	DockedByList const & getDockedByList() const;
+
+	virtual bool addDamageTaken(NetworkId const & attackingUnit, float const damage, bool const verifyAttacker);
+	virtual bool removeAttackTarget(NetworkId const & targetUnit);
+	void clearEnemyCheckQueuedFlag();
+	virtual bool shouldCheckForEnemies() const = 0;
+	void onAttackTargetChanged(NetworkId const & target);
+	void onAttackTargetLost(NetworkId const & target);
+	virtual void onAttackTargetListEmpty();
+
+	void getApproximateFutureTransform(Transform & transform, Vector & velocity, float elapsedTime) const;
+
+protected:
+
+	virtual float realAlter(float elapsedTime);
+	virtual void handleMessage (int message, float value, const MessageQueue::Data* data, uint32 flags);
+
+	ShipDynamicsModel * const m_shipDynamicsModel;
+	float m_yawPosition; // [-1...1]
+	float m_pitchPosition; // [-1...1]
+	float m_rollPosition; // [-1...1]
+	float m_throttlePosition;
+	AiShipBehaviorDock * m_pendingDockingBehavior;
+	AiShipBehaviorDock * m_dockingBehavior;
+	AiShipAttackTargetList * const m_attackTargetList;
+	Timer * const m_attackTargetDecayTimer;
+	bool m_enemyCheckQueued;
+	ShipTurretTargetingSystem * m_turretTargetingSystem;
+
+private:
+
+	DockedByList * const m_dockedByList;
+	CachedNetworkIdList * const m_aiTargetingMeList;
+
+	void clearAiTargetingMeList();
+
+private:
+	
+	ShipController();
+	ShipController(ShipController const &);
+	ShipController & operator=(ShipController const &);
+
+protected:
+
+	virtual void synchronizeTransform();
+	virtual void experiencedCollision();
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/controller/TangibleController.cpp b/engine/server/library/serverGame/src/shared/controller/TangibleController.cpp
new file mode 100644
index 00000000..d4e90806
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/TangibleController.cpp
@@ -0,0 +1,735 @@
+//========================================================================
+//
+// TangibleController.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/TangibleController.h"
+
+#include "SwgGameServer/CombatEngine.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ManufactureSchematicObject.h"
+#include "serverGame/Pvp.h"
+#include "serverGame/TangibleObject.h"
+#include "serverNetworkMessages/MessageQueueCommandQueueEnqueueFwd.h"
+#include "serverNetworkMessages/MessageQueueCommandQueueForceExecuteCommandFwd.h"
+#include "serverNetworkMessages/MessageQueuePvpCommand.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedGame/CommandTable.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/MessageQueueCommandQueueEnqueue.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedNetworkMessages/MessageQueueNetworkId.h"
+#include "sharedNetworkMessages/MessageQueueCommandQueueRemove.h"
+#include "sharedNetworkMessages/MessageQueueStartNpcConversation.h"
+#include "sharedNetworkMessages/ObjectChannelMessages.h"
+
+#include "sharedObject/NetworkIdManager.h"
+#include "swgServerNetworkMessages/MessageQueueCombatDamageList.h"
+#include "swgServerNetworkMessages/MessageQueueDirectDamage.h"
+#include "swgServerNetworkMessages/MessageQueueResourceAdd.h"
+
+//-----------------------------------------------------------------------
+
+TangibleController::TangibleController(TangibleObject *newOwner) :
+	ServerController(newOwner)
+{
+}
+
+//-----------------------------------------------------------------------
+
+TangibleController::~TangibleController()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleController::setAuthoritative(bool newAuthoritative)
+{
+	ServerController::setAuthoritative(newAuthoritative);
+	// pvp needs to be notified after an object is both initialized and made authoritative.
+	if (newAuthoritative)
+	{
+		TangibleObject* owner = dynamic_cast<TangibleObject *>(getOwner());
+		NOT_NULL(owner);
+		if (owner->isInitialized())
+			Pvp::handleAuthorityAcquire(*owner);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleController::handleMessage (const int message, const float value, const MessageQueue::Data* const data, const uint32 flags)
+{
+	TangibleObject * const owner = getTangibleOwner();
+	
+	switch (message)
+	{
+	case CM_pvpMessage:
+		{
+			const MessageQueuePvpCommand *pvpMsg = dynamic_cast<const MessageQueuePvpCommand *>(data);
+			NOT_NULL(pvpMsg);
+			Pvp::handlePvpMessage(*owner, *pvpMsg);
+		}
+		break;
+		
+	case CM_combatDamageList:
+		{
+			if (owner->isAuthoritative())
+			{
+				const MessageQueueCombatDamageList *damageListMessage = 
+					dynamic_cast<const MessageQueueCombatDamageList *>(data);
+				NOT_NULL(damageListMessage);
+				
+				const std::vector<CombatEngineData::DamageData> & damageList = 
+					damageListMessage->getDamageList();
+				if (damageList.size() == 0)
+					break;
+				
+				if (!owner->isInCombat())
+				{
+					WARNING(true, ("TangibleController setting owner %s to be in "
+						"combat to apply damage; we should be able to avoid doing "
+						"this!", owner->getNetworkId().getValueString().c_str()));
+					owner->setInCombat(true);
+				}
+				
+				// put the damage on the object's current damage list
+				
+				
+				owner->createCombatData();
+
+				CombatEngineData::CombatData * combatData = owner->getCombatData();
+
+				for (std::vector<CombatEngineData::DamageData>::const_iterator 
+					iter = damageList.begin(); iter != damageList.end(); ++iter)
+				{
+					combatData->defenseData.damage.push_back(*iter);
+				}
+			}
+		}
+		break;
+	
+	case CM_directDamage:
+		{
+			const MessageQueueDirectDamage *damageMessage = 
+				dynamic_cast<const MessageQueueDirectDamage *>(data);
+			NOT_NULL(damageMessage);
+			CombatEngine::damage(*owner, 
+				static_cast<ServerWeaponObjectTemplate::DamageType>(damageMessage->getDamageType()), 
+				static_cast<uint16>(damageMessage->getHitLocation()),
+				damageMessage->getDamageDone());
+		}
+		break;
+
+	case CM_setOwnerId:
+		{
+			const MessageQueueNetworkId * const msg = safe_cast<const MessageQueueNetworkId *>(data);
+			if(msg)
+			{
+				owner->setOwnerId(msg->getNetworkId());
+			}
+		}
+		break;
+	case CM_setMaxHitPoints:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if(msg)
+			{
+				owner->setMaxHitPoints(msg->getValue());
+			}
+		}
+		break;
+	case CM_setVisible:
+		{
+			const MessageQueueGenericValueType<bool> * const msg = safe_cast<const MessageQueueGenericValueType<bool> *>(data);
+			if(msg)
+			{
+				owner->setVisible(msg->getValue());
+			}
+		}
+		break;
+	case CM_hideFromClient:
+		{
+			const MessageQueueGenericValueType<bool> * const msg = safe_cast<const MessageQueueGenericValueType<bool> *>(data);
+			if(msg)
+			{
+				owner->setHidden(msg->getValue());
+			}
+		}
+		break;
+	case CM_setInvulnerable:
+		{
+			const MessageQueueGenericValueType<bool> * const msg = safe_cast<const MessageQueueGenericValueType<bool> *>(data);
+			if(msg)
+			{
+				owner->setInvulnerable(msg->getValue());
+			}
+		}
+		break;
+	case CM_addLocationTarget:
+		{
+			const MessageQueueGenericValueType<LocationData> * const msg = safe_cast<const MessageQueueGenericValueType<LocationData> *>(data);
+			if(msg)
+			{
+				owner->addLocationTarget(msg->getValue());
+			}
+		}
+		break;
+	case CM_removeLocationTarget:
+		{
+			const MessageQueueGenericValueType<Unicode::String> * const msg = safe_cast<const MessageQueueGenericValueType<Unicode::String> *>(data);
+			if(msg)
+			{
+				owner->removeLocationTarget(msg->getValue());
+			}
+		}
+		break;
+	case CM_setInCombat:
+		{
+			const MessageQueueGenericValueType<bool> * const msg = safe_cast<const MessageQueueGenericValueType<bool> *>(data);
+			if(msg)
+			{
+				owner->setInCombat(msg->getValue());
+			}
+		}
+		break;
+	case CM_addAim:
+		{
+			owner->addAim();
+		}
+		break;
+	case CM_clearAims:
+		{
+			owner->clearAims();
+		}
+		break;
+	case CM_alterHitPoints:
+		{
+			const MessageQueueGenericValueType<std::pair<int, NetworkId> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<int, NetworkId> > *>(data);
+			if(msg)
+			{
+				owner->alterHitPoints(msg->getValue().first, false, msg->getValue().second);
+			}
+		}
+		break;
+	case CM_addHate:
+		{
+			const MessageQueueGenericValueType<std::pair<NetworkId, float> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, float> > *>(data);
+			WARNING((msg == NULL), ("TangibleController::handleMessage(CM_addHate) The message data should never be NULL"));
+
+			if(msg)
+			{
+				owner->addHate(msg->getValue().first, msg->getValue().second);
+			}
+		}
+		break;
+	case CM_setHate:
+		{
+			const MessageQueueGenericValueType<std::pair<NetworkId, float> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, float> > *>(data);
+			WARNING((msg == NULL), ("TangibleController::handleMessage(CM_setHate) The message data should never be NULL"));
+
+			if(msg)
+			{
+				owner->setHate(msg->getValue().first, msg->getValue().second);
+			}
+		}
+		break;
+	case CM_removeHateTarget:
+		{
+			const MessageQueueGenericValueType<NetworkId> * const msg = safe_cast<const MessageQueueGenericValueType<NetworkId> *>(data);
+			WARNING((msg == NULL), ("TangibleController::handleMessage(CM_removeHateTarget) The message data should never be NULL"));
+
+			if(msg)
+			{
+				owner->removeHateTarget(msg->getValue());
+			}
+		}
+		break;
+	case CM_clearHateList:
+		{
+			owner->clearHateList();
+		}
+		break;
+	case CM_resetHateTimer:
+		{
+			owner->resetHateTimer();
+		}
+		break;
+	case CM_forceHateTarget:
+		{
+			const MessageQueueGenericValueType<NetworkId> * const msg = safe_cast<const MessageQueueGenericValueType<NetworkId> *>(data);
+			WARNING((msg == NULL), ("TangibleController::handleMessage(CM_removeHateTarget) The message data should never be NULL"));
+
+			if(msg)
+			{
+				owner->forceHateTarget(msg->getValue());
+			}
+		}
+		break;
+	case CM_autoExpireHateListTargetEnabled:
+		{
+			const MessageQueueGenericValueType<bool> * const msg = safe_cast<const MessageQueueGenericValueType<bool> *>(data);
+			WARNING((msg == NULL), ("TangibleController::handleMessage(CM_setHateListExpireTargetEnabled) The message data should never be NULL"));
+
+			if (msg != NULL)
+			{
+				owner->setHateListAutoExpireTargetEnabled(msg->getValue());
+			}
+		}
+		break;
+	case CM_setCraftedId:
+		{
+			const MessageQueueGenericValueType<NetworkId> * const msg = safe_cast<const MessageQueueGenericValueType<NetworkId> *>(data);
+			if(msg)
+			{
+				owner->setCraftedId(msg->getValue());
+			}
+		}
+		break;
+	case CM_startCraftingSession:
+		{
+			const MessageQueueGenericValueType<NetworkId> * const msg = safe_cast<const MessageQueueGenericValueType<NetworkId> *>(data);
+			if(msg)
+			{
+				CreatureObject * crafter = safe_cast<CreatureObject *>(NetworkIdManager::getObjectById(msg->getValue()));
+				DEBUG_FATAL(!crafter, ("%s:%s received startCraftingSession controller message for crafter %s, but crafter %s is not loaded on this server!", owner->getObjectTemplateName(), owner->getNetworkId().getValueString().c_str(), msg->getValue().getValueString().c_str(), msg->getValue().getValueString().c_str()));
+				if(crafter)
+					owner->startCraftingSession(*crafter);
+			}
+		}
+		break;
+	case CM_addObjectToOutputSlot:
+		{
+			const MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> > *>(data);
+			if(msg)
+			{
+				ServerObject * object = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(msg->getValue().first));
+				DEBUG_FATAL(! object, ("%s:%s received addObjectToOutputSlot controller message, but the ingredient %s is not loaded on this server!", owner->getObjectTemplateName(), owner->getNetworkId().getValueString().c_str(), msg->getValue().first.getValueString().c_str()));
+				if(object)
+				{
+					ServerObject * transferer = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(msg->getValue().second));
+					// transferer is allowed to be null
+					owner->addObjectToOutputSlot(*object, transferer);
+				}
+			}
+		}
+		break;
+	case CM_setCraftingManufactureSchematic:
+		{
+			const MessageQueueGenericValueType<NetworkId> * const msg = safe_cast<const MessageQueueGenericValueType<NetworkId> *>(data);
+			if(msg)
+			{
+				ManufactureSchematicObject * schematic = safe_cast<ManufactureSchematicObject *>(NetworkIdManager::getObjectById(msg->getValue()));
+				DEBUG_FATAL(! schematic, ("%s:%s received setCraftingManufactureSchematic controller message, but the ingredient %s is not loaded on this server!", owner->getObjectTemplateName(), owner->getNetworkId().getValueString().c_str(), msg->getValue().getValueString().c_str()));
+				if(schematic)
+				{
+					owner->setCraftingManufactureSchematic(*schematic);
+				}
+			}
+		}
+		break;
+	case CM_clearCraftingManufactureSchematic:
+		{
+			owner->clearCraftingManufactureSchematic();
+		}
+		break;
+	case CM_setCraftingPrototype:
+		{
+			const MessageQueueGenericValueType<NetworkId> * const msg = safe_cast<const MessageQueueGenericValueType<NetworkId> *>(data);
+			if(msg)
+			{
+				ServerObject * prototype = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(msg->getValue()));
+				DEBUG_FATAL(! prototype, ("%s:%s received setCraftingPrototype controller message, but the ingredient %s is not loaded on this server!", owner->getObjectTemplateName(), owner->getNetworkId().getValueString().c_str(), msg->getValue().getValueString().c_str()));
+				if(prototype)
+				{
+					owner->setCraftingPrototype(*prototype);
+				}
+			}
+		}
+		break;
+	case CM_clearCraftingPrototype:
+		{
+			owner->clearCraftingPrototype();
+		}
+		break;
+	case CM_setCreatorId:
+		{
+			const MessageQueueGenericValueType<NetworkId> * const msg = safe_cast<const MessageQueueGenericValueType<NetworkId> *>(data);
+			if(msg)
+			{
+				owner->setCreatorId(msg->getValue());
+			}
+		}
+		break;
+	case CM_setCreatorXp:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if(msg)
+			{
+				owner->setCreatorXp(msg->getValue());
+			}
+		}
+		break;
+	case CM_setCreatorXpType:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if(msg)
+			{
+				owner->setCreatorXpType(msg->getValue());
+			}
+		}
+		break;
+	case CM_setVisibleComponents:
+		{
+			const MessageQueueGenericValueType<std::vector<int> > * const msg = safe_cast<const MessageQueueGenericValueType<std::vector<int> > *>(data);
+			if(msg)
+			{
+				owner->setVisibleComponents(msg->getValue());
+			}
+		}
+		break;
+	case CM_setCraftedType:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if(msg)
+			{
+				owner->setCraftedType(msg->getValue());
+			}
+		}
+		break;
+	case CM_setCondition:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if(msg)
+			{
+				owner->setCondition(msg->getValue());
+			}
+		}
+		break;
+	case CM_clearCondition:
+		{
+			const MessageQueueGenericValueType<int> * const msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+			if(msg)
+			{
+				owner->clearCondition(msg->getValue());
+			}
+		}
+		break;
+	case CM_npcConversationStart:
+		{
+			const MessageQueueStartNpcConversation * const msg = NON_NULL(dynamic_cast<const MessageQueueStartNpcConversation *>(data));
+			
+			const CachedNetworkId npcId (msg->getNpc ());
+			TangibleObject * const npcObject = dynamic_cast<TangibleObject *>(npcId.getObject ());
+			if (npcObject)
+			{
+				owner->startNpcConversation (*npcObject, msg->getConversationName().c_str(), msg->getStarter(), msg->getAppearanceOverrideTemplateCrc());
+			}
+		}
+		break;
+		
+	case CM_npcConversationStop:
+		{				
+			owner->endNpcConversation ();
+		}
+		break;
+		
+	case CM_npcConversationSelect:
+		{
+			owner->respondToNpc (static_cast<int>(value));
+		}
+		break;
+	case CM_forwardNpcConversationMessage:
+		{
+			typedef std::pair<std::pair<StringId, ProsePackage>, Unicode::String> Payload;
+			const MessageQueueGenericValueType<Payload> * const msg = safe_cast<const MessageQueueGenericValueType<Payload> *>(data);
+			if(msg)
+			{
+				const Payload & payload = msg->getValue ();
+				owner->sendNpcConversationMessage(payload.first.first, payload.first.second, payload.second);
+			}
+		}
+		break;
+	case CM_addNpcConversationResponse:
+		{
+			typedef std::pair<StringId, ProsePackage> Payload;
+			const MessageQueueGenericValueType<Payload> * const msg = safe_cast<const MessageQueueGenericValueType<Payload> *>(data);
+			if(msg)
+			{
+				const Payload & payload = msg->getValue ();
+				owner->addNpcConversationResponse(payload.first, payload.second);
+			}
+		}
+		break;
+	case CM_removeNpcConversationResponse:
+		{
+			typedef std::pair<StringId, ProsePackage> Payload;
+			const MessageQueueGenericValueType<Payload> * const msg = safe_cast<const MessageQueueGenericValueType<Payload> *>(data);
+			if(msg)
+			{
+				const Payload & payload = msg->getValue ();
+				owner->removeNpcConversationResponse(payload.first, payload.second);
+			}
+		}
+		break;
+	case CM_sendNpcConversationResponses:
+		{
+			owner->sendNpcConversationResponses();
+		}
+		break;
+	case CM_playerResponseToNpcConversation:
+		{
+			typedef std::pair<std::string, std::pair<NetworkId, std::pair<StringId, ProsePackage> > > Payload;
+			const MessageQueueGenericValueType<Payload> * const msg = safe_cast<const MessageQueueGenericValueType<Payload> *>(data);
+			if(msg)
+			{
+				const Payload & payload = msg->getValue ();
+				owner->handlePlayerResponseToNpcConversation(payload.first, payload.second.first, payload.second.second.first, payload.second.second.second);
+			}
+		}
+		break;
+	case CM_setBioLink:
+		{
+			const MessageQueueGenericValueType<NetworkId> * const msg = safe_cast<const MessageQueueGenericValueType<NetworkId> *>(data);
+			if(msg)
+			{
+				const NetworkId & linkId = msg->getValue();
+				if (linkId != NetworkId::cms_invalid)
+					owner->setBioLink(linkId);
+				else
+					owner->clearBioLink();
+			}
+		}
+		break;
+	case CM_commandQueueForceExecuteCommandFwd:
+		{
+			MessageQueueCommandQueueForceExecuteCommandFwd const * const cmdMsg = dynamic_cast<const MessageQueueCommandQueueForceExecuteCommandFwd *>(data);
+			Command::ErrorCode status = static_cast<Command::ErrorCode>(cmdMsg->getStatus());
+
+			owner->forceExecuteCommand(CommandTable::getCommand(cmdMsg->getCommandHash()), cmdMsg->getTargetId(), cmdMsg->getParams(), status, cmdMsg->getCommandIsFromCommandQueue());
+		}
+		break;
+	case CM_commandQueueEnqueue:
+		{
+			handleCommandQueueEnqueue(dynamic_cast<const MessageQueueCommandQueueEnqueue *>(data));
+		}
+		break;
+	case CM_commandQueueRemove:
+		{
+			MessageQueueCommandQueueRemove const *msg = dynamic_cast<MessageQueueCommandQueueRemove const *>(data);
+			owner->commandQueueRemove(msg->getSequenceId());
+		}
+		break;
+	case CM_commandQueueEnqueueFwd:
+		{
+			handleCommandQueueEnqueueFwd(dynamic_cast<const MessageQueueCommandQueueEnqueueFwd *>(data));
+		}
+		break;
+	case CM_setAttackableOverride:
+		{
+			const MessageQueueGenericValueType<bool> * const msg = safe_cast<const MessageQueueGenericValueType<bool> *>(data);
+			if(msg)
+			{
+				owner->setAttackableOverride(msg->getValue());
+			}
+		}
+		break;
+	case CM_addPassiveReveal:
+		{
+			const MessageQueueGenericValueType<std::pair<std::pair<int, int>, NetworkId> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::pair<int, int>, NetworkId> > *>(data);
+			if(msg)
+			{
+				owner->addPassiveReveal(msg->getValue().second, msg->getValue().first.first, (msg->getValue().first.second != 0));
+			}
+		}
+		break;
+	case CM_removePassiveReveal:
+		{
+			const MessageQueueGenericValueType<NetworkId> * const msg = safe_cast<const MessageQueueGenericValueType<NetworkId> *>(data);
+			if(msg)
+			{
+				owner->removePassiveReveal(msg->getValue());
+			}
+		}
+		break;
+	case CM_removeAllPassiveReveal:
+		{
+			owner->removeAllPassiveReveal();
+		}
+		break;
+	case CM_addHateOverTime:
+		{
+			const MessageQueueGenericValueType<std::pair<NetworkId, std::pair<int, float> > > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, std::pair<int, float> > > *>(data);
+			if(msg)
+			{
+				owner->addHateOverTime(msg->getValue().first, msg->getValue().second.second, msg->getValue().second.first);
+			}
+		}
+		break;
+	case CM_addUserToAccessList:
+		{
+			MessageQueueGenericValueType<std::pair<int, NetworkId> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, NetworkId> > const *>(data);
+			WARNING((msg == NULL), ("TangibleController::handleMessage(CM_addUserToAccessList) The message data should never be NULL"));
+
+			if(msg)
+			{
+				if(msg->getValue().first < 0)
+					owner->addUserToAccessList(msg->getValue().second);
+				else
+					owner->addGuildToAccessList(msg->getValue().first);
+			}
+		}
+		break;
+	case CM_removeUserFromAccessList:
+		{
+			MessageQueueGenericValueType<std::pair<int, NetworkId> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, NetworkId> > const *>(data);
+			WARNING((msg == NULL), ("TangibleController::handleMessage(CM_removeUserFromAccessList) The message data should never be NULL"));
+
+			if(msg)
+			{
+				if(msg->getValue().first < 0)
+					owner->removeUserFromAccessList(msg->getValue().second);
+				else
+					owner->removeGuildFromAccessList(msg->getValue().first);
+			}
+		}
+		break;
+	case CM_clearUserAccessList:
+		{
+			MessageQueueGenericValueType<bool> const *msg = safe_cast<MessageQueueGenericValueType<bool> const *>(data);
+			if(msg)
+			{
+				if(msg->getValue())
+					owner->clearGuildAccessList();
+				else
+					owner->clearUserAccessList();
+			}
+		}
+		break;
+	case CM_addObjectEffect:
+		{
+			MessageQueueGenericValueType<std::pair<std::string, std::pair<std::string, std::pair<std::string, std::pair<Vector, float > > > > > const * msg = safe_cast<MessageQueueGenericValueType<std::pair<std::string, std::pair<std::string, std::pair<std::string, std::pair<Vector, float > > > > > const *>(data);
+			if(msg)
+			{
+				owner->addObjectEffect(msg->getValue().second.first, msg->getValue().second.second.first, msg->getValue().second.second.second.first, msg->getValue().second.second.second.second, msg->getValue().first);
+			}
+		}
+		break;
+	case CM_removeObjectEffect:
+		{
+			MessageQueueGenericValueType<std::string> const * msg = safe_cast<MessageQueueGenericValueType<std::string> const *>(data);
+			if(msg)
+			{
+				owner->removeObjectEffect(msg->getValue());
+			}
+		}
+		break;
+	case CM_removeAllObjectEffect:
+		{
+			MessageQueueGenericValueType<bool> const *msg = safe_cast<MessageQueueGenericValueType<bool> const *>(data);
+			if(msg)
+			{
+				if(msg->getValue())
+					owner->removeAllObjectEffects();
+			}
+		}
+		break;
+	default:
+		ServerController::handleMessage(message, value, data, flags);
+		break;
+	}
+}
+
+//----------------------------------------------------------------------
+
+void TangibleController::handleCommandQueueEnqueue(MessageQueueCommandQueueEnqueue const *msg)
+{
+	if (!msg)
+		return;
+
+	TangibleObject * const owner = getTangibleOwner();
+
+	if (owner->getClient())
+		owner->getClient()->resetIdleTime();
+
+	owner->commandQueueEnqueue(
+		CommandTable::getCommand(msg->getCommandHash()),
+		msg->getTargetId(),
+		msg->getParams(),
+		msg->getSequenceId());
+}
+
+//----------------------------------------------------------------------
+
+void TangibleController::handleCommandQueueEnqueueFwd(MessageQueueCommandQueueEnqueueFwd const *msg)
+{
+	// this is an enqueue message forwarded from another server
+	if (!msg)
+		return;
+
+	TangibleObject * const owner = getTangibleOwner();
+
+	int priority = msg->getPriority();
+	if (priority < 0 || priority >= Command::CP_NumberOfPriorities)
+		priority = Command::CP_Default;
+	
+	owner->commandQueueEnqueue(
+		CommandTable::getCommand(msg->getCommandHash()),
+		msg->getTargetId(),
+		msg->getParams(),
+		msg->getSequenceId(),
+		msg->getClearable(),
+		static_cast<Command::Priority>(priority),
+		msg->getFromServer());
+}
+
+//-----------------------------------------------------------------------
+
+const TangibleObject * TangibleController::getTangibleOwner() const
+{
+	return getServerOwner()->asTangibleObject();
+}
+
+// ----------------------------------------------------------------------
+
+TangibleObject * TangibleController::getTangibleOwner()
+{
+	return getServerOwner()->asTangibleObject();
+}
+
+//-----------------------------------------------------------------------
+
+TangibleController * TangibleController::asTangibleController()
+{
+	return this;
+}
+
+//----------------------------------------------------------------------
+
+TangibleController const * TangibleController::asTangibleController() const
+{
+	return this;
+}
+
+//----------------------------------------------------------------------
+
+AiTurretController * TangibleController::asAiTurretController()
+{
+	return NULL;
+}
+
+//----------------------------------------------------------------------
+
+AiTurretController const * TangibleController::asAiTurretController() const
+{
+	return NULL;
+}
+
+//========================================================================
diff --git a/engine/server/library/serverGame/src/shared/controller/TangibleController.h b/engine/server/library/serverGame/src/shared/controller/TangibleController.h
new file mode 100644
index 00000000..75bc34ec
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/TangibleController.h
@@ -0,0 +1,59 @@
+//========================================================================
+//
+// TangibleController.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	INCLUDED_TangibleController_H
+#define	INCLUDED_TangibleController_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/ServerController.h"
+class AiTurretController;
+
+//----------------------------------------------------------------------
+
+class MessageQueueCommandQueueEnqueue;
+class MessageQueueCommandQueueEnqueueFwd;
+class TangibleObject;
+
+//-----------------------------------------------------------------------
+/**
+ * A generic controller for all Tangible Objects.
+ */
+
+class TangibleController : public ServerController
+{
+public:
+	explicit TangibleController         (TangibleObject * newOwner);
+	~TangibleController                 (void);
+	virtual void    setAuthoritative    (bool newAuthoritative);
+
+	void handleCommandQueueEnqueue(MessageQueueCommandQueueEnqueue const * data);
+	void handleCommandQueueEnqueueFwd(MessageQueueCommandQueueEnqueueFwd const * data);
+
+	virtual TangibleController * asTangibleController();
+	virtual TangibleController const * asTangibleController() const;
+
+	virtual AiTurretController * asAiTurretController();
+	virtual AiTurretController const * asAiTurretController() const;
+
+	TangibleObject * getTangibleOwner();
+	const TangibleObject * getTangibleOwner() const;
+
+protected:
+	virtual void handleMessage (int message, float value, const MessageQueue::Data* data, uint32 flags);
+
+private:
+
+    TangibleController				(void);
+    TangibleController				(const TangibleController & other);
+    TangibleController&	operator=	(const TangibleController & other);
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// INCLUDED_TangibleController_H
diff --git a/engine/server/library/serverGame/src/shared/controller/TurretController.cpp b/engine/server/library/serverGame/src/shared/controller/TurretController.cpp
new file mode 100644
index 00000000..899565eb
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/TurretController.cpp
@@ -0,0 +1,23 @@
+//TurretController.cpp
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/TurretController.h"
+
+#include "serverGame/WeaponObject.h"
+
+//-----------------------------------------------------------------------
+
+TurretController::TurretController(WeaponObject * newOwner) :
+		WeaponController(newOwner)
+{
+}
+
+//-----------------------------------------------------------------------
+
+TurretController::~TurretController()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/controller/TurretController.h b/engine/server/library/serverGame/src/shared/controller/TurretController.h
new file mode 100644
index 00000000..33774cda
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/TurretController.h
@@ -0,0 +1,30 @@
+//TurretController.h
+
+#ifndef	_TURRET_CONTROLLER_H
+#define	_TURRET_CONTROLLER_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/WeaponController.h"
+
+//----------------------------------------------------------------------
+
+class WeaponObject;
+
+//-----------------------------------------------------------------------
+
+class TurretController : public WeaponController
+{
+public:
+    explicit TurretController         (WeaponObject * newOwner);
+    ~TurretController                 (void);
+
+private:
+    TurretController				(void);
+    TurretController				(const TurretController & other);
+    TurretController	operator=	(const TurretController & other);
+};
+
+//-----------------------------------------------------------------------
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/controller/UniverseController.cpp b/engine/server/library/serverGame/src/shared/controller/UniverseController.cpp
new file mode 100644
index 00000000..da625004
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/UniverseController.cpp
@@ -0,0 +1,27 @@
+//========================================================================
+//
+// UniverseController.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/UniverseController.h"
+
+#include "serverGame/UniverseObject.h"
+
+// ======================================================================
+
+UniverseController::UniverseController(UniverseObject *newOwner) :
+	ServerController(newOwner)
+{
+}
+
+//-----------------------------------------------------------------------
+
+UniverseController::~UniverseController()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/controller/UniverseController.h b/engine/server/library/serverGame/src/shared/controller/UniverseController.h
new file mode 100644
index 00000000..63ca1c62
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/UniverseController.h
@@ -0,0 +1,40 @@
+//========================================================================
+//
+// UniverseController.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	INCLUDED_UniverseController_H
+#define	INCLUDED_UniverseController_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/ServerController.h"
+#include "serverGame/UniverseObject.h"
+
+//----------------------------------------------------------------------
+
+//class UniverseObject;
+
+//-----------------------------------------------------------------------
+/**
+ * A generic controller for all Universe Objects.
+ */
+
+class UniverseController : public ServerController
+{
+  public:
+    explicit UniverseController         (UniverseObject * newOwner);
+    ~UniverseController                 (void);
+
+  private:
+    UniverseController				(void);
+    UniverseController				(const UniverseController & other);
+    UniverseController&	operator=	(const UniverseController & other);
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// INCLUDED_UniverseController_H
diff --git a/engine/server/library/serverGame/src/shared/controller/VehicleController.cpp b/engine/server/library/serverGame/src/shared/controller/VehicleController.cpp
new file mode 100644
index 00000000..b1cc5e96
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/VehicleController.cpp
@@ -0,0 +1,28 @@
+//========================================================================
+//
+// VehicleController.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/VehicleController.h"
+
+#include "serverGame/GameServer.h"
+#include "serverGame/VehicleObject.h"
+
+//-----------------------------------------------------------------------
+
+VehicleController::VehicleController(VehicleObject * newOwner) :
+		TangibleController(newOwner)
+{
+}
+
+//-----------------------------------------------------------------------
+
+VehicleController::~VehicleController()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/controller/VehicleController.h b/engine/server/library/serverGame/src/shared/controller/VehicleController.h
new file mode 100644
index 00000000..00a4647d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/VehicleController.h
@@ -0,0 +1,36 @@
+//========================================================================
+//
+// VehicleController.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	INCLUDED_VehicleController_H
+#define	INCLUDED_VehicleController_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/TangibleController.h"
+
+//-----------------------------------------------------------------------
+
+class VehicleObject;
+
+//-----------------------------------------------------------------------
+
+class VehicleController : public TangibleController
+{
+public:
+	explicit		VehicleController		(VehicleObject * newOwner);
+					~VehicleController		();
+
+private:
+	VehicleController            (void);
+	VehicleController            (const VehicleController & other);
+	VehicleController& operator=  (const VehicleController & other);
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// INCLUDED_VehicleController_H
diff --git a/engine/server/library/serverGame/src/shared/controller/WeaponController.cpp b/engine/server/library/serverGame/src/shared/controller/WeaponController.cpp
new file mode 100644
index 00000000..953bbeab
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/WeaponController.cpp
@@ -0,0 +1,24 @@
+//WeaponController.cpp
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/WeaponController.h"
+
+#include "serverGame/WeaponObject.h"
+
+//-----------------------------------------------------------------------
+
+WeaponController::WeaponController(WeaponObject * newOwner) :
+		TangibleController(newOwner)
+{
+}
+
+//-----------------------------------------------------------------------
+
+WeaponController::~WeaponController()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverGame/src/shared/controller/WeaponController.h b/engine/server/library/serverGame/src/shared/controller/WeaponController.h
new file mode 100644
index 00000000..0fa7d25f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/controller/WeaponController.h
@@ -0,0 +1,30 @@
+//WeaponController.h
+
+#ifndef	_WEAPON_CONTROLLER_H
+#define	_WEAPON_CONTROLLER_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/TangibleController.h"
+
+//----------------------------------------------------------------------
+
+class WeaponObject;
+
+//-----------------------------------------------------------------------
+
+class WeaponController : public TangibleController
+{
+public:
+    explicit WeaponController         (WeaponObject * newOwner);
+    ~WeaponController                 (void);
+
+private:
+    WeaponController				(void);
+    WeaponController				(const WeaponController & other);
+    WeaponController	operator=	(const WeaponController & other);
+};
+
+//-----------------------------------------------------------------------
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/AttribModNameManager.cpp b/engine/server/library/serverGame/src/shared/core/AttribModNameManager.cpp
new file mode 100644
index 00000000..c4a0dd5c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/AttribModNameManager.cpp
@@ -0,0 +1,372 @@
+//========================================================================
+//
+// AttribModNameManager.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AttribModNameManager.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedFoundation/Crc.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+
+
+namespace AttribModNameManagerNamespace
+{
+	// some stuf to help track down why we're getting attrib mod name requests
+	// for names we don't know about
+	std::set<uint32> unknownCrcs;
+}
+
+AttribModNameManager * AttribModNameManager::ms_attribModNameManager = NULL;
+
+
+//========================================================================
+
+/**
+ * Used to sort dotted names. A name that is a sub-dotted-string of the compared
+ * name are considered equal.
+ */
+bool AttribModNameManager::SortDottedNames::operator()(const std::string &a, const std::string &b) const
+{
+	size_t as = a.size();
+	size_t bs = b.size();
+	if (as < bs && b[as] == '.')
+		return strncmp(a.c_str(), b.c_str(), as) < 0;
+	else if (bs < as && a[bs] == '.')
+		return strncmp(b.c_str(), a.c_str(), bs) > 0;
+	else
+		return a < b;
+}
+
+//========================================================================
+
+/**
+ * Class constructror.
+ */
+AttribModNameManager::AttribModNameManager() :
+	m_names(new Names),
+	m_crcMap(new CrcNameMap)
+{
+}	// AttribModNameManager::AttribModNameManager
+
+// ----------------------------------------------------------------------
+
+/**
+ * Class destructror.
+ */
+AttribModNameManager::~AttribModNameManager()
+{
+	delete m_names;
+	delete m_crcMap;
+	m_names = NULL;
+	m_crcMap = NULL;
+}	// AttribModNameManager::~AttribModNameManager
+
+// ----------------------------------------------------------------------
+
+/**
+ * Creates the AttribModNameManager.
+ */
+void AttribModNameManager::install()
+{
+	if (ms_attribModNameManager == NULL)
+	{
+		ms_attribModNameManager = new AttribModNameManager;
+		ExitChain::add(AttribModNameManager::remove, "AttribModNameManager::remove");
+	}
+}	// AttribModNameManager::install
+
+// ----------------------------------------------------------------------
+
+/**
+ * Destroys the AttribModNameManager.
+ */
+void AttribModNameManager::remove()
+{
+	if (ms_attribModNameManager != NULL)
+	{
+		delete ms_attribModNameManager;
+		ms_attribModNameManager = NULL;
+	}
+}	// AttribModNameManager::remove
+
+// ----------------------------------------------------------------------
+
+/**
+ * Adds an attrib mod name to the manager. If the mod name wasn't a duplicate
+ * of an already existing mod, we send it to the other game servers.
+ *
+ * @param name		the attrib mod name
+ */
+void AttribModNameManager::addAttribModName(const char * name)
+{
+	bool added = addAttribModNameFromRemote(name);
+	if (added)
+	{
+		DEBUG_REPORT_LOG(true, ("AttribModNameManager sending name %s to other servers\n", name));
+
+		// tell other servers about the mod name
+
+		ServerMessageForwarding::beginBroadcast();
+
+		GenericValueTypeMessage<std::string> const addAttribModNameMessage("AddAttribModName", name);
+		ServerMessageForwarding::send(addAttribModNameMessage);
+
+		ServerMessageForwarding::end();
+	}
+}	// AttribModNameManager::addAttribModName
+
+// ----------------------------------------------------------------------
+
+/**
+ * Adds an attrib mod name to the manager.
+ *
+ * @param name		the attrib mod name
+ */
+bool AttribModNameManager::addAttribModNameFromRemote(const char * name)
+{
+	const int BUFSIZE = 1024;
+	char buffer[BUFSIZE];
+	int nameLen = strlen(name);
+	if (nameLen >= BUFSIZE)
+	{
+		WARNING_STRICT_FATAL(true, ("AttribModNameManager::addAttribModName passed "
+			"mod name %s >= %d bytes", name, BUFSIZE));
+		return false;
+	}
+	strcpy(buffer, name);
+
+	// we add the name to our map, plus any base name it derives from
+	bool added = false;
+	char * bufEnd = &buffer[nameLen];
+	while (bufEnd != buffer)
+	{
+		std::pair<Names::iterator, bool> result = m_names->insert(buffer);
+		if (result.second)
+		{
+			DEBUG_REPORT_LOG(true, ("AttribModNameManager added name %s\n", buffer));
+			added = true;
+			uint32 crc = Crc::calculate(buffer);
+			m_crcMap->insert(std::make_pair(crc, result.first));
+			
+			// see if our new name is one that we couldn't find before
+			if (AttribModNameManagerNamespace::unknownCrcs.find(crc) != 
+				AttribModNameManagerNamespace::unknownCrcs.end())
+			{
+				LOG("unknown_mods", ("AttribModNameManager::addAttribModNameFromRemote "
+					"added previously unknown mod name %s(%u) in frame %lu",
+					buffer, crc, ServerClock::getInstance().getServerFrame()));
+				AttribModNameManagerNamespace::unknownCrcs.erase(crc);
+			}
+			
+			// look for the last '.' in the name, and replace it with 0
+			while (--bufEnd != buffer)
+			{
+				if (*bufEnd == '.')
+				{
+					*bufEnd = '\0';
+					break;
+				}
+			}
+		}
+		else
+			break;
+	}
+	return added;
+}	// AttribModNameManager::addAttribModNameFromRemote
+
+// ----------------------------------------------------------------------
+
+/**
+ * Adds attrib mod names to the manager.
+ *
+ * @param names		the attrib mod names, separated by spaces
+ */
+void AttribModNameManager::addAttribModNamesListFromRemote(const char * names)
+{
+static const int BUFSIZE = 1024;
+char buffer[BUFSIZE];
+
+	int i;
+	const char * c = names;
+	while (*c != '\0')
+	{
+		for (i = 0; i < BUFSIZE-1 && *c != ' ' && *c != '\0';)
+			buffer[i++] = *c++;
+		if (*c != ' ' && *c != '\0')
+		{
+			// the name is longer than our buffer, print an error message
+			// and go to the next name
+			buffer[BUFSIZE-1] = '\0';
+			WARNING(true, ("AttribModNameManager::addAttribModNamesListFromRemote "
+				"received a name (%s) that is too long!", buffer));
+			while (*c != ' ' && *c != '\0')
+				++c;
+		}
+		else
+		{
+			buffer[i] = '\0';
+			addAttribModNameFromRemote(buffer);
+		}
+		if (*c == ' ')
+			++c;
+	}
+}	// AttribModNameManager::addAttribModNamesListFromRemote
+
+// ----------------------------------------------------------------------
+
+/**
+ * Called when another game server starts and wants the attrib mod names being 
+ * used.
+ */
+void AttribModNameManager::sendAllNamesToServer(std::vector<uint32> const & servers) const
+{
+	// get the set of non-base names we know about
+	std::set<std::string, SortDottedNames> unique;
+	for (Names::const_reverse_iterator i = m_names->rbegin(); i != m_names->rend(); ++i)
+		unique.insert(*i);
+
+	if (!unique.empty())
+	{
+		// concat the names
+		std::string msgString;
+		for (std::set<std::string, SortDottedNames>::const_iterator j = unique.begin(); j != unique.end(); ++j)
+		{
+			msgString.append(*j);
+			msgString.append(" ");
+		}
+
+		// @todo: test if msgString gets too big and break it up if needed
+
+		// send the names to the requesting server
+
+		ServerMessageForwarding::begin(servers);
+
+		GenericValueTypeMessage<std::string> const addAttribModNamesListMessage("AddAttribModNamesList", msgString);
+		ServerMessageForwarding::send(addAttribModNamesListMessage);
+
+		ServerMessageForwarding::end();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the attrib mod name for a given crc.
+ *
+ * @param crc		the crc value to look up
+ *
+ * @return the attrib mod name, or NULL if there was no name for the crc
+ */
+const char * AttribModNameManager::getAttribModName(uint32 crc) const
+{
+	if (crc != 0)
+	{
+		CrcNameMap::const_iterator result = m_crcMap->find(crc);
+		if (result != m_crcMap->end())
+			return (*(*result).second).c_str();
+		LOG("unknown_mods", ("AttribModNameManager::getAttribModName could not find "
+			"mod name for crc %u in frame %lu", crc, 
+			ServerClock::getInstance().getServerFrame()));
+		AttribModNameManagerNamespace::unknownCrcs.insert(crc);
+	}
+	return NULL;
+}	// AttribModNameManager::getAttribModName
+
+// ----------------------------------------------------------------------
+
+/**
+ * For a given attrib mod base name, returns all the mod names derived from it.
+ *
+ * @param base		the base mod name
+ * @param names		list that will be filled in with the derived names
+ */
+void AttribModNameManager::getAttribModNamesFromBase(const std::string & base, 
+	std::vector<const char *> & names) const
+{
+	size_t baselen = base.size();
+	for (Names::const_iterator i = m_names->lower_bound(base); i != m_names->end(); ++i)
+	{
+		if (strncmp(base.c_str(), (*i).c_str(), baselen) == 0)
+		{
+			char lastchar = (*i).c_str()[baselen];
+			if (lastchar == '\0' || lastchar == '.')
+			{
+				names.push_back((*i).c_str());
+			}
+			else
+				break;
+		}
+		else
+			break;
+	}
+}	// AttribModNameManager::getAttribModNamesFromBase
+
+// ----------------------------------------------------------------------
+
+/**
+ * For a given attrib mod base name, returns all the mod name crcs derived from it.
+ *
+ * @param base		the base mod name
+ * @param crcs		list that will be filled in with the derived crcs
+ */
+void AttribModNameManager::getAttribModCrcsFromBase(const std::string & base, 
+	std::vector<uint32> & crcs) const
+{
+	size_t baselen = base.size();
+	for (Names::const_iterator i = m_names->lower_bound(base); i != m_names->end(); ++i)
+	{
+		if (strncmp(base.c_str(), (*i).c_str(), baselen) == 0)
+		{
+			char lastchar = (*i).c_str()[baselen];
+			if (lastchar == '\0' || lastchar == '.')
+			{
+				crcs.push_back(Crc::calculate((*i).c_str()));
+			}
+			else
+				break;
+		}
+		else
+			break;
+	}
+}	// AttribModNameManager::getAttribModCrcsFromBase
+
+// ----------------------------------------------------------------------
+
+/**
+ * For a given attrib mod base crc, returns all the mod names derived from it.
+ *
+ * @param base		the base mod name
+ * @param names		list that will be filled in with the derived names
+ */
+void AttribModNameManager::getAttribModNamesFromBase(uint32 base, 
+	std::vector<const char *> & names) const
+{
+	const char * baseName = getAttribModName(base);
+	if (baseName != NULL)
+		getAttribModNamesFromBase(baseName, names);
+}	// AttribModNameManager::getAttribModNamesFromBase
+
+// ----------------------------------------------------------------------
+
+/**
+ * For a given attrib mod base crc, returns all the mod name crcs derived from it.
+ *
+ * @param base		the base mod name
+ * @param crcs		list that will be filled in with the derived crcs
+ */
+void AttribModNameManager::getAttribModCrcsFromBase(uint32 base, 
+	std::vector<uint32> & crcs) const
+{
+	const char * baseName = getAttribModName(base);
+	if (baseName != NULL)
+		getAttribModCrcsFromBase(baseName, crcs);
+}	// AttribModNameManager::getAttribModCrcsFromBase
+
diff --git a/engine/server/library/serverGame/src/shared/core/AttribModNameManager.h b/engine/server/library/serverGame/src/shared/core/AttribModNameManager.h
new file mode 100644
index 00000000..f2dbdfbb
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/AttribModNameManager.h
@@ -0,0 +1,74 @@
+//========================================================================
+//
+// AttribModNameManager.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+
+#ifndef _INCLUDED_AttribModNameManager_H
+#define _INCLUDED_AttribModNameManager_H
+
+//#include "sharedFoundation/PersistentCrcString.h"
+#include <set>
+
+
+/**
+ * Keeps track of attrib mod names being used in the game. Attrib mods just store
+ * the crc value for the name, this class can be used to get back the string 
+ * from the crc value. Attrib mod names take the same form as objvar names; a group
+ * of names can be collected under a single list name, separated by a '.'.
+ */
+class AttribModNameManager
+{
+public:
+	static void install();
+	static void remove();
+	
+	static AttribModNameManager & getInstance();
+
+
+	void addAttribModName(const char * name);
+	bool addAttribModNameFromRemote(const char * name);
+	void addAttribModNamesListFromRemote(const char * names);
+	void sendAllNamesToServer(std::vector<uint32> const & servers) const;
+
+	const char * getAttribModName(uint32 crc) const;
+	void         getAttribModNamesFromBase(const std::string & base, std::vector<const char *> & names) const;
+	void         getAttribModCrcsFromBase(const std::string & base, std::vector<uint32> & crcs) const;
+	void         getAttribModNamesFromBase(uint32 base, std::vector<const char *> & names) const;
+	void         getAttribModCrcsFromBase(uint32 base, std::vector<uint32> & crcs) const;
+
+private:
+	 AttribModNameManager();
+	~AttribModNameManager();
+
+private:
+	static AttribModNameManager * ms_attribModNameManager;
+
+	class SortDottedNames
+	{
+	public:
+		bool operator()(const std::string &, const std::string &) const;
+	};
+
+	typedef std::set<std::string> Names;
+	typedef stdmap<uint32, Names::const_iterator>::fwd CrcNameMap;
+
+	Names      * m_names;
+	CrcNameMap * m_crcMap;
+};
+
+
+//========================================================================
+
+inline AttribModNameManager & AttribModNameManager::getInstance()
+{
+	NOT_NULL(ms_attribModNameManager);
+	return *ms_attribModNameManager;
+}
+
+
+#endif	// _INCLUDED_AttribModNameManager_H
+
diff --git a/engine/server/library/serverGame/src/shared/core/AuctionTokenServer.cpp b/engine/server/library/serverGame/src/shared/core/AuctionTokenServer.cpp
new file mode 100644
index 00000000..35430a0d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/AuctionTokenServer.cpp
@@ -0,0 +1,44 @@
+//======================================================================
+//
+// AuctionTokenServer.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AuctionTokenServer.h"
+
+#include "serverGame/ServerObject.h"
+#include "serverGame/TangibleObject.h"
+#include "sharedGame/AuctionToken.h"
+#include "sharedGame/OutOfBandPackager.h"
+
+//======================================================================
+
+AuctionToken AuctionTokenServer::createTokenFor         (const ServerObject & obj)
+{
+	AuctionToken token;
+	token.sharedTemplateName = NON_NULL (obj.getClientSharedTemplateName ());
+	
+	const TangibleObject * const tangible = dynamic_cast<const TangibleObject *>(&obj);
+	if (tangible)
+		token.customizationData = tangible->getAppearanceData ();
+
+	return token;
+}
+
+//----------------------------------------------------------------------
+
+void AuctionTokenServer::packTokenAndAttribsOob (const ServerObject & obj, Unicode::String & oob)
+{
+	const AuctionToken & token = createTokenFor (obj);
+	OutOfBandPackager::pack (token, 0, oob);
+
+	static OutOfBandPackager::AttributeVector attribs;
+	attribs.clear ();
+	obj.getAttributes (attribs);
+
+	OutOfBandPackager::pack (attribs, 0, oob);
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/AuctionTokenServer.h b/engine/server/library/serverGame/src/shared/core/AuctionTokenServer.h
new file mode 100644
index 00000000..9657ad59
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/AuctionTokenServer.h
@@ -0,0 +1,27 @@
+//======================================================================
+//
+// AuctionTokenServer.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_AuctionTokenServer_H
+#define INCLUDED_AuctionTokenServer_H
+
+//======================================================================
+
+class AuctionToken;
+class ServerObject;
+
+//----------------------------------------------------------------------
+
+class AuctionTokenServer
+{
+public:
+	static AuctionToken createTokenFor         (const ServerObject & obj);
+	static void         packTokenAndAttribsOob (const ServerObject & obj, Unicode::String & oob);
+
+};
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/AuthTransferTracker.cpp b/engine/server/library/serverGame/src/shared/core/AuthTransferTracker.cpp
new file mode 100644
index 00000000..f99f265d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/AuthTransferTracker.cpp
@@ -0,0 +1,206 @@
+// ======================================================================
+//
+// AuthTransferTracker.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AuthTransferTracker.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "sharedFoundation/Clock.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include <queue>
+
+// ======================================================================
+
+struct AuthTransferInfo
+{
+	uint32 newAuthProcessId;
+	std::vector<uint32> unconfirmedProcessIds;
+	unsigned long startTime;
+};
+
+static std::map<NetworkId, AuthTransferInfo> *s_authTransferMap;
+static std::queue<NetworkId> *s_authTransfersOrdered;
+
+const unsigned long AUTH_TRACK_TIME_MS = 15000;
+
+// ======================================================================
+
+void AuthTransferTracker::install()
+{
+	DEBUG_FATAL(s_authTransferMap, ("AuthTransferTracker already installed"));
+	s_authTransferMap = new std::map<NetworkId, AuthTransferInfo>;
+	s_authTransfersOrdered = new std::queue<NetworkId>;
+}
+
+// ----------------------------------------------------------------------
+
+void AuthTransferTracker::remove()
+{
+	DEBUG_FATAL(!s_authTransferMap, ("AuthTransferTracker not installed"));
+	delete s_authTransferMap;
+	s_authTransferMap = 0;
+	delete s_authTransfersOrdered;
+	s_authTransfersOrdered = 0;
+}
+
+// ----------------------------------------------------------------------
+
+void AuthTransferTracker::beginAuthTransfer(NetworkId const &networkId, uint32 newAuthProcessId, ProxyList const &proxyList)
+{
+	// sanity check
+	{
+		std::map<NetworkId, AuthTransferInfo>::iterator i = s_authTransferMap->find(networkId);
+		if (i != s_authTransferMap->end())
+		{
+			WARNING_STRICT_FATAL(true, ("Tried to transfer authority for %s to %lu with an authority transfer to %lu still outstanding.  Some controller messages could be lost.", networkId.getValueString().c_str(), newAuthProcessId, (*i).second.newAuthProcessId));
+			s_authTransferMap->erase(i);
+			return;
+		}
+	}
+
+	// We only need to track auth transfers if there are proxies that messages could be coming from
+	bool trackAuthTransfer = false;
+	{
+		for (ProxyList::const_iterator i = proxyList.begin(); i != proxyList.end(); ++i)
+			if ((*i) != GameServer::getInstance().getProcessId())
+				trackAuthTransfer = true;
+	}
+
+	if (trackAuthTransfer)
+	{
+		AuthTransferInfo &authTransferInfo = (*s_authTransferMap)[networkId];
+		authTransferInfo.newAuthProcessId = newAuthProcessId;
+		authTransferInfo.startTime = Clock::timeMs();
+		for (ProxyList::const_iterator i = proxyList.begin(); i != proxyList.end(); ++i)
+			if ((*i) != GameServer::getInstance().getProcessId())
+				authTransferInfo.unconfirmedProcessIds.push_back(*i);
+		s_authTransfersOrdered->push(networkId);
+				
+		if (ConfigServerGame::getLogAuthTransfer())
+		{
+			char logBuffer[1024];
+			logBuffer[0] = '\0';
+			for (std::vector<uint32>::const_iterator i = authTransferInfo.unconfirmedProcessIds.begin(); i != authTransferInfo.unconfirmedProcessIds.end(); ++i)
+				sprintf(logBuffer+strlen(logBuffer), "%lu ", *i);
+			LOG("AuthTransfer", ("Begin auth transfer confirm for %s ( %s)", networkId.getValueString().c_str(), logBuffer));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AuthTransferTracker::sendConfirmAuthTransfer(NetworkId const &networkId, uint32 fromServer)
+{
+	// only send if the old server was set, wasn't this server, and wasn't the db.
+	if (   fromServer
+	    && fromServer != GameServer::getInstance().getProcessId()
+	    && fromServer != GameServer::getInstance().getDatabaseProcessId())
+	{
+		// also only send if we have a connection, since it may be an auth transfer due to a server crash
+		if (GameServer::getInstance().isGameServerConnected(fromServer))
+		{
+			ServerMessageForwarding::begin(fromServer);
+
+			GenericValueTypeMessage<std::pair<NetworkId, uint32> > const confirmMessage(
+				"AuthTransferConfirmMessage",
+				std::make_pair(networkId, GameServer::getInstance().getProcessId()));
+			ServerMessageForwarding::send(confirmMessage);
+
+			ServerMessageForwarding::end();
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AuthTransferTracker::handleConfirmAuthTransfer(NetworkId const &networkId, uint32 whichServer)
+{
+	std::map<NetworkId, AuthTransferInfo>::iterator i = s_authTransferMap->find(networkId);
+
+	if (i != s_authTransferMap->end())
+	{
+		AuthTransferInfo &authTransferInfo = (*i).second;
+		std::vector<uint32>::iterator j = std::find(authTransferInfo.unconfirmedProcessIds.begin(), authTransferInfo.unconfirmedProcessIds.end(), whichServer);
+		if (j != authTransferInfo.unconfirmedProcessIds.end())
+		{
+			if (ConfigServerGame::getLogAuthTransfer())
+				LOG("AuthTransfer", ("Confirm for auth transfer of %s from %lu", networkId.getValueString().c_str(), whichServer));
+
+			if (authTransferInfo.unconfirmedProcessIds.size() == 1)
+			{
+				s_authTransferMap->erase(i);
+				if (ConfigServerGame::getLogAuthTransfer())
+					LOG("AuthTransfer", ("Auth transfer confirm for %s complete", networkId.getValueString().c_str()));
+			}
+			else
+			{
+				authTransferInfo.unconfirmedProcessIds.erase(j);
+			}
+			return;
+		}
+	}
+
+	if (ConfigServerGame::getLogAuthTransfer())
+		LOG("AuthTransfer", ("unexpected confirm for auth transfer of %s from %lu", networkId.getValueString().c_str(), whichServer));
+}
+
+// ----------------------------------------------------------------------
+
+uint32 AuthTransferTracker::getAuthTransferDest(NetworkId const &networkId)
+{
+	std::map<NetworkId, AuthTransferInfo>::const_iterator i = s_authTransferMap->find(networkId);
+	if (i != s_authTransferMap->end())
+		return (*i).second.newAuthProcessId;
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+void AuthTransferTracker::handleGameServerDisconnect(uint32 processId)
+{
+	if (s_authTransferMap)
+	{
+		std::map<NetworkId, AuthTransferInfo>::iterator i = s_authTransferMap->begin();
+		while (i != s_authTransferMap->end())
+		{
+			AuthTransferInfo &authTransferInfo = (*i).second;
+			std::vector<uint32>::iterator j = std::find(authTransferInfo.unconfirmedProcessIds.begin(), authTransferInfo.unconfirmedProcessIds.end(), processId);
+			if (j != authTransferInfo.unconfirmedProcessIds.end())
+				authTransferInfo.unconfirmedProcessIds.erase(j);
+			if (authTransferInfo.newAuthProcessId == processId || authTransferInfo.unconfirmedProcessIds.empty())
+				s_authTransferMap->erase(i++);
+			else
+				++i;
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AuthTransferTracker::update()
+{
+	if (!s_authTransfersOrdered->empty())
+	{
+		NetworkId const &networkId = s_authTransfersOrdered->front();
+		std::map<NetworkId, AuthTransferInfo>::iterator i = s_authTransferMap->find(networkId);
+		if (i != s_authTransferMap->end())
+		{
+			if (Clock::timeMs()-(*i).second.startTime < AUTH_TRACK_TIME_MS)
+				return;
+			s_authTransferMap->erase(i);
+		}
+		s_authTransfersOrdered->pop();
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/core/AuthTransferTracker.h b/engine/server/library/serverGame/src/shared/core/AuthTransferTracker.h
new file mode 100644
index 00000000..b5c223b4
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/AuthTransferTracker.h
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// AuthTransferTracker.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _AuthTransferTracker_H_
+#define _AuthTransferTracker_H_
+
+// ======================================================================
+
+#include "serverGame/ProxyList.h"
+
+// ======================================================================
+
+class NetworkId;
+
+// ======================================================================
+
+class AuthTransferTracker
+{
+public:
+	static void install();
+	static void remove();
+	static void update();
+
+	static void beginAuthTransfer(NetworkId const &networkId, uint32 newAuthProcess, ProxyList const &proxyList);
+	static void sendConfirmAuthTransfer(NetworkId const &networkId, uint32 fromServer);
+	static void handleConfirmAuthTransfer(NetworkId const &networkId, uint32 whichServer);
+	static uint32 getAuthTransferDest(NetworkId const &networkId);
+	static void handleGameServerDisconnect(uint32 processId);
+};
+
+// ======================================================================
+
+#endif // _AuthTransferTracker_H_
+
diff --git a/engine/server/library/serverGame/src/shared/core/BiographyManager.cpp b/engine/server/library/serverGame/src/shared/core/BiographyManager.cpp
new file mode 100644
index 00000000..6febe92c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/BiographyManager.cpp
@@ -0,0 +1,180 @@
+// ======================================================================
+//
+// BiographyManager.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/BiographyManager.h"
+
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverNetworkMessages/BiographyMessage.h"
+#include "serverNetworkMessages/RequestBiographyMessage.h"
+#include "UnicodeUtils.h"
+
+#include <algorithm>
+#include <map>
+#include <vector>
+
+// ======================================================================
+
+bool BiographyManager::m_installed = false;
+stdmap<NetworkId, stdvector<CachedNetworkId>::fwd >::fwd *BiographyManager::m_retrievalQueue;
+
+
+BiographyManager::BiographyManager()
+{
+}
+
+// ----------------------------------------------------------------------
+
+BiographyManager::~BiographyManager()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void BiographyManager::install()
+{
+	DEBUG_FATAL(m_installed, ("BioManager already installed"));
+	m_installed = true;
+	m_retrievalQueue = new std::map<NetworkId, std::vector<CachedNetworkId> >;
+}
+
+// ----------------------------------------------------------------------
+
+void BiographyManager::remove()
+{
+	DEBUG_FATAL(!m_installed, ("BioManager not installed"));
+	m_installed = false;
+	delete m_retrievalQueue;
+	m_retrievalQueue=0;
+}
+
+// ----------------------------------------------------------------------
+
+void BiographyManager::setBiography(const NetworkId &owner, const Unicode::String &bio)
+{
+	//DEBUG_REPORT_LOG(true, ("BiographyManager::setBiography - netId: %s\n", owner.getValueString().c_str()));
+	DEBUG_FATAL(!m_installed, ("BioManager not installed"));
+	
+	// Trim off leading and trailing whitespace
+	size_t firstNonWhitespace = bio.find_first_not_of(Unicode::narrowToWide(" \t\n"));
+	size_t lastNonWhitespace = bio.find_last_not_of(Unicode::narrowToWide(" \t\n"));
+	Unicode::String truncatedBio;
+	if (firstNonWhitespace==bio.npos || lastNonWhitespace==bio.npos)
+		DEBUG_REPORT_LOG(true,("Biography for %s discarded because it was all whitespace.\n",owner.getValueString().c_str()));
+	else
+		truncatedBio.assign(bio,firstNonWhitespace,lastNonWhitespace+1-firstNonWhitespace);
+	
+	// If the biography is larger than the databaes can handle then truncate the
+	// size the databae can handle
+	unsigned int const maximumBiographyLength = 1024;
+	if (truncatedBio.size() > maximumBiographyLength)
+	{
+		WARNING(true, ("The biography for player %s is larger than the maximum allowed characters of %d, truncating.", owner.getValueString().c_str(), maximumBiographyLength));
+	}
+
+	// Send bio to the database
+	BiographyMessage const msg(owner, (truncatedBio.size() > maximumBiographyLength) ? truncatedBio.substr(0, maximumBiographyLength) : truncatedBio);
+	GameServer::getInstance().sendToDatabaseServer(msg);
+
+	// Save off the bio for viewing by other players
+	std::map<NetworkId, Unicode::String> const & connectedCharacterBiographyData = ServerUniverse::getConnectedCharacterBiographyData();
+	std::map<NetworkId, Unicode::String>::const_iterator iterFindBiography = connectedCharacterBiographyData.find(owner);
+	if ((iterFindBiography == connectedCharacterBiographyData.end()) || (iterFindBiography->second != truncatedBio))
+		ServerUniverse::setConnectedCharacterBiographyData(owner, truncatedBio);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Called when a message containing an object's biography is received from the database.
+ */
+void BiographyManager::onBiographyRetrieved(const NetworkId &owner, const Unicode::String &bio)
+{
+	//DEBUG_REPORT_LOG(true, ("BiographyManager::onBiographyRetrieved - netId: %s\n", owner.getValueString().c_str()));
+
+	DEBUG_FATAL(!m_installed, ("BioManager not installed"));
+
+	// Save off the bio for viewing by other players
+	std::map<NetworkId, Unicode::String> const & connectedCharacterBiographyData = ServerUniverse::getConnectedCharacterBiographyData();
+	std::map<NetworkId, Unicode::String>::const_iterator iterFindBiography = connectedCharacterBiographyData.find(owner);
+	if ((iterFindBiography == connectedCharacterBiographyData.end()) || (iterFindBiography->second != bio))
+		ServerUniverse::setConnectedCharacterBiographyData(owner, bio);
+
+	std::map<NetworkId, std::vector<CachedNetworkId> >::iterator i=m_retrievalQueue->find(owner);
+	if (i!=m_retrievalQueue->end())
+	{
+		std::vector<CachedNetworkId> &targets=(*i).second;
+		for (std::vector<CachedNetworkId>::iterator j=targets.begin(); j!=targets.end(); ++j)
+		{
+			CreatureObject *obj=dynamic_cast<CreatureObject*>((*j).getObject());
+			if (obj)
+			{
+				obj->onBiographyRetrieved(owner,bio);
+			}
+		}
+		m_retrievalQueue->erase(i);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Delete the biography from the database
+ */
+void BiographyManager::deleteBiography(const NetworkId &owner)
+{
+	//DEBUG_REPORT_LOG(true, ("BiographyManager::deleteBiography - netId: %s\n", owner.getValueString().c_str()));
+
+	DEBUG_FATAL(!m_installed, ("BioManager not installed"));
+	
+	BiographyMessage const msg(owner,NULL);
+	GameServer::getInstance().sendToDatabaseServer(msg);
+
+	// Save off the bio for viewing by other players
+	std::map<NetworkId, Unicode::String> const & connectedCharacterBiographyData = ServerUniverse::getConnectedCharacterBiographyData();
+	std::map<NetworkId, Unicode::String>::const_iterator iterFindBiography = connectedCharacterBiographyData.find(owner);
+	if ((iterFindBiography == connectedCharacterBiographyData.end()) || (!iterFindBiography->second.empty()))
+		ServerUniverse::setConnectedCharacterBiographyData(owner, Unicode::String());
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Queue up a request to retrive a biography, and give it to the CreatureObject
+ * when retrieved.
+ */
+void BiographyManager::requestBiography(const NetworkId &owner, CreatureObject * requestedBy)
+{
+	//DEBUG_REPORT_LOG(true, ("BiographyManager::requestBiography - netId: %s\n", owner.getValueString().c_str()));
+
+	DEBUG_FATAL(!m_installed, ("BioManager not installed"));
+
+	std::map<NetworkId, Unicode::String> const & connectedCharacterBiographyData = ServerUniverse::getConnectedCharacterBiographyData();
+	std::map<NetworkId, Unicode::String>::const_iterator iterFindBiography = connectedCharacterBiographyData.find(owner);
+	if (iterFindBiography != connectedCharacterBiographyData.end())
+	{
+		if (requestedBy)
+			requestedBy->onBiographyRetrieved(owner,iterFindBiography->second);
+	}
+	else
+	{
+		if (requestedBy)
+		{
+			std::vector<CachedNetworkId> &requesters=(*m_retrievalQueue)[owner];
+			std::vector<CachedNetworkId>::const_iterator alreadyThere=std::find(requesters.begin(),requesters.end(),CachedNetworkId(*requestedBy));
+			if (alreadyThere == requesters.end())
+				requesters.push_back(CachedNetworkId(*requestedBy));
+		}
+
+		RequestBiographyMessage const msg(owner);
+		GameServer::getInstance().sendToDatabaseServer(msg);
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/BiographyManager.h b/engine/server/library/serverGame/src/shared/core/BiographyManager.h
new file mode 100644
index 00000000..826d7751
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/BiographyManager.h
@@ -0,0 +1,51 @@
+// ======================================================================
+//
+// BiographyManager.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_BiographyManager_H
+#define INCLUDED_BiographyManager_H
+
+// ======================================================================
+
+#include "Singleton/Singleton.h"
+
+class CreatureObject;
+class CachedNetworkId;
+class NetworkId;
+
+// ======================================================================
+
+/** 
+ * A singleton to handle (character) biographies.  Caches biographies,
+ * and forwards updates and load requests to the database.
+ * @todo Expire entries in the cache?
+ */
+class BiographyManager
+{
+public:
+	static void install();
+	static void remove();
+
+	static void setBiography(const NetworkId &owner, const Unicode::String &bio);
+	static void deleteBiography(const NetworkId &owner);
+	static void requestBiography(const NetworkId &owner, CreatureObject * requestedBy);
+	static void onBiographyRetrieved(const NetworkId &owner, const Unicode::String &bio);
+
+private:
+	BiographyManager();
+	~BiographyManager();
+
+	static bool m_installed;
+
+	/**
+	 * Map of (object bio) -> (set of objects that want the bio when it's loaded)
+	 */
+	static stdmap<NetworkId, stdvector<CachedNetworkId>::fwd >::fwd *m_retrievalQueue;
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/BuffManager.cpp b/engine/server/library/serverGame/src/shared/core/BuffManager.cpp
new file mode 100644
index 00000000..e9bfccc2
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/BuffManager.cpp
@@ -0,0 +1,486 @@
+//======================================================================
+//
+// BuffManager.cpp
+// copyright (c) 2003 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/BuffManager.h"
+
+#include "sharedFoundation/Crc.h"
+#include "serverGame/CreatureObject.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/JavaLibrary.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+#include "UnicodeUtils.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMath/Vector.h"
+#include <vector>
+
+//======================================================================
+
+namespace BuffManagerNamespace
+{
+	bool m_installed = false;
+
+	const int ms_numEffects = 5;
+
+	const float BUFF_PERSIST_THRESHOLD_IN_SECONDS = 60.0f * 5.0f;
+
+	DataTable *ms_buffDatatable;
+	DataTable *ms_internalBuffDatatable;
+
+	struct BuffRecord
+	{
+		std::string name;
+		uint32 nameCrc;
+		uint32 group1Crc;
+		uint32 group2Crc;
+		uint32 maxStacks;
+		int state;
+		float duration;
+		std::string callback;
+		bool visible;
+		bool removeOnDeath;
+		bool decayOnPvPDeath;
+		bool playerRemovable;
+		bool isCelestial;
+		bool isPersistent;
+		std::string effectParamString[ms_numEffects];
+		uint32 effectParamStringCrc[ms_numEffects];
+		float effectValue[ms_numEffects];
+	};
+
+	const std::string ms_columnName = "NAME";
+	const std::string ms_columnGroup1 = "GROUP1";
+	const std::string ms_columnGroup2 = "GROUP2";
+	const std::string ms_columnDuration = "DURATION";
+	const std::string ms_columnCallback = "CALLBACK";
+	const std::string ms_columnVisible = "VISIBLE";
+	const std::string ms_columnEffect1 = "EFFECT1_PARAM";
+	const std::string ms_columnState = "STATE";
+	const std::string ms_columnRemoveOnDeath = "REMOVE_ON_DEATH";
+	const std::string ms_columnPlayerRemovable = "PLAYER_REMOVABLE";
+	const std::string ms_columnDebuff = "DEBUFF";
+	const std::string ms_columnIsCelestial = "IS_CELESTIAL";
+	const std::string ms_columnMaxStacks = "MAX_STACKS";
+	const std::string ms_columnIsPersistent = "IS_PERSISTENT";
+	const std::string ms_columnDecayOnPvPDeath = "DECAY_ON_PVP_DEATH";
+
+	std::map<uint32, BuffRecord> ms_buffRecords;
+
+	struct EffectRecord
+	{
+		std::string name;
+		uint32 nameCrc;
+		std::string type;
+		std::string subType;
+		std::string other;
+	};
+
+	const std::string ms_columnInternalName = "NAME";
+	const std::string ms_columnInternalType = "TYPE";
+	const std::string ms_columnInternalSubType = "SUBTYPE";
+	const std::string ms_columnInternalOther = "OTHER";
+
+	std::map<uint32, EffectRecord> ms_effectRecords;
+
+	const std::string ATTRIB_TYPE_HEALTH = "health";
+	const std::string ATTRIB_TYPE_STAMINA = "stamina";
+	const std::string ATTRIB_TYPE_CONSTITUTION = "constitution";
+	const std::string ATTRIB_TYPE_WILLPOWER = "willpower";
+	
+	const std::string BUFF_HANDLER_SCRIPT = "systems.buff.buff_handler";
+	const std::string BUFF_HANDLER_ADD_TRIGGER = "AddBuffHandler";
+	const std::string BUFF_HANDLER_REMOVE_TRIGGER = "RemoveBuffHandler";
+};
+
+using namespace BuffManagerNamespace;
+
+
+//======================================================================
+
+void BuffManager::install()
+{
+	if(m_installed)
+		return;
+	m_installed = true;
+
+	ms_buffDatatable = DataTableManager::getTable("datatables/buff/buff.iff", true);
+
+	unsigned int const numRows = static_cast<unsigned int>(ms_buffDatatable->getNumRows());
+	int const numColumns = ms_buffDatatable->getNumColumns();
+	int nameColumn = ms_buffDatatable->findColumnNumber(ms_columnName);
+	int group1Column = ms_buffDatatable->findColumnNumber(ms_columnGroup1);
+	int group2Column = ms_buffDatatable->findColumnNumber(ms_columnGroup2);
+	int durationColumn = ms_buffDatatable->findColumnNumber(ms_columnDuration);
+	int callbackColumn = ms_buffDatatable->findColumnNumber(ms_columnCallback);
+	int visibleColumn = ms_buffDatatable->findColumnNumber(ms_columnVisible);
+	int effect1Column = ms_buffDatatable->findColumnNumber(ms_columnEffect1);
+	int stateColumn = ms_buffDatatable->findColumnNumber(ms_columnState);
+	int removeOnDeathColumn = ms_buffDatatable->findColumnNumber(ms_columnRemoveOnDeath);
+	int playerRemovableColumn = ms_buffDatatable->findColumnNumber(ms_columnPlayerRemovable);
+	int debuffColumn = ms_buffDatatable->findColumnNumber(ms_columnDebuff);
+	int isCelestialColumn = ms_buffDatatable->findColumnNumber(ms_columnIsCelestial);
+	int maxStacksColumn = ms_buffDatatable->findColumnNumber(ms_columnMaxStacks);
+	int isPersistentColumn = ms_buffDatatable->findColumnNumber(ms_columnIsPersistent);
+	int decayOnPvPDeath = ms_buffDatatable->findColumnNumber(ms_columnDecayOnPvPDeath);
+
+	unsigned int i;
+
+	for(i = 0; i < numRows; ++i)
+	{
+		BuffRecord buffRecord;
+
+		buffRecord.name = ms_buffDatatable->getStringValue(nameColumn, i);
+		buffRecord.nameCrc = ms_buffDatatable->getIntValue(nameColumn, i);
+		buffRecord.group1Crc = ms_buffDatatable->getIntValue(group1Column, i);
+		buffRecord.group2Crc = ms_buffDatatable->getIntValue(group2Column, i);
+		buffRecord.duration = ms_buffDatatable->getFloatValue(durationColumn, i);
+		buffRecord.callback = ms_buffDatatable->getStringValue(callbackColumn, i);
+		buffRecord.visible = ms_buffDatatable->getIntValue(visibleColumn, i) != 0;
+		buffRecord.state = ms_buffDatatable->getIntValue(stateColumn, i);
+		buffRecord.removeOnDeath = ms_buffDatatable->getIntValue(removeOnDeathColumn, i) != 0;
+		buffRecord.decayOnPvPDeath = ms_buffDatatable->getIntValue(decayOnPvPDeath, i) != 0;
+		
+		bool const isDebuff = ms_buffDatatable->getIntValue(debuffColumn, i) == 1;
+
+		buffRecord.playerRemovable = (ms_buffDatatable->getIntValue(playerRemovableColumn, i) != 0) && !isDebuff;
+		buffRecord.isCelestial = (ms_buffDatatable->getIntValue(isCelestialColumn, i) != 0);
+		buffRecord.maxStacks = ms_buffDatatable->getIntValue(maxStacksColumn, i);
+		buffRecord.isPersistent = ms_buffDatatable->getIntValue(isPersistentColumn, i) == 1;
+
+		int curColumn = effect1Column;
+		int j;
+		for(j = 0; j < ms_numEffects; j++)
+			buffRecord.effectParamStringCrc[j] = 0;
+		for(j = 0; (j < ms_numEffects) && (curColumn < numColumns); j++)
+		{
+			buffRecord.effectParamString[j] = ms_buffDatatable->getStringValue(curColumn, i);
+			buffRecord.effectParamStringCrc[j] = Crc::calculate(buffRecord.effectParamString[j].c_str());
+			curColumn++;
+			buffRecord.effectValue[j] = ms_buffDatatable->getFloatValue(curColumn, i);
+			curColumn++;
+		}
+		
+		ms_buffRecords.insert(std::make_pair(buffRecord.nameCrc, buffRecord));
+
+	}
+
+	ms_internalBuffDatatable = DataTableManager::getTable("datatables/buff/effect_mapping.iff", true);
+
+	unsigned int const numInternalRows = static_cast<unsigned int>(ms_internalBuffDatatable->getNumRows());
+	int internalNameColumn = ms_internalBuffDatatable->findColumnNumber(ms_columnInternalName);
+	int internalTypeColumn = ms_internalBuffDatatable->findColumnNumber(ms_columnInternalType);
+	int internalSubTypeColumn = ms_internalBuffDatatable->findColumnNumber(ms_columnInternalSubType);
+	int internalOtherColumn = ms_internalBuffDatatable->findColumnNumber(ms_columnInternalOther);
+	
+	for(i = 0; i < numInternalRows; i++)
+	{
+		EffectRecord effectRecord;
+		
+		effectRecord.name = ms_internalBuffDatatable->getStringValue(internalNameColumn, i);
+		effectRecord.nameCrc = Crc::calculate(effectRecord.name.c_str());
+		effectRecord.type = ms_internalBuffDatatable->getStringValue(internalTypeColumn, i);
+		effectRecord.subType = ms_internalBuffDatatable->getStringValue(internalSubTypeColumn, i);
+		effectRecord.other = ms_internalBuffDatatable->getStringValue(internalOtherColumn, i);
+
+		ms_effectRecords.insert(std::make_pair(effectRecord.nameCrc, effectRecord));
+	}
+	
+}
+
+//======================================================================
+
+void BuffManager::remove()
+{
+	
+}
+
+//======================================================================
+
+bool BuffManager::applyBuffEffects(CreatureObject *creatureObj, uint32 buffNameCrc, float duration, float dynamicValue, uint32 stackCount, NetworkId caster)
+{
+	return applyBuffEffectsInternal(creatureObj, buffNameCrc, duration, dynamicValue, false, stackCount, caster);
+}
+
+//======================================================================
+
+bool BuffManager::reapplyBuffEffects(CreatureObject *creatureObj, uint32 buffNameCrc, float duration, float dynamicValue, uint32 stackCount, NetworkId caster)
+{
+	return applyBuffEffectsInternal(creatureObj, buffNameCrc, duration, dynamicValue, true, stackCount, caster);
+}
+
+//======================================================================
+
+bool BuffManager::applyBuffEffectsInternal(CreatureObject *creatureObj, uint32 buffNameCrc, float duration, float dynamicValue, bool deleteFirst, uint32 stackCount, NetworkId caster)
+{
+	if(!creatureObj)
+		return false;
+	std::map<uint32, BuffRecord>::iterator it = ms_buffRecords.find(buffNameCrc);
+	if(it == ms_buffRecords.end())
+	{
+		WARNING(true, ("Unknown buff crc %d\n", buffNameCrc));
+		return false;
+	}
+	BuffRecord const &buffRecord = it->second;
+
+	for(int effectNum = 0; effectNum < ms_numEffects; effectNum++)
+	{
+		uint32 effectCrc = buffRecord.effectParamStringCrc[effectNum];
+		if(effectCrc)
+		{
+			std::map<uint32, EffectRecord>::iterator eit = ms_effectRecords.find(effectCrc);
+			if(eit == ms_effectRecords.end())
+			{
+				WARNING(true, ("Unknown effect crc %d (%s)\n", effectCrc, buffRecord.effectParamString[effectNum].c_str()));
+				return false;
+			}
+			EffectRecord const &effectRecord = eit->second;
+
+			char tmp[512];
+			snprintf(tmp, 512, "%s_%d", buffRecord.name.c_str(), effectNum);
+			std::string effectName(tmp);
+
+			if(deleteFirst)
+				creatureObj->removeAttributeModifier(effectName);
+
+			//Attach the standard buff handler script
+			if(!creatureObj->getScriptObject()->hasScript(BUFF_HANDLER_SCRIPT))
+				creatureObj->getScriptObject()->attachScript(BUFF_HANDLER_SCRIPT, false);
+
+			//Construct script trigger call using type
+			std::string funcName = effectRecord.type;
+			funcName.append(BUFF_HANDLER_ADD_TRIGGER);
+
+			//Call through with the effect name, duration, and value
+			if (creatureObj->getScriptObject()->hasFunction(funcName))
+			{
+				ScriptParams params;
+				params.addParam(effectName.c_str());
+				params.addParam(effectRecord.subType.c_str());			
+				//0.0f is the magic value that says use the datatable value
+				params.addParam(duration == 0.0f ? buffRecord.duration : duration);
+				float value = buffRecord.effectValue[effectNum];
+				if((effectNum == 0) && (dynamicValue != 0.0f))
+					value = dynamicValue;
+				params.addParam(value);
+				params.addParam(buffRecord.name.c_str());
+				params.addParam(caster);
+
+				creatureObj->getScriptObject()->callScriptBuffHandler(funcName, params);
+			}
+
+			//Detach buff handler script
+			//NOTE: we can't do this until a lower-level bug in obj_id.java involving pending script
+			// attach and detach commands is fixed.
+			//creatureObj->getScriptObject()->detachScript(BUFF_HANDLER_SCRIPT);		
+		}
+	}
+	return true;
+}
+	
+//======================================================================
+
+bool BuffManager::removeBuffEffects(CreatureObject *creatureObj, uint32 buffNameCrc, NetworkId caster)
+{
+	if(!creatureObj)
+		return false;
+	std::map<uint32, BuffRecord>::iterator it = ms_buffRecords.find(buffNameCrc);
+	if(it == ms_buffRecords.end())
+	{
+		WARNING(true, ("Unknown buff crc %d\n", buffNameCrc));
+		return false;
+	}
+	BuffRecord const &buffRecord = it->second;
+
+	for(int effectNum = 0; effectNum < ms_numEffects; effectNum++)
+	{
+		uint32 effectCrc = buffRecord.effectParamStringCrc[effectNum];
+		if(effectCrc)
+		{
+			std::map<uint32, EffectRecord>::iterator eit = ms_effectRecords.find(effectCrc);
+			if(eit == ms_effectRecords.end())
+			{
+				WARNING(true, ("Unknown effect crc %d (%s)\n", effectCrc, buffRecord.effectParamString[effectNum].c_str()));
+				return false;
+			}
+			EffectRecord const &effectRecord = eit->second;
+
+			char tmp[512];
+			snprintf(tmp, 512, "%s_%d", buffRecord.name.c_str(), effectNum);
+			std::string effectName(tmp);
+
+			//Attach the standard buff handler script
+			if(!creatureObj->getScriptObject()->hasScript(BUFF_HANDLER_SCRIPT))
+				creatureObj->getScriptObject()->attachScript(BUFF_HANDLER_SCRIPT, false);
+
+			//Construct script trigger call using type
+			std::string funcName = effectRecord.type;
+			funcName.append(BUFF_HANDLER_REMOVE_TRIGGER);
+
+			//Call through with the effect name, duration, and value
+			if (creatureObj->getScriptObject()->hasFunction(funcName))
+			{
+				ScriptParams params;
+				params.addParam(effectName.c_str());
+				params.addParam(effectRecord.subType.c_str());
+				params.addParam(buffRecord.duration);
+				params.addParam(buffRecord.effectValue[effectNum]);
+				params.addParam(buffRecord.name.c_str());
+				params.addParam(caster);
+				creatureObj->getScriptObject()->callScriptBuffHandler(funcName, params);
+			}
+
+			//Detach buff handler script
+			//NOTE: we can't do this until a lower-level bug in obj_id.java involving pending script
+			// attach and detach commands is fixed.
+			//creatureObj->getScriptObject()->detachScript(BUFF_HANDLER_SCRIPT);
+		}
+	}
+	return true;
+}
+
+//======================================================================
+
+bool BuffManager::getIsBuffPersisted(uint32 buffNameCrc)
+{
+	std::map<uint32, BuffRecord>::iterator it = ms_buffRecords.find(buffNameCrc);
+	if(it == ms_buffRecords.end())
+	{
+		WARNING(true, ("Unknown buff crc %d\n", buffNameCrc));
+		return false;
+	}
+	BuffRecord const &buffRecord = it->second;
+		
+	// If a buff lasts longer than 5 minutes, persist it
+	if(buffRecord.isPersistent && buffRecord.duration >= BUFF_PERSIST_THRESHOLD_IN_SECONDS)
+		return true;
+	return false;
+}
+
+//======================================================================
+
+bool BuffManager::getIsBuffRemovedOnDeath(uint32 buffNameCrc)
+{
+	std::map<uint32, BuffRecord>::iterator it = ms_buffRecords.find(buffNameCrc);
+	if(it == ms_buffRecords.end())
+	{
+		WARNING(true, ("Unknown buff crc %d\n", buffNameCrc));
+		return true;
+	}
+	BuffRecord const &buffRecord = it->second;
+
+	return buffRecord.removeOnDeath;
+}
+
+//======================================================================
+
+int BuffManager::getBuffState(uint32 buffNameCrc)
+{
+	std::map<uint32, BuffRecord>::iterator it = ms_buffRecords.find(buffNameCrc);
+	if(it == ms_buffRecords.end())
+	{
+		WARNING(true, ("Unknown buff crc %d\n", buffNameCrc));
+		return 0;
+	}
+	BuffRecord const &buffRecord = it->second;
+	return buffRecord.state;
+}
+
+//======================================================================
+
+float BuffManager::getBuffDefaultDuration(uint32 buffNameCrc)
+{
+	std::map<uint32, BuffRecord>::iterator it = ms_buffRecords.find(buffNameCrc);
+	if(it == ms_buffRecords.end())
+	{
+		WARNING(true, ("Unknown buff crc %d\n", buffNameCrc));
+		return 0.0f;
+	}
+	BuffRecord const &buffRecord = it->second;
+	return buffRecord.duration;
+}
+
+//======================================================================
+
+std::string const & BuffManager::getBuffCallback(uint32 buffNameCrc)
+{
+	static std::string emptyString;
+	std::map<uint32, BuffRecord>::iterator it = ms_buffRecords.find(buffNameCrc);
+	if(it == ms_buffRecords.end())
+	{
+		WARNING(true, ("Unknown buff crc %d\n", buffNameCrc));
+		return emptyString;
+	}
+	BuffRecord const &buffRecord = it->second;
+	return buffRecord.callback;
+}
+
+//======================================================================
+
+bool BuffManager::getIsBuffPlayerRemovable(uint32 buffNameCrc)
+{
+	std::map<uint32, BuffRecord>::iterator it = ms_buffRecords.find(buffNameCrc);
+	if(it == ms_buffRecords.end())
+	{
+		WARNING(true, ("Unknown buff crc %d\n", buffNameCrc));
+		return false;
+	}
+	BuffRecord const &buffRecord = it->second;
+
+	return buffRecord.playerRemovable;	
+}
+
+//======================================================================
+
+
+uint32 BuffManager::getBuffMaxStacks(uint32 buffNameCrc)
+{
+	std::map<uint32, BuffRecord>::iterator it = ms_buffRecords.find(buffNameCrc);
+	if(it == ms_buffRecords.end())
+	{
+		WARNING(true, ("Unknown buff crc %d\n", buffNameCrc));
+		return 0;
+	}
+	BuffRecord const &buffRecord = it->second;
+
+	return buffRecord.maxStacks;	
+}
+
+//======================================================================
+
+
+bool BuffManager::getBuffIsCelestial(uint32 buffNameCrc)
+{
+	std::map<uint32, BuffRecord>::iterator it = ms_buffRecords.find(buffNameCrc);
+	if(it == ms_buffRecords.end())
+	{
+		WARNING(true, ("Unknown buff crc %d\n", buffNameCrc));
+		return false;
+	}
+	BuffRecord const &buffRecord = it->second;
+
+	return buffRecord.isCelestial;	
+}
+
+//======================================================================
+
+bool BuffManager::getDoesBuffDecayOnPvPDeath(uint32 buffNameCrc)
+{
+	std::map<uint32, BuffRecord>::iterator it = ms_buffRecords.find(buffNameCrc);
+	if(it == ms_buffRecords.end())
+	{
+		WARNING(true, ("Unknown buff crc %d\n", buffNameCrc));
+		return true;
+	}
+	BuffRecord const &buffRecord = it->second;
+
+	return buffRecord.decayOnPvPDeath;
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/BuffManager.h b/engine/server/library/serverGame/src/shared/core/BuffManager.h
new file mode 100644
index 00000000..815e5505
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/BuffManager.h
@@ -0,0 +1,49 @@
+//======================================================================
+//
+// BuffManager.h
+// copyright (c) 2003 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_BuffManager_H
+#define INCLUDED_BuffManager_H
+
+#include "sharedFoundation/NetworkId.h"
+
+//======================================================================
+
+class CreatureObject;
+
+//----------------------------------------------------------------------
+
+class BuffManager
+{
+public:
+	static void install();
+	static void remove();
+
+	static bool applyBuffEffects(CreatureObject *creatureObj, uint32 buffNameCrc, float duration, float dynamicValue, uint32 stackCount, NetworkId caster);
+	static bool removeBuffEffects(CreatureObject *creatureObj, uint32 buffNameCrc, NetworkId caster);
+	static bool reapplyBuffEffects(CreatureObject *creatureObj, uint32 buffNameCrc, float duration, float dynamicValue, uint32 stackCount, NetworkId caster);
+
+	static bool getIsBuffPersisted(uint32 buffNameCrc);
+	static bool getIsBuffRemovedOnDeath(uint32 buffNameCrc);
+	static bool getIsBuffPlayerRemovable(uint32 buffNameCrc);
+	static bool getDoesBuffDecayOnPvPDeath(uint32 buffNameCrc);
+
+	static int  getBuffState(uint32 buffNameCrc);
+	static float getBuffDefaultDuration(uint32 buffNameCrc);
+	static std::string const & getBuffCallback(uint32 buffNameCrc);
+	static uint32 getBuffMaxStacks(uint32 buffNameCrc);
+	static bool getBuffIsCelestial(uint32 buffNameCrc);
+	
+protected:
+	
+	static bool applyBuffEffectsInternal(CreatureObject *creatureObj, uint32 buffNameCrc, float duration, float dynamicValue, bool deleteFirst, uint32 stackCount, NetworkId caster);
+	
+};
+
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/CharacterMatchManager.cpp b/engine/server/library/serverGame/src/shared/core/CharacterMatchManager.cpp
new file mode 100644
index 00000000..f2e5e340
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/CharacterMatchManager.cpp
@@ -0,0 +1,653 @@
+// ============================================================================
+//
+// CharacterMatchManager.cpp
+// Copyright Sony Online Entertainment, Inc.
+//
+// ============================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CharacterMatchManager.h"
+
+#include "serverGame/CityInfo.h"
+#include "serverGame/CityInterface.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ConsoleManager.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/GuildInterface.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/Region.h"
+#include "serverGame/RegionMaster.h"
+#include "serverGame/ServerCreatureObjectTemplate.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/Clock.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedGame/LfgDataTable.h"
+#include "sharedGame/MatchMakingCharacterPreferenceId.h"
+#include "sharedGame/MatchMakingCharacterResult.h"
+#include "sharedMath/Vector2d.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedSkillSystem/SkillManager.h"
+#include "sharedSkillSystem/SkillObject.h"
+#include <hash_map>
+#include <map>
+#include <vector>
+
+// ============================================================================
+
+unsigned long CharacterMatchManager::ms_numberOfCharacterMatchRequests = 0;
+unsigned long CharacterMatchManager::ms_numberOfCharacterMatchResults = 0;
+unsigned long CharacterMatchManager::ms_timeSpentOnCharacterMatchRequestsMs = 0;
+
+// ============================================================================
+//
+// CharacterMatchManagerNamespace
+//
+// ============================================================================
+
+namespace CharacterMatchManagerNamespace
+{
+	// used when invoking LfgDataTable::LfgNode::internalAttributeMatchFunction
+	struct LfgInternalAttributeMatchFunctionParams
+	{
+		LfgInternalAttributeMatchFunctionParams() : param1(NULL), param2(NULL), param3(NULL), param4(NULL), param5(NULL) {}
+
+		void const * param1;
+		void const * param2;
+		void const * param3;
+		void const * param4;
+		void const * param5;
+	};
+
+	bool isMatch(std::map<LfgDataTable::LfgNode const *, std::vector<std::pair<LfgDataTable::LfgNode const *, LfgInternalAttributeMatchFunctionParams> > > const & specifiedSearchAttributes, std::string const & searchSubstring, LfgCharacterData const & lfgCharacterData, BitArray & matchingAttributes);
+}
+
+using namespace CharacterMatchManagerNamespace;
+
+// ======================================================================
+
+bool CharacterMatchManagerNamespace::isMatch(std::map<LfgDataTable::LfgNode const *, std::vector<std::pair<LfgDataTable::LfgNode const *, LfgInternalAttributeMatchFunctionParams> > > const & specifiedSearchAttributes, std::string const & searchSubstring, LfgCharacterData const & lfgCharacterData, BitArray & matchingAttributes)
+{
+	matchingAttributes.clear();
+
+	bool matchSingleSearchAttribute;
+	int countMatchingSearchAttributeForGroup;
+	bool matchAllSearchAttributeForGroup;
+	for (std::map<LfgDataTable::LfgNode const *, std::vector<std::pair<LfgDataTable::LfgNode const *, LfgInternalAttributeMatchFunctionParams> > >::const_iterator iterAnyAllParentNode = specifiedSearchAttributes.begin(); iterAnyAllParentNode != specifiedSearchAttributes.end(); ++iterAnyAllParentNode)
+	{
+		matchAllSearchAttributeForGroup = true;
+		if (iterAnyAllParentNode->first)
+		{
+			if ((iterAnyAllParentNode->first->actualMatchCondition == LfgDataTable::DMCT_Any) || (iterAnyAllParentNode->first->actualMatchCondition == LfgDataTable::DMCT_AnyOnly))
+				matchAllSearchAttributeForGroup = false;
+		}
+
+		countMatchingSearchAttributeForGroup = 0;
+		for (std::vector<std::pair<LfgDataTable::LfgNode const *, LfgInternalAttributeMatchFunctionParams> >::const_iterator iterSearchAttribute = iterAnyAllParentNode->second.begin(); iterSearchAttribute != iterAnyAllParentNode->second.end(); ++iterSearchAttribute)
+		{
+			if (iterSearchAttribute->first->internalAttribute)
+				matchSingleSearchAttribute = (*(iterSearchAttribute->first->internalAttributeMatchFunction))(lfgCharacterData, iterSearchAttribute->second.param1, iterSearchAttribute->second.param2, iterSearchAttribute->second.param3, iterSearchAttribute->second.param4, iterSearchAttribute->second.param5);
+			else
+				matchSingleSearchAttribute = LfgDataTable::testBit(*(iterSearchAttribute->first), lfgCharacterData.characterInterests);
+
+			if (matchSingleSearchAttribute)
+			{
+				++countMatchingSearchAttributeForGroup;
+
+				if (iterSearchAttribute->first->minValue > 0)
+				{
+					LfgDataTable::setLowHighValue(*(iterSearchAttribute->first), reinterpret_cast<unsigned long>(iterSearchAttribute->second.param1), reinterpret_cast<unsigned long>(iterSearchAttribute->second.param2), matchingAttributes);
+				}
+				else
+				{
+					LfgDataTable::setBit(*(iterSearchAttribute->first), matchingAttributes);
+				}
+
+				// if "match any", then we are done for this group of search attributes
+				// because we have found a match
+				if (!matchAllSearchAttributeForGroup)
+					break;
+			}
+			else
+			{
+				// if "match all", then we have failed for this group of search attributes,
+				// and have also failed for the entire match, since the groups of search
+				// attributes must all match
+				if (matchAllSearchAttributeForGroup)
+				{
+					matchingAttributes.clear();
+					return false;
+				}
+			}
+		}
+
+		// if "match all" and we exited the loop, then every attribute in the group
+		// matched (or else it would have already returned false on the first mismatch);
+		// if "match any" and we exited the loop without matching any attribute,
+		// then we have failed for this group of search attributes, and have also failed
+		// for the entire match, since the groups of search attributes must all match
+		if ((!matchAllSearchAttributeForGroup) && (countMatchingSearchAttributeForGroup <= 0))
+		{
+			matchingAttributes.clear();
+			return false;
+		}
+	}
+
+	// if substring is specified, it must match as well
+	if (!searchSubstring.empty())
+	{
+		// Compare a sub-string vs the player name and guild
+
+		// Player name (lowercase)
+		std::string playerName(Unicode::wideToNarrow(lfgCharacterData.characterName));
+		std::transform(playerName.begin(), playerName.end(), playerName.begin(), tolower);
+
+		// Guild name (lowercase)
+		std::string guildName(lfgCharacterData.guildName);
+		std::transform(guildName.begin(), guildName.end(), guildName.begin(), tolower);
+
+		if ((strstr(playerName.c_str(), searchSubstring.c_str()) == NULL) &&
+			(strstr(guildName.c_str(), searchSubstring.c_str()) == NULL))
+		{
+			// fail because couldn't match substring
+			matchingAttributes.clear();
+			return false;
+		}
+	}
+
+	return true;
+}
+
+// ============================================================================
+//
+// CharacterMatchManager
+//
+// ============================================================================
+
+void CharacterMatchManager::requestMatch(NetworkId const &networkId, MatchMakingCharacterPreferenceId const &matchMakingCharacterPreferenceId)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("CharacterMatchManager::requestMatch");
+	const unsigned long startTimeMs = Clock::timeMs();
+	++ms_numberOfCharacterMatchRequests;
+
+	ServerObject * const requestServerObject = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(networkId));
+	Client * const requestClient = (requestServerObject ? requestServerObject->getClient() : NULL);
+	CreatureObject * const requestCreatureObject = (requestServerObject ? requestServerObject->asCreatureObject() : NULL);
+	PlayerObject * const requestPlayerObject = (requestCreatureObject ? PlayerCreatureController::getPlayerObject(requestCreatureObject) : NULL);
+
+	if (requestCreatureObject && requestPlayerObject && requestClient)
+	{
+		BitArray const & searchAttribute = matchMakingCharacterPreferenceId.getSearchAttribute();
+		std::string const searchSubstring = Unicode::toLower(matchMakingCharacterPreferenceId.getSubString());
+
+		bool const debugOutput = requestCreatureObject->getObjVars().hasItem("characterMatchDebugOutput");
+
+		if (debugOutput)
+		{
+			ConsoleMgr::broadcastString("*****BEGIN REQUESTED SEARCH ATTRIBUTE*****", requestClient);
+
+			std::string searchAttributeDebugString = LfgDataTable::getSetLfgNodeDebugString(searchAttribute);
+			if (searchAttributeDebugString.empty())
+				ConsoleMgr::broadcastString("(no search attribute specified)", requestClient);
+			else
+				ConsoleMgr::broadcastString(searchAttributeDebugString, requestClient);
+
+			if (!searchSubstring.empty())
+			{
+				std::string s = "substring is (";
+				s += searchSubstring;
+				s += ")";
+
+				ConsoleMgr::broadcastString(s, requestClient);
+			}
+
+			ConsoleMgr::broadcastString("*****END REQUESTED SEARCH ATTRIBUTE*****", requestClient);
+		}
+
+		// if "friend" is one of the search criteria, this will contain the requester's friends list
+		PlayerObject::StringVector const * requestPlayerObjectSortedLowercaseFriendList = NULL;
+
+		// if "cts_source_galaxy" is one of the search criteria, this will contain the requester's CTS source galaxy list
+		std::set<std::string> const * requestPlayerObjectCtsSourceGalaxy = NULL;
+
+		// if "in_same_guild" is one of the search criteria, this will contain the requester's guild abbrev
+		bool inSameGuildSearch = false;
+		std::string requestPlayerObjectGuildAbbrev;
+
+		// if "citizen_of_same_city" is one of the search criteria, this will contain the requester's citizenship city
+		bool citizenOfSameCitySearch = false;
+		std::string requestPlayerObjectCitizenOfCity;
+
+		// if "cts_source_galaxy" is one of the search criteria, this will contain the list of matching CTS source galaxy
+		std::vector<std::string> * matchingCtsSourceGalaxy = NULL;
+
+		// allows search of characters marked anonymous
+		bool bypassAnonymous = false;
+
+		// allows location of characters to be displayed even if it is marked to not display
+		bool bypassHideLocation = false;
+
+		// no search results limit
+		bool bypassSearchResultsLimit = false;
+
+		// list of specified search attributes
+		//
+		// the "key" is the LfgDataTable::LfgNode::anyAllGroupingParent
+		//
+		// the "value" is the list of leaf LfgDataTable::LfgNode that
+		// specifie the attribute the player wants to search on, and
+		// if it's an "internal" attribute, it may include a 
+		// LfgInternalAttributeMatchFunctionParams structure that will
+		// contain additional information to pass to the "match" function
+		// for that particular "internal" attribute
+		std::map<LfgDataTable::LfgNode const *, std::vector<std::pair<LfgDataTable::LfgNode const *, LfgInternalAttributeMatchFunctionParams> > > specifiedSearchAttributes;
+
+		// build the list of specified search attributes
+		unsigned long lowValue, highValue;
+		std::map<std::string, LfgDataTable::LfgNode const *> const & allLeafNodes = LfgDataTable::getAllLfgLeafNodes();
+		for (std::map<std::string, LfgDataTable::LfgNode const *>::const_iterator iterLeafNode = allLeafNodes.begin(); iterLeafNode != allLeafNodes.end(); ++iterLeafNode)
+		{
+			if (iterLeafNode->second->minValue > 0)
+			{
+				LfgDataTable::getLowHighValue(*iterLeafNode->second, lowValue, highValue, searchAttribute);
+				if ((lowValue > 0) && (highValue > 0))
+				{
+					LfgInternalAttributeMatchFunctionParams params;
+					params.param1 = reinterpret_cast<void const *>(lowValue);
+					params.param2 = reinterpret_cast<void const *>(highValue);
+
+					specifiedSearchAttributes[iterLeafNode->second->anyAllGroupingParent].push_back(std::make_pair(iterLeafNode->second, params));
+				}
+			}
+			else
+			{
+				if (LfgDataTable::testBit(*iterLeafNode->second, searchAttribute))
+				{
+					// special handling for "friend" search attribute
+					if (iterLeafNode->second->name == "friend")
+					{
+						if (requestPlayerObjectSortedLowercaseFriendList == NULL)
+						{
+							requestPlayerObjectSortedLowercaseFriendList = &(requestPlayerObject->getSortedLowercaseFriendList());
+						}
+
+						LfgInternalAttributeMatchFunctionParams params;
+						params.param1 = requestPlayerObjectSortedLowercaseFriendList;
+
+						specifiedSearchAttributes[iterLeafNode->second->anyAllGroupingParent].push_back(std::make_pair(iterLeafNode->second, params));
+					}
+					// special handling for "cts_source_galaxy" search attribute
+					else if (iterLeafNode->second->name == "cts_source_galaxy")
+					{
+						if (requestPlayerObjectCtsSourceGalaxy == NULL)
+						{
+							std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData();
+							std::map<NetworkId, LfgCharacterData>::const_iterator iterFindLfg = connectedCharacterLfgData.find(networkId);
+							if (iterFindLfg != connectedCharacterLfgData.end())
+								requestPlayerObjectCtsSourceGalaxy = &(iterFindLfg->second.ctsSourceGalaxy);
+						}
+
+						if (matchingCtsSourceGalaxy == NULL)
+							matchingCtsSourceGalaxy = new std::vector<std::string>;
+
+						LfgInternalAttributeMatchFunctionParams params;
+						params.param1 = requestPlayerObjectCtsSourceGalaxy;
+						params.param2 = matchingCtsSourceGalaxy;
+
+						specifiedSearchAttributes[iterLeafNode->second->anyAllGroupingParent].push_back(std::make_pair(iterLeafNode->second, params));
+					}
+					// special handling for "in_same_guild" search attribute
+					else if (iterLeafNode->second->name == "in_same_guild")
+					{
+						inSameGuildSearch = true;
+
+						if (requestPlayerObjectGuildAbbrev.empty())
+						{
+							int const guildId = requestCreatureObject->getGuildId();
+							if (guildId != 0)
+								requestPlayerObjectGuildAbbrev = GuildInterface::getGuildAbbrev(guildId);
+						}
+
+						// a guild member searching for other guild members
+						// will return all matches and ignore the anonymous
+						// and hide location settings; that is, guild member
+						// can always search for other guild members and will
+						// always see the location of other guild members and
+						// will return all guild members
+						if (!requestPlayerObjectGuildAbbrev.empty())
+						{
+							bypassAnonymous = true;
+							bypassHideLocation = true;
+							bypassSearchResultsLimit = true;
+						}
+
+						// don't need to include this search condition in the search
+						// tree, because we'll do it here locally for optimization
+					}
+					// special handling for "citizen_of_same_city" search attribute
+					else if (iterLeafNode->second->name == "citizen_of_same_city")
+					{
+						citizenOfSameCitySearch = true;
+
+						if (requestPlayerObjectCitizenOfCity.empty())
+						{
+							std::vector<int> const & cityIds = CityInterface::getCitizenOfCityId(requestCreatureObject->getNetworkId());
+							if (!cityIds.empty())
+								requestPlayerObjectCitizenOfCity = CityInterface::getCityInfo(cityIds.front()).getCityName();
+						}
+
+						// a citizen searching for other citizens in the same
+						// city will return all matches and ignore the anonymous
+						// and hide location settings; that is, citizen can
+						// always search for other citizens in the same city and
+						// will always see the location of other citizens and
+						// will return all citizens in the same city
+						if (!requestPlayerObjectCitizenOfCity.empty())
+						{
+							bypassAnonymous = true;
+							bypassHideLocation = true;
+							bypassSearchResultsLimit = true;
+						}
+
+						// don't need to include this search condition in the search
+						// tree, because we'll do it here locally for optimization
+					}
+					else
+					{
+						specifiedSearchAttributes[iterLeafNode->second->anyAllGroupingParent].push_back(std::make_pair(iterLeafNode->second, LfgInternalAttributeMatchFunctionParams()));
+					}
+				}
+			}
+		}
+
+		// go through the Any/All grouping parent nodes, and set each to
+		// the Any/All value as specified by the user, if applicable
+		for (std::map<LfgDataTable::LfgNode const *, std::vector<std::pair<LfgDataTable::LfgNode const *, LfgInternalAttributeMatchFunctionParams> > >::const_iterator iterAnyAllParentNode = specifiedSearchAttributes.begin(); iterAnyAllParentNode != specifiedSearchAttributes.end(); ++iterAnyAllParentNode)
+		{
+			if (iterAnyAllParentNode->first)
+			{
+				LfgDataTable::LfgNode & lfgAnyAllParentNode = *(const_cast<LfgDataTable::LfgNode *>(iterAnyAllParentNode->first));
+				if ((lfgAnyAllParentNode.defaultMatchCondition == LfgDataTable::DMCT_Any) || (lfgAnyAllParentNode.defaultMatchCondition == LfgDataTable::DMCT_All))
+				{
+					if (LfgDataTable::testAnyOrAllBit(lfgAnyAllParentNode, searchAttribute))
+						lfgAnyAllParentNode.actualMatchCondition = LfgDataTable::DMCT_All;
+					else
+						lfgAnyAllParentNode.actualMatchCondition = LfgDataTable::DMCT_Any;
+				}
+				else
+				{
+					lfgAnyAllParentNode.actualMatchCondition = lfgAnyAllParentNode.defaultMatchCondition;
+				}
+			}
+		}
+
+		if (debugOutput)
+		{
+			ConsoleMgr::broadcastString("\n*****BEGIN PARSED SEARCH ATTRIBUTE*****", requestClient);
+
+			for (std::map<LfgDataTable::LfgNode const *, std::vector<std::pair<LfgDataTable::LfgNode const *, LfgInternalAttributeMatchFunctionParams> > >::const_iterator iterAnyAllParentNode = specifiedSearchAttributes.begin(); iterAnyAllParentNode != specifiedSearchAttributes.end(); ++iterAnyAllParentNode)
+			{
+				if (iterAnyAllParentNode->first)
+				{
+					std::string allAnyType;
+					switch (iterAnyAllParentNode->first->actualMatchCondition)
+					{
+						case LfgDataTable::DMCT_NA:	
+							allAnyType = "(NA)";
+							break;
+						case LfgDataTable::DMCT_Any:
+							allAnyType = "(Any)";
+							break;
+						case LfgDataTable::DMCT_AnyOnly:
+							allAnyType = "(AnyOnly)";
+							break;
+						case LfgDataTable::DMCT_All:
+							allAnyType = "(All)";
+							break;
+						case LfgDataTable::DMCT_AllOnly:
+							allAnyType = "(AllOnly)";
+							break;
+						default:
+							allAnyType = "(Unknown)";
+							break;
+					}
+
+					ConsoleMgr::broadcastString(FormattedString<512>().sprintf("%s %s", iterAnyAllParentNode->first->name.c_str(), allAnyType.c_str()), requestClient);
+				}
+				else
+				{
+					ConsoleMgr::broadcastString("(NULL) (All)", requestClient);
+				}
+
+				for (std::vector<std::pair<LfgDataTable::LfgNode const *, LfgInternalAttributeMatchFunctionParams> >::const_iterator iterSearchAttribute = iterAnyAllParentNode->second.begin(); iterSearchAttribute != iterAnyAllParentNode->second.end(); ++iterSearchAttribute)
+				{
+					if (iterSearchAttribute->first->minValue > 0)
+						ConsoleMgr::broadcastString(FormattedString<512>().sprintf("    %s (%lu, %lu)", iterSearchAttribute->first->name.c_str(), reinterpret_cast<unsigned long>(iterSearchAttribute->second.param1), reinterpret_cast<unsigned long>(iterSearchAttribute->second.param2)), requestClient);
+					else
+						ConsoleMgr::broadcastString(FormattedString<512>().sprintf("    %s", iterSearchAttribute->first->name.c_str()), requestClient);
+				}
+			}
+
+			ConsoleMgr::broadcastString("*****END PARSED SEARCH ATTRIBUTE*****\n\n", requestClient);
+		}
+
+		// now go through the character list to find matching characters
+		std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData();
+		std::map<NetworkId, Unicode::String> const & connectedCharacterBiographyData = ServerUniverse::getConnectedCharacterBiographyData();
+
+		// to give each character an equal chance of getting matched, we are going to
+		// randomly pick characters to look for a match; we will create a random list
+		// of searchable characters and do the search from that list
+		static size_t sizeVectorSearchableCharacterLfgData = 2000; // to avoid reallocating a new vector each time, allocate a large enough vector, and if necessary, increase it later
+		static std::vector<const LfgCharacterData *> vectorSearchableCharacterLfgData(sizeVectorSearchableCharacterLfgData);
+
+		if (sizeVectorSearchableCharacterLfgData < connectedCharacterLfgData.size())
+		{
+			sizeVectorSearchableCharacterLfgData = connectedCharacterLfgData.size();
+			vectorSearchableCharacterLfgData.resize(sizeVectorSearchableCharacterLfgData);
+		}
+
+		size_t numberSearchableCharacters = 0;
+
+		// if in_same_guild search specified and searcher is not in a guild, will not match any results, so just return;
+		// if citizen_of_same_city search specified and searcher is not a citizen of a city, will not match any results, so just return
+		if ((inSameGuildSearch && requestPlayerObjectGuildAbbrev.empty()) ||
+			(citizenOfSameCitySearch && requestPlayerObjectCitizenOfCity.empty()))
+		{
+		}
+		else
+		{
+			size_t randomIdx;
+
+			for (std::map<NetworkId, LfgCharacterData>::const_iterator iter = connectedCharacterLfgData.begin(); iter != connectedCharacterLfgData.end(); ++iter)
+			{
+				// ignore unsearchable characters
+				if (iter->second.anonymous && !bypassAnonymous)
+					continue;
+
+				// ignore self
+				if (iter->second.characterId == networkId)
+					continue;
+
+				// if in_same_guild search attribute specified, only include characters from matching guild
+				if (inSameGuildSearch && (requestPlayerObjectGuildAbbrev != iter->second.guildAbbrev))
+					continue;
+
+				// if citizen_of_same_city search attribute specified, only include characters from matching city
+				if (citizenOfSameCitySearch && (requestPlayerObjectCitizenOfCity != iter->second.citizenOfCity))
+					continue;
+
+				if (numberSearchableCharacters == 0)
+				{
+					vectorSearchableCharacterLfgData[0] = &(iter->second);
+				}
+				else if (inSameGuildSearch || citizenOfSameCitySearch)
+				{
+					// if it's a in_same_guild or citizen_of_same_city search,
+					// we want to return a stable search results so don't randomize
+					vectorSearchableCharacterLfgData[numberSearchableCharacters] = &(iter->second);
+				}
+				else
+				{
+					// insert the searchable character at a random place in the list, and move the
+					// character currently at that random place in the list to the end of the list
+					randomIdx = ::rand() % (numberSearchableCharacters + 1);
+					vectorSearchableCharacterLfgData[numberSearchableCharacters] = vectorSearchableCharacterLfgData[randomIdx];
+					vectorSearchableCharacterLfgData[randomIdx] = &(iter->second);
+				}
+
+				++numberSearchableCharacters;
+			}
+		}
+
+		// for a matching character, this contains the attributes that
+		// resulted in the match; it is not necessarily *ALL* the
+		// matching attributes, because we're doing short-circuit
+		// evaluation here
+		BitArray matchingAttributes;
+
+		// final matching results are stored here
+		MatchMakingCharacterResult mmcr;
+
+		// search for matching characters
+
+		// start search at a random place in the random list unless it's
+		// a in_same_guild or citizen_of_same_city search for which
+		// we want to return a stable search results so don't randomize
+		size_t currentIndex = ((inSameGuildSearch || citizenOfSameCitySearch || (numberSearchableCharacters == 0)) ? 0 : (::rand() % numberSearchableCharacters));
+
+		size_t numberSearchableCharactersChecked = 0;
+		while (numberSearchableCharactersChecked < numberSearchableCharacters)
+		{
+			matchingAttributes.clear();
+			if (isMatch(specifiedSearchAttributes, searchSubstring, *(vectorSearchableCharacterLfgData[currentIndex]), matchingAttributes))
+			{
+				// already found maximum number of matches allowed
+				if ((mmcr.m_matchingCharacterData.size() >= ConfigServerGame::getCharacterMatchMaxMatchCount()) && !bypassSearchResultsLimit)
+				{
+					mmcr.m_hasMoreMatches = true;
+					break;
+				}
+
+				// Create the result
+				LfgCharacterData const & matchingLfgCharacterData = *(vectorSearchableCharacterLfgData[currentIndex]);
+				mmcr.m_matchingCharacterData.push_back(matchingLfgCharacterData);
+				LfgCharacterSearchResultData & lfgCharacterData = mmcr.m_matchingCharacterData[mmcr.m_matchingCharacterData.size() - 1];
+				lfgCharacterData.characterInterests = matchingAttributes;
+
+				// If matching character is grouped, include group member list in returned result
+				if (lfgCharacterData.groupId.isValid() && (mmcr.m_matchingCharacterGroup.count(lfgCharacterData.groupId) == 0))
+				{
+					ServerObject const * const soGroupObject = safe_cast<ServerObject const *>(NetworkIdManager::getObjectById(lfgCharacterData.groupId));
+					GroupObject const * const groupObject = (soGroupObject ? soGroupObject->asGroupObject() : NULL);
+					if (groupObject)
+					{
+						std::vector<MatchMakingCharacterResult::MatchMakingCharacterGroupMemberInfo> & groupInfo = mmcr.m_matchingCharacterGroup[lfgCharacterData.groupId];
+						MatchMakingCharacterResult::MatchMakingCharacterGroupMemberInfo groupMemberInfo;
+
+						GroupObject::GroupMemberVector const & groupMembers = groupObject->getGroupMembers();
+						unsigned int groupMemberIndex = 0;
+						for (GroupObject::GroupMemberVector::const_iterator iterGroupMember = groupMembers.begin(); iterGroupMember != groupMembers.end(); ++iterGroupMember)
+						{
+							groupMemberInfo.groupMemberId = iterGroupMember->first;
+
+							// only return group member name if the group member is searchable
+							if (groupObject->isMemberPC(iterGroupMember->first))
+							{
+								std::map<NetworkId, LfgCharacterData>::const_iterator iterGroupMemberData = connectedCharacterLfgData.find(iterGroupMember->first);
+								if ((iterGroupMemberData == connectedCharacterLfgData.end()) || iterGroupMemberData->second.anonymous)
+									groupMemberInfo.groupMemberName = "(anonymous)";
+								else
+									groupMemberInfo.groupMemberName = iterGroupMember->second;
+							}
+							else
+							{
+								groupMemberInfo.groupMemberName = iterGroupMember->second;
+							}
+
+							groupMemberInfo.groupMemberLevel = groupObject->getMemberLevelByMemberIndex(groupMemberIndex);
+							groupMemberInfo.groupMemberProfession = groupObject->getMemberProfessionByMemberIndex(groupMemberIndex);
+
+							++groupMemberIndex;
+
+							groupInfo.push_back(groupMemberInfo);
+						}
+					}
+					else
+					{
+						lfgCharacterData.groupId = NetworkId::cms_invalid;
+					}
+				}
+
+				std::map<NetworkId, Unicode::String>::const_iterator iterBiography = connectedCharacterBiographyData.find(lfgCharacterData.characterId);
+				if ((iterBiography != connectedCharacterBiographyData.end()) && !iterBiography->second.empty())
+					mmcr.m_matchingCharacterBiography[lfgCharacterData.characterId] = iterBiography->second;
+
+				if (debugOutput)
+				{
+					ConsoleMgr::broadcastString(matchingLfgCharacterData.getDebugString(), requestClient);
+
+					if (mmcr.m_matchingCharacterBiography.count(lfgCharacterData.characterId) > 0)
+					{
+						ConsoleMgr::broadcastString("Biography:", requestClient);
+						ConsoleMgr::broadcastString(mmcr.m_matchingCharacterBiography[lfgCharacterData.characterId], requestClient);
+						ConsoleMgr::broadcastString("\n", requestClient);
+					}
+					else
+					{
+						ConsoleMgr::broadcastString("(no biography)\n\n", requestClient);
+					}
+				}
+
+				// See if common CTS source galaxy should be returned
+				lfgCharacterData.ctsSourceGalaxy.clear();
+				if (matchingCtsSourceGalaxy && !matchingCtsSourceGalaxy->empty())
+				{
+					for (std::vector<std::string>::const_iterator iter = matchingCtsSourceGalaxy->begin(); iter != matchingCtsSourceGalaxy->end(); ++iter)
+						IGNORE_RETURN(lfgCharacterData.ctsSourceGalaxy.insert(*iter));
+				}
+
+				// See if matching character's location should be returned
+				if (!matchingLfgCharacterData.displayLocationInSearchResults && !bypassHideLocation)
+				{
+					lfgCharacterData.locationPlanet.clear();
+					lfgCharacterData.locationRegion.clear();
+					lfgCharacterData.locationPlayerCity.clear();
+				}
+			}
+
+			++numberSearchableCharactersChecked;
+
+			++currentIndex;
+			if (currentIndex >= numberSearchableCharacters) // wraparound
+				currentIndex = 0;
+		}
+
+		delete matchingCtsSourceGalaxy;
+
+		// To prevent skewing statistics when more than the limits is returned
+		// (for guild member and citizen search), use the limits if the number
+		// of results exceed the limits
+		ms_numberOfCharacterMatchResults += std::min(mmcr.m_matchingCharacterData.size(), ConfigServerGame::getCharacterMatchMaxMatchCount());
+
+		// Send the results to the creature object, even if there is no matches
+		requestCreatureObject->onCharacterMatchRetrieved(mmcr);
+	}
+
+	const unsigned long endTimeMs = Clock::timeMs();
+	if (endTimeMs >= startTimeMs)
+	{
+		ms_timeSpentOnCharacterMatchRequestsMs += (endTimeMs - startTimeMs);
+	}
+	else // time wrapped
+	{
+		static const unsigned long max = std::numeric_limits<unsigned long>::max();
+		ms_timeSpentOnCharacterMatchRequestsMs += (max - startTimeMs + endTimeMs);
+	}
+}
+
+// ============================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/CharacterMatchManager.h b/engine/server/library/serverGame/src/shared/core/CharacterMatchManager.h
new file mode 100644
index 00000000..7fe8ed0a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/CharacterMatchManager.h
@@ -0,0 +1,57 @@
+// ============================================================================
+// 
+// CharacterMatchManager.h
+// Copyright Sony Online Entertainment, Inc.
+//
+// ============================================================================
+
+#ifndef INCLUDED_CharacterMatchManager_H
+#define INCLUDED_CharacterMatchManager_H
+
+class MatchMakingCharacterPreferenceId;
+class NetworkId;
+
+//-----------------------------------------------------------------------------
+class CharacterMatchManager
+{
+public:
+
+	static void requestMatch(NetworkId const &networkId, MatchMakingCharacterPreferenceId const &matchMakingCharacterPreferenceId);
+	static void getMatchStatistics(unsigned long &numberOfCharacterMatchRequests, unsigned long &numberOfCharacterMatchResults, unsigned long &timeSpentOnCharacterMatchRequestsMs);
+	static void clearMatchStatistics();
+
+private:
+	
+	static unsigned long ms_numberOfCharacterMatchRequests;
+	static unsigned long ms_numberOfCharacterMatchResults;
+	static unsigned long ms_timeSpentOnCharacterMatchRequestsMs;
+
+	// Disable
+
+	CharacterMatchManager();
+	~CharacterMatchManager();
+	CharacterMatchManager(CharacterMatchManager const &);
+	CharacterMatchManager &operator =(CharacterMatchManager const &);
+};
+
+//-----------------------------------------------------------------------
+
+inline void CharacterMatchManager::getMatchStatistics(unsigned long &numberOfCharacterMatchRequests, unsigned long &numberOfCharacterMatchResults, unsigned long &timeSpentOnCharacterMatchRequestsMs)
+{
+	numberOfCharacterMatchRequests = ms_numberOfCharacterMatchRequests;
+	numberOfCharacterMatchResults = ms_numberOfCharacterMatchResults;
+	timeSpentOnCharacterMatchRequestsMs = ms_timeSpentOnCharacterMatchRequestsMs;
+}
+
+//-----------------------------------------------------------------------
+
+inline void CharacterMatchManager::clearMatchStatistics()
+{
+	ms_numberOfCharacterMatchRequests = 0;
+	ms_numberOfCharacterMatchResults = 0;
+	ms_timeSpentOnCharacterMatchRequestsMs = 0;
+}
+
+// ============================================================================
+
+#endif // INCLUDED_CharacterMatchManager_H
diff --git a/engine/server/library/serverGame/src/shared/core/ChatServerConnection.cpp b/engine/server/library/serverGame/src/shared/core/ChatServerConnection.cpp
new file mode 100644
index 00000000..cede945a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ChatServerConnection.cpp
@@ -0,0 +1,173 @@
+// ChatServerConnection.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved.
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ChatServerConnection.h"
+
+#include "serverGame/Chat.h"
+#include "serverGame/CityInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/GuildInterface.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ReportManager.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedNetworkMessages/ChatOnCreateRoom.h"
+#include "sharedNetworkMessages/ChatOnRequestLog.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetwork/NetworkSetupData.h"
+#include "sharedObject/NetworkIdManager.h"
+
+#include "sharedNetworkMessages/VoiceChatMiscMessages.h"
+
+//-----------------------------------------------------------------------
+
+ChatServerConnection::ChatServerConnection(const std::string & a, const unsigned short p) :
+ServerConnection(a, p, NetworkSetupData())
+{
+}
+
+//-----------------------------------------------------------------------
+
+ChatServerConnection::~ChatServerConnection()
+{
+	if (this == Chat::getChatServer())
+	{
+		Chat::setChatServer(0);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ChatServerConnection::onConnectionClosed()
+{
+	static MessageConnectionCallback m("ChatServerConnectionClosed");
+	emitMessage(m);
+}
+
+//-----------------------------------------------------------------------
+
+void ChatServerConnection::onReceive(const Archive::ByteStream &message)
+{
+	Archive::ReadIterator ri = message.begin();
+	GameNetworkMessage msg(ri);
+
+	Archive::ReadIterator cri = message.begin();
+
+	if (msg.isType("ChatOnCreateRoom"))
+	{
+		ChatOnCreateRoom chat(cri);
+		GroupObject::onChatRoomCreate(chat.getRoomData().path);
+		GuildInterface::onChatRoomCreate(chat.getRoomData().path);
+		CityInterface::onChatRoomCreate(chat.getRoomData().path);
+	}
+	else if (msg.isType("ChatOnRequestLog"))
+	{
+		ChatOnRequestLog chatOnRequestLog(cri);
+
+		ReportManager::handleMessage(chatOnRequestLog);
+	}
+	else if (msg.isType("ChatAvatarConnected"))
+	{
+		GenericValueTypeMessage<NetworkId> m(cri);
+		Object *o = NetworkIdManager::getObjectById(m.getValue());
+		if (o)
+		{
+			ServerObject *so = o->asServerObject();
+			if (so && so->isAuthoritative())
+			{
+				CreatureObject *co = so->asCreatureObject();
+				if (co)
+				{
+					if (co->getGuildId())
+					{
+						GuildInterface::enterGuildChatRoom(*co);
+						GuildInterface::enterGuildVoiceChatRoom(*co);
+					}
+
+					std::vector<int> const & cityIds = CityInterface::getCitizenOfCityId(co->getNetworkId());
+					if (!cityIds.empty())
+						CityInterface::enterCityChatRoom(cityIds.front(), *co);
+				}
+				GameScriptObject * gso = so->getScriptObject();
+				if(gso)
+				{
+					ScriptParams params;
+					gso->trigAllScripts(Scripting::TRIG_CHAT_ON_LOGIN, params);
+				}
+			}
+		}
+	}
+	else if (msg.isType("ChatAvatarRenamed"))
+	{
+		GenericValueTypeMessage<std::pair<std::string, std::string> > const m(cri);
+
+		// refresh the friends and/or ignore list of any character that
+		// has the renamed avatar in his friends and/or ignore list
+		std::string const oldName(NameManager::normalizeName(m.getValue().first));
+		std::string const newName(NameManager::normalizeName(m.getValue().second));
+
+		std::set<PlayerObject const *> const &players = PlayerObject::getAllPlayerObjects();
+		if (!players.empty())
+		{
+			std::set<PlayerObject const *>::const_iterator i;
+			for (i = players.begin(); i != players.end(); ++i)
+			{
+				PlayerObject const * const   playerObject   = *i;
+				if (!playerObject->isAuthoritative())
+					continue;
+
+				CreatureObject const * const creatureObject = playerObject->getCreatureObject();
+				if (!creatureObject || !creatureObject->isAuthoritative() || !creatureObject->getClient())
+					continue;
+
+				if (playerObject->isFriend(oldName))
+				{
+					// refresh friends list in 30 seconds
+					MessageToQueue::getInstance().sendMessageToC(playerObject->getNetworkId(),
+						"C++RequestChatFriendsList",
+						"",
+						30,
+						false);
+
+					Chat::sendSystemMessage(*creatureObject, Unicode::narrowToWide(FormattedString<2048>().sprintf("%s on your friends list has been renamed to %s.  If your friends list has not been updated with the new name in about 30 seconds, you can relog to refresh your friends list.", oldName.c_str(), newName.c_str())), Unicode::emptyString);
+				}
+
+				if (playerObject->isIgnoring(oldName))
+				{
+					// refresh ignore list in 30 seconds
+					MessageToQueue::getInstance().sendMessageToC(playerObject->getNetworkId(),
+						"C++RequestChatIgnoreList",
+						"",
+						30,
+						false);
+
+					Chat::sendSystemMessage(*creatureObject, Unicode::narrowToWide(FormattedString<2048>().sprintf("%s on your ignore list has been renamed to %s.  If your ignore list has not been updated with the new name in about 30 seconds, you can relog to refresh your ignore list.", oldName.c_str(), newName.c_str())), Unicode::emptyString);
+				}
+			}
+		}
+	}
+	else if (msg.isType(VoiceChatOnGetChannel::cms_name))
+	{
+		processVoiceChatOnGetChannel(message);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ChatServerConnection::processVoiceChatOnGetChannel(const Archive::ByteStream & message)
+{
+	Archive::ReadIterator ri = message.begin();
+	VoiceChatOnGetChannel response(ri);
+
+	GroupObject::onVoiceChatRoomCreate(response.getRoomName());
+	GuildInterface::onVoiceChatRoomCreate(response.getRoomName());
+	//TODO: guild
+}
diff --git a/engine/server/library/serverGame/src/shared/core/ChatServerConnection.h b/engine/server/library/serverGame/src/shared/core/ChatServerConnection.h
new file mode 100644
index 00000000..6280e1cd
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ChatServerConnection.h
@@ -0,0 +1,33 @@
+// ChatServerConnection.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatServerConnection_H
+#define	_INCLUDED_ChatServerConnection_H
+
+//-----------------------------------------------------------------------
+
+#include "serverUtility/ServerConnection.h"
+
+//-----------------------------------------------------------------------
+
+class ChatServerConnection : public ServerConnection
+{
+public:
+	ChatServerConnection(const std::string & address, const unsigned short port);
+	~ChatServerConnection();
+
+	void onConnectionClosed();
+	void onReceive(const Archive::ByteStream &message);
+
+private:
+	ChatServerConnection & operator = (const ChatServerConnection & rhs);
+	ChatServerConnection(const ChatServerConnection & source);
+
+	void processVoiceChatOnGetChannel(const Archive::ByteStream & message);
+
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatServerConnection_H
diff --git a/engine/server/library/serverGame/src/shared/core/Client.cpp b/engine/server/library/serverGame/src/shared/core/Client.cpp
new file mode 100644
index 00000000..cea9f64e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/Client.cpp
@@ -0,0 +1,2505 @@
+// ======================================================================
+//
+// Client.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/Client.h"
+
+#include "Archive/ByteStream.h"
+#include "LocalizationManager.h"
+#include "serverGame/BuildingObject.h"
+#include "serverGame/Chat.h"
+#include "serverGame/CityInterface.h"
+#include "serverGame/CommoditiesMarket.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ConnectionServerConnection.h"
+#include "serverGame/ConsentManager.h"
+#include "serverGame/ConsoleManager.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/GuildInterface.h"
+#include "serverGame/GuildMemberInfo.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/LogoutTracker.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/ObjectTracker.h"
+#include "serverGame/ObserveTracker.h"
+#include "serverGame/PlanetMapManagerServer.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/PlayerShipController.h"
+#include "serverGame/PvpUpdateObserver.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerSecureTrade.h"
+#include "serverGame/ServerTangibleObjectTemplate.h"
+#include "serverGame/ServerUIManager.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/SpaceVisibilityManager.h"
+#include "serverGame/ShipClientUpdateTracker.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/TriggerVolume.h"
+#include "serverNetworkMessages/GameConnectionServerMessages.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/AdminAccountManager.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedFoundation/Clock.h"
+#include "sharedFoundation/CrcLowerString.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedFoundation/DynamicVariableLocationData.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/Os.h"
+#include "sharedGame/CommandTable.h"
+#include "sharedGame/GuildRankDataTable.h"
+#include "sharedGame/LfgDataTable.h"
+#include "sharedGame/PlatformFeatureBits.h"
+#include "sharedGame/RadialMenuManager.h"
+#include "sharedGame/ShipSlotIdManager.h"
+#include "sharedLog/Log.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedMessageDispatch/Message.h"
+#include "sharedMessageDispatch/Transceiver.h"
+#include "sharedNetworkMessages/AcceptAuctionMessage.h"
+#include "sharedNetworkMessages/AddMapLocationMessage.h"
+#include "sharedNetworkMessages/AddMapLocationResponseMessage.h"
+#include "sharedNetworkMessages/AuctionQueryHeadersMessage.h"
+#include "sharedNetworkMessages/AuctionQueryMessage.h"
+#include "sharedNetworkMessages/BidAuctionMessage.h"
+#include "sharedNetworkMessages/CancelLiveAuctionMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatEnum.h"
+#include "sharedNetworkMessages/ChatInviteGroupToRoom.h"
+#include "sharedNetworkMessages/ChatOnInviteGroupToRoom.h"
+#include "sharedNetworkMessages/ChatPersistentMessageToServer.h"
+#include "sharedNetworkMessages/CommandChannelMessages.h"
+#include "sharedNetworkMessages/ConsentResponseMessage.h"
+#include "sharedNetworkMessages/ConsoleChannelMessages.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/CreateAuctionMessage.h"
+#include "sharedNetworkMessages/CreateImmediateAuctionMessage.h"
+#include "sharedNetworkMessages/CreateProjectileMessage.h"
+#include "sharedNetworkMessages/ExpertiseRequestMessage.h"
+#include "sharedNetworkMessages/FactionRequestMessage.h"
+#include "sharedNetworkMessages/FactionResponseMessage.h"
+#include "sharedNetworkMessages/GalaxyLoopTimesResponse.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/GetAuctionDetails.h"
+#include "sharedNetworkMessages/GetMapLocationsMessage.h"
+#include "sharedNetworkMessages/GuildRequestMessage.h"
+#include "sharedNetworkMessages/GuildResponseMessage.h"
+#include "sharedNetworkMessages/IsVendorOwnerMessage.h"
+#include "sharedNetworkMessages/IsVendorOwnerResponseMessage.h"
+#include "sharedNetworkMessages/NewbieTutorialResponse.h"
+#include "sharedNetworkMessages/ObjectChannelMessages.h"
+#include "sharedNetworkMessages/ObjectMenuRequestDataArchive.h"
+#include "sharedNetworkMessages/ObjectMenuSelectMessage.h"
+#include "sharedNetworkMessages/ParametersMessage.h"
+#include "sharedNetworkMessages/PlanetTravelPointListRequest.h"
+#include "sharedNetworkMessages/PlanetTravelPointListResponse.h"
+#include "sharedNetworkMessages/PlayerMoneyRequest.h"
+#include "sharedNetworkMessages/PlayerMoneyResponse.h"
+#include "sharedNetworkMessages/RequestGalaxyLoopTimes.h"
+#include "sharedNetworkMessages/RetrieveAuctionItemMessage.h"
+#include "sharedNetworkMessages/RetrieveAuctionItemResponseMessage.h"
+#include "sharedNetworkMessages/SceneChannelMessages.h"
+#include "sharedNetworkMessages/SecureTradeMessages.h"
+#include "sharedNetworkMessages/ShipUpdateTransformMessage.h"
+#include "sharedNetworkMessages/StomachRequestMessage.h"
+#include "sharedNetworkMessages/SuiEventNotification.h"
+#include "sharedObject/ContainedByProperty.h"
+#include "sharedObject/NetworkController.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/PortalProperty.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+#include "sharedUtility/Location.h"
+#include "sharedSkillSystem/SkillManager.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+namespace ClientNamespace
+{
+	// list of object types, radial menu action permission
+	// override, to allow certain object types to have certain radial
+	// menu action invoked on them by non-owners of the object
+	std::set<std::pair<uint32, int> > s_radialMenuPermissionOverrideTemplateItemType;
+	std::set<std::pair<std::string, int> > s_radialMenuPermissionOverrideStaticItemType;
+
+	// ----------------------------------------------------------------------
+
+	bool canManipulateObjectExceptionCheck(ServerObject const &target, int menuType, Container::ContainerErrorCode& errorCode)
+	{
+		if (errorCode == Container::CEC_NoPermission)
+		{
+			const std::string & objectStaticName = target.getStaticItemName();
+			if (objectStaticName.empty())
+			{
+				if (s_radialMenuPermissionOverrideTemplateItemType.count(std::make_pair(target.getTemplateCrc(), menuType)) > 0)
+				{
+					errorCode = Container::CEC_Success;
+					return true;
+				}
+			}
+			else if (s_radialMenuPermissionOverrideStaticItemType.count(std::make_pair(objectStaticName, menuType)) > 0)
+			{
+				errorCode = Container::CEC_Success;
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	// ----------------------------------------------------------------------
+
+	void remove()
+	{
+	}
+}
+
+// ======================================================================
+
+Client::ClientMessage::ClientMessage(const std::string & src) :
+MessageDispatch::MessageBase(src.c_str())
+{
+}
+
+//-----------------------------------------------------------------------
+
+Client::ClientMessage::~ClientMessage()
+{
+}
+
+
+
+
+//-----------------------------------------------------------------------
+
+std::map< std::string, uint32 > Client::sm_outgoingBytesMap_Working;  // working stats that will rotate after 1 minute
+std::map< std::string, uint32 > Client::sm_outgoingBytesMap_Stats;    // computed stats from the last minute
+uint32                          Client::sm_outgoingBytesMap_Worktime = 0 ; // time we started filling in the working map
+
+
+// ======================================================================
+
+Client::Client(ConnectionServerConnection & connection, const NetworkId & characterObjectId, const std::string& accountName, const std::string& ipAddr, bool isSecure, bool isSkipLoadScreen, unsigned int stationId, std::set<NetworkId> const & observedObjects, uint32 gameFeatures, uint32 subscriptionFeatures, AccountFeatureIdList const & accountFeatureIds, unsigned int entitlementTotalTime, unsigned int entitlementEntitledTime, unsigned int entitlementTotalTimeSinceLastLogin, unsigned int entitlementEntitledTimeSinceLastLogin, int buddyPoints, std::vector<std::pair<NetworkId, std::string> > const & consumedRewardEvents, std::vector<std::pair<NetworkId, std::string> > const & claimedRewardItems, bool usingAdminLogin, CombatDataTable::CombatSpamFilterType combatSpamFilter, int combatSpamRangeSquaredFilter, int furnitureRotationDegree, bool hasUnoccupiedJediSlot, bool isJediSlotCharacter, bool sendToStarport ) :
+	MessageDispatch::Receiver(),
+	MessageDispatch::Emitter(),
+	m_accountName(accountName),
+	m_characterName(),
+	m_characterObjectId(characterObjectId),
+	m_connection(&connection),
+	m_controlledObjects(),
+	m_godLevel(0),
+	m_godMode(false),
+	m_godValidated(false),
+	m_ipAddress(ipAddr),
+	m_isReady(false),
+	m_isSecure(isSecure),
+	m_isSkipLoadScreen(isSkipLoadScreen),
+	m_primaryControlledObject(NetworkId::cms_invalid),
+	destroyNotifier(),
+	m_observing(),
+	m_openedContainers(),
+	m_watchedByList(),
+	m_lastNonIdleTime(ServerClock::getInstance().getGameTimeSeconds()),
+	m_stationId(stationId),
+	m_connectionServerLag(0),
+	m_gameServerLag(0),
+	m_gameFeatures(gameFeatures),
+	m_subscriptionFeatures(subscriptionFeatures),
+	m_accountFeatureIds(accountFeatureIds),
+	m_entitlementTotalTime(entitlementTotalTime),
+	m_entitlementEntitledTime(entitlementEntitledTime),
+	m_entitlementTotalTimeSinceLastLogin(entitlementTotalTimeSinceLastLogin),
+	m_entitlementEntitledTimeSinceLastLogin(entitlementEntitledTimeSinceLastLogin),
+	m_buddyPoints(buddyPoints),
+	m_previousObservedObjects(observedObjects),
+	m_syncUIs(),
+	m_consumedRewardEvents(consumedRewardEvents),
+	m_claimedRewardItems(claimedRewardItems),
+	m_usingAdminLogin(usingAdminLogin),
+	m_combatSpamFilter(combatSpamFilter),
+	m_combatSpamRangeSquaredFilter(combatSpamRangeSquaredFilter),
+	m_furnitureRotationDegree(furnitureRotationDegree),
+	m_hasUnoccupiedJediSlot(hasUnoccupiedJediSlot),
+	m_isJediSlotCharacter(isJediSlotCharacter),
+	m_sendToStarport( sendToStarport )
+{
+
+	connectToEmitter(connection, "ConnectionServerConnectionClosed");
+	connectToEmitter(connection, "ConnectionServerConnectionDestroyed");
+
+	// Check god permissions
+	if (   ConfigServerGame::getAdminGodToAll()
+	    || (   (!ConfigServerGame::getUseSecureLoginForGodAccess() || m_isSecure)
+	        && AdminAccountManager::isAdminAccount(Unicode::toLower(accountName), m_godLevel)
+	        && (!ConfigServerGame::getUseIPForGodAccess() || AdminAccountManager::isInternalIp(ipAddr))))
+	{
+		m_godValidated = true;
+		if (ConfigServerGame::getAdminGodToAll())
+			m_godLevel = ConfigServerGame::getAdminGodToAllGodLevel();
+	}
+
+	// See if our controlled object is ready yet.
+	ServerObject *obj = LogoutTracker::findPendingCharacterSave(characterObjectId);
+	if (obj)
+	{
+		// If we're waiting to be saved in the LogoutTracker, then we've been
+		// removed from our container, so restore our containment if need be.
+		Object *containerObject = ContainerInterface::getContainedByObject(*obj);
+		if (containerObject)
+		{
+			// Don't ever put the character into a packed house
+			ServerObject * const serverObject = containerObject->asServerObject();
+			CellObject * const cellObject = (serverObject ? serverObject->asCellObject() : NULL);
+			BuildingObject * const buildingObject = (cellObject ? cellObject->getOwnerBuilding() : NULL);
+
+			if ((buildingObject) && (!buildingObject->isInWorld()))
+			{
+				ContainedByProperty * const cby = ContainerInterface::getContainedByProperty(*obj);
+				if (cby)
+				{
+					DEBUG_REPORT_LOG(true,("Ejecting player %s from building %s, because the building is packed\n",characterObjectId.getValueString().c_str(), buildingObject->getNetworkId().getValueString().c_str()));
+					LOG("CustomerService",("Login:  Ejecting player %s from building %s, because the building is packed",characterObjectId.getValueString().c_str(), buildingObject->getNetworkId().getValueString().c_str()));
+
+					cby->setContainedBy(NetworkId::cms_invalid, true);
+					containerObject = 0;
+
+					// attempt to put the character at the ejection point of the building
+					if (!ServerWorld::isSpaceScene())
+					{
+						DynamicVariableLocationData ejectionPoint;
+						if (obj->getObjVars().getItem("building_ejection_point", ejectionPoint) && (ServerWorld::getSceneId() == ejectionPoint.scene) && (!ejectionPoint.cell.isValid()))
+						{
+							obj->removeObjVarItem("building_ejection_point");
+							obj->setPosition_p(ejectionPoint.pos);
+						}
+					}
+				}
+			}
+			else if (containerObject->isAuthoritative())
+			{
+				// The cell depersist step will try to set the parent cell of the player.
+				// However, that procedure will fail because the "contained by" property
+				// says the player is in a container when they really are not.
+		 		ContainedByProperty * const cby = ContainerInterface::getContainedByProperty(*obj);
+				if (cby)
+				{
+					// We need to remove and then re-add the property so that the
+					// property is updated immediately (as opposed to waiting for an alter)
+					cby->setContainedBy(NetworkId::cms_invalid, true);
+					obj->removeProperty(cby->getPropertyId());
+					obj->addProperty(*cby, true);
+				}
+
+				// save and restore the original transform.  The existing transform should be in parent
+				// space, but it is in world.  down through depersistContents there is an assumption that
+				// it is in parent space and gets transformed incorrectly.
+				Transform origTransform = obj->getTransform_o2p();
+
+				// NOTE: Depersist works slightly differently than when the player
+				//       is loaded from the database since in this case the player
+				//       is initialized when depersist is called
+				Container * const container = ContainerInterface::getContainer(*containerObject);
+				NOT_NULL(container);
+				IGNORE_RETURN(container->depersistContents(*obj));
+
+				// if failed to put character back into the container, then clean up the
+				// containment relationship so that the character is now out in the world
+				if (ContainerInterface::getContainedByObject(*obj) != containerObject)
+				{
+					IGNORE_RETURN(container->internalItemRemoved(*obj));
+
+					if (cby)
+					{
+						// We need to remove and then re-add the property so that the
+						// property is updated immediately (as opposed to waiting for an alter)
+						cby->setContainedBy(NetworkId::cms_invalid, true);
+						obj->removeProperty(cby->getPropertyId());
+						obj->addProperty(*cby, true);
+					}
+
+					// attempt to put the character at the ejection point of the building
+					if (!ServerWorld::isSpaceScene())
+					{
+						DynamicVariableLocationData ejectionPoint;
+						if (obj->getObjVars().getItem("building_ejection_point", ejectionPoint) && (ServerWorld::getSceneId() == ejectionPoint.scene) && (!ejectionPoint.cell.isValid()))
+						{
+							DEBUG_REPORT_LOG(true,("Ejecting player %s from building %s, because could not put player back in building\n",characterObjectId.getValueString().c_str(), (buildingObject ? buildingObject->getNetworkId().getValueString().c_str() : containerObject->getNetworkId().getValueString().c_str())));
+							LOG("CustomerService",("Login:  Ejecting player %s from building %s, because could not put player back in building",characterObjectId.getValueString().c_str(), (buildingObject ? buildingObject->getNetworkId().getValueString().c_str() : containerObject->getNetworkId().getValueString().c_str())));
+
+							obj->removeObjVarItem("building_ejection_point");
+							obj->setPosition_p(ejectionPoint.pos);
+						}
+					}
+
+					containerObject = 0;
+				}
+				else
+				{
+					obj->setTransform_o2w(origTransform);
+
+					// if the character was in a building, tell the building it has gained
+					// the player so the building demand load/unload system can work correctly
+					Object *buildingObj = ContainerInterface::getTopmostContainer(*containerObject);
+					if (buildingObj && buildingObj->asServerObject() && buildingObj->asServerObject()->asBuildingObject())
+						buildingObj->asServerObject()->asBuildingObject()->gainedPlayer(*obj);
+				}
+			}
+			else
+			{
+				// The container is no longer authoritative on this server.  Move us to a safe place
+				// outside the container.
+				Object * const topmostObject = ContainerInterface::getTopmostContainer(*obj);
+				BuildingObject * const topmostBuilding = dynamic_cast<BuildingObject*>(topmostObject);
+				if (topmostBuilding)
+				{
+					DEBUG_REPORT_LOG(true,("Ejecting player %s from building %s, because the building has changed authority\n",characterObjectId.getValueString().c_str(), topmostBuilding->getNetworkId().getValueString().c_str()));
+					LOG("CustomerService",("Login:  Ejecting player %s from building %s, because the building has changed authority",characterObjectId.getValueString().c_str(), topmostBuilding->getNetworkId().getValueString().c_str()));
+					ContainedByProperty * const cby = ContainerInterface::getContainedByProperty(*obj);
+					if (cby)
+					{
+						cby->setContainedBy(NetworkId::cms_invalid, true);
+						containerObject = 0;
+
+						PortalProperty * const portalProperty = topmostBuilding->getPortalProperty();
+						if (portalProperty)
+						{
+							ServerController * const controller = dynamic_cast<ServerController*>(obj->getController());
+							if (controller)
+							{
+								Transform destinationTransform(Transform::IF_none);
+								destinationTransform.multiply(topmostBuilding->getTransform_o2w(), portalProperty->getEjectionLocationTransform());
+								obj->setTransform_o2p(destinationTransform);
+							}
+						}
+					}
+				}
+				else
+					WARNING(true,("Expected player %s to be in a building, but he was in some other type of object.  Skipping authority fixup because something strange is going on.",characterObjectId.getValueString().c_str()));
+			}
+		}
+		else
+		{
+			// check for the case where we were in a container that isn't there anymore
+			ContainedByProperty * const cby = ContainerInterface::getContainedByProperty(*obj);
+			if ((cby) && (cby->getContainedByNetworkId().isValid()))
+			{
+				DEBUG_REPORT_LOG(true,("Ejecting player %s from building %s, because the building does not exist anymore\n",characterObjectId.getValueString().c_str(), cby->getContainedByNetworkId().getValueString().c_str()));
+				LOG("CustomerService",("Login:  Ejecting player %s from building %s, because the building does not exist anymore",characterObjectId.getValueString().c_str(), cby->getContainedByNetworkId().getValueString().c_str()));
+
+				cby->setContainedBy(NetworkId::cms_invalid, true);
+
+				// attempt to put the character at the ejection point of the building
+				if (!ServerWorld::isSpaceScene())
+				{
+					DynamicVariableLocationData ejectionPoint;
+					if (obj->getObjVars().getItem("building_ejection_point", ejectionPoint) && (ServerWorld::getSceneId() == ejectionPoint.scene) && (!ejectionPoint.cell.isValid()))
+					{
+						obj->removeObjVarItem("building_ejection_point");
+						obj->setPosition_p(ejectionPoint.pos);
+					}
+				}
+			}
+		}
+
+		// Only add to the world if it in a location which should be in the world.
+		if (!containerObject || (containerObject->isInWorld() && containerObject->getContainerProperty()->isContentItemExposedWith(*obj)))
+			obj->addToWorld();
+
+		// Notify the object that it has a client about to load
+		obj->onClientAboutToLoad();
+
+		// We need to trigger having been made authoritative since we are an object which has been
+		// disconnected from the world.
+		obj->triggerMadeAuthoritative();
+
+		// Create proxies as needed
+		ProxyList const &proxyList = obj->getExposedProxyList();
+		if (!proxyList.empty())
+		{
+			ServerMessageForwarding::begin(std::vector<uint32>(proxyList.begin(), proxyList.end()));
+
+			obj->forwardServerCreateAndBaselines();
+
+			ServerMessageForwarding::end();
+		}
+	}
+	else
+		obj = ServerWorld::findObjectByNetworkId(characterObjectId);
+
+	if (obj)
+	{
+		obj->checkAndAddClientControl(this);
+	}
+
+	// Send server-specific settings to the client
+	ParametersMessage const msg(ConfigServerGame::getWeatherUpdateSeconds());
+	send(msg, true);
+
+	ObjectTracker::addPlayer();
+}
+
+//-----------------------------------------------------------------------
+
+Client::~Client()
+{
+	ClientDestroy d(this);
+	destroyNotifier.emitMessage(d);
+
+	if (ServerWorld::isSpaceScene())
+		SpaceVisibilityManager::removeClient(*this);
+
+	ObserveTracker::onClientDestroyed(*this);
+	ShipClientUpdateTracker::onClientDestroyed(*this);
+
+	DEBUG_FATAL(!m_controlledObjects.empty(),("Deleting a client with a non-empty controlled objects list!\n"));
+	m_primaryControlledObject = NetworkId::cms_invalid;
+
+	//clean up any orphaned SynchronizedUIs
+	for (std::vector<Watcher<ServerSynchronizedUi> >::iterator i = m_syncUIs.begin(); i != m_syncUIs.end(); ++i)
+	{
+		ServerSynchronizedUi* syncUI = i->getPointer();
+		if (syncUI)
+			delete syncUI;
+	}
+
+	ObjectTracker::removePlayer();
+
+	PvpUpdateObserver::removeClientFromPvpStatusCache(this);
+
+	m_connection = 0;
+}
+
+// ----------------------------------------------------------------------
+
+void Client::install()
+{
+	// read in the list of object types, radial menu action permission
+	// override, to allow certain object types to have certain radial
+	// menu action invoked on them by non-owners of the object
+	char const * const radialMenuPermissionOverrideDataTableName = "datatables/player/radial_menu_permission_override.iff";
+	DataTable * table = DataTableManager::getTable(radialMenuPermissionOverrideDataTableName, true);
+	if (table)
+	{
+		int const columnObjectTemplate = table->findColumnNumber("Object Template");
+		int const columnCommand = table->findColumnNumber("Command");
+		if ((columnObjectTemplate >= 0) && (columnCommand >= 0))
+		{
+			std::string objectTemplate;
+			std::string command;
+			int commandMenuId;
+
+			for (int i = 0, numRows = table->getNumRows(); i < numRows; ++i)
+			{
+				objectTemplate = table->getStringValue(columnObjectTemplate, i);
+				if (objectTemplate.empty())
+					continue;
+
+				command = table->getStringValue(columnCommand, i);
+				if (command.empty())
+					continue;
+
+				commandMenuId = RadialMenuManager::getMenuTypeByName(command);
+				if (commandMenuId == 0)
+					continue;
+
+				if (objectTemplate.find(".iff") != std::string::npos)
+					ClientNamespace::s_radialMenuPermissionOverrideTemplateItemType.insert(std::make_pair(CrcLowerString::calculateCrc(objectTemplate.c_str()), commandMenuId));
+				else
+					ClientNamespace::s_radialMenuPermissionOverrideStaticItemType.insert(std::make_pair(objectTemplate, commandMenuId));
+			}
+		}
+
+		DataTableManager::close(radialMenuPermissionOverrideDataTableName);
+	}
+
+	ExitChain::add(ClientNamespace::remove, "ClientNamespace::remove");
+}
+
+//-----------------------------------------------------------------------
+
+void Client::addControlledObject(ServerObject &object)
+{
+	// check to see if it is in the list already
+	if (std::find(m_controlledObjects.begin(), m_controlledObjects.end(), &object) == m_controlledObjects.end())
+		m_controlledObjects.push_back(&object);
+	else
+		DEBUG_WARNING(true, ("Client adding controlled object [%s] that is already controlled", object.getNetworkId().getValueString().c_str()));
+
+	//finally set a pointer to the Client object on the object
+	object.setClient(*this);
+	ObserveTracker::onObjectControlled(*this, object, m_previousObservedObjects);
+
+	// Any objects to be re-controlled have been at this point, so clean up any old objects that are no longer observed
+	ObserveTracker::onClientControlComplete(*this, m_previousObservedObjects);
+	m_previousObservedObjects.clear();
+
+	// If in space, add the client to SpaceVisibilityManager.  Only do this for the topmost object the client controls that is in the world.
+	if (ServerWorld::isSpaceScene())
+	{
+		Object * topmost = ContainerInterface::getTopmostContainer(object);
+		NOT_NULL(topmost);
+		NOT_NULL(topmost->asServerObject());
+		if (topmost->isInWorld())
+			SpaceVisibilityManager::addClient(*this, *(topmost->asServerObject()));
+	}
+
+	// Restore god mode after changing servers
+	CreatureObject *primaryControlledObject = safe_cast<CreatureObject*>(m_primaryControlledObject.getObject());
+	if (primaryControlledObject)
+	{
+		if (primaryControlledObject->hasCommand(AdminAccountManager::getAdminCommandName()))
+			setGodMode(true);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void Client::clearControlledObjects()
+{
+	while (!m_controlledObjects.empty())
+		removeControlledObject(**m_controlledObjects.begin());
+
+	PvpUpdateObserver::removeClientFromPvpStatusCache(this);
+}
+
+// ----------------------------------------------------------------------
+
+ServerObject *Client::findControlledObject(NetworkId const &oid) const
+{
+	for (std::vector<ServerObject *>::const_iterator i = m_controlledObjects.begin(); i != m_controlledObjects.end(); ++i)
+		if ((*i) && (*i)->getNetworkId() == oid)
+			return *i;
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<ServerObject *> const &Client::getControlledObjects() const
+{
+	return m_controlledObjects; //lint !e1536 //low access
+}
+
+//-----------------------------------------------------------------------
+
+bool Client::isControlled(NetworkId const &id) const
+{
+	std::vector<ServerObject *>::const_iterator i;
+	for(i = m_controlledObjects.begin(); i != m_controlledObjects.end(); ++i)
+	{
+		ServerObject * object = *i;
+		if(object && object->getNetworkId() == id)
+			return true;
+	}
+	return false;
+}
+
+//-----------------------------------------------------------------------
+
+void Client::onLoadPlayer(CreatureObject &newCharacter)
+{
+	if (m_primaryControlledObject != NetworkId::cms_invalid)
+	{
+		DEBUG_WARNING(true, ("Already have a primary object!"));
+		if (m_primaryControlledObject == newCharacter.getNetworkId())
+			return;
+	}
+
+	m_primaryControlledObject = CachedNetworkId(newCharacter);
+
+	assumeControl(newCharacter);
+}
+
+//-----------------------------------------------------------------------
+
+void Client::assumeControl(CreatureObject &newCharacter)
+{
+	DEBUG_FATAL(newCharacter.getNetworkId() != m_primaryControlledObject, ("Tried to assume control of the wrong object?"));
+
+	// Add the object to the controlled object list
+	addControlledObject(newCharacter);
+
+	// Register player name with the global list
+	std::string const &firstName = Unicode::wideToNarrow(Unicode::toLower(newCharacter.getAssignedObjectFirstName()));
+	std::string const &fullName = Unicode::wideToNarrow(newCharacter.getAssignedObjectName());
+	PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(&newCharacter);
+	NameManager::getInstance().addPlayer(newCharacter.getNetworkId(), (playerObject ? playerObject->getStationId() : static_cast<uint32>(m_stationId)), firstName, fullName, 0, Os::getRealSystemTime(), true);
+
+	static const std::string loginTrace("TRACE_LOGIN");
+	LOG(loginTrace, ("sending ControlAssumed(%s, %s)", m_primaryControlledObject.getValueString().c_str(), ConfigServerGame::getGroundScene()));
+
+	ControlAssumed const controlMessage(
+		m_primaryControlledObject,
+		ConfigServerGame::getGroundScene(),
+		m_isSkipLoadScreen,
+		newCharacter.getTransform_o2w().getPosition_p(),
+		newCharacter.getObjectFrameK_w().theta(),
+		newCharacter.getSharedTemplateName(),
+		static_cast<int64>(ServerClock::getInstance().getGameTimeSeconds()));
+
+	sendToConnectionServer(controlMessage);
+
+	m_isSkipLoadScreen = false;
+}
+
+//-----------------------------------------------------------------------
+
+void Client::receiveClientMessage(const GameNetworkMessage & message)
+{
+	try
+	{
+
+		// Ignore any messages if the character is not loaded yet.
+		if (m_primaryControlledObject == NetworkId::cms_invalid)
+		{
+			DEBUG_REPORT_LOG(true,("Ignoring message for character %s because it is not loaded yet.\n",m_characterObjectId.getValueString().c_str()));
+			return;
+		}
+
+		ServerObject *primaryControlledObject = safe_cast<ServerObject*>(m_primaryControlledObject.getObject());
+
+		if (!primaryControlledObject)
+		{
+			DEBUG_REPORT_LOG(true,("Ignoring message for character %s because object %s cannot be found.\n",
+								   m_characterObjectId.getValueString().c_str(), m_primaryControlledObject.getValueString().c_str()));
+			return;
+		}
+
+		//-----------------------------------------------------------------
+
+		if (message.isType("ShipUpdateTransformMessage"))
+		{
+			Archive::ReadIterator readIterator = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+			ShipUpdateTransformMessage const shipUpdateTransformMessage(readIterator);
+
+			for (std::vector<ServerObject *>::const_iterator i = m_controlledObjects.begin(); i != m_controlledObjects.end(); ++i)
+			{
+				ShipObject * const ship = (*i)->asShipObject();
+				if (ship)
+				{
+					PlayerShipController * const playerShipController = safe_cast<PlayerShipController *>(ship->getController());
+					if (playerShipController)
+						playerShipController->receiveTransform(shipUpdateTransformMessage);
+				}
+			}
+		}
+
+		//----------------------------------------------------------------------
+
+		else if (message.isType("CreateProjectileMessage"))
+		{
+			Archive::ReadIterator readIterator = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+			CreateProjectileMessage const createProjectileMessage(readIterator);
+
+			// pilots can fire from non-turrets, gunners can fire their turret
+			ServerObject * const characterObject = getCharacterObject();
+			if (characterObject)
+			{
+				ServerObject * const containedBy = safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(*characterObject));
+				if (containedBy)
+				{
+					SlottedContainer const * const slottedContainer = ContainerInterface::getSlottedContainer(*containedBy);
+					ShipObject * const shipObject = ShipObject::getContainingShipObject(containedBy);
+
+					if (   (shipObject != NULL)
+					    && (slottedContainer != NULL)
+					    && !shipObject->hasCondition(TangibleObject::C_docking))
+					{
+						bool shotOk = false;
+
+						int const weaponIndex = createProjectileMessage.getWeaponIndex();
+						if (weaponIndex >= 0 && weaponIndex < ShipChassisSlotType::cms_numWeaponIndices)
+						{
+							Container::ContainerErrorCode err = Container::CEC_Success;
+							if (shipObject->isTurret(weaponIndex))
+							{
+								if (   slottedContainer->getObjectInSlot(ShipSlotIdManager::getPobShipGunnerSlotId(weaponIndex), err) == characterObject->getNetworkId()
+								    || slottedContainer->getObjectInSlot(ShipSlotIdManager::getShipGunnerSlotId(weaponIndex), err) == characterObject->getNetworkId())
+									shotOk = true; // gunner firing his turret
+							}
+							else
+							{
+								if (   slottedContainer->getObjectInSlot(ShipSlotIdManager::getShipPilotSlotId(), err) == characterObject->getNetworkId()
+								    || slottedContainer->getObjectInSlot(ShipSlotIdManager::getPobShipPilotSlotId(), err) == characterObject->getNetworkId())
+									shotOk = true; // pilot firing non-turret
+							}
+						}
+
+						// only gods can fire while invulnerable
+						if (shipObject->isInvulnerable() && !isGod())
+							shotOk = false;
+
+						if (shotOk)
+						{
+							shipObject->enqueueFireShotClient(
+								*this,
+								weaponIndex,
+								createProjectileMessage.getTransform_p(),
+								createProjectileMessage.getTargetedComponent(),
+								createProjectileMessage.getSyncStampLong());
+						}
+					}
+				}
+			}
+		}
+
+		//----------------------------------------------------------------------
+
+		else if(message.isType("CmdSceneReady"))
+		{
+			m_isReady = true;
+			primaryControlledObject->onClientReady(this);
+		}
+
+		//----------------------------------------------------------------------
+
+		else if(message.isType("SetCombatSpamFilter"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			GenericValueTypeMessage<int> const msg(ri);
+			m_combatSpamFilter = static_cast<CombatDataTable::CombatSpamFilterType>(msg.getValue());
+		}
+
+		//----------------------------------------------------------------------
+
+		else if(message.isType("SetCombatSpamRangeFilter"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			GenericValueTypeMessage<int> const msg(ri);
+			m_combatSpamRangeSquaredFilter = sqr(msg.getValue());
+		}
+
+		//----------------------------------------------------------------------
+
+		else if(message.isType("SetFurnitureRotationDegree"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			GenericValueTypeMessage<int> const msg(ri);
+			m_furnitureRotationDegree = msg.getValue();
+		}
+
+		//----------------------------------------------------------------------
+
+		else if(message.isType("GcwRegionsReq"))
+		{
+			GenericValueTypeMessage<std::map<std::string, std::map<std::string, std::pair<std::pair<float, float>, float> > > > const rsp("GcwRegionsRsp", Pvp::getGcwScoreCategoryRegions());
+			send(rsp, true);
+
+			GenericValueTypeMessage<std::map<std::string, std::map<std::string, int> > > const rsp2("GcwGroupsRsp", Pvp::getGcwScoreCategoryGroups());
+			send(rsp2, true);
+		}
+
+		//----------------------------------------------------------------------
+
+		else if(message.isType("SetJediSlotInfo"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			GenericValueTypeMessage<std::pair<bool, bool> > const msg(ri);
+
+			// this comes from the client (via the LoginServer) so should not be trusted;
+			// we cache them here to do preliminary checks to avoid unnecessarily sending
+			// commands to the LoginServer (assuming the values haven't been hacked on the
+			// client); when we do send the commands to the LoginServer, we'll check again there
+			m_hasUnoccupiedJediSlot = msg.getValue().first;
+			m_isJediSlotCharacter = msg.getValue().second;
+		}
+
+		//----------------------------------------------------------------------
+
+		else if(message.isType("RotateFurnitureSetQuaternion"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			GenericValueTypeMessage<std::pair<NetworkId, std::pair<std::pair<float, float>, std::pair<float, float> > > > const msg(ri);
+			
+			CreatureObject * creatureOwner = safe_cast<CreatureObject*>(getCharacterObject());
+			if (creatureOwner && creatureOwner->isAuthoritative())
+			{
+				ServerObject const * target = ServerWorld::findObjectByNetworkId(msg.getValue().first);
+				if (target && target->isAuthoritative())
+				{
+					static uint32 const commandHash = Crc::normalizeAndCalculate("rotateFurniture");
+					const Command &command = CommandTable::getCommand(commandHash);
+					if (!command.isNull())
+					{
+						// for obfuscation so players won't manually send us this command
+						Unicode::String params = Unicode::narrowToWide(FormattedString<512>().sprintf("(^-,=+_)internal_use_only_%s_quaternion(,+-=_^) %.10f %.10f %.10f %.10f %s", creatureOwner->getNetworkId().getValueString().c_str(), msg.getValue().second.first.first, msg.getValue().second.first.second, msg.getValue().second.second.first, msg.getValue().second.second.second, msg.getValue().first.getValueString().c_str()));
+						creatureOwner->commandQueueEnqueue(command, target->getNetworkId(), params, 0, false, static_cast<Command::Priority>(Command::CP_Default), true);
+					}
+				}
+			}
+		}
+
+		//----------------------------------------------------------------------
+
+		else if(message.isType("SetLfgInterests"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			GenericValueTypeMessage<BitArray> const msg(ri);
+
+			PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(safe_cast<CreatureObject const *>(getCharacterObject()));
+			if (playerObject)
+			{
+				std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData();
+				std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = connectedCharacterLfgData.find(getCharacterObjectId());
+				if (iterFind != connectedCharacterLfgData.end())
+				{
+					BitArray lfgInterests = msg.getValue();
+
+					MatchMakingId const & id = playerObject->getMatchMakingCharacterProfileId();
+					if (id.isBitSet(MatchMakingId::B_lookingForGroup))
+						LfgDataTable::setBit("lfg", lfgInterests);
+					else
+						LfgDataTable::clearBit("lfg", lfgInterests);
+
+					if (id.isBitSet(MatchMakingId::B_helper))
+						LfgDataTable::setBit("helper", lfgInterests);
+					else
+						LfgDataTable::clearBit("helper", lfgInterests);
+
+					if (id.isBitSet(MatchMakingId::B_rolePlay))
+						LfgDataTable::setBit("rp", lfgInterests);
+					else
+						LfgDataTable::clearBit("rp", lfgInterests);
+
+					if (id.isBitSet(MatchMakingId::B_lookingForWork))
+						LfgDataTable::setBit("lfw", lfgInterests);
+					else
+						LfgDataTable::clearBit("lfw", lfgInterests);
+
+					ServerUniverse::setConnectedCharacterInterestsData(getCharacterObjectId(), lfgInterests);
+				}
+			}
+		}
+
+		//----------------------------------------------------------------------
+
+		else if(message.isType("RequestGroundObjectPlacement"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			GenericValueTypeMessage<std::pair<NetworkId, std::pair<std::pair<int, float>, std::pair<float, float> > > > const msg(ri);
+
+			ServerObject * const target           = safe_cast<ServerObject *>(NetworkIdManager::getObjectById (msg.getValue().first));
+			GameScriptObject * const scriptObject = target ? target->getScriptObject() : 0;
+			
+			if (!scriptObject)
+			{
+				return;
+			}
+			
+			int menuType =  msg.getValue().second.first.first;
+			Vector loc(msg.getValue().second.first.second, msg.getValue().second.second.first, msg.getValue().second.second.second);
+			ScriptParams params;
+			params.addParam (getCharacterObjectId());
+			params.addParam (menuType);
+			params.addParam (loc.x);
+			params.addParam (loc.y);
+			params.addParam (loc.z);
+
+			IGNORE_RETURN (scriptObject->trigAllScripts(Scripting::TRIG_GROUND_TARGET_LOC, params));
+		}
+		//----------------------------------------------------------------------
+
+		else if(message.isType("ShowBackpack"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			GenericValueTypeMessage<std::pair<NetworkId, bool > > const msg(ri);
+			PlayerObject * player			= dynamic_cast<PlayerObject *>(NetworkIdManager::getObjectById (msg.getValue().first));
+			
+			if(player)
+				player->modifyShowBackpack(msg.getValue().second);
+
+		}
+		//----------------------------------------------------------------------
+
+		else if(message.isType("ShowHelmet"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			GenericValueTypeMessage<std::pair<NetworkId, bool > > const msg(ri);
+			PlayerObject * player			= dynamic_cast<PlayerObject *>(NetworkIdManager::getObjectById (msg.getValue().first));
+			
+			if(player)
+				player->modifyShowHelmet(msg.getValue().second);
+
+		}
+		//----------------------------------------------------------------------
+
+		else if(message.isType("SetWaypointColor"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			GenericValueTypeMessage<std::pair<NetworkId, std::string> > const msg(ri);
+
+			if ((msg.getValue().second == "blue") || (msg.getValue().second == "green") || (msg.getValue().second == "orange") || (msg.getValue().second == "yellow") || (msg.getValue().second == "purple") || (msg.getValue().second == "white"))
+			{
+				Waypoint w = Waypoint::getWaypointById(msg.getValue().first);
+				if (w.isValid())
+				{
+					w.setColor(Waypoint::getColorIdByName(msg.getValue().second));
+				}
+			}
+		}
+
+		//----------------------------------------------------------------------
+
+		else if (message.isType (ObjectMenuSelectMessage::MESSAGE_TYPE))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			const ObjectMenuSelectMessage m (ri);
+			ServerObject * const target           = safe_cast<ServerObject *>(NetworkIdManager::getObjectById (m.getNetworkId()));
+			GameScriptObject * const scriptObject = target ? target->getScriptObject() : 0;
+			Object * const targetContainedBy = target ? ContainerInterface::getContainedByObject(*target) : NULL;
+			const int menuType                    = m.getSelectedItemId();
+
+			static int examineMenuType = RadialMenuManager::getMenuTypeByName("EXAMINE");
+			static int tradeMenuType   = RadialMenuManager::getMenuTypeByName("TRADE_START");
+
+			CreatureObject* cobj = dynamic_cast<CreatureObject*>(primaryControlledObject);
+			if (cobj && menuType != examineMenuType && menuType != tradeMenuType)
+			{
+				CreatureController* const controller = cobj->getCreatureController();
+				if (controller && controller->getSecureTrade())
+				{
+					controller->getSecureTrade()->cancelTrade(*cobj);
+					DEBUG_REPORT_LOG (true, ("Client ObjectMenuSelectMessage [%d] for [%s] canceling trade.\n", menuType, cobj->getNetworkId ().getValueString ().c_str ()));
+				}
+			}
+
+			if (!scriptObject)
+			{
+				DEBUG_REPORT_LOG (true, ("Received an object menu select message from player %s for object %s, which does not exist or lacks a GameScriptObject.", m_characterObjectId.getValueString().c_str(),m.getNetworkId().getValueString().c_str()));
+				return;
+			}
+
+			NOT_NULL(target);
+
+			float range = 0.0f;
+			if (RadialMenuManager::getRangeForMenuType(menuType, range))
+			{
+				Container::ContainerErrorCode errorCode = Container::CEC_Success;
+				if (!target->isAuthoritative())
+				{
+					GenericValueTypeMessage<std::pair<NetworkId, NetworkId> > const rssMessage(
+						"RequestSameServer",
+						std::make_pair(
+							ContainerInterface::getTopmostContainer(*primaryControlledObject)->getNetworkId(),
+							ContainerInterface::getTopmostContainer(*target)->getNetworkId()));
+					GameServer::getInstance().sendToPlanetServer(rssMessage);
+					errorCode = Container::CEC_TryAgain;
+				}
+				else if (menuType != examineMenuType && targetContainedBy && targetContainedBy->asServerObject() && ( targetContainedBy->asServerObject()->getGameObjectType() == SharedObjectTemplate::GOT_chronicles_quest_holocron || targetContainedBy->asServerObject()->getGameObjectType() == SharedObjectTemplate::GOT_chronicles_quest_holocron_recipe ) )
+				{
+					// Can only examine items that are contained in a holocron.
+					errorCode = Container::CEC_NoPermission;
+				}
+				else if (primaryControlledObject->canManipulateObject(*target, false, false, false, range, errorCode)
+					|| ClientNamespace::canManipulateObjectExceptionCheck(*target, menuType, errorCode))
+				{
+					ScriptParams params;
+					params.addParam (getCharacterObjectId());
+					params.addParam (menuType);
+
+					if (cobj && cobj->getObjVars().hasItem("cheater"))
+					{
+						std::string menuDesc = "unknown";
+						bool tmp;
+						IGNORE_RETURN(RadialMenuManager::getCommandForMenuType(menuType, menuDesc, tmp));
+						LOG("CustomerService",("SuspectedCheaterLog: %s has used a radial menu on object %s. Menu item %d (%s).",
+											   PlayerObject::getAccountDescription(cobj).c_str(),
+											   m.getNetworkId().getValueString().c_str(),
+											   menuType,
+											   menuDesc.c_str() ));
+					}
+
+					IGNORE_RETURN (scriptObject->trigAllScripts(Scripting::TRIG_OBJECT_MENU_SELECT, params));
+				}
+				if (errorCode != Container::CEC_Success)
+					ContainerInterface::sendContainerMessageToClient(*primaryControlledObject, errorCode);
+			}
+			else
+			{
+				DEBUG_REPORT_LOG(true, ("Received a message type %d that had no range in data (radial_menu.tab)\n", menuType));
+			}
+		}
+
+		//----------------------------------------------------------------------
+
+		else if(message.isType("ConGenericMessage"))
+		{
+
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			ConGenericMessage	c(ri);
+			if (isGod())
+			{
+				LOG("CustomerService",("Avatar:%s executing command: %s", PlayerObject::getAccountDescription(getCharacterObjectId()).c_str(), c.getMsg().c_str()));
+				ConsoleMgr::processString(c.getMsg(), this, c.getMsgId());
+			}
+			else
+			{
+				//Non-god user tried to use a console command
+				if (m_primaryControlledObject.getObject())
+				{
+					LOG("CustomerService", ("CheatChannel:%s tried to execute a console command but they are not a god",
+						PlayerObject::getAccountDescription(m_primaryControlledObject.getObject()->getNetworkId()).c_str()));
+					ConsoleMgr::broadcastString("Only god users can execute console commands.", this, c.getMsgId());
+				}
+
+			}
+		}
+
+		//-----------------------------------------------------------------
+
+		else if(message.isType("ObjControllerMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			ObjControllerMessage o(ri);
+			bool appended = false;
+
+			// check to make sure the controller message is allowed from the client
+			bool allowFromClient = ControllerMessageFactory::allowFromClient(o.getMessage());
+
+			// log as a possible hack
+			if (!allowFromClient)
+				LOG("CustomerService", ("UnauthorizedControllerMessage: Player %s sent an unauthorized controller message %d for object %s.", PlayerObject::getAccountDescription(getCharacterObjectId()).c_str(), o.getMessage(), o.getNetworkId().getValueString().c_str()));
+
+			// do we allow the controller message to get executed?
+			if (allowFromClient || isGod() || !ConfigServerGame::getEnableClientControllerMessageCheck())
+			{
+				ServerObject * target = findControlledObject(o.getNetworkId());
+				if(target !=0)
+				{
+					// apply the controller message
+					ServerController * controller = dynamic_cast<ServerController *>(target->getController());
+					if (controller != NULL)
+					{
+						uint32 flags = o.getFlags();
+						flags &= ~GameControllerMessageFlags::SOURCE_REMOTE;
+						flags |= GameControllerMessageFlags::SOURCE_REMOTE_CLIENT;
+						controller->appendMessage(o.getMessage(), o.getValue(), o.getData(), flags);
+						appended = true;
+					}
+				}
+				else if (isGod())
+				{
+					target = ServerWorld::findObjectByNetworkId(o.getNetworkId());
+
+					if (target)
+					{
+						ServerController * controller = dynamic_cast<ServerController *>(target->getController());
+						if (controller != NULL)
+						{
+							uint32 flags = o.getFlags();
+							flags &= ~GameControllerMessageFlags::SOURCE_REMOTE;
+							flags |= GameControllerMessageFlags::SOURCE_REMOTE_CLIENT;
+							controller->appendMessage(o.getMessage(), o.getValue(), o.getData(), flags);
+							appended = true;
+						}
+					}
+				}
+			}
+			if (!appended)
+				delete o.getData();
+		}
+
+		//-----------------------------------------------------------------
+		//Secure Trade Messages
+		//-----------------------------------------------------------------
+		else if (message.isType("AddItemMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			AddItemMessage m(ri);
+
+
+			ServerObject * item = ServerWorld::findObjectByNetworkId(m.getNetworkId());
+			if (!item)
+				return;
+
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			DEBUG_FATAL(!playerObject, ("No controller for player!\n"));
+			if(playerObject) //lint !e774
+			{
+				PlayerCreatureController* playerController = dynamic_cast<PlayerCreatureController *>(playerObject->getController());
+				if (playerController && playerController->getSecureTrade())
+				{
+					playerController->getSecureTrade()->addItem(*playerObject, *item);
+				}
+			}
+			else
+			{
+				GameServer::getInstance().dropClient(m_characterObjectId);
+			}
+		}
+		else if (message.isType("RemoveItemMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			RemoveItemMessage m(ri);
+
+			ServerObject * item = ServerWorld::findObjectByNetworkId(m.getNetworkId());
+			if (!item)
+				return;
+
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			DEBUG_FATAL(!playerObject, ("No controller for player!\n"));
+			if(playerObject) //lint !e774
+			{
+				PlayerCreatureController* playerController = dynamic_cast<PlayerCreatureController *>(playerObject->getController());
+				if (playerController && playerController->getSecureTrade())
+				{
+					playerController->getSecureTrade()->removeItem(*playerObject, *item);
+				}
+			}
+			else
+			{
+				GameServer::getInstance().dropClient(m_characterObjectId);
+			}
+		}
+		else if (message.isType("GiveMoneyMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			GiveMoneyMessage m(ri);
+
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			DEBUG_FATAL(!playerObject, ("No controller for player!\n"));
+			if(playerObject) //lint !e774
+			{
+				PlayerCreatureController* playerController = dynamic_cast<PlayerCreatureController *>(playerObject->getController());
+				if (playerController && playerController->getSecureTrade())
+				{
+					playerController->getSecureTrade()->giveMoney(*playerObject, m.getAmount());
+				}
+			}
+			else
+			{
+				GameServer::getInstance().dropClient(m_characterObjectId);
+			}
+		}
+		else if (message.isType("AcceptTransactionMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			AcceptTransactionMessage m(ri);
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			DEBUG_FATAL(!playerObject, ("No controller for player!\n"));
+			if(playerObject) //lint !e774
+			{
+				PlayerCreatureController* playerController = dynamic_cast<PlayerCreatureController *>(playerObject->getController());
+				if (playerController && playerController->getSecureTrade())
+				{
+					playerController->getSecureTrade()->acceptOffer(*playerObject);
+				}
+
+				if (playerObject->getObjVars().hasItem("cheater"))
+				{
+					LOG("CustomerService", ("SuspectedCheaterChannel: %s has accepted a secure trade. (Check trade logs for more detail.", PlayerObject::getAccountDescription(playerObject).c_str()));
+				}
+
+
+			}
+			else
+			{
+				GameServer::getInstance().dropClient(m_characterObjectId);
+			}
+
+		}
+		else if (message.isType("UnAcceptTransactionMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			UnAcceptTransactionMessage m(ri);
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			DEBUG_FATAL(!playerObject, ("No controller for player!\n"));
+			if(playerObject) //lint !e774
+			{
+				PlayerCreatureController* playerController = dynamic_cast<PlayerCreatureController *>(playerObject->getController());
+				if (playerController && playerController->getSecureTrade())
+				{
+					playerController->getSecureTrade()->unacceptOffer(*playerObject);
+				}
+			}
+			else
+			{
+				GameServer::getInstance().dropClient(m_characterObjectId);
+			}
+
+		}
+		else if (message.isType("VerifyTradeMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			VerifyTradeMessage m(ri);
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			DEBUG_FATAL(!playerObject, ("No controller for player!\n"));
+			if(playerObject) //lint !e774
+			{
+				PlayerCreatureController* playerController = dynamic_cast<PlayerCreatureController *>(playerObject->getController());
+				if (playerController && playerController->getSecureTrade())
+				{
+					playerController->getSecureTrade()->verifyTrade(*playerObject);
+				}
+			}
+			else
+			{
+				GameServer::getInstance().dropClient(m_characterObjectId);
+			}
+		}
+		else if (message.isType("DenyTradeMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			DenyTradeMessage m(ri);
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			DEBUG_FATAL(!playerObject, ("No controller for player!\n"));
+			if(playerObject) //lint !e774
+			{
+				PlayerCreatureController* playerController = dynamic_cast<PlayerCreatureController *>(playerObject->getController());
+				if (playerController && playerController->getSecureTrade())
+				{
+					playerController->getSecureTrade()->rejectOffer(*playerObject);
+				}
+			}
+			else
+			{
+				GameServer::getInstance().dropClient(m_characterObjectId);
+			}
+
+		}
+		else if (message.isType("AbortTradeMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			AbortTradeMessage m(ri);
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			DEBUG_FATAL(!playerObject, ("No controller for player!\n"));
+			if(playerObject) //lint !e774
+			{
+				PlayerCreatureController* playerController = dynamic_cast<PlayerCreatureController *>(playerObject->getController());
+				if (playerController && playerController->getSecureTrade())
+				{
+					playerController->getSecureTrade()->cancelTrade(*playerObject);
+				}
+			}
+			else
+			{
+				GameServer::getInstance().dropClient(m_characterObjectId);
+			}
+
+		}
+
+		else if (message.isType(SuiEventNotification::MessageType))
+		{
+			ServerUIManager::receiveMessage(message);
+		}
+
+		else if (message.isType("GuildRequestMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			GuildRequestMessage const m(ri);
+
+			NetworkId const &id = m.getTargetId();
+			CreatureObject * const creatureObject = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(id));
+			if (creatureObject)
+			{
+				int const guildId = creatureObject->getGuildId();
+				GuildMemberInfo const * const info = GuildInterface::getGuildMemberInfo(guildId, id);
+				GuildResponseMessage const responseMessage(id, GuildInterface::getGuildName(guildId), info ? info->m_title : std::string());
+				send(responseMessage, true);
+			}
+		}
+
+		else if (message.isType("StomachRequestMessage"))
+		{
+			CreatureObject *creatureObject = dynamic_cast<CreatureObject*>(getCharacterObject());
+
+			if (creatureObject != NULL)
+			{
+				GameScriptObject *gameScriptObject = creatureObject->getScriptObject();
+
+				if(gameScriptObject != NULL)
+				{
+					ScriptParams scriptParams;
+					IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_STOMACH_UPDATE, scriptParams));
+				}
+			}
+		}
+
+		else if (message.isType("FactionRequestMessage"))
+		{
+			int rebel  = 0;
+			int imperial = 0;
+			int criminal  = 0;
+
+			CreatureObject * playerObject = dynamic_cast<CreatureObject*>(getCharacterObject());
+			if (playerObject)
+			{
+				float temp;
+				if (playerObject->getObjVars().getItem("faction.Rebel",temp))
+				{
+					rebel = static_cast<int>(temp);
+				}
+				if (playerObject->getObjVars().getItem("faction.Imperial",temp))
+				{
+					imperial = static_cast<int>(temp);
+				}
+				if (playerObject->getObjVars().getItem("faction.Hutt",temp))
+				{
+					criminal = static_cast<int>(temp);
+				}
+
+				std::vector<std::string> factionNames;
+				std::vector<float> factionValues;
+				std::string currentName;
+				float       currentValue;
+				DynamicVariableList::NestedList factionList(playerObject->getObjVars(),"faction");
+				for(DynamicVariableList::NestedList::const_iterator i = factionList.begin(); i != factionList.end(); ++i)
+				{
+					currentName = i.getName();
+					bool result = i.getValue(currentValue);
+					if(result)
+					{
+						factionNames.push_back(currentName);
+						factionValues.push_back(currentValue);
+					}
+				}
+
+				FactionResponseMessage const msg(rebel, imperial, criminal, factionNames, factionValues);
+				send(msg, true);
+			}
+		}
+
+		//----------------------------------------------------------------------
+
+		else if (message.isType (PlayerMoneyRequest::MessageType))
+		{
+			Archive::ReadIterator ri = (*NON_NULL (static_cast<const GameNetworkMessage *>(&message))).getByteStream().begin();
+			const PlayerMoneyRequest m (ri);
+
+			ServerObject * const playerObject = getCharacterObject();
+
+			WARNING (!playerObject, ("Got PlayerMoneyRequest for non-existant character (account=%s, networkid=%s)", m_accountName.c_str (), m_characterObjectId.getValueString ().c_str ()));
+
+			if (playerObject)
+			{
+				PlayerMoneyResponse resp;
+				resp.m_balanceCash.set (playerObject->getCashBalance ());
+				resp.m_balanceBank.set (playerObject->getBankBalance ());
+				send (resp, true);
+			}
+		}
+
+		//-----------------------------------------------------------------
+
+		else if (message.isType("AcceptAuctionMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			AcceptAuctionMessage m(ri);
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			if (playerObject)
+			{
+				CommoditiesMarket::auctionAccept(*playerObject, m.getItemId().getValue());
+				if (playerObject->getObjVars().hasItem("cheater"))
+				{
+					LOG("CustomerService", ("SuspectedCheaterChannel: %s has accepted an auction for item %s",
+											PlayerObject::getAccountDescription(playerObject).c_str(),
+											m.getItemId().getValueString().c_str()));
+				}
+			}
+			else
+			{
+				WARNING(true, ("AcceptAuctionMessage: the player was not found"));
+			}
+		}
+
+		else if (message.isType("BidAuctionMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			BidAuctionMessage m(ri);
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			if (playerObject)
+			{
+				if (playerObject->getObjVars().hasItem("cheater"))
+				{
+					LOG("CustomerService", ("SuspectedCheaterChannel: %s has bid on an auction for item %s, amount %d",
+											PlayerObject::getAccountDescription(playerObject).c_str(),
+											m.getItemId().getValueString().c_str(),
+											m.getBid()));
+				}
+
+				CommoditiesMarket::auctionBid(*playerObject, m.getItemId().getValue(), m.getBid(), m.getMaxProxyBid());
+			}
+			else
+			{
+				WARNING(true, ("BidAuctionMessage: the player was not found"));
+			}
+		}
+
+		else if (message.isType("CancelLiveAuctionMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			CancelLiveAuctionMessage m(ri);
+
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			if (playerObject)
+			{
+				CommoditiesMarket::auctionCancel(*playerObject, m.getItemId().getValue());
+				if (playerObject->getObjVars().hasItem("cheater"))
+				{
+					LOG("CustomerService", ("SuspectedCheaterChannel: %s has cancelled an auction for item %s",
+											PlayerObject::getAccountDescription(playerObject).c_str(),
+											m.getItemId().getValueString().c_str()));
+				}
+
+			}
+			else
+			{
+				WARNING(true, ("CancelLiveAuctionMessage: the player was not found"));
+			}
+		}
+
+		else if (message.isType("CreateAuctionMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			CreateAuctionMessage m(ri);
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			if (playerObject)
+			{
+				NetworkId itemId = m.getItemId();
+				NetworkId containerId = m.getContainerId();
+				CommoditiesMarket::auctionCreate(*playerObject, itemId, m.getItemLocalizedName(), containerId, m.getMinimumBid(), m.getAuctionLength(), m.getUserDescription(), m.isPremium());
+
+				if (playerObject->getObjVars().hasItem("cheater"))
+				{
+					LOG("CustomerService", ("SuspectedCheaterChannel: %s has created an auction for item %s on vendor %s",
+											PlayerObject::getAccountDescription(playerObject).c_str(),
+											m.getItemId().getValueString().c_str(),
+											containerId.getValueString().c_str()));
+				}
+			}
+			else
+			{
+				WARNING(true, ("CreateAuctionMessage: the player was not found"));
+			}
+		}
+
+		else if (message.isType("CreateImmediateAuctionMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			CreateImmediateAuctionMessage m(ri);
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			if (playerObject)
+			{
+				NetworkId itemId = m.getItemId();
+				NetworkId containerId = m.getContainerId();
+				if (m.isVendorTransfer())
+				{
+					CommoditiesMarket::transferVendorItemFromStockroom(*playerObject, itemId, m.getItemLocalizedName(), m.getPrice(), m.getAuctionLength(), m.getUserDescription());
+				}
+				else
+				{
+					CommoditiesMarket::auctionCreateImmediate(*playerObject, itemId, m.getItemLocalizedName(), containerId, m.getPrice(), m.getAuctionLength(), m.getUserDescription(), m.isPremium());
+				}
+				if (playerObject->getObjVars().hasItem("cheater"))
+				{
+					LOG("CustomerService", ("SuspectedCheaterChannel: %s has created an immediate auction for item %s on vendor %s",
+											PlayerObject::getAccountDescription(playerObject).c_str(),
+											m.getItemId().getValueString().c_str(),
+											containerId.getValueString().c_str()));
+				}
+			}
+			else
+			{
+				WARNING(true, ("CreateImmediateAuctionMessage: the player was not found"));
+			}
+		}
+
+		else if (message.isType("RelistItemsFromStockMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			GenericValueTypeMessage<std::pair<std::pair<std::vector<NetworkId>, std::vector<Unicode::String> >, int> > const m(ri);
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			if (playerObject)
+			{
+				std::vector<NetworkId> const & itemIds = m.getValue().first.first;
+				std::vector<Unicode::String> const & itemLocalizedNames = m.getValue().first.second;
+				int const timer = m.getValue().second;
+				NetworkId itemId;
+				std::vector<NetworkId>::const_iterator iterId = itemIds.begin();
+				std::vector<Unicode::String>::const_iterator iterName = itemLocalizedNames.begin();
+				for (; ((iterId != itemIds.end()) && (iterName != itemLocalizedNames.end())); ++iterId, ++iterName)
+				{
+					itemId = *iterId;
+					CommoditiesMarket::transferVendorItemFromStockroom(*playerObject, itemId, *iterName, -1, timer, Unicode::String());
+					if (playerObject->getObjVars().hasItem("cheater"))
+					{
+						LOG("CustomerService", ("SuspectedCheaterChannel: %s has created an immediate auction (relist) for item %s",
+							PlayerObject::getAccountDescription(playerObject).c_str(),
+							itemId.getValueString().c_str()));
+					}
+				}
+			}
+			else
+			{
+				WARNING(true, ("RelistItemsFromStockMessage: the player was not found"));
+			}
+		}
+
+		else if (message.isType("RetrieveAuctionItemMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			RetrieveAuctionItemMessage m(ri);
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			if (playerObject)
+			{
+				NetworkId itemId = m.getItemId();
+				ServerObject *auctionContainer = dynamic_cast<ServerObject *>(NetworkIdManager::getObjectById(m.getContainerId()));
+				if (auctionContainer)
+				{
+					if (playerObject->isAuthoritative() && auctionContainer->isAuthoritative())
+					{
+						CommoditiesMarket::auctionRetrieve(*playerObject, m.getItemId().getValue(), m.getItemId(), *auctionContainer);
+						if (playerObject->getObjVars().hasItem("cheater"))
+						{
+							LOG("CustomerService", ("SuspectedCheaterChannel: %s has retrieved an auction for item %s on vendor %s",
+								PlayerObject::getAccountDescription(playerObject).c_str(),
+								m.getItemId().getValueString().c_str(),
+								auctionContainer->getNetworkId().getValueString().c_str()));
+						}
+					}
+				}
+				else
+				{
+					LOG("CustomerService", ("Auction:Player %s attempted to retrieve an auction for container %Ld but failed.", PlayerObject::getAccountDescription(playerObject).c_str(), m.getContainerId().getValue()));
+
+					RetrieveAuctionItemResponseMessage const msg(itemId, ar_INVALID_CONTAINER_ID);;
+					Client *client = playerObject->getClient();
+					if (client)
+					{
+						client->send(msg, true);
+					}
+				}
+			}
+			else
+			{
+				WARNING(true, ("RetrieveAuctionMessage: the player was not found"));
+			}
+		}
+		else if (message.isType("AuctionQueryHeadersMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			AuctionQueryHeadersMessage m(ri);
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			if (playerObject)
+			{
+				CommoditiesMarket::auctionQueryHeaders(*playerObject,
+													 m.getRequestId(),
+													 m.getSearchType(),
+													 m.getItemType(),
+													 m.getItemTypeExactMatch(),
+													 m.getItemTemplateId(),
+													 m.getTextFilterAll(),
+													 m.getTextFilterAny(),
+													 m.getPriceFilterMin(),
+													 m.getPriceFilterMax(),
+													 m.getPriceFilterIncludesFee(),
+													 m.getAdvancedSearch(),
+													 m.getAdvancedSearchMatchAllAny(),
+													 m.getContainer(),
+													 m.getLocationSearchType(),
+													 m.getMyVendorsOnly(),
+													 m.getQueryOffset());
+			}
+		}
+		else if (message.isType("GetAuctionDetails"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			GetAuctionDetails m(ri);
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			if (playerObject)
+			{
+				CommoditiesMarket::getAuctionDetails(*playerObject,
+													 m.getItem());
+			}
+
+		}
+		else if (message.isType("IsVendorOwnerMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			IsVendorOwnerMessage m(ri);
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			if (playerObject)
+			{
+				CommoditiesMarket::isVendorOwner(*playerObject, m.getContainerId());
+			}
+
+		}
+		else if (message.isType("CommoditiesItemTypeListRequest"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			GenericValueTypeMessage<std::string> const m(ri);
+
+			static char buffer[128];
+			snprintf(buffer, sizeof(buffer)-1, "%s.%d", GameServer::getInstance().getClusterName().c_str(), CommoditiesMarket::getItemTypeMapVersionNumber());
+			buffer[sizeof(buffer)-1] = '\0';
+
+			if (m.getValue() != std::string(buffer))
+			{
+				GenericValueTypeMessage<std::pair<std::string, std::map<int, std::map<int, std::pair<int, StringId> > > > > const rsp("CommoditiesItemTypeListResponse", std::make_pair(std::string(buffer), CommoditiesMarket::getItemTypeMap()));
+				send(rsp, true);
+			}
+		}
+		else if (message.isType("CommoditiesResourceTypeListRequest"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			GenericValueTypeMessage<std::string> const m(ri);
+
+			static char buffer[128];
+			snprintf(buffer, sizeof(buffer)-1, "%s.%d", GameServer::getInstance().getClusterName().c_str(), CommoditiesMarket::getResourceTypeMapVersionNumber());
+			buffer[sizeof(buffer)-1] = '\0';
+
+			if (m.getValue() != std::string(buffer))
+			{
+				GenericValueTypeMessage<std::pair<std::string, std::map<int, std::set<std::string> > > > const rsp("CommoditiesResourceTypeListResponse", std::make_pair(std::string(buffer), CommoditiesMarket::getResourceTypeMap()));
+				send(rsp, true);
+			}
+		}
+		else if (message.isType("CollectionServerFirstListRequest"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			GenericValueTypeMessage<std::string> const m(ri);
+
+			PlanetObject const * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+			if (planetObject)
+			{
+				static char buffer[128];
+				snprintf(buffer, sizeof(buffer)-1, "%s.%d", GameServer::getInstance().getClusterName().c_str(), planetObject->getCollectionServerFirstUpdateNumber());
+				buffer[sizeof(buffer)-1] = '\0';
+
+				if (m.getValue() != std::string(buffer))
+				{
+					GenericValueTypeMessage<std::pair<std::string, std::set<std::pair<std::pair<int32, std::string>, std::pair<NetworkId, Unicode::String> > > > > const rsp("CollectionServerFirstListResponse", std::make_pair(std::string(buffer), planetObject->getCollectionServerFirst()));
+					send(rsp, true);
+				}
+			}
+		}
+
+		//-----------------------------------------------------------------
+
+		else if (message.isType (PlanetTravelPointListRequest::cms_name))
+		{
+			Archive::ReadIterator readIterator = static_cast<const GameNetworkMessage&> (message).getByteStream ().begin ();
+			const PlanetTravelPointListRequest requestMessage (readIterator);
+
+			const std::string & planetName = requestMessage.getPlanetName ();
+			const PlanetObject* const planetObject = ServerUniverse::getInstance ().getPlanetByName (requestMessage.getPlanetName ());
+			if (planetObject)
+			{
+				std::vector<std::string> names;
+				planetObject->getTravelPointNameList (names);
+
+				std::vector<Vector> points;
+				planetObject->getTravelPointPointList (points);
+
+				std::vector<int> costs;
+				planetObject->getTravelPointCostList (costs);
+
+				std::vector<bool> interplanetary;
+				planetObject->getTravelPointInterplanetaryList (interplanetary);
+
+				PlanetTravelPointListResponse const rsp(planetName, names, points, costs, interplanetary, requestMessage.getSequenceId ());
+				send(rsp, true);
+			}
+			else
+				DEBUG_WARNING (true, ("GameServer::receiveMessage: received request for travel point names from client [%s] for planet %s which does not exist", requestMessage.getPlanetName ().c_str (), requestMessage.getNetworkId ().getValueString ().c_str ()));
+		}
+
+		//-----------------------------------------------------------------
+
+		else if (message.isType (NewbieTutorialResponse::cms_name))
+		{
+			Archive::ReadIterator readIterator = static_cast<const GameNetworkMessage&> (message).getByteStream ().begin ();
+			const NewbieTutorialResponse responseMessage (readIterator);
+
+			static const std::string clientReadyString("clientReady");
+
+			if (responseMessage.getResponse() == clientReadyString)
+			{
+				for (std::vector<ServerObject *>::iterator i = m_controlledObjects.begin(); i != m_controlledObjects.end(); ++i)
+				{
+					ServerObject * const so = *i;
+					if (so)
+						so->onLoadingScreenComplete();
+				}
+			}
+
+			ScriptParams scriptParameters;
+			scriptParameters.addParam (responseMessage.getResponse ().c_str ());
+
+			if (primaryControlledObject->getScriptObject ()->trigAllScripts (Scripting::TRIG_NEWBIE_TUTORIAL_RESPONSE, scriptParameters) != SCRIPT_CONTINUE)
+				DEBUG_REPORT_LOG (true, ("OnNewbieTutorialResponse: did not return SCRIPT_CONTINUE\n"));
+		}
+
+		//-----------------------------------------------------------------
+
+		else if (message.isType("AddMapLocationMessage"))
+		{
+			Archive::ReadIterator readIterator = static_cast<const GameNetworkMessage&> (message).getByteStream ().begin ();
+			const AddMapLocationMessage msg (readIterator);
+			UNREF (msg);
+
+			/*
+			MapLocation mapLocation(msg.getLocationId(), msg.getLocationName(),
+									Vector2d(msg.getLocationX(), msg.getLocationY()),
+									msg.getCategory(), msg.getSubCategory());
+
+			PlanetObject *planetObject = ServerUniverse::getInstance ().getPlanetByName (msg.getPlanetName ());
+			if (planetObject)
+			{
+				planetObject->addMapLocation(mapLocation);
+			}
+			AddMapLocationResponseMessage responseMsg(msg.getLocationId());
+			send(responseMsg, true);
+			*/
+		}
+
+		//-----------------------------------------------------------------
+
+		else if (message.isType(GetMapLocationsMessage::MessageType))
+		{
+			Archive::ReadIterator readIterator = static_cast<const GameNetworkMessage&> (message).getByteStream ().begin ();
+			const GetMapLocationsMessage msg (readIterator);
+
+			PlanetMapManagerServer::handleClientRequest (*this, msg);
+		}
+
+		else if (message.isType("GetSpecificMapLocationsMessage"))
+		{
+			Archive::ReadIterator readIterator = static_cast<const GameNetworkMessage&> (message).getByteStream ().begin ();
+			const GenericValueTypeMessage<std::set<std::pair<std::string, NetworkId> > > msg (readIterator);
+
+			PlanetMapManagerServer::handleClientRequestGetSpecificMapLocationsMessage (*this, msg.getValue());
+		}
+
+		else if (message.isType("ConsentResponseMessage"))
+		{
+			Archive::ReadIterator readIterator = static_cast<const GameNetworkMessage&> (message).getByteStream ().begin ();
+			ConsentResponseMessage const msg(readIterator);
+			ConsentManager::getInstance().handleResponse(msg);
+		}
+
+		else if (message.isType("RequestGalaxyLoopTimes"))
+		{
+			// obfuscate the information so it's not obvious on the client that this is the server loop time
+			unsigned long loopTime = static_cast<unsigned long>(Clock::frameTime() * 3193000.0f); // loop time (in ms) * 3193
+			GalaxyLoopTimesResponse const msg(loopTime, loopTime);
+			send(msg, true);
+		}
+		else if (message.isType("LagRequest"))
+		{
+			GameNetworkMessage const msg("GameServerLagResponse");
+			send(msg, true);
+		}
+		else if (message.isType("LagReport"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			GenericValueTypeMessage<std::pair<int, int> > const report(ri);
+			m_connectionServerLag = report.getValue().first;
+			m_gameServerLag = report.getValue().second;
+		}
+		else if (message.isType("ChatInviteGroupToRoom"))
+		{
+			if (primaryControlledObject)
+			{
+				CreatureObject * const playerCreature = primaryControlledObject->asCreatureObject();
+				if (playerCreature)
+				{
+					Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+					ChatInviteGroupToRoom const chat(ri);
+
+					// We will need to notify the user if the group leader can not be found
+					bool foundGroupLeader = false;
+
+					// Get the name of the group leader being invited
+					ChatAvatarId const & groupLeaderChatAvatarId = chat.getAvatarId();
+
+					// Convert the name to a network ID
+					NetworkId const groupLeaderNetworkId = NameManager::getInstance().getPlayerId(NameManager::normalizeName(Unicode::wideToNarrow(groupLeaderChatAvatarId.getName())));
+
+					// Try to get a group object corresponding to the player network ID
+					ServerObject const * const groupServerObject = ServerWorld::findObjectByNetworkId(GroupObject::getGroupIdForLeader(groupLeaderNetworkId));
+					if (groupServerObject && groupServerObject->asGroupObject())
+					{
+						// We now know the player is a group leader of a group
+						GroupObject const * const groupLeaderGroupObject = groupServerObject->asGroupObject();
+
+						// Make sure we have the correct player since we only searched by name
+						// (i.e. we may have been looking for a player with the same name but on a different cluster)
+						ChatAvatarId const playerChatAvatarId = Chat::constructChatAvatarId(NameManager::normalizeName(groupLeaderGroupObject->getGroupLeaderName()));
+						if (playerChatAvatarId == groupLeaderChatAvatarId)
+						{
+							// We found the group leader
+							foundGroupLeader = true;
+
+							// We need to get the network IDs for all the group members
+							std::vector<NetworkId> groupNetworkIds;
+
+							GroupObject::GroupMemberVector const & groupMemberVector = groupLeaderGroupObject->getGroupMembers();
+							for (unsigned i = 0; i < groupMemberVector.size(); ++i)
+							{
+								GroupObject::GroupMember const & groupMember = groupMemberVector[i];
+
+								groupNetworkIds.push_back(groupMember.first);
+							}
+
+							// Pass the invitation to all the group members
+							Chat::inviteGroupMembers(m_primaryControlledObject, chat.getAvatarId(), chat.getRoomName(), groupNetworkIds);
+						}
+					}
+
+					// If we couldn't find the group leader, let the player know
+					if (!foundGroupLeader)
+					{
+						ChatAvatarId const inviteeId = Chat::constructChatAvatarId(*playerCreature);
+						ChatOnInviteGroupToRoom msg(ERR_DESTAVATARDOESNTEXIST, chat.getRoomName(), inviteeId, chat.getAvatarId());
+						send(msg, false);
+					}
+				}
+			}
+		}
+		else if (message.isType("ChatPersistentMessageToServer"))
+		{
+			if (primaryControlledObject) //lint !e774
+			{
+				CreatureObject * const playerCreature = primaryControlledObject->asCreatureObject();
+				if (playerCreature)
+				{
+					Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+					ChatPersistentMessageToServer const chat(ri);
+					std::string const &toName = chat.getToCharacterName().name;
+					if (!_stricmp(toName.c_str(), "guild"))
+					{
+						std::pair<int, std::pair<std::string, std::string> > const count = GuildInterface::mailToGuild(*playerCreature, chat.getSubject(), chat.getMessage(), chat.getOutOfBand());
+						if (count.first < 0)
+						{
+							Chat::sendSystemMessage(*playerCreature, Unicode::narrowToWide("You do not have sufficient permission to send mail to guild members."), Unicode::emptyString);
+						}
+						else
+						{
+							Chat::sendSystemMessage(*playerCreature, Unicode::narrowToWide(FormattedString<512>().sprintf("Your mail was sent to %d members of guild %s (%s).", count.first, count.second.first.c_str(), count.second.second.c_str())), Unicode::emptyString);
+						}
+					}
+					else if (!_strnicmp(toName.c_str(), "guild ", 6))
+					{
+						// see if it's a valid guild rank
+						GuildRankDataTable::GuildRank const * guildRank = GuildRankDataTable::getRankForDisplayRankName(toName);
+						if (guildRank)
+						{
+							std::pair<int, std::pair<std::string, std::string> > const count = GuildInterface::mailToGuildRank(*playerCreature, guildRank->slotId, chat.getSubject(), chat.getMessage(), chat.getOutOfBand());
+							if (count.first < 0)
+							{
+								Chat::sendSystemMessage(*playerCreature, Unicode::narrowToWide("You do not have sufficient permission to send mail to guild members."), Unicode::emptyString);
+							}
+							else
+							{
+								Chat::sendSystemMessage(*playerCreature, Unicode::narrowToWide(FormattedString<512>().sprintf("Your mail was sent to %d members in rank %s of guild %s (%s).", count.first, guildRank->displayName.c_str(), count.second.first.c_str(), count.second.second.c_str())), Unicode::emptyString);
+							}
+						}
+						else
+						{
+							Chat::sendSystemMessage(*playerCreature, Unicode::narrowToWide(FormattedString<512>().sprintf("\"%s\" is not a valid name.", toName.c_str())), Unicode::emptyString);
+						}
+					}
+					else if (!_stricmp(toName.c_str(), "citizens"))
+					{
+						std::pair<int, std::string> const count = CityInterface::mailToCitizens(*playerCreature, chat.getSubject(), chat.getMessage(), chat.getOutOfBand());
+						if (count.first < 0)
+						{
+							Chat::sendSystemMessage(*playerCreature, Unicode::narrowToWide("You do not have sufficient permission to send mail to citizens."), Unicode::emptyString);
+						}
+						else
+						{
+							Chat::sendSystemMessage(*playerCreature, Unicode::narrowToWide(FormattedString<512>().sprintf("Your mail was sent to %d citizens of city %s.", count.first, count.second.c_str())), Unicode::emptyString);
+						}
+					}
+
+					if (playerCreature->getObjVars().hasItem("cheater"))
+					{
+						LOGU("CustomerService", ("SuspectedCheaterChannel: %s is broadcasting a %s message that says '%s'",
+												PlayerObject::getAccountDescription(playerCreature).c_str(),
+												toName.c_str()),
+												chat.getMessage());
+					}
+				}
+			}
+		}
+		else if (message.isType("ExpertiseRequestMessage"))
+		{
+			Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+			ExpertiseRequestMessage const m(ri);
+
+			std::vector<std::string> const & addExpertisesNamesList = m.getAddExpertisesList();
+			bool clearAllExpertisesFirst = m.getClearAllExpertisesFirst();
+			std::string addList;
+			std::vector<std::string>::const_iterator i;
+			for(i = addExpertisesNamesList.begin(); i != addExpertisesNamesList.end(); ++i)
+			{
+				addList += " ";
+				addList += *i;
+			}
+			CreatureObject * playerObject = safe_cast<CreatureObject*>(getCharacterObject());
+			if (playerObject)
+			{				
+				LOG("CustomerService", ("ExpertiseRequestMessage: %s has requested to add expertises [%s] %s",
+					PlayerObject::getAccountDescription(playerObject).c_str(),
+					addList.c_str(), clearAllExpertisesFirst ? "(clearing first)" : ""));
+				playerObject->processExpertiseRequest(addExpertisesNamesList, clearAllExpertisesFirst);
+			}
+		}
+		else if (message.isType("UpdateSessionPlayTimeInfo"))
+		{
+			Archive::ReadIterator readIterator = static_cast<const GameNetworkMessage&> (message).getByteStream ().begin ();
+			GenericValueTypeMessage<std::pair<int32, std::pair<int32, unsigned long> > > const msgPlayTimeInfo(readIterator);
+
+			PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(safe_cast<CreatureObject*>(getCharacterObject()));
+			if (playerObject != NULL)
+			{
+				playerObject->setSessionPlayTimeInfo(msgPlayTimeInfo.getValue().first, msgPlayTimeInfo.getValue().second.first, msgPlayTimeInfo.getValue().second.second);
+			}
+		}
+	}
+	catch (Archive::ReadException &)
+	{
+		if (getCharacterObject())
+		{
+			WARNING_STRICT_FATAL(true, ("A message was received from a client that could not be unpacked. Either the data was corrupt (intentionally or accidentally) or the client and server notion of the message are out of sync. The client will be disconnected. Character object is : %s :%s, IP=%s, accountname=%s", getCharacterObject()->getObjectTemplateName(), getCharacterObject()->getNetworkId().getValueString().c_str(), getIpAddress().c_str(), getAccountName().c_str()));
+		}
+		else
+		{
+			WARNING_STRICT_FATAL(true, ("A message was received from a client that could not be unpacked. Either the data was corrupt (intentionally or accidentally) or the client and server notion of the message are out of sync. The client will be disconnected. IP=%s, accountname=%s", getIpAddress().c_str(), getAccountName().c_str()));
+		}
+		if (getConnection())
+		{
+			KickPlayer const kickMessage(m_characterObjectId, "Invalid Network Stream");
+			GameServer::getInstance().sendToConnectionServers(kickMessage);
+			GameServer::getInstance().dropClient(m_characterObjectId);
+		}
+	}
+
+	//-----------------------------------------------------------------
+}
+
+//-----------------------------------------------------------------------
+
+void Client::receiveMessage(const MessageDispatch::Emitter & source, const MessageDispatch::MessageBase & message)
+{
+	UNREF(source);
+
+	if (   message.isType("ConnectionServerConnectionClosed")
+	    || message.isType("ConnectionServerConnectionDestroyed"))
+	{
+		//Connection server crashed
+		DEBUG_REPORT_LOG(true, ("Connection Server crashed.  Client dropping.\n"));
+		m_connection = 0;
+		GameServer::getInstance().dropClient(m_characterObjectId);
+	}
+	else
+	{
+		if(&source != m_connection)
+		{
+			const MessageDispatch::Message<std::string> * m = dynamic_cast<const MessageDispatch::Message<std::string> *>(&message);
+			if(m)
+			{
+				ConGenericMessage const c(m->getValue(), 0);
+				send(c, true);
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void Client::removeControlledObject(ServerObject &object)
+{
+	if (m_primaryControlledObject == object.getNetworkId())
+	{
+		ObserveTracker::onClientDestroyed(*this);
+		if (ServerWorld::isSpaceScene())
+			SpaceVisibilityManager::removeClient(*this);
+	}
+
+	std::vector<ServerObject *>::iterator iter = std::find(m_controlledObjects.begin(), m_controlledObjects.end(), &object);
+	if (iter != m_controlledObjects.end())
+		IGNORE_RETURN(m_controlledObjects.erase(iter));
+	else
+		DEBUG_WARNING(true, ("Client removing object [%s] that is not controlled", object.getNetworkId().getValueString().c_str()));
+
+	object.clearClient();
+}
+
+//-----------------------------------------------------------------------
+
+void Client::selfDestruct()
+{
+	selfDestruct(false);
+}
+//-----------------------------------------------------------------------
+
+void Client::selfDestruct(const bool immediate)
+{
+	// @todo : this will eventually need to attach ai controllers to
+	// link dead objects.
+	std::vector<ServerObject *> controlledObjects = m_controlledObjects;
+
+	// the controlled object list on the client is affected by clearClient, so work on a copy of the vector
+	for (std::vector<ServerObject *>::iterator i = controlledObjects.begin(); i != controlledObjects.end(); ++i)
+	{
+		if (*i)
+		{
+			if ((*i)->isAuthoritative())
+			{
+				(*i)->handleDisconnect(immediate);
+			}
+			(*i)->clearClient();
+		}
+	}
+	m_controlledObjects.clear();
+	delete this;
+}
+
+//-----------------------------------------------------------------------
+
+void Client::send(GameNetworkMessage const &outgoingMessage, bool reliable) const
+{
+	if (m_connection)
+	{
+		static std::vector<NetworkId> v;
+		v.clear();
+		v.push_back(m_characterObjectId);
+		GameClientMessage const msg(v, reliable, outgoingMessage);
+
+
+		uint32 now = Clock::timeMs();
+		if ( sm_outgoingBytesMap_Worktime == 0 )
+			sm_outgoingBytesMap_Worktime = now;
+		else if ( (now - sm_outgoingBytesMap_Worktime) > 60000 )   // 60 seconds
+		{
+			sm_outgoingBytesMap_Stats =  sm_outgoingBytesMap_Working;
+			std::map< std::string, uint32 >::iterator iter;
+			for ( iter = sm_outgoingBytesMap_Working.begin(); iter != sm_outgoingBytesMap_Working.end(); ++iter )
+			{
+				iter->second = 0;
+			}
+			sm_outgoingBytesMap_Worktime = now;
+		}
+		sm_outgoingBytesMap_Working[ outgoingMessage.getCmdName() ] += msg.getByteStream().getSize();
+
+
+		m_connection->send(msg, true);
+	}
+	else
+	{
+		DEBUG_REPORT_LOG(true, ("Tried to send message to a client without a connection server connection.\n"));
+	}
+}
+
+
+//-----------------------------------------------------------------------
+
+std::map< std::string, uint32 >& Client::getPacketBytesPerMinStats()
+{ 
+	uint32 now = Clock::timeMs();
+        if ( sm_outgoingBytesMap_Worktime == 0 )
+                sm_outgoingBytesMap_Worktime = now;
+        else if ( (now - sm_outgoingBytesMap_Worktime) > 60000 )   // 60 seconds
+        {
+                sm_outgoingBytesMap_Stats =  sm_outgoingBytesMap_Working;
+                std::map< std::string, uint32 >::iterator iter;
+                for ( iter = sm_outgoingBytesMap_Working.begin(); iter != sm_outgoingBytesMap_Working.end(); ++iter )
+                {
+                        iter->second = 0;
+                }
+                sm_outgoingBytesMap_Worktime = now;
+        }
+
+	return sm_outgoingBytesMap_Stats;
+}
+
+
+
+//-----------------------------------------------------------------------
+
+void Client::sendToConnectionServer(GameNetworkMessage const &msg)
+{
+	if (m_connection)
+		m_connection->send(msg, true);
+	else
+	{
+		DEBUG_REPORT_LOG(true, ("Tried to send message to a client without a connection server connection.\n"));
+	}
+}
+
+//-----------------------------------------------------------------------
+
+uint16 Client::getServerSyncStampShort() const
+{
+	NOT_NULL(m_connection);
+	return m_connection->getSyncStampShort();
+}
+
+//-----------------------------------------------------------------------
+
+uint32 Client::getServerSyncStampLong() const
+{
+	NOT_NULL(m_connection);
+	return m_connection->getSyncStampLong();
+}
+
+//-----------------------------------------------------------------------
+
+float Client::computeDeltaTimeInSeconds(uint32 const syncStampLong) const
+{
+	uint32 const deltaTimeMilliseconds = syncStampLong - getServerSyncStampLong();
+
+	float deltaTime = 0.f;
+	if (deltaTimeMilliseconds > 0x7fffffff)
+		deltaTime = static_cast<float>(static_cast<int>(0xffffffff - deltaTimeMilliseconds)) / 1000.0f;
+	else
+		deltaTime = static_cast<float>(static_cast<int>(deltaTimeMilliseconds)) / 1000.0f;
+
+	return deltaTime;
+}
+
+//-----------------------------------------------------------------------
+
+bool Client::setGodMode(bool value)
+{
+	bool wasInGodMode = m_godMode;
+	m_godMode = value;
+	
+	if (value && !m_godValidated)
+	{
+		LOG("CustomerService", ("Avatar:%s denied god mode because it wasn't validated.", PlayerObject::getAccountDescription(getCharacterObjectId()).c_str() ));
+		m_godMode = false;
+	}
+
+	CreatureObject *primaryControlledObject = safe_cast<CreatureObject*>(m_primaryControlledObject.getObject());
+	if (!primaryControlledObject)
+	{
+		if (value && !wasInGodMode)
+			LOG("CustomerService", ("Avatar:%s denied god mode because it has no associated character.", m_accountName.c_str() ));
+		m_godMode = false;
+		return false;
+	}
+
+	if (m_godMode)
+		IGNORE_RETURN(primaryControlledObject->grantCommand(AdminAccountManager::getAdminCommandName(), false));		
+	else
+		primaryControlledObject->revokeCommand(AdminAccountManager::getAdminCommandName(), false, true);
+
+	if (m_godMode != wasInGodMode)
+	{
+		if (m_godMode)
+			LOG("CustomerService", ("Avatar:%s granted god mode %s level %d.", PlayerObject::getAccountDescription(getCharacterObjectId()).c_str(), AdminAccountManager::getAdminCommandName(), m_godLevel ));
+		else
+			LOG("CustomerService", ("Avatar:%s dropped god mode.", PlayerObject::getAccountDescription(getCharacterObjectId()).c_str()));
+
+		// cell permissions may change for us for all cells, so observe all buildings in range for the change
+		CellPermissions::ViewerChangeObserver o(primaryControlledObject);
+
+		ObserveTracker::onGodModeChanged(*this);
+	}
+	return (value == m_godMode); // return true if the value was set to what was requested, false otherwise
+}
+
+//-----------------------------------------------------------------------
+
+void Client::addObserving(ServerObject* o)
+{
+	if (o)
+	{
+		IGNORE_RETURN(m_observing.insert(o));
+		TangibleObject *to = o->asTangibleObject();
+		if (to && PvpUpdateObserver::satisfyPvpSyncCondition(to->isNonPvpObject(), to->hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (o->asCreatureObject() != NULL), to->getPvpFaction()))
+			addObservingPvpSync(to);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void Client::addObservingPvpSync(TangibleObject* to)
+{
+	if (to)
+	{
+		IGNORE_RETURN(m_observingPvpSync.insert(to));
+		PvpUpdateObserver::startObservingPvpSyncNotification(this, *to);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void Client::removeObservingPvpSync(ServerObject* o)
+{
+	if (o && m_observingPvpSync.erase(reinterpret_cast<TangibleObject*>(o)))
+		PvpUpdateObserver::stopObservingPvpSyncNotification(this, o->getNetworkId());
+}
+
+//-----------------------------------------------------------------------
+
+void Client::resetIdleTimeAfterCharacterTransfer()
+{
+	// set m_lastNonIdleTime such that idledTooLong() will be true in ConfigServerGame::getIdleLogoutTimeAfterCharacterTransferSec()
+	unsigned long const currentGameTime = ServerClock::getInstance().getGameTimeSeconds();
+
+	if ((currentGameTime + ConfigServerGame::getIdleLogoutTimeAfterCharacterTransferSec()) > ConfigServerGame::getIdleLogoutTimeSec())
+	{
+		m_lastNonIdleTime = currentGameTime + ConfigServerGame::getIdleLogoutTimeAfterCharacterTransferSec() - ConfigServerGame::getIdleLogoutTimeSec();
+
+		if (m_lastNonIdleTime > currentGameTime)
+			m_lastNonIdleTime = currentGameTime;
+	}
+	else
+	{
+		m_lastNonIdleTime = 0;
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void Client::resetIdleTime()
+{
+	m_lastNonIdleTime = ServerClock::getInstance().getGameTimeSeconds();
+}
+
+//-----------------------------------------------------------------------
+
+bool Client::idledTooLong() const
+{
+	return ServerClock::getInstance().getGameTimeSeconds()-m_lastNonIdleTime > ConfigServerGame::getIdleLogoutTimeSec();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & Client::getAccountName() const
+{
+	return m_accountName;
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & Client::getIpAddress() const
+{
+	return m_ipAddress;
+}
+
+//-----------------------------------------------------------------------
+
+void Client::handleIdleDisconnect() const
+{
+	DEBUG_REPORT_LOG(true, ("Disconnecting %s for being idle too long.\n", m_characterObjectId.getValueString().c_str()));
+	KickPlayer const kickMessage(m_characterObjectId, "Idle Connection");
+	GameServer::getInstance().sendToConnectionServers(kickMessage);
+	GameServer::getInstance().dropClient(m_characterObjectId);
+}
+
+//-----------------------------------------------------------------------
+
+const unsigned int Client::getStationId() const
+{
+	return m_stationId;
+}
+
+//-----------------------------------------------------------------------
+
+int Client::getConnectionServerLag() const
+{
+	return m_connectionServerLag;
+}
+
+//-----------------------------------------------------------------------
+
+int Client::getGameServerLag() const
+{
+	return m_gameServerLag;
+}
+
+//-----------------------------------------------------------------------
+
+void Client::addSynchronizedUi (ServerSynchronizedUi *syncUI)
+{
+	m_syncUIs.push_back(Watcher<ServerSynchronizedUi>(syncUI));
+}
+
+//-----------------------------------------------------------------------
+
+void Client::removeSynchronizedUi(ServerSynchronizedUi const * const syncUI)
+{
+	for (std::vector<Watcher<ServerSynchronizedUi> >::iterator i = m_syncUIs.begin(); i != m_syncUIs.end(); ++i)
+	{
+		if (i->getPointer() == syncUI)
+		{
+			IGNORE_RETURN(m_syncUIs.erase(i));
+			return;
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void Client::openContainer(ServerObject &obj, int sequence, std::string const &slotDesc)
+{
+	if (ObserveTracker::onClientOpenedContainer(*this, obj, sequence, slotDesc))
+	{
+		ScriptParams params;
+		params.addParam(getCharacterObjectId());
+		IGNORE_RETURN(obj.getScriptObject()->trigAllScripts(Scripting::TRIG_OPENED_CONTAINER, params));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void Client::closeContainer(ServerObject &obj)
+{
+	if (ObserveTracker::onClientClosedContainer(*this, obj))
+	{
+		ScriptParams params;
+		params.addParam(getCharacterObjectId());
+		IGNORE_RETURN(obj.getScriptObject()->trigAllScripts(Scripting::TRIG_CLOSED_CONTAINER, params));
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void Client::observeContainer(ServerObject &obj, int sequence, std::string const &slotDesc)
+{
+	ObserveTracker::onClientOpenedContainer(*this, obj, sequence, slotDesc, false);
+}
+
+//-----------------------------------------------------------------------
+
+bool Client::isFreeTrialAccount() const
+{
+	//Test code
+
+	if (m_primaryControlledObject.getObject())
+	{
+		if (safe_cast<ServerObject*>(m_primaryControlledObject.getObject())->getObjVars().hasItem("freeTrialAccount"))
+			return true;
+	}
+
+	//End test code
+
+	int const allFreeTrials = ClientSubscriptionFeature::FreeTrial | ClientSubscriptionFeature::FreeTrial2;
+
+	return ((m_subscriptionFeatures & allFreeTrials) != 0) &&
+		((m_subscriptionFeatures & ClientSubscriptionFeature::Base) == 0);
+}
+
+//-----------------------------------------------------------------------
+
+bool Client::isSecure() const
+{
+	return m_isSecure;
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<std::pair<NetworkId, std::string> > const & Client::getConsumedRewardEvents() const
+{
+	return m_consumedRewardEvents;
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<std::pair<NetworkId, std::string> > const & Client::getClaimedRewardItems() const
+{
+	return m_claimedRewardItems;
+}
+
+// ----------------------------------------------------------------------
+
+void Client::launchWebBrowser(std::string const & url) const
+{
+	GenericValueTypeMessage<std::string> message("LaunchBrowserMessage", url);
+	send(message,true);
+}
+
+// ----------------------------------------------------------------------
+
+bool Client::isUsingAdminLogin() const
+{
+	return m_usingAdminLogin;
+}
+
+// ----------------------------------------------------------------------
+
+bool Client::shouldReceiveCombatSpam(NetworkId const & attacker, Vector const & attackerPosition_w, NetworkId const & defender, Vector const & defenderPosition_w) const
+{
+	PROFILER_AUTO_BLOCK_DEFINE("Client::shouldReceiveCombatSpam");
+
+	// none means no combat spam, period!!!
+	if (m_combatSpamFilter == CombatDataTable::CSFT_None)
+		return false;
+
+	// some combat spam messages don't have an attacker or defender, always allow those
+	if (!attacker.isValid() && !defender.isValid())
+		return true;
+
+	// always receive combat spam if I'm the attacker or the defender
+	if (m_characterObjectId.isValid() && ((m_characterObjectId == attacker) || (m_characterObjectId == defender)))
+		return true;
+
+	bool passFilter = false;
+	if (m_combatSpamFilter == CombatDataTable::CSFT_All)
+	{
+		passFilter = true;
+	}
+	else if (m_combatSpamFilter == CombatDataTable::CSFT_Group)
+	{
+		CreatureObject *primaryControlledObject = safe_cast<CreatureObject*>(m_primaryControlledObject.getObject());
+		if (primaryControlledObject)
+		{
+			GroupObject const * group = primaryControlledObject->getGroup();
+			if (group && (group->isGroupMember(attacker) || group->isGroupMember(defender)))
+			{
+				passFilter = true;
+			}
+		}
+	}
+
+	if (!passFilter)
+		return false;
+
+	// range check
+	CreatureObject *primaryControlledObject = safe_cast<CreatureObject*>(m_primaryControlledObject.getObject());
+	if (primaryControlledObject)
+	{
+		Vector const playerPosition = primaryControlledObject->getPosition_w();
+
+		if ((attacker.isValid() && (playerPosition.magnitudeBetweenSquared(attackerPosition_w) <= m_combatSpamRangeSquaredFilter)) || (defender.isValid() && (playerPosition.magnitudeBetweenSquared(defenderPosition_w) <= m_combatSpamRangeSquaredFilter)))
+			return true;
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool Client::getSendToStarport() const
+{
+	return m_sendToStarport;
+}
+
+
+// ----------------------------------------------------------------------
+
+int Client::getBuddyPoints() const
+{
+	return m_buddyPoints;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/core/Client.h b/engine/server/library/serverGame/src/shared/core/Client.h
new file mode 100644
index 00000000..a8d429ee
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/Client.h
@@ -0,0 +1,472 @@
+// Client.h
+// copyright 2000 Verant Interactive
+
+
+#ifndef	_CLIENT_H
+#define	_CLIENT_H
+
+//-----------------------------------------------------------------------
+
+#include "Unicode.h"
+#include "sharedMessageDispatch/Emitter.h"
+#include "sharedMessageDispatch/Message.h"
+#include "sharedMessageDispatch/Receiver.h"
+#include "sharedMessageDispatch/Transceiver.h"
+
+#include "serverGame/ServerSynchronizedUi.h"
+
+#include "sharedGame/CombatDataTable.h"
+#include "sharedObject/CachedNetworkId.h"
+#include "sharedObject/Object.h"
+#include "unicodeArchive/UnicodeArchive.h"
+#include <hash_set>
+#include <map>
+
+class ConnectionServerConnection;
+class GameNetworkMessage;
+class CreatureObject;
+class ObjectList;
+class PlayerObject;
+class ServerObject;
+class TangibleObject;
+struct ClientDestroy;
+
+//-----------------------------------------------------------------------
+
+
+class Client : public MessageDispatch::Receiver, public MessageDispatch::Emitter
+{
+	friend class ClientChannel;
+public:
+	typedef std::map<uint32, int> AccountFeatureIdList;
+
+	Client                  (ConnectionServerConnection & connection, const NetworkId & characterObjectId, const std::string& accountName, const std::string& ipAddr, bool isSecure, bool isSkipLoadScreen, unsigned int stationId, stdset<NetworkId>::fwd const & observedObjects, uint32 gameFeatures, uint32 subscriptionFeatures, AccountFeatureIdList const & accountFeatureIds, unsigned int entitlementTotalTime, unsigned int entitlementEntitledTime, unsigned int entitlementTotalTimeSinceLastLogin, unsigned int entitlementEntitledTimeSinceLastLogin, int buddyPoints, std::vector<std::pair<NetworkId, std::string> > const & consumedRewardEvents, std::vector<std::pair<NetworkId, std::string> > const & claimedRewardItems, bool usingAdminLogin, CombatDataTable::CombatSpamFilterType combatSpamFilter, int combatSpamRangeSquaredFilter, int furnitureRotationDegree, bool hasUnoccupiedJediSlot, bool isJediSlotCharacter, bool sendToStarport = false);
+	virtual                  ~Client                 ();
+
+	static void              install();
+
+	void                     addControlledObject     (ServerObject &object);
+	void                     clearControlledObjects  ();
+	ServerObject *           findControlledObject    (NetworkId const &id) const;
+	std::vector<ServerObject *> const &getControlledObjects() const;
+	const Unicode::String &  getCharacterName        () const; //@todo is this used?
+	const std::string &      getIpAddress            () const;
+	ServerObject*            getCharacterObject      () const;
+	const NetworkId &        getCharacterObjectId    () const;
+	const std::string &      getAccountName          () const;
+	const unsigned int       getStationId            () const;
+	uint32                   getGameFeatures() const;
+	uint32                   getSubscriptionFeatures() const;
+	AccountFeatureIdList const & getAccountFeatureIds() const;
+	void                     setAccountFeatureIds(AccountFeatureIdList const & accountFeatureIds);
+	void                     setAccountFeatureId(uint32 featureId, int count);
+	unsigned int             getEntitlementTotalTime  () const;
+	unsigned int             getEntitlementEntitledTime () const;
+	unsigned int             getEntitlementTotalTimeSinceLastLogin () const;
+	unsigned int             getEntitlementEntitledTimeSinceLastLogin () const;
+	bool                     isFreeTrialAccount() const;
+	int                      getBuddyPoints() const;
+	bool                     isSecure() const;
+	std::vector<std::pair<NetworkId, std::string> > const & getConsumedRewardEvents() const;
+	std::vector<std::pair<NetworkId, std::string> > const & getClaimedRewardItems() const;
+	bool                     isUsingAdminLogin() const;
+	CombatDataTable::CombatSpamFilterType getCombatSpamFilter() const;
+	int                      getCombatSpamRangeSquaredFilter() const;
+	bool                     shouldReceiveCombatSpam(NetworkId const & attacker, Vector const & attackerPosition_w, NetworkId const & defender, Vector const & defenderPosition_w) const;
+	int                      getFurnitureRotationDegree() const;
+	bool                     getHasUnoccupiedJediSlot() const;
+	bool                     getIsJediSlotCharacter() const;
+
+	bool                     getSendToStarport() const;
+	
+	ConnectionServerConnection * getConnection       ();
+	// sync stamp for dealing with times synced to our connection server
+	uint16                   getServerSyncStampShort () const;
+	uint32                   getServerSyncStampLong  () const;
+	float computeDeltaTimeInSeconds(uint32 syncStampLong) const;
+	WatchedByList &          getWatchedByList        () const;
+
+	int                      getConnectionServerLag  () const;
+	int                      getGameServerLag        () const;
+	
+	MessageDispatch::Transceiver<ClientDestroy &> & getDestroyNotifier();
+	
+	bool                     getIsReady             () const;
+	bool                     isControlled           (NetworkId const &id) const;
+	bool                     isGod() const;
+	int                      getGodLevel() const;
+	bool                     isGodValidated() const;
+
+	void                     onLoadPlayer           (CreatureObject &newCharacter);
+	void                     assumeControl          (CreatureObject &newCharacter);
+
+	void                     addSynchronizedUi      (ServerSynchronizedUi * sync);
+	void                     removeSynchronizedUi   (ServerSynchronizedUi const * sync);
+	
+	void                     receiveClientMessage   (const GameNetworkMessage & message);
+	void                     receiveMessage         (const MessageDispatch::Emitter & source, const MessageDispatch::MessageBase & message);
+	void                     removeControlledObject (ServerObject &object);
+	void                     selfDestruct           ();
+	void			 selfDestruct		(const bool immediate);
+	/** send() sends a message to the client via the connection server.
+	*/
+	void                           send                   (const GameNetworkMessage & outgoingMessage, bool reliable) const;
+	void                           sendToConnectionServer (const GameNetworkMessage & outgoingMessage);
+	bool                           setGodMode(bool status);
+
+	struct ServerObjectPointerHash
+	{
+		size_t operator()(ServerObject * const ptr) const
+		{
+			return (reinterpret_cast<const size_t>(ptr) >> 4);
+		};
+	};
+	struct TangibleObjectPointerHash
+	{
+		size_t operator()(TangibleObject * const ptr) const
+		{
+			return (reinterpret_cast<const size_t>(ptr) >> 4);
+		};
+	};
+	typedef std::hash_set<ServerObject*, ServerObjectPointerHash> ObservingList;
+
+	// objects being observed that are in this list needs
+	// to have their pvp status updated when there are changes
+	// that requires pvp status to be recalcuclated
+	typedef std::hash_set<TangibleObject*, TangibleObjectPointerHash> ObservingListPvpSync;
+
+	ObservingList const &          getObserving() const;
+	ObservingListPvpSync const &   getObservingPvpSync() const;
+	void                           addObserving(ServerObject* o);
+	void                           addObservingPvpSync(TangibleObject* to);
+	void                           removeObserving(ServerObject* o);
+	void                           removeObservingPvpSync(ServerObject* o);
+	void                           removeAllObserving();
+
+	std::set<ServerObject*> &      getOpenedContainers();
+	std::set<ServerObject*> const &getOpenedContainers() const;
+
+	void                           resetIdleTimeAfterCharacterTransfer();
+	void                           resetIdleTime();
+	bool                           idledTooLong() const;
+	void                           handleIdleDisconnect() const;
+	
+	void openContainer(ServerObject &obj, int sequence, std::string const &slotDesc);
+	void closeContainer(ServerObject &obj);
+	void observeContainer(ServerObject &obj, int sequence, std::string const &slotDesc);
+
+	void launchWebBrowser(std::string const & url) const;
+
+	class ClientMessage : public MessageDispatch::MessageBase
+	{
+	public:
+		ClientMessage(const std::string & message);
+		~ClientMessage();
+	private:
+		ClientMessage();
+		ClientMessage(const ClientMessage & source);
+		ClientMessage & operator = (const ClientMessage & rhs);
+	};
+
+	static std::map< std::string, uint32 >&  getPacketBytesPerMinStats();
+
+private:
+	Client(const Client&);
+	Client&                  operator=(const Client&);
+	
+private:
+	std::string                                   m_accountName;
+	Unicode::String                               m_characterName;
+	NetworkId                                     m_characterObjectId;
+	ConnectionServerConnection *                  m_connection;      
+	std::vector<ServerObject *>                   m_controlledObjects;
+	int                                           m_godLevel;
+	bool                                          m_godMode;
+	bool                                          m_godValidated;
+	std::string                                   m_ipAddress;
+	bool                                          m_isReady;
+	bool                                          m_isSecure;
+	bool                                          m_isSkipLoadScreen;
+	CachedNetworkId                               m_primaryControlledObject; // This will be the creature object representing the player (or possibly a vehicle in the future)
+	MessageDispatch::Transceiver<ClientDestroy &> destroyNotifier;
+
+	ObservingList                                 m_observing;
+
+	// for optimization, we keep the list of observed objects
+	// that needs to have their pvp status updated when there
+	// are changes that requires pvp status to be recalcuclated;
+	// this is so that we don't have to iterate over the
+	// entire list of observed objects (which can get pretty
+	// large) to find these particular observed objects
+	ObservingListPvpSync                          m_observingPvpSync;
+
+	std::set<ServerObject*>                       m_openedContainers;
+	mutable WatchedByList                         m_watchedByList;
+	unsigned long                                 m_lastNonIdleTime;
+	unsigned int                                  m_stationId;
+	int                                           m_connectionServerLag;
+	int                                           m_gameServerLag;
+	uint32                                        m_gameFeatures;
+	uint32                                        m_subscriptionFeatures;
+	AccountFeatureIdList                          m_accountFeatureIds;
+	unsigned int                                  m_entitlementTotalTime;
+	unsigned int                                  m_entitlementEntitledTime;
+	unsigned int                                  m_entitlementTotalTimeSinceLastLogin;
+	unsigned int                                  m_entitlementEntitledTimeSinceLastLogin;
+	int                                           m_buddyPoints;
+	std::set<NetworkId>                           m_previousObservedObjects;
+	stdvector<Watcher<ServerSynchronizedUi> >::fwd m_syncUIs;
+	std::vector<std::pair<NetworkId, std::string> > m_consumedRewardEvents;
+	std::vector<std::pair<NetworkId, std::string> > m_claimedRewardItems;
+	bool                                          m_usingAdminLogin;
+	CombatDataTable::CombatSpamFilterType         m_combatSpamFilter;
+	int                                           m_combatSpamRangeSquaredFilter;
+	int                                           m_furnitureRotationDegree;
+
+	// these 2 come from the client (via the LoginServer) so should not be trusted;
+	// we cache them here to do preliminary checks to avoid unnecessarily sending
+	// commands to the LoginServer (assuming the values haven't been hacked on the
+	// client); when we do send the commands to the LoginServer, we'll check again there
+	bool                                          m_hasUnoccupiedJediSlot;
+	bool                                          m_isJediSlotCharacter;
+
+	bool					      m_sendToStarport;
+
+	static std::map< std::string, uint32 >   sm_outgoingBytesMap_Working;  // working stats that will rotate after 1 minute 
+	static std::map< std::string, uint32 >   sm_outgoingBytesMap_Stats;    // computed stats from the last minute 
+	static uint32				 sm_outgoingBytesMap_Worktime; // time we started filling in the working map
+};
+
+//-----------------------------------------------------------------------
+
+struct ClientDestroy
+{
+	explicit ClientDestroy(Client * c) :
+	client(c)
+	{
+	};
+	~ClientDestroy() {};
+	Client * client;
+};
+
+//-----------------------------------------------------------------------
+
+inline bool Client::isGodValidated() const
+{
+	return m_godValidated;
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & Client::getCharacterName() const
+{
+	return m_characterName;
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId &Client::getCharacterObjectId() const
+{
+	return m_characterObjectId;
+}
+
+//-----------------------------------------------------------------------
+
+inline ServerObject* Client::getCharacterObject() const
+{
+	return findControlledObject(getCharacterObjectId());
+}
+
+//-----------------------------------------------------------------------
+
+inline ConnectionServerConnection * Client::getConnection()
+{
+	return m_connection;
+}
+
+//-----------------------------------------------------------------------
+
+inline MessageDispatch::Transceiver<ClientDestroy &> & Client::getDestroyNotifier()
+{
+	return destroyNotifier;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool Client::getIsReady() const
+{
+    return m_isReady;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool Client::isGod() const
+{
+  return m_godMode;
+}
+
+//-----------------------------------------------------------------------
+
+inline int Client::getGodLevel() const
+{
+  return m_godLevel;
+}
+
+//-----------------------------------------------------------------------
+
+inline Client::ObservingList const &Client::getObserving() const
+{
+	return m_observing;
+}
+
+//-----------------------------------------------------------------------
+
+inline Client::ObservingListPvpSync const &Client::getObservingPvpSync() const
+{
+	return m_observingPvpSync;
+}
+
+//-----------------------------------------------------------------------
+
+inline void Client::removeObserving(ServerObject* o)
+{
+	if (o)
+	{
+		IGNORE_RETURN(m_observing.erase(o));
+		removeObservingPvpSync(o);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+inline void Client::removeAllObserving()
+{
+	m_observing.clear();
+	m_observingPvpSync.clear();
+}
+
+//-----------------------------------------------------------------------
+
+inline std::set<ServerObject*> &Client::getOpenedContainers()
+{
+	return m_openedContainers;
+}
+
+//-----------------------------------------------------------------------
+
+inline std::set<ServerObject*> const &Client::getOpenedContainers() const
+{
+	return m_openedContainers;
+}
+
+//-----------------------------------------------------------------------
+
+inline WatchedByList & Client::getWatchedByList() const
+{
+	return m_watchedByList;
+}
+
+//-----------------------------------------------------------------------
+
+inline uint32 Client::getGameFeatures() const
+{
+	return m_gameFeatures;
+}
+
+//-----------------------------------------------------------------------
+
+inline uint32 Client::getSubscriptionFeatures() const
+{
+	return m_subscriptionFeatures;
+}
+
+//-----------------------------------------------------------------------
+
+inline Client::AccountFeatureIdList const & Client::getAccountFeatureIds() const
+{
+	return m_accountFeatureIds;
+}
+
+//-----------------------------------------------------------------------
+
+inline void Client::setAccountFeatureIds(AccountFeatureIdList const & accountFeatureIds)
+{
+	m_accountFeatureIds = accountFeatureIds;
+}
+
+//-----------------------------------------------------------------------
+
+inline void Client::setAccountFeatureId(uint32 featureId, int count)
+{
+	if (count > 0)
+		m_accountFeatureIds[featureId] = count;
+	else
+		IGNORE_RETURN(m_accountFeatureIds.erase(featureId));
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int Client::getEntitlementTotalTime() const
+{
+	return m_entitlementTotalTime;
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int Client::getEntitlementEntitledTime() const
+{
+	return m_entitlementEntitledTime;
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int Client::getEntitlementTotalTimeSinceLastLogin() const
+{
+	return m_entitlementTotalTimeSinceLastLogin;
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int Client::getEntitlementEntitledTimeSinceLastLogin() const
+{
+	return m_entitlementEntitledTimeSinceLastLogin;
+}
+
+//-----------------------------------------------------------------------
+
+inline CombatDataTable::CombatSpamFilterType Client::getCombatSpamFilter() const
+{
+	return m_combatSpamFilter;
+}
+
+//-----------------------------------------------------------------------
+
+inline int Client::getCombatSpamRangeSquaredFilter() const
+{
+	return m_combatSpamRangeSquaredFilter;
+}
+
+//-----------------------------------------------------------------------
+
+inline int Client::getFurnitureRotationDegree() const
+{
+	return m_furnitureRotationDegree;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool Client::getHasUnoccupiedJediSlot() const
+{
+	return m_hasUnoccupiedJediSlot;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool Client::getIsJediSlotCharacter() const
+{
+	return m_isJediSlotCharacter;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _CLIENT_H
diff --git a/engine/server/library/serverGame/src/shared/core/ClusterWideDataClient.cpp b/engine/server/library/serverGame/src/shared/core/ClusterWideDataClient.cpp
new file mode 100644
index 00000000..a0c10d82
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ClusterWideDataClient.cpp
@@ -0,0 +1,162 @@
+// ======================================================================
+//
+// ClusterWideDataClient.cpp
+// Copyright 2004 Sony Online Entertainment, Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ClusterWideDataClient.h"
+
+#include "serverGame/GameServer.h"
+#include "serverGame/ServerObject.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedNetworkMessages/ClusterWideDataGetElementMessage.h"
+#include "sharedNetworkMessages/ClusterWideDataGetElementResponseMessage.h"
+#include "sharedNetworkMessages/ClusterWideDataReleaseLockMessage.h"
+#include "sharedNetworkMessages/ClusterWideDataRemoveElementMessage.h"
+#include "sharedNetworkMessages/ClusterWideDataUpdateDictionaryMessage.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedUtility/ValueDictionaryArchive.h"
+
+// ======================================================================
+
+namespace ClusterWideDataClientNamespace
+{
+	// tracks the requests that have been sent to the
+	// cluster wide data manager, and the object that
+	// should be notified when the response comes in
+	typedef std::map<unsigned long, NetworkId> CallbackObjectIdList;
+	CallbackObjectIdList callbackObjectIdList;
+}
+
+// ----------------------------------------------------------------------
+
+void ClusterWideDataClient::install()
+{
+	ExitChain::add(remove, "ClusterWideDataClient");
+}
+
+// ----------------------------------------------------------------------
+
+void ClusterWideDataClient::remove()
+{
+	// clear up requests list
+	ClusterWideDataClientNamespace::callbackObjectIdList.clear();
+}
+
+// ----------------------------------------------------------------------
+
+unsigned long ClusterWideDataClient::getClusterWideData(std::string const & managerName, std::string const & elementNameRegex, bool const lockElements, NetworkId const & callbackObjectId)
+{
+	ClusterWideDataGetElementMessage const msg(managerName, elementNameRegex, lockElements);
+	GameServer::getInstance().sendToCentralServer(msg);
+
+	// associate the request Id with the callback object
+	ClusterWideDataClientNamespace::callbackObjectIdList[msg.getRequestId()] = callbackObjectId;
+
+	return msg.getRequestId();
+}
+
+// ----------------------------------------------------------------------
+
+void ClusterWideDataClient::releaseClusterWideDataLock(std::string const & managerName, unsigned long const lockKey)
+{
+	ClusterWideDataReleaseLockMessage const msg(managerName, lockKey);
+	GameServer::getInstance().sendToCentralServer(msg);
+}
+
+// ----------------------------------------------------------------------
+
+void ClusterWideDataClient::removeClusterWideData(std::string const & managerName, std::string const & elementNameRegex, unsigned long const lockKey)
+{
+	ClusterWideDataRemoveElementMessage const msg(managerName, elementNameRegex, lockKey);
+	GameServer::getInstance().sendToCentralServer(msg);
+}
+
+// ----------------------------------------------------------------------
+
+void ClusterWideDataClient::updateClusterWideData(std::string const & managerName, std::string const & elementNameRegex, ValueDictionary const & dictionary, unsigned long const lockKey)
+{
+	ClusterWideDataUpdateDictionaryMessage const msg(managerName, elementNameRegex, dictionary, false, false, lockKey);
+	GameServer::getInstance().sendToCentralServer(msg);
+}
+
+// ----------------------------------------------------------------------
+
+void ClusterWideDataClient::replaceClusterWideData(std::string const & managerName, std::string const & elementNameRegex, ValueDictionary const & dictionary, bool const autoRemove, unsigned long const lockKey)
+{
+	ClusterWideDataUpdateDictionaryMessage const msg(managerName, elementNameRegex, dictionary, true, autoRemove, lockKey);
+	GameServer::getInstance().sendToCentralServer(msg);
+}
+
+// ----------------------------------------------------------------------
+
+void ClusterWideDataClient::registerMessage(MessageDispatch::Receiver & messageReceiver)
+{
+	messageReceiver.connectToMessage(ClusterWideDataGetElementResponseMessage::ms_messageName.c_str());
+}
+
+// ----------------------------------------------------------------------
+
+bool ClusterWideDataClient::handleMessage(const MessageDispatch::Emitter &, const MessageDispatch::MessageBase & message)
+{
+	bool handledMessage = false;
+
+	if (message.isType(ClusterWideDataGetElementResponseMessage::ms_messageName.c_str()))
+	{
+		handledMessage = true;
+
+		Archive::ReadIterator ri = safe_cast<const GameNetworkMessage *>(&message)->getByteStream().begin();
+
+		ClusterWideDataGetElementResponseMessage msg(ri);
+
+		// locate the callback object
+		ClusterWideDataClientNamespace::CallbackObjectIdList::iterator iter = ClusterWideDataClientNamespace::callbackObjectIdList.find(msg.getRequestId());
+		ServerObject * object = NULL;
+
+		if (iter != ClusterWideDataClientNamespace::callbackObjectIdList.end())
+			object = dynamic_cast<ServerObject *>(NetworkIdManager::getObjectById(iter->second));
+
+		// invoke callback object with the result
+		if ((object) && (object->isAuthoritative()))
+		{
+			ScriptParams params;
+			params.addParam(msg.getManagerName().c_str());
+			params.addParam(msg.getElementNameRegex().c_str());
+			params.addParam(static_cast<int>(msg.getRequestId()));
+
+			std::vector<const char *> nameList;
+			for (std::vector<std::string>::const_iterator i = msg.getElementNameList().begin(); i != msg.getElementNameList().end(); ++i)
+				nameList.push_back(i->c_str());
+
+			params.addParam(nameList);
+
+			params.addParam(msg.getElementDictionaryList());
+			params.addParam(static_cast<int>(msg.getLockKey()));
+
+			IGNORE_RETURN(object->getScriptObject()->trigAllScripts(Scripting::TRIG_RECEIVE_CLUSTER_WIDE_DATA_RESPONSE, params));
+		}
+		else
+		{
+			if (object)
+				WARNING(true, ("Non-authoritative object with network id (%s) cannot process cluster wide data response Id (%lu)", ((iter != ClusterWideDataClientNamespace::callbackObjectIdList.end()) ? iter->second.getValueString().c_str() : "none"), msg.getRequestId()));
+			else
+				WARNING(true, ("Can't locate object with network id (%s) for cluster wide data response Id (%lu)", ((iter != ClusterWideDataClientNamespace::callbackObjectIdList.end()) ? iter->second.getValueString().c_str() : "none"), msg.getRequestId()));
+
+			// unlock any locked elements
+			if (msg.getLockKey() > 0)
+				releaseClusterWideDataLock(msg.getManagerName(), msg.getLockKey());
+		}
+
+		// request has now been serviced
+		if (iter != ClusterWideDataClientNamespace::callbackObjectIdList.end())
+			ClusterWideDataClientNamespace::callbackObjectIdList.erase(iter);
+	}
+
+	return handledMessage;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/ClusterWideDataClient.h b/engine/server/library/serverGame/src/shared/core/ClusterWideDataClient.h
new file mode 100644
index 00000000..69aa83ae
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ClusterWideDataClient.h
@@ -0,0 +1,47 @@
+// ======================================================================
+//
+// ClusterWideDataClient.h
+// Copyright 2004 Sony Online Entertainment, Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef INCLUDED_ClusterWideDataClient_H
+#define INCLUDED_ClusterWideDataClient_H
+
+// ======================================================================
+
+namespace MessageDispatch
+{
+	class Emitter;
+	class MessageBase;
+	class Receiver;
+}
+
+class NetworkId;
+class ValueDictionary;
+
+// ======================================================================
+
+class ClusterWideDataClient
+{
+public:
+
+	static void          install();
+	static void          remove();
+
+	// operations
+	static unsigned long getClusterWideData(std::string const & managerName, std::string const & elementNameRegex, bool lockElements, NetworkId const & callbackObjectId);
+	static void          releaseClusterWideDataLock(std::string const & managerName, unsigned long lockKey);
+	static void          removeClusterWideData(std::string const & managerName, std::string const & elementNameRegex, unsigned long lockKey);
+	static void          updateClusterWideData(std::string const & managerName, std::string const & elementNameRegex, ValueDictionary const & dictionary, unsigned long lockKey);
+	static void          replaceClusterWideData(std::string const & managerName, std::string const & elementNameRegex, ValueDictionary const & dictionary, bool autoRemove, unsigned long lockKey);
+
+	// message handling
+	static void          registerMessage(MessageDispatch::Receiver & messageReceiver);
+	static bool          handleMessage(MessageDispatch::Emitter const &, MessageDispatch::MessageBase const & message);
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/CombatTracker.cpp b/engine/server/library/serverGame/src/shared/core/CombatTracker.cpp
new file mode 100644
index 00000000..3c0882b9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/CombatTracker.cpp
@@ -0,0 +1,198 @@
+// ======================================================================
+//
+// CombatTracker.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CombatTracker.h"
+
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/TangibleObject.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedObject/CellProperty.h"
+
+// ======================================================================
+static std::set<TangibleObject*> *s_defenders;
+
+// ======================================================================
+
+void CombatTracker::install()
+{
+	FATAL(s_defenders, ("CombatTracker::install - already installed"));
+	s_defenders = new std::set<TangibleObject*>;
+}
+
+// ----------------------------------------------------------------------
+
+void CombatTracker::remove()
+{
+	FATAL(!s_defenders, ("CombatTracker::remove - not installed"));
+	delete s_defenders;
+	s_defenders = 0;
+}
+
+// ----------------------------------------------------------------------
+
+void CombatTracker::getInterestedViewers(TangibleObject const *defender, std::vector<ServerObject *> &combatViewers)
+{
+	std::vector<ServerObject *> unfilteredViewers;
+	AICreatureController const * const defenderAiCreatureController = AICreatureController::asAiCreatureController(defender->getController());
+	bool const defenderIsInWorldCell = defender->isInWorldCell();
+
+	if (defenderAiCreatureController != NULL)
+	{
+		ServerWorld::findObjectsInRange(defender->getPosition_w(), defenderAiCreatureController->getAssistRadius(), unfilteredViewers);
+
+		for (std::vector<ServerObject *>::iterator i = unfilteredViewers.begin(); i != unfilteredViewers.end(); ++i)
+		{
+			bool interested = true;
+			ServerObject const * const serverObject = *i;
+
+			if (   (serverObject == NULL)
+				|| (serverObject == defender)
+				|| serverObject->isPlayerControlled()
+				|| !serverObject->wantSawAttackTriggers())
+			{
+				interested = false;
+			}
+			else
+			{
+				TangibleObject const * const tangibleObject = serverObject->asTangibleObject();
+
+				if (tangibleObject != NULL)
+				{
+					if (   tangibleObject->isInCombat()
+						|| tangibleObject->isDisabled()
+						|| tangibleObject->isInvulnerable())
+					{
+						interested = false;
+					}
+					else
+					{
+						CreatureObject const * const creatureObject = tangibleObject->asCreatureObject();
+
+						if (creatureObject != NULL)
+						{
+							if (   creatureObject->isIncapacitated()
+								|| creatureObject->isDead())
+							{
+								interested = false;
+							}
+							else
+							{	
+								AICreatureController const * const aiCreatureController = AICreatureController::asAiCreatureController(creatureObject->getController());
+
+								if (aiCreatureController != NULL)
+								{
+									if (aiCreatureController->isRetreating())
+									{
+										interested = false;
+									}
+									else if (!defenderIsInWorldCell && !creatureObject->isInWorldCell()
+										&& !CellProperty::areAdjacent(defender->getParentCell(), creatureObject->getParentCell()))
+									{
+										interested = false;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+
+			if (interested)
+			{
+				combatViewers.push_back(*i);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CombatTracker::update()
+{
+	std::set<TangibleObject*>::const_iterator iterDefenders = s_defenders->begin();
+
+	for (; iterDefenders != s_defenders->end(); ++iterDefenders)
+	{
+		// get defender and attackers
+
+		TangibleObject * const defender = *iterDefenders;
+		HateList::RecentList const & attackers = defender->getRecentHateList();
+
+		if (!attackers.empty())
+		{
+			// get attackers with proxies on this server
+
+			std::vector<NetworkId> localAttackers;
+			HateList::RecentList::const_iterator iterAttackers = attackers.begin();
+
+			for (; iterAttackers != attackers.end(); ++iterAttackers)
+			{
+				TangibleObject const * const attackerTangibleObject = TangibleObject::asTangibleObject(iterAttackers->getObject());
+
+				if (attackerTangibleObject != NULL)
+				{
+					localAttackers.push_back(attackerTangibleObject->getNetworkId());
+				}
+			}
+
+			if (!localAttackers.empty())
+			{
+				// get interested combat viewers
+
+				std::vector<ServerObject *> combatViewers;
+				getInterestedViewers(defender, combatViewers);
+
+				std::vector<ServerObject *>::const_iterator iterCombatViewers = combatViewers.begin();
+
+				for (; iterCombatViewers != combatViewers.end(); ++iterCombatViewers)
+				{
+					ServerObject * const combatViewer = *iterCombatViewers;
+					GameScriptObject * const gameScriptObject = GameScriptObject::asGameScriptObject(combatViewer);
+
+					if (gameScriptObject != NULL)
+					{
+						ScriptParams scriptParams;
+						scriptParams.addParam(defender->getNetworkId());
+						scriptParams.addParam(localAttackers);
+						IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_SAW_ATTACK, scriptParams));
+					}
+				}
+			}
+
+			defender->clearRecentHateList();
+		}
+	}
+
+	s_defenders->clear();
+}
+
+// ----------------------------------------------------------------------
+
+void CombatTracker::addDefender(TangibleObject *defender)
+{
+	if (s_defenders)
+	{
+		IGNORE_RETURN( s_defenders->insert(defender) );
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CombatTracker::removeDefender(TangibleObject *defender)
+{
+	if (s_defenders)
+	{
+		IGNORE_RETURN( s_defenders->erase(defender) );
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/CombatTracker.h b/engine/server/library/serverGame/src/shared/core/CombatTracker.h
new file mode 100644
index 00000000..d7907921
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/CombatTracker.h
@@ -0,0 +1,36 @@
+// ======================================================================
+//
+// CombatTracker.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef CombatTracker_H
+#define CombatTracker_H
+
+// ======================================================================
+
+class ServerObject;
+class TangibleObject;
+
+// ======================================================================
+
+class CombatTracker
+{
+public:
+	static void install();
+	static void remove();
+	static void update();
+
+	static void addDefender(TangibleObject *defender);
+	static void removeDefender(TangibleObject *defender);
+
+private:
+	static void getInterestedViewers(TangibleObject const *defender, stdvector<ServerObject *>::fwd &combatViewers);
+};
+
+// ======================================================================
+
+#endif // CombatTracker_H
+
diff --git a/engine/server/library/serverGame/src/shared/core/CommunityManager.cpp b/engine/server/library/serverGame/src/shared/core/CommunityManager.cpp
new file mode 100644
index 00000000..dc479216
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/CommunityManager.cpp
@@ -0,0 +1,334 @@
+// ============================================================================
+// 
+// CommunityManager.cpp
+// Copyright Sony Online Entertainment, Inc.
+//
+// ============================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CommunityManager.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/Chat.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/ProsePackageParticipant.h"
+#include "sharedNetworkMessages/ChatEnum.h"
+#include "sharedNetworkMessages/ChatOnChangeFriendStatus.h"
+#include "sharedNetworkMessages/ChatOnGetFriendsList.h"
+#include "sharedNetworkMessages/ChatOnChangeIgnoreStatus.h"
+#include "sharedNetworkMessages/ChatOnGetIgnoreList.h"
+#include "sharedObject/NetworkIdManager.h"
+
+// ============================================================================
+//
+// CommunityManagerNameSpace
+//
+// ============================================================================
+
+namespace CommunityManagerNameSpace
+{
+	PlayerObject *getPlayerObject(NetworkId const &networkId);
+	ServerObject *getServerObject(NetworkId const &networkId);
+
+	void sendProseChatMessage(NetworkId const &networkId, StringId const &stringId, std::string const &name);
+}
+
+using namespace CommunityManagerNameSpace;
+
+//-----------------------------------------------------------------------------
+PlayerObject *CommunityManagerNameSpace::getPlayerObject(NetworkId const &networkId)
+{
+	PlayerObject *result = NULL;
+	Object *object = NetworkIdManager::getObjectById(networkId);
+	
+	if (object != NULL)
+	{
+		CreatureObject *creatureObject = dynamic_cast<CreatureObject *>(object);
+		
+		if (creatureObject != NULL)
+		{
+			result = PlayerCreatureController::getPlayerObject(creatureObject);
+		}
+	}
+
+	return result;
+}
+
+//-----------------------------------------------------------------------------
+ServerObject *CommunityManagerNameSpace::getServerObject(NetworkId const &networkId)
+{
+	ServerObject *result = NULL;
+	Object *object = NetworkIdManager::getObjectById(networkId);
+	
+	if (object != NULL)
+	{
+		result = dynamic_cast<ServerObject *>(object);
+	}
+
+	return result;
+}
+
+//-----------------------------------------------------------------------------
+void CommunityManagerNameSpace::sendProseChatMessage(NetworkId const &networkId, StringId const &stringId, std::string const &name)
+{
+	Object *object = NetworkIdManager::getObjectById(networkId);
+
+	if (object != NULL)
+	{
+		ServerObject *serverObject = dynamic_cast<ServerObject *>(object);
+		
+		if (serverObject != NULL)
+		{
+			ProsePackage prosePackage;
+			prosePackage.stringId = stringId;
+
+			ProsePackageParticipant target;
+			target.str = Unicode::narrowToWide(name);
+
+			prosePackage.target = target;
+
+			Chat::sendSystemMessage(*serverObject, prosePackage);
+		}
+	}
+}
+
+// ============================================================================
+//
+// CommunityManager
+//
+// ============================================================================
+
+//-----------------------------------------------------------------------------
+void CommunityManager::handleMessage(ChatOnChangeFriendStatus const &message)
+{
+	unsigned int resultCode = message.getResultCode();
+
+	switch (resultCode)
+	{
+		case CHATRESULT_SUCCESS:
+			{
+				//DEBUG_REPORT_LOG(true, ("CommunityManager::handleMessage() <ChatOnChangeFriendStatus, CHATRESULT_SUCCESS> networkId: %s friend: %s\n", message.getCharacter().getValueString().c_str(), message.getFriendName().getFullName().c_str()));
+
+				// Make sure the player still exists on the server
+	
+				PlayerObject *playerObject = getPlayerObject(message.getCharacter());
+	
+				if (playerObject != NULL)
+				{
+					if (message.getAdd())
+					{
+						// Friend was added
+	
+						//DEBUG_REPORT_LOG(true, ("  CommunityManager::handleMessage() <FRIEND_ADDED>\n"));
+
+						sendProseChatMessage(message.getCharacter(), StringId("cmnty", "friend_added"), message.getFriendName().getNameWithNecessaryPrefix(Chat::getGameCode(), GameServer::getInstance().getClusterName()));
+					}
+					else
+					{
+						// Friend was removed
+	
+						//DEBUG_REPORT_LOG(true, ("  CommunityManager::handleMessage() <FRIEND_REMOVED>\n"));
+
+						sendProseChatMessage(message.getCharacter(), StringId("cmnty", "friend_removed"), message.getFriendName().getNameWithNecessaryPrefix(Chat::getGameCode(), GameServer::getInstance().getClusterName()));
+					}
+
+					playerObject->requestFriendList();
+				}
+			}
+			break;
+		case ERR_DESTAVATARDOESNTEXIST:
+			{
+				sendProseChatMessage(message.getCharacter(), StringId("cmnty", "friend_not_found"), message.getFriendName().getNameWithNecessaryPrefix(Chat::getGameCode(), GameServer::getInstance().getClusterName()));
+			}
+			break;
+		case ERR_DUPLICATEFRIEND:
+			{
+				sendProseChatMessage(message.getCharacter(), StringId("cmnty", "friend_duplicate"), message.getFriendName().getNameWithNecessaryPrefix(Chat::getGameCode(), GameServer::getInstance().getClusterName()));
+			}
+			break;
+		case ERR_FRIENDNOTFOUND:
+			{
+				sendProseChatMessage(message.getCharacter(), StringId("cmnty", "friend_not_found"), message.getFriendName().getNameWithNecessaryPrefix(Chat::getGameCode(), GameServer::getInstance().getClusterName()));
+			}
+			break;
+		default:
+			{
+				DEBUG_REPORT_LOG(true, ("CommunityManager::handleMessage() <ChatOnChangeFriendStatus, ERROR NOT HANDLED> networkId: %s result code: %d\n", message.getCharacter().getValueString().c_str(), resultCode));
+			}
+			break;
+	}
+}
+
+//-----------------------------------------------------------------------------
+void CommunityManager::handleMessage(ChatOnGetFriendsList const &message)
+{
+	//DEBUG_REPORT_LOG(true, ("CommunityManager::handleMessage() - <ChatOnGetFriendsList> networkId: %s friend count: %d\n", message.getCharacter().getValueString().c_str(), message.getFriends().size()));
+
+	PlayerObject *playerObject = getPlayerObject(message.getCharacter());
+
+	if (playerObject != NULL)
+	{
+		typedef std::vector<std::string> StringVector;
+		StringVector friendList;
+		friendList.reserve(message.getFriends().size());
+
+		std::vector<ChatAvatarId>::const_iterator iterFriends = message.getFriends().begin();
+
+#ifdef _DEBUG
+		int count = 1;
+#endif // _DEBUG
+
+		std::string const & thisGameCode = Chat::getGameCode();
+		std::string const & thisClusterName = GameServer::getInstance().getClusterName();
+		for (; iterFriends != message.getFriends().end(); ++iterFriends)
+		{
+			if (!iterFriends->name.empty())
+			{
+				if (_stricmp(iterFriends->gameCode.c_str(), thisGameCode.c_str()))
+				{
+					// friend is from a different game, so store both the game and cluster name
+					friendList.push_back(iterFriends->gameCode + std::string(".") + iterFriends->cluster + std::string(".") + iterFriends->name);
+				}
+				else if (_stricmp(iterFriends->cluster.c_str(), thisClusterName.c_str()))
+				{
+					// friend is from a different cluster, so store cluster name
+					friendList.push_back(iterFriends->cluster + std::string(".") + iterFriends->name);
+				}
+				else
+				{
+					// friend is from the same cluster, so don't need to store game name
+					friendList.push_back(iterFriends->name);
+				}
+			}
+
+			//DEBUG_REPORT_LOG(true, ("  %2d CommunityManager::handleMessage() - <ChatOnGetFriendsList> networkId: %s friend: %s\n", count, message.getCharacter().getValueString().c_str(), iterFriends->getFullName().c_str()));
+
+#ifdef _DEBUG
+			++count;
+#endif // _DEBUG
+		}
+
+		playerObject->setFriendList(friendList);
+	}
+}
+
+//-----------------------------------------------------------------------------
+void CommunityManager::handleMessage(ChatOnChangeIgnoreStatus const &message)
+{
+	unsigned int resultCode = message.getResultCode();
+
+	switch (resultCode)
+	{
+		case CHATRESULT_SUCCESS:
+			{
+				//DEBUG_REPORT_LOG(true, ("CommunityManager::handleMessage() - <ChatOnChangeIgnoreStatus, CHATRESULT_SUCCESS> networkId: %s friend: %s\n", message.getCharacter().getValueString().c_str(), message.getIgnoreName().getFullName().c_str()));
+
+				// Make sure the player still exists on the server
+	
+				PlayerObject *playerObject = getPlayerObject(message.getCharacter());
+	
+				if (playerObject != NULL)
+				{
+					if (message.getIgnore())
+					{
+						// Ignore person was added
+	
+						//DEBUG_REPORT_LOG(true, ("  CommunityManager::handleMessage() <IGNORE_ADDED>\n"));
+
+						sendProseChatMessage(message.getCharacter(), StringId("cmnty", "ignore_added"), message.getIgnoreName().getNameWithNecessaryPrefix(Chat::getGameCode(), GameServer::getInstance().getClusterName()));
+					}
+					else
+					{
+						// Ignore person was removed
+	
+						//DEBUG_REPORT_LOG(true, ("  CommunityManager::handleMessage() <IGNORE_REMOVED>\n"));
+
+						sendProseChatMessage(message.getCharacter(), StringId("cmnty", "ignore_removed"), message.getIgnoreName().getNameWithNecessaryPrefix(Chat::getGameCode(), GameServer::getInstance().getClusterName()));
+					}
+
+					playerObject->requestIgnoreList();
+				}
+			}
+			break;
+		case ERR_DESTAVATARDOESNTEXIST:
+			{
+				sendProseChatMessage(message.getCharacter(), StringId("cmnty", "ignore_not_found"), message.getIgnoreName().getNameWithNecessaryPrefix(Chat::getGameCode(), GameServer::getInstance().getClusterName()));
+			}
+			break;
+		case ERR_DUPLICATEIGNORE:
+			{
+				sendProseChatMessage(message.getCharacter(), StringId("cmnty", "ignore_duplicate"), message.getIgnoreName().getNameWithNecessaryPrefix(Chat::getGameCode(), GameServer::getInstance().getClusterName()));
+			}
+			break;
+		case ERR_IGNORENOTFOUND:
+			{
+				sendProseChatMessage(message.getCharacter(), StringId("cmnty", "ignore_not_found"), message.getIgnoreName().getNameWithNecessaryPrefix(Chat::getGameCode(), GameServer::getInstance().getClusterName()));
+			}
+			break;
+		default:
+			{
+				DEBUG_REPORT_LOG(true, ("CommunityManager::handleMessage() - <ChatOnChangeIgnoreStatus, ERROR NOT HANDLED> networkId: %s result code: %d\n", message.getCharacter().getValueString().c_str(), resultCode));
+			}
+			break;
+	}
+}
+
+//-----------------------------------------------------------------------------
+void CommunityManager::handleMessage(ChatOnGetIgnoreList const &message)
+{
+	//DEBUG_REPORT_LOG(true, ("CommunityManager::handleMessage() - <ChatOnGetIgnoreList> networkId: %s ignore count: %d\n", message.getCharacter().getValueString().c_str(), message.getIgnoreList().size()));
+
+	PlayerObject *playerObject = getPlayerObject(message.getCharacter());
+
+	if (playerObject != NULL)
+	{
+		typedef std::vector<std::string> StringVector;
+		StringVector ignoreList;
+		ignoreList.reserve(message.getIgnoreList().size());
+
+		std::vector<ChatAvatarId>::const_iterator iterIgnoreList = message.getIgnoreList().begin();
+
+#ifdef _DEBUG
+		int count = 1;
+#endif // _DEBUG
+
+		std::string const & thisGameCode = Chat::getGameCode();
+		std::string const & thisClusterName = GameServer::getInstance().getClusterName();
+		for (; iterIgnoreList != message.getIgnoreList().end(); ++iterIgnoreList)
+		{
+			if (!iterIgnoreList->name.empty())
+			{
+				if (_stricmp(iterIgnoreList->gameCode.c_str(), thisGameCode.c_str()))
+				{
+					// ignore is from a different game, so store both the game and cluster name
+					ignoreList.push_back(iterIgnoreList->gameCode + std::string(".") + iterIgnoreList->cluster + std::string(".") + iterIgnoreList->name);
+				}
+				else if (_stricmp(iterIgnoreList->cluster.c_str(), thisClusterName.c_str()))
+				{
+					// ignore is from a different cluster, so store cluster name
+					ignoreList.push_back(iterIgnoreList->cluster + std::string(".") + iterIgnoreList->name);
+				}
+				else
+				{
+					// ignore is from the same cluster, so don't need to store game name
+					ignoreList.push_back(iterIgnoreList->name);
+				}
+			}
+
+			//DEBUG_REPORT_LOG(true, ("  %2d CommunityManager::handleMessage() - <ChatOnGetIgnoreList> networkId: %s friend: %s\n", ++count, message.getCharacter().getValueString().c_str(), iterIgnoreList->getFullName().c_str()));
+
+			//playerObject->addIgnore(iterIgnoreList->name);
+#ifdef _DEBUG
+			++count;
+#endif // _DEBUG
+		}
+
+		playerObject->setIgnoreList(ignoreList);
+	}
+}
+
+// ============================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/CommunityManager.h b/engine/server/library/serverGame/src/shared/core/CommunityManager.h
new file mode 100644
index 00000000..f5ffd3c0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/CommunityManager.h
@@ -0,0 +1,38 @@
+// ============================================================================
+// 
+// CommunityManager.h
+// Copyright Sony Online Entertainment, Inc.
+//
+// ============================================================================
+
+#ifndef INCLUDED_CommunityManager_H
+#define INCLUDED_CommunityManager_H
+
+class ChatOnChangeFriendStatus;
+class ChatOnGetFriendsList;
+class ChatOnChangeIgnoreStatus;
+class ChatOnGetIgnoreList;
+
+//-----------------------------------------------------------------------------
+class CommunityManager
+{
+public:
+
+	static void handleMessage(ChatOnChangeFriendStatus const &message);
+	static void handleMessage(ChatOnGetFriendsList const &message);
+	static void handleMessage(ChatOnChangeIgnoreStatus const &message);
+	static void handleMessage(ChatOnGetIgnoreList const &message);
+
+private:
+
+	// Disable
+
+	CommunityManager();
+	~CommunityManager();
+	CommunityManager(CommunityManager const &);
+	CommunityManager &operator =(CommunityManager const &);
+};
+
+// ============================================================================
+
+#endif // INCLUDED_CommunityManager_H
diff --git a/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp b/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp
new file mode 100644
index 00000000..e439d8ed
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp
@@ -0,0 +1,578 @@
+//
+// ConfigServerGame.cpp
+// asommers 9-11-2000
+//
+// copyright 2000, verant interactive
+//
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverUtility/ConfigServerUtility.h"
+#include "sharedFoundation/ConfigFile.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMath/Vector.h"
+
+//-------------------------------------------------------------------
+
+ConfigServerGame::Data* ConfigServerGame::data;
+Vector ConfigServerGame::startingPosition;
+std::map<std::string, std::string> ConfigServerGame::m_components;
+
+//-------------------------------------------------------------------
+
+static ConfigServerGame::Data staticData;
+
+//-------------------------------------------------------------------
+
+#define KEY_INT(a,b)    (data->a = ConfigFile::getKeyInt("GameServer", #a, b))
+#define KEY_BOOL(a,b)   (data->a = ConfigFile::getKeyBool("GameServer", #a, b))
+#define KEY_FLOAT(a,b)  (data->a = ConfigFile::getKeyFloat("GameServer", #a, b))
+#define KEY_STRING(a,b) (data->a = ConfigFile::getKeyString("GameServer", #a, b))
+#define KEY_NETWORKID(a,b) (data->a = NetworkId(std::string(ConfigFile::getKeyString("GameServer", #a, b))))
+
+//-------------------------------------------------------------------
+
+void ConfigServerGame::install(void)
+{
+	ConfigServerUtility::install();
+	data = &staticData;
+
+	KEY_BOOL    (allowDefaultTemplateParams, false);
+	KEY_BOOL    (skipTutorial, false);
+	KEY_STRING	(groundScene, 0);
+	KEY_STRING	(spaceScene, 0);
+	KEY_INT     (port, 0);
+	KEY_STRING  (sceneID, "default");
+	KEY_INT     (preloadNumber, 0);
+	KEY_FLOAT   (startX, 0.0f);
+	KEY_FLOAT   (startY, 0.0f);
+	KEY_FLOAT   (startZ, 0.0f);
+	startingPosition = Vector(data->startX,data->startY,data->startZ);
+	KEY_INT		(taskManagerPort, 60001);	
+	KEY_STRING	(centralServerAddress, "swo-dev1.station.sony.com");
+	KEY_INT		(centralServerPort, 44451);
+	KEY_STRING  (javaVMName, "");
+	KEY_STRING  (scriptPath, "../../data/sku.0/sys.server/compiled/game");
+#if defined(WIN32)
+	KEY_STRING  (javaLibPath, "jvm.dll");
+#elif defined(linux)
+	// either the simple library .so name or the full path to the jvm library
+	KEY_STRING  (javaLibPath, "libjvm.so");
+#else
+#error unsupported platform
+#endif
+	KEY_STRING  (javaDebugPort, "8000");
+	KEY_BOOL    (useRemoteDebugJava, false);
+	KEY_BOOL    (profileScripts, false);
+	KEY_BOOL    (crashOnScriptError, false);
+	KEY_BOOL    (compileScripts, true);
+	KEY_BOOL    (trapScriptCrashes, true);
+	KEY_INT     (scriptWatcherWarnTime, 5000);
+	KEY_INT     (scriptWatcherInterruptTime, 5000);
+	KEY_INT     (scriptStackErrorLimit, 35);
+	KEY_INT     (scriptStackErrorLevel, 0);
+	KEY_BOOL    (disableObjvarNullCheck, false);
+	KEY_INT     (maxGameServerToSendUniverseData, 1000000);
+	KEY_INT     (timeoutToAckUniverseDataReceived, 0);
+	KEY_BOOL    (disableCombat, false);
+	KEY_STRING  (combatConfigFile, "combat.cfg");
+	KEY_FLOAT   (combatDamageDelaySeconds,  0.0);
+	KEY_INT     (triggerVolumeSystem, 0);
+	KEY_INT     (defaultAutoExpireTargetDuration, 6);
+	KEY_FLOAT   (interiorTargetDurationFactor, 1.0);
+	KEY_INT     (minPoolValue,  -100);
+	KEY_INT     (minFaucetValue, 1);
+	KEY_INT     (minDrainValue,  1);
+	KEY_INT     (minEffectiveFaucetValue, 150);
+	KEY_FLOAT   (defaultHealthRegen, 40.0f);
+	KEY_FLOAT   (defaultActionRegen, 20.0f);
+	KEY_FLOAT   (defaultMindRegen, 10.0f);
+	KEY_FLOAT   (regenThreshold, 1.0f);
+	KEY_FLOAT   (minForcePowerRegenRate, 1.0f);
+	KEY_BOOL    (enableAttribModWarnings, true);
+	KEY_BOOL    (checkAttribLimits, false);
+	KEY_INT     (maxItemAttribBonus, 50);
+	KEY_INT     (maxTotalAttribBonus, 500);
+	KEY_BOOL    (enableNewJedi, false);
+	KEY_STRING  (jediManagerTemplate, "object/jedi_manager/jedi_manager.iff");
+	KEY_INT     (maxJediBounties, 5);
+	KEY_INT     (startForcePower, 10);
+	KEY_BOOL    (logJediConcludes, false);
+	KEY_BOOL    (forceJediConcludes, false);
+	KEY_INT     (jediUpdateLocationTimeSeconds, 60 * 5);
+	KEY_STRING  (planetObjectTemplate, "object/planet/planet.iff");
+	KEY_BOOL    (javaConsoleDebugMessages, false);
+	KEY_BOOL    (useVerboseJava, false);
+	KEY_BOOL    (logJavaGc, false);
+	KEY_INT     (javaLocalRefLimit, 16);
+	KEY_STRING  (reservedNameFile, "datatables/name/reserved.iff");
+	KEY_INT     (reservedObjectIds, 10000);
+	KEY_INT     (minObjectIds, data->reservedObjectIds/2); // default is 1/2 of whatever is specifed for reservedObjectIds, so that the user can specify reservedObjectIds but doesn't have to specify minObjectIds
+	KEY_STRING  (playerObjectTemplate, "object/player/player.iff");
+	KEY_INT     (clientOutOfRangeObjectCacheTimeMs, 20000);
+	KEY_INT     (playerInterestRange, 300);
+	KEY_INT     (pvpUpdateTimeMs, 10000);
+	KEY_INT     (pvpTempFlagExpireTimeMs, 5*60*1000/2); // 2.5 minutes
+	KEY_INT     (pvpGuildWarCoolDownPeriodTimeMs, 1*60*1000); // 1 minute
+	KEY_INT     (pvpGuildWarExemptionExclusiveDelaySeconds, 5*60); // 5 minutes
+	KEY_INT     (pvpBattlefieldEnemyFlagExpireTimeMs, 5*60*1000/2); // 2.5 minutes
+	KEY_STRING  (pvpFactionOpponentsFilename, "datatables/pvp/faction_opponents.iff");
+	KEY_STRING  (pvpNonaggressiveFactionsFilename, "datatables/pvp/faction_nonaggressive.iff");
+	KEY_STRING  (pvpUnattackableFactionsFilename, "datatables/pvp/faction_unattackable.iff");
+	KEY_STRING  (pvpBountyTargetFactionsFilename, "datatables/pvp/faction_bountytarget.iff");
+	KEY_BOOL    (createAppearances,true);
+	KEY_STRING  (adminAccountDataTable, "datatables/admin/us_admin.iff");
+	KEY_BOOL    (adminGodToAll, false);
+	KEY_INT     (adminGodToAllGodLevel, 50);
+	KEY_BOOL    (useSecureLoginForGodAccess, false);
+	KEY_BOOL    (useIPForGodAccess, true);
+	KEY_BOOL    (adminPersistAllCreates, false);
+	KEY_BOOL    (buildCluster, false);
+	KEY_INT     (requestSceneWarpTimeoutSeconds, 60);
+	KEY_BOOL    (moveValidationEnabled, false);
+	KEY_FLOAT   (moveSpeedTolerance, 1.03f);
+	KEY_INT     (moveSpeedCheckFrequencyMs, 10000);
+	KEY_INT     (moveSpeedCheckFailureLeewaySeconds, 5);
+	KEY_INT     (moveSpeedCheckFailureLeewayCount, 5);
+	KEY_INT     (moveSlowdownFudgeTimeMs, 5000);
+	KEY_BOOL    (moveCheckDestinationCollision, true);
+	KEY_FLOAT   (moveMaxDistance, 50.0f);
+
+	// should be kept in sync with ConfigClientGame's disableMovementInventoryOverload
+	KEY_INT     (moveValidationMaxInventoryOverload, 121);
+
+	KEY_BOOL    (moveValidationCheckForPastTimestamp, true);
+	KEY_BOOL    (moveValidationCheckForFutureTimestamp, true);
+	KEY_BOOL    (moveValidationCheckForTimestampDrift, true);
+	KEY_INT     (moveValidationPastTimestampThresholdMs, 10000);
+	KEY_INT     (moveValidationFutureTimestampThresholdMs, 10000);
+	KEY_INT     (moveValidationTimestampDriftThresholdMs, 10000);
+	KEY_FLOAT   (moveMaxDistanceLeewayPerUpdate, 2.0f);
+	KEY_BOOL    (nameValidationAcceptAll, false);
+	KEY_FLOAT   (tangiblePvpRegionCheckTime, 20.0f);
+	KEY_FLOAT   (creaturePvpRegionCheckTime, 5.0f);
+	KEY_STRING  (defaultLightArmorTemplate, "abstract/armor_statistics/armor/crafted/crafted_light_armor.iff");
+	KEY_STRING  (defaultMediumArmorTemplate, "abstract/armor_statistics/armor/crafted/crafted_medium_armor.iff");
+	KEY_STRING  (defaultHeavyArmorTemplate, "abstract/armor_statistics/armor/crafted/crafted_heavy_armor.iff");
+	KEY_FLOAT   (armorDamageReduction, 80.0f);
+	KEY_BOOL    (stationPlayersEnabled, false);
+	KEY_BOOL    (stationPlayersShowAllDebugInfo, false);
+	KEY_BOOL    (commoditiesMarketEnabled, true);
+	KEY_INT     (commoditiesServerServiceBindPort, 4069);
+	KEY_STRING  (commoditiesServerServiceBindInterface, "localhost");
+	KEY_BOOL    (commoditiesShowAllDebugInfo, false);
+	KEY_INT     (commoditiesQueryTimeoutSec, 60);
+	KEY_INT     (commoditiesServerReconnectIntervalSec, 30);
+	KEY_INT     (unclaimedAuctionItemDestroyTimeSec, 30*24*60*60);
+	KEY_INT     (maxReimburseAmount, 0);
+	KEY_BOOL    (logBaselines, false);
+	KEY_STRING  (defaultVendorItemRestrictionFile, "datatables/commodity/vendor_item_restriction_default.iff");
+	KEY_STRING  (defaultVendorItemRestrictionRejectionMessage, "@ui_auc:reject_restricted_item");
+	KEY_INT     (weatherUpdateSeconds, 15*60);
+	KEY_STRING  (instrumentDataTableFilename, "datatables/tangible/instrument_datatable.iff");
+	KEY_STRING  (performanceDataTableFilename, "datatables/performance/performance.iff");
+	KEY_INT     (createQueueScheduleTime, 75);
+	KEY_BOOL    (disableResources, false);
+	KEY_INT     (xpMultiplier, 1);
+	KEY_STRING  (xpManagerTemplate, "object/xp_manager/xp_manager.iff");
+	KEY_FLOAT   (gcwXpBonus, 15.0f);
+	KEY_BOOL    (reportAiStateChanges, false);
+	KEY_BOOL    (reportAiWarnings, false);
+	KEY_BOOL    (sendBreadcrumbs, false);
+	KEY_BOOL    (movementWhileRetreatingThrowsException, false);
+	KEY_BOOL    (hibernateEnabled, true);
+	KEY_BOOL    (hibernateProxies, true);
+	KEY_FLOAT   (hibernateDistance, 128.0f);
+	KEY_FLOAT   (minHibernateAlter, 4.0f);
+	KEY_FLOAT   (maxHibernateAlter, 6.0f);
+	KEY_INT     (aiPulseQueuePerFrame, 100);
+	KEY_INT     (aiPulseQueueMaxWaitTimeMs, 1000);
+	KEY_FLOAT   (aiBaseAggroRadius, 24.0f);
+	KEY_FLOAT   (aiMaxAggroRadius, 96.0f);
+	KEY_FLOAT   (aiLeashRadius, 256.0f);
+	KEY_FLOAT   (aiAssistRadius, 12.0f);
+	KEY_INT     (minimumResourcePoolDrainRate, 0);
+	KEY_INT     (secondsPerResourceTick, 60);
+	KEY_INT     (resourceTimeScale, 60 * 60 * 24);
+	KEY_BOOL    (disableCreateQueue, false);
+	KEY_STRING  (craftingComponentTableFile0, "datatables/crafting/component.iff");
+	KEY_STRING  (craftingComponentTableFile1, "datatables/crafting/muzzle.iff");
+	KEY_STRING  (craftingComponentTableFile2, "datatables/crafting/scope.iff");
+	KEY_STRING  (craftingComponentTableFile3, "datatables/crafting/stock.iff");
+	m_components[std::string("component")] = data->craftingComponentTableFile0;
+	m_components[std::string("muzzle")] = data->craftingComponentTableFile1;
+	m_components[std::string("scope")] = data->craftingComponentTableFile2;
+	m_components[std::string("stock")] = data->craftingComponentTableFile3;
+	KEY_BOOL    (craftingComponentStrict, true);
+	KEY_INT     (craftingXpChance, 50);
+	KEY_STRING  (craftingXpPercentTable, "datatables/crafting/partial_xp_percent.iff");
+	KEY_INT     (maxObjectSkillModBonus, 25);
+	KEY_INT     (maxSocketSkillModBonus, 25);
+	KEY_INT     (maxSkillModSockets, 1);
+	KEY_FLOAT   (baseDecayRate, 3600.0f);
+	KEY_FLOAT   (weaponDecayThreshold, 25.0f);
+	KEY_STRING  (regionFilesName, "datatables/region/planets.iff");
+	KEY_INT     (regionTreeDepth, 2);
+	KEY_STRING  (battlefieldMarkerName, "datatables/battlefield/marker.iff");
+	KEY_FLOAT   (maxTeleportDistanceWithoutSceneWarp, 200.0f);
+	KEY_FLOAT   (maxInstrumentPlayDistance, 3.0f);
+	KEY_STRING  (characterNameGeneratorDirectory,"name");
+	//KEY_FLOAT   (statMigrationTimer, 60.0f * 10.0f); //value in seconds (currently defaults to 10 minutes)
+	KEY_INT     (maxLotsPerAccount, 165);
+	KEY_INT     (unsafeLogoutTimeMs, 3*60*1000);
+	KEY_INT     (idleLogoutTimeSec, 30*60);
+	KEY_INT     (idleLogoutTimeAfterCharacterTransferSec, 1*60);
+	KEY_STRING  (fallbackDefaultWeapon, "object/weapon/melee/unarmed/unarmed_default.iff");
+	KEY_BOOL    (logObservers, false);
+	KEY_INT     (lastKnownLocationsResetTimeSec, 60 * 60); // 1 hour
+	KEY_INT     (maxMessageTosPerObjectPerFrame, 0); // unlimited
+	KEY_INT     (maxMessageToTimePerObjectPerFrame, 0); // unlimited
+	KEY_INT     (maxMessageToBounces, 100); // should be large enough to cover the worse case legitimate scenario of having to bounce through every game server
+	KEY_INT     (missionRequestsPerFrame, 2);
+	KEY_BOOL    (disableMissions, false);
+	KEY_INT     (loopProfileLogThresholdMs, 3000);
+	KEY_INT     (groundLoopProfileLogThresholdMs, 3000);
+	KEY_INT     (spaceLoopProfileLogThresholdMs, 3000);
+	KEY_BOOL    (pvpDisableCombat, false);
+	KEY_BOOL    (logObjectLoading, false);
+	KEY_BOOL    (enforcePlayerTriggerVolumesOnly, true);
+	KEY_FLOAT   (locationTargetCheckIntervalSec, 5.0f);
+	KEY_STRING  (gameServiceBindInterface, "");
+	KEY_BOOL    (logPvpUpdates, false);
+	KEY_FLOAT   (npcConversationDistance, 6.0f);
+	KEY_INT     (serverSpawnLimit, 800);
+	KEY_INT     (spawnQueueSize, 1);
+	KEY_INT     (framesPerSpawn, 0);
+	KEY_BOOL    (enableSpawningNearLoadBeacons, true);
+	KEY_BOOL    (disableTravel, false);
+	KEY_BOOL    (sendPlayerTransform, false);
+	KEY_FLOAT   (watchedHarvesterAlterTime, 5.0f);
+    KEY_FLOAT   (unwatchedHarvesterAlterTime, 900.0f);
+	KEY_FLOAT	(harvesterExtractionRateMultiplier, 1.0f);
+	KEY_INT     (nonCriticalTasksPerFrame, 5);
+	KEY_INT     (maxMoney,         1000000000); // 1 billion (must be small enough to keep money within an int)
+	KEY_INT     (maxGalacticReserveDepositBillion, 3); // 3 billion
+	KEY_INT     (maxMoneyTransfer,  100000000); // 100 million
+	KEY_INT     (maxFreeTrialMoney, 50000); //50k credits limited to demo customers
+	KEY_BOOL    (enablePreload, false);
+	KEY_BOOL    (buildPreloadLists, false);
+	KEY_BOOL    (logAuthTransfer, false);
+
+	KEY_INT     (overrideUpdateRadius, 0);
+	KEY_FLOAT   (buildingUpdateRadiusMultiplier, 1.0f);
+	KEY_INT     (maxPopulationForNewbieTravel, 90);
+	KEY_BOOL    (debugAllAreasOverpopulated, false);
+	KEY_INT     (minNewbieTravelLocations, 5);
+	KEY_INT     (numberOfMoveObjectLists, 0);
+	KEY_INT     (sitOnObjectReportThreshold, 1000);
+	KEY_BOOL    (fatalOnSitThreshold, false);
+	KEY_INT     (databasePositionUpdateLongDelayIntervalMs, 3*60*1000);
+	KEY_INT     (databasePositionUpdateShortDelayIntervalMs, 1*1000);
+	KEY_BOOL    (logPositionUpdates, false);
+
+	KEY_BOOL    (checkOriginCreates, true);
+	KEY_BOOL    (enableWho, false);
+	KEY_BOOL    (debugGroupChat, false);
+
+	KEY_INT     (numberOfMissionsWantedInMissionBag, 10);	// MUST be 10 (at the moment)
+	KEY_INT     (missionCreationQueueSize, 4);
+	KEY_INT     (connectToAllGameServersTimeout, 120);
+	KEY_INT     (houseItemLimitMultiplier, 100);
+	KEY_INT     (maxHouseItemLimit, 500);
+	KEY_BOOL    (demandLoadHouseContents, true);
+	KEY_INT     (unloadHouseContentsTime, 10 * 60);
+	KEY_INT     (loadHouseContentsDelaySeconds, 0);
+	KEY_BOOL    (boundarySpawningAllowed, true);
+	KEY_BOOL    (debugMovement, false);
+	KEY_BOOL    (spawnAllResources, false);
+	KEY_BOOL    (skipUnreliableTransformsForOtherCells, false);
+	KEY_INT     (maxPlayerSanityCheckFailures, 3);
+	KEY_BOOL    (disablePlayerSanityChecker, false);
+	KEY_BOOL    (deactivateHarvesterIfDamaged, true);
+	KEY_FLOAT   (updateRange7Packets,  40.0f);
+	KEY_FLOAT   (updateRange6Packets,  80.0f);
+	KEY_FLOAT   (updateRange5Packets,  90.0f);
+	KEY_FLOAT   (updateRange4Packets, 100.0f);
+	KEY_FLOAT   (updateRange3Packets, 110.0f);
+	KEY_FLOAT   (updateRange2Packets, 120.0f);
+	KEY_FLOAT   (updateRange1Packets, 130.0f);
+	KEY_STRING  (instantDeleteListDataTableName, "datatables/database/instant_delete_list.iff");
+	KEY_BOOL    (sendFrameProfilerInfo, false);
+	KEY_BOOL    (logAllCommands, true);
+	KEY_BOOL    (enableDebugControllerMessageSpam ,false);
+	KEY_BOOL    (debugPvp, false);
+	KEY_BOOL    (allowMasterObjectCreation, true);
+	KEY_BOOL    (mountsEnabled, true);
+	KEY_BOOL    (mountsSanityCheckerEnabled, false);
+	KEY_BOOL    (mountsSanityCheckerBroadcastEnabled, false);
+	KEY_INT     (mountsSanityCheckerBroadcastLimit, 5);
+	KEY_INT     (universeCheckFrequencySeconds, 60 * 60);
+	KEY_BOOL    (moveSimEnabled, false);
+	KEY_BOOL    (exceptionOnObjVarZeroLengthArray, false);
+	KEY_BOOL    (trackNonAuthoritativeObjvarSets, false);
+	KEY_FLOAT   (triggerVolumeWarpDistance, 128.0f);
+	KEY_NETWORKID(maxGoldNetworkId, "0");
+	KEY_BOOL    (fatalOnMovingGoldObject, false);
+	KEY_INT     (spatialChatLogMinutes, 5);
+	KEY_FLOAT   (behaviorMaxAvoidanceStuckTime, 10.0f);
+	KEY_INT     (behaviorMaxAvoidancePersistenceFrameCount, 4);
+	KEY_BOOL    (shipsEnabled, true);
+	KEY_BOOL    (logoutTriggerEnabled, true);
+	KEY_BOOL    (loginAsBountyHunter, false);
+	KEY_INT     (veteranRewardTradeInWaitPeriodSeconds, 30 * 24 * 60 * 60); // 30 days
+	KEY_BOOL    (enableVeteranRewards, false);
+	KEY_BOOL    (enableOneYearAnniversary, false);
+	KEY_INT     (minEntitledTime, -1);
+	KEY_BOOL    (veteranDebugTriggerAll, false);
+	KEY_BOOL    (veteranDebugEnableOverrideAccountAge, false);
+	KEY_BOOL    (enableNewVeteranRewards, false);
+	KEY_FLOAT   (buddyPointTimeBonus, 30.0f/4.0f); // 4 buddy points = 30 days
+
+#ifdef _DEBUG
+	KEY_FLOAT   (manufactureTimeOverride, 0.0f);
+#endif
+
+	KEY_INT     (theaterCreationLimitMilliseconds, 25);
+	KEY_BOOL    (fatalOnGoldPobChange, true);
+	KEY_INT     (lineOfSightCacheDurationMs, 1500);
+	KEY_FLOAT   (lineOfSightCacheMinHeight, 0.8f);
+	KEY_FLOAT   (lineOfSightLocationRoundValue, 5.0f);
+
+#ifdef _DEBUG
+	// in debug mode, we default this to true so that unless
+	// a controller message is explicitly marked as being allowed
+	// from the client, it will be dropped when the game server
+	// receives it; this will have the effect of forcing the
+	// programmer to make a conscious decision to mark the
+	// controller message as allowable from the client; because
+	// controller message coming from the client is not secured,
+	// the mechanism to prevent a hacked client from sending the
+	// game server any controller message is to explicity "mark"
+	// those controller messages that are allowed from the client
+	KEY_BOOL    (enableClientControllerMessageCheck, true);
+#else
+	// for live, the this option will be set to true in the config file
+	KEY_BOOL    (enableClientControllerMessageCheck, false);
+#endif
+
+	KEY_INT     (maxWaypointsPerCharacter,100); // Keep this in sync with the maxWaypoints value in ConfigClientGame.cpp
+	KEY_FLOAT   (maxSmallCreatureHeight, 0.7f);
+	KEY_FLOAT   (smallCreatureUpdateRadius, 64.0f);
+	KEY_FLOAT   (maxMediumCreatureHeight, 3.0f);
+	KEY_FLOAT   (mediumCreatureUpdateRadius, 128.0f);
+	KEY_FLOAT   (largeCreatureUpdateRadius, 256.0f);
+	KEY_INT     (coolDownPersistThresholdSeconds, 1 * 60);
+	KEY_BOOL    (checkNotifyRegions, true);
+	KEY_BOOL    (allowRegionTriggerOverride, true);
+	KEY_INT     (spacePlanetServerUpdatesPerFrame, 0);
+	KEY_FLOAT   (hyperspaceRandomOffsetRange, 200);
+	
+	if (data->theaterCreationLimitMilliseconds <= 0)
+	{
+		data->theaterCreationLimitMilliseconds = 25;
+		WARNING(true, ("Config value [GameServer] theaterCreationLimitMilliseconds "
+			"out of range, setting to default value"));
+	}
+
+	KEY_BOOL    (sendAsteroidExtents, false);
+	KEY_BOOL    (createZoneObjects, false);
+	KEY_INT     (shipUpdatesPerSecond, 32);
+	KEY_BOOL    (debugSpaceVisibilityManager, false);
+	KEY_INT     (groundFrameRateLimit, 5);
+	KEY_INT     (spaceFrameRateLimit, 12);
+	KEY_BOOL    (aiLoggingEnabled, false);
+	KEY_BOOL    (shipShotValidationEnabled, false);
+	KEY_INT     (spaceAiEnemySearchesPerFrame, 15);
+	KEY_BOOL    (groundShouldSleep, true);
+	KEY_BOOL    (spaceShouldSleep, true);
+	KEY_BOOL    (shipMoveValidationEnabled, false);
+	KEY_INT     (shipMoveCheckIntervalMs, 1000);
+	KEY_INT     (shipMoveCheckFudgeTimeMs, 5000);
+	KEY_FLOAT   (shipMoveCheckTolerance, 1.03f);
+	KEY_FLOAT   (shipMoveCheckTimeToleranceSeconds, 0.1f);
+	KEY_INT     (spaceAiAvoidanceChecksPerFrame, 64);
+	KEY_BOOL    (spaceAiUsePathRefinement, true);
+	KEY_BOOL    (aiClientDebugEnabled, false);
+	KEY_BOOL    (shipClientUpdateDebugEnabled, false);
+	KEY_FLOAT   (shipLoadInvulnerableTimeWithoutClient, 120.f);
+	KEY_FLOAT   (shipLoadInvulnerableTimeWithClient, 10.f);
+	KEY_FLOAT   (creatureLoadInvulnerableTimeWithoutClient, 120.f);
+	KEY_FLOAT   (creatureLoadInvulnerableTimeWithClient, 1.f);
+	KEY_BOOL    (buildoutAreaEditingEnabled, false);
+	KEY_BOOL    (debugFloorPathNodeCount, false); // this flag checks cells to make sure the floor part count equals the path graph node count
+	KEY_INT     (populationReportTimeSeconds, 600);
+	KEY_FLOAT(maxCombatRange, 96.0f);
+	KEY_BOOL    (blockBuildRegionPlacement,false);
+
+	KEY_INT     (npeMinInstancePopulation,20);
+	KEY_INT     (npeMaxInstancePopulation,50);
+	KEY_BOOL    (stripNonFreeAssetsFromPlayersInTutorial, false);
+
+	// weekly time (in GMT) when GCW rating recalculation occurs
+	KEY_INT     (gcwRecalcTimeDayOfWeek, 4); // Sunday=0, Monday=1, Tuesday=2, Wednesday=3, Thursday=4, Friday=5, Saturday=6
+	KEY_INT     (gcwRecalcTimeHour, 19);     // 0 - 23
+	KEY_INT     (gcwRecalcTimeMinute, 0);    // 0 - 59
+	KEY_INT     (gcwRecalcTimeSecond, 0);    // 0 - 59
+
+	// weekly time (in GMT) when GCW score decay occurs;
+	// additional time(s) can be specified in the config file if
+	// you want the GCW score decay to occur more than once a week;
+	// the following time is ignored if any time(s) is specified
+	// in the config file; if no time(s) is specified in the
+	// config file, it will use the following time as the default
+	KEY_INT     (gcwScoreDecayTimeDayOfWeek, 1); // Sunday=0, Monday=1, Tuesday=2, Wednesday=3, Thursday=4, Friday=5, Saturday=6
+	KEY_INT     (gcwScoreDecayTimeHour, 19);     // 0 - 23
+	KEY_INT     (gcwScoreDecayTimeMinute, 0);    // 0 - 59
+	KEY_INT     (gcwScoreDecayTimeSecond, 0);    // 0 - 59
+
+	KEY_INT     (chatStatisticsReportIntervalSeconds, 60);
+	KEY_INT     (chatSpamLimiterNumCharacters, 400);
+	KEY_INT     (chatSpamLimiterIntervalMinutes, 15);
+	KEY_BOOL    (chatSpamLimiterEnabledForFreeTrial, true);
+	KEY_INT     (chatSpamNotifyPlayerWhenLimitedIntervalSeconds, 30); // <= 0 to disable
+
+	KEY_INT     (pendingLoadRequestLimit, 1000000000); // unlimited
+
+	KEY_BOOL    (enableCityCitizenshipFixup, true);
+
+	KEY_INT     (cityCitizenshipInactivePackupStartTimeEpoch, 1243839660); // June 1st 2009 12:01AM PDT
+	KEY_INT     (cityCitizenshipInactivePackupInactiveTimeSeconds, 90 * 24 * 60 * 60); // 90 days
+
+	KEY_STRING  (retroactivePlayerCityCreationTimeFilename, "");
+
+	KEY_INT     (wardenSquelchDurationSeconds, 6 * 60 * 60); // 6 hours
+	KEY_BOOL    (enableWarden, true);
+	KEY_BOOL    (enableWardenCanSquelchSecuredLogin, false);
+	KEY_BOOL    (enableWardenToDeputizeWarden, true);
+
+	KEY_BOOL    (disableCollectionServerFirstGrantForSecuredLogin, false);
+
+	KEY_INT     (locateStructureCommandIntervalSeconds, 24 * 60 * 60); // 24 hours
+
+	KEY_INT     (locateVendorCommandIntervalSeconds, 15 * 60); // 15 minutes
+
+	KEY_INT     (ctsDefaultScriptDictionarySizeBytes, 10 * 1024 * 1024); // 10M
+	KEY_STRING  (retroactiveCtsHistoryFilename, "");
+	KEY_BOOL    (allowIgnoreFreeCtsTimeRestriction, false);
+
+	KEY_INT     (groupPickupPointApprovalRangeSquared, 20 * 20);
+	KEY_INT     (groupPickupPointTimeLimitSeconds, 2 * 60);
+	KEY_INT     (groupPickupTravelPlayerCityPercent, 10);
+
+	KEY_BOOL    (groupInviteInviterCombatRestriction, false);
+	KEY_BOOL    (groupInviteInviteeCombatRestriction, false);
+	KEY_BOOL    (groupJoinInviterCombatRestriction, false);
+	KEY_BOOL    (groupJoinInviteeCombatRestriction, false);
+
+	KEY_INT     (characterMatchMaxMatchCount, 32);
+
+	KEY_BOOL    (enableOccupyUnlockedSlotCommand, true);
+	KEY_BOOL    (enableVacateUnlockedSlotCommand, true);
+	KEY_BOOL    (enableSwapUnlockedSlotCommand, true);
+	KEY_INT     (occupyVacateUnlockedSlotCommandCooldownSeconds, 24 * 60 * 60); // 24 hours
+
+	KEY_INT     (accountFeatureIdForMonthlyBoosterPack, 5032);
+	KEY_INT     (accountFeatureIdForTcgBetaAnnouncement, 5552);
+
+	KEY_BOOL    (logEventObjectCreation, false);
+	KEY_BOOL    (logEventObjectDestruction, false);
+	KEY_STRING  (housePackupAccountListDataTableName, "datatables/house_packup/house_packup_accounts.iff");
+
+	KEY_INT     (pickDropAllRoomItemsNumberOfItemsPerRound, 5);
+
+	KEY_BOOL    (enableCovertImperialMercenary, false);
+	KEY_BOOL    (enableOvertImperialMercenary, false);
+	KEY_BOOL    (enableCovertRebelMercenary, false);
+	KEY_BOOL    (enableOvertRebelMercenary, false);
+	KEY_INT     (broadcastGcwScoreToOtherGalaxiesIntervalSeconds, 15 * 60); // 15 minutes
+	KEY_BOOL    (broadcastGcwScoreToOtherGalaxies, false);
+	KEY_BOOL    (receiveGcwScoreFromOtherGalaxies, false);
+	KEY_INT     (trackGcwPercentileHistoryCount, 10);
+	KEY_BOOL    (gcwFactionalPresenceDisableForSecuredLogin, false);
+
+	KEY_INT     (gcwFactionalPresenceMountedPct, 20); // 0 to disable FP while on a vehicle/mount, 100 for no FP penalty while on a vehicle/mount
+	// clamp to 0 - 100
+	data->gcwFactionalPresenceMountedPct = std::min(std::max(data->gcwFactionalPresenceMountedPct, 0), 100);
+
+	KEY_INT     (gcwFactionalPresenceLevelPct, 10);
+	KEY_INT     (gcwFactionalPresenceGcwRankBonusPct, 10);
+	KEY_INT     (gcwFactionalPresenceAlignedCityBonusPct, 100);
+	KEY_INT     (gcwFactionalPresenceAlignedCityRankBonusPct, 10);
+	KEY_INT     (gcwFactionalPresenceAlignedCityAgeBonusPct, 5);
+	KEY_INT     (gcwGuildMinMembersForGcwRegionDefender, 10);
+	KEY_INT     (gcwRegionDefenderTotalBonusPct, 20);
+	KEY_INT     (gcwDaysRequiredForGcwRegionDefenderBonus, 3);
+
+	KEY_FLOAT   (regionFlagUpdateTime, 0.5f);
+
+	if (data->baseDecayRate <= 1.0f)
+		data->baseDecayRate = 1.0f;
+
+	if (data->weaponDecayThreshold < 0.0f)
+		data->weaponDecayThreshold = 0.0f;
+	else if (data->weaponDecayThreshold > 100.0f)
+		data->weaponDecayThreshold = 100.0f;
+	data->weaponDecayThreshold /= 100.0f;
+	
+	if (data->armorDamageReduction < 0.0f)
+		data->armorDamageReduction = 0.0f;
+	else if (data->armorDamageReduction > 100.0f)
+		data->armorDamageReduction = 100.0f;
+	data->armorDamageReduction = 1.0f - data->armorDamageReduction / 100.0f;
+
+	if (data->gcwXpBonus < 0.0f)
+		data->gcwXpBonus = 0.0f;
+	data->gcwXpBonus /= 100.0f;
+
+	// GCW score decay time(s)
+	data->gcwScoreDecayTime.clear();
+	int index = 0;
+	char const * dayOfWeek = NULL;
+	char const * hour = NULL;
+	char const * minute = NULL;
+	char const * second = NULL;
+	do
+	{
+		dayOfWeek = ConfigFile::getKeyString("GameServer", "gcwScoreDecayTimeDayOfWeek", index, 0);
+		hour = ConfigFile::getKeyString("GameServer", "gcwScoreDecayTimeHour", index, 0);
+		minute = ConfigFile::getKeyString("GameServer", "gcwScoreDecayTimeMinute", index, 0);
+		second = ConfigFile::getKeyString("GameServer", "gcwScoreDecayTimeSecond", index, 0);
+
+		if (dayOfWeek && hour && minute && second)
+		{
+			data->gcwScoreDecayTime.push_back(std::make_pair(std::make_pair(ConfigFile::getKeyInt("GameServer", "gcwScoreDecayTimeDayOfWeek", index, 0), ConfigFile::getKeyInt("GameServer", "gcwScoreDecayTimeHour", index, 0)), std::make_pair(ConfigFile::getKeyInt("GameServer", "gcwScoreDecayTimeMinute", index, 0), ConfigFile::getKeyInt("GameServer", "gcwScoreDecayTimeSecond", index, 0))));
+		}
+
+		++index;
+	}
+	while (dayOfWeek && hour && minute && second);
+
+	if (data->gcwScoreDecayTime.empty())
+	{
+		data->gcwScoreDecayTime.push_back(std::make_pair(std::make_pair(data->gcwScoreDecayTimeDayOfWeek, data->gcwScoreDecayTimeHour), std::make_pair(data->gcwScoreDecayTimeMinute, data->gcwScoreDecayTimeSecond)));
+	}
+}
+
+//-------------------------------------------------------------------
+
+void ConfigServerGame::remove(void)
+{
+	ConfigServerUtility::remove();
+}
+
+//-------------------------------------------------------------------
+
+const std::string & ConfigServerGame::getCraftingComponentTableFile(
+	const std::string & name)
+{
+static const std::string NO_DATA;
+
+	std::map<std::string, std::string>::const_iterator iter;
+	iter = m_components.find(name);
+	if (iter != m_components.end())
+		return (*iter).second;
+	if (!m_components.empty())
+		return m_components["component"];
+	return NO_DATA;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/ConfigServerGame.h b/engine/server/library/serverGame/src/shared/core/ConfigServerGame.h
new file mode 100644
index 00000000..20465d94
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ConfigServerGame.h
@@ -0,0 +1,3702 @@
+//
+// ConfigServerGame.h
+//
+// copyright 2000, verant interactive
+//
+
+#ifndef ConfigServerGame_H
+#define ConfigServerGame_H
+
+#include "sharedFoundation/NetworkId.h"
+#include <vector>
+
+class Vector;
+
+
+//-------------------------------------------------------------------
+
+class ConfigServerGame
+{
+  public:
+
+	struct Data
+	{
+		bool            allowDefaultTemplateParams;
+
+		const char *    groundScene;
+		const char *    spaceScene;
+		
+		int             port;
+		const char *    sceneID;
+		int				preloadNumber;
+
+		int             taskManagerPort;
+
+		float           startX;
+		float           startY;
+		float           startZ;
+		bool            skipTutorial;
+
+		const char *    centralServerAddress;
+		int             centralServerPort;
+
+		bool            disableCombat;
+		const char *    combatConfigFile;
+
+		float		combatDamageDelaySeconds;
+		int		triggerVolumeSystem;	            // 0 = SphereTree, 1 = test sphere tree vs. grid, 2 = sphere grid
+
+		int		defaultAutoExpireTargetDuration;    // Seconds until creatures stop chasing targets
+		float		interiorTargetDurationFactor;       // Scalar conversion to get the interior factor (0.5 = half of world val )
+
+		// min values attributes are allowed to have
+		int             minPoolValue;
+		int             minFaucetValue;
+		int             minDrainValue;
+		int             minEffectiveFaucetValue;
+		float           defaultHealthRegen;      // default health regeneration rate (pts/sec)
+		float           defaultActionRegen;      // default action regeneration rate (pts/sec)
+		float           defaultMindRegen;        // default mind regeneration rate (pts/sec)
+		float           regenThreshold;          // time for regeneration to occur before we update the attribute
+		float           minForcePowerRegenRate;  // the lowest regeneration rate for force power
+		bool            enableAttribModWarnings; // flag to turn on warning spam if an attrib mod tries to permanently change a non-pool attribute
+		bool            checkAttribLimits;       // flag to enable checking if attribs or wounds are bad values
+		int             maxItemAttribBonus;      // max attrib bonus an item may have
+		int             maxTotalAttribBonus;     // max attrib bonus a player may have
+
+		// jedi data
+		bool            enableNewJedi;           // flag to start tracking if players can become Jedi
+		const char *    jediManagerTemplate;     // template used by the jedi manager
+		int             maxJediBounties;         // max bouties a Jedi may have on him
+		int             startForcePower;         // initial force power of a new Jedi
+		bool            logJediConcludes;        // flag to log the Jedi manager concludes
+		bool            forceJediConcludes;      // flag to force the Jedi manager to add itself to the conclude list
+		int             jediUpdateLocationTimeSeconds; // how long we wait before updating a Jedi's location in the Jedi manager
+
+		// script data
+		const char *    javaVMName;                 // the type of vm we are using
+		const char *    scriptPath;                 // location of scripts
+		const char *    javaLibPath;                // location of jvm files
+		const char *    javaDebugPort;              // ip port we connect to for remote debugging
+		bool            useRemoteDebugJava;         // flag to use the jvm for remote debugging
+		bool            profileScripts;             // flag to enable script profiling
+		bool            crashOnScriptError;         // flag to crash the gameserver on a script error
+		bool            compileScripts;             // flag to compile the script .class files as they are being run
+		bool            trapScriptCrashes;          // flag to use our fatal handler to trap script segfaults
+		int             scriptWatcherWarnTime;      // time in ms to warn about a script running long
+		int             scriptWatcherInterruptTime; // time in ms (after scriptWatcherWarnTime) before we abort a script
+		int             scriptStackErrorLimit;      // depth of stack error we assume to be a legit error
+		int             scriptStackErrorLevel;      // how we handle a stack error: 0=recover, 1=javacore, 2=fatal
+		bool            disableObjvarNullCheck;     // flag to disable the check for a null object when get/setting objvars
+
+		// throttle to limit how universe data is sent from
+		// the universe game server to the other game servers;
+		// CentralServer server is the bottleneck and if universe
+		// data is sent to too many game servers at the same
+		// time, CentralServer must do massive amount of buffering
+		// which can cause out-of-memory crashes in CentralServer
+		int             maxGameServerToSendUniverseData;
+		int             timeoutToAckUniverseDataReceived;
+
+		// resource system
+		const char *    planetObjectTemplate; // template to use to make PlanetObjects
+		int             minimumResourcePoolDrainRate;
+		int             secondsPerResourceTick;    // how long does it take to collect your effeciency's worth of resource units
+		int             resourceTimeScale;         // for depletion times, how long (in seconds) 1 unit is
+		float           watchedHarvesterAlterTime; // how often to alter a harvester if it has a shared interface
+        float           unwatchedHarvesterAlterTime; //how often to alter a harvester when its not being observed(interface)
+		bool			deactivateHarvesterIfDamaged; // Deactivate a harvester if damaged, instead of just scaling the amount harvested
+	    float			harvesterExtractionRateMultiplier; //amount to multiply to adjust extraction rate, usefull for adding bonuses		
+		int             universeCheckFrequencySeconds; // how often to scan the resource tree for things that need to be spawned
+
+		bool            javaConsoleDebugMessages;
+		bool            useVerboseJava;
+		bool            logJavaGc;
+		int             javaLocalRefLimit;
+
+		// name generation
+		const char *    reservedNameFile;
+		const char *    characterNameGeneratorDirectory;
+
+		// crafting data
+		const char *    craftingComponentTableFile0;
+		const char *    craftingComponentTableFile1;
+		const char *    craftingComponentTableFile2;
+		const char *    craftingComponentTableFile3;
+		bool            craftingComponentStrict;
+		int             craftingXpChance;
+		const char *    craftingXpPercentTable;
+
+		// skill mod data
+		int             maxObjectSkillModBonus;     // max skill mod bonus an object can grant for a skill mod
+		int             maxSocketSkillModBonus;     // max skill mod bonus that can be added to an object's skill mod socket
+		int             maxSkillModSockets;         // max number of skill mod sockets an object can have
+		
+		// decay data
+		float baseDecayRate;		// value in secs
+		float weaponDecayThreshold; // % hp a weapon can be reduced to before it affects the weapon's min/max damage
+
+		// region system
+		const char * regionFilesName;   // data table that contains data tables that have static region info
+		int          regionTreeDepth;   // max depth of region quad tree
+		const char * battlefieldMarkerName; // data table that contains the templates used for battlefield markers
+
+		// Object Id Manager -- see ObjectIdManager.h for explanation of these parameters
+		int             reservedObjectIds;
+		int             minObjectIds;
+
+		// Player and Account system
+		const char *    playerObjectTemplate; // template to use to create new PlayerObjects
+
+		// time in which objects out of a client's update range continue to be cached for the client, in ms
+		int             clientOutOfRangeObjectCacheTimeMs;
+		// time between pvp enemy flag update cycles
+		int             pvpUpdateTimeMs;
+		// time before a temp flag expires for pvp
+		int             pvpTempFlagExpireTimeMs;
+		// time after cloning before someone can participate in guild war pvp again
+		int             pvpGuildWarCoolDownPeriodTimeMs;
+		// time to wait before actually becoming guild war pvp enabled/disabled though using the guild war exemption/exclusive list
+		int             pvpGuildWarExemptionExclusiveDelaySeconds;
+		// time after an action until someone may leave a battlefield
+		int             pvpBattlefieldEnemyFlagExpireTimeMs;
+		// name of pvp faction opponent data table file
+		const char *    pvpFactionOpponentsFilename;
+		// name of pvp nonaggressive factions data table file
+		const char *    pvpNonaggressiveFactionsFilename;
+		// name of pvp unattackable factions data table file
+		const char *    pvpUnattackableFactionsFilename;
+		// name of pvp bounty target factions data table file
+		const char *    pvpBountyTargetFactionsFilename;
+		// debugging and temporary settings
+		int             playerInterestRange;
+	
+		// server-side appearance creation toggle
+		bool            createAppearances;
+
+		const char *    adminAccountDataTable;
+		bool            adminGodToAll;
+		int             adminGodToAllGodLevel;
+		bool            useSecureLoginForGodAccess;
+		bool            useIPForGodAccess;
+		bool            adminPersistAllCreates;
+		bool            buildCluster;                  // flag that this is the buildcluster
+
+		int             requestSceneWarpTimeoutSeconds;
+
+		bool            moveValidationEnabled;
+		float           moveSpeedTolerance;            // tolerance when validating movement speed.  1.05 is 5% over normal max, etc.
+		int             moveSpeedCheckFrequencyMs;     // how often to validate speed
+		int             moveSpeedCheckFailureLeewaySeconds; // to lessen the impact of false positives in the speed check, only treat consecutive failure within this time period as true failure
+		int             moveSpeedCheckFailureLeewayCount; // to lessen the impact of false positives in the speed check, only treat this many consecutive failure as true failure
+		int             moveSlowdownFudgeTimeMs;       // how long to validate at the higher speed when slowing down
+		bool            moveCheckDestinationCollision; // whether to check for bad destinations
+		float           moveMaxDistance;               // maximum distance allowed to move for a single move packet
+		int             moveValidationMaxInventoryOverload; // move validation fails if inventory is overloaded by this amount
+		bool            moveValidationCheckForPastTimestamp;
+		bool            moveValidationCheckForFutureTimestamp;
+		bool            moveValidationCheckForTimestampDrift;
+		int             moveValidationPastTimestampThresholdMs;
+		int             moveValidationFutureTimestampThresholdMs;
+		int             moveValidationTimestampDriftThresholdMs;
+		float           moveMaxDistanceLeewayPerUpdate; // The absolute MAX movement between updates before we just warp you back instantly - No consecutive counts.
+
+		// Override the name validation checking
+		bool            nameValidationAcceptAll;
+
+		float           tangiblePvpRegionCheckTime;
+		float           creaturePvpRegionCheckTime;
+
+		// paths for crafting armor
+		const char *    defaultLightArmorTemplate;
+		const char *    defaultMediumArmorTemplate;
+		const char *    defaultHeavyArmorTemplate;
+		float           armorDamageReduction;
+		
+		bool            stationPlayersEnabled;
+		bool            stationPlayersShowAllDebugInfo;
+		bool            commoditiesMarketEnabled;
+		int             commoditiesServerServiceBindPort;
+		const char *    commoditiesServerServiceBindInterface;
+		bool            commoditiesShowAllDebugInfo;
+		time_t          commoditiesQueryTimeoutSec;
+		time_t          commoditiesServerReconnectIntervalSec;   //number of seconds to wait before trying to reconnect to the Commodities Server
+		time_t          unclaimedAuctionItemDestroyTimeSec;
+		int             maxReimburseAmount;
+		bool            logBaselines;
+
+		const char *    defaultVendorItemRestrictionFile;
+		const char *    defaultVendorItemRestrictionRejectionMessage;
+
+		int             weatherUpdateSeconds;
+
+		const char *    instrumentDataTableFilename;
+		const char *    performanceDataTableFilename;
+		int             createQueueScheduleTime;
+
+		bool            disableResources;
+		
+		// xp data
+		int             xpMultiplier;
+		const char *    xpManagerTemplate;
+		float           gcwXpBonus;
+		
+		// AI options
+
+		bool            reportAiStateChanges;
+		bool            reportAiWarnings;
+		bool            sendBreadcrumbs;
+		bool            movementWhileRetreatingThrowsException;
+		bool            hibernateEnabled;
+		bool            hibernateProxies;     // if true, proxied creatures are allowed to hibernate on their authoritative server
+		float           hibernateDistance;
+		float           minHibernateAlter;
+		float           maxHibernateAlter;
+		int             aiPulseQueuePerFrame;
+		int             aiPulseQueueMaxWaitTimeMs;
+		float           aiBaseAggroRadius;
+		float           aiMaxAggroRadius;
+		float           aiLeashRadius;
+		float           aiAssistRadius;
+
+		bool            disableCreateQueue;
+		float           maxTeleportDistanceWithoutSceneWarp;
+		float           maxInstrumentPlayDistance;
+
+		int             maxLotsPerAccount;
+		int             unsafeLogoutTimeMs;
+		int             idleLogoutTimeSec;
+		int             idleLogoutTimeAfterCharacterTransferSec;
+
+		const char *    fallbackDefaultWeapon;
+		bool            logObservers;
+		
+		int             lastKnownLocationsResetTimeSec;
+		int             maxMessageTosPerObjectPerFrame;
+		int             maxMessageToTimePerObjectPerFrame;
+		int             maxMessageToBounces;				
+
+		int             missionRequestsPerFrame;
+		bool            disableMissions;
+		int             loopProfileLogThresholdMs;
+		int             groundLoopProfileLogThresholdMs;
+		int             spaceLoopProfileLogThresholdMs;
+		bool            pvpDisableCombat;
+		bool            logObjectLoading;
+
+		bool            enforcePlayerTriggerVolumesOnly; 
+		float           locationTargetCheckIntervalSec;
+		const char *    gameServiceBindInterface;
+		bool            logPvpUpdates;
+
+		float           npcConversationDistance;    // max distance we can converse with an npc
+		int             serverSpawnLimit;
+		int             spawnQueueSize;
+		int             framesPerSpawn;
+		bool            enableSpawningNearLoadBeacons;
+		bool            disableTravel;
+
+		int             nonCriticalTasksPerFrame;
+
+		bool            sendPlayerTransform;
+		int             maxMoney;
+		int             maxGalacticReserveDepositBillion;
+		int             maxMoneyTransfer;
+		int             maxFreeTrialMoney;
+
+		bool            buildPreloadLists;
+		bool            enablePreload;
+		bool            logAuthTransfer;
+
+		int             overrideUpdateRadius;
+		float           buildingUpdateRadiusMultiplier;
+		int             maxPopulationForNewbieTravel;
+		int             debugAllAreasOverpopulated;
+		int             minNewbieTravelLocations;
+		int             numberOfMoveObjectLists;
+		int             sitOnObjectReportThreshold;
+		bool            fatalOnSitThreshold;
+		int             databasePositionUpdateLongDelayIntervalMs;
+		int             databasePositionUpdateShortDelayIntervalMs;
+		bool            logPositionUpdates;
+		bool            checkOriginCreates;
+		bool            enableWho;
+		bool            debugGroupChat;
+		int             numberOfMissionsWantedInMissionBag;
+		int             missionCreationQueueSize;
+		int             connectToAllGameServersTimeout;
+		int             houseItemLimitMultiplier;
+		int             maxHouseItemLimit;
+		bool            demandLoadHouseContents;
+		int             unloadHouseContentsTime;
+		int             loadHouseContentsDelaySeconds;
+		bool            boundarySpawningAllowed;
+		bool            debugMovement;
+		bool            spawnAllResources;
+		bool            skipUnreliableTransformsForOtherCells;
+		int             maxPlayerSanityCheckFailures;
+		bool            disablePlayerSanityChecker;
+
+		// Update ranges for unreliable packets per 2 seconds
+
+		float           updateRange7Packets;
+		float           updateRange6Packets;
+		float           updateRange5Packets;
+		float           updateRange4Packets;
+		float           updateRange3Packets;
+		float           updateRange2Packets;
+		float           updateRange1Packets;
+
+		const char *    instantDeleteListDataTableName;
+		bool            sendFrameProfilerInfo;
+		bool            logAllCommands;
+		bool            enableDebugControllerMessageSpam;
+		bool            debugPvp;
+		bool            allowMasterObjectCreation;
+
+		bool            mountsEnabled;
+		bool            mountsSanityCheckerEnabled;
+		bool            mountsSanityCheckerBroadcastEnabled;
+		int             mountsSanityCheckerBroadcastLimit;
+		
+		bool            moveSimEnabled;
+
+		bool            exceptionOnObjVarZeroLengthArray;
+		bool            trackNonAuthoritativeObjvarSets;
+
+		float           triggerVolumeWarpDistance;
+		NetworkId       maxGoldNetworkId;
+		bool            fatalOnMovingGoldObject;
+		int             spatialChatLogMinutes;
+
+		float           behaviorMaxAvoidanceStuckTime;
+		int             behaviorMaxAvoidancePersistenceFrameCount;
+		bool            shipsEnabled;
+		bool            logoutTriggerEnabled;
+
+		int             veteranRewardTradeInWaitPeriodSeconds;
+		bool            enableVeteranRewards;
+		bool            enableOneYearAnniversary;
+		int             minEntitledTime; // if the entitled time is less than this value, set it to this value
+		bool            veteranDebugTriggerAll;
+		bool            veteranDebugEnableOverrideAccountAge;
+		bool            enableNewVeteranRewards;
+		float           buddyPointTimeBonus; // buddy points can add to the player's entitlement time for veteran rewards
+		bool		enableSceneGlobalData;
+
+#ifdef _DEBUG
+		float           manufactureTimeOverride;
+#endif
+
+		// max time we allow for creating theater objects in a frame
+		int             theaterCreationLimitMilliseconds;
+
+		bool            fatalOnGoldPobChange;
+
+		bool            enableClientControllerMessageCheck;
+		int             maxWaypointsPerCharacter;
+
+		float           maxSmallCreatureHeight;
+		float           smallCreatureUpdateRadius;
+		float           maxMediumCreatureHeight;
+		float           mediumCreatureUpdateRadius;
+		float           largeCreatureUpdateRadius;
+
+		// long cooldowns need to be persisted to prevent exploit
+		int             coolDownPersistThresholdSeconds;
+
+		// TESTCENTER ONLY
+		bool            loginAsBountyHunter;
+		
+		bool            checkNotifyRegions;
+		bool            allowRegionTriggerOverride;
+
+		bool            sendAsteroidExtents;
+		bool            createZoneObjects;
+		int             shipUpdatesPerSecond;
+		bool            debugSpaceVisibilityManager;
+		int             groundFrameRateLimit;
+		int             spaceFrameRateLimit;
+		bool            aiLoggingEnabled;
+		bool            shipShotValidationEnabled;
+		int             spaceAiEnemySearchesPerFrame;
+		bool            groundShouldSleep;
+		bool            spaceShouldSleep;
+		bool            shipMoveValidationEnabled;
+		int             shipMoveCheckIntervalMs;
+		int             shipMoveCheckFudgeTimeMs; // how long validation uses higher values when they are being reduced
+		float           shipMoveCheckTolerance;
+		float           shipMoveCheckTimeToleranceSeconds;
+		int             spaceAiAvoidanceChecksPerFrame;
+		bool            spaceAiUsePathRefinement;
+		bool            aiClientDebugEnabled;
+		bool            shipClientUpdateDebugEnabled;
+		int             spacePlanetServerUpdatesPerFrame;
+		float           hyperspaceRandomOffsetRange;
+		float           shipLoadInvulnerableTimeWithoutClient;
+		float           shipLoadInvulnerableTimeWithClient;
+		float           creatureLoadInvulnerableTimeWithoutClient;
+		float           creatureLoadInvulnerableTimeWithClient;
+		int             lineOfSightCacheDurationMs;
+		float           lineOfSightCacheMinHeight;
+		float           lineOfSightLocationRoundValue;
+		bool            buildoutAreaEditingEnabled;
+
+		bool            debugFloorPathNodeCount;
+		int             populationReportTimeSeconds;
+		float           maxCombatRange;
+		bool            blockBuildRegionPlacement;
+
+		int	            npeMinInstancePopulation;
+		int	            npeMaxInstancePopulation;
+		bool            stripNonFreeAssetsFromPlayersInTutorial;
+
+		// weekly time (in GMT) when GCW rating recalculation occurs
+		int             gcwRecalcTimeDayOfWeek; // Sunday=0, Monday=1, Tuesday=2, Wednesday=3, Thursday=4, Friday=5, Saturday=6
+		int             gcwRecalcTimeHour;      // 0 - 23
+		int             gcwRecalcTimeMinute;    // 0 - 59
+		int             gcwRecalcTimeSecond;    // 0 - 59
+
+		// weekly time (in GMT) when GCW score decay occurs;
+		// additional time(s) can be specified in the config file if
+		// you want the GCW score decay to occur more than once a week;
+		// the following time is ignored if any time(s) is specified
+		// in the config file; if no time(s) is specified in the
+		// config file, it will use the following time as the default
+		int             gcwScoreDecayTimeDayOfWeek; // Sunday=0, Monday=1, Tuesday=2, Wednesday=3, Thursday=4, Friday=5, Saturday=6
+		int             gcwScoreDecayTimeHour;      // 0 - 23
+		int             gcwScoreDecayTimeMinute;    // 0 - 59
+		int             gcwScoreDecayTimeSecond;    // 0 - 59
+		std::vector<std::pair<std::pair<int, int>, std::pair<int, int> > > gcwScoreDecayTime;
+
+		// chat spam limiter
+		int             chatStatisticsReportIntervalSeconds;
+		int             chatSpamLimiterNumCharacters;
+		int             chatSpamLimiterIntervalMinutes;
+		bool            chatSpamLimiterEnabledForFreeTrial;
+		int             chatSpamNotifyPlayerWhenLimitedIntervalSeconds;
+
+		int             pendingLoadRequestLimit;
+
+		// city citizenship fixup at cluster startup
+		bool            enableCityCitizenshipFixup;
+
+		// city citizenship inactive packup
+		int             cityCitizenshipInactivePackupStartTimeEpoch;
+		int             cityCitizenshipInactivePackupInactiveTimeSeconds;
+
+		// city retro player city creation time
+		const char *    retroactivePlayerCityCreationTimeFilename;
+
+		// warden
+		int             wardenSquelchDurationSeconds;
+		bool            enableWarden;
+		bool            enableWardenCanSquelchSecuredLogin;
+		bool            enableWardenToDeputizeWarden;
+
+		// collection
+		bool            disableCollectionServerFirstGrantForSecuredLogin;
+
+		// locateStructure command spam limitter
+		int             locateStructureCommandIntervalSeconds;
+
+		// locateVendor command spam limitter
+		int             locateVendorCommandIntervalSeconds;
+
+		// CTS
+		int             ctsDefaultScriptDictionarySizeBytes;
+		const char *    retroactiveCtsHistoryFilename;
+		bool            allowIgnoreFreeCtsTimeRestriction;
+
+		// group pickup point
+		int             groupPickupPointApprovalRangeSquared;
+		int             groupPickupPointTimeLimitSeconds;
+		int             groupPickupTravelPlayerCityPercent; // if the destination is a player city's shuttleport, the city gets so many % of the travel cost
+
+		// combat restriction for group invite/join
+		bool            groupInviteInviterCombatRestriction;
+		bool            groupInviteInviteeCombatRestriction;
+		bool            groupJoinInviterCombatRestriction;
+		bool            groupJoinInviteeCombatRestriction;
+
+		// lfg
+		int             characterMatchMaxMatchCount;
+
+		// unlocked slot management commands
+		bool            enableOccupyUnlockedSlotCommand;
+		bool            enableVacateUnlockedSlotCommand;
+		bool            enableSwapUnlockedSlotCommand;
+		int             occupyVacateUnlockedSlotCommandCooldownSeconds;
+
+		// TCG
+		// the SWG account feature id that is incremented each time the account receives its
+		// free monthly booster pack on the account anniversary date; this will be set by
+		// some other product; we'll check it and display an announcement message and then
+		// clear it, so that it can be set again next month so we can display the announcement
+		// message next month
+		int             accountFeatureIdForMonthlyBoosterPack;
+
+		// TCG
+		// account feature id to indicate account needs to be notified of qualification for the TCG Beta
+		int             accountFeatureIdForTcgBetaAnnouncement;
+
+		// Event Logging
+		bool            logEventObjectCreation;
+		bool            logEventObjectDestruction;
+
+		float           regionFlagUpdateTime;
+
+		// abandoned house pack up
+		const char *    housePackupAccountListDataTableName;
+
+		// /pickupAllRoomItemsIntoInventory and /dropAllInventoryItemsIntoRoom
+		// commands how many items to do each pass, to spread out the load
+		int             pickDropAllRoomItemsNumberOfItemsPerRound;
+
+		// Neutral mercenary status
+		bool            enableCovertImperialMercenary;
+		bool            enableOvertImperialMercenary;
+		bool            enableCovertRebelMercenary;
+		bool            enableOvertRebelMercenary;
+
+		// GCW
+		int             broadcastGcwScoreToOtherGalaxiesIntervalSeconds;
+		bool            broadcastGcwScoreToOtherGalaxies;
+		bool            receiveGcwScoreFromOtherGalaxies;
+		int             trackGcwPercentileHistoryCount; // keep the previous nnn GCW percentile score, for historical tracking/analysis
+		bool            gcwFactionalPresenceDisableForSecuredLogin;
+		int             gcwFactionalPresenceMountedPct;
+		int             gcwFactionalPresenceLevelPct;
+		int             gcwFactionalPresenceGcwRankBonusPct;
+		int             gcwFactionalPresenceAlignedCityBonusPct;
+		int             gcwFactionalPresenceAlignedCityRankBonusPct;
+		int             gcwFactionalPresenceAlignedCityAgeBonusPct;
+		int             gcwGuildMinMembersForGcwRegionDefender;
+		int             gcwRegionDefenderTotalBonusPct;
+		int             gcwDaysRequiredForGcwRegionDefenderBonus;
+	};
+
+  private:
+
+	static Data *data;
+	static Vector startingPosition;
+	static stdmap<std::string, std::string>::fwd m_components;
+	
+
+  public:
+
+	static void install    (void);
+	static void remove     (void);
+
+	static bool             getAllowDefaultTemplateParams(void);
+
+	static bool             getSkipTutorial             (void);
+	static const char *     getGroundScene              (void);
+	static bool             getDisableCreateQueue       (void);
+	static const uint16     getPort                     (void);
+	static const char *     getSpaceScene               (void);
+	static const uint16     getTaskManagerPort          (void);
+
+	static const char *     getCentralServerAddress     (void);
+	static const uint16     getCentralServerPort        (void);
+	static const char *     getSceneID                  (void);
+	static int              getPreloadNumber            (void);
+	static const Vector&    getStartingPosition         (void);
+
+	static const char *     getDSN                      (void);
+	static const char *     getAlternateDSN             (void);
+	static const char *     getDatabaseUID              (void);
+	static const char *     getDatabasePWD              (void);
+	static const char *     getDatabaseProtocol         (void);
+	static int              getDatabaseWorkerThreads    (void);
+
+	static bool             getDisableCombat            (void);
+	static const char *     getCombatConfigFile         (void);
+
+	static float		getCombatDamageDelaySeconds (void);
+	static int              getTriggerVolumeSystem      (void);
+
+	static int		getDefaultAutoExpireTargetDuration(void);
+	static float		getInteriorTargetDurationFactor(void);
+
+	static const char *     getJavaVMName               (void);
+	static const char *     getScriptPath               (void);
+	static const char *     getJavaLibPath              (void);
+	static const char *     getJavaDebugPort            (void);
+	static bool             getUseRemoteDebugJava       (void);
+	static bool             getProfileScripts           (void);
+	static bool             getCrashOnScriptError       (void);
+	static bool             getCompileScripts           (void);
+	static bool             getTrapScriptCrashes        (void);
+	static int              getScriptWatcherWarnTime    (void);
+	static int              getScriptWatcherInterruptTime(void);
+	static int              getScriptStackErrorLimit    (void);
+	static int              getScriptStackErrorLevel    (void);
+	static int              getJavaLocalRefLimit        (void);
+	static bool             getDisableObjvarNullCheck   (void);
+
+	static int              getMaxGameServerToSendUniverseData(void);
+	static int              getTimeoutToAckUniverseDataReceived(void);
+
+	static int              getMinPoolValue             (void);
+	static int              getMinFaucetValue           (void);
+	static int              getMinDrainValue            (void);
+	static int              getMinEffectiveFaucetValue  (void);
+	static float            getDefaultHealthRegen       (void);
+	static float            getDefaultActionRegen       (void);
+	static float            getDefaultMindRegen         (void);
+	static float            getRegenThreshold           (void);
+	static float            getMinForcePowerRegenRate   (void);
+	static bool             getEnableAttribModWarnings  (void);
+	static bool             getCheckAttribLimits        (void);
+	static int              getMaxItemAttribBonus       (void);
+	static int              getMaxTotalAttribBonus      (void);
+
+	static bool             getEnableNewJedi            (void);
+	static const char *     getJediManagerTemplate      (void);
+	static int              getMaxJediBounties          (void);
+	static int              getStartForcePower          (void);
+	static bool             getLogJediConcludes         (void);
+	static bool             getForceJediConcludes       (void);
+	static int              getJediUpdateLocationTimeSeconds(void);
+
+	static const char *     getPlanetObjectTemplate     (void);
+	static const int        getSecondsPerResourceTick   (void);
+	static const uint32     getResourceTimeScale        (void);
+	static const float      getWatchedHarvesterAlterTime(void);
+    static const float      getUnWatchedHarvesterAlterTime(void);
+	static const bool       getDeactivateHarvesterIfDamaged(void);
+	static const float		getHarvesterExtractionRateMultiplier(void);
+	static const int        getUniverseCheckFrequencySeconds(void);
+
+	static const bool       getJavaConsoleDebugMessages (void);
+	static const bool       getUseVerboseJava           (void);
+	static const bool       getLogJavaGc                (void);
+
+	static const char *        getReservedNameFile          (void);
+	static const char *        getCharacterNameGeneratorDirectory(void);
+	static const std::string & getCraftingComponentTableFile(const std::string & name);
+	static bool                getCraftingComponentStrict   (void);
+	static int                 getCraftingXpChance          (void);
+	static const char *        getCraftingXpPercentTable    (void);
+
+	static int              getMaxObjectSkillModBonus(void);
+	static int              getMaxSocketSkillModBonus(void);
+	static int              getMaxSkillModSockets(void);
+
+	static float            getBaseDecayRate(void);
+	static float            getWeaponDecayThreshold(void);
+
+	static const char *     getRegionFilesName(void);
+	static int              getRegionTreeDepth(void);
+	static const char *     getBattlefieldMarkerName(void);
+
+	static int              getReservedObjectIds        (void);
+	static int              getMinObjectIds             (void);
+
+	static const char *     getPlayerObjectTemplate     (void);
+
+	static int              getClientOutOfRangeObjectCacheTimeMs(void);
+	static int              getPlayerInterestRange      (void);
+	static int              getPvpUpdateTimeMs          (void);
+	static int              getPvpTempFlagExpireTimeMs  (void);
+	static int              getPvpGuildWarCoolDownPeriodTimeMs(void);
+	static int              getPvpGuildWarExemptionExclusiveDelaySeconds(void);
+	static int              getPvpBattlefieldEnemyFlagExpireTimeMs(void);
+	static const char *     getPvpFactionOpponentsFilename(void);
+	static const char *     getPvpNonaggressiveFactionsFilename(void);
+	static const char *     getPvpUnattackableFactionsFilename(void);
+	static const char *     getPvpBountyTargetFactionsFilename(void);
+
+	static bool             getCreateAppearances        (void);
+
+	static const char *     getAdminAccountDataTable    (void);
+	static bool             getAdminGodToAll            (void);
+	static int              getAdminGodToAllGodLevel    (void);
+	static bool             getUseSecureLoginForGodAccess();
+	static bool             getUseIPForGodAccess(); 
+	static bool             getAdminPersistAllCreates   (void);
+	static bool             getBuildCluster             (void);
+
+	static int              getRequestSceneWarpTimeoutSeconds(void);
+
+	static bool             getMoveValidationEnabled    (void);
+	static float            getMoveSpeedTolerance       (void);
+	static int              getMoveSpeedCheckFrequencyMs(void);
+	static int              getMoveSpeedCheckFailureLeewaySeconds(void);
+	static int              getMoveSpeedCheckFailureLeewayCount(void);
+	static int              getMoveSlowdownFudgeTimeMs  (void);
+	static bool             getMoveCheckDestinationCollision(void);
+	static float            getMoveMaxDistance          (void);
+	static int              getMoveValidationMaxInventoryOverload(void);
+	static bool             getMoveValidationCheckForPastTimestamp(void);
+	static bool             getMoveValidationCheckForFutureTimestamp(void);
+	static bool             getMoveValidationCheckForTimestampDrift(void);
+	static int              getMoveValidationPastTimestampThresholdMs(void);
+	static int              getMoveValidationFutureTimestampThresholdMs(void);
+	static int              getMoveValidationTimestampDriftThresholdMs(void);
+	static float            getMoveMaxDistanceLeewayPerUpdate(void);
+
+	static bool             getNameValidationAcceptAll();
+
+	static float            getTangiblePvpRegionCheckTime(void);
+	static float            getCreaturePvpRegionCheckTime(void);
+
+	static const char *     getDefaultLightArmorTemplate(void);
+	static const char *     getDefaultMediumArmorTemplate(void);
+	static const char *     getDefaultHeavyArmorTemplate(void);
+	static float            getArmorDamageReduction(void);
+
+	static bool             getStationPlayersEnabled(void);
+	static bool             getStationPlayersShowAllDebugInfo();
+	static bool             getCommoditiesMarketEnabled(void);
+	static int              getCommoditiesServerServiceBindPort();
+	static const char *     getCommoditiesServerServiceBindInterface();
+	static bool             getCommoditiesShowAllDebugInfo();
+	static time_t           getCommoditiesQueryTimeoutSec(void);
+	static time_t           getCommoditiesServerReconnectIntervalSec(void);
+	static time_t           getUnclaimedAuctionItemDestroyTimeSec(void);
+	static int              getMaxReimburseAmount();
+
+	static bool             getLogBaselines(void);
+
+	static const char *     getDefaultVendorItemRestrictionFile();
+	static const char *     getDefaultVendorItemRestrictionRejectionMessage();
+
+	static int              getWeatherUpdateSeconds();
+	static const char *     getInstrumentDataTableFilename(void);
+	static const char *     getPerformanceDataTableFilename(void);
+	static const int        getCreateQueueScheduleTime(void);
+	static const bool       getDisableResources();
+	
+	static int              getXpMultiplier();
+	static const char *     getXpManagerTemplate();
+	static float            getGcwXpBonus();
+
+	static const bool       getReportAiStateChanges(void);
+	static const bool       getReportAiWarnings(void);
+	static const bool       getSendBreadcrumbs(void);
+	static const bool       getMovementWhileRetreatingThrowsException(void);
+	static const bool       getHibernateEnabled(void);
+	static const bool       getHibernateProxies(void);
+	static const float      getHibernateDistance(void);
+	static const float      getMinHibernateAlter(void);
+	static const float      getMaxHibernateAlter(void);
+	static const int        getAiPulseQueuePerFrame();
+	static const unsigned int getAiPulseQueueMaxWaitTimeMs();
+
+	static const float      getMaxTeleportDistanceWithoutSceneWarp(void);
+	static const float      getMaxInstrumentPlayDistance(void);
+
+	static const int        getMaxLotsPerAccount(void);
+	static const int        getUnsafeLogoutTimeMs(void);
+	static const unsigned long getIdleLogoutTimeSec(void);
+	static const unsigned long getIdleLogoutTimeAfterCharacterTransferSec(void);
+
+	static const char *     getFallbackDefaultWeapon(void);
+
+	static bool             getLogObservers();
+	static int              getLastKnownLocationsResetTimeSec();
+	static int              getMaxMessageTosPerObjectPerFrame();
+	static int              getMaxMessageToTimePerObjectPerFrame();
+	static int              getMaxMessageToBounces();
+
+	static int              getMissionRequestsPerFrame();
+	static bool             getDisableMissions();
+	
+	static unsigned long    getLoopProfileLogThresholdMs();
+	static unsigned long    getGroundLoopProfileLogThresholdMs();
+	static unsigned long    getSpaceLoopProfileLogThresholdMs();
+	static bool             getPvpDisableCombat();
+	static bool             getLogObjectLoading();
+
+	static bool             getEnforcePlayerTriggerVolumesOnly();
+	static float            getLocationTargetCheckIntervalSec();
+	static const char *     getGameServiceBindInterface();
+	static bool             getLogPvpUpdates();
+
+	static float            getNpcConversationDistance();
+	static int              getServerSpawnLimit();
+	static int              getSpawnQueueSize();
+	static int              getFramesPerSpawn();
+	static bool             getEnableSpawningNearLoadBeacons();
+	static bool             getDisableTravel();
+
+	static int              getNonCriticalTasksPerFrame();
+
+	static bool             getSendPlayerTransform();
+	static int              getMaxMoney();
+	static int              getMaxGalacticReserveDepositBillion();
+	static int              getMaxMoneyTransfer();
+	static int              getMaxFreeTrialMoney();
+
+	static bool             getBuildPreloadLists();
+	static bool             getEnablePreload();
+	static bool             getLogAuthTransfer();
+
+	static int              getOverrideUpdateRadius();
+	static float            getBuildingUpdateRadiusMultiplier();
+	static int              getMaxPopulationForNewbieTravel();
+	static int              getDebugAllAreasOverpopulated();
+	static int              getMinNewbieTravelLocations();
+	static int              getNumberOfMoveObjectLists();
+	static int              getSitOnObjectReportThreshold();
+	static bool             getFatalOnSitThreshold();
+	static int              getDatabasePositionUpdateLongDelayIntervalMs();
+	static int              getDatabasePositionUpdateShortDelayIntervalMs();
+	static bool             getLogPositionUpdates();
+
+	static bool             getCheckOriginCreates();
+	static bool             getEnableWho();
+	static bool             getDebugGroupChat();
+	static int              getNumberOfMissionsWantedInMissionBag();
+	static int              getMissionCreationQueueSize();
+	static int              getConnectToAllGameServersTimeout();
+	static int              getHouseItemLimitMultiplier();
+	static int              getMaxHouseItemLimit();
+	static bool             getDemandLoadHouseContents();
+	static int              getUnloadHouseContentsTime();
+	static int              getLoadHouseContentsDelaySeconds();
+	static bool             getBoundarySpawningAllowed();
+	static bool             getDebugMovement();
+	static bool             getSpawnAllResources();
+	static bool             getSkipUnreliableTransformsForOtherCells();
+	static int              getMaxPlayerSanityCheckFailures();
+	static bool             getDisablePlayerSanityChecker();
+	static float            getUpdateRange7PacketsSquared();
+	static float            getUpdateRange6PacketsSquared();
+	static float            getUpdateRange5PacketsSquared();
+	static float            getUpdateRange4PacketsSquared();
+	static float            getUpdateRange3PacketsSquared();
+	static float            getUpdateRange2PacketsSquared();
+	static float            getUpdateRange1PacketsSquared();
+	static const char *     getInstantDeleteListDataTableName();
+	static bool             getSendFrameProfilerInfo();
+	static bool             getLogAllCommands();
+	static bool             getEnableDebugControllerMessageSpam();
+	static bool             getDebugPvp();
+	static bool             getAllowMasterObjectCreation();
+
+	static bool             getMountsEnabled();
+	static bool             getMountsSanityCheckerEnabled();
+	static bool             getMountsSanityCheckerBroadcastEnabled();
+	static int              getMountsSanityCheckerBroadcastLimit();
+
+	static bool             getMoveSimEnabled ();
+
+	static bool             getExceptionOnObjVarZeroLengthArray();
+	static bool             getTrackNonAuthoritativeObjvarSets();
+
+	static float            getTriggerVolumeWarpDistance();
+	static const NetworkId &getMaxGoldNetworkId();
+	static bool             getFatalOnMovingGoldObject();
+	static int              getSpatialChatLogMinutes();
+
+	static float            getBehaviorMaxAvoidanceStuckTime();
+	static int              getBehaviorMaxAvoidancePersistenceFrameCount();
+	static bool             getShipsEnabled();
+	static bool             getLogoutTriggerEnabled();
+
+	static int              getVeteranRewardTradeInWaitPeriodSeconds();
+	static bool             getEnableVeteranRewards();
+	static bool             getEnableOneYearAnniversary();
+	static int              getMinEntitledTime();
+	static bool             getVeteranDebugTriggerAll();
+	static bool             getVeteranDebugEnableOverrideAccountAge();
+	static bool             getEnableNewVeteranRewards();
+	static float            getBuddyPointTimeBonus();
+	static bool             getEnableSceneGlobalData();
+
+#ifdef _DEBUG
+	static float            getManufactureTimeOverride();
+#endif
+
+	static int              getTheaterCreationLimitMilliseconds();
+
+	static bool             getFatalOnGoldPobChange();
+
+	static bool             getEnableClientControllerMessageCheck();
+
+	static int              getMaxWaypointsPerCharacter();
+
+	static float            getMaxSmallCreatureHeight();
+	static float            getSmallCreatureUpdateRadius();
+	static float            getMaxMediumCreatureHeight();
+	static float            getMediumCreatureUpdateRadius();
+	static float            getLargeCreatureUpdateRadius();
+
+	static int              getCoolDownPersistThresholdSeconds();
+
+	static bool             getLoginAsBountyHunter();
+	
+	static bool             getCheckNotifyRegions();
+	static bool             getAllowRegionTriggerOverride();
+
+	static bool             getSendAsteroidExtents();
+	static bool             getCreateZoneObjects();
+	static int              getShipUpdatesPerSecond();
+	static bool             getDebugSpaceVisibilityManager();
+	static int              getGroundFrameRateLimit();
+	static int              getSpaceFrameRateLimit();
+	static bool             isSpaceAiLoggingEnabled();
+	static bool             isAiLoggingEnabled();
+	static bool             getShipShotValidationEnabled();
+	static int              getSpaceAiEnemySearchesPerFrame();
+	static bool             getGroundShouldSleep();
+	static bool             getSpaceShouldSleep();
+	static bool             getShipMoveValidationEnabled();
+	static int              getShipMoveCheckIntervalMs();
+	static int              getShipMoveCheckFudgeTimeMs();
+	static float            getShipMoveCheckTolerance();
+	static float            getShipMoveCheckTimeToleranceSeconds();
+	static int              getSpaceAiAvoidanceChecksPerFrame();
+	static bool             getSpaceAiUsePathRefinement();
+	static bool             isAiClientDebugEnabled();
+	static bool             getShipClientUpdateDebugEnabled();
+	static int              getSpacePlanetServerUpdatesPerFrame();
+	static float            getHyperspaceRandomOffsetRange();
+	static float            getShipLoadInvulnerableTimeWithoutClient();
+	static float            getShipLoadInvulnerableTimeWithClient();
+	static float            getCreatureLoadInvulnerableTimeWithoutClient();
+	static float            getCreatureLoadInvulnerableTimeWithClient();
+	static unsigned long    getLineOfSightCacheDurationMs();
+	static float            getLineOfSightCacheMinHeight();
+	static float            getLineOfSightLocationRoundValue();
+	static bool             getBuildoutAreaEditingEnabled();
+
+	static bool             getDebugFloorPathNodeCount();
+	static float            getAiBaseAggroRadius();
+	static float            getAiMaxAggroRadius();
+	static float            getAiLeashRadius();
+	static float            getAiAssistRadius();
+	static int 		        getPopulationReportTimeSeconds();
+	static float            getMaxCombatRange();
+	static bool             getBlockBuildRegionPlacement();
+
+	static int              getNpeMinInstancePopulation();
+	static int              getNpeMaxInstancePopulation();
+	static bool             getStripNonFreeAssetsFromPlayersInTutorial();
+
+	static int              getGcwRecalcTimeDayOfWeek();
+	static int              getGcwRecalcTimeHour();
+	static int              getGcwRecalcTimeMinute();
+	static int              getGcwRecalcTimeSecond();
+
+	static std::vector<std::pair<std::pair<int, int>, std::pair<int, int> > > const & getGcwScoreDecayTime();
+
+	static int              getChatStatisticsReportIntervalSeconds();
+	static int              getChatSpamLimiterNumCharacters();
+	static int              getChatSpamLimiterIntervalMinutes();
+	static bool             getChatSpamLimiterEnabledForFreeTrial();
+	static int              getChatSpamNotifyPlayerWhenLimitedIntervalSeconds();
+
+	static int              getPendingLoadRequestLimit();
+
+	static bool             getEnableCityCitizenshipFixup();
+
+	static int              getCityCitizenshipInactivePackupStartTimeEpoch();
+	static int              getCityCitizenshipInactivePackupInactiveTimeSeconds();
+
+	static const char *     getRetroactivePlayerCityCreationTimeFilename();
+
+	static int              getWardenSquelchDurationSeconds();
+	static bool             getEnableWarden();
+	static bool             getEnableWardenCanSquelchSecuredLogin();
+	static bool             getEnableWardenToDeputizeWarden();
+
+	static bool             getDisableCollectionServerFirstGrantForSecuredLogin();
+
+	static int              getLocateStructureCommandIntervalSeconds();
+
+	static int              getLocateVendorCommandIntervalSeconds();
+
+	static size_t           getCtsDefaultScriptDictionarySizeBytes();
+	static const char *     getRetroactiveCtsHistoryFilename();
+	static bool             getAllowIgnoreFreeCtsTimeRestriction();
+
+	static int              getGroupPickupPointApprovalRangeSquared();
+	static int              getGroupPickupPointTimeLimitSeconds();
+	static int              getGroupPickupTravelPlayerCityPercent();
+
+	static bool             getGroupInviteInviterCombatRestriction();
+	static bool             getGroupInviteInviteeCombatRestriction();
+	static bool             getGroupJoinInviterCombatRestriction();
+	static bool             getGroupJoinInviteeCombatRestriction();
+
+	static size_t           getCharacterMatchMaxMatchCount();
+
+	static bool             getEnableOccupyUnlockedSlotCommand();
+	static bool             getEnableVacateUnlockedSlotCommand();
+	static bool             getEnableSwapUnlockedSlotCommand();
+	static int              getOccupyVacateUnlockedSlotCommandCooldownSeconds();
+
+	static int              getAccountFeatureIdForMonthlyBoosterPack();
+	static int              getAccountFeatureIdForTcgBetaAnnouncement();
+
+	static bool             getLogEventObjectCreation();
+	static bool             getLogEventObjectDestruction();
+
+	static float            getRegionFlagUpdateTimeSecs();
+	static const char *     getHousePackupAccountListDataTableName();
+
+	static int              getPickDropAllRoomItemsNumberOfItemsPerRound();
+
+	static bool             getEnableCovertImperialMercenary();
+	static bool             getEnableOvertImperialMercenary();
+	static bool             getEnableCovertRebelMercenary();
+	static bool             getEnableOvertRebelMercenary();
+	static int              getBroadcastGcwScoreToOtherGalaxiesIntervalSeconds();
+	static bool             getBroadcastGcwScoreToOtherGalaxies();
+	static bool             getReceiveGcwScoreFromOtherGalaxies();
+	static int              getTrackGcwPercentileHistoryCount();
+	static bool             getGcwFactionalPresenceDisableForSecuredLogin();
+	static int              getGcwFactionalPresenceMountedPct();
+	static int              getGcwFactionalPresenceLevelPct();
+	static int              getGcwFactionalPresenceGcwRankBonusPct();
+	static int              getGcwFactionalPresenceAlignedCityBonusPct();
+	static int              getGcwFactionalPresenceAlignedCityRankBonusPct();
+	static int              getGcwFactionalPresenceAlignedCityAgeBonusPct();
+	static int              getGcwGuildMinMembersForGcwRegionDefender();
+	static int              getGcwRegionDefenderTotalBonusPct();
+	static int              getGcwDaysRequiredForGcwRegionDefenderBonus();
+};
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getSitOnObjectReportThreshold()
+{
+	return data->sitOnObjectReportThreshold;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getFatalOnSitThreshold()
+{
+	return data->fatalOnSitThreshold;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getSendPlayerTransform(void)
+{
+
+	return data->sendPlayerTransform;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getDisableTravel()
+{
+	return data->disableTravel;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getAllowDefaultTemplateParams(void)
+{
+	return data->allowDefaultTemplateParams;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getSkipTutorial(void)
+{
+	return data->skipTutorial;
+}
+
+inline const char * ConfigServerGame::getGroundScene(void)
+{
+	return data->groundScene;
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint16 ConfigServerGame::getTaskManagerPort(void)
+{
+	return static_cast<const uint16>(data->taskManagerPort);
+}
+
+//-----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getSpaceScene(void)
+{
+	return data->spaceScene;
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint16 ConfigServerGame::getPort(void)
+{
+	return static_cast<const uint16>(data->port);
+}
+
+//-----------------------------------------------------------------------
+inline const char * ConfigServerGame::getSceneID(void)
+{
+	return data->sceneID;
+}
+
+//-----------------------------------------------------------------------
+inline int ConfigServerGame::getPreloadNumber(void)
+{
+	return data->preloadNumber;
+}
+
+//-----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getCentralServerAddress(void)
+{
+	return data->centralServerAddress;
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint16 ConfigServerGame::getCentralServerPort(void)
+{
+	return static_cast<const uint16>(data->centralServerPort);
+}
+
+//-----------------------------------------------------------------------
+
+
+inline const Vector& ConfigServerGame::getStartingPosition(void)
+{
+	return startingPosition;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getDisableCombat(void)
+{
+	return data->disableCombat;
+}
+
+//-----------------------------------------------------------------------
+
+inline const char *ConfigServerGame::getCombatConfigFile(void)
+{
+	return data->combatConfigFile;
+}
+
+//-----------------------------------------------------------------------
+
+inline float ConfigServerGame::getCombatDamageDelaySeconds(void)
+{
+	return data->combatDamageDelaySeconds;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getTriggerVolumeSystem(void)
+{
+	return data->triggerVolumeSystem;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getDefaultAutoExpireTargetDuration(void)
+{
+	return data->defaultAutoExpireTargetDuration;
+}
+
+
+//-----------------------------------------------------------------------
+
+inline float ConfigServerGame::getInteriorTargetDurationFactor(void)
+{
+	return data->interiorTargetDurationFactor;
+}
+
+
+//-----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getJavaVMName(void)
+{
+	return data->javaVMName;
+}
+
+//-----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getScriptPath(void)
+{
+	return data->scriptPath;
+}
+
+//-----------------------------------------------------------------------
+
+inline const char *ConfigServerGame::getJavaLibPath(void)
+{
+	return data->javaLibPath;
+}
+
+//-----------------------------------------------------------------------
+
+inline const char *ConfigServerGame::getJavaDebugPort(void)
+{
+	return data->javaDebugPort;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getUseRemoteDebugJava(void)
+{
+	return data->useRemoteDebugJava;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getProfileScripts(void)
+{
+	return data->profileScripts;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getCrashOnScriptError(void)
+{
+	return data->crashOnScriptError;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getCompileScripts(void)
+{
+	return data->compileScripts;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getTrapScriptCrashes(void)
+{
+	return data->trapScriptCrashes;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getScriptWatcherWarnTime(void)
+{
+	return data->scriptWatcherWarnTime;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getScriptWatcherInterruptTime(void)
+{
+	return data->scriptWatcherInterruptTime;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getScriptStackErrorLimit(void)
+{
+	return data->scriptStackErrorLimit;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getScriptStackErrorLevel(void)
+{
+	return data->scriptStackErrorLevel;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getJavaLocalRefLimit(void)
+{
+	return data->javaLocalRefLimit;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getDisableObjvarNullCheck(void)
+{
+	return data->disableObjvarNullCheck;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMaxGameServerToSendUniverseData(void)
+{
+	return data->maxGameServerToSendUniverseData;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getTimeoutToAckUniverseDataReceived(void)
+{
+	return data->timeoutToAckUniverseDataReceived;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMinPoolValue(void)
+{
+	return data->minPoolValue;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMinFaucetValue(void)
+{
+	return data->minFaucetValue;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMinDrainValue(void)
+{
+	return data->minDrainValue;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMinEffectiveFaucetValue(void)
+{
+	return data->minEffectiveFaucetValue;
+}
+
+//-----------------------------------------------------------------------
+
+inline float ConfigServerGame::getDefaultHealthRegen(void)
+{
+	return data->defaultHealthRegen;
+}
+
+//-----------------------------------------------------------------------
+
+inline float ConfigServerGame::getDefaultActionRegen(void)
+{
+	return data->defaultActionRegen;
+}
+
+//-----------------------------------------------------------------------
+
+inline float ConfigServerGame::getDefaultMindRegen(void)
+{
+	return data->defaultMindRegen;
+}
+
+//-----------------------------------------------------------------------
+
+inline float ConfigServerGame::getRegenThreshold(void)
+{
+	return data->regenThreshold;
+}
+
+//-----------------------------------------------------------------------
+
+inline float ConfigServerGame::getMinForcePowerRegenRate(void)
+{
+	return data->minForcePowerRegenRate;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableAttribModWarnings(void)
+{
+	return data->enableAttribModWarnings;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getCheckAttribLimits(void)
+{
+	return data->checkAttribLimits;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMaxItemAttribBonus(void)
+{
+	return data->maxItemAttribBonus;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMaxTotalAttribBonus(void)
+{
+	return data->maxTotalAttribBonus;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableNewJedi(void)
+{
+	return data->enableNewJedi;
+}
+
+//-----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getJediManagerTemplate(void)
+{
+	return data->jediManagerTemplate;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMaxJediBounties(void)
+{
+	return data->maxJediBounties;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getStartForcePower(void)
+{
+	return data->startForcePower;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getLogJediConcludes(void)
+{
+	return data->logJediConcludes;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getForceJediConcludes(void)
+{
+	return data->forceJediConcludes;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getJediUpdateLocationTimeSeconds(void)
+{
+	return data->jediUpdateLocationTimeSeconds;
+}
+
+//-----------------------------------------------------------------------
+
+inline const bool ConfigServerGame::getJavaConsoleDebugMessages()
+{
+	return data->javaConsoleDebugMessages;
+}
+
+//-----------------------------------------------------------------------
+
+inline const bool ConfigServerGame::getUseVerboseJava(void)
+{
+	return data->useVerboseJava;
+}
+
+//-----------------------------------------------------------------------
+
+inline const bool ConfigServerGame::getLogJavaGc(void)
+{
+	return data->logJavaGc;
+}
+
+//-----------------------------------------------------------------------
+
+inline const char *ConfigServerGame::getPlanetObjectTemplate()
+{
+	return data->planetObjectTemplate;
+}
+
+//-----------------------------------------------------------------------
+
+inline const char *ConfigServerGame::getReservedNameFile()
+{
+	return data->reservedNameFile;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getCraftingComponentStrict(void)
+{
+	return data->craftingComponentStrict;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getCraftingXpChance(void)
+{
+	return data->craftingXpChance;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getCraftingXpPercentTable(void)
+{
+	return data->craftingXpPercentTable;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMaxObjectSkillModBonus(void)
+{
+	return data->maxObjectSkillModBonus;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMaxSocketSkillModBonus(void)
+{
+	return data->maxSocketSkillModBonus;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMaxSkillModSockets(void)
+{
+	return data->maxSkillModSockets;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getBaseDecayRate(void)
+{
+	return data->baseDecayRate;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getWeaponDecayThreshold(void)
+{
+	return data->weaponDecayThreshold;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getRegionFilesName(void)
+{
+	return data->regionFilesName;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getRegionTreeDepth(void)
+{
+	return data->regionTreeDepth;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getBattlefieldMarkerName(void)
+{
+	return data->battlefieldMarkerName;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getReservedObjectIds()
+{
+	return data->reservedObjectIds;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMinObjectIds()
+{
+	return data->minObjectIds;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getPlayerObjectTemplate()
+{
+	return data->playerObjectTemplate;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getClientOutOfRangeObjectCacheTimeMs()
+{
+	return data->clientOutOfRangeObjectCacheTimeMs;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getPlayerInterestRange()
+{
+	return data->playerInterestRange;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getPvpUpdateTimeMs()
+{
+	return data->pvpUpdateTimeMs;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getPvpTempFlagExpireTimeMs()
+{
+	return data->pvpTempFlagExpireTimeMs;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getPvpGuildWarCoolDownPeriodTimeMs()
+{
+	return data->pvpGuildWarCoolDownPeriodTimeMs;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getPvpGuildWarExemptionExclusiveDelaySeconds()
+{
+	return data->pvpGuildWarExemptionExclusiveDelaySeconds;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getPvpBattlefieldEnemyFlagExpireTimeMs()
+{
+	return data->pvpBattlefieldEnemyFlagExpireTimeMs;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char *ConfigServerGame::getPvpFactionOpponentsFilename()
+{
+	return data->pvpFactionOpponentsFilename;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char *ConfigServerGame::getPvpNonaggressiveFactionsFilename()
+{
+	return data->pvpNonaggressiveFactionsFilename;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char *ConfigServerGame::getPvpUnattackableFactionsFilename()
+{
+	return data->pvpUnattackableFactionsFilename;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char *ConfigServerGame::getPvpBountyTargetFactionsFilename()
+{
+	return data->pvpBountyTargetFactionsFilename;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getCreateAppearances()
+{
+	return data->createAppearances;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getAdminAccountDataTable(void)
+{
+	return data->adminAccountDataTable;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getAdminGodToAll()
+{
+	return data->adminGodToAll;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getAdminGodToAllGodLevel()
+{
+	return data->adminGodToAllGodLevel;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getUseSecureLoginForGodAccess()
+{
+	return data->useSecureLoginForGodAccess;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getUseIPForGodAccess()
+{
+	return data->useIPForGodAccess;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getAdminPersistAllCreates()
+{
+	return data->adminPersistAllCreates;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getBuildCluster(void)
+{
+	return data->buildCluster;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getRequestSceneWarpTimeoutSeconds(void)
+{
+	return data->requestSceneWarpTimeoutSeconds;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getMoveValidationEnabled()
+{
+	return data->moveValidationEnabled;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getMoveSpeedTolerance()
+{
+	return data->moveSpeedTolerance;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMoveSpeedCheckFrequencyMs()
+{
+	return data->moveSpeedCheckFrequencyMs;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMoveSpeedCheckFailureLeewaySeconds()
+{
+	return data->moveSpeedCheckFailureLeewaySeconds;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMoveSpeedCheckFailureLeewayCount()
+{
+	return data->moveSpeedCheckFailureLeewayCount;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMoveSlowdownFudgeTimeMs()
+{
+	return data->moveSlowdownFudgeTimeMs;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getMoveCheckDestinationCollision()
+{
+	return data->moveCheckDestinationCollision;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getMoveMaxDistance()
+{
+	return data->moveMaxDistance;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMoveValidationMaxInventoryOverload()
+{
+	return data->moveValidationMaxInventoryOverload;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getMoveValidationCheckForPastTimestamp(void)
+{
+	return data->moveValidationCheckForPastTimestamp;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getMoveValidationCheckForFutureTimestamp(void)
+{
+	return data->moveValidationCheckForFutureTimestamp;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getMoveValidationCheckForTimestampDrift(void)
+{
+	return data->moveValidationCheckForTimestampDrift;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMoveValidationPastTimestampThresholdMs(void)
+{
+	return data->moveValidationPastTimestampThresholdMs;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMoveValidationFutureTimestampThresholdMs(void)
+{
+	return data->moveValidationFutureTimestampThresholdMs;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMoveValidationTimestampDriftThresholdMs(void)
+{
+	return data->moveValidationTimestampDriftThresholdMs;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getMoveMaxDistanceLeewayPerUpdate(void)
+{
+	return data->moveMaxDistanceLeewayPerUpdate;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getNameValidationAcceptAll()
+{
+	return data->nameValidationAcceptAll;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getTangiblePvpRegionCheckTime(void)
+{
+	return data->tangiblePvpRegionCheckTime;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getCreaturePvpRegionCheckTime(void)
+{
+	return data->creaturePvpRegionCheckTime;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getDefaultLightArmorTemplate(void)
+{
+	return data->defaultLightArmorTemplate;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getDefaultMediumArmorTemplate(void)
+{
+	return data->defaultMediumArmorTemplate;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getDefaultHeavyArmorTemplate(void)
+{
+	return data->defaultHeavyArmorTemplate;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getArmorDamageReduction(void)
+{
+	return data->armorDamageReduction;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getStationPlayersEnabled(void)
+{
+	return data->stationPlayersEnabled;
+}
+
+// ----------------------------------------------------------------------
+
+
+inline bool ConfigServerGame::getStationPlayersShowAllDebugInfo(void)
+{
+	return data->stationPlayersShowAllDebugInfo;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getCommoditiesMarketEnabled(void)
+{
+	return data->commoditiesMarketEnabled;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getCommoditiesServerServiceBindPort()
+{
+	return data->commoditiesServerServiceBindPort;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getCommoditiesServerServiceBindInterface()
+{
+	return data->commoditiesServerServiceBindInterface;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getCommoditiesShowAllDebugInfo(void)
+{
+	return data->commoditiesShowAllDebugInfo;
+}
+
+// ----------------------------------------------------------------------
+
+inline time_t ConfigServerGame::getCommoditiesQueryTimeoutSec(void)
+{
+	return data->commoditiesQueryTimeoutSec;
+}
+
+//-----------------------------------------------------------------------
+
+inline time_t ConfigServerGame::getCommoditiesServerReconnectIntervalSec(void)
+{
+	return data->commoditiesServerReconnectIntervalSec;
+}
+
+// ----------------------------------------------------------------------
+
+inline time_t ConfigServerGame::getUnclaimedAuctionItemDestroyTimeSec(void)
+{
+	return data->unclaimedAuctionItemDestroyTimeSec;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMaxReimburseAmount()
+{
+	return data->maxReimburseAmount;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getLogBaselines(void)
+{
+	return data->logBaselines;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getDefaultVendorItemRestrictionFile()
+{
+	return data->defaultVendorItemRestrictionFile;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getDefaultVendorItemRestrictionRejectionMessage()
+{
+	return data->defaultVendorItemRestrictionRejectionMessage;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getWeatherUpdateSeconds(void)
+{
+	return data->weatherUpdateSeconds;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getInstrumentDataTableFilename(void)
+{
+	return data->instrumentDataTableFilename;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getPerformanceDataTableFilename(void)
+{
+	return data->performanceDataTableFilename;
+}
+
+//-----------------------------------------------------------------------
+
+inline const int ConfigServerGame::getCreateQueueScheduleTime(void)
+{
+	return data->createQueueScheduleTime;
+}
+
+// ----------------------------------------------------------------------
+
+inline const bool ConfigServerGame::getDisableResources()
+{
+	return data->disableResources;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getXpMultiplier()
+{
+	return data->xpMultiplier;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getXpManagerTemplate()
+{
+	return data->xpManagerTemplate;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getGcwXpBonus()
+{
+	return data->gcwXpBonus;
+}
+
+// ----------------------------------------------------------------------
+
+inline const bool ConfigServerGame::getReportAiStateChanges(void)
+{
+	return data->reportAiStateChanges;
+}
+
+// ----------------------------------------------------------------------
+
+inline const bool ConfigServerGame::getReportAiWarnings(void)
+{
+	return data->reportAiWarnings;
+}
+
+// ----------------------------------------------------------------------
+
+inline const bool ConfigServerGame::getSendBreadcrumbs(void)
+{
+	return data->sendBreadcrumbs;
+}
+
+// ----------------------------------------------------------------------
+
+inline const bool ConfigServerGame::getMovementWhileRetreatingThrowsException(void)
+{
+	return data->movementWhileRetreatingThrowsException;
+}
+
+// ----------------------------------------------------------------------
+
+inline const bool ConfigServerGame::getHibernateEnabled(void)
+{
+	return data->hibernateEnabled;
+}
+
+// ----------------------------------------------------------------------
+
+inline const bool ConfigServerGame::getHibernateProxies(void)
+{
+	return data->hibernateProxies;
+}
+
+// ----------------------------------------------------------------------
+
+inline const float ConfigServerGame::getHibernateDistance(void)
+{
+	return data->hibernateDistance;
+}
+
+// ----------------------------------------------------------------------
+
+inline const float ConfigServerGame::getMinHibernateAlter(void)
+{
+	return data->minHibernateAlter;
+}
+
+// ----------------------------------------------------------------------
+
+inline const float ConfigServerGame::getMaxHibernateAlter(void)
+{
+	return data->maxHibernateAlter;
+}
+
+// ----------------------------------------------------------------------
+
+inline const int ConfigServerGame::getAiPulseQueuePerFrame()
+{
+	return data->aiPulseQueuePerFrame;
+}
+
+// ----------------------------------------------------------------------
+
+inline const unsigned int ConfigServerGame::getAiPulseQueueMaxWaitTimeMs()
+{
+	return static_cast<unsigned int>(data->aiPulseQueueMaxWaitTimeMs);
+}
+
+// ----------------------------------------------------------------------
+
+inline const int ConfigServerGame::getSecondsPerResourceTick()
+{
+	return data->secondsPerResourceTick;
+}
+
+// ----------------------------------------------------------------------
+
+inline const uint32 ConfigServerGame::getResourceTimeScale()
+{
+	return static_cast<uint32>(data->resourceTimeScale);
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getDisableCreateQueue()
+{
+	return data->disableCreateQueue;
+}
+
+//-----------------------------------------------------------------------
+
+inline const float ConfigServerGame::getMaxTeleportDistanceWithoutSceneWarp()
+{
+	return data->maxTeleportDistanceWithoutSceneWarp;
+}
+
+//-----------------------------------------------------------------------
+
+inline const float ConfigServerGame::getMaxInstrumentPlayDistance()
+{
+	return data->maxInstrumentPlayDistance;
+}
+
+//-----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getCharacterNameGeneratorDirectory(void)
+{
+	return data->characterNameGeneratorDirectory;
+}
+
+//-----------------------------------------------------------------------
+
+inline const int ConfigServerGame::getMaxLotsPerAccount()
+{
+	return data->maxLotsPerAccount;
+}
+
+// ----------------------------------------------------------------------
+
+inline const int ConfigServerGame::getUnsafeLogoutTimeMs()
+{
+	return data->unsafeLogoutTimeMs;
+}
+
+// ----------------------------------------------------------------------
+
+inline const unsigned long ConfigServerGame::getIdleLogoutTimeSec()
+{
+	return static_cast<unsigned long>(data->idleLogoutTimeSec);
+}
+
+// ----------------------------------------------------------------------
+
+inline const unsigned long ConfigServerGame::getIdleLogoutTimeAfterCharacterTransferSec()
+{
+	return static_cast<unsigned long>(data->idleLogoutTimeAfterCharacterTransferSec);
+}
+
+// ----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getFallbackDefaultWeapon(void)
+{
+	return data->fallbackDefaultWeapon;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getLogObservers()
+{
+	return data->logObservers;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMissionRequestsPerFrame()
+{
+	return data->missionRequestsPerFrame;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getDisableMissions()
+{
+	return data->disableMissions;
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned long ConfigServerGame::getLoopProfileLogThresholdMs()
+{
+	return static_cast<unsigned long>(data->loopProfileLogThresholdMs);
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned long ConfigServerGame::getGroundLoopProfileLogThresholdMs()
+{
+	return static_cast<unsigned long>(data->groundLoopProfileLogThresholdMs);
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned long ConfigServerGame::getSpaceLoopProfileLogThresholdMs()
+{
+	return static_cast<unsigned long>(data->spaceLoopProfileLogThresholdMs);
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getPvpDisableCombat()
+{
+	return data->pvpDisableCombat;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getLogObjectLoading()
+{
+	return data->logObjectLoading;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnforcePlayerTriggerVolumesOnly()
+{
+	return data->enforcePlayerTriggerVolumesOnly;	
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getLocationTargetCheckIntervalSec()
+{
+	return data->locationTargetCheckIntervalSec;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char * ConfigServerGame::getGameServiceBindInterface()
+{
+	return data->gameServiceBindInterface;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getLogPvpUpdates()
+{
+	return data->logPvpUpdates;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getServerSpawnLimit()
+{
+	return data->serverSpawnLimit;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getSpawnQueueSize()
+{
+	return data->spawnQueueSize;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getFramesPerSpawn()
+{
+	return data->framesPerSpawn;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableSpawningNearLoadBeacons()
+{
+	return data->enableSpawningNearLoadBeacons;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getNpcConversationDistance()
+{
+	//@todo: this value should actually come from the radial_menu datatable, 
+	// CONVERSE_START entry
+	return data->npcConversationDistance;
+}
+
+// ----------------------------------------------------------------------
+
+inline const float ConfigServerGame::getWatchedHarvesterAlterTime()
+{
+	return data->watchedHarvesterAlterTime;
+}
+
+// ----------------------------------------------------------------------
+
+inline const float ConfigServerGame::getUnWatchedHarvesterAlterTime()
+{
+	return data->unwatchedHarvesterAlterTime;
+}
+
+// ----------------------------------------------------------------------
+
+inline const float ConfigServerGame::getHarvesterExtractionRateMultiplier()
+{
+	return data->harvesterExtractionRateMultiplier;
+}
+
+// ----------------------------------------------------------------------
+
+inline const bool ConfigServerGame::getDeactivateHarvesterIfDamaged()
+{
+	return data->deactivateHarvesterIfDamaged;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getNonCriticalTasksPerFrame()
+{
+	return data->nonCriticalTasksPerFrame;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMaxMoney()
+{
+	return data->maxMoney;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMaxGalacticReserveDepositBillion()
+{
+	return data->maxGalacticReserveDepositBillion;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMaxMoneyTransfer()
+{
+	return data->maxMoneyTransfer;
+}
+
+//------------------------------------------------------------------------------------------
+
+inline int ConfigServerGame::getMaxFreeTrialMoney()
+{
+	return data->maxFreeTrialMoney;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnablePreload()
+{
+	return data->enablePreload;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getBuildPreloadLists()
+{
+	return data->buildPreloadLists;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getLogAuthTransfer()
+{
+	return data->logAuthTransfer;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getOverrideUpdateRadius()
+{
+	return data->overrideUpdateRadius;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getBuildingUpdateRadiusMultiplier()
+{
+	return data->buildingUpdateRadiusMultiplier;
+}
+
+//------------------------------------------------------------------------------------------
+
+inline int ConfigServerGame::getMaxPopulationForNewbieTravel()
+{
+	return data->maxPopulationForNewbieTravel;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getNumberOfMoveObjectLists()
+{
+	return data->numberOfMoveObjectLists;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMinNewbieTravelLocations()
+{
+	return data->minNewbieTravelLocations;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getDatabasePositionUpdateLongDelayIntervalMs()
+{
+	return data->databasePositionUpdateLongDelayIntervalMs;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getDatabasePositionUpdateShortDelayIntervalMs()
+{
+	return data->databasePositionUpdateShortDelayIntervalMs;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getLogPositionUpdates()
+{
+	return data->logPositionUpdates;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getCheckOriginCreates()
+{
+	return data->checkOriginCreates;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableWho()
+{
+	return data->enableWho;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getDebugGroupChat()
+{
+	return data->debugGroupChat;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getNumberOfMissionsWantedInMissionBag()
+{
+	return data->numberOfMissionsWantedInMissionBag;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMissionCreationQueueSize()
+{
+	return data->missionCreationQueueSize;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getConnectToAllGameServersTimeout()
+{
+	return data->connectToAllGameServersTimeout;
+}
+
+//------------------------------------------------------------------------------------------
+
+inline int ConfigServerGame::getHouseItemLimitMultiplier()
+{
+	return data->houseItemLimitMultiplier;
+}
+
+
+inline int ConfigServerGame::getMaxHouseItemLimit()
+{
+	return data->maxHouseItemLimit;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getDemandLoadHouseContents()
+{
+	return data->demandLoadHouseContents;
+}
+
+//------------------------------------------------------------------------------------------
+
+inline int ConfigServerGame::getUnloadHouseContentsTime()
+{
+	return data->unloadHouseContentsTime;
+}
+
+//------------------------------------------------------------------------------------------
+
+inline int ConfigServerGame::getLoadHouseContentsDelaySeconds()
+{
+	return data->loadHouseContentsDelaySeconds;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getBoundarySpawningAllowed()
+{
+	return data->boundarySpawningAllowed;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getDebugMovement()
+{
+	return data->debugMovement;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getSkipUnreliableTransformsForOtherCells()
+{
+	return data->skipUnreliableTransformsForOtherCells;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMaxPlayerSanityCheckFailures()
+{
+	return data->maxPlayerSanityCheckFailures;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getDisablePlayerSanityChecker()
+{
+	return data->disablePlayerSanityChecker;
+}
+
+//-------------------------------------------------------------------
+
+inline float ConfigServerGame::getUpdateRange7PacketsSquared()
+{
+	return data->updateRange7Packets * data->updateRange7Packets;
+}
+
+//-------------------------------------------------------------------
+
+inline float ConfigServerGame::getUpdateRange6PacketsSquared()
+{
+	return data->updateRange6Packets * data->updateRange6Packets;
+}
+
+//-------------------------------------------------------------------
+
+inline float ConfigServerGame::getUpdateRange5PacketsSquared()
+{
+	return data->updateRange5Packets * data->updateRange5Packets;
+}
+
+//-------------------------------------------------------------------
+
+inline float ConfigServerGame::getUpdateRange4PacketsSquared()
+{
+	return data->updateRange4Packets * data->updateRange4Packets;
+}
+
+//-------------------------------------------------------------------
+
+inline float ConfigServerGame::getUpdateRange3PacketsSquared()
+{
+	return data->updateRange3Packets * data->updateRange3Packets;
+}
+
+//-------------------------------------------------------------------
+
+inline float ConfigServerGame::getUpdateRange2PacketsSquared()
+{
+	return data->updateRange2Packets * data->updateRange2Packets;
+}
+
+//-------------------------------------------------------------------
+
+inline float ConfigServerGame::getUpdateRange1PacketsSquared()
+{
+	return data->updateRange1Packets * data->updateRange1Packets;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char *ConfigServerGame::getInstantDeleteListDataTableName()
+{
+	return data->instantDeleteListDataTableName;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getSendFrameProfilerInfo()
+{
+	return data->sendFrameProfilerInfo;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getLogAllCommands()
+{
+	return data->logAllCommands;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableDebugControllerMessageSpam()
+{
+	return data->enableDebugControllerMessageSpam;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getDebugPvp()
+{
+	return data->debugPvp;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getAllowMasterObjectCreation()
+{
+	return data->allowMasterObjectCreation;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getMountsEnabled()
+{
+	return data->mountsEnabled;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getMountsSanityCheckerEnabled()
+{
+	return data->mountsSanityCheckerEnabled;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getMountsSanityCheckerBroadcastEnabled()
+{
+	return data->mountsSanityCheckerBroadcastEnabled;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMountsSanityCheckerBroadcastLimit()
+{
+	return data->mountsSanityCheckerBroadcastLimit;
+}
+
+// ----------------------------------------------------------------------
+
+inline const int ConfigServerGame::getUniverseCheckFrequencySeconds()
+{
+	return data->universeCheckFrequencySeconds;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getMoveSimEnabled ()
+{
+	return data->moveSimEnabled;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getExceptionOnObjVarZeroLengthArray()
+{
+	return data->exceptionOnObjVarZeroLengthArray;
+}
+
+inline bool ConfigServerGame::getTrackNonAuthoritativeObjvarSets()
+{
+	return data->trackNonAuthoritativeObjvarSets;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getTriggerVolumeWarpDistance()
+{
+	return data->triggerVolumeWarpDistance;
+}
+
+//-------------------------------------------------------------------
+
+inline const NetworkId & ConfigServerGame::getMaxGoldNetworkId(void)
+{
+	return data->maxGoldNetworkId;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getFatalOnMovingGoldObject()
+{
+	return data->fatalOnMovingGoldObject;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getShipsEnabled()
+{
+	return data->shipsEnabled;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getLogoutTriggerEnabled()
+{
+	return data->logoutTriggerEnabled;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getBehaviorMaxAvoidanceStuckTime()
+{
+	return data->behaviorMaxAvoidanceStuckTime;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getBehaviorMaxAvoidancePersistenceFrameCount()
+{
+	return data->behaviorMaxAvoidancePersistenceFrameCount;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getVeteranRewardTradeInWaitPeriodSeconds()
+{
+	return data->veteranRewardTradeInWaitPeriodSeconds;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableVeteranRewards()
+{
+	return data->enableVeteranRewards;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableSceneGlobalData()
+{
+	        return data->enableSceneGlobalData;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableOneYearAnniversary()
+{
+	return data->enableOneYearAnniversary;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMinEntitledTime()
+{
+	return data->minEntitledTime;
+}
+
+// ----------------------------------------------------------------------
+#ifdef _DEBUG
+inline float ConfigServerGame::getManufactureTimeOverride()
+{
+	return data->manufactureTimeOverride;
+}
+#endif
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getTheaterCreationLimitMilliseconds()
+{
+	return data->theaterCreationLimitMilliseconds;
+}
+
+//------------------------------------------------------------
+
+inline bool ConfigServerGame::getFatalOnGoldPobChange()
+{
+	return data->fatalOnGoldPobChange;
+}
+
+//------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableClientControllerMessageCheck()
+{
+	return data->enableClientControllerMessageCheck;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getMaxSmallCreatureHeight()
+{
+	return data->maxSmallCreatureHeight;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getSmallCreatureUpdateRadius()
+{
+	return data->smallCreatureUpdateRadius;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getMaxMediumCreatureHeight()
+{
+	return data->maxMediumCreatureHeight;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getMediumCreatureUpdateRadius()
+{
+	return data->mediumCreatureUpdateRadius;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getLargeCreatureUpdateRadius()
+{
+	return data->largeCreatureUpdateRadius;
+}
+
+inline int ConfigServerGame::getCoolDownPersistThresholdSeconds()
+{
+	return data->coolDownPersistThresholdSeconds;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getLoginAsBountyHunter()
+{
+	return data->loginAsBountyHunter;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getSendAsteroidExtents()
+{
+	return data->sendAsteroidExtents;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getCreateZoneObjects()
+{
+	return data->createZoneObjects;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getShipUpdatesPerSecond()
+{
+	return data->shipUpdatesPerSecond;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getDebugSpaceVisibilityManager()
+{
+	return data->debugSpaceVisibilityManager;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getGroundFrameRateLimit()
+{
+	return data->groundFrameRateLimit;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getSpaceFrameRateLimit()
+{
+	return data->spaceFrameRateLimit;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::isSpaceAiLoggingEnabled()
+{
+	return data->aiLoggingEnabled;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::isAiLoggingEnabled()
+{
+	return data->aiLoggingEnabled;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getShipShotValidationEnabled()
+{
+	return data->shipShotValidationEnabled;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getSpaceAiEnemySearchesPerFrame()
+{
+	return data->spaceAiEnemySearchesPerFrame;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getGroundShouldSleep()
+{
+	return data->groundShouldSleep;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getSpaceShouldSleep()
+{
+	return data->spaceShouldSleep;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getShipMoveValidationEnabled()
+{
+	return data->shipMoveValidationEnabled;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getShipMoveCheckIntervalMs()
+{
+	return data->shipMoveCheckIntervalMs;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getShipMoveCheckFudgeTimeMs()
+{
+	return data->shipMoveCheckFudgeTimeMs;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getShipMoveCheckTolerance()
+{
+	return data->shipMoveCheckTolerance;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getShipMoveCheckTimeToleranceSeconds()
+{
+	return data->shipMoveCheckTimeToleranceSeconds;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getSpaceAiAvoidanceChecksPerFrame()
+{
+	return data->spaceAiAvoidanceChecksPerFrame;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getSpaceAiUsePathRefinement()
+{
+	return data->spaceAiUsePathRefinement;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::isAiClientDebugEnabled()
+{
+	return data->aiClientDebugEnabled;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getShipClientUpdateDebugEnabled()
+{
+	return data->shipClientUpdateDebugEnabled;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getSpacePlanetServerUpdatesPerFrame()
+{
+	return data->spacePlanetServerUpdatesPerFrame;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getShipLoadInvulnerableTimeWithoutClient()
+{
+	return data->shipLoadInvulnerableTimeWithoutClient;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getShipLoadInvulnerableTimeWithClient()
+{
+	return data->shipLoadInvulnerableTimeWithClient;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getCreatureLoadInvulnerableTimeWithoutClient()
+{
+	return data->creatureLoadInvulnerableTimeWithoutClient;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getCreatureLoadInvulnerableTimeWithClient()
+{
+	return data->creatureLoadInvulnerableTimeWithClient;
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned long ConfigServerGame::getLineOfSightCacheDurationMs()
+{
+	return static_cast<unsigned long>(data->lineOfSightCacheDurationMs);
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getLineOfSightCacheMinHeight()
+{
+	return data->lineOfSightCacheMinHeight;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getLineOfSightLocationRoundValue()
+{
+	return data->lineOfSightLocationRoundValue;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getBuildoutAreaEditingEnabled()
+{
+	return data->buildoutAreaEditingEnabled;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getDebugFloorPathNodeCount()
+{
+	return data->debugFloorPathNodeCount;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getGcwRecalcTimeDayOfWeek()
+{
+	return data->gcwRecalcTimeDayOfWeek;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getGcwRecalcTimeHour()
+{
+	return data->gcwRecalcTimeHour;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getGcwRecalcTimeMinute()
+{
+	return data->gcwRecalcTimeMinute;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getGcwRecalcTimeSecond()
+{
+	return data->gcwRecalcTimeSecond;
+}
+
+// ----------------------------------------------------------------------
+
+inline std::vector<std::pair<std::pair<int, int>, std::pair<int, int> > > const & ConfigServerGame::getGcwScoreDecayTime()
+{
+	return data->gcwScoreDecayTime;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getChatStatisticsReportIntervalSeconds()
+{
+	return data->chatStatisticsReportIntervalSeconds;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getChatSpamLimiterNumCharacters()
+{
+	return data->chatSpamLimiterNumCharacters;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getChatSpamLimiterIntervalMinutes()
+{
+	return data->chatSpamLimiterIntervalMinutes;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getChatSpamLimiterEnabledForFreeTrial()
+{
+	return data->chatSpamLimiterEnabledForFreeTrial;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getChatSpamNotifyPlayerWhenLimitedIntervalSeconds()
+{
+	return data->chatSpamNotifyPlayerWhenLimitedIntervalSeconds;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getPendingLoadRequestLimit()
+{
+	return data->pendingLoadRequestLimit;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableCityCitizenshipFixup()
+{
+	return data->enableCityCitizenshipFixup;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getCityCitizenshipInactivePackupStartTimeEpoch()
+{
+	return data->cityCitizenshipInactivePackupStartTimeEpoch;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getCityCitizenshipInactivePackupInactiveTimeSeconds()
+{
+	return data->cityCitizenshipInactivePackupInactiveTimeSeconds;
+}
+
+//-----------------------------------------------------------------------
+
+inline const char *ConfigServerGame::getRetroactivePlayerCityCreationTimeFilename()
+{
+	return data->retroactivePlayerCityCreationTimeFilename;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getWardenSquelchDurationSeconds()
+{
+	return data->wardenSquelchDurationSeconds;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableWarden()
+{
+	return data->enableWarden;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableWardenCanSquelchSecuredLogin()
+{
+	return data->enableWardenCanSquelchSecuredLogin;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableWardenToDeputizeWarden()
+{
+	return data->enableWardenToDeputizeWarden;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getDisableCollectionServerFirstGrantForSecuredLogin()
+{
+	return data->disableCollectionServerFirstGrantForSecuredLogin;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getLocateStructureCommandIntervalSeconds()
+{
+	return data->locateStructureCommandIntervalSeconds;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getLocateVendorCommandIntervalSeconds()
+{
+	return data->locateVendorCommandIntervalSeconds;
+}
+
+//-----------------------------------------------------------------------
+
+inline size_t ConfigServerGame::getCtsDefaultScriptDictionarySizeBytes()
+{
+	return static_cast<size_t>(data->ctsDefaultScriptDictionarySizeBytes);
+}
+
+//-----------------------------------------------------------------------
+
+inline const char *ConfigServerGame::getRetroactiveCtsHistoryFilename()
+{
+	return data->retroactiveCtsHistoryFilename;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getAllowIgnoreFreeCtsTimeRestriction()
+{
+	return data->allowIgnoreFreeCtsTimeRestriction;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getGroupPickupPointApprovalRangeSquared()
+{
+	return data->groupPickupPointApprovalRangeSquared;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getGroupPickupPointTimeLimitSeconds()
+{
+	return data->groupPickupPointTimeLimitSeconds;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getGroupPickupTravelPlayerCityPercent()
+{
+	return data->groupPickupTravelPlayerCityPercent;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getGroupInviteInviterCombatRestriction()
+{
+	return data->groupInviteInviterCombatRestriction;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getGroupInviteInviteeCombatRestriction()
+{
+	return data->groupInviteInviteeCombatRestriction;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getGroupJoinInviterCombatRestriction()
+{
+	return data->groupJoinInviterCombatRestriction;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getGroupJoinInviteeCombatRestriction()
+{
+	return data->groupJoinInviteeCombatRestriction;
+}
+
+//-----------------------------------------------------------------------
+
+inline size_t ConfigServerGame::getCharacterMatchMaxMatchCount()
+{
+	return static_cast<size_t>(data->characterMatchMaxMatchCount);
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableOccupyUnlockedSlotCommand()
+{
+	return data->enableOccupyUnlockedSlotCommand;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableVacateUnlockedSlotCommand()
+{
+	return data->enableVacateUnlockedSlotCommand;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableSwapUnlockedSlotCommand()
+{
+	return data->enableSwapUnlockedSlotCommand;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getOccupyVacateUnlockedSlotCommandCooldownSeconds()
+{
+	return data->occupyVacateUnlockedSlotCommandCooldownSeconds;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getAccountFeatureIdForMonthlyBoosterPack()
+{
+	return data->accountFeatureIdForMonthlyBoosterPack;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ConfigServerGame::getAccountFeatureIdForTcgBetaAnnouncement()
+{
+	return data->accountFeatureIdForTcgBetaAnnouncement;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getLogEventObjectCreation()
+{
+	return data->logEventObjectCreation;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getLogEventObjectDestruction()
+{
+	return data->logEventObjectDestruction;
+}
+
+//-----------------------------------------------------------------------
+
+inline float ConfigServerGame::getRegionFlagUpdateTimeSecs()
+{
+	return data->regionFlagUpdateTime;
+}
+
+// ----------------------------------------------------------------------
+
+inline const char *ConfigServerGame::getHousePackupAccountListDataTableName()
+{
+	return data->housePackupAccountListDataTableName;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getPickDropAllRoomItemsNumberOfItemsPerRound()
+{
+	return data->pickDropAllRoomItemsNumberOfItemsPerRound;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableCovertImperialMercenary()
+{
+	return data->enableCovertImperialMercenary;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableOvertImperialMercenary()
+{
+	return data->enableOvertImperialMercenary;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableCovertRebelMercenary()
+{
+	return data->enableCovertRebelMercenary;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableOvertRebelMercenary()
+{
+	return data->enableOvertRebelMercenary;
+}
+
+inline int ConfigServerGame::getBroadcastGcwScoreToOtherGalaxiesIntervalSeconds()
+{
+	return data->broadcastGcwScoreToOtherGalaxiesIntervalSeconds;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getBroadcastGcwScoreToOtherGalaxies()
+{
+	return data->broadcastGcwScoreToOtherGalaxies;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getReceiveGcwScoreFromOtherGalaxies()
+{
+	return data->receiveGcwScoreFromOtherGalaxies;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getTrackGcwPercentileHistoryCount()
+{
+	return data->trackGcwPercentileHistoryCount;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getGcwFactionalPresenceDisableForSecuredLogin()
+{
+	return data->gcwFactionalPresenceDisableForSecuredLogin;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getGcwFactionalPresenceMountedPct()
+{
+	return data->gcwFactionalPresenceMountedPct;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getGcwFactionalPresenceLevelPct()
+{
+	return data->gcwFactionalPresenceLevelPct;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getGcwFactionalPresenceGcwRankBonusPct()
+{
+	return data->gcwFactionalPresenceGcwRankBonusPct;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getGcwFactionalPresenceAlignedCityBonusPct()
+{
+	return data->gcwFactionalPresenceAlignedCityBonusPct;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getGcwFactionalPresenceAlignedCityRankBonusPct()
+{
+	return data->gcwFactionalPresenceAlignedCityRankBonusPct;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getGcwFactionalPresenceAlignedCityAgeBonusPct()
+{
+	return data->gcwFactionalPresenceAlignedCityAgeBonusPct;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getGcwGuildMinMembersForGcwRegionDefender()
+{
+	return data->gcwGuildMinMembersForGcwRegionDefender;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getGcwRegionDefenderTotalBonusPct()
+{
+	return data->gcwRegionDefenderTotalBonusPct;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getGcwDaysRequiredForGcwRegionDefenderBonus()
+{
+	return data->gcwDaysRequiredForGcwRegionDefenderBonus;
+}
+
+//-------------------------------------------------------------------
+
+inline bool ConfigServerGame::getCheckNotifyRegions()
+{
+	return data->checkNotifyRegions;
+}
+
+//-------------------------------------------------------------------
+
+inline bool ConfigServerGame::getAllowRegionTriggerOverride()
+{
+	return data->allowRegionTriggerOverride;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getHyperspaceRandomOffsetRange()
+{
+	return data->hyperspaceRandomOffsetRange;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getSpawnAllResources()
+{
+	return data->spawnAllResources;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getDebugAllAreasOverpopulated()
+{
+	return data->debugAllAreasOverpopulated;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMaxWaypointsPerCharacter()
+{
+	return data->maxWaypointsPerCharacter;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getVeteranDebugTriggerAll()
+{
+	return data->veteranDebugTriggerAll;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getVeteranDebugEnableOverrideAccountAge()
+{
+	return data->veteranDebugEnableOverrideAccountAge;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getEnableNewVeteranRewards()
+{
+	return data->enableNewVeteranRewards;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getBuddyPointTimeBonus()
+{
+	return data->buddyPointTimeBonus;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getLastKnownLocationsResetTimeSec()
+{
+	return data->lastKnownLocationsResetTimeSec;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMaxMessageTosPerObjectPerFrame()
+{
+	return data->maxMessageTosPerObjectPerFrame;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMaxMessageToTimePerObjectPerFrame()
+{
+	return data->maxMessageToTimePerObjectPerFrame;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getMaxMessageToBounces()
+{
+	return data->maxMessageToBounces;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getAiBaseAggroRadius()
+{
+	return data->aiBaseAggroRadius;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getAiMaxAggroRadius()
+{
+	return data->aiMaxAggroRadius;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getAiLeashRadius()
+{
+	return data->aiLeashRadius;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getAiAssistRadius()
+{
+	return data->aiAssistRadius;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getPopulationReportTimeSeconds()
+{
+	return data->populationReportTimeSeconds;
+}
+
+// ----------------------------------------------------------------------
+
+inline float ConfigServerGame::getMaxCombatRange()
+{
+	return data->maxCombatRange;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getBlockBuildRegionPlacement()
+{
+	return data->blockBuildRegionPlacement;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getNpeMinInstancePopulation()
+{
+	return data->npeMinInstancePopulation;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConfigServerGame::getNpeMaxInstancePopulation()
+{
+	return data->npeMaxInstancePopulation;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConfigServerGame::getStripNonFreeAssetsFromPlayersInTutorial()
+{
+	return data->stripNonFreeAssetsFromPlayersInTutorial;
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/ConsentManager.cpp b/engine/server/library/serverGame/src/shared/core/ConsentManager.cpp
new file mode 100644
index 00000000..527bf6ae
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ConsentManager.cpp
@@ -0,0 +1,102 @@
+// ============================================================================
+// 
+// ConsentManager.cpp
+// Copyright Sony Online Entertainment, Inc.
+//
+// ============================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConsentManager.h"
+
+#include "sharedNetworkMessages/ConsentResponseMessage.h"
+
+#include "sharedGame/ProsePackage.h"
+
+#include "serverGame/Client.h"
+#include "serverGame/GameServer.h"
+
+#include "swgSharedNetworkMessages/ConsentRequestMessage.h"
+
+#include "StringId.h"
+
+#include <list>
+#include <list>
+
+// ============================================================================
+
+ConsentManager::ConsentManager()
+: m_consentMap(),
+  m_nextId(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+
+int ConsentManager::askConsent(const NetworkId& player, const ProsePackage& question, CallbackFunction callback)
+{
+	int newId = m_nextId++;
+
+	std::pair<int, CallbackFunction> p = std::make_pair(newId, callback);
+
+	std::map<NetworkId, std::list<std::pair<int, CallbackFunction> > >::iterator i = m_consentMap.find(player);
+	if(i == m_consentMap.end())
+	{
+		std::list<std::pair<int, CallbackFunction> > l;
+		l.push_back(p);
+		m_consentMap.insert(std::make_pair(player, l));
+	}
+	else
+	{
+		i->second.push_back(p);
+	}
+	
+	Client *client = GameServer::getInstance().getClient(player);
+	ConsentRequestMessage msg(question, newId);
+	if(client)
+		client->send(msg, true);
+	return newId;
+}
+
+//-----------------------------------------------------------------------------
+
+void ConsentManager::removePlayerConsentRequests(const NetworkId& player)
+{
+	m_consentMap.erase(player);
+}
+
+//-----------------------------------------------------------------------------
+
+void ConsentManager::handleResponse (const ConsentResponseMessage& msg)
+{
+	const NetworkId& player = msg.getNetworkId();
+	int  id = msg.getId();
+	bool response = msg.getResponse();
+
+	//look for the player in the mapping
+	std::map<NetworkId, std::list<std::pair<int, CallbackFunction> > >::iterator i = m_consentMap.find(player);
+	if(i != m_consentMap.end())
+	{
+		//look for the unique consent id in the mapping
+		std::list<std::pair<int, CallbackFunction> > l = i->second;
+		for(std::list<std::pair<int, CallbackFunction> >::iterator i2 = l.begin(); i2 != l.end(); ++i2)
+		{
+			if(i2->first == id)
+			{
+				//call the callback function
+				CallbackFunction func = i2->second;
+				if(func)
+					func(player, id, response);
+				//remove the request from the list now that it's been processed
+				l.erase(i2);
+				//remove the player from the mapping if they have no more consent requests pending
+				if(l.empty())
+				{
+					m_consentMap.erase(player);
+				}
+				break;
+			}
+		}
+	}
+}
+
+// ============================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/ConsentManager.h b/engine/server/library/serverGame/src/shared/core/ConsentManager.h
new file mode 100644
index 00000000..902ff46d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ConsentManager.h
@@ -0,0 +1,46 @@
+// ============================================================================
+// 
+// ConsentManager.h
+// Copyright Sony Online Entertainment, Inc.
+//
+// ============================================================================
+
+#ifndef INCLUDED_ConsentManager_H
+#define INCLUDED_ConsentManager_H
+
+#include "Singleton/Singleton.h"
+#include "sharedMessageDispatch/Receiver.h"
+
+#include "sharedFoundation/NetworkId.h"
+
+class ConsentResponseMessage;
+class ProsePackage;
+class StringId;
+
+//-----------------------------------------------------------------------------
+
+class ConsentManager : public Singleton<ConsentManager>
+{
+public:
+	typedef void (*CallbackFunction) (const NetworkId& player, int id, bool response);
+
+	ConsentManager();
+	int askConsent(const NetworkId& player, const ProsePackage& question, CallbackFunction callback);
+	void removePlayerConsentRequests(const NetworkId& player);
+	void handleResponse(const ConsentResponseMessage& msg);
+
+public:
+
+private:
+	// Disable
+	ConsentManager(ConsentManager const &);
+	ConsentManager &operator =(ConsentManager const &);
+
+private:
+	stdmap<NetworkId, stdlist<std::pair<int, CallbackFunction> >::fwd >::fwd m_consentMap;
+	int m_nextId;
+};
+
+// ============================================================================
+
+#endif // INCLUDED_ConsentManager_H
diff --git a/engine/server/library/serverGame/src/shared/core/ContainerInterface.cpp b/engine/server/library/serverGame/src/shared/core/ContainerInterface.cpp
new file mode 100644
index 00000000..2fa62423
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ContainerInterface.cpp
@@ -0,0 +1,1398 @@
+// ======================================================================
+//
+// ContainerInterface.cpp
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ContainerInterface.h"
+
+#include "serverGame/Chat.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/VeteranRewardManager.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedGame/GameObjectTypes.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/ContainedByProperty.h"
+#include "sharedObject/Container.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/PortalProperty.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/SlottedContainmentProperty.h"
+#include "sharedObject/SlotIdArchive.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/VolumeContainer.h"
+#include "sharedObject/VolumeContainmentProperty.h"
+
+// ======================================================================
+
+namespace ContainerInterfaceNamespace
+{
+
+	// ----------------------------------------------------------------------
+
+	bool findContainingBankPlayer(ServerObject const &item, CreatureObject const *&player)
+	{
+		ServerObject const *lastContainer = &item;
+
+		while (lastContainer)
+		{
+			//-- are we contained?
+			Object const * const o = ContainerInterface::getContainedByObject(*lastContainer);
+			ServerObject const * const containedBy = o ? o->asServerObject() : 0;
+			if (!containedBy)
+				return false;
+
+			//-- are we contained by a creature?
+			CreatureObject const * const creature = containedBy->asCreatureObject();
+
+			if (creature)
+			{
+				if (!creature->isPlayerControlled())
+					return false;
+
+				if (creature->getBank() == lastContainer)
+				{
+					//-- if player is passed in non-null, the found creature must match it
+					if (player && player != creature)
+						return false;
+
+					player = creature;
+					return true;
+				}
+			}
+
+			lastContainer = containedBy;
+		}
+
+		return false;
+	}
+
+	// ----------------------------------------------------------------------
+
+	void logBankSubContentsMoved(CreatureObject const &player, ServerObject &item, bool added)
+	{
+		Container const * const container = ContainerInterface::getContainer(item);
+		if (!container)
+			return;
+
+		for (ContainerConstIterator it = container->begin(); it != container->end(); ++it)
+		{
+			CachedNetworkId const &id = *it;
+			ServerObject * const obj = safe_cast<ServerObject *>(id.getObject());
+			if (obj)
+			{
+				if (added)
+				{
+					LOG("CustomerService", ("Bank:%s has added %s to their bank, contained in [%s]",
+						PlayerObject::getAccountDescription(&player).c_str(),
+						ServerObject::getLogDescription(obj).c_str(),
+						item.getNetworkId().getValueString().c_str()));
+				}
+				else
+				{
+					LOG("CustomerService", ("Bank:%s has removed %s from their bank, contained in [%s]",
+						PlayerObject::getAccountDescription(&player).c_str(),
+						ServerObject::getLogDescription(obj).c_str(),
+						item.getNetworkId().getValueString().c_str()));
+				}
+
+				logBankSubContentsMoved(player, *obj, added);
+			}
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	bool checkSlottedContainerRemove(ServerObject &item, ServerObject const *transferer, Container::ContainerErrorCode &error)
+	{
+		error = Container::CEC_Success;
+
+		if (transferer)
+		{
+			// Check each slot to make sure it can be manipulated.
+			SlottedContainmentProperty * const slottedProp = ContainerInterface::getSlottedContainmentProperty(item);
+			if (!slottedProp)
+			{
+				WARNING_STRICT_FATAL(true, ("Invaid item (no slottedContainmentProperty) in transferItemToSlottedContainer"));
+				error = Container::CEC_WrongType;
+				return false;
+			}
+
+			if (!slottedProp->canManipulateArrangement(slottedProp->getCurrentArrangement()))
+			{
+				error = Container::CEC_WrongType;
+				return false;
+			}
+		}
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	bool checkTransferScripts(ServerObject *destination, ServerObject &item, ServerObject *transferer, Container::ContainerErrorCode &error)
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("checkTransferScripts");
+
+		error = Container::CEC_Success;
+
+		NetworkId const &transfererId = transferer ? transferer->getNetworkId() : NetworkId::cms_invalid;
+		ServerObject * const source = safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(item));
+		NetworkId const &sourceId = source ? source->getNetworkId() : NetworkId::cms_invalid;
+		NetworkId const &destId = destination ? destination->getNetworkId() : NetworkId::cms_invalid;
+
+		if (source)
+		{
+			if (source->getScriptObject())
+			{
+				ScriptParams params;
+				params.addParam(destId);
+				params.addParam(transfererId);
+				params.addParam(item.getNetworkId());
+
+				//-- Handle source container's scripts.
+				if (source->getScriptObject())
+				{
+					if (source->getScriptObject()->trigAllScripts(Scripting::TRIG_ABOUT_TO_LOSE_ITEM, params) == SCRIPT_OVERRIDE)
+					{
+						error = Container::CEC_BlockedByScript;
+						LOG("ScriptInvestigation", ("Source tried to prevent container transfer"));
+						return false;
+					}
+				}
+			}
+
+			if (!source->onContainerAboutToLoseItem(destination, item, transferer))
+			{
+				//-- Source container prevented the container from losing the item.
+				error = Container::CEC_BlockedByScript;
+				return false;
+			}
+			else
+			{
+				if (ContainerInterface::getSlottedContainer(*source))
+				{
+					if (!checkSlottedContainerRemove(item, transferer, error))
+					{
+						error = Container::CEC_BlockedBySourceContainer;
+						return false;
+					}
+				}
+			}
+		}
+
+		if (destination)
+		{
+			if (transferer)
+			{
+				// if the item contains any no trade items, the item
+				// and destination must be owned by the transferer
+				if (item.markedNoTradeRecursive(false, true))
+				{
+					// the item and destination must be owned by the transferer
+					if (   destination->getOwnerId() != transferer->getNetworkId()
+						&& (   !transferer->getClient()
+						|| !transferer->getClient()->isGod()))
+					{
+						error = Container::CEC_NoPermission;
+						return false;
+					}
+
+					if (   item.getOwnerId() != transferer->getNetworkId()
+						&& (   !transferer->getClient()
+						|| !transferer->getClient()->isGod()))
+					{
+						error = Container::CEC_NoPermission;
+						return false;
+					}
+				}
+				// item doesn't contain any no trade items, but the item itself is no trade
+				else if (!item.isPlayerControlled() && item.markedNoTrade())
+				{
+					// item is no trade, the destination must be owned by the transferer
+					if (   destination->getOwnerId() != transferer->getNetworkId()
+						&& (   !transferer->getClient()
+						|| !transferer->getClient()->isGod()))
+					{
+						error = Container::CEC_NoPermission;
+						return false;
+					}
+
+					if (item.markedNoTradeShared(true))
+					{
+						// if the no trade item is a "shared" no trade item and is immediately
+						// contained in a structure cell, and is being transferred to the
+						// transferer's inventory (i.e. picked up), also allow the transfer if
+						// the transferer is on the same account as the current owner of the item
+						bool blockedByNoTrade = false;
+						if (item.getOwnerId() != transferer->getNetworkId())
+						{
+							blockedByNoTrade = true;
+
+							ServerObject const * const containedBy = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(item));
+							if (containedBy && containedBy->asCellObject())
+							{
+								CreatureObject const * const transfererCreatureObject = transferer->asCreatureObject();
+								if (transfererCreatureObject && (transfererCreatureObject->getInventory() == destination))
+								{
+									PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(transfererCreatureObject);
+									if (playerObject && (playerObject->getStationId() == NameManager::getInstance().getPlayerStationId(item.getOwnerId())))
+										blockedByNoTrade = false;
+								}
+							}
+						}
+
+						if (   blockedByNoTrade
+							&& (   !transferer->getClient()
+							|| !transferer->getClient()->isGod()))
+						{
+							error = Container::CEC_NoPermission;
+							return false;
+						}
+					}
+					else
+					{
+						// just regular no trade item, so the item must be owned by the transferer
+						if (   item.getOwnerId() != transferer->getNetworkId()
+							&& (   !transferer->getClient()
+							|| !transferer->getClient()->isGod()))
+						{
+							error = Container::CEC_NoPermission;
+							return false;
+						}
+					}
+				}
+			}
+
+			if (destination->getScriptObject())
+			{
+				ScriptParams params;
+				params.addParam(sourceId);
+				params.addParam(transfererId);
+				params.addParam(item.getNetworkId());
+
+				//-- Call scripts on destination container owner.
+				if (destination->getScriptObject())
+				{
+					if (destination->getScriptObject()->trigAllScripts(Scripting::TRIG_ABOUT_TO_RECEIVE_ITEM, params) == SCRIPT_OVERRIDE)
+					{
+						LOG("ScriptInvestigation", ("Destination tried to prevent container transfer"));
+						error = Container::CEC_BlockedByScript;
+						return false;
+					}
+				}
+			}
+
+			Container::ContainerErrorCode const destinationResult = static_cast<Container::ContainerErrorCode>(destination->onContainerAboutToGainItem(item, transferer));
+			if (destinationResult != Container::CEC_Success)
+			{
+				error = destinationResult;
+				return false;
+			}
+		}
+
+		if (item.getScriptObject())
+		{
+			ScriptParams params;
+			params.addParam(destId);
+			params.addParam(transfererId);
+
+			if (item.getScriptObject()->trigAllScripts(Scripting::TRIG_ABOUT_TO_BE_XFERRED, params) == SCRIPT_OVERRIDE)
+			{
+				LOG("ScriptInvestigation", ("Item tried to prevent container transfer"));
+				error = Container::CEC_BlockedByScript;
+				return false;
+			}
+		}
+
+		if (!item.onContainerAboutToTransfer(destination, transferer))
+		{
+			error = Container::CEC_BlockedByItemBeingTransferred;
+			return false;
+		}
+
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	bool sharedTransferBegin(ServerObject &item, ServerObject *&sourceObject, Container *&sourceContainer, Container::ContainerErrorCode &error)
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("sharedTransferBegin");
+		error = Container::CEC_Success;
+		ContainedByProperty * const containedBy = ContainerInterface::getContainedByProperty(item);
+		if (!containedBy || !containedBy->getContainedBy())
+		{
+			// This item is not contained by anything!
+			// This means it is in the world!
+			// Return null for the source container, but succeed.
+			sourceContainer = NULL;
+			return true;
+		}
+
+		ServerObject * const source = containedBy->getContainedBy()->asServerObject();
+		sourceObject = source;
+		if (!source)
+		{
+			WARNING_STRICT_FATAL(true, ("This item's source was not found!"));
+			error = Container::CEC_NotFound;
+			return false;
+		}
+
+		sourceContainer = ContainerInterface::getContainer(*source);
+		if (!sourceContainer)
+		{
+			error = Container::CEC_NoContainer;
+			WARNING_STRICT_FATAL(true, ("This source contains stuff, but has no property!!"));
+			return false;
+		}
+
+		return true;
+	}
+
+	// -----------------------------------------------------------------------
+
+	bool handleTransferSource(Container *source, ServerObject &item, Container::ContainerErrorCode &error)
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("handleTransferSource");
+		error = Container::CEC_Success;
+		return !source || source->remove(item, error);
+	}
+
+	// -----------------------------------------------------------------------
+
+	void handleTransferScripts(ServerObject &item, ServerObject *sourceObject, ServerObject *destination, ServerObject *transferer, Container::ContainerErrorCode &error)
+	{
+		error = Container::CEC_Success;
+		NetworkId const transfererId = transferer ? transferer->getNetworkId() : NetworkId::cms_invalid;
+		NetworkId const sourceId = sourceObject ? sourceObject->getNetworkId() : NetworkId::cms_invalid;
+		NetworkId const destinationId = destination ? destination->getNetworkId() : NetworkId::cms_invalid;
+
+		if (sourceObject)
+		{
+			if (sourceObject->getScriptObject())
+			{
+				ScriptParams params;
+				params.addParam(destinationId);
+				params.addParam(transfererId);
+				params.addParam(item.getNetworkId());
+
+				//-- Run scripts on source's container.
+				bool const sourceContinue = (!sourceObject->getScriptObject() || sourceObject->getScriptObject()->trigAllScripts(Scripting::TRIG_LOST_ITEM, params) == SCRIPT_CONTINUE);
+				if (sourceContinue)
+					sourceObject->onContainerLostItem(destination, item, transferer);
+			}
+
+			//-- player is transfering the object out of the bank or any of its nested containers
+			CreatureObject const *player = 0;
+			if (findContainingBankPlayer(*sourceObject, player))
+			{
+				if (!destination || !findContainingBankPlayer(*destination, player))
+				{
+					if (sourceObject == player->getBank())
+					{
+						LOG("CustomerService", ("Bank:%s has removed %s from their bank",
+							PlayerObject::getAccountDescription(player).c_str(),
+							ServerObject::getLogDescription(&item).c_str()));
+					}
+					else
+					{
+						LOG("CustomerService", ("Bank:%s has removed %s from their bank subcontainer %s",
+							PlayerObject::getAccountDescription(player).c_str(),
+							ServerObject::getLogDescription(&item).c_str(),
+							ServerObject::getLogDescription(sourceObject).c_str()));
+					}
+
+					logBankSubContentsMoved(*player, item, false);
+				}
+			}
+		}
+
+		if (destination)
+		{
+			if (destination->getScriptObject())
+			{
+				ScriptParams params;
+				params.addParam(sourceId);
+				params.addParam(transfererId);
+				params.addParam(item.getNetworkId());
+
+				//-- Run scripts on destination's container.
+				bool const destinationContinue = (!destination->getScriptObject() || destination->getScriptObject()->trigAllScripts(Scripting::TRIG_RECEIVED_ITEM, params) == SCRIPT_CONTINUE);
+
+				if (destinationContinue)
+					destination->onContainerGainItem(item, sourceObject, transferer);
+			}
+
+			//-- player is transfering the object into the bank or any of its nested containers
+			CreatureObject const *player = 0;
+			if (findContainingBankPlayer(*destination, player))
+			{
+				if (!sourceObject || !findContainingBankPlayer(*sourceObject, player))
+				{
+					if (destination == player->getBank())
+					{
+						LOG("CustomerService", ("Bank:%s has added %s to their bank",
+							PlayerObject::getAccountDescription(player).c_str(),
+							ServerObject::getLogDescription(&item).c_str()));
+					}
+					else
+					{
+						LOG("CustomerService", ("Bank:%s has added %s to their bank subcontainer %s",
+							PlayerObject::getAccountDescription(player).c_str(),
+							ServerObject::getLogDescription(&item).c_str(),
+							ServerObject::getLogDescription(destination).c_str()));
+					}
+
+					logBankSubContentsMoved(*player, item, true);
+				}
+			}
+		}
+
+		if (item.getScriptObject())
+		{
+			ScriptParams params;
+			params.addParam(sourceId);
+			params.addParam(destinationId);
+			params.addParam(transfererId);
+
+			if (item.getScriptObject()->trigAllScripts(Scripting::TRIG_XFERRED, params) == SCRIPT_CONTINUE)
+				item.onContainerTransfer(destination, transferer);
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+}
+
+using namespace ContainerInterfaceNamespace;
+
+// ======================================================================
+
+//@todo consider hiding all container functions and friend this class to containers.
+
+bool ContainerInterface::canTransferTo(ServerObject *destination, ServerObject &item, ServerObject *transferer, Container::ContainerErrorCode &error)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("canTransferTo");
+
+	error = Container::CEC_Success;
+
+	// can't transfer unless both item and destination are authoritative
+	if (!item.isAuthoritative() || (destination && !destination->isAuthoritative()))
+	{
+		// move item and destination to the same server, if possible
+		if (destination && (item.isAuthoritative() != destination->isAuthoritative()))
+		{
+			GenericValueTypeMessage<std::pair<NetworkId, NetworkId> > const rssMessage(
+				"RequestSameServer",
+				std::make_pair(
+					ContainerInterface::getTopmostContainer(item)->getNetworkId(),
+					ContainerInterface::getTopmostContainer(*destination)->getNetworkId()));
+			GameServer::getInstance().sendToPlanetServer(rssMessage);
+		}
+		else
+		{
+			// we are either trying to move a proxy of the item into the world, or we
+			// are trying to move a proxy of the item into a proxy of the destination,
+			// which will not be allowed as that will leave things inconsistent on
+			// this server and on the server where the item and destination is authoritative
+			WARNING(true, ("canTransferTo() not allowing move of proxy of item (%s) into proxy of destination (%s)",
+				item.getDebugInformation().c_str(),
+				(destination ? destination->getDebugInformation().c_str() : "world")));
+		}
+
+		error = Container::CEC_TryAgain;
+		return false;
+	}
+
+	// Cannot move a tcg card that is in the middle of the redemption process
+	if (!VeteranRewardManager::checkForTcgRedemptionInProgress(item))
+	{
+		error = Container::CEC_BlockedByItemBeingTransferred;
+		return false;
+	}
+
+	// Cannot move a reward item that is in the middle of the trade in process
+	if (!VeteranRewardManager::checkForTradeInInProgress(item))
+	{
+		error = Container::CEC_BlockedByItemBeingTransferred;
+		return false;
+	}
+
+	// if the character is currently over the lot limit, and is trying to drop
+	// an item into a cell of a structure (*NOT* a POB ship) or the ingredient
+	// hopper of a factory, block the drop unless it is being dropped into a
+	// cell of the structure that caused the lot limit to be exceeded
+	if (transferer && destination)
+	{
+		CreatureObject const * const transfererCreatureObject = transferer->asCreatureObject();
+		if (transfererCreatureObject)
+		{
+			PlayerObject const * const transfererPlayerObject = PlayerCreatureController::getPlayerObject(transfererCreatureObject);
+			if (transfererPlayerObject && (transfererPlayerObject->getAccountNumLots() > transfererCreatureObject->getMaxNumberOfLots()) && transfererCreatureObject->getObjVars().hasItem("lotOverlimit.structure_id"))
+			{
+				NetworkId lotOverlimitStructure;
+				if (transfererCreatureObject->getObjVars().getItem("lotOverlimit.structure_id", lotOverlimitStructure) && lotOverlimitStructure.isValid())
+				{
+					// determine the destination type
+					ServerObject const * topmostDestinationParent = NULL;
+					ServerObject const * destinationParent = destination;
+					while (destinationParent)
+					{
+						// if item is being put into another creature object, allow it
+						if (destinationParent->asCreatureObject())
+							break;
+
+						// if item is being put into a vendor, allow it
+						if (destinationParent->isVendor() || destinationParent->isBazaarTerminal())
+							break;
+
+						// if item is being put into a gold or buildout object, allow it
+						if (ConfigServerGame::getMaxGoldNetworkId().isValid() && (destinationParent->getNetworkId() < ConfigServerGame::getMaxGoldNetworkId()))
+							break;
+
+						if (destinationParent->getNetworkId() < NetworkId::cms_invalid)
+							break;
+
+						topmostDestinationParent = destinationParent;
+						destinationParent = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*destinationParent));
+					}
+
+					// we went all the way to the topmost destination container
+					// so see if it is a building or a factory, and if so, restrict
+					// the transfer unless it is a building and is the building that
+					// caused the lot limit to be exceeded
+					if (!destinationParent && topmostDestinationParent)
+					{
+						if ((topmostDestinationParent->getGameObjectType() == SharedObjectTemplate::GOT_installation_factory) ||
+							(GameObjectTypes::isTypeOf(topmostDestinationParent->getGameObjectType(), SharedObjectTemplate::GOT_building) && (topmostDestinationParent->getNetworkId() != lotOverlimitStructure)))
+						{
+							if (transfererCreatureObject->getClient())
+							{
+								std::string lotOverlimitStructureName;
+								std::string lotOverlimitStructureLocation;
+
+								IGNORE_RETURN(transfererCreatureObject->getObjVars().getItem("lotOverlimit.structure_name", lotOverlimitStructureName));
+								IGNORE_RETURN(transfererCreatureObject->getObjVars().getItem("lotOverlimit.structure_location", lotOverlimitStructureLocation));
+
+								Chat::sendSystemMessage(*transfererCreatureObject, Unicode::narrowToWide(FormattedString<1024>().sprintf("You are currently over the lot limit, and cannot drop any item into (or move around items within) any factory or structure, other than the %s structure located at %s that caused you to exceed the lot limit.", lotOverlimitStructureName.c_str(), lotOverlimitStructureLocation.c_str())), Unicode::emptyString);
+							}
+
+							error = Container::CEC_BlockedByDestinationContainer;
+							return false;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// we can only get to this point if both the item and
+	// destination (if specified) are authoritative
+	if (!checkTransferScripts (destination, item, transferer, error))
+		return false;
+
+	if (destination)
+	{
+		Container const * const container = getContainer(*destination);
+		if (container)
+		{
+			bool const retval = container->mayAdd(item, error);
+			DEBUG_REPORT_LOG(!retval, ("Container prevented transfer\n"));
+			return retval;
+		}
+		else
+		{
+			DEBUG_REPORT_LOG(true, ("Destination %s is not a container\n", destination->getNetworkId().getValueString().c_str()));
+			error = Container::CEC_NoContainer;
+			return false;
+		}
+	}
+
+	return true;
+}
+
+// -----------------------------------------------------------------------
+
+bool ContainerInterface::canTransferToSlot(ServerObject &destination, ServerObject &item, SlotId const &slotId, ServerObject *transferer, Container::ContainerErrorCode &error)
+{
+	error = Container::CEC_Success;
+
+	SlottedContainer const * const container = destination.getSlottedContainerProperty();
+	if (!container)
+	{
+		error = Container::CEC_NoContainer;
+		return false;
+	}
+
+	if (!container->mayAdd(item, slotId, error))
+	{
+		DEBUG_REPORT_LOG(true, ("Container %s prevented transfer for item %s\n", destination.getDebugInformation().c_str(), item.getDebugInformation().c_str()));
+		return false;
+	}
+
+	// Cannot move a tcg card that is in the middle of the redemption process
+	if (!VeteranRewardManager::checkForTcgRedemptionInProgress(item))
+	{
+		error = Container::CEC_BlockedByItemBeingTransferred;
+		return false;
+	}
+
+	// Cannot move a reward item that is in the middle of the trade in process
+	if (!VeteranRewardManager::checkForTradeInInProgress(item))
+	{
+		error = Container::CEC_BlockedByItemBeingTransferred;
+		return false;
+	}
+
+	if (!checkTransferScripts (&destination, item, transferer, error))
+	{
+		DEBUG_REPORT_LOG(true, ("Scripts prevented container %s transfer for item %s\n", destination.getDebugInformation().c_str(), item.getDebugInformation().c_str()));
+		return false;
+	}
+
+	return true;
+}
+
+// -----------------------------------------------------------------------
+
+/**
+ *  Transfer the item to the container specified by destination, however it can.
+ *  This means for spatial containers it will put the object at the origin of the parent coord space
+ *  and for a slotted container, it will put the object in the first available slot.
+ */
+bool ContainerInterface::transferItemToGeneralContainer(ServerObject &destination, ServerObject &item, ServerObject *transferer, Container::ContainerErrorCode &error, bool allowOverloaded)
+{
+	error = Container::CEC_Success;
+
+	VolumeContainer * const destContainerV = getVolumeContainer(destination);
+	if (destContainerV)
+	{
+		return transferItemToVolumeContainer(destination, item, transferer, error, allowOverloaded);
+	}
+
+	SlottedContainer * const destContainerL = getSlottedContainer(destination);
+	if (destContainerL)
+	{
+		int tmp = -1;
+		if (destContainerL->getFirstUnoccupiedArrangement(item, tmp, error))
+			return transferItemToSlottedContainer(destination, item, tmp, transferer, error);
+	}
+
+	return false;
+}
+
+// -----------------------------------------------------------------------
+
+bool ContainerInterface::transferItemToSlottedContainer(ServerObject &destination, ServerObject &item, int arrangementIndex, ServerObject *transferer, Container::ContainerErrorCode &error)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("transferItemToSlottedContainer");
+
+	error = Container::CEC_Success;
+
+	if (arrangementIndex < 0)
+	{
+		WARNING_STRICT_FATAL(true, ("Invaid arrangement index in transferItemToSlottedContainer"));
+		error = Container::CEC_InvalidArrangement;
+		return false;
+	}
+
+	if (transferer) //@todo add GM/permissions check
+	{
+		//Check each slot to make sure it can be manipulated.
+		SlottedContainmentProperty * const slottedProp = getSlottedContainmentProperty(item);
+		if (!slottedProp)
+		{
+			WARNING_STRICT_FATAL(true, ("Invaid item (no slottedContainmentProperty) in transferItemToSlottedContainer"));
+			error = Container::CEC_WrongType;
+			return false;
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("transferItemToSlottedContainer.canManipulateArrangement");
+			//@todo better player feedback
+			if (!slottedProp->canManipulateArrangement(arrangementIndex))
+			{
+				error = Container::CEC_NoPermission;
+				return false;
+			}
+		}
+	}
+
+	ServerObject *sourceObject = NULL;
+	Container *sourceContainer = NULL;
+
+	if (!sharedTransferBegin(item, sourceObject, sourceContainer, error))
+		return false;
+
+	SlottedContainer * const destContainer = getSlottedContainer(destination);
+	if (!destContainer)
+	{
+		WARNING_STRICT_FATAL(true, ("This destination is not a slot container!!"));
+		if (error == Container::CEC_Success)
+			error = Container::CEC_NoContainer;
+		return false;
+	}
+
+	if (!canTransferTo(&destination, item, transferer, error))
+		return false;
+
+	//@todo currently canTransferTo calls mayAdd, and we call it again.  Optimize.
+	if (!destContainer->mayAdd(item, arrangementIndex, error))
+		return false;
+
+	//check all scripts
+
+	//check source
+	//then check item
+	//then check destiation
+
+	if (!handleTransferSource(sourceContainer, item, error))
+		return false;
+
+	if (!destContainer->add(item, arrangementIndex, error))
+	{
+		//@todo re-examine use of fatal here.
+		WARNING_STRICT_FATAL(true, ("Checks to add an item succeeded, but the add failed! Panic"));
+		return false;
+	}
+
+	item.onContainerTransferComplete(sourceObject, &destination);
+	handleTransferScripts(item, sourceObject, &destination, transferer, error);
+	return true;
+}
+
+// -----------------------------------------------------------------------
+
+bool ContainerInterface::transferItemToSlottedContainer(ServerObject &destination, ServerObject &item, SlotId const &slotId, ServerObject *transferer, Container::ContainerErrorCode &error)
+{
+	error = Container::CEC_Success;
+
+	SlottedContainmentProperty * const slottedProp = getSlottedContainmentProperty(item);
+	if (!slottedProp)
+	{
+		WARNING_STRICT_FATAL(true, ("Invaid item (no slottedContainmentProperty) in transferItemToSlottedContainer"));
+		error = Container::CEC_WrongType;
+		return false;
+	}
+	return transferItemToSlottedContainer(destination, item, slottedProp->getBestArrangementForSlot(slotId), transferer, error);
+}
+
+// -----------------------------------------------------------------------
+
+bool ContainerInterface::transferItemToUnknownContainer(ServerObject &destination, ServerObject &item, int arrangementIndex, Transform const &transform, ServerObject *transferer, Container::ContainerErrorCode &error)
+{
+	error = Container::CEC_Success;
+
+	VolumeContainer * const destContainerV = getVolumeContainer(destination);
+	if (destContainerV)
+	{
+		return transferItemToVolumeContainer(destination, item, transferer, error);
+	}
+
+	SlottedContainer * const destContainerL = getSlottedContainer(destination);
+	if (destContainerL)
+	{
+		return transferItemToSlottedContainer(destination, item, arrangementIndex, transferer, error);
+	}
+
+	CellProperty * const destContainerC = getCell(destination);
+	if (destContainerC)
+	{
+		bool retval = transferItemToCell(destination, item, transform, transferer, error);
+		return retval;
+	}
+
+	error = Container::CEC_NoContainer;
+
+	return false;
+}
+
+// -----------------------------------------------------------------------
+
+bool ContainerInterface::transferItemToVolumeContainer(ServerObject &destination, ServerObject &item, ServerObject *transferer, Container::ContainerErrorCode &error, bool allowOverloaded)
+{
+	error = Container::CEC_Success;
+
+	ServerObject *sourceObject = NULL;
+	Container *sourceContainer = NULL;
+
+	if (!sharedTransferBegin(item, sourceObject, sourceContainer, error))
+		return false;
+
+	VolumeContainer * const destContainer = getVolumeContainer(destination);
+	if (!destContainer)
+	{
+		WARNING_STRICT_FATAL(true, ("This destination is not a volume container!!"));
+		error = Container::CEC_WrongType;
+		return false;
+	}
+
+	//@todo temp code to catch players going into inventories
+	if (item.isPlayerControlled())
+	{
+		DEBUG_FATAL(true, ("Trying to put a player inside a volume container!"));
+		error = Container::CEC_BlockedByItemBeingTransferred;
+		return false;
+	}
+
+	if (!canTransferTo(&destination, item, transferer, error))
+	{
+		// If container message is anthing but full false
+		// If it is full and overloaded is false: false
+		if (allowOverloaded)
+		{
+			if (! (error == Container::CEC_Full || error == Container::CEC_TooLarge))
+				return false;
+		}
+		else
+			return false;
+	}
+
+	if (!handleTransferSource(sourceContainer, item, error))
+		return false;
+
+	// add() with allowOverloaded doesn't work, so we use the following workaround.
+	// See JavaLibrary::createNewObjectInInventoryOverloadedCrc() for where this
+	// workaround is also used.
+	int oldCapacity = 0;
+	if (allowOverloaded)
+		oldCapacity = destContainer->debugDoNotUseSetCapacity(-1);
+
+	bool const success = destContainer->add(item, error, allowOverloaded);
+
+	if (allowOverloaded)
+	{
+		IGNORE_RETURN(destContainer->debugDoNotUseSetCapacity(oldCapacity));
+		IGNORE_RETURN(destContainer->recalculateVolume());
+	}
+
+	WARNING_DEBUG_FATAL(!success, ("Checks to add an item succeeded, but the add failed! Panic"));
+
+	if (!success)
+		return false;
+
+	item.onContainerTransferComplete(sourceObject, &destination);
+	handleTransferScripts(item, sourceObject, &destination, transferer, error);
+	return true;
+}
+
+// -----------------------------------------------------------------------
+
+bool ContainerInterface::transferItemToCell(ServerObject &destination, ServerObject &item, Transform const &t, ServerObject *transferer, Container::ContainerErrorCode &error)
+{
+	error = Container::CEC_Success;
+
+	ServerObject *sourceObject = NULL;
+	Container *sourceContainer = NULL;
+
+	//check source & item
+	if (!sharedTransferBegin(item, sourceObject, sourceContainer, error))
+	{
+		DEBUG_REPORT_LOG(true, ("Could not transfer from source to cell\n"));
+		return false;
+	}
+
+	CellProperty * const destContainer = getCell(destination);
+	if (!destContainer)
+	{
+		WARNING_STRICT_FATAL(true, ("This destination is not a cell!!"));
+		error = Container::CEC_NoContainer;
+		return false;
+	}
+
+	if (!item.canDropInWorld())
+	{
+		error = Container::CEC_WrongType;
+		return false;
+	}
+
+	//check all scripts & destination
+	if (!canTransferTo(&destination, item, transferer, error))
+	{
+		DEBUG_REPORT_LOG(true, ("Could not transfer to dest cell\n"));
+		return false;
+	}
+
+	if (!handleTransferSource(sourceContainer, item, error))
+	{
+		DEBUG_REPORT_LOG(true, ("Could not transfer from source 2\n"));
+		return false;
+	}
+
+	destContainer->addObject_w(item);
+	item.setTransform_o2p(t);
+
+	item.onContainerTransferComplete(sourceObject, &destination);
+	handleTransferScripts(item, sourceObject, &destination, transferer, error);
+	return true;
+}
+
+// -----------------------------------------------------------------------
+
+bool ContainerInterface::transferItemToCell(ServerObject &destinationCell, ServerObject &item, ServerObject *transferer, Container::ContainerErrorCode &error)
+{
+#ifdef DEBUG
+	Transform const sanityCheck = item.getTransform_o2w();
+#endif
+
+	Transform const t = destinationCell.getTransform_o2w().rotateTranslate_l2p(item.getTransform_o2p());
+	bool const retval = transferItemToCell(destinationCell, item, t, transferer, error);
+
+#ifdef DEBUG
+	DEBUG_FATAL(sanityCheck != item.getTransform_o2w());
+#endif
+	return retval;
+}
+
+// -----------------------------------------------------------------------
+
+bool ContainerInterface::transferItemToWorld(ServerObject &item, Transform const &pos, ServerObject *transferer, Container::ContainerErrorCode &error)
+{
+	error = Container::CEC_Success;
+
+	if (transferer && transferer->getClient() && !transferer->getClient()->isGod())
+	{
+		// Only GMs are allowed to drop things into the world.
+		DEBUG_REPORT_LOG(true, ("Player tried to drop something in world, but they are not a god.\n"));
+		error = Container::CEC_NoPermission;
+		return false;
+	}
+
+	if (!item.canDropInWorld())
+	{
+		error = Container::CEC_WrongType;
+		return false;
+	}
+
+	if (!canTransferTo(NULL, item, transferer, error))
+	{
+		return false;
+	}
+
+	ServerObject *sourceObject = NULL;
+	Container *sourceContainer = NULL;
+
+	if (!sharedTransferBegin(item, sourceObject, sourceContainer, error))
+	{
+		DEBUG_REPORT_LOG(true, ("Could not transfer to world because source disallowed.\n"));
+		return false;
+	}
+	if (!sourceContainer)
+	{
+		// already in the world
+		DEBUG_REPORT_LOG(true, ("Failed transfer to world because it was already there\n"));
+		error = Container::CEC_Unknown;
+		return false;
+	}
+
+	if (!handleTransferSource(sourceContainer, item, error))
+	{
+		DEBUG_REPORT_LOG(true, ("Could not transfer to world because source disallowed 2.\n"));
+		return false;
+	}
+
+	item.setTransform_o2p(pos);
+
+	item.onContainerTransferComplete(sourceObject, NULL);
+	handleTransferScripts(item, sourceObject, NULL, transferer, error);
+	return true;
+}
+
+// -----------------------------------------------------------------------
+
+bool ContainerInterface::canPlayerManipulateSlot(SlotId const &slot)
+{
+	return SlotIdManager::isSlotPlayerModifiable(slot);
+}
+
+// -----------------------------------------------------------------------
+
+Container *ContainerInterface::getContainer(Object &obj)
+{
+	return obj.getContainerProperty();
+}
+
+// -----------------------------------------------------------------------
+
+Container const *ContainerInterface::getContainer(Object const &obj)
+{
+	return obj.getContainerProperty();
+}
+
+// ----------------------------------------------------------------------
+
+SlottedContainer *ContainerInterface::getSlottedContainer(Object &obj)
+{
+	return obj.getSlottedContainerProperty();
+}
+
+// ----------------------------------------------------------------------
+
+SlottedContainer const *ContainerInterface::getSlottedContainer(Object const &obj)
+{
+	return obj.getSlottedContainerProperty();
+}
+
+// -----------------------------------------------------------------------
+
+VolumeContainer *ContainerInterface::getVolumeContainer(Object &obj)
+{
+	return obj.getVolumeContainerProperty();
+}
+
+// -----------------------------------------------------------------------
+
+VolumeContainer const *ContainerInterface::getVolumeContainer(Object const &obj)
+{
+	return obj.getVolumeContainerProperty();
+}
+
+// -----------------------------------------------------------------------
+
+CellProperty *ContainerInterface::getCell(Object &obj)
+{
+	return obj.getCellProperty();
+}
+
+// -----------------------------------------------------------------------
+
+CellProperty const *ContainerInterface::getCell(Object const &obj)
+{
+	return obj.getCellProperty();
+}
+
+// -----------------------------------------------------------------------
+
+Object *ContainerInterface::getContainedByObject(Object &obj)
+{
+	ContainedByProperty * const containedBy = getContainedByProperty(obj);
+	if (containedBy)
+		return containedBy->getContainedBy();
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+Object const *ContainerInterface::getContainedByObject(Object const &obj)
+{
+	ContainedByProperty const * const containedBy = getContainedByProperty(obj);
+	if (containedBy)
+		return containedBy->getContainedBy();
+	return NULL;
+}
+
+// -----------------------------------------------------------------------
+
+ContainedByProperty *ContainerInterface::getContainedByProperty(Object &obj)
+{
+	return obj.getContainedByProperty();
+}
+
+// -----------------------------------------------------------------------
+
+ContainedByProperty const *ContainerInterface::getContainedByProperty(Object const &obj)
+{
+	return obj.getContainedByProperty();
+}
+
+// -----------------------------------------------------------------------
+
+SlottedContainmentProperty *ContainerInterface::getSlottedContainmentProperty(Object &obj)
+{
+	return safe_cast<SlottedContainmentProperty *>(obj.getProperty(SlottedContainmentProperty::getClassPropertyId()));
+}
+
+// -----------------------------------------------------------------------
+
+SlottedContainmentProperty const *ContainerInterface::getSlottedContainmentProperty(Object const &obj)
+{
+	return safe_cast<SlottedContainmentProperty const *>(obj.getProperty(SlottedContainmentProperty::getClassPropertyId()));
+}
+
+// -----------------------------------------------------------------------
+
+VolumeContainmentProperty *ContainerInterface::getVolumeContainmentProperty(Object &obj)
+{
+	return safe_cast<VolumeContainmentProperty *>(obj.getProperty(VolumeContainmentProperty::getClassPropertyId()));
+}
+
+// -----------------------------------------------------------------------
+
+VolumeContainmentProperty const *ContainerInterface::getVolumeContainmentProperty(Object const & obj)
+{
+	return safe_cast<VolumeContainmentProperty const *>(obj.getProperty(VolumeContainmentProperty::getClassPropertyId()));
+}
+
+// -----------------------------------------------------------------------
+
+Object *ContainerInterface::getTopmostContainer(Object &obj)
+{
+	// Do I have a containedBy property?  If not I am topmost.
+	ContainedByProperty *containedBy = getContainedByProperty(obj);
+	if (!containedBy)
+		return &obj;
+
+	// Is my containedBy property empty?  If so I am topmost.
+	Object *currentContainer = containedBy->getContainedBy();
+	if (!currentContainer)
+		return &obj;
+
+	// Does my parent have a containedBy property?  If not he is topmost.
+	containedBy = getContainedByProperty(*currentContainer);
+	if (!containedBy)
+		return currentContainer;
+
+	// Iterate from here.
+	Object *nextContainer = containedBy->getContainedBy();
+	while (nextContainer)
+	{
+		currentContainer = nextContainer;
+		containedBy = getContainedByProperty(*currentContainer);
+		if (!containedBy)
+			return currentContainer;
+		nextContainer = containedBy->getContainedBy();
+	}
+	return currentContainer;
+}
+
+// -----------------------------------------------------------------------
+
+Object const *ContainerInterface::getTopmostContainer(Object const &obj)
+{
+	return getTopmostContainer(const_cast<Object &>(obj));
+}
+
+// -----------------------------------------------------------------------
+// Returns the object if it is in the world, or the first parent of the object
+// that is in the world.  This returns null, if the none of the parents of the object are in the world.
+
+Object *ContainerInterface::getFirstParentInWorld(Object &obj)
+{
+	// Am I in the world? If so, I am topmost.
+	if (obj.isInWorld())
+		return &obj;
+
+	// Do I have a containedBy property?  If not I am topmost, but am not in the world
+	ContainedByProperty const *containedBy = getContainedByProperty(obj);
+	if (!containedBy)
+	{
+		WARNING_STRICT_FATAL(true, ("All objects should have a containedby property"));
+		return NULL;
+	}
+
+	// Is my containedBy property empty?  If so I am topmost but am not in the world
+	Object *currentContainer = containedBy->getContainedBy();
+	if (!currentContainer)
+	{
+		return NULL;
+	}
+
+	// Does my parent expose contents?  If it does, then return NULL since I have been removed from the world.
+	if (!getContainer(*currentContainer) || getContainer(*currentContainer)->isContentItemExposedWith(*currentContainer))
+	{
+		return NULL;
+	}
+
+	// Is my parent in the world?  If so, he is topmost
+	if (currentContainer->isInWorld())
+		return currentContainer;
+
+	// Does my parent have a containedBy property?  If not he is topmost.
+	containedBy = getContainedByProperty(*currentContainer);
+	if (!containedBy)
+	{
+		WARNING_STRICT_FATAL(true, ("All objects should have a containedby property"));
+		return (currentContainer->isInWorld()) ? currentContainer : NULL;
+	}
+
+	// Iterate from here.
+	Object *nextContainer = containedBy->getContainedBy();
+	while (nextContainer && getContainer(*nextContainer) && !getContainer(*nextContainer)->isContentItemExposedWith(*nextContainer))
+	{
+		currentContainer = nextContainer;
+
+		// If I am in the world, I am topmost.
+		if (currentContainer->isInWorld())
+			return currentContainer;
+
+		//If I am not contained, I am topmost, but not in world
+		containedBy = getContainedByProperty(*currentContainer);
+		if (!containedBy)
+		{
+			WARNING_STRICT_FATAL(true, ("All objects should have a containedby property"));
+			return NULL;
+		}
+
+		nextContainer = containedBy->getContainedBy();
+	}
+	return currentContainer->isInWorld() ? currentContainer : NULL;
+}
+
+// -----------------------------------------------------------------------
+
+Object const *ContainerInterface::getFirstParentInWorld(Object const &obj)
+{
+	return getFirstParentInWorld(const_cast<Object &>(obj));
+}
+
+// -----------------------------------------------------------------------
+
+CellObject *ContainerInterface::getContainingCellObject(Object &obj)
+{
+	CellObject *cellObj = 0;
+	Object *o = getContainedByObject(obj);
+	while (o)
+	{
+		ServerObject * const so = o->asServerObject();
+		if (so)
+		{
+			cellObj = so->asCellObject();
+			if (cellObj)
+				break;
+		}
+		o = getContainedByObject(*o);
+	}
+
+	return cellObj;
+}
+
+// -----------------------------------------------------------------------
+
+CellObject const *ContainerInterface::getContainingCellObject(Object const &obj)
+{
+	CellObject const *cellObj = 0;
+	Object const *o = getContainedByObject(obj);
+	while (o)
+	{
+		ServerObject const * const so = o->asServerObject();
+		if (so)
+		{
+			cellObj = so->asCellObject();
+			if (cellObj)
+				break;
+		}
+		o = getContainedByObject(*o);
+	}
+
+	return cellObj;
+}
+
+//----------------------------------------------------------------------
+
+bool ContainerInterface::isNestedWithin(Object const &obj, NetworkId const &containerId)
+{
+	const Object* parent = getContainedByObject(obj);
+	while (parent)
+	{
+		if (parent->getNetworkId() == containerId)
+			return true;
+
+		parent = getContainedByObject(*parent);
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void ContainerInterface::sendContainerMessageToClient(ServerObject const &player, Container::ContainerErrorCode errorCode, ServerObject const *target)
+{
+	//-- Check if error code is one that we skip sending messages to client for.
+	//   In these cases the scripter should have already generated a message.
+	bool const sendMessage = (errorCode != Container::CEC_BlockedByScript && errorCode != Container::CEC_SilentError);
+
+	if (sendMessage || (player.getClient() && player.getClient()->isGod()))
+	{
+		char tmp[64];
+		if (target && (!target->getAssignedObjectName().empty() || target->getObjectNameStringId().isValid()))
+			snprintf(tmp, sizeof(tmp)-1, "container%02d_prose", static_cast<int>(errorCode));
+		else
+			snprintf(tmp, sizeof(tmp)-1, "container%02d", static_cast<int>(errorCode));
+		tmp[sizeof(tmp)-1] = '\0';
+
+		StringId const code("container_error_message", tmp);
+
+		Chat::sendSystemMessageSimple(player, code, target);
+	}
+}
+
+// -----------------------------------------------------------------------
+
+// ----------------------------------------------------------------------
+//
+// The load_with container for an object is defined as follows:
+//
+// If the object is a player controlled creature, the load_with is the object
+//
+// Otherwise, iterate through containing objects until encountering:
+// 1) A player controlled creature (the load_with is the creature)
+// 2) A demand loaded container (the load_with is the container)
+// 3) The topmost container (the load_with is the topmost container, unless it is a ship with an owner, in which case it is the owner)
+
+NetworkId const ContainerInterface::getLoadWithContainerId(ServerObject const &obj)
+{
+	if (obj.isPlayerControlled())
+		return obj.getNetworkId();
+
+	ServerObject const *o = &obj;
+	ServerObject const *nextObj = safe_cast<ServerObject const *>(NON_NULL(getContainedByProperty(*o))->getContainedBy());
+	while (nextObj)
+	{
+		o = nextObj;
+		if (o->isPlayerControlled() || !o->getLoadContents())
+			return o->getNetworkId();
+		nextObj = safe_cast<ServerObject const *>(NON_NULL(getContainedByProperty(*o))->getContainedBy());
+	}
+
+	ShipObject const * const ship = o->asShipObject();
+	if (ship)
+	{
+		NetworkId const &owner = ship->getOwnerId();
+		if (owner != NetworkId::cms_invalid)
+			return owner;
+	}
+	return o->getNetworkId();
+}
+
+// -----------------------------------------------------------------------
+
+bool ContainerInterface::onObjectDestroy(ServerObject& item) // currently only called by ServerObject::onPermanentlyDestroyed()
+{
+	ServerObject* parentObject = safe_cast<ServerObject*>(getContainedByObject(item));
+	if (parentObject)
+	{
+		Container *const container = getContainer(*parentObject);
+		if (container)
+		{
+			Container::ContainerErrorCode error = Container::CEC_Success;
+			if (!container->remove(item, error))
+			{	
+				// TODO: DDM change to FATAL ... this should never happen but the impact of it is too scary right now
+				WARNING_DEBUG_FATAL(true, ("ContainerInterface::onObjectDestroy: object %s could not be removed from container %s for reason %d?\n", item.getDebugInformation().c_str(), parentObject->getDebugInformation().c_str(), static_cast<int>(error)));
+				
+				return false;
+			}
+			handleTransferScripts(item, parentObject, NULL, NULL, error);
+		}
+	}
+	return true;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/core/ContainerInterface.h b/engine/server/library/serverGame/src/shared/core/ContainerInterface.h
new file mode 100644
index 00000000..1040a63d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ContainerInterface.h
@@ -0,0 +1,99 @@
+// ======================================================================
+//
+// ContainerInterface.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_ContainerInterface_H
+#define	INCLUDED_ContainerInterface_H
+
+
+/** This will be moved to a game dependant place so that we can add game restrictions on these function.
+*/
+
+#include "sharedObject/Container.h"
+#include "sharedObject/SlotId.h"
+
+// ======================================================================
+
+class CellObject;
+class CellProperty;
+class ContainedByProperty;
+class NetworkId;
+class Object;
+class ServerObject;
+class SlottedContainer;
+class SlottedContainmentProperty;
+class Transform;
+class VolumeContainer;
+class VolumeContainmentProperty;
+
+// ======================================================================
+
+/**
+* The ContainerInterface is intended to provide an interface to the game (network, scripts, UI, etc) for manipulating
+* containers.  The game shouldn't interface with the containers directly, since this will take care of scripts (on the server side)
+* and will clean up old containers, and keep everything synch'd.
+*/
+
+class ContainerInterface
+{
+public:
+	static bool canTransferTo(ServerObject *destination, ServerObject &item, ServerObject *transferer, Container::ContainerErrorCode &error);
+	static bool canTransferToSlot(ServerObject &destination, ServerObject &item, SlotId const &slotId, ServerObject *transferer, Container::ContainerErrorCode &error);
+	static bool transferItemToGeneralContainer(ServerObject &destination, ServerObject &item, ServerObject *transferer, Container::ContainerErrorCode &error, bool allowOverloaded = false);
+	static bool transferItemToSlottedContainer(ServerObject &destination, ServerObject &item, int arrangementIndex, ServerObject *transferer, Container::ContainerErrorCode &error);
+	static bool transferItemToSlottedContainer(ServerObject &destination, ServerObject &item, SlotId const &slot, ServerObject *transferer, Container::ContainerErrorCode &error);
+	static bool transferItemToUnknownContainer(ServerObject &destination, ServerObject &item, int arrangementIndex, Transform const &transform, ServerObject *transferer, Container::ContainerErrorCode &error);
+	static bool transferItemToVolumeContainer(ServerObject &destination, ServerObject &item, ServerObject *transferer, Container::ContainerErrorCode &error, bool allowOverloaded = false);
+	static bool transferItemToCell(ServerObject &destination, ServerObject &item, ServerObject *transferer, Container::ContainerErrorCode &error);
+	static bool transferItemToCell(ServerObject &destination, ServerObject &item, Transform const &t, ServerObject *transferer, Container::ContainerErrorCode &error);
+	static bool transferItemToWorld(ServerObject &item, Transform const &position, ServerObject *transferer, Container::ContainerErrorCode &error);
+	static bool canPlayerManipulateSlot(SlotId const &slot);
+	
+	static bool      onObjectDestroy(ServerObject& item);
+
+	// Property manipulator helper functions
+	static Container *              getContainer(Object &obj);
+	static Container const *        getContainer(Object const &obj);
+	static SlottedContainer *       getSlottedContainer(Object &obj);
+	static SlottedContainer const * getSlottedContainer(Object const &obj);
+	static VolumeContainer *        getVolumeContainer(Object &obj);
+	static VolumeContainer const *  getVolumeContainer(Object const &obj);
+	static CellProperty *           getCell(Object &obj);
+	static CellProperty const *     getCell(Object const &obj);
+
+	static Object *                           getContainedByObject(Object &obj);
+	static Object const *                     getContainedByObject(Object const &obj);
+	static ContainedByProperty *              getContainedByProperty(Object &obj);
+	static ContainedByProperty const *        getContainedByProperty(Object const &obj);
+	static SlottedContainmentProperty *       getSlottedContainmentProperty(Object &obj);
+	static SlottedContainmentProperty const * getSlottedContainmentProperty(Object const &obj);
+	static VolumeContainmentProperty *        getVolumeContainmentProperty(Object &obj);
+	static VolumeContainmentProperty const *  getVolumeContainmentProperty(Object const &obj);
+
+	static Object *           getTopmostContainer(Object &obj);
+	static Object const *     getTopmostContainer(Object const &obj);
+	static Object *           getFirstParentInWorld(Object &obj);
+	static Object const *     getFirstParentInWorld(Object const &obj);
+	static CellObject *       getContainingCellObject(Object &obj);
+	static CellObject const * getContainingCellObject(Object const &obj);
+
+	static bool               isNestedWithin(Object const &obj, NetworkId const &containerId);
+
+	static void sendContainerMessageToClient(ServerObject const &player, Container::ContainerErrorCode code, ServerObject const *target = 0);
+	static NetworkId const getLoadWithContainerId(ServerObject const &obj);
+
+private:
+	ContainerInterface();
+	ContainerInterface(ContainerInterface const &);
+	ContainerInterface &operator=(ContainerInterface const &);
+	~ContainerInterface();
+};
+
+// ======================================================================
+
+#endif // INCLUDED_ContainerInterface_H
+
diff --git a/engine/server/library/serverGame/src/shared/core/FirstServerGame.h b/engine/server/library/serverGame/src/shared/core/FirstServerGame.h
new file mode 100644
index 00000000..dd6ae682
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/FirstServerGame.h
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// FirstServerGame.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_FirstServerGame_H
+#define INCLUDED_FirstServerGame_H
+
+// ======================================================================
+
+#include "sharedFoundation/FirstSharedFoundation.h"
+
+#include <string>
+#include <vector>
+#include <map>
+
+#ifdef WIN32
+// need to boost type_info into the std namespace, as the boost libraries expect it.
+#include <typeinfo>
+namespace std
+{
+	typedef ::type_info type_info; //lint !e36 !e18 // error 36: (Error -- redefining the storage class of symbol '_STL::type_info' (type vs. using declaration), conflicts with line 47, file D:\work\swg\current\src\external\3rd\library\stlport453\stlport\typeinfo) // error 18: (Error -- Symbol '_STL::type_info' redeclared (void/nonvoid) conflicts with line 47, file D:\work\swg\current\src\external\3rd\library\stlport453\stlport\typeinfo) // @todo: look into this.
+};
+#endif
+
+
+//#include "sharedNetworkMessages/GameNetworkMessage.h"
+//#include "sharedFoundation/DynamicVariable.h"
+//#include "sharedFoundation/NetworkIdArchive.h"
+//#include "sharedObject/CachedNetworkId.h"
+//#include "sharedObject/Controller.h"
+//#include "sharedObject/NetworkIdManager.h"
+//#include "sharedObject/Object.h"
+//#include "serverGame/GameServer.h"                      // @todo: this should probably not be in the pch
+//#include "serverGame/ServerObject.h"
+//#include "StringId.h"
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/core/FormManagerServer.cpp b/engine/server/library/serverGame/src/shared/core/FormManagerServer.cpp
new file mode 100644
index 00000000..5a1c4b15
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/FormManagerServer.cpp
@@ -0,0 +1,306 @@
+//======================================================================
+//
+// FormManagerServer.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/FormManagerServer.h"
+
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMath/Vector.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedObject/Controller.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ServerWorld.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "serverScript/ScriptParameters.h"
+
+#include "UnicodeUtils.h"
+
+//======================================================================
+
+namespace FormManagerServerNamespace
+{
+	bool s_installed = false;
+}
+
+using namespace FormManagerServerNamespace;
+
+//----------------------------------------------------------------------
+
+//======================================================================
+
+void FormManagerServer::install ()
+{
+	FormManager::install();
+
+	DEBUG_FATAL (s_installed, ("installed"));
+	if(s_installed)
+		return;
+
+	s_installed = true;
+
+	ExitChain::add(remove,"FormManagerServer::remove");
+}
+
+//----------------------------------------------------------------------
+
+void FormManagerServer::remove ()
+{
+	DEBUG_FATAL (!s_installed, ("not installed"));
+	if(!s_installed)
+		return;
+
+	s_installed = false;
+}
+
+//----------------------------------------------------------------------
+
+/**Given a set of data and an object, flag script to create this object and handle the data assignment as appropriate for that type of object
+*/
+void FormManagerServer::handleCreateObjectData(NetworkId const & actor, std::string const & templateName, Vector const & position, NetworkId const & cellId, FormManager::UnpackedFormData const & dataMap)
+{
+	DEBUG_FATAL (!s_installed, ("not installed"));
+	if(!s_installed)
+		return;
+
+	//get matching form
+	Form const * const form = FormManagerServer::getFormForServerObjectTemplate(templateName);
+	if(!form)
+		return;
+
+	//see if we should automatically create the object
+	bool const autoCreateObject = getAutomaticallyCreateObject(templateName);
+
+	if(autoCreateObject)
+	{
+		//create the object
+		ConstCharCrcString crcName(ObjectTemplateList::lookUp(templateName.c_str()));
+		uint32 const crc = crcName.getCrc();
+		if (crc == 0)
+		{
+			return;
+		}
+		ServerObject *cell = 0;
+		if (cellId.isValid())
+		{
+			cell = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(cellId));
+			if (!cell)
+				return;
+		}
+
+		Transform tr;
+		tr.setPosition_p(position);
+		ServerObject * const newObject = ServerWorld::createNewObject(crc, tr, cell, false);
+		if (newObject == NULL)
+			return;
+
+		if (cellId == NetworkId::cms_invalid)
+			newObject->addToWorld();
+
+		//tell script to "edit" the object, since we've already created it
+		handleEditObjectData(actor, newObject->getNetworkId(), dataMap);
+	}
+	else
+	{
+		//tell script to create the object in it's own special manner (since the datatable requests that)
+		Object * const obj = NetworkIdManager::getObjectById(actor);
+		ServerObject * const serverObj = obj ? obj->asServerObject() : NULL;
+		if(serverObj)
+		{
+			std::vector<char const *> keys;
+			std::vector<char const *> values;
+
+			for(FormManager::UnpackedFormData::const_iterator i = dataMap.begin(); i != dataMap.end(); ++i)
+			{
+				keys.push_back(i->first.c_str());
+				values.push_back(i->second[0]/*TODO handle lists*/.c_str());
+			}
+
+			ScriptParams params;
+			params.addParam(templateName.c_str());
+			params.addParam(position.x);
+			params.addParam(position.y);
+			params.addParam(position.z);
+			params.addParam(cellId);
+			params.addParam(keys);
+			params.addParam(values);
+
+			IGNORE_RETURN(serverObj->getScriptObject()->trigAllScripts(Scripting::TRIG_FORM_CREATEOBJECT, params));
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+/**Given a set of data and an object, flag script to edit this object and handle the data assignment as appropriate for that type of object
+*/
+void FormManagerServer::handleEditObjectData(NetworkId const & actor, NetworkId const & objectToEdit, FormManager::UnpackedFormData const & dataMap)
+{
+	DEBUG_FATAL (!s_installed, ("not installed"));
+	if(!s_installed)
+		return;
+
+	Object * const actorObj = NetworkIdManager::getObjectById(actor);
+	ServerObject * const actorServerObj = actorObj ? actorObj->asServerObject() : NULL;
+	if(actorServerObj)
+	{
+		Object * const objectToEditObj = NetworkIdManager::getObjectById(objectToEdit);
+		ServerObject * const objectToEditServerObj = objectToEditObj ? objectToEditObj->asServerObject() : NULL;
+		if(objectToEditServerObj)
+		{
+			//get matching form
+			Form const * const form = FormManagerServer::getFormForServerObjectTemplate(objectToEditServerObj->getTemplateName());
+			if(!form)
+				return;
+			
+			//set any objvar bindings before telling script
+			std::vector<FormManager::Field const *> const & fields = form->getOrderedFieldList();
+			for(std::vector<FormManager::Field const *>::const_iterator i = fields.begin(); i != fields.end(); ++i)
+			{
+				FormManager::Field const * const field = *i;
+				if(!field)
+					continue;
+
+				std::string const & objvarBinding = field->getObjvarBinding();
+				if(!objvarBinding.empty())
+				{
+					FormManager::UnpackedFormData::const_iterator i2 = dataMap.find(field->getName());
+					if(i2 != dataMap.end())
+					{
+						//TODO handle non-strings
+						std::string const & value = i2->second[0];/*TODO handle lists*/
+						IGNORE_RETURN(objectToEditServerObj->setObjVarItem(objvarBinding, value));
+					}
+				}
+			}
+		
+			std::vector<char const *> keys;
+			std::vector<char const *> values;
+			for(FormManager::UnpackedFormData::const_iterator i2 = dataMap.begin(); i2 != dataMap.end(); ++i2)
+			{
+				keys.push_back(i2->first.c_str());
+				values.push_back(i2->second[0]/*TODO handle lists*/.c_str());
+			}
+			ScriptParams params;
+			params.addParam(objectToEdit);
+			params.addParam(keys);
+			params.addParam(values);
+			IGNORE_RETURN(actorServerObj->getScriptObject()->trigAllScripts(Scripting::TRIG_FORM_EDITOBJECT, params));
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+/**Ask script to build and reply with the set of data for the given object.  Script should eventually call JavaLibrary::editFormData.
+*/
+void FormManagerServer::requestEditObjectDataForClient(NetworkId const & actor, NetworkId const & objectToEdit)
+{
+	Object * const actorObj = NetworkIdManager::getObjectById(actor);
+	ServerObject * const actorServerObj = actorObj ? actorObj->asServerObject() : NULL;
+	if(actorServerObj)
+	{
+		Object * const objectToEditObj = NetworkIdManager::getObjectById(objectToEdit);
+		ServerObject * const objectToEditServerObj = objectToEditObj ? objectToEditObj->asServerObject() : NULL;
+		if(objectToEditServerObj)
+		{
+			//get matching form
+			Form const * const form = FormManagerServer::getFormForServerObjectTemplate(objectToEditServerObj->getTemplateName());
+			if(!form)
+				return;
+			
+			std::vector<char const *> keysWeDontHave;
+			FormManager::UnpackedFormData dataMap;
+			DynamicVariableList const & objvars = objectToEditServerObj->getObjVars();
+			std::string value;
+			std::vector<std::string> values;
+			//build a list of all the fields that DON'T have objvar bindings (since script will need to tell us about them in JavaLibrary::editFormData
+			std::vector<FormManager::Field const *> const & fields = form->getOrderedFieldList();
+			for(std::vector<FormManager::Field const *>::const_iterator i = fields.begin(); i != fields.end(); ++i)
+			{
+				FormManager::Field const * const field = *i;
+				if(!field)
+					continue;
+
+				std::string const & objvarBinding = field->getObjvarBinding();
+				if(objvarBinding.empty())
+				{
+					keysWeDontHave.push_back(field->getName().c_str());
+				}
+				else
+				{
+					IGNORE_RETURN(objvars.getItem(objvarBinding, value));
+					values.clear();
+					if(value.empty())
+						value = getEmptyStringPlaceholder();
+					values.push_back(value);
+					/*TODO handle lists*/
+					dataMap[field->getName()] = values;
+				}
+			}
+
+			//if we can grab all the data, don't ask script for it
+			if(keysWeDontHave.empty())
+			{
+				sendEditObjectDataToClient(actor, objectToEdit, dataMap);	
+			}
+			else
+			{
+				//script needs to provide at least some of the data, ask for it
+				ScriptParams params;
+				params.addParam(objectToEdit);
+				params.addParam(keysWeDontHave);
+				IGNORE_RETURN(actorServerObj->getScriptObject()->trigAllScripts(Scripting::TRIG_FORM_REQUESTDATA, params));
+			}
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+/**Given an object and a set of form data from script, send it to the client so they can view/edit it
+*/
+void FormManagerServer::sendEditObjectDataToClient(NetworkId const & client, NetworkId const & objectToEdit, FormManager::UnpackedFormData const & dataMap)
+{
+	DEBUG_FATAL (!s_installed, ("not installed"));
+	if(!s_installed)
+		return;
+
+	Object * const playerObject = NetworkIdManager::getObjectById(client);
+	ServerObject * const playerServer = playerObject ? playerObject->asServerObject() : NULL;
+	CreatureObject * const playerCreature = playerServer ? playerServer->asCreatureObject() : NULL;
+
+	if(playerCreature)
+	{
+		FormManager::PackedFormData const packedData = FormManager::packFormData(dataMap);
+
+		typedef std::pair<NetworkId, Unicode::String> Payload;
+		MessageQueueGenericValueType<Payload> * const msg = new MessageQueueGenericValueType<Payload>(Payload(objectToEdit, packedData));
+
+		Controller * const controller = playerCreature->getController();
+		if(controller)
+		{
+			controller->appendMessage(static_cast<int>(CM_formDataForEdit), 0.0f, msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+		}
+		else
+		{
+			DEBUG_FATAL(true, ("No controller for object %s in FormManagerServer::sendEditObjectData", client.getValueString().c_str()));
+		}
+	}
+	else
+	{
+		DEBUG_FATAL(true, ("Could not turn object %s into a CreatureObject", client.getValueString().c_str()));
+	}
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/FormManagerServer.h b/engine/server/library/serverGame/src/shared/core/FormManagerServer.h
new file mode 100644
index 00000000..5a49b594
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/FormManagerServer.h
@@ -0,0 +1,37 @@
+//======================================================================
+//
+// FormManagerServer.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_FormManagerServer_H
+#define INCLUDED_FormManagerServer_H
+
+//======================================================================
+
+#include "sharedGame/FormManager.h"
+
+//======================================================================
+
+class CellProperty;
+class DataTable;
+class NetworkId;
+class Vector;
+
+//----------------------------------------------------------------------
+
+class FormManagerServer : public FormManager
+{
+public:
+	static void install ();
+	static void remove  ();
+	static void handleCreateObjectData(NetworkId const & actor, std::string const & templateName, Vector const & position, NetworkId const & cell, FormManager::UnpackedFormData const & dataMap);
+	static void handleEditObjectData(NetworkId const & actor, NetworkId const & objectToEdit, FormManager::UnpackedFormData const & dataMap);
+	static void requestEditObjectDataForClient(NetworkId const & actor, NetworkId const & objectToEdit);
+	static void sendEditObjectDataToClient(NetworkId const & actor, NetworkId const & objectToEdit,FormManager::UnpackedFormData const & dataMap);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/GameServer.cpp b/engine/server/library/serverGame/src/shared/core/GameServer.cpp
new file mode 100644
index 00000000..76e1c99b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/GameServer.cpp
@@ -0,0 +1,6091 @@
+// GameServer.cpp
+// copyright 2000 Verant Interactive
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/GameServer.h"
+
+#include "serverGame/AiMovementBase.h"
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/AiShipController.h"
+#include "serverGame/AttribModNameManager.h"
+#include "serverGame/AuthTransferTracker.h"
+#include "serverGame/BiographyManager.h"
+#include "serverGame/BuildingObject.h"
+#include "serverGame/CellObject.h"
+#include "serverGame/CentralConnection.h"
+#include "serverGame/CharacterMatchManager.h"
+#include "serverGame/Chat.h"
+#include "serverGame/ChatServerConnection.h"
+#include "serverGame/CitizenInfo.h"
+#include "serverGame/CityInfo.h"
+#include "serverGame/CityInterface.h"
+#include "serverGame/CityObject.h"
+#include "serverGame/Client.h"
+#include "serverGame/ClusterWideDataClient.h"
+#include "serverGame/CombatTracker.h"
+#include "serverGame/CommandCppFuncs.h"
+#include "serverGame/CommoditiesMarket.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ConnectionServerConnection.h"
+#include "serverGame/ConsoleManager.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/CustomerServiceServerConnection.h"
+#include "serverGame/DatabaseProcessConnection.h"
+#include "serverGame/GameServerMetricsData.h"
+#include "serverGame/GuildInterface.h"
+#include "serverGame/GuildObject.h"
+#include "serverGame/HarvesterInstallationObject.h"
+#include "serverGame/LogoutTracker.h"
+#include "serverGame/ManufactureInstallationObject.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/MissileManager.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/NewbieTutorial.h"
+#include "serverGame/NonCriticalTaskQueue.h"
+#include "serverGame/ObjectIdManager.h"
+#include "serverGame/ObjectTracker.h"
+#include "serverGame/ObserveTracker.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/PlanetServerConnection.h"
+#include "serverGame/PlayerCreationManagerServer.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/PlayerSanityChecker.h"
+#include "serverGame/PlayerShipController.h"
+#include "serverGame/PositionUpdateTracker.h"
+#include "serverGame/PurgeManager.h"
+#include "serverGame/Region.h"
+#include "serverGame/RegionMaster.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerAsteroidManager.h"
+#include "serverGame/SceneGlobalData.h"
+#include "serverGame/ServerBuildoutManager.h"
+#include "serverGame/ServerCommandPermissionManager.h"
+#include "serverGame/ServerCommandTable.h"
+#include "serverGame/ServerController.h"
+#include "serverGame/ServerCreatureObjectTemplate.h"
+#include "serverGame/ServerImageDesignerManager.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerObjectTerrainModificationNotification.h"
+#include "serverGame/ServerUIManager.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipAiReactionManager.h"
+#include "serverGame/ShipClientUpdateTracker.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/StationPlayersCollectorAPI.h"
+#include "serverGame/SurveySystem.h"
+#include "serverGame/TangibleObject.h"
+#include "serverGame/TaskManagerConnection.h"
+#include "serverGame/VeteranRewardManager.h"
+#include "serverMetrics/MetricsManager.h"
+#include "serverNetworkMessages/AccountFeatureIdRequest.h"
+#include "serverNetworkMessages/AccountFeatureIdResponse.h"
+#include "serverNetworkMessages/AddCharacterMessage.h"
+#include "serverNetworkMessages/AddResourceTypeMessage.h"
+#include "serverNetworkMessages/AdjustAccountFeatureIdResponse.h"
+#include "serverNetworkMessages/AiMovementMessage.h"
+#include "serverNetworkMessages/AiCreatureStateMessage.h"
+#include "serverNetworkMessages/AuthTransferClientMessage.h"
+#include "serverNetworkMessages/BiographyMessage.h"
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "serverNetworkMessages/CentralPingMessage.h"
+#include "serverNetworkMessages/CharacterNamesMessage.h"
+#include "serverNetworkMessages/ChatServerOnline.h"
+#include "serverNetworkMessages/ChunkCompleteMessage.h"
+#include "serverNetworkMessages/ClaimRewardsReplyMessage.h"
+#include "serverNetworkMessages/CreateDynamicRegionCircleMessage.h"
+#include "serverNetworkMessages/CreateDynamicRegionRectangleMessage.h"
+#include "serverNetworkMessages/CreateDynamicSpawnRegionCircleMessage.h"
+#include "serverNetworkMessages/CreateGroupMessage.h"
+#include "serverNetworkMessages/CreateObjectMessage.h"
+#include "serverNetworkMessages/CreateSyncUiMessage.h"
+#include "serverNetworkMessages/EnableNewJediTrackingMessage.h"
+#include "serverNetworkMessages/EndBaselinesMessage.h"
+#include "serverNetworkMessages/ExcommunicateGameServerMessage.h"
+#include "serverNetworkMessages/FactionalSystemMessage.h"
+#include "serverNetworkMessages/FailedToLoadObjectMessage.h"
+#include "serverNetworkMessages/FeatureIdTransactionResponse.h"
+#include "serverNetworkMessages/FirstPlanetGameServerIdMessage.h"
+#include "serverNetworkMessages/GameConnectionServerMessages.h"
+#include "serverNetworkMessages/GameGameServerMessages.h"
+#include "serverNetworkMessages/GameServerConnectAck.h"
+#include "serverNetworkMessages/GameServerReadyMessage.h"
+#include "serverNetworkMessages/GameServerUniverseLoadedMessage.h"
+#include "serverNetworkMessages/GameTaskManagerMessages.h"
+#include "serverNetworkMessages/GetMoneyFromOfflineObjectMessage.h"
+#include "serverNetworkMessages/LoadContainedObjectMessage.h"
+#include "serverNetworkMessages/LoadContentsMessage.h"
+#include "serverNetworkMessages/LocateObjectResponseMessage.h"
+#include "serverNetworkMessages/LocatePlayerResponseMessage.h"
+#include "serverNetworkMessages/LoadObjectMessage.h"
+#include "serverNetworkMessages/LoadStructureMessage.h"
+#include "serverNetworkMessages/LoadUniverseMessage.h"
+#include "serverNetworkMessages/LocateStructureMessage.h"
+#include "serverNetworkMessages/LocationResponse.h"
+#include "serverNetworkMessages/MessageToAckMessage.h"
+#include "serverNetworkMessages/NewClient.h"
+#include "serverNetworkMessages/PersistedPlayerMessage.h"
+#include "serverNetworkMessages/PlayedTimeAccumMessage.h"
+#include "serverNetworkMessages/PopulationListMessage.h"
+#include "serverNetworkMessages/PreloadRequestCompleteMessage.h"
+#include "serverNetworkMessages/ProfilerOperationMessage.h"
+#include "serverNetworkMessages/RandomName.h"
+#include "serverNetworkMessages/ReloadAdminTableMessage.h"
+#include "serverNetworkMessages/ReloadCommandTableMessage.h"
+#include "serverNetworkMessages/ReloadDatatableMessage.h"
+#include "serverNetworkMessages/ReloadScriptMessage.h"
+#include "serverNetworkMessages/ReloadTemplateMessage.h"
+#include "serverNetworkMessages/RenameCharacterMessage.h"
+#include "serverNetworkMessages/RetrievedItemLoadMessage.h"
+#include "serverNetworkMessages/SceneTransferMessages.h"
+#include "serverNetworkMessages/SetAuthoritativeMessage.h"
+#include "serverNetworkMessages/SetPlanetServerMessage.h"
+#include "serverNetworkMessages/SetUniverseAuthoritativeMessage.h"
+#include "serverNetworkMessages/StructuresForPurgeMessage.h"
+#include "serverNetworkMessages/SynchronizeScriptVarDeltasMessage.h"
+#include "serverNetworkMessages/SynchronizeScriptVarsMessage.h"
+#include "serverNetworkMessages/TeleportMessage.h"
+#include "serverNetworkMessages/TeleportToMessage.h"
+#include "serverNetworkMessages/TransferCharacterData.h"
+#include "serverNetworkMessages/TransferCharacterDataArchive.h"
+#include "serverNetworkMessages/TransferReplyMoveValidation.h"
+#include "serverNetworkMessages/UnloadObjectMessage.h"
+#include "serverNetworkMessages/UnloadProxyMessage.h"
+#include "serverNetworkMessages/UpdateObjectPositionMessage.h"
+#include "serverNetworkMessages/UploadCharacterMessage.h"
+#include "serverNetworkMessages/VerifyAndLockName.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptDictionary.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/AdminAccountManager.h"
+#include "serverUtility/ServerClock.h"
+#include "Session/CommonAPI/CommonAPI.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedDebug/DebugFlags.h"
+#include "sharedDebug/DebugMonitor.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFile/Iff.h"
+#include "sharedFile/TreeFile.h"
+#include "sharedFoundation/CalendarTime.h"
+#include "sharedFoundation/Clock.h"
+#include "sharedFoundation/ConfigFile.h"
+#include "sharedFoundation/ConfigSharedFoundation.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/Os.h"
+#include "sharedGame/AppearanceManager.h"
+#include "sharedGame/CombatDataTable.h"
+#include "sharedGame/CommandTable.h"
+#include "sharedGame/OutOfBandPackager.h"
+#include "sharedGame/PlatformFeatureBits.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/PvpData.h"
+#include "sharedGame/QuestManager.h"
+#include "sharedLog/FileLogObserver.h"
+#include "sharedLog/Log.h"
+#include "sharedMessageDispatch/MessageManager.h"
+#include "sharedNetwork/NetworkSetupData.h"
+#include "sharedNetwork/Service.h"
+#include "sharedNetworkMessages/BaselinesMessage.h"
+#include "sharedNetworkMessages/BatchBaselinesMessage.h"
+#include "sharedNetworkMessages/ConsoleChannelMessages.h"
+#include "sharedNetworkMessages/DeltasMessage.h"
+#include "sharedNetworkMessages/FrameEndMessage.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/HyperspaceMessage.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedNetworkMessages/NameErrors.h"
+#include "sharedNetworkMessages/ObjectChannelMessages.h"
+#include "sharedNetworkMessages/SetupSharedNetworkMessages.h"
+#include "sharedNetworkMessages/SlowDownEffectMessage.h"
+#include "sharedNetworkMessages/UpdateContainmentMessage.h"
+#include "sharedObject/AlterScheduler.h"
+#include "sharedObject/AppearanceTemplateList.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/ContainedByProperty.h"
+#include "sharedObject/Container.h"
+#include "sharedObject/NetworkController.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectList.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/PortalProperty.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedPathfinding/Pathfinding.h"
+#include "sharedSkillSystem/SkillManager.h"
+#include "sharedSkillSystem/SkillObject.h"
+#include "sharedTerrain/ProceduralTerrainAppearance.h"
+#include "sharedTerrain/TerrainObject.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+#include "swgSharedUtility/SpeciesRestrictions.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+//#undef PROFILE_INDIVIDUAL_MESSAGES
+#define PROFILE_INDIVIDUAL_MESSAGES 1
+
+#ifdef PROFILE_INDIVIDUAL_MESSAGES
+	#define MESSAGE_PROFILER_BLOCK(a) PROFILER_AUTO_BLOCK_DEFINE(a)
+#else
+	#define MESSAGE_PROFILER_BLOCK(a) NOP
+#endif
+
+//-----------------------------------------------------------------------
+
+namespace GameServerNamespace
+{
+	bool gs_gameServerReady = false;
+	const float IDLE_CLIENTS_CHECK_TIME_SEC = 30.0f;
+	ServerCommandPermissionManager * s_permissionManager = 0;
+
+	unsigned long  s_frameTime;
+	uint64  s_totalObjectCreateMessagesReceived;
+	uint64  s_totalObjectCreateMessagesSent;
+	bool    s_metricsManagerInstalled = false;
+	uint32  s_lastTaskKeepaliveTime = 0;
+
+#ifdef _DEBUG
+	int s_extraDelayPerFrameMs = 0; // to emulate long loop time
+#endif
+
+	std::set<uint32> s_clusterStartupResidenceStructureListResponse;
+	std::map<NetworkId, std::pair<int, NetworkId> > s_clusterStartupResidenceStructureListByStructure;
+
+	unsigned long getFrameRateLimit();
+	void broadCastHyperspaceOnWarp(ServerObject const * owner);
+	ShipObject *getAttachedShip(CreatureObject *creature);
+
+	std::map<NetworkId, unsigned long> s_pendingLoadRequests;
+
+	struct CtsSourceCharacterInfo
+	{
+		time_t transferTime;
+		std::string sourceCluster;
+		NetworkId sourceCharacterId;
+		std::string sourceCharacterName;
+		int sourceCharacterBornDate;
+		std::vector<std::pair<std::string, DynamicVariable> > sourceCharacterRetroactiveObjvars;
+	};
+
+	// any particular target character may have gone through multiple transfers
+	// so we want to keep a list (ordered by transfer time) of all the transfers
+	// the character has gone through
+	//
+	// for release build, we only care about transfers into our cluster;
+	// for debug build, read them all so we can test out the logic to
+	// make sure it works for all clusters
+	//
+	//                                            transfer time, source character info
+	//                       target character id
+	//     target cluster
+	//           \/                   \/                       \/
+#ifdef _DEBUG
+	std::map<std::string, std::map<NetworkId, std::vector<CtsSourceCharacterInfo> > > s_retroactiveCtsHistoryList;
+#else
+	                      std::map<NetworkId, std::vector<CtsSourceCharacterInfo> > s_retroactiveCtsHistoryListThisCluster;
+#endif
+
+	void loadRetroactiveCtsHistory();
+
+	// retroactive player city creation time
+	//
+	//                              city creation time
+	//                           city id
+	//        cluster
+	//           \/                 \/    \/
+#ifdef _DEBUG
+	std::map<std::string, std::map<int, time_t> > s_retroactivePlayerCityCreationTime;
+#else
+	std::map<int, time_t> s_retroactivePlayerCityCreationTimeThisCluster;
+#endif
+
+	void loadRetroactivePlayerCityCreationTime();
+
+	bool getConfigSetting(const char *section, const char *key, int & value)
+	{
+		const ConfigFile::Section * sec = ConfigFile::getSection(section);
+		if (sec == NULL)
+			return false;
+
+		const ConfigFile::Key * ky = sec->findKey(key);
+		if (ky == NULL)
+			return false;
+
+		value = ky->getAsInt(ky->getCount()-1, value);
+		return true;
+	}
+
+	const std::string OBJVAR_HAS_OUTSTANDING_REQUEST_SCENE_TRANSFER("hasOutstandingRequestSceneTransfer");
+	bool checkAndSetOutstandingRequestSceneTransfer(ServerObject & object);
+
+	void handleFactionalSystemMessage(FactionalSystemMessage const & msg);
+	void handleMessageToPlayersOnPlanet(std::string const & methodName, std::vector<int8> const & params, float delay, Vector const & loc, float radius, bool includeDisconnectedPlayers);
+	void handleMessageLocateStructureByOwnerIdReq(GameServer & gsInstance, uint32 responsePid, bool isGod, NetworkId const & ownerId, NetworkId const & ownerResidenceId, NetworkId const & responseId);
+	void handleMessageLocateStructureByOwnerIdRsp(NetworkId const & responseId, std::vector<std::string> const & response);
+	void handleAdjustAccountFeatureIdResponse(AdjustAccountFeatureIdResponse const & msg);
+	void handleAccountFeatureIdResponse(AccountFeatureIdResponse const & msg);
+
+	namespace SlotNames
+	{
+		static const ConstCharCrcLowerString appearance ("appearance_inventory");
+	}
+
+	const char* s_appearanceTemplate = "object/tangible/inventory/appearance_inventory.iff";
+
+}
+
+using namespace GameServerNamespace;
+
+//----------------------------------------------------------------------
+
+GameServer * GameServer::ms_instance = 0;
+
+//-----------------------------------------------------------------------
+
+GameServer::GameServer() :
+MessageDispatch::Receiver(),
+m_done                                (false),
+m_processId                           (0),
+m_preloadAreaId                       (0),
+m_databaseProcessId                   (0),
+m_gameServerPids                      (),
+m_centralService                      (),
+m_centralServerConnection             (0),
+m_customerServiceServerConnection     (0),
+m_connectionServerVector              (new ConnectionServerVector),
+m_planetServerConnection              (0),
+m_databaseProcessConnection           (0),
+m_pendingDatabaseProcessConnection    (0),
+m_taskManagerConnection               (),
+m_clients                             (new ClientMap),
+m_clientService                       (),
+m_clusterName                         (),
+m_clusterId                           (0),
+m_firstGameServerForPlanet            (0),
+m_pendingContainedObjects             (new PendingContainedObjectsMap),
+m_charactersPendingCreation           (new CharactersPendingCreationMap),
+m_metricsData                         (0),
+m_gameServerReadyObjectIds            (false),
+m_gameServerReadyDatabaseConnected    (false),
+m_gameServerReadyPlanetConnected      (false),
+m_connectionTimeout                   (false),
+m_chatServerConnection                (0)
+{
+	IGNORE_RETURN(SkillManager::getInstance().getRoot ());
+
+	ObjectIdManager::getInstance();
+	// set up central server connection
+	m_centralService = new CentralServerConnection(ConfigServerGame::getCentralServerAddress(), ConfigServerGame::getCentralServerPort());
+	connectToMessage("CentralConnectionOpened");
+	connectToMessage("CentralConnectionClosed");
+
+	//Add connection server messages
+	connectToMessage("ConnectionServerAddress");
+	connectToMessage("ConnectionServerClosed");
+	connectToMessage("NewClient");
+
+	connectToMessage("TaskConnectionClosed");
+	
+	// set up Commodity server connection
+	connectToMessage("CommoditiesServerConnectionClosed");
+	
+	// application messages
+	connectToMessage("BaselinesMessage");
+	connectToMessage("BatchBaselinesMessage");
+	connectToMessage("DeltasMessage");
+	connectToMessage("ChunkCompleteMessage");
+	connectToMessage("CentralGameServerSetProcessId");
+	connectToMessage("GameServerSetupMessage");
+	connectToMessage("LoadUniverseMessage");
+	connectToMessage("PlanetConnectionClosed");
+	connectToMessage("PlanetConnectionOpened");
+	connectToMessage("SetPlanetServerMessage");
+	connectToMessage("SetUniverseAuthoritativeMessage");
+	connectToMessage("CentralCreateCharacter");
+	connectToMessage("CreateDynamicSpawnRegionCircle");
+	connectToMessage("CreateDynamicRegionCircleMessage");
+	connectToMessage("CreateDynamicRegionRectangleMessage");
+	connectToMessage("CreateGroupMessage");
+	connectToMessage("CreateObjectByCrcMessage");
+	connectToMessage("CreateSyncUiMessage");
+	connectToMessage("DropClient");
+	connectToMessage("EnableNewJediTrackingMessage");
+	connectToMessage("EndBaselinesMessage");
+	connectToMessage("GameSetProcessId");
+	connectToMessage("GameServerConnectAck");
+	connectToMessage("LoadObjectMessage");
+	connectToMessage("ObjControllerMessage");
+	connectToMessage("ProfilerOperationMessage");
+	connectToMessage("SetAuthoritativeMessage");
+	connectToMessage("SynchronizationMessage");
+	connectToMessage("TaskShutdownGameServer");
+	connectToMessage("UniverseCompleteMessage");
+	connectToMessage("GameServerUniverseLoadedMessage");
+	connectToMessage("AddResourceTypeMessage");
+	connectToMessage("AddImportedResourceType");
+	connectToMessage("PreloadRequestCompleteMessage");
+	connectToMessage("UnloadObjectMessage");
+	connectToMessage("VerifyNameResponse");
+	connectToMessage("SceneTransferMessage");
+	connectToMessage("RandomNameRequest"); // from connection server
+	connectToMessage("VerifyAndLockNameRequest"); // from connection server
+
+	connectToMessage("ChatServerOnline");
+	connectToMessage("ChatServerConnectionClosed");
+	connectToMessage("TeleportMessage");
+	connectToMessage("TeleportToMessage");
+	connectToMessage("RetrievedItemLoadMessage");
+	connectToMessage("UnloadProxyMessage");
+	connectToMessage("BiographyMessage");
+	connectToMessage("LoadContainedObjectMessage");
+	connectToMessage("LoadContentsMessage");
+	connectToMessage("FirstPlanetGameServerIdMessage");
+	connectToMessage("ReloadAdminTableMessage");
+	connectToMessage("ReloadCommandTableMessage");
+	connectToMessage(ReloadDatatableMessage::ms_messageName);
+	connectToMessage("ReloadScriptMessage");
+	connectToMessage("ReloadTemplateMessage");
+	connectToMessage("AuthTransferConfirmMessage");
+	connectToMessage("ConnectionServerConnectionDestroyed");
+	connectToMessage("PersistedPlayerMessage");
+	connectToMessage("RenameCharacterMessageEx");
+	connectToMessage("PopulationListMessage");
+	connectToMessage("UpdateObjectPositionMessage");
+	connectToMessage("UpdateContainmentMessage");
+	connectToMessage("SynchronizeScriptVarsMessage");
+	connectToMessage("SynchronizeScriptVarDeltasMessage");
+	connectToMessage("CentralPingMessage");
+	connectToMessage("AddGameServer");
+	connectToMessage("ExcommunicateGameServerMessage");
+	connectToMessage("LocateObject");
+	connectToMessage("LocateObjectByTemplateName");
+	connectToMessage("LocatePlayerByPartialName");
+	connectToMessage("LocateWarden");
+	connectToMessage("LocateCreatureByCreatureName");
+	connectToMessage("LSBOIReq");
+	connectToMessage("LSBOIRsp");
+	connectToMessage("LocateStructureMessage");
+	connectToMessage("LoadStructureMessage");
+	connectToMessage("LocateObjectResponseMessage");
+	connectToMessage("LocatePlayerResponseMessage");
+	connectToMessage("PlayerSanityCheck");
+	connectToMessage("PlayerSanityCheckSuccess");
+	connectToMessage("PlayerSanityCheckProxy");
+	connectToMessage("PlayerSanityCheckProxyFail");
+	connectToMessage("EnablePlayerSanityCheckerMessage");
+	connectToMessage("StartSaveReplyMessage");
+	connectToMessage("DatabaseConsoleReplyMessage");
+	connectToMessage("FindAuthObject");
+	connectToMessage("CharacterNamesMessage");
+	connectToMessage("DownloadCharacterMessage");
+	connectToMessage("UploadCharacterMessage");
+	connectToMessage("LocationResponse");
+	connectToMessage("ReleaseCharacterNameByIdMessage");
+	connectToMessage("AddAttribModName");
+	connectToMessage("AddAttribModNamesList");
+	connectToMessage("CustomerServiceServerGameServerServiceAddress");
+	connectToMessage("AiCreatureStateMessage");
+	connectToMessage("UnloadPersistedCharacter");
+	connectToMessage("AboutToLoadCharacterFromDB");
+	connectToMessage("AuthTransferClientMessage");
+	connectToMessage("ClearTheaterMessage");
+	connectToMessage("SetTheaterMessage");
+	connectToMessage("PageChangeAuthority");
+	connectToMessage("ManualDepleteResourceMessage");
+	connectToMessage("GetMoneyFromOfflineObjectMessage");
+	connectToMessage("ClaimRewardsReplyMessage");
+	connectToMessage("SetOverrideAccountAgeMessage");
+	connectToMessage("StructuresForPurgeMessage");
+	connectToMessage(SlowDownEffectMessage::MessageType);
+	connectToMessage("PlayedTimeAccumMessage");
+	connectToMessage("RequestLoadAckMessage");
+	connectToMessage("FactionalSystemMessage");
+	connectToMessage("MessageToPlayersOnPlanet");
+	connectToMessage("ReportSystemClockTime");
+	connectToMessage("ReportSystemClockTimeResponse");
+	connectToMessage("ReportPlanetaryTime");
+	connectToMessage("ReportPlanetaryTimeResponse");
+	connectToMessage("ClusterStartComplete");
+	connectToMessage("CSRSLReq");
+	connectToMessage("CSRSLRsp");
+	connectToMessage("PopStatReq");
+	connectToMessage("GcwScoreStatReq");
+	connectToMessage("GcwScoreStatRaw");
+	connectToMessage("GcwScoreStatPct");
+	connectToMessage("LLTStatReq");
+	connectToMessage("LfgStatReq");
+	connectToMessage("ClusterId");
+	connectToMessage("OccupyUnlockedSlotRsp");
+	connectToMessage("VacateUnlockedSlotRsp");
+	connectToMessage("SwapUnlockedSlotRsp");
+	connectToMessage("AdjustAccountFeatureIdResponse");
+	connectToMessage("AccountFeatureIdResponse");
+	connectToMessage("FeatureIdTransactionResponse");
+	connectToMessage("TransferReplyMoveValidation");
+	connectToMessage("TransferReplyNameValidation");
+	
+	// Cluster wide data client
+	ClusterWideDataClient::install();
+	ClusterWideDataClient::registerMessage(*this);
+
+	m_taskManagerConnection = new TaskManagerConnection("127.0.0.1", ConfigServerGame::getTaskManagerPort());
+}
+
+//-----------------------------------------------------------------------
+
+GameServer::~GameServer()
+{
+	m_chatServerConnection = 0;
+	delete m_clients;
+	m_clients = 0;
+	delete m_connectionServerVector;
+	m_connectionServerVector = 0;
+
+	delete m_pendingContainedObjects;
+	m_pendingContainedObjects = 0;
+	delete m_charactersPendingCreation;
+	m_charactersPendingCreation = 0;
+}
+
+//----------------------------------------------------------------------
+
+void GameServer::install     ()
+{
+	DEBUG_FATAL (ms_instance, ("already installed"));
+	ms_instance = new GameServer;
+}
+
+//----------------------------------------------------------------------
+
+void GameServer::remove      ()
+{
+	// ok to remove an uninstalled GameServer singleton.
+	delete ms_instance;
+	ms_instance = 0;
+}
+
+//-----------------------------------------------------------------------
+
+uint64 GameServer::getTotalObjectCreatesReceived() // static
+{
+	return s_totalObjectCreateMessagesReceived;
+}
+
+//-----------------------------------------------------------------------
+
+uint64 GameServer::getTotalObjectCreatesSent() // static
+	{
+	return s_totalObjectCreateMessagesSent;
+}
+
+//-----------------------------------------------------------------------
+
+void GameServer::incrementTotalObjectCreatesSent() // static
+	{
+	++s_totalObjectCreateMessagesSent;
+}
+
+//-----------------------------------------------------------------------
+void GameServer::reportClusterStartupResidenceStructure(int cityId, const NetworkId & structureId, const NetworkId & ownerId) // static
+{
+	s_clusterStartupResidenceStructureListByStructure[structureId] = std::make_pair(cityId, ownerId);
+}
+
+//-----------------------------------------------------------------------
+
+void GameServer::reportBuildingObjectDestroyed(const NetworkId & structureId)
+{
+	if (!s_clusterStartupResidenceStructureListByStructure.empty())
+		IGNORE_RETURN(s_clusterStartupResidenceStructureListByStructure.erase(structureId));
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Establish a connection to a game server (if not already connected).
+ */
+void GameServer::connectToDatabaseProcess(std::string const &address, uint16 port, uint32 pid)
+{
+	FATAL(m_pendingDatabaseProcessConnection, ("Tried to connect to database process with connection still pending?"));
+	FATAL(m_databaseProcessConnection, ("Tried to connect to database process when alrady connected?"));
+
+	m_pendingDatabaseProcessConnection = new DatabaseProcessConnection(address, port, pid);
+
+	LOG("GameGameConnect", ("Game Server %lu is connecting to database process, pid %lu, addr %s port %d", m_processId, pid, address.c_str(), static_cast<int>(port)));
+}
+
+//-------------------------------------------------------------------
+
+/**
+ * Create a proxy for an object we own on another server.
+ *
+ * If address is specified, it will establish a connection and queue
+ * the task to be done later, if necessary.  Otherwise, it will FATAL
+ * if not connected.
+ * @see GameServerConnectionHandler::addGameServer
+ */
+
+void GameServer::createRemoteProxy(uint32 remoteProcessId, ServerObject *object)
+{
+
+	WARNING_STRICT_FATAL(!object, ("Told to create an object on %d we know nothing about!\n", remoteProcessId));
+	NetworkId objectId = object->getNetworkId();
+
+	DEBUG_REPORT_LOG(ConfigServerGame::getLogObjectLoading(),("createRemoteProxy(%lu,%s)\n",remoteProcessId, objectId.getValueString().c_str()));
+
+	if (remoteProcessId == 0)
+	{
+		DEBUG_FATAL(true, ("Invalid ProcessId in GameServer::CreateRemoteProxy()\n"));
+		return;
+	}
+
+
+	//If we have the object in the world and we are auth for it, create it.
+	if (object)
+	{
+		if (object->isAuthoritative())
+		{
+			if(GameServer::getProcessId() != remoteProcessId)
+			{
+				object->addServerToProxyList(remoteProcessId);
+			}
+		}
+		else
+		{
+			//Can't create an object if we're not authoritative.
+			// Forward the message to the auth server.
+
+			DEBUG_REPORT_LOG(ConfigServerGame::getLogObjectLoading(),("Forwarding proxy request for %s to authoritative server\n",objectId.getValueString().c_str()));
+
+			ServerMessageForwarding::begin(object->getAuthServerProcessId());
+
+			LoadObjectMessage const loadObjectMessage(objectId, remoteProcessId);
+			ServerMessageForwarding::send(loadObjectMessage);
+
+			ServerMessageForwarding::end();
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GameServer::createProxyOnAllServers(ServerObject *object)
+{
+	for (std::vector<uint32>::const_iterator i = m_gameServerPids.begin(); i != m_gameServerPids.end(); ++i)
+		createRemoteProxy(*i, object);
+}
+
+// ----------------------------------------------------------------------
+
+void GameServer::debugIO (void)
+{
+#ifdef _DEBUG
+	DebugMonitor::flushOutput();
+	DebugMonitor::clearScreen();
+	DebugFlags::callReportRoutines();
+#endif
+}
+
+//-----------------------------------------------------------------------
+
+void GameServer::deliverMessageToClientObject(const NetworkId &oid, const Archive::ByteStream & source)
+{
+	const ClientMap::iterator i = m_clients->find(oid);
+	if(i != m_clients->end())
+	{
+		Archive::ReadIterator ri = source.begin();
+		GameNetworkMessage const msg(ri);
+		(*i).second->receiveClientMessage(msg);
+	}
+	else
+	{
+		DEBUG_REPORT_LOG(true, ("Received message for unknown client %s\n", oid.getValueString().c_str()));
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void GameServer::dropClient(const NetworkId& oid)
+{
+	dropClient(oid, false);
+}
+//-----------------------------------------------------------------------
+
+void GameServer::dropClient(const NetworkId& oid, const bool immediate)
+{
+	DEBUG_REPORT_LOG(true,("Dropping client %s\n",oid.getValueString().c_str()));
+
+	const ClientMap::iterator i = m_clients->find(oid);
+	if(i != m_clients->end())
+	{
+		Client* client = const_cast<Client *>((*i).second);
+		m_clients->erase(i);
+		client->selfDestruct(immediate);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+unsigned long GameServer::getFrameTime() const
+{
+	return s_frameTime;
+}
+
+//-----------------------------------------------------------------------
+
+Client * GameServer::getClient(const NetworkId& networkId)
+{
+	ClientMap::iterator i = m_clients->find(networkId);
+	if (i != m_clients->end())
+	{
+		return i->second;
+	}
+	return NULL;
+}
+
+//-----------------------------------------------------------------------
+const Service * GameServer::getClientService() const
+{
+	return m_clientService;
+}
+
+// ----------------------------------------------------------------------
+
+bool GameServer::isGameServerConnected(uint32 processId) const
+{
+	return std::binary_search(m_gameServerPids.begin(), m_gameServerPids.end(), processId);
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionServerConnection * GameServer::getConnectionServerConnection(const std::string & connectionServerIp, const uint16 connectionServerPort)
+{
+	ConnectionServerConnection * result = 0;
+
+	if (m_connectionServerVector)
+	{
+		for (ConnectionServerVector::iterator i = m_connectionServerVector->begin(); i != m_connectionServerVector->end(); ++i)
+		{
+			if (((*i)->getRemoteAddress() == connectionServerIp) && ((*i)->getRemotePort() == connectionServerPort))
+			{
+				result = *i;
+				break;
+			}
+		}
+	}
+
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+void GameServer::initialize()
+{
+	//@todo, this function seems wrong to me.  This should happen in install or in the constructor.
+	//Right now this gets called at the beginning of ::run
+
+	ServerCommandTable::load();
+	loadTerrain ();
+
+	ShipObject::install();
+	AiShipController::install();
+	AICreatureController::install();
+	ShipAiReactionManager::install();
+	PlayerShipController::install();
+	MissileManager::install();
+	ShipClientUpdateTracker::install();
+	ServerAsteroidManager::install();
+	QuestManager::install();
+	VeteranRewardManager::install();
+	SceneGlobalData::install();
+	StationPlayersCollectorAPI::install();
+	ServerObject::install();
+	TangibleObject::install();
+	Client::install();
+
+	m_metricsData = new GameServerMetricsData;
+	s_permissionManager = new ServerCommandPermissionManager();
+}
+
+// ----------------------------------------------------------------------
+
+void GameServer::loadTerrain ()
+{
+	if (TerrainObject::getInstance ())
+	{
+		TerrainObject::getInstance ()->removeFromWorld ();
+		delete TerrainObject::getInstance ();
+	}
+
+	char const * const terrainFileName = ConfigServerGame::getGroundScene();
+	FATAL(!terrainFileName || !TreeFile::exists(terrainFileName), ("%s is not a valid terrain file", terrainFileName));
+
+	TerrainObject * const terrainObject = new TerrainObject(ServerWorld::getTerrainObjectNotification());
+	terrainObject->setDebugName("terrain");
+	Appearance * const appearance = AppearanceTemplateList::createAppearance(terrainFileName);
+	terrainObject->setAppearance(appearance);
+
+	ProceduralTerrainAppearance * const proceduralTerrainAppearance = dynamic_cast<ProceduralTerrainAppearance *>(appearance);
+	if (proceduralTerrainAppearance)
+		ServerObjectTerrainModificationNotification::setTerrainAppearance(proceduralTerrainAppearance);
+
+	terrainObject->addToWorld();
+}
+
+// ----------------------------------------------------------------------
+
+void GameServer::shutdown()
+{
+	delete s_permissionManager;
+	s_permissionManager = 0;
+	if(s_metricsManagerInstalled)
+		MetricsManager::remove();
+	delete m_metricsData;
+	m_metricsData = 0;
+
+	m_centralService = 0;
+	m_planetServerConnection = 0;
+
+	if (m_customerServiceServerConnection != NULL)
+	{
+		m_customerServiceServerConnection->disconnect();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GameServer::receiveMessage(const MessageDispatch::Emitter & source, const MessageDispatch::MessageBase & message)
+{
+	static Archive::ReadIterator ri;
+	static Archive::ByteStream bs;
+
+	PROFILER_AUTO_BLOCK_DEFINE("GameServer::receiveMessage");
+
+	// advise the TaskManager that the gameserver isn't dead in cases where
+	// the server is handling a LOT of LoadObjectMessages and creating
+	// proxies.
+	if(getInstance().m_taskManagerConnection)
+	{
+		if(Clock::timeMs() - s_lastTaskKeepaliveTime > 60000)
+		{
+			static const GenericValueTypeMessage<unsigned long> gameServerTaskManagerKeepAlive("GameServerTaskManagerKeepAlive", Os::getProcessId());
+			getInstance().m_taskManagerConnection->send(gameServerTaskManagerKeepAlive, true);
+			s_lastTaskKeepaliveTime = Clock::timeMs();
+		}
+	}
+
+	ServerConnection * const serverConnection = const_cast<ServerConnection *>(dynamic_cast<ServerConnection const *>(&source));
+
+	if(message.isType("CentralConnectionOpened"))
+	{
+		MESSAGE_PROFILER_BLOCK("CentralConnectionOpened");
+		if (!m_centralServerConnection)
+			m_centralServerConnection = const_cast<CentralServerConnection *>(static_cast<CentralServerConnection const *>(&source));
+	}
+	else if (message.isType("CustomerServiceServerGameServerServiceAddress"))
+	{
+		Archive::ReadIterator ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<std::string, unsigned short> > const address(ri);
+
+		DEBUG_REPORT_LOG(true, ("GameServer: Creating customer service server connection @ (%s:%d)\n", address.getValue().first.c_str(), address.getValue().second));
+
+		if (m_customerServiceServerConnection != NULL)
+		{
+			m_customerServiceServerConnection->disconnect();
+		}
+
+		m_customerServiceServerConnection = new CustomerServiceServerConnection(address.getValue().first, address.getValue().second);
+	}
+	else if(message.isType("BaselinesMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("BaselinesMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		BaselinesMessage const m(ri);
+		ServerObject *so = ServerWorld::findUninitializedObjectByNetworkId(m.getTarget());
+		if (so)
+		{
+			so->applyBaselines(m);
+		}
+		else
+		{
+			// find any object
+			so = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(m.getTarget()));
+			if (so)
+			{
+				DEBUG_WARNING(true, ("Applied baselines on object %s which is already initialized.", m.getTarget().getValueString().c_str()));
+				so->applyBaselines(m);
+			}
+			else
+			{
+				DEBUG_WARNING(true, ("Got baselines on object %s which could not be found.", m.getTarget().getValueString().c_str()));
+			}
+		}
+	}
+	else if(message.isType("BatchBaselinesMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("BaselinesMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		BatchBaselinesMessage const m(ri);
+
+		std::vector<BatchBaselinesMessageData> const & baselines = m.getData();
+
+		ServerObject * lastObject = NULL;
+		
+		for (std::vector<BatchBaselinesMessageData>::const_iterator i=baselines.begin(); i!=baselines.end(); ++i)
+		{
+			// There's a good chance the baselines for an object will come together, so remember the previous object
+			// and don't look it up again if the network id hasn't changed.
+			if (!lastObject || lastObject->getNetworkId() != i->m_networkId)
+			{
+				lastObject = ServerWorld::findUninitializedObjectByNetworkId(i->m_networkId);
+
+				if (!lastObject)
+				{
+					lastObject = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(i->m_networkId));
+					if (lastObject)
+					{
+						WARNING(true, ("Applied baselines on object %s which is already initialized.", i->m_networkId.getValueString().c_str()));
+
+					}
+					else
+					{
+						WARNING(true, ("Got baselines on object %s which could not be found.", i->m_networkId.getValueString().c_str()));
+					}
+				}
+			}
+			if (lastObject)
+			{
+				lastObject->applyBaselines(i->m_packageId, i->m_package);
+			}
+		}
+	}
+	else if(message.isType("DeltasMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("DeltasMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		DeltasMessage const m(ri);
+		ServerObject * const so = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(m.getTarget()));
+		if (so)
+			so->applyDeltas(m);
+		else
+			DEBUG_WARNING(true, ("Got DeltasMessage on object %s, which could not be found.", m.getTarget().getValueString().c_str()));
+	}
+
+	else if(message.isType("ChunkCompleteMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("ChunkCompleteMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		ChunkCompleteMessage const m(ri);
+		GameServer::getInstance().sendToPlanetServer(m);
+
+		std::vector<std::pair<int, int> > const & chunks = m.getChunks();
+		for (std::vector<std::pair<int, int> >::const_iterator i=chunks.begin(); i!=chunks.end(); ++i)
+			ServerBuildoutManager::onChunkComplete(i->first, i->second);
+	}
+
+	else if(message.isType("CentralConnectionClosed"))
+	{
+		MESSAGE_PROFILER_BLOCK("CentralConnectionClosed");
+		// @ todo : shutdown gracefully
+		DEBUG_REPORT_LOG(true, ("The connection to the central server has been closed\n"));
+		setDone("CentralConnectionClosed : %s", serverConnection->getDisconnectReason().c_str());
+		m_centralServerConnection = 0;
+	}
+	else if(message.isType("TaskConnectionOpened"))
+	{
+		MESSAGE_PROFILER_BLOCK("TaskConnectionOpened");
+		DEBUG_REPORT_LOG(true, ("The connection with the task manager has been established\n"));
+	}
+	else if(message.isType("TaskConnectionClosed"))
+	{
+		MESSAGE_PROFILER_BLOCK("TaskConnectionClosed");
+		DEBUG_REPORT_LOG(true, ("The connection to the task manager has closed\n"));
+		m_taskManagerConnection = 0;
+	}
+	else if (message.isType("AddGameServer"))
+	{
+		MESSAGE_PROFILER_BLOCK("AddGameServer");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<uint32> const addGameServerMessage(ri);
+
+		uint32 const pid = addGameServerMessage.getValue();
+
+		DEBUG_REPORT_LOG(true, ("Received AddGameServer for server %lu.\n", pid));
+
+		FATAL(std::find(m_gameServerPids.begin(), m_gameServerPids.end(), pid) != m_gameServerPids.end(), ("Got AddGameServer for server %lu which we thought was already running?", pid));
+
+		m_gameServerPids.push_back(pid);
+		std::sort(m_gameServerPids.begin(), m_gameServerPids.end());
+		}
+	else if (message.isType("ExcommunicateGameServerMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("ExcommunicateGameServerMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		ExcommunicateGameServerMessage msg(ri);
+
+		uint32 const pid = msg.getServerId();
+
+		DEBUG_REPORT_LOG(true, ("Received ExcommunicateGameServer for server %lu.\n", pid));
+		LOG("GameGameConnect", ("Server %lu was told that server %lu has gone away by Central", getProcessId(), pid));
+
+		FATAL(pid == getProcessId(), ("Crashing because Central told us to (probably indicates we weren't responding to pings)"));
+
+		std::vector<uint32>::iterator i = std::find(m_gameServerPids.begin(), m_gameServerPids.end(), pid);
+		if (i != m_gameServerPids.end())
+		{
+			m_gameServerPids.erase(i);
+
+			MessageToQueue::getInstance().onGameServerDisconnect(pid);
+			ServerUniverse::getInstance().onServerConnectionClosed(pid);
+			AuthTransferTracker::handleGameServerDisconnect(pid);
+		}
+	}
+	else if(message.isType("CommoditiesServerConnectionClosed"))
+	{
+		DEBUG_REPORT_LOG(true, ("CommoditiesServer connection closed\n"));
+		CommoditiesMarket::closeCommoditiesServerConnection();
+	}
+	else if (message.isType("ConnectionServerAddress"))
+	{
+		MESSAGE_PROFILER_BLOCK("ConnectionServerAddress");
+		// Central is telling us about a new connection server.
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		ConnectionServerAddress const msg(ri);
+		ConnectionServerConnection * const newConn = new ConnectionServerConnection(msg.getGameServiceAddress(), msg.getGameServicePort());
+		m_connectionServerVector->push_back(newConn);
+	}
+	else if (message.isType("ConnectionServerConnectionClosed") || message.isType("ConnectionServerConnectionDestroyed"))
+	{
+		MESSAGE_PROFILER_BLOCK("ConnectionServerConnectionClosed");
+		ConnectionServerConnection const * const c = dynamic_cast<const ConnectionServerConnection *>(&source);
+		ConnectionServerVector::iterator i = std::find(m_connectionServerVector->begin(), m_connectionServerVector->end(), c);
+		if (i != m_connectionServerVector->end())
+		{
+			m_connectionServerVector->erase(i);
+		}
+	}
+	else if(message.isType("NewClient"))
+	{
+		MESSAGE_PROFILER_BLOCK("NewClient");
+		static std::string const loginTrace("TRACE_LOGIN");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		NewClient const msg(ri);
+		LOG(loginTrace, ("NewClient(%s)", msg.getNetworkId().getValueString().c_str()));
+
+		//@todo make sure this holds up with non players (like vehicles)
+		//because right not, we construct a new client object for EACH object
+		//even ones that could be controlled by the same client.
+		//Also is it possible to receive this message for an object we already control?
+
+		if (m_clients->find(msg.getNetworkId()) != m_clients->end())
+		{
+			// inconsistant state, drop the client
+			LOG(loginTrace, ("NewClient(%s) : Error!  Getting a NewClient message for a client that already exists", msg.getNetworkId().getValueString().c_str()));
+
+			KickPlayer const kickMessage(msg.getNetworkId(), "Duplicate Client");
+			sendToConnectionServers(kickMessage);
+			dropClient(msg.getNetworkId());
+			return;
+		}
+
+		// don't allow login if the character is in the middle of CTS or has been successfully CTS(ed)
+		ServerObject * const obj = ServerWorld::findObjectByNetworkId(msg.getNetworkId());
+		if (obj)
+		{
+			bool kickRequested = false;
+
+			DynamicVariableList const & objVars = obj->getObjVars();
+			int timeOut;
+			if (objVars.getItem("disableLoginCtsInProgress", timeOut))
+			{
+				if (timeOut > static_cast<int>(ServerClock::getInstance().getGameTimeSeconds()))
+				{
+					MessageToQueue::getInstance().sendMessageToC(obj->getNetworkId(), "C++kickPlayerCtsCompletedOrInProgress", "", 0, false);
+					kickRequested = true;
+				}
+				else
+				{
+					obj->removeObjVarItem("disableLoginCtsInProgress");
+				}
+			}
+
+			int transferredTime;
+			if (!kickRequested && objVars.getItem("disableLoginCtsCompleted", transferredTime) && !msg.getUsingAdminLogin())
+			{
+				MessageToQueue::getInstance().sendMessageToC(obj->getNetworkId(), "C++kickPlayerCtsCompletedOrInProgress", "", 0, false);
+				kickRequested = true;
+			}
+		}
+
+		LOG(loginTrace, ("NewClient(%s) : A new client is being created from connection server", msg.getNetworkId().getValueString().c_str()));
+		std::set<NetworkId> const observedObjectSet(msg.getObservedObjects().begin(), msg.getObservedObjects().end());
+		Client * const c = new Client(
+			const_cast<ConnectionServerConnection &>(static_cast<const ConnectionServerConnection &>(source)),
+			msg.getNetworkId(),
+			msg.getAccountName(),
+			msg.getIpAddress(),
+			msg.getIsSecure(),
+			msg.getIsSkipLoadScreen(),
+			msg.getStationId(),
+			observedObjectSet,
+			msg.getGameFeatures(),
+			msg.getSubscriptionFeatures(),
+			Client::AccountFeatureIdList(),
+			msg.getEntitlementTotalTime(),
+			msg.getEntitlementEntitledTime(),
+			msg.getEntitlementTotalTimeSinceLastLogin(),
+			msg.getEntitlementEntitledTimeSinceLastLogin(),
+			msg.getBuddyPoints(),
+			msg.getConsumedRewardEvents(),
+			msg.getClaimedRewardItems(),
+			msg.getUsingAdminLogin(),
+			CombatDataTable::CSFT_All,
+			128,
+			90,
+			false,
+			false,
+			msg.getSendToStarport() );
+
+		ClientMap::iterator f = m_clients->find(msg.getNetworkId());
+
+		if(f != m_clients->end())
+			m_clients->erase(msg.getNetworkId());
+
+		m_clients->insert(std::make_pair(msg.getNetworkId(), c));
+
+		if (!msg.getUsingAdminLogin())
+		{
+			AccountFeatureIdRequest const req(NetworkId::cms_invalid, GameServer::getInstance().getProcessId(), msg.getNetworkId(), static_cast<StationId>(msg.getStationId()), PlatformGameCode::SWG, AccountFeatureIdRequest::RR_Reload);
+			c->sendToConnectionServer(req);
+		}
+	}
+	else if(message.isType("AuthTransferClientMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("AuthTransferClientMessage");
+		static const std::string loginTrace("TRACE_LOGIN");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		AuthTransferClientMessage const msg(ri);
+		LOG(loginTrace, ("AuthTransferClientMessage(%s)", msg.getNetworkId().getValueString().c_str()));
+
+		//@todo make sure this holds up with non players (like vehicles)
+		//because right not, we construct a new client object for EACH object
+		//even ones that could be controlled by the same client.
+		//Also is it possible to receive this message for an object we already control?
+
+		if (m_clients->find(msg.getNetworkId()) != m_clients->end())
+		{
+			// inconsistant state, drop the client
+			LOG(loginTrace, ("AuthTransferClientMessage(%s) : Error!  Getting a AuthTransferClientMessage message for a client that already exists", msg.getNetworkId().getValueString().c_str()));
+			KickPlayer const kickMessage(msg.getNetworkId(), "Duplicate Client");
+			sendToConnectionServers(kickMessage);
+			dropClient(msg.getNetworkId());
+			return;
+		}
+
+		// locate the connection server for the client
+		ConnectionServerConnection * const connectionServer = getConnectionServerConnection(msg.getConnectionServerIp(), msg.getConnectionServerPort());
+
+		if (!connectionServer)
+		{
+			// inconsistant state, drop the client
+			LOG(loginTrace, ("AuthTransferClientMessage(%s) : Error!  Getting a AuthTransferClientMessage message for a client but could not locate connection server (%s:%hu)", msg.getNetworkId().getValueString().c_str(), msg.getConnectionServerIp().c_str(), msg.getConnectionServerPort()));
+			KickPlayer const kickMessage(msg.getNetworkId(), "Invalid Connection Server");
+			sendToConnectionServers(kickMessage);
+			dropClient(msg.getNetworkId());
+			return;
+		}
+
+		LOG(loginTrace, ("AuthTransferClientMessage(%s) : A new client is being created from game server %lu", msg.getNetworkId().getValueString().c_str(), msg.getSourceServerPid()));
+
+		std::set<NetworkId> observedObjectSet(msg.getObservedObjects().begin(), msg.getObservedObjects().end());
+		Client * c = new Client(*connectionServer, msg.getNetworkId(), msg.getAccount(), msg.getIpAddress(), msg.getSecure(), msg.getSkipLoadScreen(), msg.getStationId(), observedObjectSet, msg.getGameFeatures(), msg.getSubscriptionFeatures(), msg.getAccountFeatureIds(), msg.getEntitlementTotalTime(), msg.getEntitlementEntitledTime(), msg.getEntitlementTotalTimeSinceLastLogin(), msg.getEntitlementEntitledTimeSinceLastLogin(), msg.getBuddyPoints(), msg.getConsumedRewardEvents(), msg.getClaimedRewardItems(), msg.getUsingAdminLogin(), static_cast<CombatDataTable::CombatSpamFilterType>(msg.getCombatSpamFilter()), msg.getCombatSpamRangeSquaredFilter(), msg.getFurnitureRotationDegree(), msg.getHasUnoccupiedJediSlot(), msg.getIsJediSlotCharacter());
+		ClientMap::iterator f = m_clients->find(msg.getNetworkId());
+
+		if(f != m_clients->end())
+			m_clients->erase(msg.getNetworkId());
+
+		m_clients->insert(std::make_pair(msg.getNetworkId(), c));
+	}
+
+	//---
+	// application messages
+	else if(message.isType("CentralGameServerSetProcessId"))
+	{
+		MESSAGE_PROFILER_BLOCK("CentralGameServerSetProcessId");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		CentralGameServerSetProcessId const m(ri);
+
+		m_processId = m.getProcessId();
+		LOG("GameServer", ("I am process %d", m_processId));
+		LOG("GameGameConnect", ("Received CentralGameServerSetProcessId message for pid %d", m_processId));
+		DEBUG_FATAL(m.getClockSubtractInterval()==0,("Got 0 for the clock subtract interval (probably indicates we connected to Central too early).\n"));
+		ServerClock::getInstance().setSubtractInterval(m.getClockSubtractInterval());
+		m_clusterName = m.getClusterName();
+
+		ScriptParams s;
+		s.addParam(m_clusterName.c_str());
+		GameScriptObject::runOneScript("base_class", "setGalaxyName", "s", s);
+		Chat::createSystemRooms(m_clusterName, ServerWorld::getSceneId());
+
+		if (!m_centralServerConnection)
+		{
+			m_centralServerConnection = const_cast<CentralServerConnection *>(static_cast<CentralServerConnection const *>(&source));
+			DEBUG_FATAL(true, ("m_centralServerConnection should have already been set when receiving CentralConnectionOpened."));
+		}
+
+		CentralGameServerConnect const connectMessage(
+			ConfigServerGame::getSceneID(),
+			"",
+			0,
+			"",
+			0);
+
+		m_centralServerConnection->send(connectMessage, true);
+
+		loadRetroactiveCtsHistory();
+		loadRetroactivePlayerCityCreationTime();
+	}
+	else if (message.isType("SetAuthoritativeMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("SetAuthoritativeMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		SetAuthoritativeMessage const t(ri);
+
+		ServerObject * const object = ServerWorld::findObjectByNetworkId(t.getId());
+		if (object)
+		{
+			bool allowed = true;
+
+			// if the PlanetServer is asking us to transfer authority for an object that
+			// is contained, reject it, because contained object must have the same authority
+			// as its container; this can happen in a race condition where authority transfer
+			// is requested, and while the request is happening, the object moves into a container
+			if ((&source == m_planetServerConnection) && !t.getSceneChange() && object->isAuthoritative())
+			{
+				Object const * const topmostContainer = ContainerInterface::getTopmostContainer(*object);
+
+				if (topmostContainer != object)
+				{
+					WARNING(true, ("Denying authority transfer for (%s) from game server (%lu) to game server (%lu) because it is contained by (%s)", object->getDebugInformation().c_str(), GameServer::getInstance().getProcessId(), t.getProcess(), (topmostContainer ? topmostContainer->getDebugInformation().c_str() : "NULL")));
+
+					allowed = false;
+
+					GenericValueTypeMessage<std::pair<NetworkId, uint32> > const denyMessage(
+						"DenySetAuthoritativeMessage",
+						std::make_pair(t.getId(), GameServer::getInstance().getProcessId()));
+
+					sendToPlanetServer(denyMessage);
+
+					object->updatePositionOnPlanetServer(true);
+				}
+			}
+
+			if (allowed)
+			{
+			if (t.getGoalIsValid())
+				object->transferAuthority(t.getProcess(), !t.getSceneChange(), t.getHandlingCrash(), t.getGoalCell(), t.getGoalTransform(), false);
+			else
+				object->transferAuthority(t.getProcess(), !t.getSceneChange(), t.getHandlingCrash(), false);
+			}
+		}
+	}
+	else if(message.isType("LoadObjectMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("LoadObjectMessage");
+
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		LoadObjectMessage const t(ri);
+
+		ServerObject * const target = ServerWorld::findObjectByNetworkId(t.getId());
+		if (target)
+			createRemoteProxy(t.getProcess(), target);
+		else
+			WARNING(true, ("Told to create object %s on %d we know nothing about (received LoadObjectMessage for an object not on this server, PlanetServer is probably confused)", t.getId().getValueString().c_str(), t.getProcess()));
+	}
+	else if(message.isType("UnloadObjectMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("UnloadObjectMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		UnloadObjectMessage const t(ri);
+
+		DEBUG_REPORT_LOG(ConfigServerGame::getLogObjectLoading(), ("Got unload object message for %s\n", t.getId().getValueString().c_str()));
+
+		ServerObject * const object = ServerWorld::findObjectByNetworkId(t.getId());
+		if (object)
+			object->unload();
+		DEBUG_WARNING(! object, ("Handling unload object message but the object does not exist\n"));
+	}
+	else if(message.isType("UnloadProxyMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("UnloadProxyMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		UnloadProxyMessage const unloadProxyMessage(ri);
+
+		DEBUG_REPORT_LOG(ConfigServerGame::getLogObjectLoading(), ("Received UnloadProxyMessage for object %s server %lu\n", unloadProxyMessage.getObjectId().getValueString().c_str(), unloadProxyMessage.getProxyGameServerId()));
+
+		ServerObject * const object = ServerWorld::findObjectByNetworkId(unloadProxyMessage.getObjectId());
+		if(object)
+		{
+			if(object->isAuthoritative())
+			{
+				if (unloadProxyMessage.getProxyGameServerId() != getProcessId())
+					object->removeServerFromProxyList(unloadProxyMessage.getProxyGameServerId());
+				else
+					DEBUG_WARNING(true,("Can't unproxy object %s from this server because this server is authoritative.", unloadProxyMessage.getObjectId().getValueString().c_str()));
+			}
+			else
+			{
+				DEBUG_REPORT_LOG(ConfigServerGame::getLogObjectLoading(),("Forwarding UnloadProxyMessage for %s to authoritative server\n", unloadProxyMessage.getObjectId().getValueString().c_str()));
+
+				ServerMessageForwarding::begin(object->getAuthServerProcessId());
+
+				ServerMessageForwarding::send(unloadProxyMessage);
+
+				ServerMessageForwarding::end();
+			}
+		}
+		else
+			DEBUG_WARNING(true, ("Received UnloadProxyMessage for object %s server %lu, but the object could not be found", unloadProxyMessage.getObjectId().getValueString().c_str(), unloadProxyMessage.getProxyGameServerId()));
+	}
+	else if(message.isType("ProfilerOperationMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("ProfilerOperationMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		ProfilerOperationMessage const m(ri);
+		uint32 const processId = m.getProcessId();
+		if (processId == 0 || processId == getProcessId())
+			Profiler::handleOperation(m.getOperation().c_str());
+	}
+	else if(message.isType("CentralCreateCharacter"))
+	{
+		MESSAGE_PROFILER_BLOCK("CentralCreateCharacter");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		handleCreateCharacter(new CentralCreateCharacter(ri));
+	}
+	else if (message.isType("VerifyNameResponse"))
+	{
+		MESSAGE_PROFILER_BLOCK("VerifyNameResponse");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		VerifyNameResponse vrn(ri);
+		
+		if (isCreatePending(vrn.getStationId()))
+		{
+			handleCharacterCreateNameVerification(vrn);
+		}
+		else
+		{
+			handleVerifyAndLockNameVerification(vrn);
+		}
+	}
+	else if (message.isType("RandomNameRequest"))
+	{
+		MESSAGE_PROFILER_BLOCK("RandomNameRequest");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		RandomNameRequest const crnr(ri);
+		handleNameRequest(crnr);
+	}
+	else if (message.isType("VerifyAndLockNameRequest"))
+	{
+		MESSAGE_PROFILER_BLOCK("VerifyAndLockNameRequest");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		VerifyAndLockNameRequest const valnr(ri);
+		handleVerifyAndLockNameRequest(valnr, true, true);
+	}
+	else if(message.isType("ObjControllerMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("ObjControllerMessage");
+
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		ObjControllerMessage	c(ri);
+
+		// Could be in baselines so it may be initialized or it may not.  Since we don't know we have to use NetworkIdManager to get it.
+		// The object could also have been destroyed due to an auth transfer, so if it has been and not all servers have confirmed it,
+		// we need to forward the message.
+
+		bool appended = false;
+
+		ServerObject * const target = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(c.getNetworkId()));
+		if (target != NULL)
+		{
+			// valid target, get its controller
+			ServerController * const controller = safe_cast<ServerController *>(target->getController());
+			if (controller != NULL)
+			{
+				uint32 flags = c.getFlags();
+				if(flags & GameControllerMessageFlags::DEST_AUTH_SERVER)
+				{
+					if(ConfigServerGame::getEnableDebugControllerMessageSpam())
+					{
+						WARNING(! target->isAuthoritative(), ("Received a controller message (%d) destined for the authoritative object (%s:%s) on this server, but the object is NOT authoritative on this server", c.getMessage(), target->getObjectTemplateName(), target->getNetworkId().getValueString().c_str() ));
+					}
+				}
+				flags |= GameControllerMessageFlags::SOURCE_REMOTE_SERVER;
+				controller->appendMessage(c.getMessage(), c.getValue(), c.getData(), flags);
+				appended = true;
+			}
+		}
+		else
+		{
+			uint32 const destServer = AuthTransferTracker::getAuthTransferDest(c.getNetworkId());
+			if (destServer)
+			{
+				if(ConfigServerGame::getEnableDebugControllerMessageSpam())
+				{
+					WARNING(true, ("ObjControllerMessage %d for object %s arrived, but the object has transferred authority to server %d", c.getMessage(), c.getNetworkId().getValueString().c_str(), destServer));
+				}
+
+				ServerMessageForwarding::begin(destServer);
+
+				ServerMessageForwarding::send(c);
+
+				ServerMessageForwarding::end();
+			}
+			else
+				DEBUG_WARNING(true, ("Got ObjControllerMessage for object %s, which could not be found.", c.getNetworkId().getValueString().c_str()));
+		}
+
+		if (!appended)
+			delete c.getData();
+	}
+	else if(message.isType("EndBaselinesMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("EndBaselinesMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		EndBaselinesMessage const t(ri);
+		ServerObject * const object = ServerWorld::findUninitializedObjectByNetworkId(t.getId());
+		if (object != NULL)
+		{
+			DEBUG_REPORT_LOG(ConfigServerGame::getLogObjectLoading(), ("Received EndBaselinesMessage for %s\n", t.getId().getValueString().c_str()));
+			ServerController * const controller = dynamic_cast<ServerController *>(object->getController());
+			NOT_NULL(controller);
+
+			bool const fromDbServer = serverConnection && serverConnection == m_databaseProcessConnection;
+			object->serverObjectEndBaselines(fromDbServer);
+		}
+		else
+		{
+			ServerObject * const badObject = ServerWorld::findObjectByNetworkId(t.getId());
+			WARNING(!badObject, ("Got EndBaeslinesMessage on object (%s) that doesn't exist!", t.getId().getValueString().c_str()));
+			WARNING(badObject, ("Got EndBaselinesMessage on object (%s : %s) which has already been created and placed in the world!", badObject->getTemplateName(), badObject->getNetworkId().getValueString().c_str()));
+		}
+	}
+	else if(message.isType("TaskShutdownGameServer"))
+	{
+		MESSAGE_PROFILER_BLOCK("TaskShutdownGameServer");
+		setDone("TaskShutdownGameServer");
+	}
+	else if (message.isType("CreateObjectByCrcMessage"))
+	{
+		s_totalObjectCreateMessagesReceived ++;
+
+		MESSAGE_PROFILER_BLOCK("CreateObjectByCrcMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+
+		NetworkId   networkId;
+		uint32      templateCrc;
+		bool        createAuthoritative;
+
+		CreateObjectByCrcMessage const t(ri);
+			networkId = t.getId();
+			templateCrc = t.getCrc();
+			createAuthoritative = t.getCreateAuthoritative();
+
+		NOT_NULL(serverConnection);
+		DEBUG_REPORT_LOG(ConfigServerGame::getLogObjectLoading(), ("CreateObjectMessageByName %s:%s\n", ObjectTemplateList::lookUp(templateCrc).getString(), networkId.getValueString().c_str()));
+
+		Object * const object = NetworkIdManager::getObjectById(networkId);
+		bool okToCreate = true;
+		if (object)
+		{
+			DEBUG_REPORT_LOG(true, ("WARNING: GOT create message for object %s that already exists!\n", networkId.getValueString().c_str()));
+			if (object->getKill())
+			{
+				delete object;
+				okToCreate = true;
+			}
+			else
+			{
+				WARNING_STRICT_FATAL(true, ("Hey, Got create message for object %s That isn't being deleted!", networkId.getValueString().c_str()));
+				okToCreate = false;
+			}
+		}
+
+		if (okToCreate)
+		{
+			//-- Since space is single-server, we will never have proxied space objects and we can ignore the hyperspace variable in the CreateObjectBy*Message message.
+			ServerWorld::createProxyObject(templateCrc, networkId, createAuthoritative);
+		}
+	}
+	else if(message.isType("CreateSyncUiMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("CreateSyncUiMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		CreateSyncUiMessage const msg(ri);
+		ServerObject * const so = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(msg.getId()));
+		if (so)
+			so->addSynchronizedUi(msg.getClients());
+	}
+	else if(message.isType("SynchronizeScriptVarsMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("SynchronizeScriptVarsMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		SynchronizeScriptVarsMessage const msg(ri);
+		ServerObject *so = ServerWorld::findUninitializedObjectByNetworkId(msg.getNetworkId());
+		if (so)
+		{
+			GameScriptObject const * const script = so->getScriptObject();
+			if (script)
+				script->unpackScriptVars(msg.getData());
+		}
+		else
+		{
+			so = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(msg.getNetworkId()));
+			DEBUG_WARNING(so, ("Got SynchronizeScriptVarsMessage for initialized object"));
+		}
+	}
+	else if (message.isType("SynchronizeScriptVarDeltasMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("SynchronizeScriptVarDeltasMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		SynchronizeScriptVarDeltasMessage const msg(ri);
+		ServerObject * const so = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(msg.getNetworkId()));
+		if (so)
+		{
+			GameScriptObject const * const script = so->getScriptObject();
+			if (script)
+				script->unpackDeltaScriptVars(msg.getData());
+		}
+		else
+			DEBUG_WARNING(true,("Got SynchronizeScriptVarDeltasMessage on object %s, which could not be found.", msg.getNetworkId().getValueString().c_str()));
+	}
+	else if(message.isType("UpdateObjectPositionMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("UpdateObjectPositionMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		UpdateObjectPositionMessage const msg(ri);
+		ServerObject * const so = ServerWorld::findUninitializedObjectByNetworkId(msg.getNetworkId());
+		if (so)
+			so->applyObjectPositionUpdate(msg);
+	}
+	else if(message.isType("UpdateContainmentMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("UpdateContainmentMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		UpdateContainmentMessage const msg(ri);
+		ServerObject * const so = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(msg.getNetworkId()));
+		if (so)
+		{
+			// Handle the containment update.
+			so->updateContainment(msg.getContainerId(), msg.getSlotArrangement());
+		}
+	}
+	else if(message.isType("DropClient"))
+	{
+		MESSAGE_PROFILER_BLOCK("DropClient");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		DropClient const msg(ri);
+		dropClient(msg.getNetworkId(), msg.getImmediate());
+	}
+	else if(message.isType("SetPlanetServerMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("SetPlanetServerMessage");
+		DEBUG_REPORT_LOG(true,("Received SetPlanetServerMessage\n"));
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		SetPlanetServerMessage const m(ri);
+		m_planetServerConnection = new PlanetServerConnection(m.getAddress(),m.getPort());
+	}
+	else if (message.isType("PlanetConnectionOpened"))
+	{
+		MESSAGE_PROFILER_BLOCK("PlanetConnectionOpened");
+		m_planetServerConnection = const_cast<PlanetServerConnection *>(static_cast<const PlanetServerConnection *>(&source));
+		DEBUG_REPORT_LOG(true, ("Connection with the Planet server has been established\n"));
+		onPlanetServerConnectionEstablished();
+	}
+	else if (message.isType("PlanetConnectionClosed"))
+	{
+		MESSAGE_PROFILER_BLOCK("PlanetConnectionClosed");
+		if (m_planetServerConnection)
+		{
+			m_planetServerConnection->setDisconnectReason("received PlanetConnectionClosed");
+			m_planetServerConnection->disconnect();
+		}
+		m_planetServerConnection = 0;
+		setDone("PlanetConnectionClosed : %s", serverConnection->getDisconnectReason().c_str());
+	}
+	else if (message.isType("GameServerSetupMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("GameServerSetupMessage");
+		LOG("GameGameConnect", ("Game Server %d Received GameServerSetupMessage.", m_processId));
+
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<std::vector<uint32>, std::pair<uint32, std::pair<std::string, uint16> > > > const m(ri);
+
+		m_gameServerPids = m.getValue().first;
+		std::sort(m_gameServerPids.begin(), m_gameServerPids.end());
+
+		ServerMessageForwarding::beginBroadcast();
+
+		GenericValueTypeMessage<uint32> const addGameServerMessage("AddGameServer", getProcessId());
+		ServerMessageForwarding::send(addGameServerMessage);
+
+		ServerMessageForwarding::end();
+
+		uint32 const databaseProcessId = m.getValue().second.first;
+		std::string const &databaseProcessAddress = m.getValue().second.second.first;
+		uint16 const databaseProcessPort = m.getValue().second.second.second;
+
+		connectToDatabaseProcess(databaseProcessAddress, databaseProcessPort, databaseProcessId);
+
+		m_connectionTimeout = Clock::timeMs() + ConfigServerGame::getConnectToAllGameServersTimeout() * 1000;
+	}
+	else if (message.isType("LoadUniverseMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("LoadUniverseMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		LoadUniverseMessage const msg(ri);
+
+		DEBUG_REPORT_LOG(true,("Got LoadUniverseMessage\n"));
+		ServerUniverse::getInstance().requestCreateProxiesOnServer(msg.getProcess());
+	}
+	else if (message.isType("SetUniverseAuthoritativeMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("SetUniverseAuthoritativeMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		SetUniverseAuthoritativeMessage const m(ri);
+		ServerUniverse::getInstance().setUniverseProcess(m.getProcess());
+	}
+	else if (message.isType("AddResourceTypeMessage"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		AddResourceTypeMessage const msg(ri);
+		ServerUniverse::getInstance().handleAddResourceTypeMessage(msg);
+	}
+	else if (message.isType("AddImportedResourceType"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<NetworkId, std::string> > const msg(ri);
+
+		if (!ServerUniverse::getInstance().getImportedResourceTypeById(msg.getValue().first))
+			IGNORE_RETURN(ResourceTypeObject::addImportedResourceType(msg.getValue().second));
+	}
+	else if (message.isType("UniverseCompleteMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("UniverseCompleteMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<uint32> const msg(ri);
+
+		ServerUniverse::getInstance().universeComplete(msg.getValue());
+		GameServerUniverseLoadedMessage const reply(getProcessId(), msg.getValue());
+		GameServer::getInstance().sendToCentralServer(reply);
+		GameServer::getInstance().sendToPlanetServer(reply);
+		gs_gameServerReady = true;
+	}
+	else if (message.isType("GameServerUniverseLoadedMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("GameServerUniverseLoadedMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GameServerUniverseLoadedMessage const msg(ri);
+
+		ServerUniverse::getInstance().universeLoadedAck(msg.getProcessId());
+	}
+	else if (message.isType("PreloadRequestCompleteMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("PreloadRequestCompleteMessage");
+		LOG("Preload", ("Game Server %d received preloadRequestCompleteMessage from database", getInstance().m_processId));
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		PreloadRequestCompleteMessage const msg(ri);
+
+		DEBUG_REPORT_LOG(true,("Got PreloadRequestCompleteMessage.  We are server %lu in the preload list\n",msg.getPreloadAreaId()));
+
+		m_preloadAreaId = msg.getPreloadAreaId();
+		MetricsManager::install(m_metricsData, true, "GameServer", ServerWorld::getSceneId(), msg.getPreloadAreaId());
+		s_metricsManagerInstalled = true;
+		GameServer::getInstance().sendToPlanetServer(msg);
+
+		// Our assigned preload number should be the same as the preload number we were started with;
+		// The cluster will still work but the restartgameserver.pl script may end up restarting the wrong
+		// game server because of the mismatch; it's worth putting out a log to look into what went wrong
+#ifndef _DEBUG
+		if (static_cast<int>(msg.getPreloadAreaId()) != ConfigServerGame::getPreloadNumber())
+			LOG("Preload", ("Game Server %d got assigned preload number %lu but was launched with preload number %d", getInstance().m_processId, msg.getPreloadAreaId(), ConfigServerGame::getPreloadNumber()));
+#endif
+
+		// Notify ServerWorld that preloading is complete, so it can trigger scripts as appropriate
+		ServerWorld::onPreloadComplete();
+	}
+	else if (message.isType("SceneTransferMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("SceneTransferMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		SceneTransferMessage const msg(ri);
+
+		ServerObject * obj = ServerWorld::findObjectByNetworkId(msg.getNetworkId());
+		if (obj)
+			obj->removeObjVarItem(OBJVAR_HAS_OUTSTANDING_REQUEST_SCENE_TRANSFER);
+
+		if (obj && obj->isAuthoritative() && isGameServerConnected(msg.getDestinationGameServer()) && (!obj->isPlayerControlled() || obj->getClient()))
+		{
+			if (obj->getSceneId() == msg.getSceneName())
+			{
+				WARNING_STRICT_FATAL(true, ("Same scene planetwarps are no longer supported!"));
+				if (obj->getClient())
+					dropClient(obj->getNetworkId());
+				obj->unload();
+			}
+			else
+			{
+				// Mounts: if it is a rider that is trying to planet warp, change the planet warp object
+				// to be the mount.
+				CreatureObject *const objAsCreature = obj->asCreatureObject();
+				if (objAsCreature)
+				{
+					if (objAsCreature->getState(States::RidingMount))
+					{
+						// The obj instance is a mounted rider.  Replace obj with the mount.
+						CreatureObject *const mountObject = objAsCreature->getMountedCreature();
+						if (mountObject)
+						{
+							// Set the proper position for the rider to that for the
+							// scene transfer.  Failure to take this step causes the
+							// ServerObject::setClient() call on the destination server
+							// to have the wrong position for the player, thus setting
+							// up location-based containment improperly, screwing up
+							// the client's view of the world.
+							obj->setPosition_p(msg.getPosition_w());
+
+							// Replace obj with mount.
+							obj = mountObject;
+						}
+						else
+						{
+							LOG("mounts-bug", ("GS::SceneTransferMessage: server id=[%d],rider id=[%s] has RidingMount state but getMountedCreature() returns NULL.", static_cast<int>(getProcessId()), obj->getNetworkId().getValueString().c_str()));
+							objAsCreature->emergencyDismountForRider();
+						}
+					}
+					else
+					{
+						ShipObject * const ship = getAttachedShip(objAsCreature);
+						if (ship)
+						{
+							// Set the proper position for the rider to that for the
+							// scene transfer.  Failure to take this step causes the
+							// ServerObject::setClient() call on the destination server
+							// to have the wrong position for the player, thus setting
+							// up location-based containment improperly, screwing up
+							// the client's view of the world.
+							obj->setPosition_w(msg.getPosition_w());
+
+							obj = ship;
+						}
+					}
+				}
+
+				// Proceed with scene transfer on the transfer focus object.
+				bool doSceneChange = false;
+
+				if (ContainerInterface::getTopmostContainer(*obj) == obj)
+					doSceneChange = true;
+				else
+				{
+					Transform tr(obj->getTransform_o2w());
+					if (tr.isNaN())
+					{
+						WARNING(true, ("Scene change for %s with nan in transform (i=%g,%g,%g j=%g,%g,%g k=%g,%g,%g, p=%g,%g,%g)",
+							obj->getDebugInformation().c_str(),
+							tr.getLocalFrameI_p().x, tr.getLocalFrameI_p().y, tr.getLocalFrameI_p().z,
+							tr.getLocalFrameJ_p().x, tr.getLocalFrameJ_p().y, tr.getLocalFrameJ_p().z,
+							tr.getLocalFrameK_p().x, tr.getLocalFrameK_p().y, tr.getLocalFrameK_p().z,
+							tr.getPosition_p().x, tr.getPosition_p().y, tr.getPosition_p().z));
+						tr.resetRotate_l2p();
+					}
+					Container::ContainerErrorCode err = Container::CEC_Success;
+					doSceneChange = ContainerInterface::transferItemToWorld(*obj, tr, 0, err);
+				}
+
+				if (doSceneChange)
+				{
+					obj->setSceneIdOnThisAndContents(msg.getSceneName());
+
+					//-- As soon as we change the scene id on the object, tell central about the
+					//   scene change.  This fixes a bug that can occur if the authority transfer
+					//   never completes where Central is left thinking we're still on this gameserver's
+					//   scene (the source scene) but the object's data says we're on the destination
+					//   due to the scene set above.
+					GenericValueTypeMessage<std::pair<NetworkId, std::pair<std::string, bool> > > const setSceneMsg("SetSceneForPlayer", std::make_pair(msg.getNetworkId(), std::make_pair(msg.getSceneName(), false)));
+					GameServer::getInstance().sendToCentralServer(setSceneMsg);
+
+					if (!msg.getSceneName().empty())
+					{
+						std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData();
+						std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = connectedCharacterLfgData.find(msg.getNetworkId());
+						if ((iterFind != connectedCharacterLfgData.end()) && (iterFind->second.locationPlanet != msg.getSceneName()))
+							ServerUniverse::setConnectedCharacterPlanetData(msg.getNetworkId(), msg.getSceneName());
+					}
+
+					obj->getContainedByProperty()->setContainedBy(NetworkId::cms_invalid);
+					obj->setPosition_p(msg.getPosition_w());
+					if (msg.getContainerId() != NetworkId::cms_invalid)
+						obj->setInteriorTeleportDestination(msg.getContainerId(), msg.getContainerName(), msg.getPosition_p());
+					if (!msg.getScriptCallback().empty())
+						obj->setTeleportScriptCallback(msg.getScriptCallback());
+					obj->transferAuthority(msg.getDestinationGameServer(), false, false, false);
+					obj->clearProxyList();
+				}
+			}
+		}
+	}
+	else if (message.isType("ChatServerOnline"))
+	{
+		MESSAGE_PROFILER_BLOCK("ChatServerOnline");
+		// a chat server advised the central server that it is online and
+		// is ready for game servers to connect to it.
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		ChatServerOnline const cso(ri);
+
+		if (m_chatServerConnection)
+		{
+			//we shouldn't have one already, but if we do then close it and
+			//accept the new one.
+			WARNING(true, ("We got notification of a new chat server coming online while we still had connection to an existing.  We're going to disconnect from the old one and connect to the new one.  This shouldn't cause any real problems, but we shouldn't have lingering chat connections laying around."));
+			m_chatServerConnection->setDisconnectReason("got ChatServerOnline message");
+			m_chatServerConnection->disconnect();
+			m_chatServerConnection = 0;
+			Chat::setChatServer(m_chatServerConnection);
+		}
+
+		if(! m_chatServerConnection)
+		{
+			REPORT_LOG(true, ("New chat server connection active\n"));
+			m_chatServerConnection = new ChatServerConnection(cso.getAddress(), cso.getPort());
+			Chat::setChatServer(m_chatServerConnection);
+			if(! m_clusterName.empty())
+			{
+				Chat::createSystemRooms(m_clusterName, ServerWorld::getSceneId());
+			}
+		}
+	}
+	else if(message.isType("ChatServerConnectionClosed"))
+	{
+		MESSAGE_PROFILER_BLOCK("ChatServerConnectionClosed");
+		REPORT_LOG(true, ("GameServer: Chat Server connection closed\n"));
+		if (m_chatServerConnection)
+		{
+			m_chatServerConnection->setDisconnectReason("got ChatServerConnectionClosed message");
+			m_chatServerConnection->disconnect();
+			
+			// if there is an interruption of service on the network
+			// between the GameServer and ChatServer, but the ChatServer
+			// is still running, the game server might never reconnect. Advise
+			// Central that the GameServer has lost a connection with the chat 
+			// server
+			GameNetworkMessage const chatClosed("ChatClosedConnectionWithGameServer");
+			sendToCentralServer(chatClosed);
+		}
+		m_chatServerConnection = 0;
+	}
+	else if(message.isType("TeleportMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("TeleportMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		TeleportMessage const msg(ri);
+		handleTeleportMessage(msg);
+	}
+	else if (message.isType("TeleportToMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("TeleportToMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		TeleportToMessage const msg(ri);
+		ServerObject * const serverObj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(msg.getTargetId()));
+		if (serverObj && serverObj->isAuthoritative())
+		{
+
+			// send teleport message
+			Object const * const firstParent = ContainerInterface::getFirstParentInWorld(*serverObj);
+			if (firstParent)
+			{
+				ServerMessageForwarding::begin(msg.getProcessId());
+
+				TeleportMessage const teleportMessage(
+					msg.getActorId(),
+					serverObj->getSceneId(),
+					firstParent->getPosition_w(),
+					firstParent->getAttachedTo() ? firstParent->getAttachedTo()->getNetworkId() : NetworkId::cms_invalid,
+					firstParent->getPosition_p());
+				ServerMessageForwarding::send(teleportMessage);
+
+				ServerMessageForwarding::end();
+			}
+		}
+	}
+	else if(message.isType("RetrievedItemLoadMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("RetrievedItemLoadMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		RetrievedItemLoadMessage const msg(ri);
+		handleRetrievedItemLoadMessage(msg);
+	}
+	else if(message.isType("BiographyMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("BiographyMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		BiographyMessage const msg(ri);
+		BiographyManager::onBiographyRetrieved(msg.getOwner(),msg.getBio());
+	}
+	else if(message.isType("LoadContainedObjectMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("LoadContainedObjectMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		LoadContainedObjectMessage const m(ri);
+		ServerObject * const obj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(m.getContainerId()));
+		if (obj)
+		{
+			WARNING(!obj->isAuthoritative(), ("Got LoadContainedObjectMessage, but the container is not authoritative.  Container is %s, Object id %s",
+				obj->getDebugInformation().c_str(), m.getObjectId().getValueString().c_str()));
+
+			obj->onContainedObjectLoaded(m.getObjectId());
+		}
+		else
+		{
+			WARNING(true, ("Got LoadContainedObjectMessage, but could not find the container.  Container id %s, Object id %s",
+								m.getContainerId().getValueString().c_str(), m.getObjectId().getValueString().c_str()));
+		}
+   	}
+	else if(message.isType("LoadContentsMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("LoadContentsMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		LoadContentsMessage const m(ri);
+		ServerObject * const obj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(m.getContainerId()));
+		if (obj)
+		{
+			WARNING(!obj->isAuthoritative(),("Got LoadContentsMessage, but the container is not authoritative.  Container is %s",
+				obj->getDebugInformation().c_str()));
+
+			obj->onAllContentsLoaded();
+		}
+		else
+		{
+			WARNING(true,("Got LoadContentsMessage, but could not find the container.  Container id %s",
+								m.getContainerId().getValueString().c_str()));
+		}
+	}
+	else if(message.isType("FirstPlanetGameServerIdMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("FirstPlanetGameServerIdMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		FirstPlanetGameServerIdMessage const msg(ri);
+		m_firstGameServerForPlanet = msg.getGameServerId();
+		DEBUG_REPORT_LOG(true,("First game server for %s is %lu\n",ServerWorld::getSceneId().c_str(),m_firstGameServerForPlanet));
+	}
+	else if(message.isType("CreateDynamicRegionCircleMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("CreateDynamicRegionCircleMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		CreateDynamicRegionCircleMessage const msg(ri);
+		RegionMaster::createNewDynamicRegion(msg.getCenterX(), msg.getCenterZ(), msg.getRadius(), msg.getName(), msg.getPlanet(), msg.getPvp(), msg.getBuildable(), msg.getMunicipal(), msg.getGeography(), msg.getMinDifficulty(), msg.getMaxDifficulty(), msg.getSpawnable(), msg.getMission(), msg.getVisible(), msg.getNotify());
+	}
+	else if(message.isType("CreateDynamicRegionRectangleMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("CreateDynamicRegionRectangleMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		CreateDynamicRegionRectangleMessage const msg(ri);
+		RegionMaster::createNewDynamicRegion(msg.getMinX(), msg.getMinZ(), msg.getMaxX(), msg.getMaxZ(), msg.getName(), msg.getPlanet(), msg.getPvp(), msg.getBuildable(), msg.getMunicipal(), msg.getGeography(), msg.getMinDifficulty(), msg.getMaxDifficulty(), msg.getSpawnable(), msg.getMission(), msg.getVisible(), msg.getNotify());
+	}
+	else if(message.isType("CreateGroupMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("CreateGroupMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		CreateGroupMessage const msg(ri);
+		ServerUniverse::getInstance().createGroup(msg.getLeader(), msg.getMembers());
+	}
+	else if(message.isType("ReloadAdminTableMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("ReloadAdminTableMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		ReloadAdminTableMessage const msg(ri);
+		handleReloadAdminTableMessage(msg);
+	}
+	else if(message.isType("ReloadCommandTableMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("ReloadCommandTableMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		ReloadCommandTableMessage const msg(ri);
+		handleReloadCommandTableMessage(msg);
+	}
+	else if (message.isType(ReloadDatatableMessage::ms_messageName))
+	{
+		MESSAGE_PROFILER_BLOCK(ReloadDatatableMessage::ms_messageName);
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		ReloadDatatableMessage const msg(ri);
+		handleReloadDatatableMessage(msg);
+	}
+	else if(message.isType("ReloadScriptMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("ReloadScriptMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		ReloadScriptMessage const msg(ri);
+		handleReloadScriptMessage(msg);
+	}
+	else if(message.isType("ReloadTemplateMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("ReloadTemplateMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		ReloadTemplateMessage const msg(ri);
+		handleReloadTemplateMessage(msg);
+	}
+	else if(message.isType("EnableNewJediTrackingMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("EnableNewJediTrackingMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		EnableNewJediTrackingMessage const msg(ri);
+		handleEnableNewJediTrackingMessage(msg);
+	}
+	else
+	{
+		// GameServer::receiveMessage() is getting too big for the compiler to handle
+		// so some of the message handling is done in the private helper receiveMessage2()
+		receiveMessage2(source, message);
+	}
+}
+
+// ----------------------------------------------------------------------
+// GameServer::receiveMessage() is getting too big for the compiler to handle
+// so some of the message handling is done in this private helper receiveMessage2()
+
+void GameServer::receiveMessage2(const MessageDispatch::Emitter & source, const MessageDispatch::MessageBase & message)
+{
+	static Archive::ReadIterator ri;
+	static Archive::ByteStream bs;
+
+	PROFILER_AUTO_BLOCK_DEFINE("GameServer::receiveMessage2");
+
+	if(message.isType("AuthTransferConfirmMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("AuthTransferConfirmMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<NetworkId, uint32> > const msg(ri);
+		AuthTransferTracker::handleConfirmAuthTransfer(msg.getValue().first, msg.getValue().second);
+	}
+	else if(message.isType("PersistedPlayerMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("PersistedPlayerMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		PersistedPlayerMessage const msg(ri);
+		LogoutTracker::onPersisted(msg.getPlayerId());
+		sendToPlanetServer(msg);
+	}
+	else if(message.isType("RenameCharacterMessageEx"))
+	{
+		MESSAGE_PROFILER_BLOCK("RenameCharacterMessageEx");
+		ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+		RenameCharacterMessageEx msg(ri);
+		NameManager::getInstance().renamePlayer(msg.getCharacterId(), msg.getNewName(), msg.getNewName());
+
+		// update the character's name in the citizen and guild listing
+		if (ServerUniverse::getInstance().isAuthoritative())
+		{
+			std::string const newName(Unicode::wideToNarrow(msg.getNewName()));
+			GuildInterface::verifyGuildMemberName(msg.getCharacterId(), newName);
+			CityInterface::verifyCitizenName(msg.getCharacterId(), newName);
+			CityInterface::verifyPgcChroniclerName(msg.getCharacterId(), newName);
+		}
+	}
+	else if(message.isType("PopulationListMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("PopulationListMessage");
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		PopulationListMessage const msg(ri);
+		ServerUniverse::getInstance().updatePopulationList(msg.getList());
+	}
+	else if (message.isType("CentralPingMessage"))
+	{
+		MESSAGE_PROFILER_BLOCK("CentralPingMessage");
+		CentralPingMessage const reply;
+		sendToCentralServer(reply);
+	}
+	else if (message.isType("LocateObject"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<uint32, std::pair<NetworkId, NetworkId> > > const msg(ri);
+
+		uint32 const responsePid = msg.getValue().first;
+		NetworkId const &targetId = msg.getValue().second.first;
+		NetworkId const &responseId = msg.getValue().second.second;
+
+		ServerObject const * const targetObj = safe_cast<ServerObject const *>(NetworkIdManager::getObjectById(targetId));
+		if (targetObj)
+		{
+			std::vector<NetworkId> containers;
+			for (Object const *o = ContainerInterface::getContainedByObject(*targetObj); o; o = ContainerInterface::getContainedByObject(*o))
+				containers.push_back(o->getNetworkId());
+
+			NetworkId residenceOf;
+			if (!targetObj->getObjVars().getItem("player_structure.residence.building", residenceOf))
+				residenceOf = NetworkId::cms_invalid;
+
+			LocateObjectResponseMessage const msg(
+				targetId,
+				responseId,
+				responsePid,
+				targetObj->findPosition_w(),
+				ConfigServerGame::getSceneID(),
+				targetObj->getObjectTemplateName(),
+				getProcessId(),
+				containers,
+				targetObj->isAuthoritative(),
+				residenceOf);
+
+			sendToCentralServer(msg);
+		}
+	}
+	else if (message.isType("LocateObjectByTemplateName"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<uint32, std::pair<uint32, NetworkId> > > const msg(ri);
+
+		uint32 const        responsePid = msg.getValue().first;
+		uint32 const        templateCrc = msg.getValue().second.first;
+		NetworkId const &   responseId  = msg.getValue().second.second;
+
+		NetworkIdManager::NetworkIdObjectHashMap const & allObjects = NetworkIdManager::getAllObjects();
+		for (NetworkIdManager::NetworkIdObjectHashMap::const_iterator iter = allObjects.begin(); iter != allObjects.end(); ++iter)
+		{
+			if (!iter->second->isAuthoritative())
+			{
+				continue;
+			}
+
+			ObjectTemplate const * const objectTemplate = iter->second->getObjectTemplate();
+			if (objectTemplate && (objectTemplate->getCrcName().getCrc() == templateCrc))
+			{
+				std::vector<NetworkId> containers;
+				for (Object const *o = ContainerInterface::getContainedByObject(*(iter->second)); o; o = ContainerInterface::getContainedByObject(*o))
+					containers.push_back(o->getNetworkId());
+
+				LocateObjectResponseMessage const msg(
+					iter->second->getNetworkId(),
+					responseId,
+					responsePid,
+					iter->second->findPosition_w(),
+					ConfigServerGame::getSceneID(),
+					objectTemplate->getName(),
+					getProcessId(),
+					containers,
+					true,
+					NetworkId::cms_invalid);
+
+				sendToCentralServer(msg);
+			}
+		}
+	}
+	else if (message.isType("LocatePlayerByPartialName"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<uint32, std::pair<std::string, NetworkId> > > const msg(ri);
+
+		uint32 const        responsePid = msg.getValue().first;
+		std::string const & partialName = msg.getValue().second.first;
+		NetworkId const &   responseId  = msg.getValue().second.second;
+
+		// Try to find player objects with matching names
+		std::set<PlayerObject const *> const &players = PlayerObject::getAllPlayerObjects();
+		if (!players.empty())
+		{
+			// Convert the player name to wide character string
+			Unicode::String const widePartialName = Unicode::toLower(Unicode::utf8ToWide(partialName));
+
+			// See if a player object has a "matching" first name
+			std::set<PlayerObject const *>::const_iterator i;
+			for (i = players.begin(); i != players.end(); ++i)
+			{
+				PlayerObject const * const   playerObject   = *i;
+				CreatureObject const * const creatureObject = playerObject->getCreatureObject();
+
+				// don't include logged out players waiting to be saved or not initialized
+				if (!creatureObject || !creatureObject->isInWorld() || !creatureObject->isAuthoritative() || !creatureObject->getClient())
+					continue;
+
+				// Lower case the first name of the player for the comparison
+				Unicode::String lowerCasePlayerName = Unicode::toLower(creatureObject->getAssignedObjectFirstName());
+
+				// Try to find the partial name somewhere within the player name
+				if (partialName == "*" || lowerCasePlayerName.find(widePartialName) != Unicode::String::npos)
+				{
+					LocatePlayerResponseMessage const msg(
+						creatureObject->getNetworkId(),
+						responseId,
+						responsePid,
+						ConfigServerGame::getSceneID(),
+						creatureObject->findPosition_w(),
+						getProcessId());
+
+					sendToCentralServer(msg);
+				}
+			}
+		}
+	}
+	else if (message.isType("LocateWarden"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<uint32, NetworkId> > const msg(ri);
+
+		uint32 const        responsePid = msg.getValue().first;
+		NetworkId const &   responseId  = msg.getValue().second;
+
+		// Try to find warden player objects
+		std::set<PlayerObject const *> const &players = PlayerObject::getAllPlayerObjects();
+		if (!players.empty())
+		{
+			std::set<PlayerObject const *>::const_iterator i;
+			for (i = players.begin(); i != players.end(); ++i)
+			{
+				PlayerObject const * const   playerObject   = *i;
+				CreatureObject const * const creatureObject = playerObject->getCreatureObject();
+
+				// don't include logged out players waiting to be saved or not initialized
+				if (!creatureObject || !creatureObject->isInWorld() || !creatureObject->isAuthoritative() || !creatureObject->getClient())
+					continue;
+
+				if (playerObject->isWarden())
+				{
+					LocatePlayerResponseMessage const msg(
+						creatureObject->getNetworkId(),
+						responseId,
+						responsePid,
+						ConfigServerGame::getSceneID(),
+						creatureObject->findPosition_w(),
+						getProcessId());
+
+					sendToCentralServer(msg);
+				}
+			}
+		}
+	}
+	else if (message.isType("LocateCreatureByCreatureName"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<uint32, std::pair<std::string, NetworkId> > > const msg(ri);
+
+		uint32 const        responsePid = msg.getValue().first;
+		std::string const & creatureName = msg.getValue().second.first;
+		NetworkId const &   responseId  = msg.getValue().second.second;
+
+		CreatureObject::AllCreaturesSet const &creatureList = CreatureObject::getAllCreatures();
+		for (CreatureObject::AllCreaturesSet::const_iterator i = creatureList.begin(); i != creatureList.end(); ++i)
+		{
+			CreatureObject const * const creatureObj = *i;
+			if (creatureObj->isAuthoritative())
+			{
+				AICreatureController const * const aiCreatureController = AICreatureController::asAiCreatureController(creatureObj->getController());
+				if (aiCreatureController == NULL)
+				{
+					continue;
+				}
+
+				PersistentCrcString const & pcsCreatureName = aiCreatureController->getCreatureName();
+				if (pcsCreatureName.isEmpty())
+				{
+					continue;
+				}
+
+				if (creatureName != pcsCreatureName.getString())
+				{
+					continue;
+				}
+
+				std::vector<NetworkId> containers;
+				for (Object const *o = ContainerInterface::getContainedByObject(*creatureObj); o; o = ContainerInterface::getContainedByObject(*o))
+					containers.push_back(o->getNetworkId());
+
+				LocateObjectResponseMessage const msg(
+					creatureObj->getNetworkId(),
+					responseId,
+					responsePid,
+					creatureObj->findPosition_w(),
+					ConfigServerGame::getSceneID(),
+					creatureObj->getObjectTemplateName(),
+					getProcessId(),
+					containers,
+					true,
+					NetworkId::cms_invalid);
+
+				sendToCentralServer(msg);
+			}
+		}
+	}
+	else if (message.isType("LSBOIReq"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<std::pair<uint32, bool>, std::pair<std::pair<NetworkId, NetworkId>, NetworkId> > > const locateStructureByOwnerIdReq(ri);
+
+		handleMessageLocateStructureByOwnerIdReq(*this, locateStructureByOwnerIdReq.getValue().first.first, locateStructureByOwnerIdReq.getValue().first.second, locateStructureByOwnerIdReq.getValue().second.first.first, locateStructureByOwnerIdReq.getValue().second.first.second, locateStructureByOwnerIdReq.getValue().second.second);
+	}
+	else if (message.isType("LSBOIRsp"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<std::pair<uint32, NetworkId>, std::vector<std::string> > > const locateStructureByOwnerIdRsp(ri);
+
+		handleMessageLocateStructureByOwnerIdRsp(locateStructureByOwnerIdRsp.getValue().first.second, locateStructureByOwnerIdRsp.getValue().second);
+	}
+	else if (message.isType("ReportSystemClockTime"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<uint32, NetworkId> > const msg(ri);
+
+#ifdef WIN32
+		std::string hostName = NetworkHandler::getHostName();
+#else
+		std::string hostName = NetworkHandler::getHumanReadableHostName();
+#endif
+
+		std::string time = FormattedString<1024>().sprintf("(%3d,%5dms) %30s.%-2lu (%3lu) on %35s:%-7d (%lu) ", ObjectTracker::getNumPlayers(), static_cast<int>(Clock::frameTime()*1000), ServerWorld::getSceneId().c_str(), m_preloadAreaId, m_processId, hostName.c_str(), Os::getProcessId(), ServerClock::getInstance().getGameTimeSeconds());
+		time += CalendarTime::convertEpochToTimeStringGMT(::time(NULL));
+
+		GenericValueTypeMessage<std::pair<uint32, std::pair<std::string, NetworkId> > > rsctr(
+			"ReportSystemClockTimeResponse", std::make_pair(msg.getValue().first, std::make_pair(time, msg.getValue().second)));
+
+		sendToCentralServer(rsctr);
+	}
+	else if (message.isType("ReportSystemClockTimeResponse"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<uint32, std::pair<std::string, NetworkId> > > const msg(ri);
+
+		ConsoleMgr::broadcastString(msg.getValue().second.first, msg.getValue().second.second);
+	}
+	else if (message.isType("ReportPlanetaryTime"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<uint32, NetworkId> > const msg(ri);
+
+		time_t const timeNow = ::time(NULL);
+		std::string time = FormattedString<1024>().sprintf("%30s.%-2lu (%3lu) (%lu) (%ld, ", ServerWorld::getSceneId().c_str(), m_preloadAreaId, m_processId, ServerClock::getInstance().getGameTimeSeconds(), timeNow);
+		time += CalendarTime::convertEpochToTimeStringGMT(timeNow);
+		time += ")";
+
+		const TerrainObject* const terrainObject = TerrainObject::getInstance();
+		if (terrainObject)
+		{
+			const float environmentCycleTime = terrainObject->getEnvironmentCycleTime();
+			if (environmentCycleTime > 0.f)
+			{
+				const float day = fmodf(static_cast<float>(ServerClock::getInstance().getGameTimeSeconds()), environmentCycleTime) / environmentCycleTime;
+				int hour   = 6 + static_cast<int>(day * 24.f * 60.f) / 60;
+				if (hour >= 24)
+					hour -= 24;
+				const int minute = static_cast<int>(fmodf(day * 24.f * 60.f, 60.f));
+
+				time += FormattedString<1024>().sprintf(" (%g, %02d:%02d, %f)", environmentCycleTime, hour, minute, day);
+			}
+			else
+			{
+				time += FormattedString<1024>().sprintf(" (environmentCycleTime %g is <= 0.f)", environmentCycleTime);
+			}
+		}
+		else
+		{
+			time += " (terrainObject is NULL)";
+		}
+
+		GenericValueTypeMessage<std::pair<uint32, std::pair<std::string, NetworkId> > > rptr(
+			"ReportPlanetaryTimeResponse", std::make_pair(msg.getValue().first, std::make_pair(time, msg.getValue().second)));
+
+		sendToCentralServer(rptr);
+	}
+	else if (message.isType("ReportPlanetaryTimeResponse"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<uint32, std::pair<std::string, NetworkId> > > const msg(ri);
+
+		ConsoleMgr::broadcastString(msg.getValue().second.first, msg.getValue().second.second);
+	}
+	else if (message.isType("ClusterStartComplete"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<bool> const msg(ri);
+
+		if (msg.getValue())
+		{
+			// cluster initial start has completed
+			if (ServerUniverse::getInstance().isAuthoritative())
+			{
+				// add player city travel points
+				std::map<int, CityInfo> const & allCities = CityInterface::getAllCityInfo();
+				for (std::map<int, CityInfo>::const_iterator iter = allCities.begin(); iter != allCities.end(); ++iter)
+				{
+					CityInfo const & ci = iter->second;
+					if (ci.getCityName().empty())
+						continue;
+
+					if ((ci.getRadius() >= 400) && (ci.getTravelCost() > 0))
+					{
+						PlanetObject *planet = ServerUniverse::getInstance().getPlanetByName(ci.getPlanet());
+						if (planet)
+						{
+							planet->addTravelPoint(
+								ci.getCityName(),
+								ci.getTravelLoc(),
+								ci.getTravelCost(),
+								ci.getTravelInterplanetary(),
+								TravelPoint::TPT_PC_Shuttleport);
+						}
+					}
+				}
+
+				// do some sanity check of GCW score
+				GuildObject * const go = ServerUniverse::getInstance().getMasterGuildObject();
+				CityObject const * const co = ServerUniverse::getInstance().getMasterCityObject();
+				if (go && go->isAuthoritative() && co && co->isAuthoritative())
+				{
+					// depersist GCW score, if it hasn't already been done
+					std::map<std::string, int> const & gcwImperialScorePercentile = go->getGcwImperialScorePercentile();
+					if (gcwImperialScorePercentile.empty())
+					{
+						// this will also calculate the GCW Region Defender Bonus
+						go->depersistGcwImperialScorePercentile();
+					}
+					else
+					{
+						// for sanity's sake, (re)calculate the GCW Region Defender Bonus
+						for (std::map<std::string, int>::const_iterator iter = gcwImperialScorePercentile.begin(); iter != gcwImperialScorePercentile.end(); ++iter)
+							go->updateGcwRegionDefenderBonus(iter->first);
+					}
+				}
+			}
+
+			if (ConfigServerGame::getEnableCityCitizenshipFixup() && ServerUniverse::getInstance().isAuthoritative())
+			{
+				std::vector<uint32> const & allGameServerPids = getAllGameServerPids();
+				if (!allGameServerPids.empty())
+				{
+					ServerMessageForwarding::beginBroadcast();
+					GenericValueTypeMessage<uint32> clusterStartupResidenceStructureListRequest("CSRSLReq", getProcessId());
+					ServerMessageForwarding::send(clusterStartupResidenceStructureListRequest);
+					ServerMessageForwarding::end();
+
+					s_clusterStartupResidenceStructureListResponse.clear();
+					for (std::vector<uint32>::const_iterator iter = allGameServerPids.begin(); iter != allGameServerPids.end(); ++iter)
+						IGNORE_RETURN(s_clusterStartupResidenceStructureListResponse.insert(*iter));
+				}
+				else
+				{
+					s_clusterStartupResidenceStructureListByStructure.clear();
+					s_clusterStartupResidenceStructureListResponse.clear();
+				}
+			}
+			else if (!ConfigServerGame::getEnableCityCitizenshipFixup())
+			{
+				s_clusterStartupResidenceStructureListByStructure.clear();
+				s_clusterStartupResidenceStructureListResponse.clear();
+			}
+		}
+		else
+		{
+			s_clusterStartupResidenceStructureListByStructure.clear();
+			s_clusterStartupResidenceStructureListResponse.clear();
+		}
+	}
+	else if (message.isType("CSRSLReq"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<uint32> const clusterStartupResidenceStructureListRequest(ri);
+
+		ServerMessageForwarding::begin(clusterStartupResidenceStructureListRequest.getValue());
+
+		std::map<int, std::set<NetworkId> > clusterStartupResidenceStructureListByCity;
+		if (!s_clusterStartupResidenceStructureListByStructure.empty())
+		{
+			for (std::map<NetworkId, std::pair<int, NetworkId> >::const_iterator iter = s_clusterStartupResidenceStructureListByStructure.begin(); iter != s_clusterStartupResidenceStructureListByStructure.end(); ++iter)
+				IGNORE_RETURN(clusterStartupResidenceStructureListByCity[iter->second.first].insert(iter->second.second));
+		}
+
+		GenericValueTypeMessage<std::pair<uint32, std::map<int, std::set<NetworkId> > > > clusterStartupResidenceStructureListResponse("CSRSLRsp", std::make_pair(getProcessId(), clusterStartupResidenceStructureListByCity));
+		ServerMessageForwarding::send(clusterStartupResidenceStructureListResponse);
+		ServerMessageForwarding::end();
+
+		s_clusterStartupResidenceStructureListByStructure.clear();
+		s_clusterStartupResidenceStructureListResponse.clear();
+	}
+	else if (message.isType("CSRSLRsp"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<uint32, std::map<int, std::set<NetworkId> > > > const clusterStartupResidenceStructureListResponse(ri);
+
+		if (s_clusterStartupResidenceStructureListResponse.erase(clusterStartupResidenceStructureListResponse.getValue().first) != 0)
+		{
+			static std::map<int, std::set<NetworkId> > s_clusterStartupResidenceStructureListByCity;
+
+			std::map<int, std::set<NetworkId> > const & residenceList = clusterStartupResidenceStructureListResponse.getValue().second;
+			if (!residenceList.empty())
+			{
+				for (std::map<int, std::set<NetworkId> >::const_iterator iter = residenceList.begin(); iter != residenceList.end(); ++iter)
+				{
+					if (!iter->second.empty())
+						s_clusterStartupResidenceStructureListByCity[iter->first].insert(iter->second.begin(), iter->second.end());
+				}
+			}
+
+			if (s_clusterStartupResidenceStructureListResponse.empty())
+			{
+				// add our own information to the list
+				if (!s_clusterStartupResidenceStructureListByStructure.empty())
+				{
+					for (std::map<NetworkId, std::pair<int, NetworkId> >::const_iterator iter = s_clusterStartupResidenceStructureListByStructure.begin(); iter != s_clusterStartupResidenceStructureListByStructure.end(); ++iter)
+						IGNORE_RETURN(s_clusterStartupResidenceStructureListByCity[iter->second.first].insert(iter->second.second));
+				}
+
+				// we now have the complete list of every declared structure within
+				// city limits; besides the mayor, only owners of these structures
+				// can be in the citizenship list, so fix up the citizenship list
+				// of all cities right now
+
+				// skip the fixup if it looks like the cluster was started
+				// without loading the entire planet because it means structures
+				// were not loaded, so we don't have the information to determine citizenship
+				if (!s_clusterStartupResidenceStructureListByCity.empty())
+				{				
+					// cities that have no declared structures don't have anything in
+					// the report, so we have to manually add in those cities
+					std::map<NetworkId, std::pair<int, std::string> > allCityMayors;
+					std::map<int, CityInfo> const & allCities = CityInterface::getAllCityInfo();
+
+					for (std::map<int, CityInfo>::const_iterator iterAllCities = allCities.begin(); iterAllCities != allCities.end(); ++iterAllCities)
+					{
+						if (s_clusterStartupResidenceStructureListByCity.count(iterAllCities->first) <= 0)
+							IGNORE_RETURN(s_clusterStartupResidenceStructureListByCity.insert(std::make_pair(iterAllCities->first, std::set<NetworkId>())));
+
+						if (iterAllCities->second.getLeaderId().isValid())
+							allCityMayors[iterAllCities->second.getLeaderId()] = std::make_pair(iterAllCities->first, iterAllCities->second.getCityName());
+					}
+
+					// remove citizens (except the mayor) that do not have a declared structure inside the city limits
+					// if necessary, add as citizen those that have a declared structure inside the city limits
+					std::string cityName;
+					std::string citizenName;
+					int citizenLastLoginTime = 0;
+					NetworkId currentCityMayor;
+					CitizenInfo const * currentCityMayorCitizenInfo;
+					std::string currentCityMayorName;
+					std::vector<NetworkId> citizensToRemove;
+					std::string citizensToRemoveNames;
+					std::string citizensToRemoveDeletedNames;
+					std::string citizensToRemoveInactiveNames;
+					std::string citizensToAddNames;
+					bool needToAddMayorAsCitizen;
+					bool removeCurrentCitizen;
+					bool removeCurrentCitizenDeleted;
+					bool removeCurrentCitizenInactive;
+					bool hasDeclaredResidence;
+					int const timeNow = static_cast<int>(::time(NULL));
+					bool const citizenInactivePackupActive = (ConfigServerGame::getCityCitizenshipInactivePackupStartTimeEpoch() <= timeNow);
+					std::map<std::pair<int, NetworkId>, CitizenInfo> const & allCitizens = CityInterface::getAllCitizensInfo();
+					for (std::map<int, std::set<NetworkId> >::iterator iterCityId = s_clusterStartupResidenceStructureListByCity.begin(); iterCityId != s_clusterStartupResidenceStructureListByCity.end(); ++iterCityId)
+					{
+						CityInfo const & cityInfo = CityInterface::getCityInfo(iterCityId->first);
+
+						cityName = cityInfo.getCityName();
+						if (cityName.empty())
+							continue;
+
+						if (!cityInfo.getCityHallId().isValid())
+							continue;
+
+						currentCityMayor = cityInfo.getLeaderId();
+						if (currentCityMayor.isValid())
+							currentCityMayorCitizenInfo = CityInterface::getCitizenInfo(iterCityId->first, currentCityMayor);
+						else
+							currentCityMayorCitizenInfo = NULL;
+
+						if (currentCityMayorCitizenInfo)
+							currentCityMayorName = currentCityMayorCitizenInfo->m_citizenName;
+						else
+							currentCityMayorName.clear();
+
+						if (currentCityMayor.isValid() && !currentCityMayorCitizenInfo)
+							needToAddMayorAsCitizen = true;
+						else
+							needToAddMayorAsCitizen = false;
+
+						LOG("CityFixup", ("City %d (%s:%s, %s:%s) has %d declared structures within its city limits.", iterCityId->first, cityName.c_str(), cityInfo.getCityHallId().getValueString().c_str(), currentCityMayorName.c_str(), currentCityMayor.getValueString().c_str(), iterCityId->second.size()));
+
+						// remove any current citizen who has not logged in for 90 days and is not marked
+						// as a "protected citizen" OR who no longer exists in the DB OR who does not have
+						// a declared structure in the city EXCEPT the mayor of the city; also remove any
+						// current citizen who is a mayor of another city, since mayor can only be the
+						// citizen of the city that they are mayor of
+						static const Unicode::String mailSubjectRemove = Unicode::narrowToWide("@" + StringId("city/city", "city_fixup_remove_citizens_subject").getCanonicalRepresentation());
+						citizensToRemove.clear();
+						citizensToRemoveNames.clear();
+						citizensToRemoveDeletedNames.clear();
+						citizensToRemoveInactiveNames.clear();
+						for (std::map<std::pair<int, NetworkId>, CitizenInfo>::const_iterator iterCurrentCitizen = allCitizens.lower_bound(std::make_pair(iterCityId->first, NetworkId::cms_invalid)); iterCurrentCitizen != allCitizens.end(); ++iterCurrentCitizen)
+						{
+							if (iterCurrentCitizen->first.first != iterCityId->first)
+								break;
+
+							// the erase() will tell us whether this current citizen is confirmed to have
+							// a declared structure in the city; what it also does for us is whoever is left
+							// in the list after all the erase() is done are people who have a declared
+							// structure in the city but are not current citizens, and will need to be added
+							// as citizens
+							citizenName = iterCurrentCitizen->second.m_citizenName;
+							removeCurrentCitizen = false;
+							removeCurrentCitizenDeleted = false;
+							removeCurrentCitizenInactive = false;
+							hasDeclaredResidence = (iterCityId->second.erase(iterCurrentCitizen->first.second) >= 1);
+
+							// mayor never gets removed
+							if (iterCurrentCitizen->first.second != currentCityMayor)
+							{
+								if (!hasDeclaredResidence)
+								{
+									// remove citizen because he doesn't have a declared residence inside the city limits
+									removeCurrentCitizen = true;
+									LOG("CustomerService", ("CityFixup: removed %s (%s) (no declared residence) as citizen of city %d (%s).", iterCurrentCitizen->first.second.getValueString().c_str(), citizenName.c_str(), iterCityId->first, cityName.c_str()));
+								}
+								else if (allCityMayors.count(iterCurrentCitizen->first.second) >= 1)
+								{
+									// remove citizen because he is already the mayor of another city
+									removeCurrentCitizen = true;
+									LOG("CustomerService", ("CityFixup: removed %s (%s) (already mayor of %d:%s) as citizen of city %d (%s).", iterCurrentCitizen->first.second.getValueString().c_str(), citizenName.c_str(), allCityMayors[iterCurrentCitizen->first.second].first, allCityMayors[iterCurrentCitizen->first.second].second.c_str(), iterCityId->first, cityName.c_str()));
+								}
+								else
+								{
+									citizenLastLoginTime = NameManager::getInstance().getPlayerLastLoginTime(iterCurrentCitizen->first.second);
+									if (citizenLastLoginTime <= 0)
+									{
+										// remove citizen because he no longer exists in the DB
+										removeCurrentCitizen = true;
+										removeCurrentCitizenDeleted = true;
+										LOG("CustomerService", ("CityFixup: removed %s (%s) (deleted) as citizen of city %d (%s).", iterCurrentCitizen->first.second.getValueString().c_str(), citizenName.c_str(), iterCityId->first, cityName.c_str()));
+									}
+									else if (citizenInactivePackupActive && ((citizenLastLoginTime + ConfigServerGame::getCityCitizenshipInactivePackupInactiveTimeSeconds()) <= timeNow) && !(iterCurrentCitizen->second.m_citizenPermissions & CitizenPermissions::InactiveProtected))
+									{
+										// remove citizen because he has not logged in for 90 days and is not marked as a "protected citizen"
+										removeCurrentCitizen = true;
+										removeCurrentCitizenInactive = true;
+										LOG("CustomerService", ("CityFixup: removed %s (%s) (inactive %s) as citizen of city %d (%s).", iterCurrentCitizen->first.second.getValueString().c_str(), citizenName.c_str(), CalendarTime::convertSecondsToDHMS(static_cast<unsigned int>(timeNow - citizenLastLoginTime)).c_str(), iterCityId->first, cityName.c_str()));
+									}
+								}
+							}
+
+							if (removeCurrentCitizen)
+							{
+								// build up list of citizens to remove
+								citizensToRemove.push_back(iterCurrentCitizen->first.second);
+
+								// build list of citizens that gets removed to send mail to mayor
+								if (!currentCityMayorName.empty())
+								{
+									if (removeCurrentCitizenDeleted)
+									{
+										if (!citizensToRemoveDeletedNames.empty())
+											citizensToRemoveDeletedNames += "\r\n";
+
+										citizensToRemoveDeletedNames += citizenName;
+
+										// send multiple mail if there are too many names
+										if (citizensToRemoveDeletedNames.size() > 2000)
+										{
+											ProsePackage pp;
+											pp.stringId = StringId("city/city", "city_fixup_remove_deleted_citizens_body");
+											pp.target.str = Unicode::narrowToWide(citizensToRemoveDeletedNames);
+
+											Unicode::String oob;
+											OutOfBandPackager::pack(pp, -1, oob);
+
+											Chat::sendPersistentMessage("City Hall", currentCityMayorName, mailSubjectRemove, Unicode::emptyString, oob);
+
+											citizensToRemoveDeletedNames.clear();
+										}
+									}
+									else if (removeCurrentCitizenInactive)
+									{
+										if (!citizensToRemoveInactiveNames.empty())
+											citizensToRemoveInactiveNames += "\r\n";
+
+										citizensToRemoveInactiveNames += citizenName;
+										citizensToRemoveInactiveNames += " (offline ";
+										citizensToRemoveInactiveNames += CalendarTime::convertSecondsToDHMS(static_cast<unsigned int>(timeNow - citizenLastLoginTime));
+										citizensToRemoveInactiveNames += ")";
+
+										// send multiple mail if there are too many names
+										if (citizensToRemoveInactiveNames.size() > 2000)
+										{
+											ProsePackage pp;
+											pp.stringId = StringId("city/city", "city_fixup_remove_inactive_citizens_body");
+											pp.target.str = Unicode::narrowToWide(citizensToRemoveInactiveNames);
+
+											Unicode::String oob;
+											OutOfBandPackager::pack(pp, -1, oob);
+
+											Chat::sendPersistentMessage("City Hall", currentCityMayorName, mailSubjectRemove, Unicode::emptyString, oob);
+
+											citizensToRemoveInactiveNames.clear();
+										}
+									}
+									else
+									{
+										if (!citizensToRemoveNames.empty())
+											citizensToRemoveNames += "\r\n";
+
+										citizensToRemoveNames += citizenName;
+
+										// send multiple mail if there are too many names
+										if (citizensToRemoveNames.size() > 2000)
+										{
+											ProsePackage pp;
+											pp.stringId = StringId("city/city", "city_fixup_remove_citizens_body");
+											pp.target.str = Unicode::narrowToWide(citizensToRemoveNames);
+
+											Unicode::String oob;
+											OutOfBandPackager::pack(pp, -1, oob);
+
+											Chat::sendPersistentMessage("City Hall", currentCityMayorName, mailSubjectRemove, Unicode::emptyString, oob);
+
+											citizensToRemoveNames.clear();
+										}
+									}
+								}
+							}
+						}
+
+						if (!currentCityMayorName.empty())
+						{
+							if (!citizensToRemoveDeletedNames.empty())
+							{
+								ProsePackage pp;
+								pp.stringId = StringId("city/city", "city_fixup_remove_deleted_citizens_body");
+								pp.target.str = Unicode::narrowToWide(citizensToRemoveDeletedNames);
+
+								Unicode::String oob;
+								OutOfBandPackager::pack(pp, -1, oob);
+
+								Chat::sendPersistentMessage("City Hall", currentCityMayorName, mailSubjectRemove, Unicode::emptyString, oob);
+							}
+
+							if (!citizensToRemoveInactiveNames.empty())
+							{
+								ProsePackage pp;
+								pp.stringId = StringId("city/city", "city_fixup_remove_inactive_citizens_body");
+								pp.target.str = Unicode::narrowToWide(citizensToRemoveInactiveNames);
+
+								Unicode::String oob;
+								OutOfBandPackager::pack(pp, -1, oob);
+
+								Chat::sendPersistentMessage("City Hall", currentCityMayorName, mailSubjectRemove, Unicode::emptyString, oob);
+							}
+
+							if (!citizensToRemoveNames.empty())
+							{
+								ProsePackage pp;
+								pp.stringId = StringId("city/city", "city_fixup_remove_citizens_body");
+								pp.target.str = Unicode::narrowToWide(citizensToRemoveNames);
+
+								Unicode::String oob;
+								OutOfBandPackager::pack(pp, -1, oob);
+
+								Chat::sendPersistentMessage("City Hall", currentCityMayorName, mailSubjectRemove, Unicode::emptyString, oob);
+							}
+						}
+
+						// remove citizens
+						for (std::vector<NetworkId>::const_iterator iterCitizenToRemove = citizensToRemove.begin(); iterCitizenToRemove != citizensToRemove.end(); ++iterCitizenToRemove)
+						{
+							CityInterface::removeCitizen(iterCityId->first, *iterCitizenToRemove, false);
+						}
+
+						// add mayor as a citizen if necessary
+						if (needToAddMayorAsCitizen)
+							IGNORE_RETURN(iterCityId->second.insert(currentCityMayor));
+
+						// add citizens
+						static const Unicode::String mailSubjectAdd = Unicode::narrowToWide("@" + StringId("city/city", "city_fixup_add_citizens_subject").getCanonicalRepresentation());
+						citizensToAddNames.clear();
+						for (std::set<NetworkId>::const_iterator iterCitizenToAdd = iterCityId->second.begin(); iterCitizenToAdd != iterCityId->second.end(); ++iterCitizenToAdd)
+						{
+							// make sure it's a valid player
+							if (!NameManager::getInstance().isPlayer(*iterCitizenToAdd))
+								continue;
+
+							// citizens who have not logged in within the past 90 days should not be
+							// added as a citizen EXCEPT for the mayor who should always be a citizen
+							if ((*iterCitizenToAdd != currentCityMayor) && citizenInactivePackupActive)
+							{
+								citizenLastLoginTime = NameManager::getInstance().getPlayerLastLoginTime(*iterCitizenToAdd);
+								if ((citizenLastLoginTime <= 0) || ((citizenLastLoginTime + ConfigServerGame::getCityCitizenshipInactivePackupInactiveTimeSeconds()) <= timeNow))
+									continue;
+							}
+
+							// don't add someone who is already a mayor of another city, unless
+							// we are adding this city's mayor as a citizen of this city
+							if ((*iterCitizenToAdd != currentCityMayor) && (allCityMayors.count(*iterCitizenToAdd) >= 1))
+								continue;
+
+							// add the new citizen
+							citizenName = NameManager::getInstance().getPlayerFullName(*iterCitizenToAdd);
+							if (citizenName.empty())
+								continue;
+
+							// build list of citizens that gets added to send mail to mayor
+							if (!currentCityMayorName.empty())
+							{
+								if (!citizensToAddNames.empty())
+									citizensToAddNames += "\r\n";
+
+								citizensToAddNames += citizenName;
+
+								// send multiple mail if there are too many names
+								if (citizensToAddNames.size() > 2000)
+								{
+									ProsePackage pp;
+									pp.stringId = StringId("city/city", "city_fixup_add_citizens_body");
+									pp.target.str = Unicode::narrowToWide(citizensToAddNames);
+
+									Unicode::String oob;
+									OutOfBandPackager::pack(pp, -1, oob);
+
+									Chat::sendPersistentMessage("City Hall", currentCityMayorName, mailSubjectAdd, Unicode::emptyString, oob);
+
+									citizensToAddNames.clear();
+								}
+							}
+
+							if (*iterCitizenToAdd == currentCityMayor)
+								LOG("CustomerService", ("CityFixup: added %s (%s) (is mayor) as citizen of city %d (%s).", iterCitizenToAdd->getValueString().c_str(), citizenName.c_str(), iterCityId->first, cityName.c_str()));
+							else
+								LOG("CustomerService", ("CityFixup: added %s (%s) (has declared residence) as citizen of city %d (%s).", iterCitizenToAdd->getValueString().c_str(), citizenName.c_str(), iterCityId->first, cityName.c_str()));
+
+							CityInterface::setCitizenInfo(iterCityId->first, *iterCitizenToAdd, citizenName, NetworkId::cms_invalid, CitizenPermissions::Citizen);
+						}
+
+						if (!citizensToAddNames.empty() && !currentCityMayorName.empty())
+						{
+							ProsePackage pp;
+							pp.stringId = StringId("city/city", "city_fixup_add_citizens_body");
+							pp.target.str = Unicode::narrowToWide(citizensToAddNames);
+
+							Unicode::String oob;
+							OutOfBandPackager::pack(pp, -1, oob);
+
+							Chat::sendPersistentMessage("City Hall", currentCityMayorName, mailSubjectAdd, Unicode::emptyString, oob);
+						}
+					}
+				}
+
+				s_clusterStartupResidenceStructureListByCity.clear();
+				s_clusterStartupResidenceStructureListByStructure.clear();
+				s_clusterStartupResidenceStructureListResponse.clear();
+
+				CityInterface::checkForDualCitizenship();
+			}
+		}
+	}
+	else if (message.isType("LocateStructureMessage"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		LocateStructureMessage const msg(ri);
+		GameServer::getInstance().sendToCentralServer(msg);
+	}
+	else if (message.isType("LoadStructureMessage"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		LoadStructureMessage const msg(ri);
+
+		ServerObject * const house = ServerWorld::findObjectByNetworkId(msg.getStructureId());
+		if (house)
+		{
+			//result += Unicode::narrowToWide("Error. Object already loaded.");
+			std::string replyMessage = "Structure " + msg.getStructureId().getValueString() + " already loaded";
+			Chat::sendSystemMessage(msg.getWhoRequested(), Unicode::narrowToWide(replyMessage), Unicode::String());
+		}
+		else
+		{
+			LoadContentsMessage const lcm(msg.getStructureId());
+			GameServer::getInstance().sendToDatabaseServer(lcm);
+			std::string const replyMessage = "Structure " + msg.getStructureId().getValueString() + " is being loaded";
+			Chat::sendSystemMessage(msg.getWhoRequested(), Unicode::narrowToWide(replyMessage), Unicode::String());
+		}
+	}
+	else if (message.isType("LocateObjectResponseMessage"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		LocateObjectResponseMessage const msg(ri);
+
+		ServerObject * const responseObject = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(msg.getResponseId()));
+		if (responseObject && responseObject->isAuthoritative())
+		{
+			int const cityId = CityInterface::getCityAtLocation(msg.getScene(), static_cast<int>(msg.getPosition_w().x), static_cast<int>(msg.getPosition_w().z), 0);
+			std::string const cityName = CityInterface::getCityInfo(cityId).getCityName();
+
+			NetworkId const residenceOf = msg.getResidenceOf();
+			std::string residenceOfName;
+			if (residenceOf.isValid())
+				residenceOfName = NameManager::getInstance().getPlayerFullName(residenceOf);
+
+			ScriptParams params;
+			params.addParam(msg.getTargetId(), "target");
+			params.addParam(msg.getPosition_w(), "location");
+			params.addParam(msg.getScene().c_str(), "scene");
+			params.addParam(msg.getSharedTemplateName().c_str(), "sharedTemplateName");
+			params.addParam(static_cast<int>(msg.getTargetPid()), "pid");
+			params.addParam(msg.getContainers(), "containers");
+			params.addParam(msg.getIsAuthoritative(), "isAuthoritative");
+			params.addParam(cityId, "cityId");
+			params.addParam(cityName.c_str(), "cityName");
+			params.addParam(residenceOf, "residenceOfId");
+			params.addParam(residenceOfName.c_str(), "residenceOfName");
+
+			ScriptDictionaryPtr dictionary;
+			responseObject->getScriptObject()->makeScriptDictionary(params, dictionary);
+			if (dictionary.get() != NULL)
+			{
+				dictionary->serialize();
+				MessageToQueue::getInstance().sendMessageToJava(responseObject->getNetworkId(), "foundObject", dictionary->getSerializedData(), 0, false);
+			}
+		}
+	}
+	else if (message.isType("LocatePlayerResponseMessage"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		LocatePlayerResponseMessage const msg(ri);
+
+		ServerObject * const responseObject = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(msg.getResponseId()));
+		if (responseObject && responseObject->isAuthoritative() && responseObject->getClient())
+		{
+			std::string playerInfo = FormattedString<512>().sprintf("%s (%s) is on server %lu. %s (%.2f, %.2f, %.2f)",
+				msg.getTargetId().getValueString().c_str(),
+				NameManager::getInstance().getPlayerFullName(msg.getTargetId()).c_str(),
+				msg.getTargetPid(), msg.getScene().c_str(),
+				msg.getPosition_w().x, msg.getPosition_w().y, msg.getPosition_w().z);
+
+			ConsoleMgr::broadcastString(playerInfo, responseObject->getClient());
+		}
+	}
+	else if(message.isType("PlayerSanityCheck"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<NetworkId, uint32> > const msg(ri);
+		PlayerSanityChecker::handlePlayerSanityCheck(msg.getValue().first, msg.getValue().second);
+	}
+	else if(message.isType("PlayerSanityCheckSuccess"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<NetworkId> const msg(ri);
+		PlayerSanityChecker::handlePlayerSanityCheckSuccess(msg.getValue());
+	}
+	else if(message.isType("PlayerSanityCheckProxy"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<NetworkId, uint32> > const msg(ri);
+		PlayerSanityChecker::handlePlayerSanityCheckProxy(msg.getValue().first, msg.getValue().second);
+	}
+	else if(message.isType("PlayerSanityCheckProxyFail"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<NetworkId, uint32> > const msg(ri);
+		PlayerSanityChecker::handlePlayerSanityCheckProxyFail(msg.getValue().first, msg.getValue().second);
+	}
+	else if (message.isType("EnablePlayerSanityCheckerMessage"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<bool> const msg(ri);
+		PlayerSanityChecker::enable(msg.getValue());
+	}
+	else if(message.isType("StartSaveReplyMessage"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<NetworkId, bool> > const msg(ri);
+
+		ServerObject const * const requestedBy = safe_cast<ServerObject const *>(NetworkIdManager::getObjectById(msg.getValue().first));
+
+		if (requestedBy)
+		{
+			if (msg.getValue().second)
+				Chat::sendSystemMessage(*requestedBy,Unicode::narrowToWide("Save has been started"),Unicode::String());
+			else
+				Chat::sendSystemMessage(*requestedBy,Unicode::narrowToWide("Save could not be started because one was already in progress"),Unicode::String());
+		}
+	}
+	else if(message.isType("DatabaseConsoleReplyMessage"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<std::string, std::string> > const msg(ri);
+
+		Chat::sendSystemMessage(msg.getValue().first,Unicode::narrowToWide(msg.getValue().second),Unicode::String());
+	}
+	else if(message.isType("FindAuthObject"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<NetworkId, unsigned int> > const msg(ri);
+		ServerObject const * const so = safe_cast<ServerObject const *>(NetworkIdManager::getObjectById(msg.getValue().first));
+		bool const found = so && so->isAuthoritative();
+
+		GenericValueTypeMessage<std::pair<std::pair<NetworkId, unsigned int>, bool> > const authResponse(
+			"FindAuthObjectResponse",
+			std::make_pair(msg.getValue(), found));
+		sendToPlanetServer(authResponse);
+	}
+	else if(message.isType("CharacterNamesMessage"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		CharacterNamesMessage const msg(ri);
+		NameManager::getInstance().addPlayers(msg.getIds(), msg.getStationIds(), msg.getNames(), msg.getFullNames(), msg.getCreateTimes(), msg.getLoginTimes());
+	}
+	else if (message.isType ("LocationResponse"))
+	{
+		Archive::ReadIterator readIterator = static_cast<GameNetworkMessage const &> (message).getByteStream ().begin ();
+		LocationResponse const locationResponse (readIterator);
+
+		//-- get the script object to invole the trigger on
+		Object * const object = NetworkIdManager::getObjectById (locationResponse.getNetworkId ());
+		if (!object)
+		{
+			DEBUG_WARNING (true, ("LocationResponse: could not resolve object %s which asked for a location", locationResponse.getNetworkId ().getValueString ().c_str ()));
+			return;
+		}
+
+		ServerObject * const scriptObject = object->asServerObject ();
+		if (!scriptObject)
+		{
+			DEBUG_WARNING (true, ("LocationResponse: object id=%s template=%s is not a server object", object->getNetworkId ().getValueString ().c_str (), object->getObjectTemplateName ()));
+			return;
+		}
+
+		//-- if the location is valid, create a reservation object
+		Vector position_w (locationResponse.getX (), 0.f, locationResponse.getZ ());
+		ServerObject * serverObject = 0;
+		if (locationResponse.getValid ())
+		{
+			//-- construct the name
+			char objectTemplateName [512];
+			snprintf (objectTemplateName, 512, "object/tangible/location/location_%i.iff", static_cast<int> (locationResponse.getRadius ()));
+
+			//-- get the height of the terrain
+			TerrainObject const * const terrainObject = TerrainObject::getConstInstance ();
+			if (terrainObject)
+				terrainObject->getHeightForceChunkCreation (position_w, position_w.y);
+
+			//-- create the object
+			Transform tr;
+			tr.setPosition_p(position_w);
+			serverObject = ServerWorld::createNewObject(objectTemplateName, tr, 0, false);
+			DEBUG_REPORT_LOG (!serverObject, ("LocationResponse: failed to create object %s\n", objectTemplateName));
+			if (serverObject)
+				serverObject->addToWorld ();
+		}
+
+		//-- inform script of the result
+		ScriptParams scriptParameters;
+		scriptParameters.addParam (locationResponse.getLocationId ().c_str());
+		scriptParameters.addParam (serverObject ? serverObject->getNetworkId () : NetworkId::cms_invalid);
+		scriptParameters.addParam (position_w);
+		scriptParameters.addParam (locationResponse.getRadius ());
+
+		if (scriptObject->getScriptObject ()->trigAllScripts (Scripting::TRIG_LOCATION_RECEIVED, scriptParameters) != SCRIPT_CONTINUE)
+			DEBUG_REPORT_LOG (true, ("LocationResponse: TRIG_LOCATION_RECEIVED: did not return SCRIPT_CONTINUE\n"));
+	}
+	else if (message.isType("ReleaseCharacterNameByIdMessage"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<NetworkId> const msg(ri);
+
+		NameManager::getInstance().releasePlayerName(msg.getValue());
+	}
+	else if (message.isType("AddAttribModName"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::string> const msg(ri);
+		AttribModNameManager::getInstance().addAttribModNameFromRemote(msg.getValue().c_str());
+	}
+	else if (message.isType("AddAttribModNamesList"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::string> const msg(ri);
+		DEBUG_REPORT_LOG(true, ("Received attrib mod names list <%s> from remote server\n", msg.getValue().c_str()));
+		AttribModNameManager::getInstance().addAttribModNamesListFromRemote(msg.getValue().c_str());
+	}
+	else if(ClusterWideDataClient::handleMessage(source, message))
+	{
+		// nothing else to do with the message since it was
+		// handled by the Cluster wide data client
+	}
+	else if (message.isType("AiCreatureStateMessage"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<AiCreatureStateMessage> const msg(ri);
+
+		NetworkId const & networkId = msg.getValue().m_networkId;
+		AiMovementMessage const & movement = msg.getValue().m_movement;
+
+		CreatureObject * const creatureObject = CreatureObject::getCreatureObject(networkId);
+
+		if (creatureObject != NULL)
+		{
+			Controller * const controller = creatureObject->getController();
+
+			if (controller != NULL)
+			{
+				DEBUG_LOG("debug_ai", ("GameServer::receiveMessage() Received AiCreatureStateMessage for networkId(%s) movementType(%s)", networkId.getValueString().c_str(), AiMovementBase::getMovementString(movement.getMovementType())));
+
+				int const flags = GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_SERVER;
+
+				// Movement
+
+				controller->appendMessage(CM_aiSetMovement, 0, new AiMovementMessage(movement), flags);
+			}
+			else
+			{
+				WARNING(true, ("GameServer::receiveMessage() Received AiCreatureStateMessage for networkId(%s) movementType(%s) but the object does not have a Controller", networkId.getValueString().c_str(), AiMovementBase::getMovementString(movement.getMovementType())));
+			}
+		}
+		else
+		{
+			WARNING(true, ("GameServer::receiveMessage() Received AiCreatureStateMessage for networkId(%s) movementType(%s) but could not resolve to a CreatureObject", networkId.getValueString().c_str(), AiMovementBase::getMovementString(movement.getMovementType())));
+		}
+	}
+	else if (message.isType("UnloadPersistedCharacter"))
+	{
+		Archive::ReadIterator ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<NetworkId> const upc(ri);
+
+		ServerObject * const object = ServerWorld::findObjectByNetworkId(upc.getValue());
+		if (object)
+		{
+			WARNING(true, ("Unloaded character object (%s) which has been persisted but still exists on this game server", object->getDebugInformation().c_str()));
+			object->unload();
+		}
+	}
+	else if (message.isType("AboutToLoadCharacterFromDB"))
+	{
+		Archive::ReadIterator ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<NetworkId, uint32> > const atlcfdb(ri);
+
+		ServerObject * const object = ServerWorld::findObjectByNetworkId(atlcfdb.getValue().first);
+		if (object)
+		{
+			WARNING(true, ("Unloaded character object (%s) because the character object is about to be loaded from the DB onto game server (%lu), I am game server (%lu)", object->getDebugInformation().c_str(), atlcfdb.getValue().second, getProcessId()));
+			object->unload();
+		}
+	}
+	else if (message.isType("ClearTheaterMessage"))
+	{
+		Archive::ReadIterator ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::string> const ctm(ri);
+
+		ServerUniverse::getInstance().remoteClearTheater(ctm.getValue());
+	}
+	else if (message.isType("SetTheaterMessage"))
+	{
+		Archive::ReadIterator ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<std::string, NetworkId> > const stm(ri);
+
+		ServerUniverse::getInstance().remoteSetTheater(stm.getValue().first, stm.getValue().second);
+	}
+	else if (message.isType("PageChangeAuthority"))
+	{
+		ServerUIManager::receiveMessage(message);
+	}
+	else if (message.isType("PlayedTimeAccumMessage"))
+	{
+		Archive::ReadIterator ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		PlayedTimeAccumMessage const ptam(ri);
+		Object * obj = NetworkIdManager::getObjectById(ptam.getNetworkId());
+		if (obj != NULL && obj->asServerObject() != NULL && obj->asServerObject()->asCreatureObject() != NULL)
+		{
+			CreatureObject * target = obj->asServerObject()->asCreatureObject();
+			PlayerObject *targetPlayer = target->asPlayerObject();
+			if(targetPlayer)
+			{
+				targetPlayer->setPlayedTimeAccumOnly(ptam.getPlayedTimeAccum());
+			}
+			else
+			{
+				target->setPseudoPlayedTime(ptam.getPlayedTimeAccum());
+			}
+		}
+
+	}
+	else if (message.isType("ManualDepleteResourceMessage"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<NetworkId> const msg(ri);
+		ServerUniverse::getInstance().manualDepleteResource(msg.getValue());		
+	}
+	else if (message.isType("ClaimRewardsReplyMessage"))
+	{
+		ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+		ClaimRewardsReplyMessage msg(ri);
+		VeteranRewardManager::handleClaimRewardsReply(msg.getStationId(), msg.getPlayer(), msg.getRewardEvent(), msg.getRewardItem(), msg.getAccountFeatureId(), msg.getConsumeAccountFeatureId(), msg.getPreviousAccountFeatureIdCount(), msg.getCurrentAccountFeatureIdCount(), msg.getResult(), true);
+	}
+	else if (message.isType("SetOverrideAccountAgeMessage"))
+	{
+		ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+		GenericValueTypeMessage<int> msg(ri);
+
+		VeteranRewardManager::setOverrideAccountAge(msg.getValue());
+	}
+	else if (message.isType("GetMoneyFromOfflineObjectMessage"))
+	{
+		ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+		GetMoneyFromOfflineObjectMessage msg(ri);
+
+		std::string const & callback = msg.getSuccess() ? msg.getSuccessCallback() : msg.getFailCallback();
+		MessageToQueue::getInstance().sendMessageToJava(msg.getReplyTo(), callback, msg.getPackedDictionary(), 0, false);
+	}
+	else if (message.isType(SlowDownEffectMessage::MessageType))
+	{
+		ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+		SlowDownEffectMessage msg(ri);
+
+		// get the attacker
+		Object * obj = NetworkIdManager::getObjectById(msg.getSource());
+		if (obj != NULL && obj->asServerObject() != NULL && obj->asServerObject()->asCreatureObject() != NULL)
+		{
+			CreatureObject * attacker = obj->asServerObject()->asCreatureObject();
+
+			// get the target
+			obj = NetworkIdManager::getObjectById(msg.getTarget());
+			if (obj != NULL && obj->asServerObject() != NULL && obj->asServerObject()->asTangibleObject() != NULL)
+			{
+				TangibleObject * defender = obj->asServerObject()->asTangibleObject();
+				if (attacker->isAuthoritative())
+					attacker->addSlowDownEffect(*defender, msg.getConeLength(), msg.getConeAngle(), msg.getSlopeAngle(), msg.getExpireTime());
+				else
+					attacker->addSlowDownEffectProxy(*defender, msg.getConeLength(), msg.getConeAngle(), msg.getSlopeAngle(), msg.getExpireTime());
+			}
+		}
+	}
+	else if (message.isType("StructuresForPurgeMessage"))
+	{
+		ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+		StructuresForPurgeMessage msg(ri);
+		PurgeManager::handleStructuresAndVendorsForPurge(msg.getStationId(), msg.getStructures(), msg.getVendors(), msg.getWarnOnly());
+	}
+	else if (message.isType("RequestLoadAckMessage"))
+	{
+		ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+		GenericValueTypeMessage<int> msg(ri);
+
+		GenericValueTypeMessage<int> reply("LoadAckMessage",msg.getValue());
+		sendToDatabaseServer(reply);
+	}
+	else if (message.isType("FactionalSystemMessage"))
+	{
+		ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+		FactionalSystemMessage msg(ri);
+		handleFactionalSystemMessage(msg);
+	}
+	else if (message.isType("MessageToPlayersOnPlanet"))
+	{
+		ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<std::pair<std::pair<std::string, std::vector<int8> >, std::pair<float, bool> >, std::pair<Vector, float> > > const msg(ri);
+		handleMessageToPlayersOnPlanet(msg.getValue().first.first.first, msg.getValue().first.first.second, msg.getValue().first.second.first, msg.getValue().second.first, msg.getValue().second.second, msg.getValue().first.second.second);
+	}
+	else if (message.isType("PopStatReq"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<uint8> const populationStatisticsRequest(ri);
+		UNREF(populationStatisticsRequest);
+
+		const GenericValueTypeMessage<std::map<std::string, int> > populationStatisticsResponse("PopStatRsp", LfgCharacterData::calculateStatistics(ServerUniverse::getConnectedCharacterLfgData()));
+		sendToCentralServer(populationStatisticsResponse);
+	}
+	else if (message.isType("GcwScoreStatReq"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<uint8> const gcwScoreStatisticsRequest(ri);
+		UNREF(gcwScoreStatisticsRequest);
+
+		static const std::map<std::string, std::pair<int64, int64> > emptyGcwScore;
+		PlanetObject const * const tatooine = ServerUniverse::getInstance().getTatooinePlanet();
+
+		static const std::map<std::string, int> emptyGcwScorePercentile;
+		GuildObject const * const guildObject = ServerUniverse::getInstance().getMasterGuildObject();
+
+		const GenericValueTypeMessage<std::pair<std::map<std::string, int>, std::pair<std::map<std::string, std::pair<int64, int64> >, std::map<std::string, std::pair<int64, int64> > > > > gcwScoreStatisticsResponse("GcwScoreStatRsp", std::make_pair((guildObject ? guildObject->getGcwImperialScorePercentile() : emptyGcwScorePercentile), std::make_pair((tatooine ? tatooine->getGcwImperialScore() : emptyGcwScore), (tatooine ? tatooine->getGcwRebelScore() : emptyGcwScore))));
+		sendToCentralServer(gcwScoreStatisticsResponse);
+	}
+	else if (message.isType("GcwScoreStatRaw"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<std::string, std::pair<std::map<std::string, std::pair<int64, int64> >, std::map<std::string, std::pair<int64, int64> > > > > const msg(ri);
+		if (ConfigServerGame::getReceiveGcwScoreFromOtherGalaxies() && ServerUniverse::getInstance().isAuthoritative() && _stricmp(getClusterName().c_str(), msg.getValue().first.c_str()))
+		{
+			GuildObject * const go = ServerUniverse::getInstance().getMasterGuildObject();
+			if (go && go->isAuthoritative())
+			{
+				go->setGcwRawScoreFromOtherGalaxy(msg.getValue().first, msg.getValue().second.first, msg.getValue().second.second);
+			}
+		}
+	}
+	else if (message.isType("GcwScoreStatPct"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<std::string, std::pair<std::map<std::string, int>, std::map<std::string, int> > > > const msg(ri);
+		if (ConfigServerGame::getReceiveGcwScoreFromOtherGalaxies() && ServerUniverse::getInstance().isAuthoritative() && _stricmp(getClusterName().c_str(), msg.getValue().first.c_str()))
+		{
+			GuildObject * const go = ServerUniverse::getInstance().getMasterGuildObject();
+			if (go && go->isAuthoritative())
+			{
+				go->setGcwImperialScorePercentileFromOtherGalaxy(msg.getValue().first, msg.getValue().second.first, msg.getValue().second.second);
+			}
+		}
+	}
+	else if (message.isType("LLTStatReq"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<uint8> const lastLoginTimeStatisticsRequest(ri);
+		UNREF(lastLoginTimeStatisticsRequest);
+
+		static std::map<int, std::pair<std::string, int> > lastLoginTimeStatistics;
+		if (lastLoginTimeStatistics.empty())
+		{
+			lastLoginTimeStatistics[(60 * 60 * 24 * 1)]    = std::make_pair(std::string("totalCharacters.loginWithinPast_Day001"), 0);
+			lastLoginTimeStatistics[(60 * 60 * 24 * 2)]    = std::make_pair(std::string("totalCharacters.loginWithinPast_Day002"), 0);
+			lastLoginTimeStatistics[(60 * 60 * 24 * 3)]    = std::make_pair(std::string("totalCharacters.loginWithinPast_Day003"), 0);
+			lastLoginTimeStatistics[(60 * 60 * 24 * 4)]    = std::make_pair(std::string("totalCharacters.loginWithinPast_Day004"), 0);
+			lastLoginTimeStatistics[(60 * 60 * 24 * 5)]    = std::make_pair(std::string("totalCharacters.loginWithinPast_Day005"), 0);
+			lastLoginTimeStatistics[(60 * 60 * 24 * 6)]    = std::make_pair(std::string("totalCharacters.loginWithinPast_Day006"), 0);
+			lastLoginTimeStatistics[(60 * 60 * 24 * 7)]    = std::make_pair(std::string("totalCharacters.loginWithinPast_Day007"), 0);
+			lastLoginTimeStatistics[(60 * 60 * 24 * 14)]   = std::make_pair(std::string("totalCharacters.loginWithinPast_Day014"), 0);
+			lastLoginTimeStatistics[(60 * 60 * 24 * 21)]   = std::make_pair(std::string("totalCharacters.loginWithinPast_Day021"), 0);
+			lastLoginTimeStatistics[(60 * 60 * 24 * 30)]   = std::make_pair(std::string("totalCharacters.loginWithinPast_Day030"), 0);
+			lastLoginTimeStatistics[(60 * 60 * 24 * 60)]   = std::make_pair(std::string("totalCharacters.loginWithinPast_Day060"), 0);
+			lastLoginTimeStatistics[(60 * 60 * 24 * 90)]   = std::make_pair(std::string("totalCharacters.loginWithinPast_Day090"), 0);
+			lastLoginTimeStatistics[(60 * 60 * 24 * 180)]  = std::make_pair(std::string("totalCharacters.loginWithinPast_Day180"), 0);
+			lastLoginTimeStatistics[(60 * 60 * 24 * 270)]  = std::make_pair(std::string("totalCharacters.loginWithinPast_Day270"), 0);
+			lastLoginTimeStatistics[(60 * 60 * 24 * 365)]  = std::make_pair(std::string("totalCharacters.loginWithinPast_Year1"), 0);
+			lastLoginTimeStatistics[(60 * 60 * 24 * 730)]  = std::make_pair(std::string("totalCharacters.loginWithinPast_Year2"), 0);
+			lastLoginTimeStatistics[(60 * 60 * 24 * 1095)] = std::make_pair(std::string("totalCharacters.loginWithinPast_Year3"), 0);
+			lastLoginTimeStatistics[(60 * 60 * 24 * 9999)] = std::make_pair(std::string("totalCharacters"), 0);
+		}
+
+		NameManager::getInstance().getPlayerWithLastLoginTimeAfterDistribution(lastLoginTimeStatistics);
+
+		std::map<int, std::pair<std::string, int> >::iterator iter = lastLoginTimeStatistics.begin();
+		std::map<int, std::pair<std::string, int> >::iterator previousIter = lastLoginTimeStatistics.begin();
+		for (; iter != lastLoginTimeStatistics.end(); ++iter)
+		{
+			if (iter != previousIter)
+				iter->second.second += previousIter->second.second;
+
+			previousIter = iter;
+		}
+
+		static std::map<int, std::pair<std::string, int> > createTimeStatistics;
+		if (createTimeStatistics.empty())
+		{
+			createTimeStatistics[(60 * 60 * 24 * 1)]    = std::make_pair(std::string("totalCharacters.createdWithinPast_Day001"), 0);
+			createTimeStatistics[(60 * 60 * 24 * 2)]    = std::make_pair(std::string("totalCharacters.createdWithinPast_Day002"), 0);
+			createTimeStatistics[(60 * 60 * 24 * 3)]    = std::make_pair(std::string("totalCharacters.createdWithinPast_Day003"), 0);
+			createTimeStatistics[(60 * 60 * 24 * 4)]    = std::make_pair(std::string("totalCharacters.createdWithinPast_Day004"), 0);
+			createTimeStatistics[(60 * 60 * 24 * 5)]    = std::make_pair(std::string("totalCharacters.createdWithinPast_Day005"), 0);
+			createTimeStatistics[(60 * 60 * 24 * 6)]    = std::make_pair(std::string("totalCharacters.createdWithinPast_Day006"), 0);
+			createTimeStatistics[(60 * 60 * 24 * 7)]    = std::make_pair(std::string("totalCharacters.createdWithinPast_Day007"), 0);
+			createTimeStatistics[(60 * 60 * 24 * 14)]   = std::make_pair(std::string("totalCharacters.createdWithinPast_Day014"), 0);
+			createTimeStatistics[(60 * 60 * 24 * 21)]   = std::make_pair(std::string("totalCharacters.createdWithinPast_Day021"), 0);
+			createTimeStatistics[(60 * 60 * 24 * 30)]   = std::make_pair(std::string("totalCharacters.createdWithinPast_Day030"), 0);
+			createTimeStatistics[(60 * 60 * 24 * 60)]   = std::make_pair(std::string("totalCharacters.createdWithinPast_Day060"), 0);
+			createTimeStatistics[(60 * 60 * 24 * 90)]   = std::make_pair(std::string("totalCharacters.createdWithinPast_Day090"), 0);
+			createTimeStatistics[(60 * 60 * 24 * 180)]  = std::make_pair(std::string("totalCharacters.createdWithinPast_Day180"), 0);
+			createTimeStatistics[(60 * 60 * 24 * 270)]  = std::make_pair(std::string("totalCharacters.createdWithinPast_Day270"), 0);
+			createTimeStatistics[(60 * 60 * 24 * 365)]  = std::make_pair(std::string("totalCharacters.createdWithinPast_Year1"), 0);
+			createTimeStatistics[(60 * 60 * 24 * 730)]  = std::make_pair(std::string("totalCharacters.createdWithinPast_Year2"), 0);
+			createTimeStatistics[(60 * 60 * 24 * 1095)] = std::make_pair(std::string("totalCharacters.createdWithinPast_Year3"), 0);
+			createTimeStatistics[(60 * 60 * 24 * 9999)] = std::make_pair(std::string("totalCharacters"), 0);
+		}
+
+		NameManager::getInstance().getPlayerWithCreateTimeAfterDistribution(createTimeStatistics);
+
+		iter = createTimeStatistics.begin();
+		previousIter = createTimeStatistics.begin();
+		for (; iter != createTimeStatistics.end(); ++iter)
+		{
+			if (iter != previousIter)
+				iter->second.second += previousIter->second.second;
+
+			previousIter = iter;
+		}
+
+		const GenericValueTypeMessage<std::pair<std::map<int, std::pair<std::string, int> >, std::map<int, std::pair<std::string, int> > > > lastLoginTimeStatisticsResponse("LLTStatRsp", std::make_pair(lastLoginTimeStatistics, createTimeStatistics));
+		sendToCentralServer(lastLoginTimeStatisticsResponse);
+	}
+	else if (message.isType("LfgStatReq"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<uint8> const characterMatchStatisticsRequest(ri);
+		UNREF(characterMatchStatisticsRequest);
+
+		unsigned long numberOfCharacterMatchRequests, numberOfCharacterMatchResults, timeSpentOnCharacterMatchRequestsMs;
+		CharacterMatchManager::getMatchStatistics(numberOfCharacterMatchRequests, numberOfCharacterMatchResults, timeSpentOnCharacterMatchRequestsMs);
+
+		if (numberOfCharacterMatchRequests || numberOfCharacterMatchResults || timeSpentOnCharacterMatchRequestsMs)
+		{
+			CharacterMatchManager::clearMatchStatistics();
+
+			const GenericValueTypeMessage<std::pair<unsigned long, std::pair<unsigned long, unsigned long> > > characterMatchStatisticsResponse("LfgStatRsp", std::make_pair(numberOfCharacterMatchRequests, std::make_pair(numberOfCharacterMatchResults, timeSpentOnCharacterMatchRequestsMs)));
+			sendToCentralServer(characterMatchStatisticsResponse);
+		}
+	}
+	else if (message.isType("ClusterId"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<uint32> const msg(ri);
+
+		if (m_clusterId == 0)
+		{
+			FATAL(((msg.getValue() < 1) || (msg.getValue() > 255)),("Cluster Id (%lu) must be between 1 and 255 inclusive", msg.getValue()));
+
+			m_clusterId = static_cast<uint8>(msg.getValue());
+		}
+	}
+	else if (message.isType("OccupyUnlockedSlotRsp"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<std::pair<int, NetworkId>, uint32> > const occupyUnlockedSlotRsp(ri);
+
+		char buffer[32];
+		snprintf(buffer, sizeof(buffer)-1, "%d", occupyUnlockedSlotRsp.getValue().first.first);
+		buffer[sizeof(buffer)-1] = '\0';
+
+		MessageToQueue::getInstance().sendMessageToC(occupyUnlockedSlotRsp.getValue().first.second,
+			"C++OccupyUnlockedSlotRsp",
+			buffer,
+			0,
+			false);
+	}
+	else if (message.isType("VacateUnlockedSlotRsp"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<std::pair<int, NetworkId>, std::pair<uint32, uint32> > > const vacateUnlockedSlotRsp(ri);
+
+		char buffer[32];
+		snprintf(buffer, sizeof(buffer)-1, "%d", vacateUnlockedSlotRsp.getValue().first.first);
+		buffer[sizeof(buffer)-1] = '\0';
+
+		MessageToQueue::getInstance().sendMessageToC(vacateUnlockedSlotRsp.getValue().first.second,
+			"C++VacateUnlockedSlotRsp",
+			buffer,
+			0,
+			false);
+	}
+	else if (message.isType("SwapUnlockedSlotRsp"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<std::pair<int, NetworkId>, std::pair<uint32, std::pair<NetworkId, std::string> > > > const swapUnlockedSlotRsp(ri);
+
+		Archive::ByteStream bs;
+		swapUnlockedSlotRsp.pack(bs);
+
+		MessageToQueue::getInstance().sendMessageToC(swapUnlockedSlotRsp.getValue().first.second,
+			"C++SwapUnlockedSlotRsp",
+			std::string(reinterpret_cast<const char *>(bs.getBuffer()), static_cast<size_t>(bs.getSize())),
+			0,
+			false);
+	}
+	else if (message.isType("AdjustAccountFeatureIdResponse"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		AdjustAccountFeatureIdResponse const msg(ri);
+
+		handleAdjustAccountFeatureIdResponse(msg);
+	}
+	else if (message.isType("AccountFeatureIdResponse"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		AccountFeatureIdResponse const msg(ri);
+
+		handleAccountFeatureIdResponse(msg);
+	}
+	else if (message.isType("FeatureIdTransactionResponse"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		FeatureIdTransactionResponse const msg(ri);
+
+		Archive::ByteStream bs;
+		msg.pack(bs);
+
+		MessageToQueue::getInstance().sendMessageToC(msg.getPlayer(),
+			"C++FeatureIdTransactionResponse",
+			std::string(reinterpret_cast<const char *>(bs.getBuffer()), static_cast<size_t>(bs.getSize())),
+			0,
+			false);
+	}
+	else if (message.isType("TransferReplyMoveValidation"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		TransferReplyMoveValidation const msg(ri);
+
+		Archive::ByteStream bs;
+		msg.pack(bs);
+
+		MessageToQueue::getInstance().sendMessageToC(msg.getSourceCharacterId(),
+			"C++TransferReplyMoveValidation",
+			std::string(reinterpret_cast<const char *>(bs.getBuffer()), static_cast<size_t>(bs.getSize())),
+			0,
+			false);
+	}
+	else if (message.isType("TransferReplyNameValidation"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		GenericValueTypeMessage<std::pair<std::string, TransferCharacterData> > const msg(ri);
+
+		Archive::ByteStream bs;
+		msg.pack(bs);
+
+		MessageToQueue::getInstance().sendMessageToC(msg.getValue().second.getCharacterId(),
+			"C++TransferReplyNameValidation",
+			std::string(reinterpret_cast<const char *>(bs.getBuffer()), static_cast<size_t>(bs.getSize())),
+			0,
+			false);
+	}
+	else if (message.isType("CreateDynamicSpawnRegionCircleMessage"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		CreateDynamicSpawnRegionCircleMessage const msg(ri);
+
+		RegionMaster::createNewDynamicRegionWithSpawn(msg.getCenterX(), msg.getCenterY(), msg.getCenterZ(), msg.getRadius(), msg.getName(), msg.getPlanet(),
+													  msg.getPvp(), msg.getBuildable(), msg.getMunicipal(), msg.getGeography(), msg.getMinDifficulty(), msg.getMaxDifficulty(),
+													  msg.getSpawnable(), msg.getMission(), msg.getVisible(), msg.getNotify(), msg.getSpawntable(), msg.getDuration());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool GameServer::isPlanetEnabledForCluster(std::string const &sceneName) const
+{
+	// look up [CentralServer] startPlanet=sceneName[:whatever]
+
+	int index = 0;
+	char const * result = 0;
+	do
+	{
+		result = ConfigFile::getKeyString("CentralServer", "startPlanet", index++, 0);
+		// result must either match sceneName completely, or match all of sceneName and be followed by a ':'
+		if (   result
+		    && (   !strcmp(result, sceneName.c_str())
+		        || (   !strncmp(result, sceneName.c_str(), sceneName.size())
+		            && result[sceneName.size()] == ':')))
+			return true;
+	} while (result);
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void GameServerNamespace::broadCastHyperspaceOnWarp(ServerObject const * const owner)
+{
+	// warpingClient can be NULL if the owner is AI
+	Client const * const warpingClient = owner->getClient();
+
+	typedef std::map<ConnectionServerConnection *, std::vector<NetworkId> > DistributionList;
+	DistributionList distributionList;
+
+	// Build distribution list of clients observing ship
+	{
+		typedef std::set<Client *> ObserverList;
+		ObserverList const & observers = owner->getObservers();
+
+		ObserverList::const_iterator ii = observers.begin();
+		ObserverList::const_iterator iiEnd = observers.end();
+		for (; ii != iiEnd; ++ii)
+		{
+			Client * const client = *ii;
+			if (client != warpingClient)
+			{
+				distributionList[client->getConnection()].push_back(client->getCharacterObjectId());
+			}
+		}
+	}
+
+	// Send Message to distribution list
+	{
+		DistributionList::const_iterator ii = distributionList.begin();
+		DistributionList::const_iterator iiEnd = distributionList.end();
+		for (; ii != iiEnd; ++ii)
+		{
+			HyperspaceMessage const hyperspaceMessage(owner->getNetworkId());
+			GameClientMessage const gameClientMessage(ii->second, true, hyperspaceMessage);
+			ii->first->send(gameClientMessage, true);
+		}
+	}
+}
+
+/**
+ * Warping an object to a different scene.
+ */
+bool GameServer::requestSceneWarp(const CachedNetworkId &objectId, const std::string &sceneName, const Vector &newPosition_w, const NetworkId &newContainer, const Vector &newPosition_p, const char * scriptCallback, bool forceLoadScreen)
+{
+	ServerObject * const object = dynamic_cast<ServerObject *>(objectId.getObject());
+	if (!object)
+		return false;
+
+	if (!isPlanetEnabledForCluster(sceneName))
+	{
+		DEBUG_WARNING(true, ("GameServer::requestSceneWarp(1) for unknown scene %s", sceneName.c_str()));
+		return false;
+	}
+
+	Vector destPosition_w(newPosition_w);
+
+	// clamp destination if in space
+	if (   !strncmp(sceneName.c_str(), "space_", 6)
+	    && (   abs(newPosition_w.x) > 8000.f
+	        || abs(newPosition_w.y) > 8000.f
+	        || abs(newPosition_w.z) > 8000.f))
+	{
+		WARNING(true, ("Tried to warp object %s outside of space zone boundaries (%g,%g,%g)", object->getDebugInformation().c_str(), newPosition_w.x, newPosition_w.y, newPosition_w.z));
+		destPosition_w.set(
+			clamp(-8000.f, newPosition_w.x, 8000.f),
+			clamp(-8000.f, newPosition_w.y, 8000.f),
+			clamp(-8000.f, newPosition_w.z, 8000.f));
+	}
+	
+	if (ServerWorld::getSceneId() == sceneName)
+	{
+		// if a pilot is doing a same scene warp, actually move the ship, and only allow in world coords
+		CreatureObject * const objAsCreature = object->asCreatureObject();
+		if (objAsCreature)
+		{
+			ShipObject * const ship = getAttachedShip(objAsCreature);
+			if (ship)
+			{
+				broadCastHyperspaceOnWarp(ship);
+				ship->teleportObject(destPosition_w, NetworkId::cms_invalid, "", destPosition_w, scriptCallback ? scriptCallback : "", forceLoadScreen);
+			}
+			else
+				object->teleportObject(destPosition_w, newContainer, "", newPosition_p, scriptCallback ? scriptCallback : "", forceLoadScreen);
+		}
+		else
+			object->teleportObject(destPosition_w, newContainer, "", newPosition_p, scriptCallback ? scriptCallback : "", forceLoadScreen);
+	}
+	else
+	{
+		// don't send multiple RequestSceneTransfer message
+		if (!checkAndSetOutstandingRequestSceneTransfer(*object))
+		{
+			RequestSceneTransfer const sceneTransferMessage(objectId, sceneName, getProcessId(), newPosition_p, destPosition_w, newContainer, scriptCallback);
+			sendToCentralServer(sceneTransferMessage);
+		}
+	}
+
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Warping an object to a different scene.
+ */
+bool GameServer::requestSceneWarp(const CachedNetworkId &objectId, const std::string &sceneName, const Vector &newPosition_w, const NetworkId &newBuilding, const std::string &newContainerName, const Vector &newPosition_p, const char * scriptCallback, bool forceLoadScreen)
+{
+	ServerObject * const object = dynamic_cast<ServerObject *>(objectId.getObject());
+	if (!object)
+		return false;
+
+	if (!isPlanetEnabledForCluster(sceneName))
+	{
+		DEBUG_WARNING(true, ("GameServer::requestSceneWarp(1) for unknown scene %s", sceneName.c_str()));
+		return false;
+	}
+
+	Vector destPosition_w(newPosition_w);
+
+	// clamp destination if in space
+	if (   !strncmp(sceneName.c_str(), "space_", 6)
+	    && (   abs(newPosition_w.x) > 8000.f
+	        || abs(newPosition_w.y) > 8000.f
+	        || abs(newPosition_w.z) > 8000.f))
+	{
+		WARNING(true, ("Tried to warp object %s outside of space zone boundaries (%g,%g,%g)", object->getDebugInformation().c_str(), newPosition_w.x, newPosition_w.y, newPosition_w.z));
+		destPosition_w.set(
+			clamp(-8000.f, newPosition_w.x, 8000.f),
+			clamp(-8000.f, newPosition_w.y, 8000.f),
+			clamp(-8000.f, newPosition_w.z, 8000.f));
+	}
+	
+	if (ServerWorld::getSceneId() == sceneName)
+	{
+		// if a pilot is doing a same scene warp, actually move the ship, and only allow in world coords
+		CreatureObject * const objAsCreature = object->asCreatureObject();
+		if (objAsCreature)
+		{
+			ShipObject * const ship = getAttachedShip(objAsCreature);
+			if (ship)
+			{
+				broadCastHyperspaceOnWarp(ship);
+				ship->teleportObject(destPosition_w, NetworkId::cms_invalid, "", destPosition_w, scriptCallback ? scriptCallback : "", forceLoadScreen);
+			}
+			else
+				object->teleportObject(destPosition_w, newBuilding, newContainerName, newPosition_p, scriptCallback ? scriptCallback : "", forceLoadScreen);
+		}
+		else
+			object->teleportObject(destPosition_w, newBuilding, newContainerName, newPosition_p, scriptCallback ? scriptCallback : "", forceLoadScreen);
+	}
+	else
+	{
+		// don't send multiple RequestSceneTransfer message
+		if (!checkAndSetOutstandingRequestSceneTransfer(*object))
+		{
+			RequestSceneTransfer const sceneTransferMessage(objectId, sceneName, getProcessId(), newPosition_p, destPosition_w, newBuilding, newContainerName, scriptCallback);
+			sendToCentralServer(sceneTransferMessage);
+		}
+	}
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Warping an object to a different scene after a delay.
+ */
+bool GameServer::requestSceneWarpDelayed(const CachedNetworkId &objectId, const std::string &sceneName, const Vector &newPosition_w, const NetworkId &newContainer, const Vector &newPosition_p,  float const delayTime, const char * scriptCallback, bool forceLoadScreen)
+{
+	Object * const o = objectId.getObject();
+	ServerObject * const so = o ? o->asServerObject() : 0;
+	ShipObject * const ship = so ? so->asShipObject() : 0;
+
+	if (!ship || !ship->isInWorld())
+		return false;
+
+	ship->setHyperspaceOnDestroy(true);
+
+	typedef std::vector<CreatureObject *> Passengers;
+	Passengers passengers;
+
+	ship->findAllPassengers(passengers, true);
+
+	Passengers::const_iterator ii = passengers.begin();
+	Passengers::const_iterator iiEnd = passengers.end();
+
+	for (; ii != iiEnd; ++ii)
+	{
+		CreatureObject * const passenger = *ii;
+		Controller * const controller = passenger->getController();
+
+		if (controller != 0)
+		{
+			MessageQueueGenericValueType<std::pair<std::string, Vector> > * const data = new MessageQueueGenericValueType<std::pair<std::string, Vector> >(std::make_pair(sceneName, newPosition_w));
+
+			controller->appendMessage(
+ 				CM_aboutToHyperspace,
+				0.0f,
+				data,
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_CLIENT);
+		}
+	}
+
+	char buf[1000];
+	std::string callbackStr = scriptCallback;
+	snprintf(buf, sizeof(buf) - 1, "%s %.2f %.2f %.2f %s %.2f %.2f %.2f %s %d", sceneName.c_str(), newPosition_w.x, newPosition_w.y, newPosition_w.z, newContainer.getValueString().c_str(), newPosition_p.x, newPosition_p.y, newPosition_p.z, (!callbackStr.empty()) ? callbackStr.c_str() : "noCallback", (forceLoadScreen) ? 1 : 0);
+	MessageToQueue::getInstance().sendMessageToC(objectId, "C++SceneWarpDelayed", buf, static_cast<int>(delayTime), false);
+
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Warping an object to a different scene after a delay.
+ */
+bool GameServer::requestSceneWarpDelayed(const CachedNetworkId &objectId, const std::string &sceneName, const Vector &newPosition_w, const NetworkId &newBuilding, const std::string &newContainerName, const Vector &newPosition_p, float const delayTime, const char * scriptCallback, bool forceLoadScreen)
+{
+	Object * const o = objectId.getObject();
+	ServerObject * const so = o ? o->asServerObject() : 0;
+	ShipObject * const ship = so ? so->asShipObject() : 0;
+
+	if (!ship || !ship->isInWorld())
+		return false;
+
+	typedef std::vector<CreatureObject *> Passengers;
+	Passengers passengers;
+
+	ship->findAllPassengers(passengers, true);
+
+	Passengers::const_iterator ii = passengers.begin();
+	Passengers::const_iterator iiEnd = passengers.end();
+
+	for (; ii != iiEnd; ++ii)
+	{
+		CreatureObject * const passenger = *ii;
+		Controller * const controller = passenger->getController();
+
+		if (controller != 0)
+		{
+			MessageQueueGenericValueType<std::pair<std::string, Vector> > * const data = new MessageQueueGenericValueType<std::pair<std::string, Vector> >(std::make_pair(sceneName, newPosition_w));
+
+			controller->appendMessage(
+ 				CM_aboutToHyperspace,
+				0.0f,
+				data,
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_CLIENT);
+		}
+	}
+
+	char buf[1000];
+	std::string callbackStr = scriptCallback;
+	snprintf(buf, sizeof(buf) - 1, "%s %.2f %.2f %.2f %s %s %.2f %.2f %.2f %s %d", sceneName.c_str(), newPosition_w.x, newPosition_w.y, newPosition_w.z, newBuilding.getValueString().c_str(), newContainerName.c_str(), newPosition_p.x, newPosition_p.y, newPosition_p.z, (!callbackStr.empty()) ? callbackStr.c_str() : "none", (forceLoadScreen) ? 1 : 0);
+	MessageToQueue::getInstance().sendMessageToC(objectId, "C++SceneWarpDelayedContainer", buf, static_cast<int>(delayTime), false);
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+unsigned long GameServerNamespace::getFrameRateLimit()
+{
+	return ServerWorld::isSpaceScene() ? ConfigServerGame::getSpaceFrameRateLimit() : ConfigServerGame::getGroundFrameRateLimit();
+}
+
+// ----------------------------------------------------------------------
+
+void GameServer::run(void)
+{
+	static const std::string frameLogChannel = "EndFrame:Time";
+	static const std::string frameLogCount = "EndFrame:Objects";
+
+	getInstance().initialize();
+
+	unsigned long lastFrameTime = 0;
+	int oldFilesOpened = TreeFile::getNumberOfFilesOpenedTotal();
+	int oldSizeOpened = TreeFile::getSizeOfFilesOpenedTotal();
+	int newFilesOpened = 0;
+	int newSizeOpened = 0;
+	unsigned long startTime = Clock::timeMs();
+	unsigned long lastFrameProcessStartTime = startTime;
+
+	const unsigned long targetFrameTime = static_cast<unsigned long>(1000.0f/getFrameRateLimit());
+
+	const GenericValueTypeMessage<unsigned long> gameServerTaskManagerKeepAlive("GameServerTaskManagerKeepAlive", Os::getProcessId());
+
+	PROFILER_BLOCK_DEFINE(profileBlockMainLoop, "main loop");
+	PROFILER_BLOCK_ENTER(profileBlockMainLoop);
+
+	LOG("ServerStartup",("GameServer starting on %s", NetworkHandler::getHostName().c_str()));  // no process id yet
+	s_frameTime = 0;
+
+	while (!getInstance().getDone())
+	{
+		if(getInstance().m_taskManagerConnection)
+		{
+			getInstance().m_taskManagerConnection->send(gameServerTaskManagerKeepAlive, true);
+			s_lastTaskKeepaliveTime = Clock::timeMs();
+		}
+
+		newFilesOpened = TreeFile::getNumberOfFilesOpenedTotal();
+		newSizeOpened = TreeFile::getSizeOfFilesOpenedTotal();
+
+		if (   lastFrameTime > ConfigServerGame::getLoopProfileLogThresholdMs()
+		    || (ServerWorld::isSpaceScene() && lastFrameTime > ConfigServerGame::getSpaceLoopProfileLogThresholdMs())
+		    || (!ServerWorld::isSpaceScene() && lastFrameTime > ConfigServerGame::getGroundLoopProfileLogThresholdMs()))
+		{
+			LOG("profile", ("Long loop (%u ms):\n%s", lastFrameTime, PROFILER_GET_LAST_FRAME_DATA()));
+			if (newFilesOpened > oldFilesOpened)
+				LOG("treefile", ("Long loop file stats: %d opened %d size", newFilesOpened - oldFilesOpened, newSizeOpened - oldSizeOpened));
+		}
+
+		oldFilesOpened = newFilesOpened;
+		oldSizeOpened = newSizeOpened;
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("NetFlushAllData");
+			NetworkHandler::flushAndConfirmAll();
+		}
+
+		bool barrierReached = true;
+
+		do
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("BarrierWait");
+
+			{
+				PROFILER_AUTO_BLOCK_DEFINE("NetworkHandler::update");
+				NetworkHandler::update();
+			}
+
+			if (   ServerWorld::isSpaceScene() && ConfigServerGame::getSpaceShouldSleep()
+			    || !ServerWorld::isSpaceScene() && ConfigServerGame::getGroundShouldSleep())
+			{
+				PROFILER_AUTO_BLOCK_DEFINE("Os::sleep");
+				Os::sleep(1);
+			}
+
+			if (ConfigServerGame::getCommoditiesMarketEnabled())
+			{
+				PROFILER_AUTO_BLOCK_DEFINE("CommoditiesMarket::giveTime");
+				CommoditiesMarket::giveTime();
+			}
+
+			// Note: adding 15 ms to the time passed here to adjust for minimum sleep times
+			barrierReached = Clock::timeMs()-lastFrameProcessStartTime+15 >= targetFrameTime;
+
+			getInstance().debugIO();
+		} while (!barrierReached && !getInstance().getDone());
+
+		lastFrameProcessStartTime = Clock::timeMs();
+
+		if (!Os::update())
+			getInstance().setDone("OS condition (Parent pid change)");
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("MetricsManager::update");
+			if (s_metricsManagerInstalled)
+				MetricsManager::update(static_cast<float>(lastFrameTime));
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::update");
+			ServerWorld::update(Clock::frameTime());
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("ServerUniverse::update");
+			ServerUniverse::getInstance().update(Clock::frameTime());
+		}
+
+		NonCriticalTaskQueue::getInstance().update();
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("MessageToQueue::update");
+			MessageToQueue::getInstance().update(Clock::frameTime());
+		}
+
+#ifdef _DEBUG
+		// do an intentional sleep, to emulate long loop time
+		if (s_extraDelayPerFrameMs > 0)
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("Os::sleep - extra");
+			Os::sleep(s_extraDelayPerFrameMs);
+		}
+#endif
+
+		{
+			// Report the population at the same time on all game servers in the cluster
+			static bool alreadyReported(false);
+			if ((time(0) % ConfigServerGame::getPopulationReportTimeSeconds()) == 0)
+			{
+				if (!alreadyReported)
+				{
+					LOG("PopulationReport",("server %s:%lu population %i",ServerWorld::getSceneId().c_str(),getInstance().m_preloadAreaId,getInstance().m_clients->size()));
+					alreadyReported=true;
+				}
+			}
+			else
+				alreadyReported=false;
+		}
+		
+		unsigned long curTime = Clock::timeMs();
+		lastFrameTime = curTime-startTime;
+		if (!getInstance().getDone())
+			ServerClock::getInstance().incrementServerFrame();
+		startTime = curTime;
+
+		getInstance().checkIdleClients(Clock::frameTime());
+		if (!getInstance().m_gameServerReadyDatabaseConnected && getInstance().m_connectionTimeout!=0 && (curTime > getInstance().m_connectionTimeout))
+			FATAL(true,("Failed to resolve connections to all the other game servers within %i seconds",ConfigServerGame::getConnectToAllGameServersTimeout()));
+
+		PROFILER_BLOCK_LEAVE(profileBlockMainLoop);
+		PROFILER_BLOCK_ENTER(profileBlockMainLoop);
+		if (getInstance().getDatabaseProcessId())
+		{
+			FrameEndMessage const emptyFrameEndMessage(getInstance().getProcessId(), lastFrameTime, "");
+			getInstance().sendToDatabaseServer(emptyFrameEndMessage);
+			if (ConfigServerGame::getSendFrameProfilerInfo())
+			{
+				FrameEndMessage const frameEndMessage(getInstance().getProcessId(), lastFrameTime, PROFILER_GET_LAST_FRAME_DATA());
+				getInstance().sendToPlanetServer(frameEndMessage);
+			}
+			else
+				getInstance().sendToPlanetServer(emptyFrameEndMessage);
+			NetworkHandler::clearBytesThisFrame();
+		}
+		s_frameTime = curTime - lastFrameProcessStartTime;
+	}
+
+	LOG("ServerStartup",("GameServer %lu exiting",getInstance().getProcessId()));
+
+	PROFILER_BLOCK_LEAVE(profileBlockMainLoop);
+
+	getInstance().shutdown();
+
+}
+
+//-----------------------------------------------------------------------
+
+void GameServer::sendToDatabaseServer(GameNetworkMessage const &message)
+{
+	if (m_databaseProcessConnection)
+		m_databaseProcessConnection->send(message, true);
+	else
+		DEBUG_FATAL(!m_done, ("Unable to send network message to database server while not flagged for shutdown"));
+	}
+
+// ----------------------------------------------------------------------
+
+std::vector<uint32> const &GameServer::getAllGameServerPids() const
+{
+	return m_gameServerPids;
+}
+
+// ----------------------------------------------------------------------
+
+bool GameServer::hasConnectionsToOtherGameServers() const
+{
+	return !(m_gameServerPids.empty());
+}
+
+// ----------------------------------------------------------------------
+
+void GameServer::sendToCentralServer(GameNetworkMessage const &message)
+{
+	if(m_centralServerConnection)
+	{
+		m_centralServerConnection->send(message, true);
+	}
+	else
+	{
+		DEBUG_REPORT_LOG(true,("Tried to send a message to Central Server, but it was not connected.\n"));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GameServer::sendToPlanetServer(GameNetworkMessage const &message)
+{
+	if (m_planetServerConnection)
+	{
+		m_planetServerConnection->send(message, true);
+	}
+	else
+	{
+		DEBUG_REPORT_LOG(true,("Tried to send a message to Planet Server, but it was not connected.\n"));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GameServer::sendToConnectionServers(GameNetworkMessage const &message)
+{
+	ConnectionServerVector v(*m_connectionServerVector);
+	for (ConnectionServerVector::iterator i = v.begin(); i != v.end(); ++i)
+		(*i)->send(message, true);
+}
+
+// ----------------------------------------------------------------------
+
+void GameServer::sendToCustomerServiceServer(GameNetworkMessage const &message)
+{
+	if (m_customerServiceServerConnection != NULL)
+	{
+		m_customerServiceServerConnection->send(message, true);
+	}
+	else
+	{
+		REPORT_LOG(true, ("GameServer::sendToCustomerServiceServer() ERROR: Unable to send to NULL customer service server connection\n"));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GameServer::clearCustomerServiceServerConnection()
+{
+	if (m_customerServiceServerConnection != NULL)
+	{
+		m_customerServiceServerConnection->disconnect();
+	}
+
+	m_customerServiceServerConnection = NULL;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Call when we are connected to the database process.
+ * Prerequisite to gameServerReady()
+ */
+void GameServer::onDatabaseProcessConnectionEstablished()
+{
+	LOG("GameGameConnect", ("Game Server %lu is connected to database process", m_processId));
+	m_gameServerReadyDatabaseConnected = true;
+	checkWhetherGameServerIsReady();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Call when we have at least one block of objectId's.
+ * Prerequisite to gameServerReady()
+ */
+void GameServer::onReceivedFirstNetworkIdBlock()
+{
+	LOG("GameGameConnect", ("Game Server %lu has received first netId block", m_processId));
+	m_gameServerReadyObjectIds = true;
+	checkWhetherGameServerIsReady();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Call when we have at least one block of objectId's.
+ * Prerequisite to gameServerReady()
+ */
+void GameServer::onPlanetServerConnectionEstablished()
+{
+	LOG("GameGameConnect", ("Game Server %lu is connected to planet server", m_processId));
+	m_gameServerReadyPlanetConnected = true;
+	checkWhetherGameServerIsReady();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Call after each asynchronous step of initializing the game server.
+ * If all steps are completed, calls gameServerReady()
+ */
+void GameServer::checkWhetherGameServerIsReady()
+{
+	if (m_gameServerReadyDatabaseConnected && m_gameServerReadyObjectIds && m_gameServerReadyPlanetConnected)
+		gameServerReady();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Call this function when we are ready to handle receiving objects.
+ * Notifies Central, who may tell other game servers to give
+ * us proxy objects now or may tell us to create new objects.
+ */
+void GameServer::gameServerReady()
+{
+	static int callCount(0);
+	UNREF(callCount);
+	DEBUG_FATAL(getProcessId()==0,("gameServerReady() was called before process ID was set.\n"));
+	DEBUG_FATAL((callCount++)!=0,("gameServerReady() was called more than once.\n"));
+
+	LOG("GameGameConnect", ("Game Server %d is ready!", m_processId));
+	GameServerReadyMessage const msg(static_cast<int>(NON_NULL(TerrainObject::getInstance())->getMapWidthInMeters()));
+	sendToCentralServer(msg);
+	sendToPlanetServer(msg);
+}
+
+// ----------------------------------------------------------------------
+
+const StringId GameServer::verifyCharacterName(const std::string &templateName, const Unicode::String &name, bool forPlayer) const
+{
+	const ServerCreatureObjectTemplate * serverTemplate = getServerCreatureObjectTemplate(templateName);
+	if (!serverTemplate)
+		return NameErrors::nameDeclinedNotCreatureTemplate;
+
+	const StringId & verified = verifyCharacterName(*serverTemplate, name, forPlayer);
+	serverTemplate->releaseReference();
+
+	return verified;
+}
+
+// ----------------------------------------------------------------------
+
+const StringId GameServer::verifyCharacterName(const ServerCreatureObjectTemplate &serverTemplate, const Unicode::String &name, bool forPlayer) const
+{
+	if (ConfigServerGame::getNameValidationAcceptAll())
+		return NameErrors::nameApproved;
+
+	if (name.empty())
+		return NameErrors::nameDeclinedEmpty;
+
+	// Check for appropriateness based on race
+	if (!NameManager::getInstance().isNameAppropriate(ConfigServerGame::getCharacterNameGeneratorDirectory(),serverTemplate.getNameGeneratorType(),name))
+		return NameErrors::nameDeclinedRaciallyInappropriate;
+
+	// Now match against reserved names and profanity
+	std::string reasonDescription;
+	if (NameManager::getInstance().isNameReserved(name,reasonDescription))
+		return StringId(NameErrors::localizationFile,reasonDescription);
+	else
+		return NameErrors::nameApproved;
+}
+
+//--------------------------------------------------------------------
+
+void GameServer::handleCreateCharacter(const CentralCreateCharacter * createMessage)
+{
+	LOG("TraceCharacterCreation", ("%d received CentralCreateCharacter(%d, %s, ...)", createMessage->getStationId(), createMessage->getStationId(), Unicode::wideToNarrow(createMessage->getCharacterName()).c_str()));
+	if (m_charactersPendingCreation->find(createMessage->getStationId()) != m_charactersPendingCreation->end())
+	{
+		LOG("TraceCharacterCreation", ("%d name verification for that name is still pending, sending GameCreateCharacterFailed(%d, %s, NameErrors::nameDeclinedRetry) to central server", createMessage->getStationId(), createMessage->getStationId(), Unicode::wideToNarrow(createMessage->getCharacterName()).c_str()));
+		DEBUG_REPORT_LOG(true, ("Received character creation request for account %li, but we are still pending a name verification for that id\n",createMessage->getStationId()));
+		GameCreateCharacterFailed const characterCreateFailed(createMessage->getStationId(), createMessage->getCharacterName(), NameErrors::nameDeclinedRetry, FormattedString<2048>().sprintf("%lu name verification for that name is still pending, sending GameCreateCharacterFailed(%lu, %s, NameErrors::nameDeclinedRetry) to central server", createMessage->getStationId(), createMessage->getStationId(), Unicode::wideToNarrow(createMessage->getCharacterName()).c_str()));
+		sendToCentralServer(characterCreateFailed);
+		delete createMessage;
+		return;
+	}
+
+	const std::string & templateName = createMessage->getTemplateName();
+	DEBUG_REPORT_LOG(true, ("Received character creation request for account %li (name %s, template %s)\n",createMessage->getStationId(), Unicode::wideToNarrow(createMessage->getCharacterName()).c_str(), templateName.c_str()));
+	if(templateName.empty ())
+	{
+		LOG("TraceCharacterCreation", ("%d sent an empty template name, sending GameCreateCharacterFailed(%d, %s, NameErrors::nameDeclinedNoTemplate) to central server", createMessage->getStationId(), createMessage->getStationId(), Unicode::wideToNarrow(createMessage->getCharacterName()).c_str()));
+		DEBUG_REPORT_LOG(true, ("The template was empty\n"));
+		// Tell central we couldn't create the character
+		GameCreateCharacterFailed const characterCreateFailed(createMessage->getStationId(), createMessage->getCharacterName(), NameErrors::nameDeclinedNoTemplate, FormattedString<2048>().sprintf("%lu sent an empty template name, sending GameCreateCharacterFailed(%lu, %s, NameErrors::nameDeclinedNoTemplate) to central server", createMessage->getStationId(), createMessage->getStationId(), Unicode::wideToNarrow(createMessage->getCharacterName()).c_str()));
+		sendToCentralServer(characterCreateFailed);
+		delete createMessage;
+		return;
+	}
+
+	if (!SpeciesRestrictions::canCreateCharacter(createMessage->getGameFeatures(), Crc::calculate(templateName.c_str())))
+	{
+		LOG("TraceCharacterCreation", ("%d sent a species template name their account was not authorized to use.  Template was %s", createMessage->getStationId(), templateName.c_str()));
+		// Tell central we couldn't create the character
+		GameCreateCharacterFailed const characterCreateFailed(createMessage->getStationId(), createMessage->getCharacterName(), NameErrors::nameDeclinedNotAuthorizedForSpecies, FormattedString<2048>().sprintf("%lu sent a species template name their account was not authorized to use.  Template was %s", createMessage->getStationId(), templateName.c_str()));
+		sendToCentralServer(characterCreateFailed);
+		delete createMessage;
+		return;
+	}
+
+	StringId avatarReason = canCreateAvatar(templateName);
+	if (avatarReason != NameErrors::nameApproved)
+	{
+		LOG("TraceCharacterCreation", ("%d canCreateAvatar(%s) failed, sending GameCreateCharacterFailed(%d, %s, REASON) to central server", createMessage->getStationId(), createMessage->getTemplateName().c_str(), createMessage->getStationId(), Unicode::wideToNarrow(createMessage->getCharacterName()).c_str()));
+		DEBUG_REPORT_LOG(true, ("Can't create avatar\n"));
+		GameCreateCharacterFailed const characterCreateFailed(createMessage->getStationId(), createMessage->getCharacterName(), avatarReason, FormattedString<2048>().sprintf("%lu canCreateAvatar(%s) failed, sending GameCreateCharacterFailed(%lu, %s, REASON) to central server", createMessage->getStationId(), createMessage->getTemplateName().c_str(), createMessage->getStationId(), Unicode::wideToNarrow(createMessage->getCharacterName()).c_str()));
+		sendToCentralServer(characterCreateFailed);
+		delete createMessage;
+		return;
+	}
+
+	// verify the name against static tests - length, character set, etc.
+	StringId VerifyNameResponse = verifyCharacterName(templateName, createMessage->getCharacterName(), true);
+	if (VerifyNameResponse != NameErrors::nameApproved)
+	{
+		LOG("TraceCharacterCreation", ("%d VerifyNameResponse != NameErrors::nameApproved, sending GameCreateCharacterFailed(%d, %s, REASON) to central server", createMessage->getStationId(), createMessage->getStationId(), Unicode::wideToNarrow(createMessage->getCharacterName()).c_str()));
+		GameCreateCharacterFailed const characterCreateFailed(createMessage->getStationId(), createMessage->getCharacterName(), VerifyNameResponse, FormattedString<2048>().sprintf("%lu VerifyNameResponse != NameErrors::nameApproved, sending GameCreateCharacterFailed(%lu, %s, REASON) to central server", createMessage->getStationId(), createMessage->getStationId(), Unicode::wideToNarrow(createMessage->getCharacterName()).c_str()));
+		sendToCentralServer(characterCreateFailed);
+		delete createMessage;
+		return;
+	}
+
+	// verify the name against known existing names
+	if (NameManager::getInstance().getPlayerId(NameManager::normalizeName(Unicode::wideToNarrow(createMessage->getCharacterName()))) != NetworkId::cms_invalid)
+	{
+		LOG("TraceCharacterCreation", ("%d character create name %s is in use, sending GameCreateCharacterFailed", createMessage->getStationId(), Unicode::wideToNarrow(createMessage->getCharacterName()).c_str()));
+		DEBUG_REPORT_LOG(true, ("Character create name %s is in use, declined for stationId %lu\n", Unicode::wideToNarrow(createMessage->getCharacterName()).c_str(), createMessage->getStationId()));
+		GameCreateCharacterFailed const characterCreateFailed(createMessage->getStationId(), createMessage->getCharacterName(), NameErrors::nameDeclinedInUse, FormattedString<2048>().sprintf("%lu character create name %s is in use, sending GameCreateCharacterFailed", createMessage->getStationId(), Unicode::wideToNarrow(createMessage->getCharacterName()).c_str()));
+		sendToCentralServer(characterCreateFailed);
+		delete createMessage;
+		return;
+	}
+
+	// Now verify against the database.
+	LOG("TraceCharacterCreation", ("%d sending VerifyNameRequest(%d, %s, %s) to the database for validation", createMessage->getStationId(), createMessage->getStationId(), createMessage->getTemplateName().c_str(), Unicode::wideToNarrow(createMessage->getCharacterName()).c_str()));
+	VerifyNameRequest const vrn(createMessage->getStationId(), NetworkId::cms_invalid, createMessage->getTemplateName(), createMessage->getCharacterName());
+	sendToDatabaseServer(vrn);
+	(*m_charactersPendingCreation)[createMessage->getStationId()] = createMessage;
+}
+
+//--------------------------------------------------------------------
+
+void GameServer::handleNameFailure(const RandomNameRequest &request, const StringId &errorMessage)
+{
+	LOG("TraceCharacterCreation", ("%d sending RandomNameResponse(%d, %s, REASON) to central server", request.getStationId(), request.getCreatureTemplate().c_str()));
+	RandomNameResponse const rnr(request.getStationId(), request.getCreatureTemplate(), Unicode::String(), errorMessage);
+	sendToCentralServer(rnr);
+}
+
+//--------------------------------------------------------------------
+
+void GameServer::handleNameRequest(const RandomNameRequest &request)
+{
+	DEBUG_REPORT_LOG(true, ("Random name requested for stationId %lu\n", request.getStationId()));
+
+	std::map<uint32, const CentralCreateCharacter *>::iterator findPendingCreation=m_charactersPendingCreation->find(request.getStationId());
+	if (findPendingCreation != m_charactersPendingCreation->end())
+	{
+		LOG("TraceCharacterCreation", ("%d received random name request after CharacterCreationRequest, ignoring request", request.getStationId()));
+		DEBUG_REPORT_LOG(true, ("Received random name request after CharacterCreation request"));
+		return;
+	}
+
+	bool success = false;
+
+	const ObjectTemplate * const objectTemplate = ObjectTemplateList::fetch(request.getCreatureTemplate());
+	if (objectTemplate)
+	{
+		const ServerCreatureObjectTemplate * const creatureTemplate = dynamic_cast<const ServerCreatureObjectTemplate *>(objectTemplate);
+		if (creatureTemplate)
+		{
+			// generate a name
+			Unicode::String randomName = NameManager::getInstance().generateUniqueRandomName(ConfigServerGame::getCharacterNameGeneratorDirectory(),creatureTemplate->getNameGeneratorType());
+
+			LOG("TraceCharacterCreation", ("%d generated name %s", request.getStationId(), Unicode::wideToNarrow(randomName).c_str(), request.getStationId(), request.getCreatureTemplate().c_str(), Unicode::wideToNarrow(randomName).c_str()));
+
+			DEBUG_REPORT_LOG(true, ("VerifyNameResponse: random name %s approved for stationId %lu\n", Unicode::wideToNarrow(randomName).c_str(), request.getStationId()));
+			RandomNameResponse const response(request.getStationId(), request.getCreatureTemplate(), randomName, NameErrors::nameApproved);
+			sendToCentralServer(response);
+			
+			success = true;
+		}
+		else
+		{
+			LOG("TraceCharacterCreation", ("%d failed to get a creature template to service random name request. The request failed", request.getStationId()));
+		}
+		objectTemplate->releaseReference();
+	}
+	else
+	{
+		LOG("TraceCharacterCreation", ("%d could not get an ObjectTemplate for name request", request.getStationId()));
+	}
+
+	if (!success)
+	{
+		WARNING(true, ("Could not generate a random name for template %s (template may not exist or may not be a CreatureTemplate).\n", request.getCreatureTemplate().c_str()));
+		handleNameFailure(request, NameErrors::nameDeclinedNoTemplate);
+	}
+}
+
+//--------------------------------------------------------------------
+
+const StringId GameServer::handleVerifyAndLockNameRequest(const VerifyAndLockNameRequest &request, bool sendFailedResponseToCentralServer, bool verifyAgainstDb)
+{
+	REPORT_LOG(true, ("Verify and lock name requested for stationId %lu\n", request.getStationId()));
+	
+	const std::string & templateName = request.getTemplateName();
+	DEBUG_REPORT_LOG(true, ("Received verify and lock name request for account %li (name %s, template %s)\n", request.getStationId(), Unicode::wideToNarrow(request.getCharacterName()).c_str(), templateName.c_str()));
+	if(templateName.empty ())
+	{
+		// Tell central we couldn't create the character
+		if (sendFailedResponseToCentralServer)
+		{
+			LOG("TraceCharacterCreation", ("%lu sent an empty template name for name verification, sending VerifyAndLockNameResponse(%lu, %s, NameErrors::nameDeclinedNoTemplate) to central server", request.getStationId(), request.getStationId(), Unicode::wideToNarrow(request.getCharacterName()).c_str()));
+			DEBUG_REPORT_PRINT(true, ("%lu sent an empty template name for name verification, sending VerifyAndLockNameResponse(%lu, %s, NameErrors::nameDeclinedNoTemplate) to central server\n", request.getStationId(), request.getStationId(), Unicode::wideToNarrow(request.getCharacterName()).c_str()));
+
+			VerifyAndLockNameResponse const verifyAndLockNameResponse(request.getStationId(), request.getCharacterName(), NameErrors::nameDeclinedNoTemplate);
+			sendToCentralServer(verifyAndLockNameResponse);
+		}
+
+		return NameErrors::nameDeclinedNoTemplate;
+	}
+
+	if (!SpeciesRestrictions::canCreateCharacter(request.getGameFeatures(), Crc::calculate(templateName.c_str())))
+	{
+		// Tell central we couldn't create the character
+		if (sendFailedResponseToCentralServer)
+		{
+			LOG("TraceCharacterCreation", ("%lu sent a species template name their account was not authorized to use, sending VerifyAndLockNameResponse to CentralServer.  Template was %s", request.getStationId(), templateName.c_str()));
+			DEBUG_REPORT_PRINT(true, ("%lu sent a species template name their account was not authorized to use, sending VerifyAndLockNameResponse to CentralServer.  Template was %s\n", request.getStationId(), templateName.c_str()));
+
+			VerifyAndLockNameResponse const verifyAndLockNameResponse(request.getStationId(), request.getCharacterName(), NameErrors::nameDeclinedNotAuthorizedForSpecies);
+			sendToCentralServer(verifyAndLockNameResponse);
+		}
+
+		return NameErrors::nameDeclinedNotAuthorizedForSpecies;
+	}
+
+	StringId avatarReason = canCreateAvatar(templateName);
+	if (avatarReason != NameErrors::nameApproved)
+	{
+		if (sendFailedResponseToCentralServer)
+		{
+			LOG("TraceCharacterCreation", ("%lu canCreateAvatar(%s) failed, sending VerifyAndLockNameResponse(%lu, %s, REASON) to central server", request.getStationId(), request.getTemplateName().c_str(), request.getStationId(), Unicode::wideToNarrow(request.getCharacterName()).c_str()));
+			DEBUG_REPORT_PRINT(true, ("%lu canCreateAvatar(%s) failed, sending VerifyAndLockNameResponse(%lu, %s, REASON) to central server\n", request.getStationId(), request.getTemplateName().c_str(), request.getStationId(), Unicode::wideToNarrow(request.getCharacterName()).c_str()));
+
+			VerifyAndLockNameResponse const verifyAndLockNameResponse(request.getStationId(), request.getCharacterName(), avatarReason);
+			sendToCentralServer(verifyAndLockNameResponse);
+		}
+
+		return avatarReason;
+	}
+
+	// verify the name against static tests - length, character set, etc.
+	StringId VerifyNameResponse = verifyCharacterName(templateName, request.getCharacterName(), true);
+	if (VerifyNameResponse != NameErrors::nameApproved)
+	{
+		if (sendFailedResponseToCentralServer)
+		{
+			LOG("TraceCharacterCreation", ("%lu VerifyNameResponse != NameErrors::nameApproved, sending VerifyAndLockNameResponse(%lu, %s, REASON) to central server", request.getStationId(), request.getStationId(), Unicode::wideToNarrow(request.getCharacterName()).c_str()));
+			DEBUG_REPORT_PRINT(true, ("%lu VerifyNameResponse != NameErrors::nameApproved, sending VerifyAndLockNameResponse(%lu, %s, REASON) to central server\n", request.getStationId(), request.getStationId(), Unicode::wideToNarrow(request.getCharacterName()).c_str()));
+
+			VerifyAndLockNameResponse const verifyAndLockNameResponse(request.getStationId(), request.getCharacterName(), VerifyNameResponse);
+			sendToCentralServer(verifyAndLockNameResponse);
+		}
+
+		return VerifyNameResponse;
+	}
+
+	// verify the name against known existing names
+	if (NameManager::getInstance().getPlayerId(NameManager::normalizeName(Unicode::wideToNarrow(request.getCharacterName()))) != NetworkId::cms_invalid)
+	{
+		if (sendFailedResponseToCentralServer)
+		{
+			LOG("TraceCharacterCreation", ("%lu character create name %s is in use, sending VerifyAndLockNameResponse", request.getStationId(), Unicode::wideToNarrow(request.getCharacterName()).c_str()));
+			DEBUG_REPORT_PRINT("TraceCharacterCreation", ("%lu character create name %s is in use, sending VerifyAndLockNameResponse\n", request.getStationId(), Unicode::wideToNarrow(request.getCharacterName()).c_str()));
+
+			VerifyAndLockNameResponse const verifyAndLockNameResponse(request.getStationId(), request.getCharacterName(), NameErrors::nameDeclinedInUse);
+			sendToCentralServer(verifyAndLockNameResponse);
+		}
+
+		return NameErrors::nameDeclinedInUse;
+	}
+
+	// Now verify against the database.
+	if (verifyAgainstDb)
+	{
+		LOG("TraceCharacterCreation", ("%lu sending VerifyNameRequest(%lu, %s, %s) to the database for validation", request.getStationId(), request.getStationId(), request.getTemplateName().c_str(), Unicode::wideToNarrow(request.getCharacterName()).c_str()));
+		VerifyNameRequest const vrn(request.getStationId(), request.getCharacterId(), request.getTemplateName(), request.getCharacterName());
+		sendToDatabaseServer(vrn);
+	}
+
+	return NameErrors::nameApproved;
+}
+
+//--------------------------------------------------------------------
+
+void GameServer::handleCharacterCreateNameVerification(const VerifyNameResponse &vrn)
+{
+	std::map<uint32, const CentralCreateCharacter *>::iterator findPendingCreation=m_charactersPendingCreation->find(vrn.getStationId());
+	const CentralCreateCharacter * createMessage = findPendingCreation->second;
+
+	if (vrn.getErrorMessage() != NameErrors::nameApproved)
+	{
+		LOG("TraceCharacterCreation", ("%d VeryfyNameResponse character create name %s declined, sending GameCreateCharacterFailed(%d, %s, %s)", vrn.getStationId(), Unicode::wideToNarrow(vrn.getName()).c_str(), vrn.getStationId(), Unicode::wideToNarrow(vrn.getName()).c_str(), vrn.getErrorMessage().getText().c_str()));
+		DEBUG_REPORT_LOG(true, ("VerifyNameResponse: character create name %s declined (%s) for stationId %lu\n", Unicode::wideToNarrow(vrn.getName()).c_str(), vrn.getErrorMessage().getText().c_str(), vrn.getStationId()));
+		GameCreateCharacterFailed const characterCreateFailed(vrn.getStationId(), vrn.getName(), vrn.getErrorMessage(), FormattedString<2048>().sprintf("%lu VeryfyNameResponse character create name %s declined, sending GameCreateCharacterFailed(%lu, %s, %s)", vrn.getStationId(), Unicode::wideToNarrow(vrn.getName()).c_str(), vrn.getStationId(), Unicode::wideToNarrow(vrn.getName()).c_str(), vrn.getErrorMessage().getText().c_str()));
+		sendToCentralServer(characterCreateFailed);
+		m_charactersPendingCreation->erase(vrn.getStationId());
+		delete createMessage;
+		return;
+	}
+	std::string templateName(createMessage->getTemplateName());
+
+	DEBUG_REPORT_LOG(true, ("VerifyNameResponse: character create name %s approved for stationId %lu\n", Unicode::wideToNarrow(vrn.getName()).c_str(), vrn.getStationId()));
+
+	TangibleObject *newCharacterObject = 0;
+
+	if (createMessage->getUseNewbieTutorial())
+	{
+		Transform tr;
+		tr.setPosition_p(NewbieTutorial::getTutorialLocation());
+		newCharacterObject = safe_cast<TangibleObject*>(ServerWorld::createNewObject(templateName, tr, 0, false));
+	}
+	else
+	{
+		Transform tr;
+		tr.setPosition_p(createMessage->getCoordinates());
+		newCharacterObject = safe_cast<TangibleObject *>(ServerWorld::createNewObject(templateName, tr, 0, false));
+	}
+
+	if (!newCharacterObject)
+	{
+		LOG("TraceCharacterCreation", ("%d could not create a new character object on the game server, sending GameCreateCharacterFailed(%d, %s, %s) to central server", vrn.getStationId(), vrn.getStationId(), Unicode::wideToNarrow(vrn.getName()).c_str(), vrn.getErrorMessage().getText().c_str()));
+		DEBUG_REPORT_LOG(true, ("handleCharacterCreateNameVerification: failed to create character object (name %s, template %s, stationId %lu)\n", Unicode::wideToNarrow(vrn.getName()).c_str(), vrn.getCreatureTemplate().c_str(), vrn.getStationId()));
+		GameCreateCharacterFailed const characterCreateFailed(vrn.getStationId(), vrn.getName(), NameErrors::nameDeclinedInternalError, FormattedString<2048>().sprintf("%lu could not create a new character object on the game server, sending GameCreateCharacterFailed(%lu, %s, %s) to central server", vrn.getStationId(), vrn.getStationId(), Unicode::wideToNarrow(vrn.getName()).c_str(), vrn.getErrorMessage().getText().c_str()));
+		sendToCentralServer(characterCreateFailed);
+		m_charactersPendingCreation->erase(vrn.getStationId());
+		delete createMessage;
+		return;
+	}
+
+	newCharacterObject->setObjectName(createMessage->getCharacterName());
+	newCharacterObject->setOwnerId(newCharacterObject->getNetworkId());
+	newCharacterObject->setPlayerControlled(true);
+	if (createMessage->getUseNewbieTutorial())
+		NewbieTutorial::setupCharacterForTutorial(newCharacterObject);
+	else
+		NewbieTutorial::setupCharacterToSkipTutorial(newCharacterObject);
+
+	CollisionProperty * collision = newCharacterObject->getCollisionProperty();
+	if(collision)
+	{
+		collision->setPlayerControlled(true);
+	}
+
+	//@todo: scale factor should probably be in TangibleObject, not CreatureObject
+	CreatureObject * const creature = dynamic_cast<CreatureObject *>(newCharacterObject);
+	if (creature)
+	{
+		float scaleFactor = createMessage->getScaleFactor ();
+		const SharedObjectTemplate * const tmpl = safe_cast<const SharedObjectTemplate *>(creature->getSharedTemplate ());
+
+		if (tmpl)
+		{
+			const float scaleMax   = tmpl->getScaleMax ();
+			const float scaleMin   = tmpl->getScaleMin ();
+
+			scaleFactor = std::min (scaleFactor, scaleMax);
+			scaleFactor = std::max (scaleFactor, scaleMin);
+		}
+
+		creature->setScaleFactor (scaleFactor);
+		creature->setScale       (Vector::xyz111 * scaleFactor);
+	}
+
+	TangibleObject * tangibleObject = dynamic_cast<TangibleObject*>(newCharacterObject);
+	//@todo we might ought enforce this be a CreatureObject
+	if (tangibleObject)
+		tangibleObject->setAppearanceData(createMessage->getAppearanceData());
+
+	// hair equip hack
+	if(!createMessage->getHairTemplateName().empty ())
+	{
+		ServerObject * const hair = ServerWorld::createNewObject(createMessage->getHairTemplateName(), *newCharacterObject, false);
+		if (!hair)
+		{
+			DEBUG_WARNING(true, ("Could not create hair %s\n", createMessage->getHairTemplateName().c_str()));
+		}
+		else
+		{
+			TangibleObject * const tangible_hair = dynamic_cast<TangibleObject *>(hair);
+
+			if (tangible_hair)
+				tangible_hair->setAppearanceData (createMessage->getHairAppearanceData ());
+			else
+				WARNING (true, ("Hair is not tangible, wtf.  Can't customize it.  (among other things, probably)..."));
+		}
+	}
+
+	if (!createMessage->getProfession ().empty ())
+	{
+		CreatureObject * const creature = dynamic_cast<CreatureObject *>(newCharacterObject);
+		if (creature)
+			PlayerCreationManagerServer::setupPlayer (*creature, createMessage->getProfession (), createMessage->getStationId(), createMessage->getJedi());
+	}
+
+	if (!createMessage->getBiography().empty())
+	{
+		BiographyManager::setBiography(newCharacterObject->getNetworkId(),createMessage->getBiography());
+	}
+
+	// ----------------------------------------------------------------------
+	// Set up the PlayerObject
+
+	ServerObject *playerServerObject = ServerWorld::createNewObject(ConfigServerGame::getPlayerObjectTemplate(), *newCharacterObject, false);
+	PlayerObject *play = dynamic_cast<PlayerObject*>(playerServerObject);
+	if (play)
+	{
+		play->setStationId(createMessage->getStationId());
+		play->setBornDate();
+		play->setSkillTemplate(createMessage->getSkillTemplate(), true);
+		play->setWorkingSkill(createMessage->getWorkingSkill(), true);
+
+		// Setup initial A-Tab inventory.
+		SlottedContainer * const container = ContainerInterface::getSlottedContainer(*newCharacterObject);
+		if(container)
+		{
+			SlotId slot;
+			Container::ContainerErrorCode tmp;
+			slot = SlotIdManager::findSlotId(GameServerNamespace::SlotNames::appearance);
+			if(slot != SlotId::invalid)
+			{
+				Container::ContainedItem itemId = container->getObjectInSlot(slot, tmp);
+				Object* appearanceInventory = itemId.getObject();
+				if(appearanceInventory == NULL)
+				{
+					WARNING(true, ("Player %s has lost their appearance inventory", newCharacterObject->getNetworkId().getValueString().c_str()));
+					appearanceInventory = ServerWorld::createNewObject(s_appearanceTemplate, *newCharacterObject, slot, false);
+					if(!appearanceInventory)
+					{
+						DEBUG_FATAL(true, ("Could not create an appearance inventory for the player who lost theirs"));
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+		LOG("TraceCharacterCreation", ("%d unable to create player object for new character %s", vrn.getStationId(), newCharacterObject->getNetworkId().getValueString().c_str()));
+		WARNING_STRICT_FATAL(true,("Unable to create PlayerObject for new character %s.\n",newCharacterObject->getNetworkId().getValueString().c_str()));
+	}
+
+	newCharacterObject->setSceneIdOnThisAndContents(createMessage->getPlanetName());
+
+	// ----------------------------------------------------------------------
+	// Tell DB Process we're about to send it a character, then send it
+	AddCharacterMessage const acm(createMessage->getStationId(), newCharacterObject->getNetworkId(),getProcessId(),createMessage->getCharacterName(),createMessage->getJedi());
+	sendToDatabaseServer(acm);
+	newCharacterObject->persist();
+
+	// ----------------------------------------------------------------------
+	// Register player name with the global list
+	std::string const &firstName = Unicode::wideToNarrow(Unicode::toLower(newCharacterObject->getAssignedObjectFirstName()));
+	std::string const &fullName = Unicode::wideToNarrow(newCharacterObject->getAssignedObjectName());
+	time_t const timeNow = Os::getRealSystemTime();
+	NameManager::getInstance().addPlayer(newCharacterObject->getNetworkId(), createMessage->getStationId(), firstName, fullName, timeNow, timeNow, true);
+
+	// ----------------------------------------------------------------------
+	// Delete the new character -- will reload it from DB when player logs in
+	// (This is so that the player could log in to a different server, or not log in at all, and things would still work.)
+	ServerWorld::removeObjectFromGame(*newCharacterObject);
+	delete newCharacterObject;
+
+	m_charactersPendingCreation->erase(vrn.getStationId());
+	delete createMessage;
+
+	// Destroy any existing chat avatar that may be using the new character's name
+	GenericValueTypeMessage<std::string> const chatDestroyAvatar("ChatDestroyAvatar", firstName);
+	Chat::sendToChatServer(chatDestroyAvatar);
+}
+
+//--------------------------------------------------------------------
+
+void GameServer::handleVerifyAndLockNameVerification(const VerifyNameResponse &vrn)
+{
+	LOG("TraceCharacterCreation", ("%lu VerifyNameResponse from db for verify and lock name received, sending VerifyAndLockNameResponse(%lu, %s, %s)", vrn.getStationId(), vrn.getStationId(), Unicode::wideToNarrow(vrn.getName()).c_str(), vrn.getErrorMessage().getText().c_str()));
+	DEBUG_REPORT_PRINT(true, ("%lu VerifyNameResponse from db for verify and lock name received, sending VerifyAndLockResponse(%lu, %s, %s)\n", vrn.getStationId(), vrn.getStationId(), Unicode::wideToNarrow(vrn.getName()).c_str(), vrn.getErrorMessage().getText().c_str()));
+
+	if (vrn.getCharacterId().isValid())
+	{
+		if (vrn.getErrorMessage() != NameErrors::nameApproved)
+		{
+			std::string const errorText(std::string("@") + vrn.getErrorMessage().getCanonicalRepresentation());
+			ScriptParams params;
+			params.addParam(errorText.c_str(), "reason");
+			ScriptDictionaryPtr dictionary;
+			GameScriptObject::makeScriptDictionary(params, dictionary);
+			if (dictionary.get() != NULL)
+			{
+				dictionary->serialize();
+				MessageToQueue::getInstance().sendMessageToJava(vrn.getCharacterId(), "renameCharacterNameValidationFail", dictionary->getSerializedData(), 0, false);
+			}
+		}
+		else
+		{
+			MessageToQueue::getInstance().sendMessageToJava(vrn.getCharacterId(), "renameCharacterNameValidationSuccess", std::vector<int8>(), 0, false);
+		}
+	}
+	else
+	{
+		VerifyAndLockNameResponse const verifyAndLockNameResponse(vrn.getStationId(), vrn.getName(), vrn.getErrorMessage());
+		sendToCentralServer(verifyAndLockNameResponse);
+	}
+}
+
+//--------------------------------------------------------------------
+
+bool GameServer::isCreatePending(uint32 stationId) const
+{
+	std::map<uint32, const CentralCreateCharacter *>::const_iterator findPendingCreation=m_charactersPendingCreation->find(stationId);
+	// If there is not a creation request pending, just reply with the random name.
+	return findPendingCreation != m_charactersPendingCreation->end();
+}
+
+//--------------------------------------------------------------------
+
+const StringId & GameServer::canCreateAvatar(const std::string &templateName)
+{
+	const ServerCreatureObjectTemplate * creatureTemplate = getServerCreatureObjectTemplate(templateName);
+	if (!creatureTemplate)
+	{
+		return NameErrors::nameDeclinedNotCreatureTemplate;
+	}
+
+	if (!creatureTemplate->getCanCreateAvatar())
+	{
+		creatureTemplate->releaseReference();
+		return NameErrors::nameDeclinedCantCreateAvatar;
+	}
+
+	creatureTemplate->releaseReference();
+	return NameErrors::nameApproved;
+}
+
+//--------------------------------------------------------------------
+
+const ServerCreatureObjectTemplate * GameServer::getServerCreatureObjectTemplate(const std::string &templateName) const
+{
+	const ObjectTemplate * objectTemplate = ObjectTemplateList::fetch(templateName);
+	if (!objectTemplate)
+		return 0;
+
+	const ServerCreatureObjectTemplate * creatureTemplate = dynamic_cast<const ServerCreatureObjectTemplate *>(objectTemplate);
+
+	return creatureTemplate;
+}
+//-----------------------------------------------------------------------
+
+int GameServer::getNumClients() const
+{
+	if (m_clients)
+		return m_clients->size();
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+void GameServer::handleTeleportMessage(TeleportMessage const &message)
+{
+	CreatureObject * const creature = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(message.getActorId()));
+	if (creature)
+	{
+		char buf[256];
+		IGNORE_RETURN(snprintf(buf, sizeof(buf)-1, "%s %g %g %g %s %g %g %g",
+			message.getSceneId().c_str(),
+			message.getPosition_w().x,
+			message.getPosition_w().y,
+			message.getPosition_w().z,
+			message.getContainerId().getValueString().c_str(),
+			message.getPosition_p().x,
+			message.getPosition_p().y,
+			message.getPosition_p().z));
+		buf[sizeof(buf)-1] = '\0';
+
+		Command::ErrorCode status = Command::CEC_Success;
+		creature->forceExecuteCommand(CommandTable::getCommand(Crc::calculate("planetwarp")), NetworkId::cms_invalid, Unicode::narrowToWide(buf), status, false);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void GameServer::handleRetrievedItemLoadMessage(RetrievedItemLoadMessage const &message)
+{
+	CachedNetworkId ownerId(message.getOwnerId());
+	if (ownerId.getObject())
+	{
+		CreatureObject *owner = dynamic_cast<CreatureObject*>(ownerId.getObject());
+		if (owner)
+		{
+			ServerObject *inventory = owner->getInventory();
+			if (inventory)
+			{
+				NetworkId objectId = message.getItemId();
+				if (objectId != NetworkId::cms_invalid)
+				{
+					inventory->loadContainedObjectFromDB(message.getItemId());
+				}
+			}
+		}
+		UNREF(owner);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void GameServer::handleReloadAdminTableMessage(ReloadAdminTableMessage const &message)
+{
+	AdminAccountManager::reload();
+}
+
+//-----------------------------------------------------------------------
+
+void GameServer::handleReloadCommandTableMessage(ReloadCommandTableMessage const &message)
+{
+	ServerCommandTable::load();
+}
+
+//-----------------------------------------------------------------------
+
+void GameServer::handleReloadDatatableMessage(ReloadDatatableMessage const &message)
+{
+	DataTableManager::reload(message.getTable());
+}
+
+//-----------------------------------------------------------------------
+
+void GameServer::handleReloadScriptMessage(ReloadScriptMessage const &message)
+{
+	GameScriptObject::reloadScript(message.getScript());
+}
+
+//-----------------------------------------------------------------------
+
+void GameServer::handleReloadTemplateMessage(ReloadTemplateMessage const &message)
+{
+	Iff templateFile;
+	if (templateFile.open(message.getTemplate().c_str(), true))
+	{
+		ObjectTemplateList::reload(templateFile);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void GameServer::handleEnableNewJediTrackingMessage(EnableNewJediTrackingMessage const &message)
+{
+	GameScriptObject::enableNewJediTracking(message.getEnableTracking());
+}
+
+//-----------------------------------------------------------------------
+
+void GameServer::checkIdleClients(float time)
+{
+	static float s_idleTimePassed;
+
+	s_idleTimePassed += time;
+
+	if (s_idleTimePassed > IDLE_CLIENTS_CHECK_TIME_SEC)
+	{
+		s_idleTimePassed = 0.0f;
+
+		std::vector<Client*> idleClients;
+
+		for (ClientMap::iterator i = m_clients->begin(); i != m_clients->end(); ++i)
+		{
+			if ((*i).second->idledTooLong())
+			{
+				PlayerObject const * playerObject = PlayerCreatureController::getPlayerObject(safe_cast<CreatureObject const *>((*i).second->getCharacterObject()));
+				if (!playerObject || (playerObject->getSessionLastActiveTime() == 0))
+				{
+				idleClients.push_back((*i).second);
+				}
+			}
+		}
+
+		for (std::vector<Client*>::iterator j = idleClients.begin(); j != idleClients.end(); ++j)
+			(*j)->handleIdleDisconnect();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GameServer::getObjectsWithClients(std::vector<ServerObject *> &objects) const
+{
+	objects.clear();
+	for (ClientMap::const_iterator i = m_clients->begin(); i != m_clients->end(); ++i)
+		if ((*i).second->getCharacterObject())
+			objects.push_back((*i).second->getCharacterObject());
+}
+
+// ----------------------------------------------------------------------
+
+void GameServer::setDone(char const *reasonfmt, ...)
+{
+	if (!m_done)
+	{
+		char reason[1024];
+		va_list ap;
+		va_start(ap, reasonfmt);
+		_vsnprintf(reason, sizeof(reason), reasonfmt, ap);
+		reason[sizeof(reason)-1] = '\0';
+
+		LOG(
+			"ServerShutdown",
+			(
+				"GameServer %d (pid %d) shutdown, reason: %s",
+				static_cast<int>(getProcessId()),
+				static_cast<int>(Os::getProcessId()),
+				reason));
+
+		REPORT_LOG(
+			true,
+			(
+				"GameServer %d (pid %d) shutdown, reason: %s\n",
+				static_cast<int>(getProcessId()),
+				static_cast<int>(Os::getProcessId()),
+				reason));
+
+		m_done = true;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GameServer::setDatabaseProcessConnection(DatabaseProcessConnection *newDatabaseProcessConnection)
+{
+	if (newDatabaseProcessConnection)
+	{
+		FATAL(newDatabaseProcessConnection != m_pendingDatabaseProcessConnection, ("Database process connection established but does not match pending?"));
+		m_databaseProcessConnection = newDatabaseProcessConnection;
+		m_pendingDatabaseProcessConnection = 0;
+		m_databaseProcessId = newDatabaseProcessConnection->getPid();
+
+		onDatabaseProcessConnectionEstablished();
+	}
+	else
+	{
+		m_databaseProcessConnection = 0;
+		m_pendingDatabaseProcessConnection = 0;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+uint32 GameServer::getDatabaseProcessId() const
+{
+	return m_databaseProcessId;
+}
+
+// ----------------------------------------------------------------------
+
+void GameServer::handleCSRequest( GameServerCSRequestMessage & message )
+{
+	DEBUG_REPORT_LOG( true, ( "HandleCSRequest:GameServer\n" ) );
+}
+
+// ----------------------------------------------------------------------
+
+bool GameServer::addPendingLoadRequest(NetworkId const & id)
+{
+	if (isAtPendingLoadRequestLimit())
+		return false;
+
+	if (s_pendingLoadRequests.find(id) != s_pendingLoadRequests.end())
+		return false;
+
+	s_pendingLoadRequests[id] = ::time(NULL);
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void GameServer::removePendingLoadRequest(NetworkId const & id)
+{
+	s_pendingLoadRequests.erase(id);
+}
+
+// ----------------------------------------------------------------------
+
+bool GameServer::isAtPendingLoadRequestLimit()
+{
+	return s_pendingLoadRequests.size() >= static_cast<unsigned int>(getPendingLoadRequestLimit());
+}
+
+// ----------------------------------------------------------------------
+
+int GameServer::getPendingLoadRequestLimit()
+{
+	static int pendingLoadRequestLimit = -1;
+
+	if (pendingLoadRequestLimit == -1)
+	{
+		pendingLoadRequestLimit = ConfigServerGame::getPendingLoadRequestLimit();
+
+		// see if there's a pending load limit set for this particular game server
+		char key[128];
+		snprintf(key, sizeof(key)-1, "pendingLoadRequestLimit_%s.%lu", ServerWorld::getSceneId().c_str(), GameServer::getInstance().getPreloadAreaId());
+		key[sizeof(key)-1] = '\0';
+
+		if (GameServerNamespace::getConfigSetting("GameServer", key, pendingLoadRequestLimit))
+			return pendingLoadRequestLimit;
+
+		// see if there's a pending load limit set for this particular planet
+		snprintf(key, sizeof(key)-1, "pendingLoadRequestLimit_%s", ServerWorld::getSceneId().c_str());
+		key[sizeof(key)-1] = '\0';
+
+		if (GameServerNamespace::getConfigSetting("GameServer", key, pendingLoadRequestLimit))
+			return pendingLoadRequestLimit;
+
+		// use default server pending load limit
+		pendingLoadRequestLimit = ConfigServerGame::getPendingLoadRequestLimit();
+	}
+
+	return pendingLoadRequestLimit;
+}
+
+// ----------------------------------------------------------------------
+
+int GameServer::getNumberOfPendingLoadRequests()
+{
+	return s_pendingLoadRequests.size();
+}
+
+// ----------------------------------------------------------------------
+
+unsigned long GameServer::getOldestPendingLoadRequestTime(NetworkId & id)
+{
+	unsigned long oldestTime = std::numeric_limits<unsigned long>::max();
+
+	std::map<NetworkId, unsigned long>::const_iterator i = s_pendingLoadRequests.begin();
+	for (; i != s_pendingLoadRequests.end(); ++i)
+		if (i->second < oldestTime)
+		{
+			id = i->first;
+			oldestTime = i->second;
+		}
+
+	return oldestTime;
+}
+
+// ----------------------------------------------------------------------
+
+ShipObject *GameServerNamespace::getAttachedShip(CreatureObject *creature)
+{
+	// The "attached" ship is the ship which must move along with the creature.
+	// This means if the creature is piloting, the ship is is piloting,
+	// or the containing ship if the creature is the ship's owner.
+	ShipObject * const ship = ShipObject::getContainingShipObject(creature);
+	if (   ship
+	    && (   ship->getOwnerId() == creature->getNetworkId()
+	        || creature->getPilotedShip() == ship))
+		return ship;
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+void GameServerNamespace::loadRetroactiveCtsHistory()
+{
+	FATAL(GameServer::getInstance().getClusterName().empty(), ("cannot load retroactive CTS history until the cluster has received its cluster name"));
+
+	static bool alreadyDone = false;
+	if (alreadyDone)
+		return;
+
+	alreadyDone = true;
+
+	// set up data to retroactive CTS history
+	std::string const retroactiveCtsHistoryFilename = ConfigServerGame::getRetroactiveCtsHistoryFilename();
+	if (!retroactiveCtsHistoryFilename.empty())
+	{
+		DataTable * table = DataTableManager::getTable(retroactiveCtsHistoryFilename, true);
+		if (table)
+		{
+			int const columnTransferTime = table->findColumnNumber("transfer time epoch");
+
+			int const columnSourceCluster = table->findColumnNumber("source cluster");
+			int const columnSourceCharacterId = table->findColumnNumber("source character id");
+			int const columnSourceCharacterName = table->findColumnNumber("source character name");
+			int const columnSourceCharacterBornDate = table->findColumnNumber("source character born date");
+
+			int const columnTargetCluster = table->findColumnNumber("target cluster");
+			int const columnTargetCharacterId = table->findColumnNumber("target character id");
+
+			FATAL((columnTransferTime < 0), ("column \"transfer time epoch\" not found in %s", retroactiveCtsHistoryFilename.c_str()));
+
+			FATAL((columnSourceCluster < 0), ("column \"source cluster\" not found in %s", retroactiveCtsHistoryFilename.c_str()));
+			FATAL((columnSourceCharacterId < 0), ("column \"source character id\" not found in %s", retroactiveCtsHistoryFilename.c_str()));
+			FATAL((columnSourceCharacterName < 0), ("column \"source character name\" not found in %s", retroactiveCtsHistoryFilename.c_str()));
+			FATAL((columnSourceCharacterBornDate < 0), ("column \"source character born date\" not found in %s", retroactiveCtsHistoryFilename.c_str()));
+
+			FATAL((columnTargetCluster < 0), ("column \"target cluster\" not found in %s", retroactiveCtsHistoryFilename.c_str()));
+			FATAL((columnTargetCharacterId < 0), ("column \"target character id\" not found in %s", retroactiveCtsHistoryFilename.c_str()));
+
+			// read in retroactive objvars; these are stored in a variable number of
+			// colunms that are named in ascending order, so search for all such columns
+			std::vector<int> columnsObjvarName;
+			std::vector<int> columnsObjvarType;
+			std::vector<int> columnsObjvarValue;
+
+			char buffer[128];
+			int columnNumber;
+			for (int i = 1; i <= 1000000000; ++i)
+			{
+				snprintf(buffer, sizeof(buffer)-1, "objvar name %d", i);
+				buffer[sizeof(buffer)-1] = '\0';
+
+				columnNumber = table->findColumnNumber(buffer);
+				if (columnNumber < 0)
+					break;
+
+				columnsObjvarName.push_back(columnNumber);
+
+				snprintf(buffer, sizeof(buffer)-1, "objvar type %d", i);
+				buffer[sizeof(buffer)-1] = '\0';
+
+				columnNumber = table->findColumnNumber(buffer);
+				FATAL((columnNumber < 0), ("column \"%s\" not found in %s", buffer, retroactiveCtsHistoryFilename.c_str()));
+
+				columnsObjvarType.push_back(columnNumber);
+
+				snprintf(buffer, sizeof(buffer)-1, "objvar value %d", i);
+				buffer[sizeof(buffer)-1] = '\0';
+
+				columnNumber = table->findColumnNumber(buffer);
+				FATAL((columnNumber < 0), ("column \"%s\" not found in %s", buffer, retroactiveCtsHistoryFilename.c_str()));
+
+				columnsObjvarValue.push_back(columnNumber);
+			}
+
+			// CTS data can also come from config file, so read that in, if any
+			std::list<std::string> ctsDataFromConfig;
+			
+			{
+				int index = 0;
+				char const * pszCtsDataFromConfig = NULL;
+				do
+				{
+					pszCtsDataFromConfig = ConfigFile::getKeyString("GameServer", "retroactiveCtsHistory", index++, NULL);
+					if (pszCtsDataFromConfig != NULL)
+					{
+						ctsDataFromConfig.push_back(pszCtsDataFromConfig);
+					}
+				}
+				while (pszCtsDataFromConfig);
+			}
+
+			CtsSourceCharacterInfo sourceCharacterInfo;
+			std::string retroactiveObjvarName;
+			int retroactiveObjvarType;
+			std::string retroactiveObjvarValue;
+			std::string targetCluster;
+			NetworkId targetCharacterId;
+
+			//                                      transfer time, source character info
+			//                          target cluster
+			//           target character id
+			//                    \/          \/                   \/
+			std::map<std::pair<NetworkId, std::string>, CtsSourceCharacterInfo> allCtsHistoryList;
+
+#ifdef _DEBUG
+			std::set<std::string> allCtsSourceCluster;
+#endif
+
+			int const currentBornDate = PlayerObject::getCurrentBornDate();
+
+			std::list<std::string>::const_iterator iterCtsDataFromConfig = ctsDataFromConfig.begin();
+			std::list<std::string>::const_iterator const iterCtsDataFromConfigEnd = ctsDataFromConfig.end();
+			Unicode::String const ctsDataFromConfigDelimiter(Unicode::narrowToWide("|"));
+			Unicode::UnicodeStringVector ctsDataFromConfigTokens;
+			std::string ctsDataFromConfigParsedData;
+
+			int const numRows = table->getNumRows();
+			int rowIndex = 0;
+
+			while (true)
+			{
+				if (rowIndex < numRows)
+				{
+					sourceCharacterInfo.transferTime = static_cast<time_t>(table->getIntValue(columnTransferTime, rowIndex));
+
+					sourceCharacterInfo.sourceCluster = table->getStringValue(columnSourceCluster, rowIndex);
+					sourceCharacterInfo.sourceCharacterId = NetworkId(table->getStringValue(columnSourceCharacterId, rowIndex));
+					sourceCharacterInfo.sourceCharacterName = table->getStringValue(columnSourceCharacterName, rowIndex);
+					sourceCharacterInfo.sourceCharacterBornDate = table->getIntValue(columnSourceCharacterBornDate, rowIndex);
+
+					targetCluster = table->getStringValue(columnTargetCluster, rowIndex);
+					targetCharacterId = NetworkId(table->getStringValue(columnTargetCharacterId, rowIndex));
+
+					// read retroactive objvars
+					{
+						sourceCharacterInfo.sourceCharacterRetroactiveObjvars.clear();
+
+						for (size_t i = 0, size = columnsObjvarName.size(); i < size; ++i)
+						{
+							retroactiveObjvarName = table->getStringValue(columnsObjvarName[i], rowIndex);
+							retroactiveObjvarType = table->getIntValue(columnsObjvarType[i], rowIndex);
+							retroactiveObjvarValue = table->getStringValue(columnsObjvarValue[i], rowIndex);
+
+							if (!retroactiveObjvarName.empty() && !retroactiveObjvarValue.empty())
+							{
+								// can only handle INT (type 0) and INT_ARRAY (type 1) objvar type at this time
+								FATAL(((retroactiveObjvarType != static_cast<int>(DynamicVariable::INT)) && (retroactiveObjvarType != static_cast<int>(DynamicVariable::INT_ARRAY))), ("invalid or unsupported objvar type %d in %s, row %d", retroactiveObjvarType, retroactiveCtsHistoryFilename.c_str(), (rowIndex+3)));
+								sourceCharacterInfo.sourceCharacterRetroactiveObjvars.push_back(std::make_pair(retroactiveObjvarName, DynamicVariable()));
+								sourceCharacterInfo.sourceCharacterRetroactiveObjvars[sourceCharacterInfo.sourceCharacterRetroactiveObjvars.size() - 1].second.load(-1, retroactiveObjvarType, Unicode::narrowToWide(retroactiveObjvarValue));
+							}
+						}
+					}
+
+					++rowIndex;
+				}
+				else if (iterCtsDataFromConfig == iterCtsDataFromConfigEnd)
+				{
+					break;
+				}
+				else
+				{
+					ctsDataFromConfigTokens.clear();
+					if ((Unicode::tokenize(Unicode::narrowToWide(*iterCtsDataFromConfig), ctsDataFromConfigTokens, &ctsDataFromConfigDelimiter, NULL)) && (ctsDataFromConfigTokens.size() == 7))
+					{
+						// sanity check
+						ctsDataFromConfigParsedData = FormattedString<2048>().sprintf("%s|%s|%s|%s|%s|%s|%s", Unicode::wideToNarrow(ctsDataFromConfigTokens[0]).c_str(), Unicode::wideToNarrow(ctsDataFromConfigTokens[1]).c_str(), Unicode::wideToNarrow(ctsDataFromConfigTokens[2]).c_str(), Unicode::wideToNarrow(ctsDataFromConfigTokens[3]).c_str(), Unicode::wideToNarrow(ctsDataFromConfigTokens[4]).c_str(), Unicode::wideToNarrow(ctsDataFromConfigTokens[5]).c_str(), Unicode::wideToNarrow(ctsDataFromConfigTokens[6]).c_str());
+						FATAL((ctsDataFromConfigParsedData != *iterCtsDataFromConfig), ("parsed CTS data (%s) does not equal read CTS data (%s)", ctsDataFromConfigParsedData.c_str(), iterCtsDataFromConfig->c_str()));
+
+						sourceCharacterInfo.transferTime = static_cast<time_t>(::atol(Unicode::wideToNarrow(ctsDataFromConfigTokens[0]).c_str()));
+
+						sourceCharacterInfo.sourceCluster = Unicode::wideToNarrow(ctsDataFromConfigTokens[1]);
+						sourceCharacterInfo.sourceCharacterId = NetworkId(Unicode::wideToNarrow(ctsDataFromConfigTokens[2]));
+						sourceCharacterInfo.sourceCharacterName = Unicode::wideToNarrow(ctsDataFromConfigTokens[3]);
+						sourceCharacterInfo.sourceCharacterBornDate = ::atoi(Unicode::wideToNarrow(ctsDataFromConfigTokens[4]).c_str());
+
+						targetCluster = Unicode::wideToNarrow(ctsDataFromConfigTokens[5]);
+						targetCharacterId = NetworkId(Unicode::wideToNarrow(ctsDataFromConfigTokens[6]));
+
+						sourceCharacterInfo.sourceCharacterRetroactiveObjvars.clear();
+					}
+					else
+					{
+						FATAL(true, ("cannot parse CTS data (%s) read from config file", iterCtsDataFromConfig->c_str()));
+					}
+
+					++iterCtsDataFromConfig;
+				}
+
+				FATAL(((sourceCharacterInfo.sourceCharacterBornDate > 0) && (sourceCharacterInfo.sourceCharacterBornDate < 907)), ("source character (%s, %s) has born date (%d) < 907", sourceCharacterInfo.sourceCluster.c_str(), sourceCharacterInfo.sourceCharacterId.getValueString().c_str(), sourceCharacterInfo.sourceCharacterBornDate));
+				FATAL((sourceCharacterInfo.sourceCharacterBornDate > currentBornDate), ("source character (%s, %s) has born date (%d) > current born date (%d)", sourceCharacterInfo.sourceCluster.c_str(), sourceCharacterInfo.sourceCharacterId.getValueString().c_str(), sourceCharacterInfo.sourceCharacterBornDate, currentBornDate));
+
+				std::map<NetworkId, std::vector<CtsSourceCharacterInfo> > * clusterCtsHistory = NULL;
+#ifdef _DEBUG
+				IGNORE_RETURN(allCtsSourceCluster.insert(sourceCharacterInfo.sourceCluster));
+				clusterCtsHistory = &(s_retroactiveCtsHistoryList[targetCluster]);
+#else
+				// for release build, we only care about transfers into our cluster;
+				// for debug build, read them all so we can test out the logic to
+				// make sure it works for all clusters
+				if (targetCluster == GameServer::getInstance().getClusterName())
+					clusterCtsHistory = &s_retroactiveCtsHistoryListThisCluster;
+#endif
+				if (clusterCtsHistory)
+				{
+					if (clusterCtsHistory->count(targetCharacterId) <= 0)
+					{
+						(*clusterCtsHistory)[targetCharacterId].push_back(sourceCharacterInfo);
+					}
+				}
+
+				std::map<std::pair<NetworkId, std::string>, CtsSourceCharacterInfo>::const_iterator const iterFindCtsHistory = allCtsHistoryList.find(std::make_pair(targetCharacterId, targetCluster));
+				if (iterFindCtsHistory == allCtsHistoryList.end())
+				{
+					allCtsHistoryList[std::make_pair(targetCharacterId, targetCluster)] = sourceCharacterInfo;
+				}
+				else
+				{
+					FATAL(((iterFindCtsHistory->second.sourceCharacterId != sourceCharacterInfo.sourceCharacterId) || (iterFindCtsHistory->second.sourceCluster != sourceCharacterInfo.sourceCluster)), ("character (%s, %s) has 2 transfers from different source characters (%s, %s, %s, %ld, %s) and (%s, %s, %s, %ld, %s)", targetCluster.c_str(), targetCharacterId.getValueString().c_str(), iterFindCtsHistory->second.sourceCluster.c_str(), iterFindCtsHistory->second.sourceCharacterId.getValueString().c_str(), iterFindCtsHistory->second.sourceCharacterName.c_str(), iterFindCtsHistory->second.transferTime, CalendarTime::convertEpochToTimeStringLocal(iterFindCtsHistory->second.transferTime).c_str(), sourceCharacterInfo.sourceCluster.c_str(), sourceCharacterInfo.sourceCharacterId.getValueString().c_str(), sourceCharacterInfo.sourceCharacterName.c_str(), sourceCharacterInfo.transferTime, CalendarTime::convertEpochToTimeStringLocal(sourceCharacterInfo.transferTime).c_str()));
+				}
+			}
+
+			DataTableManager::close(retroactiveCtsHistoryFilename);
+
+#ifdef _DEBUG
+			{
+				// make sure there are collection slots defined for CTS titles
+				for (std::set<std::string>::const_iterator iter = allCtsSourceCluster.begin(); iter != allCtsSourceCluster.end(); ++iter)
+				{
+					std::string collectionSlotName = std::string("cts_from_") + Unicode::toLower(*iter);
+
+					std::string::size_type pos = collectionSlotName.find('-');
+					while (pos != std::string::npos)
+					{
+						collectionSlotName.replace(pos, 1, 1, '_');
+						pos = collectionSlotName.find('-');
+					}
+
+					DEBUG_WARNING(!CollectionsDataTable::getSlotByName(collectionSlotName), ("no collection slot defined for CTS title (%s)", collectionSlotName.c_str()));
+				}
+			}
+#endif
+
+			// build CTS history for characters who have transferred multiple times
+
+			//                          source cluster
+			//           source character id
+			//                    \/          \/
+			std::set<std::pair<NetworkId, std::string> > ctsHistorySourceCharacters;
+
+#ifdef _DEBUG
+			for (std::map<std::string, std::map<NetworkId, std::vector<CtsSourceCharacterInfo> > >::iterator iterCtsHistoryCluster = s_retroactiveCtsHistoryList.begin(); iterCtsHistoryCluster != s_retroactiveCtsHistoryList.end(); ++iterCtsHistoryCluster)
+			{
+				std::string const & ctsHistoryClusterName = iterCtsHistoryCluster->first;
+				std::map<NetworkId, std::vector<CtsSourceCharacterInfo> > & ctsHistoryCluster = iterCtsHistoryCluster->second;
+
+#else
+			{
+				std::string const & ctsHistoryClusterName = GameServer::getInstance().getClusterName();
+				std::map<NetworkId, std::vector<CtsSourceCharacterInfo> > & ctsHistoryCluster = s_retroactiveCtsHistoryListThisCluster;
+#endif
+				for (std::map<NetworkId, std::vector<CtsSourceCharacterInfo> >::iterator iterCtsHistoryCharacter = ctsHistoryCluster.begin(); iterCtsHistoryCharacter != ctsHistoryCluster.end(); ++iterCtsHistoryCharacter)
+				{
+					FATAL((iterCtsHistoryCharacter->second.size() != 1), ("character (%s, %s) should have exactly 1 CTS history at this point in the parsing", ctsHistoryClusterName.c_str(), iterCtsHistoryCharacter->first.getValueString().c_str()));
+					CtsSourceCharacterInfo const & ctsHistoryLastSourceCharacter = iterCtsHistoryCharacter->second[0];
+
+					ctsHistorySourceCharacters.clear();
+					IGNORE_RETURN(ctsHistorySourceCharacters.insert(std::make_pair(ctsHistoryLastSourceCharacter.sourceCharacterId, ctsHistoryLastSourceCharacter.sourceCluster)));
+
+					std::map<std::pair<NetworkId, std::string>, CtsSourceCharacterInfo>::const_iterator iterFindCharacterCtsHistory = allCtsHistoryList.find(std::make_pair(ctsHistoryLastSourceCharacter.sourceCharacterId, ctsHistoryLastSourceCharacter.sourceCluster));
+					while (iterFindCharacterCtsHistory != allCtsHistoryList.end())
+					{
+						FATAL((ctsHistorySourceCharacters.count(std::make_pair(iterFindCharacterCtsHistory->second.sourceCharacterId, iterFindCharacterCtsHistory->second.sourceCluster)) > 0), ("character (%s, %s) has multiple CTS history for the same source character (%s, %s, %s)", ctsHistoryClusterName.c_str(), iterCtsHistoryCharacter->first.getValueString().c_str(), iterFindCharacterCtsHistory->second.sourceCluster.c_str(), iterFindCharacterCtsHistory->second.sourceCharacterId.getValueString().c_str(), iterFindCharacterCtsHistory->second.sourceCharacterName.c_str()));
+						IGNORE_RETURN(ctsHistorySourceCharacters.insert(std::make_pair(iterFindCharacterCtsHistory->second.sourceCharacterId, iterFindCharacterCtsHistory->second.sourceCluster)));
+
+						FATAL((iterCtsHistoryCharacter->second[iterCtsHistoryCharacter->second.size() - 1].transferTime <= iterFindCharacterCtsHistory->second.transferTime), ("character (%s, %s) has out of order CTS history for source characters (%s, %s, %s, %ld, %s) and (%s, %s, %s, %ld, %s)", ctsHistoryClusterName.c_str(), iterCtsHistoryCharacter->first.getValueString().c_str(), iterCtsHistoryCharacter->second[iterCtsHistoryCharacter->second.size() - 1].sourceCluster.c_str(), iterCtsHistoryCharacter->second[iterCtsHistoryCharacter->second.size() - 1].sourceCharacterId.getValueString().c_str(), iterCtsHistoryCharacter->second[iterCtsHistoryCharacter->second.size() - 1].sourceCharacterName.c_str(), iterCtsHistoryCharacter->second[iterCtsHistoryCharacter->second.size() - 1].transferTime, CalendarTime::convertEpochToTimeStringLocal(iterCtsHistoryCharacter->second[iterCtsHistoryCharacter->second.size() - 1].transferTime).c_str(), iterFindCharacterCtsHistory->second.sourceCluster.c_str(), iterFindCharacterCtsHistory->second.sourceCharacterId.getValueString().c_str(), iterFindCharacterCtsHistory->second.sourceCharacterName.c_str(), iterFindCharacterCtsHistory->second.transferTime, CalendarTime::convertEpochToTimeStringLocal(iterFindCharacterCtsHistory->second.transferTime).c_str()));
+						iterCtsHistoryCharacter->second.push_back(iterFindCharacterCtsHistory->second);
+
+						iterFindCharacterCtsHistory = allCtsHistoryList.find(std::make_pair(iterFindCharacterCtsHistory->second.sourceCharacterId, iterFindCharacterCtsHistory->second.sourceCluster));
+					}
+				}
+			}
+
+#ifdef _DEBUG
+			{
+				// make sure that we have the born date of the "root" source character for each transfer
+				for (std::map<std::string, std::map<NetworkId, std::vector<CtsSourceCharacterInfo> > >::const_iterator iterCtsHistoryCluster = s_retroactiveCtsHistoryList.begin(); iterCtsHistoryCluster != s_retroactiveCtsHistoryList.end(); ++iterCtsHistoryCluster)
+				{
+					std::string const & ctsHistoryClusterName = iterCtsHistoryCluster->first;
+					std::map<NetworkId, std::vector<CtsSourceCharacterInfo> > const & ctsHistoryCluster = iterCtsHistoryCluster->second;
+
+					for (std::map<NetworkId, std::vector<CtsSourceCharacterInfo> >::const_iterator iterCtsHistoryCharacter = ctsHistoryCluster.begin(); iterCtsHistoryCharacter != ctsHistoryCluster.end(); ++iterCtsHistoryCharacter)
+					{
+						FATAL(iterCtsHistoryCharacter->second.empty(), ("character (%s, %s) has empty CTS history list", ctsHistoryClusterName.c_str(), iterCtsHistoryCharacter->first.getValueString().c_str()));
+
+						// we only care about missing born date for transfers on or before 
+						// Wed Nov 19 23:21:11 2008 Pacific Standard Time (epoch 1227165671)
+						// since transfers after that should correctly transfer the born date
+						FATAL((((iterCtsHistoryCharacter->second[iterCtsHistoryCharacter->second.size() - 1]).sourceCharacterBornDate <= 0) && ((iterCtsHistoryCharacter->second[iterCtsHistoryCharacter->second.size() - 1]).transferTime <= 1227165671)), ("character (%s, %s) has no born date for the \"root\" source character (%s, %s)", ctsHistoryClusterName.c_str(), iterCtsHistoryCharacter->first.getValueString().c_str(), (iterCtsHistoryCharacter->second[iterCtsHistoryCharacter->second.size() - 1]).sourceCluster.c_str(), (iterCtsHistoryCharacter->second[iterCtsHistoryCharacter->second.size() - 1]).sourceCharacterId.getValueString().c_str()));
+
+						// if the character has transferred multiple times, make sure that only the "root" source character has a born date
+						if (iterCtsHistoryCharacter->second.size() > 1)
+						{
+							for (size_t i = 0, sizeExcludingLastElement = (iterCtsHistoryCharacter->second.size() - 1); i < sizeExcludingLastElement; ++i)
+							{
+								FATAL(((iterCtsHistoryCharacter->second[i]).sourceCharacterBornDate > 0), ("character (%s, %s) has born date (%d) for a \"non root\" source character (%s, %s)", ctsHistoryClusterName.c_str(), iterCtsHistoryCharacter->first.getValueString().c_str(), (iterCtsHistoryCharacter->second[i]).sourceCharacterBornDate, (iterCtsHistoryCharacter->second[i]).sourceCluster.c_str(), (iterCtsHistoryCharacter->second[i]).sourceCharacterId.getValueString().c_str()));
+							}
+						}
+					}
+				}
+			}
+#endif
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GameServerNamespace::loadRetroactivePlayerCityCreationTime()
+{
+	FATAL(GameServer::getInstance().getClusterName().empty(), ("cannot load retroactive player city creation time until the cluster has received its cluster name"));
+
+	static bool alreadyDone = false;
+	if (alreadyDone)
+		return;
+
+	alreadyDone = true;
+
+	// set up data to player city creation time
+	std::string const retroactivePlayerCityCreationTimeFilename = ConfigServerGame::getRetroactivePlayerCityCreationTimeFilename();
+	if (!retroactivePlayerCityCreationTimeFilename.empty())
+	{
+		DataTable * table = DataTableManager::getTable(retroactivePlayerCityCreationTimeFilename, true);
+		if (table)
+		{
+			int const columnCreationTime = table->findColumnNumber("creation time epoch");
+			int const columnCluster = table->findColumnNumber("cluster");
+			int const columnCityId = table->findColumnNumber("city id");
+
+			FATAL((columnCreationTime < 0), ("column \"creation time epoch\" not found in %s", retroactivePlayerCityCreationTimeFilename.c_str()));
+			FATAL((columnCluster < 0), ("column \"cluster\" not found in %s", retroactivePlayerCityCreationTimeFilename.c_str()));
+			FATAL((columnCityId < 0), ("column \"city id\" not found in %s", retroactivePlayerCityCreationTimeFilename.c_str()));
+
+			// player city creation time data can also come from config file, so read that in, if any
+			std::list<std::string> playerCityCreationTimeDataFromConfig;
+
+			{
+				int index = 0;
+				char const * pszPlayerCityCreationTimeDataFromConfig = NULL;
+				do
+				{
+					pszPlayerCityCreationTimeDataFromConfig = ConfigFile::getKeyString("GameServer", "retroactivePlayerCityCreationTime", index++, NULL);
+					if (pszPlayerCityCreationTimeDataFromConfig != NULL)
+					{
+						playerCityCreationTimeDataFromConfig.push_back(pszPlayerCityCreationTimeDataFromConfig);
+					}
+				}
+				while (pszPlayerCityCreationTimeDataFromConfig);
+			}
+
+			std::list<std::string>::const_iterator iterPlayerCityCreationTimeDataFromConfig = playerCityCreationTimeDataFromConfig.begin();
+			std::list<std::string>::const_iterator const iterPlayerCityCreationTimeDataFromConfigEnd = playerCityCreationTimeDataFromConfig.end();
+			Unicode::String const playerCityCreationTimeDataFromConfigDelimiter(Unicode::narrowToWide("|"));
+			Unicode::UnicodeStringVector playerCityCreationTimeDataFromConfigTokens;
+			std::string playerCityCreationTimeDataFromConfigParsedData;
+
+			time_t creationTime = 0;
+			std::string cluster;
+			int cityId = 0;
+
+			int const numRows = table->getNumRows();
+			int rowIndex = 0;
+
+			while (true)
+			{
+				if (rowIndex < numRows)
+				{
+					creationTime = static_cast<time_t>(table->getIntValue(columnCreationTime, rowIndex));
+					cluster = table->getStringValue(columnCluster, rowIndex);
+					cityId = table->getIntValue(columnCityId, rowIndex);
+
+					FATAL((cluster.empty()), ("cluster name is empty in %s, row %d", retroactivePlayerCityCreationTimeFilename.c_str(), (rowIndex+3)));
+					FATAL((cityId <= 0), ("city id for player city (%s, %d) is <= 0 in %s, row %d", cluster.c_str(), cityId, retroactivePlayerCityCreationTimeFilename.c_str(), (rowIndex+3)));
+					FATAL((creationTime <= 0), ("creation time (%d) for player city (%s, %d) is <= 0 in %s, row %d", creationTime, cluster.c_str(), cityId, retroactivePlayerCityCreationTimeFilename.c_str(), (rowIndex+3)));
+
+					++rowIndex;
+				}
+				else if (iterPlayerCityCreationTimeDataFromConfig == iterPlayerCityCreationTimeDataFromConfigEnd)
+				{
+					break;
+				}
+				else
+				{
+					playerCityCreationTimeDataFromConfigTokens.clear();
+					if ((Unicode::tokenize(Unicode::narrowToWide(*iterPlayerCityCreationTimeDataFromConfig), playerCityCreationTimeDataFromConfigTokens, &playerCityCreationTimeDataFromConfigDelimiter, NULL)) && (playerCityCreationTimeDataFromConfigTokens.size() == 3))
+					{
+						// sanity check
+						playerCityCreationTimeDataFromConfigParsedData = FormattedString<2048>().sprintf("%s|%s|%s", Unicode::wideToNarrow(playerCityCreationTimeDataFromConfigTokens[0]).c_str(), Unicode::wideToNarrow(playerCityCreationTimeDataFromConfigTokens[1]).c_str(), Unicode::wideToNarrow(playerCityCreationTimeDataFromConfigTokens[2]).c_str());
+						FATAL((playerCityCreationTimeDataFromConfigParsedData != *iterPlayerCityCreationTimeDataFromConfig), ("parsed player city creation time data (%s) does not equal read player city creation time data (%s)", playerCityCreationTimeDataFromConfigParsedData.c_str(), iterPlayerCityCreationTimeDataFromConfig->c_str()));
+
+						creationTime = static_cast<time_t>(::atol(Unicode::wideToNarrow(playerCityCreationTimeDataFromConfigTokens[0]).c_str()));
+						cluster = Unicode::wideToNarrow(playerCityCreationTimeDataFromConfigTokens[1]);
+						cityId = ::atoi(Unicode::wideToNarrow(playerCityCreationTimeDataFromConfigTokens[2]).c_str());
+
+						FATAL((cluster.empty()), ("cluster name is empty in config option (%s)", iterPlayerCityCreationTimeDataFromConfig->c_str()));
+						FATAL((cityId <= 0), ("city id for player city (%s, %d) is <= 0 in config option (%s)", cluster.c_str(), cityId, iterPlayerCityCreationTimeDataFromConfig->c_str()));
+						FATAL((creationTime <= 0), ("creation time (%d) for player city (%s, %d) is <= 0 in config option (%s)", creationTime, cluster.c_str(), cityId, iterPlayerCityCreationTimeDataFromConfig->c_str()));
+					}
+					else
+					{
+						FATAL(true, ("cannot parse player city creation time data (%s) read from config file", iterPlayerCityCreationTimeDataFromConfig->c_str()));
+					}
+
+					++iterPlayerCityCreationTimeDataFromConfig;
+				}
+
+				std::map<int, time_t> * clusterPlayerCityCreationTimeHistory = NULL;
+#ifdef _DEBUG
+				clusterPlayerCityCreationTimeHistory = &(s_retroactivePlayerCityCreationTime[cluster]);
+#else
+				// for release build, we only care about player cities created
+				// on our cluster cluster; for debug build, read them all so we
+				// can test out the logic to make sure it works for all clusters
+				if (cluster == GameServer::getInstance().getClusterName())
+					clusterPlayerCityCreationTimeHistory = &s_retroactivePlayerCityCreationTimeThisCluster;
+#endif
+				if (clusterPlayerCityCreationTimeHistory)
+				{
+					FATAL((clusterPlayerCityCreationTimeHistory->count(cityId) > 0), ("multiple entries found for player city (%s, %d)", cluster.c_str(), cityId));
+					(*clusterPlayerCityCreationTimeHistory)[cityId] = creationTime;
+				}
+			}
+
+			DataTableManager::close(retroactivePlayerCityCreationTimeFilename);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool GameServerNamespace::checkAndSetOutstandingRequestSceneTransfer(ServerObject & object)
+{
+	int const timeNow = static_cast<int>(::time(NULL));
+
+	// don't send multiple RequestSceneTransfer message
+	if (object.getObjVars().hasItem(OBJVAR_HAS_OUTSTANDING_REQUEST_SCENE_TRANSFER) && (object.getObjVars().getType(OBJVAR_HAS_OUTSTANDING_REQUEST_SCENE_TRANSFER) == DynamicVariable::INT))
+	{
+		int requestTimeOut = 0;
+		if (object.getObjVars().getItem(OBJVAR_HAS_OUTSTANDING_REQUEST_SCENE_TRANSFER, requestTimeOut))
+		{
+			if (timeNow <= requestTimeOut)
+			{
+				LOG("RequestSceneWarp", ("%s already has an outstanding RequestSceneTransfer that will expire in %d seconds", PlayerObject::getAccountDescription(&object).c_str(), (requestTimeOut - timeNow)));
+				return true;
+			}
+			else
+			{
+				LOG("RequestSceneWarp", ("%s has an expired RequestSceneTransfer, so we are allowing a new RequestSceneTransfer", PlayerObject::getAccountDescription(&object).c_str()));
+			}
+		}
+	}
+
+	IGNORE_RETURN(object.setObjVarItem(OBJVAR_HAS_OUTSTANDING_REQUEST_SCENE_TRANSFER, (timeNow + ConfigServerGame::getRequestSceneWarpTimeoutSeconds())));
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void GameServerNamespace::handleFactionalSystemMessage(FactionalSystemMessage const & msg)
+{
+	// is it a ranged message?
+	if (msg.getRadius() >= 0.0f)
+	{
+		TangibleObject * to;
+		std::vector<ServerObject *> playersInRange;
+		ServerWorld::findPlayerCreaturesInRange(msg.getLocation(), msg.getRadius(), playersInRange);
+		for (std::vector<ServerObject *>::const_iterator i = playersInRange.begin(); i != playersInRange.end(); ++i)
+		{
+			if ((*i)->isAuthoritative() && (*i)->getClient())
+			{
+				to = (*i)->asTangibleObject();
+				if (to &&
+					((msg.getNotifyImperial() && PvpData::isImperialFactionId(to->getPvpFaction())) ||
+					(msg.getNotifyRebel() && PvpData::isRebelFactionId(to->getPvpFaction()))
+					)
+					)
+				{
+					Chat::sendSystemMessage(**i, Unicode::String(), msg.getProsePackage());
+				}
+			}
+		}
+	}
+	else
+	{
+		// not a ranged message, everyone gets it
+		std::set<PlayerObject const *> const &players = PlayerObject::getAllPlayerObjects();
+		if (!players.empty())
+		{
+			CreatureObject const * creatureObject;
+			for (std::set<PlayerObject const *>::const_iterator i = players.begin(); i != players.end(); ++i)
+			{
+				creatureObject = (*i)->getCreatureObject();
+				if (creatureObject && creatureObject->isAuthoritative() && creatureObject->getClient())
+				{
+					if ((msg.getNotifyImperial() && PvpData::isImperialFactionId(creatureObject->getPvpFaction())) ||
+						(msg.getNotifyRebel() && PvpData::isRebelFactionId(creatureObject->getPvpFaction()))
+						)
+					{
+						Chat::sendSystemMessage(*creatureObject, Unicode::String(), msg.getProsePackage());
+					}
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GameServerNamespace::handleMessageToPlayersOnPlanet(std::string const & methodName, std::vector<int8> const & params, float const delay, Vector const & loc, float const radius, bool const includeDisconnectedPlayers)
+{
+	// we cannot use ServerWorld::findPlayerCreaturesInRange() because that only looks at creatures
+	// that are in the world, and disconnected players creatures are removed from the world
+	std::set<PlayerObject const *> const &players = PlayerObject::getAllPlayerObjects();
+	if (!players.empty())
+	{
+		float const radiusSquared = sqr(radius);
+		CreatureObject const * creatureObject;
+		for (std::set<PlayerObject const *>::const_iterator i = players.begin(); i != players.end(); ++i)
+		{
+			creatureObject = (*i)->getCreatureObject();
+			if (creatureObject && creatureObject->isAuthoritative() && (includeDisconnectedPlayers || creatureObject->getClient()))
+			{
+				// check range, if necessary
+				if ((radius < 0.0f) || (loc.magnitudeBetweenSquared(creatureObject->getPosition_w()) < radiusSquared))
+				{
+					MessageToQueue::getInstance().sendMessageToJava(creatureObject->getNetworkId(), methodName, params, static_cast<int>(delay), false);
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GameServerNamespace::handleMessageLocateStructureByOwnerIdReq(GameServer & gsInstance, uint32 responsePid, bool isGod, NetworkId const & ownerId, NetworkId const & ownerResidenceId, NetworkId const & responseId)
+{
+	static std::string const planetName(ServerWorld::getSceneId());
+	static std::string const displayPlanetName(Unicode::wideToNarrow(StringId("planet_n", planetName).localize()));
+	std::vector<std::string> response;
+
+	// buildings
+	{
+		BuildingObject::AllBuildingsSet const & allBuildings = BuildingObject::getAllBuildings();
+		for (BuildingObject::AllBuildingsSet::const_iterator iterBuilding = allBuildings.begin(); iterBuilding != allBuildings.end(); ++iterBuilding)
+		{
+			if ((*iterBuilding)->isAuthoritative() && ((*iterBuilding)->getOwnerId() == ownerId) && (*iterBuilding)->isInWorldCell())
+			{
+				// player assigned name
+				std::string name = Unicode::wideToNarrow((*iterBuilding)->getAssignedObjectName());
+
+				// buildings have their name in the sign
+				if (name.empty() && (*iterBuilding)->getObjVars().hasItem("player_structure.sign.name") && ((*iterBuilding)->getObjVars().getType("player_structure.sign.name") == DynamicVariable::STRING))
+					IGNORE_RETURN((*iterBuilding)->getObjVars().getItem("player_structure.sign.name", name));
+
+				// default/type name
+				Unicode::String nameTypeWide;
+				std::string nameTypeNarrow = "Building";
+				if ((*iterBuilding)->getObjectNameStringId().localize(nameTypeWide))
+					nameTypeNarrow = Unicode::wideToNarrow(nameTypeWide);
+
+				if (!name.empty())
+				{
+					if (name != nameTypeNarrow)
+					{
+						name += " (";
+						name += nameTypeNarrow;
+						name += ")";
+					}
+				}
+				else
+				{
+					name = nameTypeNarrow;
+				}
+
+				// check for residence building
+				NetworkId residenceOf;
+				if ((*iterBuilding)->getObjVars().getItem("player_structure.residence.building", residenceOf) && (residenceOf == ownerId))
+				{					
+					if (ownerId == responseId)
+					{
+						if (ownerResidenceId == (*iterBuilding)->getNetworkId())
+						{
+							name += " (residence)";
+						}
+						else
+						{
+							// house thinks it's the residence of the owner, but owner doesn't think so,
+							// so fix up house so it no longer thinks it's the residence of the owner
+							(const_cast<BuildingObject *>(*iterBuilding))->removeObjVarItem("player_structure.residence.building");
+						}
+					}
+					else
+					{
+						name += " (residence)";
+					}
+				}
+
+				Vector const loc = (*iterBuilding)->findPosition_w();
+				std::string cityAndPlanetName;
+				int const cityId = CityInterface::getCityAtLocation(planetName, static_cast<int>(loc.x), static_cast<int>(loc.z), 0);
+				if (cityId > 0)
+					cityAndPlanetName = CityInterface::getCityInfo(cityId).getCityName();
+
+				if (!cityAndPlanetName.empty())
+					cityAndPlanetName += ", ";
+
+				cityAndPlanetName += displayPlanetName;
+
+				Region const * const region = RegionMaster::getSmallestVisibleRegionAtPoint(planetName, loc.x, loc.z);
+				if (region)
+				{
+					cityAndPlanetName += ":";
+					cityAndPlanetName += Unicode::wideToNarrow(StringId::decodeString(region->getName()));
+				}
+
+				if (!isGod)
+					response.push_back(FormattedString<1024>().sprintf("%s at %s (%d, %d)", name.c_str(), cityAndPlanetName.c_str(), static_cast<int>(loc.x), static_cast<int>(loc.z)));
+				else
+					response.push_back(FormattedString<1024>().sprintf("%s, %s at %s (%d, %d)", (*iterBuilding)->getNetworkId().getValueString().c_str(), name.c_str(), cityAndPlanetName.c_str(), static_cast<int>(loc.x), static_cast<int>(loc.z)));
+			}
+		}
+	}
+
+	// installations, including harvesters and factories
+	{
+		InstallationObject::AllInstallationsSet const & allInstallations = InstallationObject::getAllInstallations();
+		for (ManufactureInstallationObject::AllInstallationsSet::const_iterator iterInstallation = allInstallations.begin(); iterInstallation != allInstallations.end(); ++iterInstallation)
+		{
+			if ((*iterInstallation)->isAuthoritative() && ((*iterInstallation)->getOwnerId() == ownerId) && (*iterInstallation)->isInWorldCell())
+			{
+				// player assigned name
+				std::string name = Unicode::wideToNarrow((*iterInstallation)->getAssignedObjectName());
+
+				// default/type name
+				Unicode::String nameTypeWide;
+				std::string nameTypeNarrow;
+				if ((*iterInstallation)->getObjectNameStringId().localize(nameTypeWide))
+					nameTypeNarrow = Unicode::wideToNarrow(nameTypeWide);
+				else if (dynamic_cast<const HarvesterInstallationObject *>(*iterInstallation))
+					nameTypeNarrow = "Harvester";
+				else if (dynamic_cast<const ManufactureInstallationObject *>(*iterInstallation))
+					nameTypeNarrow = "Factory";
+				else
+					nameTypeNarrow = "Installation";
+
+				if (!name.empty())
+				{
+					if (name != nameTypeNarrow)
+					{
+						name += " (";
+						name += nameTypeNarrow;
+						name += ")";
+					}
+				}
+				else
+				{
+					name = nameTypeNarrow;
+				}
+
+				Vector const loc = (*iterInstallation)->findPosition_w();
+				std::string cityAndPlanetName;
+				int const cityId = CityInterface::getCityAtLocation(planetName, static_cast<int>(loc.x), static_cast<int>(loc.z), 0);
+				if (cityId > 0)
+					cityAndPlanetName = CityInterface::getCityInfo(cityId).getCityName();
+
+				if (!cityAndPlanetName.empty())
+					cityAndPlanetName += ", ";
+
+				cityAndPlanetName += displayPlanetName;
+
+				Region const * const region = RegionMaster::getSmallestVisibleRegionAtPoint(planetName, loc.x, loc.z);
+				if (region)
+				{
+					cityAndPlanetName += ":";
+					cityAndPlanetName += Unicode::wideToNarrow(StringId::decodeString(region->getName()));
+				}
+
+				if (!isGod)
+					response.push_back(FormattedString<1024>().sprintf("%s at %s (%d, %d)", name.c_str(), cityAndPlanetName.c_str(), static_cast<int>(loc.x), static_cast<int>(loc.z)));
+				else
+					response.push_back(FormattedString<1024>().sprintf("%s, %s at %s (%d, %d)", (*iterInstallation)->getNetworkId().getValueString().c_str(), name.c_str(), cityAndPlanetName.c_str(), static_cast<int>(loc.x), static_cast<int>(loc.z)));
+			}
+		}
+	}
+
+	// if there are any matches, send reply
+	if (!response.empty())
+	{
+		GenericValueTypeMessage<std::pair<std::pair<uint32, NetworkId>, std::vector<std::string> > > locateStructureByOwnerIdRsp("LSBOIRsp", std::make_pair(std::make_pair(responsePid, responseId), response));
+		gsInstance.sendToCentralServer(locateStructureByOwnerIdRsp);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GameServerNamespace::handleMessageLocateStructureByOwnerIdRsp(NetworkId const & responseId, std::vector<std::string> const & response)
+{
+	if (response.empty())
+		return;
+
+	ServerObject const * const object = ServerWorld::findObjectByNetworkId(responseId);
+	if (!object)
+		return;
+
+	Client * const clientObj = object->getClient();
+	if (!clientObj)
+		return;
+
+	for (std::vector<std::string>::const_iterator iter = response.begin(); iter != response.end(); ++iter)
+		ConsoleMgr::broadcastString(*iter, clientObj);
+}
+
+// ----------------------------------------------------------------------
+
+void GameServerNamespace::handleAdjustAccountFeatureIdResponse(AdjustAccountFeatureIdResponse const & msg)
+{
+	Archive::ByteStream bs;
+	msg.pack(bs);
+
+	if (msg.getRequestingPlayer().isValid())
+	{
+		MessageToQueue::getInstance().sendMessageToC(msg.getRequestingPlayer(),
+			"C++AdjustAccountFeatureIdResponse",
+			std::string(reinterpret_cast<const char *>(bs.getBuffer()), static_cast<size_t>(bs.getSize())),
+			0,
+			false);
+	}
+
+	if (msg.getTargetPlayer().isValid() && (msg.getTargetPlayer() != msg.getRequestingPlayer()))
+	{
+		MessageToQueue::getInstance().sendMessageToC(msg.getTargetPlayer(),
+			"C++AdjustAccountFeatureIdResponse",
+			std::string(reinterpret_cast<const char *>(bs.getBuffer()), static_cast<size_t>(bs.getSize())),
+			0,
+			false);
+	}
+
+	if (msg.getTargetItem().isValid() && (msg.getTargetItem() != msg.getRequestingPlayer()) && (msg.getTargetItem() != msg.getTargetPlayer()))
+	{
+		MessageToQueue::getInstance().sendMessageToC(msg.getTargetItem(),
+			"C++AdjustAccountFeatureIdResponse",
+			std::string(reinterpret_cast<const char *>(bs.getBuffer()), static_cast<size_t>(bs.getSize())),
+			0,
+			false);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GameServerNamespace::handleAccountFeatureIdResponse(AccountFeatureIdResponse const & msg)
+{
+	// this message may arrive before the Client object has been attached
+	// to the character object, or even before we have loaded the character
+	// object into the game, so we'll just directly search for the Client
+	// object associated with the character object and update the information
+	bool needToNotifyRequester = (((msg.getRequestReason() == AccountFeatureIdRequest::RR_ConsoleCommandReloadRequest) || (msg.getRequestReason() == AccountFeatureIdRequest::RR_ReloadRewardCheck)) && msg.getRequester().isValid());
+
+	if (msg.getResultCode() == RESULT_SUCCESS)
+	{
+		Client * client = GameServer::getInstance().getClient(msg.getTarget());
+		if (client)
+		{
+			if (msg.getGameCode() == PlatformGameCode::SWG)
+				client->setAccountFeatureIds(msg.getFeatureIds());
+		}
+		else
+		{
+			// character object may have moved to a different game server,
+			// so forward the message to the character object for handling
+			Archive::ByteStream bs;
+			msg.pack(bs);
+
+			MessageToQueue::getInstance().sendMessageToC(msg.getTarget(),
+				"C++AccountFeatureIdResponse",
+				std::string(reinterpret_cast<const char *>(bs.getBuffer()), static_cast<size_t>(bs.getSize())),
+				0,
+				false);
+
+			// don't need to send another messageTo to the requester
+			if (needToNotifyRequester && (msg.getRequester() == msg.getTarget()))
+				needToNotifyRequester = false;
+		}
+	}
+
+	if (needToNotifyRequester)
+	{
+		Archive::ByteStream bs;
+		msg.pack(bs);
+
+		MessageToQueue::getInstance().sendMessageToC(msg.getRequester(),
+			"C++AccountFeatureIdResponse",
+			std::string(reinterpret_cast<const char *>(bs.getBuffer()), static_cast<size_t>(bs.getSize())),
+			0,
+			false);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+std::string GameServer::getRetroactiveCtsHistory(std::string const & clusterName, NetworkId const & characterId)
+{
+	std::string result;
+	std::map<NetworkId, std::vector<CtsSourceCharacterInfo> > const * clusterCtsHistory = NULL;
+
+#ifdef _DEBUG
+	std::map<std::string, std::map<NetworkId, std::vector<CtsSourceCharacterInfo> > >::const_iterator const iterFindCluster = s_retroactiveCtsHistoryList.find(clusterName);
+	if (iterFindCluster != s_retroactiveCtsHistoryList.end())
+		clusterCtsHistory = &(iterFindCluster->second);
+#else
+	if (clusterName == GameServer::getInstance().getClusterName())
+		clusterCtsHistory = &s_retroactiveCtsHistoryListThisCluster;
+#endif
+
+	if (!clusterCtsHistory)
+		return result;
+
+	std::map<NetworkId, std::vector<CtsSourceCharacterInfo> >::const_iterator const iterFindCharacter = clusterCtsHistory->find(characterId);
+	if (iterFindCharacter == clusterCtsHistory->end())
+		return result;
+
+	int count = 0;
+	for (std::vector<CtsSourceCharacterInfo>::const_reverse_iterator iterCtsHistory = iterFindCharacter->second.rbegin(); iterCtsHistory != iterFindCharacter->second.rend(); ++iterCtsHistory)
+	{
+		if (!result.empty())
+			result += "\n";
+
+		++count;
+
+		if (iterCtsHistory->sourceCharacterBornDate <= 0)
+			result += FormattedString<1024>().sprintf("%2d) transferred from (%s, %s, %s) on (%ld, %s)", count, iterCtsHistory->sourceCluster.c_str(), iterCtsHistory->sourceCharacterName.c_str(), iterCtsHistory->sourceCharacterId.getValueString().c_str(), iterCtsHistory->transferTime, CalendarTime::convertEpochToTimeStringLocal(iterCtsHistory->transferTime).c_str());
+		else
+			result += FormattedString<1024>().sprintf("%2d) transferred from (%s, %s, %s, born date=%d, %s) on (%ld, %s)", count, iterCtsHistory->sourceCluster.c_str(), iterCtsHistory->sourceCharacterName.c_str(), iterCtsHistory->sourceCharacterId.getValueString().c_str(), iterCtsHistory->sourceCharacterBornDate, CalendarTime::getCharacerBirthDateString(iterCtsHistory->sourceCharacterBornDate).c_str(), iterCtsHistory->transferTime, CalendarTime::convertEpochToTimeStringLocal(iterCtsHistory->transferTime).c_str());
+
+		for (std::vector<std::pair<std::string, DynamicVariable> >::const_iterator iterRetroactiveObjvar = iterCtsHistory->sourceCharacterRetroactiveObjvars.begin(); iterRetroactiveObjvar != iterCtsHistory->sourceCharacterRetroactiveObjvars.end(); ++iterRetroactiveObjvar)
+			result += FormattedString<1024>().sprintf("\n\t(%s, %s)", iterRetroactiveObjvar->first.c_str(), Unicode::wideToNarrow(iterRetroactiveObjvar->second.getPackedValueString()).c_str());
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+void GameServer::setRetroactiveCtsHistory(CreatureObject & player)
+{
+	if (!player.isAuthoritative())
+		return;
+
+	if (player.getObjVars().hasItem("ctsHistory"))
+		return;
+
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(&player);
+	if (!playerObject)
+		return;
+
+	if (!playerObject->isAuthoritative())
+		return;
+
+	std::map<NetworkId, std::vector<CtsSourceCharacterInfo> > const * clusterCtsHistory = NULL;
+
+#ifdef _DEBUG
+	std::map<std::string, std::map<NetworkId, std::vector<CtsSourceCharacterInfo> > >::const_iterator const iterFindCluster = s_retroactiveCtsHistoryList.find(GameServer::getInstance().getClusterName());
+	if (iterFindCluster != s_retroactiveCtsHistoryList.end())
+		clusterCtsHistory = &(iterFindCluster->second);
+#else
+	clusterCtsHistory = &s_retroactiveCtsHistoryListThisCluster;
+#endif
+
+	if (!clusterCtsHistory)
+		return;
+
+	std::map<NetworkId, std::vector<CtsSourceCharacterInfo> >::const_iterator const iterFindCharacter = clusterCtsHistory->find(player.getNetworkId());
+	if (iterFindCharacter == clusterCtsHistory->end())
+		return;
+
+	int count = 0;
+	int rootSourceCharacterBornDate = 0;
+	std::vector<std::string> ctsSourceGalaxies;
+	for (std::vector<CtsSourceCharacterInfo>::const_reverse_iterator iterCtsHistory = iterFindCharacter->second.rbegin(); iterCtsHistory != iterFindCharacter->second.rend(); ++iterCtsHistory)
+	{
+		++count;
+		LOG("CustomerService", ("CharacterTransferRetroactiveHistory: %s, setting objvar ctsHistory.%d = \"%ld %s %s %s\", transfer time (%s)", playerObject->getAccountDescription().c_str(), count, iterCtsHistory->transferTime, iterCtsHistory->sourceCluster.c_str(), iterCtsHistory->sourceCharacterId.getValueString().c_str(), iterCtsHistory->sourceCharacterName.c_str(), CalendarTime::convertEpochToTimeStringLocal(iterCtsHistory->transferTime).c_str()));
+		IGNORE_RETURN(player.setObjVarItem(FormattedString<1024>().sprintf("ctsHistory.%d", count), FormattedString<1024>().sprintf("%ld %s %s %s", iterCtsHistory->transferTime, iterCtsHistory->sourceCluster.c_str(), iterCtsHistory->sourceCharacterId.getValueString().c_str(), iterCtsHistory->sourceCharacterName.c_str())));
+
+		if (iterCtsHistory->sourceCharacterBornDate > 0)
+		{
+			if ((rootSourceCharacterBornDate == 0) || (iterCtsHistory->sourceCharacterBornDate < rootSourceCharacterBornDate))
+				rootSourceCharacterBornDate = iterCtsHistory->sourceCharacterBornDate;
+		}
+
+		ctsSourceGalaxies.push_back(iterCtsHistory->sourceCluster);
+	}
+
+	if (rootSourceCharacterBornDate > 0)
+	{
+		// initialize the character's born date, if necessary
+		playerObject->setBornDate();
+
+		// fix up the character's born date, but only if the "fixup" date is earlier than the current date
+		int const characterBornDate = playerObject->getBornDate();
+		if (rootSourceCharacterBornDate < characterBornDate)
+		{
+			playerObject->adjustBornDate(rootSourceCharacterBornDate - characterBornDate);
+			LOG("CustomerService", ("CharacterTransferRetroactiveHistory: %s, fixing born date from (%d, %s) to (%d, %s)", playerObject->getAccountDescription().c_str(), characterBornDate, CalendarTime::getCharacerBirthDateString(characterBornDate).c_str(), rootSourceCharacterBornDate, CalendarTime::getCharacerBirthDateString(rootSourceCharacterBornDate).c_str()));
+
+			// send mail to player notifying of born date change
+			Chat::sendPersistentMessage("system", Unicode::wideToNarrow(Unicode::toLower(player.getAssignedObjectFirstName())), Unicode::narrowToWide("Birth Date Fixup"), Unicode::narrowToWide(FormattedString<1024>().sprintf("This character's birth date has been adjusted from %s to %s.", CalendarTime::getCharacerBirthDateString(characterBornDate).c_str(), CalendarTime::getCharacerBirthDateString(rootSourceCharacterBornDate).c_str())), Unicode::emptyString);
+		}
+	}
+
+	// grant CTS titles for transfers that occurred between different galaxies
+	if (!ctsSourceGalaxies.empty())
+	{
+		ctsSourceGalaxies.push_back(GameServer::getInstance().getClusterName());
+		for (size_t i = 0, stopIndex = (ctsSourceGalaxies.size() - 2); i <= stopIndex; ++i)
+		{
+			if (ctsSourceGalaxies[i] != ctsSourceGalaxies[i+1])
+			{
+				// lower case source cluster name and replace
+				// - with _ for use to grant CTS title
+				std::string collectionSlotName = std::string("cts_from_") + Unicode::toLower(ctsSourceGalaxies[i]);
+
+				std::string::size_type pos = collectionSlotName.find('-');
+				while (pos != std::string::npos)
+				{
+					collectionSlotName.replace(pos, 1, 1, '_');
+					pos = collectionSlotName.find('-');
+				}
+
+				CollectionsDataTable::CollectionInfoSlot const * collectionSlot = CollectionsDataTable::getSlotByName(collectionSlotName);
+				if (collectionSlot && !playerObject->hasCompletedCollectionSlot(*collectionSlot))
+				{
+					LOG("CustomerService", ("CharacterTransferRetroactiveHistory: %s, granting CTS title %s", playerObject->getAccountDescription().c_str(), collectionSlotName.c_str()));	
+					IGNORE_RETURN(playerObject->modifyCollectionSlotValue(collectionSlotName, 1ll));
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<std::vector<std::pair<std::string, DynamicVariable> > const *> const & GameServer::getRetroactiveCtsHistoryObjvars(NetworkId const & characterId)
+{
+	static std::vector<std::vector<std::pair<std::string, DynamicVariable> > const *> returnValue;
+	returnValue.clear();
+
+	std::map<NetworkId, std::vector<CtsSourceCharacterInfo> > const * clusterCtsHistory = NULL;
+
+#ifdef _DEBUG
+	std::map<std::string, std::map<NetworkId, std::vector<CtsSourceCharacterInfo> > >::const_iterator const iterFindCluster = s_retroactiveCtsHistoryList.find(GameServer::getInstance().getClusterName());
+	if (iterFindCluster != s_retroactiveCtsHistoryList.end())
+		clusterCtsHistory = &(iterFindCluster->second);
+#else
+	clusterCtsHistory = &s_retroactiveCtsHistoryListThisCluster;
+#endif
+
+	if (!clusterCtsHistory)
+		return returnValue;
+
+	std::map<NetworkId, std::vector<CtsSourceCharacterInfo> >::const_iterator const iterFindCharacter = clusterCtsHistory->find(characterId);
+	if (iterFindCharacter == clusterCtsHistory->end())
+		return returnValue;
+
+	int numberOfNonEmptyVectorsReturned = 0;
+	for (std::vector<CtsSourceCharacterInfo>::const_reverse_iterator iterCtsHistory = iterFindCharacter->second.rbegin(); iterCtsHistory != iterFindCharacter->second.rend(); ++iterCtsHistory)
+	{
+		returnValue.push_back(&(iterCtsHistory->sourceCharacterRetroactiveObjvars));
+
+		if (!iterCtsHistory->sourceCharacterRetroactiveObjvars.empty())
+		{
+			++numberOfNonEmptyVectorsReturned;
+		}
+	}
+
+	if (numberOfNonEmptyVectorsReturned == 0)
+		returnValue.clear();
+
+	return returnValue;
+}
+
+// ----------------------------------------------------------------------
+
+time_t GameServer::getRetroactivePlayerCityCreationTime(std::string const & clusterName, int cityId)
+{
+	std::map<int, time_t> const * clusterPlayerCityCreationTimeHistory = NULL;
+
+#ifdef _DEBUG
+	std::map<std::string, std::map<int, time_t> >::const_iterator const iterFindCluster = s_retroactivePlayerCityCreationTime.find(clusterName);
+	if (iterFindCluster != s_retroactivePlayerCityCreationTime.end())
+		clusterPlayerCityCreationTimeHistory = &(iterFindCluster->second);
+#else
+	if (clusterName == GameServer::getInstance().getClusterName())
+		clusterPlayerCityCreationTimeHistory = &s_retroactivePlayerCityCreationTimeThisCluster;
+#endif
+
+	if (!clusterPlayerCityCreationTimeHistory)
+		return -1;
+
+	std::map<int, time_t>::const_iterator const iterFindCity = clusterPlayerCityCreationTimeHistory->find(cityId);
+	if (iterFindCity != clusterPlayerCityCreationTimeHistory->end())
+		return iterFindCity->second;
+
+	return -1;
+}
+
+// ----------------------------------------------------------------------
+
+int GameServer::getServerSpawnLimit()
+{
+	static int serverSpawnLimit = -1;
+
+	if (GameServer::getInstance().getPreloadAreaId() == 0)
+	{
+		return ConfigServerGame::getServerSpawnLimit();
+	}
+
+	if (serverSpawnLimit == -1)
+	{
+		serverSpawnLimit = ConfigServerGame::getServerSpawnLimit();
+
+		// see if there's a spawn limit set for this particular game server
+		char key[128];
+		snprintf(key, sizeof(key)-1, "serverSpawnLimit_%s.%lu", ServerWorld::getSceneId().c_str(), GameServer::getInstance().getPreloadAreaId());
+		key[sizeof(key)-1] = '\0';
+
+		if (getConfigSetting("GameServer", key, serverSpawnLimit))
+			return serverSpawnLimit;
+
+		// see if there's a spawn limit set for this particular planet
+		snprintf(key, sizeof(key)-1, "serverSpawnLimit_%s", ServerWorld::getSceneId().c_str());
+		key[sizeof(key)-1] = '\0';
+
+		if (getConfigSetting("GameServer", key, serverSpawnLimit))
+			return serverSpawnLimit;
+
+		// use default server spawn limit
+		serverSpawnLimit = ConfigServerGame::getServerSpawnLimit();
+	}
+
+	return serverSpawnLimit;
+}
+
+// ----------------------------------------------------------------------
+
+#ifdef _DEBUG
+void GameServer::setExtraDelayPerFrameMs(int ms) // to emulate long loop time
+{
+	s_extraDelayPerFrameMs = ms;
+}
+#endif
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/GameServer.h b/engine/server/library/serverGame/src/shared/core/GameServer.h
new file mode 100644
index 00000000..ca44785d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/GameServer.h
@@ -0,0 +1,319 @@
+// GameServer.h
+// copyright 2000 Verant Interactive
+// Author: Justin Randall
+
+#ifndef	_GAME_SERVER_H
+#define	_GAME_SERVER_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/ByteStream.h"
+#include "serverGame/ProxyList.h"
+#include "sharedMessageDispatch/Receiver.h"
+#include "sharedFoundation/NetworkId.h"
+
+class CachedNetworkId;
+class CentralCreateCharacter;
+class CentralServerConnection;
+class ChatServerConnection;
+class ConnectionServerConnection;
+class Client;
+class CreatureObject;
+class CustomerServiceServerConnection;
+class DatabaseProcessConnection;
+class DynamicVariable;
+class EnableNewJediTrackingMessage;
+class GameNetworkMessage;
+class GameServerCSRequestMessage;
+class GameServerMetricsData;
+class MessageToPayload;
+class NameGenerator;
+class NetworkId;
+class ObjectList;
+class PlanetServerConnection;
+class PopulationList;
+class RandomNameRequest;
+class ReloadAdminTableMessage;
+class ReloadCommandTableMessage;
+class ReloadDatatableMessage;
+class ReloadScriptMessage;
+class ReloadTemplateMessage;
+class RetrievedItemLoadMessage;
+class ServerCreatureObjectTemplate;
+class ServerObject;
+class ServerWorld;
+class Service;
+class SetMessageToBacklogThreshold;
+class SetMessageToTimeLimitMessage;
+class StringId;
+class TaskManagerConnection;
+class TeleportMessage;
+class Vector;
+class VerifyNameResponse;
+class VerifyAndLockNameRequest;
+
+namespace MessageDispatch {
+	class Callback;
+}
+
+//-----------------------------------------------------------------------
+
+class GameServer : 
+public MessageDispatch::Receiver
+{
+public:
+	typedef stdhash_map<NetworkId, Client *, NetworkId::Hash>::fwd ClientMap;
+	typedef stdvector<ConnectionServerConnection *>::fwd           ConnectionServerVector;
+
+	virtual ~GameServer ();
+
+	static GameServer &          getInstance ();
+	static void                  install     ();
+	static void                  remove      ();
+
+	bool                         getDone                       ();
+	void                         connectToDatabaseProcess      (std::string const &address, uint16 port, uint32 processId);
+	void                         createRemoteProxy             (uint32 remoteProcessId, ServerObject *object);
+	void                         createProxyOnAllServers       (ServerObject* object);
+	void                         deliverMessageToClientObject  (const NetworkId &oid, const Archive::ByteStream & message);
+	void                         spamAllClients                (const GameNetworkMessage & message, const bool reliable) const;
+	void                         dropClient(const NetworkId &oid);
+	void                         dropClient(const NetworkId &oid, bool const immediate);
+	const Service *	             getClientService              () const;
+	uint32                       getDatabaseProcessId          () const;
+	Client *                     getClient                     (const NetworkId& networkId);
+	const std::string &          getClusterName                () const;
+	uint8                        getClusterId                  () const;
+	bool                         isGameServerConnected         (uint32 processId) const;
+	ConnectionServerConnection * getConnectionServerConnection (const std::string & connectionServerIp, const uint16 connectionServerPort);
+	uint32                       getFirstGameServerForPlanet   ();
+	unsigned long                getFrameTime                  () const;
+	int                          getNumClients() const;
+	uint32                       getProcessId                  () const;
+	uint32                       getPreloadAreaId              () const;
+	virtual void                 receiveMessage                (const MessageDispatch::Emitter & source, const MessageDispatch::MessageBase & message);
+	bool                         requestSceneWarp              (const CachedNetworkId &objectId, const std::string &sceneName, const Vector &newPosition_w, const NetworkId &newContainer, const Vector &newPosition_p, const char * scriptCallback = NULL, bool forceLoadScreen = false);
+	bool                         requestSceneWarp              (const CachedNetworkId &objectId, const std::string &sceneName, const Vector &newPosition_w, const NetworkId &newBuilding, const std::string &newCellName, const Vector &newPosition_p, const char * scriptCallback = NULL, bool forceLoadScreen = false);
+	bool                         requestSceneWarpDelayed       (const CachedNetworkId &objectId, const std::string &sceneName, const Vector &newPosition_w, const NetworkId &newContainer, const Vector &newPosition_p, float delayTime, const char * scriptCallback = NULL, bool forceLoadScreen = false);
+	bool                         requestSceneWarpDelayed       (const CachedNetworkId &objectId, const std::string &sceneName, const Vector &newPosition_w, const NetworkId &newBuilding, const std::string &newCellName, const Vector &newPosition_p, float delayTime, const char * scriptCallback = NULL, bool forceLoadScreen = false);
+	
+	static void                  run                           ();
+	void                         sendToCentralServer           (GameNetworkMessage const &message);
+	void                         sendToDatabaseServer          (GameNetworkMessage const &message);
+	void                         sendToPlanetServer            (GameNetworkMessage const &message);
+	void                         sendToConnectionServers       (GameNetworkMessage const &message);
+	void                         sendToCustomerServiceServer   (GameNetworkMessage const &message);
+	void                         clearCustomerServiceServerConnection();
+	void                         setCentralServerConnection    (CentralServerConnection *newCentralServerConnection);
+	void                         setDatabaseProcessConnection  (DatabaseProcessConnection *newDatabaseProcessConnection);
+	void                         setDone                       (char const *reason, ...);
+	void                         setProcessId                  (uint32 newProcessId);
+	void                         onDatabaseProcessConnectionEstablished();
+	void                         onPlanetServerConnectionEstablished ();
+	void                         onReceivedFirstNetworkIdBlock       ();
+	
+	const std::string &          getCommandLine() const;
+	void                         setCommandLine(const std::string &);
+	
+	void                         loadTerrain ();
+
+	stdvector<uint32>::fwd const &getAllGameServerPids() const;
+	bool                         hasConnectionsToOtherGameServers() const;
+
+	void                         getObjectsWithClients(stdvector<ServerObject *>::fwd &objects) const;
+
+	static uint64                getTotalObjectCreatesReceived();
+	static uint64                getTotalObjectCreatesSent();
+	static void                  incrementTotalObjectCreatesSent();
+
+	static void                  reportClusterStartupResidenceStructure(int cityId, const NetworkId & structureId, const NetworkId & ownerId);
+	static void                  reportBuildingObjectDestroyed(const NetworkId & structureId);
+
+	bool                         isPlanetEnabledForCluster(std::string const &sceneName) const;
+	
+	virtual void                 handleCSRequest( GameServerCSRequestMessage & request );
+
+	static bool                  addPendingLoadRequest(NetworkId const & id);
+	static void                  removePendingLoadRequest(NetworkId const & id);
+	static bool                  isAtPendingLoadRequestLimit();
+	static int                   getPendingLoadRequestLimit();
+	static int                   getNumberOfPendingLoadRequests();
+	static unsigned long         getOldestPendingLoadRequestTime(NetworkId & id);
+
+	static std::string           getRetroactiveCtsHistory(std::string const & clusterName, NetworkId const & characterId);
+	static std::vector<std::vector<std::pair<std::string, DynamicVariable> > const *> const & getRetroactiveCtsHistoryObjvars(NetworkId const & characterId);
+	static void                  setRetroactiveCtsHistory(CreatureObject & player);
+
+	static time_t                getRetroactivePlayerCityCreationTime(std::string const & clusterName, int cityId);
+
+	static int                   getServerSpawnLimit();
+
+#ifdef _DEBUG
+	static void                  setExtraDelayPerFrameMs(int ms); // to emulate long loop time
+#endif
+
+	const StringId               handleVerifyAndLockNameRequest(const VerifyAndLockNameRequest &request, bool sendFailedResponseToCentralServer, bool verifyAgainstDb);
+
+protected:
+	             GameServer ();
+	virtual void initialize ();
+	virtual void shutdown   ();
+
+protected:
+	static GameServer * ms_instance;
+	
+private:
+	GameServer                    (const GameServer & source);
+	GameServer &  operator =      (const GameServer & rhs);
+	void          debugIO         ();
+	
+private:
+	void                         gameServerReady               ();
+	void                         checkWhetherGameServerIsReady ();
+	void                         handleTeleportMessage         (TeleportMessage const &message);
+	void                         handleRetrievedItemLoadMessage(RetrievedItemLoadMessage const &message);
+	void                         handleReloadAdminTableMessage (ReloadAdminTableMessage const &message);
+	void                         handleReloadCommandTableMessage(ReloadCommandTableMessage const &message);
+	void                         handleReloadDatatableMessage  (ReloadDatatableMessage const &message);
+	void                         handleReloadScriptMessage     (ReloadScriptMessage const &message);
+	void                         handleReloadTemplateMessage   (ReloadTemplateMessage const &message);
+	void                         handleEnableNewJediTrackingMessage(EnableNewJediTrackingMessage const &message);
+	void                         checkIdleClients              (float time);
+	void                         receiveMessage2               (const MessageDispatch::Emitter & source, const MessageDispatch::MessageBase & message);
+	
+private:
+	//-----------------------------------------------------------------------
+	//	maps
+	
+	typedef stdmap<NetworkId, stdvector<NetworkId>::fwd >::fwd     PendingContainedObjectsMap;
+	typedef stdmap<uint32, const CentralCreateCharacter *>::fwd    CharactersPendingCreationMap;
+
+	bool                            m_done;
+	uint32                          m_processId;
+	uint32                          m_preloadAreaId;
+	uint32                          m_databaseProcessId;
+	std::vector<uint32>             m_gameServerPids;
+	CentralServerConnection *       m_centralService;
+	CentralServerConnection *       m_centralServerConnection;
+	CustomerServiceServerConnection *m_customerServiceServerConnection;
+	ConnectionServerVector *        m_connectionServerVector;
+	PlanetServerConnection *        m_planetServerConnection;
+	DatabaseProcessConnection *     m_databaseProcessConnection;
+	DatabaseProcessConnection *     m_pendingDatabaseProcessConnection;
+	TaskManagerConnection *         m_taskManagerConnection;    
+	ClientMap *                     m_clients;
+	Service *                       m_clientService;
+	std::string                     m_clusterName;
+	uint8                           m_clusterId;
+	uint32                          m_firstGameServerForPlanet;
+	
+
+	PendingContainedObjectsMap *                       m_pendingContainedObjects;
+	CharactersPendingCreationMap *                     m_charactersPendingCreation;
+
+	GameServerMetricsData *         m_metricsData;
+	std::string                     m_commandLine;
+	
+	// name generation and validation ----------------------------------
+	const StringId                  verifyCharacterName(const ServerCreatureObjectTemplate &serverTemplate, const Unicode::String &name, bool forPlayer) const; 
+	const StringId                  verifyCharacterName(const std::string &serverTemplate, const Unicode::String &name, bool forPlayer) const; 
+	const ServerCreatureObjectTemplate * getServerCreatureObjectTemplate(const std::string &name) const;
+	void                            handleCreateCharacter(const CentralCreateCharacter * createMessage);
+	void                            handleNameRequest(const RandomNameRequest &request);
+	void                            handleNameFailure(const RandomNameRequest &request, const StringId &errorMessage);
+	void                            handleVerifyAndLockNameVerification(const VerifyNameResponse &response);
+	void                            handleCharacterCreateNameVerification(const VerifyNameResponse &response);
+	const StringId &                canCreateAvatar(const std::string &templateName);
+	bool                            isCreatePending(uint32 stationId) const;
+	// ----------------------------------------------------------------------
+	//  GameServer startup flags
+	bool                            m_gameServerReadyObjectIds;
+	bool                            m_gameServerReadyDatabaseConnected;
+	bool                            m_gameServerReadyPlanetConnected;
+	uint32                          m_connectionTimeout;
+	
+	ChatServerConnection *          m_chatServerConnection;
+};
+
+//-----------------------------------------------------------------------
+
+inline bool GameServer::getDone(void)
+{
+	return m_done;
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & GameServer::getClusterName(void) const
+{
+	return m_clusterName;
+}
+
+// ----------------------------------------------------------------------
+
+inline uint8 GameServer::getClusterId() const
+{
+	return m_clusterId;
+}
+
+//-----------------------------------------------------------------------
+
+inline uint32 GameServer::getProcessId() const
+{
+	return m_processId;
+}
+
+//-----------------------------------------------------------------------
+
+inline uint32 GameServer::getPreloadAreaId() const
+{
+	return m_preloadAreaId;
+}
+
+//-----------------------------------------------------------------------
+
+inline void GameServer::setProcessId(uint32 newProcessId)
+{
+	m_processId = newProcessId;
+}
+
+//-----------------------------------------------------------------------
+
+inline void GameServer::setCentralServerConnection(CentralServerConnection * newCentralServerConnection)
+{
+	m_centralServerConnection = newCentralServerConnection;
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & GameServer::getCommandLine() const
+{
+	return m_commandLine;
+}
+
+//-----------------------------------------------------------------------
+
+inline void GameServer::setCommandLine(const std::string & c)
+{
+	m_commandLine = c;
+}
+
+//----------------------------------------------------------------------
+
+inline GameServer & GameServer::getInstance ()
+{
+	FATAL(!ms_instance, ("GameServer not installed!"));
+
+	return *NON_NULL (ms_instance);
+}
+
+//-----------------------------------------------------------------------
+
+inline uint32 GameServer::getFirstGameServerForPlanet()
+{
+	return m_firstGameServerForPlanet;
+}
+
+// ----------------------------------------------------------------------
+
+#endif	// _GAME_SERVER_H
diff --git a/engine/server/library/serverGame/src/shared/core/InstantDeleteList.cpp b/engine/server/library/serverGame/src/shared/core/InstantDeleteList.cpp
new file mode 100644
index 00000000..a96e6cfa
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/InstantDeleteList.cpp
@@ -0,0 +1,61 @@
+// ======================================================================
+//
+// InstantDeleteList.cpp
+// copyright (c) 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/InstantDeleteList.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+
+#include <set>
+
+// ======================================================================
+
+InstantDeleteList::ListType *InstantDeleteList::ms_theList = NULL;
+
+// ======================================================================
+
+void InstantDeleteList::install()
+{
+	ExitChain::add(InstantDeleteList::remove, "InstantDeleteList::remove");
+	ms_theList = new ListType;
+
+	DataTable * data = DataTableManager::getTable(ConfigServerGame::getInstantDeleteListDataTableName(),true);
+	FATAL(!data,("Could not find data table %s, needed for InstantDeleteList",ConfigServerGame::getInstantDeleteListDataTableName()));
+			
+	int numRows = data->getNumRows();
+	for (int row=0; row<numRows; ++row)
+	{
+		std::string templateName = data->getStringValue("template",row);
+
+		uint32 templateId = ObjectTemplateList::lookUp(templateName.c_str()).getCrc();
+		ms_theList->insert(templateId);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void InstantDeleteList::remove()
+{
+	delete ms_theList;
+	ms_theList = NULL;
+}
+
+// ----------------------------------------------------------------------
+
+bool InstantDeleteList::isOnList(const ObjectTemplate &theTemplate)
+{
+	NOT_NULL(ms_theList);
+	return (ms_theList->find(theTemplate.getCrcName().getCrc()) != ms_theList->end());
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/InstantDeleteList.h b/engine/server/library/serverGame/src/shared/core/InstantDeleteList.h
new file mode 100644
index 00000000..e282479c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/InstantDeleteList.h
@@ -0,0 +1,35 @@
+// ======================================================================
+//
+// InstantDeleteList.h
+// copyright (c) 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_InstantDeleteList_H
+#define INCLUDED_InstantDeleteList_H
+
+// ======================================================================
+
+class ObjectTemplate;
+
+// ======================================================================
+
+/**
+ * List of object templates that can be deleted immediately.
+ */
+class InstantDeleteList
+{
+  public:
+	static void install();
+	static void remove();
+
+	static bool isOnList(const ObjectTemplate &theTemplate);
+
+  private:
+	typedef stdset<uint32>::fwd ListType; 
+	static ListType *ms_theList;
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/LogoutTracker.cpp b/engine/server/library/serverGame/src/shared/core/LogoutTracker.cpp
new file mode 100644
index 00000000..6e647de7
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/LogoutTracker.cpp
@@ -0,0 +1,230 @@
+// ======================================================================
+//
+// LogoutTracker.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/LogoutTracker.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverNetworkMessages/UnloadedPlayerMessage.h"
+#include "sharedFoundation/Scheduler.h"
+#include "sharedFoundation/Watcher.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedObject/Container.h"
+#include <queue>
+#include <map>
+#include <hash_map>
+
+// ======================================================================
+
+static bool s_installed;
+static Scheduler *s_logoutTrackerScheduler;
+static std::queue<NetworkId> s_logoutCallbacks;
+static std::hash_map<NetworkId, int, NetworkId::Hash> s_logoutCallbacksCount;
+
+namespace LogoutTrackerNamespace
+{
+	std::map<NetworkId, Watcher<ServerObject> > *ms_pendingSaves;
+};
+
+using namespace LogoutTrackerNamespace;
+// ======================================================================
+
+void LogoutTracker::install()
+{
+	FATAL(s_installed, ("LogoutTracker::install - already installed"));
+	s_installed = true;
+	s_logoutTrackerScheduler = new Scheduler;
+	ms_pendingSaves = new std::map<NetworkId, Watcher<ServerObject> >;
+}
+
+// ----------------------------------------------------------------------
+
+void LogoutTracker::remove()
+{
+	FATAL(!s_installed, ("LogoutTracker::remove - not installed"));
+	s_installed = false;
+	delete s_logoutTrackerScheduler;
+	s_logoutTrackerScheduler = 0;
+	delete ms_pendingSaves;
+	ms_pendingSaves=0;
+}
+
+// ----------------------------------------------------------------------
+
+void LogoutTracker::add(NetworkId const &networkId)
+{
+	// create the callback info
+	s_logoutCallbacks.push(networkId);
+
+	// keep track of how many time the same networkId is put into the logout callback queue;
+	// we will only process the *LAST* one that is put into the logout callback queue, meaning
+	// if the player disconnects repeatedly, each time causing him to get put into the logout
+	// callback queue, and a 3 minute timer set, that those previous 3 minute timers are ignored
+	// when they go off, and only when the last 3 minute timer goes off do we remove him from the
+	// world, which is the desired behavior of leaving a disconnected character in the world for
+	// 3 minutes before removing him from the world
+	std::hash_map<NetworkId, int, NetworkId::Hash>::iterator iter = s_logoutCallbacksCount.find(networkId);
+	if (iter == s_logoutCallbacksCount.end())
+	{
+		s_logoutCallbacksCount[networkId] = 1;
+	}
+	else
+	{
+		++(iter->second);
+	}
+
+	// set the callback
+	getScheduler().setCallback(handleLogoutCallback, NULL, ConfigServerGame::getUnsafeLogoutTimeMs());
+}
+
+// ----------------------------------------------------------------------
+
+void LogoutTracker::handleLogoutCallback(const void *context)
+{
+	UNREF(context);
+
+	NetworkId const &networkId = s_logoutCallbacks.front();
+	std::hash_map<NetworkId, int, NetworkId::Hash>::iterator iter = s_logoutCallbacksCount.find(networkId);
+
+	// only process the *LAST* logout callback that is put into the logout callback
+	// queue for this object as the previous ones are no longer applicable
+	if ((iter == s_logoutCallbacksCount.end()) || (iter->second == 1))
+	{
+		ServerObject *obj = ServerWorld::findObjectByNetworkId(networkId);
+		if (obj && obj->isAuthoritative() && !obj->getClient())
+		{
+			obj->handleDisconnect(true);
+		}
+	}
+
+	if (iter != s_logoutCallbacksCount.end())
+	{
+		if (iter->second > 1)
+		{
+			--(iter->second);
+		}
+		else
+		{
+			s_logoutCallbacksCount.erase(iter);
+		}
+	}
+
+	// ***MUST*** be done last, since we just have a reference to the front NetworkId
+	s_logoutCallbacks.pop();
+}
+
+// ----------------------------------------------------------------------
+
+bool LogoutTracker::isInLogoutCallbackList(NetworkId const &networkId)
+{
+	return (s_logoutCallbacksCount.count(networkId) > 0);
+}
+
+// ----------------------------------------------------------------------
+
+Scheduler &LogoutTracker::getScheduler()
+{
+	FATAL(!s_logoutTrackerScheduler, ("No LogoutTracker scheduler found"));
+	return *s_logoutTrackerScheduler;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * The character will be removed from the world and hidden.  Ask the
+ * database to send a confirmation when the character is saved, and then
+ * we will delete him.  If the player returns in the mean time, we'll put
+ * the character back in the world.  The PlanetServer also needs to know about this
+ * so that it can send the login to the right server.
+ */
+void LogoutTracker::addPendingSave(ServerObject *character)
+{
+	NOT_NULL(ms_pendingSaves);
+	(*ms_pendingSaves)[character->getNetworkId()]=character;
+	UnloadedPlayerMessage const msg(character->getNetworkId());
+	GameServer::getInstance().sendToPlanetServer(msg);
+	GameServer::getInstance().sendToDatabaseServer(msg);
+}
+
+// ----------------------------------------------------------------------
+
+void LogoutTracker::onPersisted(const NetworkId &character)
+{
+	NOT_NULL(ms_pendingSaves);
+	std::map<NetworkId, Watcher<ServerObject> >::iterator i=ms_pendingSaves->find(character);
+	if (i!=ms_pendingSaves->end())
+	{
+		if (i->second)
+		{
+			LOG("TRACE_LOGIN",("Deleting character %s who has been saved.",character.getValueString().c_str()));
+			Object* containerObject = ContainerInterface::getContainedByObject(*(i->second));
+			//If we're contained, remove ourself from the container before destruction
+			if (containerObject)
+			{
+				Container* container = ContainerInterface::getContainer(*containerObject);
+				NOT_NULL(container);
+				container->internalItemRemoved(*(i->second));
+			}
+			delete i->second;
+			ms_pendingSaves->erase(i);
+
+			// Central doesn't need to track the scene anymore
+			GenericValueTypeMessage<std::pair<NetworkId, std::pair<std::string, bool> > > const msg(
+				"SetSceneForPlayer",
+				std::make_pair(
+					character,
+					std::make_pair(std::string(), false)));
+			
+			GameServer::getInstance().sendToCentralServer(msg);
+
+			// Send a message to all the other game servers to
+			// unload any copy they still have of the character
+
+			ServerMessageForwarding::beginBroadcast();
+
+			GenericValueTypeMessage<NetworkId> const unloadPersistedCharacter("UnloadPersistedCharacter", character);
+			ServerMessageForwarding::send(unloadPersistedCharacter);
+
+			ServerMessageForwarding::end();
+
+			ServerUniverse::removeConnectedCharacterBiographyData(character);
+		}
+		else
+			LOG("TRACE_LOGIN",("Character %s was not deleted because they logged back on.",character.getValueString().c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+ServerObject *LogoutTracker::findPendingCharacterSave(const NetworkId &character)
+{
+	NOT_NULL(ms_pendingSaves);
+	std::map<NetworkId, Watcher<ServerObject> >::iterator i=ms_pendingSaves->find(character);
+	if (i!=ms_pendingSaves->end())
+	{
+		if (i->second)
+			LOG("TRACE_LOGIN",("Reconnecting character %s who was logged out but waiting to be saved.",character.getValueString().c_str()));
+
+		ServerObject *obj = i->second;
+		ms_pendingSaves->erase(i);
+		return obj;
+	}
+	else
+		return NULL;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/core/LogoutTracker.h b/engine/server/library/serverGame/src/shared/core/LogoutTracker.h
new file mode 100644
index 00000000..98e3c3dc
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/LogoutTracker.h
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// LogoutTracker.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _LogoutTracker_H_
+#define _LogoutTracker_H_
+
+// ======================================================================
+
+class NetworkId;
+class Scheduler;
+class ServerObject;
+
+// ======================================================================
+
+class LogoutTracker
+{
+public:
+	static void install();
+	static void remove();
+
+	static void add(NetworkId const &networkId);
+	static void handleLogoutCallback(void const *context);
+	static bool isInLogoutCallbackList(NetworkId const &networkId);
+	static Scheduler &getScheduler();
+	static void addPendingSave(ServerObject *character);
+	static void onPersisted(const NetworkId &character);
+	static ServerObject *findPendingCharacterSave(const NetworkId &character);
+	
+private:
+	
+	LogoutTracker();
+	LogoutTracker(LogoutTracker const &);
+};
+
+// ======================================================================
+
+#endif // _LogoutTracker_H_
+
diff --git a/engine/server/library/serverGame/src/shared/core/MessageToQueue.cpp b/engine/server/library/serverGame/src/shared/core/MessageToQueue.cpp
new file mode 100644
index 00000000..dc63ba9a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/MessageToQueue.cpp
@@ -0,0 +1,794 @@
+// ======================================================================
+//
+// MessageToQueue.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/MessageToQueue.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ObjectIdManager.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerObject.h"
+#include "serverNetworkMessages/MessageToAckMessage.h"
+#include "serverNetworkMessages/MessageToMessage.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/Timer.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedObject/NetworkIdManager.h"
+
+// ======================================================================
+
+std::string MessageToQueue::ms_nullString;
+
+// ======================================================================
+
+namespace MessageToQueueNamespace
+{
+	/**
+	 * A class to keep track of objects we are trying to find on other
+	 * servers.
+	 */
+	class ObjectLocator
+	{
+	public:
+		explicit ObjectLocator(NetworkId const & object);
+		~ObjectLocator();
+		void addMessage(MessageToPayload const & message);
+		bool foundObject(uint32 serverId, bool authoritative);
+		bool objectNotOnServer(uint32 serverId);
+
+	private:
+		bool removeServer(uint32 serverId);
+		void sendMessagesToServer(uint32 serverId);
+			
+	private:
+		NetworkId m_object;
+		std::set<uint32> m_waitingForServers;
+		std::vector<MessageToPayload> m_messages;
+		uint32 m_possibleNonAuthServer;
+
+	private:
+		ObjectLocator(); //disable
+	};
+
+	/**
+	 * A class to keep track of objects who have scheduled messages.
+	 */
+	class SchedulerItem
+	{
+	public:
+		SchedulerItem(); //required to put these in a tree, but should never actually be used
+		SchedulerItem (ServerObject const & object, unsigned long deliveryTime);
+		unsigned long getDeliveryTime() const;
+		ServerObject * getObject() const;
+		CachedNetworkId const & getNetworkId() const;
+
+	public:
+		class IsSoonerThan
+		{
+		public:
+			bool operator() (SchedulerItem const & left, SchedulerItem const & right) const;
+		};
+
+	private:
+		CachedNetworkId m_networkId;
+		unsigned long m_deliveryTime;
+		SchedulerItem & operator= (SchedulerItem const &); //disable
+	};
+	
+	typedef std::map<NetworkId, uint32> LastKnownLocationsType;
+	typedef std::map<NetworkId, ObjectLocator *> ObjectLocatorsType;
+	typedef std::set<SchedulerItem, SchedulerItem::IsSoonerThan> SchedulerItemsType;
+	typedef std::vector<MessageToPayload> FrameMessagesType;
+	
+	MessageToQueue * ms_instance=NULL;
+	LastKnownLocationsType ms_lastKnownLocations;
+	ObjectLocatorsType ms_objectLocators;
+	SchedulerItemsType ms_schedulerItems;
+	FrameMessagesType ms_frameMessages;
+	unsigned long ms_effectiveMessageToTime=0;
+	int ms_backloggedObjectCount=0;
+
+	void internalSendMessageTo   (MessageToPayload & messageData);
+	void sendNetworkMessageTo    (MessageToPayload & data);
+	void handleObjectOnServer    (uint32 server, NetworkId const & object, bool authoritative);
+	void handleObjectNotOnServer (uint32 server, NetworkId const & object);
+	void handleMessageFromNetwork(MessageToPayload & data, uint32 sourceServer);
+	void dropMessage             (MessageToPayload & message);
+}
+using namespace MessageToQueueNamespace;
+
+// ======================================================================
+
+MessageToQueue & MessageToQueue::getInstance()
+{
+	return *(NON_NULL(ms_instance));
+}
+
+// ----------------------------------------------------------------------
+
+bool MessageToQueue::isInstalled ()
+{
+	if (ms_instance)
+		return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToQueue::install()
+{
+	ExitChain::add(remove,"MessageToQueue::remove");
+	ms_instance = new MessageToQueue;
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToQueue::remove()
+{
+	delete ms_instance;
+	ms_instance = NULL;
+}
+
+// ----------------------------------------------------------------------
+
+MessageToQueue::MessageToQueue() :
+		MessageDispatch::Receiver()
+{
+	connectToMessage("MessageToMessage");
+	connectToMessage("ObjectNotOnServerMessage");
+	connectToMessage("ObjectOnServerMessage");
+	connectToMessage("WhoHasMessage");
+}
+
+// ----------------------------------------------------------------------
+
+MessageToQueue::~MessageToQueue()
+{
+	ms_lastKnownLocations.clear();
+	for (ObjectLocatorsType::iterator i=ms_objectLocators.begin(); i!=ms_objectLocators.end(); ++i)
+		delete i->second;
+	ms_objectLocators.clear();
+	ms_schedulerItems.clear();
+	ms_frameMessages.clear();
+}
+
+// ----------------------------------------------------------------------
+
+unsigned long MessageToQueue::getEffectiveMessageToTime() 
+{
+	return ms_effectiveMessageToTime;
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToQueue::update(float frameTime)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("MessageToQueue::update");
+	if (!ServerClock::getInstance().isSet())
+		return;  // Do no processing until the serverclock is ready
+		
+	static Timer resetLastKnownLocationsTimer(static_cast<float>(ConfigServerGame::getLastKnownLocationsResetTimeSec()));
+	if (resetLastKnownLocationsTimer.updateZero(frameTime))
+	{
+		ms_lastKnownLocations.clear();
+	}
+
+	ms_effectiveMessageToTime = ServerClock::getInstance().getGameTimeSeconds();
+	ms_backloggedObjectCount=0; // Count of backlogged objects resets at the start of the frame.  Backlogged objects will increment the count during the frame
+
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("MessageToQueue::update - frame messages");
+		FrameMessagesType copyFrameMessages(ms_frameMessages);
+		ms_frameMessages.clear();
+		
+		// Deliver all messages sent during the last frame.  The objects will either handle them right away if appropriate, or will
+		// enqueue them for later
+		for (FrameMessagesType::iterator i=copyFrameMessages.begin(); i!=copyFrameMessages.end(); ++i)
+		{
+			ServerObject * const object = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(i->getNetworkId()));
+			if (object)
+				object->deliverMessageTo(*i);
+			else
+				sendNetworkMessageTo(*i);
+		}
+	}
+
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("MessageToQueue::update - queued messages");
+		// Handle all objects who have queued messages whos time has come
+		std::vector<SchedulerItem> newItems;
+		while (!ms_schedulerItems.empty() && ms_schedulerItems.begin()->getDeliveryTime() < ms_effectiveMessageToTime)
+		{
+			SchedulerItem const & schedulerItem = *ms_schedulerItems.begin();
+			ServerObject * const object = schedulerItem.getObject();  
+			if (object)
+			{
+				unsigned long nextMessageTime = object->processQueuedMessageTos(ms_effectiveMessageToTime);
+				if (nextMessageTime != 0)
+					newItems.push_back(SchedulerItem(*object, nextMessageTime));
+			}
+			ms_schedulerItems.erase(ms_schedulerItems.begin());
+		}
+
+		for (std::vector<SchedulerItem>::iterator i=newItems.begin(); i!=newItems.end(); ++i)
+		{
+			// This item might duplicate one already in the scheduler, in which case the duplicate
+			// will be ignored
+			IGNORE_RETURN(ms_schedulerItems.insert(*i));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToQueue::receiveMessage(MessageDispatch::Emitter const &, MessageDispatch::MessageBase const &message)
+{
+	static Archive::ReadIterator ri;
+	ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin(); //lint !e1774 // could use dynamic_cast
+
+	if (message.isType("MessageToMessage"))
+	{
+		ri = static_cast<GameNetworkMessage const &>(message).getByteStream().begin();
+		MessageToMessage const msg(ri);
+
+		// const_cast avoids having to make another copy of the data.  Since we expect to receive lots of these mesages,
+		// avoiding making extra copies matters.  In this particular case, we know it is safe since the message is about
+		// to go out of scope anyway.
+		handleMessageFromNetwork(const_cast<MessageToPayload&>(msg.getData()), msg.getSourceServerPid());
+	}
+	else if (message.isType("WhoHasMessage"))
+	{
+		// Attempt to find the object, tell the source server if we have it or not
+		GenericValueTypeMessage<std::pair<uint32, NetworkId> > const whoHasMessage(ri);
+		uint32 sourceServer = whoHasMessage.getValue().first;
+		NetworkId const & networkId = whoHasMessage.getValue().second;
+		
+		ServerMessageForwarding::begin(sourceServer);
+		ServerObject const * const object = safe_cast<ServerObject const *>(NetworkIdManager::getObjectById(networkId));
+		if (object)
+		{
+			GenericValueTypeMessage<std::pair<uint32, std::pair<NetworkId, bool> > > reply(
+				"ObjectOnServerMessage",
+				std::make_pair(GameServer::getInstance().getProcessId(),
+							   std::make_pair(networkId,
+											  object->isAuthoritative())));
+			ServerMessageForwarding::send(reply);
+		}
+		else
+		{
+			GenericValueTypeMessage<std::pair<uint32, NetworkId> > reply(
+				"ObjectNotOnServerMessage",
+				std::make_pair(GameServer::getInstance().getProcessId(),
+							   networkId));
+			ServerMessageForwarding::send(reply);
+		}
+		ServerMessageForwarding::end();
+	}
+	else if (message.isType("ObjectNotOnServerMessage"))
+	{
+		GenericValueTypeMessage<std::pair<uint32, NetworkId> > const msg(ri);
+		handleObjectNotOnServer(msg.getValue().first, msg.getValue().second);
+	}
+	else if (message.isType("ObjectOnServerMessage"))
+	{
+		GenericValueTypeMessage<std::pair<uint32, std::pair<NetworkId, bool> > > const msg(ri);
+		handleObjectOnServer(msg.getValue().first, msg.getValue().second.first, msg.getValue().second.second);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Send a message from one object to another, to be handled in C++.
+ * The object does not need to be loaded.
+ */
+void MessageToQueue::sendMessageToC (const NetworkId &objectId, const std::string &method, const std::string &data, int delay, bool guaranteed, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod)
+{
+	WARNING_DEBUG_FATAL(delay < 0, ("Sent messageTo with negative delay.  Target %s, method %s, delay %f",objectId.getValueString().c_str(), method.c_str(), delay));
+	if (delay < 0)
+		delay = 0;
+
+	MessageToPayload messageData(objectId, ObjectIdManager::getNewObjectId(), method, data, ServerClock::getInstance().getGameTimeSeconds() + static_cast<unsigned long>(delay), guaranteed, MessageToPayload::DT_c, undeliveredCallbackObject, undeliveredCallbackMethod, 0);
+	internalSendMessageTo(messageData);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Send a message from an object to another, to be handled by a Java
+ * script.
+ */
+void MessageToQueue::sendMessageToJava (const NetworkId &objectId, const std::string &method, const std::vector<int8> &packedData, int delay, bool guaranteed, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod)
+{
+	WARNING_DEBUG_FATAL(delay < 0, ("Sent messageTo with negative delay.  Target %s, method %s, delay %f",objectId.getValueString().c_str(), method.c_str(), delay));
+	if (delay < 0)
+		delay = 0;
+
+	MessageToPayload messageData(objectId, ObjectIdManager::getNewObjectId(), method, packedData, ServerClock::getInstance().getGameTimeSeconds() + static_cast<unsigned long>(delay), guaranteed, MessageToPayload::DT_java, undeliveredCallbackObject, undeliveredCallbackMethod, 0);
+	internalSendMessageTo(messageData);
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToQueue::sendRecurringMessageToC  (const NetworkId &objectId, const std::string &method, const std::string & data, int delay)
+{
+	WARNING_DEBUG_FATAL(delay < 0, ("Sent messageTo with negative delay.  Target %s, method %s, delay %f",objectId.getValueString().c_str(), method.c_str(), delay));
+	if (delay < 0)
+		delay = 0;
+
+	MessageToPayload messageData(objectId, ObjectIdManager::getNewObjectId(), method, data, ServerClock::getInstance().getGameTimeSeconds() + static_cast<unsigned long>(delay), false, MessageToPayload::DT_c, NetworkId::cms_invalid, ms_nullString, delay);
+	internalSendMessageTo(messageData);
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToQueue::sendRecurringMessageToJava(const NetworkId &objectId, const std::string &method, const stdvector<int8>::fwd &packedData, int delay)
+{
+	WARNING_DEBUG_FATAL(delay < 0, ("Sent messageTo with negative delay.  Target %s, method %s, delay %f",objectId.getValueString().c_str(), method.c_str(), delay));
+	if (delay < 0)
+		delay = 0;
+
+	MessageToPayload messageData(objectId, ObjectIdManager::getNewObjectId(), method, packedData, ServerClock::getInstance().getGameTimeSeconds() + static_cast<unsigned long>(delay), false, MessageToPayload::DT_java, NetworkId::cms_invalid, ms_nullString, delay);
+	internalSendMessageTo(messageData);
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToQueue::cancelRecurringMessageTo(const NetworkId &objectId, const std::string &method)
+{
+	sendMessageToC(objectId, "CancelRecurringMessageTo", method, 0, false);	
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Helper function to send a messsageTo.  Queues it on the target object or sends it on the network.
+ */
+void MessageToQueueNamespace::internalSendMessageTo (MessageToPayload & data)
+{
+	WARNING_DEBUG_FATAL(data.getGuaranteed() && !data.getUndeliveredCallbackMethod().empty(), ("Programmer bug:  attemented to send message %s to object %s, with both \"guaranteed\" and \"undeliveredCallbackMethod\" set.  Persisted messages can't have an undelivered callback.", data.getMethod().c_str(), data.getNetworkId().getValueString().c_str()));
+	if (data.getNetworkId() == NetworkId::cms_invalid)
+	{
+		WARNING(true, ("MessageToQueue::sendMessageTo trying to send message %s to id 0!", data.getMethod().c_str()));
+		return;
+	}
+
+	// non-persisted MessageTo can have an unlimited sized payload
+	if (data.getGuaranteed())
+	{
+		std::vector<int8> const &packedData = data.getPackedDataVector();
+		if (packedData.size() > 1000)
+		{
+			LOG("messageToFailure", ("Discarding persisted messageTo that exceeds 1000 bytes.  Persisted message %s sent to object %s had %i bytes of data.  Persisted message will not be delivered.", data.getMethod().c_str(), data.getNetworkId().getValueString().c_str(), packedData.size()));
+			return;
+		}
+		WARNING(packedData.size() > 900 ,("Delivering persisted messageTo that exceeds 900 bytes (dangerously large, probably indicates a bug).  Persisted message %s sent to object %s had %i bytes of data.\n", data.getMethod().c_str(), data.getNetworkId().getValueString().c_str(), packedData.size()));
+	}
+
+	ServerObject * const object = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(data.getNetworkId()));
+
+	if (object)
+		ms_frameMessages.push_back(data);
+	else
+		sendNetworkMessageTo(data);		
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Send a MessageTo to the server for the target object, if known.  If
+ * not known, find the server.
+ */
+void MessageToQueueNamespace::sendNetworkMessageTo(MessageToPayload & data)
+{
+	LastKnownLocationsType::const_iterator i=ms_lastKnownLocations.find(data.getNetworkId());
+	if (i!=ms_lastKnownLocations.end())
+	{
+		data.addBounceServer(GameServer::getInstance().getProcessId());
+		ServerMessageForwarding::begin(i->second);
+		ServerMessageForwarding::send(MessageToMessage(data, GameServer::getInstance().getProcessId()));
+		ServerMessageForwarding::end();
+	}
+	else
+	{
+		// If not looking for the object already, start looking for it.  Remember the
+		// message, to be sent once the object is found
+		if (GameServer::getInstance().hasConnectionsToOtherGameServers())
+		{
+			ObjectLocatorsType::iterator j=ms_objectLocators.find(data.getNetworkId());
+			if (j==ms_objectLocators.end())
+			{
+				ObjectLocator * newLocator = new ObjectLocator(data.getNetworkId());
+				j=ms_objectLocators.insert(std::make_pair(data.getNetworkId(), newLocator)).first;
+			}
+			data.addBroadcastCount();
+			j->second->addMessage(data);
+		}
+		else
+			dropMessage(data);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Handle a MessageTo received on the network.  It is now this server's
+ * responsibility to deal with the MessgeTo, even if it doesn't own the
+ * target object.  So, it may end up re-sending the message on the network.
+ */
+void MessageToQueueNamespace::handleMessageFromNetwork(MessageToPayload & data, uint32 sourceServer)
+{
+	ServerObject * const object = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(data.getNetworkId()));
+	if (object && object->isAuthoritative())
+	{
+		object->deliverMessageTo(data);
+	}
+	else
+	{
+		if (!object)
+		{
+			// Hint to source server that this isn't a good place to try to find this object
+			ServerMessageForwarding::begin(sourceServer);
+			GenericValueTypeMessage<std::pair<NetworkId, uint32> > message("ObjectNotOnServerMessage", std::make_pair(data.getNetworkId(), GameServer::getInstance().getProcessId()));
+			ServerMessageForwarding::send(message);
+			ServerMessageForwarding::end();
+		}
+
+		// if this message is coming back around to this game server for the second time,
+		// then it means there's a circular forwarding chain, so if we haven't broadcasted
+		// the message yet to try to locate its recipient, do it now; otherwise, drop the
+		// message, as the recipient won't be found
+		if (data.hasBounceServer(GameServer::getInstance().getProcessId()))
+		{
+			// if we received the message the second time, it means the last
+			// valid location we have for the recipient is no longer valid
+			IGNORE_RETURN(ms_lastKnownLocations.erase(data.getNetworkId()));
+
+			if (ConfigServerGame::getMaxMessageToBounces() != 0 && data.getBounceCount() >= ConfigServerGame::getMaxMessageToBounces())
+			{
+				WARNING(true,("Dropping message %s to object %s, because it bounced between too many servers (bounce=%d, broadcast=%d)", data.getMethod().c_str(), data.getNetworkId().getValueString().c_str(), data.getBounceCount(), data.getBroadcastCount()));
+				dropMessage(data);
+			}
+			// allow the message to be broadcasted twice, just to make absolutely sure the object cannot be found
+			else if (data.getBroadcastCount() < 2)
+			{
+				data.clearBounceServers();
+
+				// Send the message to a (hopefully) better server to handle it
+				sendNetworkMessageTo(data);
+			}
+			else
+			{
+				// drop the message
+				WARNING(true,("Dropping message %s to object %s, because it bounced back to this server (bounce=%d, broadcast=%d)", data.getMethod().c_str(), data.getNetworkId().getValueString().c_str(), data.getBounceCount(), data.getBroadcastCount()));
+				dropMessage(data);
+			}
+		}
+		// object is not authoritative, but this is the first time we have received the message
+		// so let the object handle it (by forwarding the message to the authoritative game server)
+		else if (object) 
+		{
+			object->deliverMessageTo(data);
+		}
+		// first time we've seen the message and the object isn't here
+		else
+		{
+			// Send the message to a (hopefully) better server to handle it
+			sendNetworkMessageTo(data);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToQueueNamespace::handleObjectOnServer(uint32 server, NetworkId const & object, bool authoritative)
+{
+	ObjectLocatorsType::iterator i=ms_objectLocators.find(object);
+	if (i!=ms_objectLocators.end())
+	{
+		bool doneLocating = i->second->foundObject(server, authoritative);
+		if (doneLocating)
+		{
+			delete i->second;
+			ms_objectLocators.erase(i);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToQueueNamespace::handleObjectNotOnServer(uint32 server, NetworkId const & object)
+{
+	IGNORE_RETURN(ms_lastKnownLocations.erase(object));
+	
+	ObjectLocatorsType::iterator i=ms_objectLocators.find(object);
+	if (i!=ms_objectLocators.end())
+	{
+		bool doneLocating = i->second->objectNotOnServer(server);
+		if (doneLocating)
+		{
+			delete i->second;
+			ms_objectLocators.erase(i);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToQueue::onGameServerDisconnect (uint32 serverId)
+{
+	for(LastKnownLocationsType::iterator i=ms_lastKnownLocations.begin(); i!=ms_lastKnownLocations.end();)
+	{
+		if (i->second == serverId)
+		{
+			LastKnownLocationsType::iterator next=i;
+			++next;
+			ms_lastKnownLocations.erase(i);
+			i=next;
+		}
+		else
+			++i;
+	}
+
+	for (ObjectLocatorsType::iterator j=ms_objectLocators.begin(); j!=ms_objectLocators.end();)
+	{
+		// If a server has crashed, then any object we are looking for isn't on it
+		bool doneLocating = j->second->objectNotOnServer(serverId);
+		if (doneLocating)
+		{
+			ObjectLocatorsType::iterator next=j;
+			++next;
+			delete j->second;
+			ms_objectLocators.erase(j);
+			j=next;
+		}
+		else
+			++j;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+std::string MessageToQueue::debugGetLastKnownLocations() 
+{
+	std::string result;
+	for (LastKnownLocationsType::const_iterator i=ms_lastKnownLocations.begin(); i!=ms_lastKnownLocations.end(); ++i)
+	{
+		char temp[255];
+		snprintf(temp,sizeof(temp)-1,"%s: %lu\n",i->first.getValueString().c_str(), i->second);
+		temp[sizeof(temp)-1]='\0';
+		result += temp;
+	}
+	return result;
+}
+
+// ======================================================================
+
+ObjectLocator::ObjectLocator(NetworkId const & object) :
+		m_object(object),
+		m_waitingForServers(GameServer::getInstance().getAllGameServerPids().begin(),GameServer::getInstance().getAllGameServerPids().end()),
+		m_messages(),
+		m_possibleNonAuthServer(0)
+{
+	ServerMessageForwarding::beginBroadcast();
+	
+	GenericValueTypeMessage<std::pair<uint32, NetworkId> > const whoHasMessage(
+		"WhoHasMessage",
+		std::make_pair(GameServer::getInstance().getProcessId(),object));
+	ServerMessageForwarding::send(whoHasMessage);
+
+	ServerMessageForwarding::end();
+}
+
+// ----------------------------------------------------------------------
+
+ObjectLocator::~ObjectLocator()
+{
+	m_messages.clear();
+}
+
+// ----------------------------------------------------------------------
+
+void ObjectLocator::addMessage(MessageToPayload const & message)
+{
+	m_messages.push_back(message);
+}
+
+// ----------------------------------------------------------------------
+
+bool ObjectLocator::foundObject(uint32 serverId, bool authoritative)
+{
+	if (authoritative)
+	{
+		MessageToQueueNamespace::ms_lastKnownLocations[m_object] = serverId;
+		m_waitingForServers.clear();
+		sendMessagesToServer(serverId);
+		return true;
+	}
+	else
+	{
+		// Remember the non-auth server, use it if we can't find an auth server
+		m_possibleNonAuthServer = serverId;
+		return removeServer(serverId);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ObjectLocator::objectNotOnServer(uint32 serverId)
+{
+	return removeServer(serverId);
+}
+	
+// ----------------------------------------------------------------------
+
+void ObjectLocator::sendMessagesToServer(uint32 serverId)
+{
+	ServerMessageForwarding::begin(serverId);
+	for (std::vector<MessageToPayload>::iterator i=m_messages.begin(); i!=m_messages.end(); ++i)
+	{
+		i->addBounceServer(GameServer::getInstance().getProcessId());
+		ServerMessageForwarding::send(MessageToMessage(*i, GameServer::getInstance().getProcessId()));
+	}
+	ServerMessageForwarding::end();
+
+	m_messages.clear();
+}
+
+// ----------------------------------------------------------------------
+
+bool ObjectLocator::removeServer(uint32 serverId)
+{
+	IGNORE_RETURN(m_waitingForServers.erase(serverId));
+	if (m_waitingForServers.empty())
+	{
+		// Didn't find the authoritative server
+		if (m_possibleNonAuthServer != 0)
+		{
+			MessageToQueueNamespace::ms_lastKnownLocations[m_object] = m_possibleNonAuthServer;
+			sendMessagesToServer(m_possibleNonAuthServer);
+		}
+		else
+		{
+			// didn't find object at all.  Messages will be dropped
+			for (std::vector<MessageToPayload>::iterator message=m_messages.begin(); message!=m_messages.end(); ++message)
+				dropMessage(*message);
+			m_messages.clear();
+		}
+		return true;
+	}
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * The message is about to be dropped.  Persist it if it is guaranteed,
+ * send the undelivered callback message if one is specified.
+ */
+void MessageToQueueNamespace::dropMessage(MessageToPayload & message)
+{
+	if (message.getGuaranteed() && !message.getPersisted())
+	{
+		message.setPersisted(true);
+		MessageToMessage const msg(message, GameServer::getInstance().getProcessId());
+		GameServer::getInstance().sendToDatabaseServer(msg);			
+	}
+	
+	if (message.getUndeliveredCallbackObject() != NetworkId::cms_invalid && !message.getUndeliveredCallbackMethod().empty())
+	{
+		MessageToPayload nackMessage(message.getUndeliveredCallbackObject(), ObjectIdManager::getNewObjectId(), message.getUndeliveredCallbackMethod(), message.getPackedDataVector(), ServerClock::getInstance().getGameTimeSeconds(), message.getGuaranteed(), message.getDeliveryType(), NetworkId::cms_invalid, std::string(), 0);
+		internalSendMessageTo(nackMessage);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToQueue::addToScheduler(ServerObject const & object, unsigned long callTime)
+{
+	IGNORE_RETURN(ms_schedulerItems.insert(SchedulerItem(object,callTime)));
+}
+
+// ----------------------------------------------------------------------
+
+std::string MessageToQueue::debugGetSchedulerData() 
+{
+	std::string result;
+	unsigned int lastDeliveryTime=0;
+	for (SchedulerItemsType::const_iterator i=ms_schedulerItems.begin(); i!=ms_schedulerItems.end(); ++i)
+	{
+		char temp[256];
+		if (i->getDeliveryTime() != lastDeliveryTime)
+		{
+			if (lastDeliveryTime != 0)
+				result += '\n';
+			snprintf(temp,sizeof(temp),"%lu: ",i->getDeliveryTime());
+			result += temp;
+			lastDeliveryTime = i->getDeliveryTime();
+		}
+		ServerObject const * const object = i->getObject();
+		if (object)
+			result += " " + object->getNetworkId().getValueString();
+		else
+			result += " [invalidated]";
+	}
+	result += '\n';
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+int MessageToQueue::getTotalMessages()
+{
+	return MessageToPayload::getInstanceCount();
+}
+
+// ----------------------------------------------------------------------
+
+int MessageToQueue::getBackloggedObjectCount()
+{
+	return ms_backloggedObjectCount;
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToQueue::incrementBackloggedObjectCount()
+{
+	++ms_backloggedObjectCount;
+}
+
+// ======================================================================
+
+SchedulerItem::SchedulerItem (ServerObject const & object, unsigned long deliveryTime) :
+		m_networkId(object),
+		m_deliveryTime(deliveryTime)
+{
+}
+
+// ----------------------------------------------------------------------
+
+SchedulerItem::SchedulerItem() :
+		m_networkId(CachedNetworkId::cms_cachedInvalid),
+		m_deliveryTime(0)
+{
+	FATAL(true,("Programmer bug:  default-constructed a MessageToQueue::SchedulerItem.  These should always be created using the constructor that takes explicit values"));
+}
+
+// ----------------------------------------------------------------------
+
+unsigned long SchedulerItem::getDeliveryTime() const
+{
+	return m_deliveryTime;
+}
+
+// ----------------------------------------------------------------------
+
+ServerObject * SchedulerItem::getObject() const
+{
+	return safe_cast<ServerObject*>(m_networkId.getObject());
+}
+
+// ----------------------------------------------------------------------
+
+CachedNetworkId const & SchedulerItem::getNetworkId() const
+{
+	return m_networkId;
+}
+
+// ----------------------------------------------------------------------
+
+bool SchedulerItem::IsSoonerThan::operator() (SchedulerItem const & left, SchedulerItem const & right) const
+{
+	return (left.getDeliveryTime() < right.getDeliveryTime() ||
+			(left.getDeliveryTime() == right.getDeliveryTime() && left.getNetworkId() < right.getNetworkId()));
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/MessageToQueue.h b/engine/server/library/serverGame/src/shared/core/MessageToQueue.h
new file mode 100644
index 00000000..0dd8348a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/MessageToQueue.h
@@ -0,0 +1,59 @@
+// ======================================================================
+//
+// MessageToQueue.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_MessageToQueue_H
+#define INCLUDED_MessageToQueue_H
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMessageDispatch/Receiver.h"
+
+class MessageToPayload;
+class ServerObject;
+
+// ======================================================================
+
+/**
+ * Singleton that handles sending MessageTos
+ */
+class MessageToQueue : public MessageDispatch::Receiver
+{
+public:
+	static std::string ms_nullString;
+	
+public:
+	static unsigned long getEffectiveMessageToTime();
+	
+	static void sendMessageToC                     (const NetworkId &objectId, const std::string &method, const std::string &data, int delay, bool guaranteed, NetworkId const & undeliveredCallbackObject=NetworkId::cms_invalid, std::string const & undeliveredCallbackMethod=ms_nullString);
+	static void sendMessageToJava                  (const NetworkId &objectId, const std::string &method, const stdvector<int8>::fwd &packedData, int delay, bool guaranteed, NetworkId const & undeliveredCallbackObject=NetworkId::cms_invalid, std::string const & undeliveredCallbackMethod=ms_nullString);
+	static void sendRecurringMessageToC            (const NetworkId &objectId, const std::string &method, const std::string & data, int delay);
+	static void sendRecurringMessageToJava         (const NetworkId &objectId, const std::string &method, const stdvector<int8>::fwd &packedData, int delay);
+	static void cancelRecurringMessageTo           (const NetworkId &objectId, const std::string &method);
+	static void update                             (float frameTime);
+	static void addToScheduler                     (ServerObject const & object, unsigned long callTime);
+	static void onGameServerDisconnect             (uint32 serverId);
+	static std::string debugGetLastKnownLocations  ();
+	static std::string debugGetSchedulerData       ();
+	static int getTotalMessages                    ();
+	static int getBackloggedObjectCount            ();
+	static void incrementBackloggedObjectCount     ();
+	virtual void receiveMessage                    (MessageDispatch::Emitter const &, MessageDispatch::MessageBase const &);
+
+	static MessageToQueue & getInstance();
+	static bool isInstalled            ();
+	static void remove                 ();
+	static void install                ();
+
+private:
+	MessageToQueue();
+	~MessageToQueue();
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/MoveSimManager.cpp b/engine/server/library/serverGame/src/shared/core/MoveSimManager.cpp
new file mode 100644
index 00000000..1cad1de3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/MoveSimManager.cpp
@@ -0,0 +1,201 @@
+//======================================================================
+//
+// MoveSimManager.cpp
+// copyright (c) 2003 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/MoveSimManager.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/MoveSimController.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerWorld.h"
+#include "serverNetworkMessages/UnloadObjectMessage.h"
+#include "sharedFoundation/FloatMath.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedTerrain/TerrainObject.h"
+
+
+#include <vector>
+
+//----------------------------------------------------------------------
+
+namespace MoveSimManagerNamespace
+{
+	typedef stdvector<NetworkId>::fwd NetworkIdVector;
+	NetworkIdVector s_moveSimCreatures;
+
+	const char * const templateName_npc = "object/mobile/kaadu_hue.iff";
+	const char * const templateName_pc  = "object/creature/player/bothan_female.iff";
+
+	namespace ObjVars
+	{
+		const std::string moveSim        = "moveSim";
+		const std::string moveSimPlayer  = "moveSimPlayer";
+		const std::string moveSimPosX    = "moveSimPosX";
+		const std::string moveSimPosZ    = "moveSimPosZ";
+		const std::string moveSimRadius  = "moveSimRadius";
+	}
+
+	void setCreatureObjVars (CreatureObject & creature, const Vector & pos_w, float radius)
+	{
+		const bool isPlayer = creature.isPlayerControlled ();
+
+		creature.setObjVarItem (ObjVars::moveSim,       int(1));
+		creature.setObjVarItem (ObjVars::moveSimPlayer, int(isPlayer ? 1 : 0));
+		creature.setObjVarItem (ObjVars::moveSimPosX,   pos_w.x);
+		creature.setObjVarItem (ObjVars::moveSimPosZ,   pos_w.z);
+		creature.setObjVarItem (ObjVars::moveSimRadius, radius);
+	}
+}
+
+using namespace MoveSimManagerNamespace;
+
+//----------------------------------------------------------------------
+
+/**
+*
+* @param centerPoint the point to wander around
+* @param roamRadius the radius around the point to wander around, limited by the edges of the map
+*
+*/
+
+void MoveSimManager::start (const NetworkId & userId, int numNpcToSpawn, int numPcToSpawn, float radius, float moveSpeed)
+{
+	if (!ConfigServerGame::getMoveSimEnabled ())
+		return;
+
+	const ServerObject * const player = safe_cast<ServerObject *>(NetworkIdManager::getObjectById (userId));
+
+	if (!player)
+		return;
+
+	float halfMapWidth = 1000.0f;
+	TerrainObject * const terrainObject = TerrainObject::getInstance ();	
+	if (terrainObject)
+	{
+		//- subtract a 512 meter invalid band around the edge of the map
+		halfMapWidth = (terrainObject->getMapWidthInMeters () * 0.5f) - 512.0f;
+	}
+
+	const Vector & player_pos_w = player->getPosition_w ();
+
+	const int numToSpawn = numPcToSpawn + numNpcToSpawn;
+
+	const float randomRadiusArea = std::min (halfMapWidth * 2.0f, radius * 0.7f);
+	for (int i = 0; i < numToSpawn; ++i)
+	{
+		Vector pos = player_pos_w;
+		pos.x += Random::randomReal (-randomRadiusArea, randomRadiusArea);
+		pos.z += Random::randomReal (-randomRadiusArea, randomRadiusArea);
+
+		pos.x = std::min (halfMapWidth, std::max (-halfMapWidth, pos.x));
+		pos.z = std::min (halfMapWidth, std::max (-halfMapWidth, pos.z));
+
+		float angle = Random::randomReal (0.0f, PI * 2.0f);
+
+		Transform tr;
+		tr.setPosition_p(pos);
+		tr.yaw_l(angle);
+
+		CreatureObject * creature = 0;
+		
+		if (numPcToSpawn-- > 0)
+		{
+			creature = dynamic_cast<CreatureObject *>(ServerWorld::createNewObject(templateName_pc, tr, 0, false));
+			creature->setPlayerControlled (true);
+			ServerWorld::createNewObject (ConfigServerGame::getPlayerObjectTemplate (), *creature, false);
+		}
+		else
+		{
+			creature = dynamic_cast<CreatureObject *>(ServerWorld::createNewObject(templateName_npc, tr, 0, false));
+		}
+
+		if (!creature)
+			return;
+
+		creature->addToWorld ();
+
+		const float naturalRunSpeed = safe_cast<const SharedCreatureObjectTemplate *>(creature->getSharedTemplate())->getSpeed(SharedCreatureObjectTemplate::MT_run);
+		const float moveScale = moveSpeed / naturalRunSpeed;
+
+		creature->setMovementScale (moveScale);
+
+		MoveSimController * const msc = new MoveSimController (creature, player_pos_w, radius);
+		creature->setController (msc);
+
+		creature->scheduleForAlter ();
+
+		setCreatureObjVars (*creature, player_pos_w, radius);
+
+		s_moveSimCreatures.push_back (creature->getNetworkId ());
+	}
+}
+
+//----------------------------------------------------------------------
+
+void MoveSimManager::clear ()
+{
+	for (NetworkIdVector::const_iterator it = s_moveSimCreatures.begin (); it != s_moveSimCreatures.end (); ++it)
+	{
+		const NetworkId & id = *it;
+		ServerObject * const obj = dynamic_cast<ServerObject *>(NetworkIdManager::getObjectById (id));
+		if (obj && obj->isAuthoritative ())
+			obj->unload ();
+		else
+		{
+			ServerMessageForwarding::beginBroadcast();
+
+			UnloadObjectMessage const unloadMessage(id);
+			ServerMessageForwarding::send(unloadMessage);
+
+			ServerMessageForwarding::end();
+		}
+	}
+
+	s_moveSimCreatures.clear ();
+}
+
+//----------------------------------------------------------------------
+
+void MoveSimManager::checkApplySimulation (CreatureObject & creature)
+{
+	if (!ConfigServerGame::getMoveSimEnabled ())
+		return;
+
+	int isMoveSim = 0;
+	if (creature.getObjVars ().getItem (ObjVars::moveSim, isMoveSim) && isMoveSim != 0)
+	{
+		const NetworkId & id = creature.getNetworkId ();
+		int isPlayer = 0;
+		if (creature.getObjVars ().getItem (ObjVars::moveSimPlayer, isPlayer))
+			creature.setPlayerControlled (isPlayer != 0);
+		
+		Vector pos_w;
+		if (!creature.getObjVars ().getItem (ObjVars::moveSimPosX, pos_w.x))
+			WARNING (true, ("MoveSimManager no x from objvar for [%s]", id.getValueString ().c_str ()));
+		
+		if (!creature.getObjVars ().getItem (ObjVars::moveSimPosZ, pos_w.z))
+			WARNING (true, ("MoveSimManager no z from objvar for [%s]", id.getValueString ().c_str ()));
+		
+		float radius = 0.0f;
+		if (!creature.getObjVars ().getItem (ObjVars::moveSimRadius, radius))
+			WARNING (true, ("MoveSimManager no radius from objvar for [%s]", id.getValueString ().c_str ()));
+		
+		MoveSimController * const msc = new MoveSimController (&creature, pos_w, radius);
+		creature.setController (msc);
+		creature.scheduleForAlter ();
+		
+		if (!std::find (s_moveSimCreatures.begin (), s_moveSimCreatures.end (), id))
+			s_moveSimCreatures.push_back (id);
+
+		REPORT_LOG_PRINT (true, ("MoveSimManager [%ld] applied simulation to [%s]\n", GameServer::getInstance ().getProcessId (), id.getValueString ().c_str ()));
+	}
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/core/MoveSimManager.h b/engine/server/library/serverGame/src/shared/core/MoveSimManager.h
new file mode 100644
index 00000000..d931ddb6
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/MoveSimManager.h
@@ -0,0 +1,29 @@
+//======================================================================
+//
+// MoveSimManager.h
+// copyright (c) 2003 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MoveSimManager_H
+#define INCLUDED_MoveSimManager_H
+
+//======================================================================
+
+class NetworkId;
+class CreatureObject;
+
+//----------------------------------------------------------------------
+
+class MoveSimManager
+{
+public:
+
+	static void start (const NetworkId & userId, int numNpcToSpawn, int numPcToSpawn, float moveScale, float moveSpeed);
+	static void clear ();
+	static void checkApplySimulation (CreatureObject & creature);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/NameManager.cpp b/engine/server/library/serverGame/src/shared/core/NameManager.cpp
new file mode 100644
index 00000000..81aef04b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/NameManager.cpp
@@ -0,0 +1,563 @@
+// ======================================================================
+//
+// NameManager.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/NameManager.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/RegexList.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverNetworkMessages/CharacterNamesMessage.h"
+#include "sharedFoundation/CalendarTime.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedUtility/DataTableManager.h"
+#include "sharedUtility/NameGenerator.h"
+
+// ======================================================================
+
+NameManager *NameManager::ms_instance = NULL;
+
+// ======================================================================
+
+void NameManager::install()
+{
+	DEBUG_FATAL(ms_instance,("Installed NameManager twice.\n"));
+	ExitChain::add(remove,"NameManager::remove");
+
+	ms_instance = new NameManager;
+}
+
+// ----------------------------------------------------------------------
+
+void NameManager::remove()
+{
+	NOT_NULL(ms_instance);
+	delete ms_instance;
+	ms_instance = NULL;
+}
+
+// ----------------------------------------------------------------------
+	
+NameManager::NameManager() :
+		m_nameGenerators (new NameGeneratorMapType),
+		m_reservedNames  (NULL),
+		m_nameToIdMap    (new NameToIdMapType),
+		m_idToCharacterDataMap(new IdToCharacterDataMapType)
+{
+	DataTable *theTable = DataTableManager::getTable(ConfigServerGame::getReservedNameFile(), true);
+	NOT_NULL(theTable);
+	m_reservedNames = new RegexList(*theTable);
+	DataTableManager::close(ConfigServerGame::getReservedNameFile());
+}
+
+// ----------------------------------------------------------------------
+
+NameManager::~NameManager()
+{
+	NOT_NULL(m_nameGenerators);
+	for (NameGeneratorMapType::const_iterator i=m_nameGenerators->begin(); i!=m_nameGenerators->end(); ++i)
+	{
+		delete i->second;
+	}
+	delete m_nameGenerators;
+	m_nameGenerators = NULL;
+	delete m_reservedNames;
+	m_reservedNames = NULL;
+	delete m_nameToIdMap;
+	m_nameToIdMap = NULL;
+	delete m_idToCharacterDataMap;
+	m_idToCharacterDataMap = NULL;
+}
+
+// ----------------------------------------------------------------------
+
+const NameGenerator & NameManager::getNameGenerator(const std::string &directory, const std::string &nameTable) const
+{
+	NameGenerator *generator=NULL;
+	NOT_NULL(m_nameGenerators);
+	NameGeneratorMapType::const_iterator i=m_nameGenerators->find(NameTableIdentifier(directory,nameTable));
+	if (i==m_nameGenerators->end())
+	{
+		generator=new NameGenerator(nameTable,directory);
+		(*m_nameGenerators)[NameTableIdentifier(directory,nameTable)]=generator;
+	}
+	else
+		generator = i->second;
+	NOT_NULL(generator);
+	return *generator;
+}
+
+// ----------------------------------------------------------------------
+
+Unicode::String NameManager::generateRandomName(const std::string &directory, const std::string &nameTable) const
+{
+	const NameGenerator &nameGenerator = getNameGenerator(directory,nameTable);
+	Unicode::String newName(nameGenerator.generateRandomName());
+	int failcount = 0;
+	UNREF(failcount);
+	while (isNameReserved(newName))
+	{
+		newName = nameGenerator.generateRandomName();
+		DEBUG_FATAL(++failcount > 100, ("GenerateRandomName couldn't find a name that passed the obscenity/reserved filter\n"));
+	}
+	return newName;	
+}
+
+// ----------------------------------------------------------------------
+
+NameManager::NameTableIdentifier::NameTableIdentifier(const std::string &directory, const std::string &table) :
+		m_directory(directory),
+		m_table(table)
+{
+}
+
+// ----------------------------------------------------------------------
+
+bool NameManager::NameTableIdentifier::operator<(const NameTableIdentifier &rhs) const
+{
+	if (m_directory == rhs.m_directory)
+		return m_table < rhs.m_table;
+	else
+		return m_directory < rhs.m_directory;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Check a name against the list of reserved or obscene names
+ */
+bool NameManager::isNameReserved(const Unicode::String &name, std::string &reasonReserved, std::vector<std::string> &ignoreRules) const
+{
+	NOT_NULL(m_reservedNames);
+	return m_reservedNames->doesStringMatch(name, reasonReserved, ignoreRules);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Check a name against the list of reserved or obscene names
+ */
+bool NameManager::isNameReserved(const Unicode::String &name, std::string &reasonReserved) const
+{
+	NOT_NULL(m_reservedNames);
+	return m_reservedNames->doesStringMatch(name, reasonReserved);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Check a name against the list of reserved or obscene names
+ */
+bool NameManager::isNameReserved(const Unicode::String &name) const
+{
+	NOT_NULL(m_reservedNames);
+	return m_reservedNames->doesStringMatch(name);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Check a name against the "appropriateness" rules of a name generator.
+ * @return true if the name is considered "appropriate" for the type of name
+ * specified.  What "appropriate" means varies by name generator, but in
+ * general it refers to the name length, number of words, etc.
+ */
+ 
+bool NameManager::isNameAppropriate(const std::string &directory, const std::string &nameTable, const Unicode::String &name) const
+{
+	return (getNameGenerator(directory,nameTable).verifyName(name));
+}
+
+// ----------------------------------------------------------------------
+
+int NameManager::getTotalPlayerCount() const
+{
+	return m_idToCharacterDataMap->size();
+}
+
+// ----------------------------------------------------------------------
+
+void NameManager::addPlayer(const NetworkId &id, uint32 stationId, const std::string &name, const std::string &fullName, time_t createTime, time_t lastLoginTime, bool notifyOtherServers)
+{
+	std::string normalizedName(normalizeName(name));
+	
+	(*m_nameToIdMap)[normalizedName] = id;
+
+	CharacterData characterData;
+	characterData.stationId = stationId;
+	characterData.characterName = normalizedName;
+	characterData.characterFullName = fullName;
+
+	if (createTime == 0)
+	{
+		createTime = static_cast<time_t>(getPlayerCreateTime(id));
+		if (createTime <= 0)
+			createTime = ::time(NULL);
+	}
+	characterData.createTime = createTime;
+
+	if (lastLoginTime == 0)
+	{
+		lastLoginTime = static_cast<time_t>(getPlayerLastLoginTime(id));
+		if (lastLoginTime <= 0)
+			lastLoginTime = ::time(NULL);
+	}
+	characterData.lastLoginTime = lastLoginTime;
+
+	(*m_idToCharacterDataMap)[id] = characterData;
+
+	if (notifyOtherServers)
+	{
+		std::vector<NetworkId> ids;
+		std::vector<int> stationIds;
+		std::vector<std::string> characterNames;
+		std::vector<std::string> characterFullNames;
+		std::vector<int> characterCreateTimes;
+		std::vector<int> characterLastLoginTimes;
+
+		ids.push_back(id);
+		stationIds.push_back(static_cast<int>(stationId));
+		characterNames.push_back(normalizedName);
+		characterFullNames.push_back(fullName);
+		characterCreateTimes.push_back(static_cast<int>(createTime));
+		characterLastLoginTimes.push_back(static_cast<int>(lastLoginTime));
+
+		ServerMessageForwarding::beginBroadcast();
+
+		CharacterNamesMessage const characterNamesMessage(ids, stationIds, characterNames, characterFullNames, characterCreateTimes, characterLastLoginTimes);
+		ServerMessageForwarding::send(characterNamesMessage);
+
+		ServerMessageForwarding::end();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void NameManager::renamePlayer(const NetworkId &id, const Unicode::String &name, const Unicode::String &fullName)
+{
+	uint32 stationId = 0;
+	time_t createTime = 0;
+	time_t lastLoginTime = 0;
+
+	IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->find(id);
+	if (i != m_idToCharacterDataMap->end())
+	{
+		stationId = i->second.stationId;
+		createTime = i->second.createTime;
+		lastLoginTime = i->second.lastLoginTime;
+	}
+
+	// Remove the old names
+	releasePlayerName(id);
+
+	// Add the new names
+	addPlayer(id, stationId, Unicode::wideToNarrow(name), Unicode::wideToNarrow(fullName), createTime, lastLoginTime, false);
+}
+
+// ----------------------------------------------------------------------
+
+const NetworkId & NameManager::getPlayerId(const std::string &name) const
+{
+	NameToIdMapType::const_iterator i=m_nameToIdMap->find(name);
+	if (i==m_nameToIdMap->end())
+		return NetworkId::cms_invalid;
+	else
+		return i->second;
+}
+
+// ----------------------------------------------------------------------
+
+uint32 NameManager::getPlayerStationId(const NetworkId &id) const
+{
+	IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->find(id);
+	if (i==m_idToCharacterDataMap->end())
+		return 0;
+	else
+		return i->second.stationId;
+}
+
+// ----------------------------------------------------------------------
+
+const std::string & NameManager::getPlayerName(const NetworkId &id) const
+{
+	static const std::string emptyString;
+
+	IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->find(id);
+	if (i==m_idToCharacterDataMap->end())
+		return emptyString;
+	else
+		return i->second.characterName;
+}
+
+// ----------------------------------------------------------------------
+
+const std::string & NameManager::getPlayerFullName(const NetworkId &id) const
+{
+	static const std::string emptyString;
+
+	IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->find(id);
+	if (i==m_idToCharacterDataMap->end())
+		return emptyString;
+	else
+		return i->second.characterFullName;
+}
+
+// ----------------------------------------------------------------------
+
+int NameManager::getPlayerCreateTime(const NetworkId &id) const
+{
+	IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->find(id);
+	if (i==m_idToCharacterDataMap->end())
+		return -1;
+	else
+		return static_cast<int>(i->second.createTime);
+}
+
+// ----------------------------------------------------------------------
+
+int NameManager::getPlayerLastLoginTime(const NetworkId &id) const
+{
+	IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->find(id);
+	if (i==m_idToCharacterDataMap->end())
+		return -1;
+	else
+		return static_cast<int>(i->second.lastLoginTime);
+}
+
+// ----------------------------------------------------------------------
+
+void NameManager::getPlayerWithLastLoginTimeAfter(time_t const time, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const
+{
+	result.clear();
+
+	for (IdToCharacterDataMapType::const_iterator i = m_idToCharacterDataMap->begin(); i != m_idToCharacterDataMap->end(); ++i)
+	{
+		if (i->second.lastLoginTime > time)
+			IGNORE_RETURN(result.insert(std::make_pair(i->second.lastLoginTime, std::make_pair(std::make_pair(i->first, i->second.stationId), i->second.characterName))));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void NameManager::getPlayerWithLastLoginTimeBefore(time_t const time, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const
+{
+	result.clear();
+
+	for (IdToCharacterDataMapType::const_iterator i = m_idToCharacterDataMap->begin(); i != m_idToCharacterDataMap->end(); ++i)
+	{
+		if (i->second.lastLoginTime < time)
+			IGNORE_RETURN(result.insert(std::make_pair(i->second.lastLoginTime, std::make_pair(std::make_pair(i->first, i->second.stationId), i->second.characterName))));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void NameManager::getPlayerWithLastLoginTimeBetween(time_t const timeLowerRange, time_t const timeUpperRange, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const
+{
+	result.clear();
+
+	for (IdToCharacterDataMapType::const_iterator i = m_idToCharacterDataMap->begin(); i != m_idToCharacterDataMap->end(); ++i)
+	{
+		if ((i->second.lastLoginTime > timeLowerRange) && (i->second.lastLoginTime < timeUpperRange))
+			IGNORE_RETURN(result.insert(std::make_pair(i->second.lastLoginTime, std::make_pair(std::make_pair(i->first, i->second.stationId), i->second.characterName))));
+	}
+}
+
+// ----------------------------------------------------------------------
+// return the distribution of characters' last login time
+void NameManager::getPlayerWithLastLoginTimeAfterDistribution(std::map<int, std::pair<std::string, int> > &result) const
+{
+	for (std::map<int, std::pair<std::string, int> >::iterator iter = result.begin(); iter != result.end(); ++iter)
+		iter->second.second = 0;
+
+	int const timeNow = static_cast<int>(::time(NULL));
+	for (IdToCharacterDataMapType::const_iterator i = m_idToCharacterDataMap->begin(); i != m_idToCharacterDataMap->end(); ++i)
+	{
+		int const lastLoginTimeSecondsAgo = std::max(static_cast<int>(0), static_cast<int>(timeNow - static_cast<int>(i->second.lastLoginTime)));
+
+		std::map<int, std::pair<std::string, int> >::iterator iterFind = result.lower_bound(lastLoginTimeSecondsAgo);
+		if (iterFind != result.end())
+			++(iterFind->second.second);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void NameManager::getPlayerWithCreateTimeAfter(time_t const time, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const
+{
+	result.clear();
+
+	for (IdToCharacterDataMapType::const_iterator i = m_idToCharacterDataMap->begin(); i != m_idToCharacterDataMap->end(); ++i)
+	{
+		if (i->second.createTime > time)
+			IGNORE_RETURN(result.insert(std::make_pair(i->second.createTime, std::make_pair(std::make_pair(i->first, i->second.stationId), i->second.characterName))));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void NameManager::getPlayerWithCreateTimeBefore(time_t const time, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const
+{
+	result.clear();
+
+	for (IdToCharacterDataMapType::const_iterator i = m_idToCharacterDataMap->begin(); i != m_idToCharacterDataMap->end(); ++i)
+	{
+		if (i->second.createTime < time)
+			IGNORE_RETURN(result.insert(std::make_pair(i->second.createTime, std::make_pair(std::make_pair(i->first, i->second.stationId), i->second.characterName))));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void NameManager::getPlayerWithCreateTimeBetween(time_t const timeLowerRange, time_t const timeUpperRange, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const
+{
+	result.clear();
+
+	for (IdToCharacterDataMapType::const_iterator i = m_idToCharacterDataMap->begin(); i != m_idToCharacterDataMap->end(); ++i)
+	{
+		if ((i->second.createTime > timeLowerRange) && (i->second.createTime < timeUpperRange))
+			IGNORE_RETURN(result.insert(std::make_pair(i->second.createTime, std::make_pair(std::make_pair(i->first, i->second.stationId), i->second.characterName))));
+	}
+}
+
+// ----------------------------------------------------------------------
+// return the distribution of characters' create time
+void NameManager::getPlayerWithCreateTimeAfterDistribution(std::map<int, std::pair<std::string, int> > &result) const
+{
+	for (std::map<int, std::pair<std::string, int> >::iterator iter = result.begin(); iter != result.end(); ++iter)
+		iter->second.second = 0;
+
+	int const timeNow = static_cast<int>(::time(NULL));
+	for (IdToCharacterDataMapType::const_iterator i = m_idToCharacterDataMap->begin(); i != m_idToCharacterDataMap->end(); ++i)
+	{
+		int const createTimeSecondsAgo = std::max(static_cast<int>(0), static_cast<int>(timeNow - static_cast<int>(i->second.createTime)));
+
+		std::map<int, std::pair<std::string, int> >::iterator iterFind = result.lower_bound(createTimeSecondsAgo);
+		if (iterFind != result.end())
+			++(iterFind->second.second);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void NameManager::releasePlayerName(const NetworkId &id)
+{
+	IdToCharacterDataMapType::iterator i=m_idToCharacterDataMap->find(id);
+	if (i!=m_idToCharacterDataMap->end())
+	{
+		m_nameToIdMap->erase(i->second.characterName);
+		m_idToCharacterDataMap->erase(i);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void NameManager::addPlayers(const stdvector<NetworkId>::fwd &ids, const stdvector<int>::fwd &stationIds, const stdvector<std::string>::fwd &names, const stdvector<std::string>::fwd &fullNames, const stdvector<int>::fwd &createTimes, const stdvector<int>::fwd &lastLoginTimes)
+{
+	DEBUG_FATAL(ids.size() != stationIds.size(),("Programmer bug:  Vectors ids and stationIds must be the same size.\n"));
+	DEBUG_FATAL(ids.size() != names.size(),("Programmer bug:  Vectors ids and names must be the same size.\n"));
+	DEBUG_FATAL(ids.size() != fullNames.size(),("Programmer bug:  Vectors ids and fullNames must be the same size.\n"));
+	DEBUG_FATAL(ids.size() != createTimes.size(),("Programmer bug:  Vectors ids and createTimes must be the same size.\n"));
+	DEBUG_FATAL(ids.size() != lastLoginTimes.size(),("Programmer bug:  Vectors ids and lastLoginTimes must be the same size.\n"));
+
+	for (size_t i=0; i<ids.size(); ++i)
+	{
+		addPlayer(ids[i], static_cast<uint32>(stationIds[i]), names[i], fullNames[i], static_cast<time_t>(createTimes[i]), static_cast<time_t>(lastLoginTimes[i]), false);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void NameManager::sendAllNamesToServer (std::vector<uint32> const & servers) const
+{
+	std::vector<NetworkId> ids;
+	std::vector<int> stationIds;
+	std::vector<std::string> characterNames;
+	std::vector<std::string> characterFullNames;
+	std::vector<int> characterCreateTimes;
+	std::vector<int> characterLastLoginTimes;
+
+	for (IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->begin(); i!=m_idToCharacterDataMap->end(); ++i)
+	{
+		ids.push_back(i->first);
+		stationIds.push_back(static_cast<int>(i->second.stationId));
+		characterNames.push_back(i->second.characterName);
+		characterFullNames.push_back(i->second.characterFullName);
+		characterCreateTimes.push_back(static_cast<int>(i->second.createTime));
+		characterLastLoginTimes.push_back(static_cast<int>(i->second.lastLoginTime));
+	}
+
+	ServerMessageForwarding::begin(servers);
+
+	CharacterNamesMessage const characterNamesMessage(ids, stationIds, characterNames, characterFullNames, characterCreateTimes, characterLastLoginTimes);
+	ServerMessageForwarding::send(characterNamesMessage);
+
+	ServerMessageForwarding::end();
+}
+
+// ----------------------------------------------------------------------
+
+std::string NameManager::debugGetNameList() const
+{
+	std::string result;
+	
+	for (IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->begin(); i!=m_idToCharacterDataMap->end(); ++i)
+		result += i->first.getValueString() + " : " + FormattedString<16>().sprintf("%lu", i->second.stationId) + " : " + i->second.characterName + " : " + i->second.characterFullName + " : " + CalendarTime::convertEpochToTimeStringLocal(i->second.createTime) + " : " + CalendarTime::convertEpochToTimeStringLocal(i->second.lastLoginTime) + '\n';
+
+	result += FormattedString<128>().sprintf("(%d total characters)\n", m_idToCharacterDataMap->size());
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+std::string NameManager::normalizeName(const std::string &name)
+{
+	std::string firstName(name, 0, name.find(' '));
+	return Unicode::toLower(firstName);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Generate a random name that is not already used by another player.
+ * Technically, the name is not reserved until sent to the database.  However,
+ * the odds of two game servers generating the same random name at the same
+ * time are very low.  The worst case is a player might be given a random name,
+ * then be told to pick another when they finish character creation.
+ */
+Unicode::String NameManager::generateUniqueRandomName(const std::string &directory, const std::string &nameTable) const
+{
+	int failcount = 0;
+	Unicode::String name = generateRandomName(directory,nameTable);
+	while (getPlayerId(normalizeName(Unicode::wideToNarrow(name))) != NetworkId::cms_invalid)
+	{
+		++failcount;
+		WARNING_STRICT_FATAL(failcount > 100, ("GenerateUniqueRandomName couldn't find a name that wasn't already in use.  This may indicate that the random name data tables don't have enough possibilities.  Directory:  %s  name table:  %s", directory.c_str(), nameTable.c_str()));
+		if (failcount > 100)
+			break;
+
+		name = generateRandomName(directory,nameTable);
+	}
+	return name;
+}
+
+// ----------------------------------------------------------------------
+
+bool NameManager::isPlayer(NetworkId const & possiblePlayer) const
+{
+	IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->find(possiblePlayer);
+	return (i!=m_idToCharacterDataMap->end());
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/NameManager.h b/engine/server/library/serverGame/src/shared/core/NameManager.h
new file mode 100644
index 00000000..27d2204b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/NameManager.h
@@ -0,0 +1,115 @@
+// ======================================================================
+//
+// NameManager.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_NameManager_H
+#define INCLUDED_NameManager_H
+
+// ======================================================================
+
+class NameGenerator;
+class NetworkId;
+class RegexList;
+
+// ======================================================================
+
+/**
+ * A singleton that organizes random name generators and reserved/obscene
+ * name lists.
+ *
+ * Random name tables are identified by a directory, which indicates the
+ * general type of thing to be named, e.g. player or resource, and a
+ * table, which indicates the specific type of name, e.g. Bothan or Human.
+ */
+class NameManager
+{
+  public:
+	static NameManager &  getInstance        ();
+	static void           install            ();
+
+  public:
+	int                   getTotalPlayerCount  () const;
+	void                  addPlayer            (const NetworkId &id, uint32 stationId, const std::string &name, const std::string &fullName, time_t createTime, time_t lastLoginTime, bool notifyOtherServers);
+	void                  addPlayers           (const stdvector<NetworkId>::fwd &ids, const stdvector<int>::fwd &stationIds, const stdvector<std::string>::fwd &names, const stdvector<std::string>::fwd &fullNames, const stdvector<int>::fwd &createTimes, const stdvector<int>::fwd &lastLoginTimes);
+	void                  renamePlayer         (const NetworkId &id, const Unicode::String &name, const Unicode::String &fullName);
+	std::string           debugGetNameList     () const;
+	bool                  isPlayer             (NetworkId const & possiblePlayer) const;
+	const NetworkId &     getPlayerId          (const std::string &name) const;
+	uint32                getPlayerStationId   (const NetworkId &id) const;
+	const std::string &   getPlayerName        (const NetworkId &id) const;
+	const std::string &   getPlayerFullName    (const NetworkId &id) const;
+	int                   getPlayerCreateTime  (const NetworkId &id) const;
+	int                   getPlayerLastLoginTime (const NetworkId &id) const;
+	void                  getPlayerWithLastLoginTimeAfter (time_t time, stdmultimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::fwd &result) const;
+	void                  getPlayerWithLastLoginTimeBefore (time_t time, stdmultimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::fwd &result) const;
+	void                  getPlayerWithLastLoginTimeBetween (time_t timeLowerRange, time_t timeUpperRange, stdmultimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::fwd &result) const;
+	void                  getPlayerWithLastLoginTimeAfterDistribution (stdmap<int, std::pair<std::string, int> >::fwd &result) const;
+	void                  getPlayerWithCreateTimeAfter (time_t time, stdmultimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::fwd &result) const;
+	void                  getPlayerWithCreateTimeBefore (time_t time, stdmultimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::fwd &result) const;
+	void                  getPlayerWithCreateTimeBetween (time_t timeLowerRange, time_t timeUpperRange, stdmultimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::fwd &result) const;
+	void                  getPlayerWithCreateTimeAfterDistribution (stdmap<int, std::pair<std::string, int> >::fwd &result) const;
+	void                  releasePlayerName    (const NetworkId &id);
+	Unicode::String       generateRandomName   (const std::string &directory, const std::string &nameTable) const;
+	Unicode::String       generateUniqueRandomName (const std::string &directory, const std::string &nameTable) const;
+	bool                  isNameAppropriate    (const std::string &directory, const std::string &nameTable, const Unicode::String &name) const;
+	bool                  isNameReserved       (const Unicode::String &name) const;
+	bool                  isNameReserved       (const Unicode::String &name, std::string &reasonReserved) const;
+	bool                  isNameReserved       (const Unicode::String &name, std::string &reasonReserved, std::vector<std::string> &ignoreRules) const;
+	void                  sendAllNamesToServer (std::vector<uint32> const & servers) const;
+	static std::string    normalizeName        (const std::string &name);
+	
+  private:
+	const NameGenerator & getNameGenerator   (const std::string &directory, const std::string &nameTable) const;
+	
+  private:
+	class NameTableIdentifier
+	{
+	  public:
+		NameTableIdentifier (const std::string &m_directory, const std::string &m_table);
+		bool operator<      (const NameTableIdentifier &rhs) const;
+		
+	  private:
+		std::string          m_directory;
+		std::string          m_table;
+	};
+
+	struct CharacterData
+	{
+		uint32 stationId;
+		std::string characterName;
+		std::string characterFullName;
+		time_t createTime;
+		time_t lastLoginTime;
+	};
+
+	typedef stdmap<NameTableIdentifier, NameGenerator*>::fwd NameGeneratorMapType;
+	typedef stdmap<NetworkId, CharacterData>::fwd IdToCharacterDataMapType;
+	typedef stdmap<std::string, NetworkId>::fwd NameToIdMapType;
+
+  private:
+	mutable NameGeneratorMapType * m_nameGenerators;
+	RegexList                    * m_reservedNames;
+	NameToIdMapType              * m_nameToIdMap;
+	IdToCharacterDataMapType     * m_idToCharacterDataMap;
+	
+  private:
+	NameManager();
+	~NameManager();
+	static void remove();
+	static NameManager *ms_instance;
+};
+
+// ----------------------------------------------------------------------
+
+inline NameManager &NameManager::getInstance()
+{
+	NOT_NULL(ms_instance);
+	return *ms_instance;
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/NamedObjectManager.cpp b/engine/server/library/serverGame/src/shared/core/NamedObjectManager.cpp
new file mode 100644
index 00000000..2c76fb97
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/NamedObjectManager.cpp
@@ -0,0 +1,79 @@
+// ======================================================================
+//
+// NamedObjectManager.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/NamedObjectManager.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedFile/Iff.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMath/Vector.h"
+#include "sharedUtility/DataTable.h"
+
+// ======================================================================
+
+static std::map<std::string, NetworkId> s_namedObjects;
+
+// ======================================================================
+
+NetworkId const &NamedObjectManager::getNamedObjectId(std::string const &name) // static
+{
+	std::map<std::string, NetworkId>::const_iterator i = s_namedObjects.find(name);
+	if (i != s_namedObjects.end())
+		return (*i).second;
+	return NetworkId::cms_invalid;
+}
+
+// ----------------------------------------------------------------------
+
+void NamedObjectManager::registerNamedObjectId(std::string const &name, NetworkId const &id) // static
+{
+	if (id == NetworkId::cms_invalid)
+		IGNORE_RETURN(s_namedObjects.erase(name));
+	else
+		s_namedObjects[name] = id;
+}
+
+// ----------------------------------------------------------------------
+
+void NamedObjectManager::createZoneObjects() // static
+{
+	if (!ConfigServerGame::getCreateZoneObjects())
+		return;
+
+	std::string zoneObjectFileName = std::string("datatables/zone_objects/") + ConfigServerGame::getSceneID() + std::string(".iff");
+
+	Iff iff;
+	if (iff.open(zoneObjectFileName.c_str(), true))
+	{
+		DataTable dataTable;
+		dataTable.load(iff);
+
+		int numberOfRows = dataTable.getNumRows();
+		for (int row = 0; row < numberOfRows; ++row)
+		{
+			std::string objectName = dataTable.getStringValue("name", row);
+			std::string templateName = dataTable.getStringValue("template", row);
+			bool persisted = dataTable.getIntValue("persist", row) != 0;
+
+			if (NamedObjectManager::getNamedObjectId(objectName) == NetworkId::cms_invalid)
+			{
+				REPORT_LOG(true, ("Creating zone object '%s' %s, template '%s'\n", objectName.c_str(), persisted ? "persisted" : "nonpersisted", templateName.c_str()));
+				FATAL(persisted && !ConfigServerGame::getAllowMasterObjectCreation(), ("Master object creation is disabled and persisted named object '%s' could not be found!", objectName.c_str()));
+				ServerObject *obj = NON_NULL(ServerWorld::createNewObject(templateName, Transform::identity, 0, persisted));
+				obj->addToWorld();
+				FATAL(persisted && NamedObjectManager::getNamedObjectId(objectName) == NetworkId::cms_invalid, ("Persisted master named object '%s' did not register on creation!", objectName.c_str()));
+			}
+		}
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/core/NamedObjectManager.h b/engine/server/library/serverGame/src/shared/core/NamedObjectManager.h
new file mode 100644
index 00000000..09408c30
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/NamedObjectManager.h
@@ -0,0 +1,29 @@
+// ======================================================================
+//
+// NamedObjectManager.h
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_NamedObjectManager_H
+#define INCLUDED_NamedObjectManager_H
+
+// ======================================================================
+
+class NetworkId;
+
+// ======================================================================
+
+class NamedObjectManager
+{
+public:
+	static NetworkId const &getNamedObjectId(std::string const &name);
+	static void registerNamedObjectId(std::string const &name, NetworkId const &id);
+	static void createZoneObjects();
+};
+
+// ======================================================================
+
+#endif // INCLUDED_NamedObjectManager_H
+
diff --git a/engine/server/library/serverGame/src/shared/core/NewbieTutorial.cpp b/engine/server/library/serverGame/src/shared/core/NewbieTutorial.cpp
new file mode 100644
index 00000000..12726bb6
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/NewbieTutorial.cpp
@@ -0,0 +1,285 @@
+// ======================================================================
+//
+// NewbieTutorial.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/NewbieTutorial.h"
+
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedGame/SharedBuildoutAreaManager.h"
+#include "sharedFile/FileManifest.h"
+#include "sharedFile/TreeFile.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/Container.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/VolumeContainer.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/PortalProperty.h"
+#include "sharedRandom/Random.h"
+#include "sharedTerrain/TerrainObject.h"
+
+// ======================================================================
+
+namespace NewbieTutorialNamespace
+{
+	const std::string        s_sceneId("tutorial");
+	const std::string        s_tutorialTemplate("object/building/general/npe_hangar_1.iff");
+
+	const Vector             s_startCoords(-12.5f, 0.0f, 19.5f);
+	const std::string        s_startCellName("medicalroom");
+
+	const float              s_tutorialMapWidth(16384.0f);
+	const float              s_tutorialSpacing(512.0f);
+	const int                s_sqrtMaxTutorials(static_cast<int>(s_tutorialMapWidth/s_tutorialSpacing));
+
+	const std::string        s_tutorialObjVar("npe.phase_number");
+	const std::string        s_skipTutorialObjVar("npe.skippingTutorial");
+	const int                s_tutorialResetThreshold(2);
+
+	const std::string        s_freeTrialPlanets [] = {"tutorial", "space_npe_falcon", "space_ord_mantell"};
+	const int                s_numFreeTrialPlanets = sizeof (s_freeTrialPlanets) / sizeof (s_freeTrialPlanets[0]);
+
+	const std::string        s_freeTrialBuildoutPlanet = "dungeon1";
+
+	const std::string        s_freeTrialBuildoutAreas [] = {"npe_shared_station", "npe_dungeon"};
+	const int                s_numFreeTrialBuildoutAreas = sizeof (s_freeTrialBuildoutAreas) / sizeof (s_freeTrialBuildoutAreas[0]);
+}
+
+using namespace NewbieTutorialNamespace;
+
+std::string const &NewbieTutorial::getSceneId()
+{
+	return s_sceneId;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const &NewbieTutorial::getTutorialTemplateName()
+{
+	return s_tutorialTemplate;
+}
+
+// ----------------------------------------------------------------------
+
+Vector NewbieTutorial::getTutorialLocation()
+{
+	// Pick a random spot, keep them 512m apart, and don't let them get too close to either axis because we are
+	// now using them as server boundaries for multi-server
+	float x, z;
+	do
+	{
+		x = s_tutorialSpacing*Random::random(s_sqrtMaxTutorials-1) - s_tutorialMapWidth/2.0f;
+		z = s_tutorialSpacing*Random::random(s_sqrtMaxTutorials-1) - s_tutorialMapWidth/2.0f;
+	} while (abs(x) < 300.0f || abs(z) < 300.0f);
+	return Vector(x, 0.0f, z);
+}
+
+// ----------------------------------------------------------------------
+
+ServerObject *NewbieTutorial::createTutorial(Vector const &location)
+{
+	FATAL(ServerWorld::getSceneId() != s_sceneId, ("Tried to create a character on a non-tutorial server."));
+
+	Transform tr;
+	tr.setPosition_p(location);
+	ServerObject *tutorial = ServerWorld::createNewObject(
+		s_tutorialTemplate,
+		tr,
+		0,
+		false);
+	if (tutorial)
+		tutorial->addToWorld();
+	return tutorial;
+}
+
+// ----------------------------------------------------------------------
+
+Vector const &NewbieTutorial::getStartCoords()
+{
+	return s_startCoords;
+}
+
+// ----------------------------------------------------------------------
+
+std::string NewbieTutorial::getStartCellName()
+{
+	return s_startCellName;
+}
+
+// ----------------------------------------------------------------------
+
+void NewbieTutorial::setupCharacterForTutorial(ServerObject* character)
+{
+	if (character)
+		character->setObjVarItem(s_tutorialObjVar, 1);
+}
+
+// ----------------------------------------------------------------------
+
+void NewbieTutorial::setupCharacterToSkipTutorial(ServerObject* character)
+{
+	if (character)
+		character->setObjVarItem(s_skipTutorialObjVar, 1);
+}
+
+// ----------------------------------------------------------------------
+
+bool NewbieTutorial::shouldStartTutorial(const ServerObject* character)
+{
+	if (character)
+	{
+		if (character->getObjVars().hasItem(s_tutorialObjVar))
+		{
+			int npePhase = 0;
+			character->getObjVars().getItem(s_tutorialObjVar, npePhase);
+
+			// if the player is in the shared space station or farther, don't restart the tutorial for them
+			if (npePhase <= s_tutorialResetThreshold)
+				return true;
+		}
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool NewbieTutorial::isInTutorial(const ServerObject* character)
+{
+	if (character)
+		if (character->getObjVars().hasItem(s_tutorialObjVar))
+			return true;
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool NewbieTutorial::isInTutorialArea(const ServerObject* character)
+{
+	if (character)
+	{
+		std::string scene = ServerWorld::getSceneId();
+
+		if (isFreeTrialScene(scene))
+			return true;
+
+		Vector position = character->getPosition_w();
+
+		if (isInFreeTrialBuildoutArea(scene, position))
+			return true;
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool NewbieTutorial::isFreeTrialScene(const std::string &scene)
+{
+	for (int i = 0; i < s_numFreeTrialPlanets; ++i)
+	{
+		// if the scene matches the name, return true
+		if (scene.compare(s_freeTrialPlanets[i]) == 0)
+			return true;
+		//otherwise, if the scene name is <scene name>_<num>, we return true (multiple zones)
+		else if (scene.find(s_freeTrialPlanets[i] + "_", 0) == 0 && scene.length() == (s_freeTrialPlanets[i].length() + 2))
+			return true;
+	}
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool NewbieTutorial::isInFreeTrialBuildoutArea(const std::string &scene, const Vector &location)
+{
+	if (scene.substr(0, s_freeTrialBuildoutPlanet.length()) == s_freeTrialBuildoutPlanet)
+	{
+		const BuildoutArea *currentBuildout = SharedBuildoutAreaManager::findBuildoutAreaAtPosition(scene.c_str(), location.x, location.z, false);
+
+		if (currentBuildout)
+		{
+			std::string areaName = currentBuildout->areaName;
+			// if the scene matches a buildout area we know about, return true
+			for (int i = 0; i < s_numFreeTrialBuildoutAreas; ++i)
+				if (areaName.compare(s_freeTrialBuildoutAreas[i]) == 0)
+					return true;
+		}
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void NewbieTutorial::stripNonFreeAssetsFromPlayerInTutorial(const CreatureObject* character)
+{
+	if (!character)
+		return;
+
+	std::vector<ServerObject *> objectsToDelete;
+	const SlottedContainer * const equipmentContainer = ContainerInterface::getSlottedContainer(*character);
+
+	if (equipmentContainer)
+		getNonFreeObjectsForDeletion(equipmentContainer, objectsToDelete, character);
+	else
+		LOG("npe", ("Scanning player %s to stripNonFreeAssets from because they are in a tutorial, but character had no equipment container\n", character->getNetworkId().getValueString().c_str()));
+
+	const ServerObject * inventoryObject = character->getInventory();
+	const VolumeContainer * const inventoryContainer = ContainerInterface::getVolumeContainer(*inventoryObject);
+
+	if (inventoryContainer)
+		getNonFreeObjectsForDeletion(inventoryContainer, objectsToDelete, character);
+	else
+		LOG("npe", ("Scanning player %s to stripNonFreeAssets from because they are in a tutorial, but character had no inventory container\n", character->getNetworkId().getValueString().c_str()));
+
+	for (std::vector<ServerObject *>::iterator i = objectsToDelete.begin(); i != objectsToDelete.end(); ++i)
+		if (*i)
+			(*i)->permanentlyDestroy(DeleteReasons::Player);
+}
+
+// ----------------------------------------------------------------------
+
+void NewbieTutorial::getNonFreeObjectsForDeletion(const Container* const container, std::vector<ServerObject *>& objectsToDelete, const CreatureObject* character)
+{
+	if (!container)
+		return;
+
+	for (ContainerConstIterator i(container->begin()); i != container->end(); ++i)
+	{
+		const CachedNetworkId & itemId = *i;
+		ServerObject * item = safe_cast<ServerObject *>(itemId.getObject());
+		if (item != NULL)
+		{
+			TangibleObject *itemTangible = item->asTangibleObject();
+			if (itemTangible != NULL)
+			{
+				const char *templateName = itemTangible->getSharedTemplateName();
+				if (!FileManifest::contains(templateName))
+				{
+					objectsToDelete.push_back(item);
+					DEBUG_LOG("NewbieTutorialObjectFilter", ("Removing object %s (%s) from player %s because the template is not in the skufree manifest\n", templateName, item->getNetworkId().getValueString().c_str(), character->getNetworkId().getValueString().c_str()));
+					LOG("CustomerService", ("Removing object %s (%s) from player %s because the template is not in the skufree manifest\n", templateName, item->getNetworkId().getValueString().c_str(), character->getNetworkId().getValueString().c_str()));
+				}
+				else
+				{
+					// see if the item is a container and go through its contents
+					const Container * const itemContainer = ContainerInterface::getContainer(*item);
+					if (itemContainer != NULL)
+						getNonFreeObjectsForDeletion(itemContainer, objectsToDelete, character);
+				}
+			}
+		}
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/core/NewbieTutorial.h b/engine/server/library/serverGame/src/shared/core/NewbieTutorial.h
new file mode 100644
index 00000000..86870724
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/NewbieTutorial.h
@@ -0,0 +1,55 @@
+// ======================================================================
+//
+// NewbieTutorial.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _NewbieTutorial_H_
+#define _NewbieTutorial_H_
+
+// ======================================================================
+
+// ======================================================================
+
+class Container;
+class Vector;
+class ServerObject;
+class CreatureObject;
+
+// ======================================================================
+
+class NewbieTutorial // static
+{
+public:
+	static std::string const &getSceneId();
+	static std::string const &getTutorialTemplateName();
+	static ServerObject *createTutorial(Vector const &location);
+
+	static Vector const &getStartCoords();
+	static std::string getStartCellName();
+	static Vector getTutorialLocation();
+
+	static void setupCharacterForTutorial(ServerObject* character);
+	static void setupCharacterToSkipTutorial(ServerObject* character);
+	static bool shouldStartTutorial(const ServerObject* character);
+
+	static bool isInTutorial(const ServerObject* character);
+	static bool isInTutorialArea(const ServerObject* character);
+
+	static void stripNonFreeAssetsFromPlayerInTutorial(const CreatureObject* character);
+private:
+	NewbieTutorial();
+	NewbieTutorial(NewbieTutorial const &);
+	NewbieTutorial const &operator=(NewbieTutorial const &);
+
+	static bool isFreeTrialScene(const std::string &scene);
+	static bool isInFreeTrialBuildoutArea(const std::string &scene, const Vector &location);
+	static void getNonFreeObjectsForDeletion(const Container* const container, std::vector<ServerObject *>& objectsToDelete, const CreatureObject* character);
+};
+
+// ======================================================================
+
+#endif // _NewbieTutorial_H_
+
diff --git a/engine/server/library/serverGame/src/shared/core/NonCriticalTaskQueue.cpp b/engine/server/library/serverGame/src/shared/core/NonCriticalTaskQueue.cpp
new file mode 100644
index 00000000..37d3263a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/NonCriticalTaskQueue.cpp
@@ -0,0 +1,81 @@
+// ======================================================================
+//
+// NonCriticalTaskQueue.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/NonCriticalTaskQueue.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedLog/Log.h"
+
+#include <list>
+
+// ======================================================================
+
+NonCriticalTaskQueue::NonCriticalTaskQueue() :
+		m_tasks(new std::list<TaskRequest*>)
+{
+	ExitChain::add(&remove, "NonCriticalTaskQueue::remove");
+}
+
+// ----------------------------------------------------------------------
+
+NonCriticalTaskQueue::~NonCriticalTaskQueue()
+{
+	for (TaskListType::const_iterator i=m_tasks->begin(); i!=m_tasks->end(); ++i)
+	{
+		delete *i;
+	}
+	delete m_tasks;
+	m_tasks=0;
+}
+
+// ----------------------------------------------------------------------
+
+void NonCriticalTaskQueue::addTask(TaskRequest *newTask)
+{
+	m_tasks->push_back(newTask);
+	//LOG("NonCritialTaskQueue",("Added a task to the queue."));
+}
+
+// ----------------------------------------------------------------------
+
+void NonCriticalTaskQueue::update()
+{
+	int taskLimit=ConfigServerGame::getNonCriticalTasksPerFrame();
+	if (taskLimit <= 0)
+		taskLimit = m_tasks->size();
+	
+	if (static_cast<int>(m_tasks->size()) > taskLimit)
+		LOG("NonCritialTaskQueue",("Backlog:  %i tasks in the queue, %i will be done this frame.",m_tasks->size(),taskLimit));
+
+	while ((taskLimit-- > 0) && !(m_tasks->empty()))
+	{
+		TaskRequest *task = m_tasks->front();
+		m_tasks->pop_front();
+
+		if (task->run())
+		{
+			delete task;
+			task=0;
+//			LOG("NonCritialTaskQueue",("Deleting completed task."));
+		}
+		else
+		{
+			addTask(task);
+//			LOG("NonCritialTaskQueue",("Re-queueing non-completed task."));
+		}
+	}
+}
+
+// ======================================================================
+
+NonCriticalTaskQueue::TaskRequest::~TaskRequest()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/NonCriticalTaskQueue.h b/engine/server/library/serverGame/src/shared/core/NonCriticalTaskQueue.h
new file mode 100644
index 00000000..91fd23d5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/NonCriticalTaskQueue.h
@@ -0,0 +1,66 @@
+// ======================================================================
+//
+// NonCriticalTaskQueue.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_NonCriticalTaskQueue_H
+#define INCLUDED_NonCriticalTaskQueue_H
+
+// ======================================================================
+
+#include "Singleton/Singleton2.h"
+
+// ======================================================================
+
+/** 
+ * A queue of tasks that should not be allowed to bog down the server.
+ * Tasks can be added to this queue as they come in.  As many as possible
+ * will be done each frame.  If too many tasks come in the same frame,
+ * they will be spread out over multiple frames.
+ *
+ * A long task can do a little processing and return itself to the queue.
+ * If there is not much else in the queue, it may get called again in the
+ * same frame.
+ *
+ * This queue is not proxied, so tasks will be lost if the server crashes.
+ * Furthermore, the queue is not aware of what objects tasks require, so
+ * the tasks themselves need to check that the objects are still present.
+ */
+class NonCriticalTaskQueue : public Singleton2<NonCriticalTaskQueue>
+{
+  public:
+	class TaskRequest
+	{
+	  public:
+		/**
+		 * Do the processing for the task, or if it is a long task, do
+		 * a piece of it.
+		 * @return true if it is finished, false it if should
+		 * be returned to the queue.
+		 */
+		virtual bool run() = 0;
+
+	  public:
+		virtual ~TaskRequest();
+	};
+	
+  public:
+	void addTask           (TaskRequest *newTask);
+	void update            ();
+
+  public:
+	NonCriticalTaskQueue   ();
+	~NonCriticalTaskQueue  ();
+
+  private:
+	typedef stdlist<TaskRequest*>::fwd TaskListType;
+	
+	TaskListType *m_tasks;
+};
+
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/NpcConversation.cpp b/engine/server/library/serverGame/src/shared/core/NpcConversation.cpp
new file mode 100644
index 00000000..6ec9d47e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/NpcConversation.cpp
@@ -0,0 +1,338 @@
+//========================================================================
+//
+// NpcConversation.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/NpcConversation.h"
+
+#include "serverGame/TangibleObject.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedGame/OutOfBandPackager.h"
+#include "sharedNetworkMessages/MessageQueueNpcConversationMessage.h"
+#include "sharedNetworkMessages/MessageQueueSpatialChat.h"
+#include "sharedNetworkMessages/MessageQueueStartNpcConversation.h"
+#include "sharedNetworkMessages/MessageQueueStopNpcConversation.h"
+#include "sharedNetworkMessages/MessageQueueStringList.h"
+#include "sharedObject/Controller.h"
+
+//----------------------------------------------------------------------
+
+namespace NpcConversationNamespace
+{
+	void sendMessageToClient (const CachedNetworkId & player, int type, MessageQueue::Data & message)
+	{
+		Object * const playerObject = player.getObject ();		
+		Controller * const controller = playerObject ? playerObject->getController () : 0;
+		
+		if (controller)
+		{
+			controller->appendMessage(
+				type,
+				0.0f, 
+				&message,
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_CLIENT
+				);
+		}
+	}
+}
+
+using namespace NpcConversationNamespace;
+
+
+//----------------------------------------------------------------------
+
+
+/**
+ * Class constructor. Also informs the player a conversation has started.
+ *
+ * @param player		the player in the conversation
+ * @param npc			the npc in the conversation
+ */
+NpcConversation::NpcConversation(TangibleObject & player, TangibleObject & npc, const std::string & convoName, uint32 appearanceOverrideServerTemplateCrc) :
+	m_convoName (convoName),
+	m_player    (player),
+	m_npc       (npc),
+	m_responses (new ResponseVector),
+	m_appearanceOverrideSharedTemplateCrc(appearanceOverrideServerTemplateCrc),
+	m_finalStringId(),
+	m_finalProsePackage()
+
+{
+	// tell the player what is going on
+	MessageQueueStartNpcConversation * const message = new MessageQueueStartNpcConversation;
+
+	message->setNpc     (m_npc);
+	message->setAppearanceOverrideTemplateCrc(m_appearanceOverrideSharedTemplateCrc);
+
+	sendMessageToClient (m_player, CM_npcConversationStart, *message);
+}	// NpcConversation::NpcConversation
+
+//----------------------------------------------------------------------
+
+/**
+ * Class destructor. Also informs the player the conversation has ended.
+ */
+NpcConversation::~NpcConversation()
+{
+	TangibleObject * const player = safe_cast<TangibleObject *>(m_player.getObject());
+	if (player != NULL)
+	{
+		MessageQueueStopNpcConversation * const message = new MessageQueueStopNpcConversation;
+
+		message->setNpc(m_npc);
+		message->setFinalMessageId(m_finalStringId);
+		message->setFinalMessageProse(m_finalProsePackage);
+
+		sendMessageToClient(m_player, CM_npcConversationStop, *message);
+	}
+
+	delete m_responses;
+	m_responses = 0;
+
+}	// NpcConversation::~NpcConversation
+
+//----------------------------------------------------------------------
+
+/**
+ * Sends an npc message to the player.
+ *
+ * @param npcMessage		the message from the npc
+ */
+void NpcConversation::sendMessage(const Response & npcMessage, const Unicode::String & oob)
+{
+	// make sure the player and npc are still around
+	TangibleObject * const player = safe_cast<TangibleObject *>(m_player.getObject());
+	TangibleObject * const npc    = safe_cast<TangibleObject *>(m_npc.getObject());
+
+	if (player == NULL)
+	{
+		if (npc != NULL)
+			npc->removeConversation(m_player);
+		return;
+	}
+	if (npc == NULL)
+	{
+		player->endNpcConversation();
+		return;
+	}
+
+	Unicode::String text;
+	Unicode::String localOob = oob;
+
+	if (!npcMessage.stringId.isInvalid ())
+	{
+		ProsePackage pp;
+		pp.stringId = npcMessage.stringId;
+		OutOfBandPackager::pack (pp, -1, localOob);
+	}
+	
+	if (npcMessage.pp.isValid ())
+	{
+		OutOfBandPackager::pack (npcMessage.pp, -1, localOob);
+	}
+	
+	const int language = 0;
+
+	const MessageQueueSpatialChat msg (m_npc, m_player, text, 0, 0, 0, MessageQueueSpatialChat::F_skipTarget, language, localOob);
+	npc->speakText (msg);
+
+	if (!localOob.empty ())
+	{
+		text.append (static_cast<size_t>(1), static_cast<unsigned short>(0));
+		text.append (localOob);
+	}
+
+	//--
+
+	MessageQueueNpcConversationMessage * const message = new MessageQueueNpcConversationMessage;
+	message->setNpcMessage (text);
+	sendMessageToClient (m_player, CM_npcConversationMessage, *message);
+
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Adds a response to the current response list.
+ *
+ * @param response		the response to add
+ */
+void NpcConversation::addResponse(const Response & response)
+{
+	// make sure the response isn't already in the list
+	for (ResponseVector::iterator it = m_responses->begin (); it != m_responses->end (); ++it)
+	{
+		Response & r = *it;
+
+		if (!response.stringId.isInvalid () && (r.stringId == response.stringId || r.pp.stringId == response.stringId))
+		{
+			WARNING (true, ("NpcConversation::addResponse tried to add duplicate response stringId=[%s], pp=[%s]", 
+				response.stringId.getCanonicalRepresentation ().c_str (), response.pp.stringId.getCanonicalRepresentation ().c_str ()));
+			return;
+		}
+	}
+
+	m_responses->push_back(response);
+
+}	// NpcConversation::addResponse
+
+//----------------------------------------------------------------------
+
+/**
+ * Removes a response from the current response list.
+ *
+ * @param response		the response to remove
+ */
+void NpcConversation::removeResponse(const Response & response)
+{
+	for (ResponseVector::iterator it = m_responses->begin (); it != m_responses->end ();)
+	{
+		Response & r = *it;
+
+		if (!response.stringId.isInvalid () && (r.stringId == response.stringId || r.pp.stringId == response.stringId))
+			it = m_responses->erase (it);
+		else
+			++it;
+	}
+
+}	// NpcConversation::removeResponse
+
+//----------------------------------------------------------------------
+
+/**
+ * Sends the current responses to the player.
+ */
+void NpcConversation::sendResponses()
+{
+	// make sure the player and npc are still around
+	TangibleObject * const player = safe_cast<TangibleObject *>(m_player.getObject());
+	TangibleObject * const npc = safe_cast<TangibleObject *>(m_npc.getObject());
+
+	const int count = static_cast<int>(m_responses->size());
+
+	if (player == NULL)
+	{
+		if (npc != NULL)
+			npc->removeConversation(m_player);
+		return;
+	}
+	if (npc == NULL)
+	{
+		player->endNpcConversation();
+		return;
+	}
+	
+	MessageQueueStringList * const message = new MessageQueueStringList;
+
+	static Unicode::String text;
+	static Unicode::String localOob;
+
+	// convert the string ids to Unicode::Strings
+	for (int i = 0; i < count; ++i)
+	{
+		const Response & response = m_responses->at(i);
+	
+		text.clear     ();
+		localOob.clear ();
+		
+		if (!response.stringId.isInvalid ())
+		{			
+			ProsePackage pp;
+			pp.stringId = response.stringId;
+			OutOfBandPackager::pack (pp, -1, localOob);			
+		}
+		
+		if (response.pp.isValid ())
+		{
+			OutOfBandPackager::pack (response.pp, -1, localOob);
+		}
+
+		if (!localOob.empty ())
+		{
+			text.append (static_cast<size_t>(1), static_cast<unsigned short>(0));
+			text.append (localOob);
+		}
+
+		message->addString(text);
+	}
+
+	// send the responses to the player
+	sendMessageToClient (m_player, CM_npcConversationResponses, *message);
+
+}	// NpcConversation::sendResponses
+
+//----------------------------------------------------------------------
+
+/**
+ * Returns the StringId associated with a reponses' index. If the index is out 
+ * of range will return the lowest or highest index response. If there are no 
+ * responses will return an empty Stringid.
+ *
+ * @param index		the response index
+ *
+ * @return the response StringId
+ */
+const NpcConversation::Response & NpcConversation::getResponse(int index) const
+{
+	const static Response dummy;
+
+	if (m_responses->empty())
+		return dummy;
+
+	const int size = static_cast<int>(m_responses->size());
+	if (index < 0)
+		index = 0;
+	if (index >= size)
+		index = size - 1;
+	return m_responses->at(static_cast<size_t>(index));
+}	// NpcConversation::getResponse
+
+//----------------------------------------------------------------------
+
+void NpcConversation::clearResponses()
+{
+	m_responses->clear();
+}
+
+//----------------------------------------------------------------------
+
+int NpcConversation::getResponseCount() const
+{
+	return m_responses->size();
+}
+
+//----------------------------------------------------------------------
+
+void NpcConversation::setFinalStringId(StringId const & stringId)
+{
+	m_finalStringId = stringId;
+}
+
+//----------------------------------------------------------------------
+
+StringId const & NpcConversation::getFinalStringId() const
+{
+	return m_finalStringId;
+}
+
+//----------------------------------------------------------------------
+
+void NpcConversation::setFinalProsePackage(Unicode::String const & pp)
+{
+	m_finalProsePackage = pp;
+}
+
+//----------------------------------------------------------------------
+
+Unicode::String const & NpcConversation::getFinalProsePackage() const
+{
+	return m_finalProsePackage;
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/core/NpcConversation.h b/engine/server/library/serverGame/src/shared/core/NpcConversation.h
new file mode 100644
index 00000000..72d8d185
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/NpcConversation.h
@@ -0,0 +1,113 @@
+//========================================================================
+//
+// NpcConversation.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef INCLUDED_NpcConversation_H
+#define INCLUDED_NpcConversation_H
+
+#include "StringId.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedObject/CachedNetworkId.h"
+
+#include <string>
+
+class TangibleObject;
+class StringId;
+
+//----------------------------------------------------------------------
+
+class NpcConversation
+{
+public:
+	NpcConversation  (TangibleObject & player, TangibleObject & npc, const std::string & convoName, uint32 appearanceOverrideSharedTemplateCrc);
+	~NpcConversation ();
+
+	class Response
+	{
+	public:
+		StringId     stringId;
+		ProsePackage pp;
+
+		bool         isValid () const { return !stringId.isInvalid () || !pp.stringId.isInvalid (); }
+
+		bool operator == (const Response & rhs) const
+		{
+			return stringId == rhs.stringId && pp == rhs.pp;
+		}
+	};
+
+	const CachedNetworkId & getPlayer        () const;
+	const CachedNetworkId & getNPC           () const;
+	const std::string &     getName          () const;
+
+	void                    sendMessage      (const Response & response, const Unicode::String & oob);
+	void                    addResponse      (const Response & response);
+	void                    removeResponse   (const Response & response);
+	void                    clearResponses   ();
+	void                    sendResponses    ();
+
+	int                     getResponseCount () const;
+	const Response &        getResponse      (int index) const;
+	uint32                  getAppearanceOverrideSharedTemplateCrc() const;
+
+	void setFinalStringId(StringId const & stringId);
+	StringId const & getFinalStringId() const;
+
+	void setFinalProsePackage(Unicode::String const & oob);
+	Unicode::String const & getFinalProsePackage() const;
+
+private:
+
+	std::string                      m_convoName;
+	CachedNetworkId                  m_player;
+	CachedNetworkId                  m_npc;
+
+	typedef stdvector<Response>::fwd ResponseVector;
+	ResponseVector *                 m_responses;
+	uint32                           m_appearanceOverrideSharedTemplateCrc;
+
+
+	StringId                         m_finalStringId;
+	Unicode::String                  m_finalProsePackage;
+
+private:
+	// no copying
+	NpcConversation(const NpcConversation &src);
+	NpcConversation & operator =(const NpcConversation &src);
+};
+
+//----------------------------------------------------------------------
+
+inline const CachedNetworkId & NpcConversation::getPlayer() const
+{
+	return m_player;
+}
+
+//----------------------------------------------------------------------
+
+inline const CachedNetworkId & NpcConversation::getNPC() const
+{
+	return m_npc;
+}
+
+//----------------------------------------------------------------------
+
+inline const std::string & NpcConversation::getName() const
+{
+	return m_convoName;
+}
+
+//----------------------------------------------------------------------
+
+inline uint32 NpcConversation::getAppearanceOverrideSharedTemplateCrc() const
+{
+	return m_appearanceOverrideSharedTemplateCrc;
+}
+
+//----------------------------------------------------------------------
+
+#endif	// INCLUDED_NpcConversation_H
diff --git a/engine/server/library/serverGame/src/shared/core/ObjectIdManager.cpp b/engine/server/library/serverGame/src/shared/core/ObjectIdManager.cpp
new file mode 100644
index 00000000..e36bd036
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ObjectIdManager.cpp
@@ -0,0 +1,170 @@
+// ======================================================================
+//
+// ObjectIdManager.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ObjectIdManager.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/GameServer.h"
+#include "serverNetworkMessages/AddObjectIdBlockMessage.h"
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "serverNetworkMessages/RequestObjectIdsMessage.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedLog/Log.h"
+#include "sharedMessageDispatch/Emitter.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+ObjectIdManager::ObjectIdManager() :
+		Singleton<ObjectIdManager>(),
+		numAvailableIds(0),
+		numRequestedIds(0),
+		m_minReservedIds(ConfigServerGame::getMinObjectIds()),
+		m_maxReservedIds(ConfigServerGame::getReservedObjectIds()),
+		m_gotABlock(false)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ObjectIdManager::ObjectIdManager");
+	DEBUG_FATAL((m_maxReservedIds<=m_minReservedIds),("maxReservedIds must be greater than minReservedIds."));
+	
+	connectToMessage("AddOIDBlockMessage");
+	connectToMessage("CentralGameServerSetProcessId");
+}
+
+// ----------------------------------------------------------------------
+
+ObjectIdManager::~ObjectIdManager()
+{
+//@todo:  release freelist
+}
+
+//-----------------------------------------------------------------------
+
+NetworkId const ObjectIdManager::getNewObjectId()
+{
+	return getInstance().getNewObjectIdInternal();
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const ObjectIdManager::getNewObjectIdInternal()
+{
+	if (numAvailableIds==0)
+	{
+		if (m_gotABlock)
+			FATAL(true,("Out of available object ID's"));
+		else
+			FATAL(true,("Requested an object ID before any were received.\n"));
+		return NetworkId::cms_invalid;
+	}
+	
+	FreeListType::iterator i=m_freeList.begin();
+	DEBUG_FATAL((i==m_freeList.end()),("numAvailableIds was non-zero but freelist was empty."));
+	
+	NetworkId::NetworkIdType theId=(*i).m_start;
+	
+	if (++((*i).m_start) > (*i).m_end)
+	{ // this block is now empty
+		m_freeList.erase(i);
+	}
+	
+	if ((--numAvailableIds+numRequestedIds) < m_minReservedIds)
+	{
+		requestMoreObjectIds(m_maxReservedIds - numAvailableIds - numRequestedIds, false);
+	}
+	
+	return NetworkId(theId);
+}
+
+void ObjectIdManager::requestMoreObjectIds(int howMany, bool logRequest, uint32 processId)
+{
+	DEBUG_REPORT_LOG(true,("Requesting %i object ID's\n",howMany));
+
+	if (logRequest)
+		LOG("ObjectIdManager", ("Requesting %d more object ids for pid %lu, numAvailableIds=%d, numRequestedIds=%d, m_minReservedIds=%d, m_maxReservedIds=%d, m_gotABlock=%s", howMany, ((processId == 0) ? GameServer::getInstance().getProcessId() : processId), numAvailableIds, numRequestedIds, m_minReservedIds, m_maxReservedIds, (m_gotABlock ? "yes" : "no")));
+
+	RequestOIDsMessage const msg(processId==0?GameServer::getInstance().getProcessId():processId, howMany, logRequest);
+	GameServer::getInstance().sendToCentralServer(msg);
+
+	numRequestedIds+=howMany;
+}
+
+void ObjectIdManager::release()
+{
+	for (FreeListType::iterator i=m_freeList.begin(); i!=m_freeList.end(); ++i)
+	{
+		//@todo:  send release message
+	}
+}
+
+void ObjectIdManager::receiveMessage(const MessageDispatch::Emitter & source, const MessageDispatch::MessageBase & message)
+{
+	UNREF(source);
+	if(message.isType("AddOIDBlockMessage"))
+	{
+		Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+		AddOIDBlockMessage msg(ri);
+
+		if (msg.getLogRequest())
+			LOG("ObjectIdManager", ("Received object ids (%s - %s) for pid %lu", msg.getStart().getValueString().c_str(), msg.getEnd().getValueString().c_str(), msg.getServerId()));
+
+		addBlock(msg.getStart().getValue(), msg.getEnd().getValue());
+	}
+	if(message.isType("CentralGameServerSetProcessId"))
+	{
+		Archive::ReadIterator ri = static_cast<const GameNetworkMessage &>(message).getByteStream().begin();
+		CentralGameServerSetProcessId m(ri);
+		uint32 const processId = m.getProcessId();
+
+		if ((numAvailableIds+numRequestedIds) < m_minReservedIds)
+		{
+			LOG("ObjectIdManager", ("ObjectIdManager received CentralGameServerSetProcessId message for pid %lu, numAvailableIds=%d, numRequestedIds=%d, m_minReservedIds=%d, m_maxReservedIds=%d, m_gotABlock=%s, requesting more object ids", processId, numAvailableIds, numRequestedIds, m_minReservedIds, m_maxReservedIds, (m_gotABlock ? "yes" : "no")));
+			requestMoreObjectIds(m_maxReservedIds - numAvailableIds - numRequestedIds, true, processId);
+		}
+		else
+		{
+			LOG("ObjectIdManager", ("ObjectIdManager received CentralGameServerSetProcessId message for pid %lu, numAvailableIds=%d, numRequestedIds=%d, m_minReservedIds=%d, m_maxReservedIds=%d, m_gotABlock=%s, ***NOT*** requesting more object ids?????", processId, numAvailableIds, numRequestedIds, m_minReservedIds, m_maxReservedIds, (m_gotABlock ? "yes" : "no")));
+		}
+	}
+}
+
+void ObjectIdManager::addBlock(NetworkId::NetworkIdType start, NetworkId::NetworkIdType end)
+{
+	DEBUG_REPORT_LOG(true,("Adding NetworkId block from %s to %s\n",NetworkId(start).getValueString().c_str(),NetworkId(end).getValueString().c_str()));
+	m_gotABlock=true;
+	m_freeList.push_back(FreeListEntry(start,end));
+	numAvailableIds+=static_cast<int>(end-start+1); // No way this should be more than an int's worth of id's
+	numRequestedIds-=static_cast<int>(end-start+1);
+	if (numRequestedIds<0)
+		numRequestedIds=0; // we may recieve more ID's than we asked for.  (This is allowed by design to avoid fragmentation issues.)
+
+	if (m_freeList.size() == 1)
+	{
+		GameServer::getInstance().onReceivedFirstNetworkIdBlock();
+	}
+}
+
+#if 0 // code for printing the freelist.  Commented out until we need it.
+
+const std::string ObjectIdManager::debugDumpFreelist()
+{
+	std::string buffer="Object ID Freelist:\n";
+	char temp[100];
+	
+	FreeListEntry *e=freeList;
+	while (e)
+	{
+		sprintf(temp,"     Block:  %li to %li\n",e->start,e->end);
+		buffer+=temp;
+		e=e->next;
+	}
+	return buffer;
+}
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/ObjectIdManager.h b/engine/server/library/serverGame/src/shared/core/ObjectIdManager.h
new file mode 100644
index 00000000..4fef60b8
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ObjectIdManager.h
@@ -0,0 +1,101 @@
+// ======================================================================
+//
+// ObjectIdManager.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ObjectIdManager_H
+#define INCLUDED_ObjectIdManager_H
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMessageDispatch/Receiver.h"
+#include "Singleton/Singleton.h"
+
+#include <list>
+
+// ======================================================================
+
+/**
+ * Keeps a list of available object id's.  If the list gets
+ * too small, requests more from centralServer
+ */
+class ObjectIdManager : public Singleton<ObjectIdManager>, public MessageDispatch::Receiver
+{
+  public:
+/* 	enum //@todo Should be config file options */
+/* 	  { */
+/* 		  minReservedIds=500,	 // How small can the freelist get before we ask for more */
+/* 		  targetReservedIds=1000 // The maximum number of ID's we'd like to have in the */
+/* 								 // freelist.  Whenever we go below minNumIds, we load enough */
+/* 								 // to bring it up to this. */
+/* 	  }; */
+
+	ObjectIdManager();
+	~ObjectIdManager();
+
+	virtual void receiveMessage(const MessageDispatch::Emitter & source, const MessageDispatch::MessageBase & message);
+	
+	static NetworkId const getNewObjectId();
+	static bool hasAvailableObjectId();
+	
+  private:
+	NetworkId const getNewObjectIdInternal();
+
+	struct FreeListEntry
+	{
+		NetworkId::NetworkIdType m_start;
+		NetworkId::NetworkIdType m_end;
+		FreeListEntry(NetworkId::NetworkIdType start, NetworkId::NetworkIdType end);
+		FreeListEntry() {} // to make STL happy
+	};
+	typedef std::list<FreeListEntry> FreeListType;
+	FreeListType m_freeList;
+
+	/** How many ID's are in the freelist
+	*/
+	int numAvailableIds;
+	/**
+	 * How many ID's have we already requested.
+	 * We use this to avoid sending extra requests
+	 * while we're waiting for a response.
+	 */
+	int numRequestedIds;
+
+	int m_minReservedIds;    // How small can the freelist get before we ask for more
+	int m_maxReservedIds;    // The maximum number of ID's we'd like to have in the freelist
+	bool m_gotABlock;        // True if we ever received a block (for debugging)
+
+  private:
+	friend class ServerObjectLint;
+	void requestMoreObjectIds(int howMany, bool logRequest, uint32 processId=0);
+	void release();
+	
+	void addBlock(NetworkId::NetworkIdType start, NetworkId::NetworkIdType end);
+
+	// const std::string debugDumpFreelist();
+	ObjectIdManager(const ObjectIdManager&);  //disable
+	ObjectIdManager &operator=(const ObjectIdManager&); //disable
+
+};
+
+// ----------------------------------------------------------------------
+
+inline ObjectIdManager::FreeListEntry::FreeListEntry(NetworkId::NetworkIdType start, NetworkId::NetworkIdType end) :
+	m_start(start),
+	m_end(end)
+{
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ObjectIdManager::hasAvailableObjectId()
+{
+	return (getInstance().numAvailableIds > 0);
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/ObserveTracker.cpp b/engine/server/library/serverGame/src/shared/core/ObserveTracker.cpp
new file mode 100644
index 00000000..78fe2d74
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ObserveTracker.cpp
@@ -0,0 +1,971 @@
+// ======================================================================
+//
+// ObserveTracker.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ObserveTracker.h"
+
+#include "serverGame/BaselineDistributionListPool.h"
+#include "serverGame/Client.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/DestroyMessageManager.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/GuildObject.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/PortalTriggerVolume.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerObjectBaselinesManager.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipClientUpdateTracker.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/SpaceVisibilityManager.h"
+#include "sharedFoundation/Clock.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/Scheduler.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/SlottedContainmentProperty.h"
+#include <map>
+#include <deque>
+#include <set>
+
+// ======================================================================
+
+namespace ObserveTrackerNamespace
+{
+	typedef std::pair<ServerObject *, Client *>                UnobserveCbInfo;
+	typedef std::deque<UnobserveCbInfo>                        UnobserveCbInfoQueue;
+	typedef std::map<Client *, UnobserveCbInfo *>              UnobserveCbInfoMapEntry;
+	typedef std::map<ServerObject *, UnobserveCbInfoMapEntry>  UnobserveCbInfoMap;
+
+	bool                  s_installed;
+	Scheduler *           s_observeTrackerScheduler;
+	UnobserveCbInfoQueue  s_unobserveCallbacksOrdered;
+	UnobserveCbInfoMap    s_unobserveCallbackMap;
+
+	bool observe(Client &client, ServerObject &obj, std::set<NetworkId> const *oldObserveList = 0);
+	void unobserve(Client &client, ServerObject &obj, bool sendDestroy);
+	void setUnobserveCallback(Client &client, ServerObject &obj);
+	void removeUnobserveCallback(Client *client, ServerObject &obj);
+	bool observeContainmentChain(Client &client, ServerObject &obj, std::set<NetworkId> const *oldObserveList);
+	void observeContents(Client &client, ServerObject &obj, std::set<NetworkId> const *oldObserveList, bool recursive);
+	void observeContentsIfObservedWithParent(Client &client, ServerObject &obj, std::set<NetworkId> const *oldObserveList);
+	bool shouldObserveCellContentsDueToClientContainmentChain(Client const &client, ServerObject const &portallizedObject);
+	void observeMissionCriticalObjects(Client &client, CreatureObject const &clientCreature);
+	void handleUnobserveCallback(void const *);
+}
+using namespace ObserveTrackerNamespace;
+
+// ======================================================================
+
+void ObserveTracker::install()
+{
+	FATAL(s_installed, ("ObserveTracker::install - already installed"));
+	s_installed = true;
+	s_observeTrackerScheduler = new Scheduler;
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::remove()
+{
+	FATAL(!s_installed, ("ObserveTracker::remove - not installed"));
+	delete s_observeTrackerScheduler;
+	s_observeTrackerScheduler = 0;
+	s_unobserveCallbacksOrdered.clear();
+	s_unobserveCallbackMap.clear();
+	s_installed = false;
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::update()
+{
+	NOT_NULL(s_observeTrackerScheduler);
+	s_observeTrackerScheduler->update(Clock::timeMs());
+}
+
+// ----------------------------------------------------------------------
+
+bool ObserveTracker::isObserving(Client const &client, ServerObject const &obj)
+{
+	return obj.getObservers().count(const_cast<Client *>(&client)) == 1;
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onObjectControlled(Client &client, ServerObject &obj, std::set<NetworkId> const &oldObserveList)
+{
+	if (ConfigServerGame::getLogObservers())
+		LOG("ObserveTracker", ("onObjectControlled begin: client %s object %s", client.getCharacterObjectId().getValueString().c_str(), obj.getNetworkId().getValueString().c_str()));
+
+	// When an object is controlled, if it was already being observed,
+	// and baselines are not waiting to be sent, then we need to push
+	// out baselines for the auth* packages to that client.
+	// Note: firstParent* packages still do not behave properly for
+	// objects contained by newly controlled objects, but that
+	// functionality is not currently needed.
+	if (isObserving(client, obj))
+	{
+		std::vector<Watcher<Client> > * const baselineDistributionList = BaselineDistributionListPool::get(obj, false);
+		if (!baselineDistributionList || std::find(baselineDistributionList->begin(), baselineDistributionList->end(), static_cast<Client const *>(&client)) == baselineDistributionList->end())
+			obj.sendAuthClientBaselines(client);
+	}
+	
+	// clients should observe the containment chain of their controlled objects
+	FATAL(!observeContainmentChain(client, obj, &oldObserveList), ("Client for object %s could not observe its own containment chain.", obj.getDebugInformation().c_str()));
+
+	// clients should observe the master guild object
+	GuildObject * const masterGuildObject = ServerUniverse::getInstance().getMasterGuildObject();
+	if (masterGuildObject)
+		IGNORE_RETURN(observe(client, *masterGuildObject, &oldObserveList));
+
+	CreatureObject * const objAsCreature = obj.asCreatureObject();
+	if (objAsCreature)
+	{
+		// clients with controlled creatures should observe all their contents and indirect contents
+		observeContents(client, obj, &oldObserveList, true);
+		// clients with controlled creatures should observe their group object
+		GroupObject * const group = objAsCreature->getGroup();
+		if (group)
+			IGNORE_RETURN(observe(client, *group, &oldObserveList));
+	}
+
+	if (!ServerWorld::isSpaceScene())
+	{
+		if (obj.isInWorld())
+		{
+			// trigger any observation due to network or portal trigger volumes
+			if (obj.getTriggerVolumeEntered())
+			{
+				const std::set<TriggerVolume *> triggerVolumeEntered = *(obj.getTriggerVolumeEntered());
+				for (std::set<TriggerVolume *>::const_iterator i = triggerVolumeEntered.begin(); i != triggerVolumeEntered.end(); ++i)
+				{
+					if ((*i)->isNetworkTriggerVolume())
+						onClientEnteredNetworkTriggerVolume(client, **i, &oldObserveList);
+					else if ((*i)->isPortalTriggerVolume())
+						onClientEnteredPortalTriggerVolume(client, **i, &oldObserveList);
+				}
+			}
+		}
+	}
+	else
+	{
+		// observe any mission critical objects
+		CreatureObject const * const clientCreature = obj.asCreatureObject();
+		if (clientCreature)
+			observeMissionCriticalObjects(client, *clientCreature);
+	}
+
+	if (ConfigServerGame::getLogObservers())
+		LOG("ObserveTracker", ("onObjectControlled end: client %s object %s", client.getCharacterObjectId().getValueString().c_str(), obj.getNetworkId().getValueString().c_str()));
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onClientControlComplete(Client &client, std::set<NetworkId> const &oldObserveList)
+{
+	// Anything in the old observe list that either doesn't exist on this server or that we
+	// are not observing at this point, we need to send destroy messages for.
+	for (std::set<NetworkId>::const_iterator j = oldObserveList.begin(); j != oldObserveList.end(); ++j)
+	{
+		ServerObject const * const so = safe_cast<ServerObject const *>(NetworkIdManager::getObjectById(*j));
+		if (!so || (so->getSendToClient() && !isObserving(client, *so)))
+		{
+			DestroyMessageManager::add(&client, *j, false);
+			if (ConfigServerGame::getLogObservers())
+				LOG("ObserveTracker", ("onClientControlComplete sending destroy: client %s object %s", client.getCharacterObjectId().getValueString().c_str(), (*j).getValueString().c_str()));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onClientAddedVisibleObjectSpace(Client &client, ServerObject &visibleObject)
+{
+	DEBUG_REPORT_LOG(ConfigServerGame::getDebugSpaceVisibilityManager(),("ObserveTracker::onClientAddedVisibleObjectSpace(Client &client, %s);\n",visibleObject.getNetworkId().getValueString().c_str()));
+
+	IGNORE_RETURN(observe(client, visibleObject));
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onClientLostVisibleObjectSpace(Client &client, ServerObject &visibleObject)
+{
+	DEBUG_REPORT_LOG(ConfigServerGame::getDebugSpaceVisibilityManager(),("ObserveTracker::onClientLostVisibleObjectSpace(Client &client, %s);\n",visibleObject.getNetworkId().getValueString().c_str()));
+	//NOTE:  This will not work with multiple controlled objects that are not contained by each other
+
+	// do not unobserve mission critical objects
+	CreatureObject const * const creatureObject = safe_cast<CreatureObject const *>(client.getCharacterObject());
+	if (!creatureObject || !creatureObject->isMissionCriticalObject(visibleObject.getNetworkId()))
+		setUnobserveCallback(client, visibleObject);
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onClientEnteredNetworkTriggerVolume(Client &client, TriggerVolume &triggerVolume, std::set<NetworkId> const *oldObserveList)
+{
+	IGNORE_RETURN(observe(client, triggerVolume.getOwner(), oldObserveList));
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onClientExitedNetworkTriggerVolume(Client &client, TriggerVolume &triggerVolume)
+{
+	// If the trigger volume no longer contains any controlled objects of this client, set an unobserve callback for its owner
+
+	std::vector<ServerObject *> const &controlledObjects = client.getControlledObjects();
+	for (std::vector<ServerObject *>::const_iterator i = controlledObjects.begin(); i != controlledObjects.end(); ++i)
+		if (triggerVolume.hasObject(**i))
+			return;
+
+	setUnobserveCallback(client, triggerVolume.getOwner());
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onClientEnteredPortalTriggerVolume(Client &client, TriggerVolume &triggerVolume, std::set<NetworkId> const *oldObserveList)
+{
+	observeContents(client, triggerVolume.getOwner(), oldObserveList, false);
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onClientExitedPortalTriggerVolume(Client &, TriggerVolume &)
+{
+	// We could set unobserve callbacks for contents of cells of the trigger volume owner if desired here,
+	// but not doing so still results in correct observation semantics.
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onClientJoinedGroup(Client &client, ServerObject &group)
+{
+	IGNORE_RETURN(observe(client, group));
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onClientLeftGroup(Client &client, ServerObject &group)
+{
+	unobserve(client, group, true);
+}
+
+// ----------------------------------------------------------------------
+
+bool ObserveTracker::onClientOpenedContainer(Client &client, ServerObject &obj, int sequence, std::string const &slotDesc, bool sendOpenContainerNotification)
+{
+	// Clients can only open containers that they are observing.
+	if (isObserving(client, obj))
+	{
+		if (client.getOpenedContainers().insert(&obj).second)
+		{
+			// The container was not open for this client, so observe its contents.
+			observeContents(client, obj, 0, false);
+		}		
+
+		if (sendOpenContainerNotification)
+		{
+			// Set up a container open notification to be send to the opening client.
+			ServerObjectBaselinesManager::addOpenedContainer(client, sequence, obj.getNetworkId(), slotDesc);
+		}
+
+		return true;
+	}
+
+	DEBUG_WARNING(true, ("ObserveTracker::onClientOpenedContainer client %s tried to open a container %s that was not being observed.", client.getCharacterObjectId().getValueString().c_str(), obj.getNetworkId().getValueString().c_str()));
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool ObserveTracker::onClientClosedContainer(Client &client, ServerObject &obj)
+{
+	if (client.getOpenedContainers().erase(&obj))
+	{
+		// If we decide to use this message in the future, we can reenable it, but as it stands we don't use this for anything.
+		//send(GenericValueTypeMessage<NetworkId>("ClosedContainerMessage", obj.getNetworkId()), true);
+		return true;
+	}
+	return false;
+} //lint !e1764 // obj used in a nonconst manner
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onClientAboutToTransferAuthority(Client &client)
+{
+	// Since client is about to transfer authority, we need to purge out any
+	// unsent pending baselines from its observation lists, since they may
+	// depend on the state of the client which is about to go away.
+	static std::vector<ServerObject*> objectsToUnobserve;
+	objectsToUnobserve.clear();
+
+	Client::ObservingList const &observing = client.getObserving();
+	for (Client::ObservingList::const_iterator i = observing.begin(); i != observing.end(); ++i)
+	{
+		if ((*i)->isPatrolPathNode())
+			(*i)->removePatrolPathObserver();
+		if ((*i)->getSendToClient() && (*i)->removeFromBaselineDistributionList(client))
+			objectsToUnobserve.push_back(*i);
+	}
+
+	for (std::vector<ServerObject*>::const_iterator i2 = objectsToUnobserve.begin(); i2 != objectsToUnobserve.end(); ++i2)
+	{
+		IGNORE_RETURN((*i2)->removeObserver(&client));
+		client.removeObserving(*i2);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onObjectContainerChanged(ServerObject &obj)
+{
+	ServerObject * const newContainer = safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(obj));
+	if (newContainer)
+	{
+		// If an object controlled by a client is entering a new container, they
+		// should reobserve their containment chain, which will observe newly
+		// exposed contents as appropriate.
+		Client * const client = obj.getClient();
+		if (client)
+			FATAL(!observeContainmentChain(*client, obj, 0), ("Client for object %s could not observe its own containment chain.", obj.getDebugInformation().c_str()));
+
+		{
+			// all clients that were observing obj but are not observing its new container must unobserve obj
+			std::set<Client *> const oldObservers = obj.getObservers();
+			for (std::set<Client *>::const_iterator i = oldObservers.begin(); i != oldObservers.end(); ++i)
+				if (!isObserving(**i, *newContainer))
+					unobserve(**i, obj, true);
+		}
+
+		{
+			// All clients which are observing the new container and must be observing
+			// its contents must observe obj.
+			bool isObservedWith = (newContainer->getContainerProperty() ? newContainer->getContainerProperty()->isContentItemObservedWith(obj) : false);
+			CellProperty * newContainerCell = newContainer->getCellProperty();
+			ServerObject const * newContainerContainer = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*newContainer));
+			if (newContainerCell == NULL || newContainerContainer != NULL)
+			{
+				std::set<Client *> const &newObservers = newContainer->getObservers();
+				for (std::set<Client *>::const_iterator i = newObservers.begin(); i != newObservers.end(); ++i)
+				{
+					if (isObservedWith ||
+						(*i)->getOpenedContainers().count(newContainer) ||
+						(newContainerCell != NULL && shouldObserveCellContentsDueToClientContainmentChain(**i, *newContainerContainer)))
+					{
+						IGNORE_RETURN(observe(**i, obj));
+					}
+				}
+			}
+			else
+			{
+				WARNING(true, ("ObserveTracker::onObjectContainerChanged object %s inside cell %s that has no parent container",
+					obj.getNetworkId().getValueString().c_str(), newContainer->getNetworkId().getValueString().c_str()));
+			}
+		}
+
+
+		// The object should be observed by any clients on creatures which contain it.
+		// Note: we skip observation if the client is not observing the new container,
+		// which may be the case when container transfers occur in virtualOnSetClient.
+		for (ServerObject *o = &obj; o; o = safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(*o)))
+		{
+			if (o->asCreatureObject())
+			{
+				Client * const containingClient = o->getClient();
+				if (containingClient && isObserving(*containingClient, *newContainer))
+					if (observe(*containingClient, obj))
+						observeContents(*containingClient, obj, 0, true);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onObjectArrangementChanged(ServerObject &obj)
+{
+	// If the object moved into an appearance slot of a creature, remove any
+	// unobserve callbacks for it, because it is going into packed wearables
+	// data and will still exist as an object on clients that we don't want to
+	// send a destroy for, even though we are no longer actually observing it.
+	ServerObject * const newContainer = safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(obj));
+	if (newContainer && newContainer->asCreatureObject())
+	{
+		SlottedContainmentProperty * const scp = ContainerInterface::getSlottedContainmentProperty(obj);
+		if (scp && scp->isInAppearanceSlot())
+			removeUnobserveCallback(0, obj);
+	}	
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onObjectMadeInvisible(ServerObject &obj)
+{
+	// obj became invisible to some clients, so run through all observers
+	// and make any of them unobserve that should no longer see it.
+	std::set<Client *> const observers = obj.getObservers();
+	for (std::set<Client *>::const_iterator i = observers.begin(); i != observers.end(); ++i)
+		if (!obj.isVisibleOnClient(**i))
+			unobserve(**i, obj, true);
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onObjectMadeVisibleTo(ServerObject &obj, const std::vector<ServerObject *> & observers)
+{
+	for (std::vector<ServerObject *>::const_iterator i = observers.begin(); i != observers.end(); ++i)
+	{
+		Client * const client = (*i)->getClient();
+		if (client && obj.isVisibleOnClient(*client))
+			IGNORE_RETURN(observe(*client, obj, 0));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onClientDestroyed(Client &client)
+{
+	// client is being destroyed, so clean up observation related references
+	// to it.
+	Client::ObservingList const &observing = client.getObserving();
+	for (Client::ObservingList::const_iterator i = observing.begin(); i != observing.end(); ++i)
+	{
+		ServerObject * const obj = *i;
+		removeUnobserveCallback(&client, *obj);
+		if (obj->isPatrolPathNode())
+			obj->removePatrolPathObserver();
+		if (obj->getSendToClient())
+			IGNORE_RETURN(obj->removeFromBaselineDistributionList(client));
+		IGNORE_RETURN(obj->removeObserver(&client));
+	}
+	client.removeAllObserving();
+	PvpUpdateObserver::removeClientFromPvpStatusCache(&client);
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onObjectDestroyed(ServerObject &obj, bool const hyperspace)
+{
+	// obj is being destroyed, so clean up observation related references to it,
+	// and set up a destroy message to be sent to observers if appropriate.
+
+	const std::set<Client *> &observers = obj.getObservers();
+	for (std::set<Client *>::const_iterator i = observers.begin(); i != observers.end(); ++i)
+	{
+		(*i)->removeObserving(&obj);
+		IGNORE_RETURN(onClientClosedContainer(**i, obj));
+		if (obj.getSendToClient() && !obj.removeFromBaselineDistributionList(**i))
+			DestroyMessageManager::add(*i, obj.getNetworkId(), hyperspace);
+	}
+	obj.clearObservers();
+
+	removeUnobserveCallback(0, obj);
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onGodModeChanged(Client &client)
+{
+	static std::vector<ServerObject*> objectsToObserveOrUnobserve;
+	objectsToObserveOrUnobserve.clear();
+
+	if (client.isGod())
+	{
+		// If the client just entered god mode, redo any trigger volume related observation.
+		if (ServerWorld::isSpaceScene())
+		{
+			std::vector<ServerObject *> results;
+			SpaceVisibilityManager::getObjectsVisibleFromLocation(ContainerInterface::getTopmostContainer(*client.getCharacterObject())->getPosition_p(), results);
+			for (std::vector<ServerObject *>::const_iterator i = results.begin(); i != results.end(); ++i)
+				IGNORE_RETURN(observe(client, **i));
+		}
+		else
+		{
+			std::vector<ServerObject *> const &controlledObjects = client.getControlledObjects();
+			for (std::vector<ServerObject *>::const_iterator i = controlledObjects.begin(); i != controlledObjects.end(); ++i)
+			{
+				if ((*i)->getTriggerVolumeEntered())
+				{
+					const std::set<TriggerVolume *> triggerVolumeEntered = *((*i)->getTriggerVolumeEntered());
+					for (std::set<TriggerVolume *>::const_iterator j = triggerVolumeEntered.begin(); j != triggerVolumeEntered.end(); ++j)
+					{
+						if ((*j)->isNetworkTriggerVolume())
+						{
+							if ((*j)->getOwner().isPatrolPathNode())
+							{
+								// this is somewhat of a hack - the client will already 
+								// be observing the node, so we need to unobserve it so 
+								// its baselines will be sent to the client when 
+								// onClientEnteredNetworkTriggerVolume is called
+								unobserve(client, (*j)->getOwner(), false);
+							}
+							onClientEnteredNetworkTriggerVolume(client, **j);
+						}
+						else if ((*j)->isPortalTriggerVolume())
+							onClientEnteredPortalTriggerVolume(client, **j);
+					}
+				}
+			}
+		}
+
+		// have the client observe the datapad of any creatures he is observing
+		SlotId datapadSlot = SlotIdManager::findSlotId(ConstCharCrcLowerString("datapad"));
+		if (datapadSlot != SlotId::invalid)
+		{
+			Client::ObservingList const &observing = client.getObserving();
+			for (Client::ObservingList::const_iterator i = observing.begin(); i != observing.end(); ++i)
+			{
+				// don't observe ourself
+				if (*i != client.getCharacterObject())
+				{
+					const SlottedContainer * slottedContainer = (*i)->getSlottedContainerProperty();
+					if (slottedContainer)
+					{
+						Container::ContainerErrorCode tmp = Container::CEC_Success;
+						Container::ContainedItem itemId = slottedContainer->getObjectInSlot(datapadSlot, tmp);
+						ServerObject * const datapadObject = safe_cast<ServerObject *>(itemId.getObject());
+						if (datapadObject)
+							objectsToObserveOrUnobserve.push_back(datapadObject);
+					}
+				}
+			}
+
+			for (std::vector<ServerObject*>::const_iterator i2 = objectsToObserveOrUnobserve.begin(); i2 != objectsToObserveOrUnobserve.end(); ++i2)
+			{
+				client.addObserving(*i2);
+				IGNORE_RETURN((*i2)->addObserver(&client));
+			}
+		}
+	}
+	else
+	{
+		// If the client just left god mode, unobserve anything they should no longer be observing
+		Client::ObservingList const &observing = client.getObserving();
+		for (Client::ObservingList::const_iterator i = observing.begin(); i != observing.end(); ++i)
+		{
+			if (!(*i)->isVisibleOnClient(client))
+			{
+				if (!(*i)->isPatrolPathNode())
+					objectsToObserveOrUnobserve.push_back(*i);
+				else
+				{
+					// we want to remove the node from the client, but keep observing it
+					DestroyMessageManager::add(&client, (*i)->getNetworkId(), false);
+				}
+			}
+		}
+
+		for (std::vector<ServerObject*>::const_iterator i2 = objectsToObserveOrUnobserve.begin(); i2 != objectsToObserveOrUnobserve.end(); ++i2)
+			unobserve(client, **i2, true);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onCraftingPrototypeCreated(ServerObject const &objOwner, ServerObject &objPrototype)
+{
+	// unobserve the prototype item, and also have the client destroy it;
+	// we will observe the item again later when the crafting session
+	// is done (see onCraftingEndCraftingSession() below); this is because
+	// the prototype appearance may change as the player changes it during
+	// crafting, and the client must recreate the item in order to get the
+	// new appearance
+	Client * const client = objOwner.getClient();
+	if (client)
+		unobserve(*client, objPrototype, true);
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onCraftingEndCraftingSession(ServerObject const &objOwner, ServerObject &objPrototype)
+{
+	// observe the prototype item and its contents after crafting is done
+	Client * const client = objOwner.getClient();
+	if (client)
+	{
+		IGNORE_RETURN(observe(*client, objPrototype));
+		observeContents(*client, objPrototype, 0, true);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onMissionCriticalObjectAdded(ServerObject const &playerObject, ServerObject &criticalObject)
+{
+	Client * const client = playerObject.getClient();
+	if (client)
+		IGNORE_RETURN(observe(*client, criticalObject));
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onMakeVendorInventory(ServerObject &vendorInventory, std::set<Client *> const & oldInventoryObservers)
+{
+	// when an NPC vendor is initialized, its default inventory is replaced with
+	// a new "vendor" inventory; we need to make sure that any client that was
+	// observing the default inventory now observe the new "vendor" inventory
+	for (std::set<Client *>::const_iterator i = oldInventoryObservers.begin(); i != oldInventoryObservers.end(); ++i)
+	{
+		(*i)->addObserving(&vendorInventory);
+		IGNORE_RETURN(vendorInventory.addObserver(*i));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTracker::onClientAboutToOpenPublicContainer(Client & client, ServerObject & publicContainer)
+{
+	if (!isObserving(client, publicContainer))
+		IGNORE_RETURN(observeContainmentChain(client, publicContainer, 0));
+}
+
+// ======================================================================
+
+bool ObserveTrackerNamespace::observe(Client &client, ServerObject &obj, std::set<NetworkId> const *oldObserveList)
+{
+	// client is attempting to observe obj.  oldObserveList may contain a list
+	// of objects which the client knows about from its previous server in the
+	// case of authority transfers without a loading screen.
+
+	ServerObject * const containedByObject = safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(obj));
+	if (containedByObject && !ObserveTracker::isObserving(client, *containedByObject))
+	{
+		DEBUG_WARNING(true, ("ObserveTracker::observe - tried to observe an object %s whose immediate container %s was not observed.", obj.getDebugInformation().c_str(), containedByObject->getDebugInformation().c_str()));
+
+		// for now, recover by observing the container
+		if (!observeContainmentChain(client, *containedByObject, oldObserveList))
+			return false;
+	}
+
+	bool isVisible = obj.isVisibleOnClient(client);
+	bool isPatrol = obj.isPatrolPathNode();
+	if (!isVisible && !isPatrol)
+		return false;
+
+	if (ObserveTracker::isObserving(client, obj))
+	{
+		// If client is still observing obj, remove any pending unobserve callback for it
+		removeUnobserveCallback(&client, obj);
+	}
+	else
+	{
+		if (ConfigServerGame::getLogObservers())
+			LOG("ObserveTracker", ("observe: client %s object %s", client.getCharacterObjectId().getValueString().c_str(), obj.getNetworkId().getValueString().c_str()));
+
+		client.addObserving(&obj);
+		IGNORE_RETURN(obj.addObserver(&client));
+
+		if (isPatrol)
+			obj.addPatrolPathObserver();
+
+		// If we're observing a ship that we're not controlling, we need to start receiving updates for it if it's capable of moving
+		ShipObject const * const ship = obj.asShipObject();
+		if (ship && !ship->isAlwaysStationary() && obj.getClient() != &client)
+			ShipClientUpdateTracker::queueForUpdate(client, *ship);
+
+		// If the client was not previously observing obj, set things in motion
+		// for baselines to be sent.
+		if (isVisible && (!oldObserveList || oldObserveList->find(obj.getNetworkId()) == oldObserveList->end()))
+			obj.sendCreateAndBaselinesToClient(client);
+	}
+
+	CreatureObject * const creatureObj = obj.asCreatureObject();
+	if (creatureObj)
+	{
+		SlottedContainer * const slottedContainer = obj.getSlottedContainerProperty();
+		if (slottedContainer)
+		{
+			if (obj.isPlayerControlled())
+			{
+				// observe the player object for player controlled creatures
+				static SlotId const ghostSlot = SlotIdManager::findSlotId(ConstCharCrcLowerString("ghost"));
+				if (ghostSlot != SlotId::invalid)
+				{
+					Container::ContainerErrorCode tmp = Container::CEC_Success;
+					Container::ContainedItem itemId = slottedContainer->getObjectInSlot(ghostSlot, tmp);
+					ServerObject * const playerObject = safe_cast<ServerObject *>(itemId.getObject());
+					if (playerObject)
+						IGNORE_RETURN(observe(client, *playerObject, oldObserveList));
+				}
+
+				// observe the appearance tab object for player controlled creatures
+				ServerObject * const appearanceTabObject = creatureObj->getAppearanceInventory();
+				if (appearanceTabObject)
+					IGNORE_RETURN(observe(client, *appearanceTabObject, oldObserveList));
+			}
+
+			if (obj.getClient() != &client)
+			{
+				// mark the inventory container as observed but don't send baselines for non-player creatures
+				static SlotId const inventorySlot = SlotIdManager::findSlotId(ConstCharCrcLowerString("inventory"));
+				if (inventorySlot != SlotId::invalid)
+				{
+					Container::ContainerErrorCode tmp = Container::CEC_Success;
+					Container::ContainedItem itemId = slottedContainer->getObjectInSlot(inventorySlot, tmp);
+					ServerObject * const inventoryObject = safe_cast<ServerObject *>(itemId.getObject());
+					if (inventoryObject)
+					{
+						client.addObserving(inventoryObject);
+						IGNORE_RETURN(inventoryObject->addObserver(&client));
+					}
+				}
+				if (client.isGod())
+				{
+					// have god clients observe other player's datapad
+					SlotId datapadSlot = SlotIdManager::findSlotId(ConstCharCrcLowerString("datapad"));
+					if (datapadSlot != SlotId::invalid)
+					{
+						Container::ContainerErrorCode tmp = Container::CEC_Success;
+						Container::ContainedItem itemId = slottedContainer->getObjectInSlot(datapadSlot, tmp);
+						ServerObject * const datapadObject = safe_cast<ServerObject *>(itemId.getObject());
+						if (datapadObject)
+						{
+							client.addObserving(datapadObject);
+							IGNORE_RETURN(datapadObject->addObserver(&client));
+						}
+					}
+				}
+			}
+		}
+	}
+	else if (client.isGod())
+	{
+		// god clients observe the contents of ships and ship control devices
+		if (obj.asShipObject() || obj.getGameObjectType() == static_cast<int>(SharedObjectTemplate::GOT_data_ship_control_device))
+			observeContents(client, obj, oldObserveList, false);
+	}
+
+	if (client.getOpenedContainers().count(&obj))
+		observeContents(client, obj, oldObserveList, false);
+	if (obj.getCellProperty() && shouldObserveCellContentsDueToClientContainmentChain(client, *safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(obj))))
+		observeContents(client, obj, oldObserveList, false);
+	else
+	{
+		Container const * const container = obj.getContainerProperty();
+		if (container && container->canContentsBeObservedWith())
+			observeContentsIfObservedWithParent(client, obj, oldObserveList);
+	}
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTrackerNamespace::unobserve(Client &client, ServerObject &obj, bool sendDestroy)
+{
+	if (ObserveTracker::isObserving(client, obj))
+	{
+		if (ConfigServerGame::getLogObservers())
+			LOG("ObserveTracker", ("unobserve: client %s object %s", client.getCharacterObjectId().getValueString().c_str(), obj.getNetworkId().getValueString().c_str()));
+
+		// clear observation
+		IGNORE_RETURN(obj.removeObserver(&client));
+		client.removeObserving(&obj);
+		if (obj.isPatrolPathNode())
+			obj.removePatrolPathObserver();
+
+		// remove from open containers
+		IGNORE_RETURN(ObserveTracker::onClientClosedContainer(client, obj));
+
+		removeUnobserveCallback(&client, obj);
+
+		// If we send a destroy at this level, we no longer need to send
+		// it for contents being unobserved.
+		if (   !obj.removeFromBaselineDistributionList(client)
+		    && sendDestroy
+		    && obj.getSendToClient())
+		{
+			DestroyMessageManager::add(&client, obj.getNetworkId(), false);
+			sendDestroy = false;
+		}
+
+		// unobserve all contents
+		Container * const container = ContainerInterface::getContainer(obj);
+		if (container)
+		{
+			for (ContainerIterator i = container->begin(); i != container->end(); ++i)
+			{
+				ServerObject * const content = safe_cast<ServerObject *>((*i).getObject());
+				if (content)
+					unobserve(client, *content, sendDestroy);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTrackerNamespace::setUnobserveCallback(Client &client, ServerObject &obj)
+{
+	// Set up a callback for client to unobserve obj at some point in the future.
+	if (ObserveTracker::isObserving(client, obj))
+	{
+		// If baselines for obj are still pending for client, then we can
+		// just unobserve it since the client doesn't have it yet.
+		if (obj.removeFromBaselineDistributionList(client))
+			unobserve(client, obj, false);
+		else
+		{
+			removeUnobserveCallback(&client, obj);
+			s_unobserveCallbacksOrdered.push_back(UnobserveCbInfo(&obj, &client));
+			UnobserveCbInfo &p = s_unobserveCallbacksOrdered.back();
+			s_unobserveCallbackMap[&obj][&client] = &p;
+			s_observeTrackerScheduler->setCallback(handleUnobserveCallback, 0, static_cast<unsigned long>(ConfigServerGame::getClientOutOfRangeObjectCacheTimeMs()));
+
+			if (ConfigServerGame::getLogObservers())
+				LOG("ObserveTracker", ("setUnobserveCallback: client %s object %s", client.getCharacterObjectId().getValueString().c_str(), obj.getNetworkId().getValueString().c_str()));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTrackerNamespace::removeUnobserveCallback(Client *client, ServerObject &obj)
+{
+	// Clear out unobserve callback info for a specified client/object pair,
+	// or for all pairs associated with a particular object if client is 0.
+	// The callback will still go off, but the data associated with it is
+	// cleared out here so that it will not be processed.
+
+	UnobserveCbInfoMap::iterator i = s_unobserveCallbackMap.find(&obj);
+	if (i != s_unobserveCallbackMap.end())
+	{
+		UnobserveCbInfoMapEntry &m = (*i).second;
+		if (client)
+		{
+			UnobserveCbInfoMapEntry::iterator j = m.find(client);
+			if (j != m.end())
+			{
+				if (ConfigServerGame::getLogObservers())
+					LOG("ObserveTracker", ("removeUnobserveCallback: client %s object %s", client->getCharacterObjectId().getValueString().c_str(), obj.getNetworkId().getValueString().c_str()));
+
+				(*j).second->first = 0;
+				m.erase(j);
+			}
+			if (m.empty())
+				s_unobserveCallbackMap.erase(i);
+		}
+		else
+		{
+			for (UnobserveCbInfoMapEntry::iterator j = m.begin(); j != m.end(); ++j)
+			{
+				if (ConfigServerGame::getLogObservers())
+					LOG("ObserveTracker", ("removeUnobserveCallback: client %s object %s", (*j).first->getCharacterObjectId().getValueString().c_str(), obj.getNetworkId().getValueString().c_str()));
+				(*j).second->first = 0;
+			}
+			s_unobserveCallbackMap.erase(i);
+		}
+	}
+} //lint !e1764 // obj used in a nonconst manner
+
+// ----------------------------------------------------------------------
+
+void ObserveTrackerNamespace::handleUnobserveCallback(void const *)
+{
+	UnobserveCbInfo &p = s_unobserveCallbacksOrdered.front();
+	ServerObject * const obj = p.first;
+	if (obj)
+	{
+		Client * const client = NON_NULL(p.second);
+		unobserve(*client, *obj, true);
+	}
+	s_unobserveCallbacksOrdered.pop_front();
+}
+
+// ----------------------------------------------------------------------
+
+bool ObserveTrackerNamespace::observeContainmentChain(Client &client, ServerObject &obj, std::set<NetworkId> const *oldObserveList)
+{
+	// Observe obj, its containing object, etc. until reaching an uncontained
+	// object, but do the actual observation starting at the topmost and working
+	// down toward obj, so that we never attempt to observe an object without
+	// its containing object having been observed first.
+	std::vector<ServerObject *> containers;
+	for (ServerObject *o = &obj; o; o = safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(*o)))
+		containers.push_back(o);
+
+	for (std::vector<ServerObject *>::reverse_iterator i = containers.rbegin(); i != containers.rend(); ++i)
+	{
+		if (!observe(client, **i, oldObserveList))
+		{
+			WARNING_DEBUG_FATAL(true, ("ObserveTracker::observeContainmentChain - object %s's containment chain has an unobservable object %s", obj.getDebugInformation().c_str(), (*i)->getDebugInformation().c_str()));
+			return false;
+		}
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTrackerNamespace::observeContents(Client &client, ServerObject &obj, std::set<NetworkId> const *oldObserveList, bool recursive)
+{
+	Container * const container = ContainerInterface::getContainer(obj);
+	if (container)
+	{
+		for (ContainerIterator i = container->begin(); i != container->end(); ++i)
+		{
+			ServerObject * const content = safe_cast<ServerObject *>((*i).getObject());
+			if (content && observe(client, *content, oldObserveList) && recursive)
+				observeContents(client, *content, oldObserveList, true);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTrackerNamespace::observeContentsIfObservedWithParent(Client &client, ServerObject &obj, std::set<NetworkId> const *oldObserveList)
+{
+	Container * const container = obj.getContainerProperty();
+	if (container)
+	{
+		for (ContainerIterator i = container->begin(); i != container->end(); ++i)
+		{
+			ServerObject * const content = safe_cast<ServerObject *>((*i).getObject());
+			if (content && container->isContentItemObservedWith(*content))
+				IGNORE_RETURN(observe(client, *content, oldObserveList));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ObserveTrackerNamespace::shouldObserveCellContentsDueToClientContainmentChain(Client const &client, ServerObject const &portallizedObject)
+{
+	TriggerVolume const * const portalTriggerVolume = portallizedObject.getTriggerVolume(PortalTriggerVolume::getName());
+	std::vector<ServerObject *> const &controlledObjects = client.getControlledObjects();
+	for (std::vector<ServerObject *>::const_iterator i = controlledObjects.begin(); i != controlledObjects.end(); ++i)
+	{
+		if (portalTriggerVolume && portalTriggerVolume->hasObject(**i))
+			return true;
+		for (ServerObject const *so = (*i); so; so = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*so)))
+			if (so == &portallizedObject)
+				return true;
+	}
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void ObserveTrackerNamespace::observeMissionCriticalObjects(Client &client, CreatureObject const &clientCreature)
+{
+	CreatureObject::MissionCriticalObjectSet const & missionCriticalObjects = clientCreature.getMissionCriticalObjects();
+	for (CreatureObject::MissionCriticalObjectSet::const_iterator i = missionCriticalObjects.begin(); i != missionCriticalObjects.end(); ++i)
+	{
+		ServerObject * const obj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(*i));
+		if (obj)
+			IGNORE_RETURN(observe(client, *obj));
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/core/ObserveTracker.h b/engine/server/library/serverGame/src/shared/core/ObserveTracker.h
new file mode 100644
index 00000000..590a2981
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ObserveTracker.h
@@ -0,0 +1,59 @@
+// ======================================================================
+//
+// ObserveTracker.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ObserveTracker_H
+#define INCLUDED_ObserveTracker_H
+
+// ======================================================================
+
+class Client;
+class NetworkId;
+class ServerObject;
+class TriggerVolume;
+
+// ======================================================================
+
+class ObserveTracker
+{
+public:
+	static void install();
+	static void remove();
+	static void update();
+
+	static bool isObserving(Client const &client, ServerObject const &obj);
+	static void onObjectControlled(Client &client, ServerObject &obj, stdset<NetworkId>::fwd const &oldObserveList);
+	static void onClientControlComplete(Client &client, stdset<NetworkId>::fwd const &oldObserveList);
+	static void onClientEnteredNetworkTriggerVolume(Client &client, TriggerVolume &triggerVolume, stdset<NetworkId>::fwd const *oldObserveList = 0);
+	static void onClientExitedNetworkTriggerVolume(Client &client, TriggerVolume &triggerVolume);
+	static void onClientAddedVisibleObjectSpace(Client &client, ServerObject &visibleObject);
+	static void onClientLostVisibleObjectSpace(Client &client, ServerObject &visibleObject);
+	static void onClientEnteredPortalTriggerVolume(Client &client, TriggerVolume &triggerVolume, stdset<NetworkId>::fwd const *oldObserveList = 0);
+	static void onClientExitedPortalTriggerVolume(Client &client, TriggerVolume &triggerVolume);
+	static bool onClientOpenedContainer(Client &client, ServerObject &obj, int sequence, std::string const &slotDesc, bool sendOpenContainerNotification = true);
+	static bool onClientClosedContainer(Client &client, ServerObject &obj);
+	static void onClientJoinedGroup(Client &client, ServerObject &group);
+	static void onClientLeftGroup(Client &client, ServerObject &group);
+	static void onClientAboutToTransferAuthority(Client &client);
+	static void onObjectContainerChanged(ServerObject &obj);
+	static void onObjectArrangementChanged(ServerObject &obj);
+	static void onObjectMadeInvisible(ServerObject &obj);
+	static void onObjectMadeVisibleTo(ServerObject &obj, const std::vector<ServerObject *> & observers);
+	static void onClientDestroyed(Client &client);
+	static void onObjectDestroyed(ServerObject &obj, bool hyperspace);
+	static void onGodModeChanged(Client &client);
+	static void onCraftingPrototypeCreated(ServerObject const &objOwner, ServerObject &objPrototype);
+	static void onCraftingEndCraftingSession(ServerObject const &objOwner, ServerObject &objPrototype);
+	static void onMissionCriticalObjectAdded(ServerObject const &playerObject, ServerObject &criticalShip);
+	static void onMakeVendorInventory(ServerObject &vendorInventory, stdset<Client *>::fwd const & oldInventoryObservers);
+	static void onClientAboutToOpenPublicContainer(Client & client, ServerObject & container);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_ObserveTracker_H
+
diff --git a/engine/server/library/serverGame/src/shared/core/PlanetMapManagerServer.cpp b/engine/server/library/serverGame/src/shared/core/PlanetMapManagerServer.cpp
new file mode 100644
index 00000000..2eb9683b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/PlanetMapManagerServer.cpp
@@ -0,0 +1,281 @@
+//======================================================================
+//
+// PlanetMapManagerServer.cpp
+// copyright (c) 2003 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PlanetMapManagerServer.h"
+
+#include "serverGame/Client.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/TangibleObject.h"
+#include "sharedGame/PlanetMapManager.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/GetMapLocationsMessage.h"
+#include "sharedNetworkMessages/GetMapLocationsResponseMessage.h"
+
+#include <algorithm>
+
+//======================================================================
+
+namespace PlanetMapManagerServerNamespace
+{
+
+}
+
+using namespace PlanetMapManagerServerNamespace;
+
+//----------------------------------------------------------------------
+
+void PlanetMapManagerServer::handleClientRequest (const Client & client, const GetMapLocationsMessage & msg)
+{
+	const std::string & planetName = msg.getPlanetName ();
+
+	//-- ignore requests for other planets
+	if (planetName != ServerWorld::getSceneId ())
+		return;
+
+	uint32 clientFaction = 0;
+	const TangibleObject * const tangible = dynamic_cast<const TangibleObject *>(client.getCharacterObject ());
+	if (tangible)
+		clientFaction = tangible->getPvpFaction ();
+
+	const PlanetObject * const planetObject = ServerUniverse::getInstance ().getPlanetByName (planetName);
+	if (!planetObject)
+	{
+		WARNING (true, ("PlanetMapManagerServer no planet for [%s]", planetName.c_str ()));
+		return;
+	}
+
+	const int cacheVersionStatic  = msg.getCacheVersionStatic  ();
+	const int cacheVersionDynamic = msg.getCacheVersionDynamic ();
+	const int cacheVersionPersist = msg.getCacheVersionPersist ();
+
+	const int currentCacheVersionStatic  = planetObject->getMapLocationVersionForType (PlanetMapManager::MLT_static);
+	const int currentCacheVersionDynamic = planetObject->getMapLocationVersionForType (PlanetMapManager::MLT_dynamic);
+	const int currentCacheVersionPersist = planetObject->getMapLocationVersionForType (PlanetMapManager::MLT_persist);
+
+	const bool updateStatic  = !cacheVersionStatic  || cacheVersionStatic  != currentCacheVersionStatic;
+	const bool updateDynamic = !cacheVersionDynamic || cacheVersionDynamic != currentCacheVersionDynamic;
+	const bool updatePersist = !cacheVersionPersist || cacheVersionPersist != currentCacheVersionPersist;
+
+	//-- only retrieve the map location vectors for the out of date cache versions
+
+	static const MapLocationVector locationsEmpty;
+
+	const MapLocationVector & locationsStatic   = updateStatic ?  planetObject->getMapLocations (PlanetMapManager::MLT_static)  : locationsEmpty;
+	const MapLocationVector & locationsDynamic  = updateDynamic ? planetObject->getMapLocations (PlanetMapManager::MLT_dynamic) : locationsEmpty;
+	const MapLocationVector & locationsPersist  = updatePersist ? planetObject->getMapLocations (PlanetMapManager::MLT_persist) : locationsEmpty;
+
+	static MapLocationVector filteredVectors [PlanetMapManager::MLT_numTypes];
+
+	const MapLocationVector * mapLocationVectors [PlanetMapManager::MLT_numTypes] =
+	{
+		&locationsStatic,
+		&locationsDynamic,
+		&locationsPersist
+	};
+
+	for (int i = 0; i < static_cast<int>(PlanetMapManager::MLT_numTypes); ++i)
+	{
+		MapLocationVector & filtered  = filteredVectors [i];
+		const MapLocationVector & mlv = *mapLocationVectors [i];
+		filtered.reserve (mlv.size ());
+		filtered.clear ();
+
+		uint32 ml_faction = 0;
+		bool   ml_faction_vis = false;
+
+		for (MapLocationVector::const_iterator it = mlv.begin (); it != mlv.end (); ++it)
+		{
+			const MapLocation & ml = *it;
+			const uint8 cat = ml.getCategory ();
+
+			if (PlanetMapManager::checkCategoryFaction (cat, ml_faction, ml_faction_vis))
+			{
+				if (ml_faction_vis && ml_faction != clientFaction)
+					continue;
+			}
+				
+			filtered.push_back (ml);
+		}
+	}
+
+	const GetMapLocationsResponseMessage rsp (planetName, filteredVectors [0], filteredVectors [1], filteredVectors [2], currentCacheVersionStatic, currentCacheVersionDynamic, currentCacheVersionPersist);
+	client.send (rsp, true);
+}
+
+//----------------------------------------------------------------------
+
+
+void PlanetMapManagerServer::handleClientRequestGetSpecificMapLocationsMessage (const Client & client, const std::set<std::pair<std::string, NetworkId> > & msg)
+{
+	std::vector<std::pair<std::string, MapLocation> > response;
+
+	for (std::set<std::pair<std::string, NetworkId> >::const_iterator iter = msg.begin(); iter != msg.end(); ++iter)
+	{
+		const PlanetObject * const planetObject = ServerUniverse::getInstance().getPlanetByName(iter->first);
+		if (planetObject)
+		{
+			for (int i = 0; i < static_cast<int>(PlanetMapManager::MLT_numTypes); ++i)
+			{
+				const MapLocation * const ml = planetObject->getMapLocation(i, iter->second);
+				if (ml)
+				{
+					response.push_back(std::make_pair(iter->first, *ml));
+					break;
+				}
+			}
+		}
+	}
+
+	const GenericValueTypeMessage<std::vector<std::pair<std::string, MapLocation> > > rsp("GetSpecificMapLocationsResponseMessage", response);
+	client.send (rsp, true);
+}
+
+//----------------------------------------------------------------------
+
+bool PlanetMapManagerServer::addMapLocation (const MapLocation & loc, int mapLocationType, bool enforceLocationCountLimits)
+{
+	if (mapLocationType < 0 || mapLocationType >= PlanetMapManager::MLT_numTypes)
+	{
+		WARNING (true, ("PlanetMapManagerServer::addMapLocation invalid type [%d]", mapLocationType));
+		return false;
+	}
+
+	const std::string & planetName = ServerWorld::getSceneId ();
+
+	PlanetObject * const planetObject = ServerUniverse::getInstance ().getPlanetByName (planetName);
+	if (!planetObject)
+	{
+		WARNING (true, ("PlanetMapManagerServer::addMapLocation no planet for [%s]", planetName.c_str ()));
+		return false;
+	}
+
+	return planetObject->addMapLocation(loc, mapLocationType, enforceLocationCountLimits);
+}
+
+//----------------------------------------------------------------------
+
+bool PlanetMapManagerServer::removeMapLocation (const NetworkId & id)
+{
+	const std::string & planetName = ServerWorld::getSceneId ();
+
+	PlanetObject * const planetObject = ServerUniverse::getInstance ().getPlanetByName (planetName);
+	if (!planetObject)
+	{
+		WARNING (true, ("PlanetMapManagerServer::removeMapLocation no planet for [%s]", planetName.c_str ()));
+		return false;
+	}
+
+	return planetObject->removeMapLocation(id);
+}
+
+//----------------------------------------------------------------------
+
+void PlanetMapManagerServer::getMapLocationsByCategories (int mapLocationType, std::string & categoryName, std::string & subCategoryName, MapLocationVector & locs)
+{
+	const uint8 category    = PlanetMapManager::findCategory (categoryName);
+	const uint8 subCategory = PlanetMapManager::findCategory (subCategoryName);
+
+	getMapLocationsByCategories (mapLocationType, category, subCategory, locs);
+}
+
+//----------------------------------------------------------------------
+
+void PlanetMapManagerServer::getMapLocationsByCategories (int mapLocationType, uint8 category, uint8 subCategory, MapLocationVector & locs)
+{
+	const std::string & planetName = ServerWorld::getSceneId ();
+
+	const PlanetObject * const planetObject = ServerUniverse::getInstance ().getPlanetByName (planetName);
+	if (!planetObject)
+	{
+		WARNING (true, ("PlanetMapManagerServer::getMapLocationsByCategories no planet for [%s]", planetName.c_str ()));
+		return;
+	}
+
+	planetObject->getMapLocationsByCategories (mapLocationType, category, subCategory, locs);
+
+}
+
+//----------------------------------------------------------------------
+
+void PlanetMapManagerServer::getCategories               (int parentCategory, IntVector & results)
+{
+	static IntVector tmp_iv;
+	tmp_iv.clear ();
+
+	for (int i = 0; i < static_cast<int>(PlanetMapManager::MLT_numTypes); ++i)
+	{
+		getCategories  (parentCategory, i, tmp_iv);
+		results.insert (results.end (), tmp_iv.begin (), tmp_iv.end ());
+	}
+
+	std::sort   (results.begin (), results.end ());
+	std::unique (results.begin (), results.end ());
+}
+
+//----------------------------------------------------------------------
+
+void PlanetMapManagerServer::getCategories               (int parentCategory, int mapLocationType, IntVector & results)
+{
+	const std::string & planetName = ServerWorld::getSceneId ();
+
+	const PlanetObject * const planetObject = ServerUniverse::getInstance ().getPlanetByName (planetName);
+	if (!planetObject)
+	{
+		WARNING (true, ("PlanetMapManagerServer::getMapLocationsByCategories no planet for [%s]", planetName.c_str ()));
+		return;
+	}
+
+	//-- this function returns a sorted vector
+	planetObject->getMapLocationCategories (parentCategory, mapLocationType, results);
+}
+
+//----------------------------------------------------------------------
+
+const MapLocation * PlanetMapManagerServer::getLocation                 (const NetworkId & id, int & mapLocationType)
+{
+	const std::string & planetName = ServerWorld::getSceneId ();
+
+	const PlanetObject * const planetObject = ServerUniverse::getInstance ().getPlanetByName (planetName);
+	if (!planetObject)
+	{
+		WARNING (true, ("PlanetMapManagerServer::getMapLocationsByCategories no planet for [%s]", planetName.c_str ()));
+		return 0;
+	}
+
+	for (int i = 0; i < static_cast<int>(PlanetMapManager::MLT_numTypes); ++i)
+	{
+		const MapLocation * const ml = planetObject->getMapLocation (i, id);
+		if (ml)
+		{
+			mapLocationType = i;
+			return ml;
+		}
+	}
+
+	return 0;
+}
+
+//----------------------------------------------------------------------
+
+const MapLocation * PlanetMapManagerServer::getLocationByType           (const NetworkId & id, int mapLocationType)
+{
+	const std::string & planetName = ServerWorld::getSceneId ();
+
+	const PlanetObject * const planetObject = ServerUniverse::getInstance ().getPlanetByName (planetName);
+	if (!planetObject)
+	{
+		WARNING (true, ("PlanetMapManagerServer::getMapLocationsByCategories no planet for [%s]", planetName.c_str ()));
+		return 0;
+	}
+
+	return planetObject->getMapLocation (mapLocationType, id);
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/PlanetMapManagerServer.h b/engine/server/library/serverGame/src/shared/core/PlanetMapManagerServer.h
new file mode 100644
index 00000000..f9d963a6
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/PlanetMapManagerServer.h
@@ -0,0 +1,47 @@
+//======================================================================
+//
+// PlanetMapManagerServer.h
+// copyright (c) 2003 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_PlanetMapManagerServer_H
+#define INCLUDED_PlanetMapManagerServer_H
+
+//======================================================================
+
+class GetMapLocationsMessage;
+class Client;
+class MapLocation;
+class NetworkId;
+
+//----------------------------------------------------------------------
+
+class PlanetMapManagerServer
+{
+public:
+
+	typedef stdvector<MapLocation>::fwd MapLocationVector;
+	typedef stdvector<int>::fwd         IntVector;
+
+	static void                handleClientRequest         (const Client & client, const GetMapLocationsMessage & msg);
+	static void                handleClientRequestGetSpecificMapLocationsMessage (const Client & client, const stdset<std::pair<std::string, NetworkId> >::fwd & msg);
+
+	static bool                addMapLocation              (const MapLocation & loc, int mapLocationType, bool enforceLocationCountLimits);
+	static bool                removeMapLocation           (const NetworkId & id);
+	static void                getMapLocationsByCategories (int mapLocationType, std::string & categoryName, std::string & subCategoryName, MapLocationVector & locs);
+	static void                getMapLocationsByCategories (int mapLocationType, uint8 categoryName, uint8 subCategoryName, MapLocationVector & locs);
+
+	static void                getCategories               (const std::string & parentCategory, IntVector & results);
+	static void                getCategories               (int parentCategory, IntVector & results);
+	static void                getCategories               (int parentCategory, int mapLocationType, IntVector & results);
+
+	static const MapLocation * getLocation                 (const NetworkId & id, int & mapLocationType);
+	static const MapLocation * getLocationByType           (const NetworkId & id, int mapLocationType);
+};
+
+//======================================================================
+
+#endif
+
+
diff --git a/engine/server/library/serverGame/src/shared/core/PlayerCreationManagerServer.cpp b/engine/server/library/serverGame/src/shared/core/PlayerCreationManagerServer.cpp
new file mode 100644
index 00000000..9b2d5d2e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/PlayerCreationManagerServer.cpp
@@ -0,0 +1,229 @@
+//======================================================================
+//
+// PlayerCreationManagerServer.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PlayerCreationManagerServer.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/ServerCreatureObjectTemplate.h"
+#include "serverGame/ServerWorld.h"
+#include "serverNetworkMessages/RenameCharacterMessage.h"
+#include "sharedFoundation/ConfigFile.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedSkillSystem/SkillManager.h"
+#include "sharedSkillSystem/SkillObject.h"
+#include "sharedUtility/DataTable.h"
+
+//======================================================================
+
+void PlayerCreationManagerServer::install ()
+{
+	if (!PlayerCreationManager::isInstalled ())
+		PlayerCreationManager::install (true);
+}
+
+//----------------------------------------------------------------------
+
+void PlayerCreationManagerServer::remove ()
+{
+	if (PlayerCreationManager::isInstalled ())
+		PlayerCreationManager::remove ();
+}
+
+//----------------------------------------------------------------------
+
+bool PlayerCreationManagerServer::setupPlayer(CreatureObject & obj, const std::string & profession, StationId account, bool isJedi)
+{
+	// NOTE: the isJedi flag doesn't actually create a Jedi character, but we need it
+	// so that the database/login server will keep track of a player's extra character
+	// slots correctly
+	UNREF(isJedi);
+
+	AttribVector attribs;
+	const SkillVector * skills = 0;
+	const EqVector * eq        = 0;
+
+	const char * const sharedObjectTemplateNameStr = obj.getSharedTemplateName ();
+
+	if (!sharedObjectTemplateNameStr)
+		return false;
+
+	const std::string sharedObjectTemplateName (sharedObjectTemplateNameStr);
+
+	if (!getDefaults(sharedObjectTemplateName, profession, attribs, skills, eq))
+	{
+		WARNING (true, ("PlayerCreationManagerServer error loading for %s, %s", sharedObjectTemplateName.c_str (), profession.c_str ()));
+		return false;
+	}
+
+	//----------------------------------------------------------------------
+	//-- setup skills
+	
+	if (skills)
+	{
+		for (SkillVector::const_iterator it = skills->begin (); it != skills->end (); ++it)
+		{
+			const std::string & skillName = *it;
+
+			const SkillObject * skill = SkillManager::getInstance ().getSkill (*it);
+			if (skill)
+			{
+				//-- newb tutorial will grant the skill
+				obj.setObjVarItem ("newbie.hasSkill", skillName);
+				break;
+			}
+			else
+				WARNING (true, ("PlayerCreationManagerServer Bad skill [%s] for profesion [%s]", skillName.c_str (), profession.c_str ()));
+		}
+	}
+	
+	//----------------------------------------------------------------------
+	//-- setup attribs
+	if (!attribs.empty())
+	{
+		WARNING(attribs.size() != static_cast<size_t>(Attributes::NumberOfAttributes), ("Bad number of attribs %d when creating avatar", attribs.size()));
+		int i = 0;
+		for (AttribVector::const_iterator it = attribs.begin (); it != attribs.end (); ++it)
+		{
+			obj.initializeAttribute (i++, static_cast<Attributes::Value>(*it));
+		}
+	}
+
+	//----------------------------------------------------------------------
+	//-- setup equipment
+
+	if (eq)
+	{
+		for (EqVector::const_iterator it = eq->begin (); it != eq->end (); ++it)
+		{
+			const EqInfo & eqi = *it;
+			
+			const int32 arrangement = eqi.arrangement;
+			UNREF(arrangement);
+			//Ignore arrangement for now.  Use the first available.  If we need to change this
+			//instead of specifiying the arrangement, we'll specify which valid arrangement to use.
+			
+			ServerObject * const item = ServerWorld::createNewObject(
+				eqi.serverTemplateName, obj, false);
+			
+			if (!item)
+				WARNING (true, ("Invalid equipment template: '%s'", eqi.serverTemplateName.c_str ()));
+
+			else
+			{
+				//Attach insurance variables here:
+				if (item->asTangibleObject() != NULL)
+					item->asTangibleObject()->setUninsurable(true);
+			}
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	// **************** BEGIN SPECIAL TESTCENTER CODE **********************
+
+	// if we are on TC2 and [GameServer] loginAsBountyHunter is set, 
+	// make the player a master bounty hunter
+	if (ConfigServerGame::getLoginAsBountyHunter())
+	{
+		// check that our first name ends with "MBH"
+		std::string firstName(Unicode::wideToNarrow(obj.getAssignedObjectFirstName()));
+		// check that we are on TC2
+		std::string cluster(ConfigFile::getKeyString("CentralServer", "clusterName", ""));
+		if ((firstName.size() > 3 && firstName.substr(firstName.size() - 3) == "MBH" ) && 
+			(cluster == "TestCenter-Bria" || cluster == "sjakab"))
+		{
+			static const std::string bounty_skills[] = {
+				"combat_marksman_novice",
+				"combat_marksman_rifle_01",
+				"combat_marksman_rifle_02",
+				"combat_marksman_rifle_03",
+				"combat_marksman_rifle_04",
+				"combat_marksman_pistol_01",
+				"combat_marksman_pistol_02",
+				"combat_marksman_pistol_03",
+				"combat_marksman_pistol_04",
+				"combat_marksman_carbine_01",
+				"combat_marksman_carbine_02",
+				"combat_marksman_carbine_03",
+				"combat_marksman_carbine_04",
+				"combat_marksman_support_01",
+				"combat_marksman_support_02",
+				"combat_marksman_support_03",
+				"combat_marksman_support_04",
+				"combat_marksman_master",
+				"outdoors_scout_novice",
+				"outdoors_scout_movement_01",
+				"outdoors_scout_movement_02",
+				"outdoors_scout_movement_03",
+				"outdoors_scout_movement_04",
+				"outdoors_scout_tools_01",
+				"outdoors_scout_tools_02",
+				"outdoors_scout_tools_03",
+				"outdoors_scout_tools_04",
+				"outdoors_scout_harvest_01",
+				"outdoors_scout_harvest_02",
+				"outdoors_scout_harvest_03",
+				"outdoors_scout_harvest_04",
+				"outdoors_scout_camp_01",
+				"outdoors_scout_camp_02",
+				"outdoors_scout_camp_03",
+				"outdoors_scout_camp_04",
+				"outdoors_scout_master",
+				"combat_bountyhunter_novice",
+				"combat_bountyhunter_investigation_01",
+				"combat_bountyhunter_investigation_02",
+				"combat_bountyhunter_investigation_03",
+				"combat_bountyhunter_investigation_04",
+				"combat_bountyhunter_droidcontrol_01",
+				"combat_bountyhunter_droidcontrol_02",
+				"combat_bountyhunter_droidcontrol_03",
+				"combat_bountyhunter_droidcontrol_04",
+				"combat_bountyhunter_droidresponse_01",
+				"combat_bountyhunter_droidresponse_02",
+				"combat_bountyhunter_droidresponse_03",
+				"combat_bountyhunter_droidresponse_04",
+				"combat_bountyhunter_support_01",
+				"combat_bountyhunter_support_02",
+				"combat_bountyhunter_support_03",
+				"combat_bountyhunter_support_04",
+				"combat_bountyhunter_master"
+				};
+			static const size_t numSkills = sizeof(bounty_skills) / sizeof(std::string);
+
+			for (size_t i = 0; i < numSkills; ++i)
+			{
+				const SkillObject * skill = SkillManager::getInstance().getSkill(bounty_skills[i]);
+				if (skill != NULL)
+					obj.grantSkill(*skill);
+			}
+		}
+	}
+
+	// **************** END SPECIAL TESTCENTER CODE ************************
+
+	return true;
+}
+
+// ======================================================================
+
+void PlayerCreationManagerServer::renamePlayer(int8 renameCharacterMessageSource, uint32 stationId, const NetworkId & oid, const Unicode::String & newName, const Unicode::String & oldName, const NetworkId &requestedBy)
+{
+	if (!NameManager::getInstance().isPlayer(oid))
+		return;
+
+	RenameCharacterMessageEx const msg(static_cast<RenameCharacterMessageEx::RenameCharacterMessageSource>(renameCharacterMessageSource),stationId,oid,newName,oldName,requestedBy);
+	GameServer::getInstance().sendToDatabaseServer(msg);
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/PlayerCreationManagerServer.h b/engine/server/library/serverGame/src/shared/core/PlayerCreationManagerServer.h
new file mode 100644
index 00000000..25e1d47f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/PlayerCreationManagerServer.h
@@ -0,0 +1,33 @@
+//======================================================================
+//
+// PlayerCreationManagerServer.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_PlayerCreationManagerServer_H
+#define INCLUDED_PlayerCreationManagerServer_H
+
+//======================================================================
+
+#include "sharedFoundation/StationId.h"
+#include "sharedGame/PlayerCreationManager.h"
+#include "swgSharedUtility/Attributes.def"
+
+class CreatureObject;
+class Iff;
+class NetworkId;
+
+class PlayerCreationManagerServer : public PlayerCreationManager
+{
+public:
+	static void                   install ();
+	static void                   remove ();
+
+	static bool                   setupPlayer(CreatureObject & obj, const std::string & profession, StationId account, bool isJedi);
+	static void                   renamePlayer(int8 renameCharacterMessageSource, uint32 stationId, const NetworkId & oid, const Unicode::String & newName, const Unicode::String & oldName, const NetworkId &requestedBy);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/PlayerSanityChecker.cpp b/engine/server/library/serverGame/src/shared/core/PlayerSanityChecker.cpp
new file mode 100644
index 00000000..c52b51f4
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/PlayerSanityChecker.cpp
@@ -0,0 +1,269 @@
+// ======================================================================
+//
+// PlayerSanityChecker.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PlayerSanityChecker.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/LogoutTracker.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerObject.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedObject/NetworkIdManager.h"
+
+// ======================================================================
+
+namespace PlayerSanityCheckerNamespace
+{
+	bool s_initialized = false;
+	bool s_enabled = true;
+	
+	struct SanityCheckInfo
+	{
+		SanityCheckInfo() :
+			proxyCheckFailCount(0),
+			clientCheckFailCount(0)
+		{
+		}
+		int proxyCheckFailCount;
+		int clientCheckFailCount;
+	};
+
+	const float MIN_SANITY_CHECK_LOOP_TIME = 15.0f;
+	const int MAX_CLIENT_CHECK_FAILS = 2;
+	unsigned int s_checkPos = 0;
+	std::vector<std::pair<NetworkId, SanityCheckInfo> > s_checkVec;
+	std::map<NetworkId, int> s_checkMap;
+	float s_loopTime = 0.0f;
+
+}
+using namespace PlayerSanityCheckerNamespace;
+
+// ======================================================================
+
+void PlayerSanityChecker::add(NetworkId const &id)
+{
+	if (s_checkMap.find(id) == s_checkMap.end())
+	{
+		s_checkVec.push_back(std::make_pair(id, SanityCheckInfo()));
+		s_checkMap[id] = s_checkVec.size()-1;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerSanityChecker::update(float time)
+{
+	if (!s_initialized)
+	{
+		s_enabled = !ConfigServerGame::getDisablePlayerSanityChecker();
+		s_initialized = true;
+	}
+	
+	if (s_enabled)
+	{
+		static const int maxProxyCheckFailures = ConfigServerGame::getMaxPlayerSanityCheckFailures();
+
+		s_loopTime += time;
+		++s_checkPos;
+		if (s_checkPos >= s_checkVec.size())
+		{
+			if (s_loopTime < MIN_SANITY_CHECK_LOOP_TIME)
+				return;
+			s_checkPos = 0;
+			s_loopTime = 0;
+			// pull any cleared entries from the vector and rebuild the map
+			s_checkMap.clear();
+			int pos = 0;
+			std::vector<std::pair<NetworkId, SanityCheckInfo> >::iterator i = s_checkVec.begin();
+			while (i != s_checkVec.end())
+			{
+				if ((*i).first == NetworkId::cms_invalid)
+					i = s_checkVec.erase(i);
+				else
+				{
+					s_checkMap[(*i).first] = pos;
+					++pos;
+					++i;
+				}
+			}
+		}
+
+		if (s_checkVec.empty())
+			return;
+
+		std::pair<NetworkId, SanityCheckInfo> &entry = s_checkVec[s_checkPos];
+
+		ServerObject * const obj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(entry.first));
+		if (!obj)
+		{
+			s_checkMap.erase(entry.first);
+			entry = std::make_pair(NetworkId::cms_invalid, SanityCheckInfo());
+		}
+		else if (obj->isAuthoritative())
+		{
+			if (obj->isInWorld()) // Players waiting for their data to be saved are not in the world.  We shouldn't check proxies for these.  (They won't have any.)
+			{
+				if (!obj->getClient())
+				{
+					++(entry.second.clientCheckFailCount);
+					if (entry.second.clientCheckFailCount >= MAX_CLIENT_CHECK_FAILS)
+					{
+						entry.second.clientCheckFailCount = 0;
+						PlayerObject *playerObject = PlayerCreatureController::getPlayerObject(obj->asCreatureObject());
+						if (playerObject)
+							playerObject->setLinkDead(true);
+						if (!LogoutTracker::isInLogoutCallbackList(entry.first))
+							obj->handleDisconnect(false);
+					}
+				}
+				if (maxProxyCheckFailures)
+				{
+					entry.second.proxyCheckFailCount = 0;
+
+					ProxyList const &proxyList = obj->getExposedProxyList();
+					if (!proxyList.empty())
+					{
+						ServerMessageForwarding::begin(std::vector<uint32>(proxyList.begin(), proxyList.end()));
+
+						GenericValueTypeMessage<std::pair<NetworkId, uint32> > const proxyCheckMessage(
+							"PlayerSanityCheckProxy",
+							std::make_pair(entry.first, GameServer::getInstance().getProcessId()));
+						ServerMessageForwarding::send(proxyCheckMessage);
+
+						ServerMessageForwarding::end();
+					}
+				}
+			}
+		}
+		else
+		{
+			entry.second.clientCheckFailCount = 0;
+			if (maxProxyCheckFailures)
+			{
+				//Only send sanity check if we are not in the middle of a transfer
+				//and hence we aren't authoritative even though this is temporarily the auth process
+				if (obj->getAuthServerProcessId() != GameServer::getInstance().getProcessId())
+				{
+					++(entry.second.proxyCheckFailCount);
+					if (entry.second.proxyCheckFailCount <= maxProxyCheckFailures)
+					{
+						ServerMessageForwarding::begin(obj->getAuthServerProcessId());
+
+						GenericValueTypeMessage<std::pair<NetworkId, uint32> > const checkMessage(
+							"PlayerSanityCheck",
+							std::make_pair(entry.first, GameServer::getInstance().getProcessId()));
+						ServerMessageForwarding::send(checkMessage);
+
+						ServerMessageForwarding::end();
+					}
+					else
+					{
+						s_checkMap.erase(entry.first);
+						entry = std::make_pair(NetworkId::cms_invalid, SanityCheckInfo());
+						WARNING(true, ("PlayerSanityCheck: Unloading proxy for %s due to exceeding maximum number of sanity check failures.", obj->getNetworkId().getValueString().c_str()));
+						obj->unload();
+					}
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerSanityChecker::handlePlayerSanityCheck(NetworkId const &id, uint32 fromServerId)
+{
+	ServerObject * const obj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(id));
+	if (obj && obj->isAuthoritative())
+	{
+		ProxyList const &proxyList = obj->getExposedProxyList();
+		if (proxyList.find(fromServerId) != proxyList.end())
+		{
+			ServerMessageForwarding::begin(fromServerId);
+
+			GenericValueTypeMessage<NetworkId> const successMessage("PlayerSanityCheckSuccess", id);
+			ServerMessageForwarding::send(successMessage);
+
+			ServerMessageForwarding::end();
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerSanityChecker::handlePlayerSanityCheckSuccess(NetworkId const &id)
+{
+	std::map<NetworkId, int>::iterator i = s_checkMap.find(id);
+	if (i != s_checkMap.end())
+		s_checkVec[(*i).second].second.proxyCheckFailCount = 0;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerSanityChecker::handlePlayerSanityCheckProxy(NetworkId const &id, uint32 fromServerId)
+{
+	// The auth server is asking us if we have a proxy that should be here.  We only respond on failure.
+	ServerObject * const obj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(id));
+	if (!obj || obj->isAuthoritative())
+	{
+		ServerMessageForwarding::begin(fromServerId);
+
+		GenericValueTypeMessage<std::pair<NetworkId, uint32> > const failMessage(
+			"PlayerSanityCheckProxyFail",
+			std::make_pair(id, GameServer::getInstance().getProcessId()));
+		ServerMessageForwarding::send(failMessage);
+
+		ServerMessageForwarding::end();
+
+		if (obj)
+		{
+			// Erm, bad.  We have 2 auth objects... unload and hope something ends up ok.
+			obj->unload();
+			WARNING(true, ("PlayerSanityCheck: Found an auth object %s where we should have been a proxy.", id.getValueString().c_str()));
+		}
+		else
+		{
+			WARNING(true, ("PlayerSanityCheck: Failed to find proxy which should exist for object %s.", id.getValueString().c_str()));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerSanityChecker::handlePlayerSanityCheckProxyFail(NetworkId const &id, uint32 fromServerId)
+{
+	ServerObject *obj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(id));
+	if (obj && obj->isAuthoritative() && obj->isInWorld())
+	{
+		ProxyList const &proxyList = obj->getExposedProxyList();
+		if (proxyList.find(fromServerId) != proxyList.end())
+		{
+			WARNING(true, ("PlayerSanityCheck: Sending baselines to server in proxy list that has no proxy for %s.", id.getValueString().c_str()));
+
+			ServerMessageForwarding::begin(fromServerId);
+
+			obj->forwardServerCreateAndBaselines();
+
+			ServerMessageForwarding::end();
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerSanityChecker::enable(bool flag)
+{
+	s_enabled=flag;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/core/PlayerSanityChecker.h b/engine/server/library/serverGame/src/shared/core/PlayerSanityChecker.h
new file mode 100644
index 00000000..7510acae
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/PlayerSanityChecker.h
@@ -0,0 +1,34 @@
+// ======================================================================
+//
+// PlayerSanityChecker.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _PlayerSanityChecker_H_
+#define _PlayerSanityChecker_H_
+
+// ======================================================================
+
+class NetworkId;
+class ServerObject;
+
+// ======================================================================
+
+class PlayerSanityChecker
+{
+public:
+	static void add(NetworkId const &id);
+	static void update(float time);
+	static void handlePlayerSanityCheck(NetworkId const &id, uint32 fromServerId);
+	static void handlePlayerSanityCheckSuccess(NetworkId const &id);
+	static void handlePlayerSanityCheckProxy(NetworkId const &id, uint32 fromServerId);
+	static void handlePlayerSanityCheckProxyFail(NetworkId const &id, uint32 fromServerId);
+	static void enable(bool flag);
+};
+
+// ======================================================================
+
+#endif // _PlayerSanityChecker_H_
+
diff --git a/engine/server/library/serverGame/src/shared/core/PositionUpdateTracker.cpp b/engine/server/library/serverGame/src/shared/core/PositionUpdateTracker.cpp
new file mode 100644
index 00000000..5d95b59b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/PositionUpdateTracker.cpp
@@ -0,0 +1,324 @@
+// ======================================================================
+//
+// PositionUpdateTracker.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PositionUpdateTracker.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipObject.h"
+#include "serverNetworkMessages/UpdateObjectPositionMessage.h"
+#include "sharedFoundation/Scheduler.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/ContainedByProperty.h"
+#include "sharedObject/SlottedContainmentProperty.h"
+#include <queue>
+#include <map>
+
+// ======================================================================
+
+namespace PositionUpdateTrackerNamespace
+{
+	bool s_installed;
+	Scheduler *s_positionUpdateTrackerScheduler;
+	std::queue<ServerObject *> s_positionUpdateLongDelayCallbacksOrdered;
+	std::queue<ServerObject *> s_positionUpdateShortDelayCallbacksOrdered;
+	std::map<ServerObject *, ServerObject **> s_positionUpdateCallbackMap;
+
+	bool isContainerConsideredPersisted(ServerObject const &obj, ServerObject const &container);
+}
+using namespace PositionUpdateTrackerNamespace;
+
+// ======================================================================
+
+void PositionUpdateTracker::install()
+{
+	FATAL(s_installed, ("PositionUpdateTracker::install - already installed"));
+	s_installed = true;
+	s_positionUpdateTrackerScheduler = new Scheduler;
+}
+
+// ----------------------------------------------------------------------
+
+void PositionUpdateTracker::remove()
+{
+	FATAL(!s_installed, ("PositionUpdateTracker::remove - not installed"));
+	delete s_positionUpdateTrackerScheduler;
+	s_positionUpdateTrackerScheduler = 0;
+	s_installed = false;
+}
+
+// ----------------------------------------------------------------------
+
+void PositionUpdateTracker::positionChanged(ServerObject &obj)
+{
+	if (!s_installed)
+		return;
+	
+// if we've already got a callback set, ignore the update
+	std::map<ServerObject *, ServerObject **>::const_iterator i = s_positionUpdateCallbackMap.find(&obj);
+	if (i != s_positionUpdateCallbackMap.end())
+		return;
+
+	if (!shouldSendPositionUpdate(obj))
+		return;
+
+	if (ConfigServerGame::getLogPositionUpdates())
+	{
+		LOG("PositionUpdate", ("Queueing %s for position update", obj.getNetworkId().getValueString().c_str()));
+	}
+
+	// Creature objects such as players may frequently update their position,
+	// so we want to slow down how often we update the database
+	if (obj.asCreatureObject())
+	{
+		// create the callback info
+		s_positionUpdateLongDelayCallbacksOrdered.push(&obj);
+		ServerObject *&p = s_positionUpdateLongDelayCallbacksOrdered.back();
+		s_positionUpdateCallbackMap[&obj] = &p;
+
+		// set the callback
+		getScheduler().setCallback(handlePositionUpdateLongDelayCallback, 0, static_cast<unsigned long>(ConfigServerGame::getDatabasePositionUpdateLongDelayIntervalMs()));
+	}
+	else
+	{
+		// create the callback info
+		s_positionUpdateShortDelayCallbacksOrdered.push(&obj);
+		ServerObject *&p = s_positionUpdateShortDelayCallbacksOrdered.back();
+		s_positionUpdateCallbackMap[&obj] = &p;
+
+		// set the callback
+		getScheduler().setCallback(handlePositionUpdateShortDelayCallback, 0, static_cast<unsigned long>(ConfigServerGame::getDatabasePositionUpdateShortDelayIntervalMs()));
+	}
+} //lint !e1764 // obj used in a nonconst manner
+
+// ----------------------------------------------------------------------
+
+void PositionUpdateTracker::flushPositionUpdate(ServerObject &obj)
+{
+	if (!s_installed)
+		return;
+
+	if (s_positionUpdateCallbackMap.find(&obj) != s_positionUpdateCallbackMap.end())
+		sendPositionUpdate(obj);
+}
+
+// ----------------------------------------------------------------------
+
+bool PositionUpdateTracker::shouldSendPositionUpdate(ServerObject const &obj)
+{
+	// position updates should be sent only for non-deleted authoritative objects that are persisted and whose immediate container, if any, is persisted
+
+	if (!obj.isAuthoritative() || !obj.isPersisted() || obj.isBeingDestroyed())
+		return false;
+
+	ServerObject const   *containedByObj    = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(obj));
+	CreatureObject const *creatureContainer = (containedByObj ? containedByObj->asCreatureObject() : NULL);
+	bool const objectIsRidingMount          = (creatureContainer && creatureContainer->isMountable());
+	
+	if (containedByObj && !isContainerConsideredPersisted(obj, *containedByObj) && !objectIsRidingMount)
+		return false;
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void PositionUpdateTracker::sendPositionUpdate(ServerObject &obj)
+{
+	if (!s_installed)
+		return;
+
+	std::map<ServerObject *, ServerObject **>::iterator i = s_positionUpdateCallbackMap.find(&obj);
+	if (i != s_positionUpdateCallbackMap.end())
+	{
+		*((*i).second) = 0;
+		s_positionUpdateCallbackMap.erase(i);
+	}
+
+	if (!shouldSendPositionUpdate(obj))
+		return;
+
+	if (ConfigServerGame::getLogPositionUpdates())
+	{
+		LOG("PositionUpdate", ("Sending position update for %s", obj.getNetworkId().getValueString().c_str()));
+	}
+
+	NetworkId const loadWithId = ContainerInterface::getLoadWithContainerId(obj);
+
+	//-- Determine Object container's network id and Object's arrangement as far as the Database is concerned.
+	NetworkId containerNetworkIdForDatabase = ContainerInterface::getContainedByProperty(obj)->getContainedByNetworkId();
+	int objectArrangementForDatabase = ContainerInterface::getSlottedContainmentProperty(obj)->getCurrentArrangement();
+	Transform transformForDatabase(obj.getTransform_o2p());
+	Transform worldspaceTransformForDatabase(obj.getTransform_o2w());
+
+	// if it's a player inside a container, the world space coordinate
+	// that should be saved is the world space coordinate of the topmost
+	// container; this way, player logging out of a house will get
+	// loaded back into the same game server as the house, thus maximizing
+	// that chance that the player will loaded back into the house
+	if (obj.isPlayerControlled() && obj.asCreatureObject())
+	{
+		Object const *containerObj = ContainerInterface::getTopmostContainer(obj);
+		if (containerObj && (containerObj != &obj))
+		{
+			worldspaceTransformForDatabase = containerObj->getTransform_o2w();
+		}
+	}
+
+	// Ships should be persisted in their ship control device if they have one
+	ShipObject const * const ship = obj.asShipObject();
+	if (ship)
+	{
+		ServerObject const * const shipControlDevice = ship->getControlDevice();
+		if (shipControlDevice)
+		{
+			containerNetworkIdForDatabase = shipControlDevice->getNetworkId();
+			objectArrangementForDatabase = -1;
+			transformForDatabase.resetRotateTranslate_l2p();
+		}
+	}
+	else
+	{
+		ShipObject const * const containingShip = ShipObject::getContainingShipObject(&obj);
+
+		if (obj.isPlayerControlled())
+		{
+			if (containingShip)
+			{
+				// Player controlled objects in ships persist at the location of the ship.
+				// Note: we need a more general solution if we decide to allow ships in interiors of ships.
+				containerNetworkIdForDatabase = ContainerInterface::getContainedByProperty(*containingShip)->getContainedByNetworkId();
+				objectArrangementForDatabase = -1;
+				transformForDatabase = containingShip->getTransform_o2p();
+			}
+			else
+			{
+				ServerObject const * const container = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(obj));
+				CreatureObject const * const creatureContainer = (container ? container->asCreatureObject() : NULL);
+				if (creatureContainer && creatureContainer->isMountable())
+				{
+					// Riders of mounts persist at the location of the mount
+					containerNetworkIdForDatabase = ContainerInterface::getContainedByProperty(*creatureContainer)->getContainedByNetworkId();
+					objectArrangementForDatabase = -1;
+					transformForDatabase = creatureContainer->getTransform_o2p();
+				}
+			}
+		}
+	}
+
+	// Make sure we aren't about to try to save an invalid containment/load_with state
+	if (containerNetworkIdForDatabase == NetworkId::cms_invalid && loadWithId != obj.getNetworkId())
+	{
+		WARNING_DEBUG_FATAL(true, ("Tried to send a position update to the db for object %s with load_with=%s but contained_by=0!", obj.getNetworkId().getValueString().c_str(), loadWithId.getValueString().c_str()));
+		obj.unload();
+		return;
+	}
+
+	// Make sure we aren't about to try to save a persisted non-player in a space scene away from the origin
+	FATAL(ServerWorld::isSpaceScene() && !obj.isPlayerControlled() && !containerNetworkIdForDatabase.isValid() && transformForDatabase.getPosition_p() != Vector::zero, ("Tried to send a non-origin persisted object position to the db in a space scene for non-player object %s", obj.getDebugInformation().c_str()));
+
+	//Vector vp = transformForDatabase.getPosition_p();
+	//Vector vw = obj.getTransform_o2w().getPosition_p();
+	//LOG("PositionUpdateTracker",("sendPositionUpdate PS XYZ (%f %f %f)   WS XYZ (%f %f %f)",vp.x, vp.y, vp.z, vw.x, vw.y, vw.z));
+
+	UpdateObjectPositionMessage const positionMessage(
+		obj.getNetworkId(),
+		transformForDatabase,
+		worldspaceTransformForDatabase,
+		containerNetworkIdForDatabase,
+		objectArrangementForDatabase,
+		loadWithId,
+		obj.isPlayerControlled(),
+		obj.asCreatureObject() ? true : false);
+
+	GameServer::getInstance().sendToDatabaseServer(positionMessage);
+
+	if (loadWithId != obj.getLoadWith())
+	{
+		obj.setLoadWith(loadWithId);
+		Container * const container = ContainerInterface::getContainer(obj);
+		if (container)
+		{
+			for (ContainerIterator j = container->begin(); j != container->end(); ++j)
+			{
+				ServerObject * const content = safe_cast<ServerObject *>((*j).getObject());
+				if (content)
+					sendPositionUpdate(*content);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PositionUpdateTracker::serverObjDestroyed(ServerObject &obj)
+{
+	if (!s_installed)
+		return;
+
+	std::map<ServerObject *, ServerObject **>::iterator i = s_positionUpdateCallbackMap.find(&obj);
+	if (i != s_positionUpdateCallbackMap.end())
+	{
+		*((*i).second) = 0;
+		s_positionUpdateCallbackMap.erase(i);
+	}
+} //lint !e1764 // obj used in a nonconst manner
+
+// ----------------------------------------------------------------------
+
+void PositionUpdateTracker::handlePositionUpdateLongDelayCallback(void const *)
+{
+	if (!s_installed)
+		return;
+
+	ServerObject *&obj = s_positionUpdateLongDelayCallbacksOrdered.front();
+	if (obj)
+		flushPositionUpdate(*obj);
+	s_positionUpdateLongDelayCallbacksOrdered.pop();
+}
+
+// ----------------------------------------------------------------------
+
+void PositionUpdateTracker::handlePositionUpdateShortDelayCallback(void const *)
+{
+	if (!s_installed)
+		return;
+
+	ServerObject *&obj = s_positionUpdateShortDelayCallbacksOrdered.front();
+	if (obj)
+		flushPositionUpdate(*obj);
+	s_positionUpdateShortDelayCallbacksOrdered.pop();
+}
+
+// ----------------------------------------------------------------------
+
+Scheduler &PositionUpdateTracker::getScheduler()
+{
+
+	FATAL(!s_positionUpdateTrackerScheduler, ("No PositionUpdateTracker scheduler found"));
+	return *s_positionUpdateTrackerScheduler;
+}
+
+// ----------------------------------------------------------------------
+
+bool PositionUpdateTrackerNamespace::isContainerConsideredPersisted(ServerObject const &obj, ServerObject const &container)
+{
+	// For purposes of the position update tracker, consider players in buildout area containers to be persisted,
+	// and also consider all buildout bazaar terminals (crc 0x8c525205) to be persisted to handle the case of the
+	// Restuss bazaar terminals which are buildout which are not persisted, so when a player places an item on those
+	// bazaar terminals, we need to update the database that the items are now contained inside the bazaar terminals
+	return container.isPersisted() || (obj.isPlayerControlled() && container.getNetworkId() < NetworkId::cms_invalid) || ((container.getNetworkId() < NetworkId::cms_invalid) && container.getObjectTemplate() && (container.getObjectTemplate()->getCrcName().getCrc() == 0x8c525205));
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/core/PositionUpdateTracker.h b/engine/server/library/serverGame/src/shared/core/PositionUpdateTracker.h
new file mode 100644
index 00000000..ffe91058
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/PositionUpdateTracker.h
@@ -0,0 +1,45 @@
+// ======================================================================
+//
+// PositionUpdateTracker.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _PositionUpdateTracker_H_
+#define _PositionUpdateTracker_H_
+
+// ======================================================================
+
+class Scheduler;
+class ServerObject;
+
+// ======================================================================
+
+class PositionUpdateTracker
+{
+public:
+	static void install();
+	static void remove();
+
+	static void positionChanged(ServerObject &obj);
+	static void flushPositionUpdate(ServerObject &obj);
+	static void sendPositionUpdate(ServerObject &obj);
+	static void serverObjDestroyed(ServerObject &obj);
+	static Scheduler &getScheduler();
+
+private:
+	static bool shouldSendPositionUpdate(ServerObject const &obj);
+	static void handlePositionUpdateLongDelayCallback(void const *context);
+	static void handlePositionUpdateShortDelayCallback(void const *context);
+
+private:
+	PositionUpdateTracker();
+	PositionUpdateTracker(PositionUpdateTracker const &);
+	PositionUpdateTracker &operator=(PositionUpdateTracker const &);
+};
+
+// ======================================================================
+
+#endif // _PositionUpdateTracker_H_
+
diff --git a/engine/server/library/serverGame/src/shared/core/PreloadManager.cpp b/engine/server/library/serverGame/src/shared/core/PreloadManager.cpp
new file mode 100644
index 00000000..fbf589a1
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/PreloadManager.cpp
@@ -0,0 +1,181 @@
+// PreloadManager.cpp
+// copyright 2003 Sony Online Entertainment
+
+
+#include "serverGame/FirstServerGame.h"
+#include "PreloadManager.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedUtility/DataTableManager.h"
+
+#include <vector>
+
+//------------------------------------------------------------------------------------------
+
+bool PreloadManager::m_installed = false;
+
+//------------------------------------------------------------------------------------------
+
+namespace PreloadManagerNameSpace
+{
+	std::vector<const ObjectTemplate*> ms_objectTemplateList;
+	std::vector<DataTable*> ms_dataTableList;
+
+	void loadObjectTemplates()
+	{
+		FILE* fp = fopen("objectTemplates.plf","r");
+		char buf [128];
+		if (fp)
+		{
+			DEBUG_REPORT_LOG(true, ("Scanning templates"));
+			char* line = fgets(buf, 128, fp);
+			while (line)
+			{
+                //strip newline
+				int len = strlen(line);
+				for (int i = len - 1; i > 0; --i)
+				{
+					if (buf[i] == '\n')
+					{
+						buf[i] = 0;
+						break;
+					}
+				}
+
+				char* tmp = strstr(buf, "object/");
+				if (tmp)
+					line = tmp;
+
+				
+				const ObjectTemplate * objectTemplate = ObjectTemplateList::fetch(line);
+				if (objectTemplate)
+				{
+					ms_objectTemplateList.push_back(objectTemplate);
+					objectTemplate->preloadAssets();
+				}
+				DEBUG_REPORT_LOG(true, ("."));
+				line = fgets(buf, 128, fp);
+			}
+			fclose(fp);
+			DEBUG_REPORT_LOG(true, ("\n"));
+		}
+	}
+
+	void loadDataTables()
+	{
+		FILE* fp = fopen("datatables.plf","r");
+		char buf [128];
+		if (fp)
+		{
+			DEBUG_REPORT_LOG(true, ("Scanning tables"));
+			char* line = fgets(buf, 128, fp);
+			while (line)
+			{
+				
+				//strip newline
+				int len = strlen(line);
+				for (int i = len - 1; i > 0; --i)
+				{
+					if (buf[i] == '\n')
+					{
+						buf[i] = 0;
+						break;
+					}
+				}
+				
+				char* tmp = strstr(buf, "datatables/");
+				if (tmp)
+					line = tmp;
+
+				DataTable* dt =  DataTableManager::getTable(line, true);
+#if 0
+				if (dt)
+					ms_dataTableList.push_back(dt);
+#else
+				UNREF(dt);
+#endif
+				DEBUG_REPORT_LOG(true, ("."));
+				line = fgets(buf, 128, fp);
+			}
+			fclose(fp);
+			DEBUG_REPORT_LOG(true, ("\n"));
+		}
+	}
+
+	void buildDataTableList()
+	{
+#ifdef LINUX
+		system("find ../../data/sku.0/sys.server/compiled/game/datatables/ -name \"*.iff\" > datatables.plf");		
+#else
+		WARNING(true, ("Building preload lists only works under linux"));
+#endif
+	}
+
+	void buildObjectTemplateList()
+	{
+#ifdef LINUX
+		system("find ../../data/sku.0/sys.server/compiled/game/object/ -name \"*.iff\" > objectTemplates.plf");
+#else
+		WARNING(true, ("Building preload lists only works under linux"));
+#endif
+	}
+	
+}
+
+using namespace PreloadManagerNameSpace;
+
+
+//------------------------------------------------------------------------------------------
+
+void PreloadManager::install()
+{
+	if (m_installed)
+	{
+		DEBUG_FATAL(true, ("Preload manager already installed"));
+		return;
+	}
+	m_installed = true;
+
+	if (ConfigServerGame::getBuildPreloadLists())
+	{
+		buildDataTableList();
+		buildObjectTemplateList();
+	}
+
+	if (ConfigServerGame::getEnablePreload())
+	{
+		//preloading disabled
+		loadDataTables();
+		loadObjectTemplates();
+	}
+
+	ExitChain::add(remove, "PreloadManager::remove");
+}
+
+//------------------------------------------------------------------------------------------
+
+void PreloadManager::remove()
+{
+	if (!m_installed)
+	{
+		DEBUG_FATAL(true, ("Preload manager not installed"));
+		return;
+	}
+
+	for (std::vector<const ObjectTemplate*>::iterator i = ms_objectTemplateList.begin(); i != ms_objectTemplateList.end(); ++i)
+	{
+		(*i)->releaseReference();
+	}
+
+/*	for (std::vector<DataTable*>::iterator j = ms_objectTemplateList.begin(); j != ms_objectTemplateList.end(); ++j)
+	{
+		DataTableManager::close(*j);
+	}
+*/
+	m_installed = false;
+}
+
+//------------------------------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/core/PreloadManager.h b/engine/server/library/serverGame/src/shared/core/PreloadManager.h
new file mode 100644
index 00000000..aeb24ab5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/PreloadManager.h
@@ -0,0 +1,26 @@
+// PreloadManager.h
+// copyright 2003 Sony Online Entertainment
+
+
+#ifndef	_Included_PreloadManager_H
+#define	_Included_PreloadManager_H
+
+
+class PreloadManager
+{
+public:
+
+	static void install();
+	static void remove();
+
+private:
+	PreloadManager();
+	PreloadManager(const PreloadManager&);
+	PreloadManager & operator= (const PreloadManager&);
+	~PreloadManager();
+
+	static bool m_installed;
+};
+
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/ProsePackageManagerServer.cpp b/engine/server/library/serverGame/src/shared/core/ProsePackageManagerServer.cpp
new file mode 100644
index 00000000..bb2679ca
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ProsePackageManagerServer.cpp
@@ -0,0 +1,33 @@
+//======================================================================
+//
+// ProsePackageManagerServer.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ProsePackageManagerServer.h"
+
+#include "serverGame/ServerObject.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/ProsePackageParticipant.h"
+
+//======================================================================
+
+void ProsePackageManagerServer::createSimpleProsePackage            (const ServerObject & target, const StringId & stringId, ProsePackage &  pp)
+{
+	pp.stringId = stringId;
+	ProsePackageManagerServer::createSimpleProsePackageParticipant (target, pp.target);
+}
+
+//----------------------------------------------------------------------
+
+void ProsePackageManagerServer::createSimpleProsePackageParticipant (const ServerObject & obj, ProsePackageParticipant & ppp)
+{
+	ppp.id       = obj.getNetworkId ();
+	ppp.str      = obj.getAssignedObjectName ();
+	if (ppp.str.empty ())
+		ppp.stringId = obj.getObjectNameStringId ();
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/ProsePackageManagerServer.h b/engine/server/library/serverGame/src/shared/core/ProsePackageManagerServer.h
new file mode 100644
index 00000000..66635721
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ProsePackageManagerServer.h
@@ -0,0 +1,30 @@
+//======================================================================
+//
+// ProsePackageManagerServer.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ProsePackageManagerServer_H
+#define INCLUDED_ProsePackageManagerServer_H
+
+//======================================================================
+
+class ProsePackage;
+class ProsePackageParticipant;
+class ServerObject;
+class StringId;
+
+//----------------------------------------------------------------------
+
+class ProsePackageManagerServer
+{
+public:
+
+	static void        createSimpleProsePackage            (const ServerObject & target, const StringId & stringId, ProsePackage &            pp);
+	static void        createSimpleProsePackageParticipant (const ServerObject & obj, ProsePackageParticipant & pp);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/ProxyList.h b/engine/server/library/serverGame/src/shared/core/ProxyList.h
new file mode 100644
index 00000000..6a6a0aad
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ProxyList.h
@@ -0,0 +1,7 @@
+#ifndef _ProxyList_H_
+#define _ProxyList_H_
+
+typedef stdset<uint32>::fwd ProxyList;
+
+#endif // _ProxyList_H_
+
diff --git a/engine/server/library/serverGame/src/shared/core/PurgeManager.cpp b/engine/server/library/serverGame/src/shared/core/PurgeManager.cpp
new file mode 100644
index 00000000..056f2a3b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/PurgeManager.cpp
@@ -0,0 +1,72 @@
+// ======================================================================
+//
+// PurgeManager.cpp
+// copyright (c) 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PurgeManager.h"
+
+#include "serverGame/GameServer.h"
+#include "serverGame/MessageToQueue.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "UnicodeUtils.h"
+
+// ======================================================================
+
+/**
+ * Send messages to all the listed structures and vendors telling them to purge themselves
+ * @param stationId The stationId of the account initiating the purge
+ * @param structures vector of (structure id, owner id) pairs
+ * @param vendors vector of NetworkIds of vendors
+ */
+void PurgeManager::handleStructuresAndVendorsForPurge(StationId stationId, std::vector<std::pair<NetworkId, NetworkId> > const & structures, std::vector<std::pair<NetworkId, std::pair<NetworkId, Unicode::String> > > const & vendors, bool warnOnly)
+{
+	{
+		std::string structuresString("[");
+		for (std::vector<std::pair<NetworkId, NetworkId> >::const_iterator i=structures.begin(); i!=structures.end(); )
+		{
+			structuresString += i->first.getValueString() + " (owner " + i->second.getValueString()+")";
+			if (++i!=structures.end())
+				structuresString += ", ";
+		}
+		structuresString+="]";
+	
+		std::string vendorsString("[");
+		for (std::vector<std::pair<NetworkId, std::pair<NetworkId, Unicode::String> > >::const_iterator j=vendors.begin(); j!=vendors.end(); )
+		{
+			vendorsString += j->first.getValueString() + " (owner " + j->second.first.getValueString()+")";
+			if (++j!=vendors.end())
+				vendorsString += ", ";
+		}
+		vendorsString+="]";
+	
+		LOG("CustomerService",("Purge:  account %li, structures for %s are %s, vendors for purge are %s",stationId, warnOnly ? "warning emails" : "purge", structuresString.c_str(), vendorsString.c_str()));
+	}
+	
+	if (warnOnly)
+	{
+		for (std::vector<std::pair<NetworkId, NetworkId> >::const_iterator i=structures.begin(); i!=structures.end(); ++i)
+			MessageToQueue::getInstance().sendMessageToC(i->first, "C++WarnAboutPurge", i->second.getValueString(), 0, true);
+
+		for (std::vector<std::pair<NetworkId, std::pair<NetworkId, Unicode::String> > >::const_iterator j=vendors.begin(); j!=vendors.end(); ++j)
+			MessageToQueue::getInstance().sendMessageToC(j->second.first, "C++WarnAboutVendorPurge", Unicode::wideToNarrow(j->second.second), 0, true);
+	}
+	else
+	{
+		for (std::vector<std::pair<NetworkId, NetworkId> >::const_iterator i=structures.begin(); i!=structures.end(); ++i)
+			MessageToQueue::getInstance().sendMessageToC(i->first, "C++PurgeStructure", i->second.getValueString(), 0, true);
+
+		for (std::vector<std::pair<NetworkId, std::pair<NetworkId, Unicode::String> > >::const_iterator j=vendors.begin(); j!=vendors.end(); ++j)
+			MessageToQueue::getInstance().sendMessageToC(j->first, "C++PurgeVendor", "", 0, true);
+	}
+	
+	// Now that the messages are sent, wait for a save cycle and then tell the login server that the purge finished.
+	// Even if the structures weren't removed yet, we can assume that the persisted messageTos will have been saved.
+	GenericValueTypeMessage<StationId> msg("PurgeCompleteMessage",stationId);
+	GameServer::getInstance().sendToDatabaseServer(msg);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/PurgeManager.h b/engine/server/library/serverGame/src/shared/core/PurgeManager.h
new file mode 100644
index 00000000..e843ccd0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/PurgeManager.h
@@ -0,0 +1,31 @@
+// ======================================================================
+//
+// PurgeManager.h
+// copyright (c) 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_PurgeManager_H
+#define INCLUDED_PurgeManager_H
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/StationId.h"
+#include "Unicode.h"
+
+// ======================================================================
+
+/**
+ * Singleton for organizing structures, characters, vendors, etc. to be
+ * purged.
+ */
+class PurgeManager
+{
+  public:
+	  static void handleStructuresAndVendorsForPurge(StationId stationId, stdvector<std::pair<NetworkId, NetworkId> >::fwd const & structures, stdvector<std::pair<NetworkId, std::pair<NetworkId, Unicode::String> > >::fwd const & vendors, bool warnOnly);
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/RegexList.cpp b/engine/server/library/serverGame/src/shared/core/RegexList.cpp
new file mode 100644
index 00000000..62e86baa
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/RegexList.cpp
@@ -0,0 +1,205 @@
+// ======================================================================
+//
+// RegexList.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/RegexList.h"
+
+#include "StringId.h"
+#include "Unicode.h"
+#include "UnicodeUtils.h"
+#include "pcre/pcre.h"
+#include "sharedFoundation/PointerDeleter.h"
+#include "sharedRegex/RegexServices.h"
+#include "sharedUtility/DataTable.h"
+
+#include <algorithm>
+
+// ======================================================================
+
+class RegexList::Entry
+{
+public:
+
+	Entry(char const *pattern, bool matchWords, char const *reason);
+	~Entry();
+
+	pcre const        *getCompiledRegex() const;
+	bool               getMatchWords() const;
+	std::string const &getReason() const;
+
+private:
+
+	pcre                         *m_pcre;
+	bool                          m_matchWords;
+	std::string                   m_reason;
+
+};
+
+// ======================================================================
+// class RegexList::Entry
+// ======================================================================
+
+RegexList::Entry::Entry(char const *pattern, bool matchWords, char const *reason):
+	m_pcre(0),
+	m_matchWords(matchWords),
+	m_reason(reason)
+{
+	NOT_NULL(pattern);
+	NOT_NULL(reason);
+
+	//-- Compile the regular expression pattern.
+	char const *errorString = 0;
+	int         errorOffset = 0;
+
+	m_pcre = pcre_compile(pattern, 0, &errorString, &errorOffset, NULL);
+	WARNING(!m_pcre, ("failed to compile regex pattern [%s] into a pcre regex.", pattern));
+}
+
+// ----------------------------------------------------------------------
+
+RegexList::Entry::~Entry()
+{
+	if (m_pcre)
+	{
+		RegexServices::freeMemory(m_pcre);
+		m_pcre = 0;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+inline pcre const *RegexList::Entry::getCompiledRegex() const
+{
+	return m_pcre;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool RegexList::Entry::getMatchWords() const
+{
+	return m_matchWords;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const &RegexList::Entry::getReason() const
+{
+	return m_reason;
+}
+
+// ======================================================================
+
+RegexList::RegexList(const DataTable & sourceTable):
+	m_regexList()
+{
+	int rowCount = sourceTable.getNumRows();
+	m_regexList.reserve(rowCount);
+
+	int i;
+	int reasonColumn = sourceTable.findColumnNumber("reason");
+	int reservedNameColumn = sourceTable.findColumnNumber("reservedName");
+	int matchWholeNameColumn = sourceTable.findColumnNumber("matchWholeName");
+
+	for(i = 0; i < rowCount; ++i)
+	{
+		std::string const  regexPattern = Unicode::toLower(sourceTable.getStringValue(reservedNameColumn, i));
+		bool const         matchWords   = sourceTable.getIntValue(matchWholeNameColumn, i) == 0;
+		std::string const  reason       = sourceTable.getStringValue(reasonColumn, i);
+
+		m_regexList.push_back(new Entry(regexPattern.c_str(), matchWords, reason.c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+RegexList::~RegexList()
+{
+	std::for_each(m_regexList.begin(), m_regexList.end(), PointerDeleter());
+	RegexList::EntryVector().swap(m_regexList);
+}
+
+// ----------------------------------------------------------------------
+
+bool RegexList::doesStringMatch(const Unicode::String &name, std::string &ruleDescription) const
+{
+	std::vector<std::string> dummy;
+	return doesStringMatch(name, ruleDescription, dummy);
+}
+
+// ----------------------------------------------------------------------
+
+bool RegexList::doesStringMatch(const Unicode::String &name, std::string &ruleDescription, std::vector<std::string> &ignoreRules) const
+{
+	// parse the name into words
+	std::string testName = Unicode::toLower(Unicode::wideToNarrow(name));
+	std::vector<std::string> names;
+
+	int pos=0;
+	for (;;)
+	{
+		int newpos = testName.find(' ', pos);
+		if (newpos != int(Unicode::String::npos))
+		{
+			names.push_back(std::string(testName.c_str()+pos, newpos - pos));
+			pos = newpos + 1;
+		}
+		else
+		{
+			names.push_back(std::string(testName.c_str()+pos));
+			break;
+		}
+	}
+
+	int const maxCaptureCount  = 10;
+	int const dataElementCount = maxCaptureCount * 3;
+	int       captureData[dataElementCount];
+
+	//-- Test each rule against the input.
+	EntryVector::const_iterator const endIt = m_regexList.end();
+	for (EntryVector::const_iterator it = m_regexList.begin(); it != endIt; ++it)
+	{
+		Entry const *const entry = *it;
+		if (!entry)
+			continue;
+
+		pcre const *const compiledRegex = entry->getCompiledRegex();
+		if (!compiledRegex)
+			continue;
+
+		if (entry->getMatchWords())
+		{
+			std::vector<std::string>::iterator nameIter;
+			for (nameIter = names.begin(); nameIter != names.end(); ++nameIter)
+			{
+				int const returnCode = pcre_exec(compiledRegex, NULL, nameIter->c_str(), nameIter->length(), 0, 0, captureData, dataElementCount);
+				if (returnCode >= 0)
+				{
+					ruleDescription = entry->getReason();
+					if(std::find(ignoreRules.begin(), ignoreRules.end(), ruleDescription) == ignoreRules.end())
+						return true;
+				}
+				WARNING(returnCode < -1, ("RegexList::doesStringMatch(): pcre_exec() failed, return code [%d].", returnCode));
+			}
+		}
+		else
+		{
+			int const returnCode = pcre_exec(compiledRegex, NULL, testName.c_str(), testName.length(), 0, 0, captureData, dataElementCount);
+			if (returnCode >= 0)
+			{
+				ruleDescription = entry->getReason();
+				if(std::find(ignoreRules.begin(), ignoreRules.end(), ruleDescription) == ignoreRules.end())
+						return true;
+			}
+			WARNING(returnCode < -1, ("RegexList::doesStringMatch(): pcre_exec() failed, return code [%d].", returnCode));			
+		}
+	}
+
+	//-- If we get this far, no patterns matched the subject string.
+	return false;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/RegexList.h b/engine/server/library/serverGame/src/shared/core/RegexList.h
new file mode 100644
index 00000000..a1c3c705
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/RegexList.h
@@ -0,0 +1,60 @@
+// ======================================================================
+//
+// RegexList.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_RegexList_H
+#define INCLUDED_RegexList_H
+
+// ======================================================================
+
+class DataTable;
+class StringId;
+
+#include <vector>
+
+// ======================================================================
+
+/**
+ * A class to encapsulate a list of regular expressions.  A string can
+ * be compared against the list to see if it matches any of the expressions.
+ *
+ * Each expression can have a description associated with it.
+ * This is used, for example, in the naming filter system to give a reason
+ * the name is on the list, e.g. reserved, obscene, etc.  (This description
+ * is indended to be a string name for a localization string table.)
+ */
+class RegexList
+{
+public:
+	RegexList(const DataTable & sourceTable);
+	~RegexList();
+	
+	bool doesStringMatch(const Unicode::String &name) const;
+	bool doesStringMatch(const Unicode::String &name, std::string &ruleDescription) const;
+	bool doesStringMatch(const Unicode::String &name, std::string &ruleDescription, std::vector<std::string> &ignoreRules) const;
+
+private:
+
+	class Entry;
+	typedef stdvector<Entry*>::fwd  EntryVector;
+		
+private:
+
+	EntryVector  m_regexList;
+
+};
+
+// ----------------------------------------------------------------------
+
+inline bool RegexList::doesStringMatch(const Unicode::String &name) const
+{
+	std::string ignoreRuleDescription;
+	return doesStringMatch(name,ignoreRuleDescription);	
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/ReportManager.cpp b/engine/server/library/serverGame/src/shared/core/ReportManager.cpp
new file mode 100644
index 00000000..4bac637e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ReportManager.cpp
@@ -0,0 +1,359 @@
+// ============================================================================
+// 
+// ReportManager.cpp
+// Copyright Sony Online Entertainment, Inc.
+//
+// ============================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ReportManager.h"
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Os.h"
+#include "serverGame/Chat.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverUtility/ChatLogManager.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/ProsePackageParticipant.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatOnRequestLog.h"
+#include "sharedNetworkMessages/ChatRequestLog.h"
+#include "sharedObject/Object.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "serverUtility/ConfigServerUtility.h"
+#include "UnicodeUtils.h"
+
+// ============================================================================
+//
+// ReportManagerNamespace
+//
+// ============================================================================
+
+namespace ReportManagerNamespace
+{
+	unsigned int s_sequenceId = 1;
+
+	struct ReportData
+	{
+		Unicode::String m_reportingName;
+		Unicode::String m_harassingName;
+		NetworkId       m_reportingNetworkId;
+		NetworkId       m_harassingNetworkId;
+		std::string     m_reportLogChannel;
+		Unicode::String m_clientData;
+	};
+
+	typedef std::map<unsigned int, ReportData> ReportList;
+	ReportList s_reportList;
+
+	typedef std::map<NetworkId, time_t> ReportThrottle;
+	ReportThrottle s_reportThrottle;
+
+	time_t const s_throttleTime = 10; // seconds
+	time_t const s_throttleCleanupTime = 60; // seconds
+	time_t s_throttleCleanupTimer = 0; // seconds
+}
+
+using namespace ReportManagerNamespace;
+
+// ============================================================================
+//
+// ReportManager
+//
+// ============================================================================
+
+//-----------------------------------------------------------------------------
+bool ReportManager::isThrottled(NetworkId const &reportingNetworkId)
+{
+	bool result = false;
+	ReportThrottle::iterator iterReportThrottle = s_reportThrottle.find(reportingNetworkId);
+
+	if (iterReportThrottle != s_reportThrottle.end())
+	{
+		if ((Os::getRealSystemTime() - iterReportThrottle->second) >= s_throttleTime)
+		{
+			// Enough time elapsed
+
+			s_reportThrottle.erase(iterReportThrottle);
+		}
+		else
+		{
+			// Still waiting to time out
+
+			result = true;
+		}
+	}
+
+	return result;
+}
+
+//-----------------------------------------------------------------------------
+int ReportManager::getThrottleTimeRemaining(NetworkId const &reportingNetworkId)
+{
+	int result = 0;
+	ReportThrottle::iterator iterReportThrottle = s_reportThrottle.find(reportingNetworkId);
+
+	if (iterReportThrottle != s_reportThrottle.end())
+	{
+	    result = static_cast<int>(s_throttleTime - (Os::getRealSystemTime() - iterReportThrottle->second));
+	}
+
+	return result;
+}
+
+//-----------------------------------------------------------------------------
+void ReportManager::addReport(Unicode::String const &reportingName, NetworkId const &reportingNetworkId, Unicode::String const &harassingName, NetworkId const &harassingNetworkId, std::string const &reportLogChannel, Unicode::String const & clientSentData)
+{
+	// Remove any expired throttling
+
+	time_t const systemTime = Os::getRealSystemTime();
+
+	if ((systemTime - s_throttleCleanupTimer) > s_throttleCleanupTime)
+	{
+		s_throttleCleanupTimer = systemTime;
+
+		ReportThrottle::iterator iterReportThrottle = s_reportThrottle.begin();
+
+		for (; iterReportThrottle != s_reportThrottle.end(); ++iterReportThrottle)
+		{
+			if (((systemTime - iterReportThrottle->second) >= s_throttleTime))
+			{
+				s_reportThrottle.erase(iterReportThrottle);
+			}
+		}
+	}
+
+	// Add this report to be throttled
+
+	s_reportThrottle[reportingNetworkId] = systemTime;
+
+	// Send the request to the chat server
+
+	ChatAvatarId reportingChatAvatarId(Chat::constructChatAvatarId(Unicode::wideToNarrow(reportingName)));
+
+	ChatRequestLog msg(s_sequenceId, Unicode::narrowToWide(reportingChatAvatarId.getFullName()));
+	Chat::sendToChatServer(msg);
+
+	ReportData reportData;
+	reportData.m_reportingName = reportingName;
+	reportData.m_harassingName = harassingName;
+	reportData.m_reportingNetworkId = reportingNetworkId;
+	reportData.m_harassingNetworkId = harassingNetworkId;
+	reportData.m_clientData = clientSentData;
+
+	if (reportLogChannel.empty())
+		reportData.m_reportLogChannel = std::string("Report:");
+	else
+		reportData.m_reportLogChannel = reportLogChannel + std::string(":");
+
+	s_reportList.insert(std::make_pair(s_sequenceId, reportData));
+
+	++s_sequenceId;
+
+	// Do we need to add a timeout period to let the player know if the chat server is down?
+}
+
+//-----------------------------------------------------------------------------
+void ReportManager::handleMessage(ChatOnRequestLog const &chatOnRequestLog)
+{
+	// This function is the callback from receiving the report log request
+	// to the chat server
+
+	ReportList::const_iterator iterReportList = s_reportList.find(chatOnRequestLog.getSequence());
+
+	if (iterReportList != s_reportList.end())
+	{
+		ReportData const &reportData = iterReportList->second;
+		Unicode::String report;
+		Unicode::String header;
+		std::string const reportingPlayer(Unicode::toLower(Chat::constructChatAvatarId(Unicode::wideToNarrow(reportData.m_reportingName)).getFullName()));
+		std::string const harassingPlayer(Unicode::toLower(Chat::constructChatAvatarId(Unicode::wideToNarrow(reportData.m_harassingName)).getFullName()));
+
+		std::string reportingPlayerStationName;
+		uint32 reportingPlayerStationId = 0;
+		const CreatureObject * reporter = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(reportData.m_reportingNetworkId));
+		if (reporter)
+		{
+			const Client * reporterClient = reporter->getClient();
+			if (reporterClient)
+			{
+				reportingPlayerStationName = reporterClient->getAccountName();
+				reportingPlayerStationId = reporterClient->getStationId();
+			}
+			else
+			{
+				const PlayerObject * reporterPlayer = PlayerCreatureController::getPlayerObject(reporter);
+				if (reporterPlayer)
+				{
+					reportingPlayerStationId = reporterPlayer->getStationId();
+				}
+			}
+		}
+
+		std::string harassingPlayerStationName;
+		uint32 harassingPlayerStationId = 0;
+		const CreatureObject * harassing = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(reportData.m_harassingNetworkId));
+		if (harassing)
+		{
+			const Client * harassingClient = harassing->getClient();
+			if (harassingClient)
+			{
+				harassingPlayerStationName = harassingClient->getAccountName();
+				harassingPlayerStationId = harassingClient->getStationId();
+			}
+			else
+			{
+				const PlayerObject * harassingPlayer = PlayerCreatureController::getPlayerObject(harassing);
+				if (harassingPlayer)
+				{
+					harassingPlayerStationId = harassingPlayer->getStationId();
+				}
+			}
+		}
+
+		ChatLogManager::getReportHeader(header, reportingPlayer, reportData.m_reportingNetworkId, reportingPlayerStationName, reportingPlayerStationId, harassingPlayer, reportData.m_harassingNetworkId, harassingPlayerStationName, harassingPlayerStationId);
+
+		report.append(header);
+
+		typedef std::multimap<time_t, Unicode::String> SortedChatLog;
+		typedef std::set<Unicode::String> SortedFromPlayers;
+		SortedChatLog sortedChatLog;
+		SortedFromPlayers sortedFromPlayers;
+
+		// Sort the chat log
+
+		std::vector<ChatLogEntry>::const_iterator iterLogEntries = chatOnRequestLog.getLogEntries().begin();
+
+		{
+			Unicode::String chatMessage;
+
+			for (; iterLogEntries != chatOnRequestLog.getLogEntries().end(); ++iterLogEntries)
+			{
+				ChatLogEntry const &chatLogEntry = (*iterLogEntries);
+
+				sortedFromPlayers.insert(chatLogEntry.m_from);
+				ChatLogManager::buildLogEntry(chatMessage, chatLogEntry.m_from, chatLogEntry.m_to, chatLogEntry.m_message, chatLogEntry.m_channel, chatLogEntry.m_time);
+
+				sortedChatLog.insert(std::make_pair(chatLogEntry.m_time, chatMessage));
+			}
+		}
+
+		// Sort spatial chat
+
+		CreatureObject * const reportingCreatureObject = CreatureObject::asCreatureObject(NetworkIdManager::getObjectById(reportData.m_reportingNetworkId));
+		PlayerObject * const reportingPlayerObject = PlayerCreatureController::getPlayerObject(reportingCreatureObject);
+		
+		if (reportingPlayerObject != NULL)
+		{
+			// Make sure the chat log does not have any extra data in it
+
+			reportingPlayerObject->cleanChatLog();
+
+			// Build the chat log string
+
+			PlayerObject::ChatLog const &chatLog = reportingPlayerObject->getChatLog();
+			PlayerObject::ChatLog::const_iterator iterChatLog = chatLog.begin();
+			Unicode::String chatMessage;
+			Unicode::String fromPlayer;
+			Unicode::String toPlayer;
+			Unicode::String text;
+			Unicode::String channel;
+			time_t time;
+
+			for (; iterChatLog != chatLog.end(); ++iterChatLog)
+			{
+				int const chatMessageIndex = iterChatLog->m_index;
+
+				if (ChatLogManager::getChatMessage(chatMessageIndex, fromPlayer, toPlayer, text, channel, time))
+				{
+					sortedFromPlayers.insert(fromPlayer);
+					ChatLogManager::buildLogEntry(chatMessage, fromPlayer, toPlayer, text, channel, time);
+
+					sortedChatLog.insert(std::make_pair(iterChatLog->m_time, chatMessage));
+				}
+				else
+				{
+					DEBUG_WARNING(true, ("Unable to find the chat message(%i)", chatMessageIndex));
+				}
+			}
+		}
+		else
+		{
+			report.append(Unicode::narrowToWide(FormattedString<1024>().sprintf("Unable to resolve networkId(%s) to a PlayerObject, this probably means the player was logged out while a /report was in the process of being made.", reportData.m_reportingNetworkId.getValueString().c_str())));
+		}
+
+		// Make sure the harassing player's name is in one of the chat entries as a from player
+
+		bool foundHarassingPlayer = false;
+		SortedFromPlayers::const_iterator iterSortedFromPlayers = sortedFromPlayers.find(Unicode::narrowToWide(harassingPlayer));
+
+		if (iterSortedFromPlayers != sortedFromPlayers.end())
+		{
+			foundHarassingPlayer = true;
+		}
+
+		if (   !foundHarassingPlayer
+		    && (reportingCreatureObject != NULL))
+		{
+			// No harassing player match
+			
+			ProsePackage prosePackage;
+			prosePackage.stringId = StringId("system_msg", "report_invalid_name");
+			
+			ProsePackageParticipant target;
+			target.str = reportData.m_harassingName;
+			prosePackage.target = target;
+			prosePackage.digitInteger = ConfigServerUtility::getChatLogMinutes();
+			
+			Chat::sendSystemMessage(*reportingCreatureObject, prosePackage);
+
+			return;
+		}
+
+		// Put the final report together
+		
+		SortedChatLog::const_iterator iterSortedChatLog = sortedChatLog.begin();
+		int count = 0;
+		
+		for (; iterSortedChatLog != sortedChatLog.end(); ++iterSortedChatLog)
+		{
+			report.append(Unicode::narrowToWide(FormattedString<32>().sprintf("[%3d] ", ++count)));
+			report.append(iterSortedChatLog->second);
+		}
+
+		if(!reportData.m_clientData.empty())
+		{
+			report.append(Unicode::narrowToWide("Client sent data:\n"));
+			report.append(reportData.m_clientData);
+		}
+
+		if (!reportData.m_reportLogChannel.empty())
+			LOGU("CustomerService", (reportData.m_reportLogChannel.c_str()), report);
+		else
+			LOGU("CustomerService", ("Report:"), report);
+		
+		// System message for success
+		
+		ProsePackage prosePackage;
+		prosePackage.stringId = StringId("system_msg", "report_success");
+		
+		ProsePackageParticipant target;
+		target.str = reportData.m_harassingName;
+		prosePackage.target = target;
+		
+		if (reportingCreatureObject != NULL)
+		{
+			Chat::sendSystemMessage(*reportingCreatureObject, prosePackage);
+		}
+	}
+	else
+	{
+		DEBUG_REPORT_LOG(true, ("ReportManager: Received a report sequence number that is invalid: %d", chatOnRequestLog.getSequence()));
+	}
+}
+
+// ============================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/ReportManager.h b/engine/server/library/serverGame/src/shared/core/ReportManager.h
new file mode 100644
index 00000000..8a65aac5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ReportManager.h
@@ -0,0 +1,38 @@
+// ============================================================================
+// 
+// ReportManager.h
+// Copyright Sony Online Entertainment, Inc.
+//
+// ============================================================================
+
+#ifndef INCLUDED_ReportManager_H
+#define INCLUDED_ReportManager_H
+
+struct ChatAvatarId;
+class ChatOnRequestLog;
+class NetworkId;
+
+//-----------------------------------------------------------------------------
+class ReportManager
+{
+public:
+
+	static bool isThrottled(NetworkId const &reportingNetworkId);
+	static int getThrottleTimeRemaining(NetworkId const &reportingNetworkId);
+
+	static void addReport(Unicode::String const &reportingName, NetworkId const &reportingNetworkId, Unicode::String const &harassingName, NetworkId const &harassingNetworkId, std::string const &reportLogChannel, Unicode::String const & clientSentData = Unicode::String());
+	static void handleMessage(ChatOnRequestLog const &chatOnRequestLog);
+
+private:
+
+	// Disable
+
+	ReportManager();
+	~ReportManager();
+	ReportManager(ReportManager const &);
+	ReportManager &operator =(ReportManager const &);
+};
+
+// ============================================================================
+
+#endif // INCLUDED_ReportManager_H
diff --git a/engine/server/library/serverGame/src/shared/core/SceneGlobalData.cpp b/engine/server/library/serverGame/src/shared/core/SceneGlobalData.cpp
new file mode 100644
index 00000000..5a7c12b8
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/SceneGlobalData.cpp
@@ -0,0 +1,144 @@
+// ======================================================================
+//
+// SceneGlobalData.cpp
+// copyright (c) 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/SceneGlobalData.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedLog/Log.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+#include <algorithm>
+
+// ======================================================================
+
+namespace SceneGlobalDataNamespace
+{
+	std::string const ms_SceneGlobalDataTableName("datatables/planet_server/sceneglobaldata.iff");
+
+	bool ms_installed = false;
+
+	class SceneData 
+	{
+	public:
+		SceneData(DataTable const & dataTable, int row);
+
+		std::string const & getId() const;
+		float getUpdateRadius() const;
+		
+	private:
+		std::string const m_id;
+		float const m_updateradius;
+
+	private:  //disable:
+		SceneData();  
+		SceneData(SceneData const &);
+		SceneData & operator=(SceneData const &);
+	};
+
+	typedef std::map<std::string, SceneData *> SceneDataType;
+	
+	SceneDataType ms_SceneDataItems;
+
+	SceneData  * getSceneDataByName(std::string const & sceneName);
+	
+	std::vector<std::string> buildVectorFromString(std::string packedString);
+}
+
+using namespace SceneGlobalDataNamespace;
+
+// ======================================================================
+
+void SceneGlobalData::install()
+{
+	DEBUG_FATAL(ms_installed,("Programmer bug:  SceneGlobalData::install() called twice"));
+	ms_installed = true;
+	ExitChain::add(SceneGlobalData::remove, "SceneGlobalData::remove");
+
+	if (ConfigServerGame::getEnableSceneGlobalData())
+	{
+		DataTable * data = NON_NULL(DataTableManager::getTable(ms_SceneGlobalDataTableName, true));
+		int numRows = data->getNumRows();
+		{
+			for (int row=0; row<numRows; ++row)
+			{
+				SceneData * newScene = new SceneData(*data,row);		
+				std::pair<SceneDataType::iterator, bool> result = ms_SceneDataItems.insert(std::make_pair(newScene->getId(), newScene));
+				WARNING_DEBUG_FATAL(!result.second,("Data bug:  Scene %s was specified more than once in data table %s",newScene->getId().c_str(), ms_SceneGlobalDataTableName.c_str()));		
+			}
+		}
+
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void SceneGlobalData::remove()
+{
+	for (SceneDataType::iterator i=ms_SceneDataItems.begin(); i!=ms_SceneDataItems.end(); ++i)
+		delete i->second;
+
+	ms_SceneDataItems.clear();
+	
+	DEBUG_FATAL(!ms_installed,("Programmer bug:  SceneGlobalData was not installed"));
+	ms_installed = false;
+}
+
+// ----------------------------------------------------------------------
+
+float SceneGlobalData::getUpdateRadius(std::string const & sceneName)
+{
+	SceneData * Scene = SceneGlobalDataNamespace::getSceneDataByName(sceneName);
+
+	if (Scene) 
+	{
+		return Scene->getUpdateRadius();
+	}
+	else
+	{
+		return 0.0f;
+	}	
+}
+
+// ----------------------------------------------------------------------
+
+SceneData * SceneGlobalDataNamespace::getSceneDataByName(std::string const & sceneName)
+{
+	SceneDataType::iterator i=ms_SceneDataItems.find(sceneName);
+	if (i!=ms_SceneDataItems.end())
+		return i->second;
+	else
+		return NULL;
+}
+
+// ======================================================================
+
+SceneData::SceneData(DataTable const & dataTable, int row) :
+		m_id(dataTable.getStringValue("ID",row)),
+		m_updateradius(dataTable.getFloatValue("UpdateRadius",row))
+{
+	DEBUG_REPORT_LOG(true,("[SceneGlobalData] : Initialized global scene info with: %s, %f\n ",m_id.c_str(), m_updateradius));
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & SceneData::getId() const
+{
+	return m_id;
+}
+
+// ----------------------------------------------------------------------
+
+float SceneData::getUpdateRadius() const
+{
+	return m_updateradius;
+}
+
+// ----------------------------------------------------------------------
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/SceneGlobalData.h b/engine/server/library/serverGame/src/shared/core/SceneGlobalData.h
new file mode 100644
index 00000000..9797a84d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/SceneGlobalData.h
@@ -0,0 +1,29 @@
+// ======================================================================
+//
+// SceneGlobalData.h
+// copyright (c) 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_SceneGlobalData_H
+#define INCLUDED_SceneGlobalData_H
+
+// ======================================================================
+
+// ======================================================================
+
+// ======================================================================
+
+class SceneGlobalData
+{
+  public:
+	static void install();
+	static float getUpdateRadius(std::string const & sceneName);
+
+  private:
+	static void remove();
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/ServerBuffBuilderManager.cpp b/engine/server/library/serverGame/src/shared/core/ServerBuffBuilderManager.cpp
new file mode 100644
index 00000000..6ae614a4
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerBuffBuilderManager.cpp
@@ -0,0 +1,205 @@
+// ============================================================================
+//
+// ServerBuffBuilderManager.cpp
+// Copyright 2006 Sony Online Entertainment, Inc.
+//
+// ============================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerBuffBuilderManager.h"
+
+#include "serverGame/CreatureObject.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedMessageDispatch/Transceiver.h"
+#include "sharedObject/Controller.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/Object.h"
+
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "serverScript/ScriptParameters.h"
+
+// ============================================================================
+
+namespace ServerBuffBuilderManagerNamespace
+{
+	class MyCallback : public MessageDispatch::Callback
+	{
+	public:
+		MyCallback ()
+		: MessageDispatch::Callback ()
+		{
+			
+		}
+	};
+
+
+	bool ms_installed = false;
+	MyCallback * ms_callback = 0;
+}
+
+using namespace ServerBuffBuilderManagerNamespace;
+
+// ============================================================================
+
+void ServerBuffBuilderManager::install()
+{
+	DEBUG_FATAL(ms_installed, ("ServerImageDesignerManager::install Already Installed"));
+	ms_installed = true;
+	ms_callback = new MyCallback();
+	ExitChain::add(ServerBuffBuilderManager::remove, "ServerBuffBuilderManager::remove", 0, false);
+}
+
+//-----------------------------------------------------------------------------
+
+void ServerBuffBuilderManager::remove()
+{
+	DEBUG_FATAL(!ms_installed, ("ServerBuffBuilderManager::remove - Not Installed"));
+	ms_installed = false;
+
+	delete ms_callback;
+	ms_callback = NULL;
+}
+
+//-----------------------------------------------------------------------------
+
+bool ServerBuffBuilderManager::makeChanges(SharedBuffBuilderManager::Session const & session)
+{
+	if(!ms_installed)
+	{
+		DEBUG_FATAL(true, ("ServerBuffBuilderManager not installed"));
+		return false;
+	}
+
+	NetworkId const & recipientId = session.recipientId;
+	Object * const recipientObj = NetworkIdManager::getObjectById(recipientId);
+	ServerObject * const recipientServerObj = recipientObj ? recipientObj->asServerObject() : NULL;
+	CreatureObject * const recipient = recipientServerObj ? recipientServerObj->asCreatureObject() : NULL;
+	NetworkId const & bufferId = session.bufferId;
+	Object * const bufferObj = NetworkIdManager::getObjectById(bufferId);
+	ServerObject * const bufferServerObj = bufferObj ? bufferObj->asServerObject() : NULL;
+	CreatureObject * const buffer = bufferServerObj ? bufferServerObj->asCreatureObject() : NULL;
+	if(buffer && recipient)
+	{
+		sendSessionToScript(session, session.bufferId, static_cast<int>(Scripting::TRIG_BUFF_BUILDER_COMPLETED));
+	}
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ServerBuffBuilderManager::sendSessionToScriptForValidation(SharedBuffBuilderManager::Session const & session)
+{
+	NetworkId const & bufferId = session.bufferId;
+	NetworkId const & recipientId = session.recipientId;
+	Object const * const bufferObj = NetworkIdManager::getObjectById(bufferId);
+	ServerObject const * const bufferServer = bufferObj ? bufferObj->asServerObject() : NULL;
+	CreatureObject const * const buffer = bufferServer ? bufferServer->asCreatureObject() : NULL;
+	Object * const recipientObj = NetworkIdManager::getObjectById(recipientId);
+	ServerObject * const recipientServer = recipientObj ? recipientObj->asServerObject() : NULL;
+	CreatureObject * const recipient = recipientServer ? recipientServer->asCreatureObject() : NULL;
+	if(buffer && recipient)
+	{
+		sendSessionToScript(session, session.bufferId, static_cast<int>(Scripting::TRIG_BUFF_BUILDER_VALIDATE));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ServerBuffBuilderManager::sendSessionToScript(SharedBuffBuilderManager::Session const & session, NetworkId const & objectToTriggerId, int const trigger)
+{
+	Object * const objectToTrigger = NetworkIdManager::getObjectById(objectToTriggerId);
+	ServerObject * const serverObjectToTrigger = objectToTrigger ? objectToTrigger->asServerObject() : NULL;
+	if(serverObjectToTrigger)
+	{
+		GameScriptObject * const scriptObject = serverObjectToTrigger->getScriptObject();
+		if (scriptObject)
+		{
+			ScriptParams params;
+			params.addParam(session.bufferId, "bufferId");
+			params.addParam(session.recipientId, "recipientId");
+			params.addParam(static_cast<int>(session.startingTime), "startingTime");
+			params.addParam(session.bufferRequiredCredits, "bufferRequiredCredits");
+			params.addParam(session.bufferRequiredCredits, "recipientPaidCredits");
+			params.addParam(session.accepted, "accepted");
+			std::vector<const char *> buffComponentKeys;
+			std::vector<int> buffComponentValues;
+			
+			for(std::map<std::string, std::pair<int,int> >::const_iterator j = session.buffComponents.begin(); j != session.buffComponents.end(); ++j)
+			{
+				buffComponentKeys.push_back(j->first.c_str());
+				buffComponentValues.push_back(j->second.first);
+			}
+			params.addParam(buffComponentKeys, "buffComponentKeys");
+			params.addParam(buffComponentValues, "buffComponentValues");
+			
+			IGNORE_RETURN(scriptObject->trigAllScripts(static_cast<Scripting::TrigId>(trigger), params));
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ServerBuffBuilderManager::cancelSession(NetworkId const & bufferId, NetworkId const & recipientId)
+{
+	//send the cancel message to the buffer
+	Object * const bufferObject = NetworkIdManager::getObjectById(bufferId);
+	Controller * const bufferController = bufferObject ? bufferObject->getController() : NULL;
+	if(bufferController)
+	{
+		BuffBuilderChangeMessage * outMsg = new BuffBuilderChangeMessage();
+		if(outMsg)
+		{
+			outMsg->setBufferId(bufferId);
+			outMsg->setRecipientId(recipientId);
+			outMsg->setOrigin(BuffBuilderChangeMessage::O_SERVER);
+			bufferController->appendMessage(static_cast<int>(CM_buffBuilderCancel), 0.0f, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+		}
+	}
+
+	//send the cancel message to the recipient
+	Object * const recipientObject = NetworkIdManager::getObjectById(recipientId);
+	Controller * const recipientController = recipientObject ? recipientObject->getController() : NULL;
+	if(recipientController && bufferController != recipientController)
+	{
+		BuffBuilderChangeMessage * outMsg = new BuffBuilderChangeMessage();
+		if(outMsg)
+		{
+			outMsg->setBufferId(bufferId);
+			outMsg->setRecipientId(recipientId);
+			outMsg->setOrigin(BuffBuilderChangeMessage::O_SERVER);
+			recipientController->appendMessage(static_cast<int>(CM_buffBuilderCancel), 0.0f, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+		}
+	}
+
+	//send cancel trigger to buffer player
+	ServerObject * const bufferServerObject = bufferObject ? bufferObject->asServerObject() : NULL;
+	if(bufferServerObject)
+	{
+		GameScriptObject * const scriptObject = bufferServerObject->getScriptObject();
+		if (scriptObject)
+		{
+			ScriptParams params;
+			IGNORE_RETURN(scriptObject->trigAllScripts(Scripting::TRIG_BUFF_BUILDER_CANCELED, params));
+		}
+	}
+
+	//send cancel trigger to recipient player
+	ServerObject * const recipientServerObject = recipientObject ? recipientObject->asServerObject() : NULL;
+	if(recipientServerObject && recipientServerObject != bufferServerObject)
+	{
+		GameScriptObject * const scriptObject = recipientServerObject->getScriptObject();
+		if (scriptObject)
+		{
+			ScriptParams params;
+			IGNORE_RETURN(scriptObject->trigAllScripts(Scripting::TRIG_BUFF_BUILDER_CANCELED, params));
+		}
+	}
+	SharedBuffBuilderManager::endSession(bufferId);
+}
+
+// ============================================================================
+
+
+
+
diff --git a/engine/server/library/serverGame/src/shared/core/ServerBuffBuilderManager.h b/engine/server/library/serverGame/src/shared/core/ServerBuffBuilderManager.h
new file mode 100644
index 00000000..22d4a51a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerBuffBuilderManager.h
@@ -0,0 +1,44 @@
+// ============================================================================
+// 
+// ServerBuffBuilderManager.h
+// Copyright 2006 Sony Online Entertainment, Inc.
+//
+// ============================================================================
+
+#ifndef INCLUDED_ServerBuffBuilderManager_H
+#define INCLUDED_ServerBuffBuilderManager_H
+
+//-----------------------------------------------------------------------------
+
+#include "sharedGame/SharedBuffBuilderManager.h"
+
+//-----------------------------------------------------------------------------
+
+class ScriptParams;
+
+//-----------------------------------------------------------------------------
+
+class ServerBuffBuilderManager
+{
+public:
+	static void install();
+	static void remove();
+
+	static bool makeChanges(SharedBuffBuilderManager::Session const & session);
+	static void sendSessionToScriptForValidation(SharedBuffBuilderManager::Session const & session);
+	static void convertSessionToScriptParams(SharedBuffBuilderManager::Session const & session, ScriptParams & /*IN-OUT*/ params);
+	static void cancelSession(NetworkId const & bufferId, NetworkId const & buffeeId);
+
+private:
+	// Disable
+	ServerBuffBuilderManager();
+	ServerBuffBuilderManager(ServerBuffBuilderManager const &);
+	ServerBuffBuilderManager &operator =(ServerBuffBuilderManager const &);
+
+private:
+	static void sendSessionToScript(SharedBuffBuilderManager::Session const & session, NetworkId const & objectToTriggerId, int trigger);
+};
+
+// ============================================================================
+
+#endif // INCLUDED_ServerBuffBuilderManager_H
diff --git a/engine/server/library/serverGame/src/shared/core/ServerBuildoutManager.cpp b/engine/server/library/serverGame/src/shared/core/ServerBuildoutManager.cpp
new file mode 100644
index 00000000..dda89d33
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerBuildoutManager.cpp
@@ -0,0 +1,1491 @@
+// ======================================================================
+//
+// ServerBuildoutManager.cpp
+//
+// Copyright 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerBuildoutManager.h"
+
+#include "fileInterface/StdioFile.h"
+#include "serverGame/BuildingObject.h"
+#include "serverGame/CellObject.h"
+#include "serverGame/Client.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/ServerCellObjectTemplate.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerStaticObjectTemplate.h"
+#include "serverGame/ServerTangibleObjectTemplate.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFile/Iff.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedGame/SharedBuildoutAreaManager.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedLog/Log.h"
+#include "sharedMath/Quaternion.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedObject/ContainedByProperty.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedRandom/Random.h"
+#include "sharedUtility/DataTable.h"
+#include "UnicodeUtils.h"
+#include <algorithm>
+
+// ======================================================================
+
+namespace ServerBuildoutManagerNamespace
+{
+
+	const int cs_buildingObjIdOffset = 2000;
+
+	// ----------------------------------------------------------------------
+
+	struct BuildoutRow
+	{
+		BuildoutRow();
+		BuildoutRow(int64 id, int64 containerId, int cellIndex, Transform const &transform_p, ServerObjectTemplate const *serverTemplate, std::string const &scripts, std::string const &objvars, std::string const & eventRequired);
+		BuildoutRow(BuildoutRow const &rhs);
+		~BuildoutRow();
+		BuildoutRow &operator=(BuildoutRow const &rhs);
+
+		int64 m_id;
+		int64 m_containerId;
+		Transform m_transform_p;
+		ServerObjectTemplate const *m_serverTemplate;
+		std::string m_scripts;
+		std::string m_objvars;
+		int m_cellIndex;
+		std::string m_eventRequired;
+	};
+
+	// ----------------------------------------------------------------------
+
+	struct AreaInfo
+	{
+		BuildoutArea buildoutArea;
+		bool loaded;
+		bool editing;
+		std::vector<BuildoutRow> buildoutRows;
+	};
+
+	struct ServerEventAreaInfo
+	{
+		ServerEventAreaInfo():
+		buildOut(NULL),
+		loadedObject(NULL)
+		{
+
+		}
+		ServerEventAreaInfo(BuildoutRow const * _buildOut, ServerObject* _loadedObject):
+		buildOut(_buildOut),
+		loadedObject(_loadedObject)
+		{
+			
+		}
+
+		BuildoutRow const * buildOut;
+		ServerObject* loadedObject;
+	};
+	
+	typedef std::map< std::string, std::list< ServerEventAreaInfo > > ServerEventMap;
+	// ----------------------------------------------------------------------
+
+	int const s_buildoutCacheVersion = 2;
+	bool s_installed = false;
+	std::vector<AreaInfo> s_areas;
+	ServerEventMap s_eventObjects;
+	// ----------------------------------------------------------------------
+
+	void remove();
+	void generateBuildoutData(float x1, float z1, float x2, float z2, std::vector<ServerBuildoutAreaRow> &serverRows, std::vector<ClientBuildoutAreaRow> &clientRows);
+	void loadArea(AreaInfo &areaInfo);
+	void buildObjectsToSave(std::vector<ServerObject const *> &objectsToSave, std::vector<ServerObject const *> &potentialObjects);
+	bool isNotObjectForBuildout(ServerObject const *obj);
+	bool buildoutObjectLessComparator(ServerObject const *lhs, ServerObject const *rhs);
+	void instantiateAreaNode(AreaInfo const &areaInfo, int nodeX, int nodeZ);
+
+	// ----------------------------------------------------------------------
+#ifdef _WIN32
+	const int64 cs_dataBitStripMask = 0x80000000ffffffff;
+#else
+	const int64 cs_dataBitStripMask = 0x80000000ffffffffLL;
+#endif
+
+}
+using namespace ServerBuildoutManagerNamespace;
+
+// ======================================================================
+
+void ServerBuildoutManager::install()
+{
+	FATAL(s_installed, ("ServerBuildoutManagerNamespace::install multiple install"));
+	SharedBuildoutAreaManager::load(ConfigServerGame::getSceneID());
+
+	std::vector<BuildoutArea> const &buildoutAreas = SharedBuildoutAreaManager::getBuildoutAreasForCurrentScene();
+
+	for (std::vector<BuildoutArea>::const_iterator i = buildoutAreas.begin(); i != buildoutAreas.end(); ++i)
+	{
+		s_areas.push_back();
+		AreaInfo &areaInfo = s_areas.back();
+		areaInfo.buildoutArea = *i;
+		areaInfo.loaded = false;
+		areaInfo.editing = false;
+	}
+	s_installed = true;
+	ExitChain::add(remove, "ServerBuildoutManager::remove");
+}
+
+// ----------------------------------------------------------------------
+
+void ServerBuildoutManager::onChunkComplete(int nodeX, int nodeZ)
+{
+	for (std::vector<AreaInfo>::iterator i = s_areas.begin(); i != s_areas.end(); ++i)
+	{
+		AreaInfo &areaInfo = *i;
+		if (   nodeX < areaInfo.buildoutArea.rect.x1
+		    && nodeX+100 > areaInfo.buildoutArea.rect.x0
+		    && nodeZ < areaInfo.buildoutArea.rect.y1
+		    && nodeZ+100 > areaInfo.buildoutArea.rect.y0)
+		{
+			if (!areaInfo.loaded)
+				loadArea(areaInfo);
+			instantiateAreaNode(areaInfo, nodeX, nodeZ);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerBuildoutManager::saveArea(std::string const &serverFileName, std::string const &clientFileName, float x1, float z1, float x2, float z2)
+{
+	FATAL( true, ( "ServerBuildoutManager::saveArea\n" ) );
+
+	if (!ConfigServerGame::getBuildoutAreaEditingEnabled())
+	{
+		WARNING(true, ("Tried to save a buildout area with buildout area editing disabled?"));
+		return;
+	}
+
+	StdioFile serverOutputFile(serverFileName.c_str(), "w");
+	if (!serverOutputFile.isOpen())
+	{
+		WARNING(true, ("Failed to open area buildout save table '%s'.", serverFileName.c_str()));
+		return;
+	}
+
+	StdioFile clientOutputFile(clientFileName.c_str(), "w");
+	if (!clientOutputFile.isOpen())
+	{
+		WARNING(true, ("Failed to open area buildout save table '%s'.", clientFileName.c_str()));
+		return;
+	}
+
+	// save the table headers
+	{
+		std::string const serverHeader(
+			"server_template_crc\tcell_index\tpx\tpy\tpz\tqw\tqx\tqy\tqz\tscripts\tobjvars\n"
+			"h\ti\tf\tf\tf\tf\tf\tf\tf\ts\tp\n");
+		serverOutputFile.write(serverHeader.length(), serverHeader.c_str());
+
+		std::string const clientHeader(
+			"shared_template_crc\tcell_index\tpx\tpy\tpz\tqw\tqx\tqy\tqz\tradius\tportal_layout_crc\n"
+			"h\ti\tf\tf\tf\tf\tf\tf\tf\tf\ti\n");
+		clientOutputFile.write(clientHeader.length(), clientHeader.c_str());
+	}
+
+	// generate the rows
+	std::vector<ServerBuildoutAreaRow> serverRows;
+	std::vector<ClientBuildoutAreaRow> clientRows;
+	generateBuildoutData(x1, z1, x2, z2, serverRows, clientRows);
+
+	// save the server rows
+	{
+		for (std::vector<ServerBuildoutAreaRow>::const_iterator i = serverRows.begin(); i != serverRows.end(); ++i)
+		{
+			ConstCharCrcString const &serverTemplateName = ObjectTemplateList::lookUp((*i).serverTemplateCrc);
+			char buf[512];
+			IGNORE_RETURN(snprintf(buf, sizeof(buf)-1, "%s\t%d\t%g\t%g\t%g\t%g\t%g\t%g\t%g\t",
+				serverTemplateName.getString(),
+				(*i).cellIndex,
+				(*i).position.x, (*i).position.y, (*i).position.z,
+				(*i).orientation.w, (*i).orientation.x, (*i).orientation.y, (*i).orientation.z));
+			buf[sizeof(buf)-1] = '\0';
+			serverOutputFile.write(strlen(buf), buf);
+			serverOutputFile.write((*i).scripts.length(), (*i).scripts.c_str());
+			serverOutputFile.write(1, "\t");
+			serverOutputFile.write((*i).objvars.length(), (*i).objvars.c_str());
+			serverOutputFile.write(1, "\n");
+		}
+	}
+
+	// save the client rows
+	{
+		for (std::vector<ClientBuildoutAreaRow>::const_iterator i = clientRows.begin(); i != clientRows.end(); ++i)
+		{
+			ConstCharCrcString const &sharedTemplateName = ObjectTemplateList::lookUp((*i).sharedTemplateCrc);
+			char buf[512];
+			IGNORE_RETURN(snprintf(buf, sizeof(buf)-1, "%s\t%d\t%g\t%g\t%g\t%g\t%g\t%g\t%g\t%g\t%d\n",
+				sharedTemplateName.getString(),
+				(*i).cellIndex,
+				(*i).position.x, (*i).position.y, (*i).position.z,
+				(*i).orientation.w, (*i).orientation.x, (*i).orientation.y, (*i).orientation.z,
+				(*i).radius,
+				static_cast<int>((*i).portalLayoutCrc)));
+			buf[sizeof(buf)-1] = '\0';
+			clientOutputFile.write(strlen(buf), buf);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerBuildoutManager::clientSaveArea(Client &client, std::string const &areaName, float x1, float z1, float x2, float z2)
+{
+	if (!ConfigServerGame::getBuildoutAreaEditingEnabled())
+	{
+		WARNING(true, ("Tried to save a buildout area to a client with buildout area editing disabled?"));
+		return;
+	}
+
+	// generate the rows
+	std::vector<ServerBuildoutAreaRow> serverRows;
+	std::vector<ClientBuildoutAreaRow> clientRows;
+	generateBuildoutData(x1, z1, x2, z2, serverRows, clientRows);
+
+
+	// pass them to the client
+	GenericValueTypeMessage<
+		std::pair<
+			std::pair<std::string, std::string>, // scene, area
+			std::pair<std::vector<ServerBuildoutAreaRow>, std::vector<ClientBuildoutAreaRow> > // serverRows, clientRows
+			>
+		> const message(
+		"GodClientSaveBuildoutArea",
+		std::make_pair(
+			std::make_pair(std::string(ConfigServerGame::getSceneID()), areaName),
+			std::make_pair(serverRows, clientRows)));
+
+	client.send(message, true);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerBuildoutManager::destroyPersistedDuplicates()
+{
+	if (!ConfigServerGame::getBuildoutAreaEditingEnabled())
+	{
+		WARNING(true, ("Tried to destroy persisted duplicates of buildout area objects with buildout area editing disabled?"));
+		return;
+	}
+
+	for (std::vector<AreaInfo>::const_iterator i = s_areas.begin(); i != s_areas.end(); ++i)
+	{
+		for (std::vector<BuildoutRow>::const_iterator j = (*i).buildoutRows.begin(); j != (*i).buildoutRows.end(); ++j)
+		{
+			BuildoutRow const &buildoutRow = *j;
+
+			// Find objects very close to the buildout object, and destroy if they match.
+			std::vector<ServerObject *> objectsToTest;
+			ServerObject *container = 0;
+
+			if (buildoutRow.m_containerId == 0)
+				ServerWorld::findObjectsInRange(buildoutRow.m_transform_p.getPosition_p(), 0.1f, objectsToTest);
+			else
+			{
+				container = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(NetworkId(static_cast<NetworkId::NetworkIdType>(buildoutRow.m_containerId))));
+				if (container && container->asCellObject())
+				{
+					Container * const containerProperty = container->getContainerProperty();
+					if (containerProperty)
+					{
+						for (ContainerIterator c = containerProperty->begin(); c != containerProperty->end(); ++c)
+							objectsToTest.push_back(safe_cast<ServerObject *>((*c).getObject()));
+					}
+				}
+			}
+
+			for (std::vector<ServerObject *>::const_iterator k = objectsToTest.begin(); k != objectsToTest.end(); ++k)
+			{
+				ServerObject * const so = *k;
+				if (   so
+				    && so->getNetworkId().getValue() != buildoutRow.m_id
+				    && so->isPersisted()
+				    && so->getTemplateCrc() == buildoutRow.m_serverTemplate->getCrcName().getCrc()
+				    && so->getPosition_p().magnitudeBetweenSquared(buildoutRow.m_transform_p.getPosition_p()) < 0.005f
+				    && ContainerInterface::getContainedByObject(*so) == container)
+					so->permanentlyDestroy(DeleteReasons::Replaced);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerBuildoutManager::editBuildoutArea(std::string const &areaName)
+{
+	if (!ConfigServerGame::getBuildoutAreaEditingEnabled())
+	{
+		WARNING(true, ("Tried to edit a buildout area with buildout area editing disabled?"));
+		return;
+	}
+
+	for (std::vector<AreaInfo>::iterator i = s_areas.begin(); i != s_areas.end(); ++i)
+	{
+		if (!(*i).editing && (*i).buildoutArea.areaName == areaName)
+		{
+			(*i).editing = true;
+			// run through all objects belonging to the specified area and mark them as not client-cached
+			for (std::vector<BuildoutRow>::const_iterator j = (*i).buildoutRows.begin(); j != (*i).buildoutRows.end(); ++j)
+			{
+				ServerObject * const obj = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(NetworkId(static_cast<NetworkId::NetworkIdType>((*j).m_id))));
+				if (obj && obj->getCacheVersion() == s_buildoutCacheVersion)
+					obj->setCacheVersion(0);
+			}
+			// tell the planetserver that we want this area to stay loaded
+			GenericValueTypeMessage<std::pair<uint32, std::pair<std::pair<float, float>, std::pair<float, float> > > > const msg(
+				"ForceLoadArea",
+				std::make_pair(
+					GameServer::getInstance().getProcessId(),
+					std::make_pair(
+						std::make_pair((*i).buildoutArea.rect.x0, (*i).buildoutArea.rect.y0),
+						std::make_pair((*i).buildoutArea.rect.x1, (*i).buildoutArea.rect.y1))));
+			GameServer::getInstance().sendToPlanetServer(msg);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerBuildoutManagerNamespace::remove()
+{
+	s_areas.clear();
+	s_installed = false;
+	s_eventObjects.clear();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerBuildoutManagerNamespace::generateBuildoutData(float x1, float z1, float x2, float z2, std::vector<ServerBuildoutAreaRow> &serverRows, std::vector<ClientBuildoutAreaRow> &clientRows)
+{
+//	int objIdBase         = -1;
+
+	typedef std::map<NetworkId::NetworkIdType,int> ObjIdMap;
+
+	ObjIdMap objIdMap;
+	
+	std::vector<ServerObject const *> objectsToSave;
+
+	// build vector of objects we need to save, in the appropriate order
+	{
+		std::vector<ServerObject const *> topmostObjects;
+		int const objectCount = ServerWorld::getNumObjects();
+		for (int i = 0; i < objectCount; ++i)
+		{
+			ServerObject const * const obj = ServerWorld::getObject(i);
+			if (obj->isInWorld() && !ContainerInterface::getContainedByObject(*obj))
+			{
+				Vector const &pos = obj->getPosition_p();
+				if (pos.x >= x1 && pos.x < x2 && pos.z >= z1 && pos.z < z2)
+					topmostObjects.push_back(obj);
+			}
+		}
+		buildObjectsToSave(objectsToSave, topmostObjects);
+	}
+
+	// run through the objects to save, generating their rows
+	{
+		for (std::vector<ServerObject const *>::const_iterator i = objectsToSave.begin(); i != objectsToSave.end(); ++i)
+		{
+			ServerObject const * const obj = *i;
+
+
+			// check for unexported gold data
+			if ( obj->getIncludeInBuildout() == false && obj->getNetworkId().getValue() < 10000000 )
+			{
+				continue;
+			}
+
+			// save template
+			ServerObjectTemplate const * const serverTemplate = safe_cast<ServerObjectTemplate const *>(obj->getObjectTemplate());
+
+			bool serverOnly = false;
+			if (!obj->getPortalProperty() && dynamic_cast<ServerTangibleObjectTemplate const *>(serverTemplate))
+			{
+				// Tangibles are server only if they do not have the VF_player visible flag
+				serverOnly = true;
+				for (int vfIndex = 0; vfIndex < static_cast<int>(serverTemplate->getVisibleFlagsCount()); ++vfIndex)
+					if (serverTemplate->getVisibleFlags(vfIndex) == ServerObjectTemplate::VF_player)
+						serverOnly = false;
+			}
+
+
+			Quaternion const q(obj->getTransform_o2p());
+			Vector p(obj->getPosition_p());
+			int cellIndex = 0;
+
+			const ServerObject * const containingObject = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*obj));
+
+			if (containingObject)
+			{
+				CellObject const *objAsCell = obj->asCellObject();
+				if (!objAsCell)
+					objAsCell = containingObject->asCellObject();
+				FATAL(!objAsCell, ("Unable to determine cell index to save for buildout object %s", obj->getDebugInformation().c_str()));
+				cellIndex = objAsCell->getCell();
+			}
+			else
+			{
+				p.x -= x1;
+				p.z -= z1;
+			}
+
+			std::string packedScriptList;
+			ScriptList const &scriptList = obj->getScriptObject()->getScripts();
+			for (ScriptList::const_iterator j = scriptList.begin(); j != scriptList.end(); ++j)
+			{
+				if (!packedScriptList.empty())
+					packedScriptList += ':';
+				packedScriptList += (*j).getScriptName();
+			}
+
+			serverRows.push_back();
+			ServerBuildoutAreaRow &serverRow = serverRows.back();
+
+			serverRow.id                = static_cast< int >( obj->getNetworkId().getValue() );
+			serverRow.container         = containingObject ? static_cast< int >( containingObject->getNetworkId().getValue() ) : 0;
+			serverRow.serverTemplateCrc = obj->getTemplateCrc();
+			serverRow.cellIndex         = cellIndex;
+			serverRow.position          = p;
+			serverRow.orientation       = q;
+			serverRow.scripts           = packedScriptList;
+			serverRow.objvars           = obj->getPackedObjVars(std::string());
+
+			
+			if ( serverRow.id >= 10000000 )
+			{
+				serverRow.id = Random::random() | 0x80000000; // generate a negative random number.
+				objIdMap[ obj->getNetworkId().getValue() ] = serverRow.id;
+			}
+			else
+			{
+				serverRow.id &= cs_dataBitStripMask; // strip data bits
+			}
+
+			if ( serverRow.container >= 10000000 )
+			{
+				ObjIdMap::const_iterator it = objIdMap.find( serverRow.container );
+				FATAL( it == objIdMap.end(), ( "Unable to find the container relative objid for object %d\n", serverRow.id ) );
+				serverRow.container = it->second;
+			}
+			else
+			{
+				serverRow.id &= cs_dataBitStripMask; // strip data bits
+			}
+
+			if (!serverOnly)
+			{
+				clientRows.push_back();
+				ClientBuildoutAreaRow &clientRow = clientRows.back();
+
+				clientRow.id                = serverRow.id;
+				clientRow.container         = serverRow.container;
+				clientRow.type              = serverTemplate ? serverTemplate->getId() : 0;
+				clientRow.sharedTemplateCrc = ConstCharCrcString(obj->getSharedTemplateName()).getCrc();
+				clientRow.cellIndex         = cellIndex;
+				clientRow.position          = p;
+				clientRow.orientation       = q;
+				clientRow.radius            = serverTemplate->getUpdateRanges(ServerObjectTemplate::UR_far);
+				int portalLayoutCrc = 0;
+				obj->getObjVars().getItem("portalProperty.crc", portalLayoutCrc);
+				clientRow.portalLayoutCrc   = static_cast<uint32>(portalLayoutCrc);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerBuildoutManagerNamespace::buildObjectsToSave(std::vector<ServerObject const *> &objectsToSave, std::vector<ServerObject const *> &potentialObjects)
+{
+	// remove any non-buildout objects from the potential object vector
+	potentialObjects.erase(std::remove_if(potentialObjects.begin(), potentialObjects.end(), isNotObjectForBuildout), potentialObjects.end());
+
+	// sort by networkId for non-cells, cell index for cells
+	std::sort(potentialObjects.begin(), potentialObjects.end(), buildoutObjectLessComparator);
+
+	// push object on the stack and recurse for contents
+	for (std::vector<ServerObject const *>::const_iterator i = potentialObjects.begin(); i != potentialObjects.end(); ++i)
+	{
+		ServerObject const * const obj = *i;
+		objectsToSave.push_back(obj);
+
+		Container const * const container = ContainerInterface::getContainer(*obj);
+
+		if (container)
+		{
+			std::vector<ServerObject const *> contents;
+
+			for (ContainerConstIterator j = container->begin(); j != container->end(); ++j)
+			{
+				contents.push_back(safe_cast<ServerObject const *>((*j).getObject()));
+			}
+
+			buildObjectsToSave(objectsToSave, contents);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerBuildoutManagerNamespace::isNotObjectForBuildout(ServerObject const *obj)
+{
+#if 0
+	DEBUG_REPORT_LOG_PRINT( true, ( "isNotObjectForBuildout: %s [%d] ver=%d isPersisted=%d isPlayerController=%d includeInBuildout=%d\n" ,
+		Unicode::wideToNarrow( obj->getObjectName() ).c_str(),
+		(int)obj->getNetworkId().getValue(),
+		obj->getCacheVersion(),
+		obj->isPersisted(),
+		obj->isPlayerControlled(),
+		obj->getIncludeInBuildout() ) );
+#endif
+
+	const ServerObject * const containingObject = safe_cast<const ServerObject  *>(ContainerInterface::getContainedByObject(*obj));
+
+	// make sure that cells that should be included in the buildout have all their
+	// children included too!
+	if ( obj->getObjectTemplate()->getId() == ServerCellObjectTemplate::ServerCellObjectTemplate_tag && containingObject && containingObject->getIncludeInBuildout() )
+	{
+		ServerObject *tmpObj = const_cast< ServerObject * >( obj );
+		tmpObj->setIncludeInBuildout( true );
+	}
+
+	if ( !obj || !obj->isInWorld() ||  (!obj->isPersisted() && !obj->getIncludeInBuildout() ) || obj->isPlayerControlled() )
+	{
+		return true;
+	}
+
+	return false;
+
+}
+
+// ----------------------------------------------------------------------
+
+void ServerBuildoutManagerNamespace::loadArea(AreaInfo &areaInfo)
+{
+	int64 buildingObjId     = areaInfo.buildoutArea.getSharedBaseId();
+	int64 objIdBase         = buildingObjId + cs_buildingObjIdOffset;
+	int64 currentBuilding   = 0;
+	int64 currentCell       = 0;
+
+	int serverIdBase      = areaInfo.buildoutArea.getServerBaseId();
+
+	const bool isBuildoutEditingEnabled = ConfigServerGame::getBuildoutAreaEditingEnabled();
+	UNREF( isBuildoutEditingEnabled );
+
+	char filename[256];
+	snprintf(filename, sizeof(filename)-1, "datatables/buildout/%s/%s.iff", ConfigServerGame::getSceneID(), areaInfo.buildoutArea.areaName.c_str());
+	filename[sizeof(filename)-1] = '\0';
+
+	std::string const & eventRequired = areaInfo.buildoutArea.getRequiredEventName();
+
+	if(!eventRequired.empty())
+	{
+		ServerEventMap::iterator iter = s_eventObjects.find(eventRequired);
+		if(iter != s_eventObjects.end())
+		{
+			// Nothing to do here. We've already setup a list for this event.
+			//eventObjList = &(*iter).second;
+		}
+		else
+		{
+			s_eventObjects.insert(std::pair<std::string, std::list<ServerEventAreaInfo> >(eventRequired, std::list<ServerEventAreaInfo>()));
+		}
+
+	}
+
+	Iff iff;
+	if (!areaInfo.buildoutArea.areaName.empty() && iff.open(filename, true) && !iff.atEndOfForm() )
+	{
+		DataTable areaBuildoutTable;
+		areaBuildoutTable.load(iff);
+
+		int const buildoutRowCount = areaBuildoutTable.getNumRows();
+		if (buildoutRowCount > 0)
+		{
+			areaInfo.buildoutRows.reserve(buildoutRowCount);
+
+			int const objIdColumn             = areaBuildoutTable.findColumnNumber( "objid" );
+			int const containerColumn         = areaBuildoutTable.findColumnNumber( "container" );
+			int const serverTemplateCrcColumn = areaBuildoutTable.findColumnNumber("server_template_crc");
+			int const cellIndexColumn         = areaBuildoutTable.findColumnNumber("cell_index");
+			int const pxColumn                = areaBuildoutTable.findColumnNumber("px");
+			int const pyColumn                = areaBuildoutTable.findColumnNumber("py");
+			int const pzColumn                = areaBuildoutTable.findColumnNumber("pz");
+			int const qwColumn                = areaBuildoutTable.findColumnNumber("qw");
+			int const qxColumn                = areaBuildoutTable.findColumnNumber("qx");
+			int const qyColumn                = areaBuildoutTable.findColumnNumber("qy");
+			int const qzColumn                = areaBuildoutTable.findColumnNumber("qz");
+			int const scriptsColumn           = areaBuildoutTable.findColumnNumber("scripts");
+			int const objvarsColumn           = areaBuildoutTable.findColumnNumber("objvars");
+
+			FATAL(serverTemplateCrcColumn < 0, ("Unable to find serverTemplateCrcColumn in [%s]", filename));
+			FATAL(cellIndexColumn < 0, ("Unable to find cellIndexColumn in [%s]", filename));
+			FATAL(pxColumn < 0, ("Unable to find pxColumn in [%s]", filename));
+			FATAL(pyColumn < 0, ("Unable to find pyColumn in [%s]", filename));
+			FATAL(pzColumn < 0, ("Unable to find pzColumn in [%s]", filename));
+			FATAL(qwColumn < 0, ("Unable to find qwColumn in [%s]", filename));
+			FATAL(qxColumn < 0, ("Unable to find qxColumn in [%s]", filename));
+			FATAL(qyColumn < 0, ("Unable to find qyColumn in [%s]", filename));
+			FATAL(qzColumn < 0, ("Unable to find qzColumn in [%s]", filename));
+			FATAL(scriptsColumn < 0, ("Unable to find scriptsColumn in [%s]", filename));
+			FATAL(objvarsColumn < 0, ("Unable to find objvarsColumn in [%s]", filename));
+
+			int buildOutFileVersion = 1;
+
+			if ( objIdColumn != -1 )
+			{
+				buildOutFileVersion = 2;
+			}
+			
+			std::set< int64 > objects;
+
+			for (int buildoutRow = 0; buildoutRow < buildoutRowCount; ++buildoutRow)
+			{
+
+				int64 objId       = 0;
+				int64 containerId = 0;
+
+
+				uint32 const serverTemplateCrc = static_cast<uint32>(areaBuildoutTable.getIntValue(serverTemplateCrcColumn, buildoutRow));
+				unsigned int const cellIndex = areaBuildoutTable.getIntValue(cellIndexColumn, buildoutRow);
+
+				ObjectTemplate const * const serverTemplateBase = ObjectTemplateList::fetch(serverTemplateCrc);
+				FATAL(!serverTemplateBase, ("Nonexistant server template 0x%08x in buildout table %s, row %d (line %d)", serverTemplateCrc, areaInfo.buildoutArea.areaName.c_str(), buildoutRow, buildoutRow + 3));
+
+				ServerObjectTemplate const * const serverTemplate = serverTemplateBase->asServerObjectTemplate();
+				FATAL(!serverTemplate, ("Bad server template 0x%08x [%s] in buildout table %s, row %d (line %d)", serverTemplateCrc, serverTemplateBase->getName(), areaInfo.buildoutArea.areaName.c_str(), buildoutRow, buildoutRow + 3));
+
+				std::string const &sharedTemplateName = serverTemplate->getSharedTemplate();
+				ObjectTemplate const * const sharedTemplateBase = ObjectTemplateList::fetch(sharedTemplateName);
+				FATAL(!sharedTemplateBase, ("Nonexistant shared template [%s] for [%s] in buildout table %s, row %d (line %d)", sharedTemplateName.c_str(), serverTemplateBase->getName(), areaInfo.buildoutArea.areaName.c_str(), buildoutRow, buildoutRow + 3));
+
+				SharedObjectTemplate const * const sharedTemplate = sharedTemplateBase->asSharedObjectTemplate();
+				FATAL(!sharedTemplate, ("Bad shared template [%s] for [%s] in buildout table %s, row %d (line %d)", sharedTemplateName.c_str(), serverTemplateBase->getName(), areaInfo.buildoutArea.areaName.c_str(), buildoutRow, buildoutRow + 3));
+				bool const isPob = !sharedTemplate->getPortalLayoutFilename().empty();
+				sharedTemplateBase->releaseReference();
+				
+				bool serverOnly = false;
+				if (!isPob && dynamic_cast<ServerTangibleObjectTemplate const *>(serverTemplate))
+				{
+					// Tangibles are server only if they do not have the VF_player visible flag
+					serverOnly = true;
+					for (int vfIndex = 0; vfIndex < static_cast<int>(serverTemplate->getVisibleFlagsCount()); ++vfIndex)
+						if (serverTemplate->getVisibleFlags(vfIndex) == ServerObjectTemplate::VF_player)
+							serverOnly = false;
+				}
+
+
+				if ( buildOutFileVersion == 1 )
+				{
+					if ( isPob ) // if ( is a building )
+					{
+						objId = buildingObjId++;
+						currentBuilding = objId;
+					}
+					else if ( serverTemplate->getId() == ServerCellObjectTemplate::ServerCellObjectTemplate_tag ) // if ( is a cell )
+					{
+						objId = buildingObjId++;
+						currentCell = objId;
+						containerId = currentBuilding;
+					}
+					else if ( cellIndex > 0 ) // if ( is an object in a cell )
+					{
+						objId = objIdBase++;
+						containerId = currentCell;
+					}
+					else if ( serverOnly )
+					{
+						objId = serverIdBase++;
+					}
+					else // is an object not in a cell
+					{
+						objId = objIdBase++;
+					}
+
+					FATAL( buildingObjId >= areaInfo.buildoutArea.getSharedBaseId() + cs_buildingObjIdOffset, ( "building object id overflow" ) );
+				}
+				else
+				{
+					objId       = areaBuildoutTable.getIntValue(objIdColumn, buildoutRow);
+					containerId = areaBuildoutTable.getIntValue(containerColumn, buildoutRow);
+					
+					// with new buildout files, the object id is a random 31-bit negative value
+					// then we give the area index some bits in the upper part of the number
+					// by shifting the area index value left 48 bits.
+
+					const int64 areaIndex = areaInfo.buildoutArea.areaIndex + 1;
+
+					if ( objId < 0 )
+					{
+
+						objId ^= areaIndex << 48;
+					}
+
+					if ( containerId < 0 )
+					{
+						containerId ^= areaIndex << 48;
+					}
+
+				}
+
+				FATAL( isPob && ( cellIndex != 0 || containerId != 0 ), ( "tried to add a pob to a cell or other container. %s (objId=%d cellIndex=%d containerId=%d)",
+					serverTemplateBase->getName(), objId, cellIndex,containerId ) );
+#if 0
+				DEBUG_REPORT_LOG_PRINT( true, ( "SERVER --------- objId=%016I64x container=%016I64x\n",
+					objId,
+					containerId));
+
+#endif 
+
+				Quaternion const q(
+					areaBuildoutTable.getFloatValue(qwColumn, buildoutRow),
+					areaBuildoutTable.getFloatValue(qxColumn, buildoutRow),
+					areaBuildoutTable.getFloatValue(qyColumn, buildoutRow),
+					areaBuildoutTable.getFloatValue(qzColumn, buildoutRow));
+
+				Transform transform_p;
+
+				q.getTransform(&transform_p);
+
+				if ( cellIndex == 0 )
+				{
+					transform_p.setPosition_p(
+						areaBuildoutTable.getFloatValue(pxColumn, buildoutRow) + areaInfo.buildoutArea.rect.x0,
+						areaBuildoutTable.getFloatValue(pyColumn, buildoutRow),
+						areaBuildoutTable.getFloatValue(pzColumn, buildoutRow) + areaInfo.buildoutArea.rect.y0);
+				}
+				else
+				{
+					transform_p.setPosition_p(
+						areaBuildoutTable.getFloatValue(pxColumn, buildoutRow),
+						areaBuildoutTable.getFloatValue(pyColumn, buildoutRow),
+						areaBuildoutTable.getFloatValue(pzColumn, buildoutRow));
+				}
+
+				if ( containerId == 0 || objects.find ( containerId ) != objects.end() )
+				{
+					areaInfo.buildoutRows.push_back(
+						BuildoutRow(
+							objId,
+							containerId,
+							cellIndex,
+							transform_p,
+							serverTemplate,
+							areaBuildoutTable.getStringValue(scriptsColumn, buildoutRow),
+							areaBuildoutTable.getStringValue(objvarsColumn, buildoutRow),
+							eventRequired));
+				}
+
+				objects.insert( objId );
+
+				serverTemplateBase->releaseReference();
+			}
+		}
+	}
+
+	areaInfo.loaded = true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerBuildoutManagerNamespace::buildoutObjectLessComparator(ServerObject const *lhs, ServerObject const *rhs)
+{
+	CellObject const * const lhsAsCell = lhs->asCellObject();
+	CellObject const * const rhsAsCell = rhs->asCellObject();
+
+	if (lhsAsCell && rhsAsCell)
+		return lhsAsCell->getCell() < rhsAsCell->getCell();
+
+	return lhs->getNetworkId() < rhs->getNetworkId();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerBuildoutManagerNamespace::instantiateAreaNode(AreaInfo const &areaInfo, int nodeX, int nodeZ)
+{
+	UNREF(nodeZ);
+	UNREF(nodeX);
+
+
+	std::vector<ServerObject *> newObjects;
+	int buildingId = 0;
+	int cellIndex = 0;
+	UNREF(cellIndex);
+
+	UNREF( buildingId );
+
+	NetworkId controllerObjectId;
+
+	bool discardContainedObjects = false;
+
+	PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	std::vector<std::string> events;
+	
+	if(planetObject)
+		planetObject->parseCurrentEventsList(events);
+
+	for (std::vector<BuildoutRow>::const_iterator rowIter = areaInfo.buildoutRows.begin(); rowIter != areaInfo.buildoutRows.end(); ++rowIter)
+	{
+		BuildoutRow const &buildoutRow = *rowIter;
+
+		NetworkId const objectId(static_cast<NetworkId::NetworkIdType>(buildoutRow.m_id));
+
+		int64 const containerId = buildoutRow.m_containerId;
+
+		if ( containerId && discardContainedObjects )
+		{
+			continue;
+		}
+
+		discardContainedObjects = false;
+
+		if (containerId == 0)
+		{
+			//-- check to see if this is the controller object
+			//-- if it is, it gets created regardless of its position relative to the node
+			if (!controllerObjectId.isValid())
+			{
+				if (!buildoutRow.m_objvars.empty())
+				{
+					if (buildoutRow.m_objvars.find("isControllerObject|") != std::string::npos)
+					{
+						controllerObjectId = objectId;
+					}
+				}
+			}
+		}
+
+		// reject object if it is out of bounds and is not the controller
+		if ( !containerId && objectId != controllerObjectId )
+		{
+			const Vector &position_w = buildoutRow.m_transform_p.getPosition_p();
+
+			if ( position_w.x < nodeX || position_w.x >= nodeX+100 || position_w.z < nodeZ || position_w.z >= nodeZ+100 )
+			{
+				discardContainedObjects = true;
+				continue;
+			}
+		}
+
+		if(!buildoutRow.m_eventRequired.empty())
+		{
+			ServerEventMap::iterator searchIter = s_eventObjects.find(buildoutRow.m_eventRequired);
+			if(searchIter != s_eventObjects.end())
+			{
+				ServerEventAreaInfo newEventObj(&buildoutRow, NULL);
+				(*searchIter).second.push_back(newEventObj);
+			}
+			else
+			{
+				DEBUG_REPORT_LOG(true, ("ServerBuildoutManager: Tried to load an unknown event object. Event name: %s\n", buildoutRow.m_eventRequired.c_str()));
+			}
+			
+			if(planetObject) // We have a valid Tatooine Planet Object which keeps track of our universe wide events.
+			{
+				bool eventCurrentlyRunning = false;
+				
+				std::vector<std::string>::size_type i = 0;
+				for(; i < events.size(); ++i)
+				{
+					if(events[i] == buildoutRow.m_eventRequired) // Is our required event already running?
+						eventCurrentlyRunning = true;
+				}
+
+				if(!eventCurrentlyRunning)
+					continue; // We found an event object but their event isn't started yet. Hold off on Object creation.
+			}
+			else
+				continue; // No planet object. This should NEVER happen. Better hold off on any event object creation for now.
+
+		}
+		
+		ServerObject * const containingObject = containerId ? safe_cast<ServerObject *>(NetworkIdManager::getObjectById(NetworkId(static_cast<NetworkId::NetworkIdType>(containerId)))) : 0;
+		FATAL(containerId && !containingObject, ("could not find containing object obj=%d container=%d", (int)objectId.getValue(), containerId ));
+
+		//-- object has already been created
+		//-- this must be the controller object or one of its contents.
+		if (NetworkIdManager::getObjectById(objectId))
+			continue;
+
+		ServerObject * const newObject = safe_cast<ServerObject *>(buildoutRow.m_serverTemplate->createObject());
+		FATAL(!newObject, ("could not create buildout object"));
+
+		newObject->setNetworkId(objectId);
+		newObject->setIncludeInBuildout(true);
+
+		CellObject * const newCellObject = newObject->asCellObject();
+
+		if (newCellObject)
+		{
+			newCellObject->setCell( buildoutRow.m_cellIndex );
+		}
+
+		if (!newObject->getController())
+		{
+			newObject->createDefaultController();
+		}
+
+		newObject->setAuthority();
+
+		if (newObject->asTangibleObject() != NULL)
+			newObject->asTangibleObject()->initializeVisibility();
+
+		//
+		// if we're NOT building editing we want to set some of the objects
+		// to be client cached.  If we ARE building editing we do not want
+		// to client-cache any objects otherwise we will not be able to
+		// move them around or delete them, etc.
+		//
+		
+		const bool isEditing = ConfigServerGame::getBuildoutAreaEditingEnabled();
+		
+		if ( isEditing == false )
+		{
+			//
+			// cells and their parents should NOT BE CLIENT CACHED
+			//
+			if ( newObject->asCellObject() )
+			{
+				// by the time we get here the cache version on the POB has
+				// already been set to non-zero, so we need to reset it back
+				// to zero
+				containingObject->setCacheVersion(0);
+			}
+			else
+			{
+				//
+				// ok so we're here because this object is not a cell.
+				// what needs to be done now
+				// is make sure that objects that are player visible
+				// are client cached.
+				//
+				// the reason for this is that there are server only objects,
+				// like SPAWNERS and WAYPOINTS. These objects are NOT
+				// in the client buildout files, so the MUST NOT be client cached.
+				// If you make them client cached, you will not be able to see
+				// them in god mode!!!
+				//
+				const int vfCount = buildoutRow.m_serverTemplate->getVisibleFlagsCount();
+				
+				for ( int index = 0; index < vfCount ; ++index )
+				{
+					const ServerObjectTemplate::VisibleFlags vf = buildoutRow.m_serverTemplate->getVisibleFlags( index );
+					
+					if ( vf == ServerObjectTemplate::VF_player && buildoutRow.m_eventRequired.empty()) // Event objects can never be client cached currently.
+					{
+						newObject->setCacheVersion(s_buildoutCacheVersion);
+						break;
+					}
+				}
+			}
+		}
+ 
+		
+		if (buildoutRow.m_transform_p != Transform::identity)
+		{
+			newObject->setTransform_o2p(buildoutRow.m_transform_p);
+		}
+
+		newObject->getContainedByProperty()->setContainedBy(NetworkId(static_cast<NetworkId::NetworkIdType>(containerId)));
+
+		DynamicVariableList objVars;
+
+		buildoutRow.m_serverTemplate->getObjvars(objVars);
+
+		for (DynamicVariableList::MapType::const_iterator i = objVars.begin(); i != objVars.end(); ++i)
+		{
+			newObject->setObjVarItem(i->first, i->second);
+		}
+
+		if (!buildoutRow.m_objvars.empty())
+		{
+			newObject->setPackedObjVars(buildoutRow.m_objvars);
+		}
+		
+		int const count = buildoutRow.m_serverTemplate->getScriptsCount();
+
+		for (int j = 0; j < count; ++j)
+		{
+			newObject->getScriptObject()->attachScript(buildoutRow.m_serverTemplate->getScripts(j), false);
+		}
+
+		if (!buildoutRow.m_scripts.empty())
+		{
+			GameScriptObject * const gso = newObject->getScriptObject();
+
+			if (NULL != gso)
+			{
+				std::string const &scripts = buildoutRow.m_scripts;
+				unsigned int pos = 0;
+				while (pos < scripts.size())
+				{
+					unsigned int const oldPos = pos;
+					while (scripts[pos] && scripts[pos] != ':')
+						++pos;
+
+					std::string const & scriptName = scripts.substr(oldPos, pos-oldPos);
+					if (!gso->hasScript(scriptName))
+						IGNORE_RETURN(gso->attachScript(scriptName, false));
+
+					if (scripts[pos] == ':')
+						++pos;
+				}
+			}
+		}
+		newObjects.push_back(newObject);
+
+		if(!buildoutRow.m_eventRequired.empty())
+		{
+			ServerEventMap::iterator searchIter = s_eventObjects.find(buildoutRow.m_eventRequired);
+			if(searchIter != s_eventObjects.end())
+			{
+				ServerEventAreaInfo & newEventObj = (*searchIter).second.back();
+				newEventObj.loadedObject = newObject;
+			}
+		}
+	}
+
+	// run through newly instantiated objects and initialize them
+	{
+		for (std::vector<ServerObject *>::reverse_iterator it = newObjects.rbegin(); it != newObjects.rend(); ++it)
+		{
+			(*it)->serverObjectEndBaselines(false);
+		}
+	}
+
+	// run through newly instantiated objects and notify the controller object
+	if ( controllerObjectId.isValid() )
+	{
+		ServerObject * const controllerObject = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(controllerObjectId));
+		if (NULL != controllerObject)
+		{
+			GameScriptObject * const script = controllerObject->getScriptObject();
+
+			for (std::vector<ServerObject *>::reverse_iterator it = newObjects.rbegin(); it != newObjects.rend(); ++it)
+			{
+				ServerObject * const obj = *it;
+				if (obj == controllerObject)
+					continue;
+				
+				int registerWithController = 0;
+				if (obj->getObjVars().getItem("registerWithController", registerWithController))
+				{
+					if (registerWithController)
+					{						
+						if (NULL != script)
+						{
+							ScriptParams p;
+							p.addParam(obj->getNetworkId());
+							IGNORE_RETURN(script->trigAllScripts(Scripting::TRIG_BUILDOUT_OBJECT_REGISTER_WITH_CONTROLLER, p));
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// initialize any theaters
+	{
+
+		for (std::vector<ServerObject *>::reverse_iterator it = newObjects.rbegin(); it != newObjects.rend(); ++it)
+		{
+			ServerObject *obj = *it;
+
+			if ( obj  && obj->isAuthoritative() )
+			{
+				GameScriptObject *scripts = obj->getScriptObject();
+				
+				if ( scripts ) //&& scripts->hasScript( "poi.template.scene.base.base_theater" ) )
+				{
+					scripts->handleMessage( "startTheaterFromBuildout", std::vector<int8>() );
+				}
+	
+			}
+		}
+	}
+
+}
+
+// ----------------------------------------------------------------------
+
+ServerBuildoutManagerNamespace::BuildoutRow::BuildoutRow() :
+m_id(0),
+m_containerId(0),
+m_transform_p(),
+m_serverTemplate(0),
+m_scripts(),
+m_objvars(),
+m_cellIndex(0)
+{
+}
+
+// ----------------------------------------------------------------------
+
+ServerBuildoutManagerNamespace::BuildoutRow::BuildoutRow(int64 id, int64 containerId, int cellIndex, Transform const &transform_p, ServerObjectTemplate const *serverTemplate, std::string const &scripts, std::string const &objvars, std::string const & eventRequired) :
+	m_id(id),
+	m_containerId(containerId),
+	m_transform_p(transform_p),
+	m_serverTemplate(serverTemplate),
+	m_scripts(scripts),
+	m_objvars(objvars),
+	m_cellIndex(cellIndex),
+	m_eventRequired(eventRequired)
+{
+	if (serverTemplate)
+		serverTemplate->addReference();
+}
+
+// ----------------------------------------------------------------------
+
+ServerBuildoutManagerNamespace::BuildoutRow::BuildoutRow(BuildoutRow const &rhs) :
+	m_id(rhs.m_id),
+	m_containerId(rhs.m_containerId),
+	m_transform_p(rhs.m_transform_p),
+	m_serverTemplate(rhs.m_serverTemplate),
+	m_scripts(rhs.m_scripts),
+	m_objvars(rhs.m_objvars),
+	m_cellIndex(rhs.m_cellIndex),
+	m_eventRequired(rhs.m_eventRequired)
+{
+	if (m_serverTemplate)
+		m_serverTemplate->addReference();
+}
+
+// ----------------------------------------------------------------------
+
+ServerBuildoutManagerNamespace::BuildoutRow::~BuildoutRow()
+{
+	if (m_serverTemplate)
+		m_serverTemplate->releaseReference();
+}
+
+// ----------------------------------------------------------------------
+
+ServerBuildoutManagerNamespace::BuildoutRow &ServerBuildoutManagerNamespace::BuildoutRow::operator=(BuildoutRow const &rhs)
+{
+	if (&rhs != this)
+	{
+		m_id = rhs.m_id;
+		m_containerId = rhs.m_containerId;
+		m_transform_p = rhs.m_transform_p;
+		m_scripts = rhs.m_scripts;
+		m_objvars = rhs.m_objvars;
+		m_cellIndex = rhs.m_cellIndex;
+		m_eventRequired = rhs.m_eventRequired;
+
+		if (m_serverTemplate)
+			m_serverTemplate->releaseReference();
+		m_serverTemplate = rhs.m_serverTemplate;
+		if (m_serverTemplate)
+			m_serverTemplate->addReference();
+	}
+	return *this;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerBuildoutManager::onEventStarted(std::string const & eventName)
+{
+	if(s_eventObjects.empty())
+		return;
+
+	ServerEventMap::iterator iter = s_eventObjects.find(eventName);
+	
+	if(iter == s_eventObjects.end())
+		return; // Perhaps we should print a warning here? Would we ever have an event with no server side event objects?
+
+	std::list< ServerEventAreaInfo >* eventList = &(*iter).second;
+
+	std::vector<ServerObject *> newObjects;
+	NetworkId controllerObjectId;
+
+	std::list< ServerEventAreaInfo >::iterator objIter = eventList->begin();
+	for(; objIter != eventList->end(); ++objIter)
+	{
+		// Object Creation
+
+		//BEGIN OBJECT CREATION CODE FROM ABOVE!
+		BuildoutRow const &buildoutRow = *(*objIter).buildOut;
+
+		NetworkId const objectId(static_cast<NetworkId::NetworkIdType>(buildoutRow.m_id));
+
+		int64 const containerId = buildoutRow.m_containerId;
+
+		if (containerId == 0)
+		{
+			//-- check to see if this is the controller object
+			//-- if it is, it gets created regardless of its position relative to the node
+			if (!controllerObjectId.isValid())
+			{
+				if (!buildoutRow.m_objvars.empty())
+				{
+					if (buildoutRow.m_objvars.find("isControllerObject|") != std::string::npos)
+					{
+						controllerObjectId = objectId;
+					}
+				}
+			}
+		}
+
+		ServerObject * const containingObject = containerId ? safe_cast<ServerObject *>(NetworkIdManager::getObjectById(NetworkId(static_cast<NetworkId::NetworkIdType>(containerId)))) : 0;
+		FATAL(containerId && !containingObject, ("could not find containing object obj=%d container=%d", (int)objectId.getValue(), containerId ));
+
+		//-- object has already been created
+		//-- this must be the controller object or one of its contents.
+		if (NetworkIdManager::getObjectById(objectId))
+			continue;
+
+		ServerObject * const newObject = safe_cast<ServerObject *>(buildoutRow.m_serverTemplate->createObject());
+		FATAL(!newObject, ("could not create buildout object"));
+
+		LOGC(ConfigServerGame::getLogEventObjectCreation(),"EventBuildout", ("Loading Object for Event [%s].\nTemplate Name[%s]\nNetwork ID[%s]\nCell[%d]\nPosition[%-4.3f %-4.3f %-4.3f]\n\n",
+			                                                              eventName.c_str(), buildoutRow.m_serverTemplate->getName(), objectId.getValueString().c_str(),buildoutRow.m_cellIndex,
+																		  buildoutRow.m_transform_p.getPosition_p().x, buildoutRow.m_transform_p.getPosition_p().y, buildoutRow.m_transform_p.getPosition_p().z));
+
+		newObject->setNetworkId(objectId);
+		newObject->setIncludeInBuildout(true);
+
+		CellObject * const newCellObject = newObject->asCellObject();
+
+		if (newCellObject)
+		{
+			newCellObject->setCell( buildoutRow.m_cellIndex );
+		}
+
+		if (!newObject->getController())
+		{
+			newObject->createDefaultController();
+		}
+
+		newObject->setAuthority();
+
+		if (newObject->asTangibleObject() != NULL)
+			newObject->asTangibleObject()->initializeVisibility();
+
+		//
+		// if we're NOT building editing we want to set some of the objects
+		// to be client cached.  If we ARE building editing we do not want
+		// to client-cache any objects otherwise we will not be able to
+		// move them around or delete them, etc.
+		//
+
+		const bool isEditing = ConfigServerGame::getBuildoutAreaEditingEnabled();
+
+		if ( isEditing == false )
+		{
+			//
+			// cells and their parents should NOT BE CLIENT CACHED
+			//
+			if ( newObject->asCellObject() )
+			{
+				// by the time we get here the cache version on the POB has
+				// already been set to non-zero, so we need to reset it back
+				// to zero
+				containingObject->setCacheVersion(0);
+			}
+			else
+			{
+				//
+				// ok so we're here because this object is not a cell.
+				// what needs to be done now
+				// is make sure that objects that are player visible
+				// are client cached.
+				//
+				// the reason for this is that there are server only objects,
+				// like SPAWNERS and WAYPOINTS. These objects are NOT
+				// in the client buildout files, so the MUST NOT be client cached.
+				// If you make them client cached, you will not be able to see
+				// them in god mode!!!
+				//
+				const int vfCount = buildoutRow.m_serverTemplate->getVisibleFlagsCount();
+
+				for ( int index = 0; index < vfCount ; ++index )
+				{
+					const ServerObjectTemplate::VisibleFlags vf = buildoutRow.m_serverTemplate->getVisibleFlags( index );
+
+					if ( vf == ServerObjectTemplate::VF_player )
+					{
+						// Removing this code temporarily since we don't have a proper way to do client side, cached event build out objects.
+						// All event objects are objects that are streamed down from the server. Until we have a way for the client to know
+						// what events are going on so it can load its' own build out datatables; this value needs to stay at its' default value (0).
+
+						//newObject->setCacheVersion(s_buildoutCacheVersion);
+						break;
+					}
+				}
+			}
+		}
+
+
+		if (buildoutRow.m_transform_p != Transform::identity)
+		{
+			newObject->setTransform_o2p(buildoutRow.m_transform_p);
+		}
+
+		newObject->getContainedByProperty()->setContainedBy(NetworkId(static_cast<NetworkId::NetworkIdType>(containerId)));
+
+		DynamicVariableList objVars;
+
+		buildoutRow.m_serverTemplate->getObjvars(objVars);
+
+		for (DynamicVariableList::MapType::const_iterator i = objVars.begin(); i != objVars.end(); ++i)
+		{
+			newObject->setObjVarItem(i->first, i->second);
+		}
+
+		if (!buildoutRow.m_objvars.empty())
+		{
+			newObject->setPackedObjVars(buildoutRow.m_objvars);
+		}
+
+		int const count = buildoutRow.m_serverTemplate->getScriptsCount();
+
+		for (int j = 0; j < count; ++j)
+		{
+			newObject->getScriptObject()->attachScript(buildoutRow.m_serverTemplate->getScripts(j), false);
+		}
+
+		if (!buildoutRow.m_scripts.empty())
+		{
+			GameScriptObject * const gso = newObject->getScriptObject();
+
+			if (NULL != gso)
+			{
+				std::string const &scripts = buildoutRow.m_scripts;
+				unsigned int pos = 0;
+				while (pos < scripts.size())
+				{
+					unsigned int const oldPos = pos;
+					while (scripts[pos] && scripts[pos] != ':')
+						++pos;
+
+					std::string const & scriptName = scripts.substr(oldPos, pos-oldPos);
+					if (!gso->hasScript(scriptName))
+						IGNORE_RETURN(gso->attachScript(scriptName, false));
+
+					if (scripts[pos] == ':')
+						++pos;
+				}
+			}
+		}
+
+	    (*objIter).loadedObject = newObject;
+
+		newObjects.push_back(newObject);
+	}
+
+
+	// run through newly instantiated objects and initialize them
+	{
+		for (std::vector<ServerObject *>::reverse_iterator it = newObjects.rbegin(); it != newObjects.rend(); ++it)
+		{
+			(*it)->serverObjectEndBaselines(false);
+		}
+	}
+
+	// run through newly instantiated objects and notify the controller object
+	if ( controllerObjectId.isValid() )
+	{
+		ServerObject * const controllerObject = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(controllerObjectId));
+		if (NULL != controllerObject)
+		{
+			GameScriptObject * const script = controllerObject->getScriptObject();
+
+			for (std::vector<ServerObject *>::reverse_iterator it = newObjects.rbegin(); it != newObjects.rend(); ++it)
+			{
+				ServerObject * const obj = *it;
+				if (obj == controllerObject)
+					continue;
+
+				int registerWithController = 0;
+				if (obj->getObjVars().getItem("registerWithController", registerWithController))
+				{
+					if (registerWithController)
+					{						
+						if (NULL != script)
+						{
+							ScriptParams p;
+							p.addParam(obj->getNetworkId());
+							IGNORE_RETURN(script->trigAllScripts(Scripting::TRIG_BUILDOUT_OBJECT_REGISTER_WITH_CONTROLLER, p));
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// initialize any theaters
+	{
+
+		for (std::vector<ServerObject *>::reverse_iterator it = newObjects.rbegin(); it != newObjects.rend(); ++it)
+		{
+			ServerObject *obj = *it;
+
+			if ( obj  && obj->isAuthoritative() )
+			{
+				GameScriptObject *scripts = obj->getScriptObject();
+
+				if ( scripts ) //&& scripts->hasScript( "poi.template.scene.base.base_theater" ) )
+				{
+					scripts->handleMessage( "startTheaterFromBuildout", std::vector<int8>() );
+				}
+
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerBuildoutManager::onEventStopped(std::string const & eventName)
+{
+	if(s_eventObjects.empty())
+		return;
+
+	ServerEventMap::iterator iter = s_eventObjects.find(eventName);
+
+	if(iter == s_eventObjects.end())
+		return; // We stopped an event with no objects? Warning?
+
+	std::list< ServerEventAreaInfo >* eventList = &(*iter).second;
+
+	std::list< ServerEventAreaInfo >::iterator objIter = eventList->begin();
+	for(; objIter != eventList->end(); ++objIter)
+	{
+		// Object clean up.
+		if((*objIter).loadedObject)
+		{
+			ServerObject* object = (*objIter).loadedObject;
+			
+			LOGC(ConfigServerGame::getLogEventObjectDestruction(), "EventBuildout", ("Unloading Object for Event [%s].\nTemplate Name[%s]\nNetwork ID[%s]\nPosition[%-4.3f %-4.3f %-4.3f]\n\n",
+				eventName.c_str(), object->getTemplateName(), object->getNetworkId().getValueString().c_str(),
+				object->getTransform_o2p().getPosition_p().x, object->getTransform_o2p().getPosition_p().y, object->getTransform_o2p().getPosition_p().z));
+			
+			object->unload();
+			
+			(*objIter).loadedObject = NULL;
+		}
+	}
+}
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/core/ServerBuildoutManager.h b/engine/server/library/serverGame/src/shared/core/ServerBuildoutManager.h
new file mode 100644
index 00000000..1579be82
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerBuildoutManager.h
@@ -0,0 +1,34 @@
+// ======================================================================
+//
+// ServerBuildoutManager.h
+//
+// Copyright 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ServerBuildoutManager_H
+#define INCLUDED_ServerBuildoutManager_H
+
+// ======================================================================
+
+class Client;
+
+// ======================================================================
+
+class ServerBuildoutManager
+{
+public:
+	static void install();
+	static void onChunkComplete(int nodeX, int nodeZ);
+	static void saveArea(std::string const &serverFileName, std::string const &clientFileName, float x1, float z1, float x2, float z2);
+	static void clientSaveArea(Client &client, std::string const &areaName, float x1, float z1, float x2, float z2);
+	static void destroyPersistedDuplicates();
+	static void editBuildoutArea(std::string const &areaName);
+	static void onEventStarted(std::string const & eventName);
+	static void onEventStopped(std::string const & eventName);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_ServerBuildoutManager_H
+
diff --git a/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp b/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp
new file mode 100644
index 00000000..7bf10457
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp
@@ -0,0 +1,674 @@
+// ============================================================================
+//
+// ServerImageDesignerManager.cpp
+// Copyright Sony Online Entertainment, Inc.
+//
+// ============================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerImageDesignerManager.h"
+
+#include "serverGame/Chat.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerObjectTemplate.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedGame/CustomizationManager.h"
+#include "sharedGame/CustomizationManager_MorphParameter.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/SharedStringIds.h"
+#include "sharedNetworkMessages/ImageDesignChangeMessage.h"
+#include "sharedObject/Controller.h"
+#include "sharedObject/CustomizationData.h"
+#include "sharedObject/CustomizationVariable.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/Object.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/PaletteColorCustomizationVariable.h"
+#include "sharedObject/RangedIntCustomizationVariable.h"
+#include "sharedObject/SlotId.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainer.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedUtility/DataTable.h"
+
+// ============================================================================
+
+// ============================================================================
+
+namespace ServerImageDesignerManagerNamespace
+{
+	class MyCallback : public MessageDispatch::Callback
+	{
+	public:
+		MyCallback ()
+		: MessageDispatch::Callback ()
+		{
+			connect (*this, &MyCallback::onScaleFactorChanged, static_cast<CustomizationManager::MorphParameter::Messages::ScaleFactorChanged *>(0));
+		}
+
+		void onScaleFactorChanged (CustomizationManager::MorphParameter::Messages::ScaleFactorChanged::Payload const & payload)
+		{
+			NetworkId const & nid = payload.first;
+			Object * const o = NetworkIdManager::getObjectById(nid);
+			ServerObject * const so = o ? o->asServerObject() : NULL;
+			CreatureObject * const creature = so ? so->asCreatureObject() : NULL;
+			if (creature)
+			{
+				ObjectTemplate const * const tmp = creature->getSharedTemplate();
+				SharedObjectTemplate const * const tmpl = dynamic_cast<SharedObjectTemplate const *>(tmp);
+				if(tmpl)
+				{
+					float const denormalized = CustomizationManager::MorphParameter::denormalizeScale (tmpl, payload.second);
+					creature->setScaleFactor (denormalized);
+				}
+			}
+		}//lint !e1762 function could be const (no it couldn't, overriding base function)
+	};
+
+	struct HairData
+	{
+		std::string hairTemplate;
+		std::string characterTemplate;
+		int requiredHairSkillMod;
+	};
+
+	namespace Filenames
+	{
+		char const * const cms_hairstyleAssetTable = "datatables/customization/hair_assets_skill_mods.iff";
+		char const * const cms_allowBaldTable = "datatables/customization/allow_bald.iff";
+	}
+	
+	namespace HairAssetSkillModsColumnNames
+	{
+		char const * const hairServerTemplate = "SERVER_TEMPLATE";
+		char const * const playerServerTemplate = "SERVER_PLAYER_TEMPLATE";
+		char const * const skillModValue = "SKILL_MOD_VALUE";
+	}
+
+	namespace AllowBaldColumnNames
+	{
+		char const * const speciesGender = "SPECIES_GENDER";
+		char const * const allowBald = "ALLOW_BALD";
+	}
+
+	bool ms_installed = false;
+	MyCallback * ms_callback = 0;
+
+	std::string const cms_hairCustomizationName("hair");
+	char const * const cms_hairSlotName = "hair";
+
+	std::map<int, std::string> ms_hairIndexMap;
+	std::multimap<NetworkId, ServerImageDesignerManager::GradualCustomizationData> ms_gradualCustomizationMap;
+	std::map<std::string, HairData> ms_hairNameToHairData;
+	std::map<std::string, bool> ms_genderSpeciesToAllowBald;
+}
+
+using namespace ServerImageDesignerManagerNamespace;
+
+// ============================================================================
+
+void ServerImageDesignerManager::install()
+{
+	DEBUG_FATAL(ms_installed, ("Already Installed"));
+	ms_installed = true;
+
+	ms_callback = new MyCallback();
+
+	ms_hairNameToHairData.clear();
+	ms_genderSpeciesToAllowBald.clear();
+	DataTable dataTable;
+	Iff hairMappingIff(Filenames::cms_hairstyleAssetTable);
+	dataTable.load(hairMappingIff);
+	HairData hairData;
+	for (int i = 0; i < dataTable.getNumRows(); ++i)
+	{
+		hairData.hairTemplate = dataTable.getStringValue(HairAssetSkillModsColumnNames::hairServerTemplate, i);
+		hairData.characterTemplate = dataTable.getStringValue(HairAssetSkillModsColumnNames::playerServerTemplate, i);
+		hairData.requiredHairSkillMod = dataTable.getIntValue(HairAssetSkillModsColumnNames::skillModValue, i);
+		ms_hairNameToHairData[hairData.hairTemplate] = hairData;
+	}
+	Iff allowBaldIff(Filenames::cms_allowBaldTable);
+	DataTable allowBaldDataTable;
+	allowBaldDataTable.load(allowBaldIff);
+	for (int j = 0; j < allowBaldDataTable.getNumRows(); ++j)
+	{
+		std::string const & genderSpecies = allowBaldDataTable.getStringValue(AllowBaldColumnNames::speciesGender, j);
+		int const allowBald = allowBaldDataTable.getIntValue(AllowBaldColumnNames::allowBald, j);
+		ms_genderSpeciesToAllowBald[genderSpecies] = (allowBald != 0) ? true : false;
+	}
+
+	ExitChain::add(ServerImageDesignerManager::remove, "ServerImageDesignerManager::remove", 0, false);
+}
+
+//-----------------------------------------------------------------------------
+
+void ServerImageDesignerManager::remove()
+{
+	DEBUG_FATAL(!ms_installed, ("Not Installed"));
+	ms_installed = false;
+	
+	ms_hairNameToHairData.clear();
+	ms_genderSpeciesToAllowBald.clear();
+
+	delete ms_callback;
+	ms_callback = NULL;
+}
+
+//-----------------------------------------------------------------------------
+
+bool ServerImageDesignerManager::makeChanges(SharedImageDesignerManager::Session const & session)
+{
+	if(!ms_installed)
+	{
+		DEBUG_FATAL(true, ("ServerImageDesignerManager not installed"));
+		return false;
+	}
+
+	NetworkId const & recipientId = session.recipientId;
+	Object * const recipientObj = NetworkIdManager::getObjectById(recipientId);
+	ServerObject * const recipientServerObj = recipientObj ? recipientObj->asServerObject() : NULL;
+	CreatureObject * const recipient = recipientServerObj ? recipientServerObj->asCreatureObject() : NULL;
+	NetworkId const & designerId = session.designerId;
+	Object * const designerObj = NetworkIdManager::getObjectById(designerId);
+	ServerObject * const designerServerObj = designerObj ? designerObj->asServerObject() : NULL;
+	CreatureObject * const designer = designerServerObj ? designerServerObj->asCreatureObject() : NULL;
+	if(designer && recipient)
+	{
+
+		//validate that any selected hair can go on this character
+		if(session.newHairSet)
+		{
+			//check new hair
+			if(!session.newHairAsset.empty())
+			{
+				bool newHairOk = false;
+				std::map<std::string, HairData>::iterator a = ms_hairNameToHairData.find(session.newHairAsset);
+				if(a != ms_hairNameToHairData.end())
+				{
+					if(strcmp(recipient->getTemplateName(), a->second.characterTemplate.c_str()) == 0)
+					{
+						SharedImageDesignerManager::SkillMods const mods = getSkillModsForDesigner(designer->getNetworkId());
+						if(mods.hairSkillMod >= a->second.requiredHairSkillMod)
+							newHairOk = true;
+					}
+				}
+				if(!newHairOk)
+				{
+					Chat::sendSystemMessage(*designer, SharedStringIds::imagedesigner_hair_not_valid, Unicode::emptyString);
+					if(designer != recipient)
+						Chat::sendSystemMessage(*recipient, SharedStringIds::imagedesigner_hair_not_valid, Unicode::emptyString);
+					return false;
+				}
+			}
+			//they want bald, is this okay for this gender/species?
+			else
+			{
+				bool baldOk = false;
+				std::string const & speciesGender = CustomizationManager::getServerSpeciesGender(*recipient);
+				std::map<std::string, bool>::iterator b = ms_genderSpeciesToAllowBald.find(speciesGender);
+				if(b != ms_genderSpeciesToAllowBald.end())
+				{
+					if(b->second)
+						baldOk = true;
+				}
+				if(!baldOk)
+				{
+					Chat::sendSystemMessage(*designer, SharedStringIds::imagedesigner_bald_not_valid, Unicode::emptyString);
+					if(designer != recipient)
+						Chat::sendSystemMessage(*recipient, SharedStringIds::imagedesigner_bald_not_valid, Unicode::emptyString);
+					return false;
+				}
+			}
+		}
+
+		//ensure designer is going to get paid enough
+		if(designer != recipient)
+		{
+			if(session.designerRequiredCredits > session.recipientPaidCredits)
+			{
+				Chat::sendSystemMessage(*designer, SharedStringIds::imagedesigner_not_paying_enough, Unicode::emptyString);
+				if(designer != recipient)
+					Chat::sendSystemMessage(*recipient, SharedStringIds::imagedesigner_not_paying_enough, Unicode::emptyString);
+				ServerImageDesignerManager::cancelSession(designer->getNetworkId(), recipient->getNetworkId());
+				return false;
+			}
+
+			if(session.designerRequiredCredits > recipient->getTotalMoney())
+			{
+				Chat::sendSystemMessage(*designer, SharedStringIds::imagedesigner_not_paying_enough, Unicode::emptyString);
+				if(designer != recipient)
+					Chat::sendSystemMessage(*recipient, SharedStringIds::imagedesigner_not_paying_enough, Unicode::emptyString);
+				ServerImageDesignerManager::cancelSession(designer->getNetworkId(), recipient->getNetworkId());
+				return false;
+			}
+
+			bool result = false;
+			//pay the designer
+			if(session.recipientPaidCredits > 0)
+			{
+				int moneyToMove = session.recipientPaidCredits;
+				int const recipientCash = recipient->getCashBalance();
+				if(moneyToMove <= recipientCash)
+				{
+					//just move cash if we can
+					result = recipient->transferCashTo(session.designerId, moneyToMove);
+					if(!result)
+					{
+						WARNING(true, ("ImageDesigner: could not transfer [%d] cash credits from nid[%s] to nid[%s] for services rendered", moneyToMove, recipient->getNetworkId().getValueString().c_str(), session.designerId.getValueString().c_str()));
+						Chat::sendSystemMessage(*designer, SharedStringIds::imagedesigner_not_paying_enough, Unicode::emptyString);
+						if(designer != recipient)
+							Chat::sendSystemMessage(*recipient, SharedStringIds::imagedesigner_not_paying_enough, Unicode::emptyString);
+						ServerImageDesignerManager::cancelSession(designer->getNetworkId(), recipient->getNetworkId());
+						return false;
+					}
+					//we've moved all the necessary money
+				}
+				else
+				{
+					if(recipientCash > 0)
+					{
+						//move all their cash, and pull the rest from the bank
+						result = recipient->transferCashTo(session.designerId, recipientCash);
+						if(!result)
+						{
+							WARNING(true, ("ImageDesigner: could not transfer [%d] cash credits from nid[%s] to nid[%s] for services rendered", recipientCash, recipient->getNetworkId().getValueString().c_str(), session.designerId.getValueString().c_str()));
+							Chat::sendSystemMessage(*designer, SharedStringIds::imagedesigner_not_paying_enough, Unicode::emptyString);
+							if(designer != recipient)
+								Chat::sendSystemMessage(*recipient, SharedStringIds::imagedesigner_not_paying_enough, Unicode::emptyString);
+							ServerImageDesignerManager::cancelSession(designer->getNetworkId(), recipient->getNetworkId());
+							return false;
+						}
+						moneyToMove -= recipientCash;
+					}
+
+					//get the rest from the bank if we can
+					result = recipient->transferBankCreditsTo(session.designerId, moneyToMove);
+					if(!result)
+					{
+						WARNING(true, ("ImageDesigner: could not transfer [%d] bank credits from nid[%s] to nid[%s] for services rendered", moneyToMove, recipient->getNetworkId().getValueString().c_str(), session.designerId.getValueString().c_str()));
+						Chat::sendSystemMessage(*designer, SharedStringIds::imagedesigner_not_paying_enough, Unicode::emptyString);
+						if(designer != recipient)
+							Chat::sendSystemMessage(*recipient, SharedStringIds::imagedesigner_not_paying_enough, Unicode::emptyString);
+						ServerImageDesignerManager::cancelSession(designer->getNetworkId(), recipient->getNetworkId());
+						return false;
+					}
+				}
+
+				//tell recipient that they paid
+				ProsePackage prosePackage;
+				prosePackage.stringId = SharedStringIds::imagedesigner_recip_paid;
+				prosePackage.digitInteger = session.recipientPaidCredits;
+				Chat::sendSystemMessage(*recipient, prosePackage);
+
+				//tell designer that were they paid
+				prosePackage.stringId = SharedStringIds::imagedesigner_designer_was_paid;
+				Chat::sendSystemMessage(*designer, prosePackage);
+			}
+		}
+
+		//OK, everything checks out, make all the changes NOW!
+
+		for(std::map<std::string, float>::const_iterator i = session.morphChanges.begin(); i != session.morphChanges.end(); ++i)
+		{
+			setMorphCustomization(*recipient, i->first, i->second);
+		}
+
+		for(std::map<std::string, int>::const_iterator j = session.indexChanges.begin(); j != session.indexChanges.end(); ++j)
+		{
+			setIndexCustomization(*recipient, j->first, j->second);
+		}
+
+		if(session.newHairSet)
+		{
+			SlottedContainer * const slotted = ContainerInterface::getSlottedContainer(*recipient);
+			if(slotted)
+			{
+				SlotId const slot = SlotIdManager::findSlotId (ConstCharCrcLowerString (cms_hairSlotName));
+				Container::ContainerErrorCode tmp = Container::CEC_Success;
+				Object * const originalHairObject = slotted->getObjectInSlot(slot, tmp).getObject();
+				ServerObject * const originalHairServerObject = originalHairObject ? originalHairObject->asServerObject() : NULL;
+				TangibleObject * const orignalHair = originalHairServerObject ? originalHairServerObject->asTangibleObject() : NULL;
+				std::string originalHairCustomizationData;
+				if(orignalHair)
+				{
+					//first get the color of the old hair, so it can be applied to the new hair
+					CustomizationData const * const originalHairData = orignalHair->fetchCustomizationData ();
+					if(originalHairData)
+					{
+						originalHairCustomizationData = originalHairData->writeLocalDataToString();
+						originalHairData->release();
+					}
+						//destroy the old hair
+					IGNORE_RETURN(orignalHair->permanentlyDestroy(DeleteReasons::Script));
+				}
+
+				if(!session.newHairAsset.empty())
+				{
+					GradualCustomizationData gradualCustomization;
+					gradualCustomization.customizationName = cms_hairCustomizationName;
+					gradualCustomization.templateName = session.newHairAsset;
+					gradualCustomization.customizationString = originalHairCustomizationData;
+					gradualCustomization.customizationData = getHairCustomizations(session);
+					gradualCustomization.countdown = 20;
+					IGNORE_RETURN(ms_gradualCustomizationMap.insert(std::make_pair(recipient->getNetworkId(), gradualCustomization)));
+				}
+			}
+		}
+		sendSessionToScript(session, session.designerId, static_cast<int>(Scripting::TRIG_IMAGE_DESIGN_COMPLETED));
+	}
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ServerImageDesignerManager::setMorphCustomization(CreatureObject & creature, std::string const & customizationName, float const value)
+{
+	if(!ms_installed)
+	{
+		DEBUG_FATAL(true, ("ServerImageDesignerManager not installed"));
+		return;
+	}
+
+	CustomizationManager::Customization customization;
+	bool const result = CustomizationManager::getCustomization(CustomizationManager::getServerSpeciesGender(creature), customizationName, customization);
+	if(result)
+	{
+		CustomizationData * const customizationData = fetchCustomizationDataForCustomization(creature, customization);
+		if(customizationData)
+		{
+			CustomizationManager::MorphParameter param(*customizationData, customization);
+			param.update(creature, value);
+			customizationData->release();
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ServerImageDesignerManager::setIndexCustomization(CreatureObject & creature, std::string const & customizationName, int const value)
+{
+	if(!ms_installed)
+	{
+		DEBUG_FATAL(true, ("ServerImageDesignerManager not installed"));
+		return;
+	}
+
+	CustomizationManager::Customization customization;
+	bool const result = CustomizationManager::getCustomization(CustomizationManager::getServerSpeciesGender(creature), customizationName, customization);
+	if(result)
+	{
+		CustomizationData * const customizationData = fetchCustomizationDataForCustomization(creature, customization);
+		if(customizationData)
+		{
+			CustomizationVariable * const cv = CustomizationManager::findVariable (*customizationData, customization.variables);
+			PaletteColorCustomizationVariable * const paletteVariable = dynamic_cast<PaletteColorCustomizationVariable *>(cv);
+			if(paletteVariable)
+			{
+				int rangeMin = 0;
+				int rangeMax = 0;
+				paletteVariable->getRange(rangeMin, rangeMax);
+				int const finalValue = clamp(rangeMin, value, rangeMax);
+				paletteVariable->setValue(finalValue);
+			}
+			customizationData->release();
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+SharedImageDesignerManager::SkillMods ServerImageDesignerManager::getSkillModsForDesigner(NetworkId const & designerId)
+{
+	SharedImageDesignerManager::SkillMods skillMods;
+
+	if(!ms_installed)
+	{
+		DEBUG_FATAL(true, ("ServerImageDesignerManager not installed"));
+		return skillMods;
+	}
+
+	Object const * const o = NetworkIdManager::getObjectById(designerId);
+	ServerObject const * const so = o ? o->asServerObject() : NULL;
+	CreatureObject const * const designer = so ? so->asCreatureObject() : NULL;
+	if(designer)
+	{
+		skillMods.bodySkillMod = designer->getModValue(SharedImageDesignerManager::cms_bodySkillModName);
+		skillMods.faceSkillMod = designer->getModValue(SharedImageDesignerManager::cms_faceSkillModName);
+		skillMods.markingsSkillMod = designer->getModValue(SharedImageDesignerManager::cms_markingsSkillModName);
+		skillMods.hairSkillMod = designer->getModValue(SharedImageDesignerManager::cms_hairSkillModName);
+	}
+	return skillMods;
+}
+
+//----------------------------------------------------------------------
+
+void ServerImageDesignerManager::updateGradualCustomizations(CreatureObject * target)
+{
+	if(!target)
+		return;
+
+	//move certain customizations over time
+	std::pair<std::multimap<NetworkId, GradualCustomizationData>::iterator, std::multimap<NetworkId, GradualCustomizationData>::iterator> p = ms_gradualCustomizationMap.equal_range(target->getNetworkId());
+	if(p.first != ms_gradualCustomizationMap.end())
+	{
+		for(std::multimap<NetworkId, GradualCustomizationData>::iterator i = p.first; i != p.second; ++i)
+		{
+			if(!--(i->second.countdown))
+			{
+				if(i->second.customizationName == cms_hairCustomizationName)
+				{
+					//do this one immediately
+					SlotId const slot = SlotIdManager::findSlotId (ConstCharCrcLowerString (cms_hairCustomizationName.c_str()));
+					ServerObject * const hair = ServerWorld::createNewObject(i->second.templateName, *target, slot, true);
+					TangibleObject * const tangibleHair = hair ? hair->asTangibleObject() : NULL;
+					if(tangibleHair)
+					{
+						//first set hair color to colors from old hair (if any)
+						if(!i->second.customizationString.empty())
+						{
+							CustomizationData * const data = tangibleHair->fetchCustomizationData();
+							if(data)
+							{
+								data->loadLocalDataFromString(i->second.customizationString);
+								data->release();
+							}
+						}
+						//override hair color with any customizations made in this session
+						for(std::map<std::string, int>::iterator j = i->second.customizationData.begin(); j != i->second.customizationData.end(); ++j)
+						{
+							setIndexCustomization(*target, j->first, j->second);
+						}
+					}
+					else
+					{
+						DEBUG_WARNING(true, ("Could not create hair %s\n", i->second.templateName.c_str()));
+					}
+				}
+				ms_gradualCustomizationMap.erase(i);
+			}
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ServerImageDesignerManager::sendSessionToScriptForValidation(SharedImageDesignerManager::Session const & session)
+{
+	NetworkId const & designerId = session.designerId;
+	NetworkId const & recipientId = session.recipientId;
+	Object const * const designerObj = NetworkIdManager::getObjectById(designerId);
+	ServerObject const * const designerServer = designerObj ? designerObj->asServerObject() : NULL;
+	CreatureObject const * const designer = designerServer ? designerServer->asCreatureObject() : NULL;
+	Object * const recipientObj = NetworkIdManager::getObjectById(recipientId);
+	ServerObject * const recipientServer = recipientObj ? recipientObj->asServerObject() : NULL;
+	CreatureObject * const recipient = recipientServer ? recipientServer->asCreatureObject() : NULL;
+	if(designer && recipient)
+	{
+		sendSessionToScript(session, session.designerId, static_cast<int>(Scripting::TRIG_IMAGE_DESIGN_VALIDATE));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ServerImageDesignerManager::sendSessionToScript(SharedImageDesignerManager::Session const & session, NetworkId const & objectToTriggerId, int const trigger)
+{
+	Object * const objectToTrigger = NetworkIdManager::getObjectById(objectToTriggerId);
+	ServerObject * const serverObjectToTrigger = objectToTrigger ? objectToTrigger->asServerObject() : NULL;
+	if(serverObjectToTrigger)
+	{
+		GameScriptObject * const scriptObject = serverObjectToTrigger->getScriptObject();
+		if (scriptObject)
+		{
+			ScriptParams params;
+			params.addParam(session.designerId, "designerId");
+			params.addParam(session.recipientId, "recipientId");
+			params.addParam(session.terminalId, "terminalId");
+			params.addParam(static_cast<int>(session.startingTime), "startingTime");
+			params.addParam(static_cast<int>(session.designType), "designType");
+			params.addParam(session.newHairSet, "newHairSet");
+			params.addParam(session.newHairAsset.c_str(), "newHairAsset");
+			params.addParam(session.hairCustomizationData.c_str(), "hairCustomizationData");
+			params.addParam(session.designerRequiredCredits, "designerRequiredCredits");
+			params.addParam(session.recipientPaidCredits, "recipientPaidCredits");
+			params.addParam(session.accepted, "accepted");
+			std::vector<const char *> morphKeys;
+			std::vector<float> morphValues;
+			std::vector<const char *> indexKeys;
+			std::vector<int> indexValues;
+			std::vector<const char *> holoEmotes;
+			for(std::map<std::string, float>::const_iterator i = session.morphChanges.begin(); i != session.morphChanges.end(); ++i)
+			{
+				morphKeys.push_back(i->first.c_str());
+				morphValues.push_back(i->second);
+			}
+			params.addParam(morphKeys, "morphChangesKeys");
+			params.addParam(morphValues, "morphChangesValues");
+			for(std::map<std::string, int>::const_iterator j = session.indexChanges.begin(); j != session.indexChanges.end(); ++j)
+			{
+				indexKeys.push_back(j->first.c_str());
+				indexValues.push_back(j->second);
+			}
+			params.addParam(indexKeys, "indexChangesKeys");
+			params.addParam(indexValues, "indexChangesValues");
+			params.addParam(session.holoEmote.c_str(), "holoEmote");
+
+			IGNORE_RETURN(scriptObject->trigAllScripts(static_cast<Scripting::TrigId>(trigger), params));
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+CustomizationData * ServerImageDesignerManager::fetchCustomizationDataForCustomization(CreatureObject & creature, CustomizationManager::Customization const & customization)
+{
+	//use the hair if it's the one to be queried
+	TangibleObject * objectToQuery = &creature;
+	if(customization.isVarHairColor)
+	{
+		ServerObject * const hair = creature.getHair();
+		TangibleObject * const tangibleHair = hair ? hair->asTangibleObject() : NULL;
+		if(tangibleHair)
+			objectToQuery = tangibleHair;
+		else
+			return NULL;
+	}
+	return objectToQuery->fetchCustomizationData();
+}
+
+//----------------------------------------------------------------------
+
+void ServerImageDesignerManager::cancelSession(NetworkId const & designerId, NetworkId const & recipientId)
+{
+	//send the cancel message to the designer
+	Object * const designerObject = NetworkIdManager::getObjectById(designerId);
+	Controller * const designerController = designerObject ? designerObject->getController() : NULL;
+	if(designerController)
+	{
+		ImageDesignChangeMessage * outMsg = new ImageDesignChangeMessage();
+		if(outMsg)
+		{
+			outMsg->setDesignerId(designerId);
+			outMsg->setRecipientId(recipientId);
+			outMsg->setOrigin(ImageDesignChangeMessage::O_SERVER);
+			designerController->appendMessage(static_cast<int>(CM_imageDesignerCancel), 0.0f, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+		}
+	}
+
+	//send the cancel message to the recipient
+	Object * const recipientObject = NetworkIdManager::getObjectById(recipientId);
+	Controller * const recipientController = recipientObject ? recipientObject->getController() : NULL;
+	if(recipientController && designerController != recipientController)
+	{
+		ImageDesignChangeMessage * outMsg = new ImageDesignChangeMessage();
+		if(outMsg)
+		{
+			outMsg->setDesignerId(designerId);
+			outMsg->setRecipientId(recipientId);
+			outMsg->setOrigin(ImageDesignChangeMessage::O_SERVER);
+			recipientController->appendMessage(static_cast<int>(CM_imageDesignerCancel), 0.0f, outMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+		}
+	}
+
+	//send cancel trigger to designer player
+	ServerObject * const designerServerObject = designerObject ? designerObject->asServerObject() : NULL;
+	if(designerServerObject)
+	{
+		GameScriptObject * const scriptObject = designerServerObject->getScriptObject();
+		if (scriptObject)
+		{
+			ScriptParams params;
+			IGNORE_RETURN(scriptObject->trigAllScripts(Scripting::TRIG_IMAGE_DESIGN_CANCELED, params));
+		}
+	}
+
+	//send cancel trigger to recipient player
+	ServerObject * const recipientServerObject = recipientObject ? recipientObject->asServerObject() : NULL;
+	if(recipientServerObject && recipientServerObject != designerServerObject)
+	{
+		GameScriptObject * const scriptObject = recipientServerObject->getScriptObject();
+		if (scriptObject)
+		{
+			ScriptParams params;
+			IGNORE_RETURN(scriptObject->trigAllScripts(Scripting::TRIG_IMAGE_DESIGN_CANCELED, params));
+		}
+	}
+
+	SharedImageDesignerManager::endSession(designerId);
+}
+
+//----------------------------------------------------------------------
+
+/** For a given session, pick out all the customization changes that would affect the player's hair
+*/
+std::map<std::string, int> ServerImageDesignerManager::getHairCustomizations(SharedImageDesignerManager::Session const & session)
+{
+	Object * const o = NetworkIdManager::getObjectById(session.recipientId);
+	ServerObject * const so = o ? o->asServerObject() : NULL;
+	CreatureObject * const recipient = so ? so->asCreatureObject() : NULL;
+	CustomizationManager::Customization customization;
+	bool result = false;
+	std::map<std::string, int> hairCustomizations;
+	if (recipient)
+	{
+		//all hair customizations will be in the index changes
+		for(std::map<std::string, int>::const_iterator i = session.indexChanges.begin(); i != session.indexChanges.end(); ++i)
+		{
+			result = CustomizationManager::getCustomization(CustomizationManager::getServerSpeciesGender(*recipient), i->first, customization);
+			if(result)
+			{
+				if(customization.isVarHairColor)
+					hairCustomizations[i->first] = i->second;
+			}
+		}
+	}
+	return hairCustomizations;
+}
+
+// ============================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.h b/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.h
new file mode 100644
index 00000000..120c3524
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.h
@@ -0,0 +1,65 @@
+// ============================================================================
+// 
+// ServerImageDesignerManager.h
+// Copyright Sony Online Entertainment, Inc.
+//
+// ============================================================================
+
+#ifndef INCLUDED_ServerImageDesignerManager_H
+#define INCLUDED_ServerImageDesignerManager_H
+
+//-----------------------------------------------------------------------------
+
+#include "sharedGame/CustomizationManager.h"
+#include "sharedGame/SharedImageDesignerManager.h"
+
+//-----------------------------------------------------------------------------
+
+class ImageDesignChangeMessage;
+class CreatureObject;
+class CustomizationData;
+class ScriptParams;
+
+//-----------------------------------------------------------------------------
+
+class ServerImageDesignerManager
+{
+public:
+	struct GradualCustomizationData
+	{
+		std::string customizationName;
+		std::string templateName;
+		std::map<std::string, int> customizationData;
+		std::string customizationString;
+		int countdown;
+	};
+
+	static void install();
+	static void remove();
+
+	static bool makeChanges(SharedImageDesignerManager::Session const & session);
+	static SharedImageDesignerManager::SkillMods getSkillModsForDesigner(NetworkId const & designerId);
+	static void updateGradualCustomizations(CreatureObject* target);
+	static void sendSessionToScriptForValidation(SharedImageDesignerManager::Session const & session);
+	static void convertSessionToScriptParams(SharedImageDesignerManager::Session const & session, ScriptParams & /*IN-OUT*/ params);
+	static CustomizationData * fetchCustomizationDataForCustomization(CreatureObject & creature, CustomizationManager::Customization const & customization);
+	static void cancelSession(NetworkId const & designerId, NetworkId const & recipientId);
+	static std::map<std::string, int> getHairCustomizations(SharedImageDesignerManager::Session const & session);
+
+private:
+	// Disable
+	ServerImageDesignerManager();
+	ServerImageDesignerManager(ServerImageDesignerManager const &);
+	ServerImageDesignerManager &operator =(ServerImageDesignerManager const &);
+
+private:
+	static void sendSessionToScript(SharedImageDesignerManager::Session const & session, NetworkId const & objectToTriggerId, int trigger);
+
+private:
+	static void setMorphCustomization(CreatureObject & creature, std::string const & customizationName, float value);
+	static void setIndexCustomization(CreatureObject & creature, std::string const & customizationName, int value);
+};
+
+// ============================================================================
+
+#endif // INCLUDED_ServerImageDesignerManager_H
diff --git a/engine/server/library/serverGame/src/shared/core/ServerMessageForwarding.cpp b/engine/server/library/serverGame/src/shared/core/ServerMessageForwarding.cpp
new file mode 100644
index 00000000..ec23c1c0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerMessageForwarding.cpp
@@ -0,0 +1,85 @@
+// ======================================================================
+//
+// ServerMessageForwarding.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerMessageForwarding.h"
+
+#include "serverGame/GameServer.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#ifdef _DEBUG
+#include "serverUtility/ServerConnection.h"
+#endif
+
+// ======================================================================
+
+namespace ServerMessageForwardingNamespace
+{
+	std::vector<int> s_forwardCounts;
+	std::vector<std::vector<uint32> > s_forwardDestinationServerPids;
+}
+using namespace ServerMessageForwardingNamespace;
+
+// ======================================================================
+
+void ServerMessageForwarding::begin(uint32 destinationServerPid)
+{
+	std::vector<uint32> serverList;
+	serverList.push_back(destinationServerPid);
+	begin(serverList);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerMessageForwarding::begin(std::vector<uint32> const &destinationServerPids)
+{
+	if (s_forwardDestinationServerPids.empty() || s_forwardDestinationServerPids.back() != destinationServerPids)
+	{
+		s_forwardCounts.push_back(1);
+		s_forwardDestinationServerPids.push_back(destinationServerPids);
+
+		GenericValueTypeMessage<std::vector<uint32> > const beginForwardMessage("BeginForward", destinationServerPids);
+		GameServer::getInstance().sendToPlanetServer(beginForwardMessage);
+	}
+	else
+		++s_forwardCounts.back();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerMessageForwarding::beginBroadcast()
+{
+	begin(GameServer::getInstance().getAllGameServerPids());
+}
+
+// ----------------------------------------------------------------------
+
+void ServerMessageForwarding::end()
+{
+	FATAL(s_forwardCounts.empty(), ("ServerMessageForwarding::end without a begin?"));
+
+	if (--s_forwardCounts.back() == 0)
+	{
+		GameNetworkMessage const endForwardMessage("EndForward");
+		GameServer::getInstance().sendToPlanetServer(endForwardMessage);
+
+		s_forwardCounts.pop_back();
+		s_forwardDestinationServerPids.pop_back();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerMessageForwarding::send(GameNetworkMessage const &msg)
+{
+	DEBUG_FATAL(!ServerConnection::isMessageForwardable(msg.getType()), ("Tried to forward message of type %lu which is not in the forwardable message table.", msg.getType()));
+
+	GameServer::getInstance().sendToPlanetServer(msg);
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/core/ServerMessageForwarding.h b/engine/server/library/serverGame/src/shared/core/ServerMessageForwarding.h
new file mode 100644
index 00000000..43133bc9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerMessageForwarding.h
@@ -0,0 +1,31 @@
+// ======================================================================
+//
+// ServerMessageForwarding.h
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ServerMessageForwarding_H
+#define INCLUDED_ServerMessageForwarding_H
+
+// ======================================================================
+
+class GameNetworkMessage;
+
+// ======================================================================
+
+class ServerMessageForwarding
+{
+public:
+	static void begin(uint32 destinationServerPid);
+	static void begin(std::vector<uint32> const &destinationServerPids);
+	static void beginBroadcast();
+	static void end();
+	static void send(GameNetworkMessage const &msg);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_ServerMessageForwarding_H
+
diff --git a/engine/server/library/serverGame/src/shared/core/ServerObjectAttributeIds.cpp b/engine/server/library/serverGame/src/shared/core/ServerObjectAttributeIds.cpp
new file mode 100644
index 00000000..e1407790
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerObjectAttributeIds.cpp
@@ -0,0 +1,13 @@
+//======================================================================
+//
+// ServerObjectAttributeIds.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerObjectAttributeIds.h"
+
+//======================================================================
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/ServerObjectAttributeIds.h b/engine/server/library/serverGame/src/shared/core/ServerObjectAttributeIds.h
new file mode 100644
index 00000000..ce2192d1
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerObjectAttributeIds.h
@@ -0,0 +1,24 @@
+//======================================================================
+//
+// ServerObjectAttributeIds.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ServerObjectAttributeIds_H
+#define INCLUDED_ServerObjectAttributeIds_H
+
+//======================================================================
+
+#define MAKE_ATTRIB_ID(a) const std::string a = #a;
+
+//----------------------------------------------------------------------
+
+namespace
+{
+	MAKE_ATTRIB_ID (wpn_damage_radius);
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/ServerUIManager.cpp b/engine/server/library/serverGame/src/shared/core/ServerUIManager.cpp
new file mode 100644
index 00000000..f94b1eee
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerUIManager.cpp
@@ -0,0 +1,437 @@
+//-----------------------------------------------------------------------
+// ServerUIManager.cpp
+// copyright 2001 Verant Interactive
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerUIManager.h"
+
+#include "boost/smart_ptr.hpp"
+#include "serverGame/Client.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerUIPage.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/SuiPageDataServer.h"
+#include "serverGame/SuiPageDataServerArchive.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptDictionary.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFoundation/PointerDeleter.h"
+#include "sharedGame/SuiEventType.h"
+#include "sharedGame/SuiPageData.h"
+#include "sharedGame/SuiWidgetProperty.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/ServerUserInterfaceMessages.h"
+#include "sharedNetworkMessages/SuiCreatePageMessage.h"
+#include "sharedNetworkMessages/SuiEventNotification.h"
+#include "sharedNetworkMessages/SuiUpdatePageMessage.h"
+#include <algorithm>
+#include <map>
+
+//----------------------------------------------------------------------
+
+std::map<int, ServerUIPage*>         ServerUIManager::m_pages;
+std::multimap<NetworkId, int>        ServerUIManager::m_primaryControlledObjectMap;
+int                                  ServerUIManager::m_pageCounter = 1;
+
+
+//-----------------------------------------------------------------------
+
+void ServerUIManager::onPlayerAuthorityTransferred(const NetworkId& playerCreatureId)
+{
+	for (std::multimap<NetworkId, int>::const_iterator i = m_primaryControlledObjectMap.lower_bound(playerCreatureId); i != m_primaryControlledObjectMap.upper_bound(playerCreatureId); ++i)
+	{		
+		ServerUIPage * const p = getPage(i->second);
+		if (p)
+		{	
+			GenericValueTypeMessage<std::pair<NetworkId, SuiPageDataServer> > const pageChangeAuthority("PageChangeAuthority", std::make_pair(playerCreatureId, p->getPageDataServer()));			
+			ServerMessageForwarding::send(pageChangeAuthority);
+		}
+	}
+	deleteClientPages(playerCreatureId);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerUIManager::onPlayerLogout(const NetworkId& playerCreatureId)
+{
+	deleteClientPages(playerCreatureId);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerUIManager::install()
+{
+	std::for_each(m_pages.begin(), m_pages.end(), PointerDeleterPairSecond());
+	m_pages.clear();
+	m_primaryControlledObjectMap.clear();
+	m_pageCounter = 1;
+}
+
+//-----------------------------------------------------------------------
+
+void ServerUIManager::remove()
+{
+	std::for_each(m_pages.begin(), m_pages.end(), PointerDeleterPairSecond());
+	m_pages.clear();
+	m_primaryControlledObjectMap.clear();
+}
+
+//-----------------------------------------------------------------------
+
+
+int ServerUIManager::getNewPageId()
+{
+	//Try to get a unique cross-server value, so take the process ID, which should be < 255, and or it into the bottom 8 bits
+	int pageCounter = m_pageCounter++;
+	pageCounter <<= 8;	
+	uint32 processId = GameServer::getInstance().getProcessId();
+	DEBUG_WARNING(processId > 255, ("ServerUIManager: unexpectedly high GameServer process id %d, may result in SUI collisions", processId));
+	processId &= 0x000000FF;
+	pageCounter |= processId;
+	return pageCounter;
+}
+
+/**
+* @deprecated
+*/
+
+int ServerUIManager::createPage(const std::string& pageName, const ServerObject& owner, const NetworkId& primaryControlledObject, const std::string& callbackFunction)
+{
+	int const pageId = ServerUIManager::createPage(pageName, owner, primaryControlledObject);
+	if (pageId < 0)
+		return pageId;
+
+	ServerUIPage * const serverUIPage = ServerUIManager::getPage(pageId);
+	if (serverUIPage != NULL)
+	{
+		serverUIPage->setCallback(callbackFunction);
+		return pageId;
+	}
+
+	return -1;
+}
+
+//----------------------------------------------------------------------
+
+int ServerUIManager::createPage(const std::string& pageName, const ServerObject& owner, const NetworkId& primaryControlledObject)
+{
+	int const pageId = getNewPageId();
+	ServerUIPage * const p = new ServerUIPage(pageName, owner, primaryControlledObject, pageId);
+	if (m_pages.count(pageId))
+		IGNORE_RETURN(removePage(pageId));
+	IGNORE_RETURN(m_pages.insert(std::make_pair(pageId, p)));
+	IGNORE_RETURN(m_primaryControlledObjectMap.insert(std::make_pair(primaryControlledObject, pageId)));
+	return pageId;
+}
+
+//-----------------------------------------------------------------------
+
+void ServerUIManager::deleteClientPages(const NetworkId& primaryControlledObject)
+{
+	//if(!client)
+	//	return;
+	//find every page associated with this client
+	for(std::multimap<NetworkId, int>::const_iterator i = m_primaryControlledObjectMap.lower_bound(primaryControlledObject); i != m_primaryControlledObjectMap.upper_bound(primaryControlledObject); ++i)
+	{
+		ServerUIPage* const p = getPage(i->second);
+		//remove item from the pages map
+		IGNORE_RETURN(m_pages.erase(i->second));
+		//actually delete it
+		delete p;
+	}
+
+	//remove item from client map
+	IGNORE_RETURN(m_primaryControlledObjectMap.erase(primaryControlledObject));
+}
+
+//-----------------------------------------------------------------------
+
+ServerUIPage* ServerUIManager::getPage(int pageId)
+{
+	std::map<int, ServerUIPage*>::const_iterator iterFind = m_pages.find(pageId);
+	if (iterFind == m_pages.end())
+		return NULL;
+	else
+		return iterFind->second;
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerUIManager::showPage(int pageId)
+{
+	ServerUIPage * const page = getPage(pageId);
+	if (page != NULL)
+		return showPage(*page);
+
+	WARNING(true, ("ServerUIManager::showPage(%d) invalid page", pageId));
+	return false;
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerUIManager::showPage(ServerUIPage &  page)
+{
+	Client * const client = page.getClient();
+	if (client == NULL)
+	{
+//		WARNING(true, ("ServerUIManager::showPage attempt to show page on null client"));
+		return false;
+	}
+
+	ServerObject const * const characterObject = client->getCharacterObject();
+	if (characterObject == NULL)
+	{
+		WARNING(true, ("ServerUIManager::showPage attempt to show page to client with no character object"));
+		return false;
+	}
+
+	if (!characterObject->isAuthoritative())
+	{
+		WARNING(true, ("ServerUIManager::showPage attempt to show page to non-authoritative client"));
+		return false;
+	}
+
+	if (page.getPageDataServer().isActive())
+	{
+		SuiPageData updatePage;
+		if (page.getPageDataServer().getPageUpdate(updatePage))
+		{
+			SuiUpdatePageMessage const updateMsg(updatePage);
+			client->send(updateMsg, true);
+		}
+	}
+	else
+	{
+		SuiCreatePageMessage const createMsg(page.getPageData());
+		client->send(createMsg, true);
+		page.getPageDataServer().setActive();
+	}
+
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerUIManager::closePage(int pageId)
+{
+	//send close_page message
+	const ServerUIPage * const page = getPage(pageId);
+	if(page == NULL)
+		return false;
+
+	Client * const client = page->getClient();
+	if(client == NULL)
+		return false;
+
+	SuiForceClosePage msg;
+	msg.setClientPageId(pageId);
+	client->send(msg, true);
+
+	return ServerUIManager::removePage(pageId);
+}
+
+//----------------------------------------------------------------------
+
+bool ServerUIManager::removePage(int pageId)
+{
+	//send close_page message
+	const ServerUIPage * const page = getPage(pageId);
+	if(page == NULL)
+		return false;
+
+	NetworkId const & primaryControlledObject = page->getPrimaryControlledObject();
+
+	for(std::multimap<NetworkId, int>::iterator i = m_primaryControlledObjectMap.lower_bound(primaryControlledObject); i != m_primaryControlledObjectMap.upper_bound(primaryControlledObject);)
+	{
+		if (i->second == pageId)
+		{
+			m_primaryControlledObjectMap.erase(i++);
+		}
+		else
+		{
+			++i;
+		}
+	}
+
+	IGNORE_RETURN(m_pages.erase(pageId));
+
+	delete page;
+
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+void ServerUIManager::receiveMessage(const MessageDispatch::MessageBase& message)
+{
+	Archive::ReadIterator ri = NON_NULL(dynamic_cast<const GameNetworkMessage *>(&message))->getByteStream().begin();
+	if (message.isType(SuiEventNotification::MessageType))
+	{
+		SuiEventNotification const suiEventNotification(ri);
+
+		int const pageId = suiEventNotification.getPageId();
+
+		ServerUIPage const * const page = getPage(pageId);
+		if (page == NULL)
+			return;
+
+		Client * const client = page->getClient();
+		if (client == NULL)
+		{
+			removePage(pageId);
+			return;
+		}
+
+		ServerObject * const characterObject = client->getCharacterObject();
+
+		if (characterObject == NULL)
+		{
+			WARNING(true, ("ServerUIManager::recieveMessage got SuiEventNotification for null character object"));
+			removePage(pageId);
+			return;
+		}
+
+		SuiPageData const & suiPageData = page->getPageData();
+
+		SuiPageDataServer const & suiPageDataServer = page->getPageDataServer();
+
+		ServerObject * const ownerObject = ServerWorld::findObjectByNetworkId(suiPageDataServer.getOwnerId());
+
+		if (ownerObject == NULL)
+		{
+			WARNING(true, ("ServerUIManager::recieveMessage got SuiEventNotification for null owner object"));
+			removePage(pageId);
+			return;
+		}
+
+		GameScriptObject * const gso = ownerObject->getScriptObject();
+		if (gso == NULL)
+		{
+			WARNING(true, ("ServerUIManager::recieveMessage got SuiEventNotification for owner object with no scripts"));
+			removePage(pageId);
+			return;
+		}
+
+		int const eventIndex = suiEventNotification.getSubscribedEventIndex();
+		SuiCommand const * const command = suiPageData.findSubscribeToEventCommandByIndex(eventIndex);
+
+		if (command == NULL)
+		{
+			WARNING(true, ("ServerUIManager::recieveMessage got SuiEventNotification invalid notification index [%d]", eventIndex));
+			return;
+		}
+
+		SuiCommand::WidgetPropertyVector widgetProperties;
+		command->getPropertySubscriptionsForEvent(widgetProperties);
+
+		//-- it is ok for the notification property count to be fewer than our subscription list.
+		//-- this just means additional properties have been subscribed to, but the client hasn't processed
+		//-- the subscriptions yet
+		int const incomingPropertyCount = suiEventNotification.getPropertyCount();
+		if (static_cast<int>(widgetProperties.size()) < incomingPropertyCount)
+		{
+			WARNING(true, ("ServerUIManager::recieveMessage got SuiEventNotification invalid property count [%d], expected [%d]", 
+				static_cast<int>(widgetProperties.size()), incomingPropertyCount));
+			return;
+		}
+
+		int eventType = 0;
+		std::string callback;
+		command->getSubscribeToEventCallback(eventType, callback);
+
+		if (callback.empty())
+		{
+			WARNING(true, ("ServerUIManager::recieveMessage got SuiEventNotification invalid callback"));
+			return;
+		}
+
+		std::string const & eventTypeName = SuiEventType::getNameForType(eventType);
+
+		ScriptParams sp;
+		sp.addParam(pageId, "pageId");
+
+		if (eventType == SuiEventType::SET_onClosedOk)
+			sp.addParam("Ok", "buttonPressed");
+		else if (eventType == SuiEventType::SET_onClosedCancel)
+			sp.addParam("Cancel", "buttonPressed");
+		else
+			sp.addParam("Unknown", "buttonPressed");
+
+		sp.addParam(eventTypeName.c_str(), "eventType");
+		sp.addParam(command->getTargetWidget().c_str(), "eventWidgetName");
+
+		sp.addParam(characterObject->getNetworkId(), "player");
+
+		{
+			std::string propertyString;
+
+			int incomingPropertyIndex = 0;
+			for (SuiCommand::WidgetPropertyVector::const_iterator it = widgetProperties.begin(); it != widgetProperties.end() && incomingPropertyIndex < incomingPropertyCount; ++it, ++incomingPropertyIndex)
+			{
+				SuiWidgetProperty const & widgetProperty = *it;
+
+				propertyString.clear();
+				propertyString = widgetProperty.widgetName;
+				propertyString.push_back('.');
+				propertyString += widgetProperty.propertyName;
+
+				sp.addParam(suiEventNotification.getProperty(incomingPropertyIndex), propertyString);
+			}
+		}
+
+		ScriptDictionaryPtr sd;
+		//it allocates sd, we have to clean it up later
+		gso->makeScriptDictionary(sp, sd);
+		if(sd.get() == NULL)
+			return;
+
+		//call the script callback function
+		gso->handleMessage(callback, sd);
+
+		//by design, the page is considered invalid after OK or Cancel is pressed
+		//so we go ahead and destroy the page, if script didn't already destroy
+		//the page, otherwise, we'll have a memory leak
+		if ((eventType == SuiEventType::SET_onClosedOk) || (eventType == SuiEventType::SET_onClosedCancel))
+			IGNORE_RETURN(removePage(pageId));
+	}
+	else if(message.isType("PageChangeAuthority"))
+	{
+		//DEBUG_WARNING(true, ("ServerUIManager: received PageChangeAuthority message"));
+		const GenericValueTypeMessage<std::pair<NetworkId, SuiPageDataServer> > pageChangeAuthority(ri);
+		const NetworkId & primaryControlledObject = pageChangeAuthority.getValue().first;
+		const SuiPageDataServer & pageDataServer  = pageChangeAuthority.getValue().second;
+		const int pageId = pageDataServer.getPageData().getPageId();
+		//DEBUG_WARNING(true, ("ServerUIManager: received PageChangeAuthority message, pageId = %d", pageId));
+		SuiPageDataServer * const newPageDataServer = new SuiPageDataServer(pageDataServer);
+		ServerUIPage * const newPage = new ServerUIPage(primaryControlledObject, newPageDataServer);
+		if (m_pages.count(pageId))
+			IGNORE_RETURN(removePage(pageId));
+		IGNORE_RETURN(m_pages.insert(std::make_pair(pageId, newPage)));
+		IGNORE_RETURN(m_primaryControlledObjectMap.insert(std::make_pair(primaryControlledObject, pageId)));
+	}
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerUIManager::setPageProperty(int pageId, const std::string& widgetName, const std::string& propertyName, const Unicode::String& propertyValue)
+{
+	const ServerUIPage* page = getPage(pageId);
+	if(!page)
+		return false;
+	Client* client = page->getClient();
+	if(!client)
+		return false;
+
+	SuiSetProperty msg;
+	msg.setClientPageId(pageId);
+	msg.setWidgetName(widgetName);
+	msg.setPropertyName(propertyName);
+	msg.setPropertyValue(propertyValue);
+	client->send(msg, true);
+	return true;
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/core/ServerUIManager.h b/engine/server/library/serverGame/src/shared/core/ServerUIManager.h
new file mode 100644
index 00000000..1829cec5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerUIManager.h
@@ -0,0 +1,50 @@
+//-----------------------------------------------------------------------
+// ServerUIManager.h
+// copyright 2001 Verant Interactive
+//-----------------------------------------------------------------------
+
+#include "sharedMessageDispatch/Receiver.h"
+#include "sharedMessageDispatch/Emitter.h"
+#include "Singleton/Singleton.h"
+
+#include "sharedFoundation/Watcher.h"
+
+class Client;
+class ServerObject;
+class ServerUIPage;
+class NetworkId;
+
+//-----------------------------------------------------------------------
+
+class ServerUIManager
+{
+public:
+	static void install();
+	static void remove();
+
+	static void receiveMessage    (const MessageDispatch::MessageBase& message);
+	static void onPlayerAuthorityTransferred(const NetworkId &playerCreatureId);
+	static void onPlayerLogout    (const NetworkId &playerCreatureId);
+	static int createPage         (const std::string& pageName, const ServerObject& owner, const NetworkId& primaryControlledObject);
+	static ServerUIPage* getPage  (int pageId);
+	static bool showPage          (int pageId);
+	static bool closePage         (int pageId);
+
+	static int getNumServerUIPages(void) {return static_cast<int>(m_pages.size());}
+
+private:
+	static int createPage         (const std::string& pageName, const ServerObject& owner, const NetworkId& primaryControlledObject, const std::string& callbackFunction);
+	static bool setPageProperty   (int pageId, const std::string& widgetName, const std::string& propertyName, const Unicode::String& propertyValue);
+	static void deleteClientPages (const NetworkId& primaryControlledObject);
+	static bool removePage        (int pageId);
+	static bool showPage          (ServerUIPage & page);
+
+	static int  getNewPageId();
+
+private:
+	static stdmap<int, ServerUIPage*>::fwd  m_pages;
+	static stdmultimap<NetworkId, int>::fwd  m_primaryControlledObjectMap;
+	static int m_pageCounter;
+};
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/core/ServerUIPage.cpp b/engine/server/library/serverGame/src/shared/core/ServerUIPage.cpp
new file mode 100644
index 00000000..289f1ada
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerUIPage.cpp
@@ -0,0 +1,203 @@
+//-----------------------------------------------------------------------
+// ServerUIPage.cpp
+// copyright 2001 Verant Interactive
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerUIPage.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/Client.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/SuiPageDataServer.h"
+#include "sharedGame/SuiEventType.h"
+#include "sharedGame/SuiPageData.h"
+#include "sharedObject/NetworkIdManager.h"
+#include <vector>
+
+//-----------------------------------------------------------------------
+
+ServerUIPage::ServerUIPage(const std::string& pageName, ServerObject const & owner, NetworkId const & primaryControlledObject, int pageId) :
+m_primaryControlledObject (primaryControlledObject),
+m_pageDataServer(new SuiPageDataServer(pageId, pageName, owner.getNetworkId()))
+{
+}
+
+//-----------------------------------------------------------------------
+
+ServerUIPage::ServerUIPage(NetworkId const & primaryControlledObject, SuiPageDataServer *pageDataServer) :
+m_primaryControlledObject(primaryControlledObject),
+m_pageDataServer(pageDataServer)
+{
+}
+
+//-----------------------------------------------------------------------
+
+ServerUIPage::~ServerUIPage()
+{
+	delete m_pageDataServer;
+	m_pageDataServer = NULL;
+}
+
+//-----------------------------------------------------------------------
+
+NetworkId const & ServerUIPage::getPrimaryControlledObject () const
+{
+	return m_primaryControlledObject;
+}
+
+Client* ServerUIPage::getClient() const
+{
+	Object *const object = NetworkIdManager::getObjectById(m_primaryControlledObject);
+	if(!object)
+	{
+		WARNING(true, ("ServerUIPage PrimaryControlledObject doesn't exist"));
+		return NULL;
+	}
+	ServerObject *const serverObject = object->asServerObject();
+	if(!serverObject)
+	{
+		WARNING(true, ("ServerUIPage PrimaryControlledObject isn't a server object"));
+		return NULL;
+	}
+	Client * const result = serverObject->getClient();	
+	if(!result)
+	{
+		WARNING(true, ("ServerUIPage PrimaryControlledObject has no client yet"));
+		return NULL;
+	}
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+ServerObject* ServerUIPage::getOwner() const
+{
+	Object * const object = NetworkIdManager::getObjectById(getPageDataServer().getOwnerId());
+	if (object != NULL)
+		return object->asServerObject();
+	return NULL;
+}
+
+//-----------------------------------------------------------------------
+
+void ServerUIPage::addChildWidget(const std::string& widgetType, const std::string& widgetName, const std::string& parentWidgetName)
+{
+	SuiCommand command(SuiCommand::SCT_addChildWidget, parentWidgetName);
+	command.initAddChildWidget(widgetType, widgetName);
+	getPageData().addCommand(command);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerUIPage::setProperty(const std::string& widgetName, const std::string& propertyName, const Unicode::String& propertyValue)
+{
+	SuiCommand command(SuiCommand::SCT_setProperty, widgetName);
+	command.initSetProperty(propertyName, propertyValue);
+	getPageData().addCommand(command);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerUIPage::clearDataSource(const std::string& dataSource)
+{
+	SuiCommand const command(SuiCommand::SCT_clearDataSource, dataSource);
+	getPageData().addCommand(command);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerUIPage::clearDataSourceContainer(const std::string& dataSourceContainer)
+{
+    SuiCommand const command(SuiCommand::SCT_clearDataSourceContainer, dataSourceContainer);
+    getPageData().addCommand(command);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerUIPage::addDataItem(const std::string& dataSource, const std::string& dataItemName, const Unicode::String& dataItemValue)
+{
+	SuiCommand command(SuiCommand::SCT_addDataItem, dataSource);
+	command.initAddDataItem(dataItemName, dataItemValue);
+	getPageData().addCommand(command);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerUIPage::addDataSourceContainer(const std::string& dataSourceContainer, const std::string& dataSourceContainerName, const Unicode::String& dataSourceContainerValue)
+{
+    SuiCommand command(SuiCommand::SCT_addDataSourceContainer, dataSourceContainer);
+    command.initAddDataSourceContainer(dataSourceContainerName, dataSourceContainerValue);
+    getPageData().addCommand(command);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerUIPage::addDataSource(const std::string& dataSource, const std::string& dataSourceName, const Unicode::String& dataSourceValue)
+{
+	SuiCommand command(SuiCommand::SCT_addDataSource, dataSource);
+	command.initAddDataSource(dataSourceName, dataSourceValue);
+	getPageData().addCommand(command);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerUIPage::subscribeToProperty(const std::string& widgetName, const std::string& propertyName)
+{
+	static std::string const emptyString;
+	
+	getPageData().subscribeToPropertyForEvent(SuiEventType::SET_onClosedOk, emptyString, widgetName, propertyName);
+	getPageData().subscribeToPropertyForEvent(SuiEventType::SET_onClosedCancel, emptyString, widgetName, propertyName);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerUIPage::setCallback(const std::string& callbackFunction)
+{
+	SuiCommand suscribeOkCommand(SuiCommand::SCT_subscribeToEvent, std::string());
+	suscribeOkCommand.initSubscribeToEvent(SuiEventType::SET_onClosedOk, callbackFunction);
+
+	SuiCommand suscribeCancelCommand(SuiCommand::SCT_subscribeToEvent, std::string());
+	suscribeCancelCommand.initSubscribeToEvent(SuiEventType::SET_onClosedCancel, callbackFunction);
+
+	getPageData().addCommand(suscribeOkCommand);
+	getPageData().addCommand(suscribeCancelCommand);
+}
+
+//----------------------------------------------------------------------
+
+void ServerUIPage::setAssociatedObjectId (const NetworkId & id)
+{
+	getPageData().setAssociatedObjectIdWithMaxRange(id, getPageData().getMaxRangeFromObject());
+}
+
+//----------------------------------------------------------------------
+
+void  ServerUIPage::setAssociatedLocation (const Vector & location)
+{
+	getPageData().setAssociatedLocationWithMaxRange(location, getPageData().getMaxRangeFromObject());
+}
+
+//----------------------------------------------------------------------
+
+void ServerUIPage::setMaxRangeFromObject (float range)
+{
+	getPageData().setAssociatedObjectIdWithMaxRange(getPageData().getAssociatedObjectId(), range);
+}
+
+//----------------------------------------------------------------------
+
+SuiPageData const & ServerUIPage::getPageData() const
+{
+	return getPageDataServer().getPageData();
+}
+
+//----------------------------------------------------------------------
+
+SuiPageData & ServerUIPage::getPageData()
+{
+	return getPageDataServer().getPageData();
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverGame/src/shared/core/ServerUIPage.h b/engine/server/library/serverGame/src/shared/core/ServerUIPage.h
new file mode 100644
index 00000000..abb5dfea
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerUIPage.h
@@ -0,0 +1,76 @@
+//-----------------------------------------------------------------------
+// ServerUIPage.h
+// copyright 2001 Verant Interactive
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/ServerUserInterfaceMessages.h"
+
+//-----------------------------------------------------------------------
+
+class Client;
+class ServerObject;
+template <typename T> class Watcher;
+class SuiPageData;
+class SuiPageDataServer;
+class Vector;
+
+//-----------------------------------------------------------------------
+
+class ServerUIPage
+{
+public:
+	ServerUIPage(const std::string& pageName, ServerObject const & owner, NetworkId const & primaryControlledObject, int pageId);
+	ServerUIPage(NetworkId const & primaryControlledObject, SuiPageDataServer *pageDataServer);
+	~ServerUIPage();
+
+	void                     addChildWidget        (const std::string& widgetType, const std::string& widgetName,   const std::string& parentWidgetName);
+	void                     setProperty           (const std::string& widgetName, const std::string& propertyName, const Unicode::String& propertyValue);
+	void                     addDataItem           (const std::string& dataSource, const std::string& dataItemName, const Unicode::String& dataItemValue);
+	void                     addDataSourceContainer(const std::string& dataSourceContainer, const std::string& dataSourceContainerName, const Unicode::String& dataSourceContainerValue);
+	void                     addDataSource		   (const std::string& dataSource, const std::string& dataSourceName, const Unicode::String& dataSourceValue);
+	void                     subscribeToProperty   (std::string const & widget, std::string const & propertyName);
+	void                     clearDataSource       (const std::string& dataSource);
+	void                     clearDataSourceContainer(const std::string& dataSource);
+	void                     setCallback           (const std::string& callbackFunction);
+	NetworkId const &        getPrimaryControlledObject () const;
+	Client*                  getClient             () const;
+	ServerObject*            getOwner              () const;
+	const SuiCreatePage&     getCreationMessage    () const;
+	const SuiForceClosePage& getForceCloseMessage  () const;
+
+	void                     setAssociatedObjectId (const NetworkId & id);
+	void                     setAssociatedLocation (const Vector & location);
+	void                     setMaxRangeFromObject (float range);
+
+	SuiPageData const & getPageData() const;
+	SuiPageData & getPageData();
+	SuiPageDataServer const & getPageDataServer() const;
+	SuiPageDataServer & getPageDataServer();
+
+private:
+	//disabled
+	ServerUIPage();
+	ServerUIPage(const ServerUIPage&);
+	ServerUIPage &operator=(const ServerUIPage&);
+
+private:
+	NetworkId              m_primaryControlledObject;
+	SuiPageDataServer *    m_pageDataServer;
+};
+
+//----------------------------------------------------------------------
+
+inline SuiPageDataServer const & ServerUIPage::getPageDataServer() const
+{
+	return *NON_NULL(m_pageDataServer);
+}
+
+//----------------------------------------------------------------------
+
+inline SuiPageDataServer & ServerUIPage::getPageDataServer()
+{
+	return *NON_NULL(m_pageDataServer);
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverGame/src/shared/core/ServerUniverse.cpp b/engine/server/library/serverGame/src/shared/core/ServerUniverse.cpp
new file mode 100644
index 00000000..b938fc47
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerUniverse.cpp
@@ -0,0 +1,1224 @@
+// ======================================================================
+//
+// ServerUniverse.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerUniverse.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/AttribModNameManager.h"
+#include "serverGame/CityObject.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/GuildObject.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/ResourcePoolObject.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerResourceClassObject.h"
+#include "serverGame/ServerWorld.h"
+#include "serverNetworkMessages/AddResourceTypeMessage.h"
+#include "serverNetworkMessages/CreateGroupMessage.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/PopulationList.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedObject/ObjectTemplateList.h"
+
+#include <list>
+#include <map>
+
+// ======================================================================
+
+namespace ServerUniverseNamespace
+{
+	const Tag TAG_PLTS = TAG (P,L,T,S);
+	const Tag TAG_PLNT = TAG (P,L,N,T);
+
+	std::string s_emptyString = "";
+}
+
+using namespace ServerUniverseNamespace;
+
+// ======================================================================
+
+void ServerUniverse::install()
+{
+	if (!ConfigServerGame::getDisableResources())
+		ResourceClassObject::loadTreeFromIff();
+}
+
+// ----------------------------------------------------------------------
+
+ServerUniverse::ServerUniverse() :
+		Universe                 (),
+		m_universeObjectList     (new UniverseObjectList),
+		m_pendingUniverseObjects (new UniverseObjectList),
+		m_loaded                 (false),
+		m_authoritative          (false),
+		m_universeProcess        (0),
+		m_nextCheckTimer         (static_cast<float>(ConfigServerGame::getUniverseCheckFrequencySeconds())),
+		m_doImmediateCheck       (false),
+		m_thisPlanet             (NULL),
+		m_tatooinePlanet         (NULL),
+		m_planetNameMap          (new PlanetNameMap),
+		m_resourceTypeNameMap    (new ResourceTypeNameMap),
+		m_resourceTypeIdMap      (new ResourceTypeIdMap),
+		m_importedResourceTypeIdMap(new ResourceTypeIdMap),
+		m_resourcesToSend        (new ResourcesToSendType),
+		m_masterGuildObject      (NULL),
+		m_masterCityObject       (NULL),
+		m_theaterNameIdMap       (new TheaterNameIdMap),
+		m_theaterIdNameMap       (new TheaterIdNameMap),
+		m_populationList         (new PopulationList),
+		m_pendingProxyRequests   (),
+		m_pendingUniverseLoadedAckList(),
+		m_timeUniverseDataSent   (0)
+{
+}
+
+// ----------------------------------------------------------------------
+
+ServerUniverse::~ServerUniverse()
+{
+	for (UniverseObjectList::const_iterator j=m_universeObjectList->begin(); j!=m_universeObjectList->end(); ++j)
+		delete *j;
+	
+	delete m_pendingUniverseObjects;
+	delete m_planetNameMap;
+	delete m_resourceTypeNameMap;
+	delete m_resourceTypeIdMap;
+	delete m_importedResourceTypeIdMap;
+	delete m_resourcesToSend;
+	delete m_universeObjectList;
+	delete m_populationList;
+	delete m_theaterNameIdMap;
+	delete m_theaterIdNameMap;
+
+	m_pendingUniverseObjects =0;
+	m_planetNameMap=0;
+	m_resourceTreeRoot=0;
+	m_resourceTypeNameMap=0;
+	m_resourceTypeIdMap=0;
+	m_importedResourceTypeIdMap=0;
+	m_resourcesToSend=0;
+	m_universeObjectList = 0;
+	m_populationList = 0;
+	m_thisPlanet = 0;
+	m_tatooinePlanet = 0;
+	m_masterGuildObject = 0;
+	m_masterCityObject = 0;
+	m_theaterNameIdMap = 0;
+	m_theaterIdNameMap = 0;
+}
+
+// ----------------------------------------------------------------------
+
+PlanetObject *ServerUniverse::getPlanetByName(const std::string &sceneId) const
+{
+	PlanetNameMap::iterator i=m_planetNameMap->find(sceneId);
+	if (i!=m_planetNameMap->end())
+	{
+		return (*i).second;
+	}
+	else
+	{
+		if (!m_loaded)
+			WARNING(true,("getPlanetByName() was called for (%s), but there is no such PlanetObject. m_loaded=(%s), m_authoritative=(%s), m_universeProcess=(%lu), m_thisPlanet=(%p), m_tatooinePlanet=(%p), m_masterGuildObject=(%p), m_masterCityObject=(%p), m_planetNameMap->size()=(%d), m_universeObjectList->size()=(%d), m_pendingUniverseObjects->size()=(%d), m_resourceTypeNameMap->size()=(%d), NameManager::getTotalPlayerCount()=(%d)", sceneId.c_str(), (m_loaded ? "true" : "false"), (m_authoritative ? "true" : "false"), m_universeProcess, m_thisPlanet, m_tatooinePlanet, m_masterGuildObject, m_masterCityObject, m_planetNameMap->size(), m_universeObjectList->size(), m_pendingUniverseObjects->size(), m_resourceTypeNameMap->size(), NameManager::getInstance().getTotalPlayerCount()));
+
+		return 0;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+ResourceTypeObject *ServerUniverse::getResourceTypeByName(std::string const & name) const
+{
+	ResourceTypeNameMap::iterator i=m_resourceTypeNameMap->find(name);
+	if (i!=m_resourceTypeNameMap->end())
+		return (*i).second;
+	else
+		return 0;
+}
+
+// ----------------------------------------------------------------------
+
+ResourceTypeObject * ServerUniverse::getResourceTypeById(NetworkId const & id) const
+{
+	if (id==NetworkId::cms_invalid)
+		return NULL;
+	
+	if (id.getValue() <= NetworkId::cms_maxNetworkIdWithoutClusterId)
+	{
+	ResourceTypeIdMap::const_iterator i=m_resourceTypeIdMap->find(id);
+	if (i!=m_resourceTypeIdMap->end())
+		return (*i).second;
+	else
+		return NULL;
+	}
+	else
+	{
+		ResourceTypeIdMap::const_iterator i=m_importedResourceTypeIdMap->find(id);
+		if (i!=m_importedResourceTypeIdMap->end())
+			return (*i).second;
+		else
+			return NULL;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+ResourceTypeObject * ServerUniverse::getImportedResourceTypeById(NetworkId const & id) const
+{
+	if (id==NetworkId::cms_invalid)
+		return NULL;
+
+	ResourceTypeIdMap::const_iterator i=m_importedResourceTypeIdMap->find(id);
+	if (i!=m_importedResourceTypeIdMap->end())
+		return (*i).second;
+	else
+		return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+/** 
+ * Registers a new PlanetObject.
+ * Puts the object into a map of name->planet, so that it can be found later.
+ */
+
+void ServerUniverse::registerPlanetObject (PlanetObject &newPlanet)
+{
+	(*m_planetNameMap)[newPlanet.getName()]=&newPlanet;
+	if (newPlanet.getName()==ServerWorld::getSceneId())
+		m_thisPlanet=&newPlanet;
+	if (newPlanet.getName()=="tatooine")
+		m_tatooinePlanet=&newPlanet;
+}
+
+// ----------------------------------------------------------------------
+
+/** 
+ * Registers a new ResourceTypeObject.
+ * Puts the object into a map of name->type, so that it can be found later.
+ */
+
+void ServerUniverse::registerResourceTypeObject (ResourceTypeObject &newType, bool newlySpawned)
+{
+	(*m_resourceTypeNameMap)[newType.getResourceName()]=&newType;
+
+	if (newType.getNetworkId().getValue() <= NetworkId::cms_maxNetworkIdWithoutClusterId)
+	(*m_resourceTypeIdMap)[newType.getNetworkId()]=&newType;
+	else
+		(*m_importedResourceTypeIdMap)[newType.getNetworkId()]=&newType;
+
+	if (newlySpawned)
+	{
+		DEBUG_FATAL(!isAuthoritative(),("Programmer bug:  ServerUniverse::registerResourceTypeObject(..., true) called on a server that was not authoritative for the universe."));
+		m_resourcesToSend->push_back(&newType);
+	} 
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Send updates to a resource class to all the other servers (name change / force depletion)
+ */
+void ServerUniverse::sendUpdatedTypeToAllServers(ResourceTypeObject &changedType)
+{
+	DEBUG_FATAL(!isAuthoritative(),("Programmer bug:  ServerUniverse::sendUpdatedTypeToAllServers() called on a server that was not authoritative for the universe."));
+	m_resourcesToSend->push_back(&changedType);
+} //lint !e1764 // Lint wants changedType to be const, but the push_back requires a non-const pointer
+
+// ----------------------------------------------------------------------
+
+/** 
+ * Registers a new Universe Object.  If we are authoritative for
+ * universe objects, also proxies the object on the other game servers
+ */
+void ServerUniverse::addUniverseObject(UniverseObject &newObject)
+{
+	if (m_loaded)
+	{
+		m_universeObjectList->push_back(new CachedNetworkId(newObject));
+		newObject.setupUniverse();
+
+		if (m_authoritative)
+		{
+			GameServer::getInstance().createProxyOnAllServers(&newObject);
+		}
+	}
+	else
+	{
+		m_pendingUniverseObjects->push_back(new CachedNetworkId(newObject));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Give a new server proxies of all of the universe objects.
+ */
+void ServerUniverse::createProxiesOnServer(std::vector<uint32> const & remoteProcesses)
+{
+	m_pendingUniverseLoadedAckList.clear();
+
+	if (m_loaded)
+	{
+		// Names are included with the universe objects
+		NameManager::getInstance().sendAllNamesToServer(remoteProcesses);
+		// So are attrib mod names
+		AttribModNameManager::getInstance().sendAllNamesToServer(remoteProcesses);
+		
+		{
+			for (std::vector<uint32>::const_iterator remoteProcessId=remoteProcesses.begin(); remoteProcessId!=remoteProcesses.end(); ++remoteProcessId)
+			{
+				for (UniverseObjectList::const_iterator i=m_universeObjectList->begin(); i!=m_universeObjectList->end(); ++i)
+				{
+					if ((*i)->getObject())
+						GameServer::getInstance().createRemoteProxy(*remoteProcessId, safe_cast<ServerObject*>((*i)->getObject()));
+					else
+						DEBUG_REPORT_LOG(true,("Not proxying Universe Object %s because it has been deleted.\n",(*i)->getValueString().c_str()));
+				}
+			}
+		}
+
+		ServerMessageForwarding::begin(remoteProcesses);
+
+		{
+			std::vector<AddResourceTypeMessageNamespace::ResourceTypeData> resourceTypeDataVector;
+			AddResourceTypeMessageNamespace::ResourceTypeData resourceTypeData;
+			resourceTypeDataVector.reserve(m_resourceTypeIdMap->size());
+			
+			for (ResourceTypeIdMap::const_iterator i=m_resourceTypeIdMap->begin(); i!=m_resourceTypeIdMap->end(); ++i)
+			{
+				NON_NULL(i->second)->getDataForMessage(resourceTypeData);
+				resourceTypeDataVector.push_back(resourceTypeData);
+			}
+
+			AddResourceTypeMessage const addResourceTypeMessage(resourceTypeDataVector);
+			ServerMessageForwarding::send(addResourceTypeMessage);
+		}
+		
+		GenericValueTypeMessage<uint32> const universeCompleteMessage("UniverseCompleteMessage", GameServer::getInstance().getProcessId());
+		ServerMessageForwarding::send(universeCompleteMessage);
+
+		ServerMessageForwarding::end();
+
+		if (!remoteProcesses.empty())
+		{
+			std::string serverListAsString;
+			char oneServer[10];
+			for (std::vector<uint32>::const_iterator i=remoteProcesses.begin(); i!=remoteProcesses.end(); ++i)
+			{
+				if (ConfigServerGame::getTimeoutToAckUniverseDataReceived() > 0)
+					IGNORE_RETURN(m_pendingUniverseLoadedAckList.insert(*i));
+
+				if (i!=remoteProcesses.begin())
+					serverListAsString+=", ";
+				snprintf(oneServer,sizeof(oneServer)-1,"%lu",*i);
+				oneServer[sizeof(oneServer)-1] = '\0';
+				serverListAsString+=oneServer;
+			}
+			LOG("UniverseLoading", ("Game Server %lu sent UniverseComplete to Game Servers %s.", GameServer::getInstance().getProcessId(), serverListAsString.c_str()));
+
+			if (ConfigServerGame::getTimeoutToAckUniverseDataReceived() > 0)
+				m_timeUniverseDataSent = ::time(NULL);
+		}
+	}
+	else
+	{
+		if (!remoteProcesses.empty())
+			IGNORE_RETURN(m_pendingProxyRequests.insert(remoteProcesses.begin(),remoteProcesses.end()));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::requestCreateProxiesOnServer(uint32 remoteProcess)
+{
+	IGNORE_RETURN(m_pendingProxyRequests.insert(remoteProcess));
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Set which process should manage the universe objects, changing authority
+ * if necessary.
+ */
+void ServerUniverse::setUniverseProcess(uint32 processId)
+{
+	m_universeProcess = processId;
+	
+	if (processId==GameServer::getInstance().getProcessId())
+	{
+		for (UniverseObjectList::iterator i=m_universeObjectList->begin(); i!=m_universeObjectList->end(); ++i)
+		{
+			ServerObject *obj=safe_cast<ServerObject*>((*i)->getObject());
+			if (obj)
+				obj->setAuthority();
+		}
+
+		m_authoritative=true;
+		updateAndValidateData();
+		m_nextCheckTimer.reset();
+
+		// let all universe objects know that we have gained authority for universe objects
+		for (UniverseObjectList::iterator j=m_universeObjectList->begin(); j!=m_universeObjectList->end(); ++j)
+		{
+			UniverseObject *obj=safe_cast<UniverseObject*>((*j)->getObject());
+			if (obj)
+				obj->onServerUniverseGainedAuthority();
+		}
+	}
+	else
+	{
+		for (UniverseObjectList::iterator i=m_universeObjectList->begin(); i!=m_universeObjectList->end(); ++i)
+		{
+			ServerObject *obj=safe_cast<ServerObject*>((*i)->getObject());
+			if (obj && obj->isAuthoritative())
+				obj->releaseAuthority(processId);
+		}
+
+		m_authoritative=false;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::registerMasterGuildObject(GuildObject &masterGuildObject)
+{
+	m_masterGuildObject = &masterGuildObject;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::registerMasterCityObject(CityObject &masterCityObject)
+{
+	m_masterCityObject = &masterCityObject;
+}
+
+// ----------------------------------------------------------------------
+
+/** 
+ * Create a PlanetObject for a planet that doesn't have one.
+ */
+PlanetObject *ServerUniverse::createPlanetObject(const std::string &planetName)
+{
+	WARNING_STRICT_FATAL(!m_authoritative,("Creating planet object on non-universe-authoritative server.\n"));
+	
+	DEBUG_REPORT_LOG(true,("Creating PlanetObject for %s\n",planetName.c_str()));
+	PlanetObject * newObject = dynamic_cast<PlanetObject *>(ServerWorld::createNewObject(ConfigServerGame::getPlanetObjectTemplate(), Transform::identity, 0, true));
+	DEBUG_FATAL(!newObject,("Attempted to create a PlanetObject, got something else.\n"));
+	
+	newObject->setPlanetName(planetName);
+	registerPlanetObject (*newObject);
+	newObject->addToWorld();
+
+	return newObject;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Called when we have proxies of all universe objects.
+ * Register the objects, set up relationships between them, etc.
+ */
+
+void ServerUniverse::universeComplete(uint32 sourceServer)
+{
+	// automatically set the universe process if it hasn't been set.  Don't change it if it has been set.  If it has already been set,
+	// it probably indicates a server crash happened, and we're receiving queued data from a server that Central thinks is already down.
+	// So we want to avoid changing m_universeProcess so as not to cause race conditions.
+	if (m_universeProcess==0)
+		m_universeProcess=sourceServer;
+	
+	LOG("UniverseLoading",("Game Server %lu got UniverseComplete message.",GameServer::getInstance().getProcessId()));
+
+	m_loaded=true;
+	{
+		for (UniverseObjectList::iterator i=m_pendingUniverseObjects->begin(); i!=m_pendingUniverseObjects->end(); ++i)
+		{
+			UniverseObject *obj=safe_cast<UniverseObject*>((*i)->getObject());
+			if (obj)
+			{
+				m_universeObjectList->push_back(*i);
+				obj->setupUniverse();
+			}
+			else
+			{
+				DEBUG_REPORT_LOG(true,("Pending Universe Object %s was deleted.\n",(*i)->getValueString().c_str()));
+				delete *i;
+				*i=0;
+			}
+		}
+	}
+
+	m_pendingUniverseObjects->clear();
+
+	// calculate the initial GCW percentile score from the depersisted GCW score data
+	if (m_masterGuildObject && m_tatooinePlanet && m_masterGuildObject->isAuthoritative() && m_tatooinePlanet->isAuthoritative())
+	{
+		m_masterGuildObject->depersistGcwImperialScorePercentile();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+* Called when another game server has received its UniverseCompleteMessage
+*/
+
+void ServerUniverse::universeLoadedAck(uint32 sourceProcess)
+{
+	LOG("UniverseLoading", ("Game Server %lu got GameServerUniverseLoadedMessage from Game Server %lu.", GameServer::getInstance().getProcessId(), sourceProcess));
+	IGNORE_RETURN(m_pendingUniverseLoadedAckList.erase(sourceProcess));
+}
+
+// ----------------------------------------------------------------------
+
+GuildObject *ServerUniverse::getMasterGuildObject()
+{
+	return m_masterGuildObject;
+}
+
+// ----------------------------------------------------------------------
+
+CityObject *ServerUniverse::getMasterCityObject()
+{
+	return m_masterCityObject;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Rename a resource type, if it is our map.
+ * If it is not in the map, do nothing.
+ */
+void ServerUniverse::renameResourceType (const std::string &oldname, const std::string &newname)
+{
+	ResourceTypeNameMap::iterator i=m_resourceTypeNameMap->find(oldname);
+	if (i!=m_resourceTypeNameMap->end())
+	{
+		ResourceTypeObject *theObj=(*i).second;
+		m_resourceTypeNameMap->erase(i);
+		(*m_resourceTypeNameMap)[newname]=theObj;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+std::string ServerUniverse::generateRandomResourceName(const std::string &nameTable) const
+{
+	std::string newName(Unicode::wideToNarrow(NameManager::getInstance().generateRandomName("name_resource",nameTable))); // name generator always builds ASCII names, although it returns a Unicode string
+	int failCount = 0;
+	UNREF(failCount); // because of Windows release build 
+	for(; getResourceTypeByName(newName) != NULL; newName = Unicode::wideToNarrow(NameManager::getInstance().generateRandomName("name_resource",nameTable))) // generate names until we find an unused one
+		DEBUG_FATAL(++failCount > 100,("Failed to generate an unused resource name in 100 tries.\n"));
+
+	return newName; 
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::resourceClassTreeLoaded(stdmap<int, ResourceClassObject*>::fwd &resourceClasses)
+{
+	ServerResourceClassObject::loadDistributionFromIff(resourceClasses);
+}
+
+// ----------------------------------------------------------------------
+
+ResourceClassObject * ServerUniverse::makeResourceClassObject()
+{
+	return new ServerResourceClassObject;
+}
+
+// ----------------------------------------------------------------------
+
+/** 
+ * Check the Universe Objects.  Spawn new objects as
+ * needed, update the amount remaining on all the resource pools, etc.
+ *
+ * May be time consuming, so this should not be called every frame.
+ */
+
+void ServerUniverse::updateAndValidateData()
+{
+	WARNING_STRICT_FATAL(!m_authoritative,("UpdateAndValidateData() should only be called on the process that is authoritative for UniverseObjects.\n"));
+
+	//-- create master guild object
+	if (!m_masterGuildObject)
+	{
+		FATAL(!ConfigServerGame::getAllowMasterObjectCreation(), ("Master guild object was not found!"));
+		ServerObjectTemplate const * const objTemplate = safe_cast<ServerObjectTemplate const *>(ObjectTemplateList::fetch("object/guild/guild.iff"));
+		m_masterGuildObject = safe_cast<GuildObject *>(ServerWorld::createNewObject(*objTemplate, Transform::identity, 0, true));
+		m_masterGuildObject->addToWorld();
+	}
+
+	//-- create master city object
+	if (!m_masterCityObject)
+	{
+		FATAL(!ConfigServerGame::getAllowMasterObjectCreation(), ("Master city object was not found!"));
+		ServerObjectTemplate const * const objTemplate = safe_cast<ServerObjectTemplate const *>(ObjectTemplateList::fetch("object/city/city.iff"));
+		m_masterCityObject = safe_cast<CityObject *>(ServerWorld::createNewObject(*objTemplate, Transform::identity, 0, true));
+		m_masterCityObject->addToWorld();
+	}
+
+	//-- create planet objects if they don't exist
+	{
+		//-- load planet table
+		Iff iff;
+		if (iff.open ("universe/planets.iff", true))
+		{
+			iff.enterForm (TAG_PLTS);
+
+				iff.enterForm (TAG_0000);
+
+					const int numberOfPlanets = iff.getNumberOfBlocksLeft ();
+					int i;
+					for (i = 0; i < numberOfPlanets; ++i)
+					{
+						iff.enterChunk (TAG_PLNT);
+
+							std::string planetName;
+							iff.read_string (planetName);
+
+							//-- create all planets
+							if (!getPlanetByName (planetName))
+							{
+								FATAL(!ConfigServerGame::getAllowMasterObjectCreation(), ("Planet object %s was not found!", planetName.c_str()));
+								IGNORE_RETURN (createPlanetObject (planetName));
+							}
+
+						iff.exitChunk (TAG_PLNT);
+					}
+
+				iff.exitForm (TAG_0000);
+
+			iff.exitForm (TAG_PLTS);
+		}
+		else
+			DEBUG_WARNING (true, ("universe/planets.iff not found"));
+	}
+	
+	//-- create this planet, in case it's not in the table
+	if (!m_thisPlanet)
+	{
+		FATAL(!ConfigServerGame::getAllowMasterObjectCreation(), ("Planet object %s was not found!", ServerWorld::getSceneId().c_str()));
+		DEBUG_WARNING(true,("Spawning planet %s, which was not listed in planets.iff", ServerWorld::getSceneId().c_str()));
+		IGNORE_RETURN(createPlanetObject(ServerWorld::getSceneId()));
+	}
+	
+	//Spawn resources
+	ServerResourceClassObject *root=safe_cast<ServerResourceClassObject*>(getResourceTreeRoot());
+	if (root)
+	{
+		root->checkRanges();
+		root->checkAttributeLimits();
+		root->spawnAsNeeded();
+	}
+
+	//trigger scripts
+	for (UniverseObjectList::iterator j = m_universeObjectList->begin(); j != m_universeObjectList->end(); ++j)
+	{ 
+		UniverseObject *obj=safe_cast<UniverseObject*>((*j)->getObject());
+		if (obj)
+		{
+			ScriptParams params;
+			IGNORE_RETURN(obj->getScriptObject()->trigAllScripts(Scripting::TRIG_UNIVERSE_COMPLETE, params));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Picks a random resource type that is not depleted on this planet.
+ * @parentResourceClassName The type must derive from this class
+ */
+ResourceTypeObject const * ServerUniverse::pickRandomNonDepletedResource(const std::string &parentResourceClassName) const
+{
+	ResourceClassObject *parentClass = getResourceClassByName(parentResourceClassName);
+	if (!parentClass)
+		return 0;
+	
+	std::vector<ResourceTypeObject const *> possibleTypes;
+	if (!getCurrentPlanet())
+		return 0;
+	getCurrentPlanet()->getAvailableResourceList(possibleTypes,*parentClass);
+	if (possibleTypes.size() == 0)
+		return 0;
+	int choice = Random::random(static_cast<int>(possibleTypes.size())-1);
+	return possibleTypes[static_cast<size_t>(choice)];
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::createGroup(GroupMemberParam const & leader, stdvector<GroupMemberParam>::fwd const & members)
+{
+	if (m_authoritative)
+		GroupObject::createGroup(leader, members);
+	else
+	{
+		// send to central to be forwarded to universe authoritative server
+		CreateGroupMessage const createMessage(leader, members);
+		GameServer::getInstance().sendToCentralServer(createMessage);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::onServerConnectionClosed(uint32 processId)
+{
+	IGNORE_RETURN(m_pendingUniverseLoadedAckList.erase(processId));
+	IGNORE_RETURN(m_pendingProxyRequests.erase(processId));
+
+	if (m_authoritative)
+	{
+		// remove proxies on the crashed server
+		for (UniverseObjectList::iterator i=m_universeObjectList->begin(); i!=m_universeObjectList->end(); ++i)
+		{
+			ServerObject *obj=safe_cast<ServerObject*>((*i)->getObject());
+			if (obj)
+				obj->removeServerFromProxyList(processId);
+		}		
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::updatePopulationList(const PopulationList &newData)
+{
+	m_populationList->update(newData);
+}
+
+// ----------------------------------------------------------------------
+
+int ServerUniverse::getPopulationAtLocation(const std::string &scene, int x, int z) const
+{
+	if (ConfigServerGame::getDebugAllAreasOverpopulated())
+		return ConfigServerGame::getMaxPopulationForNewbieTravel() * 2;
+	else
+		return (m_populationList->getNearestPopulation(scene, x, z));
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerUniverse::isUniverseLoaded() const
+{
+	return m_loaded;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Called once per frame.
+ * Increment a counter, and revalidate the data if it has expired.
+ */
+void ServerUniverse::update(float frameTime)
+{
+	if (!m_pendingUniverseLoadedAckList.empty())
+	{
+		time_t const nowTime = ::time(NULL);
+		int const secondsSinceUniverseDataSent = nowTime - m_timeUniverseDataSent;
+
+		// don't wait forever for ack from another game server
+		// that it has received the universe data
+		if (secondsSinceUniverseDataSent >= ConfigServerGame::getTimeoutToAckUniverseDataReceived())
+		{
+			std::string serverListAsString;
+			char oneServer[10];
+			for (PendingUniverseLoadedAckList::const_iterator i=m_pendingUniverseLoadedAckList.begin(); i!=m_pendingUniverseLoadedAckList.end(); ++i)
+			{
+				if (i!=m_pendingUniverseLoadedAckList.begin())
+					serverListAsString+=", ";
+				snprintf(oneServer,sizeof(oneServer)-1,"%lu",*i);
+				oneServer[sizeof(oneServer)-1] = '\0';
+				serverListAsString+=oneServer;
+			}
+
+			LOG("UniverseLoading", ("Game Server %lu hasn't received (and will stop waiting for) GameServerUniverseLoadedMessage in %d seconds from Game Servers %s.", GameServer::getInstance().getProcessId(), secondsSinceUniverseDataSent, serverListAsString.c_str()));
+			m_pendingUniverseLoadedAckList.clear();
+		}
+		else // periodically log which game servers we are waiting on for GameServerUniverseLoadedMessage
+		{
+			static int const logIntervalSeconds = 60;
+			static time_t lastLogTime = 0;
+
+			if ((lastLogTime != nowTime) && (secondsSinceUniverseDataSent >= logIntervalSeconds) && ((nowTime - lastLogTime) >= logIntervalSeconds))
+			{
+				std::string serverListAsString;
+				char oneServer[10];
+				for (PendingUniverseLoadedAckList::const_iterator i=m_pendingUniverseLoadedAckList.begin(); i!=m_pendingUniverseLoadedAckList.end(); ++i)
+				{
+					if (i!=m_pendingUniverseLoadedAckList.begin())
+						serverListAsString+=", ";
+					snprintf(oneServer,sizeof(oneServer)-1,"%lu",*i);
+					oneServer[sizeof(oneServer)-1] = '\0';
+					serverListAsString+=oneServer;
+				}
+
+				LOG("UniverseLoading", ("Game Server %lu hasn't received (and will keep waiting for) GameServerUniverseLoadedMessage in %d seconds from Game Servers %s.", GameServer::getInstance().getProcessId(), secondsSinceUniverseDataSent, serverListAsString.c_str()));
+				lastLogTime = nowTime;
+			}
+		}
+	}
+
+	// check to see if we need to send universe data to other game servers
+	if (m_authoritative && m_loaded && !m_pendingProxyRequests.empty() && m_pendingUniverseLoadedAckList.empty())
+	{
+		std::vector<uint32> servers;
+		PendingProxyRequestList::iterator iter;
+		int maxGameServerToSendUniverseData = ConfigServerGame::getMaxGameServerToSendUniverseData();
+		while ((maxGameServerToSendUniverseData > 0) && (!m_pendingProxyRequests.empty()))
+		{
+			iter = m_pendingProxyRequests.begin();
+			servers.push_back(*iter);
+			m_pendingProxyRequests.erase(iter);
+			--maxGameServerToSendUniverseData;
+		}
+
+		if (!servers.empty())
+			createProxiesOnServer(servers);
+	}
+
+	if (m_nextCheckTimer.updateZero(frameTime) || m_doImmediateCheck || !m_resourcesToSend->empty())
+	{
+		m_nextCheckTimer.reset();
+		m_doImmediateCheck = false;
+		
+		if (m_authoritative)
+		{
+			updateAndValidateData();
+
+			if (!m_resourcesToSend->empty())
+			{
+				std::vector<AddResourceTypeMessageNamespace::ResourceTypeData> resourceTypeDataVector;
+				AddResourceTypeMessageNamespace::ResourceTypeData resourceTypeData;
+				resourceTypeDataVector.reserve(m_resourcesToSend->size());
+				
+				for (ResourcesToSendType::const_iterator i=m_resourcesToSend->begin(); i!=m_resourcesToSend->end(); ++i)
+				{
+					NON_NULL(*i)->getDataForMessage(resourceTypeData);
+					resourceTypeDataVector.push_back(resourceTypeData);
+				}
+
+				ServerMessageForwarding::beginBroadcast();
+
+				AddResourceTypeMessage const addResourceTypeMessage(resourceTypeDataVector);
+				GameServer::getInstance().sendToDatabaseServer(addResourceTypeMessage);
+				ServerMessageForwarding::send(addResourceTypeMessage);
+
+				ServerMessageForwarding::end();
+			}
+
+			m_resourcesToSend->clear();
+		}
+	}
+
+	// request guild object to update its guild war kill tracking data, if necessary
+	if (m_masterGuildObject)
+		m_masterGuildObject->updateGuildWarKillTrackingData();
+
+	// update GCW tracking data
+	if (m_tatooinePlanet)
+		m_tatooinePlanet->updateGcwTrackingData();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::handleAddResourceTypeMessage(AddResourceTypeMessage const & message)
+{
+	FATAL(isAuthoritative(),("Programmer bug:  Received AddResourceTypeMessage on the authoritative server"));
+	typedef std::vector<AddResourceTypeMessageNamespace::ResourceTypeData> DataVectorType;
+	DataVectorType const & data = message.getData();
+
+	for (DataVectorType::const_iterator i=data.begin(); i!=data.end(); ++i)
+	{
+		ServerResourceClassObject * const parentClass = safe_cast<ServerResourceClassObject *>(getResourceClassByName(i->m_parentClass));
+		if (parentClass)
+		{
+			ResourceTypeObject * const existingType = getResourceTypeById(i->m_networkId);
+			if (!existingType)
+			{
+				ResourceTypeObject * const newType = new ResourceTypeObject(*i, *parentClass);
+				registerResourceTypeObject(*newType, false);
+				parentClass->addType(*newType);
+			} //lint !e429 // didn't delete newType (registerResourceTypeObject keeps a pointer to it)
+			else
+			{
+				// update to existing type, or possibly a duplicate message (if a type spawns the same frame another servers connects, the message may be sent twice)
+				existingType->handlePossibleUpdates(*i);
+			}
+		}
+		else
+			WARNING(true,("Got message to add resource %s, derived from class %s.  The class could not be found.", i->m_name.c_str(), i->m_parentClass.c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+const NetworkId & ServerUniverse::findTheaterId(const std::string & name)
+{
+	if (m_theaterNameIdMap == NULL)
+		return NetworkId::cms_invalid;
+
+	TheaterNameIdMap::const_iterator result = m_theaterNameIdMap->find(name);
+	if (result == m_theaterNameIdMap->end())
+		return NetworkId::cms_invalid;
+
+	return (*result).second;
+}
+
+// ----------------------------------------------------------------------
+
+const std::string & ServerUniverse::findTheaterName(const NetworkId & id)
+{
+static const std::string emptyString;
+
+	if (m_theaterIdNameMap == NULL)
+		return emptyString;
+
+	TheaterIdNameMap::const_iterator result = m_theaterIdNameMap->find(id);
+	if (result == m_theaterIdNameMap->end())
+		return emptyString;
+
+	return (*result).second;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerUniverse::setTheater(const std::string & name, const NetworkId & id)
+{
+	bool result = remoteSetTheater(name, id);
+	if (result)
+	{
+		// tell the other servers to set the theater
+
+		ServerMessageForwarding::beginBroadcast();
+
+		GenericValueTypeMessage<std::pair<std::string, NetworkId> > const setTheaterMessage("SetTheaterMessage", std::make_pair(name, id));
+		ServerMessageForwarding::send(setTheaterMessage);
+
+		ServerMessageForwarding::end();
+	}
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerUniverse::remoteSetTheater(const std::string & name, const NetworkId & id)
+{
+	const NetworkId & testTheater = findTheaterId(name);
+	if (testTheater != NetworkId::cms_invalid)
+	{
+		WARNING(true, ("ServerUniverse::remoteSetTheater tried to set theater name %s, id %s when the name is being used by %s",
+			name.c_str(), id.getValueString().c_str(), 
+			testTheater.getValueString().c_str()));
+		return false;
+	}
+
+	if (m_theaterNameIdMap != NULL)
+		m_theaterNameIdMap->insert(std::make_pair(name, id));
+	if (m_theaterIdNameMap != NULL)
+		m_theaterIdNameMap->insert(std::make_pair(id, name));
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::clearTheater(const std::string & name)
+{
+	remoteClearTheater(name);
+
+	// tell the other servers to clear the theater
+
+	ServerMessageForwarding::beginBroadcast();
+
+	GenericValueTypeMessage<std::string> const clearTheaterMessage("ClearTheaterMessage", name);
+	ServerMessageForwarding::send(clearTheaterMessage);
+
+	ServerMessageForwarding::end();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::remoteClearTheater(const std::string & name)
+{
+	const NetworkId & id = findTheaterId(name);
+
+	if (m_theaterNameIdMap != NULL)
+		m_theaterNameIdMap->erase(name);
+	if (m_theaterIdNameMap != NULL)
+		m_theaterIdNameMap->erase(id);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::adjustGcwImperialScore(std::string const & source, CreatureObject * sourceObject, std::string const & gcwCategory, int adjustment)
+{
+	if (m_tatooinePlanet)
+		m_tatooinePlanet->adjustGcwImperialScore(source, sourceObject, gcwCategory, static_cast<int64>(adjustment));
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::adjustGcwRebelScore(std::string const & source, CreatureObject * sourceObject, std::string const & gcwCategory, int adjustment)
+{
+	if (m_tatooinePlanet)
+		m_tatooinePlanet->adjustGcwRebelScore(source, sourceObject, gcwCategory, static_cast<int64>(adjustment));
+}
+
+// ----------------------------------------------------------------------
+// the rebel score is 100 - the imperial score
+int ServerUniverse::getGcwImperialScorePercentile(std::string const & gcwCategory) const
+{
+	if (m_masterGuildObject)
+		return m_masterGuildObject->getGcwImperialScorePercentile(gcwCategory);
+
+	return 50; // tie
+}
+
+// ----------------------------------------------------------------------
+// the rebel score is 100 - the imperial score
+int ServerUniverse::getGcwGroupImperialScorePercentile(std::string const & gcwGroup) const
+{
+	if (m_masterGuildObject)
+		return m_masterGuildObject->getGcwGroupImperialScorePercentile(gcwGroup);
+
+	return 50; // tie
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Force a resource to be depleted (used by console or god commands).
+ * Forwards a message to the authoritative server if necessary.
+ * @return false if the resource type does not exist.
+ */
+bool ServerUniverse::manualDepleteResource(NetworkId const & resourceToDeplete)
+{
+	ResourceTypeObject * const resType=getResourceTypeById(resourceToDeplete);
+	if (resType)
+	{
+		if (isAuthoritative())
+		{
+			resType->deplete();
+			ServerResourceClassObject *root=safe_cast<ServerResourceClassObject*>(getResourceTreeRoot());
+			if (root)
+				root->spawnAsNeeded();
+			m_doImmediateCheck=true;
+		}
+		else
+		{
+			ServerMessageForwarding::begin(getUniverseProcess());
+
+			GenericValueTypeMessage<NetworkId> const manualDepleteResourceMessage("ManualDepleteResourceMessage", resourceToDeplete);
+			ServerMessageForwarding::send(manualDepleteResourceMessage);
+
+			ServerMessageForwarding::end();
+		}
+		return true;
+	}
+	else
+		return false;
+}
+
+// ----------------------------------------------------------------------
+
+uint32 ServerUniverse::getUniverseProcess() const
+{
+	return m_universeProcess;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::setConnectedCharacterLfgData(const NetworkId & characterId, const LfgCharacterData & lfgCharacterData)
+{
+	PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	if (planetObject)
+		planetObject->setConnectedCharacterLfgData(characterId, lfgCharacterData);
+}
+
+// ----------------------------------------------------------------------
+
+std::map<NetworkId, LfgCharacterData> const & ServerUniverse::getConnectedCharacterLfgData()
+{
+	static std::map<NetworkId, LfgCharacterData> empty;
+
+	PlanetObject const * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	if (planetObject)
+		return planetObject->getConnectedCharacterLfgData();
+
+	return empty;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::setConnectedCharacterGroupData(const NetworkId & characterId, const NetworkId & groupId)
+{
+	PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	if (planetObject)
+		planetObject->setConnectedCharacterGroupData(characterId, groupId);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::setConnectedCharacterPlanetData(const NetworkId & characterId, const std::string & planetName)
+{
+	PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	if (planetObject)
+		planetObject->setConnectedCharacterPlanetData(characterId, planetName);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::setConnectedCharacterRegionData(const NetworkId & characterId, const std::string & regionName)
+{
+	PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	if (planetObject)
+		planetObject->setConnectedCharacterRegionData(characterId, regionName);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::setConnectedCharacterPlayerCityData(const NetworkId & characterId, const std::string & playerCityName)
+{
+	PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	if (planetObject)
+		planetObject->setConnectedCharacterPlayerCityData(characterId, playerCityName);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::setConnectedCharacterLevelData(const NetworkId & characterId, int16 level)
+{
+	PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	if (planetObject)
+		planetObject->setConnectedCharacterLevelData(characterId, level);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::setConnectedCharacterProfessionData(const NetworkId & characterId, LfgCharacterData::Profession profession)
+{
+	PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	if (planetObject)
+		planetObject->setConnectedCharacterProfessionData(characterId, profession);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::setConnectedCharacterSearchableByCtsSourceGalaxyData(const NetworkId & characterId, bool searchableByCtsSourceGalaxy)
+{
+	PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	if (planetObject)
+		planetObject->setConnectedCharacterSearchableByCtsSourceGalaxyData(characterId, searchableByCtsSourceGalaxy);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::setConnectedCharacterDisplayLocationInSearchResultsData(const NetworkId & characterId, bool displayLocationInSearchResults)
+{
+	PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	if (planetObject)
+		planetObject->setConnectedCharacterDisplayLocationInSearchResultsData(characterId, displayLocationInSearchResults);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::setConnectedCharacterAnonymousData(const NetworkId & characterId, bool anonymous)
+{
+	PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	if (planetObject)
+		planetObject->setConnectedCharacterAnonymousData(characterId, anonymous);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::setConnectedCharacterInterestsData(const NetworkId & characterId, BitArray const & interests)
+{
+	PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	if (planetObject)
+		planetObject->setConnectedCharacterInterestsData(characterId, interests);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::setConnectedCharacterBiographyData(const NetworkId & characterId, const Unicode::String & biography)
+{
+	PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	if (planetObject)
+		planetObject->setConnectedCharacterBiographyData(characterId, biography);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::removeConnectedCharacterBiographyData(const NetworkId & characterId)
+{
+	PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	if (planetObject)
+		planetObject->removeConnectedCharacterBiographyData(characterId);
+}
+
+// ----------------------------------------------------------------------
+
+std::map<NetworkId, Unicode::String> const & ServerUniverse::getConnectedCharacterBiographyData()
+{
+	static std::map<NetworkId, Unicode::String> empty;
+
+	PlanetObject const * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	if (planetObject)
+		return planetObject->getConnectedCharacterBiographyData();
+
+	return empty;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::removeConnectedCharacterData(const NetworkId & characterId)
+{
+	PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	if (planetObject)
+		planetObject->removeConnectedCharacterData(characterId);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::addUniverseEvent(std::string const & eventName)
+{
+	PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	
+	if (planetObject)
+		planetObject->addUniverseEvent(eventName);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerUniverse::removeUniverseEvent(std::string const & eventName)
+{
+	PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	
+	if (planetObject)
+		planetObject->removeUniverseEvent(eventName);
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & ServerUniverse::getCurrentEvents()
+{
+	PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+	
+	if (planetObject)
+		return planetObject->getCurrentEvents();
+	
+	return s_emptyString;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/ServerUniverse.h b/engine/server/library/serverGame/src/shared/core/ServerUniverse.h
new file mode 100644
index 00000000..65206e27
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerUniverse.h
@@ -0,0 +1,249 @@
+// ======================================================================
+//
+// ServerUniverse.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ServerUniverse_H
+#define INCLUDED_ServerUniverse_H
+
+#include "sharedFoundation/Timer.h"
+#include "sharedGame/LfgCharacterData.h"
+#include "sharedGame/Universe.h"
+#include "sharedObject/CachedNetworkId.h"
+#include <set>
+#include <vector>
+
+class AddResourceTypeMessage;
+class CityObject;
+class CreatureObject;
+class GuildObject;
+class GroupMemberParam;
+class PlanetObject;
+class PopulationList;
+class ResourceClassObject;
+class ResourcePoolObject;
+class ResourceTypeObject;
+class UniverseObject;
+
+// ======================================================================
+
+/**
+* Singleton that manages Universe objects and functions that are global
+* to the entire game universe.
+*/
+class ServerUniverse:public Universe
+{
+public:
+	static ServerUniverse &getInstance();
+	static void install();
+	
+public:
+	bool                 isAuthoritative                () const;
+	bool                 isUniverseLoaded               () const;
+	GuildObject *        getMasterGuildObject           ();
+	CityObject *         getMasterCityObject            ();
+	PlanetObject *       getPlanetByName                (const std::string &sceneId) const;
+	PlanetObject *       getCurrentPlanet               () const;
+	PlanetObject *       getTatooinePlanet              () const;
+	ResourceTypeObject * getResourceTypeByName          (std::string const & name) const;
+	ResourceTypeObject * getResourceTypeById            (NetworkId const & id) const;
+	ResourceTypeObject * getImportedResourceTypeById    (NetworkId const & id) const;
+	void                 renameResourceType             (const std::string &oldname, const std::string &newname);
+	int                  getNumNativeResourceTypes      () const;
+	int                  getNumImportedResourceTypes    () const;
+	PlanetObject *       createPlanetObject             (const std::string &planetName);
+	void                 addUniverseObject              (UniverseObject &newObject);
+	void                 requestCreateProxiesOnServer   (uint32 remoteProcess);
+	void                 setUniverseProcess             (uint32 processId);
+	uint32               getUniverseProcess             () const;
+	void                 universeComplete               (uint32 sourceProcess);
+	void                 universeLoadedAck              (uint32 sourceProcess);
+	void                 registerMasterGuildObject      (GuildObject &masterGuildObject);
+	void                 registerMasterCityObject       (CityObject &masterCityObject);
+	void                 registerPlanetObject           (PlanetObject &newPlanet);
+	void                 registerResourceTypeObject     (ResourceTypeObject &newType, bool newlySpawned);
+	void                 sendUpdatedTypeToAllServers    (ResourceTypeObject &changedType);
+	virtual void         resourceClassTreeLoaded        (stdmap<int, ResourceClassObject*>::fwd &resourceClasses);
+	std::string          generateRandomResourceName     (const std::string &nameTable) const;
+	ResourceTypeObject const * pickRandomNonDepletedResource  (const std::string &parentResourceClassName) const;
+//	int                  extractResourceFromRandomPool  (const std::string &parentResourceClassName, int amount, const Vector &pos);
+	virtual ResourceClassObject* makeResourceClassObject();
+	void                 createGroup                    (GroupMemberParam const & leader, stdvector<GroupMemberParam>::fwd const & members);
+	void                 onServerConnectionClosed       (uint32 processId);
+	void                 updatePopulationList           (const PopulationList &newData);
+	int                  getPopulationAtLocation        (const std::string &scene, int x, int z) const;
+	void                 update                         (float frameTime);
+	void                 handleAddResourceTypeMessage   (AddResourceTypeMessage const & message);
+	bool                 manualDepleteResource          (NetworkId const & resourceToDeplete);
+	
+	const NetworkId &    findTheaterId(const std::string & name);
+	const std::string &  findTheaterName(const NetworkId & id);
+	bool                 setTheater(const std::string & name, const NetworkId & id);
+	void                 clearTheater(const std::string & name);
+	bool                 remoteSetTheater(const std::string & name, const NetworkId & id);
+	void                 remoteClearTheater(const std::string & name);
+
+	void                 adjustGcwImperialScore(std::string const & source, CreatureObject * sourceObject, std::string const & gcwCategory, int adjustment);
+	void                 adjustGcwRebelScore(std::string const & source, CreatureObject * sourceObject, std::string const & gcwCategory, int adjustment);
+	int                  getGcwImperialScorePercentile(std::string const & gcwCategory) const; // the rebel score is 100 - the imperial score
+	int                  getGcwGroupImperialScorePercentile(std::string const & gcwGroup) const; // the rebel score is 100 - the imperial score
+
+	static void          setConnectedCharacterLfgData(const NetworkId & characterId, const LfgCharacterData & lfgCharacterData);
+	static stdmap<NetworkId, LfgCharacterData>::fwd const & getConnectedCharacterLfgData();
+
+	static void          setConnectedCharacterGroupData(const NetworkId & characterId, const NetworkId & groupId);
+
+	static void          setConnectedCharacterPlanetData(const NetworkId & characterId, const std::string & planetName);
+
+	static void          setConnectedCharacterRegionData(const NetworkId & characterId, const std::string & regionName);
+
+	static void          setConnectedCharacterPlayerCityData(const NetworkId & characterId, const std::string & playerCityName);
+
+	static void          setConnectedCharacterLevelData(const NetworkId & characterId, int16 level);
+
+	static void          setConnectedCharacterProfessionData(const NetworkId & characterId, LfgCharacterData::Profession profession);
+
+	static void          setConnectedCharacterSearchableByCtsSourceGalaxyData(const NetworkId & characterId, bool searchableByCtsSourceGalaxy);
+
+	static void          setConnectedCharacterDisplayLocationInSearchResultsData(const NetworkId & characterId, bool displayLocationInSearchResults);
+
+	static void          setConnectedCharacterAnonymousData(const NetworkId & characterId, bool anonymous);
+
+	static void          setConnectedCharacterInterestsData(const NetworkId & characterId, BitArray const & interests);
+
+	static void          setConnectedCharacterBiographyData(const NetworkId & characterId, const Unicode::String & biography);
+	static void          removeConnectedCharacterBiographyData(const NetworkId & characterId);
+	static stdmap<NetworkId, Unicode::String>::fwd const & getConnectedCharacterBiographyData();
+
+	static void          removeConnectedCharacterData(const NetworkId & characterId);
+
+	// Universe Wide Event Functions
+	static void          addUniverseEvent(std::string const & eventName);
+	static void          removeUniverseEvent(std::string const & eventName);
+	static std::string const & getCurrentEvents();
+
+protected:
+	virtual void updateAndValidateData ();
+
+protected:
+	ServerUniverse();
+	virtual ~ServerUniverse();
+
+private:
+	void                 createProxiesOnServer(std::vector<uint32> const & remoteProcesses);
+	
+private:
+	//TODO:  consistency about whether STL containers are pointers or not
+	typedef stdvector<CachedNetworkId*>::fwd             UniverseObjectList;
+	UniverseObjectList * m_universeObjectList;
+	UniverseObjectList * m_pendingUniverseObjects;
+	bool m_loaded;
+	bool m_authoritative;
+	uint32 m_universeProcess;
+	Timer m_nextCheckTimer;
+	bool m_doImmediateCheck;
+	
+	//
+	// Planet Objects
+	//
+	typedef stdmap<const std::string, PlanetObject*>::fwd PlanetNameMap;
+	
+	PlanetObject  *m_thisPlanet;
+	PlanetObject  *m_tatooinePlanet;
+	PlanetNameMap *m_planetNameMap;
+	
+	//
+	// Resource Type Objects
+	//
+	typedef stdmap<std::string, ResourceTypeObject*>::fwd       ResourceTypeNameMap;
+	typedef stdmap<NetworkId, ResourceTypeObject*>::fwd         ResourceTypeIdMap;
+	typedef stdvector<ResourceTypeObject*>::fwd                 ResourcesToSendType;
+	
+	ResourceTypeNameMap *m_resourceTypeNameMap;
+	ResourceTypeIdMap *m_resourceTypeIdMap;
+	ResourceTypeIdMap *m_importedResourceTypeIdMap;
+	ResourcesToSendType *m_resourcesToSend;
+	
+	GuildObject *m_masterGuildObject;
+	CityObject *m_masterCityObject;
+
+	//	 UniverseObjectList  *m_pendingObjects;
+	//	 bool m_loaded;
+
+	// Theater data
+	typedef stdmap<const std::string, const NetworkId>::fwd TheaterNameIdMap;
+	typedef stdmap<const NetworkId, const std::string>::fwd TheaterIdNameMap;
+
+	TheaterNameIdMap * m_theaterNameIdMap;
+	TheaterIdNameMap * m_theaterIdNameMap;
+
+	//
+	// Non-object data about the universe
+	//
+	PopulationList *m_populationList;
+
+private:
+	typedef std::set<uint32> PendingProxyRequestList;
+	PendingProxyRequestList m_pendingProxyRequests;
+
+	typedef std::set<uint32> PendingUniverseLoadedAckList;
+	PendingUniverseLoadedAckList m_pendingUniverseLoadedAckList;
+	
+	time_t m_timeUniverseDataSent;
+
+private:
+	ServerUniverse (ServerUniverse const &); //disable
+	ServerUniverse & operator= (ServerUniverse const &); //disable
+};
+
+// ======================================================================
+
+inline bool ServerUniverse::isAuthoritative() const
+{
+	return m_authoritative;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+* Returns the PlanetObject representing the planet this server runs.
+*/
+inline PlanetObject *ServerUniverse::getCurrentPlanet() const
+{
+	WARNING(!m_thisPlanet,("getCurrentPlanet() was called, but there is no PlanetObject."));
+	return m_thisPlanet;
+}
+
+// ----------------------------------------------------------------------
+
+inline PlanetObject *ServerUniverse::getTatooinePlanet() const
+{
+	return m_tatooinePlanet;
+}
+
+// ----------------------------------------------------------------------
+
+inline ServerUniverse &ServerUniverse::getInstance()
+{
+	return *(safe_cast<ServerUniverse*>(&Universe::getInstance()));
+}
+
+// ----------------------------------------------------------------------
+
+inline int ServerUniverse::getNumNativeResourceTypes() const
+{
+	return m_resourceTypeIdMap->size();
+}
+
+// ----------------------------------------------------------------------
+
+inline int ServerUniverse::getNumImportedResourceTypes() const
+{
+	return m_importedResourceTypeIdMap->size();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/ServerWorld.cpp b/engine/server/library/serverGame/src/shared/core/ServerWorld.cpp
new file mode 100644
index 00000000..a8d33802
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerWorld.cpp
@@ -0,0 +1,3607 @@
+// ServerWorld.cpp
+// copyright 2000 Verant Interactive
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerWorld.h"
+
+#include "SwgGameServer/CombatEngine.h"
+#include "serverGame/AiCombatPulseQueue.h"
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/AuthTransferTracker.h"
+#include "serverGame/CellObject.h"
+#include "serverGame/CollisionCallbacks.h"
+#include "serverGame/CombatTracker.h"
+#include "serverGame/ConfigServerGame.h" 
+#include "serverGame/ConnectionServerConnection.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/ContainmentMessageManager.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/DestroyMessageManager.h"
+#include "serverGame/DraftSchematicObject.h"
+#include "serverGame/FormManagerServer.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/GameServerMessageArchive.h"
+#include "serverGame/GuildInterface.h"
+#include "serverGame/LineOfSightCache.h"
+#include "serverGame/LogoutTracker.h"
+#include "serverGame/ManufactureSchematicObject.h"
+#include "serverGame/MissileManager.h"
+#include "serverGame/NamedObjectManager.h"
+#include "serverGame/NebulaManagerServer.h"
+#include "serverGame/ObserveTracker.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/PlayerSanityChecker.h"
+#include "serverGame/PositionUpdateTracker.h"
+#include "serverGame/ProjectileManager.h"
+#include "serverGame/Pvp.h"
+#include "serverGame/PvpUpdateObserver.h"
+#include "serverGame/Region3dMaster.h"
+#include "serverGame/RegionMaster.h"
+#include "serverGame/ResourcePoolObject.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerArmorTemplate.h"
+#include "serverGame/ServerAsteroidManager.h"
+#include "serverGame/ServerBattlefieldMarkerObjectTemplate.h"
+#include "serverGame/ServerBuildingObjectTemplate.h"
+#include "serverGame/ServerCellObjectTemplate.h"
+#include "serverGame/ServerCityObjectTemplate.h"
+#include "serverGame/ServerConstructionContractObjectTemplate.h"
+#include "serverGame/ServerCreatureObjectTemplate.h"
+#include "serverGame/ServerDraftSchematicObjectTemplate.h"
+#include "serverGame/ServerFactoryObjectTemplate.h"
+#include "serverGame/ServerGroupObjectTemplate.h"
+#include "serverGame/ServerGuildObjectTemplate.h"
+#include "serverGame/ServerHarvesterInstallationObjectTemplate.h"
+#include "serverGame/ServerInstallationObjectTemplate.h"
+#include "serverGame/ServerIntangibleObjectTemplate.h"
+#include "serverGame/ServerManufactureInstallationObjectTemplate.h"
+#include "serverGame/ServerManufactureSchematicObjectTemplate.h"
+#include "serverGame/ServerMissionObjectTemplate.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerObjectBaselinesManager.h"
+#include "serverGame/ServerObjectTemplate.h"
+#include "serverGame/ServerPlanetObjectTemplate.h"
+#include "serverGame/ServerPlayerQuestObjectTemplate.h"
+#include "serverGame/ServerPlayerObjectTemplate.h"
+#include "serverGame/ServerResourceClassObject.h"
+#include "serverGame/ServerResourceContainerObjectTemplate.h"
+#include "serverGame/ServerShipObjectTemplate.h"
+#include "serverGame/ServerStaticObjectTemplate.h"
+#include "serverGame/ServerTangibleObjectTemplate.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerVehicleObjectTemplate.h"
+#include "serverGame/ServerWeaponObjectTemplate.h"
+#include "serverGame/ServerWorldIntangibleNotification.h"
+#include "serverGame/ServerWorldTangibleNotification.h"
+#include "serverGame/ServerWorldTerrainObjectNotification.h"
+#include "serverGame/ServerWorldUniverseNotification.h"
+#include "serverGame/ServerXpManagerObjectTemplate.h"
+#include "serverGame/ShipAiEnemySearchManager.h"
+#include "serverGame/ShipClientUpdateTracker.h"
+#include "serverGame/ShipInternalDamageOverTimeManager.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/SpacePathManager.h"
+#include "serverGame/SpaceSquadManager.h"
+#include "serverGame/TeleportFixupHandler.h"
+#include "serverGame/TriggerVolume.h"
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "serverNetworkMessages/CreateNewObjectMessage.h"
+#include "serverNetworkMessages/GameConnectionServerMessages.h"
+#include "serverNetworkMessages/PlanetRemoveObject.h"
+#include "serverNetworkMessages/UpdateObjectOnPlanetMessage.h"
+#include "serverPathfinding/ServerPathfinding.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedCollision/SetupSharedCollision.h"
+#include "sharedDebug/DebugFlags.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFile/Iff.h"
+#include "sharedFoundation/Clock.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/Scheduler.h"
+#include "sharedFoundation/Timer.h"
+#include "sharedGame/SharedBattlefieldMarkerObjectTemplate.h"
+#include "sharedGame/SharedBuildingObjectTemplate.h"
+#include "sharedGame/SharedCellObjectTemplate.h"
+#include "sharedGame/SharedConstructionContractObjectTemplate.h"
+#include "sharedGame/SharedCreatureObjectTemplate.h"
+#include "sharedGame/SharedDraftSchematicObjectTemplate.h"
+#include "sharedGame/SharedFactoryObjectTemplate.h"
+#include "sharedGame/SharedGroupObjectTemplate.h"
+#include "sharedGame/SharedGuildObjectTemplate.h"
+#include "sharedGame/SharedInstallationObjectTemplate.h"
+#include "sharedGame/SharedIntangibleObjectTemplate.h"
+#include "sharedGame/SharedManufactureSchematicObjectTemplate.h"
+#include "sharedGame/SharedMissionObjectTemplate.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedGame/SharedPlayerQuestObjectTemplate.h"
+#include "sharedGame/SharedPlayerObjectTemplate.h"
+#include "sharedGame/SharedResourceContainerObjectTemplate.h"
+#include "sharedGame/SharedShipObjectTemplate.h"
+#include "sharedGame/SharedStaticObjectTemplate.h"
+#include "sharedGame/SharedTangibleObjectTemplate.h"
+#include "sharedGame/SharedTerrainSurfaceObjectTemplate.h"
+#include "sharedGame/SharedUniverseObjectTemplate.h"
+#include "sharedGame/SharedVehicleObjectTemplate.h"
+#include "sharedGame/SharedWeaponObjectTemplate.h"
+#include "sharedGame/ShipComponentDescriptor.h"
+#include "sharedMath/Rectangle2d.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedObject/AlterScheduler.h"
+#include "sharedObject/Appearance.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/ContainedByProperty.h"
+#include "sharedObject/LotManager.h"
+#include "sharedObject/NetworkController.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/PortallizedSphereTree.h"
+#include "sharedObject/SphereGrid.h"
+#include "sharedObject/PortalProperty.h"
+#include "sharedTerrain/TerrainObject.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/Location.h"
+#include "sharedUtility/SynchronizedWeatherGenerator.h"
+#include "unicodeArchive/UnicodeArchive.h"
+#include "sharedLog/Log.h"
+
+
+
+
+Object const *getContainingPobForObjectInWorld(Object const &object)
+{
+	Object const * const containingObject = ContainerInterface::getContainedByObject(object);
+	if (containingObject)
+	{
+		Object const * const portallizedObject = ContainerInterface::getTopmostContainer(*containingObject);
+		FATAL(!portallizedObject, ("no topmost container of container of object in world?"));
+		// Note: in the case of object being a creature riding a mount,
+		// portallizedObject is not actually portallized, but returning 0
+		// for the world cell is correct in that case so the result is
+		// still correct.
+		if (portallizedObject->getPortalProperty())
+			return portallizedObject;
+	}
+	return 0;
+}
+
+
+
+
+void compare_results_int( std::set<TriggerVolume *> &results, std::set<TriggerVolume *> results2, ServerObject* object )
+{
+	if ( results.empty() && results2.empty() )    // nothing to say........
+		return;
+
+	Vector v=object->getPosition_w();
+	const Object* p = getContainingPobForObjectInWorld(*object);
+
+	if ( results == results2 )
+	{
+		return;
+	}
+
+	LOG("SphereGrid", ("---- Results differ for object at (%f %f %f)  %p --------", v.x, v.y, v.z, p ));
+
+	std::set<TriggerVolume*>::iterator iter;
+
+	LOG("SphereGrid", ("=============== Tree Results %d =================",results.size()));
+	for ( iter = results.begin(); iter != results.end(); ++iter )
+	{
+		TriggerVolume* volume = *iter;
+		ServerObject const &volumeOwner = volume->getOwner();
+		if ( &volumeOwner == NULL )
+		{
+			LOG("SphereGrid", ("Ack null owner!"));
+		}
+		else
+		{
+			const Object* pob = getContainingPobForObjectInWorld(volume->getOwner());
+			Sphere const &localSphere = volumeOwner.getLocalSphere();
+			Sphere world(volumeOwner.getTransform_o2w().rotateTranslate_l2p(localSphere.getCenter()), volume->getRadius());
+			Vector c=world.getCenter();
+			LOG("SphereGrid",(" (%f %f %f) %f POB = %p  DIST=%f",c.x,c.y,c.z,world.getRadius(),pob, c.magnitudeBetween(v) ));
+		}
+
+	}
+	LOG("SphereGrid", ("------------------ Grid Results %d ------------------",results2.size()));
+	for ( iter = results2.begin(); iter != results2.end(); ++iter )
+	{
+		TriggerVolume* volume = *iter;
+		ServerObject const &volumeOwner = volume->getOwner();
+		if ( &volumeOwner == NULL )
+		{
+			LOG("SphereGrid", ("shit null owner."));
+		}
+		else
+		{
+			const Object* pob = getContainingPobForObjectInWorld(volume->getOwner());
+			Sphere const &localSphere = volumeOwner.getLocalSphere();
+			Sphere world(volumeOwner.getTransform_o2w().rotateTranslate_l2p(localSphere.getCenter()), volume->getRadius());   // o2p or o2w
+			Vector c=world.getCenter();
+			LOG("SphereGrid",(" (%f %f %f) %f POB = %p  DIST=%f",c.x,c.y,c.z,world.getRadius(),pob, c.magnitudeBetween(v) ));
+		}
+
+	}
+	DEBUG_FATAL(true,("FATAL: SphereGrid failed to match SphereTree result set."));
+}
+
+
+
+
+void compare_results( Capsule const &test, std::vector<TriggerVolume *> &results_in, std::set<TriggerVolume *> results2, ServerObject* object )
+{
+	size_t i;
+	std::set<TriggerVolume*> results;
+	for ( i = 0; i < results_in.size(); ++i )
+	{
+		TriggerVolume* volume = results_in[i];
+		ServerObject const &volumeOwner = volume->getOwner();
+		Sphere const &localSphere = volumeOwner.getLocalSphere();
+		Sphere world(volumeOwner.getTransform_o2w().rotateTranslate_l2p(localSphere.getCenter()), volume->getRadius());   // o2p or o2w
+
+		if ( test.intersectsSphere( world ) )
+		{
+			results.insert( results_in[ i ] );
+		}
+	}
+	compare_results_int( results, results2, object );
+}
+
+
+void compare_results( Vector const &center_w, float radius, std::vector<TriggerVolume *> &results_in, std::set<TriggerVolume *> results2, ServerObject* object )
+{
+	size_t i;
+	std::set<TriggerVolume*> results;
+	for ( i = 0; i < results_in.size(); ++i )
+	{
+		TriggerVolume* volume = results_in[i];
+		ServerObject const &volumeOwner = volume->getOwner();
+		Sphere const &localSphere = volumeOwner.getLocalSphere();
+		Sphere world(volumeOwner.getTransform_o2w().rotateTranslate_l2p(localSphere.getCenter()), volume->getRadius());   // o2p or o2w
+
+		Sphere test(center_w, radius);
+		if ( test.intersectsSphere( world ) )
+		{
+			results.insert( results_in[ i ] );
+		}
+	}
+	compare_results_int( results, results2, object );
+}
+
+
+
+
+// ======================================================================
+
+namespace ServerWorldNamespace
+{
+	std::vector<const TangibleObject *> s_loadBeaconEntries;
+	bool ms_logTriggerStats = false;
+	
+	std::vector<Object *>	  gs_pendingConcludeVector;
+	std::vector<std::pair<int, ServerObject *> >    gs_pendingConcludeOpsVector;
+	bool			   gs_pendingConcludeLock = false;
+
+	typedef std::pair<Vector, Vector> MovePositionPair;
+	typedef std::map<ServerObject*, MovePositionPair> MoveObjectMap;
+	typedef std::vector<MoveObjectMap *> MoveObjectList;
+
+	MoveObjectList s_moveObjectList;
+	bool	   s_moveObjectListLock = false;
+	bool	   s_moveObjectListValid = false;
+	bool	   s_preloadComplete = false;
+	std::vector<Watcher<ServerObject> > s_preloadCompleteTriggerObjects;
+
+	int	    s_numMoveLists = 0;
+
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+	bool isPlayerHouseHook(Object const * object);
+	void issueCollisionNearWarpWarning(Object const &object, Vector const &oldPosition_w, Vector const &newPosition_w, int segmentCount);
+	void issueCollisionFarWarpWarning(Object const &object, Vector const &oldPosition_w, Vector const &newPosition_w, int segmentCount);
+	void doPreloadCompleteTrigger(ServerObject &obj);
+	void updatePlanetServer();
+	void checkSpaceBattlefieldZone();
+
+	bool s_checkedForSpaceScene = false; // s_spaceScene can't be trusted unless this is true
+	bool s_spaceScene = false;
+	bool s_checkedSpaceBattlefieldZone = false;
+	bool s_isSpaceBattlefieldZone = false;
+	bool s_isSpaceBattlefieldZoneWithPvp = false;
+	char const * const s_spaceBattlefieldDataTableFilename = "datatables/space_zones/battlefield_zones.iff";
+	int s_planetServerUpdateIndex = 0;
+}
+
+using namespace ServerWorldNamespace;
+
+// ======================================================================
+// namespace ServerWorldNamespace
+// ======================================================================
+
+bool ServerWorldNamespace::isPlayerHouseHook(Object const *object)
+{
+	if (object && object->getPortalProperty())
+	{
+		ServerObject const * const serverObject = object->asServerObject();
+		if (   serverObject
+		    && (   serverObject->asShipObject()
+			|| serverObject->getObjVars().hasItem("player_structure")))
+			return true;
+	}
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorldNamespace::issueCollisionNearWarpWarning(Object const &object, Vector const &oldPosition_w, Vector const &newPosition_w, int segmentCount)
+{
+	ServerObject const *const serverObject = object.asServerObject();
+
+	//-- Only issue these for authoritative server objects.  Proxy server objects will hit this condition after an intra-planet teleport.
+	// @todo allow proxies to know about a teleport and inform CollisionWorld so that we can always report these.
+	WARNING(!serverObject || serverObject->isAuthoritative(), 
+		("CollisionWorld::update() had %d segments for object id=[%s], template=[%s], authority=[%s], game sever id=[%d], start position=[%.2f,%.2f,%.2f], end position=[%.2f,%.2f,%.2f], object probably should have warped but collision system is not warping it.",
+		segmentCount, 
+		object.getNetworkId().getValueString().c_str(), 
+		object.getObjectTemplateName(),
+		serverObject ? (serverObject->isAuthoritative() ? "authoritative" : "proxy") : "<not ServerObject-derived>",
+		static_cast<int>(GameServer::getInstance().getProcessId()),
+		oldPosition_w.x,
+		oldPosition_w.y,
+		oldPosition_w.z,
+		newPosition_w.x,
+		newPosition_w.y,
+		newPosition_w.z
+		));
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorldNamespace::issueCollisionFarWarpWarning(Object const &object, Vector const &oldPosition_w, Vector const &newPosition_w, int segmentCount)
+{
+	ServerObject const *const serverObject = object.asServerObject();
+
+	//-- Only issue these for authoritative server objects.  Proxy server objects will hit this condition after an intra-planet teleport.
+	// @todo allow proxies to know about a teleport and inform CollisionWorld so that we can always report these.
+	WARNING(!serverObject || serverObject->isAuthoritative(), 
+		("CollisionWorld::update() had %d segments for object id=[%s], template=[%s], authority=[%s], game sever id=[%d], start position=[%.2f,%.2f,%.2f], end position=[%.2f,%.2f,%.2f], collision system will consider this a warp and adjust accordingly.",
+		segmentCount, 
+		object.getNetworkId().getValueString().c_str(), 
+		object.getObjectTemplateName(),
+		serverObject ? (serverObject->isAuthoritative() ? "authoritative" : "proxy") : "<not ServerObject-derived>",
+		static_cast<int>(GameServer::getInstance().getProcessId()),
+		oldPosition_w.x,
+		oldPosition_w.y,
+		oldPosition_w.z,
+		newPosition_w.x,
+		newPosition_w.y,
+		newPosition_w.z
+		));
+}
+
+// ----------------------------------------------------------------------
+
+bool isRelevantToTriggerVolumes(Object const &object)
+{
+	return object.getObjectTemplate()->getId() == ServerCreatureObjectTemplate::ServerCreatureObjectTemplate_tag;
+}
+
+
+// ----------------------------------------------------------------------
+
+class PlayerShipFilter: public SpatialSubdivisionFilter<ServerObject *>
+{
+public:
+	PlayerShipFilter(ServerObject const *excludeObject) :
+		m_excludeObject(excludeObject)
+	{
+	}
+
+	bool operator() (ServerObject * const &object) const
+	{
+		return object != m_excludeObject && object->asShipObject() && object->asShipObject()->isPlayerShip();
+	}
+
+private:
+	ServerObject const *m_excludeObject;
+};
+
+class CreatureFilter: public SpatialSubdivisionFilter<ServerObject *>
+{
+public:
+	CreatureFilter() {}
+	bool operator() (ServerObject * const &object) const {
+		return (object->getObjectTemplate()->getId() == ServerCreatureObjectTemplate::ServerCreatureObjectTemplate_tag); }
+};
+
+class AuthoritativeNonPlayerCreatureFilter: public SpatialSubdivisionFilter<ServerObject *>
+{
+public:
+	AuthoritativeNonPlayerCreatureFilter() {}
+	bool operator() (ServerObject * const &object) const {
+		return (object->isAuthoritative() && object->asCreatureObject() != NULL && !object->isPlayerControlled()); }
+};
+
+class TriggerVolumeFilter: public SpatialSubdivisionFilter<ServerObject *>
+{
+public:
+	TriggerVolumeFilter() {}
+	bool operator() (ServerObject * const &object) const
+	{
+		return isRelevantToTriggerVolumes(*object);
+	}
+};
+
+class TriggerVolumeFilterWithIgnoredObject: public SpatialSubdivisionFilter<ServerObject *>
+{
+public:
+	TriggerVolumeFilterWithIgnoredObject(ServerObject const &ignoredObject) :
+		m_ignoredObject(ignoredObject)
+	{
+	}
+
+	bool operator()(ServerObject *const &object) const
+	{
+		return object != &m_ignoredObject && isRelevantToTriggerVolumes(*object);
+	}
+
+private:
+	TriggerVolumeFilterWithIgnoredObject(TriggerVolumeFilterWithIgnoredObject const &);
+	TriggerVolumeFilterWithIgnoredObject &operator=(TriggerVolumeFilterWithIgnoredObject const &);
+
+private:
+	ServerObject const &m_ignoredObject;
+};
+
+class ServerObjectSphereExtentAccessor: public PortallizedSphereTreeAccessor<ServerObject *, ServerObjectSphereExtentAccessor>
+{
+public:
+
+	static Sphere const getExtent(ServerObject const *object)
+	{
+		NOT_NULL(object);
+		Sphere const &localSphere = object->getLocalSphere();
+		return Sphere(object->getTransform_o2p().rotateTranslate_l2p(localSphere.getCenter()), localSphere.getRadius());
+	}
+
+	static Object const *getCurrentPob(ServerObject const *object)
+	{
+		return getContainingPobForObjectInWorld(*NON_NULL(object));
+	}
+
+};
+
+//-----------------------------------------------------------------------
+
+class TriggerVolumeSphereExtentAccessor: public PortallizedSphereTreeAccessor<TriggerVolume *, TriggerVolumeSphereExtentAccessor>
+{
+public:
+
+	static Sphere const getExtent(TriggerVolume const *volume)
+	{
+		NOT_NULL(volume);
+		ServerObject const &volumeOwner = volume->getOwner();
+		Sphere const &localSphere = volumeOwner.getLocalSphere();
+		return Sphere(volumeOwner.getTransform_o2p().rotateTranslate_l2p(localSphere.getCenter()), volume->getRadius());
+	}
+
+	static Object const *getCurrentPob(TriggerVolume const *t)
+	{
+		NOT_NULL(t);
+		return getContainingPobForObjectInWorld(t->getOwner());
+	}
+
+};
+
+//-----------------------------------------------------------------------
+
+class TriggerVolumeSphereExtentAccessor_Grid: public PortallizedSphereTreeAccessor<TriggerVolume *, TriggerVolumeSphereExtentAccessor_Grid>
+{
+public:
+
+	static Sphere const getExtent(TriggerVolume const *volume)
+	{
+		NOT_NULL(volume);
+		ServerObject const &volumeOwner = volume->getOwner();
+		Sphere const &localSphere = volumeOwner.getLocalSphere();
+		return Sphere(volumeOwner.getTransform_o2w().rotateTranslate_l2p(localSphere.getCenter()), volume->getRadius());
+	}
+
+	static Object const *getCurrentPob(TriggerVolume const *t)
+	{
+		NOT_NULL(t);
+		return getContainingPobForObjectInWorld(t->getOwner());
+	}
+
+};
+
+//----------------------------------------------------------------------
+
+bool			   ServerWorld::m_installed	= false;
+Timer *			ServerWorld::m_idleTimer	= 0;
+std::string *		  ServerWorld::m_sceneId	  = 0;
+SynchronizedWeatherGenerator * ServerWorld::m_weatherGenerator = 0;
+
+//-----------------------------------------------------------------------
+// sphere tree instance for the server world static class
+//
+// g_objectSphereTree has a one-to-one relationship between objects and their
+// sphere extents.
+//
+// g_triggerSphereTree has a many to one relationship between trigger volumes
+// and their owner objects. 
+PortallizedSphereTree<ServerObject *, ServerObjectSphereExtentAccessor> *g_objectSphereTree = 0;
+
+PortallizedSphereTree<TriggerVolume *, TriggerVolumeSphereExtentAccessor> *g_triggerSphereTree = 0;
+DoubleSphereGrid<TriggerVolume *, TriggerVolumeSphereExtentAccessor_Grid> *g_triggerSphereGrid = 0;
+
+
+
+
+// ----------------------------------------------------------------------
+
+void ServerWorld::addIntangibleObject(Object * object)
+{
+	World::addObject(object, static_cast<int>(WOL_Intangible));
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorld::removeIntangibleObject(Object * object)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::removeIntangibleObject");
+	IGNORE_RETURN( World::removeObject(object, static_cast<int>(WOL_Intangible)) );
+}
+
+//-----------------------------------------------------------------------
+
+void ServerWorld::addObjectToConcludeList(ServerObject * object)
+{
+	if(! gs_pendingConcludeLock)
+	{
+		if(object)
+		{
+			gs_pendingConcludeVector.push_back(object);
+		}
+	}
+	else
+	{
+		gs_pendingConcludeOpsVector.push_back(std::make_pair(0, object));
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ServerWorld::addTangibleObject(ServerObject * object)
+{
+	if(object)
+	{
+		DEBUG_FATAL(object->isBeingDestroyed(), ("Destroyed objects should no longer be added back to the world, they should have Object::scheduleForAlter() called on them."));
+		
+		DEBUG_FATAL(!object->getObjectType(), ("Attempt to add unknown object to world, aborting add, continuing to run (FIXME!)"));
+#ifdef _DEBUG
+		if (object->getPosition_w() == Vector::zero && (!dynamic_cast<UniverseObject*>(object)))
+		{
+			DEBUG_WARNING(true, ("Adding object to origin, probably an error.  server id=[%d], object id=[%s], object template name=[%s]",
+													 static_cast<int>(GameServer::getInstance().getProcessId()),
+													 object->getNetworkId().getValueString().c_str(),
+													 object->getObjectTemplateName()));
+		}
+#endif
+		if (object->getObjectType())
+		{
+			World::addObject(object, static_cast<int>(WOL_Tangible));
+
+			// place the object in the sphere tree
+			if (!object->asCellObject())
+			{
+				Sphere s = object->getSphereExtent();
+				float r = s.getRadius();
+				WARNING_STRICT_FATAL(r != r, ("Someone is adding object %s:%s to the world that has a sphere extent radius that is Not a Number!", object->getObjectTemplateName(), object->getNetworkId().getValueString().c_str()));
+			
+				if((r == r) && (s.getCenter() == s.getCenter())) // check for NaN in radius
+				{
+					//First put in object sphere tree
+					g_objectSphereTree->onObjectAdded(object);
+
+					//Now notify triggers.
+					if (isRelevantToTriggerVolumes(*object))
+					{
+						std::vector<TriggerVolume *> results;
+						std::set<TriggerVolume *> results2;
+
+						int system = ConfigServerGame::getTriggerVolumeSystem();  // 0 = old, 1 = compare, 2 = new
+
+						if ( system <= 1 )
+						{
+							PROFILER_AUTO_BLOCK_DEFINE("sphere_tree_find");
+							g_triggerSphereTree->findInRange(s.getCenter(), s.getRadius(), results);
+						}
+
+						if ( system >= 1 )
+						{
+							PROFILER_AUTO_BLOCK_DEFINE("sphere_grid_find");
+							g_triggerSphereGrid->findInRange(  s.getCenter(), s.getRadius(), results2);
+						}
+
+						if ( system == 1 )
+						{
+							compare_results( s.getCenter(), s.getRadius(), results,results2,object);
+						}
+						
+						// potential add to trigger volumes
+						if ( system != 2 )
+						{
+							for (std::vector<TriggerVolume *>::const_iterator i = results.begin(); i != results.end(); ++i)
+								(*i)->addObject(*object);
+						}
+						else if ( system == 2 )
+						{
+							for (std::set<TriggerVolume *>::const_iterator i = results2.begin(); i != results2.end(); ++i)
+								(*i)->addObject(*object);
+						}
+					}
+				}
+				else
+				{
+					WARNING(r != r, ("Radius is Not a Number!"));
+					WARNING(s.getCenter() != s.getCenter(), ("Sphere center is Not a Number!"));
+					DEBUG_FATAL(true, ("Bad sphere data when adding object to the world!"));
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorld::addUniverseObject(UniverseObject * object)
+{
+	NOT_NULL(object);
+	World::addObject(object, static_cast<int>(WOL_Intangible));
+	ServerUniverse::getInstance().addUniverseObject(*object);
+	object->onAddedToWorld();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorld::removeUniverseObject(UniverseObject * object)
+{
+	IGNORE_RETURN( World::removeObject(object, static_cast<int>(WOL_Intangible)) );
+}
+
+//-----------------------------------------------------------------------
+
+void ServerWorld::addObjectTriggerVolume(TriggerVolume * triggerVolume)
+{
+	int system = ConfigServerGame::getTriggerVolumeSystem();  // 0 = old, 1 = compare, 2 = new
+	if ( system <= 1 )
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("sphere_tree_add");
+		g_triggerSphereTree->onObjectAdded(triggerVolume);
+	}
+
+	if ( system >= 1 )
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("sphere_grid_add");
+		g_triggerSphereGrid->onObjectAdded(triggerVolume);
+	}
+
+	// query the object sphere tree for objects that will be added to 
+	// the trigger volume now that it has been added
+	std::vector<ServerObject *> results;
+	// This is filtered as appropriate for things which should be in trigger volumes
+	g_objectSphereTree->findInRange(triggerVolume->getOwner().getPosition_w(), triggerVolume->getRadius(), TriggerVolumeFilter(), results);
+	for (std::vector<ServerObject *>::iterator i = results.begin(); i != results.end(); ++i)
+		triggerVolume->addObject(**i);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a new authoritative object. The object will be added to the world
+ * when we have received a signal that it has been persisted. 
+ * NOTE: createNewObjectEnd must be called to complete the creation process.
+ *
+ * @param templateName    template to create the object from
+ * @param transform       where in the world the object should be placed
+ * @param cell	    cell the new object should be in
+ * @param persisted       flag to persist the object on creation
+ * @param hyperspace      whether the object should appear to hyperspace in on clients
+ *
+ * @return the new object
+ */
+ServerObject *ServerWorld::createNewObject(std::string const &templateName, Transform const &transform, ServerObject *cell, bool persisted, bool hyperspace)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("createNewObject1crc");
+
+	if (templateName.find('\\') != std::string::npos)
+	{
+		DEBUG_REPORT_LOG(true, ("Tried to pass a backslash into createNewObject for template name %s\n", templateName.c_str()));
+		return 0;
+	}
+
+	return createNewObject(Crc::calculate(templateName.c_str()), transform, cell, persisted, hyperspace);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a new authoritative object. The object will be added to the world
+ * when we have received a signal that it has been persisted. 
+ * NOTE: createNewObjectEnd must be called to complete the creation process.
+ *
+ * @param templateCrc     template to create the object from
+ * @param position	where in the world the object should be placed
+ * @param cell	    cell the new object should be in
+ * @param persisted       flag to persist the object on creation
+ * @param hyperspace      whether the object should appear to hyperspace in on clients
+ *
+ * @return the new object
+ */
+ServerObject *ServerWorld::createNewObject(uint32 templateCrc, Transform const &transform, ServerObject *cell, bool persisted, bool hyperspace)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("createNewObject1");
+
+	ServerObject * const newObject = createObjectFromTemplate(templateCrc, NetworkId::cms_invalid);
+	if (newObject)
+	{
+		newObject->setHyperspaceOnCreate(hyperspace);
+		return createNewObjectIntermediate(newObject, transform, cell, persisted);
+	}
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a new authoritative object. The object will be added to the world
+ * when we have received a signal that it has been persisted. 
+ * NOTE: createNewObjectEnd must be called to complete the creation process.
+ *
+ * @param objectTemplate  template to create the object from
+ * @param position	where in the world the object should be placed
+ * @param cell	    cell the new object should be in
+ * @param persisted       flag to persist the object on creation
+ * @param hyperspace      whether the object should appear to hyperspace in on clients
+ *
+ * @return the new object
+ */
+ServerObject *ServerWorld::createNewObject(ServerObjectTemplate const &objectTemplate, Transform const &transform, ServerObject *cell, bool persisted, bool hyperspace)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("createNewObject2");
+
+	ServerObject * const newObject = createObjectFromTemplate(objectTemplate, NetworkId::cms_invalid);
+	if (newObject)
+	{
+		newObject->setHyperspaceOnCreate(hyperspace);
+		return createNewObjectIntermediate(newObject, transform, cell, persisted);
+	}
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a new authoritative object in a container.
+ * NOTE: createNewObjectEnd must be called to complete the creation process.
+ *
+ * @param templateName    template to create the object from
+ * @param container       container to place the new object in
+ * @param persisted       flag to persist the object on creation
+ *
+ * @return the new object
+ */
+ServerObject *ServerWorld::createNewObject(std::string const &templateName, ServerObject &container, bool persisted, bool allowOverloaded)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("createNewObject3");
+
+	if (templateName.find('\\') != std::string::npos)
+	{
+		DEBUG_REPORT_LOG(true, ("Tried to pass a backslash into createNewObject for template name %s\n", templateName.c_str()));
+		return 0;
+	}
+	return createNewObject(Crc::calculate(templateName.c_str()), container, persisted, allowOverloaded);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a new authoritative object in a container.
+ * NOTE: createNewObjectEnd must be called to complete the creation process.
+ *
+ * @param templateCrc     template to create the object from
+ * @param container       container to place the new object in
+ * @param persisted       flag to persist the object on creation
+ *
+ * @return the new object
+ */
+ServerObject *ServerWorld::createNewObject(uint32 templateCrc, ServerObject &container, bool persisted, bool allowOverloaded)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("createNewObject3crc");
+
+	ServerObject * const newObject = createObjectFromTemplate(templateCrc, NetworkId::cms_invalid);
+	if (!newObject)
+		return 0;
+
+	return createNewObjectIntermediate(newObject, container, persisted, allowOverloaded);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a new authoritative object in a conatiner. 
+ * NOTE: createNewObjectEnd must be called to complete the creation process.
+ *
+ * @param objectTemplate  template to create the object from
+ * @param container       container to place the new object in
+ * @param persisted       flag to persist the object on creation
+ *
+ * @return the new object
+ */
+ServerObject *ServerWorld::createNewObject(ServerObjectTemplate const &objectTemplate, ServerObject &container, bool persisted, bool allowOverload)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("createNewObject4");
+
+	ServerObject * const newObject = createObjectFromTemplate(objectTemplate, NetworkId::cms_invalid);
+	if (!newObject)
+		return 0;
+	
+	return createNewObjectIntermediate(newObject, container, persisted, allowOverload);
+}
+
+//-----------------------------------------------------------------------
+
+ServerObject *ServerWorld::createNewObject(ServerObjectTemplate const &objectTemplate, ServerObject &container, SlotId const &slotId, bool persisted)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("createNewObject5");
+
+	ServerObject * const newObject = createObjectFromTemplate(objectTemplate, NetworkId::cms_invalid);
+	if (!newObject)
+		return 0;
+	
+	return createNewObjectIntermediate(newObject, container, slotId, persisted);
+}
+
+//-----------------------------------------------------------------------
+
+ServerObject *ServerWorld::createNewObject(std::string const &templateName, ServerObject &container, SlotId const &slotId, bool persisted)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("createNewObject6");
+
+	if (templateName.find('\\') != std::string::npos)
+	{
+		DEBUG_REPORT_LOG(true, ("Tried to pass a backslash into createNewObject for template name %s\n", templateName.c_str()));
+		return 0;
+	}
+	return createNewObject(Crc::calculate(templateName.c_str()), container, slotId, persisted);
+}
+
+//-----------------------------------------------------------------------
+
+ServerObject *ServerWorld::createNewObject(uint32 templateCrc, ServerObject &container, SlotId const &slotId, bool persisted)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("createNewObject6crc");
+
+	ServerObject * const newObject = createObjectFromTemplate(templateCrc, NetworkId::cms_invalid);
+    if (!newObject)
+	return 0;
+
+	return createNewObjectIntermediate(newObject, container, slotId, persisted);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a new temporary manufacturing schematic for use in crafting. It would
+ * be nice if we could pull this out of ServerWorld, but there's too much important
+ * functionality in createNewObjectIntermediate to duplicate that function.
+ *
+ * @param creator		the player creating the schematic
+ * @param container		container to place the new object in
+ * @param slotId		slot to place the new object in
+ * @param persisted		flag to persist the schematic on creation
+ *
+ * @return the newly created schematic
+ */
+ManufactureSchematicObject* ServerWorld::createNewManufacturingSchematic (
+	const CachedNetworkId & creator, ServerObject & container, const SlotId & slotId, 
+	bool persisted)
+{
+	CreatureObject * const creature = dynamic_cast<CreatureObject *>(creator.getObject());
+	if (creature == NULL)
+		return NULL;
+	
+	PlayerObject * player = PlayerCreatureController::getPlayerObject(creature);
+	if (player == NULL)
+		return NULL;
+
+	const DraftSchematicObject * const draftSchematic = player->getCurrentDraftSchematic();
+	if (draftSchematic == NULL)
+		return NULL;
+
+	ManufactureSchematicObject * const manfSchematic = draftSchematic->createManufactureSchematic(creator);
+	if (manfSchematic == NULL)
+		return NULL;
+
+	if (createNewObjectIntermediate(manfSchematic, container, slotId, 
+		persisted) == NULL)
+	{
+		delete manfSchematic;
+		return NULL;
+	}
+
+	return manfSchematic;
+}	// ServerWorld::createNewManufacturingSchematic
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a new temporary manufacturing schematic for use in crafting. It would
+ * be nice if we could pull this out of ServerWorld, but there's too much important
+ * functionality in createNewObjectIntermediate to duplicate that function.
+ *
+ * @param source		the draft schematic the manf schematic is created from
+ * @param position		where to create the schematic
+ * @param persisted		flag to persist the schematic on creation
+ *
+ * @return the newly created schematic
+ */
+ManufactureSchematicObject* ServerWorld::createNewManufacturingSchematic (
+	const DraftSchematicObject & source, const Vector & position, bool persisted)
+{
+	ManufactureSchematicObject * const manfSchematic = 
+		source.createManufactureSchematic(CachedNetworkId::cms_cachedInvalid);
+	if (manfSchematic == NULL)
+		return NULL;
+
+	Transform transform;
+	transform.setPosition_p(position);
+	if (createNewObjectIntermediate(manfSchematic, transform, 0, persisted) == NULL)
+	{
+		delete manfSchematic;
+		return NULL;
+	}
+
+	return manfSchematic;
+}	// ServerWorld::createNewManufacturingSchematic
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a new temporary manufacturing schematic for use in crafting. It would
+ * be nice if we could pull this out of ServerWorld, but there's too much important
+ * functionality in createNewObjectIntermediate to duplicate that function.
+ *
+ * @param source		the draft schematic the manf schematic is created from
+ * @param container		container to create the schematic in
+ * @param persisted		flag to persist the schematic on creation
+ *
+ * @return the newly created schematic
+ */
+ManufactureSchematicObject* ServerWorld::createNewManufacturingSchematic (
+	const DraftSchematicObject & source, ServerObject & container, bool persisted)
+{
+	ManufactureSchematicObject * const manfSchematic = 
+		source.createManufactureSchematic(CachedNetworkId::cms_cachedInvalid);
+	if (manfSchematic == NULL)
+		return NULL;
+
+	if (createNewObjectIntermediate(manfSchematic, container, persisted, false) == NULL)
+		return NULL;
+	return manfSchematic;
+}	// ServerWorld::createNewManufacturingSchematic
+
+//-----------------------------------------------------------------------
+
+/**
+ * Called by the two above createNewObjectStart functions.  Done to provide a 
+ * function for common code.
+ *
+ * @param newObject			the new object being created
+ * @param position			where in the world the object should be placed
+ * @param cell				cell the new object should be in
+ * @param persisted			flag to persist the object on creation
+ *
+ * @return the new object
+ */
+ServerObject* ServerWorld::createNewObjectIntermediate(ServerObject *newObject, Transform const &transform, ServerObject *cell, bool persisted)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("createNewObjectIntermediate1");
+
+	if (newObject->getNetworkId() == NetworkId::cms_invalid)
+	{
+		WARNING_STRICT_FATAL(true, ("Tried to create an object with network id 0."));
+		return NULL;
+	}
+	
+	NetworkController *objectController = dynamic_cast<NetworkController *>(newObject->getController());
+	if (objectController == NULL)
+		objectController = dynamic_cast<NetworkController *>(newObject->createDefaultController());
+	NOT_NULL(objectController);
+
+	// initialize the object
+	newObject->setAuthority();
+
+	if (!newObject->serverObjectInitializeFirstTimeObject(cell, transform))
+	{
+		delete newObject;
+		return NULL;
+	}
+
+	// prevent initial object data from being re-sent as deltas
+	newObject->clearDeltas();
+
+	const ServerObjectTemplate * objectTemplate = safe_cast<const ServerObjectTemplate *>(newObject->getObjectTemplate());
+
+	if (persisted || objectTemplate->getPersistByDefault())
+	{
+		newObject->persist();
+	}
+	
+	return newObject;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Called by the two above createNewObjectStart in container functions. Done to 
+ * provide a function for common code.
+ *
+ * @param newObject			the new object being created
+ * @param container			container to place the new object in
+ * @param persisted			flag to persist the object on creation
+ *
+ * @return the new object
+ */
+ServerObject* ServerWorld::createNewObjectIntermediate(ServerObject* newObject, ServerObject & container, bool persisted, bool allowOverload)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("createNewObjectIntermediate2");
+
+	if (newObject->getNetworkId() == NetworkId::cms_invalid)
+	{
+		WARNING_STRICT_FATAL(true, ("Tried to create an object with network id 0."));
+		return NULL;
+	}
+	
+	NetworkController *objectController = dynamic_cast<NetworkController *>(newObject->getController());
+	if (objectController == NULL)
+		objectController = dynamic_cast<NetworkController *>(newObject->createDefaultController());
+	NOT_NULL(objectController);
+
+	// initialize the object
+	newObject->setAuthority();
+
+	IGNORE_RETURN(newObject->serverObjectInitializeFirstTimeObject(0, Transform::identity));
+
+	// prevent initial object data from being re-sent as deltas
+	newObject->clearDeltas();
+	Container::ContainerErrorCode tmp = Container::CEC_Success;		
+	if (!ContainerInterface::transferItemToGeneralContainer(container, *newObject, NULL, tmp, allowOverload))
+	{
+		IGNORE_RETURN(newObject->permanentlyDestroy(DeleteReasons::BadContainerTransfer));
+		newObject = NULL;
+	}
+	else
+	{
+		const ServerObjectTemplate * objectTemplate = safe_cast<
+			const ServerObjectTemplate *>(newObject->getObjectTemplate());
+
+		if (persisted || objectTemplate->getPersistByDefault())
+		{
+			newObject->persist();
+		}
+	}
+
+	return newObject;
+}
+
+//-----------------------------------------------------------------------
+
+ServerObject* ServerWorld::createNewObjectIntermediate(ServerObject* newObject, ServerObject & container, const SlotId & slotId, bool persisted)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("createNewObjectIntermediate3");
+
+	if (newObject->getNetworkId() == NetworkId::cms_invalid)
+	{
+		WARNING_STRICT_FATAL(true, ("Tried to create an object with network id 0."));
+		return NULL;
+	}
+
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("createNewObjectIntermedate,getController");
+		NetworkController *objectController = dynamic_cast<NetworkController *>(newObject->getController());
+		if (objectController == NULL)
+			objectController = dynamic_cast<NetworkController *>(newObject->createDefaultController());
+		NOT_NULL(objectController);
+	}
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("createNewObjectIntermediate.setAuthority");
+		newObject->setAuthority();
+	}
+
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("initializeFirstTimeObject");
+		IGNORE_RETURN(newObject->serverObjectInitializeFirstTimeObject(0, Transform::identity));
+	}
+
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("clearDeltas");
+		// prevent initial object data from being re-sent as deltas
+		newObject->clearDeltas();
+	}
+
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("transferItem");
+		Container::ContainerErrorCode tmp = Container::CEC_Success;
+		if (!ContainerInterface::transferItemToSlottedContainer(container, *newObject, slotId, NULL, tmp))
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("failedTransfer");
+			IGNORE_RETURN(newObject->permanentlyDestroy(DeleteReasons::BadContainerTransfer));
+			newObject = NULL;
+		}
+		else
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("successTransfer");
+			const ServerObjectTemplate * objectTemplate = safe_cast<
+				const ServerObjectTemplate *>(newObject->getObjectTemplate());
+			
+			if (persisted || objectTemplate->getPersistByDefault())
+			{
+				newObject->persist();
+			}
+		}
+	}
+	return newObject;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a proxy object. The object will be added to the world when we have
+ * received it's baselines.
+ *
+ * @param templateName		template to create the object from
+ * @param id				the proxy's id
+ *
+ * @return the new object
+ */
+ServerObject* ServerWorld::createProxyObject(const std::string &templateName, const NetworkId &id, bool createAuthoritative)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("createProxyObject");
+
+	return createProxyObject(Crc::calculate(templateName.c_str()), id, createAuthoritative);
+}	// ServerWorld::createProxyObject
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a proxy object. The object will be added to the world when we have
+ * received it's baselines.
+ *
+ * @param templateName		template to create the object from
+ * @param id				the proxy's id
+ *
+ * @return the new object
+ */
+ServerObject* ServerWorld::createProxyObject(uint32 templateCrc, const NetworkId &id, bool createAuthoritative)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("createProxyObjectCrc");
+
+	ServerObject *newObject = createObjectFromTemplate(templateCrc, id);
+	DEBUG_WARNING(newObject == 0, ("Failed to load object from template [%s]", ObjectTemplateList::lookUp(templateCrc).getString()));
+	if(newObject)
+	{
+		ServerController *objectController = dynamic_cast<ServerController *>(newObject->getController());
+		if (objectController == NULL)
+			objectController = dynamic_cast<ServerController *>(newObject->createDefaultController());
+		NOT_NULL(objectController);
+	
+		// initialize the object
+		if (createAuthoritative)
+			newObject->setAuthority();
+		else
+			objectController->setAuthoritative(false);
+	}
+	return newObject;
+}	// ServerWorld::createProxyObject
+
+//-----------------------------------------------------------------------
+
+void ServerWorld::debugDump ()
+{
+	World::debugReport();
+}
+
+//-----------------------------------------------------------------------
+
+void ServerWorld::dumpObjectSphereTree(std::vector<std::pair<ServerObject *, Sphere> > & results)
+{
+	g_objectSphereTree->dumpSphereTree(results);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerWorld::dumpTriggerSphereTree(std::vector<std::pair<TriggerVolume *, Sphere> > & results)
+{
+	g_triggerSphereTree->dumpSphereTree(results);
+}
+
+//-----------------------------------------------------------------------
+
+ServerObject * ServerWorld::findObjectByNetworkId(const NetworkId& id, bool searchQueuedList)
+{
+	UNREF(searchQueuedList);
+	if (id.getValue() == 0)
+		return 0;
+ 
+	ServerObject * object = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(id));
+	if (object && ( !object->isInitialized() || object->isBeingDestroyed()) )
+		return 0;
+	return object;
+}
+
+//-----------------------------------------------------------------------
+
+ServerObject * ServerWorld::findUninitializedObjectByNetworkId(const NetworkId& id)
+{
+	if (!id.isValid())
+	{
+		DEBUG_REPORT_LOG(true, ("ERROR - Tried to invoke ServerWorld::findUninitializedObjectByNetworkId with id %s\n", id.getValueString().c_str()));
+		return 0;
+	}
+ 
+	ServerObject * object = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(id));
+	if (object && object->isInitialized())
+	{
+		DEBUG_REPORT_LOG(true, ("Attempting to get an initialized object with uninitialized accessor %s\n", id.getValueString().c_str()));
+		return 0;
+	}
+	return object;
+}
+
+//-----------------------------------------------------------------------
+
+void ServerWorld::findObjectsInRange(const Vector & location, const float distance, std::vector<ServerObject *> & results)
+{
+	g_objectSphereTree->findInRange(location, distance, results);
+}
+
+//-----------------------------------------------------------------------
+
+class StaticCollidableObjectFilter: public SpatialSubdivisionFilter<ServerObject *>
+{
+public:
+	StaticCollidableObjectFilter() {}
+	bool operator() (ServerObject * const &object) const 
+	{ 
+		CollisionProperty const * collision = object->getCollisionProperty();
+		if (!collision)
+			return false;
+		bool mobile = collision->isMobile();
+		return !mobile;
+	}
+};
+
+void ServerWorld::findStaticCollidableObjectsInRange(const Vector & location, const float distance, std::vector<ServerObject *> & results)
+{
+	g_objectSphereTree->findInRange(location, distance, StaticCollidableObjectFilter(), results);
+}
+
+//-----------------------------------------------------------------------
+
+
+void ServerWorld::findCreaturesInRange(const Vector & location, const float distance, std::vector<ServerObject *> & results)
+{
+	g_objectSphereTree->findInRange(location, distance, CreatureFilter(), results);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerWorld::findAuthoritativeNonPlayerCreaturesInRange(const Vector & location, const float distance, std::vector<ServerObject *> & results)
+{
+	g_objectSphereTree->findInRange(location, distance, AuthoritativeNonPlayerCreatureFilter(), results);
+}
+
+//-----------------------------------------------------------------------
+
+class CreatureNicheFilter: public SpatialSubdivisionFilter<ServerObject *>
+{
+public:
+	explicit CreatureNicheFilter(int i_type, int i_mask): type(i_type), mask(i_mask) { type &= mask; }
+	bool operator() (ServerObject * const &object) const 
+	{ 
+		CreatureObject * creature = dynamic_cast<CreatureObject *>(object); 
+		if (!creature)
+			return false;
+		return (creature->getNiche() & mask) == type;
+	}
+
+private:
+	CreatureNicheFilter();
+
+private:
+	int type, mask;
+};
+
+void ServerWorld::findCreaturesOfNicheInRange(const Vector & location, const float distance, int type, int mask, std::vector<ServerObject *> & results)
+{
+	g_objectSphereTree->findInRange(location, distance, CreatureNicheFilter(type, mask), results);
+}
+
+//-----------------------------------------------------------------------
+
+class CreatureSpeciesFilter: public SpatialSubdivisionFilter<ServerObject *>
+{
+public:
+	explicit CreatureSpeciesFilter(int i_species): species(i_species) {}
+	bool operator() (ServerObject * const &object) const 
+	{ 
+		CreatureObject * creature = object->asCreatureObject();
+		if (!creature)
+			return false;
+		return creature->getSpecies() == species;
+	}
+
+private:
+	CreatureSpeciesFilter();
+
+private:
+	int species;
+};
+
+void ServerWorld::findCreaturesOfSpeciesInRange(const Vector & location, const float distance, int species, std::vector<ServerObject *> & results)
+{
+	g_objectSphereTree->findInRange(location, distance, CreatureSpeciesFilter(species), results);
+}
+
+//-----------------------------------------------------------------------
+
+class CreatureRaceFilter: public SpatialSubdivisionFilter<ServerObject *>
+{
+public:
+	explicit CreatureRaceFilter(int i_species, int i_race): species(i_species), race(i_race) {}
+	bool operator() (ServerObject * const &object) const 
+	{ 
+		CreatureObject * creature = dynamic_cast<CreatureObject *>(object);
+		if (!creature)
+			return false;
+		return creature->getSpecies() == species && creature->getRace() == race;
+	}
+
+private:
+	CreatureRaceFilter();
+
+private:
+	int species, race;
+};
+
+void ServerWorld::findCreaturesOfRaceInRange(const Vector & location, const float distance, int species, int race, std::vector<ServerObject *> & results)
+{
+	g_objectSphereTree->findInRange(location, distance, CreatureRaceFilter(species, race), results);
+}
+
+//-----------------------------------------------------------------------
+
+class NPCFilter: public SpatialSubdivisionFilter<ServerObject *>
+{
+public:
+	bool operator() (ServerObject * const &object) const
+	{
+		CreatureObject *c=dynamic_cast<CreatureObject *>(object);
+		if (c)
+			return !(c->isPlayerControlled());
+		else
+			return false;
+	}
+};
+
+/**
+ * Find all creatures that are not player-controlled within a given radius.
+ */
+void ServerWorld::findNPCsInRange(const Vector & location, const float distance, std::vector<ServerObject *> & results)
+{
+	g_objectSphereTree->findInRange(location, distance, NPCFilter(), results);
+}
+
+//-----------------------------------------------------------------------
+
+class PlayerFilter: public SpatialSubdivisionFilter<ServerObject *>
+{
+public:
+	bool operator() (ServerObject * const &object) const
+	{
+		CreatureObject *c=dynamic_cast<CreatureObject *>(object);
+		if (c)
+			return (c->isPlayerControlled());
+		else
+			return false;
+	}
+};
+
+/**
+ * Find all creatures that are player-controlled within a given radius.  (Won't find vehicles, for example.)
+ */
+void ServerWorld::findPlayerCreaturesInRange(const Vector & location, const float distance, std::vector<ServerObject *> & results)
+{
+	g_objectSphereTree->findInRange(location, distance, PlayerFilter(), results);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Internal cone-test function for the getXInCone functions. Does not do distance
+ * testing because we already know the object is in range.
+ *
+ * This function does precalculations that can be done once when iterating through objects to test.
+ *
+ */
+static void _isObjectInConeLoopSetup(const Object & coneCenterObject, const Object & coneDirectionObject, float angle, Vector & coneAxisVector, float & cosAngle)
+{
+	// NOTE: all calculations are made within the object space of coneCenterObject.
+
+	//-- Compute cone axis vector.
+	coneAxisVector = coneCenterObject.rotateTranslate_w2o(coneDirectionObject.getPosition_w());
+	IGNORE_RETURN(coneAxisVector.normalize());
+
+	cosAngle = cos(angle);
+}
+
+/**
+ * Internal cone-test function for the getXInCone functions. Does not do distance
+ * testing because we already know the object is in range.
+ *
+ * This function does precalculations that can be done once when iterating through objects to test.
+ *
+ */
+static void _isObjectInConeLoopSetup(const Object & coneCenterObject, const Location & coneDirection, float angle, Vector & coneAxisVector, float & cosAngle)
+{
+	// NOTE: all calculations are made within the object space of coneCenterObject.
+
+	//-- Compute cone axis vector.
+	const ServerObject * cell = NULL;
+	if (coneDirection.getCell() != NetworkId::cms_invalid)
+		cell = safe_cast<const ServerObject *>(NetworkIdManager::getObjectById(coneDirection.getCell()));
+	if (cell == NULL)
+		coneAxisVector = coneCenterObject.rotateTranslate_w2o(coneDirection.getCoordinates());
+	else
+	{
+		// convert the location to world coordinates
+		Vector worldDirection(cell->getTransform_o2w().rotateTranslate_l2p(coneDirection.getCoordinates()));
+		coneAxisVector = coneCenterObject.rotateTranslate_w2o(worldDirection);
+	}
+	IGNORE_RETURN(coneAxisVector.normalize());
+
+	cosAngle = cos(angle);
+}
+
+/**
+ * Internal cone-test function for the getXInCone functions. Does not do distance
+ * testing because we already know the object is in range.
+ *
+ * This function is used when iterating through objects and takes parameters computed in _isObjectInConeLoopSetup.
+ *
+ * @return true if the object is in the cone
+ */
+static bool _isObjectInConeLoop(const Object & coneCenterObject, const Object & testObject, const Vector & coneAxisVector, const float cosAngle)
+{
+	// NOTE: all calculations are made within the object space of coneCenterObject.
+
+	//-- Get test object orientation in cone's center object's space.
+	Vector testOrientation = coneCenterObject.rotateTranslate_w2o(testObject.getPosition_w());
+	IGNORE_RETURN(testOrientation.normalize());
+
+	//-- return true if angle between forward and position_o is smaller than the cone angle
+
+	const float dotProduct   = coneAxisVector.dot(testOrientation);
+	const bool  withinCone   = (dotProduct >= cosAngle);
+	
+	return withinCone;
+}
+
+// ----------------------------------------------------------------------
+/**
+ * Find all objects within a given cone.
+ *
+ * @param coneCenterObject		location of cone point
+ * @param coneDirectionObject	position to orient the axis of the cone
+ * @param distance				radius of cone
+ * @param angle					cone angle in radians
+ * @param results				vector to store the found objects in
+ */
+void ServerWorld::findObjectsInCone(const Object & coneCenterObject, 
+	const Object & coneDirectionObject, float distance, 
+	float angle, std::vector<ServerObject *> & results)
+{
+	std::vector<ServerObject *> rangeResults;
+	findObjectsInRange(coneCenterObject.getPosition_w(), distance, rangeResults);
+
+	Vector coneAxisVector;
+	float cosAngle = 0;
+	_isObjectInConeLoopSetup(coneCenterObject, coneDirectionObject, angle, coneAxisVector, cosAngle);
+
+	// Check each object within range to see if they fall within the arc of the cone.
+	const std::vector<ServerObject *>::const_iterator endIter = rangeResults.end();
+	for (std::vector<ServerObject *>::const_iterator iter = rangeResults.begin(); iter != endIter; ++iter)
+	{
+		// Get the object that will be tested against the cone.  Ignore it
+		// if it is the cone center object.
+		const ServerObject *const testObject = *iter;
+		if (!testObject || (testObject == &coneCenterObject))
+			continue;
+
+		// Test against the cone, add to list if successful.
+		if (_isObjectInConeLoop(coneCenterObject, *testObject, coneAxisVector, cosAngle))
+			results.push_back(*iter);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Find all objects within a given cone.
+ *
+ * @param coneCenterObject	location of cone point
+ * @param coneDirection     position to orient the axis of the cone
+ * @param distance			radius of cone
+ * @param angle				cone angle in radians
+ * @param results			vector to store the found objects in
+ */
+void ServerWorld::findObjectsInCone(const Object & coneCenterObject, 
+	const Location & coneDirection, float distance, 
+	float angle, std::vector<ServerObject *> & results)
+{
+	std::vector<ServerObject *> rangeResults;
+	findObjectsInRange(coneCenterObject.getPosition_w(), distance, rangeResults);
+
+	Vector coneAxisVector;
+	float cosAngle = 0;
+	_isObjectInConeLoopSetup(coneCenterObject, coneDirection, angle, coneAxisVector, cosAngle);
+
+	// Check each object within range to see if they fall within the arc of the cone.
+	const std::vector<ServerObject *>::const_iterator endIter = rangeResults.end();
+	for (std::vector<ServerObject *>::const_iterator iter = rangeResults.begin(); iter != endIter; ++iter)
+	{
+		// Get the object that will be tested against the cone.  Ignore it
+		// if it is the cone center object.
+		const ServerObject *const testObject = *iter;
+		if (!testObject || (testObject == &coneCenterObject))
+			continue;
+
+		// Test against the cone, add to list if successful.
+		if (_isObjectInConeLoop(coneCenterObject, *testObject, coneAxisVector, cosAngle))
+			results.push_back(*iter);
+	}
+}
+
+// ----------------------------------------------------------------------
+/**
+ * Find all creatures within a given cone.
+ *
+ * @param coneCenterObject		location of cone point
+ * @param coneDirectionObject	position to orient the axis of the cone
+ * @param distance				radius of cone
+ * @param angle					cone angle in radians
+ * @param results				vector to store the found objects in
+ */
+void ServerWorld::findCreaturesInCone(const Object & coneCenterObject, 
+	const Object & coneDirectionObject, float distance,
+	float angle, std::vector<ServerObject *> & results)
+{
+	// Query for the creatures within the given range.
+	std::vector<ServerObject *> rangeResults;
+	findCreaturesInRange(coneCenterObject.getPosition_w(), distance, rangeResults);
+
+	Vector coneAxisVector;
+	float cosAngle = 0;
+	_isObjectInConeLoopSetup(coneCenterObject, coneDirectionObject, angle, coneAxisVector, cosAngle);
+
+	// Check each creature within range to see if they fall within the arc of the cone.
+	const std::vector<ServerObject *>::const_iterator endIter = rangeResults.end();
+	for (std::vector<ServerObject *>::const_iterator iter = rangeResults.begin(); iter != endIter; ++iter)
+	{
+		// Get the object that will be tested against the cone.  Ignore it
+		// if it is the cone center object.
+		const ServerObject *const testObject = *iter;
+		if (!testObject || (testObject == &coneCenterObject))
+			continue;
+
+		// Test against the cone, add to list if successful.
+		if (_isObjectInConeLoop(coneCenterObject, *testObject, coneAxisVector, cosAngle))
+			results.push_back(*iter);
+	}
+}
+
+// ----------------------------------------------------------------------
+/**
+ * Find all creatures within a given cone.
+ *
+ * @param coneCenterObject	location of cone point
+ * @param coneDirection		position to orient the axis of the cone
+ * @param distance			radius of cone
+ * @param angle				cone angle in radians
+ * @param results			vector to store the found objects in
+ */
+void ServerWorld::findCreaturesInCone(const Object & coneCenterObject, 
+	const Location & coneDirection, float distance,
+	float angle, std::vector<ServerObject *> & results)
+{
+	// Query for the creatures within the given range.
+	std::vector<ServerObject *> rangeResults;
+	findCreaturesInRange(coneCenterObject.getPosition_w(), distance, rangeResults);
+
+	Vector coneAxisVector;
+	float cosAngle = 0;
+	_isObjectInConeLoopSetup(coneCenterObject, coneDirection, angle, coneAxisVector, cosAngle);
+
+	// Check each creature within range to see if they fall within the arc of the cone.
+	const std::vector<ServerObject *>::const_iterator endIter = rangeResults.end();
+	for (std::vector<ServerObject *>::const_iterator iter = rangeResults.begin(); iter != endIter; ++iter)
+	{
+		// Get the object that will be tested against the cone.  Ignore it
+		// if it is the cone center object.
+		const ServerObject *const testObject = *iter;
+		if (!testObject || (testObject == &coneCenterObject))
+			continue;
+
+		// Test against the cone, add to list if successful.
+		if (_isObjectInConeLoop(coneCenterObject, *testObject, coneAxisVector, cosAngle))
+			results.push_back(*iter);
+	}
+}
+
+// ----------------------------------------------------------------------
+/**
+ * Find all authoritative non-player creatures within a given cone.
+ *
+ * @param coneSourceObject	location of cone point, along with cone orientation along +z axis.
+ * @param distance		radius of cone
+ * @param angle			cone angle in radians
+ * @param results		vector to store the found objects in
+ */
+void ServerWorld::findAuthoritativeNonPlayerCreaturesInCone(const Object & coneCenterObject, 
+	const Object & coneDirectionObject, float distance,
+	float angle, std::vector<ServerObject *> & results)
+{
+	// Query for the creatures within the given range.
+	std::vector<ServerObject *> rangeResults;
+	findAuthoritativeNonPlayerCreaturesInRange(coneCenterObject.getPosition_w(), distance, rangeResults);
+
+	Vector coneAxisVector;
+	float cosAngle = 0;
+	_isObjectInConeLoopSetup(coneCenterObject, coneDirectionObject, angle, coneAxisVector, cosAngle);
+
+	// Check each creature within range to see if they fall within the arc of the cone.
+	const std::vector<ServerObject *>::const_iterator endIter = rangeResults.end();
+	for (std::vector<ServerObject *>::const_iterator iter = rangeResults.begin(); iter != endIter; ++iter)
+	{
+		// Get the object that will be tested against the cone.  Ignore it
+		// if it is the cone center object.
+		const ServerObject *const testObject = *iter;
+		if (!testObject || (testObject == &coneCenterObject))
+			continue;
+
+		// Test against the cone, add to list if successful.
+		if (_isObjectInConeLoop(coneCenterObject, *testObject, coneAxisVector, cosAngle))
+			results.push_back(*iter);
+	}
+}
+
+// ----------------------------------------------------------------------
+/**
+ * Find all creatures of a given niche within a given cone.
+ *
+ * @param location		location of cone point
+ * @param distance		radius of cone
+ * @param angle			cone angle in radians
+ * @param results		vector to store the found objects in
+ */
+void ServerWorld::findCreaturesOfNicheInCone(const Object & coneCenterObject, 
+	const Object & coneDirectionObject, float distance, float angle, int niche, 
+	int mask, std::vector<ServerObject *> & results)
+{
+	std::vector<ServerObject *> rangeResults;
+	findCreaturesOfNicheInRange(coneCenterObject.getPosition_w(), distance, niche, mask, rangeResults);
+
+	Vector coneAxisVector;
+	float cosAngle = 0;
+	_isObjectInConeLoopSetup(coneCenterObject, coneDirectionObject, angle, coneAxisVector, cosAngle);
+
+	// Check each creature within range to see if they fall within the arc of the cone.
+	const std::vector<ServerObject *>::const_iterator endIter = rangeResults.end();
+	for (std::vector<ServerObject *>::const_iterator iter = rangeResults.begin(); iter != endIter; ++iter)
+	{
+		// Get the object that will be tested against the cone.  Ignore it
+		// if it is the cone center object.
+		const ServerObject *const testObject = *iter;
+		if (!testObject || (testObject == &coneCenterObject))
+			continue;
+
+		// Test against the cone, add to list if successful.
+		if (_isObjectInConeLoop(coneCenterObject, *testObject, coneAxisVector, cosAngle))
+			results.push_back(*iter);
+	}
+}
+
+// ----------------------------------------------------------------------
+/**
+ * Find all creatures of a given species within a given cone.
+ *
+ * @param location		location of cone point
+ * @param distance		radius of cone
+ * @param angle			cone angle in radians
+ * @param results		vector to store the found objects in
+ */
+void ServerWorld::findCreaturesOfSpeciesInCone(const Object & coneCenterObject, 
+	const Object & coneDirectionObject, float distance,
+	float angle, int species, std::vector<ServerObject *> & results)
+{
+	std::vector<ServerObject *> rangeResults;
+	findCreaturesOfSpeciesInRange(coneCenterObject.getPosition_w(), distance, species, rangeResults);
+
+	Vector coneAxisVector;
+	float cosAngle = 0;
+	_isObjectInConeLoopSetup(coneCenterObject, coneDirectionObject, angle, coneAxisVector, cosAngle);
+
+	// Check each creature within range to see if they fall within the arc of the cone.
+	const std::vector<ServerObject *>::const_iterator endIter = rangeResults.end();
+	for (std::vector<ServerObject *>::const_iterator iter = rangeResults.begin(); iter != endIter; ++iter)
+	{
+		// Get the object that will be tested against the cone.  Ignore it
+		// if it is the cone center object.
+		const ServerObject *const testObject = *iter;
+		if (!testObject || (testObject == &coneCenterObject))
+			continue;
+
+		// Test against the cone, add to list if successful.
+		if (_isObjectInConeLoop(coneCenterObject, *testObject, coneAxisVector, cosAngle))
+			results.push_back(*iter);
+	}
+}
+
+// ----------------------------------------------------------------------
+/**
+ * Find all creatures of a given race within a given cone.
+ *
+ * @param location		location of cone point
+ * @param distance		radius of cone
+ * @param angle			cone angle in radians
+ * @param results		vector to store the found objects in
+ */
+void ServerWorld::findCreaturesOfRaceInCone(const Object & coneCenterObject, 
+	const Object & coneDirectionObject, float distance, 
+	float angle, int species, int race, std::vector<ServerObject *> & results)
+{
+	std::vector<ServerObject *> rangeResults;
+	findCreaturesOfRaceInRange(coneCenterObject.getPosition_w(), distance, species, race, rangeResults);
+
+	Vector coneAxisVector;
+	float cosAngle = 0;
+	_isObjectInConeLoopSetup(coneCenterObject, coneDirectionObject, angle, coneAxisVector, cosAngle);
+
+	// Check each creature within range to see if they fall within the arc of the cone.
+	const std::vector<ServerObject *>::const_iterator endIter = rangeResults.end();
+	for (std::vector<ServerObject *>::const_iterator iter = rangeResults.begin(); iter != endIter; ++iter)
+	{
+		// Get the object that will be tested against the cone.  Ignore it
+		// if it is the cone center object.
+		const ServerObject *const testObject = *iter;
+		if (!testObject || (testObject == &coneCenterObject))
+			continue;
+
+		// Test against the cone, add to list if successful.
+		if (_isObjectInConeLoop(coneCenterObject, *testObject, coneAxisVector, cosAngle))
+			results.push_back(*iter);
+	}
+}
+
+// ----------------------------------------------------------------------
+/**
+ * Find all objects that aren't creatures within a given cone.
+ *
+ * @param location		location of cone point
+ * @param distance		radius of cone
+ * @param angle			cone angle in radians
+ * @param results		vector to store the found objects in
+ */
+void ServerWorld::findNonCreaturesInCone(const Object & coneCenterObject, 
+	const Object & coneDirectionObject, float distance, float angle, 
+	std::vector<ServerObject *> & results)
+{
+	std::vector<ServerObject *> rangeResults;
+	findNonCreaturesInRange(coneCenterObject.getPosition_w(), distance, rangeResults);
+
+	Vector coneAxisVector;
+	float cosAngle = 0;
+	_isObjectInConeLoopSetup(coneCenterObject, coneDirectionObject, angle, coneAxisVector, cosAngle);
+
+	// Check each creature within range to see if they fall within the arc of the cone.
+	const std::vector<ServerObject *>::const_iterator endIter = rangeResults.end();
+	for (std::vector<ServerObject *>::const_iterator iter = rangeResults.begin(); iter != endIter; ++iter)
+	{
+		// Get the object that will be tested against the cone.  Ignore it
+		// if it is the cone center object.
+		const ServerObject *const testObject = *iter;
+		if (!testObject || (testObject == &coneCenterObject))
+			continue;
+
+		// Test against the cone, add to list if successful.
+		if (_isObjectInConeLoop(coneCenterObject, *testObject, coneAxisVector, cosAngle))
+			results.push_back(*iter);
+	}
+}
+
+// ----------------------------------------------------------------------
+/**
+ * Find all creatures that are not player-controlled within a given cone.
+ *
+ * @param location		location of cone point
+ * @param distance		radius of cone
+ * @param angle			cone angle in radians
+ * @param results		vector to store the found objects in
+ */
+void ServerWorld::findNPCsInCone(const Object & coneCenterObject, 
+	const Object & coneDirectionObject, float distance, 
+	float angle, std::vector<ServerObject *> & results)
+{
+	std::vector<ServerObject *> rangeResults;
+	findNPCsInRange(coneCenterObject.getPosition_w(), distance, rangeResults);
+
+	Vector coneAxisVector;
+	float cosAngle = 0;
+	_isObjectInConeLoopSetup(coneCenterObject, coneDirectionObject, angle, coneAxisVector, cosAngle);
+
+	// Check each creature within range to see if they fall within the arc of the cone.
+	const std::vector<ServerObject *>::const_iterator endIter = rangeResults.end();
+	for (std::vector<ServerObject *>::const_iterator iter = rangeResults.begin(); iter != endIter; ++iter)
+	{
+		// Get the object that will be tested against the cone.  Ignore it
+		// if it is the cone center object.
+		const ServerObject *const testObject = *iter;
+		if (!testObject || (testObject == &coneCenterObject))
+			continue;
+
+		// Test against the cone, add to list if successful.
+		if (_isObjectInConeLoop(coneCenterObject, *testObject, coneAxisVector, cosAngle))
+			results.push_back(*iter);
+	}
+}
+
+// ----------------------------------------------------------------------
+/**
+ * Find all creatures that are player-controlled within a given cone.  (Won't find vehicles, for example.)
+ *
+ * @param location		location of cone point
+ * @param distance		radius of cone
+ * @param angle			cone angle in radians
+ * @param results		vector to store the found objects in
+ */
+void ServerWorld::findPlayerCreaturesInCone(const Object & coneCenterObject, 
+	const Object & coneDirectionObject, float distance, 
+	float angle, std::vector<ServerObject *> & results)
+{
+	std::vector<ServerObject *> rangeResults;
+	findPlayerCreaturesInRange(coneCenterObject.getPosition_w(), distance, rangeResults);
+
+	Vector coneAxisVector;
+	float cosAngle = 0;
+	_isObjectInConeLoopSetup(coneCenterObject, coneDirectionObject, angle, coneAxisVector, cosAngle);
+
+	// Check each creature within range to see if they fall within the arc of the cone.
+	const std::vector<ServerObject *>::const_iterator endIter = rangeResults.end();
+	for (std::vector<ServerObject *>::const_iterator iter = rangeResults.begin(); iter != endIter; ++iter)
+	{
+		// Get the object that will be tested against the cone.  Ignore it
+		// if it is the cone center object.
+		const ServerObject *const testObject = *iter;
+		if (!testObject || (testObject == &coneCenterObject))
+			continue;
+
+		// Test against the cone, add to list if successful.
+		if (_isObjectInConeLoop(coneCenterObject, *testObject, coneAxisVector, cosAngle))
+			results.push_back(*iter);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Find closest NPC.
+ * @param distance the maximum distance to look, which must be less than the object interaction limit
+ */
+ServerObject *ServerWorld::findClosestNPC(const Vector & location, float distance)
+{
+	if (distance > 128)
+		distance = 128; // TODO:  #define somewhere ?
+
+	std::vector<ServerObject*> candidates;
+	findNPCsInRange(location, distance, candidates);
+	return findClosestObjectInList(location, candidates);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Find closest Player.
+ * @param distance the maximum distance to look, which must be less than the object interaction limit
+ */
+ServerObject *ServerWorld::findClosestPlayer(const Vector & location, float distance)
+{
+	if (distance > 128)
+		distance = 128; // TODO:  #define somewhere ?
+
+	std::vector<ServerObject*> candidates;
+	findPlayerCreaturesInRange(location, distance, candidates);
+	return findClosestObjectInList(location, candidates);
+}
+
+
+
+
+class PobFilter: public SpatialSubdivisionFilter<ServerObject *>
+{
+public:
+	PobFilter() {}
+	bool operator() (ServerObject * const &object) const 
+	{ 
+		PortalProperty const * portal = object->getPortalProperty();
+		if (!portal)
+			return false;
+		return true;
+	}
+};
+
+
+ServerObject *ServerWorld::findPobAtLocation(const Vector & location_w)
+{
+	std::vector<ServerObject*> candidates;
+	g_objectSphereTree->findInRange(location_w, 0.1f, PobFilter(), candidates);
+
+	return findClosestObjectInList(location_w, candidates);
+
+}
+
+
+CellProperty const * ServerWorld::findCellAtLocation(const Vector & location_w)
+{
+	CellProperty const * cell = CellProperty::getWorldCellProperty();
+	
+	ServerObject const * const pob = findPobAtLocation(location_w);
+	if (pob)
+	{
+		PortalProperty const * const portal = pob->getPortalProperty();
+		if (portal)
+		{
+			Vector location_l = pob->rotateTranslate_w2o(location_w);
+			cell = portal->findContainingCell(location_l);
+		}
+	}
+
+	return cell;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Helper function for findClosest.
+ * Given a list of objects, determines which one is closest to a point
+ */
+ServerObject *ServerWorld::findClosestObjectInList(const Vector &location, const std::vector<ServerObject*> &candidates)
+{
+	if (candidates.empty()) return NULL;
+	
+	typedef std::vector<ServerObject *> CandidatesType;
+	
+	CandidatesType::const_iterator closest=candidates.begin(); 
+	float minDistance =(*closest)->getPosition_w().magnitudeBetweenSquared(location);
+	
+	for (CandidatesType::const_iterator i=closest+1; i != candidates.end(); ++i)
+	{
+		float distance = (*i)->getPosition_w().magnitudeBetweenSquared(location);
+		if (distance < minDistance)
+		{
+			minDistance = distance;
+			closest=i;
+		}
+	}
+
+	return *closest;
+}
+
+//-----------------------------------------------------------------------
+
+class NonCreatureFilter: public SpatialSubdivisionFilter<ServerObject *>
+{
+public:
+	bool operator() (ServerObject * const &object) const { return dynamic_cast<CreatureObject *>(object) == 0; }
+};
+
+void ServerWorld::findNonCreaturesInRange(const Vector & location, const float distance, std::vector<ServerObject *> & results)
+{
+	g_objectSphereTree->findInRange(location, distance, NonCreatureFilter(), results);
+}
+
+//-----------------------------------------------------------------------
+
+int ServerWorld::getNumObjects()
+{
+	return World::getNumberOfObjects(static_cast<int>(WOL_Tangible));
+}
+
+//-----------------------------------------------------------------------
+
+ServerObject * ServerWorld::getObject(int index)
+{
+	//-- Justin Randall [10/23/2000 9:13:32 AM] --
+	//	only NetworkObjects may be added to this list (see addObject() above)
+	//	The cast here is safe. Todo: make a NetworkObjectList class that keeps
+	//	objects in a hash for location by network id.
+	return static_cast<ServerObject *>(World::getObject(static_cast<int>(WOL_Tangible), index));
+}
+
+//-----------------------------------------------------------------------
+
+static Object *beginCreateServerCellObject(int index)
+{
+	ServerObject *newObject = ServerWorld::createNewObject("object/cell/cell.iff", Transform::identity, 0, false);
+	NOT_NULL(newObject);
+	safe_cast<CellObject *>(newObject)->setCell(index);
+
+	return newObject;
+}
+
+//-----------------------------------------------------------------------
+
+static void endCreateServerCellObject(Object *newObject)
+{
+	ServerObject* cellObject = safe_cast<ServerObject*>(newObject);
+	if (!cellObject)
+	{
+		DEBUG_FATAL(true, ("Um...cell is not a server object?"));
+		return;
+	}
+	ServerObject* portalObject = safe_cast<ServerObject*>(ContainerInterface::getContainedByObject(*cellObject));
+	if (!portalObject)
+	{
+		DEBUG_FATAL(true, ("This cell is free floating with no parent"));
+		return;
+	}
+
+	cellObject->setLoadWith(portalObject->getNetworkId());
+	
+	if (portalObject->isPersisted())
+		cellObject->persist();
+}
+
+//-----------------------------------------------------------------------
+
+void ServerWorld::install()
+{
+	DEBUG_FATAL(m_installed, ("Trying to reinstall ServerWorld"));
+
+	DebugFlags::registerFlag (ms_logTriggerStats, "ServerGame", "logTriggerStats");
+
+	m_idleTimer	   = new Timer;
+	g_objectSphereTree    = new PortallizedSphereTree<ServerObject *, ServerObjectSphereExtentAccessor>;
+
+	g_triggerSphereTree   = new PortallizedSphereTree<TriggerVolume *, TriggerVolumeSphereExtentAccessor>;
+	g_triggerSphereGrid   = new DoubleSphereGrid<TriggerVolume *, TriggerVolumeSphereExtentAccessor_Grid>;
+
+	s_numMoveLists = ConfigServerGame::getNumberOfMoveObjectLists();
+	for (int i = 0; i < s_numMoveLists; ++i)
+	{
+		s_moveObjectList.push_back(new MoveObjectMap);
+	}
+	s_moveObjectListValid = true;
+	
+	PortalProperty::install(beginCreateServerCellObject, endCreateServerCellObject);
+
+	{
+		SetupSharedCollision::Data data;
+
+		data.installExtents = true;
+		data.installCollisionWorld = true;
+		data.playEffect = NULL;
+		data.isPlayerHouse = &isPlayerHouseHook;
+		data.serverSide = true;
+
+		SetupSharedCollision::install(data);
+
+		CollisionCallbacks::install();
+
+		// setup callback handlers to display more server-specific information
+		// when the collision detection thinks a warp situation has occurred.
+		CollisionWorld::setNearWarpWarningCallback(issueCollisionNearWarpWarning);
+		CollisionWorld::setFarWarpWarningCallback(issueCollisionFarWarpWarning);
+	}
+	
+	Region3dMaster::install();
+	RegionMaster::install();
+	Pvp::install(); // must be done after RegionMaster::install()
+	GameServerMessageArchive::install();
+	AiCombatPulseQueue::install();
+	
+	// install the object templates
+	ServerArmorTemplate::install(true);
+	ServerBattlefieldMarkerObjectTemplate::install(true);
+	ServerBuildingObjectTemplate::install(true);
+	ServerCellObjectTemplate::install();
+	ServerCityObjectTemplate::install(true);
+	ServerConstructionContractObjectTemplate::install(true);
+	ServerCreatureObjectTemplate::install(true);
+	ServerDraftSchematicObjectTemplate::install(true);
+	ServerFactoryObjectTemplate::install(true);
+	ServerGroupObjectTemplate::install(true);
+	ServerGuildObjectTemplate::install(true);
+	ServerHarvesterInstallationObjectTemplate::install(true);
+	ServerInstallationObjectTemplate::install(true);
+	ServerIntangibleObjectTemplate::install(true);
+	ServerManufactureInstallationObjectTemplate::install(true);
+	ServerManufactureSchematicObjectTemplate::install(true);
+	ServerMissionObjectTemplate::install(true);
+	ServerObjectTemplate::install(true);
+	ServerPlanetObjectTemplate::install(true);
+	ServerPlayerQuestObjectTemplate::install(true);
+	ServerPlayerObjectTemplate::install(true);
+	ServerResourceContainerObjectTemplate::install(true);
+	ServerShipObjectTemplate::install(true);
+	ServerStaticObjectTemplate::install(true);
+	ServerTangibleObjectTemplate::install(true);
+	ServerUniverseObjectTemplate::install(true);
+	ServerVehicleObjectTemplate::install(true);
+	ServerWeaponObjectTemplate::install(true);
+	ServerXpManagerObjectTemplate::install(true);
+
+	SharedBattlefieldMarkerObjectTemplate::install(true);
+	SharedBuildingObjectTemplate::install(true);
+	SharedCellObjectTemplate::install(true);
+	SharedConstructionContractObjectTemplate::install(true);
+	SharedCreatureObjectTemplate::install(true);
+	SharedDraftSchematicObjectTemplate::install(true);
+	SharedFactoryObjectTemplate::install(true);
+	SharedGroupObjectTemplate::install(true);
+	SharedGuildObjectTemplate::install(true);
+	SharedInstallationObjectTemplate::install(true);
+	SharedIntangibleObjectTemplate::install(true);
+	SharedManufactureSchematicObjectTemplate::install(true);
+	SharedMissionObjectTemplate::install(true);
+	SharedObjectTemplate::install(true);
+	SharedPlayerQuestObjectTemplate::install(true);
+	SharedPlayerObjectTemplate::install(true);
+	SharedResourceContainerObjectTemplate::install(true);
+	SharedShipObjectTemplate::install(true);
+	SharedStaticObjectTemplate::install(true);
+	SharedTangibleObjectTemplate::install(true);
+	SharedTerrainSurfaceObjectTemplate::install(true);
+	SharedUniverseObjectTemplate::install(true);
+	SharedVehicleObjectTemplate::install(true);
+	SharedWeaponObjectTemplate::install(true);
+
+	ShipComponentDescriptor::fetchSharedObjectTemplates();
+
+	m_weatherGenerator = new SynchronizedWeatherGenerator(ConfigServerGame::getWeatherUpdateSeconds());
+
+	FormManagerServer::install();
+
+	// install the world
+	World::install ();
+
+	m_idleTimer->setExpireTime(1.0f);
+	m_installed = true;
+
+	m_sceneId = new std::string(ConfigServerGame::getSceneID());
+
+	Pvp::getScheduler().setCallback(Pvp::updateTimedFlags, NULL, ConfigServerGame::getPvpUpdateTimeMs());
+
+	NebulaManagerServer::loadScene(*m_sceneId);
+
+	CollisionWorld::handleSceneChange(*m_sceneId);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerWorld::updateObjectDatabase(ServerObject & movingObject)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::updateObjectDatabase");
+	g_objectSphereTree->onObjectMoved(&movingObject);
+}
+
+// ----------
+
+void ServerWorld::updateTriggerDatabase(ServerObject & movingObject)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::updateTriggerDatabase");
+
+	// move the trigger volumes
+	ServerObject::TriggerVolumeMap const &volumes = movingObject.getTriggerVolumeMap();
+	for (ServerObject::TriggerVolumeMap::const_iterator v = volumes.begin(); v != volumes.end(); ++v)
+	{
+		int system = ConfigServerGame::getTriggerVolumeSystem();  // 0 = old, 1 = compare, 2 = new
+		if ( system <= 1 )
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("sphere_tree_move");
+			g_triggerSphereTree->onObjectMoved((*v).second);
+		}
+
+		if ( system >= 1 )
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("sphere_grid_move");
+			g_triggerSphereGrid->onObjectMoved((*v).second );
+		}
+	}
+}
+
+// ----------
+// handle triggers caused by a moving object hitting a trigger
+
+void ServerWorld::triggerMovingObjects(ServerObject &movingObject, Vector const &start, Vector const &end)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::triggerMovingObjects");
+
+	if (!isRelevantToTriggerVolumes(movingObject))
+		return;
+
+	if (isSpaceScene())
+	{
+		// In space, we only care about objects moving within a pob, and start and
+		// end aren't real useful, since we need position change relative to the
+		// pob, which we currently don't store.  With this implementation,
+		// an object completely crossing a trigger volume in one move will not
+		// trigger it.
+		Object const * const pob = getContainingPobForObjectInWorld(movingObject);
+		if (pob)
+		{
+			static std::vector<TriggerVolume *> results;
+			static std::set<TriggerVolume *> results2;
+
+
+			int system = ConfigServerGame::getTriggerVolumeSystem();  // 0 = old, 1 = compare, 2 = new
+
+			if (system <= 1 )
+				g_triggerSphereTree->findInRange(pob, Vector::zero, 16384.f, results);
+			if ( system >= 1 )
+				g_triggerSphereGrid->findInRange(pob, Vector::zero, 16384.f, results2);
+
+			if ( system == 1 )
+			{
+				DEBUG_FATAL(results.size() != results2.size(), ("SphereGrid failed (%d vs. %d).", results.size(), results2.size()));
+			}
+
+			if ( system != 2)
+			{
+				for (std::vector<TriggerVolume *>::const_iterator i = results.begin(); i != results.end(); ++i)
+					if ((*i) && &(*i)->getOwner() != &movingObject)
+						(*i)->objectMoved(movingObject);
+			}
+			else if ( system == 2 )
+			{
+				for (std::set<TriggerVolume *>::const_iterator i = results2.begin(); i != results2.end(); ++i)
+					if ((*i) && &(*i)->getOwner() != &movingObject)
+						(*i)->objectMoved(movingObject);
+
+			}
+
+			results.clear();
+			results2.clear();
+		}
+	}
+	else
+	{
+		float const distanceTravelledSquared = end.magnitudeBetweenSquared(start);
+		float const extentSphereRadius = movingObject.getSphereExtent().getRadius();
+
+		static std::vector<TriggerVolume *> results;
+		static std::set<TriggerVolume *> results2;
+
+		int system = ConfigServerGame::getTriggerVolumeSystem();  // 0 = old, 1 = compare, 2 = new
+
+		if (distanceTravelledSquared < sqr(ConfigServerGame::getTriggerVolumeWarpDistance()))
+		{
+			Capsule const queryCapsule(start, end, extentSphereRadius);
+			{
+				if (system <= 1 )
+				{
+					PROFILER_AUTO_BLOCK_DEFINE("sphere_tree_find");
+					g_triggerSphereTree->findInRange(queryCapsule, results);
+				}
+
+				if ( system >= 1 )
+				{
+					PROFILER_AUTO_BLOCK_DEFINE("sphere_grid_find");
+					g_triggerSphereGrid->findInRange( queryCapsule, results2);
+				}
+
+				if ( system == 1 )
+				{
+					compare_results(queryCapsule, results,results2,&movingObject);
+				}
+			}
+		}
+		else
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::triggerMovingObject::findInRange (teleport)");
+
+			// We moved really far, so consider this a warp
+			if ( system <= 1 )
+			{
+				PROFILER_AUTO_BLOCK_DEFINE("sphere_tree_find");
+				g_triggerSphereTree->findInRange(end, extentSphereRadius, results);
+			}
+
+			if ( system >= 1 )
+			{
+				PROFILER_AUTO_BLOCK_DEFINE("sphere_grid_find");
+				g_triggerSphereGrid->findInRange(  end, extentSphereRadius, results2);
+			}
+
+			if ( system == 1 )
+			{
+				compare_results( end, extentSphereRadius, results,results2,&movingObject);
+			}
+		}
+
+		if ( system != 2 )
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::triggerMovingObject::loop");
+			for (std::vector<TriggerVolume *>::const_iterator i = results.begin(); i != results.end(); ++i)
+				if ((*i) && &(*i)->getOwner() != &movingObject)
+					(*i)->moveObject(movingObject, start, end);
+		}
+		else if ( system == 2 )
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::triggerMovingObject::loop");
+			for (std::set<TriggerVolume *>::const_iterator i = results2.begin(); i != results2.end(); ++i)
+				if ((*i) && &(*i)->getOwner() != &movingObject)
+					(*i)->moveObject(movingObject, start, end);
+		}
+
+		results.clear();
+		results2.clear();
+	}
+}
+
+// ----------
+// handle triggers caused by a moving trigger hitting an object
+
+void ServerWorld::triggerMovingTriggers(ServerObject &movingObject, Vector const &start, Vector const &end)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::triggerMovingTriggers");
+
+	if (isSpaceScene())
+	{
+		// In space, we only care about triggers moving within a pob, and start
+		// and end aren't real useful, since we need position change relative to
+		// the pob, which we currently don't store.  With this implementation,
+		// a trigger volume completely crossing an object in one move will not
+		// trigger it.
+		Object const * const pob = getContainingPobForObjectInWorld(movingObject);
+		if (pob)
+		{
+			TriggerVolumeFilterWithIgnoredObject const filter(movingObject);
+
+			ServerObject::TriggerVolumeMap &volumes = movingObject.getTriggerVolumeMap();
+
+			for (ServerObject::TriggerVolumeMap::iterator v = volumes.begin(); v != volumes.end(); ++v)
+			{
+				TriggerVolume * const t = (*v).second;
+				static std::vector<ServerObject *> results;
+				g_objectSphereTree->findInRange(pob, t->getOwner().getPosition_p(), t->getRadius(), filter, results);
+				std::sort(results.begin(), results.end());
+				t->contentsChanged(results);
+				results.clear();
+			}
+		}
+	}
+	else
+	{
+		ServerObject::TriggerVolumeMap &volumes = movingObject.getTriggerVolumeMap();
+
+		DEBUG_REPORT_LOG(ms_logTriggerStats, ("**** Outloop %d\n", volumes.size()));
+		for (ServerObject::TriggerVolumeMap::iterator v = volumes.begin(); v != volumes.end(); ++v)
+		{
+			TriggerVolume * const t = (*v).second;
+
+			static std::vector<ServerObject *> results;
+
+			Capsule const queryCapsule(start, end, t->getRadius());
+			{
+				PROFILER_AUTO_BLOCK_DEFINE("SphereTree::findInRange");
+				g_objectSphereTree->findInRange(queryCapsule, TriggerVolumeFilter(), results);
+			}
+
+			DEBUG_REPORT_LOG(ms_logTriggerStats, ("     **** Innerloop %d\n", results.size()));
+			{
+				PROFILER_AUTO_BLOCK_DEFINE("MoveTriggerVolumes");
+				int clcount = 0;
+				int crcount = 0;
+				for (std::vector<ServerObject *>::iterator i = results.begin(); i != results.end(); ++i)
+				{
+					ServerObject * const object = *i;
+					if (ms_logTriggerStats)
+					{
+						crcount++;
+						if (object->getClient())
+							clcount++;
+					}
+				
+					if (object != NULL)
+						t->moveTriggerVolume(*object, start, end);
+				}
+				DEBUG_REPORT_LOG(ms_logTriggerStats, ("       Creature count: %d Client count: %d\n", crcount, clcount));
+			}
+
+			results.clear();
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorld::moveObject(ServerObject & movingObject, const Vector & start, const Vector & end)
+{
+	DEBUG_FATAL(!s_moveObjectListValid, ("Cannot operate on uninitialized object list"));
+	//If there are no move lists, execute the move right away.  Otherwise queue it up
+	if (s_numMoveLists <= 0 || !s_moveObjectListValid)
+	{
+		internalMoveObject(movingObject, start, end);
+	}
+	else
+	{
+		FATAL(s_moveObjectListLock, ("Trying to move an object while the move list is locked"));
+		unsigned int whichList = movingObject.getNetworkId().getHashValue() % s_numMoveLists;
+		MoveObjectMap * moveMap = s_moveObjectList[whichList];
+		MoveObjectMap::iterator i = moveMap->find(&movingObject);
+		if (i != moveMap->end())
+		{
+			//If the object is already scheduled to be moved, update the end position.
+			i->second.second = end;
+		}
+		else
+		{
+			//If the object is not already scheduled to be moved, add it to the map.
+			(*moveMap)[&movingObject] = std::pair<Vector, Vector>(start, end);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ServerWorld::updateMoveObjectList()
+{
+	DEBUG_FATAL(!s_moveObjectListValid, ("Cannot operate on uninitialized object list"));
+	
+	if (s_numMoveLists <= 0 || !s_moveObjectListValid)
+		return;
+
+	static int frameCounter = 0;
+	
+	s_moveObjectListLock = true;
+	if (++frameCounter >= s_numMoveLists)
+		frameCounter = 0;
+
+	MoveObjectMap * moveMap = s_moveObjectList[frameCounter];
+	MoveObjectMap::iterator i = moveMap->begin();
+	for (; i != moveMap->end(); ++i)
+	{
+		NOT_NULL(i->first);
+		internalMoveObject(*(i->first), i->second.first, i->second.second);
+	}
+	moveMap->clear();
+	s_moveObjectListLock = false;
+}
+
+
+//-----------------------------------------------------------------------
+
+void ServerWorld::internalMoveObject(ServerObject & movingObject, const Vector & start, const Vector & end)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::moveObject");
+	
+	// check for NaN 
+	if(start == start && end == end && movingObject.getSphereExtent().getRadius() == movingObject.getSphereExtent().getRadius())
+	{
+		updateObjectDatabase(movingObject);
+		updateTriggerDatabase(movingObject);
+		triggerMovingObjects(movingObject,start,end);
+		triggerMovingTriggers(movingObject,start,end);
+	}
+	else
+	{
+		DEBUG_FATAL(start != start, ("Object %s:%s is moving from an invalid start position (NaN)", movingObject.getObjectTemplateName(), movingObject.getNetworkId().getValueString().c_str()));
+		DEBUG_FATAL(end != end, ("Object %s:%s is moving to an invalid end position (NaN)", movingObject.getObjectTemplateName(), movingObject.getNetworkId().getValueString().c_str()));
+		DEBUG_FATAL(start != start, ("Object %s:%s is moving from an invalid start position (NaN)", movingObject.getObjectTemplateName(), movingObject.getNetworkId().getValueString().c_str()));
+		DEBUG_FATAL(movingObject.getSphereExtent().getRadius() != movingObject.getSphereExtent().getRadius(), ("Object %s:%s has an invalid sphere extent radius %f", movingObject.getNetworkId().getValueString().c_str(), movingObject.getSphereExtent().getRadius()));
+	}
+	
+}
+
+//------------------------------------------------------------------------------------------
+
+void ServerWorld::remove()
+{
+	DEBUG_FATAL(!m_installed, ("Trying to reremove ServerWorld"));
+
+	DebugFlags::unregisterFlag (ms_logTriggerStats);
+	
+	World::remove ();
+
+	delete m_sceneId;
+	m_sceneId = 0;
+
+#if 0 //removed pending objects
+	ObjectMap::iterator objIter;
+	while (m_pendingObjects->size() > 0)
+	{
+		objIter = m_pendingObjects->begin();
+		object = (*objIter).second;
+		m_pendingObjects->erase(objIter);
+		delete object;
+	}
+	delete m_pendingObjects;
+	m_pendingObjects = 0;
+#endif
+	delete g_objectSphereTree;
+	g_objectSphereTree = 0;
+	delete g_triggerSphereTree;
+	g_triggerSphereTree = 0;
+
+	delete g_triggerSphereGrid;
+	g_triggerSphereGrid = 0;
+
+	delete m_idleTimer;
+	m_idleTimer =0;
+
+	delete m_weatherGenerator;
+	m_weatherGenerator = 0;
+
+	for (MoveObjectList::iterator moveIter = s_moveObjectList.begin(); moveIter != s_moveObjectList.end(); ++moveIter)
+	{
+		delete *moveIter;
+	}
+	s_moveObjectList.clear();
+	s_moveObjectListValid = false;
+
+	gs_pendingConcludeVector.clear();
+
+	CollisionWorld::setNearWarpWarningCallback(NULL);
+	CollisionWorld::setFarWarpWarningCallback(NULL);
+
+	Pvp::remove();
+
+	m_installed = false;
+}
+
+//-----------------------------------------------------------------------
+
+void ServerWorld::removeObjectTriggerVolume(TriggerVolume * triggerVolume)
+{
+	int system = ConfigServerGame::getTriggerVolumeSystem();  // 0 = old, 1 = compare, 2 = new
+	if ( system <= 1 )
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("sphere_tree_remove");
+		g_triggerSphereTree->onObjectRemoved(triggerVolume);
+	}
+
+	if ( system >= 1 )
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("sphere_grid_remove");
+		g_triggerSphereGrid->onObjectRemoved(triggerVolume);
+	}
+}
+
+//-----------------------------------------------------------------------
+/** Clean up the various lists associated with objects being destroyed.
+ */
+void ServerWorld::removeObjectFromGame(const ServerObject& object)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::removeObjectFromGame");
+	FATAL(gs_pendingConcludeLock, ("Attempt to delete an object DURING CONCLUDE"));
+	std::vector<Object *>::iterator vf = std::find(gs_pendingConcludeVector.begin(), gs_pendingConcludeVector.end(), const_cast<ServerObject *>(&object));
+	if(vf != gs_pendingConcludeVector.end())
+	{
+		*vf = gs_pendingConcludeVector.back();
+		gs_pendingConcludeVector.pop_back();
+	}
+	else
+	{
+		std::vector<std::pair<int, ServerObject *> >::iterator po = gs_pendingConcludeOpsVector.begin();
+		for (; po != gs_pendingConcludeOpsVector.end(); ++po)
+		{
+			if ((*po).second == &object)
+			{
+				IGNORE_RETURN(gs_pendingConcludeOpsVector.erase(po));
+				break;
+			}
+		}
+	}
+
+	if (s_numMoveLists > 0 && s_moveObjectListValid)
+	{
+		FATAL(s_moveObjectListLock, ("Trying to delete an object while the move lists are locked"));
+		unsigned int whichList = object.getNetworkId().getHashValue() % s_numMoveLists;
+		MoveObjectMap * moveMap = s_moveObjectList[whichList];
+		MoveObjectMap::iterator i = moveMap->find(const_cast<ServerObject*>(&object));
+		if (i != moveMap->end())
+		{
+			moveMap->erase(i);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ServerWorld::removeTangibleObject(ServerObject *object)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::removeTangibleObject");
+	DEBUG_WARNING(!object, ("removeTangibleObject() was called with a NULL object parameter, this is probably not what the program intended to do"));
+
+	if (!object)
+		return;
+	
+	if (!object->isInWorld())
+	{
+		WARNING_STRICT_FATAL(!object->isInWorld(), ("Tried to remove an object that was not in the world!"));
+		return;
+	}
+
+	// if the object is being destroyed, the trigger has already gone off
+	// player creatures aren't destroyed before being removed, so it's safe to invoke
+	// the trigger here
+	if (object->isAuthoritative() && (object->getScriptObject() != NULL) && !object->isBeingDestroyed())
+	{
+		ScriptParams params;
+		IGNORE_RETURN(object->getScriptObject()->trigAllScripts(Scripting::TRIG_REMOVING_FROM_WORLD, params));
+	}
+
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("removeTangibleObject - World::removeObject");
+		if (object->isBeingDestroyed() && World::removeObject(object, static_cast<int>(WOL_Inactive)))
+		{
+			DEBUG_REPORT_LOG(true, ("Removing deleted object %s from world\n", object->getNetworkId().getValueString().c_str()));
+			return;
+		}
+	}
+
+	DEBUG_REPORT_LOG(ConfigServerGame::getLogObjectLoading(), ("Removing object %s from world\n", object->getNetworkId().getValueString().c_str()));
+
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("removeTangibleObject - World::onRemovingFromWorld");
+		object->onRemovingFromWorld();
+	}
+
+	if (object->isAuthoritative())
+	{
+		// advise planet server that the object is gone
+		PlanetRemoveObject const removeMessage(object->getNetworkId());
+		GameServer::getInstance().sendToPlanetServer(removeMessage);
+	}
+
+	if (!object->asCellObject())
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("removeTangibleObject - Sphere tree and trigger volume cleanup");
+
+		// tell all interested trigger volume about the removal
+		if (object->getTriggerVolumeEntered())
+		{
+			std::set<TriggerVolume *> const triggerVolumeEntered = *(object->getTriggerVolumeEntered());
+			for (std::set<TriggerVolume *>::const_iterator i = triggerVolumeEntered.begin(); i != triggerVolumeEntered.end(); ++i)
+				(*i)->removeObject(*object);
+		}
+
+		// Now remove the objects in our trigger volume
+		ServerObject::TriggerVolumeMap &volumes = object->getTriggerVolumeMap();
+		for (ServerObject::TriggerVolumeMap::iterator v = volumes.begin(); v != volumes.end(); ++v)
+		{
+			TriggerVolume * const t = (*v).second;
+			TriggerVolume::ContentsSet const contents = object->getTriggerVolume(t->getName())->getContents();
+			for (TriggerVolume::ContentsSet::const_iterator objectIterator = contents.begin(); objectIterator != contents.end(); ++objectIterator)
+				t->removeObject(**objectIterator);
+			// Now remove the actual trigger volume
+			removeObjectTriggerVolume( t );
+		}
+		// remove the object sphere
+		g_objectSphereTree->onObjectRemoved(object);
+	}
+	
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("removeTangibleObject - World::removeObject 2");
+		IGNORE_RETURN(World::removeObject(object, static_cast<int>(WOL_Tangible)));
+	}
+
+	//If the object is a ref obejct, remove it.
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("removeTangibleObject - removeReferenceObject");
+		TerrainObject * const terrain = TerrainObject::getInstance ();
+		if (terrain && terrain->isReferenceObject(object))
+			terrain->removeReferenceObject(object);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ServerWorld::update(real time)
+{
+	DEBUG_FATAL(!m_installed, ("ServerWorld is NOT installed!"));
+	
+	//-- update network
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("NetworkHandler::dispatch()");
+		NetworkHandler::dispatch();
+	}
+
+	// scheduler code
+	World::beginFrame ();
+	{
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("Alter");
+			AlterScheduler::alter(time);
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("CreatureObject::runSpawnQueue");
+			CreatureObject::runSpawnQueue();
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("CreatureObject::updateMissionRequestQueue");
+			CreatureObject::updateMissionRequestQueue();
+		}
+		
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("CreatureObject::runMissionCreationQueue");
+			CreatureObject::runMissionCreationQueue();
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("TriggerVolume::runScriptTriggers");
+			TriggerVolume::runScriptTriggers();
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("Schedulers");
+			{
+				PROFILER_AUTO_BLOCK_DEFINE("Scheduler:Script");
+				GameScriptObject::getScriptScheduler().update(Clock::timeMs());
+			}
+
+			{
+				PROFILER_AUTO_BLOCK_DEFINE("Scheduler:Observe");
+				ObserveTracker::update();
+			}
+
+			{
+				PROFILER_AUTO_BLOCK_DEFINE("Scheduler:PositionUpdate");
+				PositionUpdateTracker::getScheduler().update(Clock::timeMs());
+			}
+
+			{
+				PROFILER_AUTO_BLOCK_DEFINE("Scheduler:Logout");
+				LogoutTracker::getScheduler().update(Clock::timeMs());
+			}
+
+			{
+				PROFILER_AUTO_BLOCK_DEFINE("Scheduler:Pvp");
+				Pvp::getScheduler().update(Clock::timeMs());
+			}
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("TeleportFixupHandler::update");
+			TeleportFixupHandler::update(time);
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("CombatTracker::update");
+			CombatTracker::update();
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("AuthTransferTracker::update");
+			AuthTransferTracker::update();
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("ServerPathfinding::update");
+			ServerPathfinding::update(15.0f / 1000.0f);  // 15 msec for pathfinding max
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("CollisionWorld::update");
+			CollisionWorld::update(time);
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("ProjectileManager::update");
+			ProjectileManager::update(time);
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("BaselinesManager::update");
+			ServerObjectBaselinesManager::update();
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("ContainmentMessageManager::update");
+			ContainmentMessageManager::update();
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("DestroyMessageManager::update");
+			DestroyMessageManager::update();
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("PlayerSanityChecker::update");
+			PlayerSanityChecker::update(time);
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("GuildInterface::update");
+			GuildInterface::update();
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("MissileManager::update");
+			MissileManager::getInstance().update();
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("ServerAsteroidManager::update");
+			ServerAsteroidManager::update(time);
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("ShipClientUpdateTracker::update");
+			ShipClientUpdateTracker::update(time);
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("ShipAiEnemySearchManager::update");
+			ShipAiEnemySearchManager::update();
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("NebulaManagerServer::update");
+			NebulaManagerServer::update(time);
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("ShipInternalDamageOverTimeManager::update");
+			ShipInternalDamageOverTimeManager::update(time);
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("SpaceSquadManager::alter");
+			SpaceSquadManager::alter(time);
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("SpacePathManager::alter");
+			SpacePathManager::alter(time);
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("AiCombatPulseQueue::alter");
+			AiCombatPulseQueue::alter(time);
+		}
+		
+		{		
+			PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::conclude");
+			
+			ServerObject::concludeScriptVars();
+			static std::vector<ServerObject *> deferredConcludes; // for objects not initialized
+			deferredConcludes.clear();
+
+			if (!gs_pendingConcludeVector.empty())
+			{
+				{
+					PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::emptyPending");				
+					std::vector<Object *>::iterator concludeIter;
+					gs_pendingConcludeLock = true;
+					for(concludeIter = gs_pendingConcludeVector.begin(); concludeIter != gs_pendingConcludeVector.end(); ++concludeIter)
+					{
+						ServerObject *o = (*concludeIter)->asServerObject();
+						WARNING_STRICT_FATAL(!o, ("NULL object in conclude list!"));
+						if (o)
+						{
+							if (o->isInitialized())
+								o->conclude();
+							else
+								deferredConcludes.push_back(o);
+						}
+					}
+					gs_pendingConcludeVector.clear();
+					gs_pendingConcludeLock = false;
+				}
+				{
+					PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::pendingConcludeOps");				
+					std::vector<std::pair<int, ServerObject *> >::iterator po;
+					for(po = gs_pendingConcludeOpsVector.begin(); po != gs_pendingConcludeOpsVector.end(); ++po)
+					{
+						switch((*po).first)
+						{
+							case 0:
+								addObjectToConcludeList((*po).second);
+								break;
+							case 1:
+								removeObjectFromGame(*(*po).second);
+								break;
+							default:
+								break;
+						}
+					}
+					gs_pendingConcludeOpsVector.clear();
+				}
+				{
+					PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::addDeferredConclude");				
+					std::vector<ServerObject *>::iterator i;
+					for(i = deferredConcludes.begin(); i != deferredConcludes.end(); ++i)
+					{
+						addObjectToConcludeList(*i);
+					}
+				}
+			}
+		}
+
+		if (s_numMoveLists > 0)
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("updateMoveObjectList");
+			updateMoveObjectList();
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("PvpUpdateObserver_update");
+			PvpUpdateObserver::update();
+		}
+
+#ifdef DEBUG_WEATHER
+		static int weatherFrameCount = 0;
+		if (ServerClock::getInstance().isSet() && (--weatherFrameCount <= 0))
+		{
+			weatherFrameCount = 10;
+			std::string buffer;
+			getWeather().debugPrint(buffer);
+			DEBUG_REPORT_LOG(true,("Weather data is %s\n",buffer.c_str()));
+		}
+#endif	   
+	}
+
+	updatePlanetServer();
+
+	LineOfSightCache::update();
+
+	World::endFrame ();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string &ServerWorld::getSceneId()
+{
+	NOT_NULL(m_sceneId);
+	return *m_sceneId;
+}
+
+//-----------------------------------------------------------------------
+
+const ObjectNotification &ServerWorld::getTangibleNotification()
+{
+	return ServerWorldTangibleNotification::getInstance ();
+}
+
+//-----------------------------------------------------------------------
+
+const ObjectNotification &ServerWorld::getTerrainObjectNotification()
+{
+	return ServerWorldTerrainObjectNotification::getInstance ();
+}
+
+//-----------------------------------------------------------------------
+
+const ObjectNotification &ServerWorld::getIntangibleNotification()
+{
+	return ServerWorldIntangibleNotification::getInstance ();
+}
+
+//-----------------------------------------------------------------------
+
+const ObjectNotification &ServerWorld::getUniverseNotification()
+{
+	return ServerWorldUniverseNotification::getInstance ();
+}
+
+//-------------------------------------------------------------------
+
+const WeatherData & ServerWorld::getWeather()
+{
+	NOT_NULL(m_weatherGenerator);
+	return m_weatherGenerator->getWeather(ServerClock::getInstance().getGameTimeSeconds());
+}
+
+//-----------------------------------------------------------------------
+
+void ServerWorld::addLoadBeacon(const TangibleObject * loadBeacon)
+{
+	ServerWorldNamespace::s_loadBeaconEntries.push_back(loadBeacon);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerWorld::removeLoadBeacon(const TangibleObject * loadBeacon)
+{
+	std::vector<const TangibleObject *>::iterator f = std::find(ServerWorldNamespace::s_loadBeaconEntries.begin(), ServerWorldNamespace::s_loadBeaconEntries.end(), loadBeacon);
+	if (f != ServerWorldNamespace::s_loadBeaconEntries.end())
+		IGNORE_RETURN(ServerWorldNamespace::s_loadBeaconEntries.erase(f));
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerWorld::isInLoadBeaconRange(const Vector & worldPosition)
+{
+	std::vector<const TangibleObject *>::const_iterator i;
+	for(i = ServerWorldNamespace::s_loadBeaconEntries.begin(); i != ServerWorldNamespace::s_loadBeaconEntries.end(); ++i)
+	{
+		float radius = static_cast<float>((*i)->getInterestRadius()) + 300.0f;
+		radius = radius * radius * 2;
+		Vector beaconPosition = (*i)->getTransform_o2w().getPosition_p();
+		if(beaconPosition.magnitudeBetweenSquared(worldPosition) < radius)
+			return true;
+	}
+	return false;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Finds a "good" location in the world where we can place an object. Good is 
+ * defined as a resonably flat area, not in water, where the object being placed
+ * won't intersect other objects. The caller may disable the slope or water check
+ * if they want.
+ *
+ * @param areaSizeX		       the x size that should be clear
+ * @param areaSizeZ		       the z size that should be clear
+ * @param searchRectLowerLeftLocation     ll position of the area to look for a good location
+ * @param searchRectUpperRightLocation    ur position of the area to look for a good location
+ * @param dontCheckWater		  flag to skip the underwater check
+ * @param dontCheckSlope		  flag to skip the slope check
+ *
+ * @return a position in the world where the object can be placed, or 0 0 0 if 
+ * there is no valid position
+ */
+Vector ServerWorld::getGoodLocation(float areaSizeX, float areaSizeZ, 
+	const Vector & searchRectLowerLeftLocation, 
+	const Vector & searchRectUpperRightLocation, 
+	bool dontCheckWater, bool dontCheckSlope)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::getGoodLocation");
+
+	Vector goodLocation;
+
+	TerrainObject const * const terrainObject = TerrainObject::getInstance ();
+	if (!terrainObject)
+	{
+		DEBUG_WARNING (true, ("getGoodLocation (): PB there is no terrain system"));
+		return goodLocation;
+	}
+
+	LotManager const * const lotManager = ServerWorld::getConstLotManager ();
+	if (!lotManager)
+	{
+		DEBUG_WARNING (true, ("getGoodLocation (): PB there is no lot system"));
+		return goodLocation;
+	}
+
+	//build searching rectangles from the given locations
+	const float minimum = -8192.f + 512.f;
+	const float maximum =  8192.f - 512.f;
+
+	Rectangle2d searchRect;
+	searchRect.x0 = searchRectLowerLeftLocation.x;
+	searchRect.x0 = clamp (minimum, searchRectLowerLeftLocation.x, maximum);
+	searchRect.y0 = searchRectLowerLeftLocation.z;
+	searchRect.y0 = clamp (minimum, searchRectLowerLeftLocation.z, maximum);
+	searchRect.x1 = searchRectUpperRightLocation.x;
+	searchRect.x1 = clamp (minimum, searchRectUpperRightLocation.x, maximum);
+	searchRect.y1 = searchRectUpperRightLocation.z;
+	searchRect.y1 = clamp (minimum, searchRectUpperRightLocation.z, maximum);
+
+	//validate scripter-input rectangle areas > 0
+	if (searchRect.x0 > searchRect.x1)
+	{
+		DEBUG_WARNING (true, ("getGoodLocation (): DB searchRect.x0 (%1.2f) > searchRect.x1 (%1.2f)", searchRect.x0, searchRect.x1));
+		return goodLocation;
+	}
+
+	if (searchRect.y0 > searchRect.y1)
+	{
+		DEBUG_WARNING (true, ("getGoodLocation (): DB searchRect.z0 (%1.2f) > searchRect.z1 (%1.2f)", searchRect.y0, searchRect.y1));
+		return goodLocation;
+	}
+
+	//validate that the area we want to find is smaller than our search area
+	if (areaSizeX > searchRect.getWidth())
+	{
+		DEBUG_WARNING (true, ("getGoodLocation (): DB goal rectangle x (%1.2f) is larger than our search rectangle width (%1.2f)", areaSizeX, searchRect.getWidth()));
+		return goodLocation;
+	}
+
+	if (areaSizeZ > searchRect.getHeight())
+	{
+		DEBUG_WARNING (true, ("getGoodLocation (): DB goal rectangle y (%1.2f) is larger than our search rectangle height (%1.2f)", areaSizeZ, searchRect.getHeight()));
+		return goodLocation;
+	}
+
+	Rectangle2d startingRect;
+	startingRect.x0 = searchRect.x0;
+	startingRect.y0 = searchRect.y0;
+	startingRect.x1 = startingRect.x0 + areaSizeX;
+	startingRect.y1 = startingRect.y0 + areaSizeZ;
+
+	//generate vectors with a random raster range
+	int numRows = static_cast<int>(floor(searchRect.getWidth() / areaSizeX));
+	int numCols = static_cast<int>(floor(searchRect.getHeight() / areaSizeZ));
+	static std::vector<int> xRange;
+	static std::vector<int> yRange;
+	xRange.clear();
+	yRange.clear();
+	for(int i = 0; i < numRows; ++i)
+		xRange.push_back(i);
+	for(int j = 0; j < numCols; ++j)
+		yRange.push_back(j);
+
+	std::random_shuffle(xRange.begin(), xRange.end());
+	std::random_shuffle(yRange.begin(), yRange.end());
+
+	Rectangle2d successRect;
+	bool success = false;
+	Rectangle2d currentRect;
+	for(std::vector<int>::iterator it_x = xRange.begin(); it_x != xRange.end()  && !success; ++it_x)
+	{
+		for(std::vector<int>::iterator it_y = yRange.begin(); it_y != yRange.end() && !success; ++it_y)
+		{
+			currentRect = startingRect;
+
+			//jump to the random raster area
+			currentRect.translate(*it_x * areaSizeX, *it_y * areaSizeZ);
+
+			//the rectangle is a "good location" if it has neither water nor a steep slope
+			if (!dontCheckWater && terrainObject->getWater (currentRect))
+				continue;
+
+			if (!dontCheckSlope && terrainObject->getSlope (currentRect))
+				continue;
+
+			if (!lotManager->canPlace (currentRect))
+				continue;
+
+			success = true;
+			successRect = currentRect;
+		}
+	}
+
+	if (!success)
+		return goodLocation;
+
+	//validate that our success point lies within the search area (debugging tests)
+	if (successRect.x0 < searchRect.x0 || successRect.x1 > searchRect.x1 || successRect.y0 < searchRect.y0 || successRect.y1 > searchRect.y1)
+	{
+		DEBUG_WARNING (true, ("getGoodLocation (): PB result does not fit within the search location"));
+		return goodLocation;
+	}
+
+	//get the center as a 2d point
+	Vector2d successLoc2d = successRect.getCenter();
+
+	//conver that point into a location-friendly 3d point
+	goodLocation = Vector(successLoc2d.x, 0.f, successLoc2d.y);
+
+	IGNORE_RETURN( terrainObject->getHeightForceChunkCreation(goodLocation, goodLocation.y) );
+
+	return goodLocation;
+}	// ServerWorld::getGoodLocation
+
+//-----------------------------------------------------------------------
+
+/**
+* Finds a "good" location in the world where we can place an object. Good is 
+* defined as a resonably flat area, not in water, where the object being placed
+* won't intersect other objects. The caller may disable the slope or water check
+* if they want. This function checks for nearby collidable static objects as well.
+*
+* @param areaSizeX		       the x size that should be clear
+* @param areaSizeZ		       the z size that should be clear
+* @param searchRectLowerLeftLocation     ll position of the area to look for a good location
+* @param searchRectUpperRightLocation    ur position of the area to look for a good location
+* @param dontCheckWater		  flag to skip the underwater check
+* @param dontCheckSlope		  flag to skip the slope check
+* @param minStaticObjDistance the minimum distance a static object must be away from a "good" location
+*
+* @return a position in the world where the object can be placed, or 0 0 0 if 
+* there is no valid position
+*/
+Vector ServerWorld::getGoodLocationAvoidCollidables(float areaSizeX, float areaSizeZ, 
+									const Vector & searchRectLowerLeftLocation, 
+									const Vector & searchRectUpperRightLocation, 
+									bool dontCheckWater, bool dontCheckSlope, float minStaticObjDistance)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::getGoodLocation");
+
+	Vector goodLocation;
+
+	TerrainObject const * const terrainObject = TerrainObject::getInstance ();
+	if (!terrainObject)
+	{
+		DEBUG_WARNING (true, ("getGoodLocation (): PB there is no terrain system"));
+		return goodLocation;
+	}
+
+	LotManager const * const lotManager = ServerWorld::getConstLotManager ();
+	if (!lotManager)
+	{
+		DEBUG_WARNING (true, ("getGoodLocation (): PB there is no lot system"));
+		return goodLocation;
+	}
+
+	//build searching rectangles from the given locations
+	const float minimum = -8192.f + 512.f;
+	const float maximum =  8192.f - 512.f;
+
+	Rectangle2d searchRect;
+	searchRect.x0 = searchRectLowerLeftLocation.x;
+	searchRect.x0 = clamp (minimum, searchRectLowerLeftLocation.x, maximum);
+	searchRect.y0 = searchRectLowerLeftLocation.z;
+	searchRect.y0 = clamp (minimum, searchRectLowerLeftLocation.z, maximum);
+	searchRect.x1 = searchRectUpperRightLocation.x;
+	searchRect.x1 = clamp (minimum, searchRectUpperRightLocation.x, maximum);
+	searchRect.y1 = searchRectUpperRightLocation.z;
+	searchRect.y1 = clamp (minimum, searchRectUpperRightLocation.z, maximum);
+
+	//validate scripter-input rectangle areas > 0
+	if (searchRect.x0 > searchRect.x1)
+	{
+		DEBUG_WARNING (true, ("getGoodLocation (): DB searchRect.x0 (%1.2f) > searchRect.x1 (%1.2f)", searchRect.x0, searchRect.x1));
+		return goodLocation;
+	}
+
+	if (searchRect.y0 > searchRect.y1)
+	{
+		DEBUG_WARNING (true, ("getGoodLocation (): DB searchRect.z0 (%1.2f) > searchRect.z1 (%1.2f)", searchRect.y0, searchRect.y1));
+		return goodLocation;
+	}
+
+	//validate that the area we want to find is smaller than our search area
+	if (areaSizeX > searchRect.getWidth())
+	{
+		DEBUG_WARNING (true, ("getGoodLocation (): DB goal rectangle x (%1.2f) is larger than our search rectangle width (%1.2f)", areaSizeX, searchRect.getWidth()));
+		return goodLocation;
+	}
+
+	if (areaSizeZ > searchRect.getHeight())
+	{
+		DEBUG_WARNING (true, ("getGoodLocation (): DB goal rectangle y (%1.2f) is larger than our search rectangle height (%1.2f)", areaSizeZ, searchRect.getHeight()));
+		return goodLocation;
+	}
+
+	Rectangle2d startingRect;
+	startingRect.x0 = searchRect.x0;
+	startingRect.y0 = searchRect.y0;
+	startingRect.x1 = startingRect.x0 + areaSizeX;
+	startingRect.y1 = startingRect.y0 + areaSizeZ;
+
+	//generate vectors with a random raster range
+	int numRows = static_cast<int>(floor(searchRect.getWidth() / areaSizeX));
+	int numCols = static_cast<int>(floor(searchRect.getHeight() / areaSizeZ));
+	static std::vector<int> xRange;
+	static std::vector<int> yRange;
+	xRange.clear();
+	yRange.clear();
+	for(int i = 0; i < numRows; ++i)
+		xRange.push_back(i);
+	for(int j = 0; j < numCols; ++j)
+		yRange.push_back(j);
+
+	std::random_shuffle(xRange.begin(), xRange.end());
+	std::random_shuffle(yRange.begin(), yRange.end());
+
+	Rectangle2d successRect;
+	bool success = false;
+	Rectangle2d currentRect;
+	for(std::vector<int>::iterator it_x = xRange.begin(); it_x != xRange.end()  && !success; ++it_x)
+	{
+		for(std::vector<int>::iterator it_y = yRange.begin(); it_y != yRange.end() && !success; ++it_y)
+		{
+			currentRect = startingRect;
+
+			//jump to the random raster area
+			currentRect.translate(*it_x * areaSizeX, *it_y * areaSizeZ);
+
+			//the rectangle is a "good location" if it has neither water nor a steep slope
+			if (!dontCheckWater && terrainObject->getWater (currentRect))
+				continue;
+
+			if (!dontCheckSlope && terrainObject->getSlope (currentRect))
+				continue;
+
+			if (!lotManager->canPlace (currentRect))
+				continue;
+			
+			// Look for nearby static collidable objects.
+			std::vector<ServerObject*> collidables;
+			Vector2d Loc2d = currentRect.getCenter();
+			Vector checkLoc = Vector(Loc2d.x, 0.f, Loc2d.y);
+
+			ServerWorld::findStaticCollidableObjectsInRange(checkLoc, minStaticObjDistance, collidables);
+
+			if(!collidables.empty())
+				continue;
+
+			success = true;
+			successRect = currentRect;
+		}
+	}
+
+	if (!success)
+		return goodLocation;
+
+	//validate that our success point lies within the search area (debugging tests)
+	if (successRect.x0 < searchRect.x0 || successRect.x1 > searchRect.x1 || successRect.y0 < searchRect.y0 || successRect.y1 > searchRect.y1)
+	{
+		DEBUG_WARNING (true, ("getGoodLocation (): PB result does not fit within the search location"));
+		return goodLocation;
+	}
+
+	//get the center as a 2d point
+	Vector2d successLoc2d = successRect.getCenter();
+
+	//convert that point into a location-friendly 3d point
+	goodLocation = Vector(successLoc2d.x, 0.f, successLoc2d.y);
+
+	IGNORE_RETURN( terrainObject->getHeightForceChunkCreation(goodLocation, goodLocation.y) );
+
+	return goodLocation;
+}	// ServerWorld::getGoodLocationAvoidCollidables
+
+// ----------------------------------------------------------------------
+
+void ServerWorld::requestPreloadCompleteTrigger(ServerObject &obj)
+{
+	if (s_preloadComplete)
+		doPreloadCompleteTrigger(obj);
+	else
+		s_preloadCompleteTriggerObjects.push_back(Watcher<ServerObject>(&obj));
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorld::onPreloadComplete()
+{
+	if (!s_preloadComplete)
+	{
+		NamedObjectManager::createZoneObjects();
+
+		s_preloadComplete = true;
+		for (std::vector<Watcher<ServerObject> >::const_iterator i = s_preloadCompleteTriggerObjects.begin(); i != s_preloadCompleteTriggerObjects.end(); ++i)
+			if ((*i).getPointer())
+				doPreloadCompleteTrigger(*((*i).getPointer()));
+		s_preloadCompleteTriggerObjects.clear();
+	}
+
+	if (isSpaceScene())
+		ServerAsteroidManager::setupStaticFields(getSceneId());
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerWorld::isPreloadComplete()
+{
+	return s_preloadComplete;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerWorld::isSpaceScene()
+{
+	if (!s_checkedForSpaceScene)
+	{
+		s_spaceScene=(strncmp("space_",getSceneId().c_str(),6)==0);
+		s_checkedForSpaceScene=true;
+	}
+
+	return s_spaceScene;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorldNamespace::checkSpaceBattlefieldZone()
+{
+	Iff iff;
+	if (iff.open(s_spaceBattlefieldDataTableFilename, true))
+	{
+		DataTable dataTable;
+		dataTable.load(iff);
+
+		char const * const zoneName = ConfigServerGame::getSceneID();
+
+		int const numberOfRows = dataTable.getNumRows();
+		for (int row = 0; row < numberOfRows; ++row)
+		{
+			if (!_stricmp(zoneName, dataTable.getStringValue("zoneName", row)))
+			{
+				s_isSpaceBattlefieldZone = true;
+				s_isSpaceBattlefieldZoneWithPvp = (dataTable.getIntValue("pvp", row) != 0);
+				break;
+			}
+		}
+	}
+	s_checkedSpaceBattlefieldZone = true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerWorld::isSpaceBattlefieldZone()
+{
+	if (!s_checkedSpaceBattlefieldZone)
+		checkSpaceBattlefieldZone();
+
+	return s_isSpaceBattlefieldZone;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerWorld::isSpaceBattlefieldZoneWithPvp()
+{
+	if (!s_checkedSpaceBattlefieldZone)
+		checkSpaceBattlefieldZone();
+
+	return s_isSpaceBattlefieldZoneWithPvp;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorld::getSpatialChatListeners(ServerObject &source, float distance, std::vector<ServerObject *> &results)
+{
+	if (ServerWorld::isSpaceScene())
+	{
+		ShipObject * const ship = ShipObject::getContainingShipObject(&source);
+		if (ship)
+		{
+			// All creatures in the ship where the speech is taking place should hear it
+			ship->findAllPassengers(*reinterpret_cast<std::vector<CreatureObject *> *>(&results), false);
+			// If the speaker is a player in a ship station, then all player ships in range should hear it
+			if (source.isPlayerControlled() && !source.isInWorld())
+			{
+				PlayerShipFilter const filter(ship);
+				g_objectSphereTree->findInRange(0, ship->getPosition_p(), distance, filter, results);
+			}
+		}
+	}
+	else
+		findObjectsInRange(source.findPosition_w(), distance, results);
+}
+
+// ----------------------------------------------------------------------
+
+int ServerWorld::getNumMoveLists(std::vector<int> & moveListSize)
+{
+	moveListSize.clear();
+
+	for (MoveObjectList::const_iterator moveIter = s_moveObjectList.begin(); moveIter != s_moveObjectList.end(); ++moveIter)
+	{
+		moveListSize.push_back(static_cast<int>((*moveIter)->size()));
+	}
+
+	return s_numMoveLists;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorld::setNumMoveLists(int numMoveLists)
+{
+	if (!s_moveObjectListValid)
+		return;
+
+	// this method can only be used to change the number of move lists;
+	// it cannot be used to enable or disable the use of move lists
+	if ((s_numMoveLists <= 0) || (numMoveLists <= 0))
+		return;
+
+	if (s_numMoveLists == numMoveLists)
+		return;
+
+	// save off the original move lists
+	MoveObjectList orgMoveObjectList(s_moveObjectList);
+
+	// create new move lists
+	s_numMoveLists = numMoveLists;
+	s_moveObjectList.clear();
+
+	for (int i = 0; i < s_numMoveLists; ++i)
+	{
+		s_moveObjectList.push_back(new MoveObjectMap);
+	}
+
+	// rebuild new move lists from original move lists and delete original move lists
+	for (MoveObjectList::iterator moveIter = orgMoveObjectList.begin(); moveIter != orgMoveObjectList.end(); ++moveIter)
+	{
+		for (MoveObjectMap::const_iterator i = (*moveIter)->begin(); i != (*moveIter)->end(); ++i)
+		{
+			moveObject(*(i->first), i->second.first, i->second.second);
+		}
+
+		delete *moveIter;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorldNamespace::doPreloadCompleteTrigger(ServerObject &obj)
+{
+	if (obj.isAuthoritative() && obj.getScriptObject())
+	{
+		ScriptParams params;
+		IGNORE_RETURN(obj.getScriptObject()->trigAllScripts(Scripting::TRIG_PRELOAD_COMPLETE, params));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorldNamespace::updatePlanetServer()
+{
+	int const objectCount = World::getNumberOfObjects(WOL_Tangible);
+	int updateCount = ConfigServerGame::getSpacePlanetServerUpdatesPerFrame();
+
+	if (updateCount && objectCount && ServerWorld::isSpaceScene())
+	{
+		while (updateCount)
+		{
+			++s_planetServerUpdateIndex;
+			if (s_planetServerUpdateIndex >= objectCount)
+			{
+				s_planetServerUpdateIndex = 0;
+				break;
+			}
+			Object const * const o = World::getConstObject(WOL_Tangible, s_planetServerUpdateIndex);
+			if (o)
+			{
+				ServerObject const * const so = o->asServerObject();
+				if (so)
+				{
+					ShipObject const * const ship = so->asShipObject();
+					if (ship)
+					{
+						UpdateObjectOnPlanetMessage const msg(
+							ship->getNetworkId(),
+							ship->getNetworkId(),
+							static_cast<int>(ship->getPosition_p().x),
+							static_cast<int>(ship->getPosition_p().y),
+							static_cast<int>(ship->getPosition_p().z),
+							ship->isPlayerShip() ? 1 : 0,
+							0,
+							false,
+							false,
+							static_cast<int>(ship->getObjectType()),
+							0,
+							false,
+							ship->getTemplateCrc(),
+							-1,
+							-1);
+						GameServer::getInstance().sendToPlanetServer(msg);
+						--updateCount;
+					}
+				}
+			}
+		}
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/core/ServerWorld.h b/engine/server/library/serverGame/src/shared/core/ServerWorld.h
new file mode 100644
index 00000000..e0861d7e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerWorld.h
@@ -0,0 +1,198 @@
+// ServerWorld.h
+// copyright 2000 Verant Interactive
+// Author: Justin Randall
+
+#ifndef	_SERVER_WORLD_H
+#define	_SERVER_WORLD_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedObject/World.h"
+
+//-----------------------------------------------------------------------
+
+class CachedNetworkId;
+class CellObject;
+class CellProperty;
+class Client;
+class DraftSchematicObject;
+class Location;
+class ManufactureSchematicObject;
+class Object;
+class ObjectList;
+class ObjectNotification;
+class PlayerObject;
+class ResourceClassObject;
+class ServerObject;
+class ServerObjectTemplate;
+class ServerWorldIntangibleNotification;
+class ServerWorldTangibleNotification;
+class ServerWorldTerrainObjectNotification;
+class ServerWorldUniverseNotification;
+class SlotId;
+class Sphere;
+class SynchronizedWeatherGenerator;
+class TangibleObject;
+class Timer;
+class Transform;
+class TriggerVolume;
+class UniverseObject;
+class WeatherData;
+class Vector;
+
+//-----------------------------------------------------------------------
+
+class ServerWorld : public World
+{
+public:
+	friend class ServerWorldTangibleNotification;
+	friend class ServerWorldIntangibleNotification;
+	friend class ServerWorldUniverseNotification;
+	friend class ServerWorldTerrainObjectNotification;
+
+	typedef ServerWorldTangibleNotification      TangibleNotification;
+	typedef ServerWorldIntangibleNotification    IntangibleNotification;
+	typedef ServerWorldUniverseNotification      UniverseNotification;
+	typedef ServerWorldTerrainObjectNotification TerrainObjectNotification;
+
+public:
+
+	static const ObjectNotification  &getTangibleNotification      ();
+	static const ObjectNotification  &getTerrainObjectNotification ();
+	static const ObjectNotification  &getIntangibleNotification    ();
+	static const ObjectNotification  &getUniverseNotification      ();
+
+	static ServerObject *       findObjectByNetworkId          (const NetworkId& id, bool searchQueuedList=false);
+	static ServerObject *       findUninitializedObjectByNetworkId(const NetworkId& id);
+	static void                 findObjectsInRange             (const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
+	static void                 findStaticCollidableObjectsInRange (const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
+	static void                 findCreaturesInRange           (const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
+	static void                 findAuthoritativeNonPlayerCreaturesInRange(const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
+	static void                 findCreaturesOfNicheInRange    (const Vector & location, const float distance, int niche, int mask, stdvector<ServerObject *>::fwd & results);
+	static void                 findCreaturesOfSpeciesInRange  (const Vector & location, const float distance, int species, stdvector<ServerObject *>::fwd & results);
+	static void                 findCreaturesOfRaceInRange     (const Vector & location, const float distance, int species, int race, stdvector<ServerObject *>::fwd & results);
+	static void                 findNonCreaturesInRange        (const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
+	static void                 findNPCsInRange                (const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
+	static void                 findPlayerCreaturesInRange     (const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
+
+	static void                 findObjectsInCone              (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
+	static void                 findObjectsInCone              (const Object & coneCenterObject, const Location & coneDirection, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
+	static void                 findCreaturesInCone            (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
+	static void                 findCreaturesInCone            (const Object & coneCenterObject, const Location & coneDirection, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
+	static void                 findAuthoritativeNonPlayerCreaturesInCone(const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
+	static void                 findCreaturesOfNicheInCone     (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int niche, int mask, stdvector<ServerObject *>::fwd & results);
+	static void                 findCreaturesOfSpeciesInCone   (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int species, stdvector<ServerObject *>::fwd & results);
+	static void                 findCreaturesOfRaceInCone      (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int species, int race, stdvector<ServerObject *>::fwd & results);
+	static void                 findNonCreaturesInCone         (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
+	static void                 findNPCsInCone                 (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
+	static void                 findPlayerCreaturesInCone      (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
+
+	static ServerObject *       findClosestNPC                 (const Vector & location, float distance);
+	static ServerObject *       findClosestPlayer              (const Vector & location, float distance);
+	
+	static ServerObject *       findPobAtLocation              (const Vector & location_w);
+	static CellProperty const * findCellAtLocation             (const Vector & location_w);
+
+	static int                  getNumObjects                  (void);
+	static ServerObject *       getObject                      (int index); //lint !e1511 //ok to hide base function
+	static void                 install                        (void); //lint !e1511 //ok to hide base function
+
+	static void                 moveObject                     (ServerObject & movingObject, const Vector & start, const Vector & end);
+	static void                 remove                         (void); //lint !e1511 //ok to hide base function
+	static void                 removeObject                   (ServerObject * object);
+	static void                 removeObjectFromGame           (const ServerObject& object);
+	static void                 update                         (real time); //lint !e1511 //ok to hide base function
+
+	// object creation functions
+	static ServerObject*        createNewObject                 (std::string const &templateName, Transform const &transform, ServerObject *cell, bool persisted, bool hyperspace = false);
+	static ServerObject*        createNewObject                 (uint32 templateCrc, Transform const &transform, ServerObject *cell, bool persisted, bool hyperspace = false);
+	static ServerObject*        createNewObject                 (ServerObjectTemplate const &objectTemplate, Transform const &transform, ServerObject *cell, bool persisted, bool hyperspace = false);
+	static ServerObject*        createNewObject                 (std::string const &templateName, ServerObject &container, bool persisted, bool allowOverload = false);
+	static ServerObject*        createNewObject                 (uint32 templateCrc, ServerObject &container, bool persisted, bool allowOverload = false);
+	static ServerObject*        createNewObject                 (ServerObjectTemplate const &objectTemplate, ServerObject &container, bool persisted, bool allowOverloaded = false);
+	static ServerObject*        createNewObject                 (std::string const &templateName, ServerObject &container, SlotId const &slotId, bool persisted);
+	static ServerObject*        createNewObject                 (uint32 templateCrc, ServerObject &container, SlotId const &slotId, bool persisted);
+	static ServerObject*        createNewObject                 (ServerObjectTemplate const &objectTemplate, ServerObject &container, SlotId const &slotId, bool persisted);
+	static ManufactureSchematicObject * createNewManufacturingSchematic(const CachedNetworkId & creator, ServerObject & container, const SlotId & slotId, bool persisted);
+	static ManufactureSchematicObject * createNewManufacturingSchematic(const DraftSchematicObject & source, const Vector & position, bool persisted);
+	static ManufactureSchematicObject * createNewManufacturingSchematic(const DraftSchematicObject & source, ServerObject & container, bool persisted);
+	static ServerObject*        createProxyObject               (std::string const &templateName, NetworkId const &newId, bool createAuthoritative);
+	static ServerObject*        createProxyObject               (uint32 templateCrc, NetworkId const &newId, bool createAuthoritative);
+
+	static void                 addObjectTriggerVolume          (TriggerVolume * triggerVolume);
+	static void                 addObjectToConcludeList         (ServerObject * object);
+	static void                 removeObjectFromConcludeList    (ServerObject * object);
+	static void                 debugDump                       (void); //lint !e1511 //ok to hide base function
+	static const std::string &  getSceneId                      (void);
+	static bool                 isSpaceScene                    ();
+	static bool                 isSpaceBattlefieldZone          ();
+	static bool                 isSpaceBattlefieldZoneWithPvp   ();
+	static void                 removeObjectTriggerVolume       (TriggerVolume * triggerVolume);
+
+	static void                 dumpObjectSphereTree            (stdvector<std::pair<ServerObject *, Sphere> >::fwd & results);
+	static void                 dumpTriggerSphereTree           (stdvector<std::pair<TriggerVolume *, Sphere> >::fwd & results);
+
+	static const WeatherData &  getWeather                      ();
+
+	static void                 addLoadBeacon                   (const TangibleObject * loadBeacon);
+	static void                 removeLoadBeacon                (const TangibleObject * loadBeacon);
+	static bool                 isInLoadBeaconRange             (const Vector & worldPosition);
+
+	static Vector               getGoodLocation                 (float areaSizeX, float areaSizeY, const Vector & searchRectLowerLeftLocation, const Vector & searchRectUpperRightLocation, bool dontCheckWater, bool dontCheckSlope);
+	static Vector               getGoodLocationAvoidCollidables (float areaSizeX, float areaSizeY, const Vector & searchRectLowerLeftLocation, const Vector & searchRectUpperRightLocation, bool dontCheckWater, bool dontCheckSlope, float minStaticObjDistance);
+	
+	static void                 requestPreloadCompleteTrigger   (ServerObject &obj);
+	static void                 onPreloadComplete               ();
+	static bool                 isPreloadComplete               ();
+
+	static void                 getSpatialChatListeners(ServerObject &source, float distance, stdvector<ServerObject *>::fwd &results);
+
+	static int                  getNumMoveLists(stdvector<int>::fwd & moveListSize);
+	static void                 setNumMoveLists(int numMoveLists);
+
+protected:
+	friend class ServerObjectLint;
+	static ServerObject *       createObjectFromTemplate(const std::string &templateName, const NetworkId & newId);
+	static ServerObject *       createObjectFromTemplate(uint32 templateCrc, const NetworkId & newId);
+	static ServerObject *       createObjectFromTemplate(const ServerObjectTemplate &objectTemplate, const NetworkId & newId);
+
+private:
+	ServerWorld();
+	ServerWorld(const ServerWorld & other);
+	ServerWorld& operator=(const ServerWorld & other);
+	~ServerWorld();
+
+	static ServerObject* createNewObjectIntermediate(ServerObject* newObject, const Transform & transform, ServerObject *cell, bool persisted);  ///< Called by CreateNewObject(*) functions.  This is provided to share code.
+	static ServerObject* createNewObjectIntermediate(ServerObject* newObject, ServerObject & container, bool persisted, bool);  ///< Called by CreateNewObject(*) functions.  This is provided to share code.
+	static ServerObject* createNewObjectIntermediate(ServerObject* newObject, ServerObject & container, const SlotId & slotId, bool persisted);
+
+	static ServerObject *findClosestObjectInList(const Vector &location, const stdvector<ServerObject*>::fwd &candidates);
+
+	static void    addTangibleObject(ServerObject * object);
+	static void    removeTangibleObject(ServerObject * object);
+
+	static void    addIntangibleObject(Object * object);
+	static void    removeIntangibleObject(Object * object);
+
+	static void    addUniverseObject(UniverseObject * object);
+	static void    removeUniverseObject(UniverseObject * object);
+
+
+	static void    internalMoveObject(ServerObject & movingObject, const Vector & start, const Vector & end);
+	static void    updateMoveObjectList();
+	static void    updateObjectDatabase            (ServerObject & movingObject);
+	static void    updateTriggerDatabase           (ServerObject & movingObject);
+	static void    triggerMovingObjects            (ServerObject & movingObject, const Vector & start, const Vector & end);
+	static void    triggerMovingTriggers           (ServerObject & movingObject, const Vector & start, const Vector & end);
+
+	static bool	                           m_installed;
+    static Timer *                         m_idleTimer;
+	static std::string *                   m_sceneId;
+
+	static SynchronizedWeatherGenerator *  m_weatherGenerator;
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _SERVER_WORLD_H
+
diff --git a/engine/server/library/serverGame/src/shared/core/ServerWorldIntangibleNotification.cpp b/engine/server/library/serverGame/src/shared/core/ServerWorldIntangibleNotification.cpp
new file mode 100644
index 00000000..ab5dbc61
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerWorldIntangibleNotification.cpp
@@ -0,0 +1,45 @@
+//======================================================================
+//
+// ServerWorldIntangibleNotification.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerWorldIntangibleNotification.h"
+
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerWorld.h"
+
+//======================================================================
+
+ServerWorldIntangibleNotification ServerWorldIntangibleNotification::ms_instance;
+
+//----------------------------------------------------------------------
+
+ServerWorldIntangibleNotification::ServerWorldIntangibleNotification()
+: ObjectNotification()
+{
+}
+
+// ----------------------------------------------------------------------
+
+ServerWorldIntangibleNotification::~ServerWorldIntangibleNotification()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorldIntangibleNotification::addToWorld(Object &object) const
+{
+	ServerWorld::addIntangibleObject(safe_cast<ServerObject *>(&object));
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorldIntangibleNotification::removeFromWorld(Object &object) const
+{
+	ServerWorld::removeIntangibleObject(safe_cast<ServerObject *>(&object));
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/ServerWorldIntangibleNotification.h b/engine/server/library/serverGame/src/shared/core/ServerWorldIntangibleNotification.h
new file mode 100644
index 00000000..f401ecd0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerWorldIntangibleNotification.h
@@ -0,0 +1,45 @@
+//======================================================================
+//
+// ServerWorldIntangibleNotification.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ServerWorldIntangibleNotification_H
+#define INCLUDED_ServerWorldIntangibleNotification_H
+
+//======================================================================
+
+#include "sharedObject/ObjectNotification.h"
+
+//----------------------------------------------------------------------
+
+class ServerWorldIntangibleNotification : public ObjectNotification
+{
+public:
+	ServerWorldIntangibleNotification();
+	virtual ~ServerWorldIntangibleNotification();
+	
+	virtual void addToWorld(Object &object) const;
+	virtual void removeFromWorld(Object &object) const;
+	
+	static const ServerWorldIntangibleNotification & getInstance ();
+
+private:
+	
+	ServerWorldIntangibleNotification (const ServerWorldIntangibleNotification &);
+	ServerWorldIntangibleNotification &operator =(const ServerWorldIntangibleNotification &);
+
+	static ServerWorldIntangibleNotification ms_instance;
+};
+
+//----------------------------------------------------------------------
+
+inline const ServerWorldIntangibleNotification & ServerWorldIntangibleNotification::getInstance ()
+{
+	return ms_instance;
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/ServerWorldTangibleNotification.cpp b/engine/server/library/serverGame/src/shared/core/ServerWorldTangibleNotification.cpp
new file mode 100644
index 00000000..b5c01826
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerWorldTangibleNotification.cpp
@@ -0,0 +1,45 @@
+//======================================================================
+//
+// ServerWorldTangibleNotification.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerWorldTangibleNotification.h"
+
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerWorld.h"
+
+//======================================================================
+
+ServerWorldTangibleNotification ServerWorldTangibleNotification::ms_instance;
+
+//----------------------------------------------------------------------
+
+ServerWorldTangibleNotification::ServerWorldTangibleNotification()
+: ObjectNotification()
+{
+}
+
+// ----------------------------------------------------------------------
+
+ServerWorldTangibleNotification::~ServerWorldTangibleNotification()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorldTangibleNotification::addToWorld(Object &object) const
+{
+	ServerWorld::addTangibleObject(safe_cast<ServerObject *>(&object));
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorldTangibleNotification::removeFromWorld(Object &object) const
+{
+	ServerWorld::removeTangibleObject(safe_cast<ServerObject *>(&object));
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/ServerWorldTangibleNotification.h b/engine/server/library/serverGame/src/shared/core/ServerWorldTangibleNotification.h
new file mode 100644
index 00000000..3ac2d6d4
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerWorldTangibleNotification.h
@@ -0,0 +1,45 @@
+//======================================================================
+//
+// ServerWorldTangibleNotification.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ServerWorldTangibleNotification_H
+#define INCLUDED_ServerWorldTangibleNotification_H
+
+//======================================================================
+
+#include "sharedObject/ObjectNotification.h"
+
+//----------------------------------------------------------------------
+
+class ServerWorldTangibleNotification : public ObjectNotification
+{
+public:
+	ServerWorldTangibleNotification();
+	virtual ~ServerWorldTangibleNotification();
+	
+	virtual void addToWorld(Object &object) const;
+	virtual void removeFromWorld(Object &object) const;
+	
+	static const ServerWorldTangibleNotification & getInstance ();
+
+private:
+	
+	ServerWorldTangibleNotification(const ServerWorldTangibleNotification &);
+	ServerWorldTangibleNotification &operator =(const ServerWorldTangibleNotification &);
+
+	static ServerWorldTangibleNotification ms_instance;
+};
+
+//----------------------------------------------------------------------
+
+inline const ServerWorldTangibleNotification & ServerWorldTangibleNotification::getInstance ()
+{
+	return ms_instance;
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/ServerWorldTerrainObjectNotification.cpp b/engine/server/library/serverGame/src/shared/core/ServerWorldTerrainObjectNotification.cpp
new file mode 100644
index 00000000..2b1729b5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerWorldTerrainObjectNotification.cpp
@@ -0,0 +1,44 @@
+//======================================================================
+//
+// ServerWorldTerrainObjectNotification.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerWorldTerrainObjectNotification.h"
+
+#include "serverGame/ServerWorld.h"
+#include "sharedTerrain/TerrainObject.h"
+
+//======================================================================
+
+ServerWorldTerrainObjectNotification ServerWorldTerrainObjectNotification::ms_instance;
+
+//----------------------------------------------------------------------
+
+ServerWorldTerrainObjectNotification::ServerWorldTerrainObjectNotification()
+: ObjectNotification()
+{
+}
+
+// ----------------------------------------------------------------------
+
+ServerWorldTerrainObjectNotification::~ServerWorldTerrainObjectNotification()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorldTerrainObjectNotification::addToWorld(Object &object) const
+{
+	ServerWorld::addIntangibleObject(safe_cast<TerrainObject *>(&object));
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorldTerrainObjectNotification::removeFromWorld(Object &object) const
+{
+	ServerWorld::removeIntangibleObject(safe_cast<TerrainObject *>(&object));
+}
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/ServerWorldTerrainObjectNotification.h b/engine/server/library/serverGame/src/shared/core/ServerWorldTerrainObjectNotification.h
new file mode 100644
index 00000000..c0e2ea51
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerWorldTerrainObjectNotification.h
@@ -0,0 +1,45 @@
+//======================================================================
+//
+// ServerWorldTerrainObjectNotification.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ServerWorldTerrainObjectNotification_H
+#define INCLUDED_ServerWorldTerrainObjectNotification_H
+
+//======================================================================
+
+#include "sharedObject/ObjectNotification.h"
+
+//----------------------------------------------------------------------
+
+class ServerWorldTerrainObjectNotification : public ObjectNotification
+{
+public:
+	ServerWorldTerrainObjectNotification();
+	virtual ~ServerWorldTerrainObjectNotification();
+	
+	virtual void addToWorld(Object &object) const;
+	virtual void removeFromWorld(Object &object) const;
+	
+	static const ServerWorldTerrainObjectNotification & getInstance ();
+	
+private:
+	
+	ServerWorldTerrainObjectNotification(const ServerWorldTerrainObjectNotification &);
+	ServerWorldTerrainObjectNotification &operator =(const ServerWorldTerrainObjectNotification &);
+
+	static ServerWorldTerrainObjectNotification ms_instance;
+};
+
+//----------------------------------------------------------------------
+
+inline const ServerWorldTerrainObjectNotification & ServerWorldTerrainObjectNotification::getInstance ()
+{
+	return ms_instance;
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/ServerWorldUniverseNotification.cpp b/engine/server/library/serverGame/src/shared/core/ServerWorldUniverseNotification.cpp
new file mode 100644
index 00000000..603f3835
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerWorldUniverseNotification.cpp
@@ -0,0 +1,45 @@
+//======================================================================
+//
+// ServerWorldUniverseNotification.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerWorldUniverseNotification.h"
+
+#include "serverGame/ServerWorld.h"
+#include "serverGame/UniverseObject.h"
+
+//======================================================================
+
+ServerWorldUniverseNotification ServerWorldUniverseNotification::ms_instance;
+
+//----------------------------------------------------------------------
+
+ServerWorldUniverseNotification::ServerWorldUniverseNotification()
+: ObjectNotification()
+{
+}
+
+// ----------------------------------------------------------------------
+
+ServerWorldUniverseNotification::~ServerWorldUniverseNotification()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorldUniverseNotification::addToWorld(Object &object) const
+{
+	ServerWorld::addUniverseObject(safe_cast<UniverseObject *>(&object));
+}
+
+// ----------------------------------------------------------------------
+
+void ServerWorldUniverseNotification::removeFromWorld(Object &object) const
+{
+	ServerWorld::removeUniverseObject(safe_cast<UniverseObject *>(&object));
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/ServerWorldUniverseNotification.h b/engine/server/library/serverGame/src/shared/core/ServerWorldUniverseNotification.h
new file mode 100644
index 00000000..7f3ba0d3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/ServerWorldUniverseNotification.h
@@ -0,0 +1,45 @@
+//======================================================================
+//
+// ServerWorldUniverseNotification.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ServerWorldUniverseNotification_H
+#define INCLUDED_ServerWorldUniverseNotification_H
+
+//======================================================================
+
+#include "sharedObject/ObjectNotification.h"
+
+//----------------------------------------------------------------------
+
+class ServerWorldUniverseNotification : public ObjectNotification
+{
+public:
+	ServerWorldUniverseNotification();
+	virtual ~ServerWorldUniverseNotification();
+	
+	virtual void addToWorld(Object &object) const;
+	virtual void removeFromWorld(Object &object) const;
+	
+	static const ServerWorldUniverseNotification & getInstance ();
+
+private:
+	
+	ServerWorldUniverseNotification(const ServerWorldUniverseNotification &);
+	ServerWorldUniverseNotification &operator =(const ServerWorldUniverseNotification &);
+
+	static ServerWorldUniverseNotification ms_instance;
+};
+
+//----------------------------------------------------------------------
+
+inline const ServerWorldUniverseNotification & ServerWorldUniverseNotification::getInstance ()
+{
+	return ms_instance;
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/SetupServerGame.cpp b/engine/server/library/serverGame/src/shared/core/SetupServerGame.cpp
new file mode 100644
index 00000000..a8dadf30
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/SetupServerGame.cpp
@@ -0,0 +1,125 @@
+// ======================================================================
+//
+// SetupServerGame.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/SetupServerGame.h"
+
+#include "serverGame/AiServerShipObjectInterface.h"
+#include "serverGame/AttribModNameManager.h"
+#include "serverGame/AuthTransferTracker.h"
+#include "serverGame/BiographyManager.h"
+#include "serverGame/BuffManager.h"
+#include "serverGame/CombatTracker.h"
+#include "serverGame/CommandCppFuncs.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ConsoleManager.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/DraftSchematicObject.h"
+#include "serverGame/InstantDeleteList.h"
+#include "serverGame/LogoutTracker.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/NonCriticalTaskQueue.h"
+#include "serverGame/ObserveTracker.h"
+#include "serverGame/PlayerCreationManagerServer.h"
+#include "serverGame/PositionUpdateTracker.h"
+#include "serverGame/ServerBuffBuilderManager.h"
+#include "serverGame/ServerBuildoutManager.h"
+#include "serverGame/ServerImageDesignerManager.h"
+#include "serverGame/ServerSecureTradeManager.h"
+#include "serverGame/ServerUIManager.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipInternalDamageOverTimeManager.h"
+#include "serverGame/SpacePathManager.h"
+#include "serverGame/SpaceSquad.h"
+#include "serverGame/SpaceSquadManager.h"
+#include "serverGame/SurveySystem.h"
+#include "serverScript/GameScriptObject.h"
+#include "sharedSkillSystem/ExpertiseManager.h"
+#include "sharedSkillSystem/LevelManager.h"
+#include "serverUtility/AdminAccountManager.h"
+
+// ======================================================================
+
+void SetupServerGame::install()
+{
+	ConfigServerGame::install();
+
+	// AdminAccountManager::install doesn't belong here it belongs
+	// in ServerUtility but uses data from the ConfigServerGame
+	AdminAccountManager::install(ConfigServerGame::getAdminAccountDataTable());
+
+	BiographyManager::install();
+	BuffManager::install();
+	CommandCppFuncs::install();
+	CombatTracker::install();
+	AttribModNameManager::install();
+	ServerWorld::install();
+	IGNORE_RETURN(GameScriptObject::installScriptEngine());
+	ConsoleMgr::install();
+	ObserveTracker::install();
+	PositionUpdateTracker::install();
+	LogoutTracker::install();
+	AuthTransferTracker::install();
+	NonCriticalTaskQueue::install(static_cast<NonCriticalTaskQueue*>(NULL));
+	SurveySystem::install(static_cast<SurveySystem*>(NULL));
+	CreatureObject::install();
+	NameManager::install();
+	MessageToQueue::install();
+	ServerUIManager::install();
+	ServerImageDesignerManager::install();
+	ServerBuffBuilderManager::install();
+	InstantDeleteList::install();
+	PlayerCreationManagerServer::install();
+	DraftSchematicObject::install();
+	ServerSecureTradeManager::install();
+	ShipInternalDamageOverTimeManager::install();
+	SpaceSquad::install();
+	SpaceSquadManager::install();
+	SpacePathManager::install();
+	AiServerShipObjectInterface::install();
+	ServerBuildoutManager::install();
+	ExpertiseManager::install();
+	LevelManager::install();
+}
+
+// ----------------------------------------------------------------------
+
+void SetupServerGame::remove()
+{
+	ServerSecureTradeManager::remove();
+	DraftSchematicObject::remove();
+	PlayerCreationManagerServer::remove();
+	ServerUIManager::remove();
+	MessageToQueue::remove();
+	PositionUpdateTracker::remove();
+	ObserveTracker::remove();
+	LogoutTracker::remove();
+	AuthTransferTracker::remove();
+	ConsoleMgr::remove();
+	GameScriptObject::removeScriptEngine();
+	ServerWorld::remove();
+	CombatTracker::remove();
+	CommandCppFuncs::remove();
+	BuffManager::remove();
+	BiographyManager::remove();
+	GameServer::remove();
+
+	// the following are all removed by ExitChain
+	// InstantDeleteList
+	// KnowledgeBaseManager
+	// NameManager
+	// CreatureObject
+	// SurveySystem
+	// NonCriticalTaskQueue
+	// AttribModNameManager
+	// ShipInternalDamageOverTimeManager
+	// ServerBuildoutManager
+
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/SetupServerGame.h b/engine/server/library/serverGame/src/shared/core/SetupServerGame.h
new file mode 100644
index 00000000..e8fd543c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/SetupServerGame.h
@@ -0,0 +1,28 @@
+// ======================================================================
+//
+// SetupServerGame.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_SetupServerGame_H
+#define INCLUDED_SetupServerGame_H
+
+// ======================================================================
+
+class SetupServerGame
+{
+public:
+
+	static void install();
+	static void remove();
+
+private:
+	SetupServerGame();
+	SetupServerGame(const SetupServerGame &);
+	SetupServerGame &operator =(const SetupServerGame &);
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/StaticLootItemManager.cpp b/engine/server/library/serverGame/src/shared/core/StaticLootItemManager.cpp
new file mode 100644
index 00000000..8202f8d1
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/StaticLootItemManager.cpp
@@ -0,0 +1,95 @@
+// ======================================================================
+//
+// StaticLootItemManager.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/StaticLootItemManager.h"
+
+#include "serverGame/CreatureObject.h"
+#include "serverGame/NonCriticalTaskQueue.h"
+#include "serverGame/TaskGetAttributes.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedObject/NetworkIdManager.h"
+
+// ======================================================================
+
+int const MAX_ATTRIBS = 2000;
+
+// ======================================================================
+
+void StaticLootItemManager::sendDataToClient(NetworkId const & playerId, std::string const & staticItemName)
+{
+	Object * const o = NetworkIdManager::getObjectById(playerId);
+	ServerObject * const so = o ? o->asServerObject() : NULL;
+	CreatureObject * const co = so ? so->asCreatureObject() : NULL;
+
+	if(co)
+	{
+		ScriptParams params;
+		params.addParam(staticItemName.c_str());
+		IGNORE_RETURN(co->getScriptObject()->trigAllScripts(Scripting::TRIG_REQUEST_STATIC_ITEM_DATA, params));
+	}
+
+	TaskGetAttributes * const task = new TaskGetAttributes(playerId, staticItemName, 1);
+	NonCriticalTaskQueue::getInstance().addTask(task);
+}
+
+//----------------------------------------------------------------------
+
+void StaticLootItemManager::getAttributes(NetworkId const & playerId, std::string const & staticItemName, AttributeVector & data)
+{
+	Object * const o = NetworkIdManager::getObjectById(playerId);
+	ServerObject * const so = o ? o->asServerObject() : NULL;
+	CreatureObject * const co = so ? so->asCreatureObject() : NULL;
+	if(co)
+	{
+		GameScriptObject * const gso = const_cast<GameScriptObject *>(co->getScriptObject());
+		if (gso && gso->hasTrigger (Scripting::TRIG_GET_STATIC_ITEM_ATTRIBS))
+		{
+			// allow scripts to add attribute data to the vector
+			static std::vector<const char *>            names   (MAX_ATTRIBS, static_cast<const char *>(0));
+			static std::vector<const Unicode::String *> attribs (MAX_ATTRIBS, static_cast<const Unicode::String *>(0));
+
+			//-- clear the vectors
+			names.clear    ();
+			attribs.clear  ();
+			names.resize   (MAX_ATTRIBS, static_cast<const char *>(0));
+			attribs.resize (MAX_ATTRIBS, static_cast<const Unicode::String *>(0));
+
+			ScriptParams params;
+			params.addParam (staticItemName.c_str());
+			params.addParam (names);
+			params.addParam (attribs);
+
+			IGNORE_RETURN(gso->trigAllScripts(Scripting::TRIG_GET_STATIC_ITEM_ATTRIBS, params));
+
+			std::vector<const char *> const & newNames              = params.getStringArrayParam  (1);
+			std::vector<const Unicode::String *> const & newAttribs = params.getUnicodeArrayParam (2);
+
+			data.clear();
+
+			// copy the returned strings to data
+			for (int i = 0; i < MAX_ATTRIBS; ++i)
+			{
+				char const * const            newName   = newNames   [i];
+				Unicode::String const * const newAttrib = newAttribs [i];
+
+				if (newName && *newName && newAttrib && !newAttrib->empty ())
+				{
+					data.push_back (std::make_pair (std::string (newName), *newAttrib));
+				}
+				else
+					break;
+			}
+		}
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/core/StaticLootItemManager.h b/engine/server/library/serverGame/src/shared/core/StaticLootItemManager.h
new file mode 100644
index 00000000..c940304a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/StaticLootItemManager.h
@@ -0,0 +1,30 @@
+// ======================================================================
+//
+// StaticLootItemManager.h
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_StaticLootItemManager_H
+#define INCLUDED_StaticLootItemManager_H
+
+// ======================================================================
+
+class NetworkId;
+
+// ======================================================================
+
+class StaticLootItemManager
+{
+public:
+	typedef stdvector<std::pair<std::string, Unicode::String> >::fwd AttributeVector;
+
+	static void sendDataToClient(NetworkId const & playerId, std::string const & staticItemName);
+	static void getAttributes(NetworkId const & playerId, std::string const & staticItemName, AttributeVector & data);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_StaticLootItemManager_H
+
diff --git a/engine/server/library/serverGame/src/shared/core/SuiPageDataServer.cpp b/engine/server/library/serverGame/src/shared/core/SuiPageDataServer.cpp
new file mode 100644
index 00000000..7a085617
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/SuiPageDataServer.cpp
@@ -0,0 +1,117 @@
+//======================================================================
+//
+// SuiPageDataServer.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/SuiPageDataServer.h"
+
+#include "Archive/Archive.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedGame/SuiPageDataArchive.h"
+
+//======================================================================
+
+SuiPageDataServer::SuiPageDataServer(int pageId, std::string const & pageName, NetworkId const & ownerId) :
+m_pageData(pageId, pageName),
+m_ownerId(ownerId),
+m_active(false),
+m_updateCommandIndex(0)
+{
+}
+
+//----------------------------------------------------------------------
+
+SuiPageDataServer::SuiPageDataServer() :
+m_pageData(),
+m_ownerId(),
+m_active(false),
+m_updateCommandIndex(0)
+{
+}
+
+//----------------------------------------------------------------------
+
+SuiPageDataServer & SuiPageDataServer::operator =(const SuiPageDataServer & rhs)
+{
+	if(this != &rhs)
+	{
+		m_pageData = rhs.m_pageData;
+		m_ownerId = rhs.m_ownerId;
+		m_active = rhs.m_active;
+		m_updateCommandIndex = rhs.m_updateCommandIndex;
+	}
+	return *this;
+}
+
+//----------------------------------------------------------------------
+
+SuiPageDataServer::SuiPageDataServer(const SuiPageDataServer& in) :
+m_pageData(in.m_pageData),
+m_ownerId(in.m_ownerId),
+m_active(in.m_active),
+m_updateCommandIndex(in.m_updateCommandIndex)
+{
+}
+
+//----------------------------------------------------------------------
+
+void SuiPageDataServer::setActive()
+{
+	m_active = true;
+}
+
+//----------------------------------------------------------------------
+
+void SuiPageDataServer::markUpdateCommandIndex()
+{
+	m_updateCommandIndex = static_cast<int>(m_pageData.getCommands().size());
+}
+
+//----------------------------------------------------------------------
+
+bool SuiPageDataServer::getPageUpdate(SuiPageData & pageData)
+{
+	if (m_pageData.getPageUpdate(m_updateCommandIndex, pageData))
+	{
+		markUpdateCommandIndex();
+		return true;
+	}
+
+	return false;
+}
+
+//----------------------------------------------------------------------
+
+void SuiPageDataServer::get(Archive::ReadIterator & source)
+{
+	Archive::get(source, m_pageData);
+	Archive::get(source, m_ownerId);
+	Archive::get(source, m_active);
+	Archive::get(source, m_updateCommandIndex);
+}
+
+//----------------------------------------------------------------------
+
+void SuiPageDataServer::put(Archive::ByteStream & target) const
+{
+	Archive::put(target, m_pageData);
+	Archive::put(target, m_ownerId);
+	Archive::put(target, static_cast<uint8>(m_active));
+	Archive::put(target, m_updateCommandIndex);
+}
+
+//----------------------------------------------------------------------
+
+bool SuiPageDataServer::operator==(SuiPageDataServer const & rhs) const
+{
+	return 
+		m_pageData == rhs.m_pageData &&
+		m_ownerId == rhs.m_ownerId &&
+		m_active == rhs.m_active &&
+		m_updateCommandIndex == rhs.m_updateCommandIndex;
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/SuiPageDataServer.h b/engine/server/library/serverGame/src/shared/core/SuiPageDataServer.h
new file mode 100644
index 00000000..dcec5351
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/SuiPageDataServer.h
@@ -0,0 +1,87 @@
+//======================================================================
+//
+// SuiPageDataServer.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_SuiPageDataServer_H
+#define INCLUDED_SuiPageDataServer_H
+
+//======================================================================
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedGame/SuiPageData.h"
+
+//----------------------------------------------------------------------
+
+class SuiPageDataServer
+{
+public:
+
+	explicit SuiPageDataServer(int pageId, std::string const & pageName, NetworkId const & ownerId);
+	SuiPageDataServer & operator=(const SuiPageDataServer & rhs);
+	SuiPageDataServer();
+	SuiPageDataServer(const SuiPageDataServer & source);
+
+	SuiPageData & getPageData();
+	SuiPageData const & getPageData() const;
+	NetworkId const & getOwnerId() const;
+	bool isActive() const;
+
+	void setActive();
+	void markUpdateCommandIndex();
+	bool getPageUpdate(SuiPageData & pageData);
+
+public:
+
+	bool operator==(SuiPageDataServer const & rhs) const;
+	bool operator!=(SuiPageDataServer const & rhs) const;
+	void get(Archive::ReadIterator & source);
+	void put(Archive::ByteStream & target) const;	
+
+private:
+	SuiPageData m_pageData;
+	NetworkId m_ownerId;
+	bool m_active;
+	int m_updateCommandIndex;
+};
+
+//----------------------------------------------------------------------
+
+inline SuiPageData & SuiPageDataServer::getPageData()
+{
+	return m_pageData;
+}
+
+//----------------------------------------------------------------------
+
+inline SuiPageData const & SuiPageDataServer::getPageData() const
+{
+	return m_pageData;
+}
+
+//----------------------------------------------------------------------
+
+inline NetworkId const & SuiPageDataServer::getOwnerId() const
+{
+	return m_ownerId;
+}
+
+//----------------------------------------------------------------------
+
+inline bool SuiPageDataServer::operator!=(SuiPageDataServer const & rhs) const
+{
+	return !(*this==rhs);
+}
+
+//----------------------------------------------------------------------
+
+inline bool SuiPageDataServer::isActive() const
+{
+	return m_active;
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/SuiPageDataServerArchive.cpp b/engine/server/library/serverGame/src/shared/core/SuiPageDataServerArchive.cpp
new file mode 100644
index 00000000..585cdd2a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/SuiPageDataServerArchive.cpp
@@ -0,0 +1,29 @@
+//======================================================================
+//
+// SuiPageDataServerArchive.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/SuiPageDataServerArchive.h"
+
+#include "serverGame/SuiPageDataServer.h"
+
+//======================================================================
+
+namespace Archive
+{
+	void get(ReadIterator & source, SuiPageDataServer & target)
+	{
+		target.get(source);
+	}
+
+
+	void put(ByteStream & target, const SuiPageDataServer & source)
+	{
+		source.put(target);
+	}
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/SuiPageDataServerArchive.h b/engine/server/library/serverGame/src/shared/core/SuiPageDataServerArchive.h
new file mode 100644
index 00000000..a04dc6c0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/SuiPageDataServerArchive.h
@@ -0,0 +1,28 @@
+//======================================================================
+//
+// SuiPageDataServerArchive.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_SuiPageDataServerArchive_H
+#define INCLUDED_SuiPageDataServerArchive_H
+
+//======================================================================
+
+class SuiPageDataServer;
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+
+	void get(ReadIterator & source, SuiPageDataServer & target);
+	void put(ByteStream & target, const SuiPageDataServer & source);
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/TaskGetAttributes.cpp b/engine/server/library/serverGame/src/shared/core/TaskGetAttributes.cpp
new file mode 100644
index 00000000..7fcd18a3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/TaskGetAttributes.cpp
@@ -0,0 +1,116 @@
+// ======================================================================
+//
+// TaskGetAttributes.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/TaskGetAttributes.h"
+
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/StaticLootItemManager.h"
+#include "sharedFoundation/Crc.h"
+#include "sharedNetworkMessages/AttributeListMessage.h"
+#include "sharedObject/NetworkIdManager.h"
+
+#include "UnicodeUtils.h"
+
+// ======================================================================
+
+TaskGetAttributes::TaskGetAttributes(NetworkId const & playerId, NetworkId const & targetId, int const clientRevision) :
+	m_playerId(playerId),
+	m_targetId(targetId),
+	m_staticItemName(),
+	m_clientRevision(clientRevision)
+{
+}
+
+// ----------------------------------------------------------------------
+
+TaskGetAttributes::TaskGetAttributes(NetworkId const & playerId, std::string const & staticItemName, int const clientRevision) :
+	m_playerId(playerId),
+	m_targetId(),
+	m_staticItemName(staticItemName),
+	m_clientRevision(clientRevision)
+{
+}
+
+// ----------------------------------------------------------------------
+
+bool TaskGetAttributes::run()
+{
+	CreatureObject * const playerCreature = CreatureObject::getCreatureObject(m_playerId);
+	if (playerCreature)
+	{
+		PlayerObject * const player = PlayerCreatureController::getPlayerObject(playerCreature);
+		if (player) 
+		{
+			Client const * const client = GameServer::getInstance().getClient(m_playerId);
+			if (client)
+			{
+				static ServerObject::AttributeVector data;
+				data.clear();
+				int serverRevision = -127; // an arbitrary value that is not the same as the initial client revision on the game client (ObjectAttributesManager.cpp).
+				bool forceAttributeUpdate = false;
+
+				if(!m_staticItemName.empty())
+				{
+					StaticLootItemManager::getAttributes(m_playerId, m_staticItemName, data);
+					AttributeListMessage const msg(m_staticItemName, data, serverRevision);
+					client->send(msg, true);
+				}
+				else
+				{
+					ServerObject const * const obj = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(m_targetId));
+					if (obj)
+					{
+						serverRevision = obj->getAttributeRevision();
+
+						if (obj->hasAttributeCaching() && !player->isCrafting()) 
+						{
+							if (serverRevision != m_clientRevision) 
+								obj->getAttributes(m_playerId, data);
+						}
+						else
+						{
+							obj->getAttributes(m_playerId, data);
+							forceAttributeUpdate = true;
+						}
+					}
+					else
+					{
+						ResourceTypeObject const * const resourceType = ServerUniverse::getInstance().getResourceTypeById(m_targetId);
+						if (resourceType)
+						{
+							serverRevision = 0; // rls - these values don't change (at this time).
+							if (serverRevision != m_clientRevision) 
+								resourceType->getResourceAttributes(data);
+						}
+						else
+						{
+							serverRevision = static_cast<int>(player->getWaypoints().size());
+							if (serverRevision != m_clientRevision)
+								player->getWaypointAttributes(m_targetId, data);
+						}
+					}
+
+					if (serverRevision != m_clientRevision || forceAttributeUpdate == true)
+					{
+						AttributeListMessage const msg(m_targetId, data, serverRevision);
+						client->send(msg, true);
+					}
+				}
+			}
+		}
+	}
+	return true;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/TaskGetAttributes.h b/engine/server/library/serverGame/src/shared/core/TaskGetAttributes.h
new file mode 100644
index 00000000..205a7d7a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/TaskGetAttributes.h
@@ -0,0 +1,37 @@
+// ======================================================================
+//
+// TaskGetAttributes.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_TaskGetAttributes_H
+#define INCLUDED_TaskGetAttributes_H
+
+// ======================================================================
+
+#include "serverGame/NonCriticalTaskQueue.h"
+#include "sharedFoundation/NetworkId.h"
+
+// ----------------------------------------------------------------------
+
+/**
+ * Get the attributes for an object and send them to the specified client.
+ */
+class TaskGetAttributes : public NonCriticalTaskQueue::TaskRequest
+{
+  public:
+	TaskGetAttributes(NetworkId const & playerId, NetworkId const & target, int clientRevision);
+	TaskGetAttributes(NetworkId const & playerId, std::string const & staticItemName, int clientRevision);
+	virtual bool run();
+	
+  private:
+	NetworkId m_playerId;
+	NetworkId m_targetId;
+	std::string m_staticItemName;
+	int m_clientRevision;
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/core/TeleportFixupHandler.cpp b/engine/server/library/serverGame/src/shared/core/TeleportFixupHandler.cpp
new file mode 100644
index 00000000..ea3a9154
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/TeleportFixupHandler.cpp
@@ -0,0 +1,53 @@
+// ======================================================================
+//
+// TeleportFixupHandler.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/TeleportFixupHandler.h"
+#include "serverGame/ServerObject.h"
+#include "sharedLog/Log.h"
+#include <list>
+
+// ======================================================================
+
+const float TELEPORT_FIXUP_TIMEOUT_SEC = 20.0f;
+static std::list<std::pair<Watcher<ServerObject>, float> > s_teleportFixups;
+
+// ======================================================================
+
+void TeleportFixupHandler::add(ServerObject &obj)
+{
+	s_teleportFixups.push_back(std::make_pair(Watcher<ServerObject>(&obj), TELEPORT_FIXUP_TIMEOUT_SEC));
+	LOG("TeleportFixup", ("Adding %s to teleport fixup handler\n", obj.getNetworkId().getValueString().c_str()));
+}
+
+// ----------------------------------------------------------------------
+
+void TeleportFixupHandler::update(float time)
+{
+	// Run through the list, trying to fix up any outstanding teleports and counting down the timers
+	// When we try the teleport fixup, we force it if we've timed out, and we remove fixups from the
+	// list when either the object cannot be found, is no longer authoritative, or succeeds at the
+	// fixup (which it always will when forced).
+	std::list<std::pair<Watcher<ServerObject>, float> >::iterator i = s_teleportFixups.begin();
+	while (i != s_teleportFixups.end())
+	{
+		ServerObject *obj = (*i).first.getPointer();
+		(*i).second -= time;
+		if (!obj || !obj->isAuthoritative() || obj->handleTeleportFixup((*i).second <= 0.0f))
+		{
+			IGNORE_RETURN(s_teleportFixups.erase(i++));
+			if (obj)
+				LOG("TeleportFixup", ("Removing %s from teleport fixup handler, was forced: %s\n", obj->getNetworkId().getValueString().c_str(), ((*i).second <= 0.0f) ? "true" : "false"));
+		}
+		else
+			++i;
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/core/TeleportFixupHandler.h b/engine/server/library/serverGame/src/shared/core/TeleportFixupHandler.h
new file mode 100644
index 00000000..b9ba1531
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/TeleportFixupHandler.h
@@ -0,0 +1,33 @@
+// ======================================================================
+//
+// TeleportFixupHandler.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _TeleportFixupHandler_H_
+#define _TeleportFixupHandler_H_
+
+// ======================================================================
+
+class ServerObject;
+
+// ======================================================================
+
+class TeleportFixupHandler
+{
+public:
+	static void add(ServerObject &obj);
+	static void update(float time);
+
+private:
+	TeleportFixupHandler();
+	TeleportFixupHandler(TeleportFixupHandler const &);
+	TeleportFixupHandler &operator=(TeleportFixupHandler const &);
+};
+
+// ======================================================================
+
+#endif // _TeleportFixupHandler_H_
+
diff --git a/engine/server/library/serverGame/src/shared/core/VeteranRewardManager.cpp b/engine/server/library/serverGame/src/shared/core/VeteranRewardManager.cpp
new file mode 100644
index 00000000..06497c4b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/VeteranRewardManager.cpp
@@ -0,0 +1,1975 @@
+// ======================================================================
+//
+// VeteranRewardManager.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/VeteranRewardManager.h"
+
+#include "StringId.h"
+#include "UnicodeUtils.h"
+#include "serverGame/Chat.h"
+#include "serverGame/Client.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerObjectTemplate.h"
+#include "serverGame/ServerWorld.h"
+#include "serverNetworkMessages/AccountFeatureIdRequest.h"
+#include "serverNetworkMessages/AdjustAccountFeatureIdRequest.h"
+#include "serverNetworkMessages/AdjustAccountFeatureIdResponse.h"
+#include "serverNetworkMessages/ClaimRewardsMessage.h"
+#include "serverNetworkMessages/ClaimRewardsReplyMessage.h"
+#include "serverNetworkMessages/FeatureIdTransactionSyncUpdate.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptDictionary.h"
+#include "serverScript/ScriptParameters.h"
+#include "Session/CommonAPI/CommonAPI.h"
+#include "sharedFoundation/CalendarTime.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/CrcLowerString.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedGame/OutOfBandPackager.h"
+#include "sharedGame/PlatformFeatureBits.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/VolumeContainer.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+#include <algorithm>
+
+// ======================================================================
+
+namespace VeteranRewardManagerNamespace
+{
+	std::string const ms_rewardItemsTableName("datatables/veteran_rewards/items.iff");
+	std::string const ms_rewardEventsTableName("datatables/veteran_rewards/events.iff");
+
+	std::string const ms_consumedEventsObjvar("veteran_rewards.events_consumed");
+	std::string const ms_claimedItemsObjvar("veteran_rewards.items_claimed");
+	std::string const ms_featureIdTransactionObjvar("feature_id_transaction");
+	std::string const ms_tcgRedemptionInProgressObjvar("tcgRedemptionInProgress");
+
+	std::string const ms_tradeInInProgressObjvar("tradeInInProgress");
+
+	std::string const TRADE_IN_SCRIPT("systems.veteran_reward.trade_in");
+
+	bool ms_installed = false;
+
+	class RewardItem
+	{
+	public:
+		RewardItem(DataTable const & dataTable, int row);
+
+		std::string const & getId() const;
+		StringId const & getDescription() const;
+		std::string const & getObjectTemplateName() const;
+		bool getOncePerAccount() const;
+		bool getOncePerAccountFeatureId() const;
+		bool getOncePerCharacter() const;
+		bool getCanTradeIn() const;
+		bool grantToPlayer(CreatureObject & playerCreature, uint32 accountFeatureId, int previousAccountFeatureIdCount, int currentAccountFeatureIdCount, bool regrant = false) const;
+		int getMoney() const;
+		
+	private:
+		std::string const m_id;
+		StringId const m_description;
+		std::string const m_objectTemplateName;
+		int const m_money;
+		bool const m_oncePerAccount;
+		bool const m_oncePerAccountFeatureId;
+		bool const m_oncePerCharacter;
+		bool const m_canTradeIn;
+		//TODO: replacable items
+
+	private:  //disable:
+		RewardItem();  
+		RewardItem(RewardItem const &);
+		RewardItem & operator=(RewardItem const &);
+	};
+
+	class RewardEvent
+	{
+	public:
+		RewardEvent(DataTable const & dataTable, int row);
+
+	public:
+		std::string const & getId() const;
+		StringId const & getAnnouncement() const;
+		StringId const & getDescription() const;
+		std::string const & getUrl() const;
+		std::vector<std::pair<RewardItem const *, RewardEvent const *> > const & getRewardItems() const;
+		int getCategory() const;
+		int getFeatureBitRewardExclusionMask() const;
+		bool hasPlayerTriggered(CreatureObject const & playerCreature) const;
+		bool getOncePerAccount() const;
+		uint32 getAccountFeatureId() const;
+		bool getConsumeAccountFeatureId() const;
+			
+	private:
+		int const m_rowId;
+		std::string const m_id;
+		std::vector<std::string> const m_specificItems;
+		std::vector<std::string> const m_includeItemsFrom;
+		std::vector<std::pair<RewardItem const *, RewardEvent const *> > mutable * m_allItems;
+		int const m_category;
+		int const m_featureBitRewardExclusionMask;
+		uint32 const m_accountFlags;
+		uint32 const m_accountFeatureId;
+		bool const m_consumeAccountFeatureId;
+		unsigned int const m_minAccountAge;
+		int const m_minCharacterAge;
+		std::string const m_characterObjvar;
+		bool const m_oncePerAccount;
+		StringId const m_annoucement;
+		StringId const m_description;
+		std::string const m_url;
+		time_t const m_startDate;
+		time_t const m_endDate;
+		int const m_minBuddyPoints;
+		int const m_featureIdBlockedBySubscriptionBit;
+
+	private:  //disable:
+		RewardEvent();  
+		RewardEvent(RewardEvent const &); 
+		RewardEvent & operator=(RewardEvent const &);		
+	};
+
+	typedef std::map<std::string, RewardItem *> RewardItemsType;
+	typedef std::map<std::string, RewardEvent *> RewardEventsType;
+	typedef std::vector<RewardEvent *> OrderedRewardEventsType;
+	typedef std::map<uint32, std::pair<std::string, uint32> > CanTradeInRewardTemplateItemType;
+	typedef std::map<std::string, std::pair<std::string, uint32> > CanTradeInRewardStaticItemType;
+	typedef std::set<uint32> CanTradeInRewardFeatureIdType;
+	typedef std::map<uint32, uint32> FeatureIdBlockedBySubscriptionBitMap;
+
+	RewardItemsType ms_rewardItems;
+	RewardEventsType ms_rewardEvents;
+	OrderedRewardEventsType ms_orderedRewardEvents;
+	CanTradeInRewardTemplateItemType ms_canTradeInRewardTemplateItem;
+	CanTradeInRewardStaticItemType ms_canTradeInRewardStaticItem;
+	CanTradeInRewardFeatureIdType ms_canTradeInRewardFeatureId;
+	FeatureIdBlockedBySubscriptionBitMap ms_featureIdBlockedBySubscriptionBits;
+	int ms_overrideAccountAge=0;
+
+	RewardEvent * getRewardEventByName(std::string const & eventName);
+	RewardItem  * getRewardItemByName(std::string const & itemName);
+	
+	time_t yyyymmddToTime(int const yyyy, int const mm, int const dd);
+	std::vector<std::string> buildVectorFromString(std::string packedString);
+}
+
+using namespace VeteranRewardManagerNamespace;
+
+// ======================================================================
+
+void VeteranRewardManager::install()
+{
+	DEBUG_FATAL(ms_installed,("Programmer bug:  VeteranRewardManager::install() called twice"));
+	ms_installed = true;
+	ExitChain::add(VeteranRewardManager::remove, "VeteranRewardManager::remove");
+
+	if (ConfigServerGame::getEnableNewVeteranRewards())
+	{
+		{
+			DataTable * data = NON_NULL(DataTableManager::getTable(ms_rewardItemsTableName, true));
+			int const numRows = data->getNumRows();
+			for (int row=0; row<numRows; ++row)
+			{
+				RewardItem * newItem = new RewardItem(*data,row);		
+				std::pair<RewardItemsType::iterator, bool> result = ms_rewardItems.insert(std::make_pair(newItem->getId(), newItem));
+				FATAL(!result.second,("Data bug:  Reward item %s was specified more than once in data table %s",newItem->getId().c_str(), ms_rewardItemsTableName.c_str()));		
+			}
+
+			for (RewardItemsType::const_iterator iterRewardItem = ms_rewardItems.begin(); iterRewardItem != ms_rewardItems.end(); ++iterRewardItem)
+			{
+				std::string const & objectTemplateName = iterRewardItem->second->getObjectTemplateName();
+				uint32 templateItemCrc = 0;
+				if (objectTemplateName.find(".iff") != std::string::npos)
+					templateItemCrc = CrcLowerString::calculateCrc(objectTemplateName.c_str());
+
+				if (templateItemCrc > 0)
+				{
+					CanTradeInRewardTemplateItemType::const_iterator const iterFind = ms_canTradeInRewardTemplateItem.find(templateItemCrc);
+					if (iterFind != ms_canTradeInRewardTemplateItem.end())
+						FATAL((iterFind->second.first != iterRewardItem->second->getId()), ("Data bug:  \"can trade in\" reward object template (%s) can only be defined as the reward object for 1 reward item", objectTemplateName.c_str()));
+				}
+				else
+				{
+					CanTradeInRewardStaticItemType::const_iterator const iterFind = ms_canTradeInRewardStaticItem.find(objectTemplateName);
+					if (iterFind != ms_canTradeInRewardStaticItem.end())
+						FATAL((iterFind->second.first != iterRewardItem->second->getId()), ("Data bug:  \"can trade in\" reward object template (%s) can only be defined as the reward object for 1 reward item", objectTemplateName.c_str()));
+				}
+			}
+		}
+
+		{
+			DataTable * data = NON_NULL(DataTableManager::getTable(ms_rewardEventsTableName, true));
+			int const numRows = data->getNumRows();
+			for (int row=0; row<numRows; ++row)
+			{
+				RewardEvent * newEvent = new RewardEvent(*data,row);
+				std::pair<RewardEventsType::iterator, bool> result = ms_rewardEvents.insert(std::make_pair(newEvent->getId(), newEvent));
+				FATAL(!result.second,("Data bug:  Reward event %s was specified more than once in data table %s",newEvent->getId().c_str(), ms_rewardEventsTableName.c_str()));
+				ms_orderedRewardEvents.push_back(newEvent);
+			}
+		}
+
+		// sanity check
+		for (OrderedRewardEventsType::const_iterator iterEvent = ms_orderedRewardEvents.begin(); iterEvent != ms_orderedRewardEvents.end(); ++iterEvent)
+		{
+			std::vector<std::pair<RewardItem const *, RewardEvent const *> > const & items = (*iterEvent)->getRewardItems();
+			for (std::vector<std::pair<RewardItem const *, RewardEvent const *> >::const_iterator item = items.begin(); item != items.end(); ++item)
+			{
+				FATAL((item->first->getOncePerAccount() && ((*iterEvent)->getAccountFeatureId() > 0) && (*iterEvent)->getConsumeAccountFeatureId()),("Data bug:  veteran reward event name \"%s\" is a \"consuming\" feature Id event, but includes \"once per account\" item \"%s\" which is not allowed.", (*iterEvent)->getId().c_str(), item->first->getId().c_str()));
+				FATAL(((item->first->getMoney() > 0) && ((*iterEvent)->getAccountFeatureId() > 0) && (*iterEvent)->getConsumeAccountFeatureId()),("Data bug:  veteran reward event name \"%s\" is a \"consuming\" feature Id event, but includes item \"%s\" which grants credits, which is not allowed.", (*iterEvent)->getId().c_str(), item->first->getId().c_str()));
+
+				std::string const & objectTemplateName = item->first->getObjectTemplateName();
+				uint32 templateItemCrc = 0;
+				if (objectTemplateName.find(".iff") != std::string::npos)
+					templateItemCrc = CrcLowerString::calculateCrc(objectTemplateName.c_str());
+
+				if (templateItemCrc > 0)
+				{
+					CanTradeInRewardTemplateItemType::iterator const iterFind = ms_canTradeInRewardTemplateItem.find(templateItemCrc);
+					if (iterFind != ms_canTradeInRewardTemplateItem.end())
+					{
+						FATAL((iterFind->second.second > 0), ("Data bug:  \"can trade in\" reward object template (%s) can only be defined as the reward object for 1 reward event", objectTemplateName.c_str()));
+						FATAL((*iterEvent)->getOncePerAccount(), ("Data bug:  \"can trade in\" reward object template (%s) can not be defined as the reward object for a \"once per account\" reward event", objectTemplateName.c_str()));
+						FATAL(((*iterEvent)->getAccountFeatureId() == 0), ("Data bug:  \"can trade in\" reward object template (%s) can only be defined as the reward object for a reward event that requires an account feature id", objectTemplateName.c_str()));
+						FATAL(!(*iterEvent)->getConsumeAccountFeatureId(), ("Data bug:  \"can trade in\" reward object template (%s) can only be defined as the reward object for a reward event that consumes an account feature id", objectTemplateName.c_str()));
+
+						iterFind->second.second = (*iterEvent)->getAccountFeatureId();
+					}
+				}
+				else
+				{
+					CanTradeInRewardStaticItemType::iterator const iterFind = ms_canTradeInRewardStaticItem.find(objectTemplateName);
+					if (iterFind != ms_canTradeInRewardStaticItem.end())
+					{
+						FATAL((iterFind->second.second > 0), ("Data bug:  \"can trade in\" reward object template (%s) can only be defined as the reward object for 1 reward event", objectTemplateName.c_str()));
+						FATAL((*iterEvent)->getOncePerAccount(), ("Data bug:  \"can trade in\" reward object template (%s) can not be defined as the reward object for a \"once per account\" reward event", objectTemplateName.c_str()));
+						FATAL(((*iterEvent)->getAccountFeatureId() == 0), ("Data bug:  \"can trade in\" reward object template (%s) can only be defined as the reward object for a reward event that requires an account feature id", objectTemplateName.c_str()));
+						FATAL(!(*iterEvent)->getConsumeAccountFeatureId(), ("Data bug:  \"can trade in\" reward object template (%s) can only be defined as the reward object for a reward event that consumes an account feature id", objectTemplateName.c_str()));
+
+						iterFind->second.second = (*iterEvent)->getAccountFeatureId();
+					}
+				}
+			}
+		}
+
+		// more sanity check
+		{
+			for (CanTradeInRewardTemplateItemType::const_iterator iter = ms_canTradeInRewardTemplateItem.begin(); iter != ms_canTradeInRewardTemplateItem.end(); ++iter)
+			{
+				FATAL((iter->second.second == 0), ("Data bug:  \"can trade in\" reward item (%s) is not associated with any reward event", iter->second.first.c_str()));
+				ms_canTradeInRewardFeatureId.insert(iter->second.second);
+			}
+		}
+
+		{
+			for (CanTradeInRewardStaticItemType::const_iterator iter = ms_canTradeInRewardStaticItem.begin(); iter != ms_canTradeInRewardStaticItem.end(); ++iter)
+			{
+				FATAL((iter->second.second == 0), ("Data bug:  \"can trade in\" reward item (%s) is not associated with any reward event", iter->second.first.c_str()));
+				ms_canTradeInRewardFeatureId.insert(iter->second.second);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void VeteranRewardManager::remove()
+{
+	for (RewardItemsType::iterator i=ms_rewardItems.begin(); i!=ms_rewardItems.end(); ++i)
+		delete i->second;
+	for (RewardEventsType::iterator j=ms_rewardEvents.begin(); j!=ms_rewardEvents.end(); ++j)
+		delete j->second;
+
+	ms_rewardItems.clear();
+	ms_rewardEvents.clear();
+	ms_orderedRewardEvents.clear();
+	
+	DEBUG_FATAL(!ms_installed,("Programmer bug:  VeteranRewardManager was not installed"));
+	ms_installed = false;
+}
+
+// ----------------------------------------------------------------------
+
+RewardEvent * VeteranRewardManagerNamespace::getRewardEventByName(std::string const & eventName)
+{
+	RewardEventsType::iterator i=ms_rewardEvents.find(eventName);
+	if (i!=ms_rewardEvents.end())
+		return i->second;
+	else
+		return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+RewardItem * VeteranRewardManagerNamespace::getRewardItemByName(std::string const & itemName)
+{
+	RewardItemsType::iterator i=ms_rewardItems.find(itemName);
+	if (i!=ms_rewardItems.end())
+		return i->second;
+	else
+		return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the IDs of all the reward events that the player qualifies for;
+ * for multiple reward events in the same category, only return the first ID,
+ * preceded by * to indicate that there are more rewards in that category
+ * that the player qualifies for
+ */
+void VeteranRewardManager::getTriggeredEventsIds(CreatureObject const & playerCreature, std::vector<std::string> & eventsIds)
+{
+	DEBUG_FATAL(!ms_installed,("Programmer bug:  VeteranRewardManager was not installed"));
+
+	eventsIds.clear();
+
+	if (!ConfigServerGame::getEnableNewVeteranRewards())
+		return;
+
+	// Get account information
+	Client const * const client = playerCreature.getClient();
+	if (!playerCreature.isAuthoritative() || !client)
+	{
+		DEBUG_FATAL(true,("Programmer bug:  called getTriggeredEventsIds() with object %s, which isn't authoritative or doesn't have a client.", playerCreature.getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	if (client->isUsingAdminLogin())
+		return;
+
+	// Get list of reward events that have already been consumed or are being ignored
+	std::vector<std::string> consumedEventsString;
+	getConsumedEvents(playerCreature,consumedEventsString);
+	std::set<RewardEvent const *> consumedEvents;
+	{
+		for (std::vector<std::string>::const_iterator i=consumedEventsString.begin(); i!=consumedEventsString.end(); ++i)
+		{
+			RewardEvent const * const event = getRewardEventByName(*i);
+			if (event)
+				IGNORE_RETURN(consumedEvents.insert(event));
+		}
+	}
+
+	// Check for reward events -- assumes reward events are ordered in the order we want to present them to the player
+	// (Probably least valuable to most valuable is the best order, so that players don't use a more valuable event to
+	// claim a less valuable prize, not realizing that they also had achieved a less valuable event they could use for that prize.)
+	std::map<int, int> triggeredEventCategories;
+	std::string triggeredEvents;
+	{
+		for (OrderedRewardEventsType::const_iterator i=ms_orderedRewardEvents.begin(); i!=ms_orderedRewardEvents.end(); ++i)
+		{
+			if (consumedEvents.find(*i)==consumedEvents.end())
+			{
+				if ((*i)->hasPlayerTriggered(playerCreature))
+				{
+					// an event that consumes an account feature Id is only
+					// triggered if there is an item in the event that can
+					// be claimed by this character; for example, if all the
+					// items in the event are once per character, and the
+					// character has already claimed all the items, then the
+					// event should not be triggered, since there is no item
+					// in the event that this character can claim
+					if (((*i)->getAccountFeatureId() > 0) && (*i)->getConsumeAccountFeatureId())
+					{
+						std::vector<std::string> rewardItems;
+						getAvailableRewardItemsForEvent(playerCreature, (*i)->getId(), rewardItems, NULL);
+
+						if (rewardItems.empty())
+							continue;
+					}
+
+					if (!triggeredEvents.empty())
+						triggeredEvents += ", ";
+
+					triggeredEvents += (*i)->getId();
+
+					int const eventCategory = (*i)->getCategory();
+					if (eventCategory != 0)
+					{
+						std::map<int, int>::const_iterator iterFind = triggeredEventCategories.find(eventCategory);
+						if (iterFind == triggeredEventCategories.end())
+						{
+							triggeredEventCategories[eventCategory] = eventsIds.size();
+							eventsIds.push_back((*i)->getId());
+						}
+						else if (eventsIds[iterFind->second][0] != '*')
+						{
+							eventsIds[iterFind->second] = std::string("*") + eventsIds[iterFind->second];
+						}
+					}
+					else
+					{
+						eventsIds.push_back((*i)->getId());
+					}
+				}
+			}
+		}
+	}
+
+	if (!triggeredEvents.empty())
+		LOG("CustomerService",("VeteranRewards:  %s has triggered reward events (%s)", PlayerObject::getAccountDescription(&playerCreature).c_str(),triggeredEvents.c_str()));
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Get the list of reward items a player can claim using the specified event.
+ * Checks for unique items, etc.
+ * Returns a vector of the IDs of the possible items and a vector of the
+ * StringIds of the descriptions of these items.
+ */
+
+void VeteranRewardManager::getAvailableRewardItemsForEvent(CreatureObject const & playerCreature, std::string const & eventName, std::vector<std::string> & rewardItems, std::vector<std::string> * rewardDescriptions)
+{
+	DEBUG_FATAL(!ms_installed,("Programmer bug:  VeteranRewardManager was not installed"));
+
+	RewardEvent const * const event = getRewardEventByName(eventName);
+	if (!event)
+		return;
+	
+	// Get list of reward items that have already been claimed
+	std::vector<std::string> claimedItemsString;
+	getClaimedItems(playerCreature,claimedItemsString);
+	std::set<RewardItem const *> claimedItems;
+	for (std::vector<std::string>::const_iterator i=claimedItemsString.begin(); i!=claimedItemsString.end(); ++i)
+	{
+		RewardItem const * const item = getRewardItemByName(*i);
+		// it's possible that an item might be changed from once-per-account/cluster to not being once-per-account/cluster, so re-check the flags on the items here
+		if (item && (item->getOncePerAccount() || item->getOncePerCharacter()))
+			IGNORE_RETURN(claimedItems.insert(item));
+	}
+
+	std::vector<std::pair<RewardItem const *, RewardEvent const *> > const & items = event->getRewardItems();
+	for (std::vector<std::pair<RewardItem const *, RewardEvent const *> >::const_iterator item = items.begin(); item != items.end(); ++item)
+	{
+		if (claimedItems.find(item->first)==claimedItems.end())
+		{
+			rewardItems.push_back(item->first->getId());
+			if (rewardDescriptions)
+			{
+				std::string description = std::string("@");
+				description += item->first->getDescription().getCanonicalRepresentation();
+				if (item->second && (item->second != event))
+				{
+					description += " @veteran_new:color_lime_green - from @";
+					description += item->second->getAnnouncement().getCanonicalRepresentation();
+				}
+
+				rewardDescriptions->push_back(description);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Start the process of claiming a list of rewards
+ * @return true if the request is OK, will be sent to login server for verification if necessary
+ * false if there is a problem with the request
+ */
+bool VeteranRewardManager::claimRewards(CreatureObject const & playerCreature, std::string const & rewardEventName, std::string const & rewardItem, std::string * debugMessage)
+{
+	DEBUG_FATAL(!ms_installed,("Programmer bug:  VeteranRewardManager was not installed"));
+
+	if (!ConfigServerGame::getEnableNewVeteranRewards())
+		return false;
+
+	Client * const client = playerCreature.getClient();
+	if (!client)
+		return false;
+	RewardEvent const * const event = getRewardEventByName(rewardEventName);
+	if (!event)
+	{
+		if (debugMessage)
+			(*debugMessage) = "No such event";
+		return false;
+	}
+
+	// check to make sure that event can be claimed
+	if (!event->hasPlayerTriggered(playerCreature))
+	{
+		if (debugMessage)
+			(*debugMessage) = "Event not triggered";
+		return false;
+	}
+
+	std::vector<std::string> possibleRewardItems;
+	getAvailableRewardItemsForEvent(playerCreature, rewardEventName, possibleRewardItems, NULL);
+	if (possibleRewardItems.empty())
+	{
+		if (debugMessage)
+			(*debugMessage) = "There isn't any possible reward item left for this event";
+		return false;
+	}
+
+	// Check that the requested item can be claimed with this event
+	bool accountUniqueItem = false;
+	bool found = false;
+
+	for (std::vector<std::string>::const_iterator j=possibleRewardItems.begin(); j!=possibleRewardItems.end(); ++j)
+	{
+		if (rewardItem == *j)
+		{
+			found = true;
+			RewardItem const * const item = getRewardItemByName(rewardItem);
+			if (!item)
+			{
+				LOG("CustomerService",("VeteranRewards:  %s has requested item %s (claimed as part of event %s), but that item could not be found.", PlayerObject::getAccountDescription(&playerCreature).c_str(), rewardItem.c_str(), rewardEventName.c_str()));
+
+				if (debugMessage)
+					(*debugMessage) = "No such item:  " + rewardItem;
+
+				return false;
+			}
+			LOG("CustomerService",("VeteranRewards:  %s has requested item %s (claimed as part of event %s)", PlayerObject::getAccountDescription(&playerCreature).c_str(), rewardItem.c_str(), rewardEventName.c_str()));
+
+			if (item->getOncePerAccount())
+				accountUniqueItem = true;
+
+			break;
+		}
+	}
+
+	if (!found)
+	{
+		LOG("CustomerService",("VeteranRewards:  %s has requested item %s (claimed as part of event %s), but that item was not a legitimate choice for this event.", PlayerObject::getAccountDescription(&playerCreature).c_str(), rewardItem.c_str(), rewardEventName.c_str()));
+		if (debugMessage)
+			(*debugMessage) = "Item is not a legitimate choice for this event (or has already been claimed):  " + rewardItem;
+		return false;
+	}
+
+	if (event->getOncePerAccount() || accountUniqueItem || (event->getAccountFeatureId() > 0))
+	{
+		ClaimRewardsMessage const msg(GameServer::getInstance().getProcessId(), client->getStationId(), playerCreature.getNetworkId(), rewardEventName, event->getOncePerAccount(), rewardItem, accountUniqueItem, event->getAccountFeatureId(), event->getConsumeAccountFeatureId());
+
+		// reward requiring account feature id needs to go to the ConnectionServer for validation
+		// with session/Platform that the account has the required account feature id
+		if (event->getAccountFeatureId() > 0)
+		{
+			client->sendToConnectionServer(msg);
+		}
+		else
+		{
+			GameServer::getInstance().sendToCentralServer(msg);
+		}
+	}
+	else
+	{
+		//skip sending message to login, because it isn't needed.  Just grant the items right away.
+		//(Because no items are unique, stationId does't matter, pass 0 for it.)
+		handleClaimRewardsReply(0, playerCreature.getNetworkId(), rewardEventName, rewardItem, 0, false, 0, 0, true, false);
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void VeteranRewardManager::handleClaimRewardsReply(StationId stationId, NetworkId const & player, std::string const & rewardEvent, std::string const & rewardItem, uint32 accountFeatureId, bool consumeAccountFeatureId, int previousAccountFeatureIdCount, int currentAccountFeatureIdCount, bool result, bool verify)
+{
+	DEBUG_FATAL(!ms_installed,("Programmer bug:  VeteranRewardManager was not installed"));
+
+	static std::vector<int8> const emptyMessageData;
+		 
+	ServerObject * const so = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(player));
+	CreatureObject * const playerCreature = so ? so->asCreatureObject() : NULL;
+	if (!playerCreature)
+		return;	// player has vanished -- reward claim will be handled by the recovery code at the next login
+	if (!playerCreature->isAuthoritative())
+	{
+		uint32 authServer = playerCreature->getAuthServerProcessId();
+		ClaimRewardsReplyMessage msg(authServer, stationId, player, rewardEvent, rewardItem, accountFeatureId, consumeAccountFeatureId, previousAccountFeatureIdCount, currentAccountFeatureIdCount, result);
+		ServerMessageForwarding::begin(authServer);
+		ServerMessageForwarding::send(msg);
+		ServerMessageForwarding::end();
+		return;
+	}
+
+	if (result)
+	{
+		// one final check to make sure player is qualified to receive the item; don't
+		// need to do it if it's a feature id reward, since the verification has
+		// already been done by the LoginServer, which has access to up-to-date feature
+		// id information, whereas we only have a cache of the feature id information
+		if (verify && (accountFeatureId == 0))
+		{
+			RewardEvent const * const event = getRewardEventByName(rewardEvent);
+			if (!event)
+			{
+				LOG("CustomerService",("VeteranRewards:  %s's reward claim failed - could not find event", PlayerObject::getAccountDescription(playerCreature).c_str()));
+				MessageToQueue::getInstance().sendMessageToJava(player, "veteranItemGrantFailed",emptyMessageData,0,false);
+				return;
+			}
+
+			// check to make sure that event can be claimed
+			if (!event->hasPlayerTriggered(*playerCreature))
+			{
+				LOG("CustomerService",("VeteranRewards:  %s's reward claim failed - event not triggered", PlayerObject::getAccountDescription(playerCreature).c_str()));
+				MessageToQueue::getInstance().sendMessageToJava(player, "veteranItemGrantFailed",emptyMessageData,0,false);
+				return;
+			}
+
+			// Check that the requested item can be claimed with this event
+			std::vector<std::string> possibleRewardItems;
+			getAvailableRewardItemsForEvent(*playerCreature, rewardEvent, possibleRewardItems, NULL);
+			bool found = false;
+
+			for (std::vector<std::string>::const_iterator j=possibleRewardItems.begin(); j!=possibleRewardItems.end(); ++j)
+			{
+				if (rewardItem == *j)
+				{
+					found = true;
+					break;
+				}
+			}
+
+			if (!found)
+			{
+				LOG("CustomerService",("VeteranRewards:  %s's reward claim failed - reward item not available for event", PlayerObject::getAccountDescription(playerCreature).c_str()));
+				MessageToQueue::getInstance().sendMessageToJava(player, "veteranItemGrantFailed",emptyMessageData,0,false);
+				return;
+			}
+		}
+
+		// if the claim consumed an account feature id, send request for updated account feature id info
+		if ((accountFeatureId > 0) && consumeAccountFeatureId)
+		{
+			Client * const client = playerCreature->getClient();
+			if (client)
+			{
+				// until we receive the updated account feature id info,
+				// locally decrement the count on the account feature id
+				// so that it is in sync with what's on the account
+				Client::AccountFeatureIdList const & accountFeatureIds = client->getAccountFeatureIds();
+				Client::AccountFeatureIdList::const_iterator iterFeatureID = accountFeatureIds.find(accountFeatureId);
+				if (iterFeatureID != accountFeatureIds.end())
+					client->setAccountFeatureId(accountFeatureId, std::max(0, currentAccountFeatureIdCount));
+
+				AccountFeatureIdRequest const req(NetworkId::cms_invalid, GameServer::getInstance().getProcessId(), player, stationId, PlatformGameCode::SWG, AccountFeatureIdRequest::RR_Reload);
+				client->sendToConnectionServer(req);
+			}
+		}
+
+		// Attempt to create the item
+		bool itemCreationSuccess = false;
+		RewardItem const * const item = getRewardItemByName(rewardItem);
+		if (item)
+		{
+			itemCreationSuccess = item->grantToPlayer(*playerCreature, accountFeatureId, previousAccountFeatureIdCount, currentAccountFeatureIdCount);
+		}
+
+		if (itemCreationSuccess)
+		{
+			// Record that the event has been used, except for event that uses "non-consuming"
+			// account Feature Id, as those events can be claimed multiple times
+			if ((accountFeatureId == 0) || !consumeAccountFeatureId)
+			{
+				IGNORE_RETURN(playerCreature->setObjVarItem(ms_consumedEventsObjvar + "." + rewardEvent, static_cast<int>(1)));
+			}
+			else
+			{
+				// record the transaction, which will be compared with the transaction
+				// recorded in the LoginServer DB, so that if the cluster crashes, and there
+				// is a rollback, there will be a discrepancy, and we can re-grant the item
+				std::string const featureIdTransactionObjvar = ms_featureIdTransactionObjvar + "." + rewardItem;
+				int count;
+				if (playerCreature->getObjVars().getItem(featureIdTransactionObjvar, count))
+					++count;
+				else
+					count = 1;
+
+				playerCreature->setObjVarItem(featureIdTransactionObjvar, count);
+			}
+
+			LOG("CustomerService",("VeteranRewards:  %s's reward claim completed", PlayerObject::getAccountDescription(playerCreature).c_str()));
+
+			ScriptParams params;
+			params.addParam(item->getCanTradeIn(), "canTradeIn");
+			ScriptDictionaryPtr dictionary;
+			GameScriptObject::makeScriptDictionary(params, dictionary);
+			if (dictionary.get() != NULL)
+			{
+				dictionary->serialize();
+				MessageToQueue::getInstance().sendMessageToJava(player, "veteranItemGrantSucceeded",dictionary->getSerializedData(),0,false);
+			}
+			else
+			{
+				MessageToQueue::getInstance().sendMessageToJava(player, "veteranItemGrantSucceeded",emptyMessageData,0,false);
+			}
+		}
+		else
+		{
+			LOG("CustomerService",("VeteranRewards:  %s's reward claim failed", PlayerObject::getAccountDescription(playerCreature).c_str()));
+			MessageToQueue::getInstance().sendMessageToJava(player, "veteranItemGrantFailed",emptyMessageData,0,false);
+		}
+	}
+	else
+	{
+		LOG("CustomerService",("VeteranRewards:  %s's reward claim was denied by the login server", PlayerObject::getAccountDescription(playerCreature).c_str()));
+		MessageToQueue::getInstance().sendMessageToJava(player, "veteranItemGrantFailed",emptyMessageData,0,false);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Combine the data sent from the login server, listing rewards claimed on
+ * other clusters, with the local data.  Write the data to objvars on the
+ * player, so that other functions can use this data.
+ */
+void VeteranRewardManager::writeAccountDataToObjvars(CreatureObject & playerCreature)
+{
+	DEBUG_FATAL(!ms_installed,("Programmer bug:  VeteranRewardManager was not installed"));
+
+	if (!ConfigServerGame::getEnableNewVeteranRewards())
+		return;
+
+	if (!playerCreature.isAuthoritative())
+		return;	
+	Client * const client = playerCreature.getClient();
+	if (!client)
+		return;
+	
+	{
+		std::string consumedEventObjvar;
+		std::vector<std::pair<NetworkId, std::string> > const & accountConsumedEvents = client->getConsumedRewardEvents();
+		for (std::vector<std::pair<NetworkId, std::string> >::const_iterator i=accountConsumedEvents.begin(); i!=accountConsumedEvents.end(); ++i)
+		{
+			consumedEventObjvar = ms_consumedEventsObjvar + "." + i->second;
+
+			if (i->first == playerCreature.getNetworkId())
+			{
+				if (!playerCreature.getObjVars().hasItem(consumedEventObjvar))
+				{
+					// Login server thinks event was claimed by this character, but we have no record of it.  Allow it to be re-claimed by not inserting
+					// it into the list in the objvar.
+					if (getRewardEventByName(i->second))
+						LOG("CustomerService",("VeteranRewards:  %s was flagged as claiming event %s in the login database, but the local cluster has no record of it.  Reward can be re-claimed.", PlayerObject::getAccountDescription(&playerCreature).c_str(), i->second.c_str()));
+				}
+			}
+			else if (!playerCreature.getObjVars().hasItem(consumedEventObjvar))
+			{
+				// Add events claimed on other clusters to the list, so that we don't ask the player about them, etc.
+				IGNORE_RETURN(playerCreature.setObjVarItem(consumedEventObjvar, static_cast<int>(1)));
+			}
+		}
+	}
+
+	{
+		std::string claimedItemObjvar;
+		std::vector<std::pair<NetworkId, std::string> > const & accountClaimedItems = client->getClaimedRewardItems();
+		for (std::vector<std::pair<NetworkId, std::string> >::const_iterator i=accountClaimedItems.begin(); i!=accountClaimedItems.end(); ++i)
+		{
+			claimedItemObjvar = ms_claimedItemsObjvar + "." + i->second;
+
+			if (i->first==playerCreature.getNetworkId())
+			{
+				if (!playerCreature.getObjVars().hasItem(claimedItemObjvar))
+				{
+					// Login server thinks item was claimed by this character, but we have no record of it.  Allow it to be re-claimed.
+					if (getRewardItemByName(i->second))
+						LOG("CustomerService",("VeteranRewards:  %s was flagged as claiming item %s in the login database, but the local cluster has no record of it.  Reward can be re-claimed.", PlayerObject::getAccountDescription(&playerCreature).c_str(), i->second.c_str()));
+				}
+			}
+			else if (!playerCreature.getObjVars().hasItem(claimedItemObjvar))
+			{
+				// Add items claimed on other clusters to the list, so that we don't ask the player about them, etc.
+				IGNORE_RETURN(playerCreature.setObjVarItem(claimedItemObjvar, static_cast<int>(1)));
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+time_t VeteranRewardManagerNamespace::yyyymmddToTime(int const yyyy, int const mm, int const dd)
+{
+	if ((yyyy == 0) && (mm == 0) && (dd == 0))
+		return 0;
+
+	FATAL(((yyyy < 1975) || (yyyy > 2035)),("Data bug:  Reward event date (%d / %d / %d) - year %d specified for a reward event must be between 1975 - 2035.",mm,dd,yyyy,yyyy));
+	FATAL(((mm < 1) || (mm > 12)),("Data bug:  Reward event date (%d / %d / %d) - month %d specified for a reward event must be between 1 - 12.",mm,dd,yyyy,mm));
+	FATAL(((dd < 1) || (dd > 31)),("Data bug:  Reward event date (%d / %d / %d) - day %d specified for a reward event must be between 1 - 31.",mm,dd,yyyy,dd));
+
+	time_t const rawtime = ::time(NULL);
+	struct tm * const timeinfo = ::localtime(&rawtime);
+	if (!timeinfo)
+	{
+		FATAL(true,(":localtime() returns NULL"));
+		return 0;
+	}
+
+	timeinfo->tm_year = yyyy - 1900;
+	timeinfo->tm_mon = mm - 1;
+	timeinfo->tm_mday = dd;
+	timeinfo->tm_hour = 0;
+	timeinfo->tm_min = 0;
+	timeinfo->tm_sec = 0;
+
+	time_t const retval = ::mktime(timeinfo);
+
+	FATAL(retval==-1,("Could not convert tm to time_t"));
+	return retval;
+}
+
+// ----------------------------------------------------------------------
+
+void VeteranRewardManager::getRewardChoicesDescriptions(CreatureObject const & playerCreature, std::string const & eventName, std::vector<std::string> & rewardDescriptions)
+{
+	DEBUG_FATAL(!ms_installed,("Programmer bug:  VeteranRewardManager was not installed"));
+	
+	std::vector<std::string> rewardItems;
+	rewardDescriptions.clear();
+	getAvailableRewardItemsForEvent(playerCreature, eventName, rewardItems, &rewardDescriptions);
+}
+
+// ----------------------------------------------------------------------
+
+void VeteranRewardManager::getRewardChoicesTags(CreatureObject const & playerCreature, std::string const & eventName, std::vector<Unicode::String> & rewardTagsUnicode)
+{
+	DEBUG_FATAL(!ms_installed,("Programmer bug:  VeteranRewardManager was not installed"));
+
+	std::vector<std::string> rewardItems;
+
+	getAvailableRewardItemsForEvent(playerCreature, eventName, rewardItems, NULL);
+	for (std::vector<std::string>::const_iterator i=rewardItems.begin(); i!=rewardItems.end(); ++i)
+	{
+		rewardTagsUnicode.push_back(Unicode::narrowToWide(*i));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+StringId const * VeteranRewardManager::getEventAnnouncement(std::string const & eventName)
+{
+	DEBUG_FATAL(!ms_installed,("Programmer bug:  VeteranRewardManager was not installed"));
+	
+	RewardEvent const * const event = getRewardEventByName(eventName);
+	if (event)
+	{
+		return &(event->getAnnouncement());
+	}
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+StringId const * VeteranRewardManager::getEventDescription(std::string const & eventName)
+{
+	DEBUG_FATAL(!ms_installed,("Programmer bug:  VeteranRewardManager was not installed"));
+	
+	RewardEvent const * const event = getRewardEventByName(eventName);
+	if (event)
+	{
+		return &(event->getDescription());
+	}
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const * VeteranRewardManager::getEventUrl(std::string const & eventName)
+{
+	DEBUG_FATAL(!ms_installed,("Programmer bug:  VeteranRewardManager was not installed"));
+	
+	RewardEvent const * const event = getRewardEventByName(eventName);
+	if (event)
+	{
+		return &(event->getUrl());
+	}
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+bool VeteranRewardManager::isEventAccountUnique(std::string const & eventName)
+{
+	DEBUG_FATAL(!ms_installed,("Programmer bug:  VeteranRewardManager was not installed"));
+	
+	RewardEvent const * const event = getRewardEventByName(eventName);
+	if (event)
+	{
+		return (event->getOncePerAccount());
+	}
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool VeteranRewardManager::isItemAccountUnique(std::string const & itemName)
+{
+	DEBUG_FATAL(!ms_installed,("Programmer bug:  VeteranRewardManager was not installed"));
+	
+	RewardItem const * const item = getRewardItemByName(itemName);
+	if (item)
+	{
+		return (item->getOncePerAccount());
+	}
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool VeteranRewardManager::isItemAccountUniqueFeatureId(std::string const & itemName)
+{
+	DEBUG_FATAL(!ms_installed,("Programmer bug:  VeteranRewardManager was not installed"));
+
+	RewardItem const * const item = getRewardItemByName(itemName);
+	if (item)
+	{
+		return (item->getOncePerAccountFeatureId());
+	}
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void VeteranRewardManager::verifyFeatureIdTransactions(CreatureObject & playerCreature, std::map<std::string, int> const & transactionsFromLoginServer)
+{
+	// get the transaction list from the character
+	std::map<std::string, int> transactionsFromCharacter;
+	DynamicVariableList::NestedList const children(playerCreature.getObjVars(), ms_featureIdTransactionObjvar);
+	for (DynamicVariableList::NestedList::const_iterator iterChildren = children.begin(); iterChildren != children.end(); ++iterChildren)
+	{
+		if (iterChildren.getType() == DynamicVariable::INT)
+		{
+			int count = 0;
+			iterChildren.getValue(count);
+
+			transactionsFromCharacter[iterChildren.getName()] = count;
+		}
+	}
+
+	// if the transaction value on the character is > the transaction value on
+	// the LoginServer, then update the LoginServer transaction value to match
+	PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(&playerCreature);
+	if (playerObject)
+	{
+		for (std::map<std::string, int>::const_iterator iterTransactionCharacter = transactionsFromCharacter.begin(); iterTransactionCharacter != transactionsFromCharacter.end(); ++iterTransactionCharacter)
+		{
+			int transactionCountFromLoginServer = 0;
+			std::map<std::string, int>::const_iterator iterTransactionLoginServer = transactionsFromLoginServer.find(iterTransactionCharacter->first);
+			if (iterTransactionLoginServer != transactionsFromLoginServer.end())
+				transactionCountFromLoginServer = iterTransactionLoginServer->second;
+
+			if (iterTransactionCharacter->second > transactionCountFromLoginServer)
+			{
+				FeatureIdTransactionSyncUpdate const fitsu(playerObject->getStationId(), playerCreature.getNetworkId(), iterTransactionCharacter->first, (iterTransactionCharacter->second - transactionCountFromLoginServer));
+				GameServer::getInstance().sendToCentralServer(fitsu);
+
+				LOG("CustomerService",("FeatureIdTransaction: syncing LoginServer DB feature Id transaction for item (%s) from (%d) to (%d) for (%s)", iterTransactionCharacter->first.c_str(), transactionCountFromLoginServer, iterTransactionCharacter->second, playerObject->getAccountDescription().c_str()));
+			}
+		}
+	}
+
+	// if the transaction value on the character is < the transaction value on
+	// the LoginServer, then grant the player the missing item(s) until the
+	// transaction value match
+	for (std::map<std::string, int>::const_iterator iterTransactionLoginServer = transactionsFromLoginServer.begin(); iterTransactionLoginServer != transactionsFromLoginServer.end(); ++iterTransactionLoginServer)
+	{
+		int transactionCountFromCharacter = 0;
+		std::map<std::string, int>::const_iterator iterTransactionCharacter = transactionsFromCharacter.find(iterTransactionLoginServer->first);
+		if (iterTransactionCharacter != transactionsFromCharacter.end())
+			transactionCountFromCharacter = iterTransactionCharacter->second;
+
+		if (iterTransactionLoginServer->second > transactionCountFromCharacter)
+		{
+			RewardItem const * const item = getRewardItemByName(iterTransactionLoginServer->first);
+			if (item)
+			{
+				std::string const featureIdTransactionObjvar = ms_featureIdTransactionObjvar + "." + iterTransactionLoginServer->first;
+				int adjustedCount = transactionCountFromCharacter;
+				for (int i = transactionCountFromCharacter + 1; i <= iterTransactionLoginServer->second; ++i)
+				{
+					if (item->grantToPlayer(playerCreature, 0, 0, 0, true))
+					{
+						++adjustedCount;
+
+						// record the transaction, which will be compared with the transaction
+						// recorded in the LoginServer DB, so that if the cluster crashes, and there
+						// is a rollback, there will be a discrepancy, and we can re-grant the item
+						int count;
+						if (playerCreature.getObjVars().getItem(featureIdTransactionObjvar, count))
+							++count;
+						else
+							count = 1;
+
+						playerCreature.setObjVarItem(featureIdTransactionObjvar, count);
+					}
+				}
+
+				if (adjustedCount != transactionCountFromCharacter)
+					LOG("CustomerService",("FeatureIdTransaction: syncing character feature Id transaction for item (%s) from (%d) to (%d) for (%s)", iterTransactionLoginServer->first.c_str(), transactionCountFromCharacter, adjustedCount, PlayerObject::getAccountDescription(&playerCreature).c_str()));
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void VeteranRewardManager::migrateVeteranRewardsClaimInformation(CreatureObject & playerCreature)
+{
+	static std::string const oldConsumedEventsObjvar("veteran_rewards.consumed_events");
+	if ((playerCreature.getObjVars().hasItem(oldConsumedEventsObjvar)) && (playerCreature.getObjVars().getType(oldConsumedEventsObjvar) == DynamicVariable::STRING_ARRAY))
+	{
+		std::vector<Unicode::String> consumedEventsUnicode; // objvars only support Unicode vectors, or else would use std::string here
+		IGNORE_RETURN(playerCreature.getObjVars().getItem(oldConsumedEventsObjvar, consumedEventsUnicode));
+
+		std::string consumedEventsString;
+		if (!consumedEventsUnicode.empty())
+		{
+			std::string eventString;
+			for (std::vector<Unicode::String>::const_iterator i = consumedEventsUnicode.begin(); i != consumedEventsUnicode.end(); ++i)
+			{
+				eventString = Unicode::wideToNarrow(*i);
+
+				if (!consumedEventsString.empty())
+					consumedEventsString += ", ";
+
+				consumedEventsString += eventString;
+
+				IGNORE_RETURN(playerCreature.setObjVarItem(ms_consumedEventsObjvar + "." + eventString, static_cast<int>(1)));
+			}
+		}
+
+		LOG("CustomerService",("VeteranRewards: migrated %s objvar (%s) for %s.", oldConsumedEventsObjvar.c_str(), consumedEventsString.c_str(), PlayerObject::getAccountDescription(&playerCreature).c_str()));
+		playerCreature.removeObjVarItem(oldConsumedEventsObjvar);
+	}
+
+	static std::string const oldClaimedItemsObjvar("veteran_rewards.claimed_items");
+	if ((playerCreature.getObjVars().hasItem(oldClaimedItemsObjvar)) && (playerCreature.getObjVars().getType(oldClaimedItemsObjvar) == DynamicVariable::STRING_ARRAY))
+	{
+		std::vector<Unicode::String> claimedItemsUnicode; // objvars only support Unicode vectors, or else would use std::string here
+		IGNORE_RETURN(playerCreature.getObjVars().getItem(oldClaimedItemsObjvar, claimedItemsUnicode));
+
+		std::string claimedItemsString;
+		if (!claimedItemsUnicode.empty())
+		{
+			std::string itemString;
+			for (std::vector<Unicode::String>::const_iterator i = claimedItemsUnicode.begin(); i != claimedItemsUnicode.end(); ++i)
+			{
+				itemString = Unicode::wideToNarrow(*i);
+
+				if (!claimedItemsString.empty())
+					claimedItemsString += ", ";
+
+				claimedItemsString += itemString;
+
+				IGNORE_RETURN(playerCreature.setObjVarItem(ms_claimedItemsObjvar + "." + itemString, static_cast<int>(1)));
+			}
+		}
+
+		LOG("CustomerService",("VeteranRewards: migrated %s objvar (%s) for %s.", oldClaimedItemsObjvar.c_str(), claimedItemsString.c_str(), PlayerObject::getAccountDescription(&playerCreature).c_str()));
+		playerCreature.removeObjVarItem(oldClaimedItemsObjvar);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void VeteranRewardManager::getConsumedEvents(ServerObject const & playerCreature, std::vector<std::string> & consumedEvents)
+{
+	consumedEvents.clear();
+
+	DynamicVariableList::NestedList const children(playerCreature.getObjVars(), ms_consumedEventsObjvar);
+	for (DynamicVariableList::NestedList::const_iterator iterChildren = children.begin(); iterChildren != children.end(); ++iterChildren)
+	{
+		if (iterChildren.getType() == DynamicVariable::INT)
+			consumedEvents.push_back(iterChildren.getName());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void VeteranRewardManager::getClaimedItems(ServerObject const & playerCreature, std::vector<std::string> & claimedItems)
+{
+	claimedItems.clear();
+
+	DynamicVariableList::NestedList const children(playerCreature.getObjVars(), ms_claimedItemsObjvar);
+	for (DynamicVariableList::NestedList::const_iterator iterChildren = children.begin(); iterChildren != children.end(); ++iterChildren)
+	{
+		if (iterChildren.getType() == DynamicVariable::INT)
+			claimedItems.push_back(iterChildren.getName());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void VeteranRewardManager::tcgRedemption(CreatureObject const & playerCreature, ServerObject & item, int featureId, int adjustment)
+{
+	if (!playerCreature.isAuthoritative())
+		return;
+
+	PlayerObject const * const playerPlayer = PlayerCreatureController::getPlayerObject(&playerCreature);
+	if (!playerPlayer)
+		return;
+
+	Client * const client = playerCreature.getClient();
+	if (!client)
+		return;
+
+	if (!item.isAuthoritative())
+		return;
+
+	// item to be claimed must be in the player's top level inventory
+	ServerObject const * const playerInventory = playerCreature.getInventory();
+	if (!playerInventory)
+		return;
+
+	if (static_cast<void const *>(playerInventory) != static_cast<void const *>(ContainerInterface::getContainedByObject(item)))
+	{
+		Chat::sendSystemMessage(playerCreature, StringId("veteran_new", "redeem_tcg_card_not_in_inventory"), Unicode::emptyString);
+		return;
+	}
+
+	// check to see if the object is already in the middle of a redemption
+	if (!checkForTcgRedemptionInProgress(item))
+		return;
+
+	// set a "timed" objvar on the object which will be used to prevent the object
+	// from being destroyed or transferred to a different container while we do
+	// the redemption
+	int const redemptionTimeout = 300; // 5 minutes;
+	item.removeObjVarItem(ms_tcgRedemptionInProgressObjvar);
+	item.setObjVarItem(ms_tcgRedemptionInProgressObjvar, static_cast<int>(::time(NULL) + redemptionTimeout)); // 5 minutes
+
+	// send off request to adjust the account feature Id
+	AdjustAccountFeatureIdRequest const msg(NetworkId::cms_invalid, GameServer::getInstance().getProcessId(), playerCreature.getNetworkId(), PlayerObject::getAccountDescription(&playerCreature), playerPlayer->getStationId(), item.getNetworkId(), ServerObject::getLogDescription(&item), PlatformGameCode::SWGTCG, static_cast<uint32>(featureId), adjustment);
+	client->sendToConnectionServer(msg);
+
+	// let player know the redemption request has been sent
+	ProsePackage prosePackage;
+	prosePackage.stringId = StringId("veteran_new", "redeem_tcg_card_redemption_request_sent");
+	prosePackage.target.str = Unicode::narrowToWide(CalendarTime::convertSecondsToMS(static_cast<unsigned int>(redemptionTimeout)));
+	Chat::sendSystemMessage(playerCreature, prosePackage);
+}
+
+// ----------------------------------------------------------------------
+
+bool VeteranRewardManager::checkForTcgRedemptionInProgress(ServerObject const & item)
+{
+	if (item.getObjVars().hasItem(ms_tcgRedemptionInProgressObjvar) && (item.getObjVars().getType(ms_tcgRedemptionInProgressObjvar) == DynamicVariable::INT))
+	{
+		int redemptionTimeout;
+		IGNORE_RETURN(item.getObjVars().getItem(ms_tcgRedemptionInProgressObjvar, redemptionTimeout));
+
+		time_t const currentTime = ::time(NULL);
+		if (redemptionTimeout > currentTime)
+		{
+			// item should be in top level inventory; get the player object the item is in
+			ServerObject const * containingPlayer = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(item)); // this gets the player's inventory
+			if (containingPlayer)
+				containingPlayer = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*containingPlayer)); // this gets the player
+
+			if (containingPlayer && containingPlayer->getClient())
+			{
+				ProsePackage prosePackage;
+				prosePackage.stringId = StringId("veteran_new", "redeem_tcg_card_redemption_already_in_progress");
+				prosePackage.target.str = Unicode::narrowToWide(CalendarTime::convertSecondsToMS(static_cast<unsigned int>(redemptionTimeout - currentTime)));
+				Chat::sendSystemMessage(*containingPlayer, prosePackage);
+			}
+
+			// item is currently being redeemed
+			return false;
+		}
+	}
+
+	// item is not currently being redeemed
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void VeteranRewardManager::handleTcgRedemptionResponse(ServerObject & item, AdjustAccountFeatureIdResponse const & response)
+{
+	if (response.getResultCode() == RESULT_SUCCESS)
+	{
+		// card has been successfully redeemed, destroy it
+		item.permanentlyDestroy(DeleteReasons::Consumed);
+	}
+	else
+	{
+		// card has NOT been successfully redeemed, remove the
+		// redemption lock on it, so the player can try again
+		item.removeObjVarItem(ms_tcgRedemptionInProgressObjvar);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void VeteranRewardManager::attachTradeInScriptToItem(ServerObject & item)
+{
+	GameScriptObject * const script = item.getScriptObject();
+	if (!script)
+		return;
+
+	std::string const & staticItemName = item.getStaticItemName();
+	if (staticItemName.empty())
+	{
+		if ((ms_canTradeInRewardTemplateItem.count(item.getTemplateCrc()) > 0) && (!script->hasScript(TRADE_IN_SCRIPT)))
+			script->attachScript(TRADE_IN_SCRIPT, false);
+	}
+	else if ((ms_canTradeInRewardStaticItem.count(staticItemName) > 0) && (!script->hasScript(TRADE_IN_SCRIPT)))
+	{
+		script->attachScript(TRADE_IN_SCRIPT, false);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool VeteranRewardManager::tradeInReward(CreatureObject const & playerCreature, ServerObject & item, bool validateOnly)
+{
+	if (!playerCreature.isAuthoritative())
+		return false;
+
+	PlayerObject const * const playerPlayer = PlayerCreatureController::getPlayerObject(&playerCreature);
+	if (!playerPlayer)
+		return false;
+
+	Client * const client = playerCreature.getClient();
+	if (!client)
+		return false;
+
+	if (!item.isAuthoritative())
+		return false;
+
+	// verify that the item can be traded in
+	uint32 featureId = 0;
+	std::string const & staticItemName = item.getStaticItemName();
+	if (staticItemName.empty())
+	{
+		CanTradeInRewardTemplateItemType::const_iterator const iterFind = ms_canTradeInRewardTemplateItem.find(item.getTemplateCrc());
+		if (iterFind == ms_canTradeInRewardTemplateItem.end())
+			return false;
+		else
+			featureId = iterFind->second.second;
+	}
+	else
+	{
+		CanTradeInRewardStaticItemType::const_iterator const iterFind = ms_canTradeInRewardStaticItem.find(staticItemName);
+		if (iterFind == ms_canTradeInRewardStaticItem.end())
+			return false;
+		else
+			featureId = iterFind->second.second;
+	}
+
+	if (featureId == 0)
+		return false;
+
+	// item to be traded in must be in the player's top level inventory
+	ServerObject const * const playerInventory = playerCreature.getInventory();
+	if (!playerInventory)
+		return false;
+
+	if (static_cast<void const *>(playerInventory) != static_cast<void const *>(ContainerInterface::getContainedByObject(item)))
+	{
+		Chat::sendSystemMessage(playerCreature, StringId("veteran_new", "trade_in_item_not_in_inventory"), Unicode::emptyString);
+		return false;
+	}
+
+	// check to see if the object is already in the middle of a trade in
+	if (!checkForTradeInInProgress(item))
+		return false;
+
+	// there is a wait period after the item is claimed before it can be traded in
+	time_t itemClaimTime = 0;
+	DynamicVariableList const & itemObjvar = item.getObjVars();
+	if (itemObjvar.hasItem("rewardGrantInfo") && (itemObjvar.getType("rewardGrantInfo") == DynamicVariable::STRING_ARRAY))
+	{
+		std::vector<Unicode::String> rewardGrantInfo;
+		if (itemObjvar.getItem("rewardGrantInfo", rewardGrantInfo) && (rewardGrantInfo.size() == 4))
+			itemClaimTime = static_cast<time_t>(::atol(Unicode::wideToNarrow(rewardGrantInfo[0]).c_str()));
+	}
+
+	// it may be the Sarlacc trash can which has its born date stored on it
+	if ((itemClaimTime <= 0) && (staticItemName == std::string("item_cts_sarlacc_mini_game")) && itemObjvar.hasItem("sarlacc_minigame.born_time") && (itemObjvar.getType("sarlacc_minigame.born_time") == DynamicVariable::INT))
+	{
+		int sarlaccBornTime = 0;
+		if (itemObjvar.getItem("sarlacc_minigame.born_time", sarlaccBornTime))
+			itemClaimTime = static_cast<time_t>(sarlaccBornTime);
+	}
+
+	if (itemClaimTime > 0)
+	{
+		time_t timeRedeem = itemClaimTime + static_cast<time_t>(ConfigServerGame::getVeteranRewardTradeInWaitPeriodSeconds());
+		time_t const timeNow = ::time(NULL);
+
+		// see if the item has its own trade-in wait period
+		if (itemObjvar.hasItem("rewardTradeInWaitPeriod") && (itemObjvar.getType("rewardTradeInWaitPeriod") == DynamicVariable::INT))
+		{
+			int itemTradeInWaitPeriodSeconds = 0;
+			if (itemObjvar.getItem("rewardTradeInWaitPeriod", itemTradeInWaitPeriodSeconds))
+				timeRedeem = itemClaimTime + std::max(itemTradeInWaitPeriodSeconds, 0);
+		}
+
+		if (timeRedeem > timeNow)
+		{
+			ProsePackage prosePackage;
+			prosePackage.stringId = StringId("veteran_new", "trade_in_too_soon");
+			prosePackage.target.str = Unicode::narrowToWide(CalendarTime::convertSecondsToDHMS(static_cast<unsigned int>(timeRedeem - timeNow)));
+			Chat::sendSystemMessage(playerCreature, prosePackage);
+
+			return false;
+		}
+	}
+
+	if (validateOnly)
+		return true;
+
+	// set a "timed" objvar on the object which will be used to prevent the object
+	// from being destroyed or transferred to a different container while we do
+	// the trade in
+	int const redemptionTimeout = 300; // 5 minutes;
+	item.removeObjVarItem(ms_tradeInInProgressObjvar);
+	item.setObjVarItem(ms_tradeInInProgressObjvar, static_cast<int>(::time(NULL) + redemptionTimeout)); // 5 minutes
+
+	// send off request to adjust the account feature Id
+	AdjustAccountFeatureIdRequest const msg(NetworkId::cms_invalid, GameServer::getInstance().getProcessId(), playerCreature.getNetworkId(), PlayerObject::getAccountDescription(&playerCreature), playerPlayer->getStationId(), item.getNetworkId(), ServerObject::getLogDescription(&item), PlatformGameCode::SWG, static_cast<uint32>(featureId), 1);
+	client->sendToConnectionServer(msg);
+
+	// let player know the trade in request has been sent
+	ProsePackage prosePackage;
+	prosePackage.stringId = StringId("veteran_new", "trade_in_request_sent");
+	prosePackage.target.str = Unicode::narrowToWide(CalendarTime::convertSecondsToMS(static_cast<unsigned int>(redemptionTimeout)));
+	Chat::sendSystemMessage(playerCreature, prosePackage);
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool VeteranRewardManager::checkForTradeInInProgress(ServerObject const & item)
+{
+	if (item.getObjVars().hasItem(ms_tradeInInProgressObjvar) && (item.getObjVars().getType(ms_tradeInInProgressObjvar) == DynamicVariable::INT))
+	{
+		int redemptionTimeout;
+		IGNORE_RETURN(item.getObjVars().getItem(ms_tradeInInProgressObjvar, redemptionTimeout));
+
+		time_t const currentTime = ::time(NULL);
+		if (redemptionTimeout > currentTime)
+		{
+			// item should be in top level inventory; get the player object the item is in
+			ServerObject const * containingPlayer = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(item)); // this gets the player's inventory
+			if (containingPlayer)
+				containingPlayer = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*containingPlayer)); // this gets the player
+
+			if (containingPlayer && containingPlayer->getClient())
+			{
+				ProsePackage prosePackage;
+				prosePackage.stringId = StringId("veteran_new", "trade_in_already_in_progress");
+				prosePackage.target.str = Unicode::narrowToWide(CalendarTime::convertSecondsToMS(static_cast<unsigned int>(redemptionTimeout - currentTime)));
+				Chat::sendSystemMessage(*containingPlayer, prosePackage);
+			}
+
+			// item is currently being redeemed
+			return false;
+		}
+	}
+
+	// item is not currently being redeemed
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void VeteranRewardManager::handleTradeInResponse(ServerObject & item, AdjustAccountFeatureIdResponse const & response)
+{
+	if (response.getResultCode() == RESULT_SUCCESS)
+	{
+		// item has been successfully traded in, destroy it
+		item.permanentlyDestroy(DeleteReasons::Consumed);
+	}
+	else
+	{
+		// item has NOT been successfully traded in, remove the
+		// trade in lock on it, so the player can try again
+		item.removeObjVarItem(ms_tradeInInProgressObjvar);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool VeteranRewardManager::isTradeInRewardFeatureId(uint32 featureId)
+{
+	return (ms_canTradeInRewardFeatureId.count(featureId) > 0);
+}
+
+// ----------------------------------------------------------------------
+
+void VeteranRewardManager::announceMonthlyBonusBoosterPack(CreatureObject const & playerCreature)
+{
+	PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(&playerCreature);
+	if (!playerObject)
+		return;
+
+	Client * const client = playerCreature.getClient();
+	if (!client)
+		return;
+
+	if (client->isUsingAdminLogin())
+		return;
+
+	if (ConfigServerGame::getAccountFeatureIdForMonthlyBoosterPack() <= 0)
+		return;
+
+	Client::AccountFeatureIdList const & accountFeatureIds = client->getAccountFeatureIds();
+	Client::AccountFeatureIdList::const_iterator iterFind = accountFeatureIds.find(static_cast<uint32>(ConfigServerGame::getAccountFeatureIdForMonthlyBoosterPack()));
+	if ((iterFind == accountFeatureIds.end()) || (iterFind->second <= 0))
+		return;
+
+	// reset the announcement feature id
+	AdjustAccountFeatureIdRequest const msg(NetworkId::cms_invalid, GameServer::getInstance().getProcessId(), playerCreature.getNetworkId(), std::string(), playerObject->getStationId(), NetworkId::cms_invalid, std::string(), PlatformGameCode::SWG, static_cast<uint32>(ConfigServerGame::getAccountFeatureIdForMonthlyBoosterPack()), (std::numeric_limits<int>::min() / 2)); // adjusting by a large negative value will force it to 0
+	client->sendToConnectionServer(msg);
+
+	// display announcement
+	LOG("CustomerService",("VeteranRewards: displaying announcement for monthly free 5 pack of boosters for %s (account feature Id %lu, %d -> 0)", PlayerObject::getAccountDescription(&playerCreature).c_str(), static_cast<uint32>(ConfigServerGame::getAccountFeatureIdForMonthlyBoosterPack()), iterFind->second));
+	Chat::sendSystemMessage(playerCreature, StringId("veteran_new", "tcg_available_monthly_bonus_booster_pack"), Unicode::emptyString);
+}
+
+// ----------------------------------------------------------------------
+
+void VeteranRewardManager::announceSwgTcgBeta(CreatureObject const & playerCreature)
+{
+	if (ConfigServerGame::getAccountFeatureIdForTcgBetaAnnouncement() <= 0)
+		return;
+
+	PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(&playerCreature);
+	if (!playerObject)
+		return;
+
+	Client * const client = playerCreature.getClient();
+	if (!client)
+		return;
+
+	if (client->isUsingAdminLogin())
+		return;
+
+	Client::AccountFeatureIdList const & accountFeatureIds = client->getAccountFeatureIds();
+	Client::AccountFeatureIdList::const_iterator iterFind = accountFeatureIds.find(static_cast<uint32>(ConfigServerGame::getAccountFeatureIdForTcgBetaAnnouncement()));
+	if ((iterFind == accountFeatureIds.end()) || (iterFind->second <= 0))
+		return;
+
+	// reset the announcement feature id
+	AdjustAccountFeatureIdRequest const msg(NetworkId::cms_invalid, GameServer::getInstance().getProcessId(), playerCreature.getNetworkId(), std::string(), playerObject->getStationId(), NetworkId::cms_invalid, std::string(), PlatformGameCode::SWG, static_cast<uint32>(ConfigServerGame::getAccountFeatureIdForTcgBetaAnnouncement()), (std::numeric_limits<int>::min() / 2)); // adjusting by a large negative value will force it to 0
+	client->sendToConnectionServer(msg);
+
+	// display and send mail announcement
+	LOG("CustomerService",("VeteranRewards: displaying TCG beta announcement for %s (account feature Id %lu, %d -> 0)", PlayerObject::getAccountDescription(&playerCreature).c_str(), static_cast<uint32>(ConfigServerGame::getAccountFeatureIdForTcgBetaAnnouncement()), iterFind->second));
+	Chat::sendSystemMessage(playerCreature, StringId("veteran_new", "tcg_beta_announcement"), Unicode::emptyString);
+
+	Unicode::String const mailSubject = Unicode::narrowToWide("@" + StringId("veteran_new", "tcg_beta_announcement_subject").getCanonicalRepresentation());
+
+	ProsePackage pp;
+	pp.stringId = StringId("veteran_new", "tcg_beta_announcement");
+
+	Unicode::String oob;
+	OutOfBandPackager::pack(pp, -1, oob);
+
+	Chat::sendPersistentMessage("Star Wars Galaxies", Unicode::wideToNarrow(playerCreature.getAssignedObjectFirstName()), mailSubject, Unicode::emptyString, oob);
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<std::string> VeteranRewardManagerNamespace::buildVectorFromString(std::string packedString)
+{
+	std::vector<std::string> results;
+
+	if (packedString.empty())
+		return results;
+	
+	packedString +=','; // makes parsing easier
+	char temp[200];
+	int tempPos = 0;
+	for (std::string::const_iterator i=packedString.begin(); i!=packedString.end(); ++i)
+	{
+		if (*i==',')
+		{
+			temp[tempPos]='\0';
+			results.push_back(std::string(temp));
+			tempPos = 0;
+		}
+		else
+			temp[tempPos++]=*i;
+		FATAL(tempPos==200,("Data bug:  VeteranRewardManager could not parse list %s",packedString.c_str()));
+	}
+
+	return results;
+}
+
+// ----------------------------------------------------------------------
+
+void VeteranRewardManager::setOverrideAccountAge(int accountAge)
+{
+	if (ConfigServerGame::getVeteranDebugEnableOverrideAccountAge())
+		ms_overrideAccountAge=accountAge;
+}
+
+// ----------------------------------------------------------------------
+
+bool VeteranRewardManager::isFeatureIdBlockedBySubscriptionBit(CreatureObject const & playerCreature, uint32 featureId)
+{
+	FeatureIdBlockedBySubscriptionBitMap::const_iterator iter = ms_featureIdBlockedBySubscriptionBits.find(featureId);
+
+	if (iter == ms_featureIdBlockedBySubscriptionBits.end())
+		return false;
+
+	Client const * const client = playerCreature.getClient();
+
+	if (!client)
+		return false;
+
+	uint32 const subscriptionFeatures = client->getSubscriptionFeatures();
+
+	return (subscriptionFeatures & iter->second) != 0;
+}
+
+// ======================================================================
+
+RewardItem::RewardItem(DataTable const & dataTable, int row) :
+		m_id(dataTable.getStringValue("id",row)),
+		m_description(StringId(dataTable.getStringValue("Description",row))),
+		m_objectTemplateName(dataTable.getStringValue("Object Template",row)),
+		m_money(dataTable.getIntValue("Money",row)),
+		m_oncePerAccount(dataTable.getIntValue("Once Per Account",row) != 0),
+		m_oncePerAccountFeatureId(dataTable.getIntValue("Once Per Account Feature Id",row) != 0),
+		m_oncePerCharacter(m_oncePerAccount || dataTable.getIntValue("Once Per Character",row) != 0),
+		m_canTradeIn(dataTable.getIntValue("Can Trade In",row) != 0)
+{
+	FATAL(m_id.length() > 25,("Data bug:  veteran reward item name \"%s\" is too long.  The limit is 25 characters.", m_id.c_str()));
+	FATAL(!m_objectTemplateName.empty() && m_money != 0,("Data bug:  veteran reward %s specified an object template and a money amount.  A reward should be one or the other (to avoid a complicated exploit in which players can claim the item multiple times by preventing the money transfer from going through)",m_id.c_str()));
+
+	// only one of Once Per Account/Once Per Account Feature Id/Once Per Character can be set
+	FATAL(m_oncePerAccount && m_oncePerAccountFeatureId,("Data bug:  veteran reward %s cannot be both \"Once Per Account\" and \"Once Per Account Feature Id\"",m_id.c_str()));
+	FATAL(m_oncePerAccount && (dataTable.getIntValue("Once Per Character",row) != 0),("Data bug:  veteran reward %s cannot be both \"Once Per Account\" and \"Once Per Character\"",m_id.c_str()));
+	FATAL(m_oncePerAccountFeatureId && (dataTable.getIntValue("Once Per Character",row) != 0),("Data bug:  veteran reward %s cannot be both \"Once Per Character\" and \"Once Per Account Feature Id\"",m_id.c_str()));
+
+	uint32 templateItemCrc = 0;
+	if (m_objectTemplateName.find(".iff") != std::string::npos)
+		templateItemCrc = CrcLowerString::calculateCrc(m_objectTemplateName.c_str());
+
+	FATAL(((templateItemCrc > 0) && (ms_canTradeInRewardTemplateItem.count(templateItemCrc) > 0)), ("Data bug:  \"can trade in\" reward object template (%s) can only be defined as the reward object for 1 reward item", m_objectTemplateName.c_str()));
+	FATAL(((templateItemCrc == 0) && (ms_canTradeInRewardStaticItem.count(m_objectTemplateName) > 0)), ("Data bug:  \"can trade in\" reward object template (%s) can only be defined as the reward object for 1 reward item", m_objectTemplateName.c_str()));
+
+	if (m_canTradeIn)
+	{
+		FATAL(m_oncePerAccountFeatureId,("Data bug:  \"can trade in\" veteran reward %s cannot be \"Once Per Account Feature Id\"",m_id.c_str()));
+		FATAL(m_oncePerAccount || (dataTable.getIntValue("Once Per Character",row) != 0),("Data bug:  \"can trade in\" veteran reward %s cannot be \"Once Per Account\" or \"Once Per Character\"",m_id.c_str()));
+
+		if (templateItemCrc > 0)
+			ms_canTradeInRewardTemplateItem[templateItemCrc] = std::make_pair(m_id, 0);
+		else
+			ms_canTradeInRewardStaticItem[m_objectTemplateName] = std::make_pair(m_id, 0);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & RewardItem::getId() const
+{
+	return m_id;
+}
+
+// ----------------------------------------------------------------------
+
+StringId const & RewardItem::getDescription() const
+{
+	return m_description;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & RewardItem::getObjectTemplateName() const
+{
+	return m_objectTemplateName;
+}
+
+// ----------------------------------------------------------------------
+
+bool RewardItem::getOncePerAccount() const
+{
+	return m_oncePerAccount;
+}
+
+// ----------------------------------------------------------------------
+
+bool RewardItem::getOncePerAccountFeatureId() const
+{
+	return m_oncePerAccountFeatureId;
+}
+
+// ----------------------------------------------------------------------
+
+bool RewardItem::getOncePerCharacter() const
+{
+	return m_oncePerCharacter;
+}
+
+// ----------------------------------------------------------------------
+
+bool RewardItem::getCanTradeIn() const
+{
+	return m_canTradeIn;
+}
+
+// ----------------------------------------------------------------------
+
+int RewardItem::getMoney() const
+{
+	return m_money;
+}
+
+// ----------------------------------------------------------------------
+
+bool RewardItem::grantToPlayer(CreatureObject & playerCreature, uint32 accountFeatureId, int previousAccountFeatureIdCount, int currentAccountFeatureIdCount, bool regrant /*= false*/) const
+{
+	if (!m_objectTemplateName.empty())
+	{
+		NetworkId newObject;
+
+		std::vector<const char *> rewardItem;
+		rewardItem.push_back(m_objectTemplateName.c_str());
+
+		ScriptParams params;
+		params.addParam(rewardItem);
+
+		GameScriptObject * gso = playerCreature.getScriptObject();
+		if (gso && gso->hasTrigger(Scripting::TRIG_CREATE_VETERAN_REWARD))
+		{
+			// tell script to create the reward item
+			IGNORE_RETURN(gso->trigAllScripts(Scripting::TRIG_CREATE_VETERAN_REWARD, params));
+
+			// get the id of the created item
+			std::vector<const char *> const & triggerResult = params.getStringArrayParam(0);
+			if (!triggerResult.empty() && triggerResult[0] && (std::string(triggerResult[0]) != m_objectTemplateName))
+			{
+				newObject = NetworkId(std::string(triggerResult[0]));
+			}
+		}
+
+		if (!newObject.isValid())
+		{
+			if (!regrant)
+			{
+				if (accountFeatureId > 0)
+				{
+					LOG("CustomerService",("VeteranRewards:  %s tried to claim item %s, but it could not be created (account feature Id %lu, %d -> %d)", PlayerObject::getAccountDescription(&playerCreature).c_str(), getId().c_str(), accountFeatureId, previousAccountFeatureIdCount, currentAccountFeatureIdCount));
+				}
+				else
+				{
+					LOG("CustomerService",("VeteranRewards:  %s tried to claim item %s, but it could not be created", PlayerObject::getAccountDescription(&playerCreature).c_str(), getId().c_str()));
+				}
+			}
+			else
+			{
+				LOG("CustomerService",("VeteranRewards:  failed to regrant (item could not be created) item %s to %s", getId().c_str(), PlayerObject::getAccountDescription(&playerCreature).c_str()));
+			}
+
+			return false;
+		}
+		else
+		{
+			if (!regrant)
+			{
+				if (accountFeatureId > 0)
+				{
+					LOG("CustomerService",("VeteranRewards:  Granted item %s (%s) to player %s (account feature Id %lu, %d -> %d)", newObject.getValueString().c_str(), getId().c_str(), PlayerObject::getAccountDescription(&playerCreature).c_str(), accountFeatureId, previousAccountFeatureIdCount, currentAccountFeatureIdCount));
+				}
+				else
+				{
+					LOG("CustomerService",("VeteranRewards:  Granted item %s (%s) to player %s", newObject.getValueString().c_str(), getId().c_str(), PlayerObject::getAccountDescription(&playerCreature).c_str()));
+				}
+			}
+			else
+			{
+				LOG("CustomerService",("VeteranRewards:  Regranted item %s (%s) to player %s", newObject.getValueString().c_str(), getId().c_str(), PlayerObject::getAccountDescription(&playerCreature).c_str()));
+			}
+
+			// if the reward item supports trade in, attach the trade in script to it to provide the trade in functionality
+			ServerObject * const newObjectServerObject = ServerWorld::findObjectByNetworkId(newObject);
+			if (newObjectServerObject && newObjectServerObject->isAuthoritative() && newObjectServerObject->isInitialized())
+				VeteranRewardManager::attachTradeInScriptToItem(*newObjectServerObject);
+		}
+	}
+
+	if (getMoney() > 0)
+	{
+		if (!playerCreature.transferBankCreditsFrom("VeteranRewards", getMoney()))
+		{
+			if (!regrant)
+				LOG("CustomerService",("VeteranRewards:  %s tried to claim item %s, but the money could not be transfered", PlayerObject::getAccountDescription(&playerCreature).c_str(), getId().c_str()));
+			else
+				LOG("CustomerService",("VeteranRewards:  failed to regrant (money could not be transferred) item %s to %s", getId().c_str(), PlayerObject::getAccountDescription(&playerCreature).c_str()));
+
+			return false;
+		}
+		else
+		{
+			if (!regrant)
+				LOG("CustomerService",("VeteranRewards:  Granted %d credits (%s) to player %s", getMoney(), getId().c_str(), PlayerObject::getAccountDescription(&playerCreature).c_str()));
+			else
+				LOG("CustomerService",("VeteranRewards:  Regranted %d credits (%s) to player %s", getMoney(), getId().c_str(), PlayerObject::getAccountDescription(&playerCreature).c_str()));
+		}
+	}
+
+	if (getOncePerCharacter() || getOncePerAccount())
+	{
+		IGNORE_RETURN(playerCreature.setObjVarItem(ms_claimedItemsObjvar + "." + getId(), static_cast<int>(1)));
+	}
+
+	return true;
+}
+
+// ======================================================================
+
+RewardEvent::RewardEvent(DataTable const & dataTable, int row) :
+		m_rowId(row),
+		m_id(dataTable.getStringValue("id",row)),
+		m_specificItems(buildVectorFromString(dataTable.getStringValue("Items",row))),
+		m_includeItemsFrom(buildVectorFromString(dataTable.getStringValue("Include Items From",row))),
+		m_allItems(NULL),
+		m_category(dataTable.getIntValue("Category", row)),
+		m_featureBitRewardExclusionMask(dataTable.getIntValue("Feature Bit Reward Exclusion Mask", row)),
+		m_accountFlags(static_cast<uint32>(dataTable.getIntValue("Account Flags",row))),
+		m_accountFeatureId(static_cast<uint32>(dataTable.getIntValue("Account Feature Id",row))),
+		m_consumeAccountFeatureId((m_accountFeatureId > 0) ? (dataTable.getIntValue("Consume Account Feature Id",row) != 0) : false), // "Consume Account Feature Id" is only meaningful if "Account Feature Id" is > 0
+		m_minAccountAge(static_cast<unsigned int>(dataTable.getIntValue("Account Age Days",row))),
+		m_minCharacterAge(dataTable.getIntValue("Character Age Days",row)),
+		m_characterObjvar(dataTable.getStringValue("Character Objvar",row)),
+		m_oncePerAccount(dataTable.getIntValue("Once Per Account",row) != 0),
+		m_annoucement(dataTable.getStringValue("Announcement Message",row)),
+		m_description(dataTable.getStringValue("Description",row)),
+		m_url(dataTable.getStringValue("URL",row)),
+		m_startDate(yyyymmddToTime(dataTable.getIntValue("Start Date yyyy",row), dataTable.getIntValue("Start Date mm",row), dataTable.getIntValue("Start Date dd",row))),
+		m_endDate(yyyymmddToTime(dataTable.getIntValue("End Date yyyy",row), dataTable.getIntValue("End Date mm",row), dataTable.getIntValue("End Date dd",row))),
+		m_minBuddyPoints(dataTable.getIntValue("Buddy Points",row)),
+		m_featureIdBlockedBySubscriptionBit(dataTable.getIntValue("Feature Id Blocked by Subscription Bit", row))
+{
+	FATAL(m_id.empty(),("Data bug:  veteran reward event name at row %d is empty.", (row+3)));
+	FATAL(m_id[0] == '*',("Data bug:  veteran reward event name \"%s\" cannot start with *", m_id.c_str()));
+	FATAL(m_id.length() > 20,("Data bug:  veteran reward event name \"%s\" is too long.  The limit is 20 characters.", m_id.c_str()));
+	FATAL((m_oncePerAccount && (m_accountFeatureId > 0) && m_consumeAccountFeatureId),("Data bug:  veteran reward event name \"%s\" cannot be both a \"once per account\" and a \"consuming\" feature Id event.", m_id.c_str()));
+	FATAL(!m_accountFeatureId && m_featureIdBlockedBySubscriptionBit,("Data bug:  veteran reward event name \"%s\" has a Feature Id Blocked by Subscription Bit but the Feature Id is zero.", m_id.c_str()));
+
+	if (m_featureIdBlockedBySubscriptionBit && m_accountFeatureId)
+		ms_featureIdBlockedBySubscriptionBits[m_accountFeatureId] = m_featureIdBlockedBySubscriptionBit;
+}
+
+// ----------------------------------------------------------------------
+
+int RewardEvent::getCategory() const
+{
+	return m_category;
+}
+
+// ----------------------------------------------------------------------
+
+int RewardEvent::getFeatureBitRewardExclusionMask() const
+{
+	return m_featureBitRewardExclusionMask;
+}
+
+// ----------------------------------------------------------------------
+
+bool RewardEvent::getOncePerAccount() const
+{
+	return m_oncePerAccount;
+}
+
+// ----------------------------------------------------------------------
+
+uint32 RewardEvent::getAccountFeatureId() const
+{
+	return m_accountFeatureId;
+}
+
+// ----------------------------------------------------------------------
+
+bool RewardEvent::getConsumeAccountFeatureId() const
+{
+	return m_consumeAccountFeatureId;
+}
+
+// ----------------------------------------------------------------------
+
+bool RewardEvent::hasPlayerTriggered(CreatureObject const & playerCreature) const
+{
+	if (!ConfigServerGame::getEnableNewVeteranRewards())
+		return false;
+
+	if (!playerCreature.isAuthoritative())
+		return false;
+
+	Client const * const client = playerCreature.getClient();
+	if (!client)
+		return false;
+
+	if (client->isUsingAdminLogin())
+		return false; // Admin logins don't trigger rewards
+
+	if (ConfigServerGame::getVeteranDebugTriggerAll())
+		return true;
+
+	unsigned int entitledTime = client->getEntitlementEntitledTime();
+	uint32 const gameFeatures = client->getGameFeatures();
+	int const buddyPoints = client->getBuddyPoints();
+	PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(&playerCreature);
+	int const characterAge = playerObject ? playerObject->getAgeInDays() : 0;
+	uint32 const subscriptionFeatures = client->getSubscriptionFeatures();
+
+	entitledTime += static_cast<unsigned int>(static_cast<float>(buddyPoints) * ConfigServerGame::getBuddyPointTimeBonus());
+
+	if (ms_overrideAccountAge!=0)
+		entitledTime = ms_overrideAccountAge;
+
+	if (m_startDate != 0 || m_endDate != 0)
+	{
+		time_t currentTime = time(NULL);
+		if ((m_startDate != 0 && currentTime < m_startDate)
+			|| (m_endDate != 0 && currentTime > m_endDate))
+			return false;
+	}
+	
+	bool result = ((entitledTime >= m_minAccountAge) &&
+			(characterAge >= m_minCharacterAge) &&
+			((gameFeatures & m_accountFlags) == m_accountFlags) &&
+			(buddyPoints >= m_minBuddyPoints));
+
+	// check objvar requirement
+	if (result && !m_characterObjvar.empty())
+	{
+		if (!playerCreature.getObjVars().hasItem(m_characterObjvar))
+			result = false;
+	}
+
+	// check Feature Id requirement
+	if (result && (m_accountFeatureId > 0))
+	{
+		if ((m_featureIdBlockedBySubscriptionBit & subscriptionFeatures) != 0)
+			return false;
+
+		Client::AccountFeatureIdList const & accountFeatureIds = client->getAccountFeatureIds();
+		Client::AccountFeatureIdList::const_iterator iterFind = accountFeatureIds.find(m_accountFeatureId);
+		if ((iterFind == accountFeatureIds.end()) || (iterFind->second <= 0))
+			result = false;
+	}
+
+	// reward exclusion handling
+	//   this mask is used to exclude the player from receiving a reward based on a feature bit setting
+	//   for example, FreeTrial2 blocks the BARC speeder reward from ROWretail
+	if (result && (gameFeatures & getFeatureBitRewardExclusionMask()) != 0)
+		result = false;
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & RewardEvent::getId() const
+{
+	return m_id;
+}
+
+// ----------------------------------------------------------------------
+
+StringId const & RewardEvent::getAnnouncement() const
+{
+	return m_annoucement;
+}
+
+// ----------------------------------------------------------------------
+
+StringId const & RewardEvent::getDescription() const
+{
+	return m_description;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & RewardEvent::getUrl() const
+{
+	return m_url;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Return the list of reward items, including those indirectly included from
+ * other events.
+ *
+ * (Circular includes are allowed.)
+ */
+std::vector<std::pair<RewardItem const *, RewardEvent const *> > const & RewardEvent::getRewardItems() const
+{
+	if (!m_allItems)
+	{
+		// order this event and other events that this event can get
+		// items from  by the order they are listed in the rewards table;
+		// this is so that we can order the items by the order of the 
+		// event that they appear in in the rewards table 
+		std::map<int, RewardEvent const *> events;
+
+		{
+			events[m_rowId] = this;
+
+			for (std::vector<std::string>::const_iterator i=m_includeItemsFrom.begin(); i!=m_includeItemsFrom.end(); ++i)
+			{
+				RewardEvent const * const event = getRewardEventByName(*i);
+				WARNING_DEBUG_FATAL(!event,("Data bug:  Reward Event %s specified including items from Reward Event %s, which could not be found.  It is probably not in the events data table.", m_id.c_str(), i->c_str()));
+				if (event) //lint !e774 always true in debug builds
+				{
+					events[event->m_rowId] = event;
+				}
+			}
+		}
+
+		// get items for each of the event
+		std::list<std::pair<RewardItem const *, RewardEvent const *> > tempAllItems;
+		{
+			std::set<RewardItem const *> uniqueItems;
+			for (std::map<int, RewardEvent const *>::const_iterator iterEvent=events.begin(); iterEvent!=events.end(); ++iterEvent)
+			{
+				// get items specified in the event
+				std::list<std::pair<RewardItem const *, RewardEvent const *> > tempEventItems;
+				for (std::vector<std::string>::const_iterator i=iterEvent->second->m_specificItems.begin(); i!=iterEvent->second->m_specificItems.end(); ++i)
+				{
+					RewardItem const * const item = getRewardItemByName(*i);
+					WARNING_DEBUG_FATAL(!item,("Data bug:  Reward Event %s specified item %s, which could not be found.  It is probably not in the items data table.", iterEvent->second->m_id.c_str(), i->c_str()));
+					if (item) //lint !e774 always true in debug builds
+					{
+						if (uniqueItems.insert(item).second)
+							tempEventItems.push_front(std::make_pair(item, iterEvent->second));
+					}
+				}
+
+				// add items specified in the event to the master events list
+				for (std::list<std::pair<RewardItem const *, RewardEvent const *> >::const_iterator j = tempEventItems.begin(); j != tempEventItems.end(); ++j)
+					tempAllItems.push_front(*j);
+			}
+		}
+
+		// save the master events list
+		m_allItems = new std::vector<std::pair<RewardItem const *, RewardEvent const *> >;
+		
+		for (std::list<std::pair<RewardItem const *, RewardEvent const *> >::const_iterator iterItem = tempAllItems.begin(); iterItem != tempAllItems.end(); ++iterItem)
+			m_allItems->push_back(*iterItem);
+	}
+	
+	return *m_allItems;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/core/VeteranRewardManager.h b/engine/server/library/serverGame/src/shared/core/VeteranRewardManager.h
new file mode 100644
index 00000000..7395ab06
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/core/VeteranRewardManager.h
@@ -0,0 +1,69 @@
+// ======================================================================
+//
+// VeteranRewardManager.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_VeteranRewardManager_H
+#define INCLUDED_VeteranRewardManager_H
+
+// ======================================================================
+
+#include "StringId.h"
+#include "sharedFoundation/StationId.h"
+
+// ======================================================================
+
+class AdjustAccountFeatureIdResponse;
+class CreatureObject;
+class NetworkId;
+class ServerObject;
+
+// ======================================================================
+
+class VeteranRewardManager
+{
+  public:
+	static void install();
+
+	static void setOverrideAccountAge(int accountAge);
+	
+	static bool claimRewards(CreatureObject const & playerCreature, std::string const & rewardEventName, std::string const & rewardItem, std::string * debugMessage);
+	static void handleClaimRewardsReply(StationId stationId, NetworkId const & player, std::string const & rewardEvent, std::string const & rewardItem, uint32 accountFeatureId, bool consumeAccountFeatureId, int previousAccountFeatureIdCount, int currentAccountFeatureIdCount, bool result, bool verify);
+
+	static void writeAccountDataToObjvars(CreatureObject & playerCreature);
+	
+	static void getTriggeredEventsIds(CreatureObject const & playerCreature, std::vector<std::string> & eventsIds);
+	static void getAvailableRewardItemsForEvent(CreatureObject const & playerCreature, std::string const & rewardEventName, std::vector<std::string> & rewardItems, std::vector<std::string> * rewardDescriptions);
+	static void getRewardChoicesDescriptions(CreatureObject const & playerCreature, std::string const & eventName, std::vector<std::string> & rewardDescriptions);
+	static void getRewardChoicesTags(CreatureObject const & playerCreature, std::string const & eventName, std::vector<Unicode::String> & rewardTagsUnicode);
+	static StringId const * getEventAnnouncement(std::string const & eventName);
+	static StringId const * getEventDescription(std::string const & eventName);
+	static std::string const * getEventUrl(std::string const & eventName);
+	static bool isEventAccountUnique(std::string const & eventName);
+	static bool isItemAccountUnique(std::string const & itemName);
+	static bool isItemAccountUniqueFeatureId(std::string const & itemName);
+	static void verifyFeatureIdTransactions(CreatureObject & playerCreature, stdmap<std::string, int>::fwd const & transactionsFromLoginServer);
+	static void migrateVeteranRewardsClaimInformation(CreatureObject & playerCreature);
+	static void getConsumedEvents(ServerObject const & playerCreature, stdvector<std::string>::fwd & consumedEvents);
+	static void getClaimedItems(ServerObject const & playerCreature, stdvector<std::string>::fwd & claimedItems);
+	static void tcgRedemption(CreatureObject const & playerCreature, ServerObject & item, int featureId, int adjustment);
+	static bool checkForTcgRedemptionInProgress(ServerObject const & item);
+	static void handleTcgRedemptionResponse(ServerObject & item, AdjustAccountFeatureIdResponse const & response);
+	static void attachTradeInScriptToItem(ServerObject & item);
+	static bool tradeInReward(CreatureObject const & playerCreature, ServerObject & item, bool validateOnly);
+	static bool checkForTradeInInProgress(ServerObject const & item);
+	static void handleTradeInResponse(ServerObject & item, AdjustAccountFeatureIdResponse const & response);
+	static bool isTradeInRewardFeatureId(uint32 featureId);
+	static void announceMonthlyBonusBoosterPack(CreatureObject const & playerCreature);
+	static void announceSwgTcgBeta(CreatureObject const & playerCreature);
+	static bool isFeatureIdBlockedBySubscriptionBit(CreatureObject const & playerCreature, uint32 featureId);
+
+  private:
+	static void remove();
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/generated/Packager_cpp.template b/engine/server/library/serverGame/src/shared/generated/Packager_cpp.template
new file mode 100644
index 00000000..6a8c0c70
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/generated/Packager_cpp.template
@@ -0,0 +1,52 @@
+// ======================================================================
+//
+// Packager.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+// Edit Packager_cpp.template.  Do not edit Packager.cpp
+//
+// To change the contents of the addMemebersToPackage functions,
+// edit package_data.txt.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/TangibleObject.h"
+
+#include "serverGame/BattlefieldMarkerObject.h"
+#include "serverGame/BuildingObject.h"
+#include "serverGame/CellObject.h"
+#include "serverGame/CityObject.h"
+#include "serverGame/CommandQueue.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/DraftSchematicObject.h"
+#include "serverGame/FactoryObject.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/GuildObject.h"
+#include "serverGame/HarvesterInstallationObject.h"
+#include "serverGame/InstallationObject.h"
+#include "serverGame/IntangibleObject.h"
+#include "serverGame/ManufactureSchematicObject.h"
+#include "serverGame/ManufactureInstallationObject.h"
+#include "serverGame/MissionObject.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/PlayerQuestObject.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ResourceContainerObject.h"
+#include "serverGame/ResourcePoolObject.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/StaticObject.h"
+#include "serverGame/TangibleObject.h"
+#include "serverGame/UniverseObject.h"
+#include "serverGame/VehicleObject.h"
+#include "serverGame/WeaponObject.h"
+#include "serverScript/GameScriptObject.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedObject/ContainedByProperty.h"
+#include "sharedObject/SlottedContainmentProperty.h"
+
+
+//!!!BEGIN GENERATED PACKAGEADD
+//!!!END GENERATED PACKAGEADD
diff --git a/engine/server/library/serverGame/src/shared/guild/GuildInfo.cpp b/engine/server/library/serverGame/src/shared/guild/GuildInfo.cpp
new file mode 100644
index 00000000..62a68d68
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/guild/GuildInfo.cpp
@@ -0,0 +1,180 @@
+// ======================================================================
+//
+// GuildInfo.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/GuildInfo.h"
+
+#include "Archive/Archive.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+// ======================================================================
+
+namespace Archive
+{
+	void get(ReadIterator & source, GuildInfo & target)
+	{
+		get(source, target.m_name);
+		get(source, target.m_abbrev);
+		get(source, target.m_leaderId);
+		get(source, target.m_guildElectionPreviousEndTime);
+		get(source, target.m_guildElectionNextEndTime);
+		get(source, target.m_guildFaction);
+		get(source, target.m_timeLeftGuildFaction);
+		get(source, target.m_guildGcwDefenderRegion);
+		get(source, target.m_timeJoinedGuildGcwDefenderRegion);
+		get(source, target.m_timeLeftGuildGcwDefenderRegion);
+		get(source, target.m_sponsoredCount);
+		get(source, target.m_sponsoredAndMemberCount);
+		get(source, target.m_guildWarInclusionCount);
+		get(source, target.m_guildWarExclusionCount);
+	}
+
+	void put(ByteStream & target, const GuildInfo & source)
+	{
+		put(target, source.m_name);
+		put(target, source.m_abbrev);
+		put(target, source.m_leaderId);
+		put(target, source.m_guildElectionPreviousEndTime);
+		put(target, source.m_guildElectionNextEndTime);
+		put(target, source.m_guildFaction);
+		put(target, source.m_timeLeftGuildFaction);
+		put(target, source.m_guildGcwDefenderRegion);
+		put(target, source.m_timeJoinedGuildGcwDefenderRegion);
+		put(target, source.m_timeLeftGuildGcwDefenderRegion);
+		put(target, source.m_sponsoredCount);
+		put(target, source.m_sponsoredAndMemberCount);
+		put(target, source.m_guildWarInclusionCount);
+		put(target, source.m_guildWarExclusionCount);
+	}
+}
+
+// ======================================================================
+
+GuildInfo::GuildInfo() :
+	m_name(),
+	m_abbrev(),
+	m_leaderId(),
+	m_guildElectionPreviousEndTime(0),
+	m_guildElectionNextEndTime(0),
+	m_guildFaction(0),
+	m_timeLeftGuildFaction(0),
+	m_guildGcwDefenderRegion(),
+	m_timeJoinedGuildGcwDefenderRegion(0),
+	m_timeLeftGuildGcwDefenderRegion(0),
+	m_sponsoredCount(0),
+	m_sponsoredAndMemberCount(0),
+	m_guildWarInclusionCount(0),
+	m_guildWarExclusionCount(0)
+{
+}
+
+// ======================================================================
+
+GuildInfo::GuildInfo(GuildInfo const * const gi) :
+	m_name(),
+	m_abbrev(),
+	m_leaderId(),
+	m_guildElectionPreviousEndTime(0),
+	m_guildElectionNextEndTime(0),
+	m_guildFaction(0),
+	m_timeLeftGuildFaction(0),
+	m_guildGcwDefenderRegion(),
+	m_timeJoinedGuildGcwDefenderRegion(0),
+	m_timeLeftGuildGcwDefenderRegion(0),
+	m_sponsoredCount(0),
+	m_sponsoredAndMemberCount(0),
+	m_guildWarInclusionCount(0),
+	m_guildWarExclusionCount(0)
+{
+	if (gi)
+	{
+		m_name = gi->m_name;
+		m_abbrev = gi->m_abbrev;
+		m_leaderId = gi->m_leaderId;
+		m_guildElectionPreviousEndTime = gi->m_guildElectionPreviousEndTime;
+		m_guildElectionNextEndTime = gi->m_guildElectionNextEndTime;
+		m_guildFaction = gi->m_guildFaction;
+		m_timeLeftGuildFaction = gi->m_timeLeftGuildFaction;
+		m_guildGcwDefenderRegion = gi->m_guildGcwDefenderRegion;
+		m_timeJoinedGuildGcwDefenderRegion = gi->m_timeJoinedGuildGcwDefenderRegion;
+		m_timeLeftGuildGcwDefenderRegion = gi->m_timeLeftGuildGcwDefenderRegion;
+		m_sponsoredCount = gi->m_sponsoredCount;
+		m_sponsoredAndMemberCount = gi->m_sponsoredAndMemberCount;
+		m_guildWarInclusionCount = gi->m_guildWarInclusionCount;
+		m_guildWarExclusionCount = gi->m_guildWarExclusionCount;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+GuildInfo::~GuildInfo()
+{
+}
+
+// ----------------------------------------------------------------------
+
+bool GuildInfo::operator== (const GuildInfo& rhs) const
+{
+	if (this == &rhs)
+		return true;
+
+	return ((m_name == rhs.m_name) &&
+		(m_abbrev == rhs.m_abbrev) &&
+		(m_leaderId == rhs.m_leaderId) &&
+		(m_guildElectionPreviousEndTime == rhs.m_guildElectionPreviousEndTime) &&
+		(m_guildElectionNextEndTime == rhs.m_guildElectionNextEndTime) &&
+		(m_guildFaction == rhs.m_guildFaction) &&
+		(m_timeLeftGuildFaction == rhs.m_timeLeftGuildFaction) &&
+		(m_guildGcwDefenderRegion == rhs.m_guildGcwDefenderRegion) &&
+		(m_timeJoinedGuildGcwDefenderRegion == rhs.m_timeJoinedGuildGcwDefenderRegion) &&
+		(m_timeLeftGuildGcwDefenderRegion == rhs.m_timeLeftGuildGcwDefenderRegion) &&
+		(m_sponsoredCount == rhs.m_sponsoredCount) &&
+		(m_sponsoredAndMemberCount == rhs.m_sponsoredAndMemberCount) &&
+		(m_guildWarInclusionCount == rhs.m_guildWarInclusionCount) &&
+		(m_guildWarExclusionCount == rhs.m_guildWarExclusionCount));
+}
+
+// ----------------------------------------------------------------------
+
+bool GuildInfo::operator!= (const GuildInfo& rhs) const
+{
+	return !operator==(rhs);
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInfo::getCountMembersOnly() const
+{
+	return std::max(0, (m_sponsoredAndMemberCount - m_sponsoredCount));
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInfo::getCountSponsoredOnly() const
+{
+	return m_sponsoredCount;
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInfo::getCountMembersAndSponsored() const
+{
+	return m_sponsoredAndMemberCount;
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInfo::getCountMembersGuildWarPvPEnabled() const
+{
+	if (m_guildWarInclusionCount)
+		return m_guildWarInclusionCount;
+
+	return std::max(0, (m_sponsoredAndMemberCount - m_sponsoredCount - m_guildWarExclusionCount));
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/guild/GuildInfo.h b/engine/server/library/serverGame/src/shared/guild/GuildInfo.h
new file mode 100644
index 00000000..52f0f648
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/guild/GuildInfo.h
@@ -0,0 +1,62 @@
+// ======================================================================
+//
+// GuildInfo.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _GuildInfo_H_
+#define _GuildInfo_H_
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkId.h"
+
+// ======================================================================
+
+class GuildInfo
+{
+public:
+	GuildInfo();
+	GuildInfo(GuildInfo const * gi);
+	~GuildInfo();
+
+	bool operator== (const GuildInfo& rhs) const;
+	bool operator!= (const GuildInfo& rhs) const;
+
+	int getCountMembersOnly() const;
+	int getCountSponsoredOnly() const;
+	int getCountMembersAndSponsored() const;
+	int getCountMembersGuildWarPvPEnabled() const;
+
+	std::string m_name;
+	std::string m_abbrev;
+	NetworkId m_leaderId;
+	int m_guildElectionPreviousEndTime;
+	int m_guildElectionNextEndTime;
+	uint32 m_guildFaction;
+	int m_timeLeftGuildFaction;
+	std::string m_guildGcwDefenderRegion;
+	int m_timeJoinedGuildGcwDefenderRegion;
+	int m_timeLeftGuildGcwDefenderRegion;
+
+	int m_sponsoredCount;
+	int m_sponsoredAndMemberCount;
+	int m_guildWarInclusionCount;
+	int m_guildWarExclusionCount;
+};
+
+// ======================================================================
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+
+	void get(ReadIterator & source, GuildInfo & target);
+	void put(ByteStream & target, const GuildInfo & source);
+}
+// ======================================================================
+
+#endif // _GuildInfo_H_
diff --git a/engine/server/library/serverGame/src/shared/guild/GuildInterface.cpp b/engine/server/library/serverGame/src/shared/guild/GuildInterface.cpp
new file mode 100644
index 00000000..d09b8c13
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/guild/GuildInterface.cpp
@@ -0,0 +1,1489 @@
+// ======================================================================
+//
+// GuildInterface.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/GuildInterface.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/Chat.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/GuildObject.h"
+#include "serverGame/GuildStringParser.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedFoundation/CalendarTime.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedNetworkMessages/ChatRoomData.h"
+
+#include <hash_map>
+
+// ======================================================================
+
+namespace GuildInterfaceNamespace
+{
+	// ----------------------------------------------------------------------
+	const std::string s_empty;
+	uint32 const s_guildChannelLimit = 400;
+
+	int const s_maxInactiveGuildWarsTracked = 100;
+	std::string const s_objvarInactiveGuildWarsPrefix("guildWarsEnded");
+	std::string const s_objvarInactiveGuildWarsMostRecentIndex = s_objvarInactiveGuildWarsPrefix + std::string(".mostRecentIndex");
+
+	std::map<int, std::vector<int> > s_guildEnemiesAToB;
+	std::map<int, std::map<int, std::pair<int, time_t> > > s_guildEnemiesAToBKillInfo;
+	std::map<int, std::vector<int> > s_guildEnemiesBToA;
+	bool s_needEnemiesRebuild;
+
+	// dictionary containing the table showing all active guild wars with at least 1 kill
+	ScriptParams * s_activeGuildWars = NULL;
+	bool s_activeGuildWarsNeedRebuild = true;
+
+	// dictionary containing the table showing the 100 most recently ended guild wars with at least 1 kill
+	ScriptParams * s_inactiveGuildWars = NULL;
+	int s_inactiveGuildWarsMostRecentUpdateIndex = 0;
+
+	typedef std::map<std::string, NetworkId> PendingChannelAddList; //using a map to make it easier to prevent redundant entries
+	typedef std::map<std::string,PendingChannelAddList> PendingChannelAddMap;
+	PendingChannelAddMap s_pendingChannelAdds;
+
+	// ----------------------------------------------------------------------
+
+	std::string const &getChatRoomPrefix()
+	{ //lint !e1929 // returning a reference makes sense here.
+		static std::string const prefix = std::string("SWG.") + GameServer::getInstance().getClusterName().c_str() + ".guild.";
+		return prefix;
+	}
+
+	// ----------------------------------------------------------------------
+
+	std::string const &getChatRoomSuffix()
+	{ //lint !e1929 // returning a reference makes sense here.
+		static std::string const suffix("." + ChatRoomTypes::ROOM_GUILD);
+		return suffix;
+	}
+
+	// ----------------------------------------------------------------------
+
+	std::string getChatRoomPath(int guildId)
+	{
+		char buf[256];
+		snprintf(buf, 256, "%s%d%s", getChatRoomPrefix().c_str(), guildId, getChatRoomSuffix().c_str());
+		return std::string(buf);
+	}
+
+	// ----------------------------------------------------------------------
+
+	std::string getChatRoomTitle(int guildId)
+	{
+		char buf[32];
+		snprintf(buf, 32, "%d", guildId);
+		return std::string(buf);
+	}
+
+	// ----------------------------------------------------------------------
+
+	std::string const & getVoiceChatDisplayName()
+	{
+		return ChatRoomTypes::ROOM_GUILD;
+	}
+
+	// ----------------------------------------------------------------------
+
+	const char * makeCopyOfString(const char * rhs)
+	{
+		char * lhs = NULL;
+		if (rhs)
+		{
+			lhs = new char[strlen(rhs) + 1];
+			strcpy(lhs, rhs);
+		}
+		else
+		{
+			lhs = new char[1];
+			lhs[0] = '\0';
+		}
+
+		return lhs;
+	}
+}
+using namespace GuildInterfaceNamespace;
+
+// ======================================================================
+
+void GuildInterface::update()
+{
+	if (ServerUniverse::getInstance().isUniverseLoaded())
+	{
+		GuildObject *masterGuildObject = ServerUniverse::getInstance().getMasterGuildObject();
+		if (masterGuildObject)
+		{
+			if (s_needEnemiesRebuild)
+				buildEnemies(*masterGuildObject);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::touchEnemies()
+{
+	s_needEnemiesRebuild = true;
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::buildEnemies(GuildObject const &guildObject)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("GuildInterface::buildEnemies");
+
+	s_needEnemiesRebuild = false;
+	s_activeGuildWarsNeedRebuild = true;
+
+	// potential pvp updates for every guilded creature
+	std::vector<PvpUpdateObserver*> pvpUpdateObservers;
+	{
+		CreatureObject::AllCreaturesSet const &creatureList = CreatureObject::getAllCreatures();
+		for (CreatureObject::AllCreaturesSet::const_iterator i = creatureList.begin(); i != creatureList.end(); ++i)
+			if ((*i)->getGuildId())
+				pvpUpdateObservers.push_back(new PvpUpdateObserver(*i, Archive::ADOO_generic));
+	}
+
+	s_guildEnemiesAToB.clear();
+	s_guildEnemiesAToBKillInfo.clear();
+	s_guildEnemiesBToA.clear();
+
+	std::set<std::string> const &enemies = guildObject.getGuildEnemies();
+	for (std::set<std::string>::const_iterator i = enemies.begin(); i != enemies.end(); ++i)
+	{
+		int guildId, enemyId, killCount, lastUpdateTime;
+		if (GuildStringParser::parseEnemyInfo(*i, guildId, enemyId, killCount, lastUpdateTime))
+		{
+			s_guildEnemiesAToB[guildId].push_back(enemyId);
+
+			std::pair<std::map<int, std::pair<int, time_t> >::iterator, bool> result = s_guildEnemiesAToBKillInfo[guildId].insert(std::make_pair(enemyId, std::make_pair(killCount, static_cast<time_t>(lastUpdateTime))));
+			if (!result.second)
+			{
+				// multiple A->B guild enemy entries, so consolidate into one entry
+				result.first->second.first += killCount;
+				result.first->second.second = std::max(result.first->second.second, static_cast<time_t>(lastUpdateTime));
+			}
+
+			s_guildEnemiesBToA[enemyId].push_back(guildId);
+		}
+	}
+
+	// destroy pvp update observers
+	{
+		for (std::vector<PvpUpdateObserver *>::iterator i = pvpUpdateObservers.begin(); i != pvpUpdateObservers.end(); ++i)
+			delete (*i);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInterface::getGuildId(NetworkId const &memberId)
+{
+	return ServerUniverse::getInstance().getMasterGuildObject()->getGuildId(memberId);
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInterface::getGuildIdForSponsored(NetworkId const &memberId)
+{
+	return ServerUniverse::getInstance().getMasterGuildObject()->getGuildIdForSponsored(memberId);
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInterface::getGuildIdForGuildLeader(NetworkId const &leaderId)
+{
+	return ServerUniverse::getInstance().getMasterGuildObject()->getGuildIdForGuildLeader(leaderId);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::getAllGuildIds(std::vector<int> &results)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->getAllGuildIds(results);
+}
+
+// ----------------------------------------------------------------------
+
+
+int GuildInterface::findGuild(std::string const &name)
+{
+	return ServerUniverse::getInstance().getMasterGuildObject()->findGuild(name);
+}
+
+// ----------------------------------------------------------------------
+
+bool GuildInterface::guildExists(int guildId)
+{
+	return ServerUniverse::getInstance().getMasterGuildObject()->guildExists(guildId);
+}
+
+// ----------------------------------------------------------------------
+
+std::pair<int, time_t> const *GuildInterface::hasDeclaredWarAgainst(int actorGuildId, int targetGuildId)
+{
+	if (actorGuildId && targetGuildId)
+	{
+		std::map<int, std::map<int, std::pair<int, time_t> > >::const_iterator const iterFindA = s_guildEnemiesAToBKillInfo.find(actorGuildId);
+		if (iterFindA != s_guildEnemiesAToBKillInfo.end())
+		{
+			std::map<int, std::pair<int, time_t> >::const_iterator const iterFindB = iterFindA->second.find(targetGuildId);
+			if (iterFindB != iterFindA->second.end())
+				return &(iterFindB->second);
+		}
+	}
+
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+GuildInfo const * GuildInterface::getGuildInfo(int guildId)
+{
+	return ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+}
+
+// ----------------------------------------------------------------------
+
+std::string const &GuildInterface::getGuildName(int guildId)
+{
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+		return gi->m_name;
+
+	return s_empty;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const &GuildInterface::getGuildAbbrev(int guildId)
+{
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+		return gi->m_abbrev;
+	
+	return s_empty;
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const &GuildInterface::getGuildLeaderId(int guildId)
+{
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+		return gi->m_leaderId;
+
+	return NetworkId::cms_invalid;
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInterface::getGuildElectionPreviousEndTime(int guildId)
+{
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+		return gi->m_guildElectionPreviousEndTime;
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInterface::getGuildElectionNextEndTime(int guildId)
+{
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+		return gi->m_guildElectionNextEndTime;
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+uint32 GuildInterface::getGuildCurrentFaction(int guildId)
+{
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+		return getGuildCurrentFaction(*gi);
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+uint32 GuildInterface::getGuildCurrentFaction(GuildInfo const & gi)
+{
+	if (gi.m_timeLeftGuildFaction <= 0)
+		return gi.m_guildFaction;
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+uint32 GuildInterface::getGuildPreviousFaction(int guildId)
+{
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+		return getGuildPreviousFaction(*gi);
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+uint32 GuildInterface::getGuildPreviousFaction(GuildInfo const & gi)
+{
+	if (gi.m_timeLeftGuildFaction > 0)
+		return gi.m_guildFaction;
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInterface::getTimeLeftGuildPreviousFaction(int guildId)
+{
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+		return getTimeLeftGuildPreviousFaction(*gi);
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInterface::getTimeLeftGuildPreviousFaction(GuildInfo const & gi)
+{
+	if (gi.m_timeLeftGuildFaction > 0)
+		return gi.m_timeLeftGuildFaction;
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & GuildInterface::getGuildCurrentGcwDefenderRegion(int guildId)
+{
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+		return getGuildCurrentGcwDefenderRegion(*gi);
+
+	return s_empty;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const &GuildInterface::getGuildCurrentGcwDefenderRegion(GuildInfo const & gi)
+{
+	if (gi.m_timeLeftGuildGcwDefenderRegion <= 0)
+		return gi.m_guildGcwDefenderRegion;
+
+	return s_empty;
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInterface::getTimeJoinedGuildCurrentGcwDefenderRegion(int guildId)
+{
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+		return getTimeJoinedGuildCurrentGcwDefenderRegion(*gi);
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInterface::getTimeJoinedGuildCurrentGcwDefenderRegion(GuildInfo const & gi)
+{
+	if (gi.m_timeLeftGuildGcwDefenderRegion <= 0)
+		return gi.m_timeJoinedGuildGcwDefenderRegion;
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & GuildInterface::getGuildPreviousGcwDefenderRegion(int guildId)
+{
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+		return getGuildPreviousGcwDefenderRegion(*gi);
+
+	return s_empty;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & GuildInterface::getGuildPreviousGcwDefenderRegion(GuildInfo const & gi)
+{
+	if (gi.m_timeLeftGuildGcwDefenderRegion > 0)
+		return gi.m_guildGcwDefenderRegion;
+
+	return s_empty;
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInterface::getTimeLeftGuildPreviousGcwDefenderRegion(int guildId)
+{
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+		return getTimeLeftGuildPreviousGcwDefenderRegion(*gi);
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInterface::getTimeLeftGuildPreviousGcwDefenderRegion(GuildInfo const & gi)
+{
+	if (gi.m_timeLeftGuildGcwDefenderRegion > 0)
+		return gi.m_timeLeftGuildGcwDefenderRegion;
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+std::map<std::pair<std::string, int>, uint32> const & GuildInterface::getGcwRegionDefenderGuilds()
+{
+	return ServerUniverse::getInstance().getMasterGuildObject()->getGcwRegionDefenderGuilds();
+}
+
+// ----------------------------------------------------------------------
+
+std::map<std::string, std::pair<int, int> > const & GuildInterface::getGcwRegionDefenderGuildsCount()
+{
+	return ServerUniverse::getInstance().getMasterGuildObject()->getGcwRegionDefenderGuildsCount();
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInterface::getGcwRegionDefenderGuildsVersion()
+{
+	return ServerUniverse::getInstance().getMasterGuildObject()->getGcwRegionDefenderGuildsVersion();
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::getGuildMemberIds(int guildId, std::vector<NetworkId> &results)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->getGuildMemberIds(guildId, results);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::getGuildMemberIdsWithPermissions(int guildId, int permissions, std::vector<NetworkId> &results)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->getMemberIdsWithPermissions(guildId, permissions, results);
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInterface::getGuildCountMembersOnly(int guildId)
+{
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+		return gi->getCountMembersOnly();
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInterface::getGuildCountSponsoredOnly(int guildId)
+{
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+		return gi->getCountSponsoredOnly();
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInterface::getGuildCountMembersAndSponsored(int guildId)
+{
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+		return gi->getCountMembersAndSponsored();
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInterface::getGuildCountMembersGuildWarPvPEnabled(int guildId)
+{
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+		return gi->getCountMembersGuildWarPvPEnabled();
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+GuildMemberInfo const * GuildInterface::getGuildMemberInfo(int guildId, NetworkId const &memberId)
+{
+	return ServerUniverse::getInstance().getMasterGuildObject()->getGuildMemberInfo(guildId, memberId);
+}
+
+// ----------------------------------------------------------------------
+
+bool GuildInterface::getGuildMemberGuildWarEnabled(int guildId, NetworkId const &memberId)
+{
+	if (guildId == 0)
+		return false;
+
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (!gi)
+		return false;
+
+	GuildMemberInfo const * const gmi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildMemberInfo(guildId, memberId);
+	if (!gmi)
+		return false;
+
+	// if guild is using guild war inclusion list, only members
+	// with GuildInterface::WarInclusion is enabled for guild war
+	if (gi->m_guildWarInclusionCount)
+		return (gmi->m_permissions & GuildInterface::WarInclusion);
+
+	// if guild is not using guild war inclusion list, only members
+	// with GuildInterface::WarExclusion is disabled for guild war
+	return (!(gmi->m_permissions & GuildInterface::WarExclusion));
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<int> const &GuildInterface::getGuildEnemies(int guildId)
+{
+	static std::vector<int> empty;
+
+	std::map<int, std::vector<int> >::const_iterator iterFind =  s_guildEnemiesAToB.find(guildId);
+	if (iterFind != s_guildEnemiesAToB.end())
+		return iterFind->second;
+
+	return empty;
+}
+
+// ----------------------------------------------------------------------
+
+std::map<int, std::pair<int, time_t> > const &GuildInterface::getGuildEnemiesKillInfo(int guildId)
+{
+	static std::map<int, std::pair<int, time_t> > empty;
+
+	std::map<int, std::map<int, std::pair<int, time_t> > >::const_iterator iterFind = s_guildEnemiesAToBKillInfo.find(guildId);
+	if (iterFind != s_guildEnemiesAToBKillInfo.end())
+		return iterFind->second;
+
+	return empty;
+}
+
+// ----------------------------------------------------------------------
+
+std::pair<int, time_t> const &GuildInterface::getGuildEnemyKillInfo(int guildIdA, int guildIdB)
+{
+	static std::pair<int, time_t> empty = std::make_pair(0, 0);
+
+	std::map<int, std::map<int, std::pair<int, time_t> > >::const_iterator iterFindA = s_guildEnemiesAToBKillInfo.find(guildIdA);
+	if (iterFindA != s_guildEnemiesAToBKillInfo.end())
+	{
+		std::map<int, std::pair<int, time_t> >::const_iterator iterFindB = iterFindA->second.find(guildIdB);
+		if (iterFindB != iterFindA->second.end())
+			return iterFindB->second;
+	}
+
+	return empty;
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<int> const &GuildInterface::getGuildsAtWarWith(int guildId)
+{
+	static std::vector<int> empty;
+
+	std::map<int, std::vector<int> >::const_iterator iterFind =  s_guildEnemiesBToA.find(guildId);
+	if (iterFind != s_guildEnemiesBToA.end())
+		return iterFind->second;
+
+	return empty;
+}
+
+// ----------------------------------------------------------------------
+
+ScriptParams const *GuildInterface::getMasterGuildWarTableDictionary()
+{
+	if (s_activeGuildWarsNeedRebuild)
+	{
+		// build list of guild wars with at least 1 kill, ordered by most recent update time, with the guild with more kills appearing first
+		std::multimap<time_t, std::pair<std::pair<int, int>, std::pair<int, int> > > guildMutuallyAtWarWithKillSummary;
+
+		{
+			for (std::map<int, std::map<int, std::pair<int, time_t> > >::const_iterator iter1 = s_guildEnemiesAToBKillInfo.begin(); iter1 != s_guildEnemiesAToBKillInfo.end(); ++iter1)
+			{
+				for (std::map<int, std::pair<int, time_t> >::const_iterator iter2 = iter1->second.upper_bound(iter1->first); iter2 != iter1->second.end(); ++iter2)
+				{
+					// we know A has declared war on B, so see if B has declared on A to make it a guild war
+					std::pair<int, time_t> const * killInfoBtoA = hasDeclaredWarAgainst(iter2->first, iter1->first);
+					if (killInfoBtoA)
+					{
+						// we have a guild war, store it if there is at least one kill
+						if ((iter2->second.first <= 0) && (killInfoBtoA->first <= 0))
+							continue;
+
+						// guild with more kills appears first, and if guilds have the same
+						// number of kills, guild with more recent kill appears first
+						if (iter2->second.first > killInfoBtoA->first)
+							guildMutuallyAtWarWithKillSummary.insert(std::make_pair(-std::max(iter2->second.second, killInfoBtoA->second), std::make_pair(std::make_pair(iter1->first, iter2->second.first), std::make_pair(iter2->first, killInfoBtoA->first))));
+						else if (killInfoBtoA->first > iter2->second.first)
+							guildMutuallyAtWarWithKillSummary.insert(std::make_pair(-std::max(iter2->second.second, killInfoBtoA->second), std::make_pair(std::make_pair(iter2->first, killInfoBtoA->first), std::make_pair(iter1->first, iter2->second.first))));
+						else if (iter2->second.second > killInfoBtoA->second)
+							guildMutuallyAtWarWithKillSummary.insert(std::make_pair(-std::max(iter2->second.second, killInfoBtoA->second), std::make_pair(std::make_pair(iter1->first, iter2->second.first), std::make_pair(iter2->first, killInfoBtoA->first))));
+						else
+							guildMutuallyAtWarWithKillSummary.insert(std::make_pair(-std::max(iter2->second.second, killInfoBtoA->second), std::make_pair(std::make_pair(iter2->first, killInfoBtoA->first), std::make_pair(iter1->first, iter2->second.first))));
+					}
+				}
+			}
+		}
+
+		delete s_activeGuildWars;
+		s_activeGuildWars = NULL;
+
+		// build the table
+		if (!guildMutuallyAtWarWithKillSummary.empty())
+		{
+			// column header
+			static const char * s_scriptParamsColumnHeadersText[9] = 
+			{
+				"Name - Guild A",
+				"Abbrev - Guild A",
+				"Kill Count - Guild A",
+				"Guild War PvP Enabled Count - Guild A",
+				"Name - Guild B",
+				"Abbrev - Guild B",
+				"Kill Count - Guild B",
+				"Guild War PvP Enabled Count - Guild B",
+				"Last Updated"
+			};
+			static std::vector<const char *> s_scriptParamsColumnHeaders(s_scriptParamsColumnHeadersText, s_scriptParamsColumnHeadersText + (sizeof(s_scriptParamsColumnHeadersText) / sizeof(const char *)));
+
+			// column type
+			static const char * s_scriptParamsColumnTypeText[9] = 
+			{
+				"text",
+				"text",
+				"integer",
+				"integer",
+				"text",
+				"text",
+				"integer",
+				"integer",
+				"text"
+			};
+			static std::vector<const char *> s_scriptParamsColumnType(s_scriptParamsColumnTypeText, s_scriptParamsColumnTypeText + (sizeof(s_scriptParamsColumnTypeText) / sizeof(const char *)));
+
+			s_activeGuildWars = new ScriptParams();
+			std::vector<const char *> * scriptParamsGuildAName = new std::vector<const char *>;
+			std::vector<const char *> * scriptParamsGuildAAbbrev = new std::vector<const char *>;
+			std::vector<const char *> * scriptParamsGuildAKillCount = new std::vector<const char *>;
+			std::vector<const char *> * scriptParamsGuildAPvpEnabledCount = new std::vector<const char *>;
+			std::vector<const char *> * scriptParamsGuildBName = new std::vector<const char *>;
+			std::vector<const char *> * scriptParamsGuildBAbbrev = new std::vector<const char *>;
+			std::vector<const char *> * scriptParamsGuildBKillCount = new std::vector<const char *>;
+			std::vector<const char *> * scriptParamsGuildBPvpEnabledCount = new std::vector<const char *>;
+			std::vector<const char *> * scriptParamsLastUpdated = new std::vector<const char *>;
+
+			size_t const size = guildMutuallyAtWarWithKillSummary.size();
+			scriptParamsGuildAName->reserve(size);
+			scriptParamsGuildAAbbrev->reserve(size);
+			scriptParamsGuildAKillCount->reserve(size);
+			scriptParamsGuildAPvpEnabledCount->reserve(size);
+			scriptParamsGuildBName->reserve(size);
+			scriptParamsGuildBAbbrev->reserve(size);
+			scriptParamsGuildBKillCount->reserve(size);
+			scriptParamsGuildBPvpEnabledCount->reserve(size);
+			scriptParamsLastUpdated->reserve(size);
+
+			char buffer[128];
+			for (std::multimap<time_t, std::pair<std::pair<int, int>, std::pair<int, int> > >::const_iterator iter = guildMutuallyAtWarWithKillSummary.begin(); iter != guildMutuallyAtWarWithKillSummary.end(); ++iter)
+			{
+				GuildInfo const * gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(iter->second.first.first);
+				if (!gi)
+					continue;
+
+				GuildInfo const & guildA = *gi;
+
+				gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(iter->second.second.first);
+				if (!gi)
+					continue;
+
+				GuildInfo const & guildB = *gi;
+
+				scriptParamsGuildAName->push_back(makeCopyOfString(guildA.m_name.c_str()));
+				scriptParamsGuildAAbbrev->push_back(makeCopyOfString(guildA.m_abbrev.c_str()));
+
+				snprintf(buffer, sizeof(buffer), "%d", iter->second.first.second);
+				scriptParamsGuildAKillCount->push_back(makeCopyOfString(buffer));
+
+				snprintf(buffer, sizeof(buffer), "%d", guildA.getCountMembersGuildWarPvPEnabled());
+				scriptParamsGuildAPvpEnabledCount->push_back(makeCopyOfString(buffer));
+
+				scriptParamsGuildBName->push_back(makeCopyOfString(guildB.m_name.c_str()));
+				scriptParamsGuildBAbbrev->push_back(makeCopyOfString(guildB.m_abbrev.c_str()));
+
+				snprintf(buffer, sizeof(buffer), "%d", iter->second.second.second);
+				scriptParamsGuildBKillCount->push_back(makeCopyOfString(buffer));
+
+				snprintf(buffer, sizeof(buffer), "%d", guildB.getCountMembersGuildWarPvPEnabled());
+				scriptParamsGuildBPvpEnabledCount->push_back(makeCopyOfString(buffer));
+
+				scriptParamsLastUpdated->push_back(makeCopyOfString(CalendarTime::convertEpochToTimeStringLocal_YYYYMMDDHHMMSS(-iter->first).c_str()));
+			}
+
+			s_activeGuildWars->addParam(s_scriptParamsColumnHeaders, "column", false);
+			s_activeGuildWars->addParam(s_scriptParamsColumnType, "columnType", false);
+			s_activeGuildWars->addParam(*scriptParamsGuildAName, "column0", true);
+			s_activeGuildWars->addParam(*scriptParamsGuildAAbbrev, "column1", true);
+			s_activeGuildWars->addParam(*scriptParamsGuildAKillCount, "column2", true);
+			s_activeGuildWars->addParam(*scriptParamsGuildAPvpEnabledCount, "column3", true);
+			s_activeGuildWars->addParam(*scriptParamsGuildBName, "column4", true);
+			s_activeGuildWars->addParam(*scriptParamsGuildBAbbrev, "column5", true);
+			s_activeGuildWars->addParam(*scriptParamsGuildBKillCount, "column6", true);
+			s_activeGuildWars->addParam(*scriptParamsGuildBPvpEnabledCount, "column7", true);
+			s_activeGuildWars->addParam(*scriptParamsLastUpdated, "column8", true);
+		}
+
+		s_activeGuildWarsNeedRebuild = false;
+	}
+
+	return s_activeGuildWars;
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::updateInactiveGuildWarTrackingInfo(GuildObject &masterGuildObject, int guildAId, int guildAKillCount, int guildBId, int guildBKillCount)
+{
+	if (!masterGuildObject.isAuthoritative())
+		return;
+
+	if ((guildAKillCount <= 0) && (guildBKillCount <= 0))
+		return;
+
+	GuildInfo const * giA = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildAId);
+	if (!giA)
+		return;
+
+	if (giA->m_name.empty() || giA->m_abbrev.empty())
+		return;
+
+	GuildInfo const * giB = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildBId);
+	if (!giB)
+		return;
+
+	if (giB->m_name.empty() || giB->m_abbrev.empty())
+		return;
+
+	// the information is stored as objvars on the master guild object as a circular
+	// list of the 100 most recently ended guild wars with at least 1 kill
+	int nextIndex = 0;
+	if (!masterGuildObject.getObjVars().getItem(s_objvarInactiveGuildWarsMostRecentIndex, nextIndex))
+		nextIndex = 0;
+
+	++nextIndex;
+	if (nextIndex > s_maxInactiveGuildWarsTracked)
+		nextIndex = 1;
+
+	// guild with higher kill count appears first
+	if (guildAKillCount > guildBKillCount)
+		IGNORE_RETURN(masterGuildObject.setObjVarItem(FormattedString<32>().sprintf("%s.%d", s_objvarInactiveGuildWarsPrefix.c_str(), nextIndex), FormattedString<512>().sprintf("%s~%s~%d~%s~%s~%d~%ld", giA->m_name.c_str(), giA->m_abbrev.c_str(), guildAKillCount, giB->m_name.c_str(), giB->m_abbrev.c_str(), guildBKillCount, ::time(NULL))));
+	else
+		IGNORE_RETURN(masterGuildObject.setObjVarItem(FormattedString<32>().sprintf("%s.%d", s_objvarInactiveGuildWarsPrefix.c_str(), nextIndex), FormattedString<512>().sprintf("%s~%s~%d~%s~%s~%d~%ld", giB->m_name.c_str(), giB->m_abbrev.c_str(), guildBKillCount, giA->m_name.c_str(), giA->m_abbrev.c_str(), guildAKillCount, ::time(NULL))));
+
+	IGNORE_RETURN(masterGuildObject.setObjVarItem(s_objvarInactiveGuildWarsMostRecentIndex, nextIndex));
+}
+
+// ----------------------------------------------------------------------
+
+ScriptParams const *GuildInterface::getInactiveGuildWarTableDictionary()
+{
+	// update the table if necessary
+	GuildObject const * const masterGuildObject = ServerUniverse::getInstance().getMasterGuildObject();
+	if (!masterGuildObject)
+		return s_inactiveGuildWars;
+
+	DynamicVariableList const & objVars = masterGuildObject->getObjVars();
+	int mostRecentIndex = 0;
+	if (!objVars.getItem(s_objvarInactiveGuildWarsMostRecentIndex, mostRecentIndex))
+		return s_inactiveGuildWars;
+
+	if ((mostRecentIndex <= 0) || (mostRecentIndex > s_maxInactiveGuildWarsTracked))
+		return s_inactiveGuildWars;
+
+	// no new update since we last updated the table
+	if (mostRecentIndex == s_inactiveGuildWarsMostRecentUpdateIndex)
+		return s_inactiveGuildWars;
+
+	// new update since we last updated the table, recreate the table
+	s_inactiveGuildWarsMostRecentUpdateIndex = mostRecentIndex;
+
+	std::vector<const Unicode::String *> * scriptParamsGuildAName = new std::vector<const Unicode::String *>;
+	std::vector<const Unicode::String *> * scriptParamsGuildAAbbrev = new std::vector<const Unicode::String *>;
+	std::vector<const Unicode::String *> * scriptParamsGuildAKillCount = new std::vector<const Unicode::String *>;
+	std::vector<const Unicode::String *> * scriptParamsGuildBName = new std::vector<const Unicode::String *>;
+	std::vector<const Unicode::String *> * scriptParamsGuildBAbbrev = new std::vector<const Unicode::String *>;
+	std::vector<const Unicode::String *> * scriptParamsGuildBKillCount = new std::vector<const Unicode::String *>;
+	std::vector<const char *> * scriptParamsLastUpdated = new std::vector<const char *>;
+
+	scriptParamsGuildAName->reserve(s_maxInactiveGuildWarsTracked);
+	scriptParamsGuildAAbbrev->reserve(s_maxInactiveGuildWarsTracked);
+	scriptParamsGuildAKillCount->reserve(s_maxInactiveGuildWarsTracked);
+	scriptParamsGuildBName->reserve(s_maxInactiveGuildWarsTracked);
+	scriptParamsGuildBAbbrev->reserve(s_maxInactiveGuildWarsTracked);
+	scriptParamsGuildBKillCount->reserve(s_maxInactiveGuildWarsTracked);
+	scriptParamsLastUpdated->reserve(s_maxInactiveGuildWarsTracked);
+
+	// the information is stored as objvars on the master guild object as a circular
+	// list of the 100 most recently ended guild wars with at least 1 kill, so get
+	// each one, ordered by the most recent one first
+	static Unicode::String const delimiters(Unicode::narrowToWide("~"));
+	Unicode::UnicodeStringVector tokens;
+	Unicode::String guildWarData;
+	int currentIndex = mostRecentIndex;
+	while (true)
+	{
+		if (!objVars.getItem(FormattedString<32>().sprintf("%s.%d", s_objvarInactiveGuildWarsPrefix.c_str(), currentIndex), guildWarData))
+			break;
+
+		if (!Unicode::tokenize(guildWarData, tokens, &delimiters, NULL) || (tokens.size() != 7))
+			break;
+
+		scriptParamsGuildAName->push_back(new Unicode::String(tokens[0]));
+		scriptParamsGuildAAbbrev->push_back(new Unicode::String(tokens[1]));
+		scriptParamsGuildAKillCount->push_back(new Unicode::String(tokens[2]));
+
+		scriptParamsGuildBName->push_back(new Unicode::String(tokens[3]));
+		scriptParamsGuildBAbbrev->push_back(new Unicode::String(tokens[4]));
+		scriptParamsGuildBKillCount->push_back(new Unicode::String(tokens[5]));
+
+		scriptParamsLastUpdated->push_back(makeCopyOfString(CalendarTime::convertEpochToTimeStringLocal_YYYYMMDDHHMMSS(static_cast<time_t>(::atol(Unicode::wideToNarrow(tokens[6]).c_str()))).c_str()));
+
+		--currentIndex;
+		if (currentIndex <= 0)
+			currentIndex = s_maxInactiveGuildWarsTracked;
+
+		if (currentIndex == mostRecentIndex)
+			break;
+	}
+
+	delete s_inactiveGuildWars;
+	s_inactiveGuildWars = NULL;
+
+	if (!scriptParamsGuildAName->empty())
+	{
+		// column header
+		static const char * s_scriptParamsColumnHeadersText[7] = 
+		{
+			"Name - Guild A",
+			"Abbrev - Guild A",
+			"Kill Count - Guild A",
+			"Name - Guild B",
+			"Abbrev - Guild B",
+			"Kill Count - Guild B",
+			"Time Ended"
+		};
+		static std::vector<const char *> s_scriptParamsColumnHeaders(s_scriptParamsColumnHeadersText, s_scriptParamsColumnHeadersText + (sizeof(s_scriptParamsColumnHeadersText) / sizeof(const char *)));
+
+		// column type
+		static const char * s_scriptParamsColumnTypeText[7] = 
+		{
+			"text",
+			"text",
+			"integer",
+			"text",
+			"text",
+			"integer",
+			"text"
+		};
+		static std::vector<const char *> s_scriptParamsColumnType(s_scriptParamsColumnTypeText, s_scriptParamsColumnTypeText + (sizeof(s_scriptParamsColumnTypeText) / sizeof(const char *)));
+
+		s_inactiveGuildWars = new ScriptParams();
+		s_inactiveGuildWars->addParam(s_scriptParamsColumnHeaders, "column", false);
+		s_inactiveGuildWars->addParam(s_scriptParamsColumnType, "columnType", false);
+		s_inactiveGuildWars->addParam(*scriptParamsGuildAName, "column0", true);
+		s_inactiveGuildWars->addParam(*scriptParamsGuildAAbbrev, "column1", true);
+		s_inactiveGuildWars->addParam(*scriptParamsGuildAKillCount, "column2", true);
+		s_inactiveGuildWars->addParam(*scriptParamsGuildBName, "column3", true);
+		s_inactiveGuildWars->addParam(*scriptParamsGuildBAbbrev, "column4", true);
+		s_inactiveGuildWars->addParam(*scriptParamsGuildBKillCount, "column5", true);
+		s_inactiveGuildWars->addParam(*scriptParamsLastUpdated, "column6", true);
+	}
+	else
+	{
+		delete scriptParamsGuildAName;
+		delete scriptParamsGuildAAbbrev;
+		delete scriptParamsGuildAKillCount;
+		delete scriptParamsGuildBName;
+		delete scriptParamsGuildBAbbrev;
+		delete scriptParamsGuildBKillCount;
+		delete scriptParamsLastUpdated;
+	}
+
+	return s_inactiveGuildWars;
+}
+
+// ----------------------------------------------------------------------
+
+bool GuildInterface::isValidGuildName(std::string const &guildName)
+{
+	if (guildName.empty() || guildName.length() > 25)
+		return false;
+	// TODO RAD: add obscenity checking here
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool GuildInterface::isValidGuildAbbrev(std::string const &guildAbbrev)
+{
+	if (guildAbbrev.length() > 5)
+		return false;
+	return isValidGuildName(guildAbbrev);
+}
+
+// ----------------------------------------------------------------------
+
+int GuildInterface::createGuild(std::string const &guildName, std::string const &guildAbbrev)
+{
+	if (!isValidGuildName(guildName) || !isValidGuildAbbrev(guildAbbrev))
+		return 0;
+	int guildId = ServerUniverse::getInstance().getMasterGuildObject()->createGuild(guildName, guildAbbrev);
+	Chat::requestGetChannel(getChatRoomPath(guildId), false, true, s_guildChannelLimit);
+	return guildId;
+}
+
+// ----------------------------------------------------------------------
+void GuildInterface::disbandGuild(int guildId)
+{
+	Chat::requestDestroyChannel(getChatRoomPath(guildId));
+	ServerUniverse::getInstance().getMasterGuildObject()->disbandGuild(guildId);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::removeGuildMember(int guildId, NetworkId const &memberId)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->removeGuildMember(guildId, memberId);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::addGuildCreatorMember(int guildId, NetworkId const &memberId)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->addGuildCreatorMember(guildId, memberId, std::string(), std::string(), 0);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::addGuildSponsorMember(int guildId, NetworkId const &memberId)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->addGuildSponsorMember(guildId, memberId, std::string(), std::string(), 0);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::setGuildMemberPermission(int guildId, NetworkId const &memberId, int permissions)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->setGuildMemberPermission(guildId, memberId, permissions);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::setGuildMemberTitle(int guildId, NetworkId const &memberId, std::string const &title)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->setGuildMemberTitle(guildId, memberId, title);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::setGuildMemberAllegiance(int guildId, NetworkId const &memberId, NetworkId const &allegiance)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->setGuildMemberAllegiance(guildId, memberId, allegiance);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::setGuildMemberPermissionAndAllegiance(int guildId, NetworkId const &memberId, int permissions, NetworkId const &allegiance)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->setGuildMemberPermissionAndAllegiance(guildId, memberId, permissions, allegiance);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::setGuildMemberProfessionInfo(int guildId, NetworkId const &memberId, std::string const &memberProfessionSkillTemplate, int memberLevel)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->setGuildMemberProfessionInfo(guildId, memberId, memberProfessionSkillTemplate, memberLevel);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::addGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->addGuildMemberRank(guildId, memberId, rankName);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::removeGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->removeGuildMemberRank(guildId, memberId, rankName);
+}
+
+// ----------------------------------------------------------------------
+
+bool GuildInterface::hasGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName)
+{
+	return ServerUniverse::getInstance().getMasterGuildObject()->hasGuildMemberRank(guildId, memberId, rankName);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::getGuildMemberRank(int guildId, NetworkId const &memberId, std::vector<std::string> &ranks)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->getGuildMemberRank(guildId, memberId, ranks);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::setGuildLeader(int guildId, NetworkId const &leaderId)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->setGuildLeader(guildId, leaderId);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::setGuildElectionEndTime(int guildId, int electionPreviousEndTime, int electionNextEndTime)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->setGuildElectionEndTime(guildId, electionPreviousEndTime, electionNextEndTime);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::setGuildFaction(int guildId, uint32 guildFaction)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->setGuildFaction(guildId, guildFaction);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::setGuildGcwDefenderRegion(int guildId, std::string const &guildGcwDefenderRegion)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->setGuildGcwDefenderRegion(guildId, guildGcwDefenderRegion);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::setGuildEnemy(int guildId, int enemyId)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->setGuildEnemy(guildId, enemyId);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::removeGuildEnemy(int guildId, int enemyId)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->removeGuildEnemy(guildId, enemyId);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::updateGuildWarKillTracking(CreatureObject const &killer, CreatureObject const &victim)
+{
+	if (killer.getGuildId()
+	 && victim.getGuildId()
+	 && killer.getGuildWarEnabled()
+	 && victim.getGuildWarEnabled()
+	 && hasDeclaredWarAgainst(killer.getGuildId(), victim.getGuildId())
+	 && hasDeclaredWarAgainst(victim.getGuildId(), killer.getGuildId()))
+	{
+		ServerUniverse::getInstance().getMasterGuildObject()->modifyGuildWarKillTracking(killer.getGuildId(), victim.getGuildId(), 1, static_cast<int>(::time(NULL)));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::setGuildName(int guildId, std::string const &newName)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->setGuildName(guildId, newName);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::setGuildAbbrev(int guildId, std::string const &newAbbrev)
+{
+	ServerUniverse::getInstance().getMasterGuildObject()->setGuildAbbrev(guildId, newAbbrev);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::onGuildIdSet(CreatureObject const &who)
+{
+	int const guildId = who.getGuildId();
+	NetworkId const & whoId = who.getNetworkId();
+	std::string const objectName = Unicode::wideToNarrow(who.getAssignedObjectName());
+
+	GuildMemberInfo const * const memberInfo = ServerUniverse::getInstance().getMasterGuildObject()->getGuildMemberInfo(guildId, whoId);
+	if (memberInfo)
+	{
+		bool const fixName = (!objectName.empty() && (memberInfo->m_name != objectName));
+		bool const fixGuildLeaderPermissions = ((getGuildLeaderId(guildId) == whoId) && ((memberInfo->m_permissions & GuildInterface::AllAdministrativePermissions) != GuildInterface::AllAdministrativePermissions));
+
+		WARNING(fixName, ("Fixing guild (%d) member (%s) name (%s) which doesn't match object name (%s)", guildId, whoId.getValueString().c_str(), memberInfo->m_name.c_str(), objectName.c_str()));
+		WARNING(fixGuildLeaderPermissions, ("Fixing guild (%d) leader (%s) permission from (%d) to (%d)", guildId, whoId.getValueString().c_str(), memberInfo->m_permissions, (memberInfo->m_permissions | GuildInterface::AllAdministrativePermissions)));
+
+		if (fixName || fixGuildLeaderPermissions)
+		{
+			ServerUniverse::getInstance().getMasterGuildObject()->setGuildMemberNameAndPermision(
+				guildId,
+				whoId,
+				(fixName ? objectName : memberInfo->m_name),
+				(fixGuildLeaderPermissions ? (memberInfo->m_permissions | GuildInterface::AllAdministrativePermissions) : memberInfo->m_permissions));
+		}
+	}
+	else if ((getGuildLeaderId(guildId) == whoId) && !objectName.empty())
+	{
+		// handle the case where a guild leader somehow
+		// is no longer a member of the guild
+		WARNING(true, ("Guild (%d) leader (%s, %s) is currently not a guild member, so making the guild leader a guild member", guildId, whoId.getValueString().c_str(), objectName.c_str()));
+
+		addGuildCreatorMember(guildId, whoId);
+	}
+
+	enterGuildChatRoom(who);
+	enterGuildVoiceChatRoom(who);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::onAboutToClearGuildId(CreatureObject const &who)
+{
+	leaveGuildChatRoom(who);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::verifyGuildMemberName(NetworkId const &memberId, std::string const &memberName)
+{
+	int guildId = getGuildId(memberId);
+	if (guildId <= 0)
+		guildId = getGuildIdForSponsored(memberId);
+
+	if (guildId <= 0)
+		return;
+
+	GuildMemberInfo const * const memberInfo = getGuildMemberInfo(guildId, memberId);
+	if (!memberInfo)	
+		return;
+
+	if (memberInfo->m_name == memberName)
+		return;
+
+	ServerUniverse::getInstance().getMasterGuildObject()->setGuildMemberNameAndPermision(
+		guildId,
+		memberId,
+		memberName,
+		memberInfo->m_permissions);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::enterGuildChatRoom(CreatureObject const &who)
+{
+	int guildId = who.getGuildId();
+	if (guildId)
+	{
+		Chat::createRoom("System", false, getChatRoomPath(guildId), getChatRoomTitle(guildId));
+		std::string firstName;
+		size_t pos = 0;
+		IGNORE_RETURN(Unicode::getFirstToken(Unicode::wideToNarrow(who.getObjectName()), 0, pos, firstName));
+		Chat::invite(firstName, getChatRoomPath(guildId));
+		Chat::enterRoom(firstName, getChatRoomPath(guildId), false, false);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::reenterGuildChatRoom(CreatureObject const &who)
+{
+	int guildId = who.getGuildId();
+	if (guildId)
+	{
+		std::string firstName;
+		size_t pos = 0;
+		IGNORE_RETURN(Unicode::getFirstToken(Unicode::wideToNarrow(who.getObjectName()), 0, pos, firstName));
+
+		std::string const guildChatRoomPath = getChatRoomPath(guildId);
+		Chat::exitRoom(firstName, guildChatRoomPath);
+		Chat::uninvite(firstName, guildChatRoomPath);
+		Chat::invite(firstName, guildChatRoomPath);
+		Chat::enterRoom(firstName, guildChatRoomPath, false, false);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::enterGuildVoiceChatRoom(CreatureObject const &who)
+{
+	int guildId = who.getGuildId();
+	if (guildId)
+	{
+		std::string firstName;
+		size_t pos = 0;
+		IGNORE_RETURN(Unicode::getFirstToken(Unicode::wideToNarrow(who.getObjectName()), 0, pos, firstName));
+
+		std::string roomPath = getChatRoomPath(guildId);
+
+		PendingChannelAddMap::iterator entryItr = s_pendingChannelAdds.find(roomPath);
+		if(entryItr == s_pendingChannelAdds.end()) //not currently pending
+		{
+			Chat::requestGetChannel(roomPath, false, true, s_guildChannelLimit);
+			s_pendingChannelAdds[roomPath].insert(std::make_pair(firstName, who.getNetworkId()));
+			//DEBUG_WARNING(true,("Created channel and differed add for %s %s %s", roomPath.c_str(), who.getNetworkId().getValueString().c_str(), firstName.c_str()));
+
+		}
+		else //already have a request out
+		{
+			entryItr->second[firstName] = who.getNetworkId();
+			//DEBUG_WARNING(true,("added differed add for %s %s %s", roomPath.c_str(), who.getNetworkId().getValueString().c_str(), firstName.c_str()));
+		}
+	}
+}
+
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::leaveGuildChatRoom(CreatureObject const &who)
+{
+	int guildId = who.getGuildId();
+	if (guildId)
+	{
+		std::string firstName;
+		size_t pos = 0;
+		IGNORE_RETURN(Unicode::getFirstToken(Unicode::wideToNarrow(who.getObjectName()), 0, pos, firstName));
+		Chat::exitRoom(firstName, getChatRoomPath(guildId));
+		Chat::uninvite(firstName, getChatRoomPath(guildId));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::leaveGuildVoiceChatRoom(NetworkId const & playerNetworkId, std::string const & firstName, int guildId)
+{
+	PendingChannelAddMap::iterator channelAddList = s_pendingChannelAdds.find(getChatRoomPath(guildId));
+	if(channelAddList != s_pendingChannelAdds.end())
+	{
+		PendingChannelAddList::iterator creatureEntry = channelAddList->second.find(firstName);
+		if(creatureEntry != channelAddList->second.end())
+		{
+			channelAddList->second.erase(creatureEntry);
+		}
+	}
+
+	Chat::requestRemoveClientFromChannel(playerNetworkId, firstName, getChatRoomPath(guildId));
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::sendGuildChat(CreatureObject const &who, Unicode::String const &text)
+{
+	int guildId = who.getGuildId();
+	if (guildId)
+	{
+		std::string firstName;
+		size_t pos = 0;
+		IGNORE_RETURN(Unicode::getFirstToken(Unicode::wideToNarrow(who.getObjectName()), 0, pos, firstName));
+		Chat::sendToRoom(firstName, getChatRoomPath(guildId), text, Unicode::String());
+	}
+}
+
+// ---------------------------------------------------------------------
+
+void GuildInterface::onChatRoomCreate(std::string const &path)
+{
+	std::string const &prefix = getChatRoomPrefix();
+	if (!path.compare(0, prefix.length(), prefix))
+	{
+		int guildId = atoi(path.c_str()+prefix.length());
+		if (guildId)
+		{
+			std::vector<ServerObject *> players;
+			GameServer::getInstance().getObjectsWithClients(players);
+			for (std::vector<ServerObject *>::const_iterator i = players.begin(); i != players.end(); ++i)
+			{
+				if ((*i)->isAuthoritative() && (*i)->isPlayerControlled())
+				{
+					CreatureObject const *playerCreature = (*i)->asCreatureObject();
+					if (playerCreature && playerCreature->getGuildId() == guildId)
+						enterGuildChatRoom(*playerCreature);
+				}
+			}
+		}
+	}
+}
+
+void GuildInterface::onVoiceChatRoomCreate(std::string const &roomPath)
+{
+	//DEBUG_WARNING(true, ("onVoiceChatRoomCreate path %s", roomPath.c_str()));
+	PendingChannelAddMap::iterator entry = s_pendingChannelAdds.find(roomPath);
+	if(entry != s_pendingChannelAdds.end())
+	{
+		std::string const & path = entry->first;
+		PendingChannelAddList const & pendingAdds = entry->second;
+		for(PendingChannelAddList::const_iterator i = pendingAdds.begin(); i != pendingAdds.end(); ++i)
+		{
+			//DEBUG_WARNING(true,("Requesting add for %s %s %s", path.c_str(), i->second.getValueString().c_str(), i->first.c_str()));
+			Chat::requestAddClientToChannel(i->second, i->first, path, true);
+		}
+		s_pendingChannelAdds.erase(entry);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildInterface::createAllGuildChatRooms()
+{
+	std::set<int> guildIds;
+	std::vector<ServerObject *> players;
+	GameServer::getInstance().getObjectsWithClients(players);
+	for (std::vector<ServerObject *>::const_iterator i = players.begin(); i != players.end(); ++i)
+	{
+		if ((*i)->isAuthoritative() && (*i)->isPlayerControlled())
+		{
+			CreatureObject const *playerCreature = (*i)->asCreatureObject();
+			if (playerCreature && playerCreature->getGuildId())
+				IGNORE_RETURN(guildIds.insert(playerCreature->getGuildId()));
+		}
+	}
+	for (std::set<int>::const_iterator j = guildIds.begin(); j != guildIds.end(); ++j)
+	{
+		Chat::createRoom("System", false, getChatRoomPath(*j), getChatRoomTitle(*j));
+
+		//TODO: temporary separation of voice and text, this should be rolled into the createRoom call above
+		//We create the chat room when a guild member logs in, it will save us $$ to not
+		//create it here.
+		//Chat::requestGetChannel(getVoiceChatRoomPath(*j), false, false);
+	}
+}
+
+// ----------------------------------------------------------------------
+// returns the number of guild members, guild name, and guild abbrev that the
+// mail was sent to or -1 if insufficient permission to send mail to guild members
+std::pair<int, std::pair<std::string, std::string> > GuildInterface::mailToGuild(CreatureObject const &who, Unicode::String const &subject, Unicode::String const &message, Unicode::String const &oob)
+{
+	int count = -1;
+	std::string guildName, guildAbbrev;
+	int const guildId = who.getGuildId();
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+	{
+		GuildMemberInfo const * const mailerInfo = ServerUniverse::getInstance().getMasterGuildObject()->getGuildMemberInfo(guildId, who.getNetworkId());
+		if (mailerInfo && ((mailerInfo->m_permissions & GuildInterface::Mail) || (gi->m_leaderId == who.getNetworkId())))
+		{
+			guildName = gi->m_name;
+			guildAbbrev = gi->m_abbrev;
+			count = 0;
+			std::vector<NetworkId> memberIds;
+			ServerUniverse::getInstance().getMasterGuildObject()->getGuildMemberIds(guildId, memberIds);
+			for (std::vector<NetworkId>::const_iterator i = memberIds.begin(); i != memberIds.end(); ++i)
+			{
+				GuildMemberInfo const * const memberInfo = ServerUniverse::getInstance().getMasterGuildObject()->getGuildMemberInfo(guildId, *i);
+				if (memberInfo && (memberInfo->m_permissions & GuildInterface::Member))
+				{
+					Chat::sendPersistentMessage(Unicode::wideToNarrow(who.getEncodedObjectName()), memberInfo->m_name, subject, message, oob);
+					++count;
+				}
+			}
+		}
+	}
+
+	return std::make_pair(count, std::make_pair(guildName, guildAbbrev));
+}
+
+// ----------------------------------------------------------------------
+// returns the number of guild members, guild name, and guild abbrev that the
+// mail was sent to or -1 if insufficient permission to send mail to guild members
+std::pair<int, std::pair<std::string, std::string> > GuildInterface::mailToGuild(int guildId, Unicode::String const &subject, Unicode::String const &message, Unicode::String const &oob)
+{
+	int count = -1;
+	std::string guildName, guildAbbrev;
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+	{
+		guildName = gi->m_name;
+		guildAbbrev = gi->m_abbrev;
+		count = 0;
+		std::vector<NetworkId> memberIds;
+		ServerUniverse::getInstance().getMasterGuildObject()->getGuildMemberIds(guildId, memberIds);
+		for (std::vector<NetworkId>::const_iterator i = memberIds.begin(); i != memberIds.end(); ++i)
+		{
+			GuildMemberInfo const * const memberInfo = ServerUniverse::getInstance().getMasterGuildObject()->getGuildMemberInfo(guildId, *i);
+			if (memberInfo && (memberInfo->m_permissions & GuildInterface::Member))
+			{
+				Chat::sendPersistentMessage(guildName, memberInfo->m_name, subject, message, oob);
+				++count;
+			}
+		}
+	}
+
+	return std::make_pair(count, std::make_pair(guildName, guildAbbrev));
+}
+
+// ----------------------------------------------------------------------
+// returns the number of guild members, guild name, and guild abbrev that the
+// mail was sent to or -1 if insufficient permission to send mail to guild members
+std::pair<int, std::pair<std::string, std::string> > GuildInterface::mailToGuildRank(CreatureObject const &who, int guildRankSlotId, Unicode::String const &subject, Unicode::String const &message, Unicode::String const &oob)
+{
+	int count = -1;
+	std::string guildName, guildAbbrev;
+	int const guildId = who.getGuildId();
+	GuildInfo const * const gi = ServerUniverse::getInstance().getMasterGuildObject()->getGuildInfo(guildId);
+	if (gi)
+	{
+		GuildMemberInfo const * const mailerInfo = ServerUniverse::getInstance().getMasterGuildObject()->getGuildMemberInfo(guildId, who.getNetworkId());
+		if (mailerInfo && ((mailerInfo->m_permissions & GuildInterface::Mail) || (gi->m_leaderId == who.getNetworkId())))
+		{
+			guildName = gi->m_name;
+			guildAbbrev = gi->m_abbrev;
+			count = 0;
+			std::vector<NetworkId> memberIds;
+			ServerUniverse::getInstance().getMasterGuildObject()->getGuildMemberIds(guildId, memberIds);
+			for (std::vector<NetworkId>::const_iterator i = memberIds.begin(); i != memberIds.end(); ++i)
+			{
+				GuildMemberInfo const * const memberInfo = ServerUniverse::getInstance().getMasterGuildObject()->getGuildMemberInfo(guildId, *i);
+				if (memberInfo && (memberInfo->m_permissions & GuildInterface::Member) && memberInfo->m_rank.testBit(guildRankSlotId))
+				{
+					Chat::sendPersistentMessage(Unicode::wideToNarrow(who.getEncodedObjectName()), memberInfo->m_name, subject, message, oob);
+					++count;
+				}
+			}
+		}
+	}
+
+	return std::make_pair(count, std::make_pair(guildName, guildAbbrev));
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/guild/GuildInterface.h b/engine/server/library/serverGame/src/shared/guild/GuildInterface.h
new file mode 100644
index 00000000..a4517f7b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/guild/GuildInterface.h
@@ -0,0 +1,166 @@
+// ======================================================================
+//
+// GuildInterface.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _GuildInterface_H_
+#define _GuildInterface_H_
+
+// ======================================================================
+
+class CreatureObject;
+class GuildInfo;
+class GuildMemberInfo;
+class GuildObject;
+class NetworkId;
+class ScriptParams;
+
+// ======================================================================
+
+class GuildInterface // static
+{
+public:
+	// Note: These should never be moved, and should be in sync with what is in
+	// guild.scriptlib and ConsoleCommandParserGuild.cpp::getGuildPermissionsText()
+	enum GuildPermissions
+	{
+		None       = 0,      // sponsored
+
+		// administrative permissions
+		Member     = (1<<0),
+		Sponsor    = (1<<1),
+		Disband    = (1<<2),
+		Accept     = (1<<3),
+		Kick       = (1<<4),
+		Mail       = (1<<5),
+		Title      = (1<<6),
+		Namechange = (1<<7),
+		War        = (1<<8),
+		Rank       = (1<<9),
+
+		// if you need to add a new administrative guild permission,
+		// use one of the following reserved administrative guild
+		// permissions, which has been reserved for that specific purpose
+		AdministrativeReserved1  = (1<<10),
+		AdministrativeReserved2  = (1<<11),
+		AdministrativeReserved3  = (1<<12),
+		AdministrativeReserved4  = (1<<13),
+		AdministrativeReserved5  = (1<<14),
+		AdministrativeReserved6  = (1<<15),
+		AdministrativeReserved7  = (1<<16),
+		AdministrativeReserved8  = (1<<17),
+		AdministrativeReserved9  = (1<<18),
+		AdministrativeReserved10 = (1<<19),
+
+		AllAdministrativePermissions = (Member | Sponsor | Disband | Accept | Kick | Mail | Title | Namechange | War | Rank | AdministrativeReserved1 | AdministrativeReserved2 | AdministrativeReserved3 | AdministrativeReserved4 | AdministrativeReserved5 | AdministrativeReserved6 | AdministrativeReserved7 | AdministrativeReserved8 | AdministrativeReserved9 | AdministrativeReserved10),
+
+		// non-administrative permissions
+		ElectionCandidate = (1<<20), // guild member is running in the current guild election
+		WarInclusion      = (1<<21), // guild member is in the guild war inclusion list
+		WarExclusion      = (1<<22)  // guild member is in the guild war exclusion list
+	};
+
+	static void update();
+	static void touchEnemies();
+
+	static int getGuildId(NetworkId const &memberId);
+	static int getGuildIdForSponsored(NetworkId const &memberId);
+	static int getGuildIdForGuildLeader(NetworkId const &leaderId);
+	static void getAllGuildIds(stdvector<int>::fwd &results);
+	static int findGuild(std::string const &name);
+	static bool guildExists(int guildId);
+	static std::pair<int, time_t> const *hasDeclaredWarAgainst(int actorGuildId, int targetGuildId);
+	static GuildInfo const *getGuildInfo(int guildId);
+	static std::string const &getGuildName(int guildId);
+	static std::string const &getGuildAbbrev(int guildId);
+	static NetworkId const &getGuildLeaderId(int guildId);
+	static int getGuildElectionPreviousEndTime(int guildId);
+	static int getGuildElectionNextEndTime(int guildId);
+	static uint32 getGuildCurrentFaction(int guildId);
+	static uint32 getGuildCurrentFaction(GuildInfo const & gi);
+	static uint32 getGuildPreviousFaction(int guildId);
+	static uint32 getGuildPreviousFaction(GuildInfo const & gi);
+	static int getTimeLeftGuildPreviousFaction(int guildId);
+	static int getTimeLeftGuildPreviousFaction(GuildInfo const & gi);
+	static std::string const &getGuildCurrentGcwDefenderRegion(int guildId);
+	static std::string const &getGuildCurrentGcwDefenderRegion(GuildInfo const & gi);
+	static int getTimeJoinedGuildCurrentGcwDefenderRegion(int guildId);
+	static int getTimeJoinedGuildCurrentGcwDefenderRegion(GuildInfo const & gi);
+	static std::string const &getGuildPreviousGcwDefenderRegion(int guildId);
+	static std::string const &getGuildPreviousGcwDefenderRegion(GuildInfo const & gi);
+	static int getTimeLeftGuildPreviousGcwDefenderRegion(int guildId);
+	static int getTimeLeftGuildPreviousGcwDefenderRegion(GuildInfo const & gi);
+	static std::map<std::pair<std::string, int>, uint32> const & getGcwRegionDefenderGuilds();
+	static std::map<std::string, std::pair<int, int> > const & getGcwRegionDefenderGuildsCount();
+	static int getGcwRegionDefenderGuildsVersion();
+	static void getGuildMemberIds(int guildId, stdvector<NetworkId>::fwd &results);
+	static void getGuildMemberIdsWithPermissions(int guildId, int permissions, stdvector<NetworkId>::fwd &results);
+	static int getGuildCountMembersOnly(int guildId);
+	static int getGuildCountSponsoredOnly(int guildId);
+	static int getGuildCountMembersAndSponsored(int guildId);
+	static int getGuildCountMembersGuildWarPvPEnabled(int guildId);
+	static GuildMemberInfo const *getGuildMemberInfo(int guildId, NetworkId const &memberId);
+	static bool getGuildMemberGuildWarEnabled(int guildId, NetworkId const &memberId);
+	static stdvector<int>::fwd const &getGuildEnemies(int guildId);
+	static stdmap<int, std::pair<int, time_t> >::fwd const &getGuildEnemiesKillInfo(int guildId);
+	static std::pair<int, time_t> const &getGuildEnemyKillInfo(int guildIdA, int guildIdB);
+	static stdvector<int>::fwd const &getGuildsAtWarWith(int guildId);
+	static ScriptParams const *getMasterGuildWarTableDictionary();
+	static void updateInactiveGuildWarTrackingInfo(GuildObject &masterGuildObject, int guildAId, int guildAKillCount, int guildBId, int guildBKillCount);
+	static ScriptParams const *getInactiveGuildWarTableDictionary();
+
+	static bool isValidGuildName(std::string const &guildName);
+	static bool isValidGuildAbbrev(std::string const &guildAbbrev);
+	static int createGuild(std::string const &guildName, std::string const &guildAbbrev);
+	static void disbandGuild(int guildId);
+	static void removeGuildMember(int guildId, NetworkId const &memberId);
+	static void setGuildLeader(int guildId, NetworkId const &leaderId);
+	static void setGuildElectionEndTime(int guildId, int electionPreviousEndTime, int electionNextEndTime);
+	static void setGuildFaction(int guildId, uint32 guildFaction);
+	static void setGuildGcwDefenderRegion(int guildId, std::string const &guildGcwDefenderRegion);
+	static void addGuildCreatorMember(int guildId, NetworkId const &memberId);
+	static void addGuildSponsorMember(int guildId, NetworkId const &memberId);
+	static void setGuildMemberPermission(int guildId, NetworkId const &memberId, int permissions);
+	static void setGuildMemberTitle(int guildId, NetworkId const &memberId, std::string const &title);
+	static void setGuildMemberAllegiance(int guildId, NetworkId const &memberId, NetworkId const &allegiance);
+	static void setGuildMemberPermissionAndAllegiance(int guildId, NetworkId const &memberId, int permissions, NetworkId const &allegiance);
+	static void setGuildMemberProfessionInfo(int guildId, NetworkId const &memberId, std::string const &memberProfessionSkillTemplate, int memberLevel);
+	static void addGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName);
+	static void removeGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName);
+	static bool hasGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName);
+	static void getGuildMemberRank(int guildId, NetworkId const &memberId, stdvector<std::string>::fwd &ranks);
+	static void setGuildEnemy(int guildId, int enemyId);
+	static void removeGuildEnemy(int guildId, int enemyId);
+	static void updateGuildWarKillTracking(CreatureObject const &killer, CreatureObject const &victim);
+	static void setGuildName(int guildId, std::string const &newName);
+	static void setGuildAbbrev(int guildId, std::string const &newAbbrev);
+
+	static void onGuildIdSet(CreatureObject const &who);
+	static void onAboutToClearGuildId(CreatureObject const &who);
+	static void verifyGuildMemberName(NetworkId const &memberId, std::string const &memberName);
+
+	static void enterGuildChatRoom(CreatureObject const &who);
+	static void reenterGuildChatRoom(CreatureObject const &who);
+	static void leaveGuildChatRoom(CreatureObject const &who);
+	static void sendGuildChat(CreatureObject const &who, Unicode::String const &text);
+	static void onChatRoomCreate(std::string const &path);
+	static void createAllGuildChatRooms();
+	static std::pair<int, std::pair<std::string, std::string> > mailToGuild(CreatureObject const &who, Unicode::String const &subject, Unicode::String const &message, Unicode::String const &oob);
+	static std::pair<int, std::pair<std::string, std::string> > mailToGuild(int guildId, Unicode::String const &subject, Unicode::String const &message, Unicode::String const &oob);
+	static std::pair<int, std::pair<std::string, std::string> > mailToGuildRank(CreatureObject const &who, int guildRankSlotId, Unicode::String const &subject, Unicode::String const &message, Unicode::String const &oob);
+
+	static void onVoiceChatRoomCreate(std::string const &path);
+	static void enterGuildVoiceChatRoom(CreatureObject const &who);
+	static void leaveGuildVoiceChatRoom(NetworkId const & netID, std::string const & firstName, int guildID);
+
+private:
+	static void buildEnemies(GuildObject const &guildObject);
+};
+
+// ======================================================================
+
+#endif // _GuildInterface_H_
+
diff --git a/engine/server/library/serverGame/src/shared/guild/GuildMemberInfo.cpp b/engine/server/library/serverGame/src/shared/guild/GuildMemberInfo.cpp
new file mode 100644
index 00000000..3a5a8e9b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/guild/GuildMemberInfo.cpp
@@ -0,0 +1,107 @@
+// ======================================================================
+//
+// GuildMemberInfo.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/GuildMemberInfo.h"
+
+#include "Archive/Archive.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+// ======================================================================
+
+namespace Archive
+{
+	void get(ReadIterator & source, GuildMemberInfo & target)
+	{
+		get(source, target.m_name);
+		get(source, target.m_professionSkillTemplate);
+		get(source, target.m_level);
+		get(source, target.m_permissions);
+		get(source, target.m_rank);
+		get(source, target.m_title);
+		get(source, target.m_allegiance);
+	}
+
+	void put(ByteStream & target, const GuildMemberInfo & source)
+	{
+		put(target, source.m_name);
+		put(target, source.m_professionSkillTemplate);
+		put(target, source.m_level);
+		put(target, source.m_permissions);
+		put(target, source.m_rank);
+		put(target, source.m_title);
+		put(target, source.m_allegiance);
+	}
+}
+
+// ======================================================================
+
+GuildMemberInfo::GuildMemberInfo() :
+	m_name(),
+	m_professionSkillTemplate(),
+	m_level(0),
+	m_permissions(0),
+	m_rank(),
+	m_title(),
+	m_allegiance()
+{
+}
+
+// ----------------------------------------------------------------------
+
+GuildMemberInfo::GuildMemberInfo(GuildMemberInfo const * const gmi) :
+	m_name(),
+	m_professionSkillTemplate(),
+	m_level(0),
+	m_permissions(0),
+	m_rank(),
+	m_title(),
+	m_allegiance()
+{
+	if (gmi)
+	{
+		m_name = gmi->m_name;
+		m_professionSkillTemplate = gmi->m_professionSkillTemplate;
+		m_level = gmi->m_level;
+		m_permissions = gmi->m_permissions;
+		m_rank = gmi->m_rank;
+		m_title = gmi->m_title;
+		m_allegiance = gmi->m_allegiance;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+GuildMemberInfo::~GuildMemberInfo()
+{
+}
+
+// ----------------------------------------------------------------------
+
+bool GuildMemberInfo::operator== (const GuildMemberInfo& rhs) const
+{
+	if (this == &rhs)
+		return true;
+
+	return ((m_name == rhs.m_name) &&
+		(m_professionSkillTemplate == rhs.m_professionSkillTemplate) &&
+		(m_level == rhs.m_level) &&
+		(m_permissions == rhs.m_permissions) &&
+		(m_rank == rhs.m_rank) &&
+		(m_title == rhs.m_title) &&
+		(m_allegiance == rhs.m_allegiance));
+}
+
+// ----------------------------------------------------------------------
+
+bool GuildMemberInfo::operator!= (const GuildMemberInfo& rhs) const
+{
+	return !operator==(rhs);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/guild/GuildMemberInfo.h b/engine/server/library/serverGame/src/shared/guild/GuildMemberInfo.h
new file mode 100644
index 00000000..c8fa8fdb
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/guild/GuildMemberInfo.h
@@ -0,0 +1,51 @@
+// ======================================================================
+//
+// GuildMemberInfo.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _GuildMemberInfo_H_
+#define _GuildMemberInfo_H_
+
+// ======================================================================
+
+#include "sharedFoundation/BitArray.h"
+#include "sharedFoundation/NetworkId.h"
+
+// ======================================================================
+
+class GuildMemberInfo
+{
+public:
+	GuildMemberInfo();
+	GuildMemberInfo(GuildMemberInfo const * gmi);
+	~GuildMemberInfo();
+
+	bool operator== (const GuildMemberInfo& rhs) const;
+	bool operator!= (const GuildMemberInfo& rhs) const;
+
+	std::string m_name;
+	std::string m_professionSkillTemplate;
+	int m_level;
+	int m_permissions;
+	BitArray m_rank;
+	std::string m_title;
+	NetworkId m_allegiance;
+};
+
+// ======================================================================
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+
+	void get(ReadIterator & source, GuildMemberInfo & target);
+	void put(ByteStream & target, const GuildMemberInfo & source);
+}
+
+// ======================================================================
+
+#endif // _GuildMemberInfo_H_
diff --git a/engine/server/library/serverGame/src/shared/guild/GuildStringParser.cpp b/engine/server/library/serverGame/src/shared/guild/GuildStringParser.cpp
new file mode 100644
index 00000000..65e360ea
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/guild/GuildStringParser.cpp
@@ -0,0 +1,322 @@
+// ======================================================================
+//
+// GuildStringParser.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/GuildStringParser.h"
+
+#include "sharedFoundation/BitArray.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedGame/PvpData.h"
+
+// ======================================================================
+
+static void skipField(std::string const &source, unsigned int &pos)
+{
+	while (source[pos] && source[pos] != ':')
+		++pos;
+	if (source[pos] == ':')
+		++pos;
+}
+
+// ----------------------------------------------------------------------
+
+static void nextInt(std::string const &source, unsigned int &pos, int &ret)
+{
+	ret = atoi(source.c_str()+pos);
+	skipField(source, pos);
+}
+
+// ----------------------------------------------------------------------
+
+static void nextString(std::string const &source, unsigned int &pos, std::string &ret)
+{
+	unsigned int oldPos = pos;
+	while (source[pos] && source[pos] != ':')
+		++pos;
+	ret = source.substr(oldPos, pos-oldPos);
+	if (source[pos] == ':')
+		++pos;
+}
+
+// ----------------------------------------------------------------------
+
+static void nextOid(std::string const &source, unsigned int &pos, NetworkId &ret)
+{
+	unsigned int oldPos = pos;
+	skipField(source, pos);
+	ret = NetworkId(source.substr(oldPos, pos-oldPos));
+}
+
+// ======================================================================
+
+bool GuildStringParser::parseGuildName(std::string const &source, int &guildId, std::string &guildName, int &guildElectionPreviousEndTime, int &guildElectionNextEndTime, uint32 &guildFaction, int &timeLeftGuildFaction, std::string &guildGcwDefenderRegion, int &timeJoinedGuildGcwDefenderRegion, int &timeLeftGuildGcwDefenderRegion)
+{
+	// need to parse different versions
+	if (source.find("v3:") == 0) // version 3
+	{
+		unsigned int pos = 3;
+		nextInt(source, pos, guildId);
+		nextString(source, pos, guildName);
+		nextInt(source, pos, guildElectionPreviousEndTime);
+		nextInt(source, pos, guildElectionNextEndTime);
+
+		int temp;
+		nextInt(source, pos, temp);
+		guildFaction = static_cast<uint32>(temp);
+
+		nextInt(source, pos, timeLeftGuildFaction);
+		nextString(source, pos, guildGcwDefenderRegion);
+		nextInt(source, pos, timeJoinedGuildGcwDefenderRegion);
+		nextInt(source, pos, timeLeftGuildGcwDefenderRegion);
+	}
+	else if (source.find("v2:") == 0) // version 2
+	{
+		unsigned int pos = 3;
+		nextInt(source, pos, guildId);
+		nextString(source, pos, guildName);
+		nextInt(source, pos, guildElectionPreviousEndTime);
+		nextInt(source, pos, guildElectionNextEndTime);
+		guildFaction = 0;
+		timeLeftGuildFaction = 0;
+		guildGcwDefenderRegion.clear();
+		timeJoinedGuildGcwDefenderRegion = 0;
+		timeLeftGuildGcwDefenderRegion = 0;
+	}
+	else // version 1
+	{
+		unsigned int pos = 0;
+		nextInt(source, pos, guildId);
+		nextString(source, pos, guildName);
+		guildElectionPreviousEndTime = 0;
+		guildElectionNextEndTime = 0;
+		guildFaction = 0;
+		timeLeftGuildFaction = 0;
+		guildGcwDefenderRegion.clear();
+		timeJoinedGuildGcwDefenderRegion = 0;
+		timeLeftGuildGcwDefenderRegion = 0;
+	}
+
+	bool const ok = guildId && !guildName.empty();
+	WARNING(!ok, ("GuildStringParser::parseGuildName: bad string [%s]", source.c_str()));
+	return ok;
+}
+
+// ----------------------------------------------------------------------
+
+bool GuildStringParser::parseGuildAbbrev(std::string const &source, int &guildId, std::string &guildAbbrev)
+{
+	unsigned int pos = 0;
+	nextInt(source, pos, guildId);
+	nextString(source, pos, guildAbbrev);
+	bool ok = guildId && !guildAbbrev.empty();
+	WARNING(!ok, ("GuildStringParser::parseGuildAbbrev: bad string [%s]", source.c_str()));
+	return ok;
+}
+
+// ----------------------------------------------------------------------
+
+bool GuildStringParser::parseGuildLeader(std::string const &source, int &guildId, NetworkId &leaderId)
+{
+	unsigned int pos = 0;
+	nextInt(source, pos, guildId);
+	nextOid(source, pos, leaderId);
+	bool ok = guildId && leaderId != NetworkId::cms_invalid;
+	WARNING(!ok, ("GuildStringParser::parseGuildAbbrev: bad string [%s]", source.c_str()));
+	return ok;
+}
+
+// ----------------------------------------------------------------------
+
+bool GuildStringParser::parseMemberInfo(std::string const &source, int &guildId, NetworkId &memberId, std::string &memberName, std::string &memberProfessionSkillTemplate, int &memberLevel, int &permissions, BitArray &rank, std::string &title, NetworkId &allegiance)
+{
+	// need to parse different versions
+	if (source.find("v2:") == 0) // version 2
+	{
+		unsigned int pos = 3;
+		nextInt(source, pos, guildId);
+		nextOid(source, pos, memberId);
+		nextString(source, pos, memberName);
+		nextString(source, pos, memberProfessionSkillTemplate);
+		nextInt(source, pos, memberLevel);
+		nextInt(source, pos, permissions);
+		nextString(source, pos, title);
+		nextOid(source, pos, allegiance);
+
+		std::string rankStr;
+		nextString(source, pos, rankStr);
+		rank.setFromDbTextString(rankStr.c_str());
+	}
+	else // version 1
+	{
+		unsigned int pos = 0;
+		nextInt(source, pos, guildId);
+		nextOid(source, pos, memberId);
+		nextString(source, pos, memberName);
+		memberProfessionSkillTemplate.clear();
+		memberLevel = 0;
+		nextInt(source, pos, permissions);
+		nextString(source, pos, title);
+		nextOid(source, pos, allegiance);
+		rank.clear();
+	}
+
+	bool const ok = guildId && memberId != NetworkId::cms_invalid && !memberName.empty();
+	WARNING(!ok, ("GuildStringParser::parseMemberInfo: bad string [%s]", source.c_str()));
+	return ok;
+}
+
+// ----------------------------------------------------------------------
+
+bool GuildStringParser::parseEnemyInfo(std::string const &source, int &guildId, int &enemyId, int &killCount, int &lastUpdateTime)
+{
+	// need to parse different versions
+	if (source.find("v2:") == 0) // version 2
+	{
+		unsigned int pos = 3;
+		nextInt(source, pos, guildId);
+		nextInt(source, pos, enemyId);
+		nextInt(source, pos, killCount);
+		nextInt(source, pos, lastUpdateTime);
+	}
+	else // version 1
+	{
+		unsigned int pos = 0;
+		nextInt(source, pos, guildId);
+		nextInt(source, pos, enemyId);
+		killCount = 0;
+		lastUpdateTime = 0;
+	}
+
+	bool const ok = guildId && enemyId;
+	WARNING(!ok, ("GuildStringParser::parseEnemyInfo: bad string [%s]", source.c_str()));
+	return ok;
+}
+
+// ----------------------------------------------------------------------
+
+void GuildStringParser::buildNameSpec(int guildId, std::string const &guildName, int guildElectionPreviousEndTime, int guildElectionNextEndTime, uint32 guildFaction, int timeLeftGuildFaction, std::string const & guildGcwDefenderRegion, int timeJoinedGuildGcwDefenderRegion, int timeLeftGuildGcwDefenderRegion, std::string &result)
+{
+	FATAL(guildName.length() > 25, ("GuildStringParser::buildNameSpec: bad guild name"));
+
+	// DB column to store information is VARCHAR2(500)
+	char buffer[501]; // 500 chars + terminating \0
+
+	// only write out newer version if there is actually new version information
+	if (!PvpData::isNeutralFactionId(guildFaction) || (timeLeftGuildFaction > 0) || (timeJoinedGuildGcwDefenderRegion > 0) || (timeLeftGuildGcwDefenderRegion > 0)) // version 3
+	{
+		snprintf(buffer, sizeof(buffer), "v3:%d:%s:%d:%d:%d:%d:%s:%d:%d", guildId, guildName.c_str(), guildElectionPreviousEndTime, guildElectionNextEndTime, static_cast<int>(guildFaction), timeLeftGuildFaction, guildGcwDefenderRegion.c_str(), timeJoinedGuildGcwDefenderRegion, timeLeftGuildGcwDefenderRegion);
+	}
+	else if ((guildElectionPreviousEndTime > 0) || (guildElectionNextEndTime > 0)) // version 2
+	{
+		snprintf(buffer, sizeof(buffer), "v2:%d:%s:%d:%d", guildId, guildName.c_str(), guildElectionPreviousEndTime, guildElectionNextEndTime);
+	}
+	else // version 1
+	{
+		snprintf(buffer, sizeof(buffer), "%d:%s", guildId, guildName.c_str());
+	}
+
+	// absolutely, positively make sure that there is no more than 500
+	// characters in buffer (not including the terminating \0) or the DB
+	// will ***CRASH*** because the column is defined as VARCHAR2(500)
+	buffer[500] = '\0';
+	result = buffer;
+}
+
+// ----------------------------------------------------------------------
+
+void GuildStringParser::buildAbbrevSpec(int guildId, std::string const &guildAbbrev, std::string &result)
+{
+	FATAL(guildAbbrev.length() > 5, ("GuildStringParser::buildAbbrevSpec: bad guild abbrev"));
+	char buffer[32];
+	// max field lengths - 11:5 -> 16
+	snprintf(buffer, sizeof(buffer)-1, "%d:%s", guildId, guildAbbrev.c_str());
+	buffer[sizeof(buffer)-1] = '\0';
+	result = buffer;
+}
+
+// ----------------------------------------------------------------------
+
+void GuildStringParser::buildLeaderSpec(int guildId, NetworkId const &leaderId, std::string &result)
+{
+	char buffer[64];
+	// max field lengths - 11:21 -> 33
+	snprintf(buffer, sizeof(buffer)-1, "%d:%s", guildId, leaderId.getValueString().c_str());
+	buffer[sizeof(buffer)-1] = '\0';
+	result = buffer;
+}
+
+// ----------------------------------------------------------------------
+
+void GuildStringParser::buildMemberSpec(int const guildId, NetworkId const &memberId, std::string const &memberName, std::string const &memberProfessionSkillTemplate, int const memberLevel, int const permissions, BitArray const &rank, std::string const &title, NetworkId const &allegiance, std::string &result)
+{
+	FATAL(title.length() > 25, ("GuildStringParser::buildMemberSpec: bad title"));
+
+	std::string rankStr;
+	rank.getAsDbTextString(rankStr);
+
+	// DB column to store information is VARCHAR2(500)
+	char buffer[501]; // 500 chars + terminating \0
+
+	// only write out newer version if there is actually new version information
+	if ((memberLevel > 0) || !rankStr.empty() || !memberProfessionSkillTemplate.empty()) // version 2
+	{
+		snprintf(buffer, sizeof(buffer), "v2:%d:%s:%s:%s:%d:%d:%s:%s:%s",
+			guildId,
+			memberId.getValueString().c_str(),
+			memberName.c_str(),
+			memberProfessionSkillTemplate.c_str(),
+			memberLevel,
+			permissions,
+			title.c_str(),
+			allegiance.getValueString().c_str(),
+			rankStr.c_str());
+	}
+	else // version 1
+	{
+		snprintf(buffer, sizeof(buffer), "%d:%s:%s:%d:%s:%s",
+			guildId,
+			memberId.getValueString().c_str(),
+			memberName.c_str(),
+			permissions,
+			title.c_str(),
+			allegiance.getValueString().c_str());
+	}
+
+	// absolutely, positively make sure that there is no more than 500
+	// characters in buffer (not including the terminating \0) or the DB
+	// will ***CRASH*** because the column is defined as VARCHAR2(500)
+	buffer[500] = '\0';
+	result = buffer;
+}
+
+// ----------------------------------------------------------------------
+
+void GuildStringParser::buildEnemySpec(int guildId, int enemyId, int killCount, int lastUpdateTime, std::string &result)
+{
+	// DB column to store information is VARCHAR2(500)
+	char buffer[501]; // 500 chars + terminating \0
+
+	// only write out newer version if there is actually new version information
+	if (killCount > 0) // version 2
+	{
+		snprintf(buffer, sizeof(buffer), "v2:%d:%d:%d:%d", guildId, enemyId, killCount, lastUpdateTime);
+	}
+	else // version 1
+	{
+		snprintf(buffer, sizeof(buffer), "%d:%d", guildId, enemyId);
+	}
+
+	// absolutely, positively make sure that there is no more than 500
+	// characters in buffer (not including the terminating \0) or the DB
+	// will ***CRASH*** because the column is defined as VARCHAR2(500)
+	buffer[500] = '\0';
+	result = buffer;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/guild/GuildStringParser.h b/engine/server/library/serverGame/src/shared/guild/GuildStringParser.h
new file mode 100644
index 00000000..c9fdf4f4
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/guild/GuildStringParser.h
@@ -0,0 +1,41 @@
+// ======================================================================
+//
+// GuildStringParser.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _GuildStringParser_H_
+#define _GuildStringParser_H_
+
+// ======================================================================
+
+class BitArray;
+class NetworkId;
+
+// ======================================================================
+
+class GuildStringParser // static
+{
+public:
+	static bool parseGuildName   (std::string const &source, int &guildId, std::string &guildName, int &guildElectionPreviousEndTime, int &guildElectionNextEndTime, uint32 &guildFaction, int &timeLeftGuildFaction, std::string &guildGcwDefenderRegion, int &timeJoinedGuildGcwDefenderRegion, int &timeLeftGuildGcwDefenderRegion);
+	static bool parseGuildAbbrev (std::string const &source, int &guildId, std::string &guildAbbrev);
+	static bool parseGuildLeader (std::string const &source, int &guildId, NetworkId &leaderId);
+	static bool parseMemberInfo  (std::string const &source, int &guildId, NetworkId &memberId, std::string &memberName, std::string &memberProfessionSkillTemplate, int &memberLevel, int &permissions, BitArray &rank, std::string &title, NetworkId &allegiance);
+	static bool parseEnemyInfo   (std::string const &source, int &guildId, int &enemyId, int &killCount, int &lastUpdateTime);
+
+	static void buildNameSpec    (int guildId, std::string const &guildName, int guildElectionPreviousEndTime, int guildElectionNextEndTime, uint32 guildFaction, int timeLeftGuildFaction, std::string const & guildGcwDefenderRegion, int timeJoinedGuildGcwDefenderRegion, int timeLeftGuildGcwDefenderRegion, std::string &result);
+	static void buildAbbrevSpec  (int guildId, std::string const &guildAbbrev, std::string &result);
+	static void buildLeaderSpec  (int guildId, NetworkId const &leaderId, std::string &result);
+	static void buildMemberSpec  (int guildId, NetworkId const &memberId, std::string const &memberName, std::string const &memberProfessionSkillTemplate, int memberLevel, int permissions, BitArray const &rank, std::string const &title, NetworkId const &allegiance, std::string &result);
+	static void buildEnemySpec   (int guildId, int enemyId, int killCount, int lastUpdateTime, std::string &result);
+
+private:
+	GuildStringParser();
+};
+
+// ======================================================================
+
+#endif // _GuildStringParser_H_
+
diff --git a/engine/server/library/serverGame/src/shared/metrics/GameServerMetricsData.cpp b/engine/server/library/serverGame/src/shared/metrics/GameServerMetricsData.cpp
new file mode 100644
index 00000000..aa375dc4
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/metrics/GameServerMetricsData.cpp
@@ -0,0 +1,277 @@
+//GameServerMetricsData.cpp
+//Copyright 2002 Sony Online Entertainment
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/GameServerMetricsData.h"
+
+#include "serverGame/GameServer.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/ObjectTracker.h"
+#include "serverGame/ServerUIManager.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverNetworkMessages/MetricsDataMessage.h"
+#include "serverScript/GameScriptObject.h"
+#include "sharedFoundation/CalendarTime.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/Os.h"
+#include "sharedNetwork/NetworkHandler.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedObject/LotManager.h"
+#include "serverGame/Client.h"
+#include "sharedLog/Log.h"
+
+//-----------------------------------------------------------------------
+
+
+
+//-----------------------------------------------------------------------
+
+GameServerMetricsData::GameServerMetricsData() :
+MetricsData(),
+m_numClients(0),
+m_numBuildings(0),
+m_numCreatures(0),
+m_numSpawnLimit(0),
+m_numInstallations(0),
+m_numObjects(0),
+m_numPlayers(0),
+m_numRunTimeRules(0),
+m_numTangibles(0),
+m_numUniverseObjects(0),
+m_numIntangibles(0),
+m_numGroupObjects(0),
+m_numWaypoints(0),
+m_numAI(0),
+m_numDynAI(0),
+m_numStaticAI(0),
+m_numCombatAI(0),
+m_numHibernatingAI(0),
+m_numDelayedHibernatingAI(0),
+m_allocations(0),
+m_gameProcessId(0),
+m_noBuild(0),
+m_numMessages(0),
+m_numObjectsWithBackloggedMessages(0),
+m_numObjectCreatesReceived(0),
+m_numObjectCreatesSent(0),
+m_freeJavaMemory(0),
+m_numPendingLoadRequests(0),
+m_numResourceTypesNative(0),
+m_numResourceTypesImported(0)
+{
+	MetricsPair p;
+
+	ADD_METRICS_DATA(numClients, 0, true);
+
+	ADD_METRICS_DATA(numBuildings, 0, false);
+	ADD_METRICS_DATA(numCreatures, 0, true);
+	ADD_METRICS_DATA(numSpawnLimit, 0, false);
+	ADD_METRICS_DATA(numInstallations, 0, false);
+	ADD_METRICS_DATA(numObjects, 0, true);
+	ADD_METRICS_DATA(numPlayers, 0, false);
+	ADD_METRICS_DATA(numPlayersImperial, 0, true);
+	ADD_METRICS_DATA(numPlayersRebel, 0, true);
+	ADD_METRICS_DATA(numPlayersNeutral, 0, true);
+	ADD_METRICS_DATA(numRunTimeRules, 0, false);
+	ADD_METRICS_DATA(numTangibles, 0, false);
+	ADD_METRICS_DATA(numUniverseObjects, 0, true);
+
+	ADD_METRICS_DATA(numAI, 0, true);
+	ADD_METRICS_DATA(numDynAI, 0, true);
+	ADD_METRICS_DATA(numStaticAI, 0, true);
+	ADD_METRICS_DATA(numCombatAI, 0, true);
+	ADD_METRICS_DATA(numHibernatingAI, 0, true);
+	ADD_METRICS_DATA(numDelayedHibernatingAI, 0, true);
+
+	ADD_METRICS_DATA(numIntangibles, 0, false);
+	ADD_METRICS_DATA(numGroupObjects, 0, false);
+	ADD_METRICS_DATA(numWaypoints, 0, false);
+
+	ADD_METRICS_DATA(gameProcessId, 0, false);
+
+	ADD_METRICS_DATA(noBuild,0, false);
+
+	ADD_METRICS_DATA(numMessages,0, false);
+	ADD_METRICS_DATA(numObjectsWithBackloggedMessages,0, false);
+
+	ADD_METRICS_DATA(numObjectCreatesReceived, 0, false);
+	ADD_METRICS_DATA(numObjectCreatesSent, 0, false);
+
+	ADD_METRICS_DATA(freeJavaMemory, 0, false);
+
+	ADD_METRICS_DATA(numServerUIPages, 0, false);
+
+	ADD_METRICS_DATA(numPendingLoadRequests, 0, false);
+
+	ADD_METRICS_DATA(numResourceTypesNative, 0, false);
+	ADD_METRICS_DATA(numResourceTypesImported, 0, false);
+
+	std::string label = NetworkHandler::getHostName();
+
+	for (std::string::iterator i = label.begin(); i != label.end(); ++i)
+	{
+		if (*i == '.')
+		{
+			*i = '+';
+		}
+	}
+
+	label += ":";
+	char tmp[256];
+	label += _itoa(Os::getProcessId(), tmp, 10);
+
+#ifndef WIN32
+	FILE *inFile = ::fopen("/proc/cpuinfo", "rt");
+	if (inFile)
+	{
+		char buffer[2048];
+		while (::fgets(buffer, sizeof(buffer), inFile))
+		{
+			if (::strstr(buffer, "model name") == buffer)
+			{
+				buffer[::strcspn(buffer, "\r\n")] = '\0';
+
+				char * c = buffer;
+				while (*c)
+				{
+					if (::isspace(*c))
+						*c = ' ';
+
+					++c;
+				}
+
+				label += " (";
+				label += buffer;
+				label += ")";
+
+				break;
+			}
+		}
+
+		::fclose(inFile);
+	}
+#endif
+
+	m_data[m_gameProcessId].m_description = label;
+}
+
+//-----------------------------------------------------------------------
+
+GameServerMetricsData::~GameServerMetricsData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void GameServerMetricsData::updateData()
+{
+	MetricsData::updateData();
+	m_data[m_numClients].m_value = GameServer::getInstance().getNumClients();
+
+	m_data[m_numBuildings].m_value = ObjectTracker::getNumBuildings();
+	m_data[m_numCreatures].m_value = ObjectTracker::getNumCreatures();
+
+	// the following formula is also duplicated in utils.scriptlib::getNumCreaturesForSpawnLimit()
+	m_data[m_numSpawnLimit].m_value = std::max(0, (ObjectTracker::getNumAI() - (ObjectTracker::getNumHibernatingAI() / 2)));
+
+	static bool reportedServerSpawnLimit = false;
+	if (!reportedServerSpawnLimit && (GameServer::getInstance().getPreloadAreaId() > 0))
+	{
+		char tmp[256];
+		snprintf(tmp, sizeof(tmp)-1, "ServerSpawnLimit=%d", GameServer::getServerSpawnLimit());
+		tmp[sizeof(tmp)-1] = '\0';
+		m_data[m_numSpawnLimit].m_description = tmp;
+
+		reportedServerSpawnLimit = true;
+	}
+
+	m_data[m_numInstallations].m_value = ObjectTracker::getNumInstallations();
+	m_data[m_numObjects].m_value = ObjectTracker::getNumObjects();
+	m_data[m_numPlayers].m_value = ObjectTracker::getNumPlayers();
+
+	static int numPlayersImperial;
+	static int numPlayersRebel;
+	static int numPlayersNeutral;
+	ObjectTracker::getNumPlayersByFaction(numPlayersImperial, numPlayersRebel, numPlayersNeutral);
+	m_data[m_numPlayersImperial].m_value = numPlayersImperial;
+	m_data[m_numPlayersRebel].m_value = numPlayersRebel;
+	m_data[m_numPlayersNeutral].m_value = numPlayersNeutral;
+
+	m_data[m_numRunTimeRules].m_value = ObjectTracker::getNumRunTimeRules();
+	m_data[m_numTangibles].m_value = ObjectTracker::getNumTangibles();
+	m_data[m_numUniverseObjects].m_value = ObjectTracker::getNumUniverseObjects();
+	m_data[m_numIntangibles].m_value = ObjectTracker::getNumIntangibles();
+	m_data[m_numGroupObjects].m_value = ObjectTracker::getNumGroupObjects();
+	m_data[m_numWaypoints].m_value = ObjectTracker::getNumWaypoints();
+	m_data[m_numAI].m_value = std::max(0, ObjectTracker::getNumAI());
+	m_data[m_numDynAI].m_value = ObjectTracker::getNumDynamicAI();
+	m_data[m_numStaticAI].m_value = ObjectTracker::getNumStaticAI();
+	m_data[m_numCombatAI].m_value = ObjectTracker::getNumCombatAI();
+	m_data[m_numHibernatingAI].m_value = ObjectTracker::getNumHibernatingAI();
+	m_data[m_numDelayedHibernatingAI].m_value = ObjectTracker::getNumDelayedHibernatingAI();
+
+	m_data[m_gameProcessId].m_value = static_cast<int>(GameServer::getInstance().getProcessId());
+
+	const LotManager *lm = ServerWorld::getConstLotManager();
+	if (lm)
+		m_data[m_noBuild].m_value = lm->getNumberOfNoBuildEntries();
+	else
+		m_data[m_noBuild].m_value = 0;
+
+	m_data[m_numMessages].m_value = MessageToQueue::getInstance().getTotalMessages();
+	m_data[m_numObjectsWithBackloggedMessages].m_value = MessageToQueue::getInstance().getBackloggedObjectCount();
+
+	m_data[m_numObjectCreatesReceived].m_value = static_cast<int>(GameServer::getInstance().getTotalObjectCreatesReceived());
+	m_data[m_numObjectCreatesSent].m_value = static_cast<int>(GameServer::getInstance().getTotalObjectCreatesSent());
+
+	m_data[m_freeJavaMemory].m_value = GameScriptObject::getScriptFreeMem();
+
+	m_data[m_numServerUIPages].m_value = ServerUIManager::getNumServerUIPages();
+
+	m_data[m_numPendingLoadRequests].m_value = GameServer::getNumberOfPendingLoadRequests();
+
+	NetworkId id;
+	unsigned long oldestPendingLoadRequestTime = GameServer::getOldestPendingLoadRequestTime(id);
+
+	if (id.isValid())
+		m_data[m_numPendingLoadRequests].m_description = FormattedString<256>().sprintf(
+		"Max: %s requested load on %s which has been pending for %s. Limit = %d.",
+		id.getValueString().c_str(),
+		CalendarTime::convertEpochToTimeStringLocal(oldestPendingLoadRequestTime).c_str(),
+		CalendarTime::convertSecondsToMS(::time(NULL) - oldestPendingLoadRequestTime).c_str(),
+		GameServer::getPendingLoadRequestLimit()
+		);
+	else
+		m_data[m_numPendingLoadRequests].m_description = FormattedString<256>().sprintf(
+		"No pending load requests. Limit = %d.",
+		GameServer::getPendingLoadRequestLimit()
+		);
+
+	m_data[m_numResourceTypesNative].m_value = ServerUniverse::getInstance().getNumNativeResourceTypes();
+	m_data[m_numResourceTypesImported].m_value = ServerUniverse::getInstance().getNumImportedResourceTypes();
+
+/*****************  Disabled due to stats failing to update on live **********************
+	std::map< std::string, uint32 >& cpmap = Client::getPacketBytesPerMinStats();
+	std::map< std::string, uint32 >::iterator cpiter;
+
+	// Packet metrics summary
+	for ( cpiter = cpmap.begin(); cpiter != cpmap.end(); ++cpiter )
+	{
+		std::map< std::string, unsigned long>::iterator miter = m_packetDataMap.find( cpiter->first );
+		if ( miter == m_packetDataMap.end() )  // If we haven't added this packet metric yet....
+		{
+			MetricsData* p_met = MetricsData::getInstance();
+			std::string s_key("ClientPackets_BytesPerMin.");
+			s_key+=cpiter->first;
+			m_packetDataMap[ cpiter->first ] = p_met->addMetric(s_key.c_str(), 0, 0, true, true);   // add the ID to the local map
+			miter = m_packetDataMap.find( cpiter->first );
+		}
+		m_data[ miter->second ].m_value = cpiter->second;
+	}
+***************************************************************************************/
+
+
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/metrics/GameServerMetricsData.h b/engine/server/library/serverGame/src/shared/metrics/GameServerMetricsData.h
new file mode 100644
index 00000000..a25c195e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/metrics/GameServerMetricsData.h
@@ -0,0 +1,82 @@
+//GameServerMetricsData.h
+//Copyright 2002 Sony Online Entertainment
+
+
+#ifndef	_GameServerMetricsData_H
+#define	_GameServerMetricsData_H
+
+//-----------------------------------------------------------------------
+
+#include "serverMetrics/MetricsData.h"
+#include <map>
+
+//-----------------------------------------------------------------------
+
+class GameServerMetricsData : public MetricsData
+{
+public:
+	GameServerMetricsData();
+	~GameServerMetricsData();
+
+	virtual void updateData();
+
+private:
+	unsigned long m_numClients;
+
+	unsigned long m_numBuildings;
+	unsigned long m_numCreatures;
+	unsigned long m_numSpawnLimit;
+	unsigned long m_numInstallations;
+	unsigned long m_numObjects;
+	unsigned long m_numPlayers;
+	unsigned long m_numPlayersImperial;
+	unsigned long m_numPlayersRebel;
+	unsigned long m_numPlayersNeutral;
+	unsigned long m_numRunTimeRules;
+	unsigned long m_numTangibles;
+	unsigned long m_numUniverseObjects;
+
+	unsigned long m_numIntangibles;
+	unsigned long m_numGroupObjects;
+	unsigned long m_numWaypoints;
+
+	unsigned long m_numAI;
+	unsigned long m_numDynAI;
+	unsigned long m_numStaticAI;
+	unsigned long m_numCombatAI;
+	unsigned long m_numHibernatingAI;
+	unsigned long m_numDelayedHibernatingAI;
+
+	unsigned long m_allocations;
+
+	unsigned long m_gameProcessId;
+
+	unsigned long m_noBuild;
+
+	unsigned long m_numMessages;
+	unsigned long m_numObjectsWithBackloggedMessages;
+
+	unsigned long m_numObjectCreatesReceived;
+	unsigned long m_numObjectCreatesSent;
+
+	unsigned long m_freeJavaMemory;
+
+	unsigned long m_numServerUIPages;
+
+	unsigned long m_numPendingLoadRequests;
+
+	unsigned long m_numResourceTypesNative;
+	unsigned long m_numResourceTypesImported;
+
+	std::map< std::string, unsigned long > m_packetDataMap;
+
+private:
+
+	// Disabled.
+	GameServerMetricsData(const GameServerMetricsData&);
+	GameServerMetricsData &operator =(const GameServerMetricsData&);
+};
+
+
+//-----------------------------------------------------------------------
+#endif
diff --git a/engine/server/library/serverGame/src/shared/network/CentralConnection.cpp b/engine/server/library/serverGame/src/shared/network/CentralConnection.cpp
new file mode 100644
index 00000000..f10a6dc5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/network/CentralConnection.cpp
@@ -0,0 +1,186 @@
+// CentralServerConnection.cpp
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "Archive/ByteStream.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/CentralConnection.h"
+#include "serverGame/CentralCommandParserGame.h"
+#include "serverGame/ConsoleCommandParserDefault.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/NameManager.h"
+#include "serverNetworkMessages/CharacterTransferStatusMessage.h"
+#include "serverNetworkMessages/TransferCharacterData.h"
+#include "serverNetworkMessages/TransferCharacterDataArchive.h"
+#include "serverNetworkMessages/TransferReplyCharacterList.h"
+#include "serverNetworkMessages/GameServerCSRequestMessage.h"
+#include "serverNetworkMessages/GameServerCSResponseMessage.h"
+#include "serverNetworkMessages/VerifyAndLockName.h"
+#include "serverUtility/FreeCtsDataTable.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedLog/Log.h"
+#include "sharedNetwork/NetworkSetupData.h"
+#include "sharedNetworkMessages/ConsoleChannelMessages.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/NameErrors.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "UnicodeUtils.h"
+
+//-----------------------------------------------------------------------
+
+CentralServerConnection::CentralServerConnection(const std::string & a, const unsigned short p) :
+ServerConnection(a, p, NetworkSetupData()),
+m_centralCommandParser(new ConsoleCommandParserDefault)
+{
+	m_centralCommandParser->addSubCommand(new CentralCommandParserGame);
+}
+
+//-----------------------------------------------------------------------
+
+CentralServerConnection::~CentralServerConnection()
+{
+	delete m_centralCommandParser;
+}
+
+//-----------------------------------------------------------------------
+
+void CentralServerConnection::onConnectionClosed()
+{
+	ServerConnection::onConnectionClosed();
+
+	static MessageConnectionCallback m("CentralConnectionClosed");
+	emitMessage(m);
+}
+
+//-----------------------------------------------------------------------
+
+void CentralServerConnection::onConnectionOpened()
+{
+	ServerConnection::onConnectionOpened();
+
+	static MessageConnectionCallback m("CentralConnectionOpened");
+	emitMessage(m);
+}
+
+//-----------------------------------------------------------------------
+
+void CentralServerConnection::onReceive(const Archive::ByteStream & message)
+{
+	Archive::ReadIterator ri = message.begin();
+	GameNetworkMessage msg(ri);
+	ri = message.begin();
+
+	if(msg.isType("ConGenericMessage"))
+	{
+		// dispatch to CentralCommandParser
+		ConGenericMessage con(ri);
+		Unicode::String wideResult;
+		m_centralCommandParser->parse(NetworkId(static_cast<NetworkId::NetworkIdType>(con.getMsgId())), Unicode::narrowToWide(con.getMsg()), wideResult);
+
+		ConGenericMessage response(Unicode::wideToNarrow(wideResult), con.getMsgId());
+		send(response, true);
+	}
+	else if(msg.isType("CharacterTransferStatusMessage"))
+	{
+		CharacterTransferStatusMessage c(ri);
+		CreatureObject * character = safe_cast<CreatureObject *>(NetworkIdManager::getObjectById(c.getToCharacterId()));
+		if(character)
+		{
+			if(character->getClient())
+			{
+				character->receiveCharacterTransferStatusMessage(c.getStatusMessage());
+			}
+		}
+	}
+	else if(msg.isType("TransferRequestNameValidation"))
+	{
+		const GenericValueTypeMessage<TransferCharacterData> requestNameValidation(ri);
+		LOG("CustomerService", ("CharacterTransfer: Received TransferRequestNameValidation from CentralServer : %s", requestNameValidation.getValue().toString().c_str()));
+
+		std::string name = requestNameValidation.getValue().getDestinationCharacterName();
+		if(name.empty())
+		{
+			name = requestNameValidation.getValue().getSourceCharacterName();
+		}
+
+		// call the same name validation code that gets called for normal character creation
+		std::string templateName = requestNameValidation.getValue().getObjectTemplateName();
+		if (templateName.empty())
+		{
+			uint32 const templateCrc = requestNameValidation.getValue().getObjectTemplateCrc();
+			if (templateCrc != 0)
+			{
+				templateName = ObjectTemplateList::lookUp(templateCrc).getString();
+			}
+		}
+
+		VerifyAndLockNameRequest const verifyRequest(requestNameValidation.getValue().getDestinationStationId(), NetworkId::cms_invalid, templateName, Unicode::narrowToWide(name), 0xFFFFFFFF);
+		StringId const verifyResult = GameServer::getInstance().handleVerifyAndLockNameRequest(verifyRequest, false, false);
+
+		TransferCharacterData replyData(requestNameValidation.getValue());
+		replyData.setIsValidName(verifyResult == NameErrors::nameApproved);
+		GenericValueTypeMessage<std::pair<std::string, TransferCharacterData> > reply("TransferReplyNameValidation", std::make_pair(std::string("@") + verifyResult.getCanonicalRepresentation(), replyData));
+		send(reply, true);
+	}
+	else if(msg.isType("TransferReplyCharacterList"))
+	{
+		const TransferReplyCharacterList reply(ri);
+		const AvatarList & oldAl = reply.getAvatarList();
+
+		// remove any characters from the list that would qualify for free CTS; characters that
+		// qualify for free CTS should/must use the in-game free CTS to transfer the character;
+		AvatarList newAl;
+		std::string const & clusterName = GameServer::getInstance().getClusterName();
+		for (AvatarList::const_iterator iter = oldAl.begin(); iter != oldAl.end(); ++iter)
+		{
+			if (!FreeCtsDataTable::getFreeCtsInfoForCharacter(static_cast<time_t>(NameManager::getInstance().getPlayerCreateTime(iter->m_networkId)), clusterName, false))
+				newAl.push_back(*iter);
+			else
+				LOG("CustomerService", ("CharacterTransfer: removing (%s, %s, %s) from paid CTS character list for station id %u because the character qualifies for free CTS", clusterName.c_str(), Unicode::wideToNarrow(iter->m_name).c_str(), iter->m_networkId.getValueString().c_str(), reply.getStationId()));
+		}
+
+		// send updated character list back to CentralServer
+		const TransferReplyCharacterList updatedReply(reply.getTrack(), reply.getStationId(), newAl);
+		send(updatedReply, true);
+	}
+	else if(msg.isType("CtsCompletedForcharacter"))
+	{
+		const GenericValueTypeMessage<std::pair<std::string, NetworkId> > msg(ri);
+		MessageToQueue::getInstance().sendMessageToJava(msg.getValue().second, "ctsCompletedForCharacter", std::vector<int8>(), 0, false);
+	}
+	else if( msg.isType( "GameServerCSRequest" ) )
+	{
+		GameServerCSRequestMessage request( ri );
+		GameServer::getInstance().handleCSRequest( request );
+	}
+	else if( msg.isType( "CSFindAuthObject" ) )
+	{
+		// see if we have the object.
+		GenericValueTypeMessage< std::pair<NetworkId, unsigned int> > msg( ri );
+		ServerObject * object = safe_cast<ServerObject *>( NetworkIdManager::getObjectById( msg.getValue().first ) );
+		// return an appropriate response.
+		if( object && object->isAuthoritative() )
+		{
+			GenericValueTypeMessage< std::pair< unsigned int, bool > > rmsg( "CSFindAuthObjectReply", std::make_pair< unsigned int, bool >( msg.getValue().second, true ) );
+			GameServer::getInstance().sendToCentralServer( rmsg );
+		}
+		else
+		{
+			GenericValueTypeMessage< std::pair< unsigned int, bool > > rmsg( "CSFindAuthObjectReply", std::make_pair< unsigned int, bool >( msg.getValue().second, false ) );
+			GameServer::getInstance().sendToCentralServer( rmsg );
+		}
+	}
+	else
+	{
+		ServerConnection::onReceive(message);
+	}
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/network/CentralConnection.h b/engine/server/library/serverGame/src/shared/network/CentralConnection.h
new file mode 100644
index 00000000..782863bf
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/network/CentralConnection.h
@@ -0,0 +1,35 @@
+// CentralServerConnection.h
+// copyright 2000 Verant Interactive
+// Author: Justin Randall
+
+#ifndef	_CentralServerConnection_H
+#define	_CentralServerConnection_H
+
+//-----------------------------------------------------------------------
+
+#include "serverUtility/ServerConnection.h"
+
+class ConsoleCommandParserDefault;
+
+//-----------------------------------------------------------------------
+
+class CentralServerConnection : public ServerConnection
+{
+public:
+	CentralServerConnection(const std::string & remoteAddress, const unsigned short remotePort);
+	~CentralServerConnection();
+	void                          onConnectionClosed      ();
+	void                          onConnectionOpened      ();
+	const std::string &	          getClusterName          () const;
+	void                          onReceive               (const Archive::ByteStream & message);
+
+private:
+	CentralServerConnection (const CentralServerConnection&);
+	CentralServerConnection& operator= (const CentralServerConnection&);
+
+	ConsoleCommandParserDefault *  m_centralCommandParser;
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _CentralServerConnection_H
diff --git a/engine/server/library/serverGame/src/shared/network/Chat.cpp b/engine/server/library/serverGame/src/shared/network/Chat.cpp
new file mode 100644
index 00000000..209ee89d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/network/Chat.cpp
@@ -0,0 +1,786 @@
+// Chat.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/Chat.h"
+
+#include "UnicodeUtils.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "serverGame/ChatServerConnection.h"
+#include "serverGame/CityInfo.h"
+#include "serverGame/CityInterface.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/GuildInfo.h"
+#include "serverGame/GuildInterface.h"
+#include "serverGame/ServerObject.h"
+#include "sharedGame/OutOfBandPackager.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/PvpData.h"
+#include "sharedGame/TextManager.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+#include "sharedNetworkMessages/ChatChangeFriendStatus.h"
+#include "sharedNetworkMessages/ChatChangeIgnoreStatus.h"
+#include "sharedNetworkMessages/ChatCreateRoom.h"
+#include "sharedNetworkMessages/ChatDestroyRoomByName.h"
+#include "sharedNetworkMessages/ChatDeleteAllPersistentMessages.h"
+#include "sharedNetworkMessages/ChatEnum.h"
+#include "sharedNetworkMessages/ChatGetFriendsList.h"
+#include "sharedNetworkMessages/ChatGetIgnoreList.h"
+#include "sharedNetworkMessages/ChatInviteAvatarToRoom.h"
+#include "sharedNetworkMessages/ChatInviteGroupMembersToRoom.h"
+#include "sharedNetworkMessages/ChatMessageFromGame.h"
+#include "sharedNetworkMessages/ChatPutAvatarInRoom.h"
+#include "sharedNetworkMessages/ChatRemoveAvatarFromRoom.h"
+#include "sharedNetworkMessages/ChatRoomData.h"
+#include "sharedNetworkMessages/ChatSystemMessage.h"
+#include "sharedNetworkMessages/ChatUninviteFromRoom.h"
+
+
+#include "sharedNetworkMessages/VoiceChatChannelInfo.h"
+#include "sharedNetworkMessages/VoiceChatMiscMessages.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+
+//Temporary include, remove if possible
+#include "sharedObject/NetworkIdManager.h"
+
+// ======================================================================
+
+namespace ChatNamespace
+{
+	std::string const cs_systemSenderName("SYSTEM");
+}
+
+using namespace ChatNamespace;
+
+//-----------------------------------------------------------------------
+
+Chat *Chat::m_instance = NULL;
+
+
+Chat::Chat () :
+m_serverAvatar         (new ChatAvatarId),
+m_chatServer           (0),
+m_deferredChatMessages (),
+m_gameCode             ("SWG")  //@todo this can not depend on swg
+{
+	m_serverAvatar->gameCode = m_gameCode;
+	m_serverAvatar->cluster = GameServer::getInstance().getClusterName();
+	m_serverAvatar->name = "System";
+}
+
+//-----------------------------------------------------------------------
+
+Chat::~Chat()
+{
+	m_chatServer = 0;
+	delete m_serverAvatar;
+}
+
+//-----------------------------------------------------------------------
+
+void Chat::addModeratorToRoom(const std::string & who, const std::string & roomPath)
+{
+	UNREF(who);
+	UNREF(roomPath);
+}
+
+//-----------------------------------------------------------------------
+void Chat::emptyMail(const NetworkId &sourceNetworkId, const NetworkId &targetNetworkId)
+{
+	if (targetNetworkId != NetworkId::cms_invalid)
+	{
+		ChatDeleteAllPersistentMessages msg(sourceNetworkId, targetNetworkId);
+
+		sendToChatServer(msg);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+
+void Chat::addFriend(const std::string &player, const std::string & friendName)
+{
+	ChatAvatarId playerId = constructChatAvatarId (player);
+	ChatAvatarId friendId = constructChatAvatarId (friendName);
+	ChatChangeFriendStatus msg(0, playerId, friendId, true);
+	sendToChatServer(msg);
+}
+
+//-----------------------------------------------------------------------
+
+void Chat::removeFriend(const std::string &player, const std::string & friendName)
+{
+	ChatAvatarId playerId = constructChatAvatarId (player);
+	ChatAvatarId friendId = constructChatAvatarId (friendName);
+	ChatChangeFriendStatus msg(0, playerId, friendId, false);
+	sendToChatServer(msg);
+}
+
+//-----------------------------------------------------------------------
+
+void Chat::getFriendsList(const std::string &player)
+{
+	ChatAvatarId playerId = constructChatAvatarId (player);
+	ChatGetFriendsList msg(playerId);
+	sendToChatServer(msg);
+}
+
+//-----------------------------------------------------------------------
+
+
+void Chat::addIgnore(const std::string &player, const std::string & ignoreName)
+{
+	ChatAvatarId playerId = constructChatAvatarId (player);
+	ChatAvatarId ignoreId = constructChatAvatarId (ignoreName);
+	ChatChangeIgnoreStatus msg(0, playerId, ignoreId, true);
+	sendToChatServer(msg);
+}
+
+//-----------------------------------------------------------------------
+
+void Chat::removeIgnore(const std::string &player, const std::string & ignoreName)
+{
+	ChatAvatarId playerId = constructChatAvatarId (player);
+	ChatAvatarId ignoreId = constructChatAvatarId (ignoreName);
+	ChatChangeIgnoreStatus msg(0, playerId, ignoreId, false);
+	sendToChatServer(msg);
+}
+
+//-----------------------------------------------------------------------
+
+void Chat::getIgnoreList(const std::string &player)
+{
+	ChatAvatarId playerId = constructChatAvatarId (player);
+	ChatGetIgnoreList msg(playerId);
+	sendToChatServer(msg);
+}
+
+//-----------------------------------------------------------------------
+
+void Chat::createRoom(const std::string & ownerName, const bool isPublic, const std::string & roomPath, const std::string & roomTitle)
+{
+	if (ownerName != "System")
+	{
+		if (!TextManager::isAppropriateText(Unicode::narrowToWide(roomPath)))
+		{
+			sendSystemMessage(ownerName, StringId("ui_chatroom", "create_err_profane_name"), Unicode::emptyString);
+			return;
+		}
+		
+		if (!TextManager::isAppropriateText(Unicode::narrowToWide(roomTitle)))
+		{
+			sendSystemMessage(ownerName, StringId("ui_chatroom", "create_err_profane_title"), Unicode::emptyString);
+			return;
+		}
+	}
+
+	static int sequence = 1;
+	ChatCreateRoom create(sequence++, ownerName, roomPath, false, isPublic, roomTitle);
+	sendToChatServer(create);
+}
+
+//-----------------------------------------------------------------------
+
+void Chat::createSystemRooms(const std::string & galaxyName, const std::string & planetName)
+{
+	NOT_NULL (instance ().m_serverAvatar);
+
+	const std::string & avatarName = instance ().m_serverAvatar->getFullName ();
+	const std::string & gamePrefix = getGameCode () + ".";
+
+	createRoom(avatarName, true, gamePrefix + ChatRoomTypes::ROOM_UNIVERSE, "public chat for all galaxies, cannot create rooms here");
+	createRoom(avatarName, true, gamePrefix + ChatRoomTypes::ROOM_SYSTEM,   "system messages for all galaxies");
+	createRoom(avatarName, true, gamePrefix + ChatRoomTypes::ROOM_CHAT,     "public chat for all galaxies, can create rooms here");
+	
+
+	std::string galaxyRoom = gamePrefix + galaxyName + ".";
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_GALAXY, "public chat for the whole galaxy, cannot create rooms here");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_SYSTEM, "system messages for this galaxy");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_CHAT,   "public chat for this galaxy, can create rooms here");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_IMPERIAL, "Imperial chat for this galaxy");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_IMPERIAL_WAR_ROOM, "Imperial war room chat for this galaxy");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_REBEL,   "Rebel chat for this galaxy");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_REBEL_WAR_ROOM, "Rebel war room chat for this galaxy");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_BOUNTY_HUNTER  , "Bounty Hunter chat for this galaxy");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_COMMANDO       , "Commando chat for this galaxy");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_ENTERTAINER    , "Entertainer chat for this galaxy");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_FORCE_SENSITIVE, "Force Sensitive chat for this galaxy");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_MEDIC          , "Medic chat for this galaxy");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_OFFICER        , "Officer chat for this galaxy");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_PILOT          , "Pilot chat for this galaxy");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_POLITICIAN     , "Politician chat for this galaxy");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_SMUGGLER       , "Smuggler chat for this galaxy");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_SPY            , "Spy chat for this galaxy");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_TRADER         , "Trader chat for this galaxy");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_BEAST_MASTERY  , "Beast Mastery chat for this galaxy");
+	createRoom(avatarName, true, galaxyRoom + ChatRoomTypes::ROOM_WARDEN         , "Warden chat for this galaxy");
+
+	std::string planetRoom = gamePrefix + galaxyName + "." + planetName + ".";
+	createRoom(avatarName, true, planetRoom + ChatRoomTypes::ROOM_PLANET, "public chat for this planet, cannot create rooms here");
+	createRoom(avatarName, true, planetRoom + ChatRoomTypes::ROOM_SYSTEM, "system messages for this planet, cannot create rooms here");
+	createRoom(avatarName, true, planetRoom + ChatRoomTypes::ROOM_CHAT,   "public chat for this planet, can create rooms here");
+
+	GroupObject::createAllGroupChatRooms();
+	GuildInterface::createAllGuildChatRooms();
+	CityInterface::createAllCityChatRooms();
+}
+
+//-----------------------------------------------------------------------
+
+void Chat::destroyRoom(const std::string & roomPath)
+{
+	ChatDestroyRoomByName destroy(roomPath);
+	sendToChatServer(destroy);
+}
+
+//-----------------------------------------------------------------------
+
+void Chat::enterRoom(const std::string & who, const std::string & roomPath, bool forceCreate, bool createPrivate)
+{
+	ChatPutAvatarInRoom enter(who, roomPath, forceCreate, createPrivate);
+	sendToChatServer(enter);
+}
+
+//-----------------------------------------------------------------------
+
+void Chat::exitRoom(const std::string & who, const std::string & roomPath)
+{
+	ChatAvatarId id(getGameCode (), GameServer::getInstance().getClusterName(), who);
+	ChatRemoveAvatarFromRoom remove(id, roomPath);
+	sendToChatServer(remove);
+}
+
+//-----------------------------------------------------------------------
+
+Chat & Chat::instance()
+{
+	static Chat c;
+	m_instance = &c;
+	return *m_instance;
+}
+
+//-----------------------------------------------------------------------
+
+void Chat::removeModeratorFromRoom(const std::string & who, const std::string & roomPath)
+{
+	UNREF(who);
+	UNREF(roomPath);
+}
+
+//-----------------------------------------------------------------------
+
+void Chat::sendInstantMessage(const std::string & from, const std::string & to, const Unicode::String & message, const Unicode::String & oob)
+{
+	ChatMessageFromGame m(ChatMessageFromGame::INSTANT, from, to, message, oob);
+	sendToChatServer(m);
+}
+
+//----------------------------------------------------------------------
+
+void Chat::sendPersistentMessage(const std::string & from, const std::string & to, const Unicode::String & subject, const Unicode::String & message, const Unicode::String & oob)
+{
+	DEBUG_REPORT_LOG (true, ("Chat::sendPersistentMessage oob size=%d\n", static_cast<int>(oob.size ())));
+	ChatMessageFromGame m(ChatMessageFromGame::PERSISTENT, from, to, message, oob, subject);
+	sendToChatServer(m);
+}
+
+//----------------------------------------------------------------------
+
+void Chat::sendPersistentMessage    (const ServerObject & from, const std::string & to, const StringId & subject,        const Unicode::String & message, const Unicode::String & oob)
+{
+	Unicode::String subjectString;
+	subjectString.push_back ('@');
+	subjectString += Unicode::narrowToWide (subject.getCanonicalRepresentation ());
+
+	Chat::sendPersistentMessage (Unicode::wideToNarrow (from.getEncodedObjectName ()), to, subjectString, message, oob);
+}
+
+//----------------------------------------------------------------------
+
+void Chat::sendPersistentMessage    (const ServerObject & from, const std::string & to, const StringId & subject,        const StringId & message,        const Unicode::String & oob)
+{
+	Unicode::String messageString;
+	messageString.push_back ('@');
+	messageString += Unicode::narrowToWide (message.getCanonicalRepresentation ());
+
+	Unicode::String subjectString;
+	subjectString.push_back ('@');
+	subjectString += Unicode::narrowToWide (subject.getCanonicalRepresentation ());
+
+	Chat::sendPersistentMessage (Unicode::wideToNarrow (from.getEncodedObjectName ()), to, subjectString, messageString, oob);
+}
+
+//----------------------------------------------------------------------
+
+Unicode::String & Chat::makePersistentMessageBody     (Unicode::String & target, const ProsePackage & pp)
+{
+	OutOfBandPackager::pack (pp, -1, target);
+	return target;
+}
+
+//-----------------------------------------------------------------------
+
+void Chat::sendToRoom(const std::string & from, const std::string & roomName, const Unicode::String & message, const Unicode::String & oob)
+{
+	ChatMessageFromGame m(ChatMessageFromGame::ROOM, from, message, oob, roomName);
+	sendToChatServer(m);
+}
+
+//-----------------------------------------------------------------------
+
+void Chat::broadcastSystemMessageToCluster (const Unicode::String & message, const Unicode::String & oob)
+{
+	std::string const roomName = std::string("SWG.") + GameServer::getInstance().getClusterName() + std::string(".SYSTEM");
+	sendToRoom(cs_systemSenderName, roomName, message, oob);
+}
+
+//-----------------------------------------------------------------------
+
+void Chat::sendToChatServer(const GameNetworkMessage & message)
+{
+	if(instance().m_chatServer)
+	{
+		instance().m_chatServer->send(message, true);
+	}
+	else
+	{
+		Archive::ByteStream bs;
+		message.pack(bs);
+		instance().m_deferredChatMessages.push_back(bs);
+	}
+}
+
+//----------------------------------------------------------------------
+
+const ChatServerConnection *Chat::getChatServer()
+{
+	return instance().m_chatServer;
+}
+
+//-----------------------------------------------------------------------
+
+void Chat::setChatServer(ChatServerConnection * conn)
+{
+	if(! instance().m_chatServer && conn)
+	{
+		// flush deferred messages
+		std::vector<Archive::ByteStream>::const_iterator iter;
+		for(iter = instance().m_deferredChatMessages.begin(); iter != instance().m_deferredChatMessages.end(); ++iter)
+		{
+			// this cast seems unnecessary, but is required with VC6 for some reason.
+			// it should resolve to 
+			// Connection::send(const Archive::ByteStream &, const bool) const
+			static_cast<Connection *>(conn)->send((*iter), true);
+		}
+	}
+	instance().m_chatServer = conn;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sends a system-specific message to a player.
+ *
+ * @param to		player to send to
+ * @param message	the message to send
+ * @param oob		thingy
+ */
+void Chat::sendSystemMessage(const ServerObject & to, const StringId & message, const Unicode::String & oob)
+{
+	ChatSystemMessage msg(ChatSystemMessage::PERSONAL, 
+		Unicode::narrowToWide("@" + message.getCanonicalRepresentation()), oob);
+	Client *client = to.getClient();
+	if (client)
+	{
+		client->send(msg, true);
+	}
+	else
+	{
+		sendSystemMessage(Unicode::wideToNarrow(to.getAssignedObjectFirstName()), message, oob);
+	}
+}	// Chat::sendSystemMessage
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sends a system-specific message to a player.
+ *
+ * @param to		player to send to
+ * @param message	the message to send
+ * @param oob		thingy
+ */
+void Chat::sendSystemMessage(const ServerObject & to, const Unicode::String & message, const Unicode::String & oob)
+{
+	ChatSystemMessage msg(ChatSystemMessage::PERSONAL, message, oob);
+	Client *client = to.getClient();
+	if (client)
+	{
+		client->send(msg, true);
+	}
+	else
+	{
+		sendSystemMessage(Unicode::wideToNarrow(to.getAssignedObjectFirstName()), message, oob);
+	}
+}	// Chat::sendSystemMessage
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sends a system-specific message to a player.
+ *
+ * @param to		player to send to's name
+ * @param message	the message to send
+ * @param oob		thingy
+ */
+void Chat::sendSystemMessage(const std::string & to, const StringId & message, const Unicode::String & oob)
+{
+	// @todo: we need to be able to send the message string id to the player
+	// and localize it client-side
+	sendSystemMessage(to, Unicode::narrowToWide("@" + message.getCanonicalRepresentation()), oob);
+}	// Chat::sendSystemMessage
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sends a system-specific message to a player.
+ *
+ * @param to		player to send to's n
+ * @param message	the message to send
+ * @param oob		thingy
+ */
+void Chat::sendSystemMessage(const std::string & to, const Unicode::String & message,  const Unicode::String & oob)
+{
+	NOT_NULL(instance().m_serverAvatar);
+	
+	std::string toName(to);
+	// split off the last name from toName
+	std::string::size_type spacePos = toName.find(' ');
+	if (spacePos != std::string::npos)
+		toName = toName.substr(0, spacePos);
+
+	sendInstantMessage(instance().m_serverAvatar->getFullName(), to, message, oob);
+}	// Chat::sendSystemMessage
+
+//----------------------------------------------------------------------
+
+void Chat::sendSystemMessage   (const std::string & to, const ProsePackage & pp)
+{
+	Unicode::String oob;
+	OutOfBandPackager::pack (pp, -1, oob);
+	sendSystemMessage (to, Unicode::String (), oob);
+}
+
+//----------------------------------------------------------------------
+
+void Chat::sendSystemMessage   (const ServerObject & to, const ProsePackage & pp)
+{
+	//MLS shortcut me
+	//Chat::sendSystemMessage(Unicode::wideToNarrow(to.getAssignedObjectFirstName()), pp);
+	Unicode::String oob;
+	OutOfBandPackager::pack (pp, -1, oob);
+	ChatSystemMessage msg(ChatSystemMessage::PERSONAL, 
+		Unicode::String(), oob);
+	Client *client = to.getClient();
+	if (client)
+	{
+		client->send(msg, true);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void Chat::sendSystemMessageSimple  (const ServerObject & to, const StringId & stringId, const ServerObject * target)
+{
+	ProsePackage pp;
+	pp.stringId = stringId;
+	if (target)
+	{
+		pp.target.id       = target->getNetworkId ();
+		pp.target.str      = target->getAssignedObjectName ();
+		if (pp.target.str.empty ())
+			pp.target.stringId = target->getObjectNameStringId ();
+	}
+	pp.actor.id        = to.getNetworkId ();
+
+	Chat::sendSystemMessage (to, pp);
+}
+
+//----------------------------------------------------------------------
+
+const std::string & Chat::getGameCode ()
+{
+	NOT_NULL(instance().m_serverAvatar);
+	return instance ().m_gameCode;
+}
+
+//----------------------------------------------------------------------
+
+const ChatAvatarId Chat::constructChatAvatarId (const ServerObject & to)
+{
+	return Chat::constructChatAvatarId (Unicode::wideToNarrow (to.getAssignedObjectFirstName ()));
+}
+
+//----------------------------------------------------------------------
+
+const ChatAvatarId Chat::constructChatAvatarId (const std::string & to)
+{
+	NOT_NULL(instance().m_serverAvatar);
+
+	ChatAvatarId to_id (to);
+
+	if (to_id.gameCode.empty ())
+		to_id.gameCode = instance().m_serverAvatar->gameCode;
+
+	if (to_id.cluster.empty ())
+		to_id.cluster = instance().m_serverAvatar->cluster;
+
+	return to_id;
+}
+
+//----------------------------------------------------------------------
+
+void Chat::invite(const std::string & to, const std::string & room) 
+{
+	ChatAvatarId id = constructChatAvatarId(to);
+	ChatInviteAvatarToRoom inviteMessage(id, room);
+	sendToChatServer(inviteMessage);
+}
+
+//----------------------------------------------------------------------
+
+void Chat::uninvite(const std::string & to, const std::string & room) 
+{
+	ChatAvatarId id = constructChatAvatarId(to);
+	ChatUninviteFromRoom uninviteMessage(0, id, room);
+	sendToChatServer(uninviteMessage);
+}
+
+//----------------------------------------------------------------------
+
+void Chat::inviteGroupMembers(const NetworkId & invitor, const ChatAvatarId & groupLeader, const std::string & room, const stdvector<NetworkId>::fwd & members) 
+{
+	ChatInviteGroupMembersToRoom inviteMessage(invitor, groupLeader, room, members);
+	sendToChatServer(inviteMessage);
+}
+
+//----------------------------------------------------------------------
+
+unsigned int Chat::isAllowedToEnterRoom(const CreatureObject & who, const std::string & room)
+{
+	NOT_NULL(instance().m_serverAvatar);
+
+	// god is allowed to enter all rooms; don't have to actually
+	// be in god mode; just secured login is adequate
+	if (who.getClient() && who.getClient()->isGodValidated())
+		return CHATRESULT_SUCCESS;
+
+	// player must be of the correct faction to enter the factional chat rooms
+	static std::string s_imperialChatRoom = getGameCode() + "." + instance().m_serverAvatar->cluster + "." + ChatRoomTypes::ROOM_IMPERIAL;
+	static std::string s_rebelChatRoom = getGameCode() + "." + instance().m_serverAvatar->cluster + "." + ChatRoomTypes::ROOM_REBEL;
+
+	if (((_stricmp(room.c_str(), s_imperialChatRoom.c_str()) == 0) && !PvpData::isImperialFactionId(who.getPvpFaction())) ||
+		((_stricmp(room.c_str(), s_rebelChatRoom.c_str()) == 0) && !PvpData::isRebelFactionId(who.getPvpFaction())))
+	{
+		return SWG_CHAT_ERR_WRONG_FACTION;
+	}
+
+	// factional war room chat rooms only available to mayor and guild leader of the same faction of city and guild aligned with the same faction
+	static std::string s_imperialWarRoomChatRoom = getGameCode() + "." + instance().m_serverAvatar->cluster + "." + ChatRoomTypes::ROOM_IMPERIAL_WAR_ROOM;
+	static std::string s_rebelWarRoomChatRoom = getGameCode() + "." + instance().m_serverAvatar->cluster + "." + ChatRoomTypes::ROOM_REBEL_WAR_ROOM;
+
+	if (_stricmp(room.c_str(), s_imperialWarRoomChatRoom.c_str()) == 0)
+	{
+		bool allowed = false;
+
+		std::vector<int> const & cityIds = CityInterface::getCitizenOfCityId(who.getNetworkId());
+		if (!cityIds.empty())
+		{
+			CityInfo const & cityInfo = CityInterface::getCityInfo(cityIds.front());
+			uint32 const cityFaction = cityInfo.getFaction();
+			if (PvpData::isImperialFactionId(cityFaction) && (cityFaction == who.getPvpFaction()) && (cityInfo.getLeaderId() == who.getNetworkId()))
+				allowed = true;
+		}
+
+		if (!allowed)
+		{
+			int const guildId = who.getGuildId();
+			if (guildId > 0)
+			{
+				GuildInfo const * const gi = GuildInterface::getGuildInfo(guildId);
+				if (gi)
+				{
+					uint32 const guildFaction = GuildInterface::getGuildCurrentFaction(*gi);
+					if (PvpData::isImperialFactionId(guildFaction) && (guildFaction == who.getPvpFaction()) && (gi->m_leaderId == who.getNetworkId()) && (gi->getCountMembersOnly() >= ConfigServerGame::getGcwGuildMinMembersForGcwRegionDefender()))
+						allowed = true;
+				}
+			}
+		}
+
+		if (!allowed)
+			return SWG_CHAT_ERR_WRONG_GCW_REGION_DEFENDER_FACTION;
+	}
+
+	if (_stricmp(room.c_str(), s_rebelWarRoomChatRoom.c_str()) == 0)
+	{
+		bool allowed = false;
+
+		std::vector<int> const & cityIds = CityInterface::getCitizenOfCityId(who.getNetworkId());
+		if (!cityIds.empty())
+		{
+			CityInfo const & cityInfo = CityInterface::getCityInfo(cityIds.front());
+			uint32 const cityFaction = cityInfo.getFaction();
+			if (PvpData::isRebelFactionId(cityFaction) && (cityFaction == who.getPvpFaction()) && (cityInfo.getLeaderId() == who.getNetworkId()))
+				allowed = true;
+		}
+
+		if (!allowed)
+		{
+			int const guildId = who.getGuildId();
+			if (guildId > 0)
+			{
+				GuildInfo const * const gi = GuildInterface::getGuildInfo(guildId);
+				if (gi)
+				{
+					uint32 const guildFaction = GuildInterface::getGuildCurrentFaction(*gi);
+					if (PvpData::isRebelFactionId(guildFaction) && (guildFaction == who.getPvpFaction()) && (gi->m_leaderId == who.getNetworkId()) && (gi->getCountMembersOnly() >= ConfigServerGame::getGcwGuildMinMembersForGcwRegionDefender()))
+						allowed = true;
+				}
+			}
+		}
+
+		if (!allowed)
+			return SWG_CHAT_ERR_WRONG_GCW_REGION_DEFENDER_FACTION;
+	}
+
+	// player must be a warden to enter the warden room
+	static std::string s_wardenChatRoom = getGameCode() + "." + instance().m_serverAvatar->cluster + "." + ChatRoomTypes::ROOM_WARDEN;
+	if (_stricmp(room.c_str(), s_wardenChatRoom.c_str()) == 0)
+	{
+		PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(&who);
+		if (!playerObject || !playerObject->isWarden())
+		{
+			return SWG_CHAT_ERR_NOT_WARDEN;
+		}
+	}
+
+	return CHATRESULT_SUCCESS;
+}
+
+//----------------------------------------------------------------------
+
+void Chat::sendQuestSystemMessage(ServerObject const & to, Unicode::String const & message, Unicode::String const & oob)
+{
+	ChatSystemMessage const msg(ChatSystemMessage::F_quest, message, oob);
+	Client * const client = to.getClient();
+	if (client)
+		client->send(msg, true);
+}
+
+//----------------------------------------------------------------------
+//----------------------------------------------------------------------
+//----------------------------------------------------------------------
+//TODO: integrate these properly
+void Chat::requestGetChannel(std::string const & roomName, std::string const & displayName, std::string const & password, bool persistant, uint32 limit)
+{
+	VoiceChatGetChannel msg(roomName, password, true, persistant, limit);
+	sendToChatServer(msg);
+}
+
+void Chat::requestGetChannel(std::string const & roomName, bool isPublic, bool persistant, uint32 limit)
+{
+	VoiceChatGetChannel msg(roomName, "", isPublic, persistant, limit);
+	sendToChatServer(msg);
+}
+
+void Chat::requestDestroyChannel(std::string const & roomName)
+{
+	VoiceChatDeleteChannel msg(roomName);
+	sendToChatServer(msg);
+}
+
+//----------------------------------------------------------------------
+
+void Chat::requestAddClientToChannel(NetworkId const & clientId, std::string const & playerName, std::string const & roomName, bool forceShortlist)
+{
+	VoiceChatAddClientToChannel msg (clientId, playerName, roomName, forceShortlist);
+	sendToChatServer(msg);
+}
+
+//----------------------------------------------------------------------
+
+void Chat::requestRemoveClientFromChannel(NetworkId const & clientId, std::string const & playerName, std::string const & roomName)
+{
+	VoiceChatRemoveClientFromChannel msg (clientId, playerName, roomName);
+	sendToChatServer(msg);
+}
+
+//----------------------------------------------------------------------
+
+void Chat::requestChannelCommand(std::string const & srcUser, std::string const & destUser, std::string const & destChan, uint32 commandType, uint32 banTimeout)
+{
+	VoiceChatChannelCommand msg(srcUser,destUser,destChan,commandType, banTimeout);
+	sendToChatServer(msg);
+}
+
+//----------------------------------------------------------------------
+
+void Chat::requestBroadcastGlobalChannelMessage(std::string const & channelName, std::string const & message, bool isRemove, bool sendToAllClusters)
+{
+	typedef std::pair<std::pair<std::string,std::string>, bool> PayloadType;
+
+	LOG("CustomerService", ("BroadcastVoiceChannel: GameServer::Chat::requestBroadcastGlobalChannel chan(%s) text(%s) remove(%d) sendToAllClusters(%d)", 
+		channelName.c_str(), message.c_str(), (isRemove ? 1 : 0), (sendToAllClusters?1:0)));
+
+	if(sendToAllClusters)
+	{
+		GenericValueTypeMessage<PayloadType> msg("AllCluserGlobalChannel", std::make_pair(std::make_pair(channelName, message),isRemove));
+		GameServer::getInstance().sendToCentralServer(msg);
+	}
+	else
+	{
+		GenericValueTypeMessage<PayloadType> msg("BroadcastGlobalChannel", std::make_pair(std::make_pair(channelName, message),isRemove));
+		sendToChatServer(msg);
+	}
+
+}
+
+//----------------------------------------------------------------------
+
+bool Chat::debugTellClientAboutRoom(const NetworkId & clientCreatureId, const std::string &roomName, std::string const & uri, std::string const & password, bool autoJoin, bool leaveCommand)
+{
+	Object *o = NetworkIdManager::getObjectById(clientCreatureId);
+	if (o)
+	{
+		ServerObject *so = o->asServerObject();
+		if (so && so->isAuthoritative())
+		{
+			CreatureObject *creature = so->asCreatureObject();
+			if (creature)
+			{
+				Client *client = creature->getClient();
+				if (client)
+				{
+					uint32 flags = VoiceChatChannelInfo::CIF_None;
+					if(autoJoin) flags |= VoiceChatChannelInfo::CIF_AutoJoin;
+					if(leaveCommand) flags |= VoiceChatChannelInfo::CIF_LeaveChannel;
+
+					VoiceChatChannelInfo msg(roomName, roomName, uri, password, "", flags);
+					client->send(msg, true);
+					return true;
+				}
+			}
+		}
+	}
+	return false;
+}
+//END TODO
diff --git a/engine/server/library/serverGame/src/shared/network/Chat.h b/engine/server/library/serverGame/src/shared/network/Chat.h
new file mode 100644
index 00000000..f94510f4
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/network/Chat.h
@@ -0,0 +1,108 @@
+// Chat.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_Chat_H
+#define	_INCLUDED_Chat_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/ByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+struct ChatAvatarId;
+class ChatServerConnection;
+class CreatureObject;
+class NetworkId;
+class ProsePackage;
+class ServerObject;
+class StringId;
+
+//-----------------------------------------------------------------------
+
+class Chat
+{
+public:
+	~Chat();
+
+//TODO: integrate these properly
+	static void requestGetChannel(std::string const & roomName, std::string const & displayName, std::string const & password = "", bool persistant = false, uint32 limit = 100);
+	static void requestGetChannel(std::string const & roomName, bool isPublic = true, bool persistant = false, uint32 limit = 100);
+	static void requestDestroyChannel(std::string const & roomName);
+	static void requestAddClientToChannel(NetworkId const & clientId, std::string const & playerName, std::string const & roomName, bool forceShortlist);
+	static void requestRemoveClientFromChannel(NetworkId const & clientId, std::string const & playerName, std::string const & roomName);
+	static void requestChannelCommand(std::string const & srcUser, std::string const & destUser, std::string const & destChan, uint32 commandType, uint32 banTimeout);
+
+	static void requestBroadcastGlobalChannelMessage(std::string const & channelName, std::string const & message, bool isRemove, bool sendToAllClusters);
+
+	static bool debugTellClientAboutRoom(const NetworkId & clientId, std::string const& roomName, std::string const & uri, std::string const & password = "", bool autoJoin = true, bool leaveCommand = false);
+//END TODO
+
+
+	static void addFriend                (const std::string & player, const std::string & friendName);
+	static void removeFriend             (const std::string & player, const std::string & friendName);
+	static void getFriendsList           (const std::string & player);
+	static void addIgnore                (const std::string & player, const std::string & ignoreName);
+	static void removeIgnore             (const std::string & player, const std::string & ignoreName);
+	static void getIgnoreList            (const std::string & player);
+	static void addModeratorToRoom       (const std::string & who, const std::string & roomPath);
+	static void createRoom               (const std::string & ownerName, const bool isPublic, const std::string & roomPath, const std::string & roomTitle);
+	static void createSystemRooms        (const std::string & galaxyName, const std::string & planetName);
+	static void destroyRoom              (const std::string & roomPath);
+	static void enterRoom                (const std::string & who, const std::string & roomPath, bool forceCreate, bool createPrivate);
+	static void exitRoom                 (const std::string & who, const std::string & roomPath);
+	static void removeModeratorFromRoom  (const std::string & who, const std::string & roomPath);
+	static void sendInstantMessage       (const std::string & from, const std::string & to, const Unicode::String & message, const Unicode::String & oob);
+	static void emptyMail                (const NetworkId &sourceNetworkId, const NetworkId &targetNetworkId);
+
+	static Unicode::String & makePersistentMessageBody     (Unicode::String & target, const ProsePackage & pp);
+
+	static void sendPersistentMessage    (const std::string & from,  const std::string & to, const Unicode::String & subject, const Unicode::String & message, const Unicode::String & oob);
+	static void sendPersistentMessage    (const ServerObject & from, const std::string & to, const StringId & subject,        const Unicode::String & message, const Unicode::String & oob);
+	static void sendPersistentMessage    (const ServerObject & from, const std::string & to, const StringId & subject,        const StringId & message,        const Unicode::String & oob);
+
+	static void sendToChatServer         (const GameNetworkMessage & msg);
+	static void sendToRoom               (const std::string & from, const std::string & roomPath, const Unicode::String & message, const Unicode::String & oob);
+	static void broadcastSystemMessageToCluster (const Unicode::String & message, const Unicode::String & oob);
+
+	static void sendQuestSystemMessage(ServerObject const & to, Unicode::String const & message, Unicode::String const & oob);
+
+	static void sendSystemMessage        (const ServerObject & to, const StringId & message, const Unicode::String & oob);
+	static void sendSystemMessage        (const ServerObject & to, const Unicode::String & message, const Unicode::String & oob);
+	static void sendSystemMessage        (const ServerObject & to, const ProsePackage & pp);
+	static void sendSystemMessageSimple  (const ServerObject & to, const StringId & message, const ServerObject * target);
+
+	static void sendSystemMessage        (const std::string & to, const StringId & message, const Unicode::String & oob);
+	static void sendSystemMessage        (const std::string & to, const Unicode::String & message, const Unicode::String & oob);
+	static void sendSystemMessage        (const std::string & to, const ProsePackage & pp);
+	static void invite                   (const std::string & to, const std::string & room); 
+	static void uninvite                 (const std::string & to, const std::string & room); 
+	static void inviteGroupMembers       (const NetworkId & invitor, const ChatAvatarId & groupLeader, const std::string & room, const stdvector<NetworkId>::fwd & members); 
+
+	static unsigned int isAllowedToEnterRoom(const CreatureObject & who, const std::string & room);
+
+	static void setChatServer            (ChatServerConnection * chatServerConnection);
+
+	static const std::string & getGameCode ();
+
+	static const ChatAvatarId             constructChatAvatarId (const ServerObject & to);
+	static const ChatAvatarId             constructChatAvatarId (const std::string & to);
+
+	static const ChatServerConnection *   getChatServer();
+
+private:
+	Chat();
+	Chat & operator = (const Chat & rhs);
+	Chat(const Chat & source);
+	static Chat & instance();
+
+	static Chat *                        m_instance;
+	ChatAvatarId *                       m_serverAvatar;
+	ChatServerConnection *               m_chatServer;	
+	stdvector<Archive::ByteStream>::fwd  m_deferredChatMessages;
+	std::string                          m_gameCode;
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_Chat_H
diff --git a/engine/server/library/serverGame/src/shared/network/ConnectionServerConnection.cpp b/engine/server/library/serverGame/src/shared/network/ConnectionServerConnection.cpp
new file mode 100644
index 00000000..b6af7d42
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/network/ConnectionServerConnection.cpp
@@ -0,0 +1,504 @@
+// ConnectionServerConnection.cpp
+// copyright 2001 Verant Interactive
+
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConnectionServerConnection.h"
+
+#include "serverGame/BuildingObject.h"
+#include "serverGame/Chat.h"
+#include "serverGame/CommunityManager.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/NewbieTutorial.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverNetworkMessages/GameConnectionServerMessages.h"
+#include "serverNetworkMessages/TransferCharacterData.h"
+#include "serverNetworkMessages/TransferCharacterDataArchive.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverUtility/FreeCtsDataTable.h"
+#include "sharedFoundation/CalendarTime.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedGame/PlayerCreationManager.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/ChatEnum.h"
+#include "sharedNetworkMessages/ChatOnChangeFriendStatus.h"
+#include "sharedNetworkMessages/ChatOnGetFriendsList.h"
+#include "sharedNetworkMessages/ChatOnChangeIgnoreStatus.h"
+#include "sharedNetworkMessages/ChatOnGetIgnoreList.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetwork/NetworkSetupData.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/VolumeContainer.h"
+#include "sharedSkillSystem/SkillObject.h"
+
+// ======================================================================
+
+namespace ConnectionServerConnectionNamespace
+{
+	class ConnectionServerNetworkSetupData: public NetworkSetupData
+	{
+	public:
+		ConnectionServerNetworkSetupData();
+	};
+}
+
+using namespace ConnectionServerConnectionNamespace;
+
+// ======================================================================
+
+ConnectionServerConnectionNamespace::ConnectionServerNetworkSetupData::ConnectionServerNetworkSetupData():
+	NetworkSetupData()
+{
+	//-- The server connection from gameserver (or any other server) to connection server should sync to the connection server's time stamp.
+	clockSyncDelay = 45000;
+}
+
+// ======================================================================
+
+ConnectionServerConnection::ConnectionServerConnection(const std::string & a, const unsigned short p) :
+	ServerConnection(a, p, ConnectionServerNetworkSetupData()),
+	m_syncStampShort(0),
+	m_syncStampLong(0)
+{
+}
+
+// ----------------------------------------------------------------------
+
+ConnectionServerConnection::~ConnectionServerConnection()
+{
+	static MessageConnectionCallback m("ConnectionServerConnectionDestroyed");
+	emitMessage(m);
+}
+
+// ----------------------------------------------------------------------
+
+void ConnectionServerConnection::onConnectionClosed()
+{
+	ServerConnection::onConnectionClosed();
+	static MessageConnectionCallback m("ConnectionServerConnectionClosed");
+	emitMessage(m);
+}
+
+//-----------------------------------------------------------------------
+
+void ConnectionServerConnection::onConnectionOpened()
+{
+	ServerConnection::onConnectionOpened();
+
+            //Send info about ourself.
+        std::string sceneName = ConfigServerGame::getSceneID();
+        NewGameServer msg(sceneName, GameServer::getInstance().getProcessId());
+        send(msg, true);
+
+	static MessageConnectionCallback m("ConnectionServerConnectionOpened");
+	emitMessage(m);
+}
+
+//-----------------------------------------------------------------------
+
+void ConnectionServerConnection::onReceive (const Archive::ByteStream & message)
+{
+	Archive::ReadIterator ri = message.begin();
+	GameNetworkMessage m(ri);
+	ri = message.begin();
+	if(m.isType("GameClientMessage"))
+	{
+		GameClientMessage c(ri);
+		const std::vector<NetworkId> & idList = c.getDistributionList();
+		std::vector<NetworkId>::const_iterator i;
+		for(i = idList.begin(); i != idList.end(); ++i)
+		{
+			GameServer::getInstance().deliverMessageToClientObject((*i), c.getByteStream());
+		}
+	}
+	else if (m.isType("SetSyncStamp"))
+	{
+		Archive::ReadIterator readIterator = message.begin();
+		GenericValueTypeMessage<std::pair<uint16, uint32> > syncStampMessage(readIterator);
+		setSyncStamps(syncStampMessage.getValue().first, syncStampMessage.getValue().second);
+	}
+	else if (m.isType("ChatOnChangeFriendStatus"))
+	{
+		ChatOnChangeFriendStatus chat(ri);
+
+		CommunityManager::handleMessage(chat);
+	}
+	else if (m.isType("ChatOnGetFriendsList"))
+	{
+		ChatOnGetFriendsList chat(ri);
+
+		CommunityManager::handleMessage(chat);
+	}
+	else if (m.isType("ChatOnChangeIgnoreStatus"))
+	{
+		ChatOnChangeIgnoreStatus chat(ri);
+
+		CommunityManager::handleMessage(chat);
+	}
+	else if (m.isType("ChatOnGetIgnoreList"))
+	{
+		ChatOnGetIgnoreList chat(ri);
+
+		CommunityManager::handleMessage(chat);
+	}
+	else if (m.isType("ChatStatisticsCS"))
+	{
+		GenericValueTypeMessage<std::pair<std::pair<NetworkId, int>, std::pair<int, int> > > chatStatistics(ri);
+		ServerObject * const so = ServerWorld::findObjectByNetworkId(chatStatistics.getValue().first.first);
+		if (so)
+		{
+			CreatureObject * const character = so->asCreatureObject();
+			if (character)
+			{
+				PlayerObject * const player = PlayerCreatureController::getPlayerObject(character);
+				if (player)
+				{
+					player->handleChatStatisticsFromChatServer(chatStatistics.getValue().first.first, chatStatistics.getValue().first.second, chatStatistics.getValue().second.first, chatStatistics.getValue().second.second);
+				}
+			}
+		}
+	}
+	else if (m.isType("RequestLoadPackedHouses"))
+	{
+		GenericValueTypeMessage<NetworkId> characterId(ri);
+		LOG("CustomerService", ("CharacterTransfer: ConnectionServerConnection received RequestLoadPackedHouses for %s", characterId.getValue().getValueString().c_str()));
+
+		CreatureObject * character = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(characterId.getValue()));
+		if(character)
+		{
+			int numHouses = 0;
+			numHouses = character->loadPackedHouses();
+			if (numHouses > 0)
+			{
+				character->setLoadCTSPackedHouses(true);
+				// add the objvar.
+				character->setObjVarItem("cts.packed_house_count", numHouses);
+				LOG("CustomerService", ("CharacterTransfer: starting %d packed house load for CTS character %s", numHouses, PlayerObject::getAccountDescription(character).c_str()));
+			}
+			else
+			{
+				// houses are loaded, go ahead and send the reply message
+				GenericValueTypeMessage<NetworkId> loadedMsg("PackedHousesLoaded", characterId.getValue());
+				send(loadedMsg, true);
+				LOG("CustomerService", ("CharacterTransfer: CTS character %s does not have any packed houses, so telling the connection server", PlayerObject::getAccountDescription(character).c_str()));
+			}
+		}
+		else
+			LOG("CustomerService", ("CharacterTransfer: character object was NULL so unable to check if bank is loaded"));
+
+	}
+
+	else if (m.isType("RequestLoadCTSBank"))
+	{
+		GenericValueTypeMessage<NetworkId> characterId(ri);
+		LOG("CustomerService", ("CharacterTransfer: ConnectionServerConnection received RequestLoadCTSBank for %s", characterId.getValue().getValueString().c_str()));
+	
+		CreatureObject * character = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(characterId.getValue()));
+		if(character)
+		{
+			ServerObject *bankContainer = character->getBankContainer();
+			if (bankContainer)
+			{
+				if (!bankContainer->areContentsLoaded())
+				{
+					LOG("CustomerService", ("CharacterTransfer: setting LoadCTSBank flag and request bank to be loaded for %s", PlayerObject::getAccountDescription(character).c_str()));
+					character->setLoadCTSBank(true);
+					bankContainer->loadAllContentsFromDB();
+				}
+				else
+				{
+					LOG("CustomerService", ("CharacterTransfer: bank contents already loaded for %s, sending ReplyBankCTSLoaded back to client", PlayerObject::getAccountDescription(character).c_str()));
+					//Bank contents are already loaded
+					GenericValueTypeMessage<NetworkId> reply("ReplyBankCTSLoaded", characterId.getValue());
+					send(reply, true);
+				}
+			}
+			else
+				LOG("CustomerService", ("CharacterTransfer: bank container object was NULL for getBankContainer call"));
+		}
+		else
+			LOG("CustomerService", ("CharacterTransfer: character object was NULL so unable to check if bank is loaded"));
+	}
+	else if (m.isType("RequestTransferData"))
+	{
+		GenericValueTypeMessage<TransferCharacterData> requestTransferData(ri);
+		const TransferCharacterData & transferCharacterData = requestTransferData.getValue();
+
+		CreatureObject * const character = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(requestTransferData.getValue().getCharacterId()));
+		PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(character);
+		time_t characterCreateTime = -1;
+		FreeCtsDataTable::FreeCtsInfo const * freeCtsInfo = NULL;
+		bool freeCtsBypassTimeRestriction = false;
+		if (character && playerObject)
+		{
+			characterCreateTime = static_cast<time_t>(NameManager::getInstance().getPlayerCreateTime(character->getNetworkId()));
+			
+			freeCtsInfo = FreeCtsDataTable::wouldCharacterTransferBeFree(characterCreateTime, static_cast<uint32>(transferCharacterData.getSourceStationId()), transferCharacterData.getSourceGalaxy(), static_cast<uint32>(transferCharacterData.getDestinationStationId()), transferCharacterData.getDestinationGalaxy(), false);
+
+			// see if we can/should bypass the free CTS time restriction
+			if (!freeCtsInfo && ConfigServerGame::getAllowIgnoreFreeCtsTimeRestriction() && (transferCharacterData.getTransferRequestSource() == TransferRequestMoveValidation::TRS_ingame_freects_command_transfer))
+			{
+				// if we got this far and the CTS request came from TRS_ingame_freects_command_transfer, then it
+				// should be allowed as a free CTS, so do another check bypassing the free CTS time restriction
+				// check to find any matching free CTS rule, even if the time restriction on the rule has expired
+				freeCtsInfo = FreeCtsDataTable::wouldCharacterTransferBeFree(characterCreateTime, static_cast<uint32>(transferCharacterData.getSourceStationId()), transferCharacterData.getSourceGalaxy(), static_cast<uint32>(transferCharacterData.getDestinationStationId()), transferCharacterData.getDestinationGalaxy(), true);
+				if (freeCtsInfo)
+				{
+					freeCtsBypassTimeRestriction = true;
+				}
+			}
+		}
+
+		LOG("CustomerService", ("CharacterTransfer: Received RequestTransferData for character [character create time (%s) free transfer (%s)] %s", ((characterCreateTime > 0) ? CalendarTime::convertEpochToTimeStringLocal(characterCreateTime).c_str() : "NA"), (freeCtsInfo ? (freeCtsBypassTimeRestriction ? "yes - bypass" : "yes") : "no "), transferCharacterData.toString().c_str()));
+
+		bool succeeded = false;
+		if(ServerWorld::getSceneId() != NewbieTutorial::getSceneId())
+		{
+			if(character)
+			{
+				// get hair
+				std::string hairObjectTemplateName;
+				std::string hairObjectAppearanceData;
+				SlottedContainer * const container = ContainerInterface::getSlottedContainer(*character);
+				if(container)
+				{
+					SlotId hairSlot = SlotIdManager::findSlotId(ConstCharCrcString("hair"));
+					if(hairSlot != SlotId::invalid)
+					{
+						Container::ContainerErrorCode containerErrorCode = Container::CEC_Success;
+						Container::ContainedItem hairItem = container->getObjectInSlot(hairSlot, containerErrorCode);
+						const TangibleObject * hairObject = dynamic_cast<const TangibleObject *>(hairItem.getObject());
+						if(hairObject)
+						{
+							hairObjectTemplateName = hairObject->getObjectTemplateName();
+							hairObjectAppearanceData = hairObject->getAppearanceData();
+						}
+					}
+				}
+				std::string professionName;
+				const CreatureObject::SkillList & skills = character->getSkillList();
+				if (!skills.empty())
+				{
+					for (CreatureObject::SkillList::const_iterator i = skills.begin(); i != skills.end(); ++i)
+					{
+						const SkillObject * profession = (*i)->findProfessionForSkill();
+						if (profession != NULL)
+							professionName = profession->getSkillName();
+					}
+				}
+				if (professionName.empty())
+				{
+					// just get the 1st profession available
+					PlayerCreationManager::StringVector professions;
+					PlayerCreationManager::getProfessionVector (professions, "");
+					if (! professions.empty())
+					{
+						professionName = professions[0];
+					}
+				}
+
+				if (playerObject)
+				{
+					// set objvar on the creature indicating that transfer will be free,
+					// so that script can include the information in the packed dictionary
+					// so that the information can be transferred to the destination galaxy
+					// indicating that it's a free transfer
+					character->removeObjVarItem("freeCtsTransactionRuleName");
+
+					if (freeCtsInfo)
+						IGNORE_RETURN(character->setObjVarItem("freeCtsTransactionRuleName", (freeCtsInfo->ruleName.empty() ? "freeCts" : freeCtsInfo->ruleName)));
+
+					std::vector<unsigned char> dictionaryData = character->uploadCharacterData(transferCharacterData.getWithItems(), transferCharacterData.getAllowOverride());
+
+					character->removeObjVarItem("freeCtsTransactionRuleName");
+
+					if(! dictionaryData.empty())
+					{
+						// send the response to the Connection server
+						TransferCharacterData replyData(transferCharacterData);
+						replyData.setCustomizationData(character->getAppearanceData());
+						replyData.setScriptDictionaryData(dictionaryData);
+						replyData.setObjectTemplateName(character->getObjectTemplateName());
+						replyData.setObjectTemplateCrc(character->getTemplateCrc());
+						replyData.setScaleFactor(character->getScaleFactor());
+						replyData.setHairTemplateName(hairObjectTemplateName);
+						replyData.setHairAppearanceData(hairObjectAppearanceData);
+						replyData.setProfession(professionName);
+						replyData.setSkillTemplate(playerObject->getSkillTemplate());
+						replyData.setWorkingSkill(playerObject->getWorkingSkill());
+					
+						GenericValueTypeMessage<TransferCharacterData> reply("ReplyTransferData", replyData);
+						send(reply, true);
+						succeeded = true;
+					}
+					else
+					{
+						LOG("CustomerService", ("CharacterTransfer: Transfer failed: Could not retrieve dictionary for character object (%s) for transfer request. %s", requestTransferData.getValue().getCharacterId().getValueString().c_str(), requestTransferData.getValue().toString().c_str()));
+					}
+				}
+				else
+				{
+					LOG("CustomerService", ("CharacterTransfer: Transfer failed: Could not load player object (%s) for transfer request. %s", requestTransferData.getValue().getCharacterId().getValueString().c_str(), requestTransferData.getValue().toString().c_str()));
+				}
+			}
+			else
+			{
+				LOG("CustomerService", ("CharacterTransfer: Transfer failed: Could not load character object (%s) for transfer request. %s", requestTransferData.getValue().getCharacterId().getValueString().c_str(), requestTransferData.getValue().toString().c_str()));
+			}
+		}
+		else
+		{
+			LOG("CustomerService", ("CharacterTransfer: Transfer failed: transfers from the Tutorial are not allowed. %s", transferCharacterData.toString().c_str()));
+		}
+		if(! succeeded)
+		{
+			GenericValueTypeMessage<TransferCharacterData> reply("ReplyTransferDataFail", requestTransferData.getValue());
+			send(reply, true);
+		}
+	}
+	else if (m.isType("ApplyTransferData"))
+	{
+		GenericValueTypeMessage<TransferCharacterData> applyTransferData(ri);
+		LOG("CustomerService", ("CharacterTransfer: Received ApplyTransferData for character %s", applyTransferData.getValue().toString().c_str()));
+		const TransferCharacterData & transferCharacterData = applyTransferData.getValue();
+
+		CreatureObject * character = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(transferCharacterData.getDestinationCharacterId()));
+		if(character)
+		{
+			if(character->receiveCharacterTransferMessage(transferCharacterData.getScriptDictionaryData()))
+			{
+				// force CTS failure if the source character has this objvar (which has now been
+				// transferred to the target character); this is for testing CTS failure handing
+				if (character->getObjVars().hasItem("testing_only_force_cts_failure_testing_only"))
+				{
+					GenericValueTypeMessage<TransferCharacterData> applyTransferDataFail("ApplyTransferDataFail", transferCharacterData);
+					send(applyTransferDataFail, true);
+					LOG("CustomerService", ("CharacterTransfer: *** ERROR: Character has testing_only_force_cts_failure_testing_only objvar, sending ApplyTransferDataFail to central %s", applyTransferData.getValue().toString().c_str()));
+				}
+				else
+				{
+					GenericValueTypeMessage<TransferCharacterData> applyTransferDataSuccess("ApplyTransferDataSuccess", transferCharacterData);
+					send(applyTransferDataSuccess, true);
+					LOG("CustomerService", ("CharacterTransfer: Sending ApplyTransferDataSuccess for character %s", applyTransferData.getValue().toString().c_str()));
+				}
+			}
+			else
+			{
+				GenericValueTypeMessage<TransferCharacterData> applyTransferDataFail("ApplyTransferDataFail", transferCharacterData);
+				send(applyTransferDataFail, true);
+				LOG("CustomerService", ("CharacterTransfer: *** ERROR: Sending ApplyTransferDataFail for character %s", applyTransferData.getValue().toString().c_str()));
+			}
+		}
+		else
+		{
+			GenericValueTypeMessage<TransferCharacterData> applyTransferDataFail("ApplyTransferDataFail", transferCharacterData);
+			send(applyTransferDataFail, true);
+			LOG("CustomerService", ("CharacterTransfer: *** ERROR: Could not find object for character, sending ApplyTransferDataFail to central %s", applyTransferData.getValue().toString().c_str()));
+		}
+	}
+	else if (m.isType("ChatEnterRoomValidationRequest"))
+	{
+		Archive::ReadIterator readIterator = message.begin();
+		GenericValueTypeMessage<std::pair<std::pair<NetworkId, std::string>, unsigned int> > const cervreq(readIterator);
+
+		unsigned int result = CHATRESULT_SUCCESS;
+
+		ServerObject const * const o = ServerWorld::findObjectByNetworkId(cervreq.getValue().first.first);
+		CreatureObject const * const co = (o ? o->asCreatureObject() : NULL);
+		if (co)
+		{
+			result = Chat::isAllowedToEnterRoom(*co, cervreq.getValue().first.second);
+		}
+		else
+		{
+			result = SWG_CHAT_ERR_INVALID_OBJECT;
+		}
+
+		GenericValueTypeMessage<std::pair<std::pair<NetworkId, unsigned int>, unsigned int> > const cervresp(
+			"ChatEnterRoomValidationResponse",
+			std::make_pair(
+			std::make_pair(cervreq.getValue().first.first, result),
+			cervreq.getValue().second));
+
+		send(cervresp, true);
+	}
+	else if (m.isType("ChatQueryRoomValidationRequest"))
+	{
+		Archive::ReadIterator readIterator = message.begin();
+		GenericValueTypeMessage<std::pair<std::pair<NetworkId, std::string>, unsigned int> > const cqrvreq(readIterator);
+
+		bool success = false;
+
+		ServerObject const * const o = ServerWorld::findObjectByNetworkId(cqrvreq.getValue().first.first);
+		CreatureObject const * const co = (o ? o->asCreatureObject() : NULL);
+		if (co)
+		{
+			success = (CHATRESULT_SUCCESS == Chat::isAllowedToEnterRoom(*co, cqrvreq.getValue().first.second));
+		}
+
+		GenericValueTypeMessage<std::pair<std::pair<NetworkId, bool>, unsigned int> > const cqrvresp(
+			"ChatQueryRoomValidationResponse",
+			std::make_pair(
+			std::make_pair(cqrvreq.getValue().first.first, success),
+			cqrvreq.getValue().second));
+
+		send(cqrvresp, true);
+	}
+	else if (m.isType("PlayerDroppedFromGameServerCrash"))
+	{
+		Archive::ReadIterator readIterator = message.begin();
+		GenericValueTypeMessage<std::set<NetworkId> > const m(readIterator);
+
+		std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData();
+		std::map<NetworkId, Unicode::String> const & connectedCharacterBiographyData = ServerUniverse::getConnectedCharacterBiographyData();
+
+		std::set<NetworkId>::const_iterator const end = m.getValue().end();
+		for (std::set<NetworkId>::const_iterator iter = m.getValue().begin(); iter != end; ++iter)
+		{
+			if (connectedCharacterLfgData.count(*iter) > 0)
+				ServerUniverse::removeConnectedCharacterData(*iter);
+
+			if (connectedCharacterBiographyData.count(*iter) > 0)
+				ServerUniverse::removeConnectedCharacterBiographyData(*iter);
+		}
+	}
+	else
+	{
+		ServerConnection::emitMessage(m);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ConnectionServerConnection::setSyncStamps(uint16 syncStampShort, uint32 syncStampLong)
+{
+	m_syncStampShort = syncStampShort;
+	m_syncStampLong = syncStampLong;
+}
+
+// ----------------------------------------------------------------------
+
+uint16 ConnectionServerConnection::getSyncStampShort() const
+{
+	return m_syncStampShort;
+}
+
+// ----------------------------------------------------------------------
+
+uint32 ConnectionServerConnection::getSyncStampLong() const
+{
+	return m_syncStampLong;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/network/ConnectionServerConnection.h b/engine/server/library/serverGame/src/shared/network/ConnectionServerConnection.h
new file mode 100644
index 00000000..a3565e67
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/network/ConnectionServerConnection.h
@@ -0,0 +1,35 @@
+// ConnectionServerConnection.h
+// copyright 2001 Verant Interactive
+
+#ifndef	_INCLUDED_ConnectionServerConnection_H
+#define	_INCLUDED_ConnectionServerConnection_H
+
+//-----------------------------------------------------------------------
+
+#include "serverUtility/ServerConnection.h"
+
+//-----------------------------------------------------------------------
+
+class ConnectionServerConnection : public ServerConnection
+{
+public:
+	ConnectionServerConnection(const std::string & remoteAddress, const unsigned short remotePort);
+	~ConnectionServerConnection();
+	void                          onConnectionClosed      ();
+	void                          onConnectionOpened      ();
+	void	                      onReceive               (const Archive::ByteStream & message);
+	void setSyncStamps(uint16 syncStampShort, uint32 syncStampLong);
+	uint16 getSyncStampShort() const;
+	uint32 getSyncStampLong() const;
+
+private:
+	ConnectionServerConnection & operator = (const ConnectionServerConnection & rhs);
+	ConnectionServerConnection(const ConnectionServerConnection & source);
+
+	uint16 m_syncStampShort;
+	uint32 m_syncStampLong;
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ConnectionServerConnection_H
diff --git a/engine/server/library/serverGame/src/shared/network/CustomerServiceServerConnection.cpp b/engine/server/library/serverGame/src/shared/network/CustomerServiceServerConnection.cpp
new file mode 100644
index 00000000..456ec031
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/network/CustomerServiceServerConnection.cpp
@@ -0,0 +1,103 @@
+// CustomerServiceServerConnection.cpp
+// Copyright 2004, Sony Online Entertainment Inc., all rights reserved. 
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CustomerServiceServerConnection.h"
+
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverUtility/ChatLogManager.h"
+#include "sharedLog/Log.h"
+#include "sharedNetwork/NetworkSetupData.h"
+#include "sharedNetworkMessages/ChatRequestLog.h"
+#include "sharedNetworkMessages/ChatOnRequestLog.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/Object.h"
+
+//----------------------------------------------------------------------
+CustomerServiceServerConnection::CustomerServiceServerConnection(const std::string & a, const unsigned short p)
+: ServerConnection(a, p, NetworkSetupData())
+{
+	LOG("CSServerConnection", ("Connection created...listening on (%s:%d)", a.c_str(), static_cast<int>(p)));
+}
+
+//-----------------------------------------------------------------------
+CustomerServiceServerConnection::~CustomerServiceServerConnection()
+{
+}
+
+//-----------------------------------------------------------------------
+void CustomerServiceServerConnection::onConnectionClosed()
+{
+	LOG("CustomerServiceServerConnection", ("onConnectionClosed()"));
+
+	GameServer::getInstance().clearCustomerServiceServerConnection();
+}
+
+//-----------------------------------------------------------------------
+void CustomerServiceServerConnection::onConnectionOpened()
+{
+	LOG("CustomerServiceServerConnection", ("onConnectionOpened()"));
+}
+
+//-----------------------------------------------------------------------
+void CustomerServiceServerConnection::onReceive(const Archive::ByteStream & message)
+{
+	Archive::ReadIterator ri = message.begin();
+	GameNetworkMessage gameNetworkMessage(ri);
+
+	//REPORT_LOG(true, ("GameServer: CustomerServiceServerConnection::onReceive() message(%s)\n", gameNetworkMessage.getCmdName().c_str()));
+
+	if (gameNetworkMessage.isType("ChatRequestLog"))
+	{
+		// See if this game server knows about this player
+
+		ri = message.begin();
+		ChatRequestLog chatRequestLog(ri);
+		Object * const reportingObject = NetworkIdManager::getObjectById(NetworkId(Unicode::wideToNarrow(chatRequestLog.getPlayer())));
+
+		if (   (reportingObject != NULL)
+		    && reportingObject->isAuthoritative())
+		{
+			PlayerObject const * const reportingPlayerObject = PlayerCreatureController::getPlayerObject(CreatureObject::asCreatureObject(reportingObject));
+			
+			if (reportingPlayerObject != NULL)
+			{
+				PlayerObject::ChatLog const &reportingPlayerChatLog = reportingPlayerObject->getChatLog();
+				PlayerObject::ChatLog::const_iterator iterReportingPlayerChatLog = reportingPlayerChatLog.begin();
+				std::vector<ChatLogEntry> resultChatLog;
+
+				for (; iterReportingPlayerChatLog != reportingPlayerChatLog.end(); ++iterReportingPlayerChatLog)
+				{
+					int const chatMessageIndex = iterReportingPlayerChatLog->m_index;
+					ChatLogEntry chatLogEntry;
+					
+					chatLogEntry.m_time = iterReportingPlayerChatLog->m_time;
+
+					if (!ChatLogManager::getChatMessage(chatMessageIndex, chatLogEntry.m_message))
+					{
+						DEBUG_WARNING(true, ("Unable to find chat log message(%i)\n", chatMessageIndex));
+					}
+					
+					resultChatLog.push_back(chatLogEntry);
+				}
+
+				LOG("CustomerServiceServerConnection", ("onReceive(ChatRequestLog) Sending logs to the customer service server."));
+
+				// Send the chat log to the customer service server
+				
+				ChatOnRequestLog chatOnRequestLog(chatRequestLog.getSequence(), resultChatLog);
+				
+				send(chatOnRequestLog, true);
+			}
+			else
+			{
+				LOG("CustomerServiceServerConnection", ("onReceive(ChatRequestLog) Unable to resolve networkId(%s) to a PlayerObject.", Unicode::wideToNarrow(chatRequestLog.getPlayer()).c_str()));
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/network/CustomerServiceServerConnection.h b/engine/server/library/serverGame/src/shared/network/CustomerServiceServerConnection.h
new file mode 100644
index 00000000..66c0691d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/network/CustomerServiceServerConnection.h
@@ -0,0 +1,33 @@
+// CustomerServiceServerConnection.h
+// Copyright 2004, Sony Online Entertainment Inc., all rights reserved. 
+
+#ifndef INCLUDED_CustomerServiceServerConnection_H
+#define INCLUDED_CustomerServiceServerConnection_H
+
+//-----------------------------------------------------------------------
+
+#include "serverUtility/ServerConnection.h"
+
+//-----------------------------------------------------------------------
+
+class CustomerServiceServerConnection : public ServerConnection
+{
+public:
+
+	CustomerServiceServerConnection(const std::string & remoteAddress, const unsigned short remotePort);
+	virtual ~CustomerServiceServerConnection();
+
+	void onConnectionClosed();
+	void onConnectionOpened();
+	void onReceive(const Archive::ByteStream & bs);
+	
+private:
+
+	CustomerServiceServerConnection();
+	CustomerServiceServerConnection & operator = (const CustomerServiceServerConnection & rhs);
+	CustomerServiceServerConnection(const CustomerServiceServerConnection & source);
+};
+
+//-----------------------------------------------------------------------
+
+#endif // INCLUDED_CustomerServiceServerConnection_H
diff --git a/engine/server/library/serverGame/src/shared/network/DatabaseProcessConnection.cpp b/engine/server/library/serverGame/src/shared/network/DatabaseProcessConnection.cpp
new file mode 100644
index 00000000..432f6841
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/network/DatabaseProcessConnection.cpp
@@ -0,0 +1,83 @@
+// ======================================================================
+//
+// DatabaseProcessConnection.cpp
+//
+// Copyright 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/DatabaseProcessConnection.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/GameServer.h"
+#include "serverNetworkMessages/GameGameServerMessages.h"
+#include "serverUtility/ConfigServerUtility.h"
+#include "sharedLog/Log.h"
+#include "sharedNetwork/NetworkSetupData.h"
+
+// ======================================================================
+
+DatabaseProcessConnection::DatabaseProcessConnection(std::string const &remoteAddress, unsigned short remotePort, uint32 pid) :
+	ServerConnection(remoteAddress, remotePort, NetworkSetupData()),
+	m_pid(pid)
+{
+}
+
+// ----------------------------------------------------------------------
+
+DatabaseProcessConnection::~DatabaseProcessConnection()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void DatabaseProcessConnection::onConnectionClosed()
+{
+	GameServer::getInstance().setDatabaseProcessConnection(0);
+	GameServer::getInstance().setDone("DatabaseProcessConnection closed: %s", getDisconnectReason().c_str());
+}
+
+// ----------------------------------------------------------------------
+
+void DatabaseProcessConnection::onConnectionOpened()
+{
+	ServerConnection::onConnectionOpened();
+
+	LOG("GameGameConnect", ("DatabaseProcessConnection::onConnectionOpened() of %lu,%lu (preload %d)", m_pid, ServerConnection::getProcessId(), ConfigServerGame::getPreloadNumber()));
+	GameGameServerConnect const connectMessage(GameServer::getInstance().getProcessId(), false, ConfigServerUtility::getSpawnCookie(), ConfigServerGame::getPreloadNumber());
+	send(connectMessage, true);
+}
+
+// ----------------------------------------------------------------------
+
+void DatabaseProcessConnection::onReceive(Archive::ByteStream const &message)
+{
+	ServerConnection::onReceive(message);
+	Archive::ReadIterator ri = message.begin();
+	GameNetworkMessage const msg(ri);
+	ri = message.begin();
+
+	if (msg.isType("GameGameServerConnect"))
+	{
+		GameGameServerConnect const connectMessage(ri);
+
+		FATAL(!connectMessage.getIsDbProcess(), ("Received GameGameServerConnect message from something other than the database process?"));
+
+		uint32 const pid = connectMessage.getProcessId();
+
+		LOG("GameGameConnect", ("Received GameGameServerConnect message.  Old pid %lu new pid %lu. My pid %lu for Database Process", m_pid, pid, GameServer::getInstance().getProcessId()));
+		m_pid = pid;
+		GameServer::getInstance().setDatabaseProcessConnection(this);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+uint32 DatabaseProcessConnection::getPid() const
+{
+	return m_pid;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/network/DatabaseProcessConnection.h b/engine/server/library/serverGame/src/shared/network/DatabaseProcessConnection.h
new file mode 100644
index 00000000..64326534
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/network/DatabaseProcessConnection.h
@@ -0,0 +1,40 @@
+// ======================================================================
+//
+// DatabaseProcessConnection.h
+//
+// Copyright 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_DatabaseProcessConnection_H
+#define INCLUDED_DatabaseProcessConnection_H
+
+// ======================================================================
+
+#include "serverUtility/ServerConnection.h"
+
+// ======================================================================
+
+class DatabaseProcessConnection: public ServerConnection
+{
+public:
+	DatabaseProcessConnection(std::string const &remoteAddress, unsigned short remotePort, uint32 pid);
+	~DatabaseProcessConnection();
+
+	void onConnectionClosed();
+	void onConnectionOpened();
+	void onReceive(Archive::ByteStream const &message);
+
+	uint32 getPid() const;
+
+private:
+	DatabaseProcessConnection(DatabaseProcessConnection const &);
+	DatabaseProcessConnection &operator=(DatabaseProcessConnection const &);
+
+	uint32 m_pid;
+};
+
+// ======================================================================
+
+#endif // INCLUDED_DatabaseProcessConnection_H
+
diff --git a/engine/server/library/serverGame/src/shared/network/GameServerMessageArchive.cpp b/engine/server/library/serverGame/src/shared/network/GameServerMessageArchive.cpp
new file mode 100644
index 00000000..bf76972f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/network/GameServerMessageArchive.cpp
@@ -0,0 +1,76 @@
+// ======================================================================
+//
+// GameServerMessageArchive.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/GameServerMessageArchive.h"
+
+#include "serverGame/AiMovementArchive.h"
+#include "serverGame/AiCreatureStateArchive.h"
+#include "sharedFoundation/ExitChain.h"
+
+
+//-----------------------------------------------------------------------
+
+GameServerMessageArchive::GameServerMessageArchive()
+{
+}
+
+//-----------------------------------------------------------------------
+
+GameServerMessageArchive::~GameServerMessageArchive()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void GameServerMessageArchive::install()
+{
+	if (getInstance() == NULL)
+	{
+		setInstance(new GameServerMessageArchive);
+		ExitChain::add(GameServerMessageArchive::remove, "GameServerMessageArchive::remove");
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void GameServerMessageArchive::remove()
+{
+	removeInstance();
+}
+
+//-----------------------------------------------------------------------
+
+void GameServerMessageArchive::pack(Archive::ByteStream & target, AiCreatureStateMessage const & msg)
+{
+	Archive::put(target, msg);
+}
+
+//-----------------------------------------------------------------------
+
+void GameServerMessageArchive::unpack(Archive::ReadIterator & source, AiCreatureStateMessage & msg)
+{
+	Archive::get(source, msg);
+}
+
+//-----------------------------------------------------------------------
+
+void GameServerMessageArchive::pack(Archive::ByteStream & target, AiMovementMessage const & msg)
+{
+	Archive::put(target, msg);
+}
+
+//-----------------------------------------------------------------------
+
+void GameServerMessageArchive::unpack(Archive::ReadIterator & source, AiMovementMessage & msg)
+{
+	Archive::get(source, msg);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/network/GameServerMessageArchive.h b/engine/server/library/serverGame/src/shared/network/GameServerMessageArchive.h
new file mode 100644
index 00000000..fff82614
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/network/GameServerMessageArchive.h
@@ -0,0 +1,41 @@
+// ======================================================================
+//
+// GameServerMessageArchive.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+//-----------------------------------------------------------------------
+
+#ifndef INCLUDED_GameServerMessageArchive_H
+#define INCLUDED_GameServerMessageArchive_H
+
+#include "serverNetworkMessages/GameServerMessageInterface.h"
+
+
+//-----------------------------------------------------------------------
+
+// This class is used as an interface to pack/unpack messages that rely on game 
+// server specific code, so the serverGame library doesn't have to be linked
+// with every server.
+class GameServerMessageArchive : public GameServerMessageInterface
+{
+public:
+
+	static void install();
+	static void remove();
+
+	virtual void pack(Archive::ByteStream & target, AiCreatureStateMessage const & msg);
+	virtual void unpack(Archive::ReadIterator & source, AiCreatureStateMessage & msg);
+
+	virtual void pack(Archive::ByteStream & target, AiMovementMessage const & msg);
+	virtual void unpack(Archive::ReadIterator & source, AiMovementMessage & msg);
+
+protected:
+	
+	         GameServerMessageArchive();
+	virtual ~GameServerMessageArchive();
+};
+
+
+#endif	// INCLUDED_GameServerMessageArchive_H
diff --git a/engine/server/library/serverGame/src/shared/network/PlanetServerConnection.cpp b/engine/server/library/serverGame/src/shared/network/PlanetServerConnection.cpp
new file mode 100644
index 00000000..a0acd55d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/network/PlanetServerConnection.cpp
@@ -0,0 +1,58 @@
+// ======================================================================
+//
+// PlanetServerConnection.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PlanetServerConnection.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/GameServer.h"
+#include "serverNetworkMessages/GameGameServerMessages.h" // we use the GameGameServerConnect message
+#include "serverUtility/ConfigServerUtility.h"
+#include "sharedLog/Log.h"
+#include "sharedNetwork/NetworkSetupData.h"
+
+// ======================================================================
+
+PlanetServerConnection::PlanetServerConnection(const std::string & a, const unsigned short p) :
+ServerConnection(a, p, NetworkSetupData())
+{
+}
+
+//-----------------------------------------------------------------------
+
+PlanetServerConnection::~PlanetServerConnection()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void PlanetServerConnection::onConnectionClosed()
+{
+	ServerConnection::onConnectionClosed();
+
+	DEBUG_REPORT_LOG(true, ("Planet server closed connection.  GameServer will exit.\n"));
+	static MessageConnectionCallback m("PlanetConnectionClosed");
+	emitMessage(m);
+}
+
+//-----------------------------------------------------------------------
+
+void PlanetServerConnection::onConnectionOpened()
+{
+	ServerConnection::onConnectionOpened();
+
+	static MessageConnectionCallback m("PlanetConnectionOpened");
+	emitMessage(m);
+
+	// send process id
+	GameGameServerConnect c(GameServer::getInstance().getProcessId(), false, ConfigServerUtility::getSpawnCookie(), ConfigServerGame::getPreloadNumber());
+	send(c, true);
+
+	LOG("PlanetServerConnections",("Game Server %lu (preload %d) connected to planet server and sent GameGameServerConnect", GameServer::getInstance().getProcessId(), ConfigServerGame::getPreloadNumber()));
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/network/PlanetServerConnection.h b/engine/server/library/serverGame/src/shared/network/PlanetServerConnection.h
new file mode 100644
index 00000000..6f0c8aa7
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/network/PlanetServerConnection.h
@@ -0,0 +1,32 @@
+// ======================================================================
+//
+// PlanetServerConnection.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_PlanetServerConnection_H
+#define INCLUDED_PlanetServerConnection_H
+
+// ======================================================================
+
+#include "serverUtility/ServerConnection.h"
+
+// ======================================================================
+
+class PlanetServerConnection : public ServerConnection
+{
+public:
+	PlanetServerConnection(const std::string & remoteAddress, const unsigned short remotePort);
+	~PlanetServerConnection();
+	void                          onConnectionClosed      ();
+	void                          onConnectionOpened      ();
+
+private:
+	PlanetServerConnection (const PlanetServerConnection&);
+	PlanetServerConnection& operator= (const PlanetServerConnection&);
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/network/TaskManagerConnection.cpp b/engine/server/library/serverGame/src/shared/network/TaskManagerConnection.cpp
new file mode 100644
index 00000000..e26ee1f6
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/network/TaskManagerConnection.cpp
@@ -0,0 +1,69 @@
+// TaskManagerConnection.cpp
+// copyright 2000 Verant Interactive
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/TaskManagerConnection.h"
+#include "serverNetworkMessages/TaskConnectionIdMessage.h"
+#include "sharedFoundation/ConfigFile.h"
+#include "sharedNetwork/NetworkSetupData.h"
+
+//-----------------------------------------------------------------------
+
+TaskManagerConnection::TaskManagerConnection(const std::string & a, const unsigned short p) :
+ServerConnection(a, p, NetworkSetupData())
+{
+}
+
+//-----------------------------------------------------------------------
+
+TaskManagerConnection::~TaskManagerConnection()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void TaskManagerConnection::onConnectionClosed() 
+{
+	ServerConnection::onConnectionClosed();
+	static MessageConnectionCallback m("TaskConnectionClosed");
+	emitMessage(m);
+}
+
+//-----------------------------------------------------------------------
+
+void TaskManagerConnection::onConnectionOpened()
+{
+	ServerConnection::onConnectionOpened();
+	static MessageConnectionCallback m("TaskConnectionOpened");
+	emitMessage(m);
+
+	// get cluster name
+	std::string clusterName;
+	ConfigFile::Section const * const sec = ConfigFile::getSection("TaskManager");
+	if (sec)
+	{
+		ConfigFile::Key const * const ky = sec->findKey("clusterName");
+		if (ky)
+		{
+			clusterName = ky->getAsString(ky->getCount()-1, "");
+		}
+	}
+
+	TaskConnectionIdMessage id(TaskConnectionIdMessage::Game, "", clusterName);
+	send(id, true);
+}
+
+//-----------------------------------------------------------------------
+
+void TaskManagerConnection::onReceive(const Archive::ByteStream & message)
+{
+	ServerConnection::onReceive(message);
+
+	// special TaskManagerConnection-specific handler here
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/network/TaskManagerConnection.h b/engine/server/library/serverGame/src/shared/network/TaskManagerConnection.h
new file mode 100644
index 00000000..7544693e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/network/TaskManagerConnection.h
@@ -0,0 +1,30 @@
+// TaskManagerConnection.h
+// copyright 2000 Verant Interactive
+// Author: Justin Randall
+
+#ifndef _TaskManagerConnection_H
+#define	_TaskManagerConnection_H
+
+//-----------------------------------------------------------------------
+
+#include "serverUtility/ServerConnection.h"
+
+//-----------------------------------------------------------------------
+
+class TaskManagerConnection : public ServerConnection
+{
+public:
+	TaskManagerConnection(const std::string & remoteAddress, const unsigned short remotePort);
+	~TaskManagerConnection();
+	void                          onConnectionClosed      ();
+	void                          onConnectionOpened      ();
+	void	                      onReceive               (const Archive::ByteStream & message);
+
+private:
+	TaskManagerConnection(TaskManagerConnection&);
+	TaskManagerConnection& operator=(TaskManagerConnection&);
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _TaskManagerConnection_H
diff --git a/engine/server/library/serverGame/src/shared/object/AiServerShipObjectInterface.cpp b/engine/server/library/serverGame/src/shared/object/AiServerShipObjectInterface.cpp
new file mode 100644
index 00000000..5dc202dd
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/AiServerShipObjectInterface.cpp
@@ -0,0 +1,174 @@
+// ======================================================================
+//
+// AiServerShipObjectInterface.cpp
+//
+// copyright 2004, sony online entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiServerShipObjectInterface.h"
+
+#include "serverGame/AiShipPilotData.h"
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/ConfigFile.h"
+
+// ======================================================================
+//
+// AiServerShipObjectInterfaceNamespace
+//
+// ======================================================================
+
+namespace AiServerShipObjectInterfaceNamespace
+{
+	bool s_fastAxis = true;
+}
+
+using namespace AiServerShipObjectInterfaceNamespace;
+
+// ======================================================================
+//
+// AiServerShipObjectInterface
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+
+void AiServerShipObjectInterface::install()
+{
+	setFastAxisEnabled(ConfigFile::getKeyBool("GameServer", "spaceAiFastAxisEnabled", true));
+}
+
+// ----------------------------------------------------------------------
+
+AiServerShipObjectInterface::AiServerShipObjectInterface(ShipObject const * const shipObject, AiShipPilotData const & aiShipPilotData, bool const modifySpeed)
+ : ServerShipObjectInterface(shipObject)
+ , m_modifySpeed(modifySpeed)
+ , m_aiShipPilotData(aiShipPilotData)
+{
+}
+
+// ----------------------------------------------------------------------
+
+float AiServerShipObjectInterface::getMaximumSpeed() const
+{
+	float const maximumSpeed = ServerShipObjectInterface::getMaximumSpeed();
+
+	if (!m_modifySpeed)
+	{
+		return (maximumSpeed * m_aiShipPilotData.m_nonCombatMaxSpeedPercent);
+	}
+
+	return maximumSpeed;
+}
+
+// ----------------------------------------------------------------------
+
+float AiServerShipObjectInterface::getSpeedAcceleration() const
+{
+	float const speedAcceleration = ServerShipObjectInterface::getSpeedAcceleration();
+
+	if (!m_modifySpeed)
+	{
+		float const maximumSpeed = getMaximumSpeed();
+
+		return std::max(speedAcceleration, maximumSpeed * 2.0f);
+	}
+
+	return speedAcceleration;
+}
+
+// ----------------------------------------------------------------------
+
+float AiServerShipObjectInterface::getSpeedDeceleration() const
+{
+	float const speedDeceleration = ServerShipObjectInterface::getSpeedDeceleration();
+
+	if (!m_modifySpeed)
+	{
+		float const maximumSpeed = getMaximumSpeed();
+
+		return std::max(speedDeceleration, maximumSpeed * 2.0f);
+	}
+
+	return speedDeceleration;
+}
+
+// ----------------------------------------------------------------------
+
+float AiServerShipObjectInterface::getSlideDampener() const
+{
+	float const slideDampener = ServerShipObjectInterface::getSlideDampener();
+
+	return slideDampener;
+}
+
+// ----------------------------------------------------------------------
+
+float AiServerShipObjectInterface::getMaximumYaw() const
+{
+	float const maximumYaw = ServerShipObjectInterface::getMaximumYaw();
+
+	return maximumYaw;
+}
+
+// ----------------------------------------------------------------------
+
+float AiServerShipObjectInterface::getYawAcceleration() const
+{
+	float const yawAcceleration = ServerShipObjectInterface::getYawAcceleration();
+
+	return yawAcceleration;
+}
+
+// ----------------------------------------------------------------------
+
+float AiServerShipObjectInterface::getMaximumPitch() const
+{
+	float const maximumPitch = ServerShipObjectInterface::getMaximumPitch();
+
+	return maximumPitch;
+}
+
+// ----------------------------------------------------------------------
+
+float AiServerShipObjectInterface::getPitchAcceleration() const
+{
+	float const pitchAcceleration = ServerShipObjectInterface::getPitchAcceleration();
+
+	return pitchAcceleration;
+}
+
+// ----------------------------------------------------------------------
+
+float AiServerShipObjectInterface::getMaximumRoll() const
+{
+	float const maximumRoll = ServerShipObjectInterface::getMaximumRoll();
+
+	return maximumRoll;
+}
+
+// ----------------------------------------------------------------------
+
+float AiServerShipObjectInterface::getRollAcceleration() const
+{
+	float const rollAcceleration = ServerShipObjectInterface::getRollAcceleration();
+
+	return rollAcceleration;
+}
+
+// ----------------------------------------------------------------------
+
+void AiServerShipObjectInterface::setFastAxisEnabled(bool const enabled)
+{
+	s_fastAxis = enabled;
+}
+
+// ----------------------------------------------------------------------
+
+bool AiServerShipObjectInterface::isFastAxisEnabled()
+{
+	return s_fastAxis;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/AiServerShipObjectInterface.h b/engine/server/library/serverGame/src/shared/object/AiServerShipObjectInterface.h
new file mode 100644
index 00000000..5edc80fb
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/AiServerShipObjectInterface.h
@@ -0,0 +1,56 @@
+// ======================================================================
+//
+// AiServerShipObjectInterface.h
+//
+// copyright 2004, sony online entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AiServerShipObjectInterface_H
+#define INCLUDED_AiServerShipObjectInterface_H
+
+// ======================================================================
+
+#include "serverGame/ServerShipObjectInterface.h"
+
+struct AiShipPilotData;
+class ShipObject;
+
+// ======================================================================
+
+class AiServerShipObjectInterface : public ServerShipObjectInterface
+{
+public:
+
+	static void install();
+	static void setFastAxisEnabled(bool const enabled);
+	static bool isFastAxisEnabled();
+
+public:
+
+	AiServerShipObjectInterface(ShipObject const * shipObject, AiShipPilotData const & aiShipPilotData, bool const modifySpeed);
+
+	virtual float getMaximumSpeed() const;
+	virtual float getSpeedAcceleration() const;
+	virtual float getSpeedDeceleration() const;
+	virtual float getSlideDampener() const;
+	virtual float getMaximumYaw() const;
+	virtual float getYawAcceleration() const;
+	virtual float getMaximumPitch() const;
+	virtual float getPitchAcceleration() const;
+	virtual float getMaximumRoll() const;
+	virtual float getRollAcceleration() const;
+
+private:
+
+	bool const m_modifySpeed;
+	AiShipPilotData const & m_aiShipPilotData;
+
+	AiServerShipObjectInterface();
+	AiServerShipObjectInterface(AiServerShipObjectInterface const &);
+	AiServerShipObjectInterface & operator=(AiServerShipObjectInterface const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_AiServerShipObjectInterface_H
diff --git a/engine/server/library/serverGame/src/shared/object/BaselineDistributionListPool.cpp b/engine/server/library/serverGame/src/shared/object/BaselineDistributionListPool.cpp
new file mode 100644
index 00000000..f3daba5f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/BaselineDistributionListPool.cpp
@@ -0,0 +1,37 @@
+// ======================================================================
+//
+// BaselineDistributionListPool.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/BaselineDistributionListPool.h"
+#include "serverGame/Client.h"
+
+// ======================================================================
+
+static std::map<ServerObject const *, std::vector<Watcher<Client> > > s_pools;
+
+// ======================================================================
+
+std::vector<Watcher<Client> > *BaselineDistributionListPool::get(ServerObject const &obj, bool allocIfNeeded) // static
+{
+	if (allocIfNeeded)
+		return &(s_pools[&obj]);
+	std::map<ServerObject const *, std::vector<Watcher<Client> > >::iterator i = s_pools.find(&obj);
+	if (i != s_pools.end())
+		return &((*i).second);
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+void BaselineDistributionListPool::free(ServerObject const &obj) // static
+{
+	s_pools.erase(&obj);
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/BaselineDistributionListPool.h b/engine/server/library/serverGame/src/shared/object/BaselineDistributionListPool.h
new file mode 100644
index 00000000..5a498e0c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/BaselineDistributionListPool.h
@@ -0,0 +1,30 @@
+// ======================================================================
+//
+// BaselineDistributionListPool.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _BaselineDistributionListPool_H_
+#define _BaselineDistributionListPool_H_
+
+// ======================================================================
+
+template <typename T> class Watcher;
+class ServerObject;
+class Client;
+
+// ======================================================================
+
+class BaselineDistributionListPool
+{
+public:
+	static stdvector<Watcher<Client> >::fwd *get(ServerObject const &obj, bool allocIfNeeded);
+	static void free(ServerObject const &obj);
+};
+
+// ======================================================================
+
+#endif // _BaselineDistributionListPool_H_
+
diff --git a/engine/server/library/serverGame/src/shared/object/BattlefieldMarkerObject.cpp b/engine/server/library/serverGame/src/shared/object/BattlefieldMarkerObject.cpp
new file mode 100644
index 00000000..03a63c7c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/BattlefieldMarkerObject.cpp
@@ -0,0 +1,197 @@
+// ======================================================================
+//
+// BattlefieldMarkerObject.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/BattlefieldMarkerObject.h"
+
+#include "serverGame/BattlefieldMarkerController.h"
+#include "serverGame/Pvp.h"
+#include "serverGame/RegionMaster.h"
+#include "serverGame/ServerBattlefieldMarkerObjectTemplate.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedObject/NetworkIdManager.h"
+
+// ======================================================================
+
+static std::map<std::string, BattlefieldMarkerObject *> s_markerMap;
+
+// ======================================================================
+
+static void removeFromMarkerMap(std::string const &regionName, BattlefieldMarkerObject *marker)
+{
+	if (regionName.length())
+	{
+		std::map<std::string, BattlefieldMarkerObject*>::iterator i = s_markerMap.find(regionName);
+		if (i != s_markerMap.end() && (*i).second == marker)
+		{
+			s_markerMap.erase(i);
+			RegionMaster::registerBattlefieldMarker(regionName, 0);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static bool addToMarkerMap(std::string const &regionName, BattlefieldMarkerObject *marker)
+{
+	if (regionName.length())
+	{
+		std::map<std::string, BattlefieldMarkerObject*>::iterator i = s_markerMap.find(regionName);
+		if (i != s_markerMap.end())
+			return false;
+		s_markerMap[regionName] = marker;
+		RegionMaster::registerBattlefieldMarker(regionName, marker);
+	}
+	return true;
+}
+
+// ======================================================================
+
+BattlefieldMarkerObject::BattlefieldMarkerObject(ServerBattlefieldMarkerObjectTemplate const *newTemplate) :
+	TangibleObject(newTemplate),
+	m_regionName(),
+	m_battlefieldParticipants()
+{
+	addMembersToPackages();
+
+	m_regionName.setSourceObject(this);
+	m_battlefieldParticipants.setOnSet(this, &BattlefieldMarkerObject::onParticipantSet);
+	m_battlefieldParticipants.setOnInsert(this, &BattlefieldMarkerObject::onParticipantInsert);
+	m_battlefieldParticipants.setOnErase(this, &BattlefieldMarkerObject::onParticipantErase);
+}
+
+// ----------------------------------------------------------------------
+
+BattlefieldMarkerObject::~BattlefieldMarkerObject()
+{
+	removeFromMarkerMap(m_regionName.get(), this);
+}
+
+// ----------------------------------------------------------------------
+
+void BattlefieldMarkerObject::onLoadedFromDatabase()
+{
+	setPlacing(true);
+	TangibleObject::onLoadedFromDatabase();
+}
+
+// ----------------------------------------------------------------------
+
+void BattlefieldMarkerObject::onRegionNameChanged(std::string const &oldName, std::string const &newName)
+{
+	removeFromMarkerMap(oldName, this);
+	if (!addToMarkerMap(newName, this))
+	{
+		WARNING(true, ("Tried to create a duplicate battlefield marker %s, destroying it.", newName.c_str()));
+		permanentlyDestroy(DeleteReasons::SetupFailed);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+Controller *BattlefieldMarkerObject::createDefaultController()
+{
+	Controller * _controller = new BattlefieldMarkerController(this);
+	NOT_NULL(_controller);
+
+	setController(_controller);
+	return _controller;
+}
+
+// ----------------------------------------------------------------------
+
+void BattlefieldMarkerObject::setRegionName(std::string const &newName)
+{
+	m_regionName.set(newName);
+}
+
+// ----------------------------------------------------------------------
+
+std::string const &BattlefieldMarkerObject::getRegionName() const
+{
+	return m_regionName.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::map<NetworkId, uint32> const &BattlefieldMarkerObject::getBattlefieldParticipants() const
+{
+	return m_battlefieldParticipants.getMap();
+}
+
+// ----------------------------------------------------------------------
+
+uint32 BattlefieldMarkerObject::getBattlefieldFactionId(NetworkId const &who) const
+{
+	std::map<NetworkId, uint32>::const_iterator i = m_battlefieldParticipants.find(who);
+	if (i != m_battlefieldParticipants.end())
+		return (*i).second;
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+void BattlefieldMarkerObject::setBattlefieldParticipant(NetworkId const &who, uint32 factionId)
+{
+	if (!isAuthoritative())
+		sendControllerMessageToAuthServer(CM_setBattlefieldParticipant, new MessageQueueGenericValueType<std::pair<NetworkId, uint32> >(std::make_pair(who, factionId)));
+	else if (factionId)
+		m_battlefieldParticipants.set(who, factionId);
+	else
+		m_battlefieldParticipants.erase(who);
+}
+
+// ----------------------------------------------------------------------
+
+void BattlefieldMarkerObject::clearBattlefieldParticipants()
+{
+	if (!isAuthoritative())
+		sendControllerMessageToAuthServer(CM_clearBattlefieldParticipants, 0);
+	else
+		m_battlefieldParticipants.clear();
+}
+
+// ----------------------------------------------------------------------
+
+void BattlefieldMarkerObject::onParticipantSet(NetworkId const &who, uint32 const &, uint32 const &)
+{
+	TangibleObject *tangible = dynamic_cast<TangibleObject *>(NetworkIdManager::getObjectById(who));
+	if (tangible)
+		Pvp::forceStatusUpdate(*tangible);
+}
+
+// ----------------------------------------------------------------------
+
+void BattlefieldMarkerObject::onParticipantInsert(NetworkId const &who, uint32 const &)
+{
+	TangibleObject *tangible = dynamic_cast<TangibleObject *>(NetworkIdManager::getObjectById(who));
+	if (tangible)
+		Pvp::forceStatusUpdate(*tangible);
+}
+
+// ----------------------------------------------------------------------
+
+void BattlefieldMarkerObject::onParticipantErase(NetworkId const &who, uint32 const &)
+{
+	TangibleObject *tangible = dynamic_cast<TangibleObject *>(NetworkIdManager::getObjectById(who));
+	if (tangible)
+		Pvp::forceStatusUpdate(*tangible);
+}
+
+// ----------------------------------------------------------------------
+
+BattlefieldMarkerObject *BattlefieldMarkerObject::findMarkerByRegionName(std::string const &regionName) // static
+{
+	std::map<std::string, BattlefieldMarkerObject *>::iterator i = s_markerMap.find(regionName);
+	if (i != s_markerMap.end())
+		return (*i).second;
+	return 0;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/BattlefieldMarkerObject.h b/engine/server/library/serverGame/src/shared/object/BattlefieldMarkerObject.h
new file mode 100644
index 00000000..286aa62b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/BattlefieldMarkerObject.h
@@ -0,0 +1,78 @@
+// ======================================================================
+//
+// BattlefieldMarkerObject.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _INCLUDED_BattlefieldMarkerObject_H
+#define _INCLUDED_BattlefieldMarkerObject_H
+
+// ======================================================================
+
+#include "serverGame/TangibleObject.h"
+#include "Archive/AutoDeltaMap.h"
+
+// ======================================================================
+
+class ServerBattlefieldMarkerObjectTemplate;
+
+// ======================================================================
+
+class BattlefieldMarkerObject: public TangibleObject
+{
+	friend class BattlefieldMarkerController;
+	
+public:
+	BattlefieldMarkerObject(ServerBattlefieldMarkerObjectTemplate const *newTemplate);
+	virtual ~BattlefieldMarkerObject();
+
+	static BattlefieldMarkerObject *findMarkerByRegionName(std::string const &regionName);
+
+	virtual Controller *createDefaultController();
+
+	void setRegionName(std::string const &newName);
+	std::string const &getRegionName() const;
+	uint32 getBattlefieldFactionId(NetworkId const &who) const;
+	void setBattlefieldParticipant(NetworkId const &who, uint32 factionId);
+	void clearBattlefieldParticipants();
+	std::map<NetworkId, uint32> const &getBattlefieldParticipants() const;
+
+	void onParticipantSet(NetworkId const &who, uint32 const &, uint32 const &);
+	void onParticipantInsert(NetworkId const &who, uint32 const &);
+	void onParticipantErase(NetworkId const &who, uint32 const &);
+	void onRegionNameChanged(std::string const &oldName, std::string const &newName);
+
+protected:
+	virtual void onLoadedFromDatabase();
+
+private:
+	BattlefieldMarkerObject();
+	BattlefieldMarkerObject(BattlefieldMarkerObject const &);
+	BattlefieldMarkerObject &operator=(BattlefieldMarkerObject const &);
+
+	void addMembersToPackages();
+
+private:
+	struct RegionNameCallback
+	{
+		void modified(BattlefieldMarkerObject &target, std::string const &oldValue, std::string const &newValue, bool) const;
+	};
+//BPM BattlefieldMarkerObject : TangibleObject // Begin persisted members.
+	Archive::AutoDeltaVariableCallback<std::string, RegionNameCallback, BattlefieldMarkerObject> m_regionName;
+	Archive::AutoDeltaMap<NetworkId, uint32, BattlefieldMarkerObject> m_battlefieldParticipants;
+//EPM
+};
+
+// ======================================================================
+
+inline void BattlefieldMarkerObject::RegionNameCallback::modified(BattlefieldMarkerObject &target, std::string const &oldValue, std::string const &newValue, bool) const
+{
+	target.onRegionNameChanged(oldValue, newValue);
+}
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/object/BuildingObject.cpp b/engine/server/library/serverGame/src/shared/object/BuildingObject.cpp
new file mode 100644
index 00000000..7a6f9428
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/BuildingObject.cpp
@@ -0,0 +1,1025 @@
+// ======================================================================
+//
+// BuildingObject.cpp
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/BuildingObject.h"
+
+#include "serverGame/BuildingController.h"
+#include "serverGame/CellObject.h"
+#include "serverGame/CityInterface.h"
+#include "serverGame/Client.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/NewbieTutorial.h"
+#include "serverGame/ObjectTracker.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/PortalTriggerVolume.h"
+#include "serverGame/PositionUpdateTracker.h"
+#include "serverGame/Pvp.h"
+#include "serverGame/ServerBuildingObjectTemplate.h"
+#include "serverGame/ServerCreatureObjectTemplate.h"
+#include "serverGame/ServerTangibleObjectTemplate.h"
+#include "serverGame/ServerWorld.h"
+#include "serverNetworkMessages/MessageToPayload.h"
+#include "serverPathfinding/ServerPathfindingNotification.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedGame/SharedBuildingObjectTemplate.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedObject/AlterResult.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/Container.h"
+#include "sharedObject/LayerProperty.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/Portal.h"
+#include "sharedObject/PortalProperty.h"
+#include "sharedObject/PortalPropertyTemplate.h"
+#include "sharedObject/VolumeContainer.h"
+#include "sharedTerrain/TerrainModificationHelper.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+
+
+#include <algorithm>
+#include <set>
+
+// ======================================================================
+
+const std::string CLONE_RESPAWN_TABLE("datatables/structure/municipal/cloning_facility_respawn.iff");
+
+namespace BuildingObjectNamespace
+{
+	BuildingObject::AllBuildingsSet g_buildingList;
+
+	bool hasPlayer(const BuildingObject& building)
+	{
+		const Container * container = ContainerInterface::getContainer(building);
+		if (container)
+		{
+			for (ContainerConstIterator i = container->begin(); i != container->end(); ++i)
+			{
+				const ServerObject *  cell = safe_cast<ServerObject *>((*i).getObject());
+				DEBUG_FATAL(!cell, ("Null cell in building list"));
+				if (cell)
+				{
+					const Container * cellContainer = ContainerInterface::getContainer(*cell);
+					if (cellContainer)
+					{
+						for (ContainerConstIterator j = cellContainer->begin(); j != cellContainer->end(); ++j)
+						{
+							const ServerObject * obj = safe_cast<ServerObject *>((*j).getObject());
+							if (obj && obj->isPlayerControlled())
+							{
+								return true;
+							}
+						}
+					}
+				}
+			}
+		}
+		return false;
+	}
+
+	void unloadCellsContents(BuildingObject& building)
+	{
+		Container *container = ContainerInterface::getContainer(building);
+		if (container)
+		{
+			for (ContainerIterator i = container->begin(); i != container->end(); ++i)
+			{
+				ServerObject * cell = safe_cast<ServerObject *>((*i).getObject());
+				DEBUG_FATAL(!cell, ("Null cell in building list"));
+				if (cell)
+				{
+					cell->unloadPersistedContents();
+				}
+			}
+		}
+	}
+
+	void updateLoadWithToCell(const ServerObject& cell, ServerObject& obj)
+	{
+		if (!obj.isPlayerControlled())
+		{
+			obj.setLoadWith(cell.getNetworkId());
+			PositionUpdateTracker::positionChanged(obj);
+			if (obj.getLoadContents())
+			{
+				Container * objContainer = ContainerInterface::getContainer(obj);
+				if (objContainer)
+				{
+					for (ContainerIterator i = objContainer->begin(); i != objContainer->end(); ++i)
+					{
+						ServerObject* childObject = safe_cast<ServerObject*>((*i).getObject());
+						if (childObject)
+						{
+							updateLoadWithToCell(cell, *childObject);
+						}
+					}
+				}
+			}
+		}
+	}
+
+}
+
+using namespace BuildingObjectNamespace;
+
+
+// ======================================================================
+
+const SharedObjectTemplate * BuildingObject::m_defaultSharedTemplate = NULL;
+
+
+// ======================================================================
+
+BuildingObject::BuildingObject(const ServerBuildingObjectTemplate* newTemplate) :
+	TangibleObject(newTemplate),
+	m_maintenanceCost(newTemplate->getMaintenanceCost()),
+	m_timeLastChecked(0.f),
+	m_cityId(0),
+	m_isPublic(newTemplate->getIsPublic()),
+	m_allowed(),
+	m_banned(),
+	m_contentsLoaded(false),
+	m_checkCreatePortalVolume(true),
+	m_unloadTime(0)
+{
+	m_isPublic.setSourceObject(this);
+	m_allowed.setSourceObject(this);
+	m_banned.setSourceObject(this);
+	addMembersToPackages();
+
+	//@todo -- HACK! this is supposed to be set by the database,
+	// but that code isn't written. Assume all buildings and cells
+	// are in the client cache file. //-- it is now [8/4/2002 4:20:48 PM],
+	// this should be implemented in a few days. If you see this comment
+	// and the code below calls setCacheVersion(1), get with Chris
+	// and Calan to determine the status of this code.
+	//setCacheVersion(1);
+
+	// All buildings get server pathfinding notifications
+
+	addNotification( ServerPathfindingNotification::getInstance() );
+
+	//-- create test layer (this should load from the template's layer filename)
+	const SharedBuildingObjectTemplate* const sharedObjectTemplate = safe_cast<const SharedBuildingObjectTemplate*> (getSharedTemplate ());
+	if (sharedObjectTemplate->getTerrainModificationFileName ().length () != 0)
+	{
+		TerrainGenerator::Layer * layer = TerrainModificationHelper::importLayer (sharedObjectTemplate->getTerrainModificationFileName ().c_str ());
+		WARNING (!layer, ("Layer %s not found", sharedObjectTemplate->getTerrainModificationFileName ().c_str ()));
+
+		if (layer)
+		{
+			setLayer(layer);
+		}
+	}
+
+	IGNORE_RETURN(g_buildingList.insert(this));
+
+	ObjectTracker::addBuilding();
+}
+
+// ----------------------------------------------------------------------
+
+BuildingObject::~BuildingObject()
+{
+	if (isInWorld())
+		removeFromWorld();
+
+	IGNORE_RETURN(g_buildingList.erase(this));
+
+	ObjectTracker::removeBuilding();
+}
+
+// ----------------------------------------------------------------------
+
+float BuildingObject::alter(float time)
+{
+	if (m_checkCreatePortalVolume)
+	{
+
+		bool playerPlaced = isPlayerPlaced();
+	
+		// Trigger volumes are centered on the object, which may be unrelated to the extents of the object, but
+		// we need the portal trigger volume to encompass the extents of the object.
+		if (!playerPlaced)
+		{
+			Sphere const &extent = getSphereExtent();
+			float radius = extent.getRadius()
+				+ getTransform_o2w().getPosition_p().magnitudeBetween(extent.getCenter())
+				+ 5.0f;
+			if (radius > 0 && !isSpaceDungeon() && ServerWorld::getSceneId() != NewbieTutorial::getSceneId())
+			{
+				TriggerVolume* t = new PortalTriggerVolume(*this, radius);
+				addTriggerVolume(t);
+			}
+
+		}
+		m_checkCreatePortalVolume = false;
+	}
+
+	const unsigned long gameTime = ServerClock::getInstance().getGameTimeSeconds();
+	if ((m_unloadTime > 0) && (gameTime >= m_unloadTime))
+	{
+		if ( hasPlayer (*this) )
+		{
+			m_unloadTime = gameTime + static_cast<unsigned long>(ConfigServerGame::getUnloadHouseContentsTime());
+		}
+		else
+		{
+			m_unloadTime = 0;
+
+			// safety check to make absolutely sure we don't unload a building which shouldn't be unloaded
+			if (isPlayerPlaced() && ConfigServerGame::getDemandLoadHouseContents() && isAuthoritative())
+			{
+				unloadCellsContents( *this );
+				m_contentsLoaded = false;
+			}
+		}
+	}
+	
+	float result =  TangibleObject::alter(time);
+	AlterResult::incorporateAlterResult(result, ((m_unloadTime > gameTime) ? static_cast<float>(m_unloadTime - gameTime) : result));
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Initializes a newly created object.
+ */
+void BuildingObject::initializeFirstTimeObject()
+{
+	TangibleObject::initializeFirstTimeObject();
+}
+
+//------------------------------------------------------------------------------------------
+
+void BuildingObject::endBaselines()
+{
+	TangibleObject::endBaselines();
+}
+
+//-----------------------------------------------------------------------
+
+void BuildingObject::onLoadedFromDatabase()
+{
+	TangibleObject::onLoadedFromDatabase();
+
+	// We need to run through the set of banned and allowed players
+	// and make sure the data is "good".
+	// - At one time players were stored by name instead of by network ID
+
+	ObservedPermissionObjectSet* permissionSets[] = { &m_allowed, &m_banned };
+	for ( unsigned int i = 0; i < sizeof( permissionSets ) / sizeof( permissionSets[0] ); ++i )
+	{
+		const CellPermissions::PermissionList& permList = permissionSets[i]->get();
+
+		// Temporary list for processing
+		CellPermissions::PermissionList tempList;
+
+		// On the first pass over the permission list, remove the elements that need to be converted
+		CellPermissions::PermissionList::const_iterator j;
+		for ( j = permList.begin(); j != permList.end(); ++j )
+		{
+			const CellPermissions::PermissionObject& permObject = (*j);
+
+			// Check if the string from the database was valid
+			if ( !permObject.hasBeenConverted() )
+			{
+				// The string in the database needs to be converted
+				tempList.insert( permObject );
+			}
+		}
+
+		// Take the elements that need to be converted and re-add them to the list
+		for ( j = tempList.begin(); j != tempList.end(); ++j )
+		{
+			const CellPermissions::PermissionObject& permObject = (*j);
+
+			// Remove from the archive set so that it gets marked dirty
+			permissionSets[i]->erase( permObject );
+
+			// Add to the archive set so that it gets marked dirty
+			// NOTE: The permission object constructor should try to convert the string for us
+			permissionSets[i]->insert( CellPermissions::PermissionObject( permObject.m_permissionString ) );
+		}
+		tempList.clear();
+
+		// On the second pass over the permission list, validate all the names
+		for ( j = permList.begin(); j != permList.end();  ++j  )
+		{
+			const CellPermissions::PermissionObject& permObject = (*j);
+
+			// Make sure we can still obtain a name from the permission object
+			// For example, characters may have been purged
+			const std::string name = permObject.getName();
+			if ( name.empty() )
+			{
+				// The entry is no longer valid
+				tempList.insert( permObject );
+			}
+		}
+
+		// Remove all the invalid entries
+		for ( j = tempList.begin(); j != tempList.end(); ++j )
+		{
+			const CellPermissions::PermissionObject& permObject = (*j);
+
+			// Remove from the archive set so that it gets marked dirty
+			permissionSets[i]->erase( permObject );
+		}
+		tempList.clear();
+	}
+
+	// check to see if building is a declared building inside a city limit
+	if (ConfigServerGame::getEnableCityCitizenshipFixup())
+	{
+		if (!isInWorldCell())
+			return;
+
+		NetworkId residenceOf;
+		if (!getObjVars().getItem("player_structure.residence.building", residenceOf))
+			return;
+
+		if (residenceOf != getOwnerId())
+			return;
+
+		Vector const posWorld = getPosition_w();
+		int const cityId = CityInterface::getCityAtLocation(ServerWorld::getSceneId(), static_cast<int>(posWorld.x), static_cast<int>(posWorld.z), 0);
+
+		if (cityId <= 0)
+			return;
+
+		GameServer::reportClusterStartupResidenceStructure(cityId, getNetworkId(), residenceOf);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns a shared template if none was given for this object.
+ *
+ * @return the shared template
+ */
+const SharedObjectTemplate * BuildingObject::getDefaultSharedTemplate(void) const
+{
+static const ConstCharCrcLowerString templateName("object/building/base/shared_building_default.iff");
+
+	if (m_defaultSharedTemplate == NULL)
+	{
+		m_defaultSharedTemplate = safe_cast<const SharedObjectTemplate *>(
+			ObjectTemplateList::fetch(templateName));
+		WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create "
+			"default shared object template %s", templateName.getString()));
+		if (m_defaultSharedTemplate != NULL)
+			ExitChain::add (removeDefaultTemplate, "BuildingObject::removeDefaultTemplate");
+	}
+	return m_defaultSharedTemplate;
+}	// BuildingObject::getDefaultSharedTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Cleans up the default shared template.
+ */
+void BuildingObject::removeDefaultTemplate(void)
+{
+	if (m_defaultSharedTemplate != NULL)
+	{
+		m_defaultSharedTemplate->releaseReference();
+		m_defaultSharedTemplate = NULL;
+	}
+}	// BuildingObject::removeDefaultTemplate
+
+// ----------------------------------------------------------------------
+
+/**
+ * Creates a default controller for this object.
+ *
+ * @return the object's controller
+ */
+Controller* BuildingObject::createDefaultController(void)
+{
+	Controller* _controller = new BuildingController(this);
+	NOT_NULL(_controller);
+
+	setController(_controller);
+	return _controller;
+}	// BuildingObject::createDefaultController
+
+// ----------------------------------------------------------------------
+
+void BuildingObject::expelObject(ServerObject &who)
+{
+	PortalProperty *portalProperty = getPortalProperty();
+	if (portalProperty)
+	{
+		ServerController * controller = dynamic_cast<ServerController*>(who.getController());
+		if (controller)
+		{
+			CellProperty *parentCell = getParentCell();
+			ServerObject *destinationCellObject = NULL;			
+		
+			if (!parentCell->isWorldCell())
+				destinationCellObject = safe_cast<ServerObject*>(&parentCell->getOwner());
+
+			Transform destinationTransform(Transform::IF_none);
+			destinationTransform.multiply(getTransform_o2w(), portalProperty->getEjectionLocationTransform());
+			controller->teleport(destinationTransform, destinationCellObject);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void BuildingObject::onPermanentlyDestroyed()
+{
+	ServerPathfindingNotification::destroyBuilding(this);
+
+	GameServer::reportBuildingObjectDestroyed(getNetworkId());
+
+	//Check for vendors since they must be explicitly killed
+	Container *container = ContainerInterface::getContainer(*this);
+	if (container)
+	{
+
+		for (ContainerIterator i = container->begin(); i != container->end(); ++i)
+		{
+			ServerObject *cell = safe_cast<ServerObject *>((*i).getObject());
+			if (cell)
+			{
+				Container *cellContainer = ContainerInterface::getContainer(*cell);
+				if (cellContainer)
+				{
+					for (ContainerIterator j = cellContainer->begin(); j != cellContainer->end(); ++j)
+					{
+						TangibleObject *child = dynamic_cast<TangibleObject*>((*j).getObject());
+						if (child && isPlayerPlaced() && child->hasCondition(static_cast<int>(ServerTangibleObjectTemplate::C_vendor)))
+						{
+							IGNORE_RETURN(child->permanentlyDestroy(DeleteReasons::ContainerDeleted));
+						}
+						else if (child && child->getGameObjectType() == static_cast<int>(SharedObjectTemplate::GOT_corpse))
+						{
+							expelObject(*child);
+						}
+					} //for contents of cells
+				}
+			}
+		} //for cells
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void BuildingObject::addAllowed(std::string const &name)
+{
+	if(isAuthoritative())
+	{
+		if (!CellPermissions::isOnList(m_allowed.get(), name))
+		{
+			CellPermissions::PermissionObject newPermission(name);
+
+			// We don't want to add any permissions that can't be converted to names
+			if ( !newPermission.getName().empty() )
+			{
+				m_allowed.insert(name);
+			}
+		}
+		removeBanned(name);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_addAllowed, new MessageQueueGenericValueType<std::string>(name));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void BuildingObject::removeAllowed(std::string const &name)
+{
+	if(isAuthoritative())
+	{
+		m_allowed.erase(name);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removeAllowed, new MessageQueueGenericValueType<std::string>(name));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void BuildingObject::removeAllAllowed()
+{
+	if(isAuthoritative())
+	{
+		m_allowed.clear();
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removeAllAllowed, 0);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void BuildingObject::addBanned(std::string const &name)
+{
+	if(isAuthoritative())
+	{
+		if (!CellPermissions::isOnList(m_banned.get(), name))
+		{
+			CellPermissions::PermissionObject newPermission(name);
+
+			// We don't want to add any permissions that can't be converted to names
+			if ( !newPermission.getName().empty() )
+			{
+				m_banned.insert(name);
+			}
+		}
+		removeAllowed(name);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_addBanned, new MessageQueueGenericValueType<std::string>(name));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void BuildingObject::removeBanned(std::string const &name)
+{
+	if(isAuthoritative())
+	{
+		m_banned.erase(name);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removeBanned, new MessageQueueGenericValueType<std::string>(name));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void BuildingObject::removeAllBanned()
+{
+	if(isAuthoritative())
+	{
+		m_banned.clear();
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removeAllBanned, 0);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool BuildingObject::isAllowed(CreatureObject const &who) const
+{
+	if (who.getMasterId() != NetworkId::cms_invalid)
+	{
+		ServerObject const *master = ServerWorld::findObjectByNetworkId(who.getMasterId());
+		if (master && master != &who && master->asCreatureObject())
+			return isAllowed(*master->asCreatureObject());
+	}
+
+	if (!playersWithAlignedEnemyFlagsAllowed() && (Pvp::hasAnyAlignedTimedEnemyFlag(who) || Pvp::hasAnyBountyDuelEnemyFlag(who)))
+		return false;
+
+	if (getIsPublic())
+		return !CellPermissions::isOnList(m_banned.get(), who);
+	else
+	{
+		// allow non-player-controlled creatures in private buildings with no owner
+		if (!who.isPlayerControlled() && getOwnerId() == NetworkId::cms_invalid)
+			return true;
+		// allow vendor-creatures to be placed in the building
+		if (who.hasCondition(static_cast<int>(ServerTangibleObjectTemplate::C_vendor)))
+			return true;
+		// JU_TODO: test
+#if 1
+		// allow non-player-controlled creatures in private buildings if the *creature* has no owner
+		if (!who.isPlayerControlled() 
+			&& who.getMasterId() == NetworkId::cms_invalid 
+			&& who.getLevel() < 10 // temp change to < 0 after testing holo item
+			)
+		{
+			return true;
+		}
+#endif
+		// JU_TODO: end test
+		return CellPermissions::isOnList(m_allowed.get(), who);
+	}
+}
+
+//------------------------------------------------------------------------------------------
+
+bool BuildingObject::isPlayerPlaced() const
+{
+	// only non-gold/non-buildout buildings can be player placed
+	return (getObjVars().hasItem("player_structure") && (getCacheVersion() == 0) && (getNetworkId().getValue() > static_cast<NetworkId::NetworkIdType>(0)));
+}
+
+//------------------------------------------------------------------------------------------
+
+bool BuildingObject::isSpaceDungeon() const
+{
+	return getObjVars().hasItem("space_dungeon.name");
+}
+
+// ----------------------------------------------------------------------
+
+bool BuildingObject::playersWithAlignedEnemyFlagsAllowed() const
+{
+	return !isPlayerPlaced() || getObjVars().hasItem("playersWithAlignedEnemyFlagsAllowed");
+}
+
+// ----------------------------------------------------------------------
+
+bool BuildingObject::isVisibleOnClient (const Client & /*client*/) const
+{
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void BuildingObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+{
+	TangibleObject::getAttributes(data);
+}
+
+// ----------------------------------------------------------------------
+
+BuildingObject * BuildingObject::asBuildingObject()
+{
+	return this;
+}
+
+//-----------------------------------------------------------------------
+
+BuildingObject const * BuildingObject::asBuildingObject() const
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+void BuildingObject::onAddedToWorld()
+{
+	TangibleObject::onAddedToWorld();
+
+	m_checkCreatePortalVolume = true;
+	scheduleForAlter();
+	
+	Container* container = ContainerInterface::getContainer(*this);
+	if (container)
+	{
+		ContainerIterator i = container->begin();
+		for(; i != container->end(); ++i)
+		{
+			ServerObject * obj = safe_cast<ServerObject*>((*i).getObject());
+			if (obj && obj->isPlayerControlled())
+			{
+				gainedPlayer(*obj);
+			}
+		}
+	}
+
+}
+
+// ----------------------------------------------------------------------
+
+void BuildingObject::onAllContentsLoaded()
+{
+	TangibleObject::onAllContentsLoaded();
+	m_contentsLoaded = true;
+	ServerObject * containedBy = safe_cast<ServerObject *>(ContainerInterface::getFirstParentInWorld(*this));
+	bool fixHouseSceneIds = true;
+	if (containedBy)
+	{
+		const NetworkId& owner = containedBy->getLoadWith();
+		CreatureObject * characterOwner = CreatureObject::getCreatureObject(owner);
+		if (characterOwner)
+		{
+			LOG("CustomerService", ("CharacterTransfer: packed house loaded for building (%s) contained by %s.", getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(characterOwner).c_str()));
+
+			Client * const client = containedBy->getClient();
+			if (client)
+			{
+				CreatureObject * const containedByCreature = containedBy->asCreatureObject();	
+				if (containedByCreature && containedByCreature->getLoadCTSPackedHouses())
+				{
+					containedByCreature->packedHouseLoaded();
+					fixHouseSceneIds = false;
+				}
+			}
+		}
+	}
+	if(fixHouseSceneIds && !getObjVars().hasItem("packed_house.fix_contained_scene_ids"))
+	{
+		setSceneIdOnThisAndContents(getSceneId());
+		setObjVarItem("packed_house.fix_contained_scene_ids", 1);
+	}
+
+	NetworkId owner;
+	if(getObjVars().getItem("purge_process.rollup_on_load", owner))
+		rollupStructure(owner, false);
+}
+
+//------------------------------------------------------------------------------------------
+
+void BuildingObject::onCellContentsLoaded()
+{
+	if (!isPlayerPlaced())
+		return;
+	
+	bool doFixup = true;
+	Container *container = ContainerInterface::getContainer(*this);
+	if (container)
+	{
+		for (ContainerIterator i = container->begin(); i != container->end(); ++i)
+		{
+			ServerObject * cell = safe_cast<ServerObject *>((*i).getObject());
+			if (!cell || !cell->areContentsLoaded())
+			{
+				doFixup = false;
+				break;
+			}
+		}
+	}
+
+	if (doFixup)
+	{
+		fixUpPobItemLimit();
+		onAllContentsLoaded();
+	}
+}
+
+//------------------------------------------------------------------------------------------
+
+void BuildingObject::loadContents(bool immediate /*= false*/)
+{
+	if (isAuthoritative())
+	{
+		// delaying the loading of the house's contents is useful to emulate a live
+		// environment where it takes significantly longer to load a house's contents
+		if (!immediate && (ConfigServerGame::getLoadHouseContentsDelaySeconds() > 0))
+		{
+			// don't need to queue up multiple C++LoadBuildingContents messages;
+			// only one is necessary to delay load the house's contents
+			if (timeUntilMessageTo("C++LoadBuildingContents") < 0)
+			{
+				MessageToQueue::getInstance().sendMessageToC(getNetworkId(),
+					"C++LoadBuildingContents",
+					"",
+					ConfigServerGame::getLoadHouseContentsDelaySeconds(),
+					false);
+			}
+
+			return;
+		}
+
+		Container *container = ContainerInterface::getContainer(*this);
+		if (container)
+		{
+			//Demand load house cells
+			for (ContainerIterator i = container->begin(); i != container->end(); ++i)
+			{
+				ServerObject * cell = safe_cast<ServerObject *>((*i).getObject());
+				DEBUG_FATAL(!cell, ("Null cell in building list"));
+				if (cell)
+				{
+					if (cell->getLoadContents())
+					{
+						cell->setLoadContents(false);
+						Container * cellContainer = ContainerInterface::getContainer(*cell);
+						if (cellContainer)
+						{
+							for (ContainerIterator j = cellContainer->begin(); j != cellContainer->end(); ++j)
+							{
+								ServerObject * obj = safe_cast<ServerObject *>((*j).getObject());
+								if (obj)
+								{
+									updateLoadWithToCell(*cell, *obj);
+								}
+							}
+						}
+					}
+				}
+			}
+
+			//Demand load contents of house cells
+			for (ContainerIterator j = container->begin(); j != container->end(); ++j)
+			{
+				ServerObject * cell = safe_cast<ServerObject*>((*j).getObject());
+				DEBUG_FATAL(!cell, ("Null cell in building list"));
+				if (cell)
+				{
+					if (cell->areContentsLoaded())
+						break;
+
+					cell->loadAllContentsFromDB();
+					m_unloadTime = ServerClock::getInstance().getGameTimeSeconds() + static_cast<unsigned long>(ConfigServerGame::getUnloadHouseContentsTime());
+					scheduleForAlter();
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void BuildingObject::gainedPlayer(ServerObject const &)
+{
+	if (isPlayerPlaced())
+	{
+		if (ConfigServerGame::getDemandLoadHouseContents())
+		{
+			loadContents();
+		}
+		else
+		{
+			int version = 0;
+			IGNORE_RETURN(getObjVars().getItem("player_structure.version", version));
+			int newVersion = version;
+			
+			if (version < 3)
+			{
+				fixUpPobItemLimit();
+				newVersion = 3;
+			}
+			IGNORE_RETURN(setObjVarItem("player_structure.version", newVersion));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void BuildingObject::lostPlayer(ServerObject const &)
+{
+	if (isPlayerPlaced() && ConfigServerGame::getDemandLoadHouseContents() && isAuthoritative())
+	{
+		m_unloadTime = ServerClock::getInstance().getGameTimeSeconds() + static_cast<unsigned long>(ConfigServerGame::getUnloadHouseContentsTime());
+		scheduleForAlter();
+	}
+}
+
+//------------------------------------------------------------------------------------------
+
+void BuildingObject::changeTeleportDestination(Vector & position, float & yaw) const
+{
+	if (!isAuthoritative())
+	{
+		WARNING(true, ("BuildingObject::changeTeleportDestination called on "
+			"non-authoritative building %s", getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	// call a script trigger that will give us the index of the cloning facility
+	// tube to respawn in, if any
+	int index = -1;
+	ScriptParams params;
+	params.addParam(index);
+	IGNORE_RETURN(const_cast<GameScriptObject *>(getScriptObject())->trigAllScripts(
+		Scripting::TRIG_GET_RESPAWN_LOC, params));
+	index = params.getIntParam(0);
+	if (index >= 0)
+	{
+		DataTable * respawnTable = DataTableManager::getTable(CLONE_RESPAWN_TABLE, 
+			true);
+		if (respawnTable != NULL)
+		{
+			int row = respawnTable->searchColumnString(0, getTemplateName());
+			if (row >= 0)
+			{
+				char buffer[32];
+				sprintf(buffer, "TUBE%d_X", index+1);
+				int column = respawnTable->findColumnNumber(buffer);
+				if (column >= 0)
+				{
+					position.x = respawnTable->getFloatValue(column, row);
+					position.z = respawnTable->getFloatValue(column+1, row);
+					yaw = convertDegreesToRadians(respawnTable->getFloatValue(column+2, row));
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void BuildingObject::setIsPublic(bool isPublic)
+{
+	if (isAuthoritative())
+		m_isPublic.set(isPublic);
+	else
+		sendControllerMessageToAuthServer(CM_setBuildingIsPublic, new MessageQueueGenericValueType<bool>(isPublic));
+}
+
+// ----------------------------------------------------------------------
+
+
+void BuildingObject::setCityId(int cityId)
+{
+	if (isAuthoritative())
+		m_cityId.set(cityId);
+	else
+		sendControllerMessageToAuthServer(CM_setBuildingCityId, new MessageQueueGenericValueType<int>(cityId));
+}
+
+// ----------------------------------------------------------------------
+
+void BuildingObject::handleCMessageTo(const MessageToPayload &message)
+{
+	if (message.getMethod() == "C++PurgeStructure")
+	{
+		NetworkId owner(message.getDataAsString());
+		LOG("CustomerService",("Purge:  Purging building %s",getNetworkId().getValueString().c_str()));
+		if (m_contentsLoaded.get())
+			rollupStructure(owner, false);
+		else
+		{
+			IGNORE_RETURN(setObjVarItem("purge_process.rollup_on_load", owner));
+			loadContents();
+		}			
+	}
+	else if (message.getMethod() == "C++CharacterSheetInfoResidenceLocationReq")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			// get network id of the player asking for the information
+			std::string const packedData(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			NetworkId const idRequester(packedData);
+			if (idRequester.isValid() && MessageToQueue::isInstalled())
+			{
+				Vector const loc = getPosition_w();
+
+				char buffer[256];
+				snprintf(buffer, sizeof(buffer)-1, "%s %d %d %d", ServerWorld::getSceneId().c_str(), static_cast<int>(loc.x), static_cast<int>(loc.y), static_cast<int>(loc.z));
+				buffer[sizeof(buffer)-1] = '\0';
+
+				MessageToQueue::getInstance().sendMessageToC(idRequester,
+					"C++CharacterSheetInfoResidenceLocationRsp",
+					buffer,
+					0,
+					false);
+			}
+		}
+	}
+	else if (message.getMethod() == "C++CityShareGroupPickupPointTravelCost")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const packedData(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			int const cityShareOfGroupPickupPointTravelCost = atoi(packedData.c_str());
+			if (cityShareOfGroupPickupPointTravelCost > 0)
+				transferBankCreditsFrom("GroupPickupPointTravel", cityShareOfGroupPickupPointTravelCost);
+		}
+	}
+	else if (message.getMethod() == "C++LoadBuildingContents")
+	{
+		loadContents(true);
+	}
+	else
+		TangibleObject::handleCMessageTo(message);
+}
+
+//-----------------------------------------------------------------------
+
+const BuildingObject::AllBuildingsSet & BuildingObject::getAllBuildings()
+{
+	return g_buildingList;
+}
+
+//-----------------------------------------------------------------------
+
+bool BuildingObject::unloadContents()
+{
+	// make sure there are no players in the building and its valid to have its contents unloaded
+	if (!hasPlayer(*this) && isPlayerPlaced() && ConfigServerGame::getDemandLoadHouseContents() && isAuthoritative())
+	{
+		m_unloadTime = 0;
+		unloadCellsContents(*this);
+		m_contentsLoaded = false;
+	}
+
+	return !m_contentsLoaded.get();
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/BuildingObject.h b/engine/server/library/serverGame/src/shared/object/BuildingObject.h
new file mode 100644
index 00000000..36e3f245
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/BuildingObject.h
@@ -0,0 +1,194 @@
+// ======================================================================
+//
+// BuildingObject.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef BuildingObject_H
+#define BuildingObject_H
+
+// ======================================================================
+
+#include "Archive/AutoDeltaSetObserver.h"
+#include "serverGame/TangibleObject.h"
+#include "serverGame/CellPermissions.h"
+#include "sharedTerrain/TerrainGenerator.h"
+
+// ======================================================================
+
+class ServerBuildingObjectTemplate;
+class CreatureObject;
+
+// ======================================================================
+
+/** 
+  *  A BuildingObject is the base class for all large structures that players will be placing.
+  */
+
+class BuildingObject : public TangibleObject
+{
+public:
+
+	explicit BuildingObject(const ServerBuildingObjectTemplate* newTemplate);
+	virtual ~BuildingObject();
+
+	virtual BuildingObject *       asBuildingObject();
+	virtual BuildingObject const * asBuildingObject() const;
+
+
+	virtual float       alter(float time);
+	
+	static void         removeDefaultTemplate(void);
+
+	virtual Controller* createDefaultController(void);
+	void                addMembersToPackages   ();
+	virtual void        getAttributes          (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+
+	int                 getMaintenanceCost() const;
+	void                setMaintenanceCost(int newConst);
+	real                getTimeLastChecked() const;
+	void                setTimeLastChecked(real newTime);
+
+	int                 getCityId() const;
+	void                setCityId(int cityId);
+	bool                getIsPublic() const;
+	void                setIsPublic(bool isPublic);
+	void                addBanned(std::string const &name);
+	void                removeBanned(std::string const &name);
+	void                removeAllBanned();
+	void                addAllowed(std::string const &name);
+	void                removeAllowed(std::string const &name);
+	void                removeAllAllowed();
+	bool                isAllowed(CreatureObject const &who) const;
+	bool                isPlayerPlaced() const;
+	bool                isSpaceDungeon() const;
+	bool                playersWithAlignedEnemyFlagsAllowed() const;
+	virtual bool        isVisibleOnClient(const Client & client) const;
+	CellPermissions::PermissionList const &getAllowed() const;
+	CellPermissions::PermissionList const &getBanned() const;
+	void                expelObject(ServerObject &who);
+	bool                getContentsLoaded() const;
+	void                handleCMessageTo(const MessageToPayload &message);
+	virtual void        onPermanentlyDestroyed();
+	virtual void        onAllContentsLoaded();
+	void                onCellContentsLoaded();
+	virtual void        onAddedToWorld();
+	void                gainedPlayer(ServerObject const &player);
+	void                lostPlayer(ServerObject const &player);
+	virtual void        changeTeleportDestination(Vector & position, float & yaw) const;
+	void                loadContents(bool immediate = false);
+	bool                unloadContents();
+
+	struct BuildingObjectPointerHash
+	{
+		size_t operator()(const BuildingObject * const ptr) const
+		{
+			return (reinterpret_cast<const size_t>(ptr) >> 4);
+		};
+	};
+
+	typedef stdhash_set<const BuildingObject *, BuildingObjectPointerHash>::fwd AllBuildingsSet;
+	static const AllBuildingsSet & getAllBuildings();
+
+protected:
+
+	virtual void                          initializeFirstTimeObject();
+	virtual void                          endBaselines();
+	virtual void                          onLoadedFromDatabase();
+	virtual const SharedObjectTemplate *  getDefaultSharedTemplate(void) const;
+
+private:
+	BuildingObject();
+	BuildingObject(const BuildingObject& rhs);
+	BuildingObject&	operator=(const BuildingObject& rhs);
+
+	typedef Archive::AutoDeltaVariableObserver<bool, CellPermissions::UpdateObserver, BuildingObject>                         ObservedBool;
+	typedef Archive::AutoDeltaSetObserver<CellPermissions::PermissionObject, CellPermissions::UpdateObserver, BuildingObject> ObservedPermissionObjectSet;
+
+private:
+	
+	static const SharedObjectTemplate * m_defaultSharedTemplate;	// template to use if no shared template is given
+
+	// BPM BuildingObject : TangibleObject // Begin persisted members.
+	Archive::AutoDeltaVariable<int>     m_maintenanceCost;				///< The weekly cost (in credits) of maintaining this Building.
+	Archive::AutoDeltaVariable<real>    m_timeLastChecked;				///< The in-game time this Building was last accessed by the player.
+	Archive::AutoDeltaVariable<int>     m_cityId;                 ///< The player city id this building is assigned to
+	ObservedBool                        m_isPublic;
+	ObservedPermissionObjectSet         m_allowed;
+	ObservedPermissionObjectSet         m_banned;
+	Archive::AutoDeltaVariable<bool>    m_contentsLoaded;
+	// EPM 
+
+	bool                     m_checkCreatePortalVolume;
+	unsigned long            m_unloadTime;
+};
+
+// ======================================================================
+
+inline int BuildingObject::getMaintenanceCost() const
+{
+	return m_maintenanceCost.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void BuildingObject::setMaintenanceCost(int newConst)
+{
+	m_maintenanceCost = newConst;
+}
+
+// ----------------------------------------------------------------------
+
+inline real BuildingObject::getTimeLastChecked() const
+{
+	return m_timeLastChecked.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void BuildingObject::setTimeLastChecked(real newTime)
+{
+	m_timeLastChecked = newTime;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool BuildingObject::getIsPublic() const
+{
+	return m_isPublic.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline CellPermissions::PermissionList const &BuildingObject::getAllowed() const
+{
+	return m_allowed.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline CellPermissions::PermissionList const &BuildingObject::getBanned() const
+{
+	return m_banned.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int BuildingObject::getCityId() const
+{
+	return m_cityId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool BuildingObject::getContentsLoaded() const
+{
+	return m_contentsLoaded.get();
+}
+
+// ======================================================================
+
+#endif // BuildingObject_H
+
diff --git a/engine/server/library/serverGame/src/shared/object/CellObject.cpp b/engine/server/library/serverGame/src/shared/object/CellObject.cpp
new file mode 100644
index 00000000..99908cef
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/CellObject.cpp
@@ -0,0 +1,792 @@
+// ======================================================================
+//
+// CellObject.cpp
+// Copyright 2001 Sony Online Entertainment
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CellObject.h"
+
+#include "serverGame/BuildingObject.h"
+#include "serverGame/CellController.h"
+#include "serverGame/Client.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ServerObjectTemplate.h"
+#include "serverGame/ServerTangibleObjectTemplate.h"
+#include "serverGame/ServerWorld.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedCollision/Floor.h"
+#include "sharedCollision/FloorMesh.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedNetworkMessages/UpdateCellPermissionMessage.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/ContainedByProperty.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/PortalProperty.h"
+#include "sharedPathfinding/PathGraph.h"
+#include "sharedPathfinding/PathNode.h"
+#include <algorithm>
+
+
+const SharedObjectTemplate * CellObject::m_defaultSharedTemplate = NULL;
+
+
+// ======================================================================
+
+CellObject::CellObject(const ServerObjectTemplate *newTemplate)
+: ServerObject(newTemplate),
+	m_cellNumber(-1),
+	m_isPublic(true),
+	m_allowed(),
+	m_banned(),
+	m_cellLabel(),
+	m_labelLocationOffset()
+{
+	setDebugName("PortalProperty cell object");
+
+	CellProperty *cell = new CellProperty(*this);
+	addProperty(*cell);
+
+	m_isPublic.setSourceObject(this);
+	m_allowed.setSourceObject(this);
+	m_banned.setSourceObject(this);
+
+	addMembersToPackages();
+
+	//@todo -- HACK! this is supposed to be set by the database,
+	// but that code isn't written. Assume all buildings and cells
+	// are in the client cache file. //-- it is now [8/4/2002 4:20:48 PM],
+	// this should be implemented in a few days. If you see this comment
+	// and the code below calls setIsCachedOnClient(true), get with Chris
+	// and Calan to determine the status of this code.
+	//setCacheVersion(1);
+}
+
+//-----------------------------------------------------------------------
+
+CellObject::~CellObject()
+{
+}
+
+//-----------------------------------------------------------------------
+
+Controller * CellObject::createDefaultController()
+{
+	Controller *controller = new CellController(this);
+	NOT_NULL(controller);
+	setController(controller);
+	return controller;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a shared template if none was given for this object.
+ *
+ * @return the shared template
+ */
+const SharedObjectTemplate * CellObject::getDefaultSharedTemplate(void) const
+{
+static const ConstCharCrcLowerString templateName("object/cell/base/shared_cell_default.iff");
+
+	if (m_defaultSharedTemplate == NULL)
+	{
+		m_defaultSharedTemplate = safe_cast<const SharedObjectTemplate *>(
+			ObjectTemplateList::fetch(templateName));
+		WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create "
+			"default shared object template %s", templateName.getString()));
+		if (m_defaultSharedTemplate != NULL)
+			ExitChain::add (removeDefaultTemplate, "CellObject::removeDefaultTemplate");
+	}
+	return m_defaultSharedTemplate;
+}	// CellObject::getDefaultSharedTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Cleans up the default shared template.
+ */
+void CellObject::removeDefaultTemplate(void)
+{
+	if (m_defaultSharedTemplate != NULL)
+	{
+		m_defaultSharedTemplate->releaseReference();
+		m_defaultSharedTemplate = NULL;
+	}
+}	// CellObject::removeDefaultTemplate
+
+// ----------------------------------------------------------------------
+
+void CellObject::sendObjectSpecificBaselinesToClient(Client const &client) const
+{
+	ServerObject::sendObjectSpecificBaselinesToClient(client);
+	ServerObject const * const so = client.getCharacterObject();
+	if (so)
+	{
+		CreatureObject const * const creature = so->asCreatureObject();
+		if (creature)
+		{
+			UpdateCellPermissionMessage message(getNetworkId(), creature ? isAllowed(*creature) : false);
+			client.send(message, true);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CellObject::endBaselines()
+{
+	ServerObject::endBaselines();
+
+	// fix the load_with values if they don't match
+	if ( isAuthoritative() && ( getLoadWith() != ContainerInterface::getLoadWithContainerId(*this)))
+	{
+		setLoadWith(ContainerInterface::getLoadWithContainerId(*this));
+	}
+
+	DEBUG_FATAL(m_cellNumber.get() < 1, ("Invalid cell number"));
+	if (m_cellNumber.get() < 1)
+	{
+		LOG("CellProblem", ("Invalid cell number for cell %s", getNetworkId().getValueString().c_str()));
+	}
+	
+	Object *container = ContainerInterface::getContainedByObject(*this);
+	PortalProperty *portalProperty = NULL;
+	if (container)
+	{
+		portalProperty = container->getPortalProperty();
+	}
+	else
+	{
+		ContainedByProperty* prop = ContainerInterface::getContainedByProperty(*this);
+		LOG("CellProblem",("Cell %s could not resolve contained_by of %s", getNetworkId().getValueString().c_str(), prop->getContainedByNetworkId().getValueString().c_str()));
+		WARNING(true, ("CellProblem Cell %s could not resolve contained_by of %s", getNetworkId().getValueString().c_str(), prop->getContainedByNetworkId().getValueString().c_str()));
+	}
+
+	if (!portalProperty)
+	{
+		LOG("CellProblem",("Cell %s is not inside a POB", getNetworkId().getValueString().c_str()));
+		WARNING_STRICT_FATAL(true,("Cell %s is not inside a POB.\n",getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	if (m_cellNumber.get() < portalProperty->getNumberOfCells())
+	{
+		portalProperty->cellLoaded(m_cellNumber.get(), *this, false);
+	}
+	else
+	{
+		// 	go through cell contents and remove them all.  Give them to the PortalProperty to be fixed when it handles EndBaselines
+ 		CellProperty *cellProperty = getCellProperty();
+		if (cellProperty)
+		{
+			for (ContainerIterator contents=cellProperty->begin(); contents != cellProperty->end(); ++contents)
+			{
+ 				Object *object = (*contents).getObject();
+				portalProperty->queueObjectForFixup(*object);
+				Container::ContainerErrorCode tmp = Container::CEC_Success;
+
+				cellProperty->remove(contents, tmp);
+			}
+		}
+		permanentlyDestroy(DeleteReasons::BadContainerTransfer); 
+	}
+
+#ifdef _DEBUG
+	if (ConfigServerGame::getDebugFloorPathNodeCount())
+	{
+		CellProperty * cellProperty = getCellProperty();
+
+		if(cellProperty)
+		{
+			Floor const * floor = cellProperty->getFloor();
+
+			if(floor)
+			{
+				FloorMesh const * floorMesh = floor->getFloorMesh();
+
+				NOT_NULL(floorMesh);
+
+				PathGraph const * graph = safe_cast<PathGraph const *>(floorMesh->getPathGraph());
+
+				if(graph)
+				{
+					int floorParts = floorMesh->getPartCount();
+
+					int graphParts = graph->getPartCount();
+
+					if(floorParts != graphParts)
+					{
+						const char * floorName = floorMesh->getName();
+				
+						WARNING(true,("ServerCollisionProperty::ServerCollisionProperty - floor %s doesn't have the same number of parts as its graph (floor %d, graph %d)",floorName,floorParts,graphParts));
+					}
+				}
+			}
+		}
+	}
+#endif
+}
+
+//-----------------------------------------------------------------------
+
+void CellObject::onLoadedFromDatabase()
+{
+	ServerObject::onLoadedFromDatabase();
+
+	// We need to run through the set of banned and allowed players
+	// and make sure the data is "good".
+	// - At one time players were stored by name instead of by network ID
+
+	ObservedPermissionObjectSet* permissionSets[] = { &m_allowed, &m_banned };
+	for ( unsigned int i = 0; i < sizeof( permissionSets ) / sizeof( permissionSets[0] ); ++i )
+	{
+		const CellPermissions::PermissionList& permList = permissionSets[i]->get();
+
+		// Temporary list for processing
+		CellPermissions::PermissionList tempList;
+
+		// On the first pass over the permission list, remove the elements that need to be converted
+		CellPermissions::PermissionList::const_iterator j;
+		for ( j = permList.begin(); j != permList.end(); ++j )
+		{
+			const CellPermissions::PermissionObject& permObject = (*j);
+
+			// Check if the string from the database was valid
+			if ( !permObject.hasBeenConverted() )
+			{
+				// The string in the database needs to be converted
+				tempList.insert( permObject );
+			}
+		}
+
+		// Take the elements that need to be converted and re-add them to the list
+		for ( j = tempList.begin(); j != tempList.end(); ++j )
+		{
+			const CellPermissions::PermissionObject& permObject = (*j);
+
+			// Remove from the archive set so that it gets marked dirty
+			permissionSets[i]->erase( permObject );
+
+			// Add to the archive set so that it gets marked dirty
+			// NOTE: The permission object constructor should try to convert the string for us
+			permissionSets[i]->insert( CellPermissions::PermissionObject( permObject.m_permissionString ) );
+		}
+		tempList.clear();
+
+		// On the second pass over the permission list, validate all the names
+		for ( j = permList.begin(); j != permList.end();  ++j  )
+		{
+			const CellPermissions::PermissionObject& permObject = (*j);
+
+			// Make sure we can still obtain a name from the permission object
+			// For example, characters may have been purged
+			const std::string name = permObject.getName();
+			if ( name.empty() )
+			{
+				// The entry is no longer valid
+				tempList.insert( permObject );
+			}
+		}
+
+		// Remove all the invalid entries
+		for ( j = tempList.begin(); j != tempList.end(); ++j )
+		{
+			const CellPermissions::PermissionObject& permObject = (*j);
+
+			// Remove from the archive set so that it gets marked dirty
+			permissionSets[i]->erase( permObject );
+		}
+		tempList.clear();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CellObject::addAllowed(std::string const &name)
+{
+	if(isAuthoritative())
+	{
+		if (!CellPermissions::isOnList(m_allowed.get(), name))
+		{
+			CellPermissions::PermissionObject newPermission(name);
+
+			// We don't want to add any permissions that can't be converted to names
+			if ( !newPermission.getName().empty() )
+			{
+				m_allowed.insert(name);
+			}
+		}
+		removeBanned(name);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_addAllowed, new MessageQueueGenericValueType<std::string>(name));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CellObject::removeAllowed(std::string const &name)
+{
+	if(isAuthoritative())
+	{
+		m_allowed.erase(name);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removeAllowed, new MessageQueueGenericValueType<std::string>(name));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CellObject::removeAllAllowed()
+{
+	if(isAuthoritative())
+	{
+		m_allowed.clear();
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removeAllAllowed, 0);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CellObject::addBanned(std::string const &name)
+{
+	if(isAuthoritative())
+	{
+		if (!CellPermissions::isOnList(m_banned.get(), name))
+		{
+			CellPermissions::PermissionObject newPermission(name);
+
+			// We don't want to add any permissions that can't be converted to names
+			if ( !newPermission.getName().empty() )
+			{
+				m_banned.insert(name);
+			}
+		}
+		removeAllowed(name);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_addBanned, new MessageQueueGenericValueType<std::string>(name));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CellObject::removeBanned(std::string const &name)
+{
+	if(isAuthoritative())
+	{
+		m_banned.erase(name);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removeBanned, new MessageQueueGenericValueType<std::string>(name));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CellObject::removeAllBanned()
+{
+	if(isAuthoritative())
+	{
+		m_banned.clear();
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removeAllBanned, 0);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+ServerObject const *CellObject::getOwner() const
+{
+        Object const * const o = ContainerInterface::getContainedByObject(*this);
+        if (o)
+                return o->asServerObject();
+        return 0;
+}
+
+// ----------------------------------------------------------------------
+
+ServerObject *CellObject::getOwner()
+{
+        Object * const o = ContainerInterface::getContainedByObject(*this);
+        if (o)
+                return o->asServerObject();
+        return 0;
+}
+
+// ----------------------------------------------------------------------
+
+BuildingObject const *CellObject::getOwnerBuilding() const
+{
+	Object const * const o = ContainerInterface::getContainedByObject(*this);
+	if (o)
+	{
+		ServerObject const * const so = o->asServerObject();
+		if (so)
+			return so->asBuildingObject();
+	}
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+BuildingObject *CellObject::getOwnerBuilding()
+{
+	Object * const o = ContainerInterface::getContainedByObject(*this);
+	if (o)
+	{
+		ServerObject * const so = o->asServerObject();
+		if (so)
+			return so->asBuildingObject();
+	}
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+ShipObject const *CellObject::getOwnerShip() const
+{
+	Object const * const o = ContainerInterface::getContainedByObject(*this);
+	if (o)
+	{
+		ServerObject const * const so = o->asServerObject();
+		if (so)
+			return so->asShipObject();
+	}
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+ShipObject *CellObject::getOwnerShip()
+{
+	Object * const o = ContainerInterface::getContainedByObject(*this);
+	if (o)
+	{
+		ServerObject * const so = o->asServerObject();
+		if (so)
+			return so->asShipObject();
+	}
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+bool CellObject::isAllowed(CreatureObject const &who) const
+{
+	if (who.getMasterId() != NetworkId::cms_invalid)
+	{
+		ServerObject const *master = ServerWorld::findObjectByNetworkId(who.getMasterId());
+		if (master && master != &who && master->asCreatureObject())
+			return isAllowed(*master->asCreatureObject());
+	}
+
+	BuildingObject const *building = getOwnerBuilding();
+	if (building)
+	{
+		if (!building->playersWithAlignedEnemyFlagsAllowed() && (Pvp::hasAnyAlignedTimedEnemyFlag(who) || Pvp::hasAnyBountyDuelEnemyFlag(who)))
+			return false;
+		if (building->isOwner(who.getNetworkId(), who.getClient()))
+			return true;
+		if (!building->isAllowed(who))
+			return false;
+	}
+
+	if (getIsPublic())
+		return !CellPermissions::isOnList(m_banned.get(), who);
+	else
+	{
+		// allow non-player-controlled  creatures in private buildings with no owner
+		if (!who.isPlayerControlled() && building && building->getOwnerId() == NetworkId::cms_invalid)
+			return true;
+		// allow vendor-creatures to be placed in the building
+		if (who.hasCondition(ServerTangibleObjectTemplate::C_vendor))
+			return true;
+		return CellPermissions::isOnList(m_allowed.get(), who);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool CellObject::getClosestPathNodePos( const ServerObject & object, Vector & outPos ) const
+{
+	const PathNode * closestNode = NULL;
+	float closestDistance = 0;
+	const Vector objectPos = object.getPosition_w();
+
+	const CellProperty * cell = ContainerInterface::getCell(*this);
+	if (cell != NULL)
+	{
+		const Floor * floor = cell->getFloor();
+		if (floor != NULL)
+		{
+			const FloorMesh * mesh = floor->getFloorMesh();
+			if (mesh != NULL)
+			{
+				const PathGraph * path = safe_cast<const PathGraph *>(mesh->getPathGraph());
+				if (path != NULL)
+				{
+					int nodeCount = path->getNodeCount();
+					for (int i = 0; i < nodeCount; ++i)
+					{
+						const PathNode * node = path->getNode(i);
+						if (node != NULL)
+						{
+							float distance = objectPos.magnitudeBetweenSquared(
+								rotateTranslate_p2w(node->getPosition_p()));
+							if (closestNode == NULL || distance < closestDistance)
+							{
+								closestNode = node;
+								closestDistance = distance;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	if (closestNode != NULL)
+		outPos = closestNode->getPosition_p();
+	return closestNode != NULL;
+}
+
+// ----------------------------------------------------------------------
+
+bool CellObject::isVisibleOnClient (const Client & /*client*/) const
+{
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void CellObject::getAttributes (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+{
+	ServerObject::getAttributes(data);
+}
+
+// ----------------------------------------------------------------------
+
+bool CellObject::onContainerAboutToLoseItem(ServerObject * destination, ServerObject& item, ServerObject* transferer)
+{
+	//Cells should first check to see if the building will allow the item to be transfered.
+	ServerObject *obj = getOwner();
+
+	if (obj)
+	{
+		ScriptParams params;
+		params.addParam(destination ? destination->getNetworkId() : NetworkId::cms_invalid);
+		params.addParam(transferer ? transferer->getNetworkId() : NetworkId::cms_invalid);
+		params.addParam(item.getNetworkId());
+		if(obj->getScriptObject()->trigAllScripts(Scripting::TRIG_ABOUT_TO_LOSE_ITEM, params) == SCRIPT_OVERRIDE)
+		{
+			return false;
+		}
+	}
+	return ServerObject::onContainerAboutToLoseItem(destination, item, transferer);
+}
+
+// ----------------------------------------------------------------------
+
+int CellObject::onContainerAboutToGainItem(ServerObject& item, ServerObject* transferer)
+{
+	// If it's a creature trying to move into the cell, see if it's allowed.
+	CreatureObject * const creatureItem = item.asCreatureObject();
+	if (creatureItem && !isAllowed(*creatureItem))
+		return Container::CEC_SilentError;
+	//Cells should first check to see if the building will allow the item to be transfered.
+        ServerObject *obj = getOwner();
+
+	if (obj)
+	{
+		ServerObject const * const source = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(item));
+		NetworkId sourceId = source ? source->getNetworkId() : NetworkId::cms_invalid;
+		ScriptParams params;
+		params.addParam(sourceId);
+		params.addParam(transferer ? transferer->getNetworkId() : NetworkId::cms_invalid);
+		params.addParam(item.getNetworkId());
+		if (obj->getScriptObject()->trigAllScripts(Scripting::TRIG_ABOUT_TO_RECEIVE_ITEM, params) == SCRIPT_OVERRIDE)
+			return Container::CEC_BlockedByScript;
+	}
+	return ServerObject::onContainerAboutToGainItem(item, transferer);
+}
+
+// ----------------------------------------------------------------------
+
+void CellObject::onContainerLostItem(ServerObject * destination, ServerObject& item, ServerObject* transferer)
+{
+	//Cells should first check to see if the building will allow the item to be transfered.
+	ServerObject * const obj = getOwner();
+
+	if (obj)
+	{
+		ScriptParams params;
+		params.addParam(destination ? destination->getNetworkId() : NetworkId::cms_invalid);
+		params.addParam(transferer ? transferer->getNetworkId() : NetworkId::cms_invalid);
+		params.addParam(item.getNetworkId());
+		obj->getScriptObject()->trigAllScripts(Scripting::TRIG_LOST_ITEM, params);
+
+		BuildingObject * const b_obj = getOwnerBuilding();
+		if (b_obj && item.isPlayerControlled() && destination == NULL)
+		{
+			b_obj->lostPlayer(item);
+		}
+	}
+	ServerObject::onContainerLostItem(destination, item, transferer);
+}
+
+// ----------------------------------------------------------------------
+
+void CellObject::onContainerGainItem(ServerObject& item, ServerObject * source, ServerObject* transferer)
+{
+	//Cells should first check to see if the building will allow the item to be transfered.
+	ServerObject * const obj = getOwner();
+	if (obj)
+	{
+		// The default owner of an object in a building is the building's owner, unless it is a creature, ship, or vendor
+		if (   !item.asCreatureObject()
+		    && !item.asShipObject()
+		    && !item.isVendor())
+		{
+			item.setOwnerId(obj->getOwnerId());
+		}
+
+		ScriptParams params;
+		params.addParam(source ? source->getNetworkId() : NetworkId::cms_invalid);
+		params.addParam(transferer ? transferer->getNetworkId() : NetworkId::cms_invalid);
+		params.addParam(item.getNetworkId());
+
+		obj->getScriptObject()->trigAllScripts(Scripting::TRIG_RECEIVED_ITEM, params);
+
+		BuildingObject * const b_obj = getOwnerBuilding();
+		if (b_obj && item.isPlayerControlled() && !source)
+		{
+			b_obj->gainedPlayer(item);
+		}
+	}
+	ServerObject::onContainerGainItem(item, source, transferer);
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const &CellObject::getOwnerId() const
+{
+	Object const * const o = ContainerInterface::getContainedByObject(*this);
+	if (o)
+	{
+		ServerObject const * const so = o->asServerObject();
+		if (so)
+			return so->getOwnerId();
+	}
+	return NetworkId::cms_invalid;
+}
+
+// ----------------------------------------------------------------------
+
+bool CellObject::isOwner(NetworkId const &id, Client const *client) const
+{
+	Object const * const o = ContainerInterface::getContainedByObject(*this);
+	if (o)
+	{
+		ServerObject const * const so = o->asServerObject();
+		if (so)
+			return so->isOwner(id, client);
+	}
+	
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void CellObject::setOwnerId(NetworkId const &id)
+{
+	if (isAuthoritative())
+	{
+		Container * const container = ContainerInterface::getContainer(*this);
+		if (container)
+		{
+			for (ContainerIterator i = container->begin(); i != container->end(); ++i)
+			{
+				ServerObject * const content = safe_cast<ServerObject *>((*i).getObject());
+				if (content && !content->asCreatureObject())
+					content->setOwnerId(id);
+			}
+		}
+	}
+	//if not authoritative, that's ok.  This should only be called when the authoritative building has setOwnerId called on it.
+}
+
+// ----------------------------------------------------------------------
+
+void CellObject::onAllContentsLoaded()
+{
+	ServerObject::onAllContentsLoaded();
+	BuildingObject * owner = getOwnerBuilding();
+	if (owner)
+		owner->onCellContentsLoaded();
+}
+
+// ----------------------------------------------------------------------
+
+CellObject * CellObject::asCellObject()
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+CellObject const * CellObject::asCellObject() const
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+CellObject * CellObject::getCellObject(NetworkId const & networkId)
+{
+	return CellObject::asCellObject(NetworkIdManager::getObjectById(networkId));
+}
+
+// ----------------------------------------------------------------------
+
+CellObject * CellObject::asCellObject(Object * object)
+{
+	ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL;
+	CellObject * const cellObject = (serverObject != NULL) ? serverObject->asCellObject() : NULL;
+	
+	return cellObject;
+}
+
+// ----------------------------------------------------------------------
+
+CellObject const * CellObject::asCellObject(Object const * object)
+{
+	ServerObject const * const serverObject = (object != NULL) ? object->asServerObject() : NULL;
+	CellObject const * const cellObject = (serverObject != NULL) ? serverObject->asCellObject() : NULL;
+	
+	return cellObject;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/CellObject.h b/engine/server/library/serverGame/src/shared/object/CellObject.h
new file mode 100644
index 00000000..773325f2
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/CellObject.h
@@ -0,0 +1,187 @@
+// ======================================================================
+//
+// CellObject.h
+// Copyright 2001 Sony Online Entertainment
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef INCLUDED_CellObject_H
+#define INCLUDED_CellObject_H
+
+// ======================================================================
+
+#include "serverGame/ServerObject.h"
+#include "serverGame/CellPermissions.h"
+#include "Archive/AutoDeltaVariableObserver.h"
+#include "Archive/AutoDeltaSetObserver.h"
+
+// ======================================================================
+
+class BuildingObject;
+class CreatureObject;
+
+// ======================================================================
+
+class CellObject : public ServerObject
+{
+public:
+
+	static CellObject * getCellObject(NetworkId const & networkId);
+	static CellObject * asCellObject(Object * object);
+	static CellObject const * asCellObject(Object const * objec);
+
+public:
+
+	explicit CellObject(const ServerObjectTemplate *newTemplate);
+	virtual ~CellObject();
+
+	virtual CellObject *asCellObject();
+	virtual CellObject const *asCellObject() const;
+
+	static void removeDefaultTemplate(void);
+	virtual Controller * createDefaultController();
+	void setCell(int cellNumber);
+	int getCell() const;
+	void setIsPublic(bool isPublic);
+	bool getIsPublic() const;
+	void addAllowed(std::string const &name);
+	void removeAllowed(std::string const &name);
+	void removeAllAllowed();
+	void addBanned(std::string const &name);
+	void removeBanned(std::string const &name);
+	void removeAllBanned();
+	CellPermissions::PermissionList const &getAllowed() const;
+	CellPermissions::PermissionList const &getBanned() const;
+	Unicode::String const & getCellLabel() const;
+	void setCellLabel(Unicode::String const & label);
+	Vector const & getLabelLocationOffset() const;
+	void setLabelLocationOffset(Vector const & offset);
+
+	bool getClosestPathNodePos( const ServerObject & object, Vector & outPos ) const;
+
+	ServerObject *         getOwner();
+	ServerObject const *   getOwner() const;
+	BuildingObject *       getOwnerBuilding();
+	BuildingObject const * getOwnerBuilding() const;
+	ShipObject *           getOwnerShip();
+	ShipObject const *     getOwnerShip() const;
+	bool                   isAllowed(CreatureObject const &who) const;
+	virtual bool           isVisibleOnClient              (const Client & client) const;
+	void addMembersToPackages();
+	virtual void           getAttributes                  (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+
+	virtual const NetworkId &     getOwnerId() const;
+	virtual bool                  isOwner(NetworkId const &id, Client const *client) const;
+	virtual void                  setOwnerId(const NetworkId &id);
+
+	virtual void sendObjectSpecificBaselinesToClient(Client const &client) const;
+
+//Container triggers for notifiying the building
+	virtual bool                          onContainerAboutToLoseItem(ServerObject * destination, ServerObject& item, ServerObject* transferer);
+	virtual int                           onContainerAboutToGainItem(ServerObject& item, ServerObject* transferer);
+	virtual void                          onContainerLostItem(ServerObject * destination, ServerObject& item, ServerObject* transferer);
+	virtual void                          onContainerGainItem(ServerObject& item, ServerObject* source, ServerObject* transferer);
+	virtual void               onAllContentsLoaded();
+	
+protected:
+	virtual void endBaselines();
+	virtual void onLoadedFromDatabase();
+
+	virtual const SharedObjectTemplate *  getDefaultSharedTemplate(void) const;
+
+private:
+
+	CellObject();
+	CellObject(const CellObject &);
+	CellObject &operator =(const CellObject &);
+
+	typedef Archive::AutoDeltaVariableObserver<bool, CellPermissions::UpdateObserver, CellObject>                         ObservedBool;
+	typedef Archive::AutoDeltaSetObserver<CellPermissions::PermissionObject, CellPermissions::UpdateObserver, CellObject> ObservedPermissionObjectSet;
+
+private:
+
+	static const SharedObjectTemplate * m_defaultSharedTemplate;	// template to use if no shared template is given
+	
+	Archive::AutoDeltaVariable<int>  m_cellNumber;
+	ObservedBool                     m_isPublic;
+	ObservedPermissionObjectSet      m_allowed;
+	ObservedPermissionObjectSet      m_banned;
+	Archive::AutoDeltaVariable<Unicode::String> m_cellLabel;
+	Archive::AutoDeltaVariable<Vector> m_labelLocationOffset;
+};
+
+// ======================================================================
+
+inline void CellObject::setCell(int cellNumber)
+{
+	m_cellNumber = cellNumber;
+}
+
+// ----------------------------------------------------------------------
+
+inline int CellObject::getCell() const
+{
+	return m_cellNumber.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool CellObject::getIsPublic() const
+{
+	return m_isPublic.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void CellObject::setIsPublic(bool isPublic)
+{
+	m_isPublic.set(isPublic);
+}
+
+// ----------------------------------------------------------------------
+
+inline CellPermissions::PermissionList const &CellObject::getAllowed() const
+{
+	return m_allowed.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline CellPermissions::PermissionList const &CellObject::getBanned() const
+{
+	return m_banned.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline Unicode::String const & CellObject::getCellLabel() const
+{
+	return m_cellLabel.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void CellObject::setCellLabel(Unicode::String const & label)
+{
+	m_cellLabel.set(label);
+}
+
+// ----------------------------------------------------------------------
+
+inline Vector const & CellObject::getLabelLocationOffset() const
+{
+	return m_labelLocationOffset.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void CellObject::setLabelLocationOffset(Vector const & offset)
+{
+	m_labelLocationOffset.set(offset);
+}
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/object/CellPermissions.cpp b/engine/server/library/serverGame/src/shared/object/CellPermissions.cpp
new file mode 100644
index 00000000..01f61971
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/CellPermissions.cpp
@@ -0,0 +1,510 @@
+// ======================================================================
+//
+// CellPermissions.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CellPermissions.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/BuildingObject.h"
+#include "serverGame/CellObject.h"
+#include "serverGame/Client.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GuildInterface.h"
+#include "serverGame/NameManager.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/Container.h"
+#include "sharedNetworkMessages/UpdateCellPermissionMessage.h"
+
+// ======================================================================
+
+static std::set<BuildingObject const*> s_activeUpdaters;
+
+// ======================================================================
+
+namespace Archive
+{
+	// The prefixes we use to write permission strings to the database
+	const std::string PERMISSION_STRING_PREFIX_UNKNOWN_OLD    = "u:";
+	const std::string PERMISSION_STRING_PREFIX_UNKNOWN_NEW    = "U:";
+	const std::string PERMISSION_STRING_PREFIX_GUILD_NAME_OLD = "g:";
+	const std::string PERMISSION_STRING_PREFIX_GUILD_NAME_NEW = "G:";
+	const std::string PERMISSION_STRING_PREFIX_CHARACTER_NAME = "c:";
+	const std::string PERMISSION_STRING_PREFIX_NUMERIC_VALUE  = "n:";
+
+	// ----------------------------------------------------------------------
+
+	void get(ReadIterator &source, CellPermissions::PermissionObject &target)
+	{
+		std::string permissionString;
+		get(source, permissionString);
+
+		// Assume the string in the database has not been converted
+		CellPermissions::PermissionObject::PermissionFormat format = CellPermissions::PermissionObject::PF_UNCONVERTED;
+
+		// Determine whether the string in the database has already been converted
+		const std::string prefix( permissionString, 0, 2 );
+		if ( prefix == PERMISSION_STRING_PREFIX_CHARACTER_NAME )
+		{
+			format = CellPermissions::PermissionObject::PF_CHARACTER_NAME;
+		}
+		else if ( prefix == PERMISSION_STRING_PREFIX_GUILD_NAME_OLD )
+		{
+			// We used to store guilds by name instead of guild ID.
+			// So we will try to reconvert the guild name to a guild ID
+			format = CellPermissions::PermissionObject::PF_UNCONVERTED;
+			permissionString.erase( 0, prefix.length() );
+		}
+		else if ( prefix == PERMISSION_STRING_PREFIX_GUILD_NAME_NEW )
+		{
+			format = CellPermissions::PermissionObject::PF_GUILD_NAME;
+		}
+		else if ( prefix == PERMISSION_STRING_PREFIX_NUMERIC_VALUE )
+		{
+			format = CellPermissions::PermissionObject::PF_NUMERIC_VALUE;
+		}
+		else if ( prefix == PERMISSION_STRING_PREFIX_UNKNOWN_OLD )
+		{
+			// We had an issue where we may have been storing full names in the database
+			// and we did not know they were player names since NameManager only
+			// converts first names to player names.  So we will try to reconvert
+			// the unknown entries again
+			format = CellPermissions::PermissionObject::PF_UNCONVERTED;
+			permissionString.erase( 0, prefix.length() );
+		}
+		else if ( prefix == PERMISSION_STRING_PREFIX_UNKNOWN_NEW )
+		{
+			format = CellPermissions::PermissionObject::PF_UNKNOWN_STRING;
+		}
+
+		// Remove the prefix if necessary
+		if ( format != CellPermissions::PermissionObject::PF_UNCONVERTED )
+		{
+			permissionString.erase( 0, prefix.length() );
+		}
+
+		// When buildings and cells load, it is their responsibility to convert the string if necessary
+		target = CellPermissions::PermissionObject( format, permissionString );
+	}
+
+	// ----------------------------------------------------------------------
+
+	void put( ByteStream &target, CellPermissions::PermissionObject const &source )
+	{
+		std::string permissionString = source.m_permissionString;
+
+		// Before writing out the permission string, we need to append a prefix
+		switch ( source.m_originalPermissionFormat )
+		{
+			case CellPermissions::PermissionObject::PF_CHARACTER_NAME:
+				permissionString = PERMISSION_STRING_PREFIX_CHARACTER_NAME + permissionString;
+				break;
+
+			case CellPermissions::PermissionObject::PF_GUILD_NAME:
+				permissionString = PERMISSION_STRING_PREFIX_GUILD_NAME_NEW + permissionString;
+				break;
+
+			case CellPermissions::PermissionObject::PF_NUMERIC_VALUE:
+				permissionString = PERMISSION_STRING_PREFIX_NUMERIC_VALUE + permissionString;
+				break;
+
+			case CellPermissions::PermissionObject::PF_UNKNOWN_STRING:
+				permissionString = PERMISSION_STRING_PREFIX_UNKNOWN_NEW + permissionString;
+				break;
+
+			default:
+				// Do nothing to the string and it will be considered "unconverted" when it is read back in
+				break;
+		}
+
+		put(target, permissionString);
+	}
+
+}; // namespace Archive
+
+// ======================================================================
+
+CellPermissions::PermissionObject::PermissionObject() :
+	m_originalPermissionFormat( PF_UNCONVERTED ),
+	m_permissionString()
+{
+}
+
+// ----------------------------------------------------------------------
+
+CellPermissions::PermissionObject::PermissionObject( const std::string& name ) :
+	m_originalPermissionFormat( PF_UNKNOWN_STRING ),
+	m_permissionString( Unicode::getTrim(name) )
+{
+	// See if we have a guild name
+	if (_strnicmp( name.c_str(), "Guild:", 6 ) == 0 )
+	{
+		// Try to convert the name to a guild ID
+		int guildId = GuildInterface::findGuild( Unicode::getTrim((name).substr(6)) );
+		if ( guildId != 0 )
+		{
+			// Convert the guild ID to a string
+			char buffer[32];
+			sprintf( buffer, "%d", guildId );
+
+			m_originalPermissionFormat = PF_GUILD_NAME;
+			m_permissionString         = buffer;
+		}
+		else
+		{
+			// We will leave the format as "unknown" and keep the raw string
+		}
+	}
+	else
+	{
+		// The name string might be an actual name or a network ID...
+
+		// See if there are any characters in the string
+		std::string::size_type idx = name.find_first_not_of( "1234567890" );
+		if ( idx == std::string::npos )
+		{
+			// Everything in the string is a number
+			m_originalPermissionFormat = PF_NUMERIC_VALUE;
+			m_permissionString         = name;
+		}
+		else
+		{
+			// Try to convert the name to a network ID
+			const NetworkId playerNetworkId = NameManager::getInstance().getPlayerId( NameManager::normalizeName( name ) );
+			if ( playerNetworkId != NetworkId::cms_invalid )
+			{
+				// We found the network ID for the player
+				m_originalPermissionFormat = PF_CHARACTER_NAME;
+				m_permissionString         = playerNetworkId.getValueString();
+			}
+			else
+			{
+				// We will leave the format as "unknown" and keep the raw string
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+CellPermissions::PermissionObject::PermissionObject( PermissionFormat format, const std::string& name ) :
+	m_originalPermissionFormat( format ),
+	m_permissionString( name )
+{
+}
+
+// ----------------------------------------------------------------------
+
+bool CellPermissions::PermissionObject::operator<(PermissionObject const &rhs) const
+{
+	return (m_permissionString < rhs.m_permissionString);
+}
+
+// ----------------------------------------------------------------------
+
+std::string CellPermissions::PermissionObject::getName() const
+{
+	std::string nameString;
+
+	// Depending on the original format, we may need to convert the permission string
+	switch ( m_originalPermissionFormat )
+	{
+		case PF_CHARACTER_NAME:
+			{
+				const NetworkId playerNetworkId = NetworkId( m_permissionString );
+
+				// Try to convert the network ID to an actual player name
+				// NOTE: We grab the full name so that capitalization is correct
+				const std::string fullName = NameManager::getInstance().getPlayerFullName( playerNetworkId );
+
+				// Parse the first name from the full name
+				size_t curpos = 0;
+				std::string firstName;
+				if ( Unicode::getFirstToken( fullName, curpos, curpos, firstName ) )
+				{
+					nameString = firstName;
+				}
+			}
+			break;
+
+		case PF_GUILD_NAME:
+			{
+				const int guildId = atoi( m_permissionString.c_str() );
+
+				// Try to convert the guildId to an actual guild name
+				if ( guildId != 0 )
+				{
+					// Prefix with "Guild: " for legacy reasons
+					nameString = "Guild:" + GuildInterface::getGuildAbbrev( guildId );
+				}
+			}
+			break;
+
+		case PF_NUMERIC_VALUE:
+		case PF_UNKNOWN_STRING:
+		default:
+			// Just return the stored string for these cases
+			nameString = m_permissionString;
+			break;
+	}
+
+	return nameString;
+}
+
+// ----------------------------------------------------------------------
+
+bool CellPermissions::PermissionObject::hasBeenConverted() const
+{
+	return (m_originalPermissionFormat != PF_UNCONVERTED);
+}
+
+// ======================================================================
+
+CellPermissions::UpdateObserver::UpdateObserver(CellObject *cell, Archive::AutoDeltaObserverOp) :
+	m_profilerBlock("CellPermissions::UpdateObserver - cell"),
+	m_building(0),
+	m_permissions()
+{
+	if (cell)
+	{
+		BuildingObject *building = cell->getOwnerBuilding();
+		if (building)
+			init(building);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+CellPermissions::UpdateObserver::UpdateObserver(TangibleObject *tangible, Archive::AutoDeltaObserverOp) :
+	m_profilerBlock("CellPermissions::UpdateObserver - building"),
+	m_building(0),
+	m_permissions()
+{
+	if (tangible)
+	{
+		BuildingObject * const building = tangible->asBuildingObject();
+		if (building)
+			init(building);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+CellPermissions::UpdateObserver::~UpdateObserver()
+{
+	if (m_building)
+	{
+		s_activeUpdaters.erase(m_building);
+		// send permission updates for any changes to any cells of this building,
+		// and collect list of creatures we need to expel due to these changes.
+		unsigned int permPos = 0;
+		std::vector<CreatureObject*> expel;
+		handleCellPermissionsUpdateIfNeeded(*m_building, permPos, expel);
+		// expel any creatures from the building that no longer belong.
+		for (std::vector<CreatureObject*>::const_iterator i = expel.begin(); i != expel.end(); ++i)
+			m_building->expelObject(**i);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CellPermissions::UpdateObserver::init(BuildingObject *building)
+{
+	if (!building || s_activeUpdaters.find(building) != s_activeUpdaters.end())
+		return;
+
+	m_building = building;
+	s_activeUpdaters.insert(building);
+	// get permissions for all observers for all cells of this building
+	getCellPermissions(*building);
+}
+
+// ----------------------------------------------------------------------
+
+void CellPermissions::UpdateObserver::getCellPermissions(ServerObject &obj)
+{
+	Container * const container = ContainerInterface::getContainer(obj);
+	if (container)
+	{
+		for (ContainerIterator i = container->begin(); i != container->end(); ++i)
+		{
+			ServerObject * const content = safe_cast<ServerObject*>((*i).getObject());
+			if (content)
+			{
+				CellObject * const cell = content->asCellObject();
+				if (cell)
+				{
+					std::set<Client *> const &observers = m_building->getObservers();
+					for (std::set<Client *>::const_iterator j = observers.begin(); j != observers.end(); ++j)
+					{
+						ServerObject * const so = (*j)->getCharacterObject();
+						if (so)
+						{
+							CreatureObject * const creature = so->asCreatureObject();
+							if (creature)
+								m_permissions.push_back(cell->isAllowed(*creature));
+						}
+					}
+				}
+				getCellPermissions(*content);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CellPermissions::UpdateObserver::handleCellPermissionsUpdateIfNeeded(ServerObject &obj, unsigned int &permPos, std::vector<CreatureObject*> &expel)
+{
+	Container *container = ContainerInterface::getContainer(obj);
+	if (container)
+	{
+		for (ContainerIterator i = container->begin(); i != container->end(); ++i)
+		{
+			ServerObject * const content = safe_cast<ServerObject *>((*i).getObject());
+			if (content)
+			{
+				CellObject * const cell = content->asCellObject();
+				if (cell)
+				{
+					std::set<Client *> const &observers = m_building->getObservers();
+					for (std::set<Client *>::const_iterator j = observers.begin(); j != observers.end(); ++j)
+					{
+						ServerObject * const so = (*j)->getCharacterObject();
+						if (so)
+						{
+							CreatureObject * const creature = so->asCreatureObject();
+							if (creature)
+							{
+								bool const allowed = cell->isAllowed(*creature);
+								if (allowed != m_permissions[permPos])
+								{
+									LOG("CellPermUpdate", ("sending UpdateCellPermission for %s to client %s (%d)",
+										cell->getNetworkId().getValueString().c_str(),
+										(*j)->getCharacterObjectId().getValueString().c_str(),
+										allowed ? 1 : 0));
+									UpdateCellPermissionMessage const message(cell->getNetworkId(), allowed);
+									(*j)->send(message, true);
+								}
+								if (!allowed && creature->getAttachedTo() == cell)
+									expel.push_back(creature);
+								++permPos;
+							}
+						}
+					}
+				}
+				handleCellPermissionsUpdateIfNeeded(*content, permPos, expel);
+			}
+		}
+	}
+}
+
+// ======================================================================
+
+CellPermissions::ViewerChangeObserver::ViewerChangeObserver(CreatureObject *creature) :
+	m_profilerBlock("CellPermissions::ViewerChangeObserver"),
+	m_cells(),
+	m_permissions(),
+	m_creature(creature)
+{
+	if (creature)
+	{
+		Client * const client = creature->getClient();
+		if (client)
+		{
+			Client::ObservingList const &observing = client->getObserving();
+			for (Client::ObservingList::const_iterator i = observing.begin(); i != observing.end(); ++i)
+			{
+				CellObject * const cell = (*i)->asCellObject();
+				if (cell)
+				{
+					m_cells.push_back(cell);
+					m_permissions.push_back(cell->isAllowed(*creature));
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+CellPermissions::ViewerChangeObserver::~ViewerChangeObserver()
+{
+	if (!m_creature)
+		return;
+
+	// send any needed permission updates
+	Client * const client = m_creature->getClient();
+	if (client)
+	{
+		for (unsigned int i = 0; i < m_cells.size(); ++i)
+		{
+			bool const allowed = m_cells[i]->isAllowed(*m_creature);
+			if (allowed != m_permissions[i])
+			{
+				UpdateCellPermissionMessage const message(m_cells[i]->getNetworkId(), allowed);
+				client->send(message, true);
+			}
+		}
+	}
+
+	// expel from the current building if they're not allowed in anymore
+	CellObject * const cell = ContainerInterface::getContainingCellObject(*m_creature);
+	if (cell && !cell->isAllowed(*m_creature))
+	{
+		BuildingObject * const building = cell->getOwnerBuilding();
+		if (building)
+			building->expelObject(*m_creature);
+	}
+}
+
+// ======================================================================
+
+bool CellPermissions::isOnList(PermissionList const &permList, std::string const &name) // static
+{
+	for (PermissionList::const_iterator i = permList.begin(); i != permList.end(); ++i)
+		if (!_stricmp((*i).getName().c_str(), name.c_str()))
+			return true;
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool CellPermissions::isOnList(PermissionList const &permList, CreatureObject const &who) // static
+{
+	const int guildId = who.getGuildId();
+
+	// if either their name or their guild is on the list, consider them on the list
+	for (PermissionList::const_iterator i = permList.begin(); i != permList.end(); ++i)
+	{
+		const std::string& name = (*i).getName();
+
+		// objectId
+		if (name == who.getNetworkId().getValueString())
+			return true;
+
+		// first name
+		if (!_stricmp(name.c_str(), Unicode::wideToNarrow(who.getAssignedObjectFirstName()).c_str()))
+			return true;
+
+		// guilds
+		if (guildId && !_strnicmp(name.c_str(), "Guild:", 6))
+		{
+			std::string checkStr(Unicode::getTrim((name).substr(6)));
+			if (   !_stricmp(checkStr.c_str(), GuildInterface::getGuildAbbrev(guildId).c_str())
+			    || !_stricmp(checkStr.c_str(), GuildInterface::getGuildName(guildId).c_str()))
+				return true;
+		}
+	}
+	return false;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/CellPermissions.h b/engine/server/library/serverGame/src/shared/object/CellPermissions.h
new file mode 100644
index 00000000..788b6b1b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/CellPermissions.h
@@ -0,0 +1,150 @@
+// ======================================================================
+//
+// CellPermsUpdateObserver.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef CellPermissions_H
+#define CellPermissions_H
+
+// ======================================================================
+
+#include "Archive/AutoDeltaObserverOps.h"
+#include "Archive/ByteStream.h"
+#include "sharedDebug/Profiler.h"
+
+// ======================================================================
+
+class BuildingObject;
+class CellObject;
+class Client;
+class CreatureObject;
+class NetworkId;
+class ServerObject;
+class TangibleObject;
+
+// ======================================================================
+
+namespace CellPermissions
+{
+	class PermissionObject;
+};
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get(ReadIterator & source, CellPermissions::PermissionObject & target);
+	void put(ByteStream & target, const CellPermissions::PermissionObject & source);
+};
+
+//----------------------------------------------------------------------
+
+namespace CellPermissions
+{
+	//----------------------------------------------------------------------
+
+	class PermissionObject
+	{
+		friend void Archive::get( ReadIterator & source, CellPermissions::PermissionObject & target );
+		friend void Archive::put( ByteStream & target, const CellPermissions::PermissionObject & source );
+
+		friend class BuildingObject;
+		friend class CellObject;
+
+	public:
+
+		PermissionObject();
+		PermissionObject( const std::string& name );
+
+		bool operator<( PermissionObject const &rhs ) const;
+
+		// Return the permission string in the same format as it was given
+		std::string        getName() const;
+
+	private:
+
+		// We need to remember the "format" of the string that was given to us
+		enum PermissionFormat
+		{
+			PF_UNCONVERTED,     // A string read from the database that has not been converted
+			PF_CHARACTER_NAME,  // A string was given that we could convert to a network ID
+			PF_GUILD_NAME,      // A guild name was provided
+			PF_NUMERIC_VALUE,   // A numeric value was given to us (probably a network ID)
+			PF_UNKNOWN_STRING,  // A string was given to us that doesn't fit the other categories
+		};
+
+		// Intended to be used for converting entries from the database
+		PermissionObject( PermissionFormat format, const std::string& name );
+
+	private:
+
+		// Query whether the permission string has ever been "converted"
+		// NOTE: This is intended to let Building and Cell objects know whether
+		//       they need to convert data that has been loaded from the database.
+		bool               hasBeenConverted() const;
+
+	private:
+
+		PermissionFormat   m_originalPermissionFormat;
+		std::string        m_permissionString;
+	};
+
+	typedef stdset<PermissionObject>::fwd PermissionList;
+
+	//----------------------------------------------------------------------
+
+	class UpdateObserver
+	{
+	public:
+		UpdateObserver(CellObject *cell, Archive::AutoDeltaObserverOp operation);
+		UpdateObserver(TangibleObject *tangible, Archive::AutoDeltaObserverOp operation);
+		~UpdateObserver();
+
+	private:
+		UpdateObserver(UpdateObserver const &);
+		UpdateObserver &operator=(UpdateObserver const &);
+
+		void init(BuildingObject *building);
+		void getCellPermissions(ServerObject &obj);
+		void handleCellPermissionsUpdateIfNeeded(ServerObject &obj, unsigned int &permPos, stdvector<CreatureObject*>::fwd &expel);
+
+	private:
+		ProfilerAutoBlock m_profilerBlock;
+		BuildingObject *  m_building;
+		std::vector<bool> m_permissions;
+	};
+
+	//----------------------------------------------------------------------
+
+	class ViewerChangeObserver
+	{
+	public:
+		ViewerChangeObserver(CreatureObject *creature);
+		~ViewerChangeObserver();
+
+	private:
+		ViewerChangeObserver(ViewerChangeObserver const &);
+		ViewerChangeObserver &operator=(ViewerChangeObserver const &);
+
+	private:
+		ProfilerAutoBlock m_profilerBlock;
+		std::vector<CellObject *> m_cells;
+		std::vector<bool> m_permissions;
+		CreatureObject *m_creature;
+	};
+
+	//----------------------------------------------------------------------
+
+	bool isOnList(PermissionList const &permList, std::string const &name);
+	bool isOnList(PermissionList const &permList, CreatureObject const &who);
+
+	//----------------------------------------------------------------------
+};
+
+// ======================================================================
+
+#endif // CellPermissions_H
+
diff --git a/engine/server/library/serverGame/src/shared/object/CityObject.cpp b/engine/server/library/serverGame/src/shared/object/CityObject.cpp
new file mode 100644
index 00000000..a1a6041b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/CityObject.cpp
@@ -0,0 +1,2388 @@
+// ======================================================================
+//
+// CityObject.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CityObject.h"
+
+#include "serverGame/GameServer.h"
+#include "serverGame/CityController.h"
+#include "serverGame/CityInterface.h"
+#include "serverGame/CityStringParser.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GuildObject.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/ServerCityObjectTemplate.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedGame/CitizenRankDataTable.h"
+#include "sharedGame/OutOfBandPackager.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedObject/Controller.h"
+
+#include "UnicodeUtils.h"
+
+// ======================================================================
+
+namespace CityObjectNamespace
+{
+	std::string const getFactionString(uint32 factionId)
+	{
+		if (PvpData::isNeutralFactionId(factionId))
+			return "Neutral";
+		else if (PvpData::isImperialFactionId(factionId))
+			return "Imperial";
+		else if (PvpData::isRebelFactionId(factionId))
+			return "Rebel";
+
+		return "Unknown";
+	}
+};
+
+using namespace CityObjectNamespace;
+
+// ======================================================================
+
+static void replaceSetIfNeeded(char const *label, Archive::AutoDeltaSet<std::string> &oldSet, std::set<std::string> const &newSet, bool force)
+{
+	if (force || (oldSet.get() != newSet))
+	{
+		WARNING(true, ("City set %s was inconsistant on load.", label));
+
+		#ifdef _DEBUG
+			DEBUG_REPORT_LOG(true, ("Old set:\n"));
+			{
+				for (std::set<std::string>::const_iterator i = oldSet.begin(); i != oldSet.end(); ++i)
+					DEBUG_REPORT_LOG(true, ("%s\n", (*i).c_str()));
+			}
+			DEBUG_REPORT_LOG(true, ("New set:\n"));
+			{
+				for (std::set<std::string>::const_iterator i = newSet.begin(); i != newSet.end(); ++i)
+					DEBUG_REPORT_LOG(true, ("%s\n", (*i).c_str()));
+			}
+		#endif
+
+		oldSet.clear();
+		for (std::set<std::string>::const_iterator i = newSet.begin(); i != newSet.end(); ++i)
+			oldSet.insert(*i);
+	}
+}
+
+// ======================================================================
+
+CityObject::CityObject(ServerCityObjectTemplate const *newTemplate) :
+	UniverseObject(newTemplate),
+	m_cities(),
+	m_citizens(),
+	m_structures(),
+	m_citiesInfo(),
+	m_citizensInfo(),
+	m_structuresInfo(),
+	m_citizenToCityId(),
+	m_pgcRatingInfo(),
+	m_pgcRatingChroniclerId(),
+	m_gcwRegionDefenderCities(),
+	m_gcwRegionDefenderCitiesCount(),
+	m_gcwRegionDefenderCitiesVersion(0),
+	m_lowFreeCityId(1000*GameServer::getInstance().getProcessId())
+{
+	addMembersToPackages();
+
+	m_citizensInfo.setOnErase(this, &CityObject::onCitizensInfoErase);
+	m_citizensInfo.setOnInsert(this, &CityObject::onCitizensInfoInsert);
+	m_citizensInfo.setOnSet(this, &CityObject::onCitizensInfoSet);
+}
+
+// ----------------------------------------------------------------------
+
+CityObject::~CityObject()
+{
+	if (isInWorld())
+		removeFromWorld();
+}
+
+// ----------------------------------------------------------------------
+
+Controller* CityObject::createDefaultController()
+{
+	Controller* controller = new CityController(this);
+	NOT_NULL(controller);
+
+	setController(controller);
+	return controller;
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setupUniverse()
+{
+	ServerUniverse::getInstance().registerMasterCityObject(*this);
+
+	if (isAuthoritative())
+	{
+		// build the city info from data read in from DB
+
+		// disable notification while building the initial list
+		m_citizensInfo.setOnErase(NULL, NULL);
+		m_citizensInfo.setOnInsert(NULL, NULL);
+		m_citizensInfo.setOnSet(NULL, NULL);
+
+		// build cities
+		std::map<int, CityInfo> tempCities;
+		{
+			std::set<std::string> const &cities = m_cities.get();
+			for (std::set<std::string>::const_iterator i = cities.begin(); i != cities.end(); ++i)
+			{
+				int cityId;
+				std::string cityName;
+				NetworkId cityHallId;
+				std::string cityPlanet;
+				int x, z, radius;
+				int creationTime;
+				NetworkId leaderId;
+				int incomeTax, propertyTax, salesTax;
+				Vector travelLoc;
+				int travelCost;
+				bool travelInterplanetary;
+				Vector cloneLoc;
+				Vector cloneRespawn;
+				NetworkId cloneRespawnCell;
+				NetworkId cloneId;
+				if (CityStringParser::parseCityInfo(*i, cityId, cityName, cityHallId, cityPlanet, x, z, radius, creationTime, leaderId, incomeTax, propertyTax, salesTax, travelLoc, travelCost, travelInterplanetary, cloneLoc, cloneRespawn, cloneRespawnCell, cloneId))
+				{
+					CityInfo & ci = tempCities[cityId];
+					ci.setCityInfo(
+						cityName, cityHallId,
+						cityPlanet, x, z, radius,
+						leaderId,
+						incomeTax, propertyTax, salesTax,
+						travelLoc, travelCost, travelInterplanetary,
+						cloneLoc, cloneRespawn, cloneRespawnCell, cloneId);
+
+					ci.setCityCreationTime(creationTime);
+				}
+			}
+		}
+
+		// build citizens
+		{
+			NetworkId pgcChroniclerId;
+			PgcRatingInfo pgcRatingInfo;
+
+			std::set<std::string> const &citizens = m_citizens.get();
+			for (std::set<std::string>::const_iterator i = citizens.begin(); i != citizens.end(); ++i)
+			{
+				int cityId;
+				NetworkId citizenId;
+				std::string citizenName;
+				std::string citizenProfessionSkillTemplate;
+				int citizenLevel;
+				int citizenPermissions;
+				BitArray citizenRank;
+				std::string citizenTitle;
+				NetworkId citizenAllegiance;
+				if (CityStringParser::parseCitizenInfo(*i, cityId, citizenId, citizenName, citizenProfessionSkillTemplate, citizenLevel, citizenPermissions, citizenRank, citizenTitle, citizenAllegiance))
+				{
+					std::map<int, CityInfo>::iterator j = tempCities.find(cityId);
+					if (j != tempCities.end())
+					{
+						if (m_citizensInfo.find(std::make_pair(cityId, citizenId)) == m_citizensInfo.end())
+							j->second.setCitizenCount(j->second.getCitizenCount() + 1);
+
+						CitizenInfo ci;
+						ci.m_citizenName = citizenName;
+						ci.m_citizenProfessionSkillTemplate = citizenProfessionSkillTemplate;
+						ci.m_citizenLevel = citizenLevel;
+						ci.m_citizenPermissions = citizenPermissions;
+						ci.m_citizenRank = citizenRank;
+						ci.m_citizenTitle = citizenTitle;
+						ci.m_citizenAllegiance = citizenAllegiance;
+
+						m_citizensInfo.set(std::make_pair(cityId, citizenId), ci);
+
+						// if someone has the dual citizenship issue, the city
+						// that he is a mayor of should take priority
+						std::map<NetworkId, std::vector<int> >::const_iterator const iterCityOfCitizen = m_citizenToCityId.find(citizenId);
+						if (iterCityOfCitizen == m_citizenToCityId.end())
+						{
+							std::vector<int> citizenCity;
+							citizenCity.push_back(cityId);
+							m_citizenToCityId.set(citizenId, citizenCity);
+						}
+						else
+						{
+							std::vector<int> citizenCity = iterCityOfCitizen->second;
+							if (j->second.getLeaderId() == citizenId)
+							{
+								citizenCity.push_back(citizenCity.front());
+								citizenCity[0] = cityId;
+							}
+							else
+							{
+								citizenCity.push_back(cityId);
+							}
+
+							m_citizenToCityId.set(citizenId, citizenCity);
+						}
+					}
+				}
+				else if (CityStringParser::parsePgcRatingInfo(*i, pgcChroniclerId, pgcRatingInfo))
+				{
+					m_pgcRatingInfo.set(pgcChroniclerId, pgcRatingInfo);
+					m_pgcRatingChroniclerId.insert(std::make_pair(NameManager::normalizeName(pgcRatingInfo.m_chroniclerName), pgcChroniclerId));
+				}
+			}
+		}
+
+		// build structures
+		{
+			std::set<std::string> const &structures = m_structures.get();
+			for (std::set<std::string>::const_iterator i = structures.begin(); i != structures.end(); ++i)
+			{
+				int cityId;
+				NetworkId structureId;
+				int structureType;
+				bool structureValid;
+				if (CityStringParser::parseCityStructureInfo(*i, cityId, structureId, structureType, structureValid))
+				{
+					std::map<int, CityInfo>::iterator j = tempCities.find(cityId);
+					if (j != tempCities.end())
+					{
+						if (m_structuresInfo.find(std::make_pair(cityId, structureId)) == m_structuresInfo.end())
+							j->second.setStructureCount(j->second.getStructureCount() + 1);
+
+						CityStructureInfo csi;
+						csi.setStructureType(structureType);
+						csi.setStructureValid(structureValid);
+
+						m_structuresInfo.set(std::make_pair(cityId, structureId), csi);
+					}
+				}
+			}
+		}
+
+		// save off final city info
+		std::vector<std::pair<int, int> > cityIds;
+		{
+			for (std::map<int, CityInfo>::const_iterator iterCity = tempCities.begin(); iterCity != tempCities.end(); ++iterCity)
+			{
+				CityInfo const &ci = iterCity->second;
+				m_citiesInfo.set(iterCity->first, ci);
+
+				// get city ids, excluding any citys with empty names or no city hall id
+				if (!ci.getCityName().empty() && ci.getCityHallId() != NetworkId::cms_invalid && !ci.getPlanet().empty())
+					cityIds.push_back(std::make_pair(iterCity->first, ci.getCreationTime()));
+			}
+		}
+
+		// ***DO NOT*** add city travel points here, since we are not guaranteed that
+		// all the planet master objects have loaded and initialized yet; we'll wait
+		// until the cluster completes loading, and add the city travel points then
+
+		// rebuild cities
+		{
+			std::set<std::string> cities;
+			std::list<std::pair<std::string, std::string> > citiesToRetroactiveSetCreationTime;
+
+			for (std::vector<std::pair<int, int> >::const_iterator i = cityIds.begin(); i != cityIds.end(); ++i)
+			{
+				std::string citySpec;
+				getCitySpec(i->first, citySpec);
+				cities.insert(citySpec);
+
+				// see if city needs to have its creation time retroactively set
+				if (i->second <= 0)
+				{
+					time_t const retroactiveCreationTime = GameServer::getRetroactivePlayerCityCreationTime(GameServer::getInstance().getClusterName(), i->first);
+					if (retroactiveCreationTime > 0)
+					{
+						std::string updatedCitySpec;
+						CityInfo const &ci = getCityInfo(i->first);
+						CityStringParser::buildCitySpec(
+							i->first, ci.getCityName(), ci.getCityHallId(),
+							ci.getPlanet(), ci.getX(), ci.getZ(), ci.getRadius(),
+							static_cast<int>(retroactiveCreationTime),
+							ci.getLeaderId(),
+							ci.getIncomeTax(), ci.getPropertyTax(), ci.getSalesTax(),
+							ci.getTravelLoc(), ci.getTravelCost(), ci.getTravelInterplanetary(),
+							ci.getCloneLoc(), ci.getCloneRespawn(), ci.getCloneRespawnCell(), ci.getCloneId(),
+							updatedCitySpec);
+
+						citiesToRetroactiveSetCreationTime.push_back(std::make_pair(citySpec, updatedCitySpec));
+					}
+				}
+			}
+
+			if (m_cities.get() != cities)
+			{
+				// since we're going to be replacing everything, take the opportunity
+				// to set the retroactive creation time for those cities that need it
+				for (std::list<std::pair<std::string, std::string> >::const_iterator iter = citiesToRetroactiveSetCreationTime.begin(); iter != citiesToRetroactiveSetCreationTime.end(); ++iter)
+				{
+					cities.erase(iter->first);
+					cities.insert(iter->second);
+				}
+
+				replaceSetIfNeeded("cities", m_cities, cities, true);
+			}
+			else
+			{
+				// set the retroactive creation time for those cities that need it
+				for (std::list<std::pair<std::string, std::string> >::const_iterator iter = citiesToRetroactiveSetCreationTime.begin(); iter != citiesToRetroactiveSetCreationTime.end(); ++iter)
+				{
+					m_cities.erase(iter->first);
+					m_cities.insert(iter->second);
+				}
+			}
+		}
+
+		// rebuild citizens
+		{
+			std::set<std::string> citizens;
+			for (std::vector<std::pair<int, int> >::const_iterator i = cityIds.begin(); i != cityIds.end(); ++i)
+			{
+				std::vector<NetworkId> citizenIds;
+				getCitizenIds(i->first, citizenIds);
+				for (std::vector<NetworkId>::const_iterator j = citizenIds.begin(); j != citizenIds.end(); ++j)
+				{
+					std::string citizenSpec;
+					getCitizenSpec(i->first, *j, citizenSpec);
+					citizens.insert(citizenSpec);
+				}
+			}
+
+			for (std::map<NetworkId, PgcRatingInfo>::const_iterator iter = m_pgcRatingInfo.begin(); iter != m_pgcRatingInfo.end(); ++iter)
+			{
+				std::string pgcRatingSpec;
+				CityStringParser::buildPgcRatingSpec(iter->first, iter->second, pgcRatingSpec);
+				citizens.insert(pgcRatingSpec);
+			}
+
+			replaceSetIfNeeded("citizens", m_citizens, citizens, false);
+		}
+
+		// rebuild structures
+		{
+			std::set<std::string> structures;
+			for (std::vector<std::pair<int, int> >::const_iterator i = cityIds.begin(); i != cityIds.end(); ++i)
+			{
+				std::vector<NetworkId> structureIds;
+				getCityStructureIds(i->first, structureIds);
+				for (std::vector<NetworkId>::const_iterator j = structureIds.begin(); j != structureIds.end(); ++j)
+				{
+					std::string structureSpec;
+					getCityStructureSpec(i->first, *j, structureSpec);
+					structures.insert(structureSpec);
+				}
+			}
+			replaceSetIfNeeded("structures", m_structures, structures, false);
+		}
+
+		// re-enable notification
+		m_citizensInfo.setOnErase(this, &CityObject::onCitizensInfoErase);
+		m_citizensInfo.setOnInsert(this, &CityObject::onCitizensInfoInsert);
+		m_citizensInfo.setOnSet(this, &CityObject::onCitizensInfoSet);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+{
+	UniverseObject::getAttributes(data);
+}
+
+// ----------------------------------------------------------------------
+
+int CityObject::nextFreeCityId()
+{
+	// Note: this must return a city id which is not only unused, but also one
+	// that cannot have collisions with a free cityId generated by another
+	// server, even during the same frame.  This is because we need immediate
+	// feedback of what the newly created city's ID is, regardless of whether
+	// the master city object is authoritative on this server.
+	// In order to do this, we find the lowest unused id starting from
+	// 1000 * our process id + 1.  We also need to assure that if multiple citys
+	// are created from the same process, they do not collide in the time before
+	// the creation actually takes place, since we may not have up to date
+	// city info if we are not authoritative.
+
+	do
+	{
+		++m_lowFreeCityId;
+	}
+	while (cityExists(m_lowFreeCityId));
+	return m_lowFreeCityId;
+}
+
+// ----------------------------------------------------------------------
+
+int CityObject::createCity(std::string const &cityName, NetworkId const &cityHallId, std::string const &cityPlanet, int x, int z, int radius, NetworkId const &leaderId, int incomeTax, int propertyTax, int salesTax, Vector const &travelLoc, int travelCost, bool travelInterplanetary, Vector const &cloneLoc, Vector const &cloneRespawn, NetworkId const &cloneRespawnCell, NetworkId const &cloneId, int cityId)
+{
+	if (cityId == 0)
+		cityId = nextFreeCityId();
+
+	if (!isAuthoritative())
+	{
+		CityInfo ci;
+		ci.setCityInfo(
+			cityName, cityHallId,
+			cityPlanet, x, z, radius,
+			leaderId,
+			incomeTax, propertyTax, salesTax,
+			travelLoc, travelCost, travelInterplanetary,
+			cloneLoc, cloneRespawn, cloneRespawnCell, cloneId);
+
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_cityCreate,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<int, CityInfo> >(std::make_pair(cityId, ci)),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		CityInfo ci;
+		ci.setCityInfo(
+			cityName, cityHallId,
+			cityPlanet, x, z, radius,
+			leaderId,
+			incomeTax, propertyTax, salesTax,
+			travelLoc, travelCost, travelInterplanetary,
+			cloneLoc, cloneRespawn, cloneRespawnCell, cloneId);
+		ci.setCityCreationTime(static_cast<int>(::time(NULL)));
+		m_citiesInfo.set(cityId, ci);
+
+		std::string citySpec;
+		getCitySpec(cityId, citySpec);
+		m_cities.insert(citySpec);
+
+		// add travel point if the new city can support it
+		if ((radius >= 400) && (travelCost > 0))
+		{
+			PlanetObject *planet = ServerUniverse::getInstance().getPlanetByName(cityPlanet);
+			if (planet)
+			{
+				planet->addTravelPoint(
+					cityName,
+					travelLoc,
+					travelCost,
+					travelInterplanetary,
+					TravelPoint::TPT_PC_Shuttleport);
+			}
+		}
+	}
+
+	return cityId;
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::removeCity(int cityId)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_cityRemove,
+				0.0f,
+				new MessageQueueGenericValueType<int>(cityId),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		// remove citizens
+		{
+			std::vector<NetworkId> citizenIds;
+			getCitizenIds(cityId, citizenIds);
+			for (std::vector<NetworkId>::const_iterator i = citizenIds.begin(); i != citizenIds.end(); ++i)
+			{
+				std::string citizenSpec;
+				getCitizenSpec(cityId, *i, citizenSpec);
+				m_citizens.erase(citizenSpec);
+
+				m_citizensInfo.erase(std::make_pair(cityId, *i));
+
+				std::map<NetworkId, std::vector<int> >::const_iterator const iterCitizenCityId = m_citizenToCityId.find(*i);
+				if (iterCitizenCityId != m_citizenToCityId.end())
+				{
+					std::vector<int> citizenCityId = iterCitizenCityId->second;
+					std::vector<int>::iterator const iterFindCityId = std::find(citizenCityId.begin(), citizenCityId.end(), cityId);
+					if (iterFindCityId != citizenCityId.end())
+					{
+						citizenCityId.erase(iterFindCityId);
+
+						if (citizenCityId.empty())
+							m_citizenToCityId.erase(*i);
+						else
+							m_citizenToCityId.set(*i, citizenCityId);
+					}
+				}
+
+				// notify (now former) citizen
+				char buffer[32];
+				snprintf(buffer, sizeof(buffer)-1, "%d", cityId);
+				buffer[sizeof(buffer)-1] = '\0';
+
+				MessageToQueue::getInstance().sendMessageToC(*i,
+					"C++CityRemoveCitizen",
+					buffer,
+					0,
+					false);
+			}
+		}
+		// remove structures
+		{
+			std::vector<NetworkId> structureIds;
+			getCityStructureIds(cityId, structureIds);
+			for (std::vector<NetworkId>::const_iterator i = structureIds.begin(); i != structureIds.end(); ++i)
+			{
+				std::string structureSpec;
+				getCityStructureSpec(cityId, *i, structureSpec);
+				m_structures.erase(structureSpec);
+
+				m_structuresInfo.erase(std::make_pair(cityId, *i));
+			}
+		}
+		// remove city
+		{
+			// remove travel point if the city has one
+			std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+			if (iterCityInfo != m_citiesInfo.end())
+			{
+				if ((iterCityInfo->second.getRadius() >= 400) && (iterCityInfo->second.getTravelCost() > 0))
+				{
+					PlanetObject *planet = ServerUniverse::getInstance().getPlanetByName(iterCityInfo->second.getPlanet());
+					if (planet)
+					{
+						planet->removeTravelPoint(iterCityInfo->second.getCityName());
+					}
+				}
+
+				std::string const & gcwDefenderRegion = iterCityInfo->second.getGcwDefenderRegion();
+				if (!gcwDefenderRegion.empty())
+				{
+					removeGcwRegionDefenderCity(gcwDefenderRegion, cityId, iterCityInfo->second.getFaction());
+				}
+			}
+
+			// Note: because city specs contain float values, we need to be sure to pull them from
+			// the actual string list of cities rather than building it when erasing.
+			std::string citySpec;
+			if (findCitySpec(cityId, citySpec))
+				m_cities.erase(citySpec);
+
+			m_citiesInfo.erase(cityId);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::removeCitizen(int cityId, NetworkId const &citizenId)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_cityRemoveCitizen,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<int, NetworkId> >(std::make_pair(cityId, citizenId)),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		std::string citizenSpec;
+		if (getCitizenSpec(cityId, citizenId, citizenSpec) && !citizenSpec.empty())
+		{
+			m_citizens.erase(citizenSpec);
+
+			m_citizensInfo.erase(std::make_pair(cityId, citizenId));
+
+			std::map<NetworkId, std::vector<int> >::const_iterator const iterCitizenCityId = m_citizenToCityId.find(citizenId);
+			if (iterCitizenCityId != m_citizenToCityId.end())
+			{
+				std::vector<int> citizenCityId = iterCitizenCityId->second;
+				std::vector<int>::iterator const iterFindCityId = std::find(citizenCityId.begin(), citizenCityId.end(), cityId);
+				if (iterFindCityId != citizenCityId.end())
+				{
+					citizenCityId.erase(iterFindCityId);
+
+					if (citizenCityId.empty())
+						m_citizenToCityId.erase(citizenId);
+					else
+						m_citizenToCityId.set(citizenId, citizenCityId);
+
+					// notify (now former) citizen
+					char buffer[32];
+					snprintf(buffer, sizeof(buffer)-1, "%d", cityId);
+					buffer[sizeof(buffer)-1] = '\0';
+
+					MessageToQueue::getInstance().sendMessageToC(citizenId,
+						"C++CityRemoveCitizen",
+						buffer,
+						0,
+						false);
+				}
+			}
+
+			std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+			if (iterCityInfo != m_citiesInfo.end())
+			{
+				CityInfo updatedCi = iterCityInfo->second;
+				updatedCi.setCitizenCount(std::max(0, (updatedCi.getCitizenCount() - 1)));
+				m_citiesInfo.set(cityId, updatedCi);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::removeCityStructure(int cityId, NetworkId const &structureId)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_cityRemoveStructure,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<int, NetworkId> >(std::make_pair(cityId, structureId)),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		std::string structureSpec;
+		if (getCityStructureSpec(cityId, structureId, structureSpec) && !structureSpec.empty())
+		{
+			m_structures.erase(structureSpec);
+
+			m_structuresInfo.erase(std::make_pair(cityId, structureId));
+
+			std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+			if (iterCityInfo != m_citiesInfo.end())
+			{
+				CityInfo updatedCi = iterCityInfo->second;
+				updatedCi.setStructureCount(std::max(0, (updatedCi.getStructureCount() - 1)));
+				m_citiesInfo.set(cityId, updatedCi);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCityName(int cityId, std::string const &cityName)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetName,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<int, std::string> >(std::make_pair(cityId, cityName)),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else if (cityExists(cityId))
+	{
+		CityInfo const &ci = getCityInfo(cityId);
+		std::string newCitySpec;
+		CityStringParser::buildCitySpec(
+			cityId, cityName, ci.getCityHallId(),
+			ci.getPlanet(), ci.getX(), ci.getZ(), ci.getRadius(),
+			ci.getCreationTime(),
+			ci.getLeaderId(),
+			ci.getIncomeTax(), ci.getPropertyTax(), ci.getSalesTax(),
+			ci.getTravelLoc(), ci.getTravelCost(), ci.getTravelInterplanetary(),
+			ci.getCloneLoc(), ci.getCloneRespawn(), ci.getCloneRespawnCell(), ci.getCloneId(),
+			newCitySpec);
+		setCitySpec(cityId, newCitySpec);
+
+		std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+		if (iterCityInfo != m_citiesInfo.end())
+		{
+			CityInfo updatedCi = iterCityInfo->second;
+			updatedCi.setCityName(cityName);
+			m_citiesInfo.set(cityId, updatedCi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCityHall(int cityId, NetworkId const &cityHallId)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetCityHall,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<int, NetworkId> >(std::make_pair(cityId, cityHallId)),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else if (cityExists(cityId))
+	{
+		CityInfo const &ci = getCityInfo(cityId);
+		std::string newCitySpec;
+		CityStringParser::buildCitySpec(
+			cityId, ci.getCityName(), cityHallId,
+			ci.getPlanet(), ci.getX(), ci.getZ(), ci.getRadius(),
+			ci.getCreationTime(),
+			ci.getLeaderId(),
+			ci.getIncomeTax(), ci.getPropertyTax(), ci.getSalesTax(),
+			ci.getTravelLoc(), ci.getTravelCost(), ci.getTravelInterplanetary(),
+			ci.getCloneLoc(), ci.getCloneRespawn(), ci.getCloneRespawnCell(), ci.getCloneId(),
+			newCitySpec);
+		setCitySpec(cityId, newCitySpec);
+
+		std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+		if (iterCityInfo != m_citiesInfo.end())
+		{
+			CityInfo updatedCi = iterCityInfo->second;
+			updatedCi.setCityHall(cityHallId);
+			m_citiesInfo.set(cityId, updatedCi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCityLocation(int cityId, std::string const &cityPlanet, int x, int z)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetLocation,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<int, std::pair<std::string, std::pair<int, int> > > >(std::make_pair(cityId, std::make_pair(cityPlanet, std::make_pair(x, z)))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else if (cityExists(cityId))
+	{
+		CityInfo const &ci = getCityInfo(cityId);
+		std::string newCitySpec;
+		CityStringParser::buildCitySpec(
+			cityId, ci.getCityName(), ci.getCityHallId(),
+			cityPlanet, x, z, ci.getRadius(),
+			ci.getCreationTime(),
+			ci.getLeaderId(),
+			ci.getIncomeTax(), ci.getPropertyTax(), ci.getSalesTax(),
+			ci.getTravelLoc(), ci.getTravelCost(), ci.getTravelInterplanetary(),
+			ci.getCloneLoc(), ci.getCloneRespawn(), ci.getCloneRespawnCell(), ci.getCloneId(),
+			newCitySpec);
+		setCitySpec(cityId, newCitySpec);
+
+		std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+		if (iterCityInfo != m_citiesInfo.end())
+		{
+			CityInfo updatedCi = iterCityInfo->second;
+			updatedCi.setCityLocation(cityPlanet, x, z);
+			m_citiesInfo.set(cityId, updatedCi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCityRadius(int cityId, int radius)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetRadius,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<int, int> >(std::make_pair(cityId, radius)),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else if (cityExists(cityId))
+	{
+		CityInfo const &ci = getCityInfo(cityId);
+
+		// add or remove travel point if the city can support it or can no longer support it
+		if ((ci.getRadius() >= 400) && (radius < 400) && (ci.getTravelCost() > 0))
+		{
+			PlanetObject *planet = ServerUniverse::getInstance().getPlanetByName(ci.getPlanet());
+			if (planet)
+			{
+				planet->removeTravelPoint(ci.getCityName());
+			}
+		}
+		else if ((ci.getRadius() < 400) && (radius >= 400) && (ci.getTravelCost() > 0))
+		{
+			PlanetObject *planet = ServerUniverse::getInstance().getPlanetByName(ci.getPlanet());
+			if (planet)
+			{
+				planet->addTravelPoint(
+					ci.getCityName(),
+					ci.getTravelLoc(),
+					ci.getTravelCost(),
+					ci.getTravelInterplanetary(),
+					TravelPoint::TPT_PC_Shuttleport);
+			}
+		}
+
+		std::string newCitySpec;
+		CityStringParser::buildCitySpec(
+			cityId, ci.getCityName(), ci.getCityHallId(),
+			ci.getPlanet(), ci.getX(), ci.getZ(), radius,
+			ci.getCreationTime(),
+			ci.getLeaderId(),
+			ci.getIncomeTax(), ci.getPropertyTax(), ci.getSalesTax(),
+			ci.getTravelLoc(), ci.getTravelCost(), ci.getTravelInterplanetary(),
+			ci.getCloneLoc(), ci.getCloneRespawn(), ci.getCloneRespawnCell(), ci.getCloneId(),
+			newCitySpec);
+		setCitySpec(cityId, newCitySpec);
+
+		std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+		if (iterCityInfo != m_citiesInfo.end())
+		{
+			CityInfo updatedCi = iterCityInfo->second;
+			updatedCi.setCityRadius(radius);
+			m_citiesInfo.set(cityId, updatedCi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCityFaction(int cityId, uint32 faction, bool notifyCitizens)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetFaction,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<int, std::pair<uint32, bool> > >(std::make_pair(cityId, std::make_pair(faction, notifyCitizens))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else if (cityExists(cityId))
+	{
+		std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+		if (iterCityInfo != m_citiesInfo.end())
+		{
+			CityInfo updatedCi = iterCityInfo->second;
+			uint32 const oldFaction = updatedCi.getFaction();
+			updatedCi.setCityFaction(faction);
+			m_citiesInfo.set(cityId, updatedCi);
+
+			// if city faction has changed, send mail to citizens
+			if ((oldFaction != faction) && notifyCitizens)
+			{
+				static const Unicode::String subject = Unicode::narrowToWide("@" + StringId("city/city", "mail_subject_city_faction_changed").getCanonicalRepresentation());
+
+				ProsePackage pp;
+				pp.stringId = StringId("city/city", "mail_body_city_faction_changed");
+				pp.actor.str = Unicode::narrowToWide(updatedCi.getCityName());
+				pp.target.str = Unicode::narrowToWide(getFactionString(oldFaction));
+				pp.other.str = Unicode::narrowToWide(getFactionString(faction));
+
+				Unicode::String oob;
+				OutOfBandPackager::pack(pp, -1, oob);
+
+				CityInterface::mailToCitizens(cityId, subject, Unicode::emptyString, oob);
+			}
+
+			std::string const & gcwDefenderRegion = updatedCi.getGcwDefenderRegion();
+			if ((oldFaction != faction) && !gcwDefenderRegion.empty())
+			{
+				removeGcwRegionDefenderCity(gcwDefenderRegion, cityId, oldFaction);
+				addGcwRegionDefenderCity(gcwDefenderRegion, cityId, faction);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCityGcwDefenderRegion(int cityId, std::string const &gcwDefenderRegion, int timeJoined, bool notifyCitizens)
+{
+	if (!gcwDefenderRegion.empty())
+	{
+		Pvp::GcwScoreCategory const * const gcwScoreCategory = Pvp::getGcwScoreCategory(gcwDefenderRegion);
+		if (!gcwScoreCategory || !gcwScoreCategory->gcwRegionDefender)
+			return;
+	}
+
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetGcwDefenderRegion,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<std::pair<int, std::string>, std::pair<int, bool> > >(std::make_pair(std::make_pair(cityId, gcwDefenderRegion), std::make_pair(timeJoined, notifyCitizens))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else if (cityExists(cityId))
+	{
+		std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+		if (iterCityInfo != m_citiesInfo.end())
+		{
+			CityInfo updatedCi = iterCityInfo->second;
+			std::string const oldGcwDefenderRegion = updatedCi.getGcwDefenderRegion();
+			updatedCi.setCityGcwDefenderRegion(gcwDefenderRegion);
+			updatedCi.setCityTimeJoinedGcwDefenderRegion(timeJoined);
+			m_citiesInfo.set(cityId, updatedCi);
+
+			// if city GCW defender region has changed, send mail to citizens
+			if ((oldGcwDefenderRegion != gcwDefenderRegion) && notifyCitizens)
+			{
+				static const Unicode::String subject = Unicode::narrowToWide("@" + StringId("city/city", "mail_subject_city_gcw_defender_region_changed").getCanonicalRepresentation());
+
+				ProsePackage pp;
+				pp.stringId = StringId("city/city", "mail_body_city_gcw_defender_region_changed");
+				pp.actor.str = Unicode::narrowToWide(updatedCi.getCityName());
+				pp.target.str = Unicode::narrowToWide(oldGcwDefenderRegion.empty() ? "(None)" : ("@" + StringId("gcw_regions", oldGcwDefenderRegion).getCanonicalRepresentation()));
+				pp.other.str = Unicode::narrowToWide(gcwDefenderRegion.empty() ? "(None)" : ("@" + StringId("gcw_regions", gcwDefenderRegion).getCanonicalRepresentation()));
+
+				Unicode::String oob;
+				OutOfBandPackager::pack(pp, -1, oob);
+
+				CityInterface::mailToCitizens(cityId, subject, Unicode::emptyString, oob);
+			}
+
+			if (oldGcwDefenderRegion != gcwDefenderRegion)
+			{
+				removeGcwRegionDefenderCity(oldGcwDefenderRegion, cityId, updatedCi.getFaction());
+				addGcwRegionDefenderCity(gcwDefenderRegion, cityId, updatedCi.getFaction());
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCityCreationTime(int cityId, int creationTime)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetCreationTime,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<int, int> >(std::make_pair(cityId, creationTime)),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else if (cityExists(cityId))
+	{
+		CityInfo const &ci = getCityInfo(cityId);
+		std::string newCitySpec;
+		CityStringParser::buildCitySpec(
+			cityId, ci.getCityName(), ci.getCityHallId(),
+			ci.getPlanet(), ci.getX(), ci.getZ(), ci.getRadius(),
+			creationTime,
+			ci.getLeaderId(),
+			ci.getIncomeTax(), ci.getPropertyTax(), ci.getSalesTax(),
+			ci.getTravelLoc(), ci.getTravelCost(), ci.getTravelInterplanetary(),
+			ci.getCloneLoc(), ci.getCloneRespawn(), ci.getCloneRespawnCell(), ci.getCloneId(),
+			newCitySpec);
+		setCitySpec(cityId, newCitySpec);
+
+		std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+		if (iterCityInfo != m_citiesInfo.end())
+		{
+			CityInfo updatedCi = iterCityInfo->second;
+			updatedCi.setCityCreationTime(creationTime);
+			m_citiesInfo.set(cityId, updatedCi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCityLeader(int cityId, NetworkId const &leaderId)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetLeader,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<int, NetworkId> >(std::make_pair(cityId, leaderId)),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else if (cityExists(cityId))
+	{
+		CityInfo const &ci = getCityInfo(cityId);
+		std::string newCitySpec;
+		CityStringParser::buildCitySpec(
+			cityId, ci.getCityName(), ci.getCityHallId(),
+			ci.getPlanet(), ci.getX(), ci.getZ(), ci.getRadius(),
+			ci.getCreationTime(),
+			leaderId,
+			ci.getIncomeTax(), ci.getPropertyTax(), ci.getSalesTax(),
+			ci.getTravelLoc(), ci.getTravelCost(), ci.getTravelInterplanetary(),
+			ci.getCloneLoc(), ci.getCloneRespawn(), ci.getCloneRespawnCell(), ci.getCloneId(),
+			newCitySpec);
+		setCitySpec(cityId, newCitySpec);
+
+		std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+		if (iterCityInfo != m_citiesInfo.end())
+		{
+			CityInfo updatedCi = iterCityInfo->second;
+			updatedCi.setCityLeader(leaderId);
+			m_citiesInfo.set(cityId, updatedCi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCityIncomeTax(int cityId, int incomeTax)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetIncomeTax,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<int, int> >(std::make_pair(cityId, incomeTax)),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else if (cityExists(cityId))
+	{
+		CityInfo const &ci = getCityInfo(cityId);
+		std::string newCitySpec;
+		CityStringParser::buildCitySpec(
+			cityId, ci.getCityName(), ci.getCityHallId(),
+			ci.getPlanet(), ci.getX(), ci.getZ(), ci.getRadius(),
+			ci.getCreationTime(),
+			ci.getLeaderId(),
+			incomeTax, ci.getPropertyTax(), ci.getSalesTax(),
+			ci.getTravelLoc(), ci.getTravelCost(), ci.getTravelInterplanetary(),
+			ci.getCloneLoc(), ci.getCloneRespawn(), ci.getCloneRespawnCell(), ci.getCloneId(),
+			newCitySpec);
+		setCitySpec(cityId, newCitySpec);
+
+		std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+		if (iterCityInfo != m_citiesInfo.end())
+		{
+			CityInfo updatedCi = iterCityInfo->second;
+			updatedCi.setCityIncomeTax(incomeTax);
+			m_citiesInfo.set(cityId, updatedCi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCityPropertyTax(int cityId, int propertyTax)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetPropertyTax,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<int, int> >(std::make_pair(cityId, propertyTax)),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else if (cityExists(cityId))
+	{
+		CityInfo const &ci = getCityInfo(cityId);
+		std::string newCitySpec;
+		CityStringParser::buildCitySpec(
+			cityId, ci.getCityName(), ci.getCityHallId(),
+			ci.getPlanet(), ci.getX(), ci.getZ(), ci.getRadius(),
+			ci.getCreationTime(),
+			ci.getLeaderId(),
+			ci.getIncomeTax(), propertyTax, ci.getSalesTax(),
+			ci.getTravelLoc(), ci.getTravelCost(), ci.getTravelInterplanetary(),
+			ci.getCloneLoc(), ci.getCloneRespawn(), ci.getCloneRespawnCell(), ci.getCloneId(),
+			newCitySpec);
+		setCitySpec(cityId, newCitySpec);
+
+		std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+		if (iterCityInfo != m_citiesInfo.end())
+		{
+			CityInfo updatedCi = iterCityInfo->second;
+			updatedCi.setCityPropertyTax(propertyTax);
+			m_citiesInfo.set(cityId, updatedCi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCitySalesTax(int cityId, int salesTax)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetSalesTax,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<int, int> >(std::make_pair(cityId, salesTax)),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else if (cityExists(cityId))
+	{
+		CityInfo const &ci = getCityInfo(cityId);
+		std::string newCitySpec;
+		CityStringParser::buildCitySpec(
+			cityId, ci.getCityName(), ci.getCityHallId(),
+			ci.getPlanet(), ci.getX(), ci.getZ(), ci.getRadius(),
+			ci.getCreationTime(),
+			ci.getLeaderId(),
+			ci.getIncomeTax(), ci.getPropertyTax(), salesTax,
+			ci.getTravelLoc(), ci.getTravelCost(), ci.getTravelInterplanetary(),
+			ci.getCloneLoc(), ci.getCloneRespawn(), ci.getCloneRespawnCell(), ci.getCloneId(),
+			newCitySpec);
+		setCitySpec(cityId, newCitySpec);
+
+		std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+		if (iterCityInfo != m_citiesInfo.end())
+		{
+			CityInfo updatedCi = iterCityInfo->second;
+			updatedCi.setCitySalesTax(salesTax);
+			m_citiesInfo.set(cityId, updatedCi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCityTravelInfo(int cityId, Vector const &travelLoc, int travelCost, bool travelInterplanetary)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetTravelInfo,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<int, std::pair<Vector, std::pair<int, bool> > > >(std::make_pair(cityId, std::make_pair(travelLoc, std::make_pair(travelCost, travelInterplanetary)))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else if (cityExists(cityId))
+	{
+		CityInfo const &ci = getCityInfo(cityId);
+
+		// add or remove travel point if the city can support it or can no longer support it
+		bool travelPointAdded = false;
+		bool const travelPointChanged = ((ci.getTravelLoc() != travelLoc) || (ci.getTravelCost() != travelCost) || (ci.getTravelInterplanetary() != travelInterplanetary));
+		if ((ci.getRadius() >= 400) && (ci.getTravelCost() > 0) && (travelCost <= 0))
+		{
+			PlanetObject *planet = ServerUniverse::getInstance().getPlanetByName(ci.getPlanet());
+			if (planet)
+			{
+				planet->removeTravelPoint(ci.getCityName());
+			}
+		}
+		else if ((ci.getRadius() >= 400) && (ci.getTravelCost() <= 0) && (travelCost > 0))
+		{
+			PlanetObject *planet = ServerUniverse::getInstance().getPlanetByName(ci.getPlanet());
+			if (planet)
+			{
+				planet->addTravelPoint(
+					ci.getCityName(),
+					travelLoc,
+					travelCost,
+					travelInterplanetary,
+					TravelPoint::TPT_PC_Shuttleport);
+
+				travelPointAdded = true;
+			}
+		}
+
+		// see if we need to update the travel point
+		if (travelPointChanged && !travelPointAdded && (ci.getRadius() >= 400) && (travelCost > 0))
+		{
+			PlanetObject *planet = ServerUniverse::getInstance().getPlanetByName(ci.getPlanet());
+			if (planet)
+			{
+				planet->removeTravelPoint(ci.getCityName());
+
+				planet->addTravelPoint(
+					ci.getCityName(),
+					travelLoc,
+					travelCost,
+					travelInterplanetary,
+					TravelPoint::TPT_PC_Shuttleport);
+			}
+		}
+
+		std::string newCitySpec;
+		CityStringParser::buildCitySpec(
+			cityId, ci.getCityName(), ci.getCityHallId(),
+			ci.getPlanet(), ci.getX(), ci.getZ(), ci.getRadius(),
+			ci.getCreationTime(),
+			ci.getLeaderId(),
+			ci.getIncomeTax(), ci.getPropertyTax(), ci.getSalesTax(),
+			travelLoc, travelCost, travelInterplanetary,
+			ci.getCloneLoc(), ci.getCloneRespawn(), ci.getCloneRespawnCell(), ci.getCloneId(),
+			newCitySpec);
+		setCitySpec(cityId, newCitySpec);
+
+		std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+		if (iterCityInfo != m_citiesInfo.end())
+		{
+			CityInfo updatedCi = iterCityInfo->second;
+			updatedCi.setCityTravelInfo(travelLoc, travelCost, travelInterplanetary);
+			m_citiesInfo.set(cityId, updatedCi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCityCloneInfo(int cityId, Vector const &cloneLoc, Vector const &cloneRespawn, NetworkId const &cloneRespawnCell, NetworkId const &cloneId)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetCloneInfo,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<int, std::pair<Vector, std::pair<Vector, std::pair<NetworkId, NetworkId> > > > >(std::make_pair(cityId, std::make_pair(cloneLoc, std::make_pair(cloneRespawn, std::make_pair(cloneRespawnCell, cloneId))))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else if (cityExists(cityId))
+	{
+		CityInfo const &ci = getCityInfo(cityId);
+		std::string newCitySpec;
+		CityStringParser::buildCitySpec(
+			cityId, ci.getCityName(), ci.getCityHallId(),
+			ci.getPlanet(), ci.getX(), ci.getZ(), ci.getRadius(),
+			ci.getCreationTime(),
+			ci.getLeaderId(),
+			ci.getIncomeTax(), ci.getPropertyTax(), ci.getSalesTax(),
+			ci.getTravelLoc(), ci.getTravelCost(), ci.getTravelInterplanetary(),
+			cloneLoc, cloneRespawn, cloneRespawnCell, cloneId,
+			newCitySpec);
+		setCitySpec(cityId, newCitySpec);
+
+		std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+		if (iterCityInfo != m_citiesInfo.end())
+		{
+			CityInfo updatedCi = iterCityInfo->second;
+			updatedCi.setCityCloneInfo(cloneLoc, cloneRespawn, cloneRespawnCell, cloneId);
+			m_citiesInfo.set(cityId, updatedCi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCitizen(int cityId, NetworkId const &citizenId, std::string const &citizenName, NetworkId const &allegiance, int permissions)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetCitizen,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::pair<NetworkId, int> > > >(std::make_pair(std::make_pair(cityId, citizenId), std::make_pair(citizenName, std::make_pair(allegiance, permissions)))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		std::string oldCitizenSpec, newCitizenSpec;
+		CitizenInfo const * existingInfo = getCitizenSpec(cityId, citizenId, oldCitizenSpec);
+
+		CityStringParser::buildCitizenSpec(cityId, citizenId, citizenName, (existingInfo ? existingInfo->m_citizenProfessionSkillTemplate : std::string()), (existingInfo ? existingInfo->m_citizenLevel : 0), permissions, (existingInfo ? existingInfo->m_citizenRank : BitArray()), (existingInfo ? existingInfo->m_citizenTitle : std::string()), allegiance, newCitizenSpec);
+		if (oldCitizenSpec != newCitizenSpec)
+			setCitizen(oldCitizenSpec, newCitizenSpec);
+
+		if (!existingInfo)
+		{
+			std::map<NetworkId, std::vector<int> >::const_iterator const iterCityOfCitizen = m_citizenToCityId.find(citizenId);
+			if (iterCityOfCitizen == m_citizenToCityId.end())
+			{
+				std::vector<int> citizenCity;
+				citizenCity.push_back(cityId);
+				m_citizenToCityId.set(citizenId, citizenCity);
+			}
+			else
+			{
+				std::vector<int> citizenCity = iterCityOfCitizen->second;
+
+				// if someone has the dual citizenship issue, the city
+				// that he is a mayor of should take priority
+				bool mayor = false;
+				{
+					std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+					if ((iterCityInfo != m_citiesInfo.end()) && (iterCityInfo->second.getLeaderId() == citizenId))
+						mayor = true;
+				}
+
+				if (mayor)
+				{
+					citizenCity.push_back(citizenCity.front());
+					citizenCity[0] = cityId;
+				}
+				else
+				{
+					citizenCity.push_back(cityId);
+				}
+
+				m_citizenToCityId.set(citizenId, citizenCity);
+			}
+
+			std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+			if (iterCityInfo != m_citiesInfo.end())
+			{
+				CityInfo updatedCi = iterCityInfo->second;
+				updatedCi.setCitizenCount(updatedCi.getCitizenCount() + 1);
+				m_citiesInfo.set(cityId, updatedCi);
+			}
+
+			// notify new citizen
+			char buffer[32];
+			snprintf(buffer, sizeof(buffer)-1, "%d", cityId);
+			buffer[sizeof(buffer)-1] = '\0';
+
+			MessageToQueue::getInstance().sendMessageToC(citizenId,
+				"C++CityAddCitizen",
+				buffer,
+				0,
+				false);
+		}
+
+		CitizenInfo updatedInfo;
+		updatedInfo.m_citizenName = citizenName;
+		updatedInfo.m_citizenProfessionSkillTemplate = (existingInfo ? existingInfo->m_citizenProfessionSkillTemplate : std::string());
+		updatedInfo.m_citizenLevel = (existingInfo ? existingInfo->m_citizenLevel : 0);
+		updatedInfo.m_citizenPermissions = permissions;
+		updatedInfo.m_citizenRank = (existingInfo ? existingInfo->m_citizenRank : BitArray());
+		updatedInfo.m_citizenTitle = (existingInfo ? existingInfo->m_citizenTitle : std::string());
+		updatedInfo.m_citizenAllegiance = allegiance;
+
+		m_citizensInfo.set(std::make_pair(cityId, citizenId), updatedInfo);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCitizenProfessionInfo(int cityId, NetworkId const &citizenId, std::string const &citizenProfessionSkillTemplate, int citizenLevel)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetCitizenProfessionInfo,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > >(std::make_pair(std::make_pair(cityId, citizenId), std::make_pair(citizenProfessionSkillTemplate, citizenLevel))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		CitizenInfo const *info = getCitizenInfo(cityId, citizenId);
+		if (info)
+		{
+			std::string oldCitizenSpec, newCitizenSpec;
+			CityStringParser::buildCitizenSpec(cityId, citizenId, info->m_citizenName, info->m_citizenProfessionSkillTemplate, info->m_citizenLevel, info->m_citizenPermissions, info->m_citizenRank, info->m_citizenTitle, info->m_citizenAllegiance, oldCitizenSpec);
+			CityStringParser::buildCitizenSpec(cityId, citizenId, info->m_citizenName, citizenProfessionSkillTemplate, citizenLevel, info->m_citizenPermissions, info->m_citizenRank, info->m_citizenTitle, info->m_citizenAllegiance, newCitizenSpec);
+			if (oldCitizenSpec != newCitizenSpec)
+				setCitizen(oldCitizenSpec, newCitizenSpec);
+
+			CitizenInfo updatedInfo = *info;
+			updatedInfo.m_citizenProfessionSkillTemplate = citizenProfessionSkillTemplate;
+			updatedInfo.m_citizenLevel = citizenLevel;
+
+			m_citizensInfo.set(std::make_pair(cityId, citizenId), updatedInfo);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::addCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetCitizenAddRank,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > >(std::make_pair(rankName, std::make_pair(citizenId, cityId))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		CitizenInfo const *info = getCitizenInfo(cityId, citizenId);
+		if (info)
+		{
+			CitizenRankDataTable::CitizenRank const * rankData = CitizenRankDataTable::getRank(rankName);
+			if (rankData && !info->m_citizenRank.testBit(rankData->slotId))
+			{
+				BitArray rank = info->m_citizenRank;
+				rank.setBit(rankData->slotId);
+
+				std::string oldCitizenSpec, newCitizenSpec;
+				CityStringParser::buildCitizenSpec(cityId, citizenId, info->m_citizenName, info->m_citizenProfessionSkillTemplate, info->m_citizenLevel, info->m_citizenPermissions, info->m_citizenRank, info->m_citizenTitle, info->m_citizenAllegiance, oldCitizenSpec);
+				CityStringParser::buildCitizenSpec(cityId, citizenId, info->m_citizenName, info->m_citizenProfessionSkillTemplate, info->m_citizenLevel, info->m_citizenPermissions, rank, info->m_citizenTitle, info->m_citizenAllegiance, newCitizenSpec);
+				if (oldCitizenSpec != newCitizenSpec)
+					setCitizen(oldCitizenSpec, newCitizenSpec);
+
+				CitizenInfo updatedInfo = *info;
+				updatedInfo.m_citizenRank = rank;
+
+				m_citizensInfo.set(std::make_pair(cityId, citizenId), updatedInfo);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::removeCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetCitizenRemoveRank,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > >(std::make_pair(rankName, std::make_pair(citizenId, cityId))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		CitizenInfo const *info = getCitizenInfo(cityId, citizenId);
+		if (info)
+		{
+			CitizenRankDataTable::CitizenRank const * rankData = CitizenRankDataTable::getRank(rankName);
+			if (rankData && info->m_citizenRank.testBit(rankData->slotId))
+			{
+				BitArray rank = info->m_citizenRank;
+				rank.clearBit(rankData->slotId);
+
+				std::string oldCitizenSpec, newCitizenSpec;
+				CityStringParser::buildCitizenSpec(cityId, citizenId, info->m_citizenName, info->m_citizenProfessionSkillTemplate, info->m_citizenLevel, info->m_citizenPermissions, info->m_citizenRank, info->m_citizenTitle, info->m_citizenAllegiance, oldCitizenSpec);
+				CityStringParser::buildCitizenSpec(cityId, citizenId, info->m_citizenName, info->m_citizenProfessionSkillTemplate, info->m_citizenLevel, info->m_citizenPermissions, rank, info->m_citizenTitle, info->m_citizenAllegiance, newCitizenSpec);
+				if (oldCitizenSpec != newCitizenSpec)
+					setCitizen(oldCitizenSpec, newCitizenSpec);
+
+				CitizenInfo updatedInfo = *info;
+				updatedInfo.m_citizenRank = rank;
+
+				m_citizensInfo.set(std::make_pair(cityId, citizenId), updatedInfo);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool CityObject::hasCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName)
+{
+	CitizenInfo const *info = getCitizenInfo(cityId, citizenId);
+	if (info)
+	{
+		CitizenRankDataTable::CitizenRank const * rankData = CitizenRankDataTable::getRank(rankName);
+		if (rankData && info->m_citizenRank.testBit(rankData->slotId))
+			return true;
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::getCitizenRank(int cityId, NetworkId const &citizenId, std::vector<std::string> &ranks)
+{
+	ranks.clear();
+
+	CitizenInfo const *info = getCitizenInfo(cityId, citizenId);
+	if (info)
+	{
+		std::vector<CitizenRankDataTable::CitizenRank const *> const & allRanks = CitizenRankDataTable::getAllRanks();
+		for (std::vector<CitizenRankDataTable::CitizenRank const *>::const_iterator iter = allRanks.begin(); iter != allRanks.end(); ++iter)
+		{
+			if (info->m_citizenRank.testBit((*iter)->slotId))
+				ranks.push_back((*iter)->name);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCitizenTitle(int cityId, NetworkId const &citizenId, std::string const &citizenTitle)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetCitizenTitle,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > >(std::make_pair(citizenTitle, std::make_pair(citizenId, cityId))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		CitizenInfo const *info = getCitizenInfo(cityId, citizenId);
+		if (info)
+		{
+			std::string oldCitizenSpec, newCitizenSpec;
+			CityStringParser::buildCitizenSpec(cityId, citizenId, info->m_citizenName, info->m_citizenProfessionSkillTemplate, info->m_citizenLevel, info->m_citizenPermissions, info->m_citizenRank, info->m_citizenTitle, info->m_citizenAllegiance, oldCitizenSpec);
+			CityStringParser::buildCitizenSpec(cityId, citizenId, info->m_citizenName, info->m_citizenProfessionSkillTemplate, info->m_citizenLevel, info->m_citizenPermissions, info->m_citizenRank, citizenTitle, info->m_citizenAllegiance, newCitizenSpec);
+			if (oldCitizenSpec != newCitizenSpec)
+				setCitizen(oldCitizenSpec, newCitizenSpec);
+
+			CitizenInfo updatedInfo = *info;
+			updatedInfo.m_citizenTitle = citizenTitle;
+
+			m_citizensInfo.set(std::make_pair(cityId, citizenId), updatedInfo);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCityStructure(int cityId, NetworkId const &structureId, int structureType, bool structureValid)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_citySetStructure,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<int, bool> > >(std::make_pair(std::make_pair(cityId, structureId), std::make_pair(structureType, structureValid))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		std::string oldStructureSpec, newStructureSpec;
+		CityStructureInfo const * existingInfo = getCityStructureSpec(cityId, structureId, oldStructureSpec);
+		CityStringParser::buildCityStructureSpec(cityId, structureId, structureType, structureValid, newStructureSpec);
+		if (oldStructureSpec != newStructureSpec)
+		{
+			if (!oldStructureSpec.empty())
+				m_structures.erase(oldStructureSpec);
+			m_structures.insert(newStructureSpec);
+		}
+
+		if (!existingInfo)
+		{
+			std::map<int, CityInfo>::const_iterator const iterCityInfo = m_citiesInfo.find(cityId);
+			if (iterCityInfo != m_citiesInfo.end())
+			{
+				CityInfo updatedCi = iterCityInfo->second;
+				updatedCi.setStructureCount(updatedCi.getStructureCount() + 1);
+				m_citiesInfo.set(cityId, updatedCi);
+			}
+		}
+
+		CityStructureInfo updatedInfo;
+		updatedInfo.setStructureType(structureType);
+		updatedInfo.setStructureValid(structureValid);
+
+		m_structuresInfo.set(std::make_pair(cityId, structureId), updatedInfo);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::getCitySpec(int cityId, std::string &result) const
+{
+	CityInfo const &ci = getCityInfo(cityId);
+	CityStringParser::buildCitySpec(
+		cityId, ci.getCityName(), ci.getCityHallId(),
+		ci.getPlanet(), ci.getX(), ci.getZ(), ci.getRadius(),
+		ci.getCreationTime(),
+		ci.getLeaderId(),
+		ci.getIncomeTax(), ci.getPropertyTax(), ci.getSalesTax(),
+		ci.getTravelLoc(), ci.getTravelCost(), ci.getTravelInterplanetary(),
+		ci.getCloneLoc(), ci.getCloneRespawn(), ci.getCloneRespawnCell(), ci.getCloneId(),
+		result);
+}
+
+// ----------------------------------------------------------------------
+
+CitizenInfo const * CityObject::getCitizenSpec(int cityId, NetworkId const &citizenId, std::string &result) const
+{
+	CitizenInfo const *info = getCitizenInfo(cityId, citizenId);
+	if (info)
+	{
+		CityStringParser::buildCitizenSpec(cityId, citizenId, info->m_citizenName, info->m_citizenProfessionSkillTemplate, info->m_citizenLevel, info->m_citizenPermissions, info->m_citizenRank, info->m_citizenTitle, info->m_citizenAllegiance, result);
+		return info;
+	}
+
+	result.clear();
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+CityStructureInfo const * CityObject::getCityStructureSpec(int cityId, NetworkId const &structureId, std::string &result) const
+{
+	CityStructureInfo const *info = getCityStructureInfo(cityId, structureId);
+	if (info)
+	{
+		CityStringParser::buildCityStructureSpec(cityId, structureId, info->getStructureType(), info->getStructureValid(), result);
+		return info;
+	}
+
+	result.clear();
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::unload()
+{
+	FATAL(true, ("Tried to unload city object.\n"));
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCitySpec(int cityId, std::string const &newCitySpec)
+{
+	FATAL(!isAuthoritative(), ("CityObject::setCitySpec is only valid on the auth server"));
+	std::string oldCitySpec;
+	if (findCitySpec(cityId, oldCitySpec))
+	{
+		if (oldCitySpec == newCitySpec)
+			return;
+		m_cities.erase(oldCitySpec);
+	}
+	m_cities.insert(newCitySpec);
+}
+
+// ----------------------------------------------------------------------
+
+bool CityObject::findCitySpec(int cityId, std::string &citySpec) const
+{
+	for (std::set<std::string>::const_iterator i = m_cities.begin(); i != m_cities.end(); ++i)
+	{
+		if ((*i).find("v2:") == 0)
+		{
+			if (atoi((*i).c_str() + 3) == cityId)
+			{
+				citySpec = *i;
+				return true;
+			}
+		}
+		else if (atoi((*i).c_str()) == cityId)
+		{
+			citySpec = *i;
+			return true;
+		}
+	}
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setCitizen(std::string const &oldCitizenSpec, std::string const &newCitizenSpec)
+{
+	FATAL(!isAuthoritative(), ("CityObject::setCitizen is only valid on the auth server"));
+
+	if (!oldCitizenSpec.empty())
+			m_citizens.erase(oldCitizenSpec);
+
+	m_citizens.insert(newCitizenSpec);
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::onCitizensInfoErase(std::pair<int, NetworkId> const & key, CitizenInfo const & value)
+{
+	UNREF(value);
+
+	// citizen has been removed from a city, so need to update CreatureObject militia city id changes
+	ServerObject * const citizen = ServerWorld::findObjectByNetworkId(key.second);
+	if (citizen)
+	{
+		CreatureObject * const citizenCreatureObject = citizen->asCreatureObject();
+		if (citizenCreatureObject && citizenCreatureObject->isAuthoritative() && citizenCreatureObject->isInitialized() && (citizenCreatureObject->getMilitiaOfCityId() == key.first))
+		{
+			citizenCreatureObject->setMilitiaOfCityId(0);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::onCitizensInfoInsert(std::pair<int, NetworkId> const & key, CitizenInfo const & value)
+{
+	// citizen has been added to a city, so need to update CreatureObject militia city id changes
+	ServerObject * const citizen = ServerWorld::findObjectByNetworkId(key.second);
+	if (citizen)
+	{
+		CreatureObject * const citizenCreatureObject = citizen->asCreatureObject();
+		if (citizenCreatureObject && citizenCreatureObject->isAuthoritative() && citizenCreatureObject->isInitialized())
+		{
+			int const currentMilitiaOfCityId = citizenCreatureObject->getMilitiaOfCityId();
+			if (currentMilitiaOfCityId == 0)
+			{
+				// gaining militia
+				if (value.m_citizenPermissions & CitizenPermissions::Militia)
+					citizenCreatureObject->setMilitiaOfCityId(key.first);
+			}
+			else if (currentMilitiaOfCityId == key.first)
+			{
+				// losing militia
+				if (!(value.m_citizenPermissions & CitizenPermissions::Militia))
+					citizenCreatureObject->setMilitiaOfCityId(0);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::onCitizensInfoSet(std::pair<int, NetworkId> const & key, CitizenInfo const & oldValue, CitizenInfo const & newValue)
+{
+	UNREF(oldValue);
+
+	// citizen info has been changed, so need to update CreatureObject militia city id changes
+	ServerObject * const citizen = ServerWorld::findObjectByNetworkId(key.second);
+	if (citizen)
+	{
+		CreatureObject * const citizenCreatureObject = citizen->asCreatureObject();
+		if (citizenCreatureObject && citizenCreatureObject->isAuthoritative() && citizenCreatureObject->isInitialized())
+		{
+			int const currentMilitiaOfCityId = citizenCreatureObject->getMilitiaOfCityId();
+			if (currentMilitiaOfCityId == 0)
+			{
+				// gaining militia
+				if (newValue.m_citizenPermissions & CitizenPermissions::Militia)
+					citizenCreatureObject->setMilitiaOfCityId(key.first);
+			}
+			else if (currentMilitiaOfCityId == key.first)
+			{
+				// losing militia
+				if (!(newValue.m_citizenPermissions & CitizenPermissions::Militia))
+					citizenCreatureObject->setMilitiaOfCityId(0);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool CityObject::cityExists(int cityId) const
+{
+	return (m_citiesInfo.find(cityId) != m_citiesInfo.end());
+}
+
+// ----------------------------------------------------------------------
+
+CityInfo const &CityObject::getCityInfo(int cityId) const
+{
+	static const CityInfo s_nullCityInfo;
+	std::map<int, CityInfo>::const_iterator i = m_citiesInfo.find(cityId);
+	if (i != m_citiesInfo.end())
+		return i->second;
+	return s_nullCityInfo;
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::getAllCityIds(std::vector<int> &results) const
+{
+	results.clear();
+
+	for (std::map<int, CityInfo>::const_iterator i = m_citiesInfo.begin(); i != m_citiesInfo.end(); ++i)
+		results.push_back(i->first);
+}
+
+// ----------------------------------------------------------------------
+
+std::map<int, CityInfo> const &CityObject::getAllCityInfo() const
+{
+	return m_citiesInfo.getMap();
+}
+
+// ----------------------------------------------------------------------
+
+int CityObject::findCityByName(std::string const &name) const
+{
+	char const *nameText = name.c_str();
+	for (std::map<int, CityInfo>::const_iterator i = m_citiesInfo.begin(); i != m_citiesInfo.end(); ++i)
+		if (!_stricmp(i->second.getCityName().c_str(), nameText))
+			return i->first;
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+int CityObject::findCityByCityHall(NetworkId const &cityHallId) const
+{
+	for (std::map<int, CityInfo>::const_iterator i = m_citiesInfo.begin(); i != m_citiesInfo.end(); ++i)
+		if (i->second.getCityHallId() == cityHallId)
+			return i->first;
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+int CityObject::getCityAtLocation(std::string const &planetName, int x, int z, int radius) const
+{
+	for (std::map<int, CityInfo>::const_iterator i = m_citiesInfo.begin(); i != m_citiesInfo.end(); ++i)
+	{
+		CityInfo const &ci = i->second;
+		if (   ci.getPlanet() == planetName
+			&& sqr(x-ci.getX())+sqr(z-ci.getZ()) <= sqr(radius+ci.getRadius()))
+			return i->first;
+	}
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::getCitizenIds(int cityId, std::vector<NetworkId> &results) const
+{
+	results.clear();
+
+	for (std::map<std::pair<int, NetworkId>, CitizenInfo>::const_iterator iter = m_citizensInfo.lower_bound(std::make_pair(cityId, NetworkId::cms_invalid)); iter != m_citizensInfo.end(); ++iter)
+	{
+		if (iter->first.first != cityId)
+			break;
+
+		results.push_back(iter->first.second);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+std::map<std::pair<int, NetworkId>, CitizenInfo> const &CityObject::getAllCitizensInfo() const
+{
+	return m_citizensInfo.getMap();
+}
+
+// ----------------------------------------------------------------------
+
+CitizenInfo const *CityObject::getCitizenInfo(int cityId, NetworkId const &citizenId) const
+{
+	std::map<std::pair<int, NetworkId>, CitizenInfo>::const_iterator const iterFind = m_citizensInfo.find(std::make_pair(cityId, citizenId));
+	if (iterFind != m_citizensInfo.end())
+		return &(iterFind->second);
+
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::getCityStructureIds(int cityId, stdvector<NetworkId>::fwd &results) const
+{
+	results.clear();
+
+	for (std::map<std::pair<int, NetworkId>, CityStructureInfo>::const_iterator iter = m_structuresInfo.lower_bound(std::make_pair(cityId, NetworkId::cms_invalid)); iter != m_structuresInfo.end(); ++iter)
+	{
+		if (iter->first.first != cityId)
+			break;
+
+		results.push_back(iter->first.second);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+std::map<std::pair<int, NetworkId>, CityStructureInfo> const & CityObject::getAllCityStructuresInfo() const
+{
+	return m_structuresInfo.getMap();
+}
+
+// ----------------------------------------------------------------------
+
+CityStructureInfo const *CityObject::getCityStructureInfo(int cityId, NetworkId const &structureId) const
+{
+	std::map<std::pair<int, NetworkId>, CityStructureInfo>::const_iterator const iterFind = m_structuresInfo.find(std::make_pair(cityId, structureId));
+	if (iterFind != m_structuresInfo.end())
+		return &(iterFind->second);
+
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<int> const & CityObject::getCitizenOfCityId(NetworkId const &citizenId) const
+{
+	static std::vector<int> emptyList;
+
+	std::map<NetworkId, std::vector<int> >::const_iterator const iterFind = m_citizenToCityId.find(citizenId);
+	if (iterFind != m_citizenToCityId.end())
+		return iterFind->second;
+
+	return emptyList;
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::checkForDualCitizenship() const
+{
+	if (!isAuthoritative())
+		return;
+
+	// check for dual citizenship
+	std::string cities;
+	char buffer[32];
+	for (std::map<NetworkId, std::vector<int> >::const_iterator iterCitizens = m_citizenToCityId.begin(); iterCitizens != m_citizenToCityId.end(); ++iterCitizens)
+	{
+		if (iterCitizens->second.size() > 1)
+		{
+			cities.clear();
+			for (std::vector<int>::const_iterator iterCities = iterCitizens->second.begin(); iterCities != iterCitizens->second.end(); ++iterCities)
+			{
+				CityInfo const & ci = getCityInfo(*iterCities);
+
+				if (!cities.empty())
+					cities += std::string("|");
+
+				snprintf(buffer, sizeof(buffer)-1, "%d", *iterCities);
+				buffer[sizeof(buffer)-1] = '\0';
+
+				if (ci.getLeaderId() == iterCitizens->first)
+					cities += "*";
+
+				cities += buffer;
+				cities += ":";
+				cities += ci.getCityName();
+			}
+
+			LOG("CityFixup", ("(%s, %s) is a citizen of %d cities (%s).", iterCitizens->first.getValueString().c_str(), NameManager::getInstance().getPlayerFullName(iterCitizens->first).c_str(), iterCitizens->second.size(), cities.c_str()));
+			LOG("CustomerService", ("DualCitizenship:(%s, %s) is a citizen of %d cities (%s).", iterCitizens->first.getValueString().c_str(), NameManager::getInstance().getPlayerFullName(iterCitizens->first).c_str(), iterCitizens->second.size(), cities.c_str()));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+PgcRatingInfo const * CityObject::getPgcRating(NetworkId const &chroniclerId) const
+{
+	std::map<NetworkId, PgcRatingInfo>::const_iterator const iterFind = m_pgcRatingInfo.find(chroniclerId);
+	if (iterFind != m_pgcRatingInfo.end())
+		return &(iterFind->second);
+
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::getPgcChroniclerId(std::string const &chroniclerName, std::vector<NetworkId> &chroniclerIds) const
+{
+	chroniclerIds.clear();
+
+	std::string const normalizedName = NameManager::normalizeName(chroniclerName);
+	std::set<std::pair<std::string, NetworkId> > const & pgcRatingChroniclerId = m_pgcRatingChroniclerId.get();
+	for (std::set<std::pair<std::string, NetworkId> >::const_iterator iter = pgcRatingChroniclerId.lower_bound(std::make_pair(normalizedName, NetworkId::cms_invalid)); iter != pgcRatingChroniclerId.end(); ++iter)
+	{
+		if (iter->first != normalizedName)
+			break;
+
+		chroniclerIds.push_back(iter->second);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::adjustPgcRating(NetworkId const &chroniclerId, std::string const &chroniclerName, int adjustment)
+{
+	if (!chroniclerId.isValid() || (adjustment == 0))
+		return;
+
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_adjustPgcRating,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > >(std::make_pair(chroniclerName, std::make_pair(chroniclerId, adjustment))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		PgcRatingInfo updatedPgcRating;
+		PgcRatingInfo const * const existingPgcRating = getPgcRating(chroniclerId);
+		if (existingPgcRating)
+		{
+			updatedPgcRating = *existingPgcRating;
+			++updatedPgcRating.m_ratingCount;
+			updatedPgcRating.m_ratingTotal += static_cast<int64>(adjustment);
+
+			std::string oldPgcRatingSpec;
+			CityStringParser::buildPgcRatingSpec(chroniclerId, *existingPgcRating, oldPgcRatingSpec);
+			m_citizens.erase(oldPgcRatingSpec);
+		}
+		else
+		{
+			updatedPgcRating.m_chroniclerName = NameManager::getInstance().getPlayerFullName(chroniclerId);
+			if (updatedPgcRating.m_chroniclerName.empty())
+				updatedPgcRating.m_chroniclerName = chroniclerName;
+
+			if (updatedPgcRating.m_chroniclerName.empty())
+				return;
+
+			updatedPgcRating.m_ratingCount = 1;
+			updatedPgcRating.m_ratingTotal = static_cast<int64>(adjustment);
+
+			m_pgcRatingChroniclerId.insert(std::make_pair(NameManager::normalizeName(updatedPgcRating.m_chroniclerName), chroniclerId));
+		}
+
+		updatedPgcRating.m_lastRatingTime = static_cast<int>(::time(NULL));
+
+		std::string updatedPgcRatingSpec;
+		CityStringParser::buildPgcRatingSpec(chroniclerId, updatedPgcRating, updatedPgcRatingSpec);
+
+		m_citizens.insert(updatedPgcRatingSpec);
+		m_pgcRatingInfo.set(chroniclerId, updatedPgcRating);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::adjustPgcRatingData(NetworkId const &chroniclerId, std::string const &chroniclerName, int index, int adjustment)
+{
+	if (!chroniclerId.isValid() || (adjustment == 0) || (index < 0) || (static_cast<size_t>(index) >= PgcRatingInfo::ms_PgcRatingDataSize))
+		return;
+
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_adjustPgcRatingData,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > >(std::make_pair(std::make_pair(index, chroniclerId), std::make_pair(chroniclerName, adjustment))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		PgcRatingInfo updatedPgcRating;
+		PgcRatingInfo const * const existingPgcRating = getPgcRating(chroniclerId);
+		if (existingPgcRating)
+		{
+			if (static_cast<size_t>(index) >= existingPgcRating->m_data.size())
+				return;
+
+			updatedPgcRating = *existingPgcRating;
+			updatedPgcRating.m_data[index] += adjustment;
+
+			std::string oldPgcRatingSpec;
+			CityStringParser::buildPgcRatingSpec(chroniclerId, *existingPgcRating, oldPgcRatingSpec);
+			m_citizens.erase(oldPgcRatingSpec);
+		}
+		else
+		{
+			if (static_cast<size_t>(index) >= updatedPgcRating.m_data.size())
+				return;
+
+			updatedPgcRating.m_chroniclerName = NameManager::getInstance().getPlayerFullName(chroniclerId);
+			if (updatedPgcRating.m_chroniclerName.empty())
+				updatedPgcRating.m_chroniclerName = chroniclerName;
+
+			if (updatedPgcRating.m_chroniclerName.empty())
+				return;
+
+			updatedPgcRating.m_data[index] = adjustment;
+
+			m_pgcRatingChroniclerId.insert(std::make_pair(NameManager::normalizeName(updatedPgcRating.m_chroniclerName), chroniclerId));
+		}
+
+		std::string updatedPgcRatingSpec;
+		CityStringParser::buildPgcRatingSpec(chroniclerId, updatedPgcRating, updatedPgcRatingSpec);
+
+		m_citizens.insert(updatedPgcRatingSpec);
+		m_pgcRatingInfo.set(chroniclerId, updatedPgcRating);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::setPgcRatingData(NetworkId const &chroniclerId, std::string const &chroniclerName, int index, int value)
+{
+	if (!chroniclerId.isValid() || (index < 0) || (static_cast<size_t>(index) >= PgcRatingInfo::ms_PgcRatingDataSize))
+		return;
+
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_setPgcRatingData,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > >(std::make_pair(std::make_pair(index, chroniclerId), std::make_pair(chroniclerName, value))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		PgcRatingInfo updatedPgcRating;
+		PgcRatingInfo const * const existingPgcRating = getPgcRating(chroniclerId);
+		if (existingPgcRating)
+		{
+			if (static_cast<size_t>(index) >= existingPgcRating->m_data.size())
+				return;
+
+			if (existingPgcRating->m_data[index] == value)
+				return;
+
+			updatedPgcRating = *existingPgcRating;
+			updatedPgcRating.m_data[index] = value;
+
+			std::string oldPgcRatingSpec;
+			CityStringParser::buildPgcRatingSpec(chroniclerId, *existingPgcRating, oldPgcRatingSpec);
+			m_citizens.erase(oldPgcRatingSpec);
+		}
+		else
+		{
+			if (static_cast<size_t>(index) >= updatedPgcRating.m_data.size())
+				return;
+
+			updatedPgcRating.m_chroniclerName = NameManager::getInstance().getPlayerFullName(chroniclerId);
+			if (updatedPgcRating.m_chroniclerName.empty())
+				updatedPgcRating.m_chroniclerName = chroniclerName;
+
+			if (updatedPgcRating.m_chroniclerName.empty())
+				return;
+
+			updatedPgcRating.m_data[index] = value;
+
+			m_pgcRatingChroniclerId.insert(std::make_pair(NameManager::normalizeName(updatedPgcRating.m_chroniclerName), chroniclerId));
+		}
+
+		std::string updatedPgcRatingSpec;
+		CityStringParser::buildPgcRatingSpec(chroniclerId, updatedPgcRating, updatedPgcRatingSpec);
+
+		m_citizens.insert(updatedPgcRatingSpec);
+		m_pgcRatingInfo.set(chroniclerId, updatedPgcRating);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::verifyPgcChroniclerName(NetworkId const &chroniclerId, std::string const &chroniclerName)
+{
+	PgcRatingInfo const * const existingPgcRating = getPgcRating(chroniclerId);
+	if (!existingPgcRating || (existingPgcRating->m_chroniclerName == chroniclerName) || chroniclerName.empty())
+		return;
+
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_fixPgcChroniclerName,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<std::string, NetworkId> >(std::make_pair(chroniclerName, chroniclerId)),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		PgcRatingInfo updatedPgcRating = *existingPgcRating;
+		updatedPgcRating.m_chroniclerName = chroniclerName;
+
+		std::string oldPgcRatingSpec;
+		CityStringParser::buildPgcRatingSpec(chroniclerId, *existingPgcRating, oldPgcRatingSpec);
+
+		m_citizens.erase(oldPgcRatingSpec);
+		m_pgcRatingChroniclerId.erase(std::make_pair(NameManager::normalizeName(existingPgcRating->m_chroniclerName), chroniclerId));
+
+		std::string updatedPgcRatingSpec;
+		CityStringParser::buildPgcRatingSpec(chroniclerId, updatedPgcRating, updatedPgcRatingSpec);
+
+		m_citizens.insert(updatedPgcRatingSpec);
+		m_pgcRatingInfo.set(chroniclerId, updatedPgcRating);
+		m_pgcRatingChroniclerId.insert(std::make_pair(NameManager::normalizeName(updatedPgcRating.m_chroniclerName), chroniclerId));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::addGcwRegionDefenderCity(std::string const & gcwRegion, int cityId, uint32 faction)
+{
+	if (!gcwRegion.empty())
+	{
+		m_gcwRegionDefenderCities.set(std::make_pair(gcwRegion, cityId), faction);
+
+		Archive::AutoDeltaMap<std::string, std::pair<int, int> >::const_iterator iter = m_gcwRegionDefenderCitiesCount.find(gcwRegion);
+		if (iter != m_gcwRegionDefenderCitiesCount.end())
+		{
+			if (PvpData::isImperialFactionId(faction))
+				m_gcwRegionDefenderCitiesCount.set(gcwRegion, std::make_pair(iter->second.first + 1, iter->second.second));
+			else if (PvpData::isRebelFactionId(faction))
+				m_gcwRegionDefenderCitiesCount.set(gcwRegion, std::make_pair(iter->second.first, iter->second.second + 1));
+		}
+		else
+		{
+			if (PvpData::isImperialFactionId(faction))
+				m_gcwRegionDefenderCitiesCount.set(gcwRegion, std::make_pair(1, 0));
+			else if (PvpData::isRebelFactionId(faction))
+				m_gcwRegionDefenderCitiesCount.set(gcwRegion, std::make_pair(0, 1));
+		}
+
+		m_gcwRegionDefenderCitiesVersion.set(m_gcwRegionDefenderCitiesVersion.get() + 1);
+
+		GuildObject * const go = ServerUniverse::getInstance().getMasterGuildObject();
+		if (go)
+			go->updateGcwRegionDefenderBonus(gcwRegion);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CityObject::removeGcwRegionDefenderCity(std::string const & gcwRegion, int cityId, uint32 faction)
+{
+	if (!gcwRegion.empty())
+	{
+		m_gcwRegionDefenderCities.erase(std::make_pair(gcwRegion, cityId));
+
+		Archive::AutoDeltaMap<std::string, std::pair<int, int> >::const_iterator iter = m_gcwRegionDefenderCitiesCount.find(gcwRegion);
+		if (iter != m_gcwRegionDefenderCitiesCount.end())
+		{
+			std::pair<int, int> value = iter->second;
+
+			if (PvpData::isImperialFactionId(faction))
+				value.first = std::max(0, value.first - 1);
+			else if (PvpData::isRebelFactionId(faction))
+				value.second = std::max(0, value.second - 1);
+
+			if ((value.first > 0) || (value.second > 0))
+				m_gcwRegionDefenderCitiesCount.set(gcwRegion, value);
+			else
+				m_gcwRegionDefenderCitiesCount.erase(gcwRegion);
+		}
+
+		m_gcwRegionDefenderCitiesVersion.set(m_gcwRegionDefenderCitiesVersion.get() + 1);
+
+		GuildObject * const go = ServerUniverse::getInstance().getMasterGuildObject();
+		if (go)
+			go->updateGcwRegionDefenderBonus(gcwRegion);
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/CityObject.h b/engine/server/library/serverGame/src/shared/object/CityObject.h
new file mode 100644
index 00000000..6364df1a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/CityObject.h
@@ -0,0 +1,160 @@
+//========================================================================
+//
+// CityObject.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef INCLUDED_CityObject_H
+#define INCLUDED_CityObject_H
+
+// ======================================================================
+
+#include "Archive/AutoDeltaSet.h"
+#include "serverGame/CitizenInfo.h"
+#include "serverGame/CityInfo.h"
+#include "serverGame/CityStructureInfo.h"
+#include "serverGame/PgcRatingInfo.h"
+#include "serverGame/UniverseObject.h"
+
+// ======================================================================
+
+class ServerCityObjectTemplate;
+
+// ======================================================================
+
+class CityObject: public UniverseObject
+{
+public:
+	CityObject(ServerCityObjectTemplate const *newTemplate);
+	virtual ~CityObject();
+
+	virtual Controller* createDefaultController();
+	virtual void setupUniverse();
+	virtual void getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+	virtual void unload();
+
+	int createCity(std::string const &cityName, NetworkId const &cityHallId, std::string const &cityPlanet, int x, int z, int radius, NetworkId const &leaderId, int incomeTax, int propertyTax, int salesTax, Vector const &travelLoc, int travelCost, bool travelInterplanetary, Vector const &cloneLoc, Vector const &cloneRespawn, NetworkId const &cloneRespawnCell, NetworkId const &cloneId, int cityId = 0);
+	void removeCity(int cityId);
+	void removeCitizen(int cityId, NetworkId const &citizenId);
+	void removeCityStructure(int cityId, NetworkId const &structureId);
+	void setCityName(int cityId, std::string const &cityName);
+	void setCityHall(int cityId, NetworkId const &cityHallId);
+	void setCityLocation(int cityId, std::string const &cityPlanet, int x, int z);
+	void setCityRadius(int cityId, int radius);
+	void setCityFaction(int cityId, uint32 faction, bool notifyCitizens);
+	void setCityGcwDefenderRegion(int cityId, std::string const &gcwDefenderRegion, int timeJoined, bool notifyCitizens);
+	void setCityCreationTime(int cityId, int creationTime);
+	void setCityLeader(int cityId, NetworkId const &leaderId);
+	void setCityIncomeTax(int cityId, int incomeTax);
+	void setCityPropertyTax(int cityId, int propertyTax);
+	void setCitySalesTax(int cityId, int salesTax);
+	void setCityTravelInfo(int cityId, Vector const &travelLoc, int travelCost, bool travelInterplanetary);
+	void setCityCloneInfo(int cityId, Vector const &cloneLoc, Vector const &cloneRespawn, NetworkId const &cloneRespawnCell, NetworkId const &cloneId);
+	void setCitizen(int cityId, NetworkId const &citizenId, std::string const &citizenName, NetworkId const &allegiance, int permissions);
+	void setCitizenProfessionInfo(int cityId, NetworkId const &citizenId, std::string const &citizenProfessionSkillTemplate, int citizenLevel);
+	void addCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName);
+	void removeCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName);
+	bool hasCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName);
+	void getCitizenRank(int cityId, NetworkId const &citizenId, stdvector<std::string>::fwd &ranks);
+	void setCitizenTitle(int cityId, NetworkId const &citizenId, std::string const &citizenTitle);
+	void setCityStructure(int cityId, NetworkId const &structureId, int structureType, bool structureValid);
+
+	bool cityExists(int cityId) const;
+	CityInfo const &getCityInfo(int cityId) const;
+	void getAllCityIds(stdvector<int>::fwd &results) const;
+	stdmap<int, CityInfo>::fwd const &getAllCityInfo() const;
+	int findCityByName(std::string const &name) const;
+	int findCityByCityHall(NetworkId const &cityHallId) const;
+	int getCityAtLocation(std::string const &planetName, int x, int z, int radius) const;
+	void getCitizenIds(int cityId, stdvector<NetworkId>::fwd &results) const;
+	stdmap<std::pair<int, NetworkId>, CitizenInfo>::fwd const &getAllCitizensInfo() const;
+	CitizenInfo const *getCitizenInfo(int cityId, NetworkId const &citizenId) const;
+	void getCityStructureIds(int cityId, stdvector<NetworkId>::fwd &results) const;
+	stdmap<std::pair<int, NetworkId>, CityStructureInfo>::fwd const & getAllCityStructuresInfo() const;
+	CityStructureInfo const *getCityStructureInfo(int cityId, NetworkId const &structureId) const;
+	stdvector<int>::fwd const & getCitizenOfCityId(NetworkId const &citizenId) const;
+
+	std::map<std::pair<std::string, int>, uint32> const & getGcwRegionDefenderCities() const;
+	std::map<std::string, std::pair<int, int> > const & getGcwRegionDefenderCitiesCount() const;
+	int getGcwRegionDefenderCitiesVersion() const;
+
+	void checkForDualCitizenship() const;
+
+	PgcRatingInfo const * getPgcRating(NetworkId const &chroniclerId) const;
+	void getPgcChroniclerId(std::string const &chroniclerName, std::vector<NetworkId> &chroniclerIds) const;
+	void adjustPgcRating(NetworkId const &chroniclerId, std::string const &chroniclerName, int adjustment);
+	void adjustPgcRatingData(NetworkId const &chroniclerId, std::string const &chroniclerName, int index, int adjustment);
+	void setPgcRatingData(NetworkId const &chroniclerId, std::string const &chroniclerName, int index, int value);
+	void verifyPgcChroniclerName(NetworkId const &chroniclerId, std::string const &chroniclerName);
+
+private:
+	CityObject();
+	CityObject(CityObject const &rhs);
+	CityObject& operator=(CityObject const &rhs);
+
+	void addMembersToPackages();
+	int nextFreeCityId();
+	void getCitySpec(int cityId, std::string &result) const;
+	CitizenInfo const * getCitizenSpec(int cityId, NetworkId const &citizenId, std::string &result) const;
+	CityStructureInfo const * getCityStructureSpec(int cityId, NetworkId const &structureId, std::string &result) const;
+	void setCitySpec(int cityId, std::string const &newCitySpec);
+	bool findCitySpec(int cityId, std::string &citySpec) const;
+	void setCitizen(std::string const &oldCitizenSpec, std::string const &newCitizenSpec);
+
+	void addGcwRegionDefenderCity(std::string const & gcwRegion, int cityId, uint32 faction);
+	void removeGcwRegionDefenderCity(std::string const & gcwRegion, int cityId, uint32 faction);
+
+	void onCitizensInfoErase(std::pair<int, NetworkId> const & key, CitizenInfo const & value);
+	void onCitizensInfoInsert(std::pair<int, NetworkId> const & key, CitizenInfo const & value);
+	void onCitizensInfoSet(std::pair<int, NetworkId> const & key, CitizenInfo const & oldValue, CitizenInfo const & newValue);
+
+private:
+// BPM CityObject : UniverseObject // Begin persisted members
+	Archive::AutoDeltaSet<std::string> m_cities;
+	Archive::AutoDeltaSet<std::string> m_citizens;
+	Archive::AutoDeltaSet<std::string> m_structures;
+// EPM
+
+	// parallel maps to persisted members m_cities, m_citizens, and m_structures that
+	// will provide access to the data because the data in the persisted members are strings
+	Archive::AutoDeltaMap<int, CityInfo> m_citiesInfo; // city id -> CityInfo
+	Archive::AutoDeltaMap<std::pair<int, NetworkId>, CitizenInfo, CityObject> m_citizensInfo; // (city id, citizen id) -> CitizenInfo
+	Archive::AutoDeltaMap<std::pair<int, NetworkId>, CityStructureInfo> m_structuresInfo; // (city id, structure id) -> CityStructureInfo
+	Archive::AutoDeltaMap<NetworkId, std::vector<int> > m_citizenToCityId; // citizen id -> city id (could be multiple for the bug where a character is a citizen of multiple cities)
+
+	Archive::AutoDeltaMap<NetworkId, PgcRatingInfo> m_pgcRatingInfo;
+	Archive::AutoDeltaSet<std::pair<std::string, NetworkId> > m_pgcRatingChroniclerId; // <lowercase chronicler first name, chronicler id>
+
+	Archive::AutoDeltaMap<std::pair<std::string, int>, uint32> m_gcwRegionDefenderCities;
+	Archive::AutoDeltaMap<std::string, std::pair<int, int> > m_gcwRegionDefenderCitiesCount;
+	Archive::AutoDeltaVariable<int> m_gcwRegionDefenderCitiesVersion;
+
+	int m_lowFreeCityId;
+};
+
+// ----------------------------------------------------------------------
+
+inline std::map<std::pair<std::string, int>, uint32> const & CityObject::getGcwRegionDefenderCities() const
+{
+	return m_gcwRegionDefenderCities.getMap();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::map<std::string, std::pair<int, int> > const & CityObject::getGcwRegionDefenderCitiesCount() const
+{
+	return m_gcwRegionDefenderCitiesCount.getMap();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CityObject::getGcwRegionDefenderCitiesVersion() const
+{
+	return m_gcwRegionDefenderCitiesVersion.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/ContainmentMessageManager.cpp b/engine/server/library/serverGame/src/shared/object/ContainmentMessageManager.cpp
new file mode 100644
index 00000000..900d2623
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ContainmentMessageManager.cpp
@@ -0,0 +1,158 @@
+// ======================================================================
+//
+// ContainmentMessageManager.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ContainmentMessageManager.h"
+
+#include "serverGame/ConnectionServerConnection.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/DistributionListStack.h"
+#include "serverGame/ServerObject.h"
+#include "serverNetworkMessages/GameConnectionServerMessages.h"
+#include "sharedNetworkMessages/UpdateContainmentMessage.h"
+#include "sharedObject/ContainedByProperty.h"
+#include "sharedObject/SlottedContainmentProperty.h"
+#include <algorithm>
+
+// ======================================================================
+//
+// Order of containment messages is preserved, and changes are sent for any objects that still exist.
+// Containment states for each update are as of the time at which the message is added, to preserve causality.
+//
+// ======================================================================
+
+namespace ContainmentMessageManagerNamespace
+{
+	// ----------------------------------------------------------------------
+
+	class ContainmentMessageData
+	{
+	public:
+		ContainmentMessageData();
+		explicit ContainmentMessageData(ServerObject &object);
+
+		void update() const;
+
+	private:
+		Watcher<ServerObject> m_watcher;
+		NetworkId m_containedBy;
+		int m_currentArrangement;
+	};
+
+	// ----------------------------------------------------------------------
+
+	std::vector<ContainmentMessageData> s_containmentMessages;
+	std::map<NetworkId, std::set<Client *> > s_frameBaselines;
+
+	// ----------------------------------------------------------------------
+
+	std::set<Client *> const *getClientBaselinesThisFrame(NetworkId const &networkId);
+
+	// ----------------------------------------------------------------------
+
+}
+using namespace ContainmentMessageManagerNamespace;
+
+// ======================================================================
+
+void ContainmentMessageManager::addContainmentMessage(ServerObject &object)
+{
+	s_containmentMessages.push_back(ContainmentMessageData(object));
+}
+
+// ----------------------------------------------------------------------
+
+void ContainmentMessageManager::addFrameBaselines(NetworkId const &networkId, std::vector<Watcher<Client> > const &distributionList)
+{
+	std::set<Client *>& baselines = s_frameBaselines[networkId];
+	for (std::vector<Watcher<Client> >::const_iterator i = distributionList.begin(); i != distributionList.end(); ++i)
+		IGNORE_RETURN(baselines.insert(*i));
+}
+
+// ----------------------------------------------------------------------
+
+void ContainmentMessageManager::update()
+{
+	for (std::vector<ContainmentMessageData>::iterator i = s_containmentMessages.begin(); i != s_containmentMessages.end(); ++i)
+		(*i).update();
+
+	s_containmentMessages.clear();
+	s_frameBaselines.clear();
+}
+
+// ----------------------------------------------------------------------
+
+ContainmentMessageManagerNamespace::ContainmentMessageData::ContainmentMessageData() :
+	m_watcher(),
+	m_containedBy(NetworkId::cms_invalid),
+	m_currentArrangement(-1)
+{
+}
+
+// ----------------------------------------------------------------------
+
+ContainmentMessageManagerNamespace::ContainmentMessageData::ContainmentMessageData(ServerObject &object) :
+	m_watcher(&object),
+	m_containedBy(ContainerInterface::getContainedByProperty(object)->getContainedByNetworkId()),
+	m_currentArrangement(ContainerInterface::getSlottedContainmentProperty(object)->getCurrentArrangement())
+{
+}
+
+// ----------------------------------------------------------------------
+
+void ContainmentMessageManagerNamespace::ContainmentMessageData::update() const
+{
+	static std::set<Client *> clientResultSet;
+
+	ServerObject * const obj = m_watcher.getPointer();
+	if (obj)
+	{
+		std::set<Client *> const &observers = obj->getObservers();
+		std::set<Client *> const * const baselines = getClientBaselinesThisFrame(obj->getNetworkId());
+		std::set<Client *> const *clients;
+		if (!baselines)
+			clients = &observers;
+		else
+		{
+			clientResultSet.clear();
+			std::insert_iterator<std::set<Client *> > insertIter(clientResultSet, clientResultSet.begin());
+			IGNORE_RETURN(std::set_difference(observers.begin(), observers.end(), baselines->begin(), baselines->end(), insertIter));
+			clients = &clientResultSet;
+		}
+
+		std::map<ConnectionServerConnection *, std::vector<NetworkId> > &tmpDistributionList = DistributionListStack::alloc();
+		for (std::set<Client *>::const_iterator i = clients->begin(); i != clients->end(); ++i)
+			tmpDistributionList[(*i)->getConnection()].push_back((*i)->getCharacterObjectId());
+
+		if (!tmpDistributionList.empty())
+		{
+			UpdateContainmentMessage const ucm(obj->getNetworkId(), m_containedBy, m_currentArrangement);
+			for (std::map<ConnectionServerConnection *, std::vector<NetworkId> >::const_iterator j = tmpDistributionList.begin(); j != tmpDistributionList.end(); ++j)
+			{
+				GameClientMessage const gcm((*j).second, true, ucm);
+				(*j).first->send(gcm, true);
+			}
+		}
+
+		DistributionListStack::release();
+		clientResultSet.clear();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+std::set<Client *> const *ContainmentMessageManagerNamespace::getClientBaselinesThisFrame(NetworkId const &networkId)
+{
+	std::map<NetworkId, std::set<Client *> >::const_iterator i = s_frameBaselines.find(networkId);
+	if (i != s_frameBaselines.end())
+		return &((*i).second);
+	return 0;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/ContainmentMessageManager.h b/engine/server/library/serverGame/src/shared/object/ContainmentMessageManager.h
new file mode 100644
index 00000000..70412643
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ContainmentMessageManager.h
@@ -0,0 +1,35 @@
+// ======================================================================
+//
+// ContainmentMessageManager.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _ContainmentMessageManager_H_
+#define _ContainmentMessageManager_H_
+
+// ======================================================================
+
+#include "serverGame/Client.h"
+
+// ======================================================================
+
+class ContainmentMessageManager
+{
+public:
+	static void addContainmentMessage(ServerObject &object);
+	static void addFrameBaselines(NetworkId const &networkId, std::vector<Watcher<Client> > const &distributionList);
+	static void update();
+	
+private:
+	ContainmentMessageManager();
+	~ContainmentMessageManager();
+	ContainmentMessageManager(ContainmentMessageManager const &);
+	ContainmentMessageManager &operator=(ContainmentMessageManager const &);
+};
+
+// ======================================================================
+
+#endif // _ContainmentMessageManager_H_
+
diff --git a/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp b/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp
new file mode 100644
index 00000000..ece29b65
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp
@@ -0,0 +1,15908 @@
+//========================================================================
+//
+// CreatureObject.cpp
+// Copyright 2001-2005, Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#pragma warning(disable : 4100 4514)
+#include "serverGame/CreatureObject.h"
+
+#include "SwgGameServer/CombatEngine.h"
+#include "SwgGameServer/ConfigCombatEngine.h"
+#include "UnicodeUtils.h"
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/AttribModNameManager.h"
+#include "serverGame/BiographyManager.h"
+#include "serverGame/BuffManager.h"
+#include "serverGame/BuildingObject.h"
+#include "serverGame/CellObject.h"
+#include "serverGame/Chat.h"
+#include "serverGame/CitizenInfo.h"
+#include "serverGame/CityInfo.h"
+#include "serverGame/CityInterface.h"
+#include "serverGame/Client.h"
+#include "serverGame/CommandCppFuncs.h"
+#include "serverGame/CommandQueue.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ConsoleManager.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/DraftSchematicObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/GroupMissionCriticalObjectsBuilder.h"
+#include "serverGame/GroupStringId.h"
+#include "serverGame/GuildInterface.h"
+#include "serverGame/GuildMemberInfo.h"
+#include "serverGame/GuildObject.h"
+#include "serverGame/ServerImageDesignerManager.h"
+#include "serverGame/ManufactureSchematicObject.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/MissionObject.h"
+#include "serverGame/MoveSimManager.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/NewbieTutorial.h"
+#include "serverGame/NpcConversation.h"
+#include "serverGame/ObjectTracker.h"
+#include "serverGame/ObserveTracker.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/PvpInternal.h"
+#include "serverGame/Region.h"
+#include "serverGame/RegionMaster.h"
+#include "serverGame/ReportManager.h"
+#include "serverGame/ServerCreatureObjectTemplate.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerMissionObjectTemplate.h"
+#include "serverGame/ServerSecureTrade.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWeaponObjectTemplate.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/SpaceVisibilityManager.h"
+#include "serverGame/TriggerVolume.h"
+#include "serverGame/VeteranRewardManager.h"
+#include "serverGame/WeaponObject.h"
+#include "serverNetworkMessages/AccountFeatureIdResponse.h"
+#include "serverNetworkMessages/FeatureIdTransactionRequest.h"
+#include "serverNetworkMessages/FeatureIdTransactionResponse.h"
+#include "serverNetworkMessages/GroupMemberParam.h"
+#include "serverNetworkMessages/LoginUpgradeAccountMessage.h"
+#include "serverNetworkMessages/MessageQueueAlterAttribute.h"
+#include "serverNetworkMessages/MessageQueueCommandQueueEnqueueFwd.h"
+#include "serverNetworkMessages/MessageQueueSetState.h"
+#include "serverNetworkMessages/MessageToPayload.h"
+#include "serverNetworkMessages/TransferReplyMoveValidation.h"
+#include "serverNetworkMessages/UnloadedPlayerMessage.h"
+#include "serverNetworkMessages/UpdateObjectOnPlanetMessage.h"
+#include "serverNetworkMessages/UploadCharacterMessage.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/JavaLibrary.h"
+#include "serverScript/ScriptDictionary.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/AdminAccountManager.h"
+#include "serverUtility/ServerClock.h"
+#include "Session/CommonAPI/CommonAPI.h"
+#include "sharedCollision/BaseExtent.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedCollision/Floor.h"
+#include "sharedCollision/Footprint.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFile/TreeFile.h"
+#include "sharedFoundation/CalendarTime.h"
+#include "sharedFoundation/ConfigFile.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/Clock.h"
+#include "sharedFoundation/ConfigFile.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/Crc.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedFoundation/DynamicVariableListNestedList.h"
+#include "sharedFoundation/DynamicVariableLocationData.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/TemporaryCrcString.h"
+#include "sharedGame/AppearanceManager.h"
+#include "sharedGame/AttribModArchive.h"
+#include "sharedGame/Buff.h"
+#include "sharedGame/CityData.h"
+#include "sharedGame/CommandTable.h"
+#include "sharedGame/ConfigSharedGame.h"
+#include "sharedGame/CraftingData.h"
+#include "sharedGame/CustomizationManager.h"
+#include "sharedGame/CustomizationManager_MorphParameter.h"
+#include "sharedGame/GameObjectTypes.h"
+#include "sharedGame/LfgDataTable.h"
+#include "sharedGame/MatchMakingCharacterResult.h"
+#include "sharedGame/OutOfBandPackager.h"
+#include "sharedGame/PlatformFeatureBits.h"
+#include "sharedGame/PlayerCreationManager.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/PvpData.h"
+#include "sharedGame/SharedCreatureObjectTemplate.h"
+#include "sharedGame/SharedStringIds.h"
+#include "sharedGame/ShipSlotIdManager.h"
+#include "sharedGame/SlopeEffectProperty.h"
+#include "sharedGame/SlowDownProperty.h"
+#include "sharedGame/SpatialChatManager.h"
+#include "sharedGame/VehicleHoverDynamics.h"
+#include "sharedLog/Log.h"
+#include "sharedMath/AxialBox.h"
+#include "sharedMath/MxCifQuadTreeBounds.h"
+#include "sharedMath/Ray3d.h"
+#include "sharedNetworkMessages/ClientMfdStatusUpdateMessage.h"
+#include "sharedNetworkMessages/ErrorMessage.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/GrantCommand.h"
+#include "sharedNetworkMessages/MessageQueueCombatSpam.h"
+#include "sharedNetworkMessages/MessageQueueCommandTimer.h"
+#include "sharedNetworkMessages/MessageQueueDataTransformWithParent.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedNetworkMessages/MessageQueueMissionListResponse.h"
+#include "sharedNetworkMessages/MessageQueueOpponentInfo.h"
+#include "sharedNetworkMessages/MessageQueuePosture.h"
+#include "sharedNetworkMessages/MessageQueuePushCreature.h"
+#include "sharedNetworkMessages/MessageQueueSitOnObject.h"
+#include "sharedNetworkMessages/MessageQueueSlowDownEffect.h"
+#include "sharedNetworkMessages/MessageQueueSpatialChat.h"
+#include "sharedNetworkMessages/MessageQueueStringList.h"
+#include "sharedNetworkMessages/RevokeCommand.h"
+#include "sharedNetworkMessages/SceneChannelMessages.h"
+#include "sharedNetworkMessages/SlowDownEffectMessage.h"
+#include "serverNetworkMessages/TransferCharacterData.h"
+#include "serverNetworkMessages/TransferCharacterDataArchive.h"
+#include "sharedNetworkMessages/UpdatePostureMessage.h"
+#include "sharedObject/AlterResult.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/ContainedByProperty.h"
+#include "sharedObject/CustomizationData.h"
+#include "sharedObject/MovementTable.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/SlotId.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/SlottedContainmentProperty.h"
+#include "sharedObject/VolumeContainer.h"
+#include "sharedSkillSystem/ExpertiseManager.h"
+#include "sharedSkillSystem/LevelManager.h"
+#include "sharedSkillSystem/SkillManager.h"
+#include "sharedSkillSystem/SkillObject.h"
+#include "sharedTerrain/TerrainObject.h"
+#include "sharedTerrain/WaterTypeManager.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+#include "swgSharedNetworkMessages/MessageQueueCombatAction.h"
+#include "swgSharedUtility/Attributes.h"
+#include "swgSharedUtility/States.h"
+#include "sharedUtility/ValueDictionary.h"
+#include <algorithm>
+#include <deque>
+#include <hash_set>
+#include <set>
+
+//----------------------------------------------------------------------
+// static CreatureObject vars
+
+const SharedObjectTemplate * CreatureObject::m_defaultSharedTemplate = NULL;
+
+//----------------------------------------------------------------------
+
+// The max number of lots available to a player.  This value is also defined in base_class.java
+static const int HOUSING_MAX_LOTS = 10;
+
+// Slot names
+static const ConstCharCrcLowerString DATAPAD_SLOT_NAME("datapad");
+
+// Crafting objvar names
+static const std::string OBJVAR_DISABLE_SCHEMATIC_FILTER("crafting.disableSchematicFiltering");
+
+//objvar for banking
+static const std::string OBJVAR_BANK_ID("banking_bankid");
+static const std::string OBJVAR_OPEN_BANK_TERMINAL_ID("open_bank_location");
+
+//slot names
+static const ConstCharCrcLowerString BANK_SLOT_NAME("bank");
+static const ConstCharCrcLowerString MISSION_BAG_SLOT_NAME("mission_bag");
+
+// skill data granted independently from skills
+static const std::string OBJVAR_NOT_SKILL_MODS("_notskill.mods");
+static const std::string OBJVAR_NOT_SKILL_COMMANDS("_notskill.commands");
+static const std::string OBJVAR_NOT_SKILL_SCHEMATICS("_notskill.schematics");
+
+// special skill mods
+static const std::string SLOPE_MOD("slope_move");
+static const std::string GROUP_SLOPE_MOD("group_slope_move");
+
+// jedi/force power objvars
+static const std::string OBJVAR_NEW_JEDI_FORCE("_start_force");
+static const std::string OBJVAR_JEDI("jedi");
+static const std::string OBJVAR_ADD_JEDI_ACK("jediAddedAcknowlege");
+//static const std::string OBJVAR_FORCE_REGEN_RATE("jedi.regenrate");
+//static const std::string OBJVAR_FORCE_REGEN_VALUE("jedi.regenvalue");
+static const std::string OBJVAR_JEDI_VISIBILITY("jedi.visibility");
+
+// deprecated badge objvars (will be used to move old badges over to the collection system)
+static const std::string OBJVAR_BADGES("badge.tracking");
+static const std::string OBJVAR_COUNT_BADGES("badge.count");
+
+// residence house id objvar
+const std::string OBJVAR_PLAYER_HOUSE_ID("residenceHouseId");
+
+// If a pet accepts a group invitation but is deleted before
+// being given the group information, we need to try to remove
+// him from the group in the future
+static const unsigned MAX_ATTEMPTS_TO_REMOVE_PET_FROM_GROUP = 30;
+static const int      TIME_BETWEEN_ATTEMPTS_TO_REMOVE_PET   = 1;
+
+// creature regen constants
+const static std::string CREATURES_TABLE("datatables/mob/creatures.iff");
+
+//----------------------------------------------------------------------
+
+namespace CreatureObjectNamespace
+{
+	const int POINTS_PER_TIER = 4;
+	// ----------------------------------------------------------------------
+
+	const char* s_inventoryTemplate  = "object/tangible/inventory/character_inventory.iff";
+	const char* s_datapadTemplate    = "object/tangible/datapad/character_datapad.iff";
+	const char* s_missionBagTemplate = "object/tangible/mission_bag/mission_bag.iff";
+	const char* s_bankTemplate       = "object/tangible/bank/character_bank.iff";
+	const char* s_appearanceTemplate = "object/tangible/inventory/appearance_inventory.iff";
+
+	SlotId      s_defaultWeaponSlotId    = SlotId::invalid;
+	SlotId      s_inventorySlotId        = SlotId::invalid;
+	SlotId      s_appearanceSlotId       = SlotId::invalid;
+	bool        s_allowNullDefaultWeapon = false;
+
+	// ----------------------------------------------------------------------
+
+	std::map<std::string, std::pair<int, int> > s_instrumentTypeMap;
+
+	// ----------------------------------------------------------------------
+
+	void loadInstrumentTable()
+	{
+		char const *fileName = ConfigServerGame::getInstrumentDataTableFilename();
+		DataTable *t = DataTableManager::getTable(fileName, true);
+		if (!t)
+		{
+			FATAL(true, ("Could not find instrument datatable %s.", fileName));
+		}
+		for (int row = 0; row < t->getNumRows(); ++row)
+		{
+			std::string name = t->getStringValue("serverTemplateName", row);
+			int visualId = t->getIntValue("instrumentVisualId", row);
+			int audioId = t->getIntValue("instrumentAudioId", row);
+			IGNORE_RETURN(s_instrumentTypeMap.insert(std::make_pair(name, std::make_pair(visualId, audioId))));
+		}
+		DataTableManager::close(fileName);
+	}
+
+	// ----------------------------------------------------------------------
+
+	int lookupInstrumentVisualId(char const * serverTemplateName)
+	{
+		std::map<std::string, std::pair<int, int> >::const_iterator i = s_instrumentTypeMap.find(std::string(serverTemplateName));
+		if (i != s_instrumentTypeMap.end())
+			return (*i).second.first;
+		return 0;
+	}
+
+	// ----------------------------------------------------------------------
+
+	int lookupInstrumentAudioId(char const * serverTemplateName)
+	{
+		std::map<std::string, std::pair<int, int> >::const_iterator i = s_instrumentTypeMap.find(std::string(serverTemplateName));
+		if (i != s_instrumentTypeMap.end())
+			return (*i).second.second;
+		return 0;
+	}
+
+	// ----------------------------------------------------------------------
+
+	std::map<int, int> s_danceVisualMap;
+
+	// ----------------------------------------------------------------------
+
+	void loadDanceVisualTable()
+	{
+		char const *fileName = ConfigServerGame::getPerformanceDataTableFilename();
+		DataTable *t = DataTableManager::getTable(fileName, true);
+		for (int row = 0; row < t->getNumRows(); ++row)
+		{
+			int visualId = t->getIntValue("danceVisualId", row);
+			if (visualId)
+			{
+				IGNORE_RETURN(s_danceVisualMap.insert(std::make_pair(row+1, visualId)));
+			}
+		}
+		DataTableManager::close(fileName);
+	}
+
+	struct CommandSeriesRecord
+	{
+		std::string commandName;
+		std::string baseCommandName;
+		int level;
+	};
+	std::vector<CommandSeriesRecord> s_commandSeriesRecords;
+
+	void loadCommandSeriesTable()
+	{
+		DataTable *t = DataTableManager::getTable("datatables/command/command_series.iff", true);
+		for (int row = 0; row < t->getNumRows(); ++row)
+		{
+			CommandSeriesRecord csr;
+			csr.commandName = t->getStringValue("commandName", row);
+			csr.baseCommandName = t->getStringValue("baseCommandName", row);
+			csr.level = t->getIntValue("level", row);
+			IGNORE_RETURN(s_commandSeriesRecords.push_back(csr));			
+		}
+		DataTableManager::close("datatables/command/command_series.iff");
+	}
+
+	// ----------------------------------------------------------------------
+
+	int lookupDanceVisual(int performanceType)
+	{
+		std::map<int, int>::const_iterator i = s_danceVisualMap.find(performanceType);
+		if (i != s_danceVisualMap.end())
+			return (*i).second;
+		return 0;
+	}
+
+	// ----------------------------------------------------------------------
+
+	bool instrumentTooFar(Vector const &playerPos_w, Vector const &instrumentPos_w)
+	{
+		static float maxDistSquared = sqr(ConfigServerGame::getMaxInstrumentPlayDistance());
+		if (playerPos_w.magnitudeBetweenSquared(instrumentPos_w) < maxDistSquared)
+			return false;
+		return true;
+	}
+
+	// ----------------------------------------------------------------------
+
+	CreatureObject::AllCreaturesSet g_creatureList;
+
+	std::vector<std::pair<CreatureObject *, NetworkId> > gs_missionRequestQueue;
+	std::vector<std::pair<CreatureObject *, NetworkId> > gs_missionRequestQueueDeferredRemoves;
+
+	void removeCreatureFromMissionRequestQueue(const CreatureObject * creature)
+	{
+		std::vector<std::pair<CreatureObject *, NetworkId> >::iterator qiter;
+		for(qiter = gs_missionRequestQueue.begin(); qiter != gs_missionRequestQueue.end(); ++qiter)
+		{
+			if((*qiter).first == creature)
+			{
+				gs_missionRequestQueueDeferredRemoves.push_back((*qiter));
+			}
+		}
+	}
+
+	std::deque<NetworkId> s_spawnQueue;
+	std::deque<NetworkId> s_missionQueue;
+
+	//----------------------------------------------------------------------
+	//- @odo: these lists really need to be moved into C++
+
+	bool isBuildingAdminForTarget (const ServerObject & object, const ServerObject & target)
+	{
+
+		const TangibleObject* hopperObject = target.asTangibleObject();
+		const CreatureObject* player = object.asCreatureObject();
+		if (!player || !hopperObject)
+			return false;
+		return hopperObject->isOnAdminList(*player);
+	}
+
+	//----------------------------------------------------------------------
+
+	bool canHopperForTarget (const ServerObject & object, const ServerObject & target)
+	{
+		const TangibleObject* hopperObject = target.asTangibleObject();
+		const CreatureObject* player = object.asCreatureObject();
+		if (!player || !hopperObject)
+			return false;
+		return hopperObject->isOnHopperList(*player);
+	}
+
+	//----------------------------------------------------------------------
+
+	bool isTargetBuildingBaseObject (const ServerObject & buildingObject, const ServerObject & target)
+	{
+		static const std::string objvarname_baseObjects = "player_structure.base_objects";
+
+		const NetworkId & targetId = target.getNetworkId ();
+
+		typedef stdvector<NetworkId>::fwd NetworkIdVector;
+		static NetworkIdVector ids;
+		ids.clear ();
+
+		if (buildingObject.getObjVars ().getItem (objvarname_baseObjects, ids))
+		{
+			for (NetworkIdVector::const_iterator it = ids.begin (); it != ids.end (); ++it)
+			{
+				const NetworkId & id = *it;
+				if (id == targetId)
+					return true;
+			}
+		}
+
+		return false;
+	}
+
+	bool isOnVendorList(const CreatureObject& object, const ServerObject& target)
+	{
+		static const std::string objvarname_vendorList = "player_structure.vendor.vendorList";
+
+		const Unicode::String & requestorFirstName = object.getAssignedObjectFirstName ();
+		typedef stdvector<Unicode::String>::fwd StringVector;
+		static StringVector sv;
+		sv.clear ();
+
+		if (target.getObjVars ().getItem (objvarname_vendorList, sv))
+		{
+			for (StringVector::const_iterator it = sv.begin (); it != sv.end (); ++it)
+			{
+				const Unicode::String & vendorFirstName = *it;
+				if (Unicode::caseInsensitiveCompare (vendorFirstName, requestorFirstName))
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	//----------------------------------------------------------------------
+
+	namespace SlotNames
+	{
+		static const ConstCharCrcLowerString datapad   ("datapad");
+		static const ConstCharCrcLowerString inventory ("inventory");
+		static const ConstCharCrcLowerString bank      ("bank");
+		static const ConstCharCrcLowerString hair      ("hair");
+		static const ConstCharCrcLowerString ghost     ("ghost");
+		static const ConstCharCrcLowerString appearance ("appearance_inventory");
+		static const ConstCharCrcLowerString hangar    ("hangar");
+	}
+
+	uint64 s_containmentStatesMask = 0;
+	std::map<SlotId, uint64> s_containerSlotStates;
+
+	namespace GroupHelpers
+	{
+		bool creatureIsContainedInPOBShip(CreatureObject const * creatureObject);
+		void findAllTargetsForGroup(CreatureObject * const targetObj, std::vector<CreatureObject *> & targets);
+		bool roomInGroup(GroupObject const * groupObj, int additionalMembers);
+		GroupMemberParam const buildGroupMemberParam(CreatureObject const * creatureObject);
+		void buildGroupMemberParamsFromCreatures(std::vector<CreatureObject *> const & targets, GroupObject::GroupMemberParamVector & targetMemberParams);
+	}
+
+	// ----------------------------------------------------------------------
+
+	void skipField(std::string const &source, unsigned int &pos)
+	{
+		while (source[pos] && source[pos] != '~')
+			++pos;
+		if (source[pos] == '~')
+			++pos;
+	}
+
+	// ----------------------------------------------------------------------
+
+	void nextString(std::string const &source, unsigned int &pos, std::string &ret)
+	{
+		unsigned int oldPos = pos;
+		while (source[pos] && source[pos] != '~')
+			++pos;
+		ret = source.substr(oldPos, pos-oldPos);
+		if (source[pos] == '~')
+			++pos;
+	}
+
+	// ----------------------------------------------------------------------
+
+	void nextOid(std::string const &source, unsigned int &pos, NetworkId &ret)
+	{
+		unsigned int oldPos = pos;
+		skipField(source, pos);
+		ret = NetworkId(source.substr(oldPos, pos-oldPos));
+	}
+
+	// ----------------------------------------------------------------------
+
+	void nextFloat(std::string const &source, unsigned int &pos, float &ret)
+	{
+		ret = static_cast<float>(atof(source.c_str()+pos));
+		skipField(source, pos);
+	}
+
+	// for enforcing height restriction when restoring decoration layout
+	std::map<std::pair<uint32, uint32>, std::pair<float, float> > s_mapCellHeightRestriction;
+
+	void restoreItemDecorationLayout(CreatureObject & decorator, PlayerObject & decoratorPlayerObject, CachedNetworkId const & item, TangibleObject const & pob, CachedNetworkId const & cell, Vector const & position, Quaternion const & orientation);
+}
+
+//=======================================================================
+
+using namespace CreatureObjectNamespace;
+
+//=======================================================================
+
+void CreatureObject::PostureChangeCallback::modified(CreatureObject &target, Postures::Enumerator oldValue, Postures::Enumerator value, bool) const
+{
+	UNREF(oldValue);
+	// Make creatures not collidable when they're in dead or incapacitated posture
+	CollisionProperty * collision = target.getCollisionProperty();
+	if (collision)
+	{
+		bool collidable = (value != Postures::Dead && value != Postures::Incapacitated);
+		collision->setCollidable(collidable);
+	}
+
+	//-- Retrieve the collection of avialable locomotions for fast/slow/stationary movement speeds.
+	//   This info is used on authoritative and proxy objects to make calcLocomotions(), called every alter,
+	//   considerably more efficient.
+	target.getAvailableLocomotions();
+	if (value == Postures::Dead)
+		Pvp::handleCreatureDied(target);
+}
+
+//=======================================================================
+
+void CreatureObject::LocomotionChangeCallback::modified(CreatureObject &target, Locomotions::Enumerator oldValue, Locomotions::Enumerator value, bool) const
+{
+	ScriptParams params;
+	params.addParam(value);
+	params.addParam(oldValue);
+
+	if (target.isAuthoritative())
+	{
+		GameScriptObject * const script = target.getScriptObject();
+
+		if (script != 0)
+		{
+			script->trigAllScripts(Scripting::TRIG_LOCOMOTION_CHANGED, params);
+		}
+	}
+}
+
+// ======================================================================
+
+void CreatureObject::StateChangeCallback::modified(CreatureObject &target, uint64 oldValue, uint64 newValue, bool isLocal) const
+{
+	UNREF(newValue);
+	UNREF(isLocal);
+	UNREF(oldValue);
+	//-- Retrieve the collection of avialable locomotions for fast/slow/stationary movement speeds.
+	//   This info is used on authoritative and proxy objects to make calcLocomotions(), called every alter,
+	//   considerably more efficient.
+	target.getAvailableLocomotions();
+}
+
+// ======================================================================
+
+CreatureAttitude::CreatureAttitude() :
+	m_behavior(Behaviors::Invalid),
+	m_angerState(kAngerCalm),
+	m_fearState(kFearCalm)
+{
+	for (int i = 0; i <MentalStates::NumberOfMentalStates; ++i)
+		m_currentValues[i] = 0;
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureAttitude::operator!=(CreatureAttitude const &other) const
+{
+	if (   m_behavior != other.m_behavior
+	    || m_angerState != other.m_angerState
+	    || m_fearState != other.m_fearState)
+		return true;
+	for (int i = 0; i < MentalStates::NumberOfMentalStates; ++i)
+		if (m_currentValues[i] != other.m_currentValues[i])
+			return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+float CreatureAttitude::operator-(CreatureAttitude const &other) const
+{
+	float result = 0.0f;
+	if (m_behavior != other.m_behavior)
+		result = 30.0f;
+	if (m_angerState != other.m_angerState)
+		result += 30.0f;
+	if (m_fearState != other.m_fearState)
+		result += 30.0f;
+	for (int i = 0; i < MentalStates::NumberOfMentalStates; ++i)
+		result += abs(m_currentValues[i] - other.m_currentValues[i]);
+	return result;
+}
+
+// ======================================================================
+
+MonitoredCreatureMovement::MonitoredCreatureMovement() :
+	m_lastDistance(0),
+	m_skittishness(0),
+	m_curve(0)
+{
+}
+
+// ----------------------------------------------------------------------
+
+bool MonitoredCreatureMovement::operator!=(MonitoredCreatureMovement const &other) const
+{
+	return    m_lastDistance != other.m_lastDistance
+	       || m_skittishness != other.m_skittishness
+	       || m_curve != other.m_curve;
+}
+
+// ----------------------------------------------------------------------
+
+float MonitoredCreatureMovement::operator-(MonitoredCreatureMovement const &other) const
+{
+	return   abs(m_lastDistance - other.m_lastDistance)
+	       + abs(m_skittishness - other.m_skittishness)
+	       + abs(m_curve - other.m_curve);
+}
+
+// ======================================================================
+
+CreatureObject::CreatureObject(const ServerCreatureObjectTemplate* newTemplate) :
+	TangibleObject(newTemplate),
+	m_commandQueue(NULL),
+	m_isStatic(false),
+	m_shield(NULL),
+	m_regenerationTime(0),
+	m_attributes(Attributes::NumberOfAttributes),
+	m_maxAttributes(Attributes::NumberOfAttributes),
+	m_totalAttributes(Attributes::NumberOfAttributes),
+	m_totalMaxAttributes(Attributes::NumberOfAttributes),
+	m_attribBonus(Attributes::NumberOfAttributes),
+	m_shockWounds(0),
+	m_attributeModList(),
+	m_cachedCurrentAttributeModValues(Attributes::NumberOfAttributes),
+	m_cachedMaxAttributeModValues(Attributes::NumberOfAttributes),
+	m_currentAttitude(),
+	m_lastBehavior(),
+	m_mentalStatesToward(),
+	m_maxMentalStates(),
+	m_mentalStateDecays(),
+	m_scaleFactor(1.0f),
+	m_monitoredCreatureMovements(),
+	m_guildId(0),
+	m_timeToUpdateGuildWarPvpStatus(0),
+	m_guildWarEnabled(false),
+	m_militiaOfCityId(),
+	m_locatedInCityId(),
+	m_masterId(),
+	m_rank(0),
+	m_wsX(0.0),
+	m_wsY(0.0),
+	m_wsZ(0.0),
+//	m_animState(CreatureObject::AS_idle),
+	m_mood(0),
+	m_sayMode(0),
+	m_animationMood("neutral"),
+	m_posture(Postures::Upright),
+	m_stopWalkRun(2),
+	m_states(0),
+	m_movementScale(1.0f),
+	m_movementPercent(1.0f),
+	m_baseWalkSpeed        (-1.0f),
+	m_walkSpeed            (safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate())->getSpeed(SharedCreatureObjectTemplate::MT_walk)),
+	m_baseRunSpeed         (-1.0f),
+	m_runSpeed             (safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate())->getSpeed(SharedCreatureObjectTemplate::MT_run)),
+	m_accelScale           (1.0f),
+	m_accelPercent         (1.0f),
+	m_turnScale            (1.0f),
+	m_slopeModAngle        (safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate())->getSlopeModAngle() * PI / 180),
+	m_baseSlopeModPercent  (safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate())->getSlopeModPercent()),
+	m_slopeModPercent      (1.0f),
+	m_waterModPercent      (safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate())->getWaterModPercent()),
+	m_lookAtTarget                (),
+	m_intendedTarget              (),
+	m_cover                       (0),
+	m_coverVisibility             (true),
+	m_currentWeapon               (),
+	m_modMap                      (),
+	m_skills                      (),
+	m_deferComputeTotalAttributes (0),
+	m_group                       (),
+	m_groupInviter                (),
+	m_inviterForPendingGroup      (),
+	m_performanceType             (),
+	m_performanceStartTime        (),
+	m_animatingSkillData          (),
+	m_level                       (-1),
+	m_previousLevel               (-1),
+	m_totalLevelXp                (0),
+	m_levelHealthGranted          (0),
+	m_invulnerabilityTimer        (),
+	m_alternateAppearanceSharedObjectTemplateName (),
+	m_clientMfdStatusUpdateMessage(0),
+	m_timedMod                    (),
+	m_timedModDuration            (),
+	m_timedModUpdateTime          (),
+	m_addedToSpawnQueue           (false),
+	m_numberOfMissionsWantedInMissionBag(0),
+	m_fastLocomotion              (Locomotions::Invalid),
+	m_slowLocomotion              (Locomotions::Invalid),
+	m_stationaryLocomotion        (Locomotions::Invalid),
+	m_vehiclePhysicsData          (0),
+	m_missionCriticalObjectSet(),
+	m_groupMissionCriticalObjectSet(),
+	m_triggerVolumeEntered(),
+	m_pseudoPlayedTime(0.0f),
+	m_buffs(),
+	m_persistedBuffs(),
+	m_clientUsesAnimationLocomotion(false),
+	m_difficulty(static_cast<unsigned char>(D_normal)),
+	m_hologramType(-1),
+	m_visibleOnMapAndRadar(true),
+	m_lookAtYaw(0.0f),
+	m_useLookAtYaw(false),
+	m_fixedupPersistentBuffsAfterLoading(false),
+	m_fixedupLevelXpAfterLoading(false),
+	m_lavaResistance(0.0f),
+	m_lastWaterDamageTime(0),
+	m_isBeast(false),
+	m_forceShowHam(false),
+	m_regionFlagTimer(ConfigServerGame::getRegionFlagUpdateTimeSecs()),
+	m_wearableAppearanceData(),
+	m_decoyOrigin(NetworkId::cms_invalid)
+{
+	addProperty(*(new CommandQueue(*this)));
+
+	// get the shared object template
+	const SharedCreatureObjectTemplate * sharedTemplate = safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate());
+	NOT_NULL(sharedTemplate);
+
+	// Handle scale.
+	// setScaleFactor(safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate())->getScale());
+	// Cannot set scale with setScaleFactor() since this object isn't authoratative yet.  Expect many
+	// bugs from the lack of authority setting within a constructor.
+	const float scale = std::max (0.0f, sharedTemplate->getScale());
+	m_scaleFactor = scale;
+	setScale (Vector::xyz111 * scale);
+
+	// get the attribute values
+	{
+		for (int i = 0; i < Attributes::NumberOfAttributes; ++i)
+		{
+			m_attributes.set(i, static_cast<Attributes::Value>(
+				newTemplate->getAttributes(static_cast<
+				ServerCreatureObjectTemplate::Attributes>(i))));
+			m_maxAttributes.set(i, m_attributes.get(i));
+			m_cachedCurrentAttributeModValues.set(i, 0);
+			m_cachedMaxAttributeModValues.set(i, 0);
+			m_regeneration[i] = 0;
+		}
+		// store the default regen values in the former faucet attrib slots
+		m_attributes.set(Attributes::Constitution, static_cast<int>(ConfigServerGame::getDefaultHealthRegen()));
+		m_attributes.set(Attributes::Stamina, static_cast<int>(ConfigServerGame::getDefaultActionRegen()));
+		m_attributes.set(Attributes::Willpower, static_cast<int>(ConfigServerGame::getDefaultMindRegen()));
+	}
+
+	// fix the size of the mental state vectors
+	m_maxMentalStates.resize(MentalStates::NumberOfMentalStates,      0);
+	m_mentalStateDecays.resize(MentalStates::NumberOfMentalStates,    0);
+
+	CreatureAttitude initialState;
+
+	// get the mental state values
+	{
+		for (int i = 0; i < MentalStates::NumberOfMentalStates; ++i)
+		{
+			const ServerCreatureObjectTemplate::MentalStates state = static_cast<ServerCreatureObjectTemplate::MentalStates>(i);
+
+			m_maxMentalStates.set(i, static_cast<MentalStates::Value>(newTemplate->getMaxMentalStates(state)));
+			initialState.m_currentValues[i] = 0;
+			m_mentalStateDecays.set(i, float(newTemplate->getMentalStatesDecay(state)));
+		}
+	}
+
+	m_currentAttitude.set(initialState);
+	m_lastBehavior.set(-1);
+
+	m_fearCutoffs[CreatureAttitude::kFearCalm] = 0;
+	m_fearCutoffs[CreatureAttitude::kFearAlert] = 25;
+	m_fearCutoffs[CreatureAttitude::kFearThreaten] = 50;
+	m_fearCutoffs[CreatureAttitude::kFearFlee] = 75;
+	m_fearCutoffs[CreatureAttitude::kFearPanic] = 100;
+
+	m_angerCutoffs[CreatureAttitude::kAngerCalm] = 0;
+	m_angerCutoffs[CreatureAttitude::kAngerAttack] = 60;
+	m_angerCutoffs[CreatureAttitude::kAngerFrenzy] = 100;
+
+	CollisionProperty * pCollision = getCollisionProperty();
+
+	if(pCollision)
+	{
+		pCollision->setServerSide(true);
+	}
+
+	addMembersToPackages();
+
+	m_guildId.setSourceObject(this);
+	m_guildWarEnabled.setSourceObject(this);
+	m_militiaOfCityId.setSourceObject(this);
+	m_locatedInCityId.setSourceObject(this);
+	m_group.setSourceObject(this);
+	m_posture.setSourceObject(this);
+	m_locomotion.setSourceObject(this);
+	m_invulnerabilityTimer.setSourceObject(this);
+
+	if (GameObjectTypes::isTypeOf (getGameObjectType (), SharedObjectTemplate::GOT_vehicle))
+	{
+		CustomizationData *const cd = fetchCustomizationData();
+		if (cd)
+		{
+			VehicleHoverDynamics::setInitialParams (*cd,
+				safe_cast<const SharedCreatureObjectTemplate*> (getSharedTemplate ())->getSpeedMin        (SharedCreatureObjectTemplate::MT_walk),
+				safe_cast<const SharedCreatureObjectTemplate*> (getSharedTemplate ())->getSpeed           (SharedCreatureObjectTemplate::MT_run),
+				safe_cast<const SharedCreatureObjectTemplate*> (getSharedTemplate ())->getTurnRate        (SharedCreatureObjectTemplate::MT_walk),
+				safe_cast<const SharedCreatureObjectTemplate*> (getSharedTemplate ())->getTurnRate        (SharedCreatureObjectTemplate::MT_run),
+				safe_cast<const SharedCreatureObjectTemplate*> (getSharedTemplate ())->getAccelerationMax (SharedCreatureObjectTemplate::MT_walk),
+				safe_cast<const SharedCreatureObjectTemplate*> (getSharedTemplate ())->getAccelerationMax (SharedCreatureObjectTemplate::MT_run));
+
+			cd->release ();
+		}
+	}
+
+	m_lavaResistance = WaterTypeManager::getLavaResistance(getObjectTemplateName());
+
+	IGNORE_RETURN(g_creatureList.insert(this));
+
+	ObjectTracker::addCreature();
+}
+
+//-----------------------------------------------------------------------
+
+CreatureObject::~CreatureObject()
+{
+	//-- This must be the first line in the destructor to invalidate any watchers watching this object
+	nullWatchers();
+
+	if (m_vehiclePhysicsData)
+	{
+		delete m_vehiclePhysicsData;
+		m_vehiclePhysicsData = 0;
+	}
+
+	if (isAuthoritative())
+	{
+		GroupObject *group = getGroup();
+		if (group)
+		{
+			group->removeGroupMember(getNetworkId());
+		}
+		else
+		{
+			// If we are a pet...
+			if ( getMasterId() != NetworkId::cms_invalid )
+			{
+				// We need to clean up outstanding group invitations since
+				// there are race conditions with ServerUniverse group
+				// objects and us getting added to them
+
+				// Check for an outstanding group formation
+				const NetworkId groupInviterNetworkId = getInviterForPendingGroup();
+				if ( groupInviterNetworkId != NetworkId::cms_invalid )
+				{
+					// Send a message to the group inviter to tell them to remove
+					// us from the group...
+
+					// We need to tell the network ID of the pet and we need to keep
+					// of how many times this message has been sent to the inviter
+					char msgBuffer[100];
+					sprintf( msgBuffer, "%s 1", getNetworkId().getValueString().c_str() );
+
+					// Send the message with a delay
+					if ( MessageToQueue::isInstalled() )
+					{
+						MessageToQueue::getInstance().sendMessageToC( groupInviterNetworkId,
+																													"C++RemovePetFromGroup",
+																													msgBuffer,
+																													TIME_BETWEEN_ATTEMPTS_TO_REMOVE_PET,
+																													false );  // reliable
+					}
+				}
+			}
+		}
+
+		if (getGuildId())
+			GuildInterface::onAboutToClearGuildId(*this);
+	}
+
+	if (isPlayerControlled())
+		removeFromSpawnQueue();
+
+	removeCreatureFromMissionRequestQueue(this);
+	if (isInWorld())
+		removeFromWorld();
+
+	Controller *controller = getController();
+	if (controller)
+	{
+		CreatureController *creatureController = safe_cast<CreatureController*>(controller);
+		ServerSecureTrade *trade = creatureController->getSecureTrade();
+		if (trade)
+			trade->cancelTrade(*this);
+	}
+//	AICreatureController * aiController = AICreatureController::asAiCreatureController(controller);
+//	if (aiController != NULL)
+//	{
+//		aiController->stop();
+//	}
+
+	IGNORE_RETURN(g_creatureList.erase(this));
+
+	delete m_clientMfdStatusUpdateMessage;
+
+	// We should have have been removed from all TriggerVolumes by
+	// now, but if we haven't, we need to tell any TriggerVolumes
+	// that we haven't been removed from to remove us from their
+	// contents list, or else those TriggerVolumes will have a
+	// pointer to a non-existent object
+	for (std::set<TriggerVolume *>::const_iterator i = m_triggerVolumeEntered.begin(); i != m_triggerVolumeEntered.end(); ++i)
+	{
+		WARNING(true, ("CreatureObject (%s) being destroyed but hasn't been removed from TriggerVolume (%s) owned by (%s)",
+			getDebugInformation().c_str(),
+			(*i)->getName().c_str(),
+			(*i)->getOwner().getDebugInformation().c_str()));
+
+		(*i)->objectDestroyed(*this);
+	}
+
+	ObjectTracker::removeCreature();
+}
+
+
+//-----------------------------------------------------------------------
+
+CreatureObject * CreatureObject::asCreatureObject()
+{
+	return this;
+}
+
+//-----------------------------------------------------------------------
+
+CreatureObject const * CreatureObject::asCreatureObject() const
+{
+	return this;
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::install()
+{
+	loadDanceVisualTable();
+	loadInstrumentTable();
+	loadCommandSeriesTable();
+
+	installForMounts();
+
+	s_defaultWeaponSlotId = SlotIdManager::findSlotId(ConstCharCrcLowerString("default_weapon"));
+	FATAL(s_defaultWeaponSlotId == SlotId::invalid, ("failed to find SlotId for default_weapon: the slot definition file was improperly loaded or modified."));
+
+	s_inventorySlotId = SlotIdManager::findSlotId(CreatureObjectNamespace::SlotNames::inventory);
+	FATAL(s_inventorySlotId == SlotId::invalid, ("failed to find SlotId for inventory: the slot definition file was improperly loaded or modified."));
+
+	s_appearanceSlotId = SlotIdManager::findSlotId(CreatureObjectNamespace::SlotNames::appearance);
+	FATAL(s_appearanceSlotId == SlotId::invalid, ("Failed to find SlotId for appearance: the slot definition file was improperly loaded or modified."));
+
+	s_containerSlotStates[ShipSlotIdManager::getShipPilotSlotId()]      = States::getStateMask(States::PilotingShip);
+	s_containerSlotStates[ShipSlotIdManager::getPobShipPilotSlotId()]   = States::getStateMask(States::PilotingPobShip);
+	s_containerSlotStates[ShipSlotIdManager::getShipOperationsSlotId()] = States::getStateMask(States::ShipOperations);
+	s_containerSlotStates[ShipSlotIdManager::getPobShipOperationsSlotId()] = States::getStateMask(States::ShipOperations);
+
+	{
+		// corresponds to slots in CreatureObject_Mounts.cpp
+		char slotName[256];
+		s_containerSlotStates[SlotIdManager::findSlotId(ConstCharCrcLowerString("rider"))] = States::getStateMask(States::RidingMount);
+		for (int i = 1; i < 8; ++i)
+		{
+			snprintf(slotName, 255, "rider%d", i);
+			SlotId const slot = SlotIdManager::findSlotId(ConstCharCrcLowerString(slotName));
+			s_containerSlotStates[slot] = States::getStateMask(States::RidingMount);
+		}
+	}
+
+	for (int weaponIndex = 0; weaponIndex < ShipChassisSlotType::cms_numWeaponIndices; ++weaponIndex)
+	{
+		s_containerSlotStates[ShipSlotIdManager::getShipGunnerSlotId(weaponIndex)] = States::getStateMask(States::ShipGunner);
+		s_containerSlotStates[ShipSlotIdManager::getPobShipGunnerSlotId(weaponIndex)] = States::getStateMask(States::ShipGunner);
+	}
+
+	s_containmentStatesMask = States::getStateMask(States::ShipInterior);
+	for (std::map<SlotId, uint64>::const_iterator i = s_containerSlotStates.begin(); i != s_containerSlotStates.end(); ++i)
+		s_containmentStatesMask |= (*i).second;
+
+	// for enforcing height restriction when restoring decoration layout
+	{
+		char const * const cellHeightDataTableName = "datatables/structure/cell_height.iff";
+		DataTable * table = DataTableManager::getTable(cellHeightDataTableName, true);
+		if (table)
+		{
+			int const columnStructure = table->findColumnNumber("template");
+			int const columnCell = table->findColumnNumber("cell");
+			int const columnMinHeight = table->findColumnNumber("min_height");
+			int const columnMaxHeight = table->findColumnNumber("max_height");
+			if ((columnStructure >= 0) && (columnCell >= 0) && (columnMinHeight >= 0) && (columnMaxHeight >= 0))
+			{
+				std::string structure;
+				std::string cell;
+
+				for (int i = 0, numRows = table->getNumRows(); i < numRows; ++i)
+				{
+					structure = table->getStringValue(columnStructure, i);
+					if (structure.empty())
+						continue;
+
+					cell = table->getStringValue(columnCell, i);
+					if (cell.empty())
+						continue;
+
+					s_mapCellHeightRestriction[std::make_pair(CrcLowerString::calculateCrc(structure.c_str()), CrcLowerString::calculateCrc(cell.c_str()))] = std::make_pair(table->getFloatValue(columnMinHeight, i), table->getFloatValue(columnMaxHeight, i));
+				}
+			}
+
+			DataTableManager::close(cellHeightDataTableName);
+		}
+	}
+
+	ExitChain::add(CreatureObject::remove, "CreatureObject::remove");
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::remove()
+{
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a shared template if none was given for this object.
+ *
+ * @return the shared template
+ */
+const SharedObjectTemplate * CreatureObject::getDefaultSharedTemplate() const
+{
+static const ConstCharCrcLowerString templateName("object/creature/base/shared_creature_default.iff");
+
+	if (m_defaultSharedTemplate == NULL)
+	{
+		m_defaultSharedTemplate = safe_cast<const SharedObjectTemplate *>(
+			ObjectTemplateList::fetch(templateName));
+		WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create "
+			"default shared object template %s", templateName.getString()));
+		if (m_defaultSharedTemplate != NULL)
+			ExitChain::add (removeDefaultTemplate, "CreatureObject::removeDefaultTemplate");
+	}
+	return m_defaultSharedTemplate;
+}	// CreatureObject::getDefaultSharedTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Cleans up the default shared template.
+ */
+void CreatureObject::removeDefaultTemplate()
+{
+	if (m_defaultSharedTemplate != NULL)
+	{
+		m_defaultSharedTemplate->releaseReference();
+		m_defaultSharedTemplate = NULL;
+	}
+}	// CreatureObject::removeDefaultTemplate
+
+//-----------------------------------------------------------------------
+
+bool CreatureObject::isSpawningAllowed() const
+{
+	ServerObject const * container = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*this));
+
+	return    isAuthoritative()
+	       && getScriptObject()->isScriptListInitialized()
+	       &&
+	       (
+	        	!container || container->asCreatureObject()
+	       )
+	       && (   ConfigServerGame::getBoundarySpawningAllowed()
+	           || getExposedProxyList().empty())
+	       && (   ConfigServerGame::getEnableSpawningNearLoadBeacons()
+	           || !ServerWorld::isInLoadBeaconRange(getPosition_w()));
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::addToSpawnQueue()
+{
+	PROFILER_AUTO_BLOCK_DEFINE("CreatureObject::addToSpawnQueue");
+
+	if (m_addedToSpawnQueue || !isSpawningAllowed())
+		return;
+
+	DEBUG_FATAL(std::find(s_spawnQueue.begin(), s_spawnQueue.end(), getNetworkId()) != s_spawnQueue.end(), ("spawn queue is inconsistant with m_addedToSpawnQueue flag"));
+
+	s_spawnQueue.push_back(getNetworkId());
+
+	m_addedToSpawnQueue = true;
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::removeFromSpawnQueue()
+{
+	if (m_addedToSpawnQueue)
+	{
+		std::deque<NetworkId>::iterator f = std::find(s_spawnQueue.begin(), s_spawnQueue.end(), getNetworkId());
+		if (f != s_spawnQueue.end())
+			s_spawnQueue.erase(f);
+		m_addedToSpawnQueue = false;
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::runSpawnQueue()
+{
+	static int framesPerSpawn = ConfigServerGame::getFramesPerSpawn();
+	static int64 lastSpawnFrame = 0;
+	static int64 currentSpawnFrame = 0;
+
+	++currentSpawnFrame;
+
+	if (currentSpawnFrame - lastSpawnFrame >= framesPerSpawn)
+	{
+		int i = 1;
+		if (framesPerSpawn == 0)
+			i = ConfigServerGame::getSpawnQueueSize();
+
+		while (i > 0 && !s_spawnQueue.empty())
+		{
+			NetworkId const id = s_spawnQueue.front();
+			s_spawnQueue.pop_front();
+
+			// Only spawn if we can resolve the object, and it believes spawning
+			// should be allowed.  If we can resolve the object but spawning is not
+			// allowed, do not re-add it to the queue and mark it as such.
+
+			CreatureObject * const spawner = safe_cast<CreatureObject *>(NetworkIdManager::getObjectById(id));
+
+			if (spawner)
+			{
+				if (spawner->isSpawningAllowed())
+				{
+					ScriptParams params;
+					ScriptDictionaryPtr dictionary;
+					GameScriptObject::makeScriptDictionary(params, dictionary);
+					if (dictionary.get() != NULL)
+					{
+						dictionary->serialize();
+						MessageToQueue::getInstance().sendMessageToJava(id, "spawn_Trigger", dictionary->getSerializedData(), 0, false);
+					}
+					s_spawnQueue.push_back(id);
+				}
+				else
+					spawner->m_addedToSpawnQueue = false;
+			}
+			--i;
+		}
+		lastSpawnFrame = currentSpawnFrame;
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::showSpawnQueue(Unicode::String & result)
+{
+	for (std::deque<NetworkId>::iterator i = s_spawnQueue.begin(); i != s_spawnQueue.end(); ++i)
+	{
+		ServerObject const * const obj = safe_cast<ServerObject const *>(NetworkIdManager::getObjectById((*i)));
+		if (obj)
+		{
+			result += Unicode::narrowToWide((*i).getValueString());
+			result += Unicode::narrowToWide(" - ");
+			result += obj->getObjectName();
+			result += Unicode::narrowToWide("\n");
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+/**
+*/
+bool CreatureObject::assignMission(MissionObject * missionObject)
+{
+	bool result = false;
+	if(missionObject)
+	{
+		ServerObject * datapad = getDatapad();
+		if(datapad)
+		{
+			// if this mission is coming from our own mission bag, increment missions wanted
+			ServerObject * missionBag = getMissionBag();
+			if(missionBag)
+			{
+				Container * container = ContainerInterface::getContainer(*missionBag);
+				ContainerIterator iter;
+				bool found = false;
+				int i = 0;
+				for(iter = container->begin(); iter != container->end(); ++iter)
+				{
+					MissionObject * mo = safe_cast<MissionObject *>((*iter).getObject());
+					if(mo)
+					{
+						i++;
+						if(mo == missionObject)
+						{
+							found = true;
+						}
+					}
+				}
+				if(found)
+				{
+					setNumberOfMissionsWantedInMissionBag(i + 1);
+				}
+			}
+
+			Container::ContainerErrorCode tmp = Container::CEC_Success;
+			result = ContainerInterface::transferItemToGeneralContainer(*datapad, *missionObject, NULL, tmp);
+			if(result)
+			{
+				missionObject->setMissionHolderId(getNetworkId());
+
+			}
+		}
+	}
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::setMissionBoardUISequenceId(const uint8 sequenceId)
+{
+	m_missionListRequestSequenceId = sequenceId;
+}
+
+//-----------------------------------------------------------------------
+
+std::vector<CachedNetworkId> CreatureObject::getMissions()
+{
+	std::vector<CachedNetworkId> result;
+	ServerObject * const datapad = getDatapad();
+	if (datapad)
+	{
+		Container * const container = ContainerInterface::getContainer(*datapad);
+		if (container)
+		{
+			for (ContainerIterator iter = container->begin(); iter != container->end(); ++iter)
+			{
+				ServerObject * const serverMissionObject = safe_cast<ServerObject *>((*iter).getObject());
+				if (serverMissionObject)
+				{
+					MissionObject * const missionObject = serverMissionObject->asMissionObject();
+					if (missionObject)
+						result.push_back(*iter);
+				}
+			}
+		}
+	}
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+bool CreatureObject::canManipulateObject(ServerObject const &target, bool movingObject, bool doPermissionCheckOnItem, bool doPermissionCheckOnParents, float maxRange, Container::ContainerErrorCode& code, bool skipNoTradeCheck, bool * allowedByGodMode) const
+{
+	if (allowedByGodMode)
+		*allowedByGodMode = false;
+
+	if (getClient() && !ObserveTracker::isObserving(*getClient(), target) && (target.getCacheVersion() == 0))
+	{
+		code = Container::CEC_Unknown;
+		return false;
+	}
+
+	code = Container::CEC_Success;
+	ServerObjectTemplate const * const targetTemplate = safe_cast<ServerObjectTemplate const *>(target.getObjectTemplate());
+	NOT_NULL(targetTemplate);
+
+	bool canMoveInWorld = false;
+	bool godCanMove     = false;
+
+	ServerObject const * const serverTarget = safe_cast<ServerObject const *>(&target);
+	if (!serverTarget || (movingObject && serverTarget->getCacheVersion() > 0))
+	{
+		code = Container::CEC_Unmovable;
+		return false;
+	}
+
+	if (serverTarget->isInBazaarOrVendor() && !(serverTarget->isVendor() || serverTarget->isBazaarTerminal()))
+	{
+		code = Container::CEC_Unknown;
+		return false;
+	}
+
+	ServerObject const * const containedBy = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*serverTarget));
+
+	//-- don't transfer from/to factory crates
+	if (containedBy && containedBy->getGameObjectType () == SharedObjectTemplate::GOT_misc_factory_crate)
+	{
+		code = Container::CEC_Unknown;
+		return false;
+	}
+
+	{
+		for (size_t i = 0; i < targetTemplate->getMoveFlagsCount(); ++i)
+		{
+			if (targetTemplate->getMoveFlags(i) == ServerObjectTemplate::MF_player)
+			{
+				canMoveInWorld = true;
+				godCanMove = true;
+			}
+			else if (targetTemplate->getMoveFlags(i) == ServerObjectTemplate::MF_gm)
+				godCanMove = true;
+		}
+	}
+
+	//Gods don't have distance checks or anything, so we can exit early if they are a god at this point.
+	if ((canMoveInWorld || godCanMove) && getClient() && getClient()->isGod())
+	{
+		if (allowedByGodMode)
+			*allowedByGodMode = true;
+
+		return true;
+	}
+
+	//----------------------------------------------------------------------
+
+	// see if the object is flagged as being owner-only manipulatable
+	if (!skipNoTradeCheck)
+	{
+		if (target.markedNoTrade())
+		{
+			// the item must be owned by this creature
+
+			NetworkId ownerId;
+			if (target.asIntangibleObject())
+				ownerId = containedBy ? containedBy->getOwnerId() : NetworkId::cms_invalid;
+			else
+				ownerId = target.getOwnerId();
+
+			if (ownerId != getNetworkId())
+			{
+				code = Container::CEC_NoPermission;
+				return false;
+			}
+		}
+	}
+
+	//----------------------------------------------------------------------
+
+	// exclude these object types from being moved by players
+	const int got = serverTarget->getGameObjectType ();
+
+	CreatureObject const * const creatureTarget = serverTarget->asCreatureObject();
+	if (movingObject)
+	{
+        // If the object isn't contained they may be trying to move the object
+		// check the flags on the template to see if it can be picked up.
+		if (!canMoveInWorld && target.isInWorld ())
+		{
+//			DEBUG_REPORT_LOG(true, ("canManipulate failed - This object is in the world and is flagged as immobile\n"));
+			code = Container::CEC_NoPermission;
+			return false;
+		}
+
+		// can't move creatures we don't own
+		if (creatureTarget && creatureTarget->getOwnerId() != getNetworkId())
+		{
+			code = Container::CEC_NoPermission;
+			return false;
+		}
+
+		if (GameObjectTypes::isTypeOf (got, SharedObjectTemplate::GOT_building)      ||
+			GameObjectTypes::isTypeOf (got, SharedObjectTemplate::GOT_installation)  ||
+			got == SharedObjectTemplate::GOT_lair                                    ||
+			got == SharedObjectTemplate::GOT_camp                                    ||
+			got == SharedObjectTemplate::GOT_vehicle                                 ||
+			got == SharedObjectTemplate::GOT_corpse                                  ||
+			serverTarget->asCellObject()                                             ||
+			got == SharedObjectTemplate::GOT_data_mission_object)
+		{
+			code = Container::CEC_UnmovableType;
+			return false;
+		}
+
+		//-- can't move items in the world cell unless we are explicitly owning them
+		if (serverTarget->isInWorldCell () && serverTarget->getOwnerId () != getNetworkId ())
+		{
+			code = Container::CEC_NoPermission;
+			return false;
+		}
+	}
+
+	//----------------------------------------------------------------------
+
+	ServerObject const * const firstParentInWorld = safe_cast<ServerObject const *>(ContainerInterface::getFirstParentInWorld(target));
+	if (firstParentInWorld && firstParentInWorld != ContainerInterface::getFirstParentInWorld(*this) && firstParentInWorld->asTangibleObject())
+	{
+
+		if (maxRange > 0.0f)
+		{
+			float distance = findPosition_w().magnitudeBetween(firstParentInWorld->findPosition_w());
+			distance -= getRadius();
+			distance -= firstParentInWorld->getRadius();
+			// Check range on the server with a 1m fudge factor in it.
+			if (distance > maxRange + 1.0f)
+			{
+				code = Container::CEC_OutOfRange;
+				return false;
+			}
+		}
+
+		// skip LOS check if the item is being restored as part of decoration layout restore
+		PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(this);
+		if (!playerObject || (playerObject->getRestoreDecorationObjectBeingRestored() != target.getNetworkId()))
+		{
+			if (!checkLOSTo(*firstParentInWorld))
+			{
+				code = Container::CEC_CantSee;
+//				DEBUG_REPORT_LOG(true, ("LOS check failed in can manipulate\n"));
+				return false;
+			}
+		}
+	}
+
+	//----------------------------------------------------------------------
+
+	bool manipulateOk = true;
+
+	if (target.asTangibleObject() && target.asTangibleObject()->isLocked())
+	{
+		TangibleObject const * tangibleTarget = target.asTangibleObject();
+
+		bool allow = false;
+
+		if(tangibleTarget->isUserOnAccessList(getNetworkId()) || tangibleTarget->isGuildOnAccessList(getGuildId()))
+		{
+			// Still have to obey house rules.
+			ServerObject const * const topmost = safe_cast<ServerObject const *>(ContainerInterface::getTopmostContainer(*serverTarget));
+			if (movingObject && topmost)
+			{
+				//Handle the case where we are in a designer placed building and a designer placed container (loot chest)
+				if (   topmost->getOwnerId() == NetworkId::cms_invalid
+					&& (   firstParentInWorld->getOwnerId() == NetworkId::cms_invalid
+					|| firstParentInWorld->getOwnerId() == getNetworkId())
+					&& serverTarget != firstParentInWorld)
+				{
+					allow = true;
+				}
+				//Handle the case where we are in a player building or pob ship
+				else if (topmost->getOwnerId() == getNetworkId() || isBuildingAdminForTarget (*this, *topmost))
+				{
+					const bool isContainerPortallized = topmost->getPortalProperty() != 0;
+
+					allow = (!isContainerPortallized || !movingObject || !isTargetBuildingBaseObject (*topmost, *serverTarget));
+				}
+				else
+					allow = false;
+			}
+			else
+				allow = true;
+		}
+		else
+		{
+			// Our target is locked, but allow admins on a building to be able to manipulate the object.
+
+			
+			ServerObject const * const topmost = safe_cast<ServerObject const *>(ContainerInterface::getTopmostContainer(*serverTarget));
+			if (topmost)
+			{
+				//Handle the case where we are in a designer placed building and a designer placed container (loot chest)
+				if (   topmost->getOwnerId() == NetworkId::cms_invalid
+					&& (   firstParentInWorld->getOwnerId() == NetworkId::cms_invalid
+					|| firstParentInWorld->getOwnerId() == getNetworkId())
+					&& serverTarget != firstParentInWorld)
+				{
+					allow = true;
+				}
+				//Handle the case where we are in a player building or pob ship
+				else if (topmost->getOwnerId() == getNetworkId())
+				{
+					const bool isContainerPortallized = topmost->getPortalProperty() != 0;
+
+					allow = (!isContainerPortallized || !movingObject || !isTargetBuildingBaseObject (*topmost, *serverTarget));
+				}
+				else
+					allow = false;
+			}
+
+		}
+
+		if(!allow)
+			code = Container::CEC_NoPermission;
+
+		return allow;
+	}
+
+	//----------------------------------------------------------------------
+	//-- see if we need to check permissions of the object itself
+
+	if (doPermissionCheckOnItem)
+	{
+		//Do not allow players to manipulate other players or things contained by other players
+		if (serverTarget->isPlayerControlled() && serverTarget != this)
+		{
+			code = Container::CEC_NoPermission;
+			return false;
+		}
+
+		if (serverTarget->getOwnerId () == getNetworkId())
+		{
+			manipulateOk = true;
+		}
+
+		//-- an invalid owner means we can manipulate the item in general,
+		//-- e.g. opening a container, but not move it
+		else if (movingObject || serverTarget->getOwnerId ().isValid ())
+		{
+			manipulateOk = false;
+		}
+	}
+
+	//----------------------------------------------------------------------
+	//-- see if the permission check on parents needs to be carried out.
+
+//ParentCheck on item
+//if item is a vendor, get topmost and check vendor list
+//else
+//  get first parent in world
+//  if is an installation check hopper list
+//  else if it is a creature, check the immediate parent for ownership only (covers corpses, inventory, etc)
+//  else check ownership of topmost, with 0 being allowed.
+//    if topmost happens to be a player building, check its admin list and make sure the object being moved isn't part of the house
+//	  else if topmost happens to be an unowned building, then any sub containers can be looted
+
+	if (doPermissionCheckOnParents)
+	{
+
+		// Check our access list.
+		if(containedBy && containedBy->asTangibleObject() && containedBy->asTangibleObject()->isLocked())
+		{
+			TangibleObject const * tangibleParent = containedBy->asTangibleObject();
+			
+			if(tangibleParent->isUserOnAccessList(getNetworkId()) || tangibleParent->isGuildOnAccessList(getGuildId()))
+			{
+				manipulateOk = true;
+			}
+			else
+			{
+				manipulateOk = false;
+				code = Container::CEC_NoPermission;
+			}
+
+		}
+		else if (!manipulateOk || movingObject)
+		{
+			//-- can't move items contained by a manufacturing schematic
+			{
+				if (containedBy && containedBy->getGameObjectType () == SharedObjectTemplate::GOT_data_manufacturing_schematic)
+				{
+					code = Container::CEC_NoPermission;
+					return false;
+				}
+			}
+
+			if (firstParentInWorld)
+			{
+				const int containerGot = firstParentInWorld->getGameObjectType ();
+				if (GameObjectTypes::isTypeOf (containerGot, SharedObjectTemplate::GOT_installation))
+				{
+					//-- test admin status on installation
+					manipulateOk = canHopperForTarget (*this, *firstParentInWorld);
+				}
+				else if (firstParentInWorld->asCreatureObject())
+				{
+					// check for ownership
+					manipulateOk = (containedBy && (containedBy->getOwnerId() == getNetworkId() || containedBy->getOwnerId() == NetworkId::cms_invalid));
+				}
+				else
+				{
+					ServerObject const * const topmost = safe_cast<ServerObject const *>(ContainerInterface::getTopmostContainer(*serverTarget));
+					if (topmost)
+					{
+						//Handle the case where we are in a designer placed building and a designer placed container (loot chest)
+						if (   topmost->getOwnerId() == NetworkId::cms_invalid
+						    && (   firstParentInWorld->getOwnerId() == NetworkId::cms_invalid
+						        || firstParentInWorld->getOwnerId() == getNetworkId())
+						    && serverTarget != firstParentInWorld)
+						{
+							manipulateOk = true;
+						}
+						//Handle the case where we are in a player building or pob ship
+						else if (topmost->getOwnerId() == getNetworkId() || isBuildingAdminForTarget (*this, *topmost))
+						{
+							const bool isContainerPortallized = topmost->getPortalProperty() != 0;
+
+							manipulateOk = (!isContainerPortallized || !movingObject || !isTargetBuildingBaseObject (*topmost, *serverTarget));
+						}
+						else
+							manipulateOk = false;
+					}
+					else
+						manipulateOk = false;
+				}
+			}
+			else
+				manipulateOk = false;
+		}
+	}
+
+
+	//----------------------------------------------------------------------
+
+	if (!manipulateOk && code == Container::CEC_Success)
+		code = Container::CEC_NoPermission;
+
+	return manipulateOk;
+}
+
+//-----------------------------------------------------------------------
+/**
+ * Do any processing needed during endBaselines() to handle this object if
+ * it is contained by another object.
+ *
+ * @return  true if object should have addToWorld() called on it; false otherwise.
+ */
+
+bool CreatureObject::handleContentsSetup()
+{
+	bool ret = TangibleObject::handleContentsSetup();
+	setStatesDueToContainment();
+	return ret;
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setStatesDueToContainment()
+{
+	uint64 oldStates = m_states.get();
+	uint64 states = oldStates&(~s_containmentStatesMask);
+
+	ServerObject const *containingObject = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*this));
+	if (containingObject)
+	{
+		SlottedContainer const *slottedContainer = containingObject->getSlottedContainerProperty();
+		if (slottedContainer)
+		{
+			SlottedContainmentProperty const *slottedContainmentProperty = ContainerInterface::getSlottedContainmentProperty(*this);
+			if (slottedContainmentProperty)
+			{
+				int currentArrangement = slottedContainmentProperty->getCurrentArrangement();
+				if (currentArrangement != -1)
+				{
+					SlottedContainmentProperty::SlotArrangement const &slotArrangement = slottedContainmentProperty->getSlotArrangement(currentArrangement);
+					for (SlottedContainmentProperty::SlotArrangement::const_iterator i = slotArrangement.begin(); i != slotArrangement.end(); ++i)
+						states |= s_containerSlotStates[*i];
+				}
+			}
+		}
+		else if (containingObject->asCellObject())
+		{
+			// special case - state set when in the interior of a pob ship
+			ServerObject const * const portallizedObject = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*containingObject));
+			if (portallizedObject && portallizedObject->asShipObject())
+				states |= States::getStateMask(States::ShipInterior);
+		}
+	}
+
+	if (states != oldStates)
+		m_states = states;
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::forwardServerObjectSpecificBaselines() const
+{
+	TangibleObject::forwardServerObjectSpecificBaselines();
+
+	Property const * const property = getProperty(SlowDownProperty::getClassPropertyId());
+	if (property != NULL)
+	{
+		SlowDownProperty const * const slowdownProperty = safe_cast<const SlowDownProperty *>(property);
+
+		SlowDownEffectMessage const message(getNetworkId(), slowdownProperty->getTarget(), slowdownProperty->getConeLength(), slowdownProperty->getConeAngle(), slowdownProperty->getSlopeAngle(), slowdownProperty->getExpireTime());
+		ServerMessageForwarding::send(message);
+	}
+
+	// if we are an ai creature, have our controller send our current ai state
+	AICreatureController const * const aiCreatureController = AICreatureController::asAiCreatureController(getController());
+
+	if (aiCreatureController != NULL)
+	{
+		aiCreatureController->forwardServerObjectSpecificBaselines();
+}
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::sendObjectSpecificBaselinesToClient(Client const &client) const
+{
+	TangibleObject::sendObjectSpecificBaselinesToClient(client);
+
+	Property const * const property = getProperty(SlowDownProperty::getClassPropertyId());
+	if (property != NULL)
+	{
+		SlowDownProperty const * const slowdownProperty = safe_cast<const SlowDownProperty *>(property);
+
+		SlowDownEffectMessage const message(getNetworkId(), slowdownProperty->getTarget(), slowdownProperty->getConeLength(), slowdownProperty->getConeAngle(), slowdownProperty->getSlopeAngle(), slowdownProperty->getExpireTime());
+		client.send(message, true);
+	}
+
+	UpdatePostureMessage const updatePostureMessage(getNetworkId(), getPosture());
+	client.send(updatePostureMessage, true);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Initializes a newly created object.
+ */
+void CreatureObject::initializeFirstTimeObject()
+{
+	TangibleObject::initializeFirstTimeObject();
+
+	//-- Get ourselves into a reasonable locomotion state.
+	updateMovementInfo();
+
+	// create the default weapon
+	initializeDefaultWeapon();
+
+	// set the current weapon
+	WeaponObject * weapon = getReadiedWeapon();
+	if (weapon != NULL)
+		setCurrentWeapon(*weapon);
+
+	//Quick error check since all creatures should have a default weapon
+	WARNING_STRICT_FATAL(!getDefaultWeapon(), ("Creature %s (%s) has no default "
+		"weapon", getNetworkId().getValueString().c_str(), getTemplateName()));
+
+	const ServerCreatureObjectTemplate * myTemplate = safe_cast<const ServerCreatureObjectTemplate *>(getObjectTemplate());
+	Unicode::String newName = NameManager::getInstance().generateRandomName(ConfigServerGame::getCharacterNameGeneratorDirectory(), myTemplate->getNameGeneratorType());
+	if (!newName.empty())
+	{
+		setObjectName(newName);
+	}
+
+	setOwnerId(getNetworkId());
+	recomputeSlopeModPercent();
+
+	setupSkillData();
+	packWearables();
+
+	ServerObject *bankContainer = getBankContainer();
+	if (bankContainer)
+		bankContainer->setLoadContents(false);
+
+	// note: this MUST come after TangibleObject::initializeFirstTimeObject() is called
+	float defaultAlterTime = 0;
+	if (!isPlayerControlled())
+		defaultAlterTime = AlterResult::cms_alterQuickly;
+//	DEBUG_REPORT_LOG(true, ("[aitest] setting creature %s default alter time to %f\n", getNetworkId().getValueString().c_str(), defaultAlterTime));
+	setDefaultAlterTime(defaultAlterTime);
+}	// CreatureObject::initializeFirstTimeObject
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::onLoadedFromDatabase()
+{
+	typedef const std::string * strptr;
+
+	if (isAuthoritative())
+	{
+		if (isPlayerControlled())
+		{
+			onClientAboutToLoad();
+
+			// Initialize A-Tab info if we need to.
+			SlottedContainer * const container = ContainerInterface::getSlottedContainer(*this);
+			if(container)
+			{
+				SlotId slot;
+				Container::ContainerErrorCode tmp;
+				slot = SlotIdManager::findSlotId(CreatureObjectNamespace::SlotNames::appearance);
+				if(slot != SlotId::invalid)
+				{
+					Container::ContainedItem itemId = container->getObjectInSlot(slot, tmp);
+					Object* appearanceInventory = itemId.getObject();
+					if(appearanceInventory == NULL)
+					{
+						WARNING(true, ("Player %s has lost their appearance inventory", getNetworkId().getValueString().c_str()));
+						appearanceInventory = ServerWorld::createNewObject(s_appearanceTemplate, *this, slot, false);
+						if(!appearanceInventory)
+						{
+							DEBUG_FATAL(true, ("Could not create an appearance inventory for the player who lost theirs"));
+						}
+					}
+				}
+			}
+
+
+			PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+			if (playerObject)
+			{
+				// move old badges over to the collection system
+				if (getObjVars().hasItem(OBJVAR_BADGES) && (getObjVars().getType(OBJVAR_BADGES) == DynamicVariable::INT_ARRAY))
+				{
+					std::vector<int> badges;
+					getObjVars().getItem(OBJVAR_BADGES, badges);
+
+					if (!badges.empty())
+						playerObject->migrateLegacyBadgesToCollection(badges);
+
+					removeObjVarItem(OBJVAR_BADGES);
+					removeObjVarItem(OBJVAR_COUNT_BADGES);
+				}
+
+				// check for Jedi initialization
+				if (getObjVars().hasItem(OBJVAR_NEW_JEDI_FORCE))
+				{
+					int start_force;
+					getObjVars().getItem(OBJVAR_NEW_JEDI_FORCE, start_force);
+					removeObjVarItem(OBJVAR_NEW_JEDI_FORCE);
+					if (start_force > 0)
+					{
+						playerObject->setMaxForcePower(start_force);
+						playerObject->setForcePowerRegenRate(ConfigServerGame::getMinForcePowerRegenRate());
+					}
+					else
+					{
+						WARNING(true, ("Player %s had the %s objvar, but it had a "
+							"value of %d", getNetworkId().getValueString().c_str(),
+							OBJVAR_NEW_JEDI_FORCE.c_str(), start_force));
+					}
+				}
+
+				// check the non-pool attributes: their value should be the
+				// same as their max value, since we don't regenerate/heal them
+				for (int i = 0; i < Attributes::NumberOfAttributes; ++i)
+				{
+					if (Attributes::isAttribPool(i))
+						continue;
+
+					Attributes::Value attrib = getUnmodifiedAttribute(i);
+					Attributes::Value max = getUnmodifiedMaxAttribute(i);
+					if (attrib != max)
+						setAttribute(i, max);
+				}
+
+				// initialize the character born date, if necessary
+				playerObject->setBornDate();
+
+				// retroactively set CTS history and CTS title(s), if necessary,
+				// and fix up the character's born date, if necessary, if it was
+				// incorrectly changed from a prior CTS where the character's born
+				// date was not transferred;
+				//
+				// should be done *AFTER* the above statement to initialize the
+				// character born date, if necessary
+				GameServer::setRetroactiveCtsHistory(*this);
+
+				// set the "born on <galaxy>" title if this galaxy supports
+				// it and it hasn't already been set on this character
+				if (!getObjVars().hasItem("bornOnGalaxyTitleSet"))
+				{
+					// lower case cluster name and replace - with _ for use with the collection slot name
+					std::string collectionSlotName = std::string("born_on_") + Unicode::toLower(GameServer::getInstance().getClusterName());
+
+					std::string::size_type pos = collectionSlotName.find('-');
+					while (pos != std::string::npos)
+					{
+						collectionSlotName.replace(pos, 1, 1, '_');
+						pos = collectionSlotName.find('-');
+					}
+
+					CollectionsDataTable::CollectionInfoSlot const * collectionSlot = CollectionsDataTable::getSlotByName(collectionSlotName);
+					if (collectionSlot)
+					{
+						FATAL((collectionSlot->collection.name != std::string("born_on_collection")), ("collection slot %s must be in collection born_on_collection", collectionSlot->name.c_str()));
+						FATAL((collectionSlot->collection.page.name != std::string("born_on_page")), ("collection slot %s must be in collection page born_on_page", collectionSlot->name.c_str()));
+						FATAL((collectionSlot->collection.page.book.name != std::string("born_on_book")), ("collection slot %s must be in collection book born_on_book", collectionSlot->name.c_str()));
+
+						// see if character transferred from another galaxy, and
+						// if yes, then the original galaxy is the home galaxy
+						std::string originalSourceGalaxy;
+						int earliestTransferTime = -1;
+
+						DynamicVariableList::NestedList const ctsTransactions(getObjVars(), "ctsHistory");
+						for (DynamicVariableList::NestedList::const_iterator i = ctsTransactions.begin(); i != ctsTransactions.end(); ++i)
+						{
+							Unicode::String ctsTransactionDetail;
+							if (i.getValue(ctsTransactionDetail))
+							{
+								Unicode::UnicodeStringVector tokens;
+								if (Unicode::tokenize(ctsTransactionDetail, tokens, NULL, NULL) && (tokens.size() >= 4))
+								{
+									int const transferTime = atoi(Unicode::wideToNarrow(tokens[0]).c_str());
+									if ((earliestTransferTime == -1) || (transferTime < earliestTransferTime))
+									{
+										earliestTransferTime = transferTime;
+										originalSourceGalaxy = Unicode::wideToNarrow(tokens[1]);
+									}
+								}
+							}
+						}
+
+						// character transferred from another galaxy, so
+						// use the original galaxy as the home galaxy
+						if (!originalSourceGalaxy.empty())
+						{
+							// lower case cluster name and replace - with _ for use with the collection slot name
+							collectionSlotName = std::string("born_on_") + Unicode::toLower(originalSourceGalaxy);
+
+							std::string::size_type pos = collectionSlotName.find('-');
+							while (pos != std::string::npos)
+							{
+								collectionSlotName.replace(pos, 1, 1, '_');
+								pos = collectionSlotName.find('-');
+							}
+
+							collectionSlot = CollectionsDataTable::getSlotByName(collectionSlotName);
+							if (collectionSlot)
+							{
+								FATAL((collectionSlot->collection.name != std::string("born_on_collection")), ("collection slot %s must be in collection born_on_collection", collectionSlot->name.c_str()));
+								FATAL((collectionSlot->collection.page.name != std::string("born_on_page")), ("collection slot %s must be in collection page born_on_page", collectionSlot->name.c_str()));
+								FATAL((collectionSlot->collection.page.book.name != std::string("born_on_book")), ("collection slot %s must be in collection book born_on_book", collectionSlot->name.c_str()));
+							}
+						}
+					}
+
+					// set "born on <galaxy>" collection slot and clear all the other "born on <galaxy>" collection slots;
+					// this still needs to be run even if collectionSlot is NULL in order to forcefully clear all of the
+					// other "born on <galaxy>" collection slots, since we are reusing deleted/no longer used collection
+					// slot bits, and those bits may be left in a set state at the time they were deleted/no longer used
+					std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & slots = CollectionsDataTable::getSlotsInCollection("born_on_collection");
+
+					for (std::vector<CollectionsDataTable::CollectionInfoSlot const *>::const_iterator iter = slots.begin(); iter != slots.end(); ++iter)
+					{
+						playerObject->modifyCollectionSlotValue((*iter)->name, ((*iter == collectionSlot) ? 1ll : -1ll));
+					}
+
+					IGNORE_RETURN(setObjVarItem("bornOnGalaxyTitleSet", 1));
+				}
+			}
+
+			// wait for all loading/initialization to complete, and then double
+			// check the character's title to make sure it is a valid title
+			MessageToQueue::getInstance().sendMessageToC(getNetworkId(),
+				"C++CheckCharacterTitle", "", 30, false);
+		}
+
+		// store the default regen values in the former faucet attrib slots
+		m_attributes.set(Attributes::Constitution, static_cast<int>(ConfigServerGame::getDefaultHealthRegen()));
+		m_attributes.set(Attributes::Stamina, static_cast<int>(ConfigServerGame::getDefaultActionRegen()));
+		m_attributes.set(Attributes::Willpower, static_cast<int>(ConfigServerGame::getDefaultMindRegen()));
+
+		if(!isPlayerControlled())
+			fixupPersistentBuffsAfterLoading();
+		else
+		{
+			PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+			if (playerObject && playerObject->isInitialized())
+			{
+				fixupPersistentBuffsAfterLoading();
+				fixupLevelXpAfterLoading();
+			}
+		}
+
+		// there are cetain states we don't want to be in on start-up
+		setState(States::Cover, false);
+		setState(States::Combat, false);
+		setState(States::Peace, false);
+		setState(States::Aiming, false);
+		setState(States::Meditate, false);
+		setState(States::Berserk, false);
+		setState(States::FeignDeath, false);
+		setState(States::Tumbling, false);
+		setState(States::Rallied, false);
+		setState(States::Stunned, false);
+		setState(States::Blinded, false);
+		setState(States::Dizzy, false);
+		setState(States::Intimidated, false);
+		setState(States::Immobilized, false);
+		setState(States::Crafting, false);
+		setState(States::MountedCreature, false);
+		setState(States::Disguised, false);
+		setStatesDueToContainment();
+
+		// override the speeds stored in the database
+		// @todo: make the speeds non-persisted
+		setBaseWalkSpeed((safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate())->getSpeed(SharedCreatureObjectTemplate::MT_walk)));
+		setBaseRunSpeed((safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate())->getSpeed(SharedCreatureObjectTemplate::MT_run)));
+	}
+
+	// setupSkillData MUST be called before we add the bonuses for equipment!
+	setupSkillData();
+	packWearables();
+
+	if (isAuthoritative() && isPlayerControlled())
+	{
+		// make sure the player has no more expertise skills than they should have for their level
+		// if they do, log them as a suspected cheater
+		int const remainingExpertisePoints = getRemainingExpertisePoints();
+
+		if (remainingExpertisePoints < 0)
+		{
+			LOG("CustomerService",
+				("SuspectedCheaterChannel: %s has more expertises than level %d allows. Amount over limit is %d.",
+				PlayerObject::getAccountDescription(this).c_str(), getLevel(), -remainingExpertisePoints)
+				);
+		}
+
+		// if we are a player, go through all the creature's equipment and update for
+		// bonus skill mods
+		std::vector<std::pair<std::string, int> > skillModBonuses;
+		std::vector<std::pair<int, int> > attribBonuses;
+		Container const * const equipment = ContainerInterface::getContainer(*this);
+		if (equipment != NULL)
+		{
+			for (ContainerConstIterator i(equipment->begin()); i != equipment->end(); ++i)
+			{
+				ServerObject const * const so = safe_cast<ServerObject const *>((*i).getObject());
+				if (so)
+				{
+					TangibleObject const * const equippedItem = so->asTangibleObject();
+					if (equippedItem != NULL)
+					{
+						equippedItem->getSkillModBonuses(skillModBonuses);
+						int bonusCount = skillModBonuses.size();
+						{
+						for (int j = 0; j < bonusCount; ++j)
+						{
+							std::pair<std::string, int> const &bonus = skillModBonuses[j];
+							addModBonus(bonus.first, bonus.second);
+						}
+					}
+						equippedItem->getAttribBonuses(attribBonuses);
+						bonusCount = attribBonuses.size();
+						{
+						for (int j = 0; j < bonusCount; ++j)
+						{
+							std::pair<int, int> const &bonus = attribBonuses[j];
+							addAttribBonus(bonus.first, bonus.second);
+						}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	TangibleObject::onLoadedFromDatabase();
+
+	if (isAuthoritative())
+	{
+		// note: this MUST come after TangibleObject::onLoadedFromDatabase() is called
+		float defaultAlterTime = 0;
+		if (!isPlayerControlled())
+			defaultAlterTime = AlterResult::cms_alterQuickly;
+//		DEBUG_REPORT_LOG(true, ("[aitest] setting creature %s default alter time to %f\n", getNetworkId().getValueString().c_str(), defaultAlterTime));
+		setDefaultAlterTime(defaultAlterTime);
+
+		CreatureController * controller = getCreatureController();
+		if (controller != NULL)
+			controller->updateHibernate();
+	}
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Initializes a proxy object.
+ */
+void CreatureObject::endBaselines()
+{
+	// catch people in potentially deleted newbie halls
+	if (NewbieTutorial::getSceneId() == ServerWorld::getSceneId())
+		getContainedByProperty()->setContainedBy(NetworkId::cms_invalid);
+
+	TangibleObject::endBaselines();
+
+	if (isAuthoritative())
+	{
+		// set our initial posture depending if we are incapacitated/dead or not
+		Postures::Enumerator posture = getPosture();
+		if (isDead())
+			posture = Postures::Dead;
+		if (getAttribute(Attributes::Health) <= 0)
+		{
+			// make sure we are incapacitated, unless we are dead
+			if (posture != Postures::Dead)
+				posture = Postures::Incapacitated;
+		}
+
+		if (posture != getPosture())
+			setPosture(posture);
+
+		updateMovementInfo();
+
+		// Fix up guildId - set regardless of whether it is already correct, as this
+		// triggers entry into the guild chat room.
+		int guildId = GuildInterface::getGuildId(getNetworkId());
+
+		// fix up issue there a guild leader gets mistakenly removed
+		// from the guild (i.e. the guild leader's permission is reset
+		// to 0, meaning he is only a sponsored member, and the guild
+		// id won't be returned in GuildInterface::getGuildId()), causing
+		// the guild to be leaderless; we only need to get the guild id
+		// for the guild that this character is the leader of; setGuildId()
+		// will do the rest of the work
+		if (guildId == 0)
+			guildId = GuildInterface::getGuildIdForGuildLeader(getNetworkId());
+
+		setGuildId(guildId);
+
+		// Fix up guildWarEnabled
+		setGuildWarEnabled(GuildInterface::getGuildMemberGuildWarEnabled(getGuildId(), getNetworkId()));
+
+		// Fix up militiaOfCityId
+		setMilitiaOfCityId(CityInterface::getMilitiaOfCityId(getNetworkId()));
+
+		// Mount: needs to grab its position from the rider since the rider dictates
+		// mount position.
+		if (getState(States::MountedCreature))
+		{
+			CreatureObject const *const rider = getPrimaryMountingRider();
+			if (rider)
+			{
+				// Use parent space since both the rider and mount should be
+				// attached to the same thing.  Initially this is limited to
+				// the world.
+				setPosition_p(rider->getPosition_p());
+			}
+		}
+
+		// depersist persisted command cooldowns
+		CommandQueue * commandQueue = getCommandQueue();
+		if (commandQueue)
+		{
+			commandQueue->depersistCooldown();
+		}
+
+		// make sure that factional player characters are at least rank 1 (rating 0)
+		// and non-factional player characters have no current GCW points or rating
+		PlayerObject * const player = PlayerCreatureController::getPlayerObject(this);
+		if (player)
+		{
+			static int const min = std::numeric_limits<int>::min();
+			if (PvpData::isImperialFactionId(getPvpFaction()) || PvpData::isRebelFactionId(getPvpFaction()))
+			{
+				// decrementing the value by a really large
+				// number will cause it to reset to 0
+				if (player->getCurrentGcwRating() < Pvp::getMinRatingForRank())
+					player->modifyCurrentGcwRating(min, true);
+			}
+			else
+			{
+				// decrementing the value by a really large
+				// number will cause it to reset to 0
+				if (player->getCurrentGcwPoints() > 0)
+					player->modifyCurrentGcwPoints(min, false);
+
+				if (player->getCurrentGcwRating() != -1)
+					player->modifyCurrentGcwRating(min, false);
+
+				if (player->getCurrentPvpKills() > 0)
+					player->modifyCurrentPvpKills(min, false);
+			}
+
+			// make sure that m_nextGcwRatingCalcTime is set so that the
+			// rating will be recalculated at the next recalculation interval
+			player->setNextGcwRatingCalcTime(true);
+
+			// migrate veteran rewards claim tracking information to new system
+			VeteranRewardManager::migrateVeteranRewardsClaimInformation(*this);
+
+			// request the list of account feature transactions for the character
+			// from the LoginServer DB which will be compared to the list of account
+			// feature transactions stored on the character, and if there is any
+			// discrepancy, then it probably means there was a rollback, so we would
+			// need to grant the character any missing item(s)
+			FeatureIdTransactionRequest const fitr(GameServer::getInstance().getProcessId(), player->getStationId(), getNetworkId());
+			GameServer::getInstance().sendToCentralServer(fitr);
+
+			// set the guild rank
+			GuildMemberInfo const * const guildMemberInfo = GuildInterface::getGuildMemberInfo(getGuildId(), getNetworkId());
+			if (guildMemberInfo)
+				player->setGuildRank(guildMemberInfo->m_rank);
+
+			// set the citizen rank
+			// join the city chat room
+			std::vector<int> const & cityIds = CityInterface::getCitizenOfCityId(getNetworkId());
+			if (!cityIds.empty())
+			{
+				int const cityId = cityIds.front();
+				CitizenInfo const * const citizenInfo = CityInterface::getCitizenInfo(cityId, getNetworkId());
+				if (citizenInfo)
+					player->setCitizenRank(citizenInfo->m_citizenRank);
+
+				// join the city chat room
+				CityInterface::enterCityChatRoom(cityId, *this);
+			}
+
+			// set the player's citizenship information
+			player->updateCitizenshipInfo();
+
+			// set the player's GCW Region info
+			player->updateGcwRegionInfo();
+
+			// set the player's GCW Region Defender info
+			player->updateGcwDefenderRegionInfo();
+
+			// fix the citizen name in the citizen roster, if necessary
+			CityInterface::verifyCitizenName(getNetworkId(), Unicode::wideToNarrow(getAssignedObjectName()));
+
+			// check for over lot limit condition
+			player->setAccountNumLotsOverLimitSpam();
+
+			// fix the pgc chronicler's name in the pgc rating data, if necessary
+			CityInterface::verifyPgcChroniclerName(getNetworkId(), Unicode::wideToNarrow(getAssignedObjectName()));
+
+			// depersist galactic reserve 
+			{
+				// migrate any galactic reserve information that's stored in the PlayerObject into the CreatureObject
+				int temp;
+				if (player->getObjVars().getItem("galactic_reserve", temp))
+				{
+					player->removeObjVarItem("galactic_reserve");
+					setObjVarItem("galactic_reserve", temp);
+				}
+
+				if (player->getObjVars().getItem("galactic_reserve_cooldown", temp))
+				{
+					player->removeObjVarItem("galactic_reserve_cooldown");
+					setObjVarItem("galactic_reserve_cooldown", temp);
+				}
+
+				player->depersistGalacticReserveDeposit();
+			}
+
+			// depersist mercenary status
+			if (!ConfigServerGame::getEnableCovertImperialMercenary())
+			{
+				player->modifyCollectionSlotValue("covert_imperial_mercenary", -1);
+			}
+
+			if (!ConfigServerGame::getEnableOvertImperialMercenary())
+			{
+				player->modifyCollectionSlotValue("overt_imperial_mercenary", -1);
+			}
+
+			if (!ConfigServerGame::getEnableCovertRebelMercenary())
+			{
+				player->modifyCollectionSlotValue("covert_rebel_mercenary", -1);
+			}
+
+			if (!ConfigServerGame::getEnableOvertRebelMercenary())
+			{
+				player->modifyCollectionSlotValue("overt_rebel_mercenary", -1);
+			}
+
+			if (!PvpData::isNeutralFactionId(getPvpFaction()))
+			{
+				player->modifyCollectionSlotValue("covert_imperial_mercenary", -1);
+				player->modifyCollectionSlotValue("overt_imperial_mercenary", -1);
+				player->modifyCollectionSlotValue("covert_rebel_mercenary", -1);
+				player->modifyCollectionSlotValue("overt_rebel_mercenary", -1);
+			}
+			else
+			{
+				if (player->hasCompletedCollectionSlot("covert_imperial_mercenary"))
+				{
+					Pvp::setNeutralMercenaryFaction(*this, PvpData::getImperialFactionId(), PvpType_Covert);
+				}
+				else if (player->hasCompletedCollectionSlot("overt_imperial_mercenary"))
+				{
+					Pvp::setNeutralMercenaryFaction(*this, PvpData::getImperialFactionId(), PvpType_Declared);
+				}
+				else if (player->hasCompletedCollectionSlot("covert_rebel_mercenary"))
+				{
+					Pvp::setNeutralMercenaryFaction(*this, PvpData::getRebelFactionId(), PvpType_Covert);
+				}
+				else if (player->hasCompletedCollectionSlot("overt_rebel_mercenary"))
+				{
+					Pvp::setNeutralMercenaryFaction(*this, PvpData::getRebelFactionId(), PvpType_Declared);
+				}
+			}
+		}
+	}
+	else
+	{
+		getAvailableLocomotions();
+	}
+
+	checkAndRestoreRequiredSlots();
+
+	// get the current weapon, which will set it to our held or default weapon
+	IGNORE_RETURN(getCurrentWeapon());
+
+	// Rider: needs to not participate in CollisionWorld.
+	if (getState(States::RidingMount))
+	{
+		CollisionProperty *const collisionProperty = getCollisionProperty();
+		if (collisionProperty)
+		{
+			if (isInWorld())
+				CollisionWorld::removeObject(this);
+
+			collisionProperty->setDisableCollisionWorldAddRemove(true);
+		}
+	}
+
+	// Fix up the footprint's swim height to take into consideration any scaling on this creature.
+	Footprint *const footprint = getFootprint();
+	if (footprint)
+		footprint->setSwimHeight(getSwimHeight());
+
+	if (isAuthoritative())
+		recomputeSlopeModPercent();
+
+	if (ConfigServerGame::getMoveSimEnabled ())
+		MoveSimManager::checkApplySimulation (*this);
+
+	if (isAuthoritative())
+		GroupMissionCriticalObjectsBuilder::updateGroupMissionCriticalObjects(*this, true);
+}	// CreatureObject::endBaselines
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::checkAndRestoreRequiredSlots()
+{
+	SlottedContainer * const container = ContainerInterface::getSlottedContainer(*this);
+	if (container == NULL)
+	{
+		WARNING_STRICT_FATAL(true, ("This creature is not slotted!"));
+		return;
+	}
+
+	// get the default weapon from it's slot and set the class variable
+
+	bool foundDefaultWeapon = false;
+	Container::ContainerErrorCode tmp = Container::CEC_Success;
+	Container::ContainedItem const itemId = container->getObjectInSlot(s_defaultWeaponSlotId, tmp);
+	Object * const o = itemId.getObject();
+	if (o)
+	{
+		ServerObject * const so = o->asServerObject();
+		if (so && so->asWeaponObject())
+			foundDefaultWeapon = true;
+	}
+
+	if (!foundDefaultWeapon)
+	{
+		if (isAuthoritative())
+		{
+			// try to make the default weapon from the template instead
+			initializeDefaultWeapon();
+		}
+		else
+		{
+			WARNING_STRICT_FATAL(true, ("Unable to find default weapon slot id for %s(%s)",
+				getNetworkId().getValueString().c_str(),
+				getObjectTemplateName()));
+		}
+	}
+
+	if (isPlayerControlled() && isAuthoritative())
+	{
+		//restore inventory, mission bag, and datapad for players
+
+		SlotId slot = SlotIdManager::findSlotId(CreatureObjectNamespace::SlotNames::inventory);
+		if (slot != SlotId::invalid)
+		{
+			Container::ContainedItem itemId = container->getObjectInSlot(slot, tmp);
+			Object* inventory = itemId.getObject();
+			if (inventory == NULL)
+			{
+				WARNING(true, ("Player %s has lost their inventory", getNetworkId().getValueString().c_str()));
+				inventory = ServerWorld::createNewObject(s_inventoryTemplate, *this, slot, false);
+				if (!inventory)
+				{
+					DEBUG_FATAL(true, ("Could not create an inventory for the player who lost theirs"));
+				}
+			}
+		}
+
+		slot = SlotIdManager::findSlotId(CreatureObjectNamespace::SlotNames::datapad);
+		if (slot != SlotId::invalid)
+		{
+			Container::ContainedItem itemId = container->getObjectInSlot(slot, tmp);
+			Object* datapad = itemId.getObject();
+			if (datapad == NULL)
+			{
+				WARNING(true, ("Player %s has lost their datapad", getNetworkId().getValueString().c_str()));
+				datapad = ServerWorld::createNewObject(s_datapadTemplate, *this, slot, false);
+				if (!datapad)
+				{
+					DEBUG_FATAL(true, ("Could not create an datapad for the player who lost theirs"));
+				}
+			}
+		}
+
+		slot = SlotIdManager::findSlotId(ConstCharCrcLowerString("mission_bag"));
+		if (slot != SlotId::invalid)
+		{
+			Container::ContainedItem itemId = container->getObjectInSlot(slot, tmp);
+			ServerObject* missionBag = safe_cast<ServerObject*>(itemId.getObject());
+			if (missionBag == NULL)
+			{
+				WARNING(true, ("Player %s has lost their mission bag", getNetworkId().getValueString().c_str()));
+				missionBag = ServerWorld::createNewObject(s_missionBagTemplate, *this, slot, false);
+				if (!missionBag)
+				{
+					DEBUG_FATAL(true, ("Could not create a mission bag for the player who lost theirs"));
+				}
+				else
+					missionBag->persist();
+			}
+		}
+
+		slot = SlotIdManager::findSlotId(ConstCharCrcLowerString("bank"));
+		if (slot != SlotId::invalid)
+		{
+			Container::ContainedItem itemId = container->getObjectInSlot(slot, tmp);
+			ServerObject* bank = safe_cast<ServerObject*>(itemId.getObject());
+			if (bank == NULL)
+			{
+				WARNING(true, ("Player %s has lost their bank", getNetworkId().getValueString().c_str()));
+				bank = ServerWorld::createNewObject(s_bankTemplate, *this, slot, false);
+				if (!bank)
+				{
+					DEBUG_FATAL(true, ("Could not create a bank for the player who lost theirs"));
+				}
+				else
+				{
+					bank->persist();
+					bank->setLoadContents(false);
+				}
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Allows an object to do pre-deletion cleanup.
+ */
+void CreatureObject::onRemovingFromWorld()
+{
+	TangibleObject::onRemovingFromWorld();
+	if (isAuthoritative())
+	{
+		// if we are crafting, end the crafting session
+		PlayerObject * const player = PlayerCreatureController::getPlayerObject(this);
+		if (player != NULL && player->isCrafting())
+			player->stopCrafting(false);
+
+		// exit all notify regions
+		Archive::AutoDeltaSet<std::pair<std::string, std::string> >::const_iterator i;
+		for(i = m_notifyRegions.begin(); i != m_notifyRegions.end(); ++i)
+		{
+			ScriptParams params;
+			params.addParam(i->first.c_str());
+			params.addParam(i->second.c_str());
+			if(getScriptObject())
+			{
+				IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_EXIT_REGION, params));
+			}
+		}
+		m_notifyRegions.clear();
+	}
+
+	if (isMountable())
+		IGNORE_RETURN(detachAllRiders());
+	{
+	}
+}
+
+void CreatureObject::addToWorld()
+{
+	if (getKill())
+		return;
+
+	if (isInWorld())
+	{
+		DEBUG_WARNING(true, ("Calling add to world on object already in it %s", getNetworkId().getValueString().c_str()));
+		return;
+	}
+	updateWorldSphere();
+
+	Object::addToWorld();
+	updateTriggerVolumes();
+
+	if (getScriptObject() != NULL)
+		getScriptObject()->setOwnerIsLoaded();
+
+	ContainedByProperty * const containedByProperty = getContainedByProperty();
+	if (containedByProperty && containedByProperty->getContainedByNetworkId().isValid())
+	{
+		Object const * const containedByObject = containedByProperty->getContainedBy();
+		if (containedByObject && !containedByObject->isInWorld())
+		{
+			if (!ServerWorld::isSpaceScene())
+			{
+				// attempt to put the character at the ejection point of the building
+				DynamicVariableLocationData ejectionPoint;
+				if (getObjVars().getItem("building_ejection_point", ejectionPoint) && (ServerWorld::getSceneId() == ejectionPoint.scene) && (!ejectionPoint.cell.isValid()))
+				{
+					DEBUG_REPORT_LOG(true,("Ejecting player %s from building %s, because the building does not exist anymore or is not loaded in the world\n",getNetworkId().getValueString().c_str(), containedByProperty->getContainedByNetworkId().getValueString().c_str()));
+					LOG("CustomerService",("Login:  Ejecting player %s from building %s, because the building does not exist anymore or is not loaded in the world",getNetworkId().getValueString().c_str(), containedByProperty->getContainedByNetworkId().getValueString().c_str()));
+					removeObjVarItem("building_ejection_point");
+					teleportObject(ejectionPoint.pos, ejectionPoint.cell, "", ejectionPoint.pos,"");
+
+				}
+				else
+				// warp the player to the Mos Eisley Starport
+				{
+					DEBUG_REPORT_LOG(true, ("Tried to load creature %s into invalid container. Moving to Mos Eisley Starport.\n", getNetworkId().getValueString().c_str()));
+					LOG("CustomerService",("Login:  Tried to load creature %s into invalid container. Moving to Mos Eisley Starport.\n", getNetworkId().getValueString().c_str()));
+					GameServer::getInstance().requestSceneWarp(CachedNetworkId(*this),"tatooine",Vector(3528,5,-4804),NetworkId::cms_invalid,Vector(3528,5,-4804));
+				}
+			}
+		}
+	}
+
+	onAddedToWorld();
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::initializeNewPlayer()
+{
+}
+
+//-----------------------------------------------------------------------
+
+/** Set up the inventory object for the creature and initialize with contents from template.
+ */
+void CreatureObject::setupInventory()
+{
+
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets up the creature's skills and related data.
+ */
+void CreatureObject::setupSkillData()
+{
+	if (isAuthoritative())
+	{
+		// clear out our current skill related data
+		m_modMap.clear();
+		if (isPlayerControlled())
+		{
+			clearCommands();
+
+			PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+			if (playerObject != NULL)
+			{
+				playerObject->clearSchematics();
+			}
+		}
+
+		m_skills.erase(0);
+
+		// set the skill related data from the skills
+		for (SkillList::const_iterator skillIter = m_skills.begin(); skillIter != m_skills.end(); ++skillIter)
+		{
+			SkillObject const * skill = *skillIter;
+			if (skill)
+			{
+				// init skillmods
+				std::vector<std::pair<std::string, int> > const &statMods = skill->getStatisticModifiers();
+				std::vector<std::pair<std::string, int> >::const_iterator modIter;
+				for (modIter = statMods.begin(); modIter != statMods.end(); ++modIter)
+				{
+					addModValue((*modIter).first, (*modIter).second, true);
+				}
+				// init skill commands
+				{
+					const SkillObject::StringVector & sv = skill->getCommandsProvided ();
+					for (SkillObject::StringVector::const_iterator i = sv.begin();
+						i != sv.end(); ++i)
+					{
+						grantCommand(*i, true);
+					}
+				}
+				// init schematics
+				{
+					const SkillObject::StringVector & sv = skill->getSchematicsGranted ();
+					for (SkillObject::StringVector::const_iterator i = sv.begin(); i != sv.end(); ++i)
+						grantSchematicGroup("+" + *i, true);
+				}
+			}
+		}
+
+		// read the non-skill data from the objvars and add those to the creature
+		// note that we add them as "from skill" so that they don't get added to the
+		// objvar list again
+		{
+			DynamicVariableList::NestedList mods(getObjVars(), OBJVAR_NOT_SKILL_MODS);
+			DynamicVariableList::NestedList::const_iterator i(mods.begin());
+			int value;
+			for (; i != mods.end(); ++i)
+			{
+				i.getValue(value);
+				addModValue(i.getName(), value, true);
+			}
+		}
+		{
+			DynamicVariableList::NestedList commands(getObjVars(), OBJVAR_NOT_SKILL_COMMANDS);
+			DynamicVariableList::NestedList::const_iterator i(commands.begin());
+			for (; i != commands.end(); ++i)
+			{
+				grantCommand(i.getName(), true);
+			}
+			if(getClient())
+			{
+				revokeCommand(AdminAccountManager::getAdminCommandName(), false);
+
+				if (getClient()->isGod())
+					grantCommand(AdminAccountManager::getAdminCommandName(), false);
+			}
+		}
+		{
+			DynamicVariableList::NestedList schematics(getObjVars(), OBJVAR_NOT_SKILL_SCHEMATICS);
+			DynamicVariableList::NestedList::const_iterator i(schematics.begin());
+			for (; i != schematics.end(); ++i)
+			{
+				grantSchematic(strtoul(i.getName().c_str(), NULL, 10), true);
+			}
+		}
+
+		// calculate the level based on the skill list
+		recalculateLevel();
+	}
+}	// CreatureObject::setupSkillData
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a default controller for this object.
+ *
+ * @return the object's controller
+ */
+Controller* CreatureObject::createDefaultController ()
+{
+	const ServerCreatureObjectTemplate * myTemplate = safe_cast<
+		const ServerCreatureObjectTemplate *>(getObjectTemplate());
+
+	Controller * controller = 0;
+	if (myTemplate->getCanCreateAvatar())
+	{
+		controller = new PlayerCreatureController(this);
+	}
+	else
+	{
+		controller = new AICreatureController(this);
+
+		AICreatureController * const aiCreatureController = AICreatureController::asAiCreatureController(controller);
+
+		if (aiCreatureController != NULL)
+		{
+			aiCreatureController->addServerNpAutoDeltaVariables(m_serverPackage_np);
+		}
+	}
+
+	setController(controller);
+	return controller;
+}	// CreatureObject::createDefaultController
+
+//-----------------------------------------------------------------------
+
+CreatureController* CreatureObject::getCreatureController()
+{
+	return safe_cast<CreatureController*>(getController());
+}
+
+//----------------------------------------------------------------------
+
+const CreatureController* CreatureObject::getCreatureController() const
+{
+	return safe_cast<const CreatureController*>(getController());
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::setAuthority()
+{
+	// don't recalculate our attribs until all our equipment has been made
+ 	// authoritative
+	++m_deferComputeTotalAttributes;
+	TangibleObject::setAuthority();
+	--m_deferComputeTotalAttributes;
+	computeTotalAttributes();
+}
+
+//----------------------------------------------------------------------
+
+
+void CreatureObject::setAuthServerProcessId(uint32 processId)
+{
+	uint32 const oldProcess = getAuthServerProcessId();
+	TangibleObject::setAuthServerProcessId(processId);
+
+	if (oldProcess != getAuthServerProcessId())
+	{
+		// we can't trade if we are on different servers, so cancel it
+		if (getCreatureController()->getSecureTrade() != NULL)
+		{
+			getCreatureController()->getSecureTrade()->cancelTrade(*this);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Updates the creature. Removes it from combat if it is incapacitated.
+ *
+ * @param time		current game time
+ *
+ * @return base class result
+ */
+float CreatureObject::alter(float time)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("CreatureObject::alter");
+	float const result = TangibleObject::alter(time);
+
+	m_regionFlagTimer.updateNoReset(time); // Update our notify timer.
+
+	if (isPlayerControlled() && (isIncapacitated() || isDead()))
+	{
+		// If the player is trading, cancel the trade.
+		// We need to force the issue to catch edge cases.
+		ServerSecureTrade * const secureTradeObject = getCreatureController()->getSecureTrade();
+		if (secureTradeObject != NULL)
+		{
+			secureTradeObject->cancelTrade(*this);
+		}
+	}
+
+	if (!isAuthoritative())
+	{
+		// Non-authoritative activity.
+		removeFromSpawnQueue();
+	}
+	else
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("CreatureObject::alter auth stuff");
+		//-- Mounts/vehicles: driver moves the server's mount/vehicle position to that of the driver.
+		transferRiderPositionToMount();
+
+		updateVehiclePhysicsData ();
+
+		// Authoritative activity.
+
+		// update the invulnerability timer
+		if (m_invulnerabilityTimer.get() != 0.0f)
+		{
+			float const timeLeft = std::max(0.f, m_invulnerabilityTimer.get()-time);
+			m_invulnerabilityTimer.set(timeLeft);
+		}
+		else
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("CreatureObject::alter commandqueue");
+			// update the command queue
+			getCommandQueue()->update(time);
+		}
+
+		//check timer and migrate stats if necessary
+
+//disable self stat migration
+#if 0
+		migrateStats(time);
+#endif
+
+		if (isPlayerControlled())
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("CreatureObject::alter auth player stuff");
+			// keep the spawn queue pumping.
+			// todo: if the spawn queue is starving out players because
+			// there are too may other players on the queue, make some
+			// preliminary checks (e.g. in a city, too many creatures nearby)
+			// and reduce the spawn queue size
+			addToSpawnQueue();
+
+			{
+				PROFILER_AUTO_BLOCK_DEFINE("gradual customizations");
+				ServerImageDesignerManager::updateGradualCustomizations(this);
+			}
+
+			PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+			if (playerObject)
+			{
+				PROFILER_AUTO_BLOCK_DEFINE("playerobject stuff");
+				playerObject->alterPlayedTime(time);
+				playerObject->updateKillMeter(time);
+				playerObject->checkStomach();
+				playerObject->checkTheater(getPosition_w(), getSceneId(), getRunSpeed(), 128.0f);
+				updateGroup();
+
+				if (playerObject->getIsUnsticking() && getPositionChanged())
+				{
+					Chat::sendSystemMessageSimple(*this, SharedStringIds::unstick_request_cancelled, NULL);
+					playerObject->setIsUnsticking(false);
+				}
+			}
+
+			if (!ServerWorld::isSpaceScene())
+			{
+				// if we're in a conversation, end it if we move too far from the npc
+				if (m_npcConversation != NULL)
+				{
+					PROFILER_AUTO_BLOCK_DEFINE("CreatureObject::alter::npcConvCheck");
+					bool endConversation = false;
+					// check the distance to the npc
+					ServerObject const * const npc = safe_cast<ServerObject const *>(m_npcConversation->getNPC().getObject());
+					if (npc != NULL)
+					{
+						float distance = findPosition_w().magnitudeBetween(npc->findPosition_w());
+						distance -= getRadius();
+						distance -= npc->getRadius();
+						if (distance > ConfigServerGame::getNpcConversationDistance())
+							endConversation = true;
+					}
+					else
+					{
+						endConversation = true;
+					}
+					if (endConversation)
+						endNpcConversation();
+				}
+			}
+		}
+		alterPseudoPlayedTime(time);
+		updateBuffs();
+
+		//-- Handle mounts-specific functionality for an authoritative rider or mount.
+		alterAuthoritativeForMounts();
+	}
+
+	// see if we are performing a slow down effect
+	Property * property = getProperty(SlowDownProperty::getClassPropertyId());
+	if (property != NULL)
+	{
+		// has it expired?
+		SlowDownProperty * slowdown = safe_cast<SlowDownProperty *>(property);
+		if (slowdown->getExpireTime() <= ServerClock::getInstance().getGameTimeSeconds())
+		{
+			// yes, remove the effect
+			removeProperty(SlowDownProperty::getClassPropertyId());
+		}
+		else
+		{
+			// we need to find every authoritative non-player creature in the effect's
+			// area, and and tell them they are moving on our effect "hill" during their next alter
+			// (player creatures are handled on the player's client)
+			Object * target = slowdown->getTarget().getObject();
+			if (target != NULL)
+			{
+				std::vector<ServerObject *> found;
+				ServerWorld::findAuthoritativeNonPlayerCreaturesInCone(*this, *target, slowdown->getConeLength(), slowdown->getConeAngle(), found);
+				if (!found.empty())
+				{
+					// compute the effective normal vector of our "hill"
+					Vector normal(getPosition_w() - target->getPosition_w());
+					normal.y = 0;
+					normal.normalize();
+					normal *= cos(slowdown->getSlopeAngle() + PI_OVER_2);
+					normal.y = sin(slowdown->getSlopeAngle() + PI_OVER_2);
+					for (std::vector<ServerObject *>::iterator i = found.begin(); i != found.end(); ++i)
+					{
+						if ((*i)->getNetworkId() != getNetworkId())
+							safe_cast<CreatureObject*>(*i)->addTerrainSlopeEffect(normal);
+					}
+				}
+			}
+		}
+	}
+
+	//-- Handle mounts-specific functionality for all mounts.  We'll do sanity checking in here.
+	alterAnyForMounts();
+
+	//-- Handle updateMovementInfo.
+	if (getLocalFlag(LocalObjectFlags::CreatureObject_RequiresMovementInfoUpdate))
+	{
+		updateMovementInfo();
+		setLocalFlag(LocalObjectFlags::CreatureObject_RequiresMovementInfoUpdate, false);
+	}
+
+	m_locomotion = calcLocomotion();
+
+	if (PlayerCreatureController::getPlayerObject(this) != 0)
+	{
+		if (m_level.get() != m_previousLevel)
+		{
+			if (isAuthoritative())
+			{
+				GameScriptObject * const script = getScriptObject();
+
+				if (script != 0)
+				{
+					ScriptParams params;
+					params.addParam(m_previousLevel);
+					params.addParam(m_level.get());
+					script->trigAllScripts(Scripting::TRIG_COMBAT_LEVEL_CHANGED, params);
+				}
+			}
+			m_previousLevel = m_level.get();
+			levelChanged();
+		}
+	}
+
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+bool CreatureObject::canDestroy() const
+{
+	// turn off our default weapon so it won't prevent us from getting
+	// destroyed
+	WeaponObject * defaultWeapon = getDefaultWeapon();
+	if (defaultWeapon != NULL)
+		defaultWeapon->setAsDefaultWeapon(false);
+
+	bool result = TangibleObject::canDestroy();
+	if (!result)
+	{
+		// we're not being destroyed, turn our default weapon back on
+		if (defaultWeapon != NULL)
+			defaultWeapon->setAsDefaultWeapon(true);
+	}
+
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+float CreatureObject::getPvpRegionCheckTime()
+{
+	return ConfigServerGame::getCreaturePvpRegionCheckTime();
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the default weapon for a creature. This function bootstraps the default weapon.
+ * After this function is called, there should always be a weapon in the default
+ * weapon slot.
+ */
+void CreatureObject::initializeDefaultWeapon()
+{
+	FATAL(!isAuthoritative(), ("CreatureObject::initializeDefaultWeapon: obj %s, while nonauth", getDebugInformation().c_str()));
+
+	ServerCreatureObjectTemplate const * const myTemplate = safe_cast<ServerCreatureObjectTemplate const *>(getObjectTemplate());
+	if (myTemplate != NULL)
+	{
+		ServerWeaponObjectTemplate const *weaponTemplate = myTemplate->getDefaultWeapon();
+		if (weaponTemplate == NULL)
+		{
+			WARNING(true, ("Creature template %s has no valid default weapon!", getTemplateName()));
+
+			// try to use the fallback weapon
+			weaponTemplate = dynamic_cast<ServerWeaponObjectTemplate const *>(ObjectTemplateList::fetch(ConfigServerGame::getFallbackDefaultWeapon()));
+
+			FATAL(weaponTemplate == NULL, ("CreatureObject::initializeFirstTimeObject fallback weapon template %s is bad!", ConfigServerGame::getFallbackDefaultWeapon()));
+		}
+
+		WeaponObject * const weapon = safe_cast<WeaponObject *>(ServerWorld::createNewObject(*weaponTemplate, *this, s_defaultWeaponSlotId, false));
+
+		if (weapon != NULL)
+			weapon->setAsDefaultWeapon(true);
+		else
+		{
+			WARNING_STRICT_FATAL(true, ("CreatureObject::initializeDefaultWeapon unable to create default weapon %s for creature %s", weaponTemplate->getName(), getNetworkId().getValueString().c_str()));
+		}
+
+		weaponTemplate->releaseReference();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::swapDefaultWeapons(WeaponObject &newDefaultWeapon, ServerObject &weaponContainer)
+{
+	FATAL(!isAuthoritative(), ("CreatureObject::swapDefaultWeapons: obj %s, weapon %s, weaponContainer %s, while obj nonauth", getDebugInformation().c_str(), newDefaultWeapon.getDebugInformation().c_str(), weaponContainer.getDebugInformation().c_str()));
+	FATAL(!newDefaultWeapon.isAuthoritative(), ("CreatureObject::swapDefaultWeapons: obj %s, weapon %s, weaponContainer %s, while newDefaultWeapon nonauth", getDebugInformation().c_str(), newDefaultWeapon.getDebugInformation().c_str(), weaponContainer.getDebugInformation().c_str()));
+	FATAL(!weaponContainer.isAuthoritative(), ("CreatureObject::swapDefaultWeapons: obj %s, weapon %s, weaponContainer %s, while weaponContainer nonauth", getDebugInformation().c_str(), newDefaultWeapon.getDebugInformation().c_str(), weaponContainer.getDebugInformation().c_str()));
+
+	// There is a window here where the default weapon can be null, so we
+	// set a flag that it's ok until we've finished the transfer.
+	FATAL(s_allowNullDefaultWeapon, ("CreatureObject::swapDefaultWeapons has been recursively called!"));
+
+	WeaponObject * const oldDefaultWeapon = getDefaultWeapon();
+	FATAL(!oldDefaultWeapon, ("CreatureObject::swapDefaultWeapons: obj %s, weapon %s, weaponContainer %s, with no current default weapon", getDebugInformation().c_str(), newDefaultWeapon.getDebugInformation().c_str(), weaponContainer.getDebugInformation().c_str()));
+
+	s_allowNullDefaultWeapon = true;
+
+	// Move the current default weapon into the weapon container
+	oldDefaultWeapon->setAsDefaultWeapon(false);
+	Container::ContainerErrorCode err = Container::CEC_Success;
+	bool const success1 = ContainerInterface::transferItemToVolumeContainer(weaponContainer, *oldDefaultWeapon, 0, err, true);
+	FATAL(!success1, ("CreatureObject::swapDefaultWeapons: obj %s, old default weapon %s, new default weapon %s, weaponContainer %s, old default weapon transfer to weaponContainer failed with error %d", getDebugInformation().c_str(), oldDefaultWeapon->getDebugInformation().c_str(), newDefaultWeapon.getDebugInformation().c_str(), weaponContainer.getDebugInformation().c_str(), static_cast<int>(err)));
+
+	// Try to move the new default weapon into the default weapon slot
+	bool const success2 = ContainerInterface::transferItemToSlottedContainer(*this, newDefaultWeapon, s_defaultWeaponSlotId, 0, err);
+	if (success2)
+		newDefaultWeapon.setAsDefaultWeapon(true);
+	else
+	{
+		// We failed to swap in the new default weapon, so we need to move the old one back in.
+		bool const success3 = ContainerInterface::transferItemToSlottedContainer(*this, *oldDefaultWeapon, s_defaultWeaponSlotId, 0, err);
+		FATAL(!success3, ("CreatureObject::swapDefaultWeapons: obj %s, old default weapon %s, new default weapon %s, weaponContainer %s, old default weapon transfer back to default weapon slot after failure to switch to new default weapon failed with error %d", getDebugInformation().c_str(), oldDefaultWeapon->getDebugInformation().c_str(), newDefaultWeapon.getDebugInformation().c_str(), weaponContainer.getDebugInformation().c_str(), static_cast<int>(err)));
+		oldDefaultWeapon->setAsDefaultWeapon(true);
+	}
+
+	s_allowNullDefaultWeapon = false;
+	return success2;
+}
+
+// ----------------------------------------------------------------------
+
+WeaponObject *CreatureObject::getDefaultWeapon() const
+{
+	SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this);
+	if (container == NULL)
+	{
+		return NULL;
+	}
+
+	WeaponObject * defaultWeapon = NULL;
+	Container::ContainerErrorCode error;
+	Container::ContainedItem itemId = container->getObjectInSlot(s_defaultWeaponSlotId, error);
+	if (error == Container::CEC_Success)
+	{
+		Object * const o = itemId.getObject();
+		if (o)
+		{
+			ServerObject * const so = o->asServerObject();
+			if (so)
+				defaultWeapon = so->asWeaponObject();
+		}
+		FATAL(!s_allowNullDefaultWeapon && defaultWeapon == NULL, ("CreatureObject::getDefaultWeapon, weapon is NULL! Object in default slot is %s", itemId.getValueString().c_str()));
+	}
+	return defaultWeapon;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns an attribute value, modified by attribute mods.
+ *
+ * @param attribute		the attribute to get
+ */
+Attributes::Value CreatureObject::getAttribute(Attributes::Enumerator attribute) const
+{
+	if (attribute < 0 || attribute >= Attributes::NumberOfAttributes)
+	{
+		DEBUG_REPORT_LOG(true, ("attribute out of range (%d)\n", attribute));
+		return 0;
+	}
+
+	return getAdjustedAttribute(attribute, m_attributes[attribute]);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns an attribute value, adjusted by wounds, etc.
+ *
+ * @param attribute		the attribute type
+ * @param value			the value to adjust
+ *
+ * @returns value adjusted by various params
+ */
+Attributes::Value CreatureObject::getAdjustedAttribute(Attributes::Enumerator attribute,
+	Attributes::Value value) const
+{
+	if (attribute < 0 || attribute >= Attributes::NumberOfAttributes)
+	{
+		DEBUG_REPORT_LOG(true, ("attribute out of range (%d)\n", attribute));
+		return value;
+	}
+
+	// modify the attribute for attrib mods
+	value = static_cast<Attributes::Value>(
+		value + m_cachedCurrentAttributeModValues[attribute]);
+
+	// modify for partial regeneration
+	value = static_cast<Attributes::Value>(value + static_cast<int>(floor(m_regeneration[attribute])));
+
+	//cap maximum value
+	Attributes::Value max = getMaxAttribute(attribute);
+	if (value > max)
+		value = max;
+
+	return value;
+}	// CreatureObject::getAdjustedAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a max attribute value, modified by attribute mods.
+ *
+ * @param attribute		the attribute to get
+ */
+Attributes::Value CreatureObject::getMaxAttribute(Attributes::Enumerator attribute, bool capStat) const
+{
+	if (attribute < 0 || attribute >= Attributes::NumberOfAttributes)
+	{
+		DEBUG_REPORT_LOG(true, ("attribute out of range (%d)\n", attribute));
+		return 0;
+	}
+
+	Attributes::Value value = getUnmodifiedMaxAttribute(attribute);
+	value = static_cast<Attributes::Value>(
+		value + m_cachedMaxAttributeModValues[attribute] + m_attribBonus[attribute]);
+
+	if (capStat)
+	{
+		// make sure the value doesn't go below the defined minimum value
+		if (Attributes::isAttribPool(attribute) && value < ConfigServerGame::getMinPoolValue())
+			value = static_cast<Attributes::Value>(ConfigServerGame::getMinPoolValue());
+
+		// double-check that the max isn't <= 0
+		if (value < 1)
+			value = 1;
+	}
+	return value;
+}
+
+//-----------------------------------------------------------------------
+
+const std::map<std::string, std::pair<int, int> > & CreatureObject::getModMap() const
+{
+	return m_modMap.getMap();
+}
+
+//-----------------------------------------------------------------------
+
+const int CreatureObject::getModValue(const std::string & modName) const
+{
+	int result = 0;
+	std::map<std::string, std::pair<int, int> >::const_iterator f = m_modMap.find(modName);
+	if(f != m_modMap.end())
+	{
+		result = (*f).second.first;
+	}
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the value for a skill mod, modified by any special equipment the
+ * creature may be wearing.
+ *
+ * @param statMod		the name of the skill mod
+ *
+ * @return the mod value
+ */
+const int CreatureObject::getEnhancedModValue(const std::string & modName) const
+{
+	int base = 0;
+	int bonus = 0;
+
+	std::map<std::string, std::pair<int, int> >::const_iterator f = m_modMap.find(modName);
+	if (f != m_modMap.end())
+	{
+		base = (*f).second.first;
+		bonus = (*f).second.second;
+	}
+	if (bonus > ConfigSharedGame::getMaxCreatureSkillModBonus())
+		bonus = ConfigSharedGame::getMaxCreatureSkillModBonus();
+	return base + bonus;
+}	// CreatureObject::getEnhancedSkillStatMod
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the value for a skill mod, modified by any special equipment the
+ * creature may be wearing.  This version does not respect getMaxCreatureSkillModBonus
+ *
+ * @param statMod		the name of the skill mod
+ *
+ * @return the mod value
+ */
+const int CreatureObject::getEnhancedModValueUncapped(const std::string & modName) const
+{
+	int base = 0;
+	int bonus = 0;
+
+	std::map<std::string, std::pair<int, int> >::const_iterator f = m_modMap.find(modName);
+	if (f != m_modMap.end())
+	{
+		base = (*f).second.first;
+		bonus = (*f).second.second;
+	}
+	return base + bonus;
+}	// CreatureObject::getEnhancedSkillStatMod
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::setModValue(const std::string & modName, const int value)
+{
+	if(isAuthoritative())
+	{
+		int oldBonus = 0;
+		Archive::AutoDeltaMap<std::string, std::pair<int, int> >::const_iterator found =
+			m_modMap.find(modName);
+		if (found != m_modMap.end())
+			oldBonus = (*found).second.second;
+		if (value != 0 || oldBonus != 0)
+		{
+			m_modMap.set(modName, std::make_pair(value, oldBonus));
+		}
+		else
+		{
+			m_modMap.erase(modName);
+		}
+
+		updateSlopeMovement(modName);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setModValue, new MessageQueueGenericValueType<std::pair<std::string, int> >(std::make_pair(modName, value)));
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::addModValue(const std::string & modName, const int value, bool fromSkill)
+{
+	int currentVal = getModValue(modName);
+	setModValue(modName, currentVal + value);
+	if (!fromSkill)
+	{
+		// update the objvars for the value
+		std::string objvarName(OBJVAR_NOT_SKILL_MODS + "." + modName);
+		int currentValue = 0;
+		getObjVars().getItem(objvarName, currentValue);
+		currentValue += value;
+		if (currentValue != 0)
+			setObjVarItem(objvarName, currentValue);
+		else
+			removeObjVarItem(objvarName);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Adds a skill mod bonus to the creature.
+ *
+ * @param statMod		the skill mod name
+ * @param bonus			the bonus value
+ */
+void CreatureObject::addModBonus(const std::string & modName, int bonus)
+{
+	if(isAuthoritative())
+	{
+		int oldBase = 0;
+		int oldBonus = 0;
+		Archive::AutoDeltaMap<std::string, std::pair<int, int> >::const_iterator found =
+			m_modMap.find(modName);
+		if (found != m_modMap.end())
+		{
+			oldBase = (*found).second.first;
+			oldBonus = (*found).second.second;
+		}
+		bonus += oldBonus;
+		if (bonus != 0 || oldBase != 0)
+		{
+			m_modMap.set(modName, std::make_pair(oldBase, bonus));
+		}
+		else
+		{
+			m_modMap.erase(modName);
+		}
+
+		updateSlopeMovement(modName);
+	}
+	else
+	{
+//		sendControllerMessageToAuthServer(CM_setModValue, new MessageQueueGenericValueType<std::pair<std::string, int> >(std::make_pair(modName, value)));
+	}
+}	// CreatureObject::addModBonus
+
+// ----------------------------------------------------------------------
+
+/**
+ * Adds an attrib bonus to the creature.
+ *
+ * @param attrib		the attribute
+ * @param bonus			the bonus value
+ */
+void CreatureObject::addAttribBonus(int attrib, int bonus)
+{
+	if (isAuthoritative())
+	{
+		if (attrib < 0 || attrib >= Attributes::NumberOfAttributes)
+			return;
+
+		int newBonus = m_attribBonus[attrib] + bonus;
+		if (newBonus > ConfigServerGame::getMaxTotalAttribBonus())
+			newBonus = ConfigServerGame::getMaxTotalAttribBonus();
+		else if (newBonus < -ConfigServerGame::getMaxTotalAttribBonus())
+			newBonus = -ConfigServerGame::getMaxTotalAttribBonus();
+		m_attribBonus.set(attrib, newBonus);
+	}
+}	// CreatureObject::addAttribBonus
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::updateSlopeMovement(const std::string & modName)
+{
+	// if I'm modifiying the slope mod, update my speed
+	if (modName == SLOPE_MOD)
+		recomputeSlopeModPercent();
+	// if I'm modifiying the group slope mod and I'm a group leader,
+	// update my group's speed
+	else if (modName == GROUP_SLOPE_MOD && getGroup() != NULL &&
+		getGroup()->getGroupLeaderId() == getNetworkId())
+	{
+		const GroupObject::GroupMemberVector & members = getGroup()->getGroupMembers();
+		GroupObject::GroupMemberVector::const_iterator iter;
+		for (iter = members.begin(); iter != members.end(); ++iter)
+		{
+			CreatureObject * member = safe_cast<CreatureObject *>(
+				NetworkIdManager::getObjectById((*iter).first));
+			if (member != NULL)
+				member->recomputeSlopeModPercent();
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Cause the client to dance using the specified dance style.
+ *
+ * This function will change the server and clients to the SkillAnimating
+ * posture.
+ *
+ * @param enabled     if true, start doing the skill.  If false, stop doing the skill.
+ * @param danceStyle  the number of the dance style.
+ *
+ * @return  true if this function succeeded, false if it failed for any reason.
+ */
+
+bool CreatureObject::showDanceVisuals(bool enabled)
+{
+	//-- Ensure we are authoratative.  This function should only be called
+	//   indirectly via the command table, which guarantees it is called on the
+	//   authoratative object.
+	if (!isAuthoritative())
+	{
+		DEBUG_WARNING(true, ("showDanceVisuals() should be called only on the authoratative object."));
+		return false;
+	}
+
+	if (!enabled)
+	{
+		//-- Set the server object to the upright posture.
+		setPosture(Postures::Upright);
+
+		//-- Tell all clients to switch to the specified posture.
+		Controller *const controller = getController();
+		if (controller)
+			controller->appendMessage(CM_setPosture, 0.0f, new MessageQueuePosture(Postures::Upright, true), GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_ALL_CLIENT);
+		else
+			DEBUG_WARNING(true, ("showDanceVisuals(): no controller, could not tell clients to go to SkillAnimating posture."));
+	}
+	else
+	{
+		int visualId = lookupDanceVisual(getPerformanceType());
+		if (visualId == 0)
+			return false;
+
+		//-- Set the server object to animating skill posture.
+		setPosture(Postures::SkillAnimating);
+
+		//-- Tell all clients to switch to the specified posture.
+		Controller *const controller = getController();
+		if (controller)
+			controller->appendMessage(CM_setPosture, 0.0f, new MessageQueuePosture(Postures::SkillAnimating, true), GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_ALL_CLIENT);
+		else
+			DEBUG_WARNING(true, ("showDanceVisuals(): no controller, could not tell clients to go to SkillAnimating posture."));
+
+		//-- Modify the animating skill data string.
+		char buffer[64];
+
+		sprintf(buffer, "dance_%d", visualId);
+		m_animatingSkillData = buffer;
+	}
+
+	//-- Success.
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::showMusicianVisuals(bool enabled)
+{
+	//-- Ensure we are authoratative.  This function should only be called
+	//   indirectly via the command table, which guarantees it is called on the
+	//   authoratative object.
+	if (!isAuthoritative())
+	{
+		DEBUG_WARNING(true, ("showMusicianVisuals() should be called only on the authoratative object."));
+		return false;
+	}
+
+	if (!enabled)
+	{
+		//-- Set the server object to the upright posture.
+		setPosture(Postures::Upright);
+
+		//-- Tell all clients to switch to the specified posture.
+		Controller *const controller = getController();
+		if (controller)
+			controller->appendMessage(CM_setPosture, 0.0f, new MessageQueuePosture(Postures::Upright, true), GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_ALL_CLIENT);
+		else
+			DEBUG_WARNING(true, ("showDanceVisuals(): no controller, could not tell clients to go to SkillAnimating posture."));
+	}
+	else
+	{
+		//-- Determine the type of instrument used by this creature.
+		// @todo
+		const int instrumentId = getInstrumentVisualId();
+		if (instrumentId == 0)
+		{
+			WARNING(true, ("tried to call showMusicianVisuals without a valid instrument"));
+			return false;
+		}
+
+		//-- Set the server object to animating skill posture.
+		setPosture(Postures::SkillAnimating);
+
+		//-- Tell all clients to switch to the specified posture.
+		Controller *const controller = getController();
+		if (controller)
+			controller->appendMessage(CM_setPosture, 0.0f, new MessageQueuePosture(Postures::SkillAnimating, true), GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_ALL_CLIENT);
+		else
+			DEBUG_WARNING(true, ("showDanceVisuals(): no controller, could not tell clients to go to SkillAnimating posture."));
+
+		//-- Modify the animating skill data string.
+		char buffer[64];
+
+		sprintf(buffer, "music_%d", instrumentId);
+		m_animatingSkillData = buffer;
+	}
+
+	//-- Success.
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::sendMusicFlourish(int flourishIndex)
+{
+	Controller *controller = getController();
+	if (controller)
+	{
+		MessageQueueGenericValueType<int> *msg = new MessageQueueGenericValueType<int>(flourishIndex);
+		controller->appendMessage(
+			CM_musicFlourish,
+			0.0f,
+			msg,
+			GameControllerMessageFlags::SEND |
+			GameControllerMessageFlags::RELIABLE |
+			GameControllerMessageFlags::DEST_ALL_CLIENT);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a mental state value, modified by mental state mods.
+ *
+ * @param attribute		the attribute to get
+ */
+MentalStates::Value CreatureObject::getMentalState(MentalStates::Enumerator attribute) const
+{
+	if (attribute < 0 || attribute >= MentalStates::NumberOfMentalStates)
+	{
+		DEBUG_REPORT_LOG(true, ("mental state out of range (%d)\n", attribute));
+		return 0.0f;
+	}
+
+	MentalStates::Value value = static_cast<MentalStates::Value>(m_currentAttitude.get().m_currentValues[attribute]);
+	return value;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a mental state value, modified by mental state mods.
+ *
+ * @param attribute		the attribute to get
+ */
+MentalStates::Value CreatureObject::getMentalStateToward(const NetworkId &target, MentalStates::Enumerator attribute) const
+{
+	if (attribute < 0 || attribute >= MentalStates::NumberOfMentalStates)
+	{
+		DEBUG_REPORT_LOG(true, ("mental state out of range (%d)\n", attribute));
+		return 0.0f;
+	}
+
+	MentalStates::Value value = static_cast<MentalStates::Value>(m_currentAttitude.get().m_currentValues[attribute]);
+
+	CreatureAttitude const * const cs = getAttitudeToward(target);
+	if (cs)
+	{
+		value = static_cast<MentalStates::Value>(value + cs->m_currentValues[attribute]);
+	}
+	return value;
+}
+
+//-----------------------------------------------------------------------
+
+int CreatureObject::getExperiencePoints(const std::string & experienceType) const
+{
+	if (isPlayerControlled())
+	{
+		const PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+		if (playerObject != NULL)
+			return playerObject->getExperiencePoints(experienceType);
+	}
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+const std::map<std::string, int> & CreatureObject::getExperiencePoints() const
+{
+	static const std::map<std::string, int> emptyResult;
+	if(isPlayerControlled())
+	{
+		const PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+		if(playerObject != NULL)
+		{
+			return playerObject->getExperiencePoints();
+		}
+	}
+	return emptyResult;
+}
+
+//-----------------------------------------------------------------------
+
+const CreatureObject::SkillList & CreatureObject::getSkillList() const
+{
+	return m_skills.get();
+}
+
+//-----------------------------------------------------------------------
+
+const int CreatureObject::grantExperiencePoints(const std::string & experienceType, int amount)
+{
+	if (isPlayerControlled())
+	{
+		PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+		if (playerObject != NULL)
+		{
+			int const amountGranted = playerObject->grantExperiencePoints(experienceType, amount);
+
+			LevelManager::LevelData levelData(m_level.get(), m_totalLevelXp.get());
+			LevelManager::addXpToLevelData(levelData, experienceType, amountGranted);
+
+			setLevelData(levelData.currentLevel, levelData.currentLevelXp, levelData.currentHealth);
+
+			return amountGranted;
+		}
+	}
+	return INT_MIN;
+}
+
+// ----------------------------------------------------------------------
+
+const bool CreatureObject::grantSkill(const SkillObject & newSkill)
+{
+	if(isAuthoritative())
+	{
+		//-- jww: simply return true if the skill is already in the vector
+		//--      this was the previous behavior, dunno if it should return false
+		if (hasSkill (newSkill))
+			return true;
+
+		// signal scripts that skill is about to be granted.  If the script returns override, cancel skill grant.
+		{
+			ScriptParams params;
+			params.addParam(newSkill.getSkillName().c_str());
+			if (getScriptObject()->trigAllScripts(Scripting::TRIG_SKILL_ABOUT_TO_BE_GRANTED, params) == SCRIPT_OVERRIDE)
+			{
+				return false;
+			}
+		}
+
+		m_skills.insert(&newSkill);
+		if(getClient())
+		{
+			LOG("CustomerService", ("Skill: Account %s CharacterId %s has acquired skill %s", getClient()->getAccountName().c_str(), getNetworkId().getValueString().c_str(), newSkill.getSkillName().c_str()));
+		}
+
+		{
+			const SkillObject::StringVector & sv = newSkill.getCommandsProvided ();
+			for (SkillObject::StringVector::const_iterator i = sv.begin(); i != sv.end(); ++i)
+				grantCommand(*i, true);
+		}
+
+		const std::vector<std::pair<std::string, int> > & statMods =  newSkill.getStatisticModifiers();
+		std::vector<std::pair<std::string, int> >::const_iterator modIter;
+		for(modIter = statMods.begin(); modIter != statMods.end(); ++ modIter)
+		{
+			addModValue((*modIter).first, (*modIter).second, true);
+		}
+
+		{
+			const SkillObject::StringVector & sv = newSkill.getSchematicsGranted ();
+			for (SkillObject::StringVector::const_iterator i = sv.begin(); i != sv.end(); ++i)
+				grantSchematicGroup("+" + *i, true);
+		}
+
+		// signal scripts that skill has been granted
+		ScriptParams params;
+		params.addParam(newSkill.getSkillName().c_str());
+		IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_SKILL_GRANTED,
+			params));
+
+		LevelManager::LevelData levelData(m_level.get(), m_totalLevelXp.get());
+		LevelManager::addSkillToLevelData(levelData, newSkill.getSkillName());
+
+		setLevelData(levelData.currentLevel, levelData.currentLevelXp, levelData.currentHealth);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_grantSkill, new MessageQueueGenericValueType<std::string>(newSkill.getSkillName()));
+	}
+
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::revokeSkill(const SkillObject & oldSkill, bool silent)
+{
+	if(isAuthoritative())
+	{
+		// signal scripts that skill has been revoked
+		ScriptParams params;
+		params.addParam(oldSkill.getSkillName().c_str());
+		if(getScriptObject()->trigAllScripts(Scripting::TRIG_SKILL_ABOUT_TO_BE_REVOKED, params) == SCRIPT_CONTINUE)
+		{
+
+			for (SkillList::const_iterator it = m_skills.begin(); it != m_skills.end(); ++it)
+			{
+				const SkillObject * const skill = *it;
+
+				if (skill)
+				{
+					const SkillObject::SkillVector &prerequisiteSkills = skill->getPrerequisiteSkills();
+
+					for (SkillObject::SkillVector::const_iterator pit = prerequisiteSkills.begin(); pit != prerequisiteSkills.end(); ++pit)
+					{
+						const SkillObject * const prereq = *pit;
+						NOT_NULL (prereq);
+
+						if (oldSkill.getSkillName() == prereq->getSkillName())
+						{
+							if (!silent)
+							Chat::sendSystemMessage(*this, SharedStringIds::revoke_dependant_skill, Unicode::emptyString);
+							return;
+						}
+					}
+				}
+			}
+
+			if (m_skills.contains(&oldSkill))
+			{
+				// remove granted commands
+				{
+					const SkillObject::StringVector & sv = oldSkill.getCommandsProvided ();
+					for (SkillObject::StringVector::const_iterator i = sv.begin(); i != sv.end(); ++i)
+						revokeCommand(*i, true);
+				}
+
+				// remove granted skill mods
+				const std::vector<std::pair<std::string, int> > & statMods =  oldSkill.getStatisticModifiers();
+				std::vector<std::pair<std::string, int> >::const_iterator modIter;
+				for(modIter = statMods.begin(); modIter != statMods.end(); ++ modIter)
+				{
+					addModValue((*modIter).first, -(*modIter).second, true);
+				}
+
+				// remove schematics that were granted by any schematic groups
+				{
+					const SkillObject::StringVector & sv = oldSkill.getSchematicsGranted ();
+					for (SkillObject::StringVector::const_iterator i = sv.begin(); i != sv.end(); ++i)
+					{
+						const std::string & grantedGroup = *i;
+						grantSchematicGroup("-" + grantedGroup, true);
+					}
+				}
+
+				m_skills.erase(&oldSkill);
+				if(getClient())
+				{
+					LOG("CustomerService", ("Skill: Account %s CharacterId %s has lost skill %s", getClient()->getAccountName().c_str(), getNetworkId().getValueString().c_str(), oldSkill.getSkillName().c_str()));
+				}
+
+				// Remove the current skill title if this is a player and their current title
+				// is this skill
+
+				PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+
+				if ((playerObject != NULL) &&
+					(oldSkill.getSkillName() == playerObject->getTitle()))
+				{
+					StringId message("shared", "skill_title_removed");
+					Unicode::String outOfBand;
+					if (!silent)
+					Chat::sendSystemMessage(*this, message, outOfBand);
+
+					playerObject->setTitle("");
+				}
+
+				// signal scripts that skill has been revoked
+				ScriptParams params;
+				params.addParam(oldSkill.getSkillName().c_str());
+				IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_SKILL_REVOKED,params));
+
+				// update the level data
+				LevelManager::LevelData levelData(m_level.get(), m_totalLevelXp.get());
+				LevelManager::removeSkillFromLevelData(levelData, oldSkill.getSkillName());
+
+				setLevelData(levelData.currentLevel, levelData.currentLevelXp, levelData.currentHealth);
+			}
+		}
+	}
+	else
+	{
+		LOG("CustomerService", ("Skill: Could not revoke skill %s from character %s because it is a proxy so we're forwarding this to the auth server.",
+			oldSkill.getSkillName().c_str(), getNetworkId().getValueString().c_str()));
+		sendControllerMessageToAuthServer(CM_revokeSkill, new MessageQueueGenericValueType<std::string>(oldSkill.getSkillName()));
+	}
+}
+
+//-----------------------------------------------------------------------
+
+const bool CreatureObject::grantSchematicGroup(const std::string & groupNameWithModifier, bool fromSkill)
+{
+	if (isPlayerControlled())
+	{
+		PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+		if (playerObject != NULL)
+			return playerObject->grantSchematicGroup(groupNameWithModifier, fromSkill);
+	}
+	return false;
+}
+
+//-----------------------------------------------------------------------
+
+const bool CreatureObject::grantSchematic(const std::string & schematicName, bool fromSkill)
+{
+	return grantSchematic(Crc::calculate(schematicName.c_str()), fromSkill);
+}
+
+//-----------------------------------------------------------------------
+
+const bool CreatureObject::grantSchematic(uint32 schematicCrc, bool fromSkill)
+{
+	if (isPlayerControlled())
+	{
+		PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+		if (playerObject != NULL)
+			return playerObject->grantSchematic(schematicCrc, fromSkill);
+	}
+	return false;
+}
+
+//-----------------------------------------------------------------------
+
+const bool CreatureObject::revokeSchematic(const std::string & schematicName, bool fromSkill)
+{
+	return revokeSchematic(Crc::calculate(schematicName.c_str()), fromSkill);
+}
+
+//-----------------------------------------------------------------------
+
+const bool CreatureObject::revokeSchematic(uint32 schematicCrc, bool fromSkill)
+{
+	if (isPlayerControlled())
+	{
+		PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+		if (playerObject != NULL)
+			return playerObject->revokeSchematic(schematicCrc, fromSkill);
+	}
+	return false;
+}
+
+//-----------------------------------------------------------------------
+
+const bool CreatureObject::hasSchematic(const std::string & schematicName)
+{
+	return hasSchematic(Crc::calculate(schematicName.c_str()));
+}
+
+//-----------------------------------------------------------------------
+
+const bool CreatureObject::hasSchematic(uint32 schematicCrc)
+{
+	if (isPlayerControlled())
+	{
+		PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+		if (playerObject != NULL)
+			return playerObject->hasSchematic(schematicCrc);
+	}
+	return false;
+}
+
+//-----------------------------------------------------------------------
+
+const bool CreatureObject::hasSkill(const SkillObject & skill) const
+{
+	return std::find (m_skills.begin(), m_skills.end (), &skill) != m_skills.end();
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets up the object for being in or out of combat.
+ * @todo: this should really be in tangible only, we need to have a command queue
+ * for tangibles
+ *
+ * @param inCombat		flag to put the object in combat-ready state or not
+ *
+ * @return true if state was set, false if something went wrong
+ */
+void CreatureObject::setInCombat(bool inCombat)
+{
+	TangibleObject::setInCombat(inCombat);
+
+	if (isAuthoritative())
+	{
+		if (!inCombat)
+		{
+			setState(States::Aiming, false);
+		}
+		else
+		{
+			// if we are crafting, end the crafting session
+
+			PlayerObject * const player = PlayerCreatureController::getPlayerObject(this);
+
+			if (player != NULL && player->isCrafting())
+			{
+				player->stopCrafting(false);
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * If this object is in combat, adds an aim to it.
+ */
+void CreatureObject::addAim ()
+{
+	TangibleObject::addAim();
+	if (isInCombat())
+	{
+		setState(States::Aiming, true);
+	}
+}	// CreatureObject::addAim
+
+//-----------------------------------------------------------------------
+
+/**
+ * If this object is in combat, clear's it's aims.
+ */
+void CreatureObject::clearAims ()
+{
+	TangibleObject::clearAims();
+	if (isInCombat())
+	{
+		setState(States::Aiming, false);
+	}
+}	// CreatureObject::clearAims
+
+//-----------------------------------------------------------------------
+
+/**
+ * Modifies a creature's attribute. No other function should modify the pool indexes
+ * of m_attributes. Will incapacitate the creature if an attribute drops to 0.
+ *
+ * @param attrib				the attribute to modify
+ * @param delta					amount to modify the attribute by
+ * @param checkIncapacitation	flag to check for incap/recap
+ * @param source				who is doing the damage (NetworkId::cms_invalid
+ *								for no one)
+ * @param force                 force the change, even if we would normally not
+ *                              make it
+ *
+ * @return the amount of damage actually applied
+ */
+int CreatureObject::alterAttribute(Attributes::Enumerator attrib, int delta,
+	bool checkIncapacitation, const NetworkId & source, bool force)
+{
+	if (isAuthoritative())
+	{
+		if (attrib < 0 || attrib >= Attributes::NumberOfAttributes)
+		{
+			DEBUG_REPORT_LOG(true, ("attribute out of range (%d)\n", attrib));
+			return 0;
+		}
+
+		if (!Attributes::isAttribPool(attrib))
+		{
+			// we only alter pool values now, regeneration is set directly
+			DEBUG_REPORT_LOG(true, ("CreatureObject::alterAttribute called on %s for non-pool attrib (%d)\n",
+				getNetworkId().getValueString().c_str(), attrib));
+			return 0;
+		}
+
+		if (delta == 0)
+			return 0;
+
+		// Use TangibleObject::isInvulnerable so we don't consider invulnerability timers
+		if ((isDead() || TangibleObject::isInvulnerable()) && !force)
+			return 0;
+
+		if (getMaxAttribute(attrib) <= 0 && !force)
+			return 0;
+
+		// if we are taking damage, try and damage any attrib mods instead
+		int attribModChange = 0;
+		int regenChange = 0;
+		if (delta < 0)
+		{
+			attribModChange = changeAttribModCurrentValue(attrib, delta, false);
+			if (attribModChange == delta)
+			{
+				computeTotalAttributes();
+				if (checkIncapacitation)
+					testIncapacitation(source);
+				return attribModChange;
+			}
+			else
+			{
+				delta -= attribModChange;
+			}
+
+			// if we are still taking damage, try and reduce any accumulated
+			// regeneration points
+			if (delta < 0 && m_regeneration[attrib] > 0)
+			{
+				if (m_regeneration[attrib] >= -delta)
+				{
+					// regen can absorb it all
+					m_regeneration[attrib] += delta;
+					computeTotalAttributes();
+					if (checkIncapacitation)
+						testIncapacitation(source);
+					return attribModChange + delta;
+				}
+				else
+				{
+					regenChange = -static_cast<int>(floor(m_regeneration[attrib]));
+					m_regeneration[attrib] += regenChange;
+					delta -= regenChange;
+				}
+			}
+		}
+
+		// Don't set the actual attribute until the end of this function,
+		// to avoid changing it multiple times and generating network spam
+		int newValue = m_attributes[attrib] + delta;
+
+		// if the attribute is more than the max attribute, reduce it
+		int maxAttribLimit = getUnmodifiedMaxAttribute(attrib) + getAttributeBonus(attrib);
+		if (newValue > maxAttribLimit)
+		{
+			int overflow = newValue - maxAttribLimit;
+			delta -= overflow;
+			newValue = maxAttribLimit;
+
+			// try and heal any attrib mods
+			attribModChange = changeAttribModCurrentValue(attrib, overflow, false);
+		}
+
+		// cap for min attrib value, depending on attrib type
+		int minValue = 0;
+		if (isPlayerControlled())
+		{
+			if (Attributes::isAttribPool(attrib))
+				minValue = ConfigServerGame::getMinPoolValue();
+		}
+		int adjustedNewValue = getAdjustedAttribute(attrib, static_cast<
+			Attributes::Value>(newValue));
+		if (adjustedNewValue < minValue)
+		{
+			newValue = minValue - (adjustedNewValue - newValue);
+			adjustedNewValue = minValue;
+#ifdef _DEBUG
+			adjustedNewValue = getAdjustedAttribute(attrib, static_cast<
+				Attributes::Value>(newValue));
+			if (adjustedNewValue != minValue)
+			{
+				DEBUG_WARNING(true, ("CreatureObject::alterAttribute, "
+					"adjustedNewValue != minValue"));
+			}
+#endif
+		}
+
+		if (newValue != m_attributes[attrib])
+		{
+			// clip delta so whoever did the damage won't get overkill xp
+			if (adjustedNewValue < 0)
+				adjustedNewValue = 0;
+			delta = adjustedNewValue - getAttribute(attrib);
+
+			// change the attribute
+			m_attributes.set(attrib, static_cast<Attributes::Value>(newValue));
+
+			// update the client and check for incapacitation
+			computeTotalAttributes();
+			if (checkIncapacitation)
+				testIncapacitation(source);
+		}
+		else
+			delta = 0;
+
+		return delta + attribModChange + regenChange;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_alterAttribute,
+			new MessageQueueAlterAttribute(attrib, delta, checkIncapacitation,
+			source));
+		return 0;
+	}
+}	// CreatureObject::alterAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Tests to see if we need to be incapacitated/recapacitated.
+ *
+ * @param attackerId	the object that may have caused our incapacitation.
+ */
+void CreatureObject::testIncapacitation(const NetworkId & attackerId)
+{
+	WARNING_STRICT_FATAL(!isAuthoritative(), ("CreatureObject::testIncapacitation invoked on non-authoritative object %s:%s", getObjectTemplateName(), getNetworkId().getValueString().c_str()));
+
+	if (m_deferComputeTotalAttributes <= 0)
+	{
+		int const health = getAttribute(Attributes::Health);
+
+		if (!isIncapacitated())
+		{
+			// see if we are incapacitated
+
+			if (health <= 0)
+			{
+				setIncapacitated(true, attackerId);
+			}
+		}
+		else
+		{
+			// recapacitate if any attribute is above 0
+
+			if (health > 0)
+			{
+				setIncapacitated(false, attackerId);
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Applies an attribute modifier to this creature.
+ *
+ * @param name          the attrib mod name
+ * @param attrib		the attribute to modify
+ * @param value			the value to apply
+ * @param duration		how long the modifier lasts
+ * @param attackRate	time to get to the peak modifier value
+ * @param decayRate		time for the modifier to be reduced to 0
+ * @param flags         flags that define how the mod works
+ */
+void CreatureObject::addAttributeModifier(const std::string & name,
+	Attributes::Enumerator attrib, int value, float duration, float attackRate,
+	float decayRate, int flags)
+{
+	AttribMod::AttribMod mod;
+
+	if (!name.empty())
+	{
+		AttribModNameManager::getInstance().addAttribModName(name.c_str());
+		mod.tag = Crc::calculate(name.c_str());
+	}
+	else
+		mod.tag = 0;
+	mod.attrib = attrib;
+	mod.value = value;
+	mod.attack = attackRate;
+	mod.sustain = duration;
+	mod.decay = decayRate;
+	mod.flags = flags;
+	if (!Attributes::isAttribPool(mod.attrib))
+	{
+		// non-pool mods must change both max and current
+		mod.flags |=
+			AttribMod::AMF_changeMax |
+			AttribMod::AMF_attackCurrent |
+			AttribMod::AMF_decayCurrent;
+	}
+	LOG("CustomerService", ("Attribs: Added attrib mod to %s. Mod data: "
+		"%s(%u) %d %d %.2f %.2f %.2f %d",
+		PlayerObject::getAccountDescription(this).c_str(),
+		name.c_str(), mod.tag, mod.attrib, mod.value, mod.attack, mod.sustain,
+		mod.decay, mod.flags));
+	addAttributeModifier(mod);
+}	// CreatureObject::addAttributeModifier
+
+//-----------------------------------------------------------------------
+
+/**
+ * Applies a skillmod modifier to this creature.
+ *
+ * @param name          the attrib mod name
+ * @param skill 		the skillmod to modify
+ * @param value			the value to apply
+ * @param duration		how long the modifier lasts (-1 = infinite, or until the player logs off)
+ * @param flags         flags that define how the mod works
+ */
+void CreatureObject::addSkillmodModifier(const std::string & name,
+	const std::string & skill, int value, float duration, int flags)
+{
+	AttribMod::AttribMod mod;
+
+	if (skill.empty())
+	{
+		WARNING_STRICT_FATAL(true, ("CreatureObject::addSkillmodModifier called "
+			"with empty string for skill"));
+		return;
+	}
+
+	if (!name.empty())
+	{
+		AttribModNameManager::getInstance().addAttribModName(name.c_str());
+		mod.tag = Crc::calculate(name.c_str());
+	}
+	else
+		mod.tag = 0;
+
+	AttribModNameManager::getInstance().addAttribModName(skill.c_str());
+	mod.skill = Crc::calculate(skill.c_str());
+	mod.value = value;
+	mod.attack = 0;
+	mod.sustain = duration;
+	mod.decay = 0;
+	mod.flags = flags | AttribMod::AMF_skillMod;
+
+	LOG("CustomerService", ("Attribs: Added skill mod to %s. Mod data: "
+		"%s(%u) %s(%u) %d %.2f %d",
+		PlayerObject::getAccountDescription(this).c_str(),
+		name.c_str(), mod.tag, skill.c_str(), mod.skill,
+		mod.value, mod.sustain, mod.flags));
+	addAttributeModifier(mod);
+}	// CreatureObject::addSkillmodModifier
+
+//-----------------------------------------------------------------------
+
+/**
+ * Applies an attribute modifier to this creature.
+ *
+ * @param mod			the mod to add
+ * @param attacker		who is causing the mod to be applied
+ *
+ * @return the amount the attrib was modified by, if the mod did direct damage
+ */
+int CreatureObject::addAttributeModifier(const AttribMod::AttribMod & mod,
+	ServerObject * attacker)
+{
+static char internalTagBuf[] = {'_','_','i','n','t','e','r','n','a','l','T','a','g','N','a','m','e','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','\0'};
+static const int internalTagBufLen = strlen(internalTagBuf);
+
+	int damage = 0;
+
+	if (isAuthoritative())
+	{
+		++m_deferComputeTotalAttributes;
+
+		if (AttribMod::isDirectDamage(mod))
+		{
+			// check if we're making a potentially dangerous mod
+			if (!Attributes::isAttribPool(mod.attrib))
+			{
+ 				WARNING(true, ("Creature %s is having non-pool attribute %d instantly "
+					"modified! This change will be permanent!",
+					getNetworkId().getValueString().c_str(), mod.attrib));
+			}
+
+			// apply instantanious damage directly
+#ifdef _DEBUG
+			if (ConfigCombatEngine::getDebugDamage())
+			{
+				char debugBuffer[1024];
+				snprintf(debugBuffer, 1024, "creature %s attribute %d(%d) modified by %d to %d\n",
+					getNetworkId().getValueString().c_str(),
+					mod.attrib,
+					m_attributes[mod.attrib],
+					mod.value,
+					m_attributes[mod.attrib] + mod.value);
+				DEBUG_REPORT_LOG (true, ("%s", debugBuffer));
+				if (attacker != NULL)
+				{
+					Client *client = attacker->getClient();
+					if (client != NULL)
+						ConsoleMgr::broadcastString(debugBuffer, client);
+				}
+			}
+#endif
+
+			damage = alterAttribute(mod.attrib, mod.value, false,
+				attacker ? attacker->getNetworkId() : NetworkId::cms_invalid);
+		}
+		else if (AttribMod::isAttribMod(mod) && mod.decay == AttribMod::AMDS_antidote)
+		{
+			removeAttributeModifiers(mod.attrib);
+		}
+		else
+		{
+			if (mod.attack >= 0 && (mod.sustain >= 0 || mod.sustain == -1.0f))
+			{
+				// apply other damage to the attribMod list
+				CreatureMod newMod;
+				newMod.startTime = ServerClock::getInstance().getGameTimeSeconds();
+				newMod.maxVal = 0;
+				newMod.currentVal = 0;
+				newMod.mod = mod;
+				if (newMod.mod.tag == 0)
+				{
+					// we need to have some sort of tag, so we use an internal
+					// name hash
+					std::pair<Archive::AutoDeltaMap<uint32, CreatureMod>::const_iterator, bool> insertResult;
+					do
+					{
+						newMod.mod.tag = Crc::calculate(&internalTagBuf[0]);
+						char * c = &internalTagBuf[internalTagBufLen-1];
+						while (++(*c) == '9' + 1)
+						{
+							*c-- = '0';
+						}
+						insertResult = m_attributeModList.insert(newMod.mod.tag, newMod);
+					} while (!insertResult.second);
+
+					// clear any flags that assume we have a valid tag.
+					if (newMod.mod.flags & AttribMod::AMF_triggerOnDone)
+					{
+						newMod.mod.flags &= ~AttribMod::AMF_triggerOnDone;
+
+						DEBUG_WARNING(true, ("Creature %s has a mod flagged as "
+							"trigger when done, but has no mod name.",
+							getNetworkId().getValueString().c_str()));
+					}
+					if (newMod.mod.flags & AttribMod::AMF_visible)
+					{
+						newMod.mod.flags &= ~AttribMod::AMF_visible;
+
+						DEBUG_WARNING(true, ("Creature %s received a mod flagged as "
+							"visible, but has no mod name.",
+							getNetworkId().getValueString().c_str()));
+					}
+				}
+				else
+				{
+					m_attributeModList.insert(mod.tag, newMod);
+				}
+
+				if ((mod.flags & AttribMod::AMF_visible) && isPlayerControlled())
+				{
+					// send the mod name and the mod time length to the player
+					// NOTE: we just send the tag value to the client, we expect
+					// the client to get the mod name from a datatable
+					float time = mod.attack;
+					if (mod.decay > 0)
+						time += mod.decay;
+					if (mod.sustain > 0)
+						time += mod.sustain;
+					else if (mod.sustain == -1.0f)
+						time = -1.0f;
+					sendTimedModData(mod.tag, time);
+				}
+			}
+			else
+			{
+				const char * modName = AttribModNameManager::getInstance().getAttribModName(mod.tag);
+				if (modName == NULL)
+					modName = "<NULL>";
+				WARNING(true, ("Creature %s received a mod %s with invalid "
+					"attack(%.2f) or duration(%.2f)",
+					getNetworkId().getValueString().c_str(), modName, mod.attack,
+					mod.sustain));
+			}
+		}
+
+		--m_deferComputeTotalAttributes;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_addAttributeModifier,
+			new MessageQueueGenericValueType<AttribMod::AttribMod>(mod));
+	}
+	return damage;
+}	// CreatureObject::addAttributeModifier
+
+//-----------------------------------------------------------------------
+
+/**
+ * Checks if the creature has a given attrib/skill mod on them.
+ *
+ * @param modName		the name of the mod to look for
+ *
+ * @return tue if the creature has the mod, false if not
+ */
+bool CreatureObject::hasAttribModifier(const std::string & modName) const
+{
+	// since the mod name may be a group name, we need to get any names
+	// that may be derived from the modName
+	std::vector<uint32> nameCrcs;
+	AttribModNameManager::getInstance().getAttribModCrcsFromBase(modName, nameCrcs);
+
+	// if we have any name that matches a value in nameCrcs, we can return true
+	for (std::vector<uint32>::const_iterator i = nameCrcs.begin();
+		i != nameCrcs.end(); ++i)
+	{
+		if (m_attributeModList.find(*i) != m_attributeModList.end())
+			return true;
+	}
+	return false;
+}	// CreatureObject::hasAttribModifier
+
+//-----------------------------------------------------------------------
+
+/**
+ * Removes an attribute/skill modifier from this creature.
+ *
+ * @param modName		the name of the mod to look for
+ */
+void CreatureObject::removeAttributeModifier (const std::string & modName)
+{
+	// since the mod name may be a group name, we need to get any names
+	// that may be derived from the modName
+	std::vector<uint32> nameCrcs;
+	AttribModNameManager::getInstance().getAttribModCrcsFromBase(modName, nameCrcs);
+
+	// if we have any name that matches a value in nameCrcs, we can return true
+	std::map<uint32, CreatureMod>::const_iterator f;
+	for (std::vector<uint32>::const_iterator i = nameCrcs.begin();
+		i != nameCrcs.end(); ++i)
+	{
+		f = m_attributeModList.find(*i);
+		if (f != m_attributeModList.end())
+		{
+			const CreatureMod & m = (*f).second;
+
+			// if the mod is visible, we need to tell the player it's being
+			// removed
+			if (m.mod.flags & AttribMod::AMF_visible)
+			{
+				sendCancelTimedMod(m.mod.tag);
+			}
+			const char * type = "attrib";
+			if (AttribMod::isSkillMod(m.mod))
+			{
+				const char * skillModName = AttribModNameManager::getInstance().getAttribModName(m.mod.skill);
+				if (skillModName != NULL)
+					addModValue(skillModName, -m.maxVal, true);
+				else
+				{
+					WARNING(true, ("Unable to remove skillmod mod on player %s due to "
+						"unknown skill mod crc. Mod data: %u %u %d %.2f %d",
+						PlayerObject::getAccountDescription(this).c_str(),
+						m.mod.tag, m.mod.skill, m.mod.value, m.mod.sustain, m.mod.flags));
+				}
+				type = "skill";
+			}
+			m_attributeModList.erase(f);
+//			LOG("CustomerService", ("Attribs: Removed named %s mod %s from %s",
+//				type, modName.c_str(), PlayerObject::getAccountDescription(this).c_str()));
+		}
+	}
+}	// CreatureObject::removeAttributeModifier
+
+//-----------------------------------------------------------------------
+
+/**
+ * Removes all attribute modifiers for a given attribute from this creature.
+ *
+ * @param attribute		the attribute to clear
+ */
+void CreatureObject::removeAttributeModifiers(Attributes::Enumerator attribute)
+{
+	if(isAuthoritative())
+	{
+		DEBUG_FATAL(attribute < 0 || attribute >= Attributes::NumberOfAttributes,
+			("attribute out of range\n"));
+
+		LOG("CustomerService", ("Attribs: Removed all attrib mods affecting "
+			"attrib %d from %s", attribute,
+			PlayerObject::getAccountDescription(this).c_str()));
+
+		m_cachedCurrentAttributeModValues.set(attribute, 0);
+		m_cachedMaxAttributeModValues.set(attribute, 0);
+
+		typedef Archive::AutoDeltaMap<uint32, CreatureMod>::const_iterator ModIter;
+		for (ModIter i = m_attributeModList.begin(); i != m_attributeModList.end();)
+		{
+			if (!AttribMod::isSkillMod((*i).second.mod) &&
+				(*i).second.mod.attrib == attribute)
+			{
+				// if the mod is visible, we need to tell the player it's being
+				// removed
+				if ((*i).second.mod.flags & AttribMod::AMF_visible)
+				{
+					sendCancelTimedMod((*i).second.mod.tag);
+				}
+
+				i = m_attributeModList.erase(i);
+			}
+			else
+				++i;
+		}
+
+		computeTotalAttributes();
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removeAttributeModifiers, new MessageQueueGenericValueType<Attributes::Enumerator>(attribute));
+	}
+}	// CreatureObject::removeAttributeModifiers
+
+//-----------------------------------------------------------------------
+
+/**
+ * Removes all the attribute modifiers from this creature.
+ */
+void CreatureObject::removeAllAttributeModifiers ()
+{
+int i;
+
+	if (isAuthoritative())
+	{
+		for (i = 0; i < Attributes::NumberOfAttributes; ++i)
+		{
+			m_cachedCurrentAttributeModValues.set(i, 0);
+			m_cachedMaxAttributeModValues.set(i, 0);
+		}
+
+		typedef Archive::AutoDeltaMap<uint32, CreatureMod>::const_iterator ModIter;
+		for (ModIter i = m_attributeModList.begin(); i != m_attributeModList.end();)
+		{
+			if (!AttribMod::isSkillMod((*i).second.mod))
+			{
+				// if the mod is visible, we need to tell the player it's being
+				// removed
+				if ((*i).second.mod.flags & AttribMod::AMF_visible)
+				{
+					sendCancelTimedMod((*i).second.mod.tag);
+				}
+
+				i = m_attributeModList.erase(i);
+			}
+			else
+				++i;
+		}
+
+		computeTotalAttributes();
+
+		LOG("CustomerService", ("Attribs: removed all attrib mods from %s.",
+			PlayerObject::getAccountDescription(this).c_str()));
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removeAllAttributeModifiers, 0);
+	}
+}	// CreatureObject::removeAllAttributeModifiers
+
+//-----------------------------------------------------------------------
+
+/**
+* Removes all the attribute and skill mod modifiers from this creature.
+* Does NOT remove buffs, only the effects so be sure to manually remove
+* any buffs for which you need the icons to go away.
+*/
+void CreatureObject::removeAllAttributeAndSkillmodMods ()
+{
+	if (isAuthoritative())
+	{
+		// remove all attrib and skill mod mods
+		typedef Archive::AutoDeltaMap<uint32, CreatureMod>::const_iterator ModIter;
+		for (ModIter i = m_attributeModList.begin(); i != m_attributeModList.end();)
+		{
+			const CreatureMod & m = (*i).second;
+			if (AttribMod::isSkillMod(m.mod))
+			{
+				const char * skillModName = AttribModNameManager::getInstance().getAttribModName(m.mod.skill);
+				if (skillModName != NULL)
+					addModValue(skillModName, -m.maxVal, true);
+			}
+			// if the mod is visible, we need to tell the player it's being
+			// removed
+			if (m.mod.flags & AttribMod::AMF_visible)
+			{
+				sendCancelTimedMod(m.mod.tag);
+			}
+			// if the mod is flagged as having a callback, call the script
+			if (m.mod.flags & AttribMod::AMF_triggerOnDone)
+			{
+				const char * modName = AttribModNameManager::getInstance().getAttribModName(m.mod.tag);
+				if (modName != NULL)
+				{
+					ScriptParams params;
+					params.addParam(modName);
+					params.addParam(true);
+					if (AttribMod::isAttribMod(m.mod))
+					{
+						IGNORE_RETURN(getScriptObject()->trigAllScripts(
+							Scripting::TRIG_ATTRIB_MOD_DONE, params));
+					}
+					else if (AttribMod::isSkillMod(m.mod))
+					{
+						IGNORE_RETURN(getScriptObject()->trigAllScripts(
+							Scripting::TRIG_SKILL_MOD_DONE, params));
+					}
+
+				}
+			}
+
+			i = m_attributeModList.erase(i);
+		}
+		for (int j = 0; j < Attributes::NumberOfAttributes; ++j)
+		{
+			m_cachedCurrentAttributeModValues.set(j, 0);
+			m_cachedMaxAttributeModValues.set(j, 0);
+		}
+		computeTotalAttributes();
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removeAllAttributeAndSkillmodModifiers, 0);
+	}
+
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a attrib/skillmod mod with a given name attached to the creature.
+ *
+ * @param modName		the mod to look for
+ *
+ * @return the mod, or NULL if there is no mod with that name attached to us
+ */
+const AttribMod::AttribMod * CreatureObject::getAttributeModifier(
+	const std::string & modName) const
+{
+	// since the mod name may be a group name, we need to get any names
+	// that may be derived from the modName
+	std::vector<uint32> nameCrcs;
+	AttribModNameManager::getInstance().getAttribModCrcsFromBase(modName, nameCrcs);
+
+	// if we have any name that matches a value in nameCrcs, we can return it
+	for (std::vector<uint32>::const_iterator i = nameCrcs.begin();
+		i != nameCrcs.end(); ++i)
+	{
+		std::map<uint32, CreatureMod>::const_iterator found = m_attributeModList.find(*i);
+		if (found != m_attributeModList.end())
+			return &((*found).second.mod);
+	}
+	return NULL;
+}	// CreatureObject::getAttributeModifier
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the attribute modifiers on this creature.
+ */
+const std::map<uint32, CreatureMod> & CreatureObject::getAttributeModifiers() const
+{
+	return m_attributeModList.getMap();
+}	// CreatureObject::getAttributeModifiers
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sends info about a mod that's affecting a player to the client.
+ *
+ * @param id		the mod id
+ * @param time		how long the mod lasts (in sec)
+ * @param updateCache whether or not to update the cached list of timed mods that have been sent to the client
+ */
+void CreatureObject::sendTimedModData(uint32 id, float time, bool updateCache/* = true*/)
+{
+	if (isPlayerControlled() && getController() != NULL && id != 0)
+	{
+		MessageQueueGenericValueType<std::pair<uint32, float> > * const msg =
+			new MessageQueueGenericValueType<std::pair<uint32, float> >(
+			std::make_pair(id, time));
+		getController()->appendMessage(
+			static_cast<int>(CM_modData),
+			0,
+			msg,
+			GameControllerMessageFlags::SEND |
+			GameControllerMessageFlags::RELIABLE |
+			GameControllerMessageFlags::DEST_AUTH_CLIENT);
+	}
+
+	if (isPlayerControlled() && isAuthoritative() && updateCache && id != 0)
+	{
+		const int index = m_timedMod.find(id);
+
+		if (index >= 0)
+		{
+			m_timedModDuration.set(index, time);
+			m_timedModUpdateTime.set(index, ServerClock::getInstance().getGameTimeSeconds());
+		}
+		else
+		{
+			m_timedMod.push_back(id);
+			m_timedModDuration.push_back(time);
+			m_timedModUpdateTime.push_back(ServerClock::getInstance().getGameTimeSeconds());
+		}
+	}
+}	// CreatureObject::sendTimedModData
+
+//-----------------------------------------------------------------------
+
+/**
+ * Tells a client to cancel a timed mod.
+ *
+ * @param id		the mod id
+ */
+void CreatureObject::sendCancelTimedMod(uint32 id)
+{
+	if (isPlayerControlled() && getController() != NULL && id != 0)
+	{
+		MessageQueueGenericValueType<uint32> * const msg =
+			new MessageQueueGenericValueType<uint32>(id);
+		getController()->appendMessage(
+			static_cast<int>(CM_cancelMod),
+			0,
+			msg,
+			GameControllerMessageFlags::SEND |
+			GameControllerMessageFlags::RELIABLE |
+			GameControllerMessageFlags::DEST_AUTH_CLIENT);
+	}
+
+	if (isPlayerControlled() && isAuthoritative() && id != 0)
+	{
+		const int index = m_timedMod.find(id);
+
+		if (index >= 0)
+		{
+			m_timedMod.erase(index);
+			m_timedModDuration.erase(index);
+			m_timedModUpdateTime.erase(index);
+		}
+	}
+}	// CreatureObject::sendCancelTimedMod
+
+//-----------------------------------------------------------------------
+
+/**
+ * Applies damage done during combat to the creature.
+ *
+ * @param damageData		the damage
+ */
+void CreatureObject::applyDamage(const CombatEngineData::DamageData &damageData)
+{
+	WARNING_STRICT_FATAL(!isAuthoritative(), ("CreatureObject::applyDamageTo "
+		"invoked on non-authoritative object %s:%s", getObjectTemplateName(),
+		getNetworkId().getValueString().c_str()));
+
+	if (!isAuthoritative())
+		return;
+
+	//-- vehicles get damaged like tangibles
+	if (GameObjectTypes::isTypeOf (getGameObjectType (), SharedObjectTemplate::GOT_vehicle))
+	{
+		TangibleObject::applyDamage (damageData);
+		return;
+	}
+
+	int healthDamage = 0;    // damage info we will send to the client
+	int actionDamage = 0;    // damage info we will send to the client
+	int mindDamage   = 0;    // damage info we will send to the client
+
+	ServerObject *attacker = safe_cast<ServerObject *>(damageData.attackerId.getObject());
+
+	// if the attacker is a player and we are not, and we are incapped/dead,
+	// don't allow additional damage
+	if (attacker != NULL && attacker->isPlayerControlled() && !isPlayerControlled() &&
+		(isIncapacitated() || isDead()))
+	{
+		return;
+	}
+
+	++m_deferComputeTotalAttributes;
+
+	std::vector<AttribMod::AttribMod>::const_iterator iter;
+	for (iter = damageData.damage.begin(); iter != damageData.damage.end(); ++iter)
+	{
+		const AttribMod::AttribMod &mod = *iter;
+		if (mod.value == 0)
+			continue;
+
+		int damage = -addAttributeModifier(mod, attacker);
+		if (damage != 0)
+		{
+			if (mod.attrib == Attributes::Health)
+				healthDamage += damage;
+			else if (mod.attrib == Attributes::Action)
+				actionDamage += damage;
+			else if (mod.attrib == Attributes::Mind)
+				mindDamage += damage;
+		}
+	}
+
+	--m_deferComputeTotalAttributes;
+
+	computeTotalAttributes();
+
+	// tell scripts we have taken combat damage
+	if (damageData.attackerId != NetworkId::cms_invalid &&
+		(healthDamage > 0 || actionDamage > 0 || mindDamage > 0))
+	{
+		NOT_NULL(getScriptObject());
+		int damageArray[] = {healthDamage, 0, actionDamage, 0, mindDamage, 0};
+		std::vector<int> damageParam(&damageArray[0], &damageArray[Attributes::NumberOfAttributes]);
+
+		ScriptParams params;
+		params.addParam(damageData.attackerId);
+		params.addParam(damageData.weaponId);
+		params.addParam(damageParam);
+		IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_CREATURE_DAMAGED,
+			params));
+	}
+	testIncapacitation(damageData.attackerId);
+}	// CreatureObject::applyDamage
+
+//-----------------------------------------------------------------------
+
+/**
+ * Changes attrib mod(s) on the creature due to combat damage or healing. Note
+ * that only positive attrib mods can be changed
+ *
+ * @param attrib				the index of the attribute getting damaged
+ * @param delta					the amount to change the mod by
+ * @param checkPoolOverflow		flag to check if a pool value is over its max value
+ *
+ * @return the amount the attrib mod(s) changed
+ */
+int CreatureObject::changeAttribModCurrentValue(Attributes::Enumerator attrib, int delta, bool checkPoolOverflow)
+{
+	if (!isAuthoritative())
+	{
+		DEBUG_WARNING(true, ("CreatureObject::damageAttribMods called for "
+			"non-authoritative creature %s, attrib %d",
+			getNetworkId().getValueString().c_str(), attrib));
+		return 0;
+	}
+
+	if (attrib < 0 || attrib >= Attributes::NumberOfAttributes)
+	{
+		DEBUG_REPORT_LOG(true, ("attribute out of range (%d)\n", attrib));
+		return 0;
+	}
+
+	int startDelta = delta;
+	typedef Archive::AutoDeltaMap<uint32, CreatureMod>::const_iterator ModIter;
+	for (ModIter i = m_attributeModList.begin(); i != m_attributeModList.end() &&
+		delta != 0; ++i)
+	{
+		CreatureMod m = (*i).second;
+		if (AttribMod::isAttribMod(m.mod) && m.mod.attrib == attrib && m.mod.value > 0)
+		{
+			if (delta > 0)
+			{
+				// healing mods
+				if (m.maxVal > m.currentVal)
+				{
+					if (m.maxVal - m.currentVal >= delta)
+					{
+						// this mod can take the entire change
+						m.currentVal += delta;
+						delta = 0;
+					}
+					else
+					{
+						// this mod can only take part of the change
+						delta -= (m.maxVal - m.currentVal);
+						m.currentVal = m.maxVal;
+					}
+					m_attributeModList.set((*i).first, m);
+				}
+			}
+			else
+			{
+				// damaging mods
+				if (m.currentVal > 0)
+				{
+					if (m.currentVal + delta > 0)
+					{
+						// this mod can take the entire change
+						m.currentVal += delta;
+						delta = 0;
+					}
+					else
+					{
+						// this mod can only take part of the change
+						delta += m.currentVal;
+						m.currentVal = 0;
+					}
+					m_attributeModList.set((*i).first, m);
+				}
+			}
+		}
+	}
+
+	if (startDelta != delta)
+		recomputeAttribModTotals(checkPoolOverflow);
+
+	return startDelta - delta;
+}	// CreatureObject::changeAttribModCurrentValue
+
+//-----------------------------------------------------------------------
+
+/**
+ * Recomputes the values due to attrib mods to be added to the creature's current
+ * and max attribs.
+ *
+ * @param checkPoolOverflow		flag to check if a pool value is over its max value
+ */
+void CreatureObject::recomputeAttribModTotals(bool checkPoolOverflow)
+{
+int i;
+
+	if (!isAuthoritative())
+		return;
+
+	int newCachedMaxAttributeModValues[Attributes::NumberOfAttributes];
+	int newCachedCurrentAttributeModValues[Attributes::NumberOfAttributes];
+	for (i = 0; i < Attributes::NumberOfAttributes; ++i)
+	{
+		newCachedMaxAttributeModValues[i] = 0;
+		newCachedCurrentAttributeModValues[i] = 0;
+	}
+
+	typedef Archive::AutoDeltaMap<uint32, CreatureMod>::const_iterator ModIter;
+	for (ModIter j = m_attributeModList.begin(); j != m_attributeModList.end(); ++j)
+	{
+		const CreatureMod & m = (*j).second;
+		if (AttribMod::isAttribMod(m.mod))
+		{
+			if ((m.mod.flags & AttribMod::AMF_changeMax))
+				newCachedMaxAttributeModValues[m.mod.attrib] += m.maxVal;
+			newCachedCurrentAttributeModValues[m.mod.attrib] += m.currentVal;
+		}
+	}
+
+	for (i = 0; i < Attributes::NumberOfAttributes; ++i)
+	{
+		m_cachedMaxAttributeModValues.set(i, static_cast<Attributes::Value>(newCachedMaxAttributeModValues[i]));
+		m_cachedCurrentAttributeModValues.set(i, static_cast<Attributes::Value>(newCachedCurrentAttributeModValues[i]));
+
+		if (newCachedCurrentAttributeModValues[i] < 0)
+		{
+			// don't let the mod prevent us from healing out of incapacitation
+			int healedAttrib = getAdjustedAttribute(i, getUnmodifiedMaxAttribute(i));
+			if (healedAttrib < 0)
+			{
+				m_cachedMaxAttributeModValues.set(i, static_cast<Attributes::Value>(
+					m_cachedMaxAttributeModValues[i] - healedAttrib + 1));
+				m_cachedCurrentAttributeModValues.set(i, static_cast<Attributes::Value>(
+					m_cachedCurrentAttributeModValues[i] - healedAttrib + 1));
+			}
+		}
+
+		if (Attributes::isAttribPool(i) && checkPoolOverflow)
+		{
+			// since we can modify the max value and not the current value, damage
+			// the attribute if it is over the max
+			int max = getMaxAttribute(i);
+			int current = getUnmodifiedAttribute(i) + m_cachedCurrentAttributeModValues[i];
+			if (current > max)
+			{
+				IGNORE_RETURN(alterAttribute(i, max - current, true));
+			}
+		}
+	}
+}	// CreatureObject::recomputeAttribModTotals
+
+//-----------------------------------------------------------------------
+
+/**
+ * Advances the timing of attribute buffs and debuffs.  Should be called by the controller from the
+ * authoritative object.
+ *
+ * @param time The amount of time to advance the buff.
+ */
+void CreatureObject::decayAttributes(float time)
+{
+	if (!isAuthoritative())
+		return;
+
+	PROFILER_AUTO_BLOCK_DEFINE("CreatureObject::decayAttributes");
+
+	// prevent client-seen attributes from being updated until all the attributes
+	// have been modified
+	++m_deferComputeTotalAttributes;
+
+	const uint32 currentTime = ServerClock::getInstance().getGameTimeSeconds();
+	typedef Archive::AutoDeltaMap<uint32, CreatureMod>::const_iterator ModIter;
+	{	// contain i because VC isn't compilant
+	for (ModIter i = m_attributeModList.begin(); i != m_attributeModList.end();)
+	{
+		CreatureMod m = (*i).second;
+		if (AttribMod::isDirectDamage(m.mod))
+		{
+			DEBUG_WARNING(true, ("CreatureObject::decayAttributes has direct "
+				"damage mod in its list"));
+			continue;
+		}
+
+		const float deltaTime = static_cast<float>(currentTime - m.startTime);
+		float decayBegin = m.mod.attack;
+		if (m.mod.sustain > 0)
+			decayBegin += m.mod.sustain;
+		float totalTime = decayBegin;
+		if (m.mod.decay > 0)
+			totalTime += m.mod.decay;
+		if (m.mod.sustain == -1.0f)
+		{
+			// mod never expires
+			decayBegin = -1.0f;
+			totalTime = -1.0f;
+		}
+		int modValue = 0;
+
+		if (deltaTime >= totalTime && totalTime != -1.0f)
+		{			
+			// end of the mod time, erase the mod
+			if (AttribMod::isSkillMod(m.mod))
+			{
+				const char * skillModName = AttribModNameManager::getInstance().getAttribModName(m.mod.skill);
+				if (skillModName != NULL)
+				{
+					addModValue(skillModName, -m.maxVal, true);
+
+					LOG("CustomerService", ("Attribs: Expired skill mod on %s. Mod data: "
+						"%u %u %d %.2f %d",
+						PlayerObject::getAccountDescription(this).c_str(),
+						m.mod.tag, m.mod.skill, m.mod.value, m.mod.sustain, m.mod.flags));
+				}
+				else
+				{
+					WARNING(true, ("Unable to expire skillmod mod on player %s due to "
+						"unknown skill mod crc. Mod data: %u %u %d %.2f %d",
+						PlayerObject::getAccountDescription(this).c_str(),
+						m.mod.tag, m.mod.skill, m.mod.value, m.mod.sustain, m.mod.flags));
+				}
+			}
+			else
+			{
+				LOG("CustomerService", ("Attribs: Expired attrib mod on %s. Mod data: "
+					"%u %d %d %.2f %.2f %.2f %d",
+					PlayerObject::getAccountDescription(this).c_str(),
+					m.mod.tag, m.mod.attrib, m.mod.value, m.mod.attack, m.mod.sustain,
+					m.mod.decay, m.mod.flags));
+			}
+
+			// remove the mod from ourself
+			i = m_attributeModList.erase(i);
+
+			if (m.mod.flags & AttribMod::AMF_triggerOnDone)
+			{
+				// tell scripts the mod has ended
+				const char * modName = AttribModNameManager::getInstance().getAttribModName(m.mod.tag);
+				if (modName != NULL)
+				{
+					ScriptParams params;
+					params.addParam(modName);
+					params.addParam(false);
+					if (AttribMod::isAttribMod(m.mod))
+					{
+						IGNORE_RETURN(getScriptObject()->trigAllScripts(
+							Scripting::TRIG_ATTRIB_MOD_DONE, params));
+					}
+					else if (AttribMod::isSkillMod(m.mod))
+					{
+						IGNORE_RETURN(getScriptObject()->trigAllScripts(
+							Scripting::TRIG_SKILL_MOD_DONE, params));
+					}
+				}
+				else
+				{
+					WARNING(true, ("Unable to trigger mod done on player %s due to "
+						"unknown mod name crc. Mod data: %u %u %d %.2f %.2f %.2f %d",
+						PlayerObject::getAccountDescription(this).c_str(),
+						m.mod.tag, m.mod.attrib, m.mod.value, m.mod.attack,
+						m.mod.sustain, m.mod.decay, m.mod.flags));
+				}
+			}
+			if (m.mod.flags & AttribMod::AMF_visible)
+			{
+				// tell the client to erase the mod icon
+				sendCancelTimedMod(m.mod.tag);
+			}
+		}
+		else
+		{
+			if (deltaTime < m.mod.attack)      // in attack phase
+			{
+				float t = deltaTime / m.mod.attack;
+				modValue = static_cast<int>(m.mod.value * t + 0.5f);
+			}
+			else if (deltaTime < decayBegin || decayBegin == -1.0f) // in sustain phase
+			{
+				modValue = m.mod.value;
+			}
+			else if (deltaTime < totalTime)  // in decay phase
+			{
+				float t = (deltaTime - decayBegin) / m.mod.decay;
+				modValue = static_cast<int>(m.mod.value * (1.0f-t) + 0.5f);
+			}
+
+			if (m.maxVal != modValue)
+			{
+				int delta = modValue - m.maxVal;
+				// Even if the mod is flagged as not updating max, we still need
+				// to change it here so we can calculate the next frame's delta.
+				// We'll check for updating max in recomputeAttribModTotals instead.
+				m.maxVal = modValue;
+
+				if (AttribMod::isSkillMod(m.mod))
+				{
+					// add the skillmod mod as if it were from a skill,
+					// which makes it temporary
+					const char * skillModName = AttribModNameManager::getInstance().getAttribModName(m.mod.skill);
+					if (skillModName != NULL)
+						addModValue(skillModName, delta, true);
+					else
+					{
+						WARNING(true, ("Unable to add skillmod mod on player %s due to "
+							"unknown skill mod crc. Mod data: %u %u %d %.2f %d",
+							PlayerObject::getAccountDescription(this).c_str(),
+							m.mod.tag, m.mod.skill, m.mod.value, m.mod.sustain, m.mod.flags));
+					}
+				}
+				else
+				{
+					// see if we need to update the mod current value in addition
+					// to the max value
+					// non-pool attribs must update the current value
+					bool updateCurrent = !Attributes::isAttribPool(m.mod.attrib);
+					if (!updateCurrent)
+					{
+						// check the mod flags
+						if (deltaTime < decayBegin)
+						{
+							if ((m.mod.flags & AttribMod::AMF_attackCurrent))
+								updateCurrent = true;
+						}
+						else
+						{
+							if ((m.mod.flags & AttribMod::AMF_decayCurrent))
+								updateCurrent = true;
+						}
+					}
+					if (updateCurrent)
+					{
+						if ((m.mod.flags & AttribMod::AMF_changeMax) ||
+							!Attributes::isAttribPool(m.mod.attrib))
+						{
+							m.currentVal += delta;
+						}
+						else
+						{
+							// we are doing damage/healing over time, modify the
+							// attribute directly
+							IGNORE_RETURN(alterAttribute(m.mod.attrib, delta, true,
+								NetworkId::cms_invalid, false));
+						}
+					}
+				}
+
+				// make sure the mod's current val doesn't get out of range
+				if (m.mod.value >= 0)
+				{
+					if (m.currentVal > m.maxVal)
+						m.currentVal = m.maxVal;
+					else if (m.currentVal < 0)
+						m.currentVal = 0;
+				}
+				else
+				{
+					if (m.currentVal < m.maxVal)
+						m.currentVal = m.maxVal;
+					else if (m.currentVal > 0)
+						m.currentVal = 0;
+				}
+				m_attributeModList.set((*i).first, m);
+			}
+			++i;
+		}
+	}
+	}
+
+	recomputeAttribModTotals(true);
+
+	// regenerate attributes
+	int i;
+	bool attribRegen = false;
+	float regenerationRate[3] = {0,0,0};
+	m_regenerationTime += time;
+	for (i = 0; i < 3; ++i)
+	{
+		int poolAttrib = Attributes::POOLS[i];
+		int maxAttrib = getMaxAttribute(poolAttrib);
+ 		int currentAttrib = getAttribute(poolAttrib);
+ 		if (currentAttrib < maxAttrib)
+		{
+			attribRegen = true;
+			regenerationRate[i] = getRegenRate(poolAttrib);
+			m_regeneration[poolAttrib] += regenerationRate[i] * time;
+		}
+	}
+
+	//--
+	//-- update player incapacitation timer
+	//--
+
+	if (isPlayerControlled())
+	{		
+		// regenerate force powers
+		if (!isIncapacitated())
+		{
+			PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+			if (playerObject)
+			{
+				playerObject->regenerateForcePower(time);
+			}
+		}
+	}
+
+	// update the client
+	--m_deferComputeTotalAttributes;
+	computeTotalAttributes();
+	if (isAuthoritative())
+		testIncapacitation(NetworkId::cms_invalid);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Advances the timing of mental state buffs and debuffs and decays mental states toward
+ * their default values.  Should be called by the controller from the
+ * authoritative object.
+ *
+ * @param time The amount of time to advance the buff.
+ */
+
+void CreatureObject::decayMentalStates(float time)
+{
+	if (isDead())
+		return;
+
+	// @todo AJS - make this take into account time since objects were unloaded when they are reloaded
+	int oldBehavior = m_currentAttitude.get().m_behavior;
+	CreatureAttitude newState = m_currentAttitude.get();
+	updateBehavior(0, newState);
+
+	CreatureAttitude newTargetState;
+
+	int i;
+	// Initialize the decay values for each mental state
+	float decays[MentalStates::NumberOfMentalStates];
+	for (i=0; i<MentalStates::NumberOfMentalStates; ++i)
+	{
+		// decay the values
+		const float decay = time * 100.0f / m_mentalStateDecays[i];
+		decays[i] = decay;
+	}
+	// decay the main mental states
+	for (i=0; i<MentalStates::NumberOfMentalStates; ++i)
+	{
+		MentalStates::Value newValue = newState.m_currentValues[i];
+		newValue = std::max(0.0f, newValue - decays[i]);
+		newState.m_currentValues[i] = newValue;
+	}
+
+	// decay targetted mental states
+	Archive::AutoDeltaMap<NetworkId, CreatureAttitude>::const_iterator targetIterator, targetEnd = m_mentalStatesToward.end();
+	for (targetIterator=m_mentalStatesToward.begin(); targetIterator != targetEnd; ++targetIterator)
+	{
+		newTargetState = targetIterator->second;
+		for (i=0; i<MentalStates::NumberOfMentalStates; ++i)
+		{
+			MentalStates::Value newValue = targetIterator->second.m_currentValues[i];
+			if (newValue > 0)
+			{
+				newValue = std::max(newValue - decays[i], 0.0f);
+			}
+			else
+			{
+				newValue = std::min(newValue + decays[i], 0.0f);
+			}
+			newTargetState.m_currentValues[i] = newValue;
+		}
+		m_mentalStatesToward.set(targetIterator->first, newTargetState);
+	}
+
+	// Now change the behaviors for all of the targetted objects
+	bool behaviorChanged[Behaviors::NumberOfBehaviors];
+
+	int behavior;
+
+	// Clear the accumulated values for each behavior
+	for (behavior = 0; behavior < Behaviors::NumberOfBehaviors; ++behavior)
+	{
+		behaviorChanged[behavior] = false;
+	}
+
+	clipMentalStatesToward();
+	deleteUnusedMentalStatesToward(behaviorChanged);
+
+	int newBehavior = newState.m_behavior;
+	if (!m_mentalStatesToward.empty())
+	{
+		// Update the behavior toward each target, and also update the accumulated state values for each behavior
+		Archive::AutoDeltaMap<NetworkId, CreatureAttitude>::const_iterator i = m_mentalStatesToward.begin(), e=m_mentalStatesToward.end();
+		for (; i != e; ++i)
+		{
+			oldBehavior = i->second.m_behavior;
+			newTargetState = i->second;
+			updateBehavior(&i->first, newTargetState);
+			if (newTargetState.m_behavior != oldBehavior)
+			{
+				if (oldBehavior >= 0)
+				{
+					m_targetsByBehavior[oldBehavior].erase(i->first);
+					behaviorChanged[oldBehavior] = true;
+				}
+				m_targetsByBehavior[newTargetState.m_behavior].insert(i->first);
+				behaviorChanged[newTargetState.m_behavior] = true;
+			}
+			m_mentalStatesToward.set(i->first, newTargetState);
+			if (newTargetState.m_behavior > newBehavior)
+				newBehavior = newTargetState.m_behavior;
+		}
+	}
+
+	m_currentAttitude.set(newState);
+
+	if (m_lastBehavior.get() != newBehavior)
+	{
+		const int lastBehavior = m_lastBehavior.get();
+		m_lastBehavior = newBehavior;
+		behaviorChanged[newBehavior] = false;
+
+		notifyTargetChange(lastBehavior, newBehavior, behaviorChanged);
+	}
+	else
+	{
+		notifyTargetChange(m_lastBehavior.get(), m_lastBehavior.get(), behaviorChanged);
+	}
+}
+
+// --------------------------------------------------------------------------
+
+/**
+ * Returns the weapon currently being carried by the creature, which may or may
+ * not be the weapon it is using. If the creature is not carrying a weapon,
+ * returns the default weapon.
+ *
+ * @return the weapon
+ */
+WeaponObject *CreatureObject::getReadiedWeapon() const
+{
+	static SlotId const rightHandSlot = SlotIdManager::findSlotId(ConstCharCrcLowerString("hold_r"));
+
+	// first check the right hand.
+	SlottedContainer const * const slottedContainer = ContainerInterface::getSlottedContainer(*this);
+	if (slottedContainer)
+	{
+		if (slottedContainer->hasSlot(rightHandSlot))
+		{
+			Container::ContainerErrorCode tmp = Container::CEC_Success;
+			Object * const o = slottedContainer->getObjectInSlot(rightHandSlot, tmp).getObject();
+			if (o)
+			{
+				ServerObject * const so = o->asServerObject();
+				if (so)
+				{
+					WeaponObject * const wo = so->asWeaponObject();
+					if (wo)
+						return wo;
+				}
+			}
+		}
+	}
+	// nothing in the hand, return the default weapon
+	return getDefaultWeapon();
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Returned the weapon the creature will use for combat.
+ *
+ * @return the weapon
+ */
+WeaponObject *CreatureObject::getCurrentWeapon()
+{
+	Object * const o = m_currentWeapon.get().getObject();
+	if (o)
+	{
+		ServerObject * const so = o->asServerObject();
+		if (so)
+		{
+			WeaponObject * const currentWeapon = so->asWeaponObject();
+			if (currentWeapon)
+				return currentWeapon;
+		}
+	}
+
+	WeaponObject * const readiedWeapon = getReadiedWeapon();
+	if (readiedWeapon)
+		setCurrentWeapon(*readiedWeapon);
+	return readiedWeapon;
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Sets the weapon the creature will use for combat.
+ *
+ * @param weapon		the weapon
+ */
+void CreatureObject::setCurrentWeapon(WeaponObject & weapon)
+{
+	if(isAuthoritative())
+	{
+		m_currentWeapon = CachedNetworkId(weapon);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setCurrentWeapon, new MessageQueueGenericValueType<NetworkId>(weapon.getNetworkId()));
+	};
+}
+
+// --------------------------------------------------------------------------
+
+int CreatureObject::getInstrumentVisualId() const
+{
+	static SlotId rightHandSlot = SlotIdManager::findSlotId(ConstCharCrcLowerString("hold_r"));
+	bool hasWeapon = false;
+
+	// first check the right hand.
+	SlottedContainer const * const slottedContainer = ContainerInterface::getSlottedContainer(*this);
+	if (slottedContainer)
+	{
+		if (slottedContainer->hasSlot(rightHandSlot))
+		{
+			Container::ContainerErrorCode tmp = Container::CEC_Success;
+			Object const * const object = slottedContainer->getObjectInSlot(rightHandSlot, tmp).getObject();
+			if (object)
+			{
+				int type = lookupInstrumentVisualId(object->getObjectTemplateName());
+				if (type)
+					return type;
+				ServerObject const * const so = object->asServerObject();
+				if (so && so->asWeaponObject())
+					hasWeapon = true;
+			}
+		}
+	}
+
+	// then check the intended target if no weapon is equipped
+	if(!hasWeapon)
+	{
+		int visualId = internalGetInstrumentVisualId(getIntendedTarget());
+		if(visualId)
+			return visualId;
+	}
+
+	// last, check the look at target if no weapon is equipped
+	if (!hasWeapon)
+	{
+		int visualId = internalGetInstrumentVisualId(getLookAtTarget());
+		if(visualId)
+			return visualId;
+	}
+
+	return 0;
+}
+
+// --------------------------------------------------------------------------
+
+int CreatureObject::getInstrumentAudioId() const
+{
+	static SlotId rightHandSlot = SlotIdManager::findSlotId(ConstCharCrcLowerString("hold_r"));
+	bool hasWeapon = false;
+
+	// first check the right hand.
+	SlottedContainer const * const slottedContainer = ContainerInterface::getSlottedContainer(*this);
+	if (slottedContainer)
+	{
+		if (slottedContainer->hasSlot(rightHandSlot))
+		{
+			Container::ContainerErrorCode tmp = Container::CEC_Success;
+			Object const * const object = slottedContainer->getObjectInSlot(rightHandSlot, tmp).getObject();
+			if (object)
+			{
+				int type = lookupInstrumentAudioId(object->getObjectTemplateName());
+				if (type)
+					return type;
+				ServerObject const * const so = object->asServerObject();
+				if (so && so->asWeaponObject())
+					hasWeapon = true;
+			}
+		}
+	}
+
+	// then check the intended target if no weapon is equipped
+	if (!hasWeapon)
+	{
+		int audioId = internalGetInstrumentAudioId(getIntendedTarget());
+		if(audioId)
+			return audioId;		
+	}
+	
+	// last, check the look at target if no weapon is equipped
+	if (!hasWeapon)
+	{
+		int audioId = internalGetInstrumentAudioId(getLookAtTarget());
+		if(audioId)
+			return audioId;	
+	}
+	return 0;
+}
+
+// --------------------------------------------------------------------------
+
+int CreatureObject::internalGetInstrumentAudioId(NetworkId const &id) const
+{
+	if (id != NetworkId::cms_invalid)
+	{
+		Object const * const object = NetworkIdManager::getObjectById(id);
+		if (   object
+			&& !instrumentTooFar(getPosition_w(), object->getPosition_w())
+			&& ContainerInterface::getContainedByObject(*this) == ContainerInterface::getContainedByObject(*object))
+		{
+			ServerObject const * const serverObj = object->asServerObject();
+			if (!serverObj->getSharedTemplate()->getArrangementDescriptor())
+			{
+				int type = lookupInstrumentAudioId(object->getObjectTemplateName());
+				if (type)
+					return type;
+			}
+		}
+	}
+	return 0;
+}
+
+// --------------------------------------------------------------------------
+
+int CreatureObject::internalGetInstrumentVisualId(NetworkId const &id) const
+{
+	if (id != NetworkId::cms_invalid)
+	{
+		Object const * const object = NetworkIdManager::getObjectById(id);
+		if (   object
+			&& !instrumentTooFar(getPosition_w(), object->getPosition_w())
+			&& ContainerInterface::getContainedByObject(*this) == ContainerInterface::getContainedByObject(*object))
+		{
+			ServerObject const * const serverObj = object->asServerObject();
+			if (!serverObj->getSharedTemplate()->getArrangementDescriptor())
+			{
+				int type = lookupInstrumentVisualId(object->getObjectTemplateName());
+				if (type)
+					return type;
+			}
+		}
+	}
+	return 0;
+}
+
+// --------------------------------------------------------------------------
+
+GroupObject *CreatureObject::getGroup() const
+{
+	if (m_group.get() != NetworkId::cms_invalid)
+	{
+		Object *obj = m_group.get().getObject();
+		if (obj)
+		{
+			ServerObject *serverObj = obj->asServerObject();
+			return serverObj->asGroupObject();
+		}
+	}
+	return 0;
+}
+
+// --------------------------------------------------------------------------
+
+void CreatureObject::setGroup(GroupObject *group, bool disbandingCurrentGroup)
+{
+	if (isAuthoritative())
+	{
+		NetworkId const oldGroupId = m_group.get();
+
+		m_group = group ? CachedNetworkId(*group) : CachedNetworkId::cms_cachedInvalid;
+		recomputeSlopeModPercent();
+
+		// Our group has finally been established, so don't worry about
+		// keeping track of who invited us to the group
+		setInviterForPendingGroup( NetworkId::cms_invalid );
+		setGroupInviter(NetworkId::cms_invalid, std::string(), NetworkId::cms_invalid);
+
+		PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+		if (playerObject && (playerObject->getSessionStartPlayTime() != 0))
+		{
+			std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData();
+			std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = connectedCharacterLfgData.find(getNetworkId());
+			if ((iterFind != connectedCharacterLfgData.end()) && (iterFind->second.groupId != m_group.get()))
+				ServerUniverse::setConnectedCharacterGroupData(getNetworkId(), m_group.get());
+		}
+
+		// if joining a group, and the group currently
+		// has an active group pickup point, handle it
+		if (group && (oldGroupId != group->getNetworkId()))
+		{
+			unsigned int const secondsLeftOnGroupPickup = group->getSecondsLeftOnGroupPickup();
+			if (secondsLeftOnGroupPickup)
+			{
+				std::pair<std::string, Vector> const & groupPickupLocation = group->getGroupPickupLocation();
+				if (!groupPickupLocation.first.empty())
+				{
+					// tell group member that there's an active group pickup point
+					if (getClient())
+					{
+						StringId::LocUnicodeString response;
+						if (StringId("group", "create_group_pickup_success_new_group_member").localize(response))
+						{
+							ConsoleMgr::broadcastString(FormattedString<2048>().sprintf(Unicode::wideToNarrow(response).c_str(), CalendarTime::convertSecondsToMS(secondsLeftOnGroupPickup).c_str()),
+								getClient());
+						}
+					}
+
+					// create/update the group member's group pickup point waypoint
+					if (playerObject)
+					{
+						Location const location(groupPickupLocation.second, NetworkId::cms_invalid, Location::getCrcBySceneName(groupPickupLocation.first));
+						playerObject->createOrUpdateReusableWaypoint(location, "groupPickupWp", Unicode::narrowToWide("Group Pickup Point"), Waypoint::White);
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+		NetworkId groupId;
+		if(group)
+			groupId = group->getNetworkId();
+
+		sendControllerMessageToAuthServer(CM_setGroup, new MessageQueueGenericValueType<std::pair<bool, NetworkId> >(std::make_pair(disbandingCurrentGroup, groupId)));
+	}
+}
+
+// --------------------------------------------------------------------------
+
+NetworkId const & CreatureObject::getGroupInviterId() const
+{
+	return m_groupInviter.get().first.first;
+}
+
+// --------------------------------------------------------------------------
+
+std::string const & CreatureObject::getGroupInviterName() const
+{
+	return m_groupInviter.get().first.second;
+}
+
+// --------------------------------------------------------------------------
+
+CreatureObject *CreatureObject::getGroupInviter() const
+{
+	NetworkId const & inviterId = m_groupInviter.get().first.first;
+	if (inviterId != NetworkId::cms_invalid)
+	{
+		Object * const o = NetworkIdManager::getObjectById(inviterId);
+		if (o)
+		{
+			ServerObject * const so = o->asServerObject();
+			if (so)
+				return so->asCreatureObject();
+		}
+	}
+	return 0;
+}
+
+// --------------------------------------------------------------------------
+
+void CreatureObject::setGroupInviter(NetworkId const &inviterId, std::string const& inviterName, NetworkId const &inviterShipId)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, NetworkId> > > *msg = new MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, NetworkId> > >(std::make_pair(inviterName, std::make_pair(inviterId, inviterShipId)));
+			controller->appendMessage(
+				CM_setGroupInviter,
+				0.0f,
+				msg,
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		m_groupInviter = PlayerAndShipPair(std::make_pair(inviterId, inviterName), inviterShipId);
+	}
+}
+
+// --------------------------------------------------------------------------
+
+NetworkId const &CreatureObject::getInviterForPendingGroup() const
+{
+	// We agreed to join a group and this is the guy that invited us
+	return m_inviterForPendingGroup.get();
+}
+
+// --------------------------------------------------------------------------
+
+void CreatureObject::setInviterForPendingGroup(NetworkId const &inviterId)
+{
+	// Once we agree to join a group, we keep track of who extended
+	// the invitation until we get an actual group object
+	m_inviterForPendingGroup = inviterId;
+}
+
+// --------------------------------------------------------------------------
+
+void CreatureObject::notifyTargetChange(int lastBehavior, int newBehavior, bool * i_targetsChanged)
+{
+	bool sendMessage = false;
+	Scripting::TrigId notification = Scripting::TRIG_TARGET_CHANGE;
+	ScriptParams params;
+	params.addParam(newBehavior);
+	if (lastBehavior != newBehavior)
+	{
+		notification = Scripting::TRIG_BEHAVIOR_CHANGE;
+		params.addParam(lastBehavior);
+		sendMessage = true;
+	}
+	std::vector<int> targetListChanged;
+	targetListChanged.reserve(Behaviors::NumberOfBehaviors);
+	targetListChanged.resize(Behaviors::NumberOfBehaviors);
+	int i;
+	for (i=0; i<Behaviors::NumberOfBehaviors; ++i)
+	{
+		targetListChanged[i]= 0;
+		if (i_targetsChanged[i])
+		{
+			sendMessage = true;
+			targetListChanged[i] = true;
+		}
+	}
+	if (sendMessage)
+	{
+		params.addParam(targetListChanged);
+		IGNORE_RETURN(getScriptObject()->trigAllScripts(notification, params));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+CreatureAttitude const *CreatureObject::getAttitudeToward(NetworkId const &target) const
+{
+	Archive::AutoDeltaMap<NetworkId, CreatureAttitude>::const_iterator i = m_mentalStatesToward.find(target);
+	if (i == m_mentalStatesToward.end())
+		return 0;
+	return &i->second;
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::clipMentalStatesToward()
+{
+	float maxDeltas[MentalStates::NumberOfMentalStates];
+	float minValues[MentalStates::NumberOfMentalStates];
+	MentalStates::Enumerator state;
+	for (state=0; state<MentalStates::NumberOfMentalStates; ++state)
+	{
+		MentalStates::Value current = getMentalState(state);
+		minValues[state] = -current;
+		maxDeltas[state] = m_maxMentalStates[state] - current;
+	}
+
+	Archive::AutoDeltaMap<NetworkId, CreatureAttitude>::const_iterator i = m_mentalStatesToward.begin();
+	Archive::AutoDeltaMap<NetworkId, CreatureAttitude>::const_iterator e = m_mentalStatesToward.end();
+	for (; i != e; ++i)
+	{
+		CreatureAttitude newState = i->second;
+		for (state=0; state<MentalStates::NumberOfMentalStates; ++state)
+		{
+			float delta = i->second.m_currentValues[state];
+			if (delta > maxDeltas[state])
+			{
+				newState.m_currentValues[state] = maxDeltas[state];
+			}
+			else if (delta < minValues[state])
+			{
+				newState.m_currentValues[state] = 0;
+			}
+		}
+		m_mentalStatesToward.set(i->first, newState);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::deleteUnusedMentalStatesToward(bool * i_behaviorChanged)
+{
+	Archive::AutoDeltaMap<NetworkId, CreatureAttitude>::const_iterator i = m_mentalStatesToward.begin();
+	Archive::AutoDeltaMap<NetworkId, CreatureAttitude>::const_iterator e = m_mentalStatesToward.end();
+	std::vector<NetworkId> to_erase;
+	for (; i != e; ++i)
+	{
+		ServerObject * object = ServerWorld::findObjectByNetworkId(i->first);
+		bool erase = true;
+		int state;
+		if (object)
+		{
+			for (state=0; state<MentalStates::NumberOfMentalStates && erase; ++state)
+			{
+				if (i->second.m_currentValues[state] > 0)
+					erase = false;
+			}
+		}
+		if (erase)
+		{
+			int currentObjectBehavior = i->second.m_behavior;
+			if (currentObjectBehavior != -1) // if -1, we are deleting an object that was added and removed in the same alter
+			{
+				if (currentObjectBehavior < Behaviors::Calm || currentObjectBehavior >= Behaviors::NumberOfBehaviors)
+				{
+					DEBUG_REPORT_LOG(true, ("deleteUnusedMentalStatesToward: currentBehavior %d is invalid", currentObjectBehavior));
+				}
+				else
+				{
+					std::set<NetworkId>::iterator currentTargetByBehaviorIter = m_targetsByBehavior[currentObjectBehavior].find(i->first);
+					if (currentTargetByBehaviorIter != m_targetsByBehavior[currentObjectBehavior].end())
+					{
+						i_behaviorChanged[currentObjectBehavior] = true;
+						m_targetsByBehavior[currentObjectBehavior].erase(currentTargetByBehaviorIter);
+					}
+				}
+			}
+			to_erase.push_back(i->first);
+		}
+	}
+	std::vector<NetworkId>::iterator tei;
+	for (tei = to_erase.begin(); tei!=to_erase.end(); ++tei)
+	{
+		m_mentalStatesToward.erase(*tei);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::setMentalStateToward(const NetworkId &target, MentalStates::Enumerator state, MentalStates::Value value)
+{
+	if(! isAuthoritative())
+	{
+		sendControllerMessageToAuthServer(CM_setMentalStateToward, new MessageQueueGenericValueType<std::pair<NetworkId, std::pair<MentalStates::Enumerator, MentalStates::Value> > >(std::make_pair(target, std::make_pair(state, value))));
+	}
+	else
+	{
+		if (state < 0 || state >= MentalStates::NumberOfMentalStates)
+		{
+			DEBUG_REPORT_LOG(true, ("mental state out of range (%d)\n", state));
+			return;
+		}
+
+		ServerObject * object = ServerWorld::findObjectByNetworkId(target);
+		if (!object)
+			return;
+
+		CreatureAttitude const * const cs = getAttitudeToward(target);
+		CreatureAttitude newState;
+
+		if (!cs && value <= 0)
+			return;
+
+		if (cs)
+		{
+			 newState = *cs;
+		}
+		newState.m_currentValues[state] = value;
+		m_mentalStatesToward.set(target, newState);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::setMentalStateTowardClampBehavior(const NetworkId &target, MentalStates::Enumerator state, MentalStates::Value value, Behaviors::Enumerator behavior)
+{
+	if(! isAuthoritative())
+	{
+		sendControllerMessageToAuthServer(CM_setMentalStateTowardClampBehavior, new MessageQueueGenericValueType<std::pair<NetworkId, std::pair<MentalStates::Enumerator, std::pair<MentalStates::Value, Behaviors::Enumerator> > > >(std::make_pair(target, std::make_pair(state, std::make_pair(value, behavior)))));
+	}
+	else
+	{
+		if (state < 0 || state >= MentalStates::NumberOfMentalStates)
+		{
+			DEBUG_REPORT_LOG(true, ("mental state out of range (%d)\n", state));
+			return;
+		}
+
+		if (behavior < Behaviors::Calm || behavior >= Behaviors::NumberOfBehaviors)
+		{
+			DEBUG_REPORT_LOG(true, ("setMentalStateTowardClampBehavior: behavior %d is invalid", behavior));
+			return;
+		}
+
+		ServerObject * object = ServerWorld::findObjectByNetworkId(target);
+		if (!object)
+			return;
+
+		CreatureAttitude const * const cs = getAttitudeToward(target);
+		if (!cs && value <= 0)
+			return;
+
+		CreatureAttitude newState;
+		if (cs)
+		{
+			 newState = *cs;
+		}
+		float oldValue = newState.m_currentValues[state];
+
+		float maxValue = 0;
+		if (behavior >= Behaviors::Alert && behavior <= Behaviors::Retreat) // [1..3] 4 = flee
+		{
+			if (state != MentalStates::Fear)
+			{
+				DEBUG_REPORT_LOG(true, ("Bad mental state %d for behavior %d in setMentalStateTowardClampBehavior", state, behavior));
+				return;
+			}
+			maxValue = m_fearCutoffs[behavior - Behaviors::Alert + 2]; // [2..4] out of [0..4]
+		}
+		else if (behavior == Behaviors::Attack) // [5] 6 = frenzy
+		{
+			if (state != MentalStates::Anger)
+			{
+				DEBUG_REPORT_LOG(true, ("Bad mental state %d for behavior %d in setMentalStateTowardClampBehavior", state, behavior));
+				return;
+			}
+			maxValue = m_angerCutoffs[behavior - Behaviors::Attack + 2]; // [2..2] out of [0..2]
+		}
+		else if (behavior == Behaviors::Calm)
+		{
+			if (state == MentalStates::Fear)
+			{
+				maxValue = m_fearCutoffs[behavior+1];
+			}
+			else
+			{
+				maxValue = 0.0f;
+			}
+		}
+		else
+		{
+			maxValue = 1e30f; // allow any value
+		}
+		maxValue = std::max(0.0f, maxValue - 1.0f);
+		if (oldValue < maxValue)
+		{
+			if (value > maxValue)
+				value = maxValue;
+
+			newState.m_currentValues[state] = value;
+			m_mentalStatesToward.set(target, newState);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+/**
+* Gets the creatures current state.  0 = calm, 1-4 = afraid, 5-7 = angry.
+*/
+
+bool CreatureObject::updateBehavior(const NetworkId * id, CreatureAttitude &state) const
+{
+	int attitude = state.m_behavior;
+	float anger = id ? getMentalStateToward(*id, MentalStates::Anger) : getMentalState(MentalStates::Anger);
+	float fear = id ? getMentalStateToward(*id, MentalStates::Fear) : getMentalState(MentalStates::Fear);
+
+	while ((state.m_fearState > 0) && fear <= m_fearCutoffs[state.m_fearState-1]) // much less fearful than current state
+	{
+		state.m_fearState = static_cast<CreatureAttitude::eFearState>(state.m_fearState - 1);
+	}
+	while ((state.m_fearState < CreatureAttitude::kFearStateCount-1) && fear >= m_fearCutoffs[state.m_fearState+1])
+	{
+		state.m_fearState = static_cast<CreatureAttitude::eFearState>(state.m_fearState + 1);
+	}
+	if (anger == 0)
+		state.m_angerState = CreatureAttitude::kAngerCalm;
+	else
+	{
+		while ((state.m_angerState > CreatureAttitude::kAngerAttack) && anger <= m_angerCutoffs[state.m_angerState-1]) // much less angry than current state
+		{
+			state.m_angerState = static_cast<CreatureAttitude::eAngerState>(state.m_angerState - 1);
+		}
+		while ((state.m_angerState < CreatureAttitude::kAngerStateCount-1) && anger >= m_angerCutoffs[state.m_angerState+1])
+		{
+			state.m_angerState = static_cast<CreatureAttitude::eAngerState>(state.m_angerState + 1);
+		}
+	}
+
+	if (anger > 0)
+	{
+		if (state.m_angerState == CreatureAttitude::kAngerCalm) // got here somehow, I don't know
+			state.m_behavior = CreatureAttitude::kAngerAttack + CreatureAttitude::kFearStateCount-1;
+		else
+			state.m_behavior = state.m_angerState + CreatureAttitude::kFearStateCount-1;
+	}
+	else
+	{
+		if (state.m_fearState == CreatureAttitude::kFearCalm)
+			state.m_behavior = 0;
+		else
+			state.m_behavior = state.m_fearState;
+	}
+
+	return state.m_behavior != attitude;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the list of draft schematics this creature can use.
+ *
+ * @return the schematic list
+ */
+const std::map<std::pair<uint32, uint32>,int> & CreatureObject::getDraftSchematics() const
+{
+static const std::map<std::pair<uint32, uint32>,int> npcSchematics;
+
+	if (isPlayerControlled())
+	{
+		PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(this);
+		if (playerObject != NULL)
+			return playerObject->getDraftSchematics();
+	}
+	return npcSchematics;
+}	// CreatureObject::getDraftSchematics
+
+//-----------------------------------------------------------------------
+
+/**
+ * Tests if a given ingredient for use in crafting is in this creature's inventory.
+ *
+ * @param ingredient		the ingredient to test
+ *
+ * @return true if the ingredient in in our inventory, false if not
+ */
+bool CreatureObject::isIngredientInInventory(const Object & ingredient) const
+{
+	const ServerObject * inventory = getInventory();
+	if (inventory == NULL)
+		return false;
+
+	const Object * container = ContainerInterface::getContainedByObject(ingredient);
+	while (container != NULL)
+	{
+		if (inventory->getNetworkId() == container->getNetworkId() ||
+			getNetworkId() == container->getNetworkId())
+		{
+			return true;
+		}
+		// go up a container level
+		container = ContainerInterface::getContainedByObject(*container);
+	}
+	return false;
+}	// CreatureObject::isIngredientInInventory
+
+//-----------------------------------------------------------------------
+
+/**
+ * Disables schematic filtering when this creature crafts. Note this only works
+ * if the creature is controlled by a god-mode player.
+ */
+void CreatureObject::disableSchematicFiltering()
+{
+	if (getClient() == NULL || !getClient()->isGod())
+		return;
+
+	setObjVarItem(OBJVAR_DISABLE_SCHEMATIC_FILTER, 1);
+}	// CreatureObject::disableSchematicFiltering
+
+//-----------------------------------------------------------------------
+
+/**
+ * Enables schematic filtering when this creature crafts. Note this only works
+ * if the creature is controlled by a god-mode player.
+ */
+void CreatureObject::enableSchematicFiltering()
+{
+	if (getClient() == NULL || !getClient()->isGod())
+		return;
+
+	removeObjVarItem(OBJVAR_DISABLE_SCHEMATIC_FILTER);
+}	// CreatureObject::enableSchematicFiltering
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns if schematic filtering is enabled or not. Note this only works
+ * if the creature is controlled by a god-mode player.
+ *
+ * @return true if filtering is on, false if it is off
+ */
+bool CreatureObject::isSchematicFilteringEnabled()
+{
+	if (getClient() == NULL || !getClient()->isGod())
+		return true;
+
+	return (!getObjVars().hasItem(OBJVAR_DISABLE_SCHEMATIC_FILTER));
+}	// CreatureObject::isSchematicFilteringEnabled
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a list of manufacture schematics in this creature's datapad.
+ *
+ * @param schematics		list to be filled with the schematics
+ */
+void CreatureObject::getManufactureSchematics(std::vector<const ManufactureSchematicObject *> & schematics)
+{
+	const ServerObject * datapad = getDatapad();
+	if (datapad == NULL)
+		return;
+	const VolumeContainer * container = ContainerInterface::getVolumeContainer(*datapad);
+	if (container == NULL)
+		return;
+
+	for (ContainerConstIterator iter = container->begin(); iter != container->end(); ++iter)
+	{
+		const ManufactureSchematicObject * schematic = dynamic_cast<const
+			ManufactureSchematicObject *>((*iter).getObject());
+		if (schematic != NULL)
+			schematics.push_back(schematic);
+	}
+}	// CreatureObject::getManufactureSchematics(unfiltered)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a list of manufacture schematics in this creature's datapad, filtered
+ * by a bitmask of crafting types.
+ *
+ * @param schematics		list to be filled with the schematics
+ * @param craftingTypes		bitmask of valid crafting types
+ */
+void CreatureObject::getManufactureSchematics(std::vector<const ManufactureSchematicObject *> & schematics, uint32 craftingTypes)
+{
+	const ServerObject * datapad = getDatapad();
+	if (datapad == NULL)
+		return;
+	const VolumeContainer * container = ContainerInterface::getVolumeContainer(*datapad);
+	if (container == NULL)
+		return;
+
+	for (ContainerConstIterator iter = container->begin(); iter != container->end(); ++iter)
+	{
+		const ManufactureSchematicObject * schematic = dynamic_cast<const
+			ManufactureSchematicObject *>((*iter).getObject());
+		if (schematic != NULL && ((schematic->getCategory() & craftingTypes) != 0))
+			schematics.push_back(schematic);
+	}
+}	// CreatureObject::getManufactureSchematics(filtered)
+
+//-----------------------------------------------------------------------
+
+
+bool CreatureObject::isItemEquipped(const Object & item) const
+{
+	Object const * const itemContainedBy = ContainerInterface::getContainedByObject (item);
+
+	if (itemContainedBy)
+	{
+		return (getNetworkId () == itemContainedBy->getNetworkId ());
+	}
+
+	return false;
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::getBehaviorTargets(int behavior, std::vector<NetworkId> &targets)
+{
+	if (behavior < 0 || behavior >= Behaviors::NumberOfBehaviors)
+	{
+		return;
+	}
+
+	targets.clear();
+	targets.reserve(m_targetsByBehavior[behavior].size());
+	targets.resize(m_targetsByBehavior[behavior].size());
+	std::set<NetworkId>::const_iterator  i;
+	std::vector<NetworkId>::iterator src = targets.begin();
+	for (i=m_targetsByBehavior[behavior].begin(); i!= m_targetsByBehavior[behavior].end(); ++i)
+	{
+		 *src++=*i;
+	}
+}
+
+//-----------------------------------------------------------------------
+
+int CreatureObject::getBehavior() const
+{
+	return m_lastBehavior.get();
+}
+
+
+//-----------------------------------------------------------------------
+
+int CreatureObject::getBehaviorToward(const NetworkId &target) const
+{
+	CreatureAttitude const * const cs = getAttitudeToward(target);
+	if (!cs)
+		return 0;
+	return cs->m_behavior;
+}
+
+//----------------------------------------------------------------------
+
+int CreatureObject::getNiche() const
+{
+	const SharedCreatureObjectTemplate * sharedTemplate = safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate());
+	return static_cast<unsigned int>(sharedTemplate->getNiche());
+}
+
+//----------------------------------------------------------------------
+
+SharedCreatureObjectTemplate::Species CreatureObject::getSpecies() const
+{
+	const SharedCreatureObjectTemplate * sharedTemplate = safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate());
+	return static_cast<SharedCreatureObjectTemplate::Species>(sharedTemplate->getSpecies());
+}
+
+//----------------------------------------------------------------------
+
+SharedCreatureObjectTemplate::Race CreatureObject::getRace() const
+{
+	const SharedCreatureObjectTemplate * sharedTemplate = safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate());
+	return static_cast<SharedCreatureObjectTemplate::Race>(sharedTemplate->getRace());
+}
+
+//----------------------------------------------------------------------
+/*
+void CreatureObject::setAnimationState(CreatureObject::AnimationState state)
+{
+    m_animState = static_cast<unsigned char>(state);
+}
+*/
+//----------------------------------------------------------------------
+
+void CreatureObject::setMood(uint32 mood)
+{
+	if(isAuthoritative())
+	{
+		DEBUG_WARNING (mood > 255, ("Mood %d out of range", mood));
+		m_mood = static_cast<unsigned char>(mood);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setMood, new MessageQueueGenericValueType<unsigned long>(mood));
+	}
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Sets the incapacitated state on the creature.
+ *
+ * @param flag		true to incapacitate, false to recapacitate
+ * @param attacker	who incapacitated us
+ */
+void CreatureObject::setIncapacitated(bool flag, const NetworkId & attackerId)
+{
+	if (isAuthoritative())
+	{
+		if (flag)
+		{
+			clearHateList();
+		}
+
+		int oldPosture = getPosture();
+		if (flag && oldPosture != Postures::Incapacitated)
+		{
+			ScriptParams params;
+			params.addParam(attackerId);
+			if (getScriptObject()->trigAllScripts(
+				Scripting::TRIG_ABOUT_TO_BE_INCAPACITATED, params) == SCRIPT_OVERRIDE)
+			{
+				LOG("CustomerService", ("Combat: %s not incapacitated due to script",
+					PlayerObject::getAccountDescription(this).c_str()));
+				return;
+			}
+			LOG("CustomerService", ("Combat: %s incapacitated",
+				PlayerObject::getAccountDescription(this).c_str()));
+
+			// if we are crafting, end the crafting session
+			PlayerObject * const player = PlayerCreatureController::getPlayerObject(this);
+			if (player != NULL && player->isCrafting())
+				player->stopCrafting(false);
+
+			if (isInNpcConversation())
+				endNpcConversation();
+
+			setPosture(Postures::Incapacitated);
+			setState(States::FeignDeath, false);
+
+			// invoke incapacitation script on us
+			if (oldPosture != Postures::Dead)
+			{
+				params.clear();
+				params.addParam(attackerId);
+				IGNORE_RETURN(getScriptObject()->trigAllScripts(
+					Scripting::TRIG_INCAPACITATED, params));
+				if (attackerId != NetworkId::cms_invalid)
+				{
+					// invoke incapacitation script on who incapacitated us
+					ServerObject * attacker = safe_cast<ServerObject *>(
+						NetworkIdManager::getObjectById(attackerId));
+					if (attacker != NULL)
+					{
+						params.clear();
+						params.addParam(getNetworkId());
+						IGNORE_RETURN(attacker->getScriptObject()->trigAllScripts(
+							Scripting::TRIG_INCAPACITATE_TARGET, params));
+
+						TangibleObject * const tangibleAttacker = attacker->asTangibleObject();
+
+						if (tangibleAttacker != NULL)
+						{
+							tangibleAttacker->verifyHateList();
+						}
+					}
+				}
+			}
+		}
+		else if (!flag && oldPosture == Postures::Incapacitated)
+		{
+			// allow scripts to prevent recapacitation
+			ScriptParams params;
+			if (getScriptObject()->trigAllScripts(Scripting::TRIG_RECAPACITATED,
+				params) == SCRIPT_OVERRIDE)
+			{
+				LOG("CustomerService", ("Combat: %s not recapacitated due to script",
+					PlayerObject::getAccountDescription(this).c_str()));
+				return;
+			}
+
+			LOG("CustomerService", ("Combat: %s recapacitated",
+				PlayerObject::getAccountDescription(this).c_str()));
+			// recapacitate us
+			// Force the stand command to execute
+			setPosture(Postures::Upright);
+		}
+		// if we are a player, send us our new posture
+		if ((getController() != NULL) && !isInCombat())
+		{
+			getController()->appendMessage(
+				CM_setPosture,
+				0.0f,
+				new MessageQueuePosture(getPosture(), true),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_ALL_CLIENT
+			);
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setIncapacitated, new MessageQueueGenericValueType<std::pair<bool, NetworkId> >(std::make_pair(flag, attackerId)));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::updateMovementInfo()
+{
+	// TODO RAD - figure out a real fix for this
+	if (!canMove() && !isPlayerControlled())
+ 		m_stopWalkRun = 0;
+
+	//-- Retrieve walk and run multipliers from movement table.  These are based on the creature's posture and states.
+	float walkSpeedModifier = 0.0f;
+	float runSpeedModifier = 0.0f;
+
+	float accelScale = 0.0f;
+	float turnScale = 0.0f;
+
+	getMovementTable()->getAllMovementRateScales(m_posture.get(), m_states.get(), walkSpeedModifier, runSpeedModifier, accelScale, turnScale);
+	m_accelScale    = accelScale;
+	m_turnScale     = turnScale;
+
+	DEBUG_WARNING((walkSpeedModifier > 0.0f) && (runSpeedModifier > 0.0f) && (walkSpeedModifier != runSpeedModifier), ("updateMovementInfo(): both walk and run speed are nonzero but not equal,walk=[%g],run=[%g].", walkSpeedModifier, runSpeedModifier));
+	m_movementScale = std::max(walkSpeedModifier, runSpeedModifier);
+
+	//-- Calculate walk and run speed.
+	m_walkSpeed = (walkSpeedModifier > 0.0f) ? getBaseWalkSpeed() : 0.0f;
+	m_runSpeed  = (runSpeedModifier > 0.0f)  ? getBaseRunSpeed() : 0.0f;
+
+	// If this creature is mounted, we want this creature's walkSpeed, runSpeed, movementScale and movementPercent set to the mount's
+	if (getState(States::RidingMount))
+	{
+		CreatureObject *const mountedCreature = getMountedCreature();
+		if (mountedCreature)
+		{
+			if (GameObjectTypes::isTypeOf (mountedCreature->getGameObjectType (), SharedObjectTemplate::GOT_vehicle) &&
+				mountedCreature->m_vehiclePhysicsData)
+			{
+				m_runSpeed  = mountedCreature->m_vehiclePhysicsData->m_runSpeed;
+				m_walkSpeed = mountedCreature->m_vehiclePhysicsData->m_walkSpeed;
+			}
+			else
+			{
+				m_walkSpeed = mountedCreature->getBaseWalkSpeed();
+				m_runSpeed  = mountedCreature->getBaseRunSpeed();
+			}
+		}
+	}
+
+	//-- Update fast/slow/stationary locomotion mappings.
+	getAvailableLocomotions();
+
+	//-- Choose locomotion.
+	m_locomotion = calcLocomotion();
+
+	// if the posture isn't sneak, make sure we don't have cover
+	if (getPosture() != Postures::Sneaking && getCover() != 0)
+ 		setCover(0);
+
+	// if we are prone and have a movement mod > 50, increase our movement rate
+	if (getPosture() == Postures::Prone)
+	{
+		int movementMod = getEnhancedModValue(SLOPE_MOD);
+		GroupObject const *group = getGroup();
+		if (group)
+		{
+			// get my group leader skill mod
+			NetworkId const &leaderId = group->getGroupLeaderId();
+			if (leaderId != NetworkId::cms_invalid)
+			{
+				Object const *o = NetworkIdManager::getObjectById(leaderId);
+				if (o)
+				{
+					ServerObject const *so = o->asServerObject();
+					if (so)
+					{
+						CreatureObject const *co = so->asCreatureObject();
+						if (co)
+							movementMod += co->getEnhancedModValue(GROUP_SLOPE_MOD);
+					}
+				}
+			}
+		}
+		if (movementMod > 50)
+		{
+			float moveScale, accelScale, turnScale;
+			getMovementTable()->getRates(Postures::Upright, moveScale, accelScale, turnScale);
+
+			movementMod -= 50;
+			if (movementMod > 50)
+				movementMod = 50;
+			float modScale = (movementMod / 50.0f) * ((moveScale / m_movementScale.get()) - 1.0f) + 1.0f;
+			m_movementScale = m_movementScale.get() * modScale;
+		}
+	}
+
+	//-- Mounts: update to a mount's movement info needs to propagate to
+	//   its rider.
+	if (getState(States::MountedCreature))
+	{
+		typedef std::vector<CreatureObject *> Riders;
+		Riders riders;
+
+		getMountingRiders(riders);
+
+		Riders::const_iterator ii = riders.begin();
+		Riders::const_iterator iiEnd = riders.end();
+
+		for (; ii != iiEnd; ++ii)
+		{
+			CreatureObject *const rider = * ii;
+
+			if (rider)
+				rider->requestMovementInfoUpdate();
+			else
+			{
+				LOG("mounts-bug", ("CreatureObject::updateMovementInfo(): server id=[%d],mount id=[%s],has MountedCreature state but getMountingRider() returns null.", static_cast<int>(GameServer::getInstance().getProcessId()), getNetworkId().getValueString().c_str()));
+				detachAllRiders();
+			}
+		}
+	}
+
+	//-- Prevent player from moving while stunned
+	if (getState(States::Stunned))
+	{
+		m_turnScale = 0.0f;
+		m_movementScale = 0.0f;
+	}
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Sets a creature's posture, if it's allowed for its current state. This function
+ * should be called directly if source is CS_player, otherwise it should be called
+ * from setCombatState().
+ *
+ * Note: callers should set isClientImmediate to false (the default) if changing
+ * posture during combat.  Combat generally controls when the client visuals for
+ * posture will actually change.  Setting isClientImmediate to true causes the client
+ * to drop any combat actions currently playing involving this creature and will
+ * make the client's visual posture change immediately.
+ *
+ * @param posture		         the new posture.
+ * @param isClientImmediate  if set, the client changes visual posture immediately;
+ *                           otherwise, combat is assumed to migrate to this posture
+ *                           at the appropriate time (as instructed by the combat action
+ *                           message) or the client will revert to this new server posture
+ *                           in 5 seconds (as of this writing).
+ */
+void CreatureObject::setPosture(Postures::Enumerator newPosture, bool isClientImmediate)
+{
+	//-- vehicles can't be anything but upright
+	if (newPosture != Postures::Upright && GameObjectTypes::isTypeOf (getGameObjectType (), SharedObjectTemplate::GOT_vehicle))
+	{
+		WARNING (true, ("CreatureObject attempt to set a vehicle to posture [%d].", newPosture));
+		return;
+	}
+
+	//-- Only do server message processing if the posture changed, but always send the
+	//   posture to the clients if isClientImmediate is true --- the client visual posture
+	//   is unknown on the server and may be different than the server posture.
+	Postures::Enumerator oldPosture = m_posture.get();
+	bool const doServerProcessing = (oldPosture != newPosture);
+
+	if (doServerProcessing)
+	{
+		//-- Process the posture change on the server only if the posture changed.
+		if (!isAuthoritative())
+		{
+			sendControllerMessageToAuthServer(CM_setPosture, new MessageQueuePosture(newPosture, isClientImmediate));
+			return;
+		}
+
+		if (getMovementTable()->getLocomotion(newPosture, m_states.get(), MovementTable::kStationary) != Locomotions::Invalid)
+		{
+			Postures::Enumerator oldPosture = m_posture.get();
+			
+			m_posture = newPosture;
+			
+			// If we were previously sitting on a chair, clear the flag.
+			if(oldPosture == Postures::Sitting)
+				setState(States::SittingOnChair, false);
+
+			// @todo revisit this.  updateMoevementInfo() indirectly changes auto delta variables.  Since this isn't
+			// guaranteed to be the authoritative object, this is an invalid thing to do.
+			requestMovementInfoUpdate();
+
+			if (getScriptObject() != NULL)
+			{
+				ScriptParams params;
+				params.addParam(oldPosture);
+				params.addParam(newPosture);
+				IGNORE_RETURN(getScriptObject()->trigAllScripts(
+												Scripting::TRIG_CHANGED_POSTURE, params));
+			}
+
+			recomputeSlopeModPercent();
+		}
+	}
+
+	//-- Handle posture changes that should take effect immediately on the client.
+	if (isClientImmediate)
+	{
+		//-- Send if we're the authoritative server OR if we're not passing the message on to the authoritative server.
+		//   This guarantees that we only send this message to the clients once.
+		bool const sendToClient = isAuthoritative() || !doServerProcessing;
+		if (sendToClient)
+		{
+			Controller *const controller = getController();
+			if (controller)
+				controller->appendMessage(CM_setPosture, 0.0f, new MessageQueuePosture(newPosture, true), GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_ALL_CLIENT);
+			else
+				DEBUG_WARNING(true, ("setPosture(): called with isClientImmediate but object id=[%s],template=[%s] has no controller.", getNetworkId().getValueString().c_str(), getObjectTemplateName()));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+/**
+ * Call this function to request that movement info be updated at the
+ * end of the next frame's alter.
+ *
+ * This function was needed to delay the updateMovementInfo() until
+ * after all transitive mount-related state was complete.  It has the
+ * side effect of preventing the call from being made multiple times
+ * in the same frame.
+ */
+
+void CreatureObject::requestMovementInfoUpdate()
+{
+	setLocalFlag(LocalObjectFlags::CreatureObject_RequiresMovementInfoUpdate, true);
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::setCover(int cover)
+{
+	if(!isAuthoritative())
+	{
+		sendControllerMessageToAuthServer(CM_setCover, new MessageQueueGenericValueType<int>(cover));
+	}
+	else
+	{
+		m_cover = cover;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sets the value of a state on a creature, if it's allowed for its current
+ * state.
+ *
+ * @param whichState  which state to change
+ * @param value       new value of the state
+ */
+void CreatureObject::setState(States::Enumerator whichState, bool value)
+{
+	if (isAuthoritative())
+	{
+		if(whichState == States::Combat)
+		{
+			setInCombat(value);
+			return;
+		}
+
+		//-- vehicles can't have most states
+		if (value && GameObjectTypes::isTypeOf (getGameObjectType (), SharedObjectTemplate::GOT_vehicle))
+		{
+			switch (whichState)
+			{
+				case States::MountedCreature:
+				case States::Swimming:
+				case States::Combat:
+					// these states are okay for a vehicle to have, continue on with state change processing.
+					break;
+
+				default:
+					// all other states are not okay for a vehicle to have, warn about them.
+					WARNING (true, ("CreatureObject id=[%s] attempt to set state id=[%d], name=[%s] on a vehicle, unsupported.", getNetworkId().getValueString().c_str(), whichState, States::getStateName(whichState)));
+					return;
+			}
+		}
+
+		uint64 stateFlags = m_states.get();
+
+		// enforce a no state change if the creature is a glowing Jedi
+		if (value)
+			stateFlags |= States::getStateMask(whichState);
+		else
+			stateFlags &= ~States::getStateMask(whichState);
+ 		if (m_states.get() != stateFlags)
+ 		{
+ 			m_states = stateFlags;
+ 			requestMovementInfoUpdate();
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setState, new MessageQueueSetState(static_cast<int>(whichState), value));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::setSayMode(uint32 sayMode)
+{
+	if(isAuthoritative())
+	{
+		DEBUG_WARNING (sayMode > 255, ("Saymode %d out of range", sayMode));
+		m_sayMode = static_cast<unsigned char>(sayMode);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setSayMode, new MessageQueueGenericValueType<unsigned long>(sayMode));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::setAnimationMood(const std::string & mood)
+{
+	if(isAuthoritative())
+	{
+		m_animationMood = mood;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setAnimationMood, new MessageQueueGenericValueType<std::string>(mood));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::setAttribute(Attributes::Enumerator attribute, Attributes::Value value)
+{
+	if(!isAuthoritative())
+	{
+		sendControllerMessageToAuthServer(CM_setAttribute, new MessageQueueGenericValueType<std::pair<Attributes::Enumerator, Attributes::Value> >(std::make_pair(attribute, value)));
+	}
+	else
+	{
+		if (attribute < 0 || attribute >= Attributes::NumberOfAttributes)
+		{
+			DEBUG_REPORT_LOG(true, ("attribute out of range (%d)\n", attribute));
+			return;
+		}
+		if (!Attributes::isAttribPool(attribute))
+		{
+			WARNING(true, ("CreatureObject::setAttribute called with non-pool attribute %d on creature %s. If this is a regeneration value, call setRegenRate() instead.",
+				attribute, getNetworkId().getValueString().c_str()));
+			return;
+		}
+		const Attributes::Value currentValue = m_attributes[attribute];
+		IGNORE_RETURN(alterAttribute(attribute, value - currentValue, true));
+	}
+}
+
+//----------------------------------------------------------------------
+
+/** Set the maximum value for an attribute.  Optionally revalidate the stats for players.
+ */
+void CreatureObject::setMaxAttribute(Attributes::Enumerator attribute, Attributes::Value value, bool verifyPlayerMaxStats)
+{
+	if(! isAuthoritative())
+	{
+		sendControllerMessageToAuthServer(CM_setMaxAttribute, new MessageQueueGenericValueType<std::pair<Attributes::Enumerator, Attributes::Value> >(std::make_pair(attribute, value)));
+	}
+	else
+	{
+		if (attribute < 0 || attribute >= Attributes::NumberOfAttributes)
+		{
+			DEBUG_REPORT_LOG(true, ("attribute out of range (%d)\n", attribute));
+			return;
+		}
+		if (!Attributes::isAttribPool(attribute))
+		{
+			WARNING(true, ("CreatureObject::setMaxAttribute called with non-pool attribute %d on creature %s. If this is a regeneration value, call setRegenRate() instead.",
+				attribute, getNetworkId().getValueString().c_str()));
+			return;
+		}
+		m_maxAttributes.set(attribute, value);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::setMentalState(MentalStates::Enumerator state, MentalStates::Value value)
+{
+	if(! isAuthoritative())
+	{
+		sendControllerMessageToAuthServer(CM_setMentalState, new MessageQueueGenericValueType<std::pair<MentalStates::Enumerator, MentalStates::Value> >(std::make_pair(state, value)));
+	}
+	else
+	{
+		if (state < 0 || state >= MentalStates::NumberOfMentalStates)
+		{
+			DEBUG_REPORT_LOG(true, ("mental state out of range (%d)\n", state));
+			return;
+		}
+
+		if (value > m_maxMentalStates[state])
+			value = m_maxMentalStates[state];
+		else if (value < 0)
+			value = 0;
+		CreatureAttitude newState = m_currentAttitude.get();
+		newState.m_currentValues[state] = value;
+		m_currentAttitude.set(newState);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::setMaxMentalState(MentalStates::Enumerator state, MentalStates::Value value)
+{
+	if(isAuthoritative())
+	{
+		if (state < 0 || state >= MentalStates::NumberOfMentalStates)
+		{
+			DEBUG_REPORT_LOG(true, ("mental state out of range (%d)\n", state));
+			return;
+		}
+
+		m_maxMentalStates.set(state, value);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setMaxMentalState, new MessageQueueGenericValueType<std::pair<MentalStates::Enumerator, MentalStates::Value> >(std::make_pair(state, value)));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::setMentalStateDecay(MentalStates::Enumerator state, float value)
+{
+	if(! isAuthoritative())
+	{
+		sendControllerMessageToAuthServer(CM_setMentalStateDecay, new MessageQueueGenericValueType<std::pair<MentalStates::Enumerator, float> >(std::make_pair(state, value)));
+	}
+	else
+	{
+		if (state < 0 || state >= MentalStates::NumberOfMentalStates)
+		{
+			DEBUG_REPORT_LOG(true, ("mental state out of range (%d)\n", state));
+			return;
+		}
+
+		m_mentalStateDecays.set(state, value);
+	}
+}
+
+//----------------------------------------------------------------------
+
+ServerObject *CreatureObject::getObjectInSlot(ConstCharCrcLowerString const &slotName)
+{
+	SlottedContainer * const s = ContainerInterface::getSlottedContainer(*this);
+	if (s)
+	{
+		SlotId const dp = SlotIdManager::findSlotId(slotName);
+		Container::ContainerErrorCode tmp = Container::CEC_Success;
+		return safe_cast<ServerObject *>(s->getObjectInSlot(dp, tmp).getObject());
+	}
+
+	return 0;
+}
+
+//----------------------------------------------------------------------
+
+const ServerObject *  CreatureObject::getObjectInSlot (const ConstCharCrcLowerString & slotName) const
+{
+	return const_cast<CreatureObject *>(this)->getObjectInSlot (slotName);
+}
+
+//-----------------------------------------------------------------------
+
+ServerObject * CreatureObject::getDatapad()
+{
+	return getObjectInSlot (SlotNames::datapad);
+}
+
+//----------------------------------------------------------------------
+
+const ServerObject * CreatureObject::getDatapad() const
+{
+	return const_cast<CreatureObject *>(this)->getDatapad ();
+}
+
+//----------------------------------------------------------------------
+
+ServerObject * CreatureObject::getBank       ()
+{
+	return getObjectInSlot (SlotNames::bank);
+}
+
+//----------------------------------------------------------------------
+
+const ServerObject *  CreatureObject::getBank       () const
+{
+	return const_cast<CreatureObject *>(this)->getBank ();
+}
+
+//-----------------------------------------------------------------------
+
+ServerObject * CreatureObject::getInventory()
+{
+	return getObjectInSlot (SlotNames::inventory);
+}
+
+//----------------------------------------------------------------------
+
+const ServerObject * CreatureObject::getInventory() const
+{
+	return const_cast<CreatureObject *>(this)->getInventory ();
+}
+
+//----------------------------------------------------------------------
+
+ServerObject * CreatureObject::getHair()
+{
+	return getObjectInSlot (SlotNames::hair);
+}
+
+//------------------------------------------------------------------------
+
+const ServerObject * CreatureObject::getHair() const
+{
+	return const_cast<CreatureObject *>(this)->getHair ();
+}
+
+//----------------------------------------------------------------------
+
+
+ServerObject * CreatureObject::getAppearanceInventory()
+{
+	return getObjectInSlot (SlotNames::appearance);
+}
+
+//----------------------------------------------------------------------
+
+const ServerObject * CreatureObject::getAppearanceInventory() const
+{
+	return const_cast<CreatureObject *>(this)->getAppearanceInventory ();
+}
+
+//----------------------------------------------------------------------
+
+
+ServerObject * CreatureObject::getHangar()
+{
+	return getObjectInSlot (SlotNames::hangar);
+}
+
+//----------------------------------------------------------------------
+
+const ServerObject * CreatureObject::getHangar() const
+{
+	return const_cast<CreatureObject *>(this)->getHangar();
+}
+
+
+//-----------------------------------------------------------------------
+
+bool CreatureObject::onContainerAboutToTransfer(ServerObject * destination, ServerObject* transferer)
+{
+	bool const baseResult = TangibleObject::onContainerAboutToTransfer(destination, transferer);
+	if (!baseResult)
+		return false;
+
+	const PlayerObject * const player = PlayerCreatureController::getPlayerObject(this);
+	// let's prevent CS from putting any more players in their inventories
+	if(player && destination)
+	{
+		const CreatureObject * creatureDestination = destination->asCreatureObject();
+		if(creatureDestination)
+		{
+			const PlayerObject * const playerDestination = PlayerCreatureController::getPlayerObject(creatureDestination);
+			if(playerDestination)
+			{
+				return false;
+			}
+		}
+	}
+	return onContainerAboutToTransferForMounts(destination, transferer);
+}
+
+
+/**
+ * Callback for when the creature is about to equip an item. Checks to make sure
+ * we don't equip two shields, and prevents equiping armor that would incapacitate
+ * us.
+ *
+ * @param item			the item being equipped
+ * @param transferer	who is causing the item to be equipped
+ *
+ * @return true to allow the transfer, false to prevent it
+ */
+int CreatureObject::onContainerAboutToGainItem(ServerObject& item, ServerObject* transferer)
+{
+	TangibleObject const * const object = item.asTangibleObject();
+	if (object != NULL)
+	{
+		// See if this item is equippable
+		const char *sharedTemplateName = item.getSharedTemplateName();
+		if (!isAppearanceEquippable(sharedTemplateName))
+		{
+			if (getClient() != NULL)
+			{
+				StringId message("shared", "item_not_equippable");
+				Unicode::String outOfBand;
+				Chat::sendSystemMessage(*this, message, outOfBand);
+				return Container::CEC_SilentError;
+			}
+			else
+				return Container::CEC_BlockedByDestinationContainer;
+		}
+	}
+
+
+	return TangibleObject::onContainerAboutToGainItem(item, transferer);
+}	// CreatureObject::onContainerAboutToGainItem
+
+//----------------------------------------------------------------------
+
+/**
+ * Callback for when the creature unequips an item.
+ *
+ * @param destination		where the item was transferred to
+ * @param item				the item that was unequipped
+ * @param transferer		who caused the transfer
+ */
+void CreatureObject::onContainerLostItem(ServerObject *destination, ServerObject &item, ServerObject *transferer)
+{
+	TangibleObject const * const tangibleObject = item.asTangibleObject();
+	if (tangibleObject == NULL)
+		return;
+
+	// check if the object applies skill mod bonuses when equipped
+	{
+	std::vector<std::pair<std::string, int> > skillModBonuses;
+	tangibleObject->getSkillModBonuses(skillModBonuses);
+	int const bonusCount = skillModBonuses.size();
+	if (bonusCount > 0)
+	{
+		std::vector<const char *> modNames(bonusCount);
+		std::vector<int> modValues(bonusCount);
+		for (int i = 0; i < bonusCount; ++i)
+		{
+			std::pair<std::string, int> const &bonus = skillModBonuses[i];
+			addModBonus(bonus.first, -bonus.second);
+			modNames[i] = bonus.first.c_str();
+			modValues[i] = -bonus.second;
+		}
+		ScriptParams params;
+		params.addParam(modNames);
+		params.addParam(modValues);
+		IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_SKILLMODS_CHANGED, params));
+	}
+	}
+
+	// check if the object applies attribute bonuses when equipped
+	{
+	std::vector<std::pair<int, int> > attribBonuses;
+	tangibleObject->getAttribBonuses(attribBonuses);
+	int const bonusCount = attribBonuses.size();
+	for (int i = 0; i < bonusCount; ++i)
+	{
+		std::pair<int, int> const &bonus = attribBonuses[i];
+		addAttribBonus(bonus.first, -bonus.second);
+	}
+	}
+
+
+
+	// if the item is a weapon, make our current weapon our default weapon
+	WeaponObject const * const weaponObject = tangibleObject->asWeaponObject();
+	if (weaponObject != NULL && getDefaultWeapon() != NULL)
+		setCurrentWeapon(*getDefaultWeapon());
+
+	// check if the object is our shield
+	if (tangibleObject == m_shield)
+		m_shield = NULL;
+
+	//Update wearbles data
+	SlottedContainmentProperty* scp = ContainerInterface::getSlottedContainmentProperty(item);
+	if (scp)
+	{
+		WearableEntry e("", scp->getCurrentArrangement(), item.getNetworkId(), 0);
+		int index = m_wearableData.find(e);
+		if (index >= 0)
+		{
+			m_wearableData.erase(index);
+		}
+	}
+
+	TangibleObject::onContainerLostItem(destination, item, transferer);
+}	// CreatureObject::onContainerLostItem
+
+//----------------------------------------------------------------------
+
+/**
+ * Callback for when the creature equips an item.
+ * shields, and weapons.
+ *
+ * @param item				the item that was equipped
+ * @param transferer		who caused the transfer
+ */
+void CreatureObject::onContainerGainItem(ServerObject& item, ServerObject* source, ServerObject* transferer)
+{
+	TangibleObject * const tangibleObject = item.asTangibleObject();
+	if (tangibleObject == NULL)
+		return;
+
+	// check if the object applies skill mod bonuses when equipped
+	{
+	std::vector<std::pair<std::string, int> > skillModBonuses;
+	tangibleObject->getSkillModBonuses(skillModBonuses);
+	int const bonusCount = skillModBonuses.size();
+	if (bonusCount > 0)
+	{
+		std::vector<const char *> modNames(bonusCount);
+		std::vector<int> modValues(bonusCount);
+		for (int i = 0; i < bonusCount; ++i)
+		{
+			std::pair<std::string, int> const &bonus = skillModBonuses[i];
+			addModBonus(bonus.first, bonus.second);
+			modNames[i] = bonus.first.c_str();
+			modValues[i] = bonus.second;
+		}
+		ScriptParams params;
+		params.addParam(modNames);
+		params.addParam(modValues);
+		IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_SKILLMODS_CHANGED, params));
+	}
+	}
+
+	// check if the object applies attribute bonuses when equipped
+	{
+	std::vector<std::pair<int, int> > attribBonuses;
+	tangibleObject->getAttribBonuses(attribBonuses);
+	int const bonusCount = attribBonuses.size();
+	for (int i = 0; i < bonusCount; ++i)
+	{
+		std::pair<int, int> const &bonus = attribBonuses[i];
+		addAttribBonus(bonus.first, bonus.second);
+	}
+	}
+
+	// if the item is a weapon, make it our current weapon
+	WeaponObject * const weaponObject = tangibleObject->asWeaponObject();
+	if (weaponObject != NULL)
+		setCurrentWeapon(*weaponObject);
+
+	//Update wearables data
+	SlottedContainmentProperty* scp = ContainerInterface::getSlottedContainmentProperty(item);
+	if (scp)
+	{
+		Object const * inventory = 0;
+		Object const * datapad = 0;
+		Object const * appearance = 0;
+
+		SlottedContainer const * const myContainer = ContainerInterface::getSlottedContainer(*this);
+
+		if (myContainer)
+		{
+			Container::ContainerErrorCode tmp = Container::CEC_Success;
+			static SlotId const inventorySlot = SlotIdManager::findSlotId(CreatureObjectNamespace::SlotNames::inventory);
+			if (inventorySlot != SlotId::invalid)
+			{
+				Container::ContainedItem itemId = myContainer->getObjectInSlot(inventorySlot, tmp);
+				inventory = itemId.getObject();
+			}
+			SlotId datapadSlot = SlotIdManager::findSlotId(CreatureObjectNamespace::SlotNames::datapad);
+			if (datapadSlot != SlotId::invalid)
+			{
+				Container::ContainedItem itemId = myContainer->getObjectInSlot(datapadSlot, tmp);
+				datapad = itemId.getObject();
+			}
+			SlotId appearanceInvSlot = SlotIdManager::findSlotId(CreatureObjectNamespace::SlotNames::appearance);
+			if (appearanceInvSlot != SlotId::invalid)
+			{
+				Container::ContainedItem itemId = myContainer->getObjectInSlot(appearanceInvSlot, tmp);
+				appearance = itemId.getObject();
+			}
+		}
+
+		if ( scp->isInAppearanceSlot() || tangibleObject == inventory || tangibleObject == datapad)
+		{
+			ConstCharCrcString clientSharedTemplateNameCrcString = ObjectTemplateList::lookUp(tangibleObject->getClientSharedTemplateName());
+			if (clientSharedTemplateNameCrcString.isEmpty())
+				WARNING(true, ("Could not find crc for %s.  Wearable will not be streamed to client", tangibleObject->getClientSharedTemplateName()));
+			else if (tangibleObject->asWeaponObject() != NULL)
+			{
+				addPackedWearable(tangibleObject->getAppearanceData(), scp->getCurrentArrangement(), tangibleObject->getNetworkId(), clientSharedTemplateNameCrcString.getCrc(),
+					tangibleObject->createSharedBaselinesMessage(), tangibleObject->createSharedNpBaselinesMessage());
+			}
+			else
+				addPackedWearable(tangibleObject->getAppearanceData(), scp->getCurrentArrangement(), tangibleObject->getNetworkId(), clientSharedTemplateNameCrcString.getCrc());
+		}
+	}
+
+	TangibleObject::onContainerGainItem(item, source, transferer);
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::onContainerTransferComplete(ServerObject *oldContainer, ServerObject *newContainer)
+{
+	TangibleObject::onContainerTransferComplete(oldContainer, newContainer);
+
+	setStatesDueToContainment();
+
+	if (!isInWorld())
+		setMovementStationary();
+
+	ShipObject const * const oldContainingShipObject = ShipObject::getContainingShipObject(oldContainer);
+	ShipObject const * const newContainingShipObject = ShipObject::getContainingShipObject(newContainer);
+
+	if (oldContainingShipObject != newContainingShipObject)
+	{
+		GroupObject * const groupObject = getGroup();
+
+		if (groupObject != 0)
+		{
+			if (oldContainingShipObject != 0)
+			{
+				if (oldContainingShipObject->getPortalProperty() != 0)
+				{
+					if (getNetworkId() == oldContainingShipObject->getOwnerId())
+					{
+						NetworkId const & shipId = oldContainingShipObject->getNetworkId();
+						groupObject->removePOBShip(shipId);
+					}
+				}
+			}
+
+			if (newContainingShipObject != 0)
+			{
+				if (newContainingShipObject->getPortalProperty() != 0)
+				{
+					groupObject->addPOBShipAndOwner(newContainingShipObject->getNetworkId(), newContainingShipObject->getOwnerId());
+				}
+			}
+
+			NetworkId const & shipId = (newContainingShipObject != 0) ? newContainingShipObject->getNetworkId() : NetworkId::cms_invalid;
+			groupObject->setShipForMember(getNetworkId(), shipId);
+		}
+	}
+
+	Client * const client = getClient();
+	if (client && ServerWorld::isSpaceScene())
+	{
+		ServerObject const * const oldTopmost = oldContainer ? safe_cast<ServerObject *>(ContainerInterface::getTopmostContainer(*oldContainer)) : this;
+		ServerObject * const newTopmost = newContainer ? safe_cast<ServerObject *>(ContainerInterface::getTopmostContainer(*newContainer)) : this;
+		if (oldTopmost != newTopmost)
+		{
+			SpaceVisibilityManager::removeClient(*client);
+			SpaceVisibilityManager::addClient(*client, *newTopmost);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+// this object got added to a trigger volume
+void CreatureObject::onAddedToTriggerVolume(TriggerVolume & triggerVolume)
+{
+	WARNING(!isInWorld(), ("CreatureObject (%s) not in world but being added to TriggerVolume (%s) owned by (%s)",
+		getDebugInformation().c_str(),
+		triggerVolume.getName().c_str(),
+		triggerVolume.getOwner().getDebugInformation().c_str()));
+
+	IGNORE_RETURN(m_triggerVolumeEntered.insert(&triggerVolume));
+}
+
+// ----------------------------------------------------------------------
+// this object got removed from a trigger volume
+void CreatureObject::onRemovedFromTriggerVolume(TriggerVolume & triggerVolume)
+{
+	// NOTE: be careful about referencing the TriggerVolume because this
+	// function can be called from the TriggerVolume's dtor
+	IGNORE_RETURN(m_triggerVolumeEntered.erase(&triggerVolume));
+}
+
+// ----------------------------------------------------------------------
+
+// ----------------------------------------------------------------------
+
+/**
+ * Computes the total attributes and max attributes for sending to clients,
+ */
+void CreatureObject::computeTotalAttributes ()
+{
+int i;
+
+	WARNING_STRICT_FATAL(!isAuthoritative(), ("computeTotalAttributes called on nonauthoritative object %s:%s", getObjectTemplateName(), getNetworkId().getValueString().c_str()));
+
+	if (!isAuthoritative())
+		return;
+
+	if (m_deferComputeTotalAttributes <= 0)
+	{
+		if (m_regenerationTime >= ConfigServerGame::getRegenThreshold())
+		{
+			// send updates to the client
+			m_regenerationTime -= ConfigServerGame::getRegenThreshold();
+			for (i = 0; i < 3; ++i)
+			{
+				int poolAttrib = Attributes::POOLS[i];
+				const float delta = static_cast<float>(floor(m_regeneration[
+					poolAttrib]));
+				if (delta >= 1.0f)
+				{
+					m_regeneration[poolAttrib] -= delta;
+					IGNORE_RETURN(alterAttribute(poolAttrib, static_cast<int>(
+						delta), true));
+				}
+			}
+		}
+
+		if (ConfigServerGame::getCheckAttribLimits())
+		{
+			// check and make sure our current attribs are <= our max attribs,
+			// for both unmodified and modified versions
+			for (i = 0; i < Attributes::NumberOfAttributes; ++i)
+			{
+				if (Attributes::isAttribPool(i))
+				{
+					if (getUnmodifiedAttribute(i) > getUnmodifiedMaxAttribute(i))
+					{
+						WARNING_STRICT_FATAL(true, ("Creature %s has attribute %d with "
+							"an unmodified current value > its max value! We will change "
+							"the current value! Current = %d, max = %d, "
+							"cur mods = %d, max mods = %d",
+							getNetworkId().getValueString().c_str(),
+							i,
+							static_cast<int>(getUnmodifiedAttribute(i)),
+							static_cast<int>(getUnmodifiedMaxAttribute(i)),
+							static_cast<int>(m_cachedCurrentAttributeModValues[i]),
+							static_cast<int>(m_cachedMaxAttributeModValues[i])));
+						m_attributes.set(i, getUnmodifiedMaxAttribute(i));
+					}
+					if (getAttribute(i) > getMaxAttribute(i))
+					{
+						WARNING_STRICT_FATAL(true, ("Creature %s has attribute %d with "
+							"a current value > its max value! Current = %d(%d), max = "
+							"%d(%d), cur mods = %d, max mods = %d",
+							getNetworkId().getValueString().c_str(),
+							i,
+							static_cast<int>(getAttribute(i)),
+							static_cast<int>(getUnmodifiedAttribute(i)),
+							static_cast<int>(getMaxAttribute(i)),
+							static_cast<int>(getUnmodifiedMaxAttribute(i)),
+							static_cast<int>(m_cachedCurrentAttributeModValues[i]),
+							static_cast<int>(m_cachedMaxAttributeModValues[i])));
+					}
+				}
+			}
+		}
+
+		for (i = 0; i < Attributes::NumberOfAttributes; ++i)
+		{
+			if (Attributes::isAttribPool(i))
+			{
+				m_totalAttributes.set(i, getAttribute(i) - static_cast<int>(floor(m_regeneration[i])));
+				m_totalMaxAttributes.set(i, getMaxAttribute(i));
+			}
+		}
+	}
+}	// CreatureObject::computeTotalAttributes
+
+//----------------------------------------------------------------------
+
+void CreatureObject::resetAttribute (Attributes::Enumerator attrib, Attributes::Value value)
+{
+	setMaxAttribute (attrib, value);
+	setAttribute    (attrib, value);
+	m_shockWounds   = 0;
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::initializeAttribute(Attributes::Enumerator attrib, Attributes::Value value)
+{
+	m_maxAttributes.set(attrib, value);
+	m_attributes.set   (attrib, value);
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Drains a creature's special abilities, based on it's drain attributes.
+ *
+ * @param action		amount to drain the creature's action SA
+ * @param mind			amount to drain the creature's mind SA
+ *
+ * @return true if the SA were drained, false if draining them would cause one
+ * to be < 0
+ */
+bool CreatureObject::drainAttributes(Attributes::Value action, Attributes::Value mind)
+{
+	int i;
+	int mods[3] = {0, action, mind};
+	int deltas[3];
+
+	// determine the amount to drain and make sure it won't incapaciate the creature
+	for (i = 0; i < 3; ++i)
+	{
+		if (mods[i] > 0)
+		{
+			deltas[i] = getAttribute(Attributes::POOLS[i]) - mods[i];
+			if (deltas[i] < 0)
+			return false;
+	}
+		else
+			deltas[i] = -1;
+	}
+
+	// drain the attributes
+	for (i = 0; i < 3; ++i)
+	{
+		if (deltas[i] >= 0)
+			alterAttribute(Attributes::POOLS[i], -mods[i], false);
+	}
+	return true;
+}	// CreatureObject::drainAttributes
+
+//----------------------------------------------------------------------
+
+/**
+ * Tests draining an attribute, but does not actually modify the attrib.
+ *
+ * @param attribute		the attribute to test
+ * @param value			the amount to drain the attribute by
+ *
+ * @return the amount the attribute would be drained by, or -1 on error
+ */
+int CreatureObject::testDrainAttribute(Attributes::Enumerator attribute,
+	Attributes::Value value) const
+{
+	// we can only drain action and mind
+	if (attribute != Attributes::Action && attribute != Attributes::Mind)
+		return -1;
+
+	if (getAttribute(attribute) - value <= 0)
+		return -1;
+
+	return static_cast<int>(value);
+}	// CreatureObject::testDrainAttribute
+
+//----------------------------------------------------------------------
+
+void CreatureObject::onClientReady(Client *c)
+{
+	TangibleObject::onClientReady(c);
+
+	// check cell permissions
+	Object * const attachedTo = getAttachedTo();
+	if (attachedTo)
+	{
+		ServerObject * const serverAttachedTo = attachedTo->asServerObject();
+		if (serverAttachedTo)
+		{
+			CellObject * const cellObject = serverAttachedTo->asCellObject();
+			if (cellObject && !cellObject->isAllowed(*this))
+			{
+				BuildingObject * const ownerBuilding = cellObject->getOwnerBuilding();
+				if (ownerBuilding)
+					ownerBuilding->expelObject(*this);
+			}
+		}
+	}
+
+	GroupObject *group = getGroup();
+	if (group)
+		group->onGroupMemberConnect(getNetworkId());
+
+	// update the client with the list of mods currently on the character
+
+	// but first, remove any mods from the list that has expired
+	uint32 const gameTimeSeconds = ServerClock::getInstance().getGameTimeSeconds();
+	std::vector<uint32> expiredMods;
+	std::vector<uint32>::const_iterator iterTimedMod = m_timedMod.begin();
+	std::vector<float>::const_iterator iterTimedModDuration = m_timedModDuration.begin();
+	std::vector<uint32>::const_iterator iterTimedModUpdateTime = m_timedModUpdateTime.begin();
+
+	for (; iterTimedMod != m_timedMod.end(); ++iterTimedMod, ++iterTimedModDuration, ++iterTimedModUpdateTime)
+	{
+		if (*iterTimedModDuration >= 0)
+		{
+			if ((*iterTimedModUpdateTime + static_cast<uint32>(*iterTimedModDuration)) < gameTimeSeconds)
+				expiredMods.push_back(*iterTimedMod);
+		}
+	}
+
+	int index;
+	for (iterTimedMod = expiredMods.begin(); iterTimedMod != expiredMods.end(); ++iterTimedMod)
+	{
+		index = m_timedMod.find(*iterTimedMod);
+
+		if (index >= 0)
+		{
+			m_timedMod.erase(index);
+			m_timedModDuration.erase(index);
+			m_timedModUpdateTime.erase(index);
+		}
+	}
+
+	// send the mods to the client
+	iterTimedMod = m_timedMod.begin();
+	iterTimedModDuration = m_timedModDuration.begin();
+	iterTimedModUpdateTime = m_timedModUpdateTime.begin();
+
+	for (; iterTimedMod != m_timedMod.end(); ++iterTimedMod, ++iterTimedModDuration, ++iterTimedModUpdateTime)
+	{
+		if (*iterTimedModDuration >= 0)
+			sendTimedModData(*iterTimedMod, *iterTimedModDuration - static_cast<float>(gameTimeSeconds - *iterTimedModUpdateTime), false);
+		else
+			sendTimedModData(*iterTimedMod, -1.0f, false);
+	}
+
+	// update the client with the list of cooldowns currently on the character
+
+	// visual only cooldown timers are stored in objvars
+	DynamicVariableList const & objvars = getObjVars();
+	std::map<int, std::pair<int, int> > visualCooldownTimers;
+	for (DynamicVariableList::MapType::const_iterator iterObjVar = objvars.begin(); iterObjVar != objvars.end(); ++iterObjVar)
+	{
+		if (iterObjVar->first.find("visualCooldown.beginTime.") == 0)
+		{
+			int cooldownGroupCrc = 0;
+			if (1 == sscanf(iterObjVar->first.c_str(), "visualCooldown.beginTime.%d", &cooldownGroupCrc))
+			{
+				int beginTime = 0;
+				if (iterObjVar->second.get(beginTime))
+				{
+					std::map<int, std::pair<int, int> >::iterator iterFind = visualCooldownTimers.find(cooldownGroupCrc);
+					if (iterFind == visualCooldownTimers.end())
+					{
+						visualCooldownTimers[cooldownGroupCrc] = std::make_pair(beginTime, 0);
+					}
+					else
+					{
+						iterFind->second.first = beginTime;
+					}
+				}
+			}
+		}
+		else if (iterObjVar->first.find("visualCooldown.endTime.") == 0)
+		{
+			int cooldownGroupCrc = 0;
+			if (1 == sscanf(iterObjVar->first.c_str(), "visualCooldown.endTime.%d", &cooldownGroupCrc))
+			{
+				int endTime = 0;
+				if (iterObjVar->second.get(endTime))
+				{
+					std::map<int, std::pair<int, int> >::iterator iterFind = visualCooldownTimers.find(cooldownGroupCrc);
+					if (iterFind == visualCooldownTimers.end())
+					{
+						visualCooldownTimers[cooldownGroupCrc] = std::make_pair(0, endTime);
+					}
+					else
+					{
+						iterFind->second.second = endTime;
+					}
+				}
+			}
+		}
+	}
+
+	char buffer[256];
+	int const currentGameTime = static_cast<int>(ServerClock::getInstance().getGameTimeSeconds());
+	for (std::map<int, std::pair<int, int> >::const_iterator iterCooldown = visualCooldownTimers.begin(); iterCooldown != visualCooldownTimers.end(); ++iterCooldown)
+	{
+		// send any unexpired cooldowns to the client
+		if ((iterCooldown->second.first > 0) && (iterCooldown->second.second > 0) && (iterCooldown->second.first <= currentGameTime) && (currentGameTime < iterCooldown->second.second))
+		{
+			CreatureController *controller = getCreatureController();
+			if (controller)
+			{
+				MessageQueueCommandTimer *msg = new MessageQueueCommandTimer(
+					0,
+					iterCooldown->first,
+					-1,
+					0);
+				msg->setCurrentTime(MessageQueueCommandTimer::F_cooldown, static_cast<float>(currentGameTime - iterCooldown->second.first));
+				msg->setMaxTime    (MessageQueueCommandTimer::F_cooldown, static_cast<float>(iterCooldown->second.second - iterCooldown->second.first));
+
+				controller->appendMessage(
+					static_cast< int >( CM_commandTimer ),
+					0.0f,
+					msg,
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_CLIENT);
+			}
+		}
+		else
+		{
+			// cleanup the objvars for any expired/invalid cooldowns
+			snprintf(buffer, sizeof(buffer)-1, "visualCooldown.beginTime.%d", iterCooldown->first);
+			buffer[sizeof(buffer)-1] = '\0';
+			removeObjVarItem(buffer);
+
+			snprintf(buffer, sizeof(buffer)-1, "visualCooldown.endTime.%d", iterCooldown->first);
+			buffer[sizeof(buffer)-1] = '\0';
+			removeObjVarItem(buffer);
+		}
+	}
+
+	// command cooldown timers are stored in the command queue
+	CommandQueue const * commandQueue = getCommandQueue();
+	if (commandQueue && getClient())
+	{
+		double const currentTime = Clock::getCurrentTime();
+		uint32 currentCooldownTimeSecond = 0;
+		uint32 maxCooldownTimeSecond = 0;
+		std::map<uint32, std::pair<double, double> > const & cooldowns = commandQueue->getCooldowns().getMap();
+		for (std::map<uint32, std::pair<double, double> >::const_iterator cooldownsIter = cooldowns.begin(); cooldownsIter != cooldowns.end(); ++cooldownsIter)
+		{
+			if ((cooldownsIter->second.first <= currentTime) && (currentTime < cooldownsIter->second.second))
+			{
+				// don't bother sending cooldown with less than 1 second left because
+				// by the time it gets to the client, it will probably have already expired
+				currentCooldownTimeSecond = static_cast<uint32>(currentTime - cooldownsIter->second.first);
+				maxCooldownTimeSecond = static_cast<uint32>(cooldownsIter->second.second - cooldownsIter->second.first);
+
+				if (currentCooldownTimeSecond < maxCooldownTimeSecond)
+				{
+					GenericValueTypeMessage<std::pair<uint32, std::pair<uint32, uint32> > > commandCooldown("SetCommandCooldown", std::make_pair(cooldownsIter->first, std::make_pair(currentCooldownTimeSecond, maxCooldownTimeSecond)));
+					getClient()->send(commandCooldown, true);
+				}
+			}
+		}
+	}
+
+	// sync chat character count with chat server
+	PlayerObject * const player = PlayerCreatureController::getPlayerObject(this);
+	if (player && (player->getChatSpamTimeEndInterval() > 0))
+	{
+		time_t timeUnsquelch = static_cast<time_t>(player->getSecondsUntilUnsquelched());
+		if (timeUnsquelch > 0)
+			timeUnsquelch += ::time(NULL);
+
+		GenericValueTypeMessage<std::pair<std::pair<std::pair<NetworkId, int>, int>, std::pair<int, int> > > chatStatistics("ChatStatisticsGS", std::make_pair(std::make_pair(std::make_pair(getNetworkId(), static_cast<int>(timeUnsquelch)), player->getChatSpamTimeEndInterval()), std::make_pair(player->getChatSpamSpatialNumCharacters(), player->getChatSpamNonSpatialNumCharacters())));
+		Chat::sendToChatServer(chatStatistics);
+	}
+
+	// if necessary, announce TCG monthly bonus booster pack and Swg Tcg Beta
+	if (getClient() && !getClient()->isUsingAdminLogin())
+	{
+		VeteranRewardManager::announceMonthlyBonusBoosterPack(*this);
+
+		if (ConfigServerGame::getAccountFeatureIdForTcgBetaAnnouncement() > 0)
+			VeteranRewardManager::announceSwgTcgBeta(*this);
+	}
+	// Make sure our player has the server's speed maximum
+	PlayerCreatureController const * playerController = safe_cast<PlayerCreatureController const *>(getCreatureController());
+	if(playerController)
+	{
+		GenericValueTypeMessage<float> const msg("fca11a62d23041008a4f0df36aa7dca6", playerController->getServerSpeedForPlayer());
+		Client const * const client = getClient();
+		if (client)
+			return client->send(msg, true);
+	}
+
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::onClientAboutToLoad()
+{
+	if (isAuthoritative())
+		setInvulnerabilityTimer(ConfigServerGame::getCreatureLoadInvulnerableTimeWithoutClient());
+
+	TangibleObject::onClientAboutToLoad();
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::onLoadingScreenComplete()
+{
+	TangibleObject::onLoadingScreenComplete();
+
+	if (isAuthoritative() && isInvulnerable())
+		setInvulnerabilityTimer(ConfigServerGame::getCreatureLoadInvulnerableTimeWithClient());
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::monitorCreatureMovement(const CachedNetworkId &ofTarget, float i_skittishness, float i_curve)
+{
+	Object * object = ofTarget.getObject();
+	if (!object || object == this)
+		return false;
+
+	Archive::AutoDeltaMap<NetworkId, MonitoredCreatureMovement>::const_iterator i = m_monitoredCreatureMovements.find(ofTarget);
+	MonitoredCreatureMovement newMovement;
+	if (i == m_monitoredCreatureMovements.end())
+	{
+		newMovement.m_lastDistance = object->getPosition_w().magnitudeBetween(getPosition_w());
+		newMovement.m_skittishness = i_skittishness;
+		newMovement.m_curve = i_curve;
+	}
+	else
+	{
+		newMovement = i->second;
+		newMovement.m_skittishness = i_skittishness;
+		newMovement.m_curve = i_curve;
+
+	}
+	if (newMovement != i->second)
+	{
+		m_monitoredCreatureMovements.set(ofTarget, newMovement);
+	}
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool CreatureObject::ignoreCreatureMovement(const CachedNetworkId &ofTarget)
+{
+	Archive::AutoDeltaMap<NetworkId, MonitoredCreatureMovement>::const_iterator i = m_monitoredCreatureMovements.find(ofTarget);
+	if (i == m_monitoredCreatureMovements.end())
+		return false;
+	m_monitoredCreatureMovements.erase(ofTarget);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::reportMonitoredCreatures(float time)
+{
+	Vector ownerPosition = getPosition_w();
+	std::vector<NetworkId> toRemove;
+	Archive::AutoDeltaMap<NetworkId, MonitoredCreatureMovement>::const_iterator i;
+	for (i=m_monitoredCreatureMovements.begin(); i!=m_monitoredCreatureMovements.end(); ++i)
+	{
+		CachedNetworkId cnid(i->first);
+		Object * o = cnid.getObject();
+		if (o)
+		{
+			MonitoredCreatureMovement newMovement = i->second;
+
+			float lastDistance = newMovement.m_lastDistance;
+			float currentDistance = o->getPosition_w().magnitudeBetween(ownerPosition);
+			float approach = lastDistance - currentDistance;
+			//float tangentVelocity = sqrt(((mobDelta - targetDelta)/i_time).magnitudeSquared() - approachVelocity * approachVelocity);
+
+			// calculate the fear delta
+			if (approach > 0)
+			{
+				float approachVelocity = approach / time;
+				float totalDistance = getApproachTriggerRange();
+				float percent = 1 - ((lastDistance + currentDistance) * 0.5f) / totalDistance;
+				if (percent > 1)
+					percent = 1;
+				else if (percent < 0)
+					percent = 0;
+				if (i->second.m_curve < 0)
+				{
+					percent = -percent;
+				}
+				float absCurve = abs(i->second.m_curve);
+				float scale = pow(percent, absCurve) * (1+absCurve);
+				float speedScale = float(sqrt(approachVelocity / getRunSpeed()));
+				float fearDelta = approach * i->second.m_skittishness * speedScale * scale;
+				setMentalStateToward(i->first, MentalStates::Fear, getMentalStateToward(i->first, MentalStates::Fear)+fearDelta);
+			}
+			newMovement.m_lastDistance = currentDistance;
+			m_monitoredCreatureMovements.set(i->first, newMovement);
+		}
+		else
+		{
+			toRemove.push_back(i->first);
+		}
+	}
+	std::vector<NetworkId>::iterator removeIt;
+	for (removeIt = toRemove.begin(); removeIt != toRemove.end(); ++removeIt)
+	{
+		m_monitoredCreatureMovements.erase(*removeIt);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::doWarmupChecks(Command const &command, NetworkId const &targetId, Unicode::String const &params, Command::ErrorCode &status, int &statusDetail)
+{
+	if (doesLocomotionInvalidateCommand(command))
+	{
+		if (ConfigServerGame::getLogAllCommands())
+		{
+			LOG(
+				"Command",
+				("%s>%s %s ignored due to locomotion %d",
+					getNetworkId().getValueString().c_str(),
+					targetId.getValueString().c_str(),
+					command.m_commandName.c_str(),
+					getLocomotion()));
+		}
+		status = Command::CEC_Locomotion;
+		statusDetail = static_cast<int>(getLocomotion());
+	}
+	else if (isPlayerControlled() && command.m_characterAbility.size() && !hasCommand(command.m_characterAbility))
+	{
+		if (ConfigServerGame::getLogAllCommands())
+		{
+			LOG(
+				"Command",
+				("%s>%s %s ignored due to ability %s",
+					getNetworkId().getValueString().c_str(),
+					targetId.getValueString().c_str(),
+					command.m_commandName.c_str(),
+					command.m_characterAbility.c_str()));
+		}
+		status = Command::CEC_Ability;
+	}
+	// target verification - don't execute the command if a target is
+	// required and none is present, or if there is never a target and
+	// one is specified
+	else if (   (command.m_targetType == Command::CTT_None && targetId != NetworkId::cms_invalid)
+			     || (command.m_targetType == Command::CTT_Required && targetId == NetworkId::cms_invalid))
+	{
+		if (ConfigServerGame::getLogAllCommands())
+		{
+			LOG(
+				"Command",
+				("%s>%s %s ignored due to target type",
+					getNetworkId().getValueString().c_str(),
+					targetId.getValueString().c_str(),
+					command.m_commandName.c_str()));
+		}
+		status = Command::CEC_TargetType;
+	}
+	else
+	{
+		// target range checking
+		if (command.m_targetType != Command::CTT_None && targetId != NetworkId::cms_invalid && command.m_maxRangeToTargetSquared != 0.0f)
+		{
+			Object *targetObj = NetworkIdManager::getObjectById(targetId);
+			if (!targetObj)
+			{
+				if (ConfigServerGame::getLogAllCommands())
+				{
+					LOG(
+						"Command",
+						("%s>%s %s ignored due to range to target",
+							getNetworkId().getValueString().c_str(),
+							targetId.getValueString().c_str(),
+							command.m_commandName.c_str()));
+				}
+				status = Command::CEC_TargetRange;
+			}
+			else
+			{
+				TangibleObject const * const tangible = dynamic_cast<TangibleObject *>(targetObj);
+				if(tangible)
+				{
+					float distance = this->getDistanceBetweenCollisionSpheres_w(*tangible);
+					distance = sqr(distance);
+
+					if(distance > command.m_maxRangeToTargetSquared)
+					{
+						if (ConfigServerGame::getLogAllCommands())
+						{
+							LOG(
+								"Command",
+								("%s>%s %s ignored due to range to target",
+								getNetworkId().getValueString().c_str(),
+								targetId.getValueString().c_str(),
+								command.m_commandName.c_str()));
+						}
+						status = Command::CEC_TargetRange;
+					}
+				}
+				else
+				{
+					if(findPosition_w().magnitudeBetweenSquared(targetObj->findPosition_w()) > command.m_maxRangeToTargetSquared)
+					{
+						if (ConfigServerGame::getLogAllCommands())
+						{
+							LOG(
+								"Command",
+								("%s>%s %s ignored due to range to target",
+								getNetworkId().getValueString().c_str(),
+								targetId.getValueString().c_str(),
+								command.m_commandName.c_str()));
+						}
+					
+						status = Command::CEC_TargetRange;
+					}
+				
+				}
+				
+			}
+			
+		}
+		if (status == Command::CEC_Success)
+		{
+			// make sure that the command is allowed in all states set on the creature currently
+			for (States::Enumerator i = 0; i < States::NumberOfStates; ++i)
+			{
+				// @todo: don't gate npc command usage on swimming
+				if (!isPlayerControlled() && i == States::Swimming)
+					continue;
+
+				if (getState(i) && !command.m_statePermissions[i])
+				{
+					if (ConfigServerGame::getLogAllCommands())
+					{
+						LOG(
+							"Command",
+							("%s>%s %s ignored due to state %d",
+								getNetworkId().getValueString().c_str(),
+								targetId.getValueString().c_str(),
+								command.m_commandName.c_str(),
+								i));
+					}
+					status = Command::CEC_StateMustNotHave;
+					statusDetail = i;
+					break;
+				}
+
+				if (!getState(i) && command.m_stateRequired[i])
+				{
+					if (ConfigServerGame::getLogAllCommands())
+					{
+						LOG(
+							"Command",
+							("%s>%s %s ignored due to missing required state %d",
+							getNetworkId().getValueString().c_str(),
+							targetId.getValueString().c_str(),
+							command.m_commandName.c_str(),
+							i));
+					}
+					status = Command::CEC_StateMustHave;
+					statusDetail = i;
+					break;
+				}
+			}
+		}
+	}
+
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::isDisabled() const
+{
+	if (GameObjectTypes::isTypeOf (getGameObjectType (), SharedObjectTemplate::GOT_vehicle))
+		return TangibleObject::isDisabled ();
+
+	return (isIncapacitated() || isDead());
+}
+
+// -------------------------------------------------------------------
+
+bool CreatureObject::makeDead(const NetworkId & killer, const NetworkId & corpse)
+{
+	if (isAuthoritative())
+	{
+		if (isDead())
+		{
+			clearHateList();
+			return true;
+		}
+
+		ScriptParams params;
+		params.addParam(killer);
+		params.addParam(corpse);
+		if (getScriptObject()->trigAllScripts(Scripting::TRIG_DEATH, params) != SCRIPT_CONTINUE)
+			return false;
+
+		clearHateList();
+
+		// if we are crafting, end the crafting session
+		PlayerObject * const player = PlayerCreatureController::getPlayerObject(this);
+		if (player != NULL && player->isCrafting())
+			player->stopCrafting(false);
+
+		// if we are in a conversation, end it
+		if (isInNpcConversation())
+			endNpcConversation();
+
+		// remove all attrib and skill mod mods
+		typedef Archive::AutoDeltaMap<uint32, CreatureMod>::const_iterator ModIter;
+		for (ModIter i = m_attributeModList.begin(); i != m_attributeModList.end();)
+		{
+			const CreatureMod & m = (*i).second;
+
+			bool remove = true;
+			//check to see if this attribute mod comes from a buff that should not be removed on death
+			const char * rawModName = AttribModNameManager::getInstance().getAttribModName(m.mod.tag);
+			if(rawModName)
+			{
+				std::string tmpModName(rawModName);
+
+				//strip the attribute number from the mod name to get the raw buff name
+				//this is a little fragile because we are looking up the name of the
+				//buff, trusting that the mod name will be based on it
+				//in BuffManager.cpp, attributes that are assigned by a buff have the
+				//mod name as ("%s_%d", buffname, effectNum) so we will check to see if
+				//the name matches that format and if the resulting buff name is flagged
+				//to not be removed on death.
+				int namelength = tmpModName.size();
+				if(namelength > 2 && tmpModName[namelength-2] == '_' && tmpModName[namelength-1] >= '0' && tmpModName[namelength-1] <= '9')
+				{
+					std::string buffname = tmpModName.substr(0,namelength-2);
+					uint32 buffNameCrc = Crc::normalizeAndCalculate(buffname.c_str());
+					remove = BuffManager::getIsBuffRemovedOnDeath(buffNameCrc);
+					
+					// Check to see if this is a Pvp related death and we should ignore the removal.
+					if(remove && BuffManager::getDoesBuffDecayOnPvPDeath(buffNameCrc)) // We only care about buffs that would normally be removed on death and have the decay flag.
+					{
+						Object * killerObj = NetworkIdManager::getObjectById(killer);
+						if(killerObj && killerObj->asServerObject() && killerObj->asServerObject()->asCreatureObject())
+						{
+							CreatureObject * killerCreature = killerObj->asServerObject()->asCreatureObject();
+							PlayerObject * const playerKiller = PlayerCreatureController::getPlayerObject(killerCreature);
+							if(playerKiller)
+								remove =  false; // Buffs that decay on PvP death don't get removed on PvP death.
+							else if(killerCreature->getMasterId() != NetworkId::cms_invalid) // Check to see if this is some type of pet.
+							{
+								Object * masterObj = NetworkIdManager::getObjectById(killerCreature->getMasterId());
+								if(masterObj && masterObj->asServerObject() && masterObj->asServerObject()->asCreatureObject())
+								{
+									CreatureObject * masterCreature = masterObj->asServerObject()->asCreatureObject();
+									PlayerObject * const masterPlayer = PlayerCreatureController::getPlayerObject(masterCreature); // Pet has a valid player as a master. Pvp related.
+									if(masterPlayer)
+										remove = false;
+								}
+							}
+						}
+					}// End PvP check
+				}
+			}
+
+			if(remove)
+			{
+				if (AttribMod::isSkillMod(m.mod))
+				{
+					const char * skillModName = AttribModNameManager::getInstance().getAttribModName(m.mod.skill);
+					if (skillModName != NULL)
+						addModValue(skillModName, -m.maxVal, true);
+				}
+				// if the mod is visible, we need to tell the player it's being
+				// removed
+				if (m.mod.flags & AttribMod::AMF_visible)
+				{
+					sendCancelTimedMod(m.mod.tag);
+				}
+				// if the mod is flagged as having a callback, call the script
+				if (m.mod.flags & AttribMod::AMF_triggerOnDone)
+				{
+					const char * modName = AttribModNameManager::getInstance().getAttribModName(m.mod.tag);
+					if (modName != NULL)
+					{
+						ScriptParams params;
+						params.addParam(modName);
+						params.addParam(true);
+						if (AttribMod::isAttribMod(m.mod))
+						{
+							IGNORE_RETURN(getScriptObject()->trigAllScripts(
+								Scripting::TRIG_ATTRIB_MOD_DONE, params));
+						}
+						else if (AttribMod::isSkillMod(m.mod))
+						{
+							IGNORE_RETURN(getScriptObject()->trigAllScripts(
+								Scripting::TRIG_SKILL_MOD_DONE, params));
+						}
+
+					}
+				}
+
+				i = m_attributeModList.erase(i);
+			}
+			else
+			{
+				++i;
+			}
+		}
+		for (int j = 0; j < Attributes::NumberOfAttributes; ++j)
+		{
+			m_cachedCurrentAttributeModValues.set(j, 0);
+			m_cachedMaxAttributeModValues.set(j, 0);
+		}
+		computeTotalAttributes();
+
+		LOG("CustomerService", ("Attribs: removed all attrib and skillmod mods "
+			"from %s due to death.",
+			PlayerObject::getAccountDescription(this).c_str()));
+
+		if (!isPlayerControlled())
+			setDefaultAlterTime(AlterResult::cms_keepNoAlter);
+
+		//-- If we're in combat, the client will take care of arranging for
+		//   a suitable transition to the dead posture; otherwise, make it
+		//   happen immediately.
+		setPosture(Postures::Dead, !isInCombat());
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_makeDead, new MessageQueueGenericValueType<
+			std::pair<NetworkId, NetworkId> >(std::make_pair(killer, corpse)));
+	}
+	return true;
+}
+
+//--------------------------------------------------------------------
+
+bool CreatureObject::makeNotDead()
+{
+	if (!isDead())
+		return true;
+
+	if (!isPlayerControlled())
+		setDefaultAlterTime(AlterResult::cms_alterQuickly);
+
+	setPosture(Postures::Prone, true);
+	testIncapacitation(NetworkId::cms_invalid);
+	return true;
+}
+
+//--------------------------------------------------------------------
+
+Locomotions::Enumerator CreatureObject::calcLocomotion() const
+{
+	Locomotions::Enumerator ret = Locomotions::Invalid;
+	if (m_stopWalkRun.get() > 1)
+		ret = m_fastLocomotion;
+	if (ret == Locomotions::Invalid && m_stopWalkRun.get() > 0)
+		ret = m_slowLocomotion;
+	if (ret == Locomotions::Invalid)
+		ret = m_stationaryLocomotion;
+	return ret;
+}
+
+//--------------------------------------------------------------------
+
+bool CreatureObject::canMove() const
+{
+	return getMovementTable()->hasMovingLocomotion(m_posture.get(), m_states.get()) && !getObjVars().hasItem("forceNoMovement");
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::setScaleFactor(float scale)
+{
+	if(isAuthoritative())
+	{
+		scale = std::max (0.0f, scale);
+		m_scaleFactor = scale;
+		setScale (Vector::xyz111 * scale);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setScaleFactor, new MessageQueueGenericValueType<float>(scale));
+	}
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Gets the approximate height of the creature, modified by it's posture.
+ *
+ * @return the creature's height
+ */
+float CreatureObject::getHeight() const
+{
+	float height = TangibleObject::getHeight();
+	height *= getMovementTable()->getCanSeeHeightMod(m_posture.get(), m_states.get());
+
+	return height;
+}	// CreatureObject::getHeight
+
+//----------------------------------------------------------------------
+
+/**
+ * Gets the approximate radius of the object.
+ *
+ * @return the object's radius
+ */
+float CreatureObject::getRadius() const
+{
+	const SharedCreatureObjectTemplate * myTemplate = safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate());
+	return myTemplate->getCollisionRadius() * std::max(getScale().x, getScale().z);
+}	// CreatureObject::getHeight
+
+//----------------------------------------------------------------------
+
+Object const * CreatureObject::getStandingOn() const
+{
+	CollisionProperty const * collision = getCollisionProperty();
+
+	if(collision)
+	{
+		return collision->getStandingOn();
+	}
+	else
+	{
+		return NULL;
+	}
+}
+
+//----------------------------------------------------------------------
+
+float CreatureObject::getFarNetworkUpdateRadius() const
+{
+	if (ServerWorld::getSceneId() == NewbieTutorial::getSceneId())
+		return 0.f;
+
+	float height = TangibleObject::getHeight();
+	float radius;
+
+	if (height < ConfigServerGame::getMaxSmallCreatureHeight())
+		radius = ConfigServerGame::getSmallCreatureUpdateRadius();
+	else if (height < ConfigServerGame::getMaxMediumCreatureHeight())
+		radius = ConfigServerGame::getMediumCreatureUpdateRadius();
+	else
+		radius = ConfigServerGame::getLargeCreatureUpdateRadius();
+
+	return radius;
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::setShockWounds(int wound)
+{
+static const StringId SHOCK_WOUND_ID("cbt_spam", "shock_wound");
+
+	if(isAuthoritative())
+	{
+		// Use TangibleObject::isInvulnerable so we don't account for the invulnerability timer
+		if (TangibleObject::isInvulnerable())
+			return;
+
+		if (wound < 0)
+			wound = 0;
+		else if (wound > 1000)
+			wound = 1000;
+		if (wound != m_shockWounds.get())
+		{
+			if (isInCombat())
+			{
+				ProsePackage pp;
+				pp.stringId = SHOCK_WOUND_ID;
+				pp.digitInteger = wound - m_shockWounds.get();
+				Unicode::String oob;
+				OutOfBandPackager::pack(pp, 0, oob);
+				MessageQueueCombatSpam spam(oob, false, false, false, 1);
+				performCombatSpam (spam, true, false, false);
+			}
+			m_shockWounds = wound;
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setShockWounds, new MessageQueueGenericValueType<int>(wound));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::setLookAtTarget(const NetworkId& id)
+{
+	if(isAuthoritative())
+	{
+		m_lookAtTarget.set(id);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setLookAtTarget, new MessageQueueGenericValueType<NetworkId>(id));
+	}
+
+	ShipObject * const ship = getPilotedShip();
+	if(ship)
+	{
+		ship->setLookAtTargetFromPilot(id);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::setIntendedTarget(const NetworkId& id)
+{
+	if(isAuthoritative())
+	{
+		DEBUG_WARNING(true, ("CreatureObject::setIntendedTarget: '%s'", id.getValueString().c_str()));
+		m_intendedTarget.set(id);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setIntendedTarget, new MessageQueueGenericValueType<NetworkId>(id));
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::setMovementStationary()
+{
+	if (isAuthoritative())
+		m_stopWalkRun = 0;
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::setMovementWalk()
+{
+	if (isAuthoritative())
+		m_stopWalkRun = 1;
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::setMovementRun()
+{
+	if (isAuthoritative())
+		m_stopWalkRun = 2;
+}
+
+//--------------------------------------------------------------------
+
+bool CreatureObject::setSlopeModAngle(float angle)
+{
+	if(isAuthoritative())
+	{
+		m_slopeModAngle = angle;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setSlopeModAngle, new MessageQueueGenericValueType<float>(angle));
+	}
+	return true;
+}
+
+//--------------------------------------------------------------------
+
+bool CreatureObject::setSlopeModPercent(float percent)
+{
+	if(isAuthoritative())
+	{
+		if (percent < 0.0f)
+			percent = 0.0f;
+		else if (percent > 1.0f)
+			percent = 1.0f;
+		m_baseSlopeModPercent = percent;
+
+		//
+		// modify the percent reduced due to skill mods
+		//
+
+		// get my skill mod
+		int movementMod = getEnhancedModValue(SLOPE_MOD);
+		if (getGroup() != NULL)
+		{
+			// get my group leader skill mod
+			const NetworkId & leaderId = getGroup()->getGroupLeaderId();
+			if (leaderId != NetworkId::cms_invalid)
+			{
+				const CreatureObject * leader = safe_cast<const CreatureObject *>(
+					NetworkIdManager::getObjectById(leaderId));
+				if (leader != NULL)
+				{
+					movementMod += leader->getEnhancedModValue(GROUP_SLOPE_MOD);
+				}
+			}
+		}
+		if (movementMod > 100)
+			movementMod = 100;
+
+		switch (getPosture())
+		{
+			case Postures::Upright:
+				if (movementMod > 50)
+					movementMod = 50;
+				if (movementMod > 0 && percent < 1.0f)
+				{
+					percent += (1.0f - percent) * ((float)movementMod / 50.0f);
+				}
+				break;
+			case Postures::Prone:
+			case Postures::Sneaking:
+//				movementMod -= 50;
+//				if (movementMod > 0 && percent < 1.0f)
+//				{
+//					percent += (1.0f - percent) * ((float)movementMod / 50.0f);
+//				}
+//				break;
+			case Postures::Crouched:
+			case Postures::Blocking:
+			case Postures::Climbing:
+			case Postures::Flying:
+			case Postures::LyingDown:
+			case Postures::Sitting:
+			case Postures::SkillAnimating:
+			case Postures::DrivingVehicle:
+			case Postures::RidingCreature:
+			case Postures::KnockedDown:
+			case Postures::Incapacitated:
+			case Postures::Dead:
+			default:
+				break;
+		}
+
+		m_slopeModPercent = percent;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setSlopeModPercent, new MessageQueueGenericValueType<float>(percent));
+	}
+	return true;
+}
+
+//--------------------------------------------------------------------
+
+bool CreatureObject::setWaterModPercent(float percent)
+{
+	if(isAuthoritative())
+	{
+		m_waterModPercent = percent;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setWaterModPercent, new MessageQueueGenericValueType<float>(percent));
+	}
+	return true;
+}
+
+//--------------------------------------------------------------------
+
+bool CreatureObject::setMovementScale(float scale)
+{
+	if(isAuthoritative())
+	{
+		m_movementScale = scale;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setMovementScale, new MessageQueueGenericValueType<float>(scale));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::setMovementPercent(float percent)
+{
+	if(isAuthoritative())
+	{
+		m_movementPercent = percent;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setMovementPercent, new MessageQueueGenericValueType<float>(percent));
+	}
+	return true;
+}
+
+//--------------------------------------------------------------------
+
+bool CreatureObject::setTurnPercent(float percent)
+{
+	if(isAuthoritative())
+	{
+		m_turnScale = percent;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setTurnPercent, new MessageQueueGenericValueType<float>(percent));
+	}
+	return true;
+}
+
+//--------------------------------------------------------------------
+
+bool CreatureObject::setAccelScale(float scale)
+{
+	if(isAuthoritative())
+	{
+		m_accelScale = scale;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setAccelScale, new MessageQueueGenericValueType<float>(scale));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::setAccelPercent(float percent)
+{
+	if(isAuthoritative())
+	{
+		m_accelPercent = percent;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setAccelPercent, new MessageQueueGenericValueType<float>(percent));
+	}
+	return true;
+}
+
+//--------------------------------------------------------------------
+/**
+ * Instruct the clients to display the visuals for having this creature
+ * sit on the specified chair-like target object in the specified position.
+ *
+ * For chairs, where there is only a single spot to sit in, the positionIndex
+ * should be zero.  For couches where, theoretically, we could have multiple
+ * creatures sit, the value should represent the space in which the player
+ * is sitting.
+ *
+ * @param targetObjectId  the network id for the object on which the creature
+ *                        will sit.
+ * @param positionIndex   the 0-based index of the position of the chair-like object
+ *                        in which the creature will sit.  Typically this will be zero.
+ */
+void CreatureObject::sitOnObject(NetworkId const &chairCellId, Vector const &chairPosition_p)
+{
+	if (isAuthoritative())
+	{
+		// you can't sit on something in a different cell than you
+		if (ContainerInterface::getContainedByProperty(*this)->getContainedByNetworkId() != chairCellId)
+			return;
+
+		//-- If the chair is more than the allowed distance away from the authoritative position for the creature, log the attempt and ignore.
+		Vector const creaturePosition_p = getPosition_p();
+		float  const separationSquared  = creaturePosition_p.magnitudeBetweenSquared(chairPosition_p);
+
+		if (separationSquared > MessageQueueSitOnObject::cs_maximumChairRangeSquared)
+		{
+			LOG("move_validation", ("CreatureObject::sitOnObject: object id=[%s] out of range for specified chair position, separation=[%.2f] meters.", getNetworkId().getValueString().c_str(), separationSquared));
+			return;
+		}
+
+		//-- Get the controller.
+		Controller * const controller = getController();
+		NetworkController * const networkController = safe_cast<NetworkController *>(controller);
+		ServerController * const serverController = safe_cast<ServerController *>(networkController);
+		NOT_NULL(serverController);
+
+		// teleport the player to the chairs location
+		// orientation doesn't matter in this case
+		Transform transform;
+		transform.setPosition_p(chairPosition_p);
+		serverController->teleport(transform, ContainerInterface::getContainingCellObject(*this));
+
+		//-- Send the SitOnObject controller message to all clients.
+		serverController->appendMessage(CM_sitOnObject, 0.0f, new MessageQueueSitOnObject(chairCellId, chairPosition_p), GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_ALL_CLIENT);
+
+		//-- Set the server posture to sitting & set SittingInChair state.
+		setPosture(Postures::Sitting);
+		setState(States::SittingOnChair, true);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_sitOnObject, new MessageQueueSitOnObject(chairCellId, chairPosition_p));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::onBiographyRetrieved(const NetworkId &owner, const Unicode::String &bio)
+{
+	//TODO:  Biography handling code
+	//DEBUG_REPORT_LOG(true,("Biography for object %s received:  %s\n",owner.getValueString().c_str(), Unicode::wideToNarrow(bio).c_str()));
+
+	CreatureController *creatureController = getCreatureController();
+
+	if (creatureController != NULL)
+	{
+		typedef std::pair<NetworkId, Unicode::String> Payload;
+
+		MessageQueueGenericValueType<Payload> * const msg = new MessageQueueGenericValueType<Payload>(Payload(owner, bio));
+
+		creatureController->appendMessage(static_cast<int>(CM_biographyRetrieved), 0.0f, msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::onCharacterMatchRetrieved(MatchMakingCharacterResult const &results)
+{
+	CreatureController *creatureController = getCreatureController();
+
+	if (creatureController != NULL)
+	{
+		typedef std::pair<NetworkId, Unicode::String> Payload;
+
+		MessageQueueGenericValueType<MatchMakingCharacterResult> * const msg = new MessageQueueGenericValueType<MatchMakingCharacterResult>(results);
+
+		creatureController->appendMessage(static_cast<int>(CM_characterMatchRetrieved), 0.0f, msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::setLocomotion(Locomotions::Enumerator posture)
+{
+	if (!isAuthoritative())
+	{
+		sendControllerMessageToAuthServer(CM_setLocomotion, new MessageQueueGenericValueType<Locomotions::Enumerator>(posture));
+	}
+	else
+	{
+		Postures::Enumerator newPosture;
+		MovementTable::eLocomotionSpeed speed = getMovementTable()->getLocomotionData(posture, newPosture);
+		if (speed != MovementTable::kInvalid)
+		{
+			setPosture(newPosture);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::speakText(MessageQueueSpatialChat const &spatialChat)
+{
+	// a speech type may only be used if it either has no skills listed as providing it, or the creature has
+	// at least one of the skills listed.
+
+	std::vector<std::string> const &skillsProviding = SpatialChatManager::getSkillsProviding(spatialChat.getChatType());
+	if (!skillsProviding.empty())
+	{
+		bool found = false;
+		for (std::vector<std::string>::const_iterator i = skillsProviding.begin(); i != skillsProviding.end(); ++i)
+		{
+			if (hasCommand(*i))
+			{
+				found = true;
+				break;
+			}
+		}
+		if (!found)
+			return;
+	}
+
+	TangibleObject::speakText(spatialChat);
+}
+
+// ----------------------------------------------------------------------
+
+int CreatureObject::getPerformanceType() const
+{
+	return m_performanceType.get();
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setPerformanceType(int performanceType)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			MessageQueueGenericValueType<int> *msg = new MessageQueueGenericValueType<int>(performanceType);
+			controller->appendMessage(
+				CM_setPerformanceType,
+				0.0f,
+				msg,
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		m_performanceType = performanceType;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+int CreatureObject::getPerformanceStartTime() const
+{
+	return m_performanceStartTime.get();
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setPerformanceStartTime(int performanceStartTime)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			MessageQueueGenericValueType<int> *msg = new MessageQueueGenericValueType<int>(performanceStartTime);
+			controller->appendMessage(
+				CM_setPerformanceStartTime,
+				0.0f,
+				msg,
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		m_performanceStartTime = performanceStartTime;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const &CreatureObject::getPerformanceListenTarget() const
+{
+	return m_performanceListenTarget.get();
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setPerformanceListenTarget(NetworkId const &who)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			MessageQueueGenericValueType<NetworkId> *msg = new MessageQueueGenericValueType<NetworkId>(who);
+			controller->appendMessage(
+				CM_setPerformanceListenTarget,
+				0.0f,
+				msg,
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		m_performanceListenTarget = who;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const &CreatureObject::getPerformanceWatchTarget() const
+{
+	return m_performanceWatchTarget.get();
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setPerformanceWatchTarget(NetworkId const &who)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			MessageQueueGenericValueType<NetworkId> *msg = new MessageQueueGenericValueType<NetworkId>(who);
+			controller->appendMessage(
+				CM_setPerformanceWatchTarget,
+				0.0f,
+				msg,
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		m_performanceWatchTarget = who;
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::setGuildId(int guildId)
+{
+	FATAL(!isAuthoritative(), ("setGuildId called on nonauthoritative object"));
+	int oldGuildId = getGuildId();
+	if (oldGuildId != guildId)
+	{
+		if (oldGuildId)
+			GuildInterface::onAboutToClearGuildId(*this);
+		m_guildId = guildId;
+	}
+	if (guildId)
+		GuildInterface::onGuildIdSet(*this);
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::setTimeToUpdateGuildWarPvpStatus(unsigned long timeToUpdateGuildWarPvpStatus)
+{
+	FATAL(!isAuthoritative(), ("setTimeToUpdateGuildWarPvpStatus called on nonauthoritative object"));
+	m_timeToUpdateGuildWarPvpStatus = timeToUpdateGuildWarPvpStatus;
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::setGuildWarEnabled(bool guildWarEnabled)
+{
+	FATAL(!isAuthoritative(), ("setGuildWarEnabled called on nonauthoritative object"));
+	m_guildWarEnabled = guildWarEnabled;
+	m_timeToUpdateGuildWarPvpStatus = 0;
+}
+
+// ----------------------------------------------------------------------
+
+int CreatureObject::getMilitiaOfCityId() const
+{
+	return m_militiaOfCityId.get();
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::setMilitiaOfCityId(int cityId)
+{
+	FATAL(!isAuthoritative(), ("setMilitiaOfCityId called on nonauthoritative object"));
+	m_militiaOfCityId = cityId;
+}
+
+// ----------------------------------------------------------------------
+
+int CreatureObject::getLocatedInCityId() const
+{
+	return m_locatedInCityId.get();
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::setLocatedInCityId(int newCityId)
+{
+	FATAL(!isAuthoritative(), ("setLocatedInCityId called on nonauthoritative object"));
+	int oldCityId = m_locatedInCityId.get();
+	if (oldCityId != newCityId)
+	{
+		m_locatedInCityId.set(newCityId);
+		if (getScriptObject())
+		{
+			ScriptParams params;
+			params.addParam(oldCityId);
+			params.addParam(newCityId);
+			IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_CITY_CHANGED, params));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const &CreatureObject::getMasterId() const
+{
+	return m_masterId.get();
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setMasterId(NetworkId const &masterId)
+{
+	if (isAuthoritative())
+		m_masterId = masterId;
+	else
+		sendControllerMessageToAuthServer(CM_setMasterId, new MessageQueueGenericValueType<NetworkId>(masterId));
+}
+
+// ----------------------------------------------------------------------
+
+float CreatureObject::getSwimHeight() const
+{
+	return safe_cast<const SharedCreatureObjectTemplate*>(getSharedTemplate())->getSwimHeight() * getScaleFactor();
+}
+
+//-----------------------------------------------------------------------
+
+const CreatureObject::AllCreaturesSet & CreatureObject::getAllCreatures()
+{
+	return g_creatureList;
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::addToMissionRequestQueue(const NetworkId & terminalId)
+{
+	if (!ConfigServerGame::getDisableMissions())
+	{
+		std::vector<std::pair<CreatureObject *, NetworkId> >::const_iterator f = std::find(gs_missionRequestQueue.begin(), gs_missionRequestQueue.end(), std::make_pair(this, terminalId));
+		if(f == gs_missionRequestQueue.end())
+		{
+			gs_missionRequestQueue.push_back(std::make_pair(this, terminalId));
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::removeFromMissionRequestQueue(const NetworkId & creatureId)
+{
+	CreatureObject * creature = safe_cast<CreatureObject *>(NetworkIdManager::getObjectById(creatureId));
+	if (creature)
+	{
+		removeCreatureFromMissionRequestQueue(creature);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::updateMissionRequestQueue()
+{
+	if(! gs_missionRequestQueue.empty())
+	{
+		// remove pending creatures from previous run
+		std::vector<std::pair<CreatureObject *, NetworkId> >::const_iterator remIter;
+		std::vector<std::pair<CreatureObject *, NetworkId> >::iterator i;
+		for(remIter = gs_missionRequestQueueDeferredRemoves.begin(); remIter != gs_missionRequestQueueDeferredRemoves.end(); ++remIter)
+		{
+			for(i = gs_missionRequestQueue.begin(); i != gs_missionRequestQueue.end(); ++i)
+			{
+				if((*i).first == (*remIter).first)
+				{
+					gs_missionRequestQueue.erase(i);
+					break;
+				}
+			}
+		}
+
+		gs_missionRequestQueueDeferredRemoves.clear();
+		int count = 0;
+
+		for(i = gs_missionRequestQueue.begin(); i != gs_missionRequestQueue.end(); ++i)
+		{
+			CreatureObject * creature = (*i).first;
+
+			// if a delete happened while processing the queue, find the
+			// creature in the defferred deleted queue. If it's there, skip this
+			// creature and move on to the next
+			if(! gs_missionRequestQueueDeferredRemoves.empty())
+			{
+				// is this creature in the queue?
+				remIter = std::find(gs_missionRequestQueueDeferredRemoves.begin(), gs_missionRequestQueueDeferredRemoves.end(), std::make_pair(creature, (*i).second));
+				if(remIter != gs_missionRequestQueueDeferredRemoves.end())
+					continue;
+			}
+
+			// build vector of network ids for all mission objects in the mission bag
+			ServerObject * missionBag = creature->getMissionBag();
+			if(missionBag)
+			{
+				static std::vector<NetworkId> missionObjects;
+
+				Container * container = ContainerInterface::getContainer(*missionBag);
+				ContainerIterator iter;
+				for(iter = container->begin(); iter != container->end(); ++iter)
+				{
+					MissionObject * missionObject = safe_cast<MissionObject *>((*iter).getObject());
+					if(missionObject)
+					{
+						missionObjects.push_back(missionObject->getNetworkId());
+					}
+				}
+
+				ScriptParams p;
+				p.addParam(creature->getNetworkId());
+				p.addParam((*i).second);
+				p.addParam(missionObjects);
+				GameScriptObject * script = creature->getScriptObject();
+				if(script)
+					IGNORE_RETURN(script->trigAllScripts(Scripting::TRIG_PLAYER_REQUEST_MISSION_BOARD, p));
+				removeCreatureFromMissionRequestQueue(creature);
+				missionObjects.clear();
+			}
+			++count;
+			if (count >= ConfigServerGame::getMissionRequestsPerFrame())
+			{
+				break;
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+{
+	TangibleObject::getAttributes(data);
+}
+
+//-----------------------------------------------------------------------
+
+bool CreatureObject::isAppearanceEquippable(const char *appearanceTemplateName)
+{
+	// Returns whether an object template is wearable based on the data in the
+	// appearance_table.tab
+
+	bool result = true;
+
+	// Make sure this object has a valid appearance
+
+	if (appearanceTemplateName == NULL)
+	{
+		result = false;
+	}
+	else
+	{
+		// Check to see if we even care about the creature object depending
+		// on its gender/species combination
+
+		SharedCreatureObjectTemplate::Species species = getSpecies();
+		SharedCreatureObjectTemplate::Gender gender = getGender();
+
+		int column = -1;
+
+		// Get the species index
+
+		switch (species)
+		{
+			case SharedCreatureObjectTemplate::SP_human:       { column =  1; } break;
+			case SharedCreatureObjectTemplate::SP_rodian:      { column =  3; } break;
+			case SharedCreatureObjectTemplate::SP_monCalamari: { column =  5; } break;
+			case SharedCreatureObjectTemplate::SP_wookiee:     { column =  7; } break;
+			case SharedCreatureObjectTemplate::SP_twilek:      { column =  9; } break;
+			case SharedCreatureObjectTemplate::SP_trandoshan:  { column = 11; } break;
+			case SharedCreatureObjectTemplate::SP_zabrak:      { column = 13; } break;
+			case SharedCreatureObjectTemplate::SP_bothan:      { column = 15; } break;
+			case SharedCreatureObjectTemplate::SP_ithorian:    { column = 17; } break;
+			case SharedCreatureObjectTemplate::SP_sullustan:   { column = 19; } break;
+			default: { } break;
+		}
+
+		// Add in the gender index
+
+		switch (gender)
+		{
+			case SharedCreatureObjectTemplate::GE_male:   { } break;
+			case SharedCreatureObjectTemplate::GE_female: { column += 1; } break;
+			default: { } break;
+		}
+
+		if (column > 0)
+		{
+			// If the object template is in the list, then check if it is equippable, otherwise
+			// there is no restriction so the item must be equippable
+
+			std::string objectTemplateName(appearanceTemplateName);
+
+			if (!objectTemplateName.empty())
+			{
+				// Strip out just the object template name
+
+				size_t const slashIndex = objectTemplateName.rfind('/');
+				size_t const dotIndex   = objectTemplateName.rfind('.');
+
+				std::string fileName;
+
+				if (slashIndex == std::string::npos)
+				{
+					fileName = objectTemplateName.substr(0, dotIndex);
+				}
+				else if (dotIndex == std::string::npos)
+				{
+					fileName = objectTemplateName.substr(slashIndex + 1);
+				}
+				else
+				{
+					fileName = objectTemplateName.substr(slashIndex + 1, dotIndex - slashIndex - 1);
+				}
+
+				if (AppearanceManager::isAppearanceManaged(fileName))
+				{
+					// A ':block' token in the data table denotes the item is not equippable
+
+					std::string destAppearancePath;
+
+					AppearanceManager::getAppearanceName(destAppearancePath, fileName, column);
+
+					static const std::string tagBlock = ":block";
+
+					if (destAppearancePath == tagBlock)
+					{
+						result = false;
+					}
+				}
+			}
+		}
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sends a message to the Planet Server to update the position of the object.
+ */
+void CreatureObject::updatePlanetServerInternal(const bool forceUpdate) const
+{
+	if (forceUpdate || getPositionChanged())
+	{
+		// If this is a mount with a rider on it, use the larger of the rider and mount's
+		// interest radius for the mount.  This allows the planet server to update nodes
+		// marked for proxy subscription properly.  Otherwise we'll get a destroy proxy
+		// for the mount the first time it moves into a node that hasn't yet been subscribed,
+		// immediately followed by a create proxy message for the mount when the rider's
+		// position gets updated.
+
+		int effectiveInterestRadius = getInterestRadius();
+		if (getState(States::MountedCreature))
+		{
+			CreatureObject const *const rider = getPrimaryMountingRider();
+			if (rider)
+				effectiveInterestRadius = std::max(rider->getInterestRadius(), getInterestRadius());
+		}
+
+		if (!ContainerInterface::getContainedByObject(*this) || (effectiveInterestRadius > 0))
+		{
+			bool hibernating = false;
+			if(getCreatureController())
+				hibernating = getCreatureController()->getHibernate();
+
+			AICreatureController const * const aiCreatureController = dynamic_cast<AICreatureController const *>(getCreatureController());
+
+			Object const * const topmostContainer = ContainerInterface::getTopmostContainer(*this);
+			FATAL(!topmostContainer, ("Object %s was contained by something, but getTopmostContainer() returned NULL", getNetworkId().getValueString().c_str()));
+			Vector const &position = topmostContainer->getPosition_p();
+			UpdateObjectOnPlanetMessage const msg(
+				getNetworkId(),
+				topmostContainer == this ? NetworkId::cms_invalid : topmostContainer->getNetworkId(),
+				static_cast<int>(position.x),
+				static_cast<int>(position.y),
+				static_cast<int>(position.z),
+				effectiveInterestRadius,
+				static_cast<int>(getLocationReservationRadius()),
+				false,
+				true,
+				static_cast<int>(getObjectType()),
+				static_cast<int>(getLevel()),
+				hibernating,
+				getTemplateCrc(),
+				aiCreatureController ? aiCreatureController->getMovementType() : -1,
+				getIsStatic() == true ? 1 : 0);
+			GameServer::getInstance().sendToPlanetServer(msg);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+int CreatureObject::getCurrentTargetsTotal(const std::map<Attributes::Enumerator, Attributes::Value> & targets)
+{
+	int sum = 0;
+	for(std::map<Attributes::Enumerator, Attributes::Value>::const_iterator i = targets.begin(); i != targets.end(); ++i)
+	{
+		sum += i->second;
+	}
+	return sum;
+}
+
+// ======================================================================
+
+ServerObject *CreatureObject::getMissionBag() const
+{
+	SlottedContainer const * const s = ContainerInterface::getSlottedContainer(*this);
+	if (s)
+	{
+		static SlotId const bankId = SlotIdManager::findSlotId(MISSION_BAG_SLOT_NAME);
+		Container::ContainerErrorCode tmp = Container::CEC_Success;
+		Object * const o = s->getObjectInSlot(bankId, tmp).getObject();
+		if (o)
+			return o->asServerObject();
+	}
+	return 0;
+}
+
+// ======================================================================
+
+ServerObject *CreatureObject::getBankContainer() const
+{
+	return const_cast<CreatureObject *>(this)->getBank ();
+}
+
+// ======================================================================
+
+namespace PlayerBanks
+{
+	const static Unicode::String invalidBankName =
+		Unicode::narrowToWide("INVALID_BANK_NAME");
+}
+
+//----------------------------------------------------------------------
+
+Unicode::String CreatureObject::getBankName() const
+{
+	Unicode::String bankName = PlayerBanks::invalidBankName;
+	getObjVars().getItem(OBJVAR_BANK_ID,bankName);
+	return bankName;
+}
+
+// ======================================================================
+
+bool CreatureObject::isBankMember(Unicode::String bankName) const
+{
+	return (bankName.compare(getBankName()) == 0);
+}
+
+// ======================================================================
+
+bool CreatureObject::joinBank(Unicode::String bankName)
+{
+	if (getBankName() == bankName)
+	{
+		StringId message("system_msg", "already_member_of_bank");
+		Unicode::String outOfBand;
+		Chat::sendSystemMessage(*this, message, outOfBand);
+		return false;
+	}
+	if (getBankName() != PlayerBanks::invalidBankName)
+	{
+		StringId message("system_msg", "member_of_different_bank");
+		Unicode::String outOfBand;
+		Chat::sendSystemMessage(*this, message, outOfBand);
+		return false;
+	}
+	StringId message("system_msg", "succesfully_joined_bank");
+	Unicode::String outOfBand;
+	Chat::sendSystemMessage(*this, message, outOfBand);
+//	printf("Setting item (%s) on objvars (%x)\n", OBJVAR_BANK_ID.c_str(), (int)objVars);
+	setObjVarItem(OBJVAR_BANK_ID, bankName);
+	/*DynamicVariable *objvar = objVars->getItemByName(OBJVAR_BANK_ID);
+	if (objvar)
+	{
+		DynamicVariableString *stringVar = dynamic_cast<DynamicVariableString *>(objvar);
+		stringVar->setValue(bankName);
+	}*/
+	return true;
+}
+
+// ======================================================================
+
+void CreatureObject::quitBank()
+{
+	ServerObject *bankContainer = getBankContainer();
+	if (bankContainer)
+	{
+		Container *container = ContainerInterface::getContainer(*bankContainer);
+		if (container->getNumberOfItems() != 0)
+		{
+			//Can't quit bank, you still have items in it
+			StringId message("system_msg", "bank_not_empty");
+			Unicode::String outOfBand;
+			Chat::sendSystemMessage(*this, message, outOfBand);
+			return;
+		}
+	}
+	StringId message("system_msg", "succesfully_quit_bank");
+	Unicode::String outOfBand;
+	Chat::sendSystemMessage(*this, message, outOfBand);
+	setObjVarItem(OBJVAR_BANK_ID, PlayerBanks::invalidBankName);
+	/*DynamicVariable *objvar = objVars->getItemByName(OBJVAR_BANK_ID);
+	if (objvar)
+	{
+		DynamicVariableString *stringVar = dynamic_cast<DynamicVariableString *>(objvar);
+		stringVar->setValue(PlayerBanks::invalidBankName);
+	}*/
+	setObjVarItem(OBJVAR_OPEN_BANK_TERMINAL_ID, NetworkId::cms_invalid);
+	if (bankContainer)
+	{
+		ScriptParams params;
+		params.addParam(getNetworkId());
+		IGNORE_RETURN (bankContainer->getScriptObject()->trigAllScripts(Scripting::TRIG_CLOSED_CONTAINER, params))
+		;
+		Client *client = getClient();
+		if (client)
+		{
+			GenericValueTypeMessage<NetworkId> m("ClosedContainerMessage", bankContainer->getNetworkId());
+			client->send(m, true);
+			ObserveTracker::onClientClosedContainer(*client, *bankContainer);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+float CreatureObject::getInvulnerabilityTimer() const
+{
+	return m_invulnerabilityTimer.get();
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setInvulnerabilityTimer(float duration)
+{
+	if (isAuthoritative())
+	{
+		DEBUG_REPORT_LOG(true, ("Setting creature invulnerability timer for %s to %g\n", getDebugInformation().c_str(), duration));
+		m_invulnerabilityTimer = duration;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::isInvulnerable() const
+{
+	if (m_invulnerabilityTimer.get() > 0.f)
+		return true;
+	return TangibleObject::isInvulnerable();
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::handleCMessageTo(MessageToPayload const &message)
+{
+	if (message.getMethod() == "C++RenameFailed")
+	{
+		std::string reason(message.getDataAsString());
+		if (reason.empty())
+			reason = "Rename request failed.";
+
+		Chat::sendSystemMessage(*this,Unicode::narrowToWide(reason),Unicode::String());
+	}
+	else if ((message.getMethod() == "C++PlayerRenameRequestSubmitted") || (message.getMethod() == "C++PlayerLastNameRenameRequestSubmitted"))
+	{
+		// set objvar to indicate there's a pending rename request for this character,
+		// and the time of the rename request, to enforce the 90 days wait between rename
+		if (!getClient() || !getClient()->isGod())
+			setObjVarItem("renameCharacterRequest.requestTime", static_cast<int>(::time(NULL)));
+
+		std::string const newName(message.getDataAsString());
+		if (getObjVars().hasItem("renameCharacterRequest.requestTime") && !newName.empty())
+		{
+			setObjVarItem("renameCharacterRequest.requestNewName", newName);
+		}
+
+		// for player requested rename, send message to CentralServer to drop the character,
+		// and prevent the character from further login until the rename request has been completed
+		PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(this);
+		if (playerObject)
+		{
+			GenericValueTypeMessage<std::pair<unsigned int, std::pair<NetworkId, std::pair<std::string, bool> > > > const msg("PlayerRenameRequestSubmitted", std::make_pair(static_cast<unsigned int>(playerObject->getStationId()), std::make_pair(getNetworkId(), std::make_pair(newName, (message.getMethod() == "C++PlayerLastNameRenameRequestSubmitted")))));
+			GameServer::getInstance().sendToCentralServer(msg);
+		}
+	}
+	else if (message.getMethod() == "C++GmRenameRequestSubmitted")
+	{
+		std::string reason(message.getDataAsString());
+		if (reason.empty())
+			reason = "Rename request submitted.";
+
+		Chat::sendSystemMessage(*this,Unicode::narrowToWide(reason),Unicode::String());
+	}
+	else if (message.getMethod() == "C++experience")
+	{
+		std::vector<int8> const & packedData = message.getPackedDataVector();
+		std::vector<int8>::const_iterator spacePos = std::find(packedData.begin(), packedData.end(), ' ');
+		if (spacePos != packedData.end())
+		{
+			int amount = atoi(std::string(spacePos + 1, packedData.end()).c_str());
+			grantExperiencePoints(std::string(packedData.begin(), spacePos), amount);
+		}
+	}
+	else if (message.getMethod() == "C++AddJediSlot")
+	{
+		// if we haven't received an addJediToAccountAck(), resend the Jedi request
+		if (!getObjVars().hasItem(OBJVAR_ADD_JEDI_ACK))
+		{
+			PlayerObject * const player = PlayerCreatureController::getPlayerObject(this);
+			if (player != NULL)
+			{
+				player->addJediToAccount();
+				MessageToQueue::getInstance().sendMessageToC(getNetworkId(),
+					"C++AddJediSlot", "", 5 * 60, true);
+			}
+		}
+		else
+		{
+			removeObjVarItem(OBJVAR_ADD_JEDI_ACK);
+		}
+	}
+	else if (message.getMethod() == "ClientMfdStatusUpdateMessage")
+	{
+		if (getClient() && isAuthoritative())
+		{
+			if (!message.getPackedDataVector().empty())
+			{
+				static Archive::ByteStream bs;
+				bs.clear();
+				bs.put((&(message.getPackedDataVector()[0])), message.getPackedDataVector().size());
+				Archive::put(bs, message.getPackedDataVector());
+				Archive::ReadIterator ri = bs.begin();
+				ClientMfdStatusUpdateMessage mfdUpdate(ri);
+				getClient()->send(mfdUpdate, false);
+			}
+		}
+	}
+	else if (message.getMethod() == "FindFriend")
+	{
+		if (getClient() && isAuthoritative())
+		{
+			if (!message.getPackedDataVector().empty())
+			{
+				PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+				if (playerObject)
+				{
+					static Archive::ByteStream bs;
+					bs.clear();
+					bs.put((&(message.getPackedDataVector()[0])), message.getPackedDataVector().size());
+					Archive::put(bs, message.getPackedDataVector());
+					Archive::ReadIterator ri = bs.begin();
+					NetworkId source;
+					std::string sourceName;
+					Archive::get(ri, source);
+					Archive::get(ri, sourceName);
+					playerObject->replyLocationToFriend(sourceName, source);
+				}
+			}
+		}
+	}
+	else if (message.getMethod() == "LocationToFriend")
+	{
+		if (getClient() && isAuthoritative())
+		{
+			if (!message.getPackedDataVector().empty())
+			{
+				PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+				if (playerObject)
+				{
+					static Archive::ByteStream bs;
+					bs.clear();
+					bs.put((&(message.getPackedDataVector()[0])), message.getPackedDataVector().size());
+					Archive::put(bs, message.getPackedDataVector());
+					Archive::ReadIterator ri = bs.begin();
+					Location friendLocation;
+					NetworkId friendId;
+					Archive::get(ri, friendLocation);
+					Archive::get(ri, friendId);
+					playerObject->receiveLocationToFriend(friendId, friendLocation);
+				}
+			}
+		}
+	}
+	else if (message.getMethod() == "FailLocationToFriend")
+	{
+		if (getClient() && isAuthoritative())
+		{
+			if (!message.getPackedDataVector().empty())
+			{
+				PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+				if (playerObject)
+				{
+					static Archive::ByteStream bs;
+					bs.clear();
+					bs.put((&(message.getPackedDataVector()[0])), message.getPackedDataVector().size());
+					Archive::put(bs, message.getPackedDataVector());
+					Archive::ReadIterator ri = bs.begin();
+					NetworkId friendId;
+					Archive::get(ri, friendId);
+					playerObject->receiveFailLocationToFriend(friendId);
+				}
+			}
+		}
+	}
+	else if (message.getMethod() == "C++TheaterDestroyed")
+	{
+		PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+		if (playerObject)
+		{
+			playerObject->handleCMessageTo(message);
+		}
+	}
+	else if (message.getMethod() == "C++RemovePetFromGroup")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string packedData(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+
+			// Parse the info from the message
+			char     petNetworkIdBuffer[100];
+			unsigned msgSendCount;
+			sscanf(packedData.c_str(), "%s %u", petNetworkIdBuffer, &msgSendCount);
+
+			// Turn the string into a network Id
+			NetworkId petNetworkId( petNetworkIdBuffer );
+
+			// Try to remove the pet from the group
+			GroupObject *group = getGroup();
+			if (group && group->isGroupMember(petNetworkId))
+			{
+				group->removeGroupMember(petNetworkId);
+			}
+			else
+			{
+				// We will only try to remove the pet so many times...
+				if (msgSendCount < MAX_ATTEMPTS_TO_REMOVE_PET_FROM_GROUP)
+				{
+					// We will try again in the future...
+					++msgSendCount;
+
+					// We need to tell the network ID of the pet and we need to keep
+					// of how many times this message has been sent to the inviter
+					char msgBuffer[100];
+					sprintf( msgBuffer, "%s %u", petNetworkId.getValueString().c_str(), msgSendCount );
+
+					// Send the message with a delay
+					MessageToQueue::getInstance().sendMessageToC( getNetworkId(),
+					                                              "C++RemovePetFromGroup",
+					                                              msgBuffer,
+					                                              TIME_BETWEEN_ATTEMPTS_TO_REMOVE_PET,
+					                                              false );  // reliable
+				}
+			}
+		}
+	}
+	else if (message.getMethod() == "C++WaitForPatrolPreload")
+	{
+		if (ServerWorld::isPreloadComplete())
+		{
+			DEBUG_REPORT_LOG(ConfigServerGame::isAiLoggingEnabled(),("C++WaitForPatrolPreload being handled for %s\n", getNetworkId().getValueString().c_str()));
+
+			MessageToQueue::cancelRecurringMessageTo(getNetworkId(), "C++WaitForPatrolPreload");
+
+			AICreatureController * const aiCreatureController = safe_cast<AICreatureController * const>(getController());
+			if (aiCreatureController != NULL)
+			{
+				const std::string data = message.getDataAsString();
+				std::string::size_type locationStart = 0;
+				std::string::size_type  locationEnd = data.find('|', locationStart);
+				std::vector<Unicode::String> locations;
+				while (locationEnd != std::string::npos)
+				{
+					locations.push_back(Unicode::narrowToWide(data.substr(locationStart, locationEnd - locationStart)));
+					locationStart = locationEnd + 1;
+					locationEnd = data.find('|', locationStart);
+				}
+
+				bool random = false;
+				bool flip = false;
+				bool repeat = false;
+
+				if (data.size() > (locationStart+2))
+				{
+					random = data.at(locationStart++) != '0';
+					flip = data.at(locationStart++) != '0';
+					repeat = data.at(locationStart++) != '0';
+				}
+				int startPoint = 0;
+				if (data.size() > locationStart && data.at(locationStart) == '*')
+				{
+					++locationStart;
+					startPoint = atoi(data.substr(locationStart).c_str());
+				}
+
+				aiCreatureController->patrol(locations, random, flip, repeat, startPoint);
+			}
+		}
+	}
+	else if (message.getMethod() == "C++WarnAboutVendorPurge")
+	{
+		LOG("CustomerService",("Purge:  Sending warning emails to the owner (%s) of vendor (%s) effected by a purge",getNetworkId().getValueString().c_str(),message.getDataAsString().c_str()));
+
+		const StringId subject("player_structure", "vendor_purge_warning_subject");
+		const StringId body("player_structure", "vendor_purge_warning_body");
+		const Unicode::String mail_subject = Unicode::narrowToWide("@" + subject.getCanonicalRepresentation());
+		const Unicode::String mail_body = Unicode::narrowToWide("@" + body.getCanonicalRepresentation());
+
+		ProsePackage pp;
+		pp.stringId     = body;
+		pp.other.str    = Unicode::narrowToWide(message.getDataAsString());
+			
+		Unicode::String oob;
+		OutOfBandPackager::pack(pp, -1, oob);
+
+		Chat::sendPersistentMessage("Galactic Housing Authority", Unicode::wideToNarrow(getObjectName()), 
+									mail_subject, Unicode::emptyString, oob); 
+	}
+	else if (message.getMethod() == "C++CheckCharacterTitle")
+	{
+		PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+		if (playerObject && !playerObject->getTitle().empty())
+		{
+			static uint32 const commandHash = Crc::normalizeAndCalculate("setCurrentSkillTitle");
+			const Command &command = CommandTable::getCommand(static_cast<uint32>(commandHash));
+			if (!command.isNull())
+			{
+				commandQueueEnqueue(command, NetworkId::cms_invalid, Unicode::narrowToWide(playerObject->getTitle()), 0, false);
+			}
+		}
+	}
+	else if (message.getMethod() == "C++CharacterSheetInfoResidenceLocationRsp")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			// location of residence
+			std::string const residenceLoc(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+
+			// get the city(ies) this character is a citizen of
+			std::string citizensOf;
+			std::vector<int> const & cityId = CityInterface::getCitizenOfCityId(getNetworkId());
+			if (!cityId.empty())
+			{
+				std::string cityName;
+				for (std::vector<int>::const_iterator iterCity = cityId.begin(); iterCity != cityId.end(); ++iterCity)
+				{
+					CityInfo const & cityInfo = CityInterface::getCityInfo(*iterCity);
+					cityName = cityInfo.getCityName();
+					if (cityName.empty())
+						continue;
+
+					if (!citizensOf.empty())
+						citizensOf += ",";
+
+					if (getNetworkId() == cityInfo.getLeaderId())
+						citizensOf += "*";
+
+					citizensOf += cityName;
+				}
+			}
+
+			// send to client
+			GenericValueTypeMessage<std::pair<std::string, std::string> > message("CharacterSheetResponseResLoc", std::make_pair(residenceLoc, citizensOf));
+			Client * const client = getClient();
+			if (client)
+				client->send(message, true);
+		}
+	}
+	else if (message.getMethod() == "C++SpammerReq")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const params(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			std::string::size_type const pos = params.find(' ');
+			if ((pos != std::string::npos) && (params.size() > (pos + 1)))
+			{
+				NetworkId const actor(params.substr(0, pos));
+				std::string const actorName(params.substr(pos + 1));
+				PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+				if (playerObject)
+				{
+					bool canSpammer = true;
+
+					// on a session-authenticated cluster, cannot /spammer a secured login character
+					if (getClient() && getClient()->isGodValidated())
+					{
+						if (!ConfigServerGame::getAdminGodToAll() && !ConfigServerGame::getEnableWardenCanSquelchSecuredLogin())
+						{
+							canSpammer = false;
+						}
+					}
+
+					// cannot /spammer self
+					if (canSpammer && (actor == getNetworkId()))
+					{
+						canSpammer = false;
+					}
+
+					// cannot /spammer a target that is already squelched
+					if (canSpammer && (playerObject->getSecondsUntilUnsquelched() != 0))
+					{
+						canSpammer = false;
+					}
+
+					if (!canSpammer)
+					{
+						MessageToQueue::getInstance().sendMessageToC(actor,
+							"C++SpammerRspCannotSpammerTarget",
+							Unicode::wideToNarrow(getAssignedObjectName()),
+							0,
+							false);
+					}
+					else
+					{
+						// do it
+						playerObject->squelch(actor, actorName, ConfigServerGame::getWardenSquelchDurationSeconds());
+
+						std::string result = getNetworkId().getValueString();
+						result += "|";
+						result += Unicode::wideToNarrow(getAssignedObjectName());
+						result += "|";
+						result += playerObject->getAccountDescription();
+
+						MessageToQueue::getInstance().sendMessageToC(actor,
+							"C++SpammerRspSuccess",
+							result,
+							0,
+							false);
+					}
+				}
+				else
+				{
+					MessageToQueue::getInstance().sendMessageToC(actor,
+						"C++SpammerRspInvalidTarget",
+						std::string(),
+						0,
+						false);
+				}
+			}
+		}
+	}
+	else if (message.getMethod() == "C++SpammerRspTargetNotFound")
+	{
+		Chat::sendSystemMessage(*this, StringId("warden", "invalid_target"), Unicode::emptyString);
+	}
+	else if (message.getMethod() == "C++SpammerRspInvalidTarget")
+	{
+		Chat::sendSystemMessage(*this, StringId("warden", "invalid_target"), Unicode::emptyString);
+	}
+	else if (message.getMethod() == "C++SpammerRspCannotSpammerTarget")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const targetName(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+
+			ProsePackage prosePackage;
+			prosePackage.stringId = StringId("warden", "cannot_spammer_target");
+			prosePackage.target.str = Unicode::narrowToWide(targetName);
+			Chat::sendSystemMessage(*this, prosePackage);
+		}
+	}
+	else if (message.getMethod() == "C++SpammerRspSuccess")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const result(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			std::string::size_type const pos1 = result.find('|');
+			if ((pos1 != std::string::npos) && (result.size() > (pos1 + 1)))
+			{
+				std::string::size_type const pos2 = result.find('|', (pos1 + 1));
+				if ((pos2 != std::string::npos) && (result.size() > (pos2 + 1)))
+				{
+					NetworkId const target(result.substr(0, pos1));
+					std::string const targetName(result.substr(pos1 + 1, pos2 - pos1 - 1));
+					std::string const targetAccountDescription(result.substr(pos2 + 1));
+
+					// request /report
+					ReportManager::addReport(getAssignedObjectFirstName(), getNetworkId(), Unicode::narrowToWide(NameManager::normalizeName(targetName)), target, std::string("Warden"));
+
+					// log it
+					LOG("CustomerService", ("Warden:%s has spammer %s", PlayerObject::getAccountDescription(this).c_str(), targetAccountDescription.c_str()));
+
+					// display confirmation message
+					ProsePackage prosePackage;
+					prosePackage.stringId = StringId("warden", "confirm_spammer");
+					prosePackage.target.str = Unicode::narrowToWide(targetName);
+					Chat::sendSystemMessage(*this, prosePackage);
+				}
+			}
+		}
+	}
+	else if (message.getMethod() == "C++UnspammerReq")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const params(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			NetworkId const actor(params);
+			PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+			if (playerObject)
+			{
+				bool canUnspammer = true;
+
+				// cannot /unspammer a target that is not currently /spammer(ed)
+				if (playerObject->getSecondsUntilUnsquelched() <= 0)
+				{
+					canUnspammer = false;
+				}
+
+				// can only /unspammer target that was /spammer(ed) by the actor
+				if (canUnspammer && (playerObject->getSquelchedById() != actor))
+				{
+					canUnspammer = false;
+				}
+
+				if (!canUnspammer)
+				{
+					MessageToQueue::getInstance().sendMessageToC(actor,
+						"C++UnspammerRspCannotUnspammerTarget",
+						Unicode::wideToNarrow(getAssignedObjectName()),
+						0,
+						false);
+				}
+				else
+				{
+					// do it
+					playerObject->unsquelch();
+
+					std::string result = Unicode::wideToNarrow(getAssignedObjectName());
+					result += "|";
+					result += playerObject->getAccountDescription();
+
+					MessageToQueue::getInstance().sendMessageToC(actor,
+						"C++UnspammerRspSuccess",
+						result,
+						0,
+						false);
+				}
+			}
+			else
+			{
+				MessageToQueue::getInstance().sendMessageToC(actor,
+					"C++UnspammerRspInvalidTarget",
+					std::string(),
+					0,
+					false);
+			}
+		}
+	}
+	else if (message.getMethod() == "C++UnspammerRspTargetNotFound")
+	{
+		Chat::sendSystemMessage(*this, StringId("warden", "invalid_target"), Unicode::emptyString);
+	}
+	else if (message.getMethod() == "C++UnspammerRspInvalidTarget")
+	{
+		Chat::sendSystemMessage(*this, StringId("warden", "invalid_target"), Unicode::emptyString);
+	}
+	else if (message.getMethod() == "C++UnspammerRspCannotUnspammerTarget")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const targetName(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+
+			ProsePackage prosePackage;
+			prosePackage.stringId = StringId("warden", "cannot_unspammer_target");
+			prosePackage.target.str = Unicode::narrowToWide(targetName);
+			Chat::sendSystemMessage(*this, prosePackage);
+		}
+	}
+	else if (message.getMethod() == "C++UnspammerRspSuccess")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const result(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			std::string::size_type const pos = result.find('|');
+			if ((pos != std::string::npos) && (result.size() > (pos + 1)))
+			{
+				std::string const targetName(result.substr(0, pos));
+				std::string const targetAccountDescription(result.substr(pos + 1));
+
+				// log it
+				LOG("CustomerService", ("Warden:%s has unspammer %s", PlayerObject::getAccountDescription(this).c_str(), targetAccountDescription.c_str()));
+
+				// display confirmation message
+				ProsePackage prosePackage;
+				prosePackage.stringId = StringId("warden", "confirm_unspammer");
+				prosePackage.target.str = Unicode::narrowToWide(targetName);
+				Chat::sendSystemMessage(*this, prosePackage);
+			}
+		}
+	}
+	else if (message.getMethod() == "C++DeputizeWardenReq")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const params(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			NetworkId existingWarden;
+			StationId existingWardenStationId;
+			bool success = false;
+
+			Unicode::String const delimiters(Unicode::narrowToWide("|"));
+			Unicode::UnicodeStringVector tokens;
+			if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, NULL)) && (tokens.size() == 2))
+			{
+				existingWarden = NetworkId(Unicode::wideToNarrow(tokens[0]));
+				
+				// quick way to convert a string to a uint32
+				existingWardenStationId = static_cast<StationId>(NetworkId(Unicode::wideToNarrow(tokens[1])).getValue());
+
+				if (existingWarden != getNetworkId())
+				{
+					PlayerObject * po = PlayerCreatureController::getPlayerObject(this);
+					if (po && !po->isWarden() && (po->getStationId() == existingWardenStationId))
+					{
+						// make warden
+						success = true;
+						po->setPriviledgedTitle(static_cast<int8>(PlayerDataPriviledgedTitle::Warden));
+
+						// send success message back to existing warden who deputized this warden
+						std::string result = Unicode::wideToNarrow(getAssignedObjectName());
+						result += "|";
+						result += po->getAccountDescription();
+
+						MessageToQueue::getInstance().sendMessageToC(existingWarden,
+							"C++DeputizeWardenRspSuccess",
+							result,
+							0,
+							false);
+					}
+				}
+			}
+
+			if (!success)
+			{
+				MessageToQueue::getInstance().sendMessageToC(existingWarden,
+					"C++DeputizeWardenRspCannotDeputize",
+					std::string(),
+					0,
+					false);
+			}
+		}
+	}
+	else if (message.getMethod() == "C++DeputizeWardenRspSuccess")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const result(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			std::string::size_type const pos = result.find('|');
+			if ((pos != std::string::npos) && (result.size() > (pos + 1)))
+			{
+				std::string const newWardenName(result.substr(0, pos));
+				std::string const newWardenAccountInfo(result.substr(pos + 1));
+
+				// log it
+				LOG("CustomerService", ("WardenPlayerDeputize:%s has deputized %s", PlayerObject::getAccountDescription(this).c_str(), newWardenAccountInfo.c_str()));
+
+				// display confirmation message
+				ProsePackage prosePackage;
+				prosePackage.stringId = StringId("warden", "confirm_deputize");
+				prosePackage.target.str = Unicode::narrowToWide(newWardenName);
+				Chat::sendSystemMessage(*this, prosePackage);
+			}
+		}
+	}
+	else if (message.getMethod() == "C++DeputizeWardenRspCannotDeputize")
+	{
+		Chat::sendSystemMessage(*this, StringId("warden", "cannot_deputize"), Unicode::emptyString);
+	}
+	else if (message.getMethod() == "C++UndeputizeWardenReq")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const params(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			NetworkId existingWarden;
+			StationId existingWardenStationId;
+			bool success = false;
+
+			Unicode::String const delimiters(Unicode::narrowToWide("|"));
+			Unicode::UnicodeStringVector tokens;
+			if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, NULL)) && (tokens.size() == 2))
+			{
+				existingWarden = NetworkId(Unicode::wideToNarrow(tokens[0]));
+
+				// quick way to convert a string to a uint32
+				existingWardenStationId = static_cast<StationId>(NetworkId(Unicode::wideToNarrow(tokens[1])).getValue());
+
+				if (existingWarden != getNetworkId())
+				{
+					PlayerObject * po = PlayerCreatureController::getPlayerObject(this);
+					if (po && po->isWarden() && (po->getStationId() == existingWardenStationId))
+					{
+						// revoke warden
+						success = true;
+						po->setPriviledgedTitle(static_cast<int8>(PlayerDataPriviledgedTitle::NormalPlayer));
+
+						// send success message back to existing warden who undeputized this warden
+						std::string result = Unicode::wideToNarrow(getAssignedObjectName());
+						result += "|";
+						result += po->getAccountDescription();
+
+						MessageToQueue::getInstance().sendMessageToC(existingWarden,
+							"C++UndeputizeWardenRspSuccess",
+							result,
+							0,
+							false);
+					}
+				}
+			}
+
+			if (!success)
+			{
+				MessageToQueue::getInstance().sendMessageToC(existingWarden,
+					"C++UndeputizeWardenRspCannotUndeputize",
+					std::string(),
+					0,
+					false);
+			}
+		}
+	}
+	else if (message.getMethod() == "C++UndeputizeWardenRspSuccess")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const result(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			std::string::size_type const pos = result.find('|');
+			if ((pos != std::string::npos) && (result.size() > (pos + 1)))
+			{
+				std::string const priorWardenName(result.substr(0, pos));
+				std::string const pirorWardenAccountInfo(result.substr(pos + 1));
+
+				// log it
+				LOG("CustomerService", ("WardenPlayerUndeputize:%s has undeputized %s", PlayerObject::getAccountDescription(this).c_str(), pirorWardenAccountInfo.c_str()));
+
+				// display confirmation message
+				ProsePackage prosePackage;
+				prosePackage.stringId = StringId("warden", "confirm_undeputize");
+				prosePackage.target.str = Unicode::narrowToWide(priorWardenName);
+				Chat::sendSystemMessage(*this, prosePackage);
+			}
+		}
+	}
+	else if (message.getMethod() == "C++UndeputizeWardenRspCannotUndeputize")
+	{
+		Chat::sendSystemMessage(*this, StringId("warden", "cannot_undeputize"), Unicode::emptyString);
+	}
+	else if (message.getMethod() == "C++OnCollectionServerFirst")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const collectionName(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			CollectionsDataTable::CollectionInfoCollection const * const collectionInfo = CollectionsDataTable::getCollectionByName(collectionName);
+			if (collectionInfo && collectionInfo->trackServerFirst)
+			{
+				GameScriptObject * gameScriptObject = const_cast<GameScriptObject *>(getScriptObject());
+				if (gameScriptObject)
+				{
+					ScriptParams params;
+					params.addParam(collectionInfo->page.book.name.c_str()); // book
+					params.addParam(collectionInfo->page.name.c_str());      // page
+					params.addParam(collectionInfo->name.c_str());           // collection
+
+					IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_COLLECTION_SERVER_FIRST, params));
+				}
+			}
+		}
+	}
+	else if (message.getMethod() == "C++InviteToGroupReq")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const params(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+
+			bool success = false;
+			NetworkId actor, actorShip, group;
+			std::string actorName;
+			GroupObject const * groupObject = NULL;
+			StringId responseSid;
+
+			Unicode::String const delimiters(Unicode::narrowToWide("|"));
+			Unicode::UnicodeStringVector tokens;
+			if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, NULL)) && (tokens.size() == 4))
+			{
+				success = true;
+				actor = NetworkId(Unicode::wideToNarrow(tokens[0]));
+				actorShip = NetworkId(Unicode::wideToNarrow(tokens[1]));
+				group = NetworkId(Unicode::wideToNarrow(tokens[2]));
+				actorName = Unicode::wideToNarrow(tokens[3]);
+
+				ServerObject const * so = (group.isValid() ? safe_cast<ServerObject const *>(NetworkIdManager::getObjectById(group)) : NULL);
+				groupObject = (so ? so->asGroupObject() : NULL);
+			}
+
+			if (success)
+			{
+				std::vector<CreatureObject *> targets;
+				GroupHelpers::findAllTargetsForGroup(this, targets);
+
+				if (!GroupHelpers::roomInGroup(groupObject, targets.size()))
+				{
+					responseSid = GroupStringId::SID_GROUP_FULL;
+					success = false;
+				}
+			}
+
+			if (success)
+			{
+				if ((this->getGroup()) && (!GroupHelpers::creatureIsContainedInPOBShip(this)))
+				{
+					responseSid = GroupStringId::SID_GROUP_ALREADY_GROUPED;
+					success = false;
+				}
+			}
+
+			if (success)
+			{
+				GameScriptObject* const gso = getScriptObject();
+				if (gso != NULL && gso->hasScript("ai.beast"))
+				{
+					responseSid = GroupStringId::SID_GROUP_BEASTS_CANT_JOIN;
+					success = false;
+				}
+			}
+
+			if (success)
+			{
+				NetworkId const & oldInviter = getGroupInviterId();
+				if (oldInviter.isValid())
+				{
+					if (oldInviter == actor)
+						responseSid = GroupStringId::SID_GROUP_CONSIDERING_YOUR_GROUP;
+					else
+						responseSid = GroupStringId::SID_GROUP_CONSIDERING_OTHER_GROUP;
+
+					success = false;
+				}
+			}
+
+			if (success)
+			{
+				PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(this);
+				if (playerObject && playerObject->isIgnoring(Unicode::toLower(actorName)))
+				{
+					responseSid = GroupStringId::SID_GROUP_INVITE_NO_TARGET_SELF;
+					success = false;
+				}
+			}
+
+			if (success)
+			{
+				// cannot be invited if in combat
+				if (getState(States::Combat) && ConfigServerGame::getGroupInviteInviteeCombatRestriction())
+				{
+					responseSid = GroupStringId::SID_GROUP_INVITE_TARGET_IN_COMBAT;
+					success = false;
+				}
+			}
+
+			if (success)
+			{
+				ProsePackage pp;
+				pp.stringId = GroupStringId::SID_GROUP_INVITE_TARGET;
+				pp.target.str = Unicode::narrowToWide(actorName);
+				pp.actor.id = getNetworkId();
+
+				Chat::sendSystemMessage(*this, pp);
+
+				setGroupInviter(actor, actorName, actorShip);
+
+				responseSid = GroupStringId::SID_GROUP_INVITE_LEADER;
+			}
+
+			std::string const objectName(Unicode::wideToNarrow(getAssignedObjectName()));
+
+			std::string response = responseSid.getCanonicalRepresentation();
+			response += "|";
+
+			if (!objectName.empty())
+			{
+				response += "nameString|";
+				response += objectName;
+			}
+			else
+			{
+				StringId nameSid = getObjectNameStringId();
+				response += "nameStringId|";
+				response += nameSid.getCanonicalRepresentation();
+			}
+
+			MessageToQueue::getInstance().sendMessageToC(actor,
+				"C++GroupOperationGenericRsp",
+				response,
+				0,
+				false);
+		}
+	}
+	else if (message.getMethod() == "C++InviteToGroupRspTargetNotFound")
+	{
+		Chat::sendSystemMessageSimple(*this, GroupStringId::SID_GROUP_INVITE_NO_TARGET_SELF, NULL);
+	}
+	else if (message.getMethod() == "C++GroupOperationGenericRsp")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const result(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			Unicode::String const delimiters(Unicode::narrowToWide("|"));
+			Unicode::UnicodeStringVector tokens;
+			if ((Unicode::tokenize(Unicode::narrowToWide(result), tokens, &delimiters, NULL)) && (tokens.size() == 3))
+			{
+				std::string const response(Unicode::wideToNarrow(tokens[0]));
+				std::string const responseParmType(Unicode::wideToNarrow(tokens[1]));
+				std::string const responseParm(Unicode::wideToNarrow(tokens[2]));
+
+				ProsePackage pp;
+				pp.stringId = StringId(response);
+
+				if (responseParmType == std::string("nameString"))
+				{
+					pp.target.str = Unicode::narrowToWide(responseParm);
+				}
+				else
+				{
+					pp.target.stringId = StringId(responseParm);
+				}
+
+				pp.actor.id = getNetworkId();
+
+				Chat::sendSystemMessage(*this, pp);
+			}
+		}
+	}
+	else if (message.getMethod() == "C++UninviteFromGroupReq")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const params(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+
+			bool success = false;
+			NetworkId actor;
+			std::string actorName;
+			StringId responseSid;
+
+			Unicode::String const delimiters(Unicode::narrowToWide("|"));
+			Unicode::UnicodeStringVector tokens;
+			if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, NULL)) && (tokens.size() == 2))
+			{
+				success = true;
+				actor = NetworkId(Unicode::wideToNarrow(tokens[0]));
+				actorName = Unicode::wideToNarrow(tokens[1]);
+			}
+
+			if (success)
+			{
+				if (actor != getGroupInviterId())
+				{
+					responseSid = GroupStringId::SID_GROUP_UNINVITE_NOT_INVITED;
+					success = false;
+				}
+			}
+
+			if (success)
+			{
+				ProsePackage pp;
+				pp.stringId = GroupStringId::SID_GROUP_UNINVITE_TARGET;
+				pp.target.str = Unicode::narrowToWide(actorName);
+				pp.actor.id = getNetworkId();
+
+				Chat::sendSystemMessage(*this, pp);
+
+				setGroupInviter(NetworkId::cms_invalid, std::string(), NetworkId::cms_invalid);
+
+				responseSid = GroupStringId::SID_GROUP_UNINVITE_SELF;
+			}
+
+			std::string const objectName(Unicode::wideToNarrow(getAssignedObjectName()));
+
+			std::string response = responseSid.getCanonicalRepresentation();
+			response += "|";
+
+			if (!objectName.empty())
+			{
+				response += "nameString|";
+				response += objectName;
+			}
+			else
+			{
+				StringId nameSid = getObjectNameStringId();
+				response += "nameStringId|";
+				response += nameSid.getCanonicalRepresentation();
+			}
+
+			MessageToQueue::getInstance().sendMessageToC(actor,
+				"C++GroupOperationGenericRsp",
+				response,
+				0,
+				false);
+		}
+	}
+	else if (message.getMethod() == "C++UninviteFromGroupRspTargetNotFound")
+	{
+		Chat::sendSystemMessageSimple(*this, GroupStringId::SID_GROUP_UNINVITE_NO_TARGET_SELF, NULL);
+	}
+	else if (message.getMethod() == "C++GroupJoinInviterInfoReq")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const params(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			NetworkId const invitee(params);
+			GroupObject const * const existingGroup = getGroup();
+			GroupMemberParam gmp = GroupHelpers::buildGroupMemberParam(this);
+
+			char buffer[1024];
+			snprintf(buffer, sizeof(buffer)-1, "%s|%s|%s|%d|%d|%d|%s|%d|%d|%d",
+				(existingGroup ? existingGroup->getNetworkId().getValueString().c_str() : "0"),
+				gmp.m_memberId.getValueString().c_str(),
+				gmp.m_memberName.c_str(),
+				gmp.m_memberDifficulty,
+				static_cast<int>(gmp.m_memberProfession),
+				(gmp.m_memberIsPC ? 1 : 0),
+				gmp.m_memberShipId.getValueString().c_str(),
+				(gmp.m_memberShipIsPOB ? 1 : 0),
+				(gmp.m_memberOwnsPOB ? 1 : 0),
+				(getState(States::Combat) ? 1 : 0));
+
+			buffer[sizeof(buffer)-1] = '\0';
+
+			MessageToQueue::getInstance().sendMessageToC(invitee,
+				"C++GroupJoinInviterInfoRsp",
+				buffer,
+				0,
+				false);
+
+			// if the inviter had been invited in the meantime, have them decline
+			if (getGroupInviterId().isValid())
+				setGroupInviter(NetworkId::cms_invalid, std::string(), NetworkId::cms_invalid);
+		}
+	}
+	else if (message.getMethod() == "C++GroupJoinInviterInfoRsp")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const params(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			bool success = false;
+			NetworkId existingGroupId;
+			NetworkId inviterId;
+			std::string inviterName;
+			int inviterDifficulty = 1;
+			LfgCharacterData::Profession inviterProfession = LfgCharacterData::Prof_Unknown;
+			bool inviterIsPC = true;
+			NetworkId inviterShipId;
+			bool inviterShipIsPOB = false;
+			bool inviterOwnsPOB = false;
+			bool inviterInCombat = false;
+
+			Unicode::String const delimiters(Unicode::narrowToWide("|"));
+			Unicode::UnicodeStringVector tokens;
+			if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, NULL)) && (tokens.size() == 10))
+			{
+				success = true;
+				existingGroupId = NetworkId(Unicode::wideToNarrow(tokens[0]));
+				inviterId = NetworkId(Unicode::wideToNarrow(tokens[1]));
+				inviterName = Unicode::wideToNarrow(tokens[2]);
+				inviterDifficulty = atoi(Unicode::wideToNarrow(tokens[3]).c_str());
+				inviterProfession = static_cast<LfgCharacterData::Profession>(atoi(Unicode::wideToNarrow(tokens[4]).c_str()));
+				inviterIsPC = (atoi(Unicode::wideToNarrow(tokens[5]).c_str()) != 0);
+				inviterShipId = NetworkId(Unicode::wideToNarrow(tokens[6]));
+				inviterShipIsPOB = (atoi(Unicode::wideToNarrow(tokens[7]).c_str()) != 0);
+				inviterOwnsPOB = (atoi(Unicode::wideToNarrow(tokens[8]).c_str()) != 0);
+				inviterInCombat = (atoi(Unicode::wideToNarrow(tokens[9]).c_str()) != 0);
+			}
+
+			GroupObject * existingGroup = NULL;
+			if (success)
+			{
+				if (existingGroupId.isValid())
+				{
+					ServerObject * so = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(existingGroupId));
+					existingGroup = (so ? so->asGroupObject() : NULL);
+					if (!existingGroup)
+					{
+						success = false;
+						Chat::sendSystemMessageSimple(*this, GroupStringId::SID_GROUP_EXISTING_GROUP_NOT_FOUND, NULL);
+					}
+				}
+			}
+
+			if (success)
+			{
+				// make sure inviter hasn't joined another group since the invite
+				if (existingGroup && (inviterId != existingGroup->getGroupLeaderId()))
+				{
+					success = false;
+					ProsePackage pp;
+					pp.stringId = GroupStringId::SID_GROUP_JOIN_INVITER_NOT_LEADER;
+					pp.target.str = Unicode::narrowToWide(inviterName);
+					pp.actor.id = getNetworkId();
+
+					Chat::sendSystemMessage(*this, pp);
+				}
+			}
+
+			if (success)
+			{
+				// cannot join if the inviter is in combat
+				if (inviterInCombat && ConfigServerGame::getGroupJoinInviterCombatRestriction())
+				{
+					success = false;
+					ProsePackage pp;
+					pp.stringId = GroupStringId::SID_GROUP_JOIN_LEADER_IN_COMBAT;
+					pp.target.str = Unicode::narrowToWide(inviterName);
+					pp.actor.id = getNetworkId();
+
+					Chat::sendSystemMessage(*this, pp);
+				}
+			}
+
+			std::vector<CreatureObject *> targets;
+			if (success)
+			{
+				GroupHelpers::findAllTargetsForGroup(this, targets);
+
+				if (existingGroup && !GroupHelpers::roomInGroup(existingGroup, targets.size()))
+				{
+					success = false;
+					Chat::sendSystemMessageSimple(*this, GroupStringId::SID_GROUP_JOIN_FULL, NULL);
+				}
+			}
+
+			if (success)
+			{
+				// if we are in a POB group then we need to disband it
+				GroupObject * const groupFromPOB = getGroup();
+				if (groupFromPOB != 0)
+				{
+					groupFromPOB->disbandGroup();
+
+					std::vector<CreatureObject *>::const_iterator ii = targets.begin();
+					std::vector<CreatureObject *>::const_iterator iiEnd = targets.end();
+
+					for (; ii != iiEnd; ++ii)
+					{
+						if ((*ii)->getGroup() == groupFromPOB)
+							(*ii)->getGroup()->onGroupMemberRemoved((*ii)->getNetworkId(), true);
+					}
+
+					if (getGroup() == groupFromPOB)
+						getGroup()->onGroupMemberRemoved(getNetworkId(), true);
+				}
+
+				if (existingGroup)
+				{
+					GroupObject::GroupMemberParamVector targetMemberParams;
+					GroupHelpers::buildGroupMemberParamsFromCreatures(targets, targetMemberParams);
+
+					int const numberOfTargets = static_cast<int>(targetMemberParams.size());
+
+					for (int i = 0; i < numberOfTargets; ++i)
+					{
+						existingGroup->addGroupMember(targetMemberParams[i]);
+					}
+				}
+				else
+				{
+					// if the inviter happens to be in the same ship as you then we need to remove
+					// him from the targets list so that he isn't added to the new group twice
+					for (std::vector<CreatureObject *>::iterator ii = targets.begin(); ii != targets.end(); ++ii)
+					{
+						if ((*ii)->getNetworkId() == inviterId)
+						{
+							targets.erase(ii);
+							break;
+						}
+					}
+
+					GroupObject::GroupMemberParamVector targetMemberParams;
+					GroupHelpers::buildGroupMemberParamsFromCreatures(targets, targetMemberParams);
+
+					// group did not already exist, so form it with the inviter as the leader
+					if (!targetMemberParams.empty())
+						ServerUniverse::getInstance().createGroup(GroupMemberParam(inviterId, inviterName, inviterDifficulty, inviterProfession, inviterIsPC, inviterShipId, inviterShipIsPOB, inviterOwnsPOB), targetMemberParams);
+				}
+
+				// Until the targets are actually told they are in a group
+				// (the authoritative group object may be on another server)
+				// we will keep track of who extended the invitation
+				std::vector<CreatureObject *>::const_iterator ii = targets.begin();
+				std::vector<CreatureObject *>::const_iterator iiEnd = targets.end();
+				for (; ii != iiEnd; ++ii)
+				{
+					(*ii)->setInviterForPendingGroup(inviterId);
+				}
+			}
+		}
+	}
+	else if (message.getMethod() == "C++GroupJoinInviterInfoReqInviterNotFound")
+	{
+		Chat::sendSystemMessageSimple(*this, GroupStringId::SID_GROUP_MUST_BE_INVITED, NULL);
+	}
+	else if (message.getMethod() == "C++LeaveGroupReq")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const params(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			GroupObject const * const groupObj = getGroup();
+			if (groupObj && (groupObj->getNetworkId() == NetworkId(params)) && (groupObj->getGroupLeaderId() != getNetworkId()))
+			{
+				static uint32 const commandHash = Crc::normalizeAndCalculate("leaveGroup");
+				const Command &command = CommandTable::getCommand(static_cast<uint32>(commandHash));
+				if (!command.isNull())
+				{
+					commandQueueEnqueue(command, NetworkId::cms_invalid, Unicode::String(), 0, false, static_cast<Command::Priority>(Command::CP_Front), true);
+				}
+			}
+		}
+	}
+	else if (message.getMethod() == "C++GroupPickupPointCreated")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const params(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+
+			Unicode::String const delimiters(Unicode::narrowToWide("|"));
+			Unicode::UnicodeStringVector tokens;
+			if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, NULL)) && (tokens.size() == 5))
+			{
+				// tell group member that the group pickup point has been created
+				if (getClient())
+				{
+					StringId::LocUnicodeString response;
+					if (StringId("group", "create_group_pickup_success_others").localize(response))
+					{
+						ConsoleMgr::broadcastString(FormattedString<2048>().sprintf(Unicode::wideToNarrow(response).c_str(), Unicode::wideToNarrow(tokens[4]).c_str(), CalendarTime::convertSecondsToMS(static_cast<unsigned int>(ConfigServerGame::getGroupPickupPointTimeLimitSeconds())).c_str()),
+							getClient());
+					}
+				}
+
+				// create/update the group member's group pickup point waypoint
+				PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+				if (playerObject)
+				{
+					std::string const planetName = Unicode::wideToNarrow(tokens[0]);
+					int const x = atoi(Unicode::wideToNarrow(tokens[1]).c_str());
+					int const y = atoi(Unicode::wideToNarrow(tokens[2]).c_str());
+					int const z = atoi(Unicode::wideToNarrow(tokens[3]).c_str());
+
+					Location const location(Vector(static_cast<real>(x), static_cast<real>(y), static_cast<real>(z)), NetworkId::cms_invalid, Location::getCrcBySceneName(planetName));
+					playerObject->createOrUpdateReusableWaypoint(location, "groupPickupWp", Unicode::narrowToWide("Group Pickup Point"), Waypoint::White);
+				}
+			}
+		}
+	}
+	else if (message.getMethod() == "C++OccupyUnlockedSlotRsp")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const params(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			LoginUpgradeAccountMessage::OccupyUnlockedSlotResponse const response = static_cast<LoginUpgradeAccountMessage::OccupyUnlockedSlotResponse>(::atoi(params.c_str()));
+
+			if (response == LoginUpgradeAccountMessage::OUSR_success)
+			{
+				// CS log the response
+				LOG("CustomerService",("JediUnlockedSlot:%s OccupyUnlockedSlot request SUCCESS", PlayerObject::getAccountDescription(this).c_str()));
+
+				Chat::sendSystemMessage(*this, StringId("unlocked_slot", "occupy_unlocked_slot_success"), Unicode::emptyString);
+
+				// let the client know so it can change the character to be properly displayed on the character select screen
+				Client * const client = getClient();
+				if (client)
+				{
+					GenericValueTypeMessage<std::pair<std::string, NetworkId> > const characterChangedUnlocked("CharacterChangedUnlocked", std::make_pair(GameServer::getInstance().getClusterName(), getNetworkId()));
+					client->send(characterChangedUnlocked, true);
+				}
+			}
+			else if (response == LoginUpgradeAccountMessage::OUSR_db_error)
+			{
+				// CS log the response
+				LOG("CustomerService",("JediUnlockedSlot:%s OccupyUnlockedSlot request FAILED - internal db error", PlayerObject::getAccountDescription(this).c_str()));
+
+				Chat::sendSystemMessage(*this, StringId("unlocked_slot", "occupy_unlocked_slot_db_error"), Unicode::emptyString);
+			}
+			else if (response == LoginUpgradeAccountMessage::OUSR_account_has_no_unlocked_slot)
+			{
+				// CS log the response
+				LOG("CustomerService",("JediUnlockedSlot:%s OccupyUnlockedSlot request FAILED - account doesn't have an unlocked slot", PlayerObject::getAccountDescription(this).c_str()));
+
+				Chat::sendSystemMessage(*this, StringId("unlocked_slot", "occupy_unlocked_slot_db_no_unlocked_slot"), Unicode::emptyString);
+			}
+			else if (response == LoginUpgradeAccountMessage::OUSR_account_has_no_unoccupied_unlocked_slot)
+			{
+				LOG("CustomerService",("JediUnlockedSlot:%s OccupyUnlockedSlot request FAILED - account has no unoccupied unlocked slot", PlayerObject::getAccountDescription(this).c_str()));
+
+				Chat::sendSystemMessage(*this, StringId("unlocked_slot", "occupy_unlocked_slot_db_no_unoccupied_unlocked_slot"), Unicode::emptyString);
+			}
+			else if (response == LoginUpgradeAccountMessage::OUSR_cluster_already_has_unlocked_slot_character)
+			{
+				// CS log the response
+				LOG("CustomerService",("JediUnlockedSlot:%s OccupyUnlockedSlot request FAILED - cluster already has an unlocked slot character", PlayerObject::getAccountDescription(this).c_str()));
+
+				Chat::sendSystemMessage(*this, StringId("unlocked_slot", "occupy_unlocked_slot_db_has_unlocked_slot"), Unicode::emptyString);
+			}
+			else
+			{
+				// CS log the response
+				LOG("CustomerService",("JediUnlockedSlot:%s OccupyUnlockedSlot request FAILED - unknown result code (%d)", PlayerObject::getAccountDescription(this).c_str(), static_cast<int>(response)));
+			}
+		}
+	}
+	else if (message.getMethod() == "C++VacateUnlockedSlotRsp")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const params(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			LoginUpgradeAccountMessage::VacateUnlockedSlotResponse const response = static_cast<LoginUpgradeAccountMessage::VacateUnlockedSlotResponse>(::atoi(params.c_str()));
+
+			if (response == LoginUpgradeAccountMessage::VUSR_success)
+			{
+				// CS log the response
+				LOG("CustomerService",("JediUnlockedSlot:%s VacateUnlockedSlot request SUCCESS", PlayerObject::getAccountDescription(this).c_str()));
+
+				Chat::sendSystemMessage(*this, StringId("unlocked_slot", "vacate_unlocked_slot_success"), Unicode::emptyString);
+
+				// let the client know so it can change the character to be properly displayed on the character select screen
+				Client * const client = getClient();
+				if (client)
+				{
+					GenericValueTypeMessage<std::pair<std::string, NetworkId> > const characterChangedNormal("CharacterChangedNormal", std::make_pair(GameServer::getInstance().getClusterName(), getNetworkId()));
+					client->send(characterChangedNormal, true);
+				}
+			}
+			else if (response == LoginUpgradeAccountMessage::VUSR_db_error)
+			{
+				// CS log the response
+				LOG("CustomerService",("JediUnlockedSlot:%s VacateUnlockedSlot request FAILED - internal db error", PlayerObject::getAccountDescription(this).c_str()));
+
+				Chat::sendSystemMessage(*this, StringId("unlocked_slot", "vacate_unlocked_slot_db_error"), Unicode::emptyString);
+			}
+			else if (response == LoginUpgradeAccountMessage::VUSR_account_has_no_unlocked_slot)
+			{
+				// CS log the response
+				LOG("CustomerService",("JediUnlockedSlot:%s VacateUnlockedSlot request FAILED - account doesn't have an unlocked slot", PlayerObject::getAccountDescription(this).c_str()));
+
+				Chat::sendSystemMessage(*this, StringId("unlocked_slot", "vacate_unlocked_slot_db_no_unlocked_slot"), Unicode::emptyString);
+			}
+			else if (response == LoginUpgradeAccountMessage::VUSR_not_unlocked_slot_character)
+			{
+				// CS log the response
+				LOG("CustomerService",("JediUnlockedSlot:%s VacateUnlockedSlot request FAILED - character is not an unlocked slot character", PlayerObject::getAccountDescription(this).c_str()));
+
+				Chat::sendSystemMessage(*this, StringId("unlocked_slot", "vacate_unlocked_slot_db_not_unlocked_slot_character"), Unicode::emptyString);
+			}
+			else if (response == LoginUpgradeAccountMessage::VUSR_no_available_normal_character_slot)
+			{
+				// CS log the response
+				LOG("CustomerService",("JediUnlockedSlot:%s VacateUnlockedSlot request FAILED - no available normal character slot for the account on this galaxy", PlayerObject::getAccountDescription(this).c_str()));
+
+				Chat::sendSystemMessage(*this, StringId("unlocked_slot", "vacate_unlocked_slot_db_no_available_normal_character_slot"), Unicode::emptyString);
+			}
+			else
+			{
+				// CS log the response
+				LOG("CustomerService",("JediUnlockedSlot:%s VacateUnlockedSlot request FAILED - unknown result code (%d)", PlayerObject::getAccountDescription(this).c_str(), static_cast<int>(response)));
+			}
+		}
+	}
+	else if (message.getMethod() == "C++SwapUnlockedSlotRsp")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			Archive::ByteStream bs;
+			bs.put(reinterpret_cast<const void *>(&message.getPackedDataVector()[0]), static_cast<unsigned int>(message.getPackedDataVector().size()));
+
+			Archive::ReadIterator ri = bs.begin();
+			GenericValueTypeMessage<std::pair<std::pair<int, NetworkId>, std::pair<uint32, std::pair<NetworkId, std::string> > > > const swapUnlockedSlotRsp(ri);
+
+			LoginUpgradeAccountMessage::SwapUnlockedSlotResponse const response = static_cast<LoginUpgradeAccountMessage::SwapUnlockedSlotResponse>(swapUnlockedSlotRsp.getValue().first.first);
+			if (response == LoginUpgradeAccountMessage::SUSR_success)
+			{
+				// CS log the response
+				LOG("CustomerService",("JediUnlockedSlot:%s SwapUnlockedSlot with %s (%s) request SUCCESS", PlayerObject::getAccountDescription(this).c_str(), swapUnlockedSlotRsp.getValue().second.second.first.getValueString().c_str(), swapUnlockedSlotRsp.getValue().second.second.second.c_str()));
+
+				ProsePackage prosePackage;
+				prosePackage.stringId = StringId("unlocked_slot", "swap_unlocked_slot_success");
+				prosePackage.target.str = Unicode::narrowToWide(swapUnlockedSlotRsp.getValue().second.second.second);
+				Chat::sendSystemMessage(*this, prosePackage);
+
+				// let the client know so it can change the character to be properly displayed on the character select screen
+				Client * const client = getClient();
+				if (client)
+				{
+					GenericValueTypeMessage<std::pair<std::string, NetworkId> > const characterChangedNormal("CharacterChangedNormal", std::make_pair(GameServer::getInstance().getClusterName(), getNetworkId()));
+					client->send(characterChangedNormal, true);
+
+					GenericValueTypeMessage<std::pair<std::string, NetworkId> > const characterChangedUnlocked("CharacterChangedUnlocked", std::make_pair(GameServer::getInstance().getClusterName(), swapUnlockedSlotRsp.getValue().second.second.first));
+					client->send(characterChangedUnlocked, true);
+				}
+			}
+			else if (response == LoginUpgradeAccountMessage::SUSR_db_error)
+			{
+				// CS log the response
+				LOG("CustomerService",("JediUnlockedSlot:%s SwapUnlockedSlot with %s request FAILED - internal db error", PlayerObject::getAccountDescription(this).c_str(), swapUnlockedSlotRsp.getValue().second.second.first.getValueString().c_str()));
+
+				Chat::sendSystemMessage(*this, StringId("unlocked_slot", "swap_unlocked_slot_db_error"), Unicode::emptyString);
+			}
+			else if (response == LoginUpgradeAccountMessage::SUSR_account_has_no_unlocked_slot)
+			{
+				// CS log the response
+				LOG("CustomerService",("JediUnlockedSlot:%s SwapUnlockedSlot with %s request FAILED - account doesn't have an unlocked slot", PlayerObject::getAccountDescription(this).c_str(), swapUnlockedSlotRsp.getValue().second.second.first.getValueString().c_str()));
+
+				Chat::sendSystemMessage(*this, StringId("unlocked_slot", "swap_unlocked_slot_db_no_unlocked_slot"), Unicode::emptyString);
+			}
+			else if (response == LoginUpgradeAccountMessage::SUSR_not_unlocked_slot_character)
+			{
+				// CS log the response
+				LOG("CustomerService",("JediUnlockedSlot:%s SwapUnlockedSlot with %s request FAILED - source character is not an unlocked slot character", PlayerObject::getAccountDescription(this).c_str(), swapUnlockedSlotRsp.getValue().second.second.first.getValueString().c_str()));
+
+				Chat::sendSystemMessage(*this, StringId("unlocked_slot", "swap_unlocked_slot_db_not_unlocked_slot_character"), Unicode::emptyString);
+			}
+			else if (response == LoginUpgradeAccountMessage::SUSR_invalid_target_character)
+			{
+				// CS log the response
+				LOG("CustomerService",("JediUnlockedSlot:%s SwapUnlockedSlot with %s request FAILED - target character is either not valid, not on the same account, or not on this galaxy", PlayerObject::getAccountDescription(this).c_str(), swapUnlockedSlotRsp.getValue().second.second.first.getValueString().c_str()));
+
+				Chat::sendSystemMessage(*this, StringId("unlocked_slot", "swap_unlocked_slot_db_invalid_target_character"), Unicode::emptyString);
+			}
+			else if (response == LoginUpgradeAccountMessage::SUSR_target_character_already_unlocked_slot_character)
+			{
+				// CS log the response
+				LOG("CustomerService",("JediUnlockedSlot:%s SwapUnlockedSlot with %s request FAILED - target character is already an unlocked slot character", PlayerObject::getAccountDescription(this).c_str(), swapUnlockedSlotRsp.getValue().second.second.first.getValueString().c_str()));
+
+				Chat::sendSystemMessage(*this, StringId("unlocked_slot", "swap_unlocked_slot_db_target_is_already_unlocked_character"), Unicode::emptyString);
+			}
+			else
+			{
+				// CS log the response
+				LOG("CustomerService",("JediUnlockedSlot:%s SwapUnlockedSlot with %s request FAILED - unknown result code (%d)", PlayerObject::getAccountDescription(this).c_str(), swapUnlockedSlotRsp.getValue().second.second.first.getValueString().c_str(), swapUnlockedSlotRsp.getValue().first.first));
+			}
+		}
+	}
+	else if (message.getMethod() == "C++AccountFeatureIdResponse")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			Archive::ByteStream bs;
+			bs.put(reinterpret_cast<const void *>(&message.getPackedDataVector()[0]), static_cast<unsigned int>(message.getPackedDataVector().size()));
+
+			Archive::ReadIterator ri = bs.begin();
+			AccountFeatureIdResponse const msg(ri);
+
+			if ((msg.getTarget() == getNetworkId()) && (msg.getResultCode() == RESULT_SUCCESS))
+			{
+				Client * client = getClient();
+				if (client)
+				{
+					if (msg.getGameCode() == PlatformGameCode::SWG)
+						client->setAccountFeatureIds(msg.getFeatureIds());
+				}
+			}
+
+			if ((msg.getRequestReason() == AccountFeatureIdRequest::RR_ConsoleCommandReloadRequest) && msg.getRequester().isValid() && (msg.getRequester() == getNetworkId()))
+			{
+				if (msg.getResultCode() == RESULT_SUCCESS)
+				{
+					ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("request for feature Id for account (%lu) was successful", msg.getTargetStationId()),
+						getClient());
+
+					if (msg.getGameCode() == PlatformGameCode::SWG)
+					{
+						ConsoleMgr::broadcastString("you can use the /getAccountInfo command on a targeted character to view the character's account SWG feature Id",
+							getClient());
+					}
+
+					if (msg.getResultCameFromSession())
+					{
+						std::map<uint32, std::string> const & sessionFeatureIdsData = msg.getSessionFeatureIdsData();
+
+						ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("session/Platform reported successful result code (%u, %s:%s), (%d) feature Ids for account (%lu)", msg.getResultCode(), msg.getSessionResultString().c_str(), msg.getSessionResultText().c_str(), sessionFeatureIdsData.size(), msg.getTargetStationId()),
+							getClient());
+
+						for (std::map<uint32, std::string>::const_iterator iter = sessionFeatureIdsData.begin(); iter != sessionFeatureIdsData.end(); ++iter)
+						{
+							ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("%lu (%s)", iter->first, iter->second.c_str()),
+								getClient());
+						}
+					}
+					else if (msg.getGameCode() != PlatformGameCode::SWG)
+					{
+						std::map<uint32, int> const & featureIds = msg.getFeatureIds();
+
+						ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("(%d) feature Ids for account (%lu)", featureIds.size(), msg.getTargetStationId()),
+							getClient());
+
+						for (std::map<uint32, int>::const_iterator iter = featureIds.begin(); iter != featureIds.end(); ++iter)
+						{
+							ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("%lu (%d)", iter->first, iter->second),
+								getClient());
+						}
+					}
+				}
+				else
+				{
+					if (msg.getResultCameFromSession())
+						ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("request for feature Id for account (%lu) failed with error code (%u, %s:%s)", msg.getTargetStationId(), msg.getResultCode(), msg.getSessionResultString().c_str(), msg.getSessionResultText().c_str()), getClient());
+					else
+						ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("request for feature Id for account (%lu) failed with error code (%u)", msg.getTargetStationId(), msg.getResultCode()), getClient());
+				}
+			}
+
+			if ((msg.getRequestReason() == AccountFeatureIdRequest::RR_ReloadRewardCheck) && msg.getRequester().isValid() && (msg.getRequester() == getNetworkId()) && (msg.getGameCode() == PlatformGameCode::SWG))
+			{
+				// let script know the that account feature id has been
+				// retrieved so it can resume the rewards claim process
+				MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), "veteranAccountFeatureIdResponse", std::vector<int8>(), 0, false);
+			}
+		}
+	}
+	else if (message.getMethod() == "C++FeatureIdTransactionResponse")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			Archive::ByteStream bs;
+			bs.put(reinterpret_cast<const void *>(&message.getPackedDataVector()[0]), static_cast<unsigned int>(message.getPackedDataVector().size()));
+
+			Archive::ReadIterator ri = bs.begin();
+			FeatureIdTransactionResponse const msg(ri);
+			VeteranRewardManager::verifyFeatureIdTransactions(*this, msg.getTransactions());
+		}
+	}
+	else if (message.getMethod() == "C++TransferReplyMoveValidation")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			Archive::ByteStream bs;
+			bs.put(reinterpret_cast<const void *>(&message.getPackedDataVector()[0]), static_cast<unsigned int>(message.getPackedDataVector().size()));
+
+			Archive::ReadIterator ri = bs.begin();
+			TransferReplyMoveValidation const msg(ri);
+
+			// we should only be here if the validation failed
+			TransferRequestMoveValidation::TransferRequestSource const transferRequestSource = msg.getTransferRequestSource();
+			if (transferRequestSource == TransferRequestMoveValidation::TRS_console_god_command)
+			{
+				TransferReplyMoveValidation::TransferReplyMoveValidationResult const result = msg.getResult();
+
+				if (result == TransferReplyMoveValidation::TRMVR_cannot_create_regular_character)
+				{
+					ConsoleMgr::broadcastString(FormattedString<256>().sprintf("the destination station id (%u) is not allowed to create any more character on the destination galaxy (%s)", msg.getDestinationStationId(), msg.getDestinationGalaxy().c_str()), getClient());
+				}
+				else if (result == TransferReplyMoveValidation::TRMVR_destination_galaxy_invalid)
+				{
+					ConsoleMgr::broadcastString(FormattedString<256>().sprintf("either the destination galaxy (%s) is invalid, or the destination galaxy (%s) is not using the same login server as this galaxy", msg.getDestinationGalaxy().c_str(), msg.getDestinationGalaxy().c_str()), getClient());
+				}
+				else if (result == TransferReplyMoveValidation::TRMVR_destination_galaxy_not_connected)
+				{
+					ConsoleMgr::broadcastString(FormattedString<256>().sprintf("the destination galaxy (%s) is not currently started", msg.getDestinationGalaxy().c_str()), getClient());
+				}
+				else if (result == TransferReplyMoveValidation::TRMVR_destination_galaxy_in_loading)
+				{
+					ConsoleMgr::broadcastString(FormattedString<256>().sprintf("the destination galaxy (%s) is currently loading", msg.getDestinationGalaxy().c_str()), getClient());
+				}
+				else
+				{
+					ConsoleMgr::broadcastString(FormattedString<256>().sprintf("transfer validation failed with error code (%d)", static_cast<int>(result)), getClient());
+				}
+			}
+			else if ((transferRequestSource == TransferRequestMoveValidation::TRS_ingame_freects_command_validate) || (transferRequestSource == TransferRequestMoveValidation::TRS_ingame_freects_command_transfer))
+			{
+				TransferReplyMoveValidation::TransferReplyMoveValidationResult const result = msg.getResult();
+				if (result == TransferReplyMoveValidation::TRMVR_cannot_create_regular_character)
+				{
+					ScriptParams params;
+					params.addParam(msg.getDestinationGalaxy().c_str(), "destinationGalaxy");
+					ScriptDictionaryPtr dictionary;
+					GameScriptObject::makeScriptDictionary(params, dictionary);
+					if (dictionary.get() != NULL)
+					{
+						dictionary->serialize();
+						MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), "handleFreeCtsValidateFailCannotCreateCharacter", dictionary->getSerializedData(), 0, false);
+					}
+				}
+				else if ((result == TransferReplyMoveValidation::TRMVR_destination_galaxy_invalid) ||
+				         (result == TransferReplyMoveValidation::TRMVR_destination_galaxy_not_connected) ||
+				         (result == TransferReplyMoveValidation::TRMVR_destination_galaxy_in_loading))
+				{
+					ScriptParams params;
+					params.addParam(msg.getDestinationGalaxy().c_str(), "destinationGalaxy");
+					ScriptDictionaryPtr dictionary;
+					GameScriptObject::makeScriptDictionary(params, dictionary);
+					if (dictionary.get() != NULL)
+					{
+						dictionary->serialize();
+						MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), "handleFreeCtsValidateFailDestGalaxyUnavailable", dictionary->getSerializedData(), 0, false);
+					}
+				}
+				else
+				{
+					LOG("CustomerService", ("CharacterTransfer: transfer validation failed for [%u, %s, %s (%s)] to [%u, %s, %s] with unexpected error code (%d)", msg.getSourceStationId(), msg.getSourceGalaxy().c_str(), msg.getSourceCharacter().c_str(), msg.getSourceCharacterId().getValueString().c_str(), msg.getDestinationStationId(), msg.getDestinationGalaxy().c_str(), msg.getDestinationCharacter().c_str(), static_cast<int>(result)));
+				}
+			}
+			else if ((transferRequestSource == TransferRequestMoveValidation::TRS_ingame_cts_command_validate) || (transferRequestSource == TransferRequestMoveValidation::TRS_ingame_cts_command_transfer))
+			{
+				TransferReplyMoveValidation::TransferReplyMoveValidationResult const result = msg.getResult();
+				if (result == TransferReplyMoveValidation::TRMVR_cannot_create_regular_character)
+				{
+					ScriptParams params;
+					params.addParam(msg.getDestinationGalaxy().c_str(), "destinationGalaxy");
+					ScriptDictionaryPtr dictionary;
+					GameScriptObject::makeScriptDictionary(params, dictionary);
+					if (dictionary.get() != NULL)
+					{
+						dictionary->serialize();
+						MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), "handleCtsValidateFailCannotCreateCharacter", dictionary->getSerializedData(), 0, false);
+					}
+				}
+				else if ((result == TransferReplyMoveValidation::TRMVR_destination_galaxy_invalid) ||
+					(result == TransferReplyMoveValidation::TRMVR_destination_galaxy_not_connected) ||
+					(result == TransferReplyMoveValidation::TRMVR_destination_galaxy_in_loading))
+				{
+					ScriptParams params;
+					params.addParam(msg.getDestinationGalaxy().c_str(), "destinationGalaxy");
+					ScriptDictionaryPtr dictionary;
+					GameScriptObject::makeScriptDictionary(params, dictionary);
+					if (dictionary.get() != NULL)
+					{
+						dictionary->serialize();
+						MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), "handleCtsValidateFailDestGalaxyUnavailable", dictionary->getSerializedData(), 0, false);
+					}
+				}
+				else
+				{
+					LOG("CustomerService", ("CharacterTransfer: transfer validation failed for [%u, %s, %s (%s)] to [%u, %s, %s] with unexpected error code (%d)", msg.getSourceStationId(), msg.getSourceGalaxy().c_str(), msg.getSourceCharacter().c_str(), msg.getSourceCharacterId().getValueString().c_str(), msg.getDestinationStationId(), msg.getDestinationGalaxy().c_str(), msg.getDestinationCharacter().c_str(), static_cast<int>(result)));
+				}
+			}
+		}
+	}
+	else if (message.getMethod() == "C++TransferReplyNameValidation")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			Archive::ByteStream bs;
+			bs.put(reinterpret_cast<const void *>(&message.getPackedDataVector()[0]), static_cast<unsigned int>(message.getPackedDataVector().size()));
+
+			Archive::ReadIterator ri = bs.begin();
+			GenericValueTypeMessage<std::pair<std::string, TransferCharacterData> > const msg(ri);
+
+			TransferRequestMoveValidation::TransferRequestSource const transferRequestSource = msg.getValue().second.getTransferRequestSource();
+
+			if (!msg.getValue().second.getIsValidName())
+			{
+				if (transferRequestSource == TransferRequestMoveValidation::TRS_console_god_command)
+				{
+					ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("the character name (%s) is not available on galaxy (%s) because of reason (%s)", msg.getValue().second.getDestinationCharacterName().c_str(), msg.getValue().second.getDestinationGalaxy().c_str(), msg.getValue().first.c_str()), getClient());
+				}
+				else if ((transferRequestSource == TransferRequestMoveValidation::TRS_ingame_freects_command_validate) || (transferRequestSource == TransferRequestMoveValidation::TRS_ingame_freects_command_transfer))
+				{
+					ScriptParams params;
+					params.addParam(msg.getValue().second.getDestinationGalaxy().c_str(), "destinationGalaxy");
+					params.addParam(msg.getValue().second.getDestinationCharacterName().c_str(), "destinationCharacterName");
+					params.addParam(msg.getValue().first.c_str(), "reason");
+					ScriptDictionaryPtr dictionary;
+					GameScriptObject::makeScriptDictionary(params, dictionary);
+					if (dictionary.get() != NULL)
+					{
+						dictionary->serialize();
+						MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), "handleFreeCtsValidateFailNameValidation", dictionary->getSerializedData(), 0, false);
+					}
+				}
+				else if ((transferRequestSource == TransferRequestMoveValidation::TRS_ingame_cts_command_validate) || (transferRequestSource == TransferRequestMoveValidation::TRS_ingame_cts_command_transfer))
+				{
+					ScriptParams params;
+					params.addParam(msg.getValue().second.getDestinationGalaxy().c_str(), "destinationGalaxy");
+					params.addParam(msg.getValue().second.getDestinationCharacterName().c_str(), "destinationCharacterName");
+					params.addParam(msg.getValue().first.c_str(), "reason");
+					ScriptDictionaryPtr dictionary;
+					GameScriptObject::makeScriptDictionary(params, dictionary);
+					if (dictionary.get() != NULL)
+					{
+						dictionary->serialize();
+						MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), "handleCtsValidateFailNameValidation", dictionary->getSerializedData(), 0, false);
+					}
+				}
+			}
+			else if (transferRequestSource == TransferRequestMoveValidation::TRS_ingame_freects_command_validate)
+			{
+				ScriptParams params;
+				params.addParam(msg.getValue().second.getDestinationGalaxy().c_str(), "destinationGalaxy");
+				params.addParam(msg.getValue().second.getDestinationCharacterName().c_str(), "destinationCharacterName");
+				ScriptDictionaryPtr dictionary;
+				GameScriptObject::makeScriptDictionary(params, dictionary);
+				if (dictionary.get() != NULL)
+				{
+					dictionary->serialize();
+					MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), "handleFreeCtsValidateSuccess", dictionary->getSerializedData(), 0, false);
+				}
+			}
+			else if (transferRequestSource == TransferRequestMoveValidation::TRS_ingame_cts_command_validate)
+			{
+				ScriptParams params;
+				params.addParam(msg.getValue().second.getDestinationGalaxy().c_str(), "destinationGalaxy");
+				params.addParam(msg.getValue().second.getDestinationCharacterName().c_str(), "destinationCharacterName");
+				ScriptDictionaryPtr dictionary;
+				GameScriptObject::makeScriptDictionary(params, dictionary);
+				if (dictionary.get() != NULL)
+				{
+					dictionary->serialize();
+					MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), "handleCtsValidateSuccess", dictionary->getSerializedData(), 0, false);
+				}
+			}
+		}
+	}
+	else if (message.getMethod() == "C++PickupAllRoomItemsIntoInventory")
+	{
+		// use while(true) loop to use break to discontinue processing and go to the end of loop to run cleanup code
+		PlayerObject * playerObject = NULL;
+		while (true)
+		{
+			playerObject = PlayerCreatureController::getPlayerObject(this);
+			if (!playerObject)
+				break;
+
+			// player has disconnected
+			if (!getClient())
+				break;
+
+			// don't allow this in god mode because it could be used accidentally and pick up a bunch of stuff,
+			// and god mode allows stuff to be picked up, which wouldn't normally be allowed to be picked up
+			if (getClient()->isGod())
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /pickupAllRoomItemsIntoInventory operation has been terminated because you switched into GOD mode."), Unicode::emptyString);
+				break;
+			}
+
+			// player is not "active", meaning he's probably doing it with a macro
+			if (playerObject->getSessionLastActiveTime() == 0)
+				break;
+
+			int operationId = 0;
+			if (!getObjVars().getItem("pickupDropAllItemsOperation.operationId", operationId) || (operationId == 0))
+				break;
+
+			if (operationId != playerObject->getPickupDropAllItemsOperationId())
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /pickupAllRoomItemsIntoInventory operation has been terminated because of an unexpected condition.  Please try the operation again."), Unicode::emptyString);
+				break;
+			}
+
+			NetworkId const & cellId = playerObject->getPickupDropAllItemsCellId();
+
+			ServerObject const * const containingCell = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*this));
+			if (!containingCell || !containingCell->asCellObject() || (containingCell->getNetworkId() != cellId))
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /pickupAllRoomItemsIntoInventory operation has been terminated because you have left the room."), Unicode::emptyString);
+				break;
+			}
+
+			ServerObject const * const containingPOBso = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*containingCell));
+			if (!containingPOBso)
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /pickupAllRoomItemsIntoInventory operation has been terminated because you have left the room."), Unicode::emptyString);
+				break;
+			}
+
+			if (!containingPOBso->isInWorldCell())
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /pickupAllRoomItemsIntoInventory operation has been terminated because you have left the room."), Unicode::emptyString);
+				break;
+			}
+
+			TangibleObject const * const containingPOB = containingPOBso->asTangibleObject();
+			if (!containingPOB)
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /pickupAllRoomItemsIntoInventory operation has been terminated because of an internal error."), Unicode::emptyString);
+				break;
+			}
+
+			if (!containingPOB->isOnAdminList(*this))
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /pickupAllRoomItemsIntoInventory operation has been terminated because you are no longer the the owner or an admin of the structure or POB ship."), Unicode::emptyString);
+				break;
+			}
+
+			ServerObject * const targetInventoryObj = getInventory();
+			if (!targetInventoryObj)
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /pickupAllRoomItemsIntoInventory operation has been terminated because of an internal error."), Unicode::emptyString);
+				break;
+			}
+
+			VolumeContainer * const targetInventoryContainer = ContainerInterface::getVolumeContainer(*targetInventoryObj);
+			if (!targetInventoryContainer)
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /pickupAllRoomItemsIntoInventory operation has been terminated because of an internal error."), Unicode::emptyString);
+				break;
+			}
+
+			int const inventoryBaseLimit = targetInventoryContainer->getTotalVolume();
+			int const inventoryLimit = (playerObject->getPickupAllItemsAllowInventoryOverload() ? std::max(inventoryBaseLimit, (inventoryBaseLimit + ConfigServerGame::getMoveValidationMaxInventoryOverload() - 11)) : inventoryBaseLimit);
+
+			if (targetInventoryContainer->getCurrentVolume() >= inventoryLimit)
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /pickupAllRoomItemsIntoInventory operation has been terminated because your inventory is full."), Unicode::emptyString);
+
+				// if they didn't run the command with the -overload
+				// option, remind them about the -overload option
+				if (!playerObject->getPickupAllItemsAllowInventoryOverload())
+					Chat::sendSystemMessage(*this, Unicode::narrowToWide("If you wish to pick up more items than available inventory space, you can specify the \"overload\" option with the command by typing \"/pickupAllRoomItemsIntoInventory -overload\" which will pick up additional items and overload your inventory, but not so overloaded as to prevent you from moving."), Unicode::emptyString);
+
+				break;
+			}
+
+			Container const * const cellContainer = ContainerInterface::getContainer(*containingCell);
+			if (!cellContainer)
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /pickupAllRoomItemsIntoInventory operation has been terminated because of an internal error."), Unicode::emptyString);
+				break;
+			}
+
+			std::set<NetworkId> & processedItemsSoFar = playerObject->getPickupDropAllItemsProcessedItemsSoFar();
+			std::list<CachedNetworkId> cellContents;
+			{
+				for (ContainerConstIterator iter = cellContainer->begin(); iter != cellContainer->end(); ++iter)
+				{
+					if ((*iter != getNetworkId()) && (processedItemsSoFar.count(*iter) <= 0))
+						cellContents.push_back(*iter);
+				}
+			}
+
+			if (cellContents.empty())
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /pickupAllRoomItemsIntoInventory operation has been terminated because no more items in the room can be picked up or the room is empty."), Unicode::emptyString);
+				break;
+			}
+
+			// if necessary, temporary increase the inventory limit to allow overload
+			if (inventoryLimit > inventoryBaseLimit)
+				targetInventoryContainer->debugDoNotUseSetCapacity(inventoryLimit);
+
+			int numberOfItemsPickedUpSoFar = playerObject->getPickupDropAllItemsNumItemsSoFar();
+
+			char buffer[512];
+			Vector const pos = Transform::identity.getPosition_p();
+			snprintf(buffer, sizeof(buffer)-1, " %s -1 %f %f %f", targetInventoryObj->getNetworkId().getValueString().c_str(), pos.x, pos.y, pos.z);
+			buffer[sizeof(buffer)-1] = '\0';
+			Unicode::String const commandTransferItemMiscParams = Unicode::narrowToWide(buffer);
+
+			static uint32 const hashTransferItemMisc = Crc::normalizeAndCalculate("transferItemMisc");
+			Command const & commandTransferItemMisc = CommandTable::getCommand(hashTransferItemMisc);
+			ServerObject const * cellContent;
+			bool blockedByNoTrade;
+			bool showPickUpMenu;
+			Container::ContainerErrorCode cec;
+			int previousVolume, newVolume;
+			int numberOfItemsToProcessThisRound = ConfigServerGame::getPickDropAllRoomItemsNumberOfItemsPerRound();
+			for (std::list<CachedNetworkId>::const_iterator iter = cellContents.begin(); iter != cellContents.end(); ++iter)
+			{
+				--numberOfItemsToProcessThisRound;
+				processedItemsSoFar.insert(*iter);
+
+				cellContent = safe_cast<ServerObject const *>(iter->getObject());
+				if (!cellContent)
+					continue;
+
+				if (ContainerInterface::getContainedByObject(*cellContent) != containingCell)
+					continue;
+
+				// see if the item would normally have the "Pick Up" menu item on it
+				if (!PlayerCreatureController::objectMenuRequestCanManipulateObject(*this, *cellContent, blockedByNoTrade, showPickUpMenu))
+					continue;
+
+				if (!showPickUpMenu)
+					continue;
+
+				// see if item would fit in inventory
+				if (!targetInventoryContainer->mayAdd(*cellContent, cec))
+					continue;
+
+				// "Pick Up" the item, just as if the player had used the "Pick Up" radial or /pickup command
+				previousVolume = targetInventoryContainer->getCurrentVolume();
+				CommandCppFuncs::commandFuncTransferMisc(commandTransferItemMisc, getNetworkId(), cellContent->getNetworkId(), commandTransferItemMiscParams);
+
+				// stop trying when inventory is full
+				newVolume = targetInventoryContainer->getCurrentVolume();
+				if (newVolume >= inventoryLimit)
+				{
+					Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /pickupAllRoomItemsIntoInventory operation has been terminated because your inventory is full."), Unicode::emptyString);
+
+					// if they didn't run the command with the -overload
+					// option, remind them about the -overload option
+					if (!playerObject->getPickupAllItemsAllowInventoryOverload())
+						Chat::sendSystemMessage(*this, Unicode::narrowToWide("If you wish to pick up more items than available inventory space, you can specify the \"overload\" option with the command by typing \"/pickupAllRoomItemsIntoInventory -overload\" which will pick up additional items and overload your inventory, but not so overloaded as to prevent you from moving."), Unicode::emptyString);
+
+					break;
+				}
+
+				// update count of how many items have been picked up for the operation
+				numberOfItemsPickedUpSoFar += std::max(0, (newVolume - previousVolume));
+
+				// stop trying when enough items have been picked up for the operation
+				if (numberOfItemsPickedUpSoFar > inventoryLimit)
+				{
+					Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /pickupAllRoomItemsIntoInventory operation has been terminated because \"enough\" items have been picked up."), Unicode::emptyString);
+					break;
+				}
+
+				// only do so many items each round, to spread out the load
+				if (numberOfItemsToProcessThisRound <= 0)
+					break;
+			}
+
+			// if necessary, restore the inventory limit
+			if (inventoryLimit > inventoryBaseLimit)
+				targetInventoryContainer->debugDoNotUseSetCapacity(inventoryBaseLimit);
+
+			// stop if inventory is full
+			if (targetInventoryContainer->getCurrentVolume() >= inventoryLimit)
+				break;
+
+			// stop if enough items have been picked up for the operation
+			if (numberOfItemsPickedUpSoFar > inventoryLimit)
+				break;
+			else
+				playerObject->setPickupDropAllItemsNumItemsSoFar(numberOfItemsPickedUpSoFar);
+
+			// stop if no more items can be picked up
+			if (numberOfItemsToProcessThisRound > 0)
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /pickupAllRoomItemsIntoInventory operation has been terminated because no more items in the room can be picked up or the room is empty."), Unicode::emptyString);
+				break;
+			}
+
+			// queue up the next round of pickup
+			MessageToQueue::getInstance().sendMessageToC(getNetworkId(),
+				"C++PickupAllRoomItemsIntoInventory",
+				"",
+				1,
+				false);
+
+			return;
+		}
+
+		// if we reach this point, it means we are stopping the operation, so cleanup
+		removeObjVarItem("pickupDropAllItemsOperation");
+
+		if (playerObject)
+		{
+			playerObject->setPickupDropAllItemsOperationId(0);
+			playerObject->setPickupDropAllItemsCellId(NetworkId::cms_invalid);
+			playerObject->setPickupAllItemsAllowInventoryOverload(false);
+			playerObject->setPickupDropAllItemsNumItemsSoFar(0);
+			playerObject->getPickupDropAllItemsProcessedItemsSoFar().clear();
+		}
+	}
+	else if (message.getMethod() == "C++DropAllInventoryItemsIntoRoom")
+	{
+		// use while(true) loop to use break to discontinue processing and go to the end of loop to run cleanup code
+		PlayerObject * playerObject = NULL;
+		while (true)
+		{
+			playerObject = PlayerCreatureController::getPlayerObject(this);
+			if (!playerObject)
+				break;
+
+			// player has disconnected
+			if (!getClient())
+				break;
+
+			// don't allow this in god mode because it could be used accidentally and drop a bunch of stuff,
+			// and god mode allows stuff to be dropped, which wouldn't normally be allowed to be dropped
+			if (getClient()->isGod())
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /dropAllInventoryItemsIntoRoom operation has been terminated because you switched into GOD mode."), Unicode::emptyString);
+				break;
+			}
+
+			// player is not "active", meaning he's probably doing it with a macro
+			if (playerObject->getSessionLastActiveTime() == 0)
+				break;
+
+			int operationId = 0;
+			if (!getObjVars().getItem("pickupDropAllItemsOperation.operationId", operationId) || (operationId == 0))
+				break;
+
+			if (operationId != playerObject->getPickupDropAllItemsOperationId())
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /dropAllInventoryItemsIntoRoom operation has been terminated because of an unexpected condition.  Please try the operation again."), Unicode::emptyString);
+				break;
+			}
+
+			NetworkId const & cellId = playerObject->getPickupDropAllItemsCellId();
+
+			ServerObject const * const containingCell = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*this));
+			if (!containingCell || !containingCell->asCellObject() || (containingCell->getNetworkId() != cellId))
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /dropAllInventoryItemsIntoRoom operation has been terminated because you have left the room."), Unicode::emptyString);
+				break;
+			}
+
+			ServerObject const * const containingPOBso = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*containingCell));
+			if (!containingPOBso)
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /dropAllInventoryItemsIntoRoom operation has been terminated because you have left the room."), Unicode::emptyString);
+				break;
+			}
+
+			if (!containingPOBso->isInWorldCell())
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /dropAllInventoryItemsIntoRoom operation has been terminated because you have left the room."), Unicode::emptyString);
+				break;
+			}
+
+			TangibleObject const * const containingPOB = containingPOBso->asTangibleObject();
+			if (!containingPOB)
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /dropAllInventoryItemsIntoRoom operation has been terminated because of an internal error."), Unicode::emptyString);
+				break;
+			}
+
+			if (!containingPOB->isOnAdminList(*this))
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /dropAllInventoryItemsIntoRoom operation has been terminated because you are no longer the the owner or an admin of the structure or POB ship."), Unicode::emptyString);
+				break;
+			}
+
+			int pobBaseItemLimit = 0;
+			int pobAdditionalItems = 0;
+			const int pobItemLimit = containingPOB->getPobTotalItemLimit(pobBaseItemLimit, pobAdditionalItems);
+
+			if (containingPOB->getPobItemCount() >= pobItemLimit)
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /dropAllInventoryItemsIntoRoom operation has been terminated because the structure or POB ship is full."), Unicode::emptyString);
+				break;
+			}
+
+			ServerObject const * const targetInventoryObj = getInventory();
+			if (!targetInventoryObj)
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /dropAllInventoryItemsIntoRoom operation has been terminated because of an internal error."), Unicode::emptyString);
+				break;
+			}
+
+			VolumeContainer const * const targetInventoryContainer = ContainerInterface::getVolumeContainer(*targetInventoryObj);
+			if (!targetInventoryContainer)
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /dropAllInventoryItemsIntoRoom operation has been terminated because of an internal error."), Unicode::emptyString);
+				break;
+			}
+
+			int const inventoryOverloadLimit = targetInventoryContainer->getTotalVolume() + ConfigServerGame::getMoveValidationMaxInventoryOverload();
+
+			std::set<NetworkId> & processedItemsSoFar = playerObject->getPickupDropAllItemsProcessedItemsSoFar();
+			std::list<CachedNetworkId> inventoryContents;
+			{
+				for (ContainerConstIterator iter = targetInventoryContainer->begin(); iter != targetInventoryContainer->end(); ++iter)
+				{
+					if (processedItemsSoFar.count(*iter) <= 0)
+						inventoryContents.push_back(*iter);
+				}
+			}
+
+			if (inventoryContents.empty())
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /dropAllInventoryItemsIntoRoom operation has been terminated because no more items in your inventory can be dropped or your inventory is empty."), Unicode::emptyString);
+				break;
+			}
+
+			int numberOfItemsDroppedSoFar = playerObject->getPickupDropAllItemsNumItemsSoFar();
+
+			char buffer[512];
+			Vector const pos = getTransform_o2c().getPosition_p();
+			snprintf(buffer, sizeof(buffer)-1, " %s -1 %f %f %f", containingCell->getNetworkId().getValueString().c_str(), pos.x, pos.y, pos.z);
+			buffer[sizeof(buffer)-1] = '\0';
+			Unicode::String const commandTransferItemMiscParams = Unicode::narrowToWide(buffer);
+
+			static uint32 const hashTransferItemMisc = Crc::normalizeAndCalculate("transferItemMisc");
+			Command const & commandTransferItemMisc = CommandTable::getCommand(hashTransferItemMisc);
+			ServerObject const * inventoryContent;
+			int previousVolume, newVolume;
+			int numberOfItemsToProcessThisRound = ConfigServerGame::getPickDropAllRoomItemsNumberOfItemsPerRound();
+			for (std::list<CachedNetworkId>::const_iterator iter = inventoryContents.begin(); iter != inventoryContents.end(); ++iter)
+			{
+				--numberOfItemsToProcessThisRound;
+				processedItemsSoFar.insert(*iter);
+
+				inventoryContent = safe_cast<ServerObject const *>(iter->getObject());
+				if (!inventoryContent)
+					continue;
+
+				if (ContainerInterface::getContainedByObject(*inventoryContent) != targetInventoryObj)
+					continue;
+
+				previousVolume = containingPOB->getPobItemCount();
+				if ((previousVolume + inventoryContent->getVolume()) > pobItemLimit)
+					continue;
+
+				// "Drop" the item, just as if the player had used the "Drop" radial
+				CommandCppFuncs::commandFuncTransferMisc(commandTransferItemMisc, getNetworkId(), inventoryContent->getNetworkId(), commandTransferItemMiscParams);
+
+				// stop trying when POB is full
+				newVolume = containingPOB->getPobItemCount();
+				if (newVolume >= pobItemLimit)
+				{
+					Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /dropAllInventoryItemsIntoRoom operation has been terminated because the structure or POB ship is full."), Unicode::emptyString);
+					break;
+				}
+
+				// update count of how many items have been dropped for the operation
+				numberOfItemsDroppedSoFar += std::max(0, (newVolume - previousVolume));
+
+				// stop trying when enough items have been dropped for the operation
+				if ((numberOfItemsDroppedSoFar > inventoryOverloadLimit) && (numberOfItemsDroppedSoFar > ConfigServerGame::getPickDropAllRoomItemsNumberOfItemsPerRound()))
+				{
+					Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /dropAllInventoryItemsIntoRoom operation has been terminated because \"enough\" items have been dropped."), Unicode::emptyString);
+					break;
+				}
+
+				// only do so many items each round, to spread out the load
+				if (numberOfItemsToProcessThisRound <= 0)
+					break;
+			}
+
+			// stop if POB is full
+			if (containingPOB->getPobItemCount() >= pobItemLimit)
+				break;
+
+			// stop if enough items have been dropped for the operation
+			if ((numberOfItemsDroppedSoFar > inventoryOverloadLimit) && (numberOfItemsDroppedSoFar > ConfigServerGame::getPickDropAllRoomItemsNumberOfItemsPerRound()))
+				break;
+			else
+				playerObject->setPickupDropAllItemsNumItemsSoFar(numberOfItemsDroppedSoFar);
+
+			// stop if no more items can be dropped
+			if (numberOfItemsToProcessThisRound > 0)
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The /dropAllInventoryItemsIntoRoom operation has been terminated because no more items in your inventory can be dropped or your inventory is empty."), Unicode::emptyString);
+				break;
+			}
+
+			// queue up the next round of drop
+			MessageToQueue::getInstance().sendMessageToC(getNetworkId(),
+				"C++DropAllInventoryItemsIntoRoom",
+				"",
+				1,
+				false);
+
+			return;
+		}
+
+		// if we reach this point, it means we are stopping the operation, so cleanup
+		removeObjVarItem("pickupDropAllItemsOperation");
+
+		if (playerObject)
+		{
+			playerObject->setPickupDropAllItemsOperationId(0);
+			playerObject->setPickupDropAllItemsCellId(NetworkId::cms_invalid);
+			playerObject->setPickupAllItemsAllowInventoryOverload(false);
+			playerObject->setPickupDropAllItemsNumItemsSoFar(0);
+			playerObject->getPickupDropAllItemsProcessedItemsSoFar().clear();
+		}
+	}
+	else if (message.getMethod() == "C++RestoreDecorationLayout")
+	{
+		// use while(true) loop to use break to discontinue processing and go to the end of loop to run cleanup code
+		PlayerObject * playerObject = NULL;
+		while (true)
+		{
+			playerObject = PlayerCreatureController::getPlayerObject(this);
+			if (!playerObject)
+				break;
+
+			// player has disconnected
+			if (!getClient())
+				break;
+
+			// player is not "active", meaning he's probably doing it with a macro
+			if (playerObject->getSessionLastActiveTime() == 0)
+				break;
+
+			int operationId = 0;
+			if (!getObjVars().getItem("restoreDecorationOperation.operationId", operationId) || (operationId == 0))
+				break;
+
+			if (operationId != playerObject->getRestoreDecorationOperationId())
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The restore decoration layout operation has been terminated because of an unexpected condition.  Please try the operation again."), Unicode::emptyString);
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide(FormattedString<256>().sprintf("%d items to be moved/restored, %d items attempted, %d items moved/restored.", playerObject->getRestoreDecorationTotalCount(), playerObject->getRestoreDecorationAttemptedCount(), playerObject->getRestoreDecorationSuccessCount())), Unicode::emptyString);
+				break;
+			}
+
+			ServerObject * const containingCell = safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(*this));
+			if (!containingCell || !containingCell->asCellObject())
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The restore decoration layout operation has been terminated because you have left the structure or POB ship."), Unicode::emptyString);
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide(FormattedString<256>().sprintf("%d items to be moved/restored, %d items attempted, %d items moved/restored.", playerObject->getRestoreDecorationTotalCount(), playerObject->getRestoreDecorationAttemptedCount(), playerObject->getRestoreDecorationSuccessCount())), Unicode::emptyString);
+				break;
+			}
+
+			ServerObject * const containingPOBso = safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(*containingCell));
+			if (!containingPOBso)
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The restore decoration layout operation has been terminated because you have left the structure or POB ship."), Unicode::emptyString);
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide(FormattedString<256>().sprintf("%d items to be moved/restored, %d items attempted, %d items moved/restored.", playerObject->getRestoreDecorationTotalCount(), playerObject->getRestoreDecorationAttemptedCount(), playerObject->getRestoreDecorationSuccessCount())), Unicode::emptyString);
+				break;
+			}
+
+			if (!containingPOBso->isInWorldCell())
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The restore decoration layout operation has been terminated because you have left the structure or POB ship."), Unicode::emptyString);
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide(FormattedString<256>().sprintf("%d items to be moved/restored, %d items attempted, %d items moved/restored.", playerObject->getRestoreDecorationTotalCount(), playerObject->getRestoreDecorationAttemptedCount(), playerObject->getRestoreDecorationSuccessCount())), Unicode::emptyString);
+				break;
+			}
+
+			if (containingPOBso->getNetworkId() != playerObject->getRestoreDecorationPobId())
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The restore decoration layout operation has been terminated because you have left the structure or POB ship."), Unicode::emptyString);
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide(FormattedString<256>().sprintf("%d items to be moved/restored, %d items attempted, %d items moved/restored.", playerObject->getRestoreDecorationTotalCount(), playerObject->getRestoreDecorationAttemptedCount(), playerObject->getRestoreDecorationSuccessCount())), Unicode::emptyString);
+				break;
+			}
+
+			TangibleObject * const containingPOB = containingPOBso->asTangibleObject();
+			if (!containingPOB)
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The restore decoration layout operation has been terminated because of an internal error."), Unicode::emptyString);
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide(FormattedString<256>().sprintf("%d items to be moved/restored, %d items attempted, %d items moved/restored.", playerObject->getRestoreDecorationTotalCount(), playerObject->getRestoreDecorationAttemptedCount(), playerObject->getRestoreDecorationSuccessCount())), Unicode::emptyString);
+				break;
+			}
+
+			if (!containingPOB->isOnAdminList(*this))
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The restore decoration layout operation has been terminated because you are no longer the the owner or an admin of the structure or POB ship."), Unicode::emptyString);
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide(FormattedString<256>().sprintf("%d items to be moved/restored, %d items attempted, %d items moved/restored.", playerObject->getRestoreDecorationTotalCount(), playerObject->getRestoreDecorationAttemptedCount(), playerObject->getRestoreDecorationSuccessCount())), Unicode::emptyString);
+				break;
+			}
+
+			int numberOfItemsToProcessThisRound = ConfigServerGame::getPickDropAllRoomItemsNumberOfItemsPerRound();
+			std::list<std::pair<std::pair<CachedNetworkId, CachedNetworkId>, std::pair<Vector, Quaternion> > > & restoreDecorationLayoutList = playerObject->getRestoreDecorationLayoutList();
+			while (!restoreDecorationLayoutList.empty() && (numberOfItemsToProcessThisRound > 0))
+			{
+				std::pair<std::pair<CachedNetworkId, CachedNetworkId>, std::pair<Vector, Quaternion> > const & front = restoreDecorationLayoutList.front();
+				restoreItemDecorationLayout(*this, *playerObject, front.first.first, *containingPOB, front.first.second, front.second.first, front.second.second);
+				playerObject->setRestoreDecorationAttemptedCount(playerObject->getRestoreDecorationAttemptedCount() + 1);
+				--numberOfItemsToProcessThisRound;
+				restoreDecorationLayoutList.pop_front();
+			}
+
+			if (restoreDecorationLayoutList.empty())
+			{
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide("The restore decoration layout operation has been completed."), Unicode::emptyString);
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide(FormattedString<256>().sprintf("%d items to be moved/restored, %d items attempted, %d items moved/restored.", playerObject->getRestoreDecorationTotalCount(), playerObject->getRestoreDecorationAttemptedCount(), playerObject->getRestoreDecorationSuccessCount())), Unicode::emptyString);
+				break;
+			}
+
+			// queue up the next round of restore
+			MessageToQueue::getInstance().sendMessageToC(getNetworkId(),
+				"C++RestoreDecorationLayout",
+				"",
+				1,
+				false);
+
+			return;
+		}
+
+		// if we reach this point, it means we are stopping the operation, so cleanup
+		removeObjVarItem("restoreDecorationOperation");
+
+		if (playerObject)
+		{
+			playerObject->setRestoreDecorationOperationId(0);
+			playerObject->setRestoreDecorationPobId(NetworkId::cms_invalid);
+			playerObject->setRestoreDecorationTotalCount(0);
+			playerObject->setRestoreDecorationAttemptedCount(0);
+			playerObject->setRestoreDecorationSuccessCount(0);
+			playerObject->getRestoreDecorationLayoutList().clear();
+		}
+	}
+	else if (message.getMethod() == "C++CityAddCitizen")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const params(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			const int cityId = atoi(params.c_str());
+			if (cityId > 0)
+				CityInterface::enterCityChatRoom(cityId, *this);
+		}
+	}
+	else if (message.getMethod() == "C++CityRemoveCitizen")
+	{
+		if (!message.getPackedDataVector().empty())
+		{
+			std::string const params(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			const int cityId = atoi(params.c_str());
+			if (cityId > 0)
+				CityInterface::leaveCityChatRoom(cityId, *this);
+		}
+	}
+	else
+	{
+		TangibleObject::handleCMessageTo(message);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+bool CreatureObject::alwaysSendReliableTransform() const
+{
+	return false;
+}
+
+//-----------------------------------------------------------------------
+
+bool CreatureObject::immediateLogoutAllowed()
+{
+	// Notes:
+	//   1. This should only be called on authoritative objects.
+	//   2. This call is triggered by a client disconnect that we will only see if a client is
+	//      already associated with this object.
+	//   3. A client is only associated with an object when the object has finished baselines and
+	//      is authoritative; therefore, we should never hit a case where a player that is logging
+	//      in gets disconnected and causes this function to get called.
+	//   4. Even though this function is phrased as a query, it has some serious side effects.
+	//      Calling it should be treated as if the caller is saying "Prepare for a disconnect" even
+	//      though script can override and prevent an immediate logout.
+	DEBUG_FATAL(!isAuthoritative(), ("CreatureObject::immediateLogoutAllowed() should only be called on authoritative objects."));
+
+	// if we are in an npc conversation, end it
+	if (isInNpcConversation())
+		endNpcConversation();
+
+	// if we are mounted, dismount.
+	if (getState(States::RidingMount))
+	{
+		CreatureObject *const mountedCreature = getMountedCreature();
+		if (mountedCreature)
+			mountedCreature->detachRider(getNetworkId());
+	}
+
+	virtualOnLogout();
+
+	LOG("CustomerService", ("Money:%s logging out with %d money", PlayerObject::getAccountDescription(getNetworkId()).c_str(), getTotalMoney()));
+
+	ScriptParams params;
+	return (getScriptObject()->trigAllScripts(Scripting::TRIG_IMMEDIATE_LOGOUT, params) == SCRIPT_CONTINUE);
+}
+
+//-----------------------------------------------------------------------
+
+float CreatureObject::getStepHeight() const
+{
+	return static_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate())->getStepHeight();
+}
+
+//----------------------------------------------------------------------
+
+float CreatureObject::getApproachTriggerRange() const
+{
+	return static_cast<const ServerCreatureObjectTemplate *>(getObjectTemplate())->getApproachTriggerRange();
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::setIsBeast(bool newValue)
+{
+	if(m_isBeast.get() != newValue)
+	{
+		m_isBeast.set(newValue);
+	}
+}
+
+//----------------------------------------------------------------------
+
+bool CreatureObject::setForceShowHam(bool show)
+{
+	if(!isAuthoritative())
+	{
+		return false;
+	}
+
+	m_forceShowHam.set(show);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::setIsStatic(bool newValue)
+{
+	if(m_isStatic.get() != newValue)
+	{
+		m_isStatic = newValue;
+		if (newValue)
+		{
+			TerrainObject* const terrain = TerrainObject::getInstance();
+			if (terrain && terrain->isReferenceObject(this))
+				terrain->removeReferenceObject(this);
+			// don't alter static creatures
+			if (!isPlayerControlled())
+				setDefaultAlterTime(AlterResult::cms_keepNoAlter);
+		}
+		else
+		{
+			potentiallyAddToTerrain();
+			if (!isPlayerControlled())
+				setDefaultAlterTime(AlterResult::cms_alterQuickly);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+bool CreatureObject::potentiallyAddToTerrain()
+{
+	//@todo don't make reference object if any of the following are true:
+	// check is "asleep" (must add when woken up)
+
+	TerrainObject* const terrain = TerrainObject::getInstance ();
+	if ( isAuthoritative() && !getIsStatic() && !getCreatureController()->getHibernate() && terrain && !terrain->isReferenceObject(this) && isInWorldCell() )
+	{
+		terrain->addReferenceObject(this);
+		return true;
+	}
+	return false;
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::virtualOnAddedToWorldCell()
+{
+	TangibleObject::virtualOnAddedToWorldCell();
+	potentiallyAddToTerrain();
+	m_lastRegionNotifyPosition = getPosition_w();
+	m_lastRegionNotifyPosition.x += 1.0f; // force a check
+	checkNotifyRegions();
+}
+
+//------------------------------------------------------------------------------------------
+
+void CreatureObject::virtualOnRemovedFromWorldCell()
+{
+	TangibleObject::virtualOnRemovedFromWorldCell();
+
+	TerrainObject* const terrain = TerrainObject::getInstance();
+	if (terrain && terrain->isReferenceObject(this))
+		terrain->removeReferenceObject(this);
+}
+
+//------------------------------------------------------------------------------------------
+
+void CreatureObject::virtualOnSetAuthority()
+{
+	TangibleObject::virtualOnSetAuthority();
+
+	potentiallyAddToTerrain();
+
+	for (int i = 0; i < Attributes::NumberOfAttributes; ++i)
+		m_regeneration[i] = 0;
+
+	if (isPlayerControlled())
+	{
+		setNumberOfMissionsWantedInMissionBag(ConfigServerGame::getNumberOfMissionsWantedInMissionBag());
+
+		if (isInitialized())
+		{
+			Client *client = GameServer::getInstance().getClient(getNetworkId());
+			if (client)
+				client->onLoadPlayer(*this);
+		}
+	}
+
+	AICreatureController * const controller = AICreatureController::asAiCreatureController(getController());
+
+	if (controller)
+		controller->setAuthority(true);
+
+	//-- Update the creature's group mission critical object set
+	GroupMissionCriticalObjectsBuilder::updateGroupMissionCriticalObjects(*this, true);
+}
+
+//------------------------------------------------------------------------------------------
+
+void CreatureObject::virtualOnReleaseAuthority()
+{
+	TangibleObject::virtualOnReleaseAuthority();
+	TerrainObject* const terrain = TerrainObject::getInstance();
+	if (terrain && terrain->isReferenceObject(this))
+		terrain->removeReferenceObject(this);
+
+	AICreatureController * const controller = AICreatureController::asAiCreatureController(getController());
+
+	if(controller)
+	{
+		if (getProperty(SlopeEffectProperty::getClassPropertyId()) != NULL)
+			removeProperty(SlopeEffectProperty::getClassPropertyId());
+		controller->setAuthority(false);
+	}
+}
+
+//------------------------------------------------------------------------------------------
+
+void CreatureObject::virtualOnLogout()
+{
+	TangibleObject::virtualOnLogout();
+	PlayerObject * const player = PlayerCreatureController::getPlayerObject(this);
+	if (player != NULL)
+		player->virtualOnLogout();
+}
+
+//------------------------------------------------------------------------------------------
+
+bool CreatureObject::wantSawAttackTriggers() const
+{
+	if (isDisabled())
+		return false;
+	return TangibleObject::wantSawAttackTriggers();
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::addPackedWearable(std::string const &appearanceData, int arrangementIndex, NetworkId const &networkId, uint32 sharedTemplateCrcValue, const BaselinesMessage * weaponSharedBaselines, const BaselinesMessage * weaponSharedNpBaselines)
+{
+	//-- Check if this network id already exists in the wearable list.
+	size_t const length = m_wearableData.size();
+	for (size_t i = 0; i < length; ++i)
+	{
+		WearableEntry const &entry = m_wearableData[i];
+		if (entry.m_networkId == networkId)
+		{
+			// Check if this entry exists but in a different configuration.
+			WARNING((entry.m_arrangement != arrangementIndex), ("attempted to add object id=[%s] in packed wearable list multiple times in different arrangements, existing=[%d],new=[%d].", appearanceData.c_str(), entry.m_arrangement, arrangementIndex));
+			WARNING((static_cast<uint32>(entry.m_objectTemplate) != sharedTemplateCrcValue), ("attempted to add object id=[%s] in packed wearable list multiple times differing only by shared object template crc value, existing=[%d],new=[%d].", appearanceData.c_str(), entry.m_objectTemplate, static_cast<int>(sharedTemplateCrcValue)));
+			DEBUG_WARNING((entry.m_appearanceString != appearanceData), ("attempted to add object id=[%s] in packed wearable list multiple times differing only by appearance customization data.", appearanceData.c_str()));
+
+			// Done, this entry is already in the wearable data list.
+
+			// we own the weaponSharedBaselines and weaponSharedBaselines pointers, so if
+			// we are not going to add them to the wearables list, we must delete them
+			if (weaponSharedBaselines)
+				delete weaponSharedBaselines;
+			if (weaponSharedNpBaselines)
+				delete weaponSharedNpBaselines;
+
+			return;
+		}
+	}
+
+	//-- Add the new entry.
+	m_wearableData.push_back(WearableEntry(appearanceData, arrangementIndex, networkId, sharedTemplateCrcValue, weaponSharedBaselines, weaponSharedNpBaselines));
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::packWearables()
+{
+	// Pack wearables data
+
+	SlottedContainer const * const myContainer = ContainerInterface::getSlottedContainer(*this);
+
+	if (myContainer)
+	{
+		Object const * inventory = 0;
+		Object const * datapad = 0;
+		Object const * appearance = 0;
+		Container::ContainerErrorCode tmp = Container::CEC_Success;
+		static SlotId const inventorySlot = SlotIdManager::findSlotId(CreatureObjectNamespace::SlotNames::inventory);
+		if (inventorySlot != SlotId::invalid)
+		{
+			Container::ContainedItem itemId = myContainer->getObjectInSlot(inventorySlot, tmp);
+			inventory = itemId.getObject();
+		}
+		SlotId datapadSlot = SlotIdManager::findSlotId(CreatureObjectNamespace::SlotNames::datapad);
+		if (datapadSlot != SlotId::invalid)
+		{
+			Container::ContainedItem itemId = myContainer->getObjectInSlot(datapadSlot, tmp);
+			datapad = itemId.getObject();
+		}
+		SlotId appearanceInvSlot = SlotIdManager::findSlotId(CreatureObjectNamespace::SlotNames::appearance);
+		if (appearanceInvSlot != SlotId::invalid)
+		{
+			Container::ContainedItem itemId = myContainer->getObjectInSlot(appearanceInvSlot, tmp);
+			appearance = itemId.getObject();
+		}
+
+		for (ContainerConstIterator iter = myContainer->begin(); iter != myContainer->end(); ++iter)
+		{
+			Object const * const o = (*iter).getObject();
+			if (o)
+			{
+				ServerObject const * const so = o->asServerObject();
+				if (so)
+				{
+					TangibleObject const * const tang = so->asTangibleObject();
+					if (tang)
+					{
+						SlottedContainmentProperty const * const scp = ContainerInterface::getSlottedContainmentProperty(*tang);
+						if (scp)
+						{
+							if (scp->isInAppearanceSlot() || tang == inventory || tang == datapad )
+							{
+								ConstCharCrcString clientSharedTemplateNameCrcString = ObjectTemplateList::lookUp(tang->getClientSharedTemplateName());
+								if (clientSharedTemplateNameCrcString.isEmpty())
+									WARNING(true, ("Could not find crc for [%s].  Wearable will not be streamed to client", tang->getClientSharedTemplateName()));
+								else if (so->asWeaponObject() != NULL)
+								{
+									addPackedWearable(tang->getAppearanceData(), scp->getCurrentArrangement(), tang->getNetworkId(), clientSharedTemplateNameCrcString.getCrc(),
+										tang->createSharedBaselinesMessage(), tang->createSharedNpBaselinesMessage());
+								}
+								else
+									addPackedWearable(tang->getAppearanceData(), scp->getCurrentArrangement(), tang->getNetworkId(), clientSharedTemplateNameCrcString.getCrc());
+							}
+						}
+					}
+				}
+			}
+		}
+
+		if(appearance)
+		{
+			SlottedContainer const * const myAppearanceContainer = ContainerInterface::getSlottedContainer(*appearance);
+			for(ContainerConstIterator iter = myAppearanceContainer->begin(); iter!= myAppearanceContainer->end(); ++iter)
+			{
+				Object const * const o = (*iter).getObject();
+				if (o)
+				{
+					ServerObject const * const so = o->asServerObject();
+					if (so)
+					{
+						TangibleObject const * const tang = so->asTangibleObject();
+						if (tang)
+						{
+							SlottedContainmentProperty const * const scp = ContainerInterface::getSlottedContainmentProperty(*tang);
+							if (scp)
+							{
+								if (scp->isInAppearanceSlot())
+								{
+									ConstCharCrcString clientSharedTemplateNameCrcString = ObjectTemplateList::lookUp(tang->getClientSharedTemplateName());
+									if (clientSharedTemplateNameCrcString.isEmpty())
+										WARNING(true, ("Could not find crc for [%s].  Wearable will not be streamed to client", tang->getClientSharedTemplateName()));
+									else
+										addPackedAppearanceWearable(tang->getAppearanceData(), scp->getCurrentArrangement(), tang->getNetworkId(), clientSharedTemplateNameCrcString.getCrc());
+								}
+							}
+						}
+					}
+				}
+	}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Called when we get an ack back that a Jedi slot has been added to our account.
+ * This function should only be called by PlayerObject::addJediToAccountAck()!
+ */
+void CreatureObject::addJediToAccountAck()
+{
+	// flag success via an objvar so we can end the timed callback C++AddJediSlot
+	setObjVarItem(OBJVAR_ADD_JEDI_ACK, 1);
+}	// CreatureObject::addJediToAccountAck
+
+
+//----------------------------------------------------------------------
+
+void CreatureObject::setNumberOfMissionsWantedInMissionBag(int n)
+{
+	int i = 0;
+	ServerObject * const missionBag = getMissionBag();
+	if(missionBag)
+	{
+		Container * const container = ContainerInterface::getContainer(*missionBag);
+		ContainerIterator iter;
+		for(iter = container->begin(); iter != container->end(); ++iter)
+		{
+			Object * const o = (*iter).getObject();
+			if (o)
+			{
+				ServerObject * const so = o->asServerObject();
+				if (so && so->asMissionObject())
+					++i;
+			}
+		}
+
+		if (n - i > 0)
+		{
+			if (m_numberOfMissionsWantedInMissionBag <= 0)
+			{
+				// place object on mission object create queue
+				s_missionQueue.push_back(getNetworkId());
+			}
+			m_numberOfMissionsWantedInMissionBag = n - i;
+		}
+		else if (i - n > 0)
+		{
+			// remove mission objects from the bag
+			int j = 0;
+			for (iter = container->begin(), j = 0; iter != container->end(), j < i - n; ++iter, ++j)
+			{
+				Object * const o = (*iter).getObject();
+				if (o)
+				{
+					ServerObject * const so = o->asServerObject();
+					if (so && so->asMissionObject())
+						so->kill();
+				}
+			}
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::runMissionCreationQueue()
+{
+	int i = ConfigServerGame::getMissionCreationQueueSize();
+	while(i > 0 && !s_missionQueue.empty())
+	{
+		const NetworkId id = s_missionQueue.front();
+		s_missionQueue.pop_front();
+		CreatureObject * creature = safe_cast<CreatureObject *>(NetworkIdManager::getObjectById(id));
+		if(creature)
+		{
+			if(creature->isAuthoritative())
+			{
+				if(MissionObject::createMissionObjectInCreatureMissionBag(creature))
+					creature->m_numberOfMissionsWantedInMissionBag--;
+				if(creature->m_numberOfMissionsWantedInMissionBag > 0)
+					s_missionQueue.push_back(id);
+			}
+		}
+		i--;
+	}
+}
+
+//----------------------------------------------------------------------
+
+int CreatureObject::getMaxNumberOfLots() const
+{
+	return HOUSING_MAX_LOTS;
+}
+
+//----------------------------------------------------------------------
+
+NetworkId CreatureObject::getHouse() const
+{
+	NetworkId houseId;
+
+	// the objvar houseId is per player and is used if it exists
+	if (getObjVars().getItem(OBJVAR_PLAYER_HOUSE_ID, houseId))
+		return houseId;
+
+	return NetworkId::cms_invalid;
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::setHouse(const CachedNetworkId & houseId)
+{
+	if (isAuthoritative())
+	{
+		// store as an objvar to keep this id per player vs. per account
+		setObjVarItem(OBJVAR_PLAYER_HOUSE_ID, houseId);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setHouse, new MessageQueueGenericValueType<NetworkId>(houseId));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::getAvailableLocomotions()
+{
+	getMovementTable()->getAllLocomotions(m_posture.get(), m_states.get(), m_fastLocomotion, m_slowLocomotion, m_stationaryLocomotion);
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::calcPvpableState()
+{
+	setPvpable(true);
+}
+
+// ----------------------------------------------------------------------
+
+float CreatureObject::getBaseWalkSpeed() const
+{
+	float speed = m_baseWalkSpeed.get();
+	if (speed < 0.0f)
+		return safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate())->getSpeed(SharedCreatureObjectTemplate::MT_walk);
+	return speed;
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setBaseWalkSpeed(float speed)
+{
+	if (isAuthoritative())
+	{
+		if (m_baseWalkSpeed.get() != speed)
+		{
+			m_baseWalkSpeed = speed;
+			requestMovementInfoUpdate();
+		}
+	}
+	else
+	{
+		Controller *controller = getController();
+		if (controller)
+			controller->appendMessage(
+				CM_creatureSetBaseWalkSpeed,
+				speed,
+				0,
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+float CreatureObject::getBaseRunSpeed() const
+{
+	float speed = m_baseRunSpeed.get();
+	if (speed < 0.0f)
+		return safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate())->getSpeed(SharedCreatureObjectTemplate::MT_run);
+	return speed;
+}
+
+// ----------------------------------------------------------------------
+
+int CreatureObject::loadPackedHouses()
+{
+	int numHouses = 0;
+	ServerObject *datapad = getDatapad();
+	if (datapad)
+	{
+		VolumeContainer const * datapadContainer = ContainerInterface::getVolumeContainer(*datapad);
+		if (datapadContainer)
+		{
+			// iterate over contents.
+			for(ContainerConstIterator iter(datapadContainer->begin());
+				iter != datapadContainer->end();
+				++iter)
+			{
+				const CachedNetworkId & objId = (*iter);
+				const ServerObject * obj = safe_cast<const ServerObject *>(objId.getObject());
+				if (obj && (obj->getGameObjectType() == SharedObjectTemplate::GOT_data_house_control_device))
+				{
+					// if object is a house control device, then go ahead and get the first contained item -
+					// should be the house itself.
+					SlottedContainer const *hcdContainer = ContainerInterface::getSlottedContainer(*obj);
+					if (hcdContainer && hcdContainer->getNumberOfItems() > 0)
+					{
+						//load the contents for the house.
+						for(ContainerConstIterator hcdIter(hcdContainer->begin());
+							hcdIter != hcdContainer->end();
+							++hcdIter)
+						{
+							Object * const houseId = (*hcdIter).getObject();
+							BuildingObject * const house = (houseId ? houseId->asServerObject()->asBuildingObject() : NULL);
+							if (house && !house->getContentsLoaded())
+							{
+								LOG("CustomerService", ("CharacterTransfer: starting packed house load (%s) for CTS character %s", house->getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(this).c_str()));
+
+								numHouses++;
+								house->loadContents();
+								setLoadCTSPackedHouses(true);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return numHouses;
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<unsigned char> CreatureObject::uploadCharacterData(const bool withItems, const bool allowOverride)
+{
+	std::vector<unsigned char> result;
+
+	if(getClient())
+	{
+		GameScriptObject * scriptObject = getScriptObject();
+		if(scriptObject)
+		{
+			int resultSize = 0;
+			std::vector<unsigned char> tmp;
+			tmp.resize(ConfigServerGame::getCtsDefaultScriptDictionarySizeBytes());
+
+			ScriptParams p;
+			p.addParam(tmp);
+			p.addParam(resultSize);
+			p.addParam(withItems);
+			p.addParam(allowOverride);
+			REPORT_LOG(true, ("Calling OnStartCharacterUpload from CreatureObject.cpp\n"));
+			IGNORE_RETURN(scriptObject->trigAllScripts(Scripting::TRIG_START_CHARACTER_UPLOAD, p));
+
+			resultSize = p.getIntParam(1);
+			tmp = p.getByteArrayParam(0);
+			int i;
+			for(i=0; i < resultSize; ++i)
+			{
+				result.push_back(tmp[static_cast<size_t>(i)]);
+			}
+			LOG("CustomerService", ("CharacterTransfer: CreatureObject::uploadCharacterData() yields a buffer %d bytes long", result.size()));
+		}
+	}
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+bool  CreatureObject::receiveCharacterTransferMessage(const std::vector<unsigned char> & packedCharacterData)
+{
+	bool result = false;
+	GameScriptObject * scriptObject = getScriptObject();
+	if(scriptObject)
+	{
+		ScriptParams p;
+		p.addParam(packedCharacterData);
+		if(scriptObject->trigAllScripts(Scripting::TRIG_DOWNLOAD_CHARACTER, p))
+		{
+			result = true;
+		}
+	}
+
+	if (result)
+	{
+	// tell CentralServer to not allow login for this character
+	// until the character has been persisted and unloaded
+		GenericValueTypeMessage<std::pair<NetworkId, std::pair<std::string, bool> > > const msg(
+			"SetSceneForPlayer",
+			std::make_pair(
+			getNetworkId(),
+			std::make_pair(ServerWorld::getSceneId(), true)));
+
+		GameServer::getInstance().sendToCentralServer(msg);
+
+		// set the idle time so that the character will be disconnected
+		// in ConfigServerGame::getIdleLogoutTimeAfterCharacterTransferSec()
+		// so that the character will get unloaded after the next save cycle,
+		// so that the player can log in the character; this should be much
+		// faster than the default idle disconnect behavior where the character
+		// would get disconnected in ConfigServerGame::getIdleLogoutTimeSec()
+		if (getClient())
+			getClient()->resetIdleTimeAfterCharacterTransfer();
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+void  CreatureObject::receiveCharacterTransferStatusMessage(const std::string & statusMessage)
+{
+	GameScriptObject * scriptObject = getScriptObject();
+	if(scriptObject)
+	{
+		ScriptParams p;
+		p.addParam(statusMessage.c_str());
+		scriptObject->trigAllScripts(Scripting::TRIG_RECEIVE_CHARACTER_TRANSFER_STATUS_MESSAGE, p);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setBaseRunSpeed(float speed)
+{
+	if (isAuthoritative())
+	{
+		if (m_baseRunSpeed.get() != speed)
+		{
+			m_baseRunSpeed = speed;
+			requestMovementInfoUpdate();
+		}
+	}
+	else
+	{
+		Controller *controller = getController();
+		if (controller)
+			controller->appendMessage(
+				CM_creatureSetBaseRunSpeed,
+				speed,
+				0,
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Tests if this creature has a bounty on another creature.
+ * (Virtual function, overriden in SwgCreatureObject)
+ *
+ * @param target		the creature to test if we have a bounty on
+ *
+ * @return true if we have a bounty on the target, false if not
+ */
+bool CreatureObject::hasBounty(const CreatureObject & target) const
+{
+	//@todo: this should really be a function of the pvp classes, but we
+	// need this to be virtual
+	return false;
+}	// CreatureObject::hasBounty
+
+// ----------------------------------------------------------------------
+
+/**
+ * Tests if this creature has a bounty on anything.
+ * (Virtual function, overriden in SwgCreatureObject, can't be pure virtual
+ * because ServerCreatureObjectTemplate has a function that instantiates a CreatureObject)
+ */
+bool CreatureObject::hasBounty() const
+{
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Return a list of all the bounty hunters targeting this creature.
+ *
+ * Overriden in SwgCreatureObject.
+ */
+std::vector<NetworkId> const & CreatureObject::getJediBountiesOnMe() const
+{
+	static const std::vector<NetworkId> nothing;
+	return nothing;
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::hasBountyMissionForTarget(const NetworkId & targetId) const
+{
+	const ServerObject * const datapad = getDatapad();
+	if (!datapad)
+		return false;
+
+	const Container * const container = ContainerInterface::getContainer(*datapad);
+	if (!container)
+		return false;
+
+	for (ContainerConstIterator iter = container->begin(); iter != container->end(); ++iter)
+	{
+		const ServerObject * const serverMissionObject = safe_cast<const ServerObject *>((*iter).getObject());
+		if (serverMissionObject)
+		{
+			const MissionObject * const missionObject = serverMissionObject->asMissionObject();
+			if (missionObject)
+			{
+				static const unsigned int bounty = CrcLowerString::calculateCrc("bounty");
+				NetworkId bountyTargetId;
+
+				if ((missionObject->getMissionType() == bounty) && (missionObject->getObjVars().getItem("objTarget", bountyTargetId)) && (bountyTargetId == targetId))
+						return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setAlternateAppearance(std::string const &sharedObjectTemplateName)
+{
+	//-- Ensure we're authoritative.
+	if (!isAuthoritative())
+	{
+		WARNING(true,
+			("CreatureObject::setAppearanceFromObjectTemplate(): called on non-authoritative object id=[%s], server id=[%d]",
+			getNetworkId().getValueString().c_str(),
+			static_cast<int>(GameServer::getInstance().getProcessId())
+			));
+		return;
+	}
+	
+	// See if we're trying to turn off our alt appearance
+	std::string const none("none");
+	if(sharedObjectTemplateName.find(none) != std::string::npos && sharedObjectTemplateName.size() == none.size())
+	{
+		GameScriptObject * const scriptObject = this->getScriptObject();
+		if(scriptObject)
+		{
+			ScriptParams params;
+			params.addParam(getNetworkId());
+			if(scriptObject->trigAllScripts(Scripting::TRIG_ON_ABOUT_TO_REVERT_APPEARANCE, params) == SCRIPT_OVERRIDE)
+				return;
+			m_alternateAppearanceSharedObjectTemplateName.set(sharedObjectTemplateName);
+
+			setState(States::Disguised, false);
+
+			params.clear();
+			params.addParam(getNetworkId());
+
+			IGNORE_RETURN(scriptObject->trigAllScripts(Scripting::TRIG_REVERTED_APPEARANCE, params));
+
+		}
+		
+		return;
+	}
+
+	//-- Ensure the serverObjectTemplateName exists.
+	if (sharedObjectTemplateName.empty() || !TreeFile::exists(sharedObjectTemplateName.c_str()))
+	{
+		WARNING(true,
+			("CreatureObject::setAppearanceFromObjectTemplate(): called on id=[%s], server id=[%d]: invalid serverObjectTemplateName [%s]",
+			getNetworkId().getValueString().c_str(),
+			static_cast<int>(GameServer::getInstance().getProcessId()),
+			sharedObjectTemplateName.c_str()
+			));
+		return;
+	}
+
+
+	ObjectTemplate const *sharedObjectTemplate = ObjectTemplateList::fetch(sharedObjectTemplateName);
+	SharedCreatureObjectTemplate const *const sharedObjectTemplateAsCreature = dynamic_cast<SharedCreatureObjectTemplate const*>(sharedObjectTemplate);
+
+	if (sharedObjectTemplate && sharedObjectTemplateAsCreature)
+	{
+		//-- Ensure there is an appearance filename.
+		if (!sharedObjectTemplateAsCreature->getAppearanceFilename().empty())
+		{
+			GameScriptObject * const scriptObject = this->getScriptObject();
+			if(scriptObject)
+			{
+				ScriptParams params;
+				params.addParam(getNetworkId());
+				params.addParam(sharedObjectTemplateName.c_str());
+
+				if(scriptObject->trigAllScripts(Scripting::TRIG_ON_ABOUT_TO_CHANGE_APPEARANCE, params) == SCRIPT_OVERRIDE)
+					return;
+
+				//-- Set the alternate shared object template name since it is different from the natural shared object template name.
+				m_alternateAppearanceSharedObjectTemplateName.set(sharedObjectTemplateAsCreature->getAppearanceFilename());
+
+				setState(States::Disguised, true);
+
+				params.clear();
+				params.addParam(getNetworkId());
+
+				IGNORE_RETURN(scriptObject->trigAllScripts(Scripting::TRIG_CHANGED_APPEARANCE, params));
+			}
+
+		}
+
+		// Release resources.
+		sharedObjectTemplate->releaseReference();
+		sharedObjectTemplate = 0;
+	}
+
+}
+
+// ======================================================================
+
+bool operator!=(CreatureMod const &a, CreatureMod const &b)
+{
+	return    a.mod != b.mod
+	       || a.startTime != b.startTime
+	       || a.maxVal != b.maxVal
+	       || a.currentVal != b.currentVal;
+}
+
+// ======================================================================
+
+namespace Archive
+{
+	void put(Archive::ByteStream &target, CreatureAttitude const &state)
+	{
+		target.put(&state.m_behavior, 4);
+		target.put(&state.m_angerState, 4);
+		target.put(&state.m_fearState, 4);
+		for (int i = 0; i < MentalStates::NumberOfMentalStates; ++i)
+			target.put(&state.m_currentValues[i], 4);
+	}
+
+	void get(Archive::ReadIterator &source, CreatureAttitude &state)
+	{
+		source.get(&state.m_behavior, 4);
+		source.get(&state.m_angerState, 4);
+		source.get(&state.m_fearState, 4);
+		for (int i = 0; i < MentalStates::NumberOfMentalStates; ++i)
+			source.get(&state.m_currentValues[i], 4);
+	}
+
+	//----------------------------------------------------------------------
+
+	void put(Archive::ByteStream &target, MonitoredCreatureMovement const &state)
+	{
+		target.put(&state.m_lastDistance, sizeof(state.m_lastDistance));
+		target.put(&state.m_skittishness, sizeof(state.m_skittishness));
+		target.put(&state.m_curve, sizeof(state.m_curve));
+	}
+
+	void get(Archive::ReadIterator &source, MonitoredCreatureMovement &state)
+	{
+		source.get(&state.m_lastDistance, sizeof(state.m_lastDistance));
+		source.get(&state.m_skittishness, sizeof(state.m_skittishness));
+		source.get(&state.m_curve, sizeof(state.m_curve));
+	}
+
+	//----------------------------------------------------------------------
+
+	void put(Archive::ByteStream &target, CreatureMod const &mod)
+	{
+		target.put(&mod.startTime, sizeof(mod.startTime));
+		target.put(&mod.maxVal, sizeof(mod.maxVal));
+		target.put(&mod.currentVal, sizeof(mod.currentVal));
+		put(target, mod.mod);
+	}
+
+	void get(Archive::ReadIterator &source, CreatureMod &mod)
+	{
+		source.get(&mod.startTime, sizeof(mod.startTime));
+		source.get(&mod.maxVal, sizeof(mod.maxVal));
+		source.get(&mod.currentVal, sizeof(mod.currentVal));
+		get(source, mod.mod);
+	}
+};
+
+//----------------------------------------------------------------------
+
+float CreatureObject::getWalkSpeed    () const
+{
+	float walkSpeed = m_walkSpeed.get();
+
+	if (GameObjectTypes::isTypeOf (getGameObjectType (), SharedObjectTemplate::GOT_vehicle))
+	{
+		if (m_vehiclePhysicsData)
+		{
+			walkSpeed = m_vehiclePhysicsData->m_walkSpeed;
+		}
+	}
+
+	return walkSpeed * getMovementScale() * getMovementPercent();
+}
+
+//----------------------------------------------------------------------
+
+float CreatureObject::getRunSpeed     () const
+{
+	float runSpeed = m_runSpeed.get();
+
+	if (GameObjectTypes::isTypeOf (getGameObjectType (), SharedObjectTemplate::GOT_vehicle))
+	{
+		if (m_vehiclePhysicsData)
+		{
+			runSpeed = m_vehiclePhysicsData->m_runSpeed;
+		}
+	}
+
+	return runSpeed * getMovementScale() * getMovementPercent();
+}
+
+//----------------------------------------------------------------------
+
+float CreatureObject::getAccelerationForSpeed (float currentSpeed) const
+{
+	float accel = 0.0f;
+
+	if (currentSpeed <= getWalkSpeed ())
+		accel = safe_cast<const SharedCreatureObjectTemplate*> (getSharedTemplate ())->getAccelerationMax (SharedCreatureObjectTemplate::MT_walk);
+	else
+		accel = safe_cast<const SharedCreatureObjectTemplate*> (getSharedTemplate ())->getAccelerationMax (SharedCreatureObjectTemplate::MT_run);
+
+	if (GameObjectTypes::isTypeOf (getGameObjectType (), SharedObjectTemplate::GOT_vehicle))
+	{
+		if (m_vehiclePhysicsData)
+		{
+			if (m_vehiclePhysicsData->m_runSpeed)
+			{
+				const float speedPercent = std::min (1.0f, currentSpeed / m_vehiclePhysicsData->m_runSpeed);
+				accel = m_vehiclePhysicsData->m_accelerationMin + (m_vehiclePhysicsData->m_accelerationMax - m_vehiclePhysicsData->m_accelerationMin) * speedPercent;
+			}
+		}
+	}
+
+	 return accel * getAccelScale() * getAccelPercent();
+}
+
+//----------------------------------------------------------------------
+
+float CreatureObject::getTurnRateForSpeed     (float currentSpeed) const
+{
+	float turnRate = 0.0f;
+
+	if (currentSpeed <= getWalkSpeed ())
+		turnRate = safe_cast<const SharedCreatureObjectTemplate*> (getSharedTemplate ())->getTurnRate (SharedCreatureObjectTemplate::MT_walk);
+	else
+		turnRate = safe_cast<const SharedCreatureObjectTemplate*> (getSharedTemplate ())->getTurnRate (SharedCreatureObjectTemplate::MT_run);
+
+	if (GameObjectTypes::isTypeOf (getGameObjectType (), SharedObjectTemplate::GOT_vehicle))
+	{
+		if (m_vehiclePhysicsData)
+		{
+			if (m_vehiclePhysicsData->m_runSpeed)
+			{
+				const float speedPercent = std::min (1.0f, currentSpeed / m_vehiclePhysicsData->m_runSpeed);
+				turnRate = convertRadiansToDegrees (m_vehiclePhysicsData->m_turnRateMin + (m_vehiclePhysicsData->m_turnRateMax - m_vehiclePhysicsData->m_turnRateMin) * speedPercent);
+			}
+		}
+	}
+
+	return turnRate;
+}
+
+//----------------------------------------------------------------------
+
+float CreatureObject::getSlopeMod     () const
+{
+	return 1.0f;
+}
+
+//-----------------------------------------------------------------------
+
+float CreatureObject::getAcceleration(SharedCreatureObjectTemplate::MovementTypes movementType) const
+{
+	float walk = getAccelerationForSpeed (getWalkSpeed ());
+	float run  = getAccelerationForSpeed (getRunSpeed ());
+
+	if (walk < 0.1f)
+		walk = 0.1f;
+	if (walk < run)
+	{
+		run = walk;
+	}
+	if (movementType == SharedCreatureObjectTemplate::MT_walk)
+		return walk;
+	else
+		return run;
+}
+
+//-----------------------------------------------------------------------
+
+float CreatureObject::getTurnRate(SharedCreatureObjectTemplate::MovementTypes movementType) const
+{
+	float walk = getTurnRateForSpeed (getWalkSpeed ());
+	float run  = getTurnRateForSpeed (getRunSpeed ());
+
+	if (walk < 30.0f)
+		walk = 30.0f;
+	if (walk < run)
+	{
+		run = walk * 0.5f;
+	}
+	if (movementType == SharedCreatureObjectTemplate::MT_walk)
+		return walk;
+	else
+		return run;
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::updateVehiclePhysicsData ()
+{
+	if (GameObjectTypes::isTypeOf (getGameObjectType (), SharedObjectTemplate::GOT_vehicle))
+	{
+		if (!m_vehiclePhysicsData)
+			m_vehiclePhysicsData = new VehiclePhysicsData;
+
+		const CustomizationData *const cd = fetchCustomizationData();
+		if (cd)
+		{
+			VehicleHoverDynamics::readParamsFromCustomizationData (*cd,
+				m_vehiclePhysicsData->m_minMoveSpeed,
+				m_vehiclePhysicsData->m_runSpeed,
+				m_vehiclePhysicsData->m_turnRateMin,
+				m_vehiclePhysicsData->m_turnRateMax,
+				m_vehiclePhysicsData->m_accelerationMin,
+				m_vehiclePhysicsData->m_accelerationMax);
+
+			cd->release ();
+			m_vehiclePhysicsData->m_walkSpeed = 0.5f * m_vehiclePhysicsData->m_runSpeed;
+			return;
+		}
+	}
+
+	if (m_vehiclePhysicsData)
+	{
+		delete m_vehiclePhysicsData;
+		m_vehiclePhysicsData = 0;
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::unequipAllItems()
+{
+	//-- Ensure we're authoritative.
+	if (!isAuthoritative())
+	{
+		WARNING(true,
+			("unequipAllItems() called on object id=[%s], template=[%s] on server id=[%d] but this object is not authoritative.",
+			getNetworkId().getValueString().c_str(),
+			getObjectTemplateName(),
+			static_cast<int>(GameServer::getInstance().getProcessId())
+			));
+		return;
+	}
+
+	//-- Get the equipment container for the creature.
+	SlottedContainer * const equipmentContainer = ContainerInterface::getSlottedContainer(*this);
+	if (!equipmentContainer)
+	{
+		WARNING(true,
+			("unequipAllItems() called on object id=[%s], template=[%s] on server id=[%d]: failed to get equipment slotted container, error code=[%d].",
+			getNetworkId().getValueString().c_str(),
+			getObjectTemplateName(),
+			static_cast<int>(GameServer::getInstance().getProcessId())
+			));
+		return;
+	}
+
+	//-- Get the inventory container for the creature.
+	Container::ContainerErrorCode errorCode          = Container::CEC_Success;
+	Container::ContainedItem  inventoryContainedItem = equipmentContainer->getObjectInSlot(s_inventorySlotId, errorCode);
+	Object *const             inventoryObjectBase    = inventoryContainedItem.getObject();
+	ServerObject *const       inventoryObject        = inventoryObjectBase ? inventoryObjectBase->asServerObject() : NULL;
+	if (!inventoryObject || (errorCode != Container::CEC_Success))
+	{
+		WARNING(true,
+			("unequipAllItems() called on object id=[%s], template=[%s] on server id=[%d]: failed to get inventory object from equipment, error code=[%d].",
+			getNetworkId().getValueString().c_str(),
+			getObjectTemplateName(),
+			static_cast<int>(GameServer::getInstance().getProcessId()),
+			static_cast<int>(errorCode)
+			));
+		return;
+	}
+
+	VolumeContainer *const inventoryContainer = ContainerInterface::getVolumeContainer(*inventoryObject);
+	if (!inventoryContainer)
+	{
+		WARNING(true,
+			("unequipAllItems() called on object id=[%s], template=[%s] on server id=[%d]: inventory object is NULL.",
+			getNetworkId().getValueString().c_str(),
+			getObjectTemplateName(),
+			static_cast<int>(GameServer::getInstance().getProcessId())
+			));
+		return;
+	}
+
+	//-- Collect items to move into inventory.  This includes items in all slots that players can manipulate.
+	typedef std::vector<ServerObject*>  ServerObjectVector;
+	ServerObjectVector                  itemsToTransfer;
+
+	{
+		ContainerIterator const endIt = equipmentContainer->end();
+		for (ContainerIterator it = equipmentContainer->begin(); it != endIt; ++it)
+		{
+			// Get the equipment item.
+			Container::ContainedItem containedItem = *it;
+			Object *const       objectBase = containedItem.getObject();
+			ServerObject *const object     = objectBase ? objectBase->asServerObject() : NULL;
+			if (!object)
+			{
+				WARNING(true,
+					("null object in equipment container for object id=[%s]: equipment item id=[%s].",
+					getNetworkId().getValueString().c_str(),
+					containedItem.getValueString().c_str()
+					));
+				continue;
+			}
+
+			// Get the slotted containment property so we can check the slot characteristics.
+			SlottedContainmentProperty const *const property = ContainerInterface::getSlottedContainmentProperty(*object);
+			if (!property)
+			{
+				WARNING(true,
+					("object in equipment container for object id=[%s], equipment item id=[%s] has no SlottedContainmentProperty.",
+					getNetworkId().getValueString().c_str(),
+					containedItem.getValueString().c_str()
+					));
+				continue;
+			}
+
+			// Check if any of the current arrangement's slots are not player manipulatable.
+			if (property->canManipulateArrangement(property->getCurrentArrangement()))
+				itemsToTransfer.push_back(object);
+		}
+	}
+
+	//-- Transfer selected equipped items to inventory.
+	{
+		ServerObjectVector::iterator const endIt = itemsToTransfer.end();
+		for (ServerObjectVector::iterator it = itemsToTransfer.begin(); it != endIt; ++it)
+		{
+			ServerObject *const object = *it;
+			if (!object)
+				continue;
+
+			ContainerInterface::transferItemToVolumeContainer(*inventoryObject, *object, NULL, errorCode);
+			WARNING(errorCode != Container::CEC_Success,
+				("unequipAllItems(): CreatureObject id=[%s] failed to transfer item id=[%s], template=[%s] from equipment to inventory container, container error code [%d].",
+				getNetworkId().getValueString().c_str(),
+				object->getNetworkId().getValueString().c_str(),
+				object->getObjectTemplateName(),
+				static_cast<int>(errorCode)
+				));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::virtualOnSetClient()
+{
+	TangibleObject::virtualOnSetClient();
+
+	handleTutorialTransition();
+
+	setNumberOfMissionsWantedInMissionBag(ConfigServerGame::getNumberOfMissionsWantedInMissionBag());
+}
+
+//----------------------------------------------------------------------
+
+std::vector<WearableEntry> CreatureObject::getWearableData()
+{
+	return m_wearableData.get();
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::setWearableData(std::vector<WearableEntry> const & packedWearables)
+{
+	m_wearableData.set(packedWearables);
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::onContainedItemAppearanceDataModified(TangibleObject const & target, std::string const & oldValue, std::string const & value)
+{
+	TangibleObject::onContainedItemAppearanceDataModified(target, oldValue, value);
+
+	if(oldValue != value)
+	{
+		std::vector<WearableEntry> wearableData = getWearableData();
+		for(std::vector<WearableEntry>::iterator i = wearableData.begin(); i != wearableData.end(); ++i)
+		{
+			if(target.getNetworkId() == i->m_networkId)
+			{
+				i->m_appearanceString = value;
+				setWearableData(wearableData);
+				//there will only be one object with the target's networkid, so we can return
+				return;
+			}
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::updateGroup()
+{
+	GroupObject * group = getGroup();
+	if(group)
+	{
+		const std::vector<std::pair<NetworkId, std::string> > & groupMembers = group->getGroupMembers();
+
+		// if there are members that might need an update
+		if(! groupMembers.empty())
+		{
+			// setup the update status message that is sent to the client
+			if(! m_clientMfdStatusUpdateMessage)
+			{
+				// this is the first time an update might need to have been sent
+				m_clientMfdStatusUpdateMessage = new ClientMfdStatusUpdateMessage(getNetworkId(), ServerWorld::getSceneId(), findPosition_w(), ConfigFile::getKeyFloat("ServerGame", "groupLocationUpdateTimer", 1.0f), ConfigFile::getKeyFloat("ServerGame", "groupLocationUpdateMinimumMoveDistance", 64.0f));
+			}
+			else
+			{
+				// it's already been constructed, update members
+				m_clientMfdStatusUpdateMessage->setSceneName(ServerWorld::getSceneId());
+				m_clientMfdStatusUpdateMessage->setWorldCoordinates(findPosition_w());
+			}
+
+			// if there are still members to update since the last calculation, select
+			// the first one in the list and send the message
+			if(! m_clientMfdStatusUpdateMessage->getMembersToUpdate().empty())
+			{
+				if(m_clientMfdStatusUpdateMessage->updateMemberUpdateTimer(Clock::frameTime()))
+				{
+					// default, assume that the object is observed and no messageTo
+					// is needed
+					bool sendMessageTo = false;
+
+					while(! sendMessageTo && (!m_clientMfdStatusUpdateMessage->getMembersToUpdate().empty()))
+					{
+						static Archive::ByteStream bs;
+						bs.clear();
+						NetworkId memberId = m_clientMfdStatusUpdateMessage->getMembersToUpdate().back();
+						m_clientMfdStatusUpdateMessage->getMembersToUpdate().pop_back();
+
+						if(memberId != getNetworkId())
+						{
+							// cull bad network id's
+							if(memberId != NetworkId::cms_invalid)
+							{
+								Object * obj = NetworkIdManager::getObjectById(memberId);
+								if(obj)
+								{
+									ServerObject * target = obj->asServerObject();
+									if(target && target->getClient())
+									{
+										// check to see whether the target observing this creature
+										// if it is, then the client will be updated automatically
+										if(! ObserveTracker::isObserving(*target->getClient(), *this))
+										{
+											// this creature is not being observed by the target player
+											// if it is authoritative on this server, however, send
+											// the message directly.
+											if(target->isAuthoritative())
+											{
+												target->getClient()->send(*m_clientMfdStatusUpdateMessage, false);
+											}
+											else
+											{
+												// the object is valid, but
+												// not authoritative on this
+												// server, send a messageTO
+												sendMessageTo = true;
+											}
+										} // else normal game operation will take care of updating the client MFD status window
+									}
+									else if(target && !target->getClient() && !target->isAuthoritative())
+									{
+										// target is valid, but probably a proxy of a player
+										// controlled object. Send a message to the remote
+										// server
+										sendMessageTo = true;
+									}
+									else if(! target)
+									{
+										WARNING_STRICT_FATAL(true, ("While updating group locations, group member ID %s refers to an object that is not a server object!", memberId.getValueString().c_str()));
+									}
+								}
+								else
+								{
+									// not on this server, send a message
+									sendMessageTo = true;
+								}
+							} // else memberId is an invalid NetworkId
+						} // else memberId is self
+						if(sendMessageTo)
+						{
+							// the group member is not locally authoritative
+							// on this server and is not being observed, the only
+							// way to get data to the group member is by sending
+							// a message to.
+
+							bs.clear();
+							m_clientMfdStatusUpdateMessage->pack(bs);
+							// send the messageTo to the target object
+							MessageToQueue::getInstance().sendMessageToC(memberId, "ClientMfdStatusUpdateMessage", std::string(reinterpret_cast<const char * const>(bs.getBuffer()), bs.getSize()), 0, false);
+						}
+					}
+				}
+			}
+			// If the message hasn't changed since the last attempt, don't
+			// bother sending the update
+			else if(m_clientMfdStatusUpdateMessage->getHasChanged())
+			{
+				// add group members to the mfs status update member id list
+				m_clientMfdStatusUpdateMessage->getMembersToUpdate().clear();
+				std::vector<std::pair<NetworkId, std::string> >::const_iterator i;
+				for(i = groupMembers.begin(); i != groupMembers.end(); ++i)
+				{
+					if(i->first != NetworkId::cms_invalid && i->first != getNetworkId())
+						m_clientMfdStatusUpdateMessage->addMemberToUpdate(i->first);
+				}
+			}
+		}
+		else
+		{
+			// the group is empty, clean up any memory that might have been used before
+			delete m_clientMfdStatusUpdateMessage;
+			m_clientMfdStatusUpdateMessage = 0;
+		}
+	}
+	else
+	{
+		// the group is empty, clean up any memory that might have been used before
+		delete m_clientMfdStatusUpdateMessage;
+		m_clientMfdStatusUpdateMessage = 0;
+	}
+
+	if(m_clientMfdStatusUpdateMessage)
+	{
+		m_clientMfdStatusUpdateMessage->setHasChanged(false);
+	}
+}
+
+//------------------------------------------------------------------------------------------
+
+void CreatureObject::handleTutorialTransition()
+{
+	// this is where all the code lives for the special transitions for the tutorial...
+	// much of the implementation is implemented in NewbieTutorial and is called through here
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+
+	if (playerObject)
+	{
+		// check if this player is coming from the character creation / selection screen
+		bool isFromLogin = playerObject->getIsFromLogin();
+		playerObject->setIsFromLogin(false);
+		bool startTutorial = !ConfigServerGame::getSkipTutorial();
+		if (startTutorial)
+		{
+			// let the npe phase determine whether or not to do the tutorial
+			startTutorial = (NewbieTutorial::shouldStartTutorial(this));
+		}
+
+		const std::string currentScene = ServerWorld::getSceneId();
+		if (NewbieTutorial::isInTutorialArea(this))
+		{
+			LOG("npe", ("handleTutorialTransition called for object %s in scene %s at location %f %f %f\n", getNetworkId().getValueString().c_str(), currentScene.c_str(), getPosition_w().x, getPosition_w().y, getPosition_w().z));
+
+			// check and see if they are loading into a tutorial area. If so, make sure they only have objects in the FileManifest
+			if (ConfigServerGame::getStripNonFreeAssetsFromPlayersInTutorial())
+			{
+				LOG("npe", ("handleTutorialTransition removing any non-free assets from object %s\n", getNetworkId().getValueString().c_str()));
+				NewbieTutorial::stripNonFreeAssetsFromPlayerInTutorial(this);
+			}
+		}
+
+		if (startTutorial && currentScene == NewbieTutorial::getSceneId())
+		{
+			// if we are in the tutorial scene, force a teleportFixup here so we can determine if we are in a container
+			handleTeleportFixup(false);
+
+			ServerObject const * container = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*this));
+
+			// if they are on the tutorial planet, but not in a valid container, create a tutorial instance for them
+			if (!container || !container->isAuthoritative() || isFromLogin)
+			{
+				// the player should be in the tutorial and is in the right place, go ahead and place them
+				NewbieTutorial::setupCharacterForTutorial(this);
+				Vector newLocation = getPosition_w();
+				if (newLocation == Vector(0,0,0))
+				{
+					LOG("npe", ("handleTutorialTransition setup tutorial at the origin for object %s\n", getNetworkId().getValueString().c_str()));
+				}
+				ServerObject *tutorial = NewbieTutorial::createTutorial(newLocation);
+
+				FATAL(!tutorial, ("failed to create tutorial for player which already exists."));
+				std::string startCellName = NewbieTutorial::getStartCellName();
+
+				Vector startCoords = NewbieTutorial::getStartCoords();
+				LOG("npe", ("handleTutorialTransition created newbie tutorial %s (%s authoritative) for %s (%s authoritative)\n", tutorial->getNetworkId().getValueString().c_str(), (tutorial->isAuthoritative()) ? "is" : "not", getNetworkId().getValueString().c_str(), (isAuthoritative()) ? "is" : "not"));
+
+				teleportObject(newLocation, tutorial->getNetworkId(), startCellName, startCoords, "", true);
+			}
+		}
+		else if (
+				(startTutorial && isFromLogin)
+			)
+		{
+			// if the creature object is coming from login, and they should start the tutorial
+			// or if the player is on a free trial account, but is on a non-free trial planet or location (NOT GOOD!)
+			// warp them to the tutorial planet
+			LOG("npe", ("Warping player (%s) back to tutorial because they are coming from login (%i) or because they are on a free trial account (%i) and trying to get to a non-free trial planet (%s: %f %f %f)\n", getNetworkId().getValueString().c_str(), isFromLogin, (getClient() && getClient()->isFreeTrialAccount()), ServerWorld::getSceneId().c_str(), getPosition_w().x, getPosition_w().y, getPosition_w().z));
+			NewbieTutorial::setupCharacterForTutorial(this);
+			GameServer::getInstance().requestSceneWarp(CachedNetworkId(*this), NewbieTutorial::getSceneId(), NewbieTutorial::getTutorialLocation(), NetworkId::cms_invalid, Vector(0,0,0));
+		}
+	}
+}
+
+//------------------------------------------------------------------------------------------
+
+void CreatureObject::onContainerChildLostItem(ServerObject * destination, ServerObject& item, ServerObject* source, ServerObject* transferer)
+{
+	ServerObject::onContainerChildLostItem(destination, item, source, transferer);
+
+	GameScriptObject * gameScriptObject = getScriptObject();
+	if(gameScriptObject)
+	{
+		NetworkId itemId = item.getNetworkId();
+		NetworkId sourceId;
+		if(source)
+			sourceId = source->getNetworkId();
+		NetworkId transfererId;
+		if(transferer)
+			transfererId = transferer->getNetworkId();
+		NetworkId destinationId;
+		if(destination)
+			destinationId = destination->getNetworkId();
+
+		ScriptParams params;
+		params.addParam (itemId);
+		params.addParam (sourceId);
+		params.addParam (transfererId);
+		params.addParam (destinationId);
+		IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_CONTAINER_CHILD_LOST_ITEM, params));
+	}
+
+	if(isPlayerControlled()) // Source == Appearance Inventory
+	{
+		//Update wearble appearance data
+		SlottedContainmentProperty* scp = ContainerInterface::getSlottedContainmentProperty(item);
+		if (scp)
+		{
+			WearableEntry e("", scp->getCurrentArrangement(), item.getNetworkId(), 0);
+			int index = m_wearableAppearanceData.find(e);
+			if (index >= 0)
+			{
+				m_wearableAppearanceData.erase(index);
+			}
+		}
+	}
+
+}
+
+//------------------------------------------------------------------------------------------
+
+void CreatureObject::onContainerChildGainItem(ServerObject& item, ServerObject* source, ServerObject* transferer)
+{
+	ServerObject::onContainerChildGainItem(item, source, transferer);
+
+	GameScriptObject * gameScriptObject = getScriptObject();
+	if(gameScriptObject)
+	{
+		NetworkId itemId = item.getNetworkId();
+		NetworkId sourceId;
+		if(source)
+			sourceId = source->getNetworkId();
+		NetworkId transfererId;
+		if(transferer)
+			transfererId = transferer->getNetworkId();
+
+		ScriptParams params;
+		params.addParam (itemId);
+		params.addParam (sourceId);
+		params.addParam (transfererId);
+
+		IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_CONTAINER_CHILD_GAIN_ITEM, params));
+	}
+
+	if(isPlayerControlled())
+	{
+		TangibleObject* tangibleObject = item.asTangibleObject();
+
+		if(!tangibleObject)
+			return;
+
+		//Update wearables data
+		SlottedContainmentProperty* scp = ContainerInterface::getSlottedContainmentProperty(item);
+		if (scp)
+		{
+			Object const * appearance = 0;
+
+			SlottedContainer const * const myContainer = ContainerInterface::getSlottedContainer(*this);
+
+			if (myContainer)
+			{
+				Container::ContainerErrorCode tmp = Container::CEC_Success;
+				SlotId appearanceInvSlot = SlotIdManager::findSlotId(CreatureObjectNamespace::SlotNames::appearance);
+				if (appearanceInvSlot != SlotId::invalid)
+				{
+					Container::ContainedItem itemId = myContainer->getObjectInSlot(appearanceInvSlot, tmp);
+					appearance = itemId.getObject();
+				}
+			}
+
+			Object const * container = ContainerInterface::getContainedByObject(*tangibleObject);
+			bool const inAppearanceInv = (container == appearance);
+			if (scp->getCurrentArrangement() >= 0 && scp->isInAppearanceSlot() && inAppearanceInv)
+			{
+				ConstCharCrcString clientSharedTemplateNameCrcString = ObjectTemplateList::lookUp(tangibleObject->getClientSharedTemplateName());
+				if (clientSharedTemplateNameCrcString.isEmpty())
+					WARNING(true, ("Could not find crc for %s.  Wearable will not be streamed to client", tangibleObject->getClientSharedTemplateName()));
+				else
+					addPackedAppearanceWearable(tangibleObject->getAppearanceData(), scp->getCurrentArrangement(), tangibleObject->getNetworkId(), clientSharedTemplateNameCrcString.getCrc());
+			}
+		}
+	}
+	
+}
+
+//------------------------------------------------------------------------------------------
+
+void CreatureObject::forceNotifyRegionsCheck()
+{
+	m_lastRegionNotifyPosition.x += 1.0f; // force a check
+}
+
+//------------------------------------------------------------------------------------------
+
+void CreatureObject::checkNotifyRegions()
+{
+	// if the object is player controlled, check for a change of regions that have their
+	// notify field set to true.
+	static const bool allowChecks = ConfigServerGame::getCheckNotifyRegions();
+	if(! allowChecks)
+		return;
+
+	if(! isPlayerControlled() || !isAuthoritative())
+		return;
+
+	if (! isInWorld())
+		return;
+	bool forceCheckRegions = m_regionFlagTimer.isExpired();
+
+	if(m_lastRegionNotifyPosition == getPosition_w() && !forceCheckRegions)
+		return;
+
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+	if(! playerObject)
+		return;
+
+	PROFILER_AUTO_BLOCK_DEFINE("CreatureObject::checkNotifyRegions()");
+	// region containers populated by region master getRegionsAtPoint()
+
+	static std::vector<const Region *> newRegions;
+	newRegions.clear();
+	RegionMaster::getRegionsAtPoint(ServerWorld::getSceneId(), getPosition_w().x, getPosition_w().z, newRegions);
+
+	if(forceCheckRegions)
+	{
+		m_regionFlagTimer.reset();
+
+		std::vector<const Region *>::iterator regionIter = newRegions.begin();
+		EnvironmentInfo flags = static_cast<EnvironmentInfo>(0);
+		for(; regionIter != newRegions.end(); ++regionIter)
+		{
+			if((*regionIter)->getNotify())
+				flags = flags | (*regionIter)->getEnvironmentFlags();
+		}
+
+		playerObject->setEnvironmentFlags(flags);
+
+		if(m_lastRegionNotifyPosition == getPosition_w())
+			return;
+	}
+
+	static std::vector<std::string> newNotifyRegions;
+	newNotifyRegions.clear();
+
+	static std::vector<std::string> newNotifyRegionsEntered;
+	newNotifyRegionsEntered.clear();
+
+	static std::vector<std::pair<std::string, std::string> > notifyRegionsExited;
+	notifyRegionsExited.clear();
+
+	// look for region enter events
+	std::vector<const Region *>::const_iterator i;
+
+	bool teleport = false;
+	static const bool allowOverride = ConfigServerGame::getAllowRegionTriggerOverride();
+
+	// iterate through the new regions looking for a "notify" region that is not in the
+	// list of regions found during the last check.
+	for(i = newRegions.begin(); i != newRegions.end(); ++i)
+	{
+		if((*i)->getNotify())
+		{
+			// this is a region that requires a notification be sent
+			// to scripts on the player's creature object
+			std::string regionName = Unicode::wideToNarrow((*i)->getName());
+			newNotifyRegions.push_back(regionName);
+
+			// check the notify regions from the last pass
+			// to see if this is a new region
+			if (!m_notifyRegions.contains(std::make_pair(ServerWorld::getSceneId(), regionName)))
+			{
+				// the region was not in the list, this is a new region
+				// and TRIG_ENTER_REGION should be generated
+				ScriptParams params;
+				params.addParam(ServerWorld::getSceneId().c_str());
+				params.addParam(regionName.c_str());
+				if(getScriptObject())
+				{
+					// allow scripts to prevent entry into the region if they
+					// return SCRIPT_OVERRIDE
+					if (getScriptObject()->trigAllScripts(Scripting::TRIG_ENTER_REGION, params) == SCRIPT_OVERRIDE)
+					{
+						// don't disallow admins, don't disallow if the server
+						// config has it disabled
+						if((!getClient() || !getClient()->isGod()) && allowOverride)
+						{
+							teleport = true;
+
+							Vector teleportTarget = getPosition_w();
+							Vector regionCenter = (*i)->getCenter();
+							
+							// if, somehow, a player starts in a forbidden region, allow them to walk out
+							if(teleportTarget.magnitudeXZBetweenSquared(regionCenter) < m_lastRegionNotifyPosition.magnitudeXZBetweenSquared(regionCenter))
+							{
+								// the current position is further into the region,
+								// push the player back
+								teleportObject(m_lastRegionNotifyPosition, NetworkId::cms_invalid, "", Vector(), "");
+							}
+							else
+							{
+								// the current position is closer to the region edge,
+								// allow the player to move normally in this direction
+								m_lastRegionNotifyPosition = teleportTarget;
+							}
+
+							// if the player is on a mount/vehicle but is
+							// not the driver of the mount/vehicle, then
+							// eject the (passenger) player so he doesn't
+							// keep trying to enter the region because the
+							// mount/vehicle will keep taking him into the
+							// region as long as he remains mounted
+							CreatureObject const * const mountedCreature = getMountedCreature();
+							if (mountedCreature && (this != mountedCreature->getPrimaryMountingRider()))
+							{
+								static uint32 const commandHash = Crc::normalizeAndCalculate("dismount");
+								const Command &command = CommandTable::getCommand(static_cast<uint32>(commandHash));
+								if (!command.isNull())
+								{
+									commandQueueEnqueue(command, mountedCreature->getNetworkId(), mountedCreature->getObjectName(), 0, false, static_cast<Command::Priority>(Command::CP_Front), true);
+								}
+							}
+						}
+					}
+				}
+
+				// if a teleport didn't happen,
+				// keep this region on the list
+				// of notify regions the client
+				// just entered
+				if(! teleport)
+					newNotifyRegionsEntered.push_back(regionName);
+			}
+		}
+	}
+
+	// look for for region exit events. If a region from the last pass
+	// is not in the new region list, the player has left the region
+	Archive::AutoDeltaSet<std::pair<std::string, std::string> >::const_iterator i2;
+	for(i2 = m_notifyRegions.begin(); i2 != m_notifyRegions.end(); ++i2)
+	{
+		if((i2->first != ServerWorld::getSceneId()) || (std::find(newNotifyRegions.begin(), newNotifyRegions.end(), i2->second) == newNotifyRegions.end()))
+		{
+			// the player is exiting the region, send a TRIG_EXIT_REGION
+			// to all scripts attached to the player's creature object
+			ScriptParams params;
+			params.addParam(i2->first.c_str());
+			params.addParam(i2->second.c_str());
+			if(getScriptObject())
+			{
+				if(getScriptObject()->trigAllScripts(Scripting::TRIG_EXIT_REGION, params) == SCRIPT_OVERRIDE)
+				{
+					// don't override movement of god characters, or if the
+					// server config disables move overrides
+					if((!getClient() || !getClient()->isGod()) && allowOverride && (i2->first == ServerWorld::getSceneId()))
+					{
+						teleport = true;
+
+						Vector teleportTarget = getPosition_w();
+
+						// if the current position is outside the region, fix the
+						// teleport target to prevent the player from exiting
+						Region * r = RegionMaster::getRegionByName(i2->first, Unicode::narrowToWide(i2->second));
+						if (r)
+						{
+							if(! r->getBounds().isPointIn(teleportTarget.x, teleportTarget.z))
+							{
+								// find a point along the path that is in the retion
+								Vector heading = r->getCenter() - teleportTarget;
+								heading.normalize();
+
+								int tries = 0;
+								while(! r->getBounds().isPointIn(teleportTarget.x, teleportTarget.z) && tries < 300)
+								{
+									++tries;
+									teleportTarget += heading;
+								}
+								teleportObject(teleportTarget, NetworkId::cms_invalid, "", Vector(), "");
+							}
+						}
+						m_lastRegionNotifyPosition = teleportTarget;
+					}
+				}
+				else
+				{
+					notifyRegionsExited.push_back(std::make_pair(i2->first, i2->second));
+				}
+			}
+		}
+	}
+
+	if(!teleport)
+	{
+		m_lastRegionNotifyPosition = getPosition_w();
+	}
+
+	std::vector<std::pair<std::string, std::string> >::const_iterator i3;
+	for(i3 = notifyRegionsExited.begin(); i3 != notifyRegionsExited.end(); ++i3)
+	{
+		m_notifyRegions.erase(*i3);
+	}
+
+	std::vector<std::string>::const_iterator i4;
+	for(i4 = newNotifyRegionsEntered.begin(); i4 != newNotifyRegionsEntered.end(); ++i4)
+	{
+		m_notifyRegions.insert(std::make_pair(ServerWorld::getSceneId(), *i4));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::hasCertificationsForItem(const TangibleObject & item) const
+{
+	std::vector<std::string> requiredCerts;
+	item.getRequiredCertifications(requiredCerts);
+
+	for (std::vector<std::string>::const_iterator i=requiredCerts.begin(); i!=requiredCerts.end(); ++i)
+	{
+		if (!hasCommand(*i))
+			return false;
+	}
+
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+CreatureObject * CreatureObject::getCreatureObject(NetworkId const & networkId)
+{
+	return asCreatureObject(NetworkIdManager::getObjectById(networkId));
+}
+
+// ----------------------------------------------------------------------
+
+CreatureObject const * CreatureObject::asCreatureObject(Object const * object)
+{
+	ServerObject const * const serverObject = (object != NULL) ? object->asServerObject() : NULL;
+
+	return (serverObject != NULL) ? serverObject->asCreatureObject() : NULL;
+}
+
+// ----------------------------------------------------------------------
+
+CreatureObject * CreatureObject::asCreatureObject(Object * object)
+{
+	ServerObject * serverObject = (object != NULL) ? object->asServerObject() : NULL;
+
+	return (serverObject != NULL) ? serverObject->asCreatureObject() : NULL;
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::addMissionCriticalObject(NetworkId const & networkId)
+{
+	if (isAuthoritative())
+	{
+		if (m_missionCriticalObjectSet.find(networkId) == m_missionCriticalObjectSet.end())
+		{
+			m_missionCriticalObjectSet.insert(networkId);
+			GroupMissionCriticalObjectsBuilder::updateGroupMissionCriticalObjects(*this, true);
+			ServerObject * const serverObject = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(networkId));
+			if (serverObject)
+				ObserveTracker::onMissionCriticalObjectAdded(*this, *serverObject);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::removeMissionCriticalObject(NetworkId const & networkId)
+{
+	if (isAuthoritative())
+	{
+		MissionCriticalObjectSet::iterator iter = m_missionCriticalObjectSet.find(networkId);
+		if (iter != m_missionCriticalObjectSet.end())
+		{
+			m_missionCriticalObjectSet.erase(iter);
+			GroupMissionCriticalObjectsBuilder::updateGroupMissionCriticalObjects(*this, true);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::clearMissionCriticalObjects()
+{
+	if (isAuthoritative())
+	{
+		m_missionCriticalObjectSet.clear();
+		GroupMissionCriticalObjectsBuilder::updateGroupMissionCriticalObjects(*this, true);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::isMissionCriticalObject(NetworkId const & networkId) const
+{
+	if (isAuthoritative())
+		return m_missionCriticalObjectSet.find(networkId) != m_missionCriticalObjectSet.end();
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+CreatureObject::MissionCriticalObjectSet const & CreatureObject::getMissionCriticalObjects() const
+{
+	return m_missionCriticalObjectSet.get();
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setGroupMissionCriticalObjects(GroupMissionCriticalObjectSet const & groupMissionCriticalObjectSet)
+{
+	DEBUG_FATAL(!isAuthoritative(), ("CreatureObject::setGroupMissionCriticalObjects: called on non-authoritative object %s", getDebugInformation(true).c_str()));
+	if (isAuthoritative())
+	{
+		//-- Anything that is not in our set, we need to add
+		{
+			for (GroupMissionCriticalObjectSet::const_iterator iter = groupMissionCriticalObjectSet.begin(); iter != groupMissionCriticalObjectSet.end(); ++iter)
+				if (!m_groupMissionCriticalObjectSet.contains(*iter))
+					m_groupMissionCriticalObjectSet.insert(*iter);
+		}
+
+		//-- Anything that is not in the original set, we need to remove
+		{
+			for (GroupMissionCriticalObjectSet::iterator iter = m_groupMissionCriticalObjectSet.begin(); iter != m_groupMissionCriticalObjectSet.end(); ++iter)
+				if (groupMissionCriticalObjectSet.find(*iter) == groupMissionCriticalObjectSet.end())
+					m_groupMissionCriticalObjectSet.erase(*iter);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::getCoverVisibility() const
+{
+	return m_coverVisibility.get();
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setCoverVisibility(bool isVisible)
+{
+	if (isAuthoritative())
+	{
+		m_coverVisibility.set(isVisible);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setCoverVisibility, new MessageQueueGenericValueType<bool>(isVisible));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Called when an attack pushes us away from the attacker. This gets called
+ * due to a message from the client (which sucks, btw).
+ *
+ * @param attackerId	the attacker
+ * @param attackerPos	where the client thought the attacker was
+ * @param defenderPos	where the client thought the defender (us) was
+ * @param distance		the distance we are pushed away from the attacker
+ */
+void CreatureObject::pushedMe(const NetworkId & attackerId,
+	const Vector & attackerPos, const Vector & defenderPos, float distance)
+{
+	if (isAuthoritative())
+	{
+		const ServerObject * attacker = safe_cast<const ServerObject *>(NetworkIdManager::getObjectById(attackerId));
+
+		//@todo: add a whole bunch of security checks here
+		// for now, push us away from the defender, using the server positions
+
+		// do a bare minimum sanity check
+		static const float MAX_DISTANCE = 20.0f;
+		if (distance > MAX_DISTANCE)
+		{
+			WARNING(true, ("CreatureObject::pushedMe told defender %s was pushed by %s %f meters (max = %f)",
+				getNetworkId().getValueString().c_str(), attackerId.getValueString().c_str(), distance, MAX_DISTANCE));
+			return;
+		}
+
+
+		UNREF(defenderPos);
+
+		Vector offset(getPosition_w());
+		if (attacker != NULL)
+			offset -= attacker->getPosition_w();
+		else
+			offset -= attackerPos;
+		offset.normalize();
+		offset *= distance;
+
+		// this is a hack due to the controller move command needing to know the destination cell
+		// @todo: change creature movement to always use the CellProperty notification system for moving across cell boundaries
+		const Vector oldPos(getPosition_p());
+
+		// note: unlike the client, this call will not cause us to change cells
+		move_p(rotate_w2p(offset));
+
+		AICreatureController *controller = dynamic_cast<AICreatureController *>(getController());
+		if (controller != NULL)
+		{
+			// we only need to do this for npcs, because we'll use the update from a player's client for players
+			// we need to do this for npcs to prevent the ai from moving them back to their previous position
+			const Vector newPos(getPosition_p());
+			float closestPortalT = 0.0f;
+			const CellProperty * destinationCell = getParentCell()->getDestinationCell(oldPos, newPos, closestPortalT);
+			if (destinationCell == NULL || destinationCell == getParentCell())
+			{
+				// no cell change
+				controller->warpTo(getParentCell(), newPos);
+			}
+			else
+			{
+				Vector warpPos(destinationCell->getOwner().rotateTranslate_w2p(rotateTranslate_p2w(newPos)));
+				controller->warpTo(destinationCell, warpPos);
+			}
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_pushCreature,
+			new MessageQueuePushCreature(attackerId, getNetworkId(), attackerPos, defenderPos, distance));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Creates a "slow down" effect between this creature and a defender. The effect acts as if
+ * there was a hill between the combatants, with the attacker at the top and the defender
+ * at the bottom. The area of the effect is a cone between the attacker and defender.
+ * The "hill" will be maintained between the combatants even if they move.
+ *
+ * @param defender		the target that defines the direction of the "hill"
+ * @param coneLength	the length of the effect cone
+ * @param coneAngle		the angle of the effect cone, in radians
+ * @param slopeAngle	the angle of the "hill", in radians
+ * @param expireTime	the game time when the effect expires
+ */
+void CreatureObject::addSlowDownEffect(const TangibleObject & defender, float coneLength, float coneAngle, float slopeAngle, unsigned long expireTime)
+{
+	if (isAuthoritative())
+	{
+		if (addSlowDownEffectProxy(defender, coneLength, coneAngle, slopeAngle, expireTime))
+		{
+			// tell everyone who can see us that we are doing the effect
+			Controller * const controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(CM_slowDownEffect,
+					0,
+					new MessageQueueSlowDownEffect(defender.getNetworkId(), coneLength, coneAngle, slopeAngle, expireTime),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_PROXY_SERVER |
+					GameControllerMessageFlags::DEST_ALL_CLIENT);
+			}
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_slowDownEffect,
+			new MessageQueueSlowDownEffect(defender.getNetworkId(), coneLength, coneAngle, slopeAngle, expireTime));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Creates a "slow down" effect between this creature and a defender. The effect acts as if
+ * there was a hill between the combatants, with the attacker at the top and the defender
+ * at the bottom. The area of the effect is a cone between the attacker and defender.
+ * The "hill" will be maintained between the combatants even if they move.
+ *
+ * @param defender		the target that defines the direction of the "hill"
+ * @param coneLength	the length of the effect cone
+ * @param coneAngle		the angle of the effect cone, in radians
+ * @param slopeAngle	the angle of the "hill", in radians
+ * @param expireTime	the game time when the effect expires
+ *
+ * @return true if the effect was added, false if the creature already had a slow down effect
+ */
+bool CreatureObject::addSlowDownEffectProxy(const TangibleObject & defender, float coneLength, float coneAngle, float slopeAngle, unsigned long expireTime)
+{
+	// if we already are doing a slowdown, don't do another
+	Property * property = getProperty(SlowDownProperty::getClassPropertyId());
+	if (property != NULL)
+		return false;
+
+	property = new SlowDownProperty(*this, CachedNetworkId(defender), coneLength, coneAngle, slopeAngle, expireTime);
+	addProperty(*property, true);
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Causes any slow down effect being used by us to be canceled early.
+ */
+void CreatureObject::removeSlowDownEffect()
+{
+	if (isAuthoritative())
+	{
+		removeSlowDownEffectProxy();
+
+		// tell all my proxies (client and server) to remove the effect
+		Controller * const controller = getController();
+		if (controller)
+			controller->appendMessage(CM_removeSlowDownEffectProxy, 0, NULL, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_ALL_CLIENT | GameControllerMessageFlags::DEST_PROXY_SERVER);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removeSlowDownEffect, NULL);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Causes any slow down effect being used by us to be canceled early.
+ */
+void CreatureObject::removeSlowDownEffectProxy()
+{
+	if (getProperty(SlowDownProperty::getClassPropertyId()) != NULL)
+		removeProperty(SlowDownProperty::getClassPropertyId());
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Adds an additional terrain slope effect that will be taken into account the
+ * next time we alter this creature. Note that this function only affects non-player
+ * creatures.
+ *
+ * @param normal		the normal vector of the "terrain" that is affecting us
+ */
+void CreatureObject::addTerrainSlopeEffect(const Vector & normal)
+{
+	if (isAuthoritative() && !isPlayerControlled())
+	{
+		Property * property = getProperty(SlopeEffectProperty::getClassPropertyId());
+		if (property == NULL)
+		{
+			property = new SlopeEffectProperty(*this);
+			addProperty(*property, true);
+		}
+		safe_cast<SlopeEffectProperty*>(property)->addNormal(normal);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+char const * CreatureObject::getMentalStateString(MentalStates::Enumerator const mentalState)
+{
+	switch (mentalState)
+	{
+		case MentalStates::Fear: { return "FEAR"; }
+		case MentalStates::Anger: { return "ANGER"; }
+		case MentalStates::Interest: { return "INTEREST"; }
+		case MentalStates::Distress: { return "DISTRESS"; }
+		default: {}
+	}
+
+	return "ERROR";
+}
+
+// ----------------------------------------------------------------------
+
+char const * CreatureObject::getBehaviorString(Behaviors::Enumerator const behavior)
+{
+	switch (behavior)
+	{
+		case Behaviors::Calm: { return "CALM"; }
+		case Behaviors::Alert: { return "ALERT"; }
+		case Behaviors::Threaten: { return "THREATEN"; }
+		case Behaviors::Retreat: { return "RETREAT"; }
+		case Behaviors::Flee: { return "FLEE"; }
+		case Behaviors::Attack: { return "ATTACK"; }
+		case Behaviors::Frenzy: { return "FRENZY"; }
+		default: {}
+	}
+
+	return "ERROR";
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::alterPseudoPlayedTime(float time)
+{
+	if (isAuthoritative())
+	{
+		m_pseudoPlayedTime += time;
+	}
+	else
+	{
+		WARNING(true, ("CreatureObject::alterPlayedTime called on non-authoritative creature"));
+	}
+}	// updatePlayedTime
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setPseudoPlayedTime(float playedTime)
+{
+	m_pseudoPlayedTime = playedTime;
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::addBuff(uint32 buffNameCrc, float duration, float dynamicValue, NetworkId caster, uint32 stackCount)
+{
+	addBuff( buffNameCrc, duration, dynamicValue, duration, caster, stackCount);
+}
+
+void CreatureObject::addBuff(uint32 buffNameCrc, float timeTillRemoval, float dynamicValue, float totalDuration, NetworkId caster, uint32 stackCount)
+{
+	if (!isAuthoritative())
+	{
+		sendControllerMessageToAuthServer(CM_addBuff, new MessageQueueGenericValueType<std::pair<int, std::pair<float, std::pair<float, std::pair< float, NetworkId > > > > >(std::make_pair(static_cast<int>(buffNameCrc), std::make_pair(timeTillRemoval, std::make_pair(dynamicValue, std::make_pair(totalDuration, caster))))));
+		return;
+	}
+	uint32 timestamp = internalGetPlayedTime();
+
+	if (BuffManager::getBuffIsCelestial(buffNameCrc))
+	{
+		timestamp = ServerClock::getInstance().getGameTimeSeconds();
+	}
+
+	int newStackCount = stackCount;
+
+	if(timeTillRemoval < 0.0f)
+		timestamp = 0xFFFFFFFF;
+	else if (timeTillRemoval == 0.0f)
+	{
+		float defaultDuration = BuffManager::getBuffDefaultDuration(buffNameCrc);
+		if(defaultDuration < 0.0f)
+			timestamp = 0xFFFFFFFF;
+		else
+		{
+			timestamp += static_cast<uint32>(defaultDuration);
+			totalDuration = defaultDuration;
+		}
+	}
+	else
+	{
+		timestamp += static_cast<uint32>(timeTillRemoval);
+	}
+	bool reapply = false;
+	if(hasBuff(buffNameCrc))
+	{
+		Buff b;
+		getBuff(buffNameCrc, b);
+		
+		newStackCount += b.m_stackCount;
+
+		if((timestamp != 0xFFFFFFFF) && (b.m_timestamp > timestamp))
+		{
+			//We don't need to do anything; the buff we're adding has less time than the one we have
+			return;
+		}
+		std::map<uint32, Buff::PackedBuff>::const_iterator i = m_buffs.find(buffNameCrc);
+		if (i != m_buffs.end())
+		{
+			m_buffs.erase(i);
+		}
+		m_persistedBuffs.erase(buffNameCrc);
+		reapply = true;
+	}
+
+	newStackCount = std::max(0, std::min(newStackCount, static_cast<int>(BuffManager::getBuffMaxStacks(buffNameCrc))));
+
+	Buff::PackedBuff packedValue = Buff(buffNameCrc, timestamp, dynamicValue, static_cast<uint32>(totalDuration), caster, newStackCount).getPackedBuffValue();
+
+	m_buffs.insert(buffNameCrc, packedValue);
+	if (BuffManager::getIsBuffPersisted(buffNameCrc))
+	{
+		m_persistedBuffs.insert(buffNameCrc, packedValue);
+	}
+	if(reapply)
+		BuffManager::reapplyBuffEffects(this, buffNameCrc, timeTillRemoval, dynamicValue, newStackCount, caster);
+	else
+		BuffManager::applyBuffEffects(this, buffNameCrc, timeTillRemoval, dynamicValue, newStackCount, caster);
+	//If there was a state, add that state to this creature
+	int buffState = BuffManager::getBuffState(buffNameCrc);
+	if(buffState != -1)
+		setState(static_cast<States::Enumerator>(buffState), true);
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::removeBuff(uint32 buffNameCrc)
+{
+	if (!isAuthoritative())
+	{
+		sendControllerMessageToAuthServer(CM_removeBuff, new MessageQueueGenericValueType<int>(static_cast<int>(buffNameCrc)));
+		return;
+	}
+
+	std::map<uint32, Buff::PackedBuff>::const_iterator i = m_buffs.find(buffNameCrc);
+	if (i != m_buffs.end())
+	{
+		NetworkId caster = (*i).second.caster;
+		m_buffs.erase(i);
+		int buffState = BuffManager::getBuffState(buffNameCrc);
+		BuffManager::removeBuffEffects(this, buffNameCrc, caster);
+		if (!stillHasBuffState(buffNameCrc, buffState))
+			setState(static_cast<States::Enumerator>(buffState), false);
+		std::string const &callback = BuffManager::getBuffCallback(buffNameCrc);
+		ScriptParams params;
+		params.addParam(static_cast<int>(buffNameCrc), "buffCrc");
+		ScriptDictionaryPtr dictionary;
+		getScriptObject()->makeScriptDictionary(params, dictionary);
+		dictionary->serialize();
+		getScriptObject()->handleMessage(callback, dictionary);
+	}
+
+	// clean up any persistance
+	m_persistedBuffs.erase(buffNameCrc);
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::decrementBuff(uint32 const buffNameCrc, uint32 const stacksToRemove)
+{
+	std::map<const uint32, Buff::PackedBuff>::const_iterator i = m_buffs.find(buffNameCrc);
+	if (i != m_buffs.end())
+	{
+		
+		Buff::PackedBuff b = (*i).second;
+
+		b.stackCount -= stacksToRemove;
+
+		removeBuff(buffNameCrc);
+
+		if (static_cast<int32>(b.stackCount) > 0)
+		{
+			uint32 currentTime = internalGetPlayedTime();
+
+			if (BuffManager::getBuffIsCelestial(buffNameCrc))
+			{
+				currentTime = ServerClock::getInstance().getGameTimeSeconds();
+			}
+
+			float endTime = static_cast<float> (b.endtime) - static_cast<float> (currentTime); 
+			addBuff( buffNameCrc, endTime , b.value, static_cast<float> (b.duration), b.caster, b.stackCount);	
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::decayBuff(uint32 buffNameCrc, float decayPercentage)
+{
+	std::map<const uint32, Buff::PackedBuff>::const_iterator i = m_buffs.find(buffNameCrc);
+	if (i != m_buffs.end())
+	{
+		Buff::PackedBuff b = (*i).second;
+
+		float decayValue = b.duration * decayPercentage; // decayPercentage should be a value between 0.0 and 1.0
+		
+		removeBuff(buffNameCrc);
+		
+		uint32 currentTime = internalGetPlayedTime();
+
+		float endTime = (static_cast<float> (b.endtime) - decayValue) - static_cast<float> (currentTime);
+		
+		if(endTime > 0.0f)
+			addBuff( buffNameCrc, endTime , b.value, static_cast<float> (b.duration), b.caster, b.stackCount);	
+	}
+}
+
+uint32 CreatureObject::internalGetPlayedTime() const
+{
+	if (isPlayerControlled())
+	{
+		PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(this);
+		if (playerObject)
+		{
+			return static_cast<uint32>(playerObject->getPlayedTime());
+		}
+	}
+	return static_cast<uint32>(ServerClock::getInstance().getGameTimeSeconds());
+}
+
+// ----------------------------------------------------------------------
+
+// This functions expires buffs as needed
+void CreatureObject::updateBuffs()
+{
+	uint32 timestamp = internalGetPlayedTime();
+	std::list< Buff > buffsToRemove;
+
+	for (std::map<uint32, Buff::PackedBuff>::const_iterator i = m_buffs.begin(); i != m_buffs.end(); )
+	{
+		const std::pair<uint32, Buff::PackedBuff> & p = *i++;
+		Buff b(p.first, p.second);
+
+		if (BuffManager::getBuffIsCelestial(b.m_nameCrc))
+		{
+			timestamp = ServerClock::getInstance().getGameTimeSeconds();
+		}
+		else
+		{
+			timestamp = internalGetPlayedTime();
+		}
+
+		if (b.m_timestamp < timestamp)
+		{
+			buffsToRemove.push_back(b);
+		}
+	}
+	
+	std::list< Buff >::iterator iter = buffsToRemove.begin();
+	for( ; iter != buffsToRemove.end(); ++iter)
+	{
+		removeBuff((*iter).m_nameCrc);
+	}
+	
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::stillHasBuffState(uint32 buffNameCrc, int state) const
+{
+	for (std::map<uint32, Buff::PackedBuff>::const_iterator i = m_buffs.begin(); i != m_buffs.end(); ++i)
+	{
+		const std::pair<uint32, Buff::PackedBuff> & p = *i;
+		if ((p.first != buffNameCrc) && (BuffManager::getBuffState(p.first) == state))
+			return true;
+	}
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::getAllBuffs(stdvector<uint32>::fwd & buffCrcs) const
+{
+	buffCrcs.clear();
+	buffCrcs.reserve(m_buffs.size());
+	for (std::map<uint32, Buff::PackedBuff>::const_iterator i = m_buffs.begin(); i != m_buffs.end(); ++i)
+	{
+		const std::pair<uint32, Buff::PackedBuff> & p = *i;
+		buffCrcs.push_back(p.first);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::getBuff(uint32 buffNameCrc, Buff & buff) const
+{
+	std::map<uint32, Buff::PackedBuff>::const_iterator found = m_buffs.find(buffNameCrc);
+	if (found == m_buffs.end())
+		return false;
+
+	buff.set((*found).first, (*found).second);
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::hasBuff(uint32 buffNameCrc) const
+{
+	std::map<uint32, Buff::PackedBuff>::const_iterator found = m_buffs.find(buffNameCrc);
+	return (found != m_buffs.end());
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::isInTutorial() const
+{
+	return NewbieTutorial::isInTutorial(this);
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::isJedi() const
+{
+	PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(this);
+	if (playerObject)
+		return playerObject->isJedi();
+	else
+		return false;
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setLevel(int level)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_setLevel,
+				0.0f,
+				new MessageQueueGenericValueType<int>(level),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+		if (playerObject == NULL)
+		{
+			// this is an ai, so just set the level
+			m_level = (int16) level;
+		}
+		else
+		{
+			LevelManager::LevelData levelData;
+			LevelManager::setLevelDataFromLevel(levelData, level);
+
+			setLevelData(levelData.currentLevel, levelData.currentLevelXp, levelData.currentHealth);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::recalculateLevel()
+{
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+	if (playerObject != NULL)
+	{
+		if (!isAuthoritative())
+		{
+			Controller *controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(
+					CM_recalculateLevel,
+					0.0f,
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+		else
+		{
+			LevelManager::LevelData levelData;
+			LevelManager::calculateLevelData(getLevelXp(), levelData);
+
+			setLevelData(levelData.currentLevel, levelData.currentLevelXp, levelData.currentHealth);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setLevelData(int16 level, int levelXp, int health)
+{
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+	if (playerObject != NULL)
+	{
+		m_totalLevelXp = levelXp;
+
+		m_levelHealthGranted = health;
+
+		m_level = level;
+
+		GroupObject *group = getGroup();
+		if (group != 0)
+		{
+			group->setMemberLevel(getNetworkId(), level);
+		}
+
+		std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData();
+		std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = connectedCharacterLfgData.find(getNetworkId());
+		if ((iterFind != connectedCharacterLfgData.end()) && (iterFind->second.level != static_cast<int16>(level)))
+			ServerUniverse::setConnectedCharacterLevelData(getNetworkId(), static_cast<int16>(level));
+
+		// update and sync
+		computeTotalAttributes();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::levelChanged() const
+{
+	return;
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setClientUsesAnimationLocomotion(bool const enabled)
+{
+	m_clientUsesAnimationLocomotion = enabled;
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::fixupPersistentBuffsAfterLoading()
+{
+	// initialize persisted buffs
+	if(m_fixedupPersistentBuffsAfterLoading)
+		return;  // don't want to do it twice
+	m_fixedupPersistentBuffsAfterLoading = true;
+	DEBUG_WARNING(isPlayerControlled() && PlayerCreatureController::getPlayerObject(this) && !PlayerCreatureController::getPlayerObject(this)->isInitialized(),
+		("CreatureObject::fixupPersistentBuffsAfterLoading trying to use an uninitialized player object"));
+	uint32 currentTime = internalGetPlayedTime();
+	std::vector<Buff> tempPersistedHolder;
+	for (std::map<uint32, Buff::PackedBuff>::const_iterator ip = m_persistedBuffs.begin(); ip != m_persistedBuffs.end(); ++ip)
+	{
+		Buff b((*ip).first, (*ip).second);
+		tempPersistedHolder.push_back(b);
+	}
+	m_persistedBuffs.clear();
+	for (std::vector<Buff>::const_iterator i = tempPersistedHolder.begin(); i != tempPersistedHolder.end(); ++i)
+	{
+		const Buff & b = (*i);
+
+		if (BuffManager::getBuffIsCelestial(b.m_nameCrc))
+		{
+			currentTime = ServerClock::getInstance().getGameTimeSeconds();
+		}
+		else
+			currentTime = internalGetPlayedTime();
+
+		if (b.m_timestamp > currentTime || b.m_timestamp == 0xFFFFFFFF)
+		{
+			float timeTillRemoval = -1.0f;
+			if (b.m_timestamp != 0xFFFFFFFF)
+				timeTillRemoval = static_cast<float>(b.m_timestamp - currentTime);
+						
+
+			addBuff(b.m_nameCrc, timeTillRemoval, b.m_value, static_cast<float>(b.m_duration), b.m_caster, b.m_stackCount);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::fixupLevelXpAfterLoading()
+{
+	// initialize persisted buffs
+	if(m_fixedupLevelXpAfterLoading)
+		return;  // don't want to do it twice
+
+	m_fixedupLevelXpAfterLoading = true;
+
+	DEBUG_FATAL(!isPlayerControlled(),
+		("CreatureObject::fixupLevelXpAfterLoading trying to be called for a non-player controlled object"));
+
+	PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+
+	DEBUG_FATAL(!playerObject,
+		("CreatureObject::fixupLevelXpAfterLoading trying to use a non-existent player object"));
+
+	DEBUG_FATAL(playerObject && !playerObject->isInitialized(),
+		("CreatureObject::fixupLevelXpAfterLoading trying to use an uninitialized player object"));
+
+	// The level XP and level are not persisted in the database, so when we
+	// are done loading, we will calculate the current level XP and level
+	if (playerObject && playerObject->isInitialized())
+	{
+		LevelManager::LevelData levelData;
+
+		// Level XP due to experience points
+		std::map<std::string, int> const & experienceMap = playerObject->getExperiencePoints();
+		std::map<std::string, int>::const_iterator i;
+		for (i = experienceMap.begin(); i != experienceMap.end(); ++i)
+		{
+			LevelManager::addXpToLevelData(levelData, i->first, i->second);
+		}
+
+		// Level XP due to skills
+		for (SkillList::const_iterator skillIter = m_skills.begin(); skillIter != m_skills.end(); ++skillIter)
+		{
+			SkillObject const * skill = *skillIter;
+			if (skill)
+			{
+				LevelManager::addSkillToLevelData(levelData, skill->getSkillName());
+			}
+		}
+
+		// Update the skill info directly (we do not want scripts triggered)
+		m_level              = levelData.currentLevel;
+		m_previousLevel      = levelData.currentLevel;
+		m_totalLevelXp       = levelData.currentLevelXp;
+		m_levelHealthGranted = levelData.currentHealth;
+
+		levelChanged();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+CreatureObject::Difficulty CreatureObject::getDifficulty() const
+{
+	return static_cast<Difficulty>(m_difficulty.get());
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setDifficulty(Difficulty const difficulty)
+{
+	m_difficulty = static_cast<unsigned char>(difficulty);
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setHologramType(int32 const newHologramType)
+{
+	if (isAuthoritative())
+	{
+		m_hologramType = newHologramType;
+	}
+	else
+	{	
+		sendControllerMessageToAuthServer(CM_modifyHologramType, new MessageQueueGenericValueType<int32 >(newHologramType));				
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setVisibleOnMapAndRadar(bool const newVal)
+{
+	if (isAuthoritative())
+	{
+		m_visibleOnMapAndRadar = newVal;
+	}
+	else
+	{	
+		sendControllerMessageToAuthServer(CM_modifyVisibleOnMapAndRadar, new MessageQueueGenericValueType<bool>(newVal));				
+	}
+}
+
+// ----------------------------------------------------------------------
+
+float CreatureObject::getRegenRate(Attributes::Enumerator poolAttrib) const
+{
+	if (!Attributes::isAttribPool(poolAttrib))
+		return 0;
+
+	// we've stored the rate as an int, convert back to float
+	int fixedFloatRate = m_attributes[poolAttrib+1];
+	return static_cast<float>(fixedFloatRate);
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setRegenRate(Attributes::Enumerator poolAttrib, float value)
+{
+	if (Attributes::isAttribPool(poolAttrib))
+	{
+		if (value < 0)
+			value = 0;
+		if (isAuthoritative())
+		{
+			// store the value as an int
+			m_attributes.set(poolAttrib+1, static_cast<int>(floor(value)));
+		}
+		else
+		{
+			sendControllerMessageToAuthServer(CM_setRegenRate, new MessageQueueGenericValueType<std::pair<int, float> >(std::make_pair(static_cast<int>(poolAttrib), value)));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::setLastWaterDamageTime(unsigned long newTime)
+{
+	m_lastWaterDamageTime = newTime;
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::doesLocomotionInvalidateCommand(Command const &cmd) const
+{
+	Locomotions::Enumerator locomotion = getLocomotion();
+	if((locomotion != Locomotions::Running) || cmd.m_locomotionPermissions[locomotion])
+		return !cmd.m_locomotionPermissions[locomotion];
+	if(!isPlayerControlled())
+		return true;
+	PlayerCreatureController const *playerCreatureController = safe_cast<PlayerCreatureController const *>(getController());
+	if(playerCreatureController)
+		return (playerCreatureController->getLastSpeed() > ConfigSharedGame::getMovementThresholdForActionValidation());
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+CommandQueue * CreatureObject::getCommandQueue() const
+{
+	if (m_commandQueue == NULL)
+	{
+		m_commandQueue = CommandQueue::getCommandQueue(*const_cast<CreatureObject *>(this));
+	}
+
+	return m_commandQueue;
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::clearCommands()
+{
+	m_commands.clear();	
+}
+
+// ----------------------------------------------------------------------
+
+std::map<std::string, int> const & CreatureObject::getCommandList() const
+{
+	return m_commands.getMap();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+	Multiple skills can grant the same command. Commands can be granted
+	apart from skills. When a skill is removed, it must remove the command
+	it granted, but it probably shouldn't remove the command if is granted
+	by another skill or commands granted via other methods
+	(items/quests, etc...)
+*/
+bool CreatureObject::grantCommand(std::string const & commandName, bool const fromSkill)
+{
+	bool result = false;
+	if(isAuthoritative())
+	{
+		result = true;
+		// check if we already have the command
+		Archive::AutoDeltaMap<std::string, int>::const_iterator found = m_commands.find(commandName);
+		if (found == m_commands.end())
+		{
+			m_commands.set(commandName, 1);
+
+			if(getClient())
+			{
+				GrantCommand grant(commandName);
+				getClient()->send(grant, true);
+			}
+			if (!fromSkill)
+			{
+				// save command as objvar
+				setObjVarItem(OBJVAR_NOT_SKILL_COMMANDS + "." + commandName, 1);
+			}
+		}
+		else
+		{
+			m_commands.set(commandName, (*found).second + 1);
+		}
+	}
+	else
+	{
+		result = true;
+		sendControllerMessageToAuthServer(CM_grantCommand, new MessageQueueGenericValueType<std::string>(commandName));
+	}
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::revokeCommand(std::string const & command, bool const fromSkill, bool const ignoreCount)
+{
+	if(isAuthoritative())
+	{
+		Archive::AutoDeltaMap<std::string, int>::const_iterator found = m_commands.find(command);
+		if (found != m_commands.end())
+		{
+			if ((*found).second > 1 && !ignoreCount)
+			{
+				m_commands.set(command, (*found).second - 1);
+			}
+			else
+			{
+				m_commands.erase(found);
+
+				if(getClient())
+				{
+					RevokeCommand revoke(command);
+					getClient()->send(revoke, true);
+				}
+				if (!fromSkill)
+				{
+					// remove commands from objvars
+					removeObjVarItem(OBJVAR_NOT_SKILL_COMMANDS + "." + command);
+				}
+			}
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_revokeCommand, new MessageQueueGenericValueType<std::string>(command));
+	}
+}
+
+//-----------------------------------------------------------------------
+
+bool CreatureObject::hasCommand(std::string const & commandName) const
+{
+	bool result = false;
+	if (commandName == "unskilled")
+		result = true;
+	else
+	{
+		const Archive::AutoDeltaMap<std::string, int>::const_iterator f = m_commands.find(commandName);
+		result = (f != m_commands.end());
+	}
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Called when our observer count changes. Will bring us into or out of hibernation
+ * if needed.
+ */
+void CreatureObject::observersCountChanged()
+{
+	if (isAuthoritative())
+	{
+		CreatureController * controller = getCreatureController();
+		int observers = getObserversCount();
+		bool hibernating = controller->getHibernate();
+		if ((observers > 0 && hibernating) ||
+			(observers <= 0 && !hibernating))
+		{
+			// attempt to change our hibernate state
+			controller->updateHibernate();
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+bool CreatureObject::isStopped() const
+{
+	return (m_stopWalkRun.get() == 0);
+}
+
+//-----------------------------------------------------------------------
+
+bool CreatureObject::isWalking() const
+{
+	return (m_stopWalkRun.get() == 1);
+}
+
+//-----------------------------------------------------------------------
+
+bool CreatureObject::isRunning() const
+{
+	return (m_stopWalkRun.get() == 2);
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::setLookAtYaw(const float lookAtYaw, bool useLookAtYaw)
+{
+	if(useLookAtYaw && (m_lookAtYaw != lookAtYaw))
+		setTransformChanged(true);
+	m_lookAtYaw = lookAtYaw;
+	m_useLookAtYaw = useLookAtYaw;	
+}
+
+//-----------------------------------------------------------------------
+
+float CreatureObject::getLookAtYaw() const
+{
+	return m_lookAtYaw;
+}
+
+//-----------------------------------------------------------------------
+
+bool CreatureObject::getUseLookAtYaw() const
+{
+	return m_useLookAtYaw;
+}
+
+//-----------------------------------------------------------------------
+
+int CreatureObject::getExpertiseRankForPlayer(std::string const & expertiseName)
+{
+	int result = 0;
+
+	int rankMax = ExpertiseManager::getExpertiseRankMax(expertiseName);
+
+	int tree = ExpertiseManager::getExpertiseTree(expertiseName);
+	int tier = ExpertiseManager::getExpertiseTier(expertiseName);
+	int grid = ExpertiseManager::getExpertiseGrid(expertiseName);
+	int rank = 1;
+
+	while (rank <= rankMax)
+	{
+		SkillObject const * skill = ExpertiseManager::getExpertiseSkillAt(tree, tier, grid, rank);
+		if (skill && hasSkill(*skill))
+		{
+			result = rank;
+			rank++;
+		}
+		else
+		{
+			break;
+		}
+	}
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::getExpertisesForPlayer(SkillList & expertiseList) const
+{
+	expertiseList.clear();
+
+	SkillList const & skillList = this->getSkillList();
+
+	for (SkillList::const_iterator i = skillList.begin(); i != skillList.end(); ++i)
+	{
+		if (*i)
+		{
+			if (ExpertiseManager::isExpertise(*i))
+			{
+				expertiseList.insert(*i);
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+int CreatureObject::getExpertisePointsSpentForPlayerInTree(int tree)
+{
+	int spentPoints = 0;
+
+	SkillList expertiseList;
+	getExpertisesForPlayer(expertiseList);
+
+	for (SkillList::const_iterator i = expertiseList.begin(); i != expertiseList.end(); ++i)
+	{
+		SkillObject const * expertise = *i;
+		if (expertise)
+		{
+			std::string const & expertiseName = expertise->getSkillName();
+			if (ExpertiseManager::getExpertiseTree(expertiseName) == tree)
+			{
+				spentPoints += getExpertiseRankForPlayer(expertiseName);
+			}
+		}
+	}
+	return spentPoints;
+}
+
+//----------------------------------------------------------------------
+
+int CreatureObject::getRemainingExpertisePoints() const
+{
+	int const numPointsAvail = ExpertiseManager::getExpertisePointsForLevel(getLevel());
+
+	CreatureObject::SkillList expertiseList;
+	getExpertisesForPlayer(expertiseList);
+	int const numPointsUsed = expertiseList.size() - 1; // subtract 1 for skill "expertise"
+
+	return numPointsAvail - numPointsUsed;
+}
+
+//-----------------------------------------------------------------------
+
+bool CreatureObject::processExpertiseRequest(std::vector<std::string> const &addExpertisesNamesList, bool clearAllExpertisesFirst)
+{
+	for(std::vector<std::string>::const_iterator i = addExpertisesNamesList.begin(); i != addExpertisesNamesList.end(); ++i)
+	{
+		std::string const &s = *i;
+		const SkillObject *skill = SkillManager::getInstance().getSkill(s);
+		if(skill)
+		{
+			//Check prerequisites
+			SkillObject::SkillVector const prereqs = skill->getPrerequisiteSkills();
+			for (SkillObject::SkillVector::const_iterator i = prereqs.begin(); i != prereqs.end(); ++i)
+			{
+				SkillObject const * prereq = (*i);
+				if (!prereq || !hasSkill(*prereq))
+				{
+					DEBUG_WARNING(true, ("player %s tried to get expertise %s but doesn't have expertise %s", getNetworkId().getValueString().c_str(),
+						skill->getSkillName().c_str(), prereq->getSkillName().c_str()));
+					return false;
+				}
+			}
+			//Check tier points
+			//Check if the player has enough points for a skill of this tier
+			int tree = ExpertiseManager::getExpertiseTree(s);
+			int pointsInTree = getExpertisePointsSpentForPlayerInTree(tree);
+			int tier = ExpertiseManager::getExpertiseTier(s);
+			if (pointsInTree < (tier - 1) * POINTS_PER_TIER)
+			{
+				DEBUG_WARNING(true, ("player %s tried to get expertise %s but only has %d points in tree %d, needs %d", getNetworkId().getValueString().c_str(),
+					s.c_str(), pointsInTree, tree, (tier - 1) * POINTS_PER_TIER
+					));
+				return false;
+			}
+
+			if (getRemainingExpertisePoints() < 1)
+			{
+				LOG("CustomerService", 
+					("SuspectedCheaterChannel: %s attempted to gain more expertise than allowed.",
+					PlayerObject::getAccountDescription(this).c_str())
+					);
+
+				return false;
+			}
+
+			//Check faction column
+
+			//Grant skill
+			grantSkill(*skill);
+		}
+	}
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+bool CreatureObject::clearAllExpertises()
+{
+	int numTries = 0;
+	while(numTries < 50)
+	{
+		//@TODO:  guard this however design wants
+		const SkillList &skills = getSkillList();
+		std::vector<const SkillObject *> skillsToRevoke;
+		for(std::set<const SkillObject *>::iterator i = skills.begin(); i != skills.end(); ++i)
+		{
+			const SkillObject *skill = *i;
+			if(skill && ExpertiseManager::isExpertise(skill))
+				skillsToRevoke.push_back(skill);
+		}
+		if(skillsToRevoke.empty())
+			return true;
+		for(std::vector<const SkillObject *>::iterator i2 = skillsToRevoke.begin(); i2 != skillsToRevoke.end(); ++i2)
+		{
+			const SkillObject *skill = *i2;
+			revokeSkill(*skill, true);
+		}
+		numTries++;
+	}
+	return false;
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::recomputeCommandSeries()
+{
+	for(std::vector<CommandSeriesRecord>::iterator i = s_commandSeriesRecords.begin(); i != s_commandSeriesRecords.end(); ++i)
+	{
+		CommandSeriesRecord const & csr = *i;
+		bool hasLevel = getLevel() >= csr.level;
+		if(csr.baseCommandName.empty())
+		{
+			if(!hasLevel)
+				LOG("CustomerService",("Player %s of level %d has command %s from command series, but should not have it until level %d",
+					getNetworkId().getValueString().c_str(), getLevel(), csr.baseCommandName.c_str(), csr.level));
+		}
+		else
+		{
+			if(hasCommand(csr.commandName) && (!hasCommand(csr.baseCommandName) || !hasLevel))
+			{
+				revokeCommand(csr.commandName, true);
+			}
+			else if(!hasCommand(csr.commandName) && hasCommand(csr.baseCommandName) && hasLevel)
+			{
+				grantCommand(csr.commandName, true);
+			}
+		}
+
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::incrementKillMeter(int amount)
+{
+	if (isPlayerControlled())
+	{
+		PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(this);
+		if (playerObject != NULL)
+		{
+			playerObject->incrementKillMeter(amount);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void CreatureObject::getLfgCharacterData(LfgCharacterData & lfgCharacterData) const
+{
+	lfgCharacterData.characterId = getNetworkId();
+	lfgCharacterData.characterName = getAssignedObjectName();
+	lfgCharacterData.characterLowercaseFirstName = Unicode::wideToNarrow(Unicode::toLower(getAssignedObjectFirstName()));
+
+	lfgCharacterData.species = getSpecies();
+	lfgCharacterData.gender = getGender();
+
+	std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData();
+	std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = connectedCharacterLfgData.find(getNetworkId());
+	if (iterFind != connectedCharacterLfgData.end())
+	{
+		lfgCharacterData.characterInterests = iterFind->second.characterInterests;
+		lfgCharacterData.characterCreateTime = iterFind->second.characterCreateTime;
+		lfgCharacterData.characterAge = iterFind->second.characterAge;
+	}
+	else
+	{
+		lfgCharacterData.characterInterests.clear();
+		lfgCharacterData.characterCreateTime = -1;
+		lfgCharacterData.characterAge = -1;
+	}
+
+	if (lfgCharacterData.characterCreateTime <= 0)
+		lfgCharacterData.characterCreateTime = static_cast<int32>(NameManager::getInstance().getPlayerCreateTime(getNetworkId()));
+
+	PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(this);
+	if (playerObject)
+	{
+		lfgCharacterData.characterAge = playerObject->getAgeInDays();
+
+		lfgCharacterData.profession = LfgCharacterData::convertSkillTemplateToProfession(playerObject->getSkillTemplate());
+
+		MatchMakingId const & id = playerObject->getMatchMakingCharacterProfileId();
+		lfgCharacterData.anonymous = id.isBitSet(MatchMakingId::B_anonymous);
+		lfgCharacterData.searchableByCtsSourceGalaxy = id.isBitSet(MatchMakingId::B_searchableByCtsSourceGalaxy);
+		lfgCharacterData.displayLocationInSearchResults = id.isBitSet(MatchMakingId::B_displayLocationInSearchResults);
+
+		if (id.isBitSet(MatchMakingId::B_lookingForGroup))
+			LfgDataTable::setBit("lfg", lfgCharacterData.characterInterests);
+		else
+			LfgDataTable::clearBit("lfg", lfgCharacterData.characterInterests);
+
+		if (id.isBitSet(MatchMakingId::B_helper))
+			LfgDataTable::setBit("helper", lfgCharacterData.characterInterests);
+		else
+			LfgDataTable::clearBit("helper", lfgCharacterData.characterInterests);
+
+		if (id.isBitSet(MatchMakingId::B_rolePlay))
+			LfgDataTable::setBit("rp", lfgCharacterData.characterInterests);
+		else
+			LfgDataTable::clearBit("rp", lfgCharacterData.characterInterests);
+
+		if (id.isBitSet(MatchMakingId::B_lookingForWork))
+			LfgDataTable::setBit("lfw", lfgCharacterData.characterInterests);
+		else
+			LfgDataTable::clearBit("lfw", lfgCharacterData.characterInterests);
+
+		lfgCharacterData.active = (playerObject->getSessionLastActiveTime() != 0);
+		lfgCharacterData.sessionActivity = playerObject->getSessionActivity();
+	}
+	else
+	{
+		lfgCharacterData.profession = LfgCharacterData::Prof_Unknown;
+		lfgCharacterData.anonymous = false;
+		lfgCharacterData.displayLocationInSearchResults = false;
+		lfgCharacterData.active = false;
+		lfgCharacterData.sessionActivity = 0;
+	}
+
+	SkillObject const * skill = SkillManager::getInstance().getSkill("pilot_rebel_navy_novice");
+	if (skill && hasSkill(*skill))
+	{
+		lfgCharacterData.pilot = LfgCharacterData::Pilot_Rebel;
+	}
+	else
+	{
+		skill = SkillManager::getInstance().getSkill("pilot_imperial_navy_novice");
+		if (skill && hasSkill(*skill))
+		{
+			lfgCharacterData.pilot = LfgCharacterData::Pilot_Imperial;
+		}
+		else
+		{
+			skill = SkillManager::getInstance().getSkill("pilot_neutral_novice");
+			if (skill && hasSkill(*skill))
+			{
+				lfgCharacterData.pilot = LfgCharacterData::Pilot_Neutral;
+			}
+			else
+			{
+				lfgCharacterData.pilot = LfgCharacterData::Pilot_None;
+			}
+		}
+	}
+
+	lfgCharacterData.level = getLevel();
+	lfgCharacterData.faction = getPvpFaction();
+
+	int const guildId = getGuildId();
+	if (guildId == 0)
+	{
+		lfgCharacterData.guildName.clear();
+		lfgCharacterData.guildAbbrev.clear();
+	}
+	else
+	{
+		lfgCharacterData.guildName = GuildInterface::getGuildName(guildId);
+		lfgCharacterData.guildAbbrev = GuildInterface::getGuildAbbrev(guildId);
+	}
+
+	std::vector<int> const & cityIds = CityInterface::getCitizenOfCityId(getNetworkId());
+	if (!cityIds.empty())
+	{
+		lfgCharacterData.citizenOfCity = CityInterface::getCityInfo(cityIds.front()).getCityName();
+	}
+	else
+	{
+		lfgCharacterData.citizenOfCity.clear();
+	}
+
+	lfgCharacterData.groupId = m_group.get();
+	lfgCharacterData.locationPlanet = ServerWorld::getSceneId();
+
+	lfgCharacterData.locationRegion.clear();
+	lfgCharacterData.locationFactionalPresenceGcwRegion.clear();
+	lfgCharacterData.locationFactionalPresenceGridX = 0;
+	lfgCharacterData.locationFactionalPresenceGridZ = 0;
+	lfgCharacterData.locationPlayerCity.clear();
+	PlanetObject const * const planetObject = ServerUniverse::getInstance().getPlanetByName(lfgCharacterData.locationPlanet);
+	if (planetObject)
+	{
+		Vector const creaturePosition = findPosition_w();
+		Region const * const region = RegionMaster::getSmallestVisibleRegionAtPoint(planetObject->getName(), creaturePosition.x, creaturePosition.z);
+
+		if (region != NULL)
+			lfgCharacterData.locationRegion = Unicode::wideToNarrow(region->getName());
+
+		// handle factional presence
+		Client const * const client = getClient();
+		if (client && (!ConfigServerGame::getGcwFactionalPresenceDisableForSecuredLogin() || !client->isGodValidated()))
+		{
+			std::string const & playerCurrentGcwRegion = playerObject->getCurrentGcwRegion();
+			if (!playerCurrentGcwRegion.empty())
+			{
+				if (!ServerWorld::isSpaceScene())
+				{
+					// ground factional presence
+					//
+					// character contributes to ground GCW factional presence if he is actively
+					// playing the game, is declared factional, is not in a cell, is not
+					// cloaked/incapped/dead/swimming, and is not hidden from the overhead map/radar
+					if (lfgCharacterData.active && !PvpData::isNeutralFactionId(lfgCharacterData.faction) && PvpInternal::isDeclared(*this) && !isHidden() && isVisible() && getCoverVisibility() && !isIncapacitated() && !isDead() && !getState(States::Swimming) && getVisibleOnMapAndRadar())
+					{
+						bool inCell = false;
+						ServerObject const * o = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*this));
+						while (o)
+						{
+							if (o->asCellObject())
+							{
+								inCell = true;
+								break;
+							}
+
+							o = safe_cast<ServerObject const*>(ContainerInterface::getContainedByObject(*o));
+						}
+
+						if (!inCell)
+						{
+							// make sure he (or his vehicle/mount) is standing on the
+							// ground, and not on a roof/balcony/storyteller platform/etc
+							Object const * playerOrMount = getMountedCreature();
+							if (playerOrMount)
+							{
+								// is factional presence allowed while mounted?
+								if (ConfigServerGame::getGcwFactionalPresenceMountedPct() <= 0)
+									playerOrMount = NULL;
+							}
+							else
+							{
+								playerOrMount = this;
+							}
+
+							if (playerOrMount)
+							{
+								CollisionProperty const * const collisionProperty = playerOrMount->getCollisionProperty();
+								Footprint const * const footprint = (collisionProperty ? collisionProperty->getFootprint() : NULL);
+								bool isOnSolidFloor = (footprint && footprint->isOnSolidFloor());
+								if (isOnSolidFloor)
+								{
+									// make sure the player/mount is actually standing on the floor for it to count
+									float groundHeight, floorHeight;
+									if (footprint->getGroundHeight(groundHeight) && footprint->getFloorHeight(floorHeight) && (groundHeight == floorHeight))
+									{
+										// really standing on the floor
+									}
+									else
+									{
+										// not really standing on the floor
+										isOnSolidFloor = false;
+									}
+								}
+
+								// standing on the ground
+								if (!isOnSolidFloor)
+								{
+									lfgCharacterData.locationFactionalPresenceGcwRegion = playerCurrentGcwRegion;
+
+									// if there's factional presence, calculate the grid in which it is occurring
+									// clamp to -8000 - 7999
+									int posX = std::min(std::max(static_cast<int>(creaturePosition.x), -8000), 7999);
+
+									// clamp to -8000 - 7999
+									int posZ = std::min(std::max(static_cast<int>(creaturePosition.z), -8000), 7999);
+
+									if (posX < 0)
+										posX -= (PvpData::getGcwFactionalPresenceGridSize() - 1);
+
+									if (posZ < 0)
+										posZ -= (PvpData::getGcwFactionalPresenceGridSize() - 1);
+
+									lfgCharacterData.locationFactionalPresenceGridX = ((posX / PvpData::getGcwFactionalPresenceGridSize()) * PvpData::getGcwFactionalPresenceGridSize()) + (PvpData::getGcwFactionalPresenceGridSize() / 2);
+									lfgCharacterData.locationFactionalPresenceGridZ = ((posZ / PvpData::getGcwFactionalPresenceGridSize()) * PvpData::getGcwFactionalPresenceGridSize()) + (PvpData::getGcwFactionalPresenceGridSize() / 2);
+								}
+							}
+						}
+					}
+				}
+				else if (lfgCharacterData.active && !isIncapacitated() && !isDead())
+				{
+					// space factional presence
+					//
+					// character contributes to space GCW factional presence if he is actively playing the
+					// game, is not incapped/dead, is on board a player ship that's open to attack from
+					// other player ships, and is the same faction as the ship
+					ShipObject const * const ship = ShipObject::getContainingShipObject(this);
+					if (ship && ship->isPlayerShip() && !ship->isInvulnerable() && PvpInternal::isDeclared(*ship))
+					{
+						uint32 const shipFaction = ship->getSpaceFaction();
+						if ((PvpData::isImperialFactionId(shipFaction) || PvpData::isRebelFactionId(shipFaction)) && (lfgCharacterData.faction == shipFaction))
+							lfgCharacterData.locationFactionalPresenceGcwRegion = playerCurrentGcwRegion;
+					}
+				}
+			}
+		}
+
+		int const cityId = CityInterface::getCityAtLocation(planetObject->getName(), static_cast<int>(creaturePosition.x), static_cast<int>(creaturePosition.z), 0);
+		if (cityId > 0)
+			lfgCharacterData.locationPlayerCity = CityInterface::getCityInfo(cityId).getCityName();
+	}
+
+	// CTS transferred from galaxy
+	lfgCharacterData.ctsSourceGalaxy.clear();
+	if (getObjVars().hasItem("ctsHistory"))
+	{
+		DynamicVariableList::NestedList const ctsTransactions(getObjVars(), "ctsHistory");
+		for (DynamicVariableList::NestedList::const_iterator i = ctsTransactions.begin(); i != ctsTransactions.end(); ++i)
+		{
+			Unicode::String ctsTransactionDetail;
+			if (i.getValue(ctsTransactionDetail))
+			{
+				Unicode::UnicodeStringVector tokens;
+				if (Unicode::tokenize(ctsTransactionDetail, tokens, NULL, NULL) && (tokens.size() >= 4))
+				{
+					IGNORE_RETURN(lfgCharacterData.ctsSourceGalaxy.insert(Unicode::wideToNarrow(tokens[1])));
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObjectNamespace::GroupHelpers::creatureIsContainedInPOBShip(CreatureObject const * const creatureObject)
+{
+	NOT_NULL(creatureObject);
+
+	ShipObject const * const shipObject = ShipObject::getContainingShipObject(creatureObject);
+	return shipObject && shipObject->getPortalProperty();
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObjectNamespace::GroupHelpers::findAllTargetsForGroup(CreatureObject * const targetObj, std::vector<CreatureObject *> & targets)
+{
+	typedef std::vector<CreatureObject *> Targets;
+
+	NOT_NULL(targetObj);
+
+	ShipObject * const shipObject = ShipObject::getContainingShipObject(targetObj);
+	GroupObject const * const groupObject = targetObj->getGroup();
+
+	if ((shipObject != 0) && (groupObject != 0))
+	{
+		Targets passengers;
+
+		shipObject->findAllPassengers(passengers, true);
+
+		Targets::const_iterator ii = passengers.begin();
+		Targets::const_iterator iiEnd = passengers.end();
+
+		for (; ii != iiEnd; ++ii)
+		{
+			CreatureObject * const passenger = *ii;
+
+			if (passenger != 0)
+			{
+				NetworkId const & passengerId = passenger->getNetworkId();
+
+				if (groupObject->isGroupMember(passengerId))
+				{
+					targets.push_back(passenger);
+				}
+			}
+			NOT_NULL(passenger);
+		}
+	}
+	else
+	{
+		targets.push_back(targetObj);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObjectNamespace::GroupHelpers::roomInGroup(GroupObject const * groupObj, int additionalMembers)
+{
+	if (groupObj != 0)
+	{
+		return groupObj->doesGroupHaveRoomFor(additionalMembers);
+	}
+
+	additionalMembers = std::max(0, additionalMembers);
+	return additionalMembers < GroupObject::maximumMembersInGroup();
+}
+
+// ----------------------------------------------------------------------
+
+GroupMemberParam const CreatureObjectNamespace::GroupHelpers::buildGroupMemberParam(CreatureObject const * const creatureObject)
+{
+	NOT_NULL(creatureObject);
+
+	ShipObject const * const shipObject = ShipObject::getContainingShipObject(creatureObject);
+	NetworkId const & memberId = creatureObject->getNetworkId();
+	std::string const & name = Unicode::wideToNarrow(creatureObject->getEncodedObjectName());
+	int const level = creatureObject->getLevel();
+	bool const memberIsPC = creatureObject->isPlayerControlled();
+	LfgCharacterData::Profession profession = LfgCharacterData::Prof_Unknown;
+	if (!memberIsPC)
+	{
+		profession = LfgCharacterData::Prof_NPC;
+	}
+	else
+	{
+		PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(creatureObject);
+		if (playerObject)
+			profession = LfgCharacterData::convertSkillTemplateToProfession(playerObject->getSkillTemplate());
+	}
+
+	NetworkId const & shipId = (shipObject != 0) ? shipObject->getNetworkId() : NetworkId::cms_invalid;
+	bool const shipIsPOB = shipObject != 0 && shipObject->getPortalProperty() != 0;
+	bool const ownsPOB = shipObject != 0 && shipObject->getOwnerId() == memberId;
+
+	return GroupMemberParam(memberId, name, level, profession, memberIsPC, shipId, shipIsPOB, ownsPOB);
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObjectNamespace::GroupHelpers::buildGroupMemberParamsFromCreatures(std::vector<CreatureObject *> const & targets, GroupObject::GroupMemberParamVector & targetMemberParams)
+{
+	std::vector<CreatureObject *>::const_iterator ii = targets.begin();
+	std::vector<CreatureObject *>::const_iterator iiEnd = targets.end();
+
+	for (; ii != iiEnd; ++ii)
+	{
+		CreatureObject const * const creatureObject = *ii;
+		if (creatureObject != 0)
+		{
+			targetMemberParams.push_back(GroupHelpers::buildGroupMemberParam(creatureObject));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObjectNamespace::restoreItemDecorationLayout(CreatureObject & decorator, PlayerObject & decoratorPlayerObject, CachedNetworkId const & item, TangibleObject const & pob, CachedNetworkId const & cell, Vector const & position, Quaternion const & orientation)
+{
+	// make sure item is around
+	ServerObject const * const itemSo = safe_cast<ServerObject const *>(item.getObject());
+	if (!itemSo)
+		return;
+
+	// make sure item is immediately in a cell/room
+	ServerObject const * const itemContainingCell = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*itemSo));
+	if (!itemContainingCell || !itemContainingCell->asCellObject())
+		return;
+
+	// make sure item is in the pob
+	if (&pob != ContainerInterface::getContainedByObject(*itemContainingCell))
+		return;
+
+	// make sure the cell is around
+	ServerObject const * const cellSo = safe_cast<ServerObject const *>(cell.getObject());
+	if (!cellSo)
+		return;
+
+	CellObject const * const cellCo = cellSo->asCellObject();
+	if (!cellCo)
+		return;
+
+	// make sure cell is in the pob
+	if (&pob != ContainerInterface::getContainedByObject(*cellCo))
+		return;
+
+	// item is not currently in the target room, need to move it
+	bool needToMoveItem = false;
+	bool needToRotateItem = false;
+	Transform const * itemCurrentTransform = NULL;
+	if (itemContainingCell->getNetworkId() != cellSo->getNetworkId())
+	{
+		needToMoveItem = true;
+	}
+	else
+	{
+		// if the item is not currently at the desired position, need to move it
+		itemCurrentTransform = &(itemSo->getTransform_o2p());
+		Vector const currentPosition = itemCurrentTransform->getPosition_p();
+		if (currentPosition.magnitudeBetweenSquared(position) > 0.0025) // not within 0.05m
+		{
+			needToMoveItem = true;
+		}
+		else
+		{
+			// if the item is not currently at the desired orientation, need to rotate it
+			Quaternion const currentOrientation(*itemCurrentTransform);
+			if (!WithinEpsilonInclusive(currentOrientation.w, orientation.w, 0.01f) ||
+				!WithinEpsilonInclusive(currentOrientation.x, orientation.x, 0.01f) ||
+				!WithinEpsilonInclusive(currentOrientation.y, orientation.y, 0.01f) ||
+				!WithinEpsilonInclusive(currentOrientation.z, orientation.z, 0.01f))
+			{
+				needToRotateItem = true;
+			}
+		}
+	}
+
+	if (!needToMoveItem && !needToRotateItem)
+		return;
+
+	// if the item needs to be moved, check to see if it needs to be rotated as well
+	if (needToMoveItem)
+	{
+		if (!itemCurrentTransform)
+			itemCurrentTransform = &(itemSo->getTransform_o2p());
+
+		Quaternion const currentOrientation(*itemCurrentTransform);
+		if (!WithinEpsilonInclusive(currentOrientation.w, orientation.w, 0.01f) ||
+			!WithinEpsilonInclusive(currentOrientation.x, orientation.x, 0.01f) ||
+			!WithinEpsilonInclusive(currentOrientation.y, orientation.y, 0.01f) ||
+			!WithinEpsilonInclusive(currentOrientation.z, orientation.z, 0.01f))
+		{
+			needToRotateItem = true;
+		}
+	}
+
+	// if the item needs to be moved, find the "best" valid position for the item
+	if (needToMoveItem)
+	{
+		CellProperty const * const cellProperty = cellCo->getCellProperty();
+		if (!cellProperty)
+			return;
+
+		Floor const * const floor = cellProperty->getFloor();
+		if (!floor)
+			return;
+
+		BaseExtent const * const floorExtent = floor->getExtent_l();
+		if (!floorExtent)
+			return;
+
+		AxialBox const floorExtentBoundingBox = floorExtent->getBoundingBox();
+		Vector floorExtentBoundingBoxCenter = floorExtentBoundingBox.getCenter();
+		floorExtentBoundingBoxCenter.y = position.y + 1.0f;
+
+		Vector goodLocation(position);
+		goodLocation.y = floorExtentBoundingBoxCenter.y;
+
+		bool foundGoodPoint = true;
+		FloorLocator flResult;
+		if (!floor->intersectClosest(Ray3d(goodLocation, Vector::negativeUnitY), flResult))
+		{
+			// do a "binary" search of points on the line starting at the floor bounding
+			// box center location (which may be a good location) and ending at the target 
+			// location (which is a bad location) until a point on the line is found
+			// that is a good location, and that point is "up against" the wall of the cell
+			Vector badLocation(goodLocation);
+			goodLocation = floorExtentBoundingBoxCenter;
+			foundGoodPoint = floor->intersectClosest(Ray3d(goodLocation, Vector::negativeUnitY), flResult);
+
+			Vector midpointPosition;
+			while (true)
+			{
+				// stop when the 2 closest "good" and "bad" location points are .2m apart,
+				// meaning we have gotten close enough to "up against" the wall of the cell
+				if (goodLocation.magnitudeXZBetweenSquared(badLocation) <= 0.04f)
+					break;
+
+				midpointPosition = Vector::midpoint(goodLocation, badLocation);
+				midpointPosition.y = floorExtentBoundingBoxCenter.y;
+				if (floor->intersectClosest(Ray3d(midpointPosition, Vector::negativeUnitY), flResult))
+				{
+					foundGoodPoint = true;
+					goodLocation = midpointPosition;
+				}
+				else
+				{
+					badLocation = midpointPosition;
+				}
+			}
+		}
+
+		// couldn't find any valid position for the item
+		if (!foundGoodPoint)
+			return;
+
+		// set the height of the item
+		goodLocation.y = position.y;
+
+		// trigger script to move the item, which will perform the remaining validation
+		GameScriptObject * const gameScriptObject = decorator.getScriptObject();
+		if (!gameScriptObject)
+			return;
+
+		ScriptParams sp;
+		sp.addParam(itemSo->getNetworkId());
+		sp.addParam(cellSo->getNetworkId());
+		sp.addParam(goodLocation);
+		sp.addParam(needToRotateItem);
+		sp.addParam(orientation.w);
+		sp.addParam(orientation.x);
+		sp.addParam(orientation.y);
+		sp.addParam(orientation.z);
+
+		// set the id of the object being restored, so that we can bypass the LOS check for it
+		decoratorPlayerObject.setRestoreDecorationObjectBeingRestored(itemSo->getNetworkId());
+		IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_DO_RESTORE_ITEM_DECORATION_LAYOUT, sp));
+		decoratorPlayerObject.setRestoreDecorationObjectBeingRestored(NetworkId::cms_invalid);
+
+		// check to see if the item got restored
+		bool itemGotRestored = true;
+		if (itemContainingCell->getNetworkId() == cellSo->getNetworkId())
+		{
+			Transform const & itemCurrentTransform = itemSo->getTransform_o2p();
+			Vector const currentPosition = itemCurrentTransform.getPosition_p();
+			if (currentPosition.magnitudeBetweenSquared(goodLocation) > 0.0025) // not within 0.05m
+			{
+				itemGotRestored = false;
+			}
+			else if (needToRotateItem)
+			{
+				Quaternion const currentOrientation(itemCurrentTransform);
+				if (!WithinEpsilonInclusive(currentOrientation.w, orientation.w, 0.01f) ||
+					!WithinEpsilonInclusive(currentOrientation.x, orientation.x, 0.01f) ||
+					!WithinEpsilonInclusive(currentOrientation.y, orientation.y, 0.01f) ||
+					!WithinEpsilonInclusive(currentOrientation.z, orientation.z, 0.01f))
+				{
+					itemGotRestored = false;
+				}
+			}
+		}
+		else if (cellSo != ContainerInterface::getContainedByObject(*itemSo))
+		{	
+			itemGotRestored = false;
+		}
+
+		if (itemGotRestored)
+			decoratorPlayerObject.setRestoreDecorationSuccessCount(decoratorPlayerObject.getRestoreDecorationSuccessCount() + 1);
+	}
+	else if (needToRotateItem)
+	{
+		// trigger script to rotate the item, which will perform the remaining validation
+		GameScriptObject * const gameScriptObject = decorator.getScriptObject();
+		if (!gameScriptObject)
+			return;
+
+		ScriptParams sp;
+		sp.addParam(itemSo->getNetworkId());
+		sp.addParam(orientation.w);
+		sp.addParam(orientation.x);
+		sp.addParam(orientation.y);
+		sp.addParam(orientation.z);
+
+		// set the id of the object being restored, so that we can bypass the LOS check for it
+		decoratorPlayerObject.setRestoreDecorationObjectBeingRestored(itemSo->getNetworkId());
+		IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_DO_RESTORE_ITEM_DECORATION_LAYOUT_ROTATION_ONLY, sp));
+		decoratorPlayerObject.setRestoreDecorationObjectBeingRestored(NetworkId::cms_invalid);
+
+		// check to see if the item got restored
+		bool itemGotRestored = true;
+		Transform const & itemCurrentTransform = itemSo->getTransform_o2p();
+		Quaternion const currentOrientation(itemCurrentTransform);
+		if (!WithinEpsilonInclusive(currentOrientation.w, orientation.w, 0.01f) ||
+			!WithinEpsilonInclusive(currentOrientation.x, orientation.x, 0.01f) ||
+			!WithinEpsilonInclusive(currentOrientation.y, orientation.y, 0.01f) ||
+			!WithinEpsilonInclusive(currentOrientation.z, orientation.z, 0.01f))
+		{
+			itemGotRestored = false;
+		}
+
+		if (itemGotRestored)
+			decoratorPlayerObject.setRestoreDecorationSuccessCount(decoratorPlayerObject.getRestoreDecorationSuccessCount() + 1);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::clientMinigameOpen(ValueDictionary const & messageData)
+{
+	typedef ValueDictionary Payload;
+	MessageQueueGenericValueType<Payload> * msg = new MessageQueueGenericValueType<Payload>(messageData);
+
+	if (isAuthoritative())
+	{
+		appendMessage(CM_clientMinigameOpen, 0.0f, msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_clientMinigameOpen, msg);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::clientMinigameClose(ValueDictionary const & messageData)
+{
+	typedef ValueDictionary Payload;
+	MessageQueueGenericValueType<Payload> * msg = new MessageQueueGenericValueType<Payload>(messageData);
+
+	if (isAuthoritative())
+	{
+		appendMessage(CM_clientMinigameClose, 0.0f, msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_clientMinigameClose, msg);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::addPackedAppearanceWearable(std::string const &appearanceData, int arrangementIndex, NetworkId const &networkId, uint32 sharedTemplateCrcValue)
+{
+	//-- Check if this network id already exists in the wearable list.
+	size_t const length = m_wearableAppearanceData.size();
+	for (size_t i = 0; i < length; ++i)
+	{
+		WearableEntry const &entry = m_wearableAppearanceData[i];
+		if (entry.m_networkId == networkId)
+		{
+			// Check if this entry exists but in a different configuration.
+			WARNING((entry.m_arrangement != arrangementIndex), ("attempted to add object id=[%s] in packed wearable list multiple times in different arrangements, existing=[%d],new=[%d].", appearanceData.c_str(), entry.m_arrangement, arrangementIndex));
+			WARNING((static_cast<uint32>(entry.m_objectTemplate) != sharedTemplateCrcValue), ("attempted to add object id=[%s] in packed wearable list multiple times differing only by shared object template crc value, existing=[%d],new=[%d].", appearanceData.c_str(), entry.m_objectTemplate, static_cast<int>(sharedTemplateCrcValue)));
+			DEBUG_WARNING((entry.m_appearanceString != appearanceData), ("attempted to add object id=[%s] in packed wearable list multiple times differing only by appearance customization data.", appearanceData.c_str()));
+
+			return;
+		}
+	}
+	//-- Add the new entry.
+	m_wearableAppearanceData.push_back(WearableEntry(appearanceData, arrangementIndex, networkId, sharedTemplateCrcValue, NULL, NULL));
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::saveDecorationLayout(ServerObject const & pobSourceObject, int saveSlotNumber, std::string const & description)
+{
+	int debugNumItems = 0;
+	const unsigned long debugStartTimeMs = Clock::timeMs();
+
+	if (!isAuthoritative())
+		return;
+
+	if (!getClient())
+		return;
+
+	// only slots 1-3 are currently supported
+	if ((saveSlotNumber < 1) || (saveSlotNumber > 3))
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+		return;
+	}
+
+	if (!pobSourceObject.isAuthoritative())
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("You must be standing inside the structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	PlayerObject * const playerObj = PlayerCreatureController::getPlayerObject(this);
+	if (!playerObj)
+		return;
+
+	ServerObject const * const containingCell = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*this));
+	if (!containingCell || !containingCell->asCellObject())
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("You must be standing inside the structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	ServerObject const * const containingPOBso = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*containingCell));
+	if (!containingPOBso)
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("You must be standing inside the structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	if (!containingPOBso->isInWorldCell())
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("You must be standing inside the structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	if (containingPOBso != &pobSourceObject)
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("You must be standing inside the structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	if (containingPOBso->asBuildingObject() && !containingPOBso->asBuildingObject()->getContentsLoaded())
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("Please wait until the building has loaded its contents and try again."), Unicode::emptyString);
+		return;
+	}
+
+	TangibleObject const * const containingPOB = containingPOBso->asTangibleObject();
+	if (!containingPOB)
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+		return;
+	}
+
+	if (!containingPOB->isOnAdminList(*this))
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("You must be the owner or an admin of the structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	Container const * const pobContainer = ContainerInterface::getContainer(*containingPOB);
+	if (pobContainer)
+	{
+		std::string objvarValue;
+		int objvarValueIndex = 0;
+
+		char buffer1[64];
+		buffer1[sizeof(buffer1)-1] = '\0';
+
+		char buffer2[1024];
+		buffer2[sizeof(buffer2)-1] = '\0';
+
+		std::set<std::string> rooms;
+
+		snprintf(buffer1, sizeof(buffer1)-1, "savedDecoration%d", saveSlotNumber);
+		playerObj->removeObjVarItem(buffer1);
+
+		for (ContainerConstIterator i = pobContainer->begin(); i != pobContainer->end(); ++i)
+		{
+			ServerObject const * const cell = safe_cast<ServerObject const *>((*i).getObject());
+			if (cell && cell->asCellObject())
+			{
+				CellProperty const * const cellContainer = cell->getCellProperty();
+				if (cellContainer)
+				{
+					std::map<std::pair<uint32, uint32>, std::pair<float, float> >::const_iterator const iterFindCellHeight = s_mapCellHeightRestriction.find(std::make_pair(containingPOB->getTemplateCrc(), cellContainer->getCellNameCrc()));
+					if (iterFindCellHeight == s_mapCellHeightRestriction.end())
+						continue;
+
+					Floor const * const floor = cellContainer->getFloor();
+					if (!floor)
+						continue;
+
+					BaseExtent const * const floorExtent = floor->getExtent_l();
+					if (!floorExtent)
+						continue;
+
+					AxialBox const floorExtentBoundingBox = floorExtent->getBoundingBox();
+					Vector const floorExtentBoundingBoxCenter = floorExtentBoundingBox.getCenter();
+
+					for (ContainerConstIterator j = cellContainer->begin(); j != cellContainer->end(); ++j)
+					{
+						ServerObject const * const cellContent = safe_cast<ServerObject const *>((*j).getObject());
+						if (cellContent && cellContent->isPersisted() && !cellContent->asCreatureObject() && !cellContent->isVendor())
+						{
+							++debugNumItems;
+							IGNORE_RETURN(rooms.insert(cellContainer->getCellName()));
+
+							Transform const & transform = cellContent->getTransform_o2p();
+							Vector const position = transform.getPosition_p();
+							Quaternion const quaternion(transform);
+
+							snprintf(buffer2, sizeof(buffer2)-1, "%s~%s~%.10g~%.10g~%.10g~%.10g~%.10g~%.10g~%.10g", cellContent->getNetworkId().getValueString().c_str(), cellContainer->getCellName(), position.x - floorExtentBoundingBoxCenter.x, position.y - iterFindCellHeight->second.first, position.z - floorExtentBoundingBoxCenter.z, quaternion.w, quaternion.x, quaternion.y, quaternion.z);
+							if ((objvarValue.size() + ::strlen(buffer2) + 2)  > DynamicVariable::MAX_DYNAMIC_VARIABLE_UTF8_LENGTH)
+							{
+								snprintf(buffer1, sizeof(buffer1)-1, "savedDecoration%d.%d", saveSlotNumber, objvarValueIndex);
+								playerObj->setObjVarItem(buffer1, objvarValue);
+								++objvarValueIndex;
+								objvarValue = buffer2;
+							}
+							else
+							{
+								if (!objvarValue.empty())
+									objvarValue += "~";
+
+								objvarValue += buffer2;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		if (rooms.empty())
+		{
+			snprintf(buffer1, sizeof(buffer1)-1, "savedDecoration%d", saveSlotNumber);
+			playerObj->removeObjVarItem(buffer1);
+
+			Chat::sendSystemMessage(*this, Unicode::narrowToWide("There is currently no decoration in the structure or POB ship to save."), Unicode::emptyString);
+		}
+		else
+		{
+			if (!objvarValue.empty())
+			{
+				snprintf(buffer1, sizeof(buffer1)-1, "savedDecoration%d.%d", saveSlotNumber, objvarValueIndex);
+				playerObj->setObjVarItem(buffer1, objvarValue);
+			}
+
+			snprintf(buffer1, sizeof(buffer1)-1, "savedDecoration%d.saveTime", saveSlotNumber);
+			playerObj->setObjVarItem(buffer1, static_cast<int>(::time(NULL)));
+
+			snprintf(buffer1, sizeof(buffer1)-1, "savedDecoration%d.pobName", saveSlotNumber);
+			playerObj->setObjVarItem(buffer1, containingPOB->getObjectNameStringId().localize());
+
+			std::vector<Unicode::String> roomsVector;
+			for (std::set<std::string>::const_iterator iterRoom = rooms.begin(); iterRoom != rooms.end(); ++iterRoom)
+				roomsVector.push_back(Unicode::narrowToWide(*iterRoom));
+
+			snprintf(buffer1, sizeof(buffer1)-1, "savedDecoration%d.rooms", saveSlotNumber);
+			playerObj->setObjVarItem(buffer1, roomsVector);
+
+			std::string validatedDescription = description;
+			if (!validatedDescription.empty())
+			{
+				if (validatedDescription.size() > 40)
+					validatedDescription = validatedDescription.substr(0, 40);
+
+				snprintf(buffer1, sizeof(buffer1)-1, "savedDecoration%d.description", saveSlotNumber);
+				playerObj->setObjVarItem(buffer1, validatedDescription);
+			}
+
+			if (validatedDescription.empty())
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide(FormattedString<256>().sprintf("The decoration layout of the structure or POB ship has been saved in slot %d.", saveSlotNumber)), Unicode::emptyString);
+			else
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide(FormattedString<256>().sprintf("The decoration layout of the structure or POB ship has been saved in slot %d (%s).", saveSlotNumber, validatedDescription.c_str())), Unicode::emptyString);
+		}
+	}
+	else
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+	}
+
+	if ((debugNumItems > 0) && getClient()->isGod())
+	{
+		const unsigned long debugEndTimeMs = Clock::timeMs();
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide(FormattedString<256>().sprintf("!!!GOD MODE STATISTICS!!! %d items saved in %lums", debugNumItems, (debugEndTimeMs - debugStartTimeMs))), Unicode::emptyString);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::restoreDecorationLayout(ServerObject const & pobTargetObject, int saveSlotNumber)
+{
+	const unsigned long debugStartTimeMs = Clock::timeMs();
+
+	if (!isAuthoritative())
+		return;
+
+	if (!getClient())
+		return;
+
+	// only slots 1-3 are currently supported
+	if ((saveSlotNumber < 1) || (saveSlotNumber > 3))
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+		return;
+	}
+
+	if (!pobTargetObject.isAuthoritative())
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("You must be standing inside the structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	PlayerObject * const playerObj = PlayerCreatureController::getPlayerObject(this);
+	if (!playerObj)
+		return;
+
+	ServerObject const * const containingCell = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*this));
+	if (!containingCell || !containingCell->asCellObject())
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("You must be standing inside the structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	ServerObject const * const containingPOBso = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*containingCell));
+	if (!containingPOBso)
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("You must be standing inside the structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	if (!containingPOBso->isInWorldCell())
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("You must be standing inside the structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	if (containingPOBso != &pobTargetObject)
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("You must be standing inside the structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	// don't allow another restore on the pob while one is still in progress
+	int const timeNow = static_cast<int>(::time(NULL));
+	int restoreDecorationOperationTimeout = 0;
+	if (getObjVars().getItem("restoreDecorationOperation.timeout", restoreDecorationOperationTimeout) && (restoreDecorationOperationTimeout > timeNow))
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide(FormattedString<1024>().sprintf("You are already performing a restore decoration layout operation.  Please wait for the current operation to complete, or if the current operation does not complete in %s, you can try another operation.", CalendarTime::convertSecondsToMS(static_cast<unsigned int>(restoreDecorationOperationTimeout - timeNow)).c_str())), Unicode::emptyString);
+		return;
+	}
+
+	if (containingPOBso->asBuildingObject() && !containingPOBso->asBuildingObject()->getContentsLoaded())
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("Please wait until the building has loaded its contents and try again."), Unicode::emptyString);
+		return;
+	}
+
+	TangibleObject const * const containingPOB = containingPOBso->asTangibleObject();
+	if (!containingPOB)
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+		return;
+	}
+
+	// check for lot overlimit drop restriction
+	if ((playerObj->getAccountNumLots() > getMaxNumberOfLots()) && getObjVars().hasItem("lotOverlimit.structure_id"))
+	{
+		NetworkId lotOverlimitStructure;
+		if (getObjVars().getItem("lotOverlimit.structure_id", lotOverlimitStructure) && lotOverlimitStructure.isValid())
+		{
+			if (GameObjectTypes::isTypeOf(containingPOB->getGameObjectType(), SharedObjectTemplate::GOT_building) && (containingPOB->getNetworkId() != lotOverlimitStructure))
+			{
+				std::string lotOverlimitStructureName;
+				std::string lotOverlimitStructureLocation;
+
+				IGNORE_RETURN(getObjVars().getItem("lotOverlimit.structure_name", lotOverlimitStructureName));
+				IGNORE_RETURN(getObjVars().getItem("lotOverlimit.structure_location", lotOverlimitStructureLocation));
+
+				Chat::sendSystemMessage(*this, Unicode::narrowToWide(FormattedString<1024>().sprintf("You are currently over the lot limit, and cannot drop any item into (or move around items within) any factory or structure, other than the %s structure located at %s that caused you to exceed the lot limit.", lotOverlimitStructureName.c_str(), lotOverlimitStructureLocation.c_str())), Unicode::emptyString);
+				return;
+			}
+		}
+	}
+
+	if (!containingPOB->isOnAdminList(*this))
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("You must be the owner or an admin of the structure or POB ship to do this."), Unicode::emptyString);
+		return;
+	}
+
+	// build the list of rooms in the target pob
+	std::map<std::string, std::pair<CellObject const *, std::pair<std::pair<float, float>, std::pair<float, float> > > > pobTargetObjectRoomsToCells;
+	Container const * const pobContainer = ContainerInterface::getContainer(*containingPOB);
+	if (pobContainer)
+	{
+		for (ContainerConstIterator i = pobContainer->begin(); i != pobContainer->end(); ++i)
+		{
+			ServerObject const * const cell = safe_cast<ServerObject const *>((*i).getObject());
+			if (!cell || !cell->asCellObject())
+				continue;
+
+			CellProperty const * const cellContainer = cell->getCellProperty();
+			if (!cellContainer)
+				continue;
+
+			std::map<std::pair<uint32, uint32>, std::pair<float, float> >::const_iterator const iterFindCellHeight = s_mapCellHeightRestriction.find(std::make_pair(containingPOB->getTemplateCrc(), cellContainer->getCellNameCrc()));
+			if (iterFindCellHeight == s_mapCellHeightRestriction.end())
+				continue;
+
+			Floor const * const floor = cellContainer->getFloor();
+			if (!floor)
+				continue;
+
+			BaseExtent const * const floorExtent = floor->getExtent_l();
+			if (!floorExtent)
+				continue;
+
+			AxialBox const floorExtentBoundingBox = floorExtent->getBoundingBox();
+			Vector const floorExtentBoundingBoxCenter = floorExtentBoundingBox.getCenter();
+
+			pobTargetObjectRoomsToCells[cellContainer->getCellName()] = std::make_pair(cell->asCellObject(), std::make_pair(std::make_pair(iterFindCellHeight->second.first, iterFindCellHeight->second.second), std::make_pair(floorExtentBoundingBoxCenter.x, floorExtentBoundingBoxCenter.z)));
+		}
+	}
+	else
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+		return;
+	}
+
+	// build the list of source room to target room mapping, telling us where to move/restore the items
+	DynamicVariableList const & objVars = playerObj->getObjVars();
+	char buffer[64];
+	buffer[sizeof(buffer)-1] = '\0';
+
+	std::vector<Unicode::String> savedSourceRooms;
+	snprintf(buffer, sizeof(buffer)-1, "savedDecoration%d.rooms", saveSlotNumber);
+	if (!objVars.getItem(buffer, savedSourceRooms) || savedSourceRooms.empty())
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+		return;
+	}
+
+	std::vector<Unicode::String> savedTargetRooms;
+	snprintf(buffer, sizeof(buffer)-1, "savedDecoration%d.targetRooms", saveSlotNumber);
+	if (!objVars.getItem(buffer, savedTargetRooms) || savedTargetRooms.empty())
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+		return;
+	}
+
+	if (savedSourceRooms.size() != savedTargetRooms.size())
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+		return;
+	}
+
+	std::map<std::string, std::string> sourceRoomToTargetRoomMapping;
+	for (size_t i = 0, size = savedSourceRooms.size(); i < size; ++i)
+	{
+		if (savedTargetRooms[i].empty())
+			continue;
+
+		std::string savedTargetRoomNarrow = Unicode::wideToNarrow(savedTargetRooms[i]);
+		if (pobTargetObjectRoomsToCells.count(savedTargetRoomNarrow) <= 0)
+			continue;
+
+		sourceRoomToTargetRoomMapping[Unicode::wideToNarrow(savedSourceRooms[i])] = savedTargetRoomNarrow;
+	}
+
+	if (sourceRoomToTargetRoomMapping.empty())
+	{
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide("An internal error has been encountered."), Unicode::emptyString);
+		return;
+	}
+
+	int debugNumItems = 0;
+	int numItemsToBeMoved = 0;
+
+	unsigned int pos;
+	NetworkId itemId;
+	ServerObject const * itemObj;
+	ServerObject const * itemObjContainingCell;
+	std::string room;
+	Vector position, currentPosition;
+	Quaternion orientation;
+	std::map<std::string, std::string>::const_iterator iterFindSourceRoomToTargetRoomMapping;
+	std::map<std::string, std::pair<CellObject const *, std::pair<std::pair<float, float>, std::pair<float, float> > > >::const_iterator iterFindPobTargetObjectRoomsToCells;
+
+	std::string objvarValue;
+	int objvarValueIndex = 0;
+
+	std::list<std::pair<std::pair<CachedNetworkId, CachedNetworkId>, std::pair<Vector, Quaternion> > > & restoreDecorationLayoutList = playerObj->getRestoreDecorationLayoutList();
+	restoreDecorationLayoutList.clear();
+
+	snprintf(buffer, sizeof(buffer)-1, "savedDecoration%d.%d", saveSlotNumber, objvarValueIndex);
+	while (objVars.getItem(buffer, objvarValue) && !objvarValue.empty())
+	{
+		pos = 0;
+		while (objvarValue[pos])
+		{
+			++debugNumItems;
+
+			nextOid(objvarValue, pos, itemId);
+			nextString(objvarValue, pos, room);
+			nextFloat(objvarValue, pos, position.x);
+			nextFloat(objvarValue, pos, position.y);
+			nextFloat(objvarValue, pos, position.z);
+			nextFloat(objvarValue, pos, orientation.w);
+			nextFloat(objvarValue, pos, orientation.x);
+			nextFloat(objvarValue, pos, orientation.y);
+			nextFloat(objvarValue, pos, orientation.z);
+
+			itemObj = ServerWorld::findObjectByNetworkId(itemId);
+			if (!itemObj)
+				continue;
+
+			itemObjContainingCell = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*itemObj));
+			if (!itemObjContainingCell || !itemObjContainingCell->asCellObject())
+				continue;
+
+			if (ContainerInterface::getContainedByObject(*itemObjContainingCell) != containingPOB)
+				continue;
+
+			// what destination room should this item go in?
+			iterFindSourceRoomToTargetRoomMapping = sourceRoomToTargetRoomMapping.find(room);
+			if (iterFindSourceRoomToTargetRoomMapping == sourceRoomToTargetRoomMapping.end())
+			{
+				// no destination room specified, item should not be moved
+				continue;
+			}
+
+			// find the cell in the target structure corresponding to the target room
+			iterFindPobTargetObjectRoomsToCells = pobTargetObjectRoomsToCells.find(iterFindSourceRoomToTargetRoomMapping->second);
+			if (iterFindPobTargetObjectRoomsToCells == pobTargetObjectRoomsToCells.end())
+			{
+				// target room not found, cannot move the item
+				continue;
+			}
+
+			// the height is saved as the offset from the floor
+			position.y += iterFindPobTargetObjectRoomsToCells->second.second.first.first;
+
+			if (position.y < iterFindPobTargetObjectRoomsToCells->second.second.first.first)
+				position.y = iterFindPobTargetObjectRoomsToCells->second.second.first.first;
+			else if (position.y > iterFindPobTargetObjectRoomsToCells->second.second.first.second)
+				position.y = iterFindPobTargetObjectRoomsToCells->second.second.first.second;
+
+			// x and z are saved as offset from the "center"
+			position.x += iterFindPobTargetObjectRoomsToCells->second.second.second.first;
+			position.z += iterFindPobTargetObjectRoomsToCells->second.second.second.second;
+
+			// item is not currently in the target room, need to move it
+			if (itemObjContainingCell->getNetworkId() != iterFindPobTargetObjectRoomsToCells->second.first->getNetworkId())
+			{
+				++numItemsToBeMoved;
+				restoreDecorationLayoutList.push_back(std::make_pair(std::make_pair(CachedNetworkId(*itemObj), CachedNetworkId(*iterFindPobTargetObjectRoomsToCells->second.first)), std::make_pair(position, orientation)));
+				continue;
+			}
+
+			// if the item is not currently at the desired position, need to move it
+			Transform const & itemCurrentTransform = itemObj->getTransform_o2p();
+			currentPosition = itemCurrentTransform.getPosition_p();
+			if (currentPosition.magnitudeBetweenSquared(position) > 0.0025) // not within 0.05m
+			{
+				++numItemsToBeMoved;
+				restoreDecorationLayoutList.push_back(std::make_pair(std::make_pair(CachedNetworkId(*itemObj), CachedNetworkId(*iterFindPobTargetObjectRoomsToCells->second.first)), std::make_pair(position, orientation)));
+				continue;
+			}
+
+			// if the item is not currently at the desired orientation, need to move it
+			Quaternion const currentOrientation(itemCurrentTransform);
+			if (!WithinEpsilonInclusive(currentOrientation.w, orientation.w, 0.01f) ||
+				!WithinEpsilonInclusive(currentOrientation.x, orientation.x, 0.01f) ||
+				!WithinEpsilonInclusive(currentOrientation.y, orientation.y, 0.01f) ||
+				!WithinEpsilonInclusive(currentOrientation.z, orientation.z, 0.01f))
+			{
+				++numItemsToBeMoved;
+				restoreDecorationLayoutList.push_back(std::make_pair(std::make_pair(CachedNetworkId(*itemObj), CachedNetworkId(*iterFindPobTargetObjectRoomsToCells->second.first)), std::make_pair(position, orientation)));
+				continue;
+			}
+		}
+
+		++objvarValueIndex;
+		snprintf(buffer, sizeof(buffer)-1, "savedDecoration%d.%d", saveSlotNumber, objvarValueIndex);
+	}
+
+	snprintf(buffer, sizeof(buffer)-1, "savedDecoration%d.description", saveSlotNumber);
+	std::string saveSlotDescription;
+	IGNORE_RETURN(objVars.getItem(buffer, saveSlotDescription));
+	if (restoreDecorationLayoutList.empty())
+	{
+		if (saveSlotDescription.empty())
+			Chat::sendSystemMessage(*this, Unicode::narrowToWide(FormattedString<1024>().sprintf("No items in the structure or POB ship could be (or need to be) moved/restored using the saved decoration layout in slot %d.", saveSlotNumber)), Unicode::emptyString);
+		else
+			Chat::sendSystemMessage(*this, Unicode::narrowToWide(FormattedString<1024>().sprintf("No items in the structure or POB ship could be (or need to be) moved/restored using the saved decoration layout in slot %d (%s).", saveSlotNumber, saveSlotDescription.c_str())), Unicode::emptyString);
+	}
+	else
+	{
+		if (saveSlotDescription.empty())
+			Chat::sendSystemMessage(*this, Unicode::narrowToWide(FormattedString<1024>().sprintf("Please remain in the structure or POB ship while the system attempts to move/restore %d items using the saved decoration layout in slot %d.  You will be notified when the operation is complete.", numItemsToBeMoved, saveSlotNumber)), Unicode::emptyString);
+		else
+			Chat::sendSystemMessage(*this, Unicode::narrowToWide(FormattedString<1024>().sprintf("Please remain in the structure or POB ship while the system attempts to move/restore %d items using the saved decoration layout in slot %d (%s).  You will be notified when the operation is complete.", numItemsToBeMoved, saveSlotNumber, saveSlotDescription.c_str())), Unicode::emptyString);
+
+		// start messageTo loop to do the decoration layout restore,
+		// spread out over a period of time so it doesn't lag out the server
+		int restoreDecorationOperationId = ::rand();
+		while (restoreDecorationOperationId == 0)
+			restoreDecorationOperationId = ::rand();
+
+		playerObj->setRestoreDecorationOperationId(restoreDecorationOperationId);
+		playerObj->setRestoreDecorationPobId(containingPOB->getNetworkId());
+		playerObj->setRestoreDecorationTotalCount(numItemsToBeMoved);
+		playerObj->setRestoreDecorationAttemptedCount(0);
+		playerObj->setRestoreDecorationSuccessCount(0);
+
+		IGNORE_RETURN(setObjVarItem("restoreDecorationOperation.timeout", timeNow + (5 * 60)));
+		IGNORE_RETURN(setObjVarItem("restoreDecorationOperation.operationId", restoreDecorationOperationId));
+
+		MessageToQueue::getInstance().sendMessageToC(getNetworkId(),
+			"C++RestoreDecorationLayout",
+			"",
+			0,
+			false);
+	}
+
+	if ((debugNumItems > 0) && getClient()->isGod())
+	{
+		const unsigned long debugEndTimeMs = Clock::timeMs();
+		Chat::sendSystemMessage(*this, Unicode::narrowToWide(FormattedString<256>().sprintf("!!!GOD MODE STATISTICS!!! %d items read (%d will be moved) in %lums", debugNumItems, numItemsToBeMoved, (debugEndTimeMs - debugStartTimeMs))), Unicode::emptyString);
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/CreatureObject.h b/engine/server/library/serverGame/src/shared/object/CreatureObject.h
new file mode 100644
index 00000000..93705f66
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/CreatureObject.h
@@ -0,0 +1,1426 @@
+//========================================================================
+//
+// CreatureObject.h
+// Copyright 2001-2003, Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#ifndef INCLUDED_CreatureObject_H
+#define INCLUDED_CreatureObject_H
+
+#include "Archive/AutoDeltaMap.h"
+#include "Archive/AutoDeltaPackedMap.h"
+#include "Archive/AutoDeltaSet.h"
+#include "serverGame/GroupIdObserver.h"
+#include "serverGame/TangibleObject.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedFoundation/Timer.h"
+#include "sharedGame/AttribMod.h"
+#include "sharedGame/Buff.h"
+#include "sharedGame/Command.h"
+#include "serverGame/PvpUpdateAndCellPermissionsObserver.h"
+#include "sharedGame/SharedCreatureObjectTemplate.h"
+#include "sharedGame/WearableEntry.h"
+#include "sharedObject/Container.h"
+#include "sharedSkillSystem/SkillObjectArchive.h"
+#include "swgSharedUtility/Attributes.def"
+#include "swgSharedUtility/Behaviors.def"
+#include "swgSharedUtility/Locomotions.def"
+#include "swgSharedUtility/MentalStates.def"
+#include "swgSharedUtility/Postures.def"
+#include "swgSharedUtility/States.def"
+
+#pragma warning(disable : 4100 4514) //@todo investigate why we need this?
+#include <string>
+#include <vector>
+
+class ClientMfdStatusUpdateMessage;
+class ConstCharCrcLowerString;
+class CreatureController;
+class DraftSchematicObject;
+class GroupObject;
+class LfgCharacterData;
+class ManufactureSchematicObject;
+struct MatchMakingCharacterResult;
+class MessageQueueMissionListResponseData;
+class MissionObject;
+class ProsePackage;
+class ServerCreatureObjectTemplate;
+class ServerWeaponObjectTemplate;
+class ShipObject;
+class SkillObject;
+class TriggerVolume;
+class ValueDictionary;
+class WeaponObject;
+
+namespace Crafting
+{
+	struct CustomValue;
+}
+
+namespace Archive
+{
+	class ByteStream;
+	class ReadIterator;
+}
+
+// ----------------------------------------------------------------------
+
+namespace LocalObjectFlags
+{
+	enum
+	{
+		CreatureObject_RequiresMovementInfoUpdate = TangibleObject_Max,
+
+		// This must come last.
+		CreatureObject_Max
+	};
+}
+
+// ======================================================================
+
+class CreatureAttitude
+{
+public:
+	CreatureAttitude();
+
+	enum eAngerState
+	{
+		kAngerCalm,
+		kAngerAttack,
+		kAngerFrenzy,
+		kAngerStateCount
+	};
+
+	enum eFearState
+	{
+		kFearCalm,
+		kFearAlert,
+		kFearThreaten,
+		kFearFlee,
+		kFearPanic,
+		kFearStateCount
+	};
+
+	int m_behavior;
+	MentalStates::Value m_currentValues[MentalStates::NumberOfMentalStates];
+	eAngerState m_angerState;
+	eFearState m_fearState;
+	bool operator !=(const CreatureAttitude &other) const;
+	float operator -(const CreatureAttitude &other) const;
+};
+
+// ======================================================================
+
+	struct CreatureMod
+	{
+		AttribMod::AttribMod mod;        // the modifier description
+		int                  maxVal;     // the max value of the mod, at the current time
+		int                  currentVal; // the current value of the mod, at the current time
+		uint32               startTime;  // time when the attrib mod was added to the creature
+	};
+
+// ======================================================================
+
+class MonitoredCreatureMovement
+{
+public:
+	MonitoredCreatureMovement();
+
+	float m_lastDistance;
+	float m_skittishness; // meters/meter
+	float m_curve; // power curve used to advance
+
+	bool operator!=(MonitoredCreatureMovement const &other) const;
+	float operator-(MonitoredCreatureMovement const &other) const;
+};
+
+// ======================================================================
+
+/** 
+* CreatureObject refers to a tangible object that generally moves on its own accord.  This would include
+* player avatars, creatures, droids, and other self-controlled entities.
+*/
+
+class CreatureObject : public TangibleObject
+{
+	friend class CreatureController;
+	friend class AICreatureController;
+public:
+
+	enum Difficulty
+	{
+		  D_normal
+		, D_elite
+		, D_boss
+	};
+
+	enum AttributeRegeneration
+	{
+		AR_normal,
+		AR_combat,
+		AR_count
+	};
+
+	static char const * getMentalStateString(MentalStates::Enumerator const mentalState);
+	static char const * getBehaviorString(Behaviors::Enumerator const behavior);
+
+	typedef stdmap<std::string, int>::fwd            ExperiencePointMap;
+	typedef stdset<const SkillObject *>::fwd         SkillList;
+	typedef stdvector<std::string>::fwd              StringVector;
+	typedef std::pair<std::pair<NetworkId /*player*/, std::string /*name*/>, NetworkId /*ship*/> PlayerAndShipPair;
+	
+	CreatureObject(const ServerCreatureObjectTemplate* newTemplate);
+	virtual            ~CreatureObject();
+
+	virtual CreatureObject *       asCreatureObject();
+	virtual CreatureObject const * asCreatureObject() const;
+
+	static CreatureObject * getCreatureObject(NetworkId const & networkId);
+	
+	static CreatureObject const * asCreatureObject(Object const * object);
+	static CreatureObject * asCreatureObject(Object * object);
+
+	static void         install();
+	static void         removeDefaultTemplate();
+
+	virtual bool        alwaysSendReliableTransform() const;
+	bool                isSpawningAllowed() const;
+	void                addToSpawnQueue ();
+	void                removeFromSpawnQueue  ();
+	static void         runSpawnQueue();
+	static void         showSpawnQueue(Unicode::String & result);
+	virtual void        onClientReady (Client *c);
+	virtual void        onClientAboutToLoad();
+	virtual void        onLoadingScreenComplete();
+	virtual bool        canManipulateObject(ServerObject const &target, bool movingObject, bool doPermissionCheckOnItem, bool doPermissionCheckOnParent, float maxDistance, Container::ContainerErrorCode&, bool skipNoTradeCheck = false, bool * allowedByGodMode = NULL) const;
+
+	virtual void        onRemovingFromWorld();
+	void                addMembersToPackages();
+	virtual void        addToWorld();
+
+	virtual Controller*       createDefaultController  ();
+	CreatureController*       getCreatureController() ;
+	const CreatureController* getCreatureController() const;
+
+	virtual void        setAuthority();
+	virtual void        setAuthServerProcessId(uint32 processId);
+	virtual float       alter(float time);
+	
+	virtual bool        canDestroy() const;
+	
+	float               getScaleFactor () const;
+	void                setScaleFactor(float scale);
+	virtual float       getHeight     () const;
+	virtual float       getRadius     () const;
+	virtual Object const * getStandingOn () const; // returns the object this creature is standing on
+	virtual float       getFarNetworkUpdateRadius() const;
+
+	Attributes::Value   getAttribute             (Attributes::Enumerator attribute) const;
+	Attributes::Value   getUnmodifiedAttribute   (Attributes::Enumerator attribute) const;
+	Attributes::Value   getMaxAttribute          (Attributes::Enumerator attribute, bool capStat = true) const;
+	Attributes::Value   getUnmodifiedMaxAttribute(Attributes::Enumerator attribute) const;
+	Attributes::Value   getAttributeBonus        (Attributes::Enumerator attribute) const;
+	void                resetAttribute           (Attributes::Enumerator attrib, Attributes::Value);
+	void                initializeAttribute      (Attributes::Enumerator attrib, Attributes::Value);
+	bool                drainAttributes          (Attributes::Value action, Attributes::Value mind);
+	int                 testDrainAttribute       (Attributes::Enumerator attribute, Attributes::Value value) const;
+	int                 getShockWounds           () const;
+	void                setShockWounds           (int wound);
+	void                setAttribute             (Attributes::Enumerator attribute, Attributes::Value value);
+	virtual void        getAttributes            (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+	void                sendTimedModData         (uint32 id, float time, bool updateCache = true);
+	void                sendCancelTimedMod       (uint32 id);
+	
+	float               getInvulnerabilityTimer  () const;
+	void                setInvulnerabilityTimer  (float duration);
+	virtual bool        isInvulnerable           () const;
+	virtual void        handleCMessageTo         (const MessageToPayload &message);
+
+	virtual void        addAim ();
+	virtual void        clearAims ();
+	void                pushedMe(const NetworkId & attackerId, const Vector & attackerPos, const Vector & defenderPos, float distance);
+
+	// slot manipulation functions
+
+	ServerObject *        getInventory  ();
+	const ServerObject *  getInventory  () const;
+	ServerObject *        getDatapad    ();
+	const ServerObject *  getDatapad    () const;
+	ServerObject *        getBank       ();
+	const ServerObject *  getBank       () const;
+	ServerObject*         getHair       ();
+	const ServerObject *  getHair       () const;
+	ServerObject *        getAppearanceInventory ();
+	const ServerObject *  getAppearanceInventory () const;
+	ServerObject *		  getHangar		();
+	const ServerObject *  getHangar     () const;
+	ServerObject *        getObjectInSlot (const ConstCharCrcLowerString & slotName);
+	const ServerObject *  getObjectInSlot (const ConstCharCrcLowerString & slotName) const;
+
+	//Container triggers
+	virtual bool        onContainerAboutToTransfer(ServerObject * destination, ServerObject* transferer);
+	virtual int         onContainerAboutToGainItem(ServerObject& item, ServerObject* transferer);
+	virtual void        onContainerLostItem(ServerObject * destination, ServerObject& item, ServerObject* transferer);
+	virtual void        onContainerGainItem(ServerObject& item, ServerObject* source, ServerObject* transferer);
+
+    virtual void        onContainerChildLostItem(ServerObject * destination, ServerObject& item, ServerObject* source, ServerObject* transferer);
+	virtual void        onContainerChildGainItem(ServerObject& item, ServerObject* source, ServerObject* transferer);
+	
+	virtual void        onContainerTransferComplete(ServerObject *oldContainer, ServerObject *newContainer);
+
+	// trigger volume functions
+	virtual void                              onAddedToTriggerVolume       (TriggerVolume & triggerVolume);
+	virtual void                              onRemovedFromTriggerVolume   (TriggerVolume & triggerVolume);
+
+	virtual const std::set<TriggerVolume *> * getTriggerVolumeEntered      () const;
+
+	// crafting functions
+	const stdmap<std::pair<uint32, uint32>,int>::fwd &  getDraftSchematics () const;
+	bool                                isIngredientInInventory(const Object & ingredient) const;
+	void                                disableSchematicFiltering(void);
+	void                                enableSchematicFiltering(void);
+	bool                                isSchematicFilteringEnabled(void);
+	void                                getManufactureSchematics(stdvector<const ManufactureSchematicObject *>::fwd & schematics);
+	void                                getManufactureSchematics(stdvector<const ManufactureSchematicObject *>::fwd & schematics, uint32 craftingTypes);
+
+	// inventory functions
+	bool isItemEquipped (const Object & item) const;
+
+	// skill system methods
+	int                 getExperiencePoints(const std::string & experienceType) const;
+	const std::map<std::string, int> &  getExperiencePoints() const;
+	const SkillList &   getSkillList() const;
+	const stdmap<std::string, std::pair<int, int> >::fwd & getModMap() const;
+	const int           getModValue(const std::string & modName) const;
+	const int           getEnhancedModValue(const std::string & modName) const;	
+	const int           getEnhancedModValueUncapped(const std::string & modName) const;  // This version does not respect getMaxCreatureSkillModBonus
+	void                setModValue(const std::string & modName, const int value);
+	void                addModValue(const std::string & modName, const int value, bool fromSkill);
+	const int           grantExperiencePoints(const std::string & experienceType, int amount);
+	virtual const bool  grantSkill(const SkillObject & newSkill);
+	const bool          grantSchematicGroup(const std::string & groupName, bool fromSkill);
+	const bool          grantSchematic(const std::string & schematicName, bool fromSkill);
+	const bool          grantSchematic(uint32 schematicCrc, bool fromSkill);
+	const bool          revokeSchematic(const std::string & schematicName, bool fromSkill);
+	const bool          revokeSchematic(uint32 schematicCrc, bool fromSkill);
+	const bool          hasSchematic(const std::string & schematicName);
+	const bool          hasSchematic(uint32 schematicCrc);
+	const bool          hasSkill(const SkillObject & skill) const;
+	bool                hasCertificationsForItem(const TangibleObject & item) const;
+	virtual void        revokeSkill(const SkillObject & oldSkill, bool silent = false);
+	//---
+
+	bool                showDanceVisuals(bool enabled);
+	bool                showMusicianVisuals(bool enabled);
+	void                sendMusicFlourish(int flourishIndex);
+
+	virtual bool        isDisabled() const;
+	bool                isIncapacitated () const;
+	void                setIncapacitated(bool flag, const NetworkId & attackerId);
+	bool                isDead () const;
+	bool                makeDead(const NetworkId & killer, const NetworkId & corpse);
+	bool                makeNotDead();
+	const NetworkId&    getLookAtTarget() const;
+	void                setLookAtTarget(const NetworkId&);	
+	const NetworkId&    getIntendedTarget() const;
+	void                setIntendedTarget(const NetworkId&);
+	virtual bool        wantSawAttackTriggers() const;
+
+	void                                addAttributeModifier(const std::string & name, Attributes::Enumerator attrib, int value, float duration, float attackRate, float decayRate, int flags);
+	void                                addSkillmodModifier(const std::string & name, const std::string & skill, int value, float duration, int flags);
+	int                                 addAttributeModifier(const AttribMod::AttribMod & mod, ServerObject * attacker = NULL);
+	bool                                hasAttribModifier(const std::string & modName) const;
+	void                                removeAttributeModifier(const std::string & modName);
+	void                                removeAttributeModifiers(Attributes::Enumerator attribute);
+	void                                removeAllAttributeModifiers ();
+	void								removeAllAttributeAndSkillmodMods ();
+	const AttribMod::AttribMod *        getAttributeModifier(const std::string & modName) const;
+	const stdmap<uint32, CreatureMod>::fwd & getAttributeModifiers () const;
+
+	// Mental state functions	
+	MentalStates::Value  getMentalState(MentalStates::Enumerator attribute) const;
+	MentalStates::Value  getMentalStateToward(const NetworkId &id, MentalStates::Enumerator attribute) const;
+	MentalStates::Value  getUnmodifiedMentalState(MentalStates::Enumerator attribute) const;
+	MentalStates::Value  getMaxMentalState(MentalStates::Enumerator attribute) const;
+	float                getMentalStateDecay(MentalStates::Enumerator state) const;
+	void                 getBehaviorTargets(Behaviors::Enumerator behavior, stdvector<NetworkId>::fwd &targets);
+	Behaviors::Enumerator getBehavior() const;
+	Behaviors::Enumerator getBehaviorToward(const NetworkId &target) const;
+
+	//AI Behavior State modifiers
+	float               getAcceleration(SharedCreatureObjectTemplate::MovementTypes  movementType) const;
+	float               getTurnRate(SharedCreatureObjectTemplate::MovementTypes  movementType) const;
+	float               getApproachTriggerRange() const;
+	float               getSlopeModAngleMin() const;
+	float               getSlopeModAngleMax() const;
+	float               getSlopeModPercentMin() const;
+	float               getSlopeModPercentMax() const;
+	float               getWaterModPercentMin() const;
+	float               getWaterModPercentMax() const;
+
+	WeaponObject*                   getDefaultWeapon () const;
+	WeaponObject*                   getReadiedWeapon () const;
+	WeaponObject*                   getCurrentWeapon ();
+	bool                            swapDefaultWeapons(WeaponObject &newDefaultWeapon, ServerObject &weaponContainer);
+	void                            setCurrentWeapon(WeaponObject & weapon);
+	int                             getInstrumentVisualId () const;
+	int                             getInstrumentAudioId () const;
+	GroupObject*                    getGroup() const;
+	void                            setGroup(GroupObject *group, bool disbandingCurrentGroup);
+	NetworkId const &               getGroupInviterId() const;
+	std::string const &             getGroupInviterName() const;
+	CreatureObject*                 getGroupInviter() const;
+	void                            setGroupInviter(NetworkId const &inviterId, std::string const& inviterName, NetworkId const &inviterShipId);
+	NetworkId const &               getInviterForPendingGroup() const;
+	void                            setInviterForPendingGroup(NetworkId const &inviterId);
+	int                             getPerformanceType() const;
+	void                            setPerformanceType(int performanceType);
+	int                             getPerformanceStartTime() const;
+	void                            setPerformanceStartTime(int performanceStartTime);
+	NetworkId const &               getPerformanceListenTarget() const;
+	void                            setPerformanceListenTarget(NetworkId const &who);
+	NetworkId const &               getPerformanceWatchTarget() const;
+	void                            setPerformanceWatchTarget(NetworkId const &who);
+	int                             getGuildId() const;
+	void                            setGuildId(int guildId);
+	unsigned long                   getTimeToUpdateGuildWarPvpStatus() const;
+	void                            setTimeToUpdateGuildWarPvpStatus(unsigned long timeToUpdateGuildWarPvpStatus);
+	bool                            getGuildWarEnabled() const;
+	void                            setGuildWarEnabled(bool guildWarEnabled);
+	int                             getMilitiaOfCityId() const;
+	void                            setMilitiaOfCityId(int cityId);
+	int                             getLocatedInCityId() const;
+	void                            setLocatedInCityId(int cityId);
+	NetworkId const &               getMasterId() const;
+	void                            setMasterId(NetworkId const &masterId);
+
+	SharedCreatureObjectTemplate::Gender  getGender () const;
+	uint32                                getMood () const;
+	void                                  setMood(uint32 mood);
+	Postures::Enumerator                  getPosture () const;
+	Locomotions::Enumerator               getLocomotion () const;
+	bool                                  getState(States::Enumerator whichState) const;
+	void                                  setState(States::Enumerator whichState, bool value);
+	float                                 getWalkSpeed () const; // adjusted for posture and movement scale
+	float                                 getRunSpeed () const; // adjusted for posture and movement scale
+	float                                 getAccelerationForSpeed (float currentSpeed) const;
+	float                                 getTurnRateForSpeed     (float currentSpeed) const;
+	float                                 getSlopeMod             () const;
+	uint32                                getSayMode () const;
+	void                                  setSayMode(uint32 sayMode);
+	const std::string &                   getAnimationMood () const;
+	void                                  setAnimationMood(const std::string &);
+	int                                   getNiche () const;
+	SharedCreatureObjectTemplate::Species getSpecies () const;
+	SharedCreatureObjectTemplate::Race    getRace () const;
+	float                                 getStepHeight () const;
+	bool                                  canMove () const;
+
+	void                                  onBiographyRetrieved(const NetworkId &owner, const Unicode::String &bio);
+	void                                  onCharacterMatchRetrieved(MatchMakingCharacterResult const &results);
+	
+	void                                  setMovementStationary();
+	void                                  setMovementWalk();
+	void                                  setMovementRun();
+
+	bool                                  setSlopeModAngle(float angle);
+	float                                 getSlopeModAngle() const;
+	bool                                  setSlopeModPercent(float percent);
+	float                                 getBaseSlopeModPercent() const;
+	float                                 getSlopeModPercent() const;
+	void                                  recomputeSlopeModPercent();
+	bool                                  setWaterModPercent(float percent);
+	float                                 getWaterModPercent() const;
+	bool                                  setMovementScale(float percent);
+	float                                 getMovementScale() const;
+	bool                                  setMovementPercent(float percent);
+	float                                 getMovementPercent() const;
+	bool                                  setTurnPercent(float percent);
+	float                                 getTurnPercent() const;
+	bool                                  setAccelScale(float percent);
+	float                                 getAccelScale() const;
+	bool                                  setAccelPercent(float percent);
+	float                                 getAccelPercent() const;
+	float                                 getSwimHeight() const;
+	void                                  setBaseWalkSpeed(float speed);
+	float                                 getBaseWalkSpeed() const;
+	void                                  setBaseRunSpeed(float speed);
+	float                                 getBaseRunSpeed() const;
+
+	int                                   getCover () const;
+	bool                                  getCoverVisibility() const;
+
+	void                                  sitOnObject(NetworkId const &chairCellId, Vector const &chairPosition_w);
+	virtual void                          speakText(MessageQueueSpatialChat const &spatialChat);
+	virtual bool                          immediateLogoutAllowed();
+	
+	//Banks
+	ServerObject *                         getBankContainer() const;
+	Unicode::String                        getBankName() const;
+	bool                                   joinBank(Unicode::String bankName);
+	void                                   quitBank();
+	bool                                   isBankMember(Unicode::String bankName) const;
+
+	// Missions
+	ServerObject *                         getMissionBag() const;
+	bool                                   assignMission(MissionObject * mission);
+	void                                   addMissionToPlayerListRequest(MissionObject * mission);
+	std::vector<CachedNetworkId>           getMissions();
+	void                                   missionListRequestComplete(ServerObject *terminal);
+	void                                   setMissionBoardUISequenceId(const uint8 sequence);
+	void                                   addToMissionRequestQueue(const NetworkId & terminalId);
+	void                                   removeFromMissionRequestQueue(const NetworkId & terminalId);
+	static void                            updateMissionRequestQueue();
+	void                                   setNumberOfMissionsWantedInMissionBag(int numberOfMissions);
+
+	// ======
+	// Mounts: PUBLIC: implemented in CreatureObject_Mounts.cpp
+	// ======
+
+	// Called on mount creature.
+	int                                    getMountabilityStatus() const;
+	void                                   makePetMountable();
+	bool                                   isMountable() const;
+	bool                                   isMountableAndHasRoomForAnother() const;
+	NetworkId                              getPetControlDeviceId() const;
+	bool                                   detachRider(NetworkId const rider);
+	bool                                   detachAllRiders();
+	CreatureObject                  const *getPrimaryMountingRider() const;
+	CreatureObject                        *getPrimaryMountingRider();
+	void                                   getMountingRiders(stdvector<const CreatureObject *>::fwd & riders) const;
+	void                                   getMountingRiders(stdvector<CreatureObject *>::fwd & riders);
+
+	// Called on rider.
+	bool                                   mountCreature(CreatureObject &mountObject);
+	CreatureObject                 const  *getMountedCreature() const;
+	CreatureObject                        *getMountedCreature();
+	void                                   emergencyDismountForRider();
+
+	// ======
+	// Ships: PUBLIC: implemented in CreatureObject_Ships.cpp
+	// ======
+
+	ShipObject                            *getPilotedShip();
+	ShipObject const                      *getPilotedShip() const;
+	bool                                   pilotShip(ServerObject &pilotSlotObject);
+	bool                                   unpilotShip();
+
+	void                                   getAllShipsInDatapad(stdvector<NetworkId>::fwd & ships) const;
+
+	// ======
+
+	struct CreatureObjectPointerHash
+	{
+		size_t operator()(const CreatureObject * const ptr) const
+		{
+			return (reinterpret_cast<const size_t>(ptr) >> 4);
+		};
+	};
+
+	typedef stdhash_set<const CreatureObject *, CreatureObjectPointerHash>::fwd AllCreaturesSet;
+	static const AllCreaturesSet & getAllCreatures();
+
+	bool monitorCreatureMovement(const CachedNetworkId &ofTarget, float i_skittishness, float i_curve);
+	bool ignoreCreatureMovement(const CachedNetworkId &ofTarget);
+	
+	virtual CommandQueue * getCommandQueue() const;
+
+	bool isInTutorial() const;
+
+	// Jedi functions
+	void addJediToAccountAck(void);
+	bool isJedi() const;
+
+	// Housing functions
+	int                     getMaxNumberOfLots() const;
+	NetworkId               getHouse(void) const;
+	void                    setHouse(const CachedNetworkId & houseId);
+
+	// Character transfer
+	bool receiveCharacterTransferMessage(const std::vector<unsigned char> & packedCharacterData);
+	void  receiveCharacterTransferStatusMessage(const std::string & statusMessage);
+	std::vector<unsigned char> uploadCharacterData(const bool withItems, const bool allowOverride);
+
+	int loadPackedHouses();
+
+	void setClientUsesAnimationLocomotion(bool const enabled);
+	void addSlowDownEffect(const TangibleObject & defender, float coneLength, float coneAngle, float slopeAngle, unsigned long expireTime);
+	bool addSlowDownEffectProxy(const TangibleObject & defender, float coneLength, float coneAngle, float slopeAngle, unsigned long expireTime);
+	void removeSlowDownEffect();
+	void removeSlowDownEffectProxy();
+	void addTerrainSlopeEffect(const Vector & normal);
+
+	void recomputeCommandSeries();
+	void incrementKillMeter(int amount);
+
+public:
+	void      setCover(int cover);
+	void      setCoverVisibility(bool isVisible);
+	void      setLocomotion(Locomotions::Enumerator posture);
+	void      setMaxAttribute(Attributes::Enumerator attribute, Attributes::Value value, bool verifyPlayerMaxStats = true);
+	void      setMentalState(MentalStates::Enumerator state, MentalStates::Value value);
+	void      setMentalStateToward(const NetworkId &target, MentalStates::Enumerator state, MentalStates::Value value);
+	void      setMentalStateTowardClampBehavior(const NetworkId &target, MentalStates::Enumerator state, MentalStates::Value value, Behaviors::Enumerator behavior);
+	void      setMaxMentalState(MentalStates::Enumerator state, MentalStates::Value value);
+	void      setMentalStateDecay(MentalStates::Enumerator state, float value);
+	void      setPosture(Postures::Enumerator posture, bool isClientImmediate = false);
+	
+	void      requestMovementInfoUpdate();
+
+	bool      getIsStatic() const;
+	void      setIsStatic(bool);
+
+	bool      isBeast() const;
+	void      setIsBeast(bool);
+
+	bool      setForceShowHam(bool show);
+
+	static void  runMissionCreationQueue();
+
+	virtual   bool hasBounty(const CreatureObject & target) const;
+	virtual   bool hasBounty() const;
+	virtual std::vector<NetworkId> const & getJediBountiesOnMe() const;
+	bool      hasBountyMissionForTarget(const NetworkId & targetId) const;
+
+	void      setAlternateAppearance(std::string const &sharedObjectTemplateName);
+
+	std::vector<WearableEntry> getWearableData();
+	void     setWearableData(std::vector<WearableEntry> const & packedWearables);
+
+	virtual void onContainedItemAppearanceDataModified(TangibleObject const & target, std::string const & oldValue, std::string const & value);
+
+	void forceNotifyRegionsCheck();
+	void checkNotifyRegions();
+
+	void addMissionCriticalObject(NetworkId const & networkId);
+	void removeMissionCriticalObject(NetworkId const & networkId);
+	void clearMissionCriticalObjects();
+	bool isMissionCriticalObject(NetworkId const & networkId) const;
+	typedef std::set<NetworkId> MissionCriticalObjectSet;
+	MissionCriticalObjectSet const & getMissionCriticalObjects() const;
+	typedef std::set<std::pair<NetworkId, NetworkId> > GroupMissionCriticalObjectSet;
+	void setGroupMissionCriticalObjects(GroupMissionCriticalObjectSet const & groupMissionCriticalObjectSet);
+	
+	bool processExpertiseRequest(std::vector<std::string> const &addExpertisesNamesList, bool clearAllExpertisesFirst);
+	bool clearAllExpertises();
+
+	float getPseudoPlayedTime() const;
+	void setPseudoPlayedTime(float alterTime);
+	
+	bool hasBuff(uint32 buffNameCrc) const;
+	void addBuff(uint32 buffNameCrc, float duration = 0.0f, float dynamicValue = 0.0f, NetworkId caster = NetworkId::cms_invalid, uint32 stackCount = 1 );
+	void addBuff(uint32 buffNameCrc, float timeTillRemoval, float dynamicValue, float totalDuration, NetworkId caster, uint32 stackCount = 1);
+	void removeBuff(uint32 buffNameCrc);
+	void getAllBuffs(stdvector<uint32>::fwd  & buffCrcs) const;
+	bool getBuff(uint32 buffNameCrc, Buff & buff) const;
+	void decrementBuff(uint32 const buffNameCrc, uint32 const stacksToRemove = 1);
+	void decayBuff(uint32 buffNameCrc, float decayPercentage);
+
+	int16 getLevel() const;
+	int  getLevelXp() const;
+	void setLevel(int level);  // this is called to force this object to the specified level irregardless of the current skills - this can change level xp and health
+	void recalculateLevel();
+	void fixupPersistentBuffsAfterLoading();
+	void fixupLevelXpAfterLoading();
+
+	void doWarmupChecks(
+		const Command &command,
+		const NetworkId &target,
+		const Unicode::String &params,
+		Command::ErrorCode &status,
+		int &detail );
+
+	Difficulty getDifficulty() const;
+	void setDifficulty(Difficulty const difficulty);
+
+	int32 getHologramType() const;
+	void setHologramType(int32 newHologramType);
+
+	bool getVisibleOnMapAndRadar() const;
+	void setVisibleOnMapAndRadar(bool visible);
+
+	float getRegenRate(Attributes::Enumerator poolAttrib) const;
+	void  setRegenRate(Attributes::Enumerator poolAttrib, float value);
+
+	float getLavaResistance() const;
+	unsigned long getLastWaterDamageTime() const;
+	void setLastWaterDamageTime(unsigned long newTime);
+
+	stdmap<std::string, int>::fwd const & getCommandList() const;
+	void clearCommands();
+	bool grantCommand(std::string const & commandName, bool fromSkill);
+	void revokeCommand(std::string const & command, bool fromSkill, bool ignoreCount = false);
+	bool hasCommand(std::string const & commandName) const;
+
+	void setLookAtYaw(const float lookAtYaw, bool useLookAtYaw);
+	float getLookAtYaw() const;
+	bool getUseLookAtYaw() const;
+	
+	bool     isAppearanceEquippable(const char *appearanceTemplateName);
+
+	void getLfgCharacterData(LfgCharacterData & lfgCharacterData) const;
+	
+	void clientMinigameOpen(ValueDictionary const & messageData);
+	void clientMinigameClose(ValueDictionary const & messageData);
+
+	void			  setDecoyOrigin(NetworkId const & originalCreature);
+	NetworkId const & getDecoyOrigin() const;
+
+	void saveDecorationLayout(ServerObject const & pobSourceObject, int saveSlotNumber, std::string const & description);
+	void restoreDecorationLayout(ServerObject const & pobTargetObject, int saveSlotNumber);
+
+protected:
+
+	virtual void        endBaselines();
+	virtual void        onLoadedFromDatabase();
+	virtual void        initializeFirstTimeObject();
+	virtual void setInCombat(bool inCombat);
+
+	//void      setAnimationState(AnimationState state);
+	void      clipMentalStatesToward();
+	void      deleteUnusedMentalStatesToward(bool * i_stateChanged);
+	void      initializeDefaultWeapon();
+
+	virtual void applyDamage(const CombatEngineData::DamageData &damageData);
+	        
+	virtual void decayAttributes(float time); // advance buffs, etc.
+	virtual void decayMentalStates(float time); // do decay towards base value
+	virtual void reportMonitoredCreatures(float time);
+
+	Locomotions::Enumerator calcLocomotion() const;
+	const MovementTable * getMovementTable() const;
+	
+	virtual bool handleContentsSetup();
+	virtual void forwardServerObjectSpecificBaselines() const;
+	virtual void sendObjectSpecificBaselinesToClient(Client const &client) const;
+	virtual float getPvpRegionCheckTime();
+	virtual void updatePlanetServerInternal(bool forceUpdate) const;
+
+	virtual const SharedObjectTemplate *  getDefaultSharedTemplate(void) const;
+
+	virtual void calcPvpableState();
+
+	uint32 internalGetPlayedTime() const;
+	void alterPseudoPlayedTime(float alterTime);
+
+	void updateBuffs();
+	bool stillHasBuffState(uint32 buffNameCrc, int state) const;
+	
+	void setLevelData(int16 level, int levelXp, int health);
+	virtual void levelChanged() const;
+
+	virtual void observersCountChanged();
+
+	bool isStopped() const;
+	bool isWalking() const;
+	bool isRunning() const;
+	
+private:
+
+	// Disabled.
+	CreatureObject();
+	CreatureObject(const CreatureObject& rhs);
+	CreatureObject&	operator=(const CreatureObject& rhs);
+
+	static void remove();
+
+	// ======
+	// Mounts: PRIVATE: implemented in CreatureObject_Mounts.cpp
+	// ======
+
+	static void  installForMounts();
+
+	void         transferRiderPositionToMount();
+	void         alterAuthoritativeForMounts();
+	void         alterAnyForMounts();
+	bool         onContainerAboutToTransferForMounts(ServerObject const * destination, ServerObject* transferer);
+	
+	// ======
+
+	Attributes::Value getAdjustedAttribute(Attributes::Enumerator attribute, Attributes::Value value) const;
+
+	void     setupInventory();
+	void     setupSkillData();
+	int      alterAttribute(Attributes::Enumerator attrib, int delta, bool checkIncapacitation, const NetworkId & source = NetworkId::cms_invalid, bool force = false);
+	void     testIncapacitation(const NetworkId & attackerId);
+	void     initializeNewPlayer  ();
+	
+	void     addPackedWearable(std::string const &appearanceData, int arrangementIndex, NetworkId const &networkId, uint32 sharedTemplateCrcValue, const BaselinesMessage * weaponSharedBaselines = NULL, const BaselinesMessage * weaponSharedNpBaselines = NULL);
+	void     addPackedAppearanceWearable(std::string const &appearanceData, int arrangementIndex, NetworkId const &networkId, uint32 sharedTemplateCrcValue);	
+	void     packWearables();
+	void     computeTotalAttributes ();
+
+	bool     potentiallyAddToTerrain();
+
+	void     addModBonus(const std::string & modName, int bonus);
+	void     addAttribBonus(int attrib, int bonus);
+	void     updateSlopeMovement(const std::string & modName);
+
+	int      getCurrentTargetsTotal(const stdmap<Attributes::Enumerator, Attributes::Value>::fwd & targets);
+	
+	int      changeAttribModCurrentValue(Attributes::Enumerator attrib, int delta, bool checkPoolOverflow);
+	void     recomputeAttribModTotals(bool checkPoolOverflow);
+
+	void     updateMovementInfo();
+	void     updateVehiclePhysicsData ();
+
+	void     unequipAllItems();
+	
+	void     updateGroup();
+	
+	void     handleTutorialTransition();
+
+protected:
+	virtual void       virtualOnAddedToWorldCell();
+	virtual void       virtualOnRemovedFromWorldCell();
+	virtual void       virtualOnSetAuthority();
+	virtual void       virtualOnReleaseAuthority();
+	virtual void       virtualOnSetClient();
+	virtual void       virtualOnLogout();
+private:
+
+	struct PostureChangeCallback
+	{
+		void modified(CreatureObject &target, Postures::Enumerator oldValue, Postures::Enumerator value, bool isLocal) const;
+	};
+	friend struct PostureChangeCallback;
+
+	struct LocomotionChangeCallback
+	{
+		void modified(CreatureObject &target, Locomotions::Enumerator oldValue, Locomotions::Enumerator value, bool isLocal) const;
+	};
+	friend struct LocomotionChangeCallback;
+
+	struct StateChangeCallback
+	{
+		void modified(CreatureObject &target, uint64 oldValue, uint64 newValue, bool isLocal) const;
+	};
+	friend struct StateChangeCallback;
+
+	typedef stdvector<MessageQueueMissionListResponseData>::fwd         MessageQueueMissionListResponseDataVector;
+	MessageQueueMissionListResponseDataVector      m_missionResponseEntries;
+
+	static const SharedObjectTemplate * m_defaultSharedTemplate;	// template to use if no shared template is given
+	
+	CreatureAttitude const *getAttitudeToward(NetworkId const &m_id) const;
+	bool                 updateBehavior(NetworkId const *id, CreatureAttitude &state) const;
+	void                 notifyTargetChange(int state, int newState, bool * i_stateChanged);
+	void                 checkAndRestoreRequiredSlots();
+
+	void                 getAvailableLocomotions();
+	
+	void                 setStatesDueToContainment();
+	
+	bool	             doesLocomotionInvalidateCommand(Command const &cmd) const;
+
+	int                  internalGetInstrumentAudioId(NetworkId const &id) const;
+	int                  internalGetInstrumentVisualId(NetworkId const &id) const;
+
+	int getExpertisePointsSpentForPlayerInTree(int tree);
+	void getExpertisesForPlayer(SkillList & expertiseList) const;
+	int getExpertiseRankForPlayer(std::string const & expertiseName);
+	int getRemainingExpertisePoints() const;
+
+	mutable CommandQueue * m_commandQueue;
+	Archive::AutoDeltaVariable<bool>                 m_isStatic;
+
+	// same goes for the shield
+	Watcher<TangibleObject>                          m_shield;		// personal shield that absorbs damage before any armor
+
+
+	float                                            m_regeneration[Attributes::NumberOfAttributes];   ///< Accumulated regeneration points
+	float                                            m_regenerationTime;                               ///< Accumulated regeneration time
+	
+	// BPM CreatureObject : TangibleObject // Begin persisted members.
+	Archive::AutoDeltaVector<Attributes::Value>      m_attributes;           ///< The current attributes (health, action, mind) of the mobile.
+	Archive::AutoDeltaVector<Attributes::Value>      m_maxAttributes;        ///< The max unaffected attributes of this mobile.
+	Archive::AutoDeltaVector<Attributes::Value>      m_totalAttributes;      ///< The current attributes, with all mods applied
+	Archive::AutoDeltaVector<Attributes::Value>      m_totalMaxAttributes;   ///< The max attributes, with all mods applied
+	Archive::AutoDeltaVector<Attributes::Value>      m_attribBonus;          ///< Bonus from items that are added to the max attrib values
+	Archive::AutoDeltaVariable<int>                  m_shockWounds;          ///< Shock wounds taken
+	Archive::AutoDeltaVariable<bool>                 m_allowSARegen;         ///< If this is set to false, special ability pools will not regenerate
+	Archive::AutoDeltaMap<uint32, CreatureMod>       m_attributeModList;     ///< List of modifies to the mobile's attributes (such as wounds or buffs).
+	Archive::AutoDeltaVector<Attributes::Value>      m_cachedCurrentAttributeModValues; ///< The current value of all the attribute mods being added to the attribute values.
+	Archive::AutoDeltaVector<Attributes::Value>      m_cachedMaxAttributeModValues;     ///< The current value of all the attribute mods being added to the max attribute values.
+	Archive::AutoDeltaVariable<CreatureAttitude>     m_currentAttitude;      ///< The current general attitude
+	Archive::AutoDeltaVariable<Behaviors::Enumerator> m_lastBehavior;        ///< The last overall selected behavior
+	Archive::AutoDeltaMap<NetworkId, CreatureAttitude> m_mentalStatesToward;   ///< The current mental states toward another mobile
+	Archive::AutoDeltaVector<MentalStates::Value>    m_maxMentalStates;      ///< The max unaffected mental states of this mobile.
+	Archive::AutoDeltaVector<float>                  m_mentalStateDecays;    ///< The time it takes for the mental state to decay halfway to it's original value
+	MentalStates::Value    m_fearCutoffs[CreatureAttitude::kFearStateCount];          ///< Cutoff values for fear state transitions
+	MentalStates::Value    m_angerCutoffs[CreatureAttitude::kAngerStateCount];         ///< Cutoff values for anger state transitions
+	std::set<NetworkId>                              m_targetsByBehavior[Behaviors::NumberOfBehaviors];
+
+	Archive::AutoDeltaVariable<float>                m_scaleFactor;          ///< Value to resize the creature on the client by
+
+	Archive::AutoDeltaMap<NetworkId, MonitoredCreatureMovement> m_monitoredCreatureMovements; ///< The creatures we are monitoring
+	Archive::AutoDeltaVariable<Vector> m_lastMonitorReportPosition;
+	Archive::AutoDeltaVariableObserver<int, PvpUpdateAndCellPermissionsObserver, CreatureObject> m_guildId;
+
+	// when switching guild war pvp status using the guild war exemption/exclusive list,
+	// add a delay to when the actually switch takes place, to prevent exploit of quickly
+	// switching in and out guiild war pvp using the guild war exemption/exclusive list
+	Archive::AutoDeltaVariable<unsigned long> m_timeToUpdateGuildWarPvpStatus;
+
+	Archive::AutoDeltaVariableObserver<bool, PvpUpdateObserver, CreatureObject> m_guildWarEnabled;
+	Archive::AutoDeltaVariableObserver<int, PvpUpdateObserver, CreatureObject> m_militiaOfCityId;
+	Archive::AutoDeltaVariableObserver<int, PvpUpdateObserver, CreatureObject> m_locatedInCityId;
+	Archive::AutoDeltaVariableObserver<NetworkId, PvpUpdateObserver, CreatureObject> m_masterId;
+
+	// ***DEPRECATED*** use PlayerObject::m_currentGcwRank instead
+	Archive::AutoDeltaVariable<uint8>                m_rank;          ///< The rank designation value for this player. 0 = no rank designated.
+
+	// Worldspace XYZ used to figure out where to put plaers if they logout from a buildout structure (which the DB isn't aware of)
+	Archive::AutoDeltaVariable<float>		m_wsX;
+	Archive::AutoDeltaVariable<float>		m_wsY;
+	Archive::AutoDeltaVariable<float>		m_wsZ;
+
+	//EPM
+	
+	Archive::AutoDeltaVariable<unsigned char>        m_animState;     ///< The current animation state.
+	Archive::AutoDeltaVariable<unsigned char>        m_mood;          ///< The mood the mobile is in.
+	Archive::AutoDeltaVariable<unsigned char>        m_sayMode;       ///< The current default say text that a character uses when speaking.
+	Archive::AutoDeltaVariable<std::string>          m_animationMood;
+	Archive::AutoDeltaVariableCallback<Postures::Enumerator, PostureChangeCallback, CreatureObject> m_posture;       ///< The posture of the mobile
+	Archive::AutoDeltaVariableCallback<Locomotions::Enumerator, LocomotionChangeCallback, CreatureObject> m_locomotion;       ///< The locomotion of the mobile
+	Archive::AutoDeltaVariable<int>                  m_stopWalkRun;   ///< does the creature want to stop, walk, or run?
+	Archive::AutoDeltaVariableCallback<uint64, StateChangeCallback, CreatureObject> m_states;       ///< The states set on the creature
+	Archive::AutoDeltaVariable<float>                m_movementScale;     // scale to the creature's base movement rate
+	Archive::AutoDeltaVariable<float>                m_movementPercent;   // script-defined mod to the creature's base movement rate
+	Archive::AutoDeltaVariable<float>                m_baseWalkSpeed;
+	Archive::AutoDeltaVariable<float>                m_walkSpeed;         // scale to the creature's base movement rate
+	Archive::AutoDeltaVariable<float>                m_baseRunSpeed;
+	Archive::AutoDeltaVariable<float>                m_runSpeed;          // scale to the creature's base movement rate
+	Archive::AutoDeltaVariable<float>                m_accelScale;        // scale to the creature's base acceleration rate
+	Archive::AutoDeltaVariable<float>                m_accelPercent;      // script-defined mod to the creature's base acceleration rate
+	Archive::AutoDeltaVariable<float>                m_turnScale;         // scale to the creature's base turn rate
+	Archive::AutoDeltaVariable<float>                m_slopeModAngle;     // angle at which the creature starts to slow down
+	Archive::AutoDeltaVariable<float>                m_baseSlopeModPercent;   // unmodified scale to the creature's base movement rate for a 90 degree slope
+	Archive::AutoDeltaVariable<float>                m_slopeModPercent;   // scale to the creature's base movement rate for a 90 degree slope, modified by skill
+	Archive::AutoDeltaVariable<float>                m_waterModPercent;   // scale to the creature's base movement rate for movement in water
+
+	Archive::AutoDeltaVariable<NetworkId>  m_lookAtTarget;  ///< Creature's current target
+	Archive::AutoDeltaVariable<NetworkId>  m_intendedTarget;  ///< Creature's intended target
+	
+	Archive::AutoDeltaVariable<int>                  m_cover;         ///< current cover value for combat
+	Archive::AutoDeltaVariable<bool>                 m_coverVisibility; // whether the creature is visibile
+	Archive::AutoDeltaVariable<CachedNetworkId> m_currentWeapon; ///< current weapon creature is using in combat
+
+	// pair: unmodified skill mod, bonus from equipped objects
+	Archive::AutoDeltaMap<std::string, std::pair<int, int> >   m_modMap;        // sync calculated mod information with client and server (pistol_accuracy, for example)
+
+	Archive::AutoDeltaSet<const SkillObject *>    m_skills;
+
+	// Mission system related data
+	ServerObject *                                   m_missionTerminal;
+	
+	int                                              m_deferComputeTotalAttributes;
+	Archive::AutoDeltaVariableObserver<CachedNetworkId, GroupIdObserver, CreatureObject> m_group;
+	Archive::AutoDeltaVariable<PlayerAndShipPair>    m_groupInviter;
+	Archive::AutoDeltaVariable<NetworkId>            m_inviterForPendingGroup;  // "pending group" means you accepted an invitation but have not received a group object
+	Archive::AutoDeltaVariable<int>                  m_performanceType;
+	Archive::AutoDeltaVariable<int>                  m_performanceStartTime;
+	Archive::AutoDeltaVariable<NetworkId>            m_performanceListenTarget;
+	Archive::AutoDeltaVariable<NetworkId>            m_performanceWatchTarget;
+
+	/// Specifies the string used by the client to determine what to do when in the Postures::SkillAnimating posture.
+	Archive::AutoDeltaVariable<std::string>          m_animatingSkillData;
+
+	Archive::AutoDeltaVariable<int16>                m_level;
+	int16                                            m_previousLevel;
+	Archive::AutoDeltaVariable<int>                  m_totalLevelXp;
+	Archive::AutoDeltaVariable<int>                  m_levelHealthGranted;
+
+	Archive::AutoDeltaVector<WearableEntry>          m_wearableData;
+	Archive::AutoDeltaVariableObserver<float, PvpUpdateObserver, CreatureObject> m_invulnerabilityTimer;
+
+	Archive::AutoDeltaVariable<std::string>          m_alternateAppearanceSharedObjectTemplateName;
+	ClientMfdStatusUpdateMessage *                   m_clientMfdStatusUpdateMessage;
+
+	// the list of timed mods that has been sent to the client;
+	// we store this in a vector instead of a set/map because
+	// we want to preserve the order that the mods were added,
+	// so that when we need to update the client with this information,
+	// the client will display the information in the same order
+	// as it previously dispayed it (in the modifiers window)
+	Archive::AutoDeltaVector<uint32>                 m_timedMod;
+	Archive::AutoDeltaVector<float>                  m_timedModDuration;
+	Archive::AutoDeltaVector<uint32>                 m_timedModUpdateTime;
+	
+	uint8    m_missionListRequestSequenceId;
+	bool     m_addedToSpawnQueue;
+	int      m_numberOfMissionsWantedInMissionBag;
+
+	//-- Cached by updateMovementInfo() so we don't have to make expensive MovementTable calls every alter call in calcLocomotion().
+	Locomotions::Enumerator  m_fastLocomotion;
+	Locomotions::Enumerator  m_slowLocomotion;
+	Locomotions::Enumerator  m_stationaryLocomotion;
+
+	struct VehiclePhysicsData
+	{
+		float m_minMoveSpeed;
+		float m_walkSpeed;
+		float m_runSpeed;
+		float m_accelerationMin;
+		float m_accelerationMax;
+		float m_turnRateMin;
+		float m_turnRateMax;
+	};
+
+	VehiclePhysicsData * m_vehiclePhysicsData;
+	
+	Vector m_lastRegionNotifyPosition;
+	Archive::AutoDeltaSet<std::pair<std::string, std::string> > m_notifyRegions;
+
+	Archive::AutoDeltaSet<NetworkId> m_missionCriticalObjectSet;
+	Archive::AutoDeltaSet<std::pair<NetworkId, NetworkId> > m_groupMissionCriticalObjectSet;
+
+	/** The list of TriggerVolume this object is currently in
+	 */
+	std::set<TriggerVolume *> m_triggerVolumeEntered;
+
+	float m_pseudoPlayedTime;
+
+	//Buffs
+	Archive::AutoDeltaMap<uint32, Buff::PackedBuff>       m_buffs;
+	Archive::AutoDeltaPackedMap<uint32, Buff::PackedBuff> m_persistedBuffs;
+
+	Archive::AutoDeltaVariable<bool> m_clientUsesAnimationLocomotion;
+	Archive::AutoDeltaVariable<unsigned char> m_difficulty;
+	Archive::AutoDeltaVariable<int32> m_hologramType;
+	Archive::AutoDeltaVariable<bool> m_visibleOnMapAndRadar;
+
+	//Look at position
+	float m_lookAtYaw;
+	bool m_useLookAtYaw;
+	int m_lookAtPositionSequenceId;
+
+	bool m_fixedupPersistentBuffsAfterLoading;
+	bool m_fixedupLevelXpAfterLoading;
+	float m_lavaResistance;
+	unsigned long m_lastWaterDamageTime; // used for timing last damage taken by lava (and other future harmful water types)
+
+	float m_attribRegenMultipliers[AR_count];
+	Archive::AutoDeltaMap<std::string, int> m_commands; // game commands a creature may execute
+
+	Archive::AutoDeltaVariable<bool> m_isBeast;
+	Archive::AutoDeltaVariable<bool> m_forceShowHam;
+
+	Timer m_regionFlagTimer; // Occasionally verify we have the correct region flags.
+
+	Archive::AutoDeltaVector<WearableEntry> m_wearableAppearanceData; // Vector for our appearance items.
+
+	Archive::AutoDeltaVariable<NetworkId>   m_decoyOrigin; // The OID of the player whom we copied for this decoy creature.
+};
+
+//----------------------------------------------------------------------
+/*
+inline CreatureObject::AnimationState CreatureObject::getAnimationState() const
+{
+    return static_cast<AnimationState>(m_animState.get());
+}
+*/
+//----------------------------------------------------------------------
+
+inline const std::set<TriggerVolume *> * CreatureObject::getTriggerVolumeEntered() const
+{
+	return &m_triggerVolumeEntered;
+}
+
+//----------------------------------------------------------------------
+
+inline bool CreatureObject::getIsStatic() const
+{
+	return m_isStatic.get();
+}
+
+//----------------------------------------------------------------------
+
+inline bool CreatureObject::isBeast() const
+{
+	return m_isBeast.get();
+}
+
+//----------------------------------------------------------------------
+
+inline float CreatureObject::getScaleFactor () const
+{
+	return m_scaleFactor.get();
+}
+
+//----------------------------------------------------------------------
+
+inline Attributes::Value CreatureObject::getUnmodifiedAttribute(Attributes::Enumerator attribute) const
+{
+	DEBUG_FATAL(attribute < 0 || attribute >= Attributes::NumberOfAttributes, ("attribute out of range\n"));
+	return m_attributes[attribute];
+}
+
+//----------------------------------------------------------------------
+
+inline Attributes::Value CreatureObject::getUnmodifiedMaxAttribute(Attributes::Enumerator attribute) const
+{
+	DEBUG_FATAL(attribute < 0 || attribute >= Attributes::NumberOfAttributes, ("attribute out of range\n"));
+
+	// @NOTE: special case for health attribute adds level health
+	return (Attributes::Health == attribute) ? m_maxAttributes[attribute] + m_levelHealthGranted.get() : m_maxAttributes[attribute];
+}
+
+//----------------------------------------------------------------------
+
+inline int CreatureObject::getShockWounds () const
+{
+	return m_shockWounds.get();
+}
+
+//----------------------------------------------------------------------
+
+inline Attributes::Value CreatureObject::getAttributeBonus(Attributes::Enumerator attribute) const
+{
+	DEBUG_FATAL(attribute < 0 || attribute >= Attributes::NumberOfAttributes, ("attribute out of range\n"));
+	return m_attribBonus[attribute];
+}
+
+//----------------------------------------------------------------------
+
+inline MentalStates::Value CreatureObject::getUnmodifiedMentalState(MentalStates::Enumerator attribute) const
+{
+	DEBUG_FATAL(attribute < 0 || attribute >= MentalStates::NumberOfMentalStates, ("mental state out of range\n"));
+	//@ todo - decay here, or elsewhere?
+	return m_currentAttitude.get().m_currentValues[attribute];
+}
+
+//----------------------------------------------------------------------
+
+inline MentalStates::Value CreatureObject::getMaxMentalState(MentalStates::Enumerator attribute) const
+{
+	DEBUG_FATAL(attribute < 0 || attribute >= MentalStates::NumberOfMentalStates, ("mental state out of range\n"));
+	return m_maxMentalStates[attribute];
+}
+
+//----------------------------------------------------------------------
+
+inline float CreatureObject::getMentalStateDecay(MentalStates::Enumerator attribute) const
+{
+	DEBUG_FATAL(attribute < 0 || attribute >= MentalStates::NumberOfMentalStates, ("mental state out of range\n"));
+	return m_mentalStateDecays[attribute];
+}
+
+//----------------------------------------------------------------------
+
+inline SharedCreatureObjectTemplate::Gender  CreatureObject::getGender() const
+{
+	return safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate())->getGender();
+}
+
+//----------------------------------------------------------------------
+
+inline float CreatureObject::getSlopeModAngleMin() const
+{
+	return safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate())->getSlopeModAngleMin() * PI / 180;
+}
+
+//----------------------------------------------------------------------
+
+inline float CreatureObject::getSlopeModAngleMax() const
+{
+	return safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate())->getSlopeModAngleMax() * PI / 180;
+}
+
+//----------------------------------------------------------------------
+
+inline float CreatureObject::getSlopeModPercentMin() const
+{
+	return safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate())->getSlopeModPercentMin();
+}
+
+//----------------------------------------------------------------------
+
+inline void CreatureObject::recomputeSlopeModPercent()
+{
+	setSlopeModPercent(m_baseSlopeModPercent.get());
+}
+
+//----------------------------------------------------------------------
+
+inline float CreatureObject::getSlopeModPercentMax() const
+{
+	return safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate())->getSlopeModPercentMax();
+}
+
+//----------------------------------------------------------------------
+
+inline float CreatureObject::getWaterModPercentMin() const
+{
+	return safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate())->getWaterModPercentMin();
+}
+
+//----------------------------------------------------------------------
+
+inline float CreatureObject::getWaterModPercentMax() const
+{
+	return safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate())->getWaterModPercentMax();
+}
+
+//----------------------------------------------------------------------
+
+inline uint32 CreatureObject::getMood() const
+{
+	return static_cast<uint32>(m_mood.get());
+}
+
+//----------------------------------------------------------------------
+
+inline Postures::Enumerator CreatureObject::getPosture () const
+{
+	return m_posture.get();
+}
+
+//----------------------------------------------------------------------
+
+inline bool CreatureObject::getState(States::Enumerator whichState) const
+{
+	if(whichState == States::Combat)
+	{
+		return isInCombat();
+	}
+
+	return (m_states.get() & States::getStateMask(whichState)) != 0;
+}
+
+//----------------------------------------------------------------------
+
+inline uint32 CreatureObject::getSayMode() const
+{
+	return static_cast<uint32>(m_sayMode.get());
+}
+
+//----------------------------------------------------------------------
+
+inline const std::string & CreatureObject::getAnimationMood() const
+{
+	return m_animationMood.get();
+}
+
+//----------------------------------------------------------------------
+
+inline bool CreatureObject::isIncapacitated () const
+{
+	Postures::Enumerator posture = getPosture();
+	return ( (posture == Postures::Incapacitated && !getState(States::FeignDeath)) || posture == Postures::Dead);
+}
+
+//----------------------------------------------------------------------
+
+inline bool CreatureObject::isDead () const
+{
+	//@todo: hook into death implementation;
+	return getPosture() == Postures::Dead;
+}
+
+//----------------------------------------------------------------------
+
+inline const NetworkId& CreatureObject::getLookAtTarget() const
+{
+	return m_lookAtTarget.get();
+}
+
+//----------------------------------------------------------------------
+
+inline const NetworkId& CreatureObject::getIntendedTarget() const
+{
+	return m_intendedTarget.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int CreatureObject::getCover () const
+{
+	return m_cover.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline Locomotions::Enumerator CreatureObject::getLocomotion () const
+{
+	return m_locomotion.get();
+}
+
+//--------------------------------------------------------------------
+
+inline const MovementTable * CreatureObject::getMovementTable() const
+{
+	const SharedCreatureObjectTemplate * sharedTemplate = safe_cast<const SharedCreatureObjectTemplate *>(getSharedTemplate());
+	const MovementTable * table = sharedTemplate->getMovementTable();
+	
+	return table;
+}
+
+//--------------------------------------------------------------------
+
+inline float CreatureObject::getSlopeModAngle() const
+{
+	return m_slopeModAngle.get();
+}
+
+//--------------------------------------------------------------------
+
+inline float CreatureObject::getBaseSlopeModPercent() const
+{
+	return m_baseSlopeModPercent.get();
+}
+
+//--------------------------------------------------------------------
+
+inline float CreatureObject::getSlopeModPercent() const
+{
+	return m_slopeModPercent.get();
+}
+
+//--------------------------------------------------------------------
+
+inline float CreatureObject::getWaterModPercent() const
+{
+	return m_waterModPercent.get();
+}
+
+//--------------------------------------------------------------------
+
+inline float CreatureObject::getMovementScale() const
+{
+	return m_movementScale.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline float CreatureObject::getMovementPercent() const
+{
+	return m_movementPercent.get();
+}
+
+//--------------------------------------------------------------------
+
+inline float CreatureObject::getTurnPercent() const
+{
+	return m_turnScale.get();
+}
+
+//--------------------------------------------------------------------
+
+inline float CreatureObject::getAccelScale() const
+{
+	return m_accelScale.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline float CreatureObject::getAccelPercent() const
+{
+	return m_accelPercent.get();
+}
+
+// ======================================================================
+
+inline int16  CreatureObject::getLevel() const
+{
+	return m_level.get();
+}
+
+inline int  CreatureObject::getLevelXp() const
+{
+	return m_totalLevelXp.get();
+}
+
+inline float CreatureObject::getPseudoPlayedTime() const
+{
+	return m_pseudoPlayedTime;
+}
+
+//-----------------------------------------------------------------------
+
+inline float CreatureObject::getLavaResistance() const
+{
+	return m_lavaResistance;
+}
+
+//-----------------------------------------------------------------------
+
+inline unsigned long CreatureObject::getLastWaterDamageTime() const
+{
+	return m_lastWaterDamageTime;
+}
+
+// ======================================================================
+
+namespace Archive
+{
+	void put(Archive::ByteStream &target,   CreatureAttitude const &state);
+	void get(Archive::ReadIterator &source, CreatureAttitude &state);
+	void put(Archive::ByteStream &target,   MonitoredCreatureMovement const &state);
+	void get(Archive::ReadIterator &source, MonitoredCreatureMovement &state);
+	void put(Archive::ByteStream &target,   CreatureMod const &mod);
+	void get(Archive::ReadIterator &source, CreatureMod &mod);
+}
+
+// ======================================================================
+
+bool operator!=(CreatureMod const &a, CreatureMod const &b);
+inline bool operator==(CreatureMod &a, CreatureMod const &b)
+{
+	return !(a != b);
+}
+
+// ----------------------------------------------------------------------
+
+inline int32 CreatureObject::getHologramType() const
+{
+	return m_hologramType.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool CreatureObject::getVisibleOnMapAndRadar() const
+{
+	return m_visibleOnMapAndRadar.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void CreatureObject::setDecoyOrigin(const NetworkId &originalCreature)
+{
+	m_decoyOrigin = originalCreature;
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & CreatureObject::getDecoyOrigin() const
+{
+	return m_decoyOrigin.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreatureObject::getGuildId() const
+{
+	return m_guildId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline unsigned long CreatureObject::getTimeToUpdateGuildWarPvpStatus() const
+{
+	return m_timeToUpdateGuildWarPvpStatus.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool CreatureObject::getGuildWarEnabled() const
+{
+	return m_guildWarEnabled.get();
+}
+
+// ======================================================================
+
+#endif	// INCLUDED_CreatureObject_H
diff --git a/engine/server/library/serverGame/src/shared/object/CreatureObject_Mounts.cpp b/engine/server/library/serverGame/src/shared/object/CreatureObject_Mounts.cpp
new file mode 100644
index 00000000..993140f7
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/CreatureObject_Mounts.cpp
@@ -0,0 +1,1124 @@
+// ======================================================================
+//
+// CreatureObject_Mounts.cpp
+// Copyright 2003 Sony Online Entertainment, Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CreatureObject.h"
+
+#include "serverGame/Chat.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ServerTangibleObjectTemplate.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedGame/SharedSaddleManager.h"
+#include "sharedCollision/CollisionProperty.h" 
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedGame/MountValidScaleRangeTable.h"
+#include "sharedGame/SharedSaddleManager.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedObject/Appearance.h"
+#include "sharedObject/AppearanceTemplate.h"
+#include "sharedObject/AlterScheduler.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/SlottedContainmentProperty.h"
+#include "swgSharedUtility/Postures.h"
+#include "UnicodeUtils.h"
+
+#include <string>
+
+// ======================================================================
+
+namespace CreatureObjectNamespace
+{
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+	std::string const  cs_petControlDeviceObjVarName("pet.controlDevice");
+	char const *const  cs_riderSlotName = "rider";
+	
+	char const *const  cs_mountErrorChannelName = "mounts-error";
+	char const *const  cs_mountInfoChannelName = "mounts-info";
+	
+	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+	int const cs_totalNumberOfRiders = 8;
+
+	SlotId s_riderSlotId[cs_totalNumberOfRiders] =
+	{
+		SlotId(SlotId::invalid),
+		SlotId(SlotId::invalid),
+		SlotId(SlotId::invalid),
+		SlotId(SlotId::invalid),
+		SlotId(SlotId::invalid),
+		SlotId(SlotId::invalid),
+		SlotId(SlotId::invalid),
+		SlotId(SlotId::invalid),
+	};
+
+	CreatureObject * realGetMountingRider(CreatureObject const * mount, SlotId const & slot);
+	CrcString const * getLogicalSaddleNameForMount(Object const * mount);
+	int getSaddleSeatingCapacity(CreatureObject const * mount);
+	bool realDetachRider(CreatureObject * mount, SlotId const & slot);
+	void LogMovement(CreatureObject const * mount);
+}
+
+// ======================================================================
+
+CreatureObject * CreatureObjectNamespace::realGetMountingRider(CreatureObject const * const mount, SlotId const & slot)
+{
+	//-- Ensure mounts are enabled.
+	if (!ConfigServerGame::getMountsEnabled())
+		return NULL;
+
+	//-- Get the rider element from the slotted container.	
+	SlottedContainer const * const slottedContainer = ContainerInterface::getSlottedContainer(*mount);
+	if (!slottedContainer)
+		return NULL;
+
+	//-- Check for a rider.
+	Container::ContainerErrorCode errorCode = Container::CEC_Success;
+	CachedNetworkId riderId = slottedContainer->getObjectInSlot(slot, errorCode);
+	if (errorCode != Container::CEC_Success)
+		return NULL;
+
+	Object * const riderObject = riderId.getObject();
+
+	ServerObject * const riderServerObject = (riderObject != 0) ? riderObject->asServerObject() : 0;
+
+	CreatureObject * const riderCreatureObject = (riderServerObject != 0) ? riderServerObject->asCreatureObject() : 0;
+
+	return riderCreatureObject;
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObjectNamespace::LogMovement(CreatureObject const * const mount)
+{
+	NOT_NULL(mount);
+
+	typedef std::vector<CreatureObject const *> Riders;
+	Riders riders;
+
+	if (mount != 0)
+	{
+		mount->getMountingRiders(riders);
+
+		if (!riders.empty())
+		{
+			{
+				int const process = static_cast<int>(GameServer::getInstance().getProcessId());
+				char const * const id = mount->getNetworkId().getValueString().c_str();
+				Vector const location_w(mount->getPosition_w());
+				LOG("mounts-movement", ("server id=[%d], Vehicle id=[%s] is located at %f %f %f", process, id, location_w.x, location_w.y, location_w.z));
+			}
+
+			Riders::const_iterator ii = riders.begin();
+			Riders::const_iterator iiEnd = riders.end();
+
+			for (; ii != iiEnd; ++ii)
+			{
+				CreatureObject const *const rider = *ii;
+
+				if (rider != 0)
+				{
+					int const process = static_cast<int>(GameServer::getInstance().getProcessId());
+					char const * const id = rider->getNetworkId().getValueString().c_str();
+					Vector const location_w(rider->getPosition_w());
+					LOG("mounts-movement", ("server id=[%d], passenger id=[%s] is located at %f %f %f", process, id, location_w.x, location_w.y, location_w.z));
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+CrcString const * CreatureObjectNamespace::getLogicalSaddleNameForMount(Object const * const mount)
+{
+	NOT_NULL(mount);
+
+	ServerObject const * const serverObject = mount->asServerObject();
+	SharedObjectTemplate const * const sharedObjectTemplate = serverObject->getSharedTemplate();
+
+	std::string const appearanceFilename = (sharedObjectTemplate != 0) ? sharedObjectTemplate->getAppearanceFilename() : "None";
+
+	ConstCharCrcString const appearanceFilenameCrc(appearanceFilename.c_str());
+
+	CrcString const * const logicalSaddleName = SharedSaddleManager::getLogicalSaddleNameForMountAppearance(appearanceFilenameCrc);
+
+	return logicalSaddleName;
+}
+
+// ----------------------------------------------------------------------
+
+int CreatureObjectNamespace::getSaddleSeatingCapacity(CreatureObject const * const mount)
+{
+	NOT_NULL(mount);
+
+	// default to 1 seat...
+	int saddleSeatingCapacity = 1;
+
+	{
+		ServerObject const * const serverObject = mount->asServerObject();
+		SharedObjectTemplate const * const sharedObjectTemplate = serverObject->getSharedTemplate();
+
+		std::string const appearanceFilename = (sharedObjectTemplate != 0) ? sharedObjectTemplate->getAppearanceFilename() : "None";
+
+		//DEBUG_REPORT_LOG(true, ("sharedObjectTemplate appearanceFilename = '%s'\n", appearanceFilename.c_str()));
+	}
+
+	CrcString const * const logicalSaddleName = getLogicalSaddleNameForMount(mount);
+
+	if (logicalSaddleName != 0)
+	{
+		saddleSeatingCapacity = SharedSaddleManager::getSaddleSeatingCapacityForLogicalSaddleName(*logicalSaddleName);
+	}
+
+	return saddleSeatingCapacity;	
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObjectNamespace::realDetachRider(CreatureObject * const mount, SlotId const & slot)
+{
+	NOT_NULL(mount);
+	
+	bool detachedRider = false;
+
+	//-- If this object is a mount and has an object in its rider slot,
+	//   remove that object from the container now.  It will be a player and must
+	//   be removed prior to the mount hitting ServerObject::permanentlyDestroyObject().
+	SlottedContainer * const slottedContainer = ContainerInterface::getSlottedContainer(*mount);
+	if (slottedContainer)
+	{
+		//-- Check for a rider.
+		Container::ContainerErrorCode errorCode = Container::CEC_Success;
+		CachedNetworkId riderId = slottedContainer->getObjectInSlot(slot, errorCode);
+		if (errorCode == Container::CEC_Success)
+		{
+			ServerObject *const rider = safe_cast<ServerObject*>(riderId.getObject());
+			if (rider)
+			{
+				// Turn off mounted state on rider.
+				CreatureObject *const creatureRider = rider->asCreatureObject();
+				if (creatureRider)
+					creatureRider->setState(States::RidingMount, false);
+
+				// Allow dismounted rider to participate in CollisionWorld.
+				CollisionProperty *const collisionProperty = rider->getCollisionProperty();
+				if (collisionProperty)
+				{
+					collisionProperty->setDisableCollisionWorldAddRemove(false);
+					if (mount->isInWorld())
+						CollisionWorld::addObject(rider);
+				}
+
+				// Rider should be authoritative if on the mount and the mount is authoritative.
+				if (!rider->isAuthoritative())
+				{
+					// Something really screwy happened here --- the mount was authoritative but the
+					// rider, contained by the mount, was not authoritative.  Sounds like a container
+					// authority bug.
+					WARNING(true, ("CreatureObject::realDetachRider(): server id=[%d], mount id=[%s], rider id=[%s], not ejecting rider because rider is not authoritative.",
+						static_cast<int>(GameServer::getInstance().getProcessId()),
+						mount->getNetworkId().getValueString().c_str(),
+						rider->getNetworkId().getValueString().c_str()));
+				}
+				else
+				{
+					// Transfer rider to world.
+					// @todo: -TRF- transfer to mount's cell if we allow mounts inside cells.
+					IGNORE_RETURN(ContainerInterface::transferItemToWorld(*rider, mount->getTransform_o2w(), NULL, errorCode));
+					if (errorCode == Container::CEC_Success)
+					{
+						detachedRider = true;
+
+						// Add rider to CollisionWorld.  We removed the rider from CollisionWorld
+						// when the rider mounted the creature.
+						CollisionWorld::addObject(rider);
+					}
+					else
+					{
+						DEBUG_WARNING(errorCode != Container::CEC_Success, ("mount id=[%s] failed to force unmount the rider when removed from the world, container error code [%d].", mount->getNetworkId().getValueString().c_str(), static_cast<int>(errorCode)));
+					}
+					rider->updatePositionOnPlanetServer(true); // Force an update to the Planet Server, in case we delete the mount next
+
+					if (detachedRider && !ServerWorld::isSpaceScene() && mount->isInWorldCell())
+					{
+						// force the dismounted rider to the *EXACT* location
+						// of the mount, because any slight little movement
+						// "twitch" because of dismount could put the rider in
+						// an unintended, exploitable location, like behind
+						// the wall of a building
+						rider->teleportObject(mount->getPosition_w(), NetworkId::cms_invalid, "", Vector(), "");
+					}
+				}
+			}
+		}
+	}
+	return detachedRider;
+}
+
+// ======================================================================
+
+using namespace CreatureObjectNamespace;
+
+// ======================================================================
+// CreatureObject: PRIVATE STATIC
+// ======================================================================
+/**
+ * Install the mounts code.
+ *
+ * This function should be called only from CreatureObject::install().
+ */
+
+void CreatureObject::installForMounts()
+{
+	s_riderSlotId[0] = SlotIdManager::findSlotId(ConstCharCrcLowerString(cs_riderSlotName));
+
+	char slotName[256];
+
+	for (int i = 1; i < cs_totalNumberOfRiders; ++i)
+	{
+		snprintf(slotName, 255, "%s%d", cs_riderSlotName, i);
+		s_riderSlotId[i] = SlotIdManager::findSlotId(ConstCharCrcLowerString(slotName));
+	}
+}	
+
+// ======================================================================
+// CreatureObject: PUBLIC
+// ======================================================================
+
+/**
+ * If this is the driver of a vehicle/mount, transfer the rider
+ * position to the mount.
+ *
+ * Note: this function must be called prior to the rider's
+ * m_commandQueue->update() function.  This is because the
+ * command queue might get a message that has to look at the
+ * mounted vehicle's position (e.g. during a dismount), which
+ * will not yet be updated until this function is called.
+ */
+
+void CreatureObject::transferRiderPositionToMount()
+{
+	//-- This function only applies to the driving rider of a mount.
+	if (!getState(States::RidingMount))
+		return;
+
+	//-- Ensure we can get to this rider's vehicle/mount.
+	CreatureObject *const mountObject = getMountedCreature();
+	if (!mountObject)
+	{
+		LOG("mounts-bug", ("CreatureObject::transferRiderPositionToMount(): server id=[%d],object id=[%s] has state RidingMount but getMountedCreature() returns NULL.", static_cast<int>(GameServer::getInstance().getProcessId()), getNetworkId().getValueString().c_str()));
+		emergencyDismountForRider();
+		return;
+	}
+
+	if (mountObject->getPrimaryMountingRider() != this)
+	{
+		return;
+	}
+
+	//-- Set mount to the same cell and o2p transform as the rider.
+	//   Note: this code assumes there is no parent-child relationship
+	//   between the rider and the mount on the server.
+	CellProperty *const riderCellProperty = getParentCell();
+	bool const cellChanged = (mountObject->getParentCell() != riderCellProperty);
+
+	if (cellChanged)
+		mountObject->setParentCell(riderCellProperty);
+
+	// Only assign new o2p transform to mount if it is different from the rider's; otherwise,
+	// identical information gets flooded to all client proxys of the mount due to other code
+	// assuming the transform actually changed.  Note: we might want to put the change detection
+	// logic at a lower level so code like this doesn't have to duplicate this functionality
+	// everywhere.
+	Transform const &riderTransform_o2p = getTransform_o2p();
+	Transform const &mountTransform_o2p = mountObject->getTransform_o2p();
+
+	bool const transformChanged = (mountTransform_o2p != riderTransform_o2p);
+	if (transformChanged)
+		mountObject->setTransform_o2p(riderTransform_o2p);
+
+	if (cellChanged || transformChanged)
+	{
+		// Update the vehicle's collision property if either the cell or the transform changed.
+		// This is effectively warping the vehicle so that the server-side collision doesn't
+		// get stuck on something that the rider's client didn't get stuck on.  I do not use
+		// the warp command on CollisionProperty because it has several other side effects that
+		// are heavier than necessary for updating the previous position.  If this code ever has
+		// problems, consider using the CollisionProperty warp but watch for performance issues.
+		CollisionProperty *const mountCollisionProperty = mountObject->getCollisionProperty();
+		if (mountCollisionProperty)
+			mountCollisionProperty->setLastPos(riderCellProperty, riderTransform_o2p);
+	}
+}
+
+// ----------------------------------------------------------------------
+/** 
+ * Handle alter for mounts functionality, specifically for authoritative
+ * CreatureObjects.
+ */
+
+void CreatureObject::alterAuthoritativeForMounts()
+{
+	DEBUG_FATAL(!isAuthoritative(), ("This should only be called from CreatureObject::alter() when isAuthoratative() is true."));
+
+	//-- Handle rider or mount incapacitation case.
+	Postures::Enumerator const currentPosture = getPosture();
+	bool const shouldBeDismounted = (currentPosture != Postures::Upright);
+
+	if (shouldBeDismounted)
+	{
+		//-- Check for a rider on a mount.
+		if (getState(States::RidingMount))
+		{
+			DEBUG_LOG(cs_mountInfoChannelName, ("rider id=[%s] is being forced to dismount because rider is in posture [%s]", getNetworkId().getValueString().c_str(), Postures::getPostureName(currentPosture)));
+			
+			// Get the mount, request a dismount.
+			CreatureObject *const mountObject = getMountedCreature();
+			if (mountObject)
+			{
+				bool const detachSuccess = mountObject->detachRider(getNetworkId());
+				if (!detachSuccess)
+					LOG(cs_mountErrorChannelName, ("mount id=[%s] failed to successfully detach the rider during posture-initiated dismount.", mountObject->getNetworkId().getValueString().c_str()));
+				else
+				{
+					DEBUG_LOG(cs_mountInfoChannelName, ("mount id=[%s] successfully detached the rider during posture-initiated dismount.", mountObject->getNetworkId().getValueString().c_str()));
+				}
+			}
+			else
+				LOG(cs_mountErrorChannelName, ("unexpected: rider object id=[%s],template=[%s] is reporting state States::RidingMount turned on but getMountedCreature() returned NULL.", getNetworkId().getValueString().c_str(), getObjectTemplateName()));
+		}
+		else if (getState(States::MountedCreature))
+		{
+			DEBUG_LOG(cs_mountInfoChannelName, ("mount id=[%s] is being forced to dismount the rider because the mount is in posture [%s]", getNetworkId().getValueString().c_str(), Postures::getPostureName(currentPosture)));
+
+			// This creature is the mount.  Dismount its rider.
+			bool const detachSuccess = detachAllRiders();
+			if (!detachSuccess)
+				LOG(cs_mountErrorChannelName, ("mount id=[%s] failed to successfully detach the rider during posture-initiated dismount.", getNetworkId().getValueString().c_str()));
+			else
+			{
+				DEBUG_LOG(cs_mountInfoChannelName, ("mount id=[%s] successfully detached the rider during posture-initiated dismount.", getNetworkId().getValueString().c_str()));
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+static void BroadcastSystemMessageToClusterWithLimiter(char const *message)
+{
+	if (ConfigServerGame::getMountsSanityCheckerBroadcastEnabled())
+	{
+		static int requestCount = 0;
+	
+		++requestCount;
+		if ((requestCount > 0) && (requestCount <= ConfigServerGame::getMountsSanityCheckerBroadcastLimit()))
+			Chat::broadcastSystemMessageToCluster(Unicode::narrowToWide(message), Unicode::emptyString);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::alterAnyForMounts()
+{
+	//LogMovement(this);
+
+	if (ConfigServerGame::getMountsSanityCheckerEnabled())
+	{
+		// NOTE: it is important to remember that we need to ignore the
+		//       States::MountedCreature and States::RidingMount states
+		//       when dealing with proxy objects.
+		//
+		//       Proxy objects for the mount and rider can and usually do
+		//       get the state changes on a different frame than the
+		//       container change.
+
+		//-- Handle sanity checking from a mount's point of view.
+		
+		// Check if the mount has riders.
+
+		typedef std::vector<CreatureObject const *> Riders;
+		Riders riders;
+
+		getMountingRiders(riders);
+
+		Riders::const_iterator ii = riders.begin();
+		Riders::const_iterator iiEnd = riders.end();
+
+		for (; ii != iiEnd; ++ii)
+		{
+			CreatureObject const *const rider = *ii;
+
+			if (rider)
+			{
+				bool triggeredWarning = false;
+				
+				// Ensure the rider points back to this mount.
+				if (rider->getMountedCreature() != this)
+				{
+					WARNING(true,
+									("mounts sanity check failure: game server id=[%d], mount id=[%s,%s], rider id=[%s,%s], rider's mount address=[%p]: mount has rider but rider says it is mounted by something other than this mount.",
+									 static_cast<int>(GameServer::getInstance().getProcessId()),
+									 getNetworkId().getValueString().c_str(),
+									 isAuthoritative() ? "authoritative" : "proxy",
+									 rider->getNetworkId().getValueString().c_str(),
+									 rider->isAuthoritative() ? "authoritative" : "proxy",
+									 rider->getMountedCreature()
+									 ));
+					triggeredWarning = true;
+				}
+
+				// Ensure this mount has the MountedCreature state (only do check on authoritative mount).
+				if (isAuthoritative() && !getState(States::MountedCreature))
+				{
+					WARNING(true,
+									("mounts sanity check failure: game server id=[%d], mount id=[%s,%s], rider id=[%s,%s]: authoritative mount does not have MountedCreature state set but getMountingRider returned a non-NULL value.",
+									 static_cast<int>(GameServer::getInstance().getProcessId()),
+									 getNetworkId().getValueString().c_str(),
+									 isAuthoritative() ? "authoritative" : "proxy",
+									 rider->getNetworkId().getValueString().c_str(),
+									 rider->isAuthoritative() ? "authoritative" : "proxy"
+									 ));
+					triggeredWarning = true;
+				}
+
+				// Broadcast system message to the cluster.
+				if (triggeredWarning)
+				{
+					char buffer[1024];
+					IGNORE_RETURN(snprintf(buffer, sizeof(buffer) - 1, "Attention player %s: please stop whatever you're doing and contact Todd Fiala at x382 (Austin) to address an issue we need to track down related to mount %s.  If this player just logged out, please tell them to contact me.",
+									 Unicode::wideToNarrow(rider->getObjectName()).c_str(),
+									 Unicode::wideToNarrow(getObjectName()).c_str()
+									 ));
+					buffer[sizeof(buffer) - 1] = '\0';
+					BroadcastSystemMessageToClusterWithLimiter(buffer);
+				}
+			}
+			else
+			{
+				// Ensure we don't have the mounted creature state set (only do check on authoritative mount).
+				
+				WARNING(isAuthoritative() && getState(States::MountedCreature),
+								("mounts sanity check failure: game server id=[%d], mount id=[%s,%s]: authoritative mount does have MountedCreature state set but getMountingRider() returned a NULL value.",
+								 static_cast<int>(GameServer::getInstance().getProcessId()),
+								 getNetworkId().getValueString().c_str(),
+								 isAuthoritative() ? "authoritative" : "proxy"
+								 ));
+			}
+		}
+
+		//-- Handle sanity checking from a rider's point of view.
+
+		/*
+		// Check if the rider has a mount.
+		CreatureObject const *const mount = getMountedCreature();
+		if (mount)
+		{
+			bool triggeredWarning = false;
+			
+			// Ensure the mount has this rider as one of its riders.
+			// This needs to change once we support multiple riders per mount.
+
+			not just the primary!!!
+			if (mount->getPrimaryMountingRider() != this)
+			{
+				WARNING(true,
+								("mounts sanity check failure: game server id=[%d], rider id=[%s,%s], mount id=[%s,%s], mount's rider address=[%p]: rider has mount but mount says its rider is something other than this rider.",
+								 static_cast<int>(GameServer::getInstance().getProcessId()),
+								 getNetworkId().getValueString().c_str(),
+								 isAuthoritative() ? "authoritative" : "proxy",
+								 mount->getNetworkId().getValueString().c_str(),
+								 mount->isAuthoritative() ? "authoritative" : "proxy",
+								 mount->getMountingRider()
+								 ));
+				triggeredWarning = true;
+			}
+			
+			// Ensure this rider has the RidingMount state (only do check on authoritative rider).
+			if (isAuthoritative() && !getState(States::RidingMount))
+			{
+				WARNING(true,
+								("mounts sanity check failure: game server id=[%d], rider id=[%s,%s], mount id=[%s,%s]: authoritative rider does not have RidingMount state set but getMountedCreature() returned a non-NULL value.",
+								 static_cast<int>(GameServer::getInstance().getProcessId()),
+								 getNetworkId().getValueString().c_str(),
+								 isAuthoritative() ? "authoritative" : "proxy",
+								 mount->getNetworkId().getValueString().c_str(),
+								 mount->isAuthoritative() ? "authoritative" : "proxy"
+								 ));
+				triggeredWarning = true;
+			}
+
+			// Broadcast system message to the cluster.
+			if (triggeredWarning)
+			{
+				char buffer[1024];
+				IGNORE_RETURN(snprintf(buffer, sizeof(buffer) - 1, "Attention player %s: please stop whatever you're doing and contact Todd Fiala at x382 (Austin) to address an issue we need to track down related to mount %s.  If this player just logged out, please tell them to contact me.",
+								 Unicode::wideToNarrow(getObjectName()).c_str(),
+								 Unicode::wideToNarrow(mount->getObjectName()).c_str()
+								 ));
+				buffer[sizeof(buffer) - 1] = '\0';
+				BroadcastSystemMessageToClusterWithLimiter(buffer);
+			}
+		}
+		else
+		{
+			// Ensure we don't have the RidingMount state set (only do check on authoritative rider).
+			WARNING(isAuthoritative() && getState(States::RidingMount),
+							("mounts sanity check failure: game server id=[%d], rider id=[%s,%s]: authoritative rider does have RidingMount state set but getMountedCreature() returned a NULL value.",
+							 static_cast<int>(GameServer::getInstance().getProcessId()),
+							 getNetworkId().getValueString().c_str(),
+							 isAuthoritative() ? "authoritative" : "proxy"
+							 ));
+		}
+		*/
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::onContainerAboutToTransferForMounts(ServerObject const * destination, ServerObject* /* transferer */)
+{
+	//-- Do not let a mounted rider get detached from a container.
+	bool const isRidingMount = getState(States::RidingMount);
+	if (!isRidingMount)
+		return true;
+
+	//-- We only allow container transfers of a rider while the rider is not yet mounted
+	//   (i.e. the container creature has not yet been set.)  We must clear the RidingMount
+	//   state on a rider prior to intentionally dismounting the rider (see and use detachRider()
+	//   on the mount object.
+	bool const canChangeContainerNow = (getMountedCreature() == NULL);
+	if (!canChangeContainerNow)
+	{
+		LOG("mounts-bug", ("CO::onContainerAboutToTransferForMounts():server id=[%d],rider id=[%s] erroneously tried to transfer the player into object id=[%s].",
+											 static_cast<int>(GameServer::getInstance().getProcessId()),
+											 getNetworkId().getValueString().c_str(),
+											 (destination == NULL) ? "<null (world cell)>" : destination->getNetworkId().getValueString().c_str()));
+	}
+	return canChangeContainerNow;
+}
+
+// ----------------------------------------------------------------------
+/**
+ * Determine if this creature can support becoming a mount.
+ *
+ * This function only checks the potential for the CreatureObject to
+ * become a mount.  To check if this creature is a mount, use
+ * isMountable().
+ */
+
+int CreatureObject::getMountabilityStatus() const
+{
+	//-- Ensure mounts are enabled.
+	if (!ConfigServerGame::getMountsEnabled())
+	{
+		LOG(cs_mountInfoChannelName, ("CreatureObject::canBeMadeMountable() called on object id=[%s] when mounts are disabled, ignoring call.", getNetworkId().getValueString().c_str()));
+		return static_cast<int>(MountValidScaleRangeTable::MS_speciesUnmountable);
+	}
+
+	//-- Indicate we're mountable if we've already been made mountable.
+	if (isMountable())
+		return static_cast<int>(MountValidScaleRangeTable::MS_creatureMountable);
+
+	SharedObjectTemplate const *const sharedObjectTemplate = getSharedTemplate();
+
+	// Note: multi-seater mount support will need to change saddle capacity.
+	int   const saddleCapacity  = 1;
+	float const appearanceScale = getScaleFactor();
+
+	MountValidScaleRangeTable::MountabilityStatus const result = MountValidScaleRangeTable::doesCreatureSupportScaleAndSaddleCapacity(TemporaryCrcString(sharedObjectTemplate->getAppearanceFilename().c_str(), true), appearanceScale, saddleCapacity);
+	if (result != MountValidScaleRangeTable::MS_creatureMountable)
+		return static_cast<int>(result);
+
+	//-- Get the slotted container.
+	SlottedContainer const * const slottedContainer = ContainerInterface::getSlottedContainer(*this);
+
+	int const maxSlots = getSaddleSeatingCapacity(this);
+	bool hasRequiredSlot = false;
+
+	for (int i = 0; i < maxSlots; ++i)
+	{
+		hasRequiredSlot = slottedContainer && slottedContainer->hasSlot(s_riderSlotId[i]);
+
+		if (hasRequiredSlot)
+		{
+			break;
+		}
+	}
+
+	return (hasRequiredSlot ? static_cast<int>(MountValidScaleRangeTable::MS_creatureMountable) : static_cast<int>(MountValidScaleRangeTable::MS_speciesMountableMissingRiderSlot));
+}
+
+// ----------------------------------------------------------------------
+/**
+ * Convert a pet into a mountable-pet.
+ *
+ * This function will DEBUG_FATAL if canBeMadeMountable() returns false.
+ * The caller should have already checked canBeMadeMountable().
+ *
+ * This function flips the TangibleObject condition flag for C_mount.
+ */
+
+void CreatureObject::makePetMountable()
+{
+	//-- Ensure mounts are enabled.
+	if (!ConfigServerGame::getMountsEnabled())
+	{
+		LOG(cs_mountInfoChannelName, ("CreatureObject::makePetMountable() called on object id=[%s] when mounts are disabled, ignoring call.", getNetworkId().getValueString().c_str()));
+		return;
+	}
+	
+	//-- Validate preconditions.
+	DEBUG_FATAL(!isAuthoritative(), ("makePetMountable(): called on non-authoritative creature id=[%s],template=[%s].", getNetworkId().getValueString().c_str(), getObjectTemplateName()));
+	DEBUG_FATAL(getMountabilityStatus() != static_cast<int>(MountValidScaleRangeTable::MS_creatureMountable), ("makePetMountable(): creature id=[%s],template=[%s] this creature cannot be made mountable. Caller should have checked getMountabilityStatus() first.", getNetworkId().getValueString().c_str(), getObjectTemplateName()));
+	DEBUG_FATAL(isMountable(), ("makePetMountable(): creature id=[%s],template=[%s] already is mountable.  Caller doesn't need to call makePetMountable().", getNetworkId().getValueString().c_str(), getObjectTemplateName()));
+
+	//-- Get the pet control device network id.
+	NetworkId const pcdNetworkId = getPetControlDeviceId();
+	if (!pcdNetworkId.isValid())
+	{
+		DEBUG_FATAL(true, ("makePetMountable(): creature id=[%s],template=[%s] does not have a valid pet control device id on it. Expecting script to place this objvar on the pet.", getNetworkId().getValueString().c_str(), getObjectTemplateName()));
+		return;
+	}
+
+	//-- Set the Condition bit to indicate we're a mount.
+	setCondition(getCondition() | static_cast<int>(ServerTangibleObjectTemplate::C_mount));
+
+	//-- Set the Creature as static so that it doesn't count against the spawn limit.
+	setIsStatic(true);
+}
+
+// ----------------------------------------------------------------------
+/**
+ * Determine if this creature is a mount.
+ */
+
+bool CreatureObject::isMountable() const
+{
+	if (ConfigServerGame::getMountsEnabled())
+	{
+		return (getCondition() & static_cast<int>(ServerTangibleObjectTemplate::C_mount)) != 0;
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::isMountableAndHasRoomForAnother() const
+{
+	bool hasEmptySlot = false;
+
+	if (ConfigServerGame::getMountsEnabled())
+	{
+		if (isMountable())
+		{
+			//-- Get the slotted container.
+			SlottedContainer const * const slottedContainer = ContainerInterface::getSlottedContainer(*this);
+
+			int const maxSlots = getSaddleSeatingCapacity(this);
+
+			for (int i = 0; i < maxSlots; ++i)
+			{
+				if (slottedContainer && slottedContainer->hasSlot(s_riderSlotId[i]))
+				{
+					Container::ContainerErrorCode error = Container::CEC_Success;
+
+					if (slottedContainer->isSlotEmpty(s_riderSlotId[i], error) && error == Container::CEC_Success)
+					{
+						hasEmptySlot = true;
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	return hasEmptySlot;
+}
+
+//----------------------------------------------------------------------
+/**
+ * Assuming this CreatureObject is a pet or mount, get the network id
+ * of the associated pet control device's id.
+ *
+ * This function gets the network id from the obj_id pet.controlDevice
+ * objvar placed on all pets by the pet script-based system.
+ */
+
+NetworkId CreatureObject::getPetControlDeviceId() const
+{
+	//-- Retrieve the list of objvars on the creature.
+	DynamicVariableList const &variableList = getObjVars();
+
+	//-- Get pet control device's network id.
+	NetworkId petControlDeviceId;
+	
+	if (variableList.getItem(cs_petControlDeviceObjVarName, petControlDeviceId))
+		return petControlDeviceId;
+	else
+		return NetworkId::cms_invalid;
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::detachRider(NetworkId const riderId)
+{
+	//-- Ensure mounts are enabled.
+	if (!ConfigServerGame::getMountsEnabled())
+		return false;
+
+	//-- Only do this on the authoritative mount.
+	if (!isAuthoritative())
+	{
+		typedef MessageQueueGenericValueType<NetworkId> Message;
+		Message * const msg = new Message(riderId);
+		sendControllerMessageToAuthServer(CM_detachRiderForMount, msg);
+		return true;
+	}
+
+	//-- Validate preconditions.
+	DEBUG_FATAL(!isMountable(), ("CreatureObject::detachRider(): called on an object id=[%s],template=[%s] that is not mountable, makes no sense.", getNetworkId().getValueString().c_str()));
+
+	int const maxSlots = getSaddleSeatingCapacity(this);
+	bool forceDetachAll = false; // incase riderId is the first person
+	bool detachedRider = false;
+
+	for (int i = 0; i < maxSlots; ++i)
+	{
+		CreatureObject const * const rider = realGetMountingRider(this, s_riderSlotId[i]);
+
+		bool const detach = ((rider != 0) && (rider->getNetworkId() == riderId)) || forceDetachAll;
+
+		if (detach)
+		{
+			detachedRider = realDetachRider(this, s_riderSlotId[i]);
+			if (i == 0)
+			{
+				forceDetachAll = true;
+			}
+		}
+	}
+
+	if (forceDetachAll)
+	{
+		//-- Turn off MountedCreature state on mount.
+		setState(States::MountedCreature, false);
+	}
+
+	//-- Set mount's AlterScheduler schedule phase back to zero so that
+	//   the mount gets altered along with everything else.
+	AlterScheduler::setObjectSchedulePhase(*this, 0);
+
+	updatePositionOnPlanetServer(true);
+
+	return detachedRider;
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::detachAllRiders()
+{
+	//-- Ensure mounts are enabled.
+	if (!ConfigServerGame::getMountsEnabled())
+		return false;
+
+	//-- Only do this on the authoritative mount.
+	if (!isAuthoritative())
+	{
+		// add a plural message
+		sendControllerMessageToAuthServer(CM_detachAllRidersForMount, NULL);
+		return true;
+	}
+
+	//-- Validate preconditions.
+	DEBUG_FATAL(!isMountable(), ("CreatureObject::detachRider(): called on an object id=[%s],template=[%s] that is not mountable, makes no sense.", getNetworkId().getValueString().c_str()));
+
+	int const maxSlots = getSaddleSeatingCapacity(this);
+	int numberOfSuccesses = 0;
+
+	for (int i = 0; i < maxSlots; ++i)
+	{
+		if (realDetachRider(this, s_riderSlotId[i]))
+		{
+			++numberOfSuccesses;
+		}
+	}
+
+	bool const detachedRider = numberOfSuccesses == maxSlots;
+
+	//-- Turn off MountedCreature state on mount.
+	setState(States::MountedCreature, false);
+
+	//-- Set mount's AlterScheduler schedule phase back to zero so that
+	//   the mount gets altered along with everything else.
+	AlterScheduler::setObjectSchedulePhase(*this, 0);
+
+	return detachedRider;
+}
+
+// ----------------------------------------------------------------------
+
+CreatureObject const *CreatureObject::getPrimaryMountingRider() const
+{
+	return const_cast<CreatureObject*>(this)->getPrimaryMountingRider();
+}
+
+// ----------------------------------------------------------------------
+
+CreatureObject * CreatureObject::getPrimaryMountingRider()
+{
+	return realGetMountingRider(this, s_riderSlotId[0]);
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::getMountingRiders(std::vector<const CreatureObject *> & riders) const
+{
+	int const maxSlots = getSaddleSeatingCapacity(this);
+
+	for (int i = 0; i < maxSlots; ++i)
+	{
+		CreatureObject const * const rider = realGetMountingRider(this, s_riderSlotId[i]);
+
+		if (rider != 0)
+		{
+			riders.push_back(rider);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void CreatureObject::getMountingRiders(std::vector<CreatureObject *> & riders)
+{
+	int const maxSlots = getSaddleSeatingCapacity(this);
+
+	for (int i = 0; i < maxSlots; ++i)
+	{
+		CreatureObject * const rider = realGetMountingRider(this, s_riderSlotId[i]);
+
+		if (rider != 0)
+		{
+			riders.push_back(rider);
+		}
+	}
+}
+
+
+// ----------------------------------------------------------------------
+/**
+ * Instruct this rider to ride on the specified mount.
+ *
+ * @param mountObject  the CreatureObject that will be ridden by this
+ *                     instance.
+ *
+ * @return  true if this rider was able to mount the creature; false otherwise.
+ */
+
+bool CreatureObject::mountCreature(CreatureObject &mountObject)
+{
+	//-- Ensure mounts are enabled.
+	if (!ConfigServerGame::getMountsEnabled())
+	{
+		LOG(cs_mountInfoChannelName, ("CreatureObject::mountCreature() called on rider object id=[%s] when mounts are disabled, ignoring call.", getNetworkId().getValueString().c_str()));
+		return false;
+	}
+
+	//-- Ensure we (the rider) are not already mounted.
+	if (getState(States::RidingMount))
+	{
+		DEBUG_FATAL(true, ("mountCreature(): rider id=[%s] template=[%s] is already riding a mount.", getNetworkId().getValueString().c_str(), getObjectTemplateName()));
+		return false;
+	}
+
+	//-- Ensure the mount is mountable.
+	if (!mountObject.isMountable())
+	{
+		DEBUG_FATAL(true, ("mountCreature(): specified mountObject id=[%s] template=[%s] is not mountable.", mountObject.getNetworkId().getValueString().c_str(), mountObject.getObjectTemplateName()));
+		return false;
+	}
+
+	//-- Ensure both the mount and the rider are authoritative on this server.
+	//   (They should be by design of how this function gets called.)
+	if (!isAuthoritative() || !mountObject.isAuthoritative())
+	{
+		DEBUG_WARNING(true, ("mountCreature(): rider id=[%s] or mount id=[%s] was not authoritative on this server, mounting aborted.", getNetworkId().getValueString().c_str(), mountObject.getNetworkId().getValueString().c_str()));
+		return false;
+	}
+
+	//-- Reject if the player is not in the world cell
+	if (!isInWorldCell())
+	{
+		DEBUG_WARNING(true, ("mountCreature(): rider id=[%s] is not in the world cell, mounting aborted.", getNetworkId().getValueString().c_str()));
+		return false;
+	}
+
+	//-- Reject if the mount is not in the world cell
+	if (!mountObject.isInWorldCell())
+	{
+		DEBUG_WARNING(true, ("mountCreature(): mount id=[%s] is not in the world cell, mounting aborted.", mountObject.getNetworkId().getValueString().c_str()));
+		return false;
+	}
+
+	// ... set the new mount-related states on the rider and mount.  This is necessary
+	//     so that I can efficiently handle CreatureObject::onContainerTransferComplete,
+	//     which is called before transferItemToSlottedContainer() completes.
+	setState(States::RidingMount, true);
+	mountObject.setState(States::MountedCreature, true);
+	
+	Container::ContainerErrorCode errorCode = Container::CEC_Success;
+	bool transferSuccess = false;
+
+	// transfer into the first available slot
+
+	int const maxSlots = getSaddleSeatingCapacity(&mountObject);
+
+	for (int i = 0; i < maxSlots; ++i)
+	{
+		if (ContainerInterface::canTransferToSlot(mountObject, *this, s_riderSlotId[i], NULL, errorCode))
+		{
+			transferSuccess = ContainerInterface::transferItemToSlottedContainer(mountObject, *this, s_riderSlotId[i], NULL, errorCode);
+
+			if ((transferSuccess) && (errorCode == Container::CEC_Success))
+			{
+				break;
+			}
+		}
+	}
+	
+	DEBUG_FATAL(transferSuccess && (errorCode != Container::CEC_Success), ("mountCreature(): transferItemToSlottedContainer() returned success but container error code returned error %d.", static_cast<int>(errorCode)));
+
+	if (!transferSuccess)
+	{
+		// Clear these states so that the objects are not in a funky bad state.
+		setState(States::RidingMount, false);
+
+		if (mountObject.getPrimaryMountingRider() == 0)
+		{
+			// clear state if empty mount
+			mountObject.setState(States::MountedCreature, false);
+		}
+
+		return transferSuccess;
+	}
+
+	//-- Take the rider out of CollisionWorld.
+	// @todo: add all object non-auto-delta change info to another function
+	//        that can be called via controller message to proxies, end baselines
+	//        on proxies and from here.
+	if (isInWorld())
+		CollisionWorld::removeObject(this);
+
+	CollisionProperty *const collisionProperty = getCollisionProperty();
+	if (collisionProperty)
+		collisionProperty->setDisableCollisionWorldAddRemove(true);
+
+	//-- Set the mount's AlterScheduler phase to 1 so that it gets an alter after the rider.
+	//   The rider will count on this so that the rider can update the mount's server position
+	//   prior to the mount getting altered that frame.
+	AlterScheduler::setObjectSchedulePhase(mountObject, 1);
+
+	//-- Tell rider to update movement info so it pulls walk/run speed from the mount.
+	updateMovementInfo();
+	
+	//-- Indicate transfer success.
+	return transferSuccess;
+}
+
+//----------------------------------------------------------------------
+
+CreatureObject const *CreatureObject::getMountedCreature() const
+{
+	return const_cast<CreatureObject*>(this)->getMountedCreature();
+}
+
+//----------------------------------------------------------------------
+
+CreatureObject *CreatureObject::getMountedCreature()
+{
+	//-- Ensure mounts are enabled.
+	if (!ConfigServerGame::getMountsEnabled())
+		return NULL;
+
+	//-- Check this creature's container object.
+	ServerObject *const container = safe_cast<ServerObject*>(ContainerInterface::getContainedByObject(*this));
+	if (!container)
+		return NULL;
+
+	//-- Check if the container is a creature.
+	CreatureObject *const creatureContainer = container->asCreatureObject();
+	if (!creatureContainer)
+		return NULL;
+
+	//-- Ignore non-mountable creature objects.
+	CreatureObject *const mount = creatureContainer->isMountable() ? creatureContainer : NULL;
+	return mount;
+}
+
+// ----------------------------------------------------------------------
+/**
+ * Cleanup the mount-related state on this rider such that they no longer
+ * act as if mounted.
+ *
+ * DO NOT CALL THIS UNLESS YOU KNOW THAT THE INTERNAL MOUNTS STATE IS SOMEHOW
+ * OUT OF SYNC.
+ *
+ * The purpose for this emergency function is to handle the case where internal
+ * mount-related state is no longer consistent.  This function is intended to be
+ * called when a rider appears to be mounted (via the RidingMount state) but
+ * is not contained by its mount.
+ */
+
+void CreatureObject::emergencyDismountForRider()
+{
+	LOG("mounts-bug", ("CreatureObject::emergencyDismountRider() called, server id=[%d], rider id=[%s], rider is [%s]", static_cast<int>(GameServer::getInstance().getProcessId()), getNetworkId().getValueString().c_str(), isAuthoritative() ? "authoritative" : "proxy"));
+
+	//-- Ensure we have the RidingMount state.
+	if (!getState(States::RidingMount))
+	{
+		WARNING(true, ("CreatureObject::emergencyDismountRider() called when RidingMount state is not set.  Ignoring call."));
+		return;
+	}
+
+	//-- Pass request along to authoritative server if we're not it.
+	if (!isAuthoritative())
+	{
+		sendControllerMessageToAuthServer(CM_emergencyDismountForRider, NULL);
+		return;
+	}
+	
+	//-- Try to get the mount.
+	CreatureObject *const mount = getMountedCreature();
+	if (mount)
+	{
+		IGNORE_RETURN(mount->detachRider(getNetworkId()));
+		return;
+	}
+
+	// NOTE: if we've made it this far, the rider appears to be mounted (by states) but the
+	// containment relationship has been broken erroneously.  Try to fixup the player from here.
+
+	//-- Set state to be not riding.
+	setState(States::RidingMount, false);
+
+	//-- Transfer the rider to the world cell.
+	Container::ContainerErrorCode  errorCode = Container::CEC_Success;
+	bool const transferSucceeded = ContainerInterface::transferItemToWorld (*this, this->getTransform_o2w(), NULL, errorCode);
+	WARNING(!transferSucceeded || (errorCode != Container::CEC_Success), ("Transfer to world failed, return value=[%s], error code=[%d].", transferSucceeded ? "true" : "false", static_cast<int>(errorCode)));
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/CreatureObject_Ships.cpp b/engine/server/library/serverGame/src/shared/object/CreatureObject_Ships.cpp
new file mode 100644
index 00000000..3f9de076
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/CreatureObject_Ships.cpp
@@ -0,0 +1,229 @@
+// ======================================================================
+//
+// CreatureObject_Ships.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/CreatureObject.h"
+
+#include "serverGame/CellObject.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/ShipClientUpdateTracker.h"
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedGame/ShipSlotIdManager.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/ContainedByProperty.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/SlottedContainmentProperty.h"
+
+// ======================================================================
+
+/**
+ * Instruct this pilot to ride on the specified ship.
+ *
+ * @param mountObject  the ShipObject that will be ridden by this
+ *                     instance.
+ *
+ * @return  true if this pilot was able to mount the ship; false otherwise.
+ */
+
+bool CreatureObject::pilotShip(ServerObject &pilotSlotObject)
+{
+	//-- Ensure ships are enabled.
+	if (!ConfigServerGame::getShipsEnabled())
+	{
+		return false;
+	}
+
+	//-- Ensure we (the pilot) are not already piloting a ship.
+	if (getPilotedShip())
+	{
+		DEBUG_FATAL(true, ("pilotShip(): pilot id=[%s] template=[%s] is already piloting a ship.", getNetworkId().getValueString().c_str(), getObjectTemplateName()));
+		return false;
+	}
+
+	//-- Ensure both the ship and the pilot are authoritative on this server.
+	//   (They should be by design of how this function gets called.)
+	if (!isAuthoritative() || !pilotSlotObject.isAuthoritative())
+	{
+		DEBUG_WARNING(true, ("pilotShip(): pilot id=[%s] or ship id=[%s] was not authoritative on this server, mounting aborted.", getNetworkId().getValueString().c_str(), pilotSlotObject.getNetworkId().getValueString().c_str()));
+		return false;
+	}
+
+	ShipObject *shipObject = ShipObject::getContainingShipObject(&pilotSlotObject);
+	NOT_NULL(shipObject);
+
+	//-- Reject if the ship is not in the world cell
+	if (!shipObject->isInWorldCell())
+	{
+		DEBUG_WARNING(true, ("pilotShip(): ship id=[%s] is not in the world cell, mounting ship aborted.", shipObject->getNetworkId().getValueString().c_str()));
+		return false;
+	}
+
+	// If directly contained by a ship, we use the pilot slot, else we use the pob pilot slot
+	SlotId const pilotSlotId = pilotSlotObject.asShipObject() ? ShipSlotIdManager::getShipPilotSlotId() : ShipSlotIdManager::getPobShipPilotSlotId();
+
+	Container::ContainerErrorCode errorCode = Container::CEC_Success;
+	bool const transferSuccess = ContainerInterface::transferItemToSlottedContainer(pilotSlotObject, *this, pilotSlotId, NULL, errorCode);
+	DEBUG_FATAL(transferSuccess && (errorCode != Container::CEC_Success), ("pilotShip(): transferItemToSlottedContainer() returned success but container error code returned error %d.", static_cast<int>(errorCode)));
+
+	if (transferSuccess)
+	{
+		Client * const client = getClient();
+		if (client)
+			client->addControlledObject(*shipObject);
+	}
+
+	//-- Indicate transfer success.
+	return transferSuccess;
+}
+
+// ----------------------------------------------------------------------
+
+bool CreatureObject::unpilotShip()
+{
+	//-- Only do this on the authoritative pilot.
+	if (!isAuthoritative())
+	{
+		DEBUG_REPORT_LOG(true, ("CreatureObject::unpilotShip(): server id=[%d], ship id=[%s], skipping call because ship is not authoritative.",
+			static_cast<int>(GameServer::getInstance().getProcessId()),
+			getNetworkId().getValueString().c_str()));
+		return false;
+	}
+
+	//-- Ensure ships are enabled.
+	if (!ConfigServerGame::getShipsEnabled())
+		return false;
+
+	bool unpilotedShip = false;
+
+	ShipObject* ship = getPilotedShip();
+	if (!ship)
+		return false;
+
+	ServerObject * const containingObject = NON_NULL(safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(*this)));
+
+	// If directly contained by a ship, we use the pilot slot, else we use the pob pilot slot
+	SlotId const pilotSlotId = containingObject->asShipObject() ? ShipSlotIdManager::getShipPilotSlotId() : ShipSlotIdManager::getPobShipPilotSlotId();
+
+	// If this creature is piloting the ship, he is in the pilot slot of either the ship or an object contained by a cell of the ship.
+	SlottedContainer * const slottedContainer = ContainerInterface::getSlottedContainer(*containingObject);
+	if (slottedContainer)
+	{
+		//-- Check for a pilot.
+		Container::ContainerErrorCode errorCode = Container::CEC_Success;
+		CachedNetworkId pilotId = slottedContainer->getObjectInSlot(pilotSlotId, errorCode);
+		if (errorCode == Container::CEC_Success)
+		{
+			ServerObject * const pilot = safe_cast<ServerObject*>(pilotId.getObject());
+			FATAL(pilot != this, ("Somehow told to unpilot a ship when we are not the pilot of the ship!"));
+
+			// Transfer pilot to location of the object it was contained by, which may or may not have been the ship, but it something with a pilot slot.
+			CellObject * const destCell = dynamic_cast<CellObject *>(containingObject->getAttachedTo());
+			if (destCell)
+			{
+				Transform tr(containingObject->getTransform_o2p());
+				// push them back a meter as well if they are unpiloting a pob ship
+				if (!containingObject->asShipObject())
+					tr.move_l(Vector(0.f, 0.f, -1.f));
+				IGNORE_RETURN(ContainerInterface::transferItemToCell(*destCell, *this, tr, 0, errorCode));
+			}
+			else
+				IGNORE_RETURN(ContainerInterface::transferItemToWorld(*this, containingObject->getTransform_o2w(), 0, errorCode));
+			if (errorCode == Container::CEC_Success)
+				unpilotedShip = true;
+		}
+	}
+
+	Client * const client = getClient();
+	if (client)
+	{
+		client->removeControlledObject(*ship);
+		// make sure the client can start receiving updates for the ship
+		ShipClientUpdateTracker::queueForUpdate(*client, *ship);
+	}
+
+	return unpilotedShip;
+}
+
+
+//----------------------------------------------------------------------
+
+ShipObject const *CreatureObject::getPilotedShip() const
+{
+	return const_cast<CreatureObject*>(this)->getPilotedShip();
+}
+
+//----------------------------------------------------------------------
+
+ShipObject *CreatureObject::getPilotedShip()
+{
+	//-- Ensure ships are enabled.
+	if (!ConfigServerGame::getShipsEnabled())
+		return 0;
+
+	// If we are occupying a "pilot" slot of our immediate container, then we are indirectly contained by a ship which we are piloting
+	SlottedContainmentProperty const *slottedContainmentProperty = ContainerInterface::getSlottedContainmentProperty(*this);
+	if (slottedContainmentProperty)
+	{
+		int currentArrangement = slottedContainmentProperty->getCurrentArrangement();
+		if (currentArrangement != -1)
+		{
+			SlottedContainmentProperty::SlotArrangement const &slotArrangement = slottedContainmentProperty->getSlotArrangement(currentArrangement);
+			for (SlottedContainmentProperty::SlotArrangement::const_iterator i = slotArrangement.begin(); i != slotArrangement.end(); ++i)
+				if ((*i) == ShipSlotIdManager::getShipPilotSlotId() || (*i) == ShipSlotIdManager::getPobShipPilotSlotId())
+					return ShipObject::getContainingShipObject(this);
+		}
+	}
+	return 0;
+}
+
+//----------------------------------------------------------------------
+
+void CreatureObject::getAllShipsInDatapad(std::vector<NetworkId> & result) const
+{
+	ServerObject const * const datapad = getDatapad();
+	if(datapad)
+	{
+		Container const * const datapadContainer = ContainerInterface::getContainer(*datapad);
+		if(datapadContainer)
+		{
+			//look at each item in the datapad for the ship control devices
+			for(ContainerConstIterator iter = datapadContainer->begin(); iter != datapadContainer->end(); ++iter)
+			{
+				Object const * const itemO = (*iter).getObject();
+				ServerObject const * const itemSO = itemO ? itemO->asServerObject() : NULL;
+				if(itemSO && (itemSO->getGameObjectType() == SharedObjectTemplate::GOT_data_ship_control_device))
+				{
+					Container const * const itemContainer = ContainerInterface::getContainer(*itemSO);
+					{
+						if(!itemContainer)
+							continue;
+
+						//for each ship control device, see if the item contains a shipobject
+						for(ContainerConstIterator iter2 = itemContainer->begin(); iter2 != itemContainer->end(); ++iter2)
+						{
+							Object const * const o = (*iter2).getObject();
+							ServerObject const * const so = o ? o->asServerObject() : NULL;
+							ShipObject const * const ship = so ? so->asShipObject() : NULL;
+							if(ship)
+							{
+								result.push_back(ship->getNetworkId());
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/DestroyMessageManager.cpp b/engine/server/library/serverGame/src/shared/object/DestroyMessageManager.cpp
new file mode 100644
index 00000000..8089931e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/DestroyMessageManager.cpp
@@ -0,0 +1,103 @@
+// ======================================================================
+//
+// DestroyMessageManager.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/DestroyMessageManager.h"
+#include "serverGame/Client.h"
+#include "serverGame/ConnectionServerConnection.h"
+#include "serverNetworkMessages/GameConnectionServerMessages.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/SceneChannelMessages.h"
+
+#ifdef _DEBUG
+#include "serverGame/ServerObject.h"
+#include "sharedObject/NetworkIdManager.h"
+#endif
+
+// ======================================================================
+//
+// Destroy messages are in arbitrary order.
+//
+// ======================================================================
+
+namespace DestroyMessageManagerNamespace
+{
+	std::map<NetworkId, std::pair<std::set<Watcher<Client> >, bool> > s_destroyMap;
+}
+using namespace DestroyMessageManagerNamespace;
+
+// ======================================================================
+
+void DestroyMessageManager::add(Client *client, NetworkId const &destroyId, bool const hyperspace)
+{
+	s_destroyMap[destroyId].first.insert(Watcher<Client>(client));
+	s_destroyMap[destroyId].second = hyperspace;
+}
+
+// ----------------------------------------------------------------------
+
+bool DestroyMessageManager::remove(Client const *client, NetworkId const &destroyId)
+{
+	std::map<NetworkId, std::pair<std::set<Watcher<Client> >, bool> >::iterator i = s_destroyMap.find(destroyId);
+	if (i != s_destroyMap.end())
+	{
+		std::set<Watcher<Client> > &clients = (*i).second.first;
+		std::set<Watcher<Client> >::iterator j = std::find(clients.begin(), clients.end(), client);
+		if (j != clients.end())
+		{
+			if (clients.size() == 1)
+				s_destroyMap.erase(i);
+			else
+				clients.erase(j);
+			return true;
+		}
+	}
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void DestroyMessageManager::update()
+{
+	for (std::map<NetworkId, std::pair<std::set<Watcher<Client> >, bool> >::const_iterator i = s_destroyMap.begin(); i != s_destroyMap.end(); ++i)
+	{
+
+#ifdef _DEBUG
+		Object const * const o = NetworkIdManager::getObjectById((*i).first);
+		DEBUG_FATAL(o && o->asServerObject() && o->asServerObject()->getCacheVersion() > 0, ("Tried to destroy cached object %s", (*i).first.getValueString().c_str()));
+#endif
+
+		std::set<Watcher<Client> > const &clientSet = (*i).second.first;
+		bool const hyperspace = (*i).second.second;
+
+		typedef std::map<ConnectionServerConnection *, std::vector<NetworkId> > DistributionList;
+		DistributionList distributionList;
+
+		for (std::set<Watcher<Client> >::const_iterator j = clientSet.begin(); j != clientSet.end(); ++j)
+		{
+			Client * const client = (*j).getPointer();
+			if (client)
+				distributionList[client->getConnection()].push_back(client->getCharacterObjectId());
+		}
+
+		if (!distributionList.empty())
+		{
+			SceneDestroyObject const message((*i).first, hyperspace);
+			for (DistributionList::const_iterator k = distributionList.begin(); k != distributionList.end(); ++k)
+			{
+				GameClientMessage const gcm((*k).second, true, message);
+				(*k).first->send(gcm, true);
+			}
+		}
+	}
+
+	s_destroyMap.clear();
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/DestroyMessageManager.h b/engine/server/library/serverGame/src/shared/object/DestroyMessageManager.h
new file mode 100644
index 00000000..a6f0680d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/DestroyMessageManager.h
@@ -0,0 +1,36 @@
+// ======================================================================
+//
+// DestroyMessageManager.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _DestroyMessageManager_H_
+#define _DestroyMessageManager_H_
+
+// ======================================================================
+
+class Client;
+class NetworkId;
+
+// ======================================================================
+
+class DestroyMessageManager
+{
+public:
+	static void add(Client *client, NetworkId const &destroyId, bool hyperspace);
+	static bool remove(Client const *client, NetworkId const &destroyId);
+	static void update();
+	
+private:
+	DestroyMessageManager();
+	~DestroyMessageManager();
+	DestroyMessageManager(DestroyMessageManager const &);
+	DestroyMessageManager &operator=(DestroyMessageManager const &);
+};
+
+// ======================================================================
+
+#endif // _DestroyMessageManager_H_
+
diff --git a/engine/server/library/serverGame/src/shared/object/DistributionListStack.cpp b/engine/server/library/serverGame/src/shared/object/DistributionListStack.cpp
new file mode 100644
index 00000000..24b52cd0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/DistributionListStack.cpp
@@ -0,0 +1,41 @@
+// ======================================================================
+//
+// DistributionListStack.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/DistributionListStack.h"
+#include <map>
+#include <vector>
+
+// ======================================================================
+
+namespace DistributionListStackNamespace
+{
+	const unsigned int cms_maxDistributionLists = 16;
+	std::map<ConnectionServerConnection *, std::vector<NetworkId> > s_distributionLists[cms_maxDistributionLists];
+	unsigned int s_distributionListCount;
+}
+using namespace DistributionListStackNamespace;
+
+// ======================================================================
+
+std::map<ConnectionServerConnection *, std::vector<NetworkId> > &DistributionListStack::alloc()
+{
+	FATAL(s_distributionListCount == cms_maxDistributionLists, ("DistributionListStack::alloc too many entries on stack"));
+	return s_distributionLists[s_distributionListCount++];
+}
+
+// ----------------------------------------------------------------------
+
+void DistributionListStack::release()
+{
+	FATAL(s_distributionListCount == 0, ("DistributionListStack::release with empty stack"));
+	s_distributionLists[--s_distributionListCount].clear();
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/DistributionListStack.h b/engine/server/library/serverGame/src/shared/object/DistributionListStack.h
new file mode 100644
index 00000000..1d4546db
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/DistributionListStack.h
@@ -0,0 +1,37 @@
+// ======================================================================
+//
+// DistributionListStack.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _DistributionListStack_H_
+#define _DistributionListStack_H_
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkId.h"
+
+// ======================================================================
+
+class ConnectionServerConnection;
+
+// ======================================================================
+
+class DistributionListStack
+{
+public:
+	static stdmap<ConnectionServerConnection *, stdvector<NetworkId>::fwd>::fwd &alloc();
+	static void release();
+
+private:
+	DistributionListStack();
+	DistributionListStack(DistributionListStack const &);
+	DistributionListStack &operator=(DistributionListStack const &);
+};
+
+// ======================================================================
+
+#endif // _DistributionListStack_H_
+
diff --git a/engine/server/library/serverGame/src/shared/object/DraftSchematicObject.cpp b/engine/server/library/serverGame/src/shared/object/DraftSchematicObject.cpp
new file mode 100644
index 00000000..feba149f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/DraftSchematicObject.cpp
@@ -0,0 +1,566 @@
+//========================================================================
+//
+// DraftSchematicObject.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/DraftSchematicObject.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/ManufactureSchematicObject.h"
+#include "serverGame/ObjectIdManager.h"
+#include "serverGame/ServerController.h"
+#include "serverGame/ServerManufactureSchematicObjectTemplate.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFile/TreeFile.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/Crc.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedNetworkMessages/MessageQueueResourceWeights.h"
+#include "sharedObject/NetworkController.h"
+#include "sharedObject/ObjectTemplateList.h"
+
+// ======================================================================
+// local constants
+
+
+static const int MAX_ATTRIBUTES = 32;
+static const std::string REQUEST_RESOURCE_WEIGHTS_SCRIPT_METHOD("OnRequestResourceWeights");
+
+
+// ======================================================================
+// static members
+
+DraftSchematicObject::SchematicMap * DraftSchematicObject::m_schematics = NULL;
+const SharedObjectTemplate * DraftSchematicObject::m_defaultSharedTemplate = NULL;
+
+
+// ======================================================================
+
+/**
+ * Class constructor.
+ *
+ * @param newTemplate		template to create the schematic from.
+ */
+DraftSchematicObject::DraftSchematicObject(
+	const ServerDraftSchematicObjectTemplate* newTemplate) :
+	IntangibleObject(newTemplate),
+	m_slots(),
+	m_attributes(),
+	m_experimentalAttributes(),
+	m_combinedCrc(newTemplate->getCrcName().getCrc(), getSharedTemplate()->getCrcName().getCrc())
+{
+int i;
+ServerDraftSchematicObjectTemplate::IngredientSlot slot;
+
+	// put the slots in the name lookup map
+	int count = newTemplate->getSlotsCount();
+	for (i = 0; i < count; ++i)
+	{
+		newTemplate->getSlots(slot, i);
+		m_slots.insert(std::make_pair(slot.name, i));
+	}
+
+	// get the experimental attributes from the attributes, and create a map 
+	// between them
+	int minValue = 0, maxValue = 0;
+	count = getAttribsCount();
+	for (i = 0; i < count; ++i)
+	{
+		const SharedDraftSchematicObjectTemplate::SchematicAttribute & attrib = 
+			getAttrib(i);
+
+		m_attributes[attrib.name] = i;
+		if (!attrib.experiment.getTable().empty() && !attrib.experiment.getText().empty())
+		{
+			getAttribMinMax(i, minValue, maxValue);
+			if (minValue != maxValue)
+				m_experimentalAttributes[attrib.experiment].push_back(attrib.name);
+		}
+	}
+}	// DraftSchematicObject::DraftSchematicObject	
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+DraftSchematicObject::~DraftSchematicObject()
+{
+}	// DraftSchematicObject::~DraftSchematicObject
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a shared template if none was given for this object.
+ *
+ * @return the shared template
+ */
+const SharedObjectTemplate * DraftSchematicObject::getDefaultSharedTemplate(void) const
+{
+static const ConstCharCrcLowerString templateName("object/draft_schematic/base/shared_draft_schematic_default.iff");
+
+	if (m_defaultSharedTemplate == NULL)
+	{
+		m_defaultSharedTemplate = safe_cast<const SharedObjectTemplate *>(
+			ObjectTemplateList::fetch(templateName));
+		WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create "
+			"default shared object template %s", templateName.getString()));
+		if (m_defaultSharedTemplate != NULL)
+			ExitChain::add (removeDefaultTemplate, "DraftSchematicObject::removeDefaultTemplate");
+	}
+	return m_defaultSharedTemplate;
+}	// DraftSchematicObject::getDefaultSharedTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Cleans up the default shared template.
+ */
+void DraftSchematicObject::removeDefaultTemplate(void)
+{
+	if (m_defaultSharedTemplate != NULL)
+	{
+		m_defaultSharedTemplate->releaseReference();
+		m_defaultSharedTemplate = NULL;
+	}
+}	// DraftSchematicObject::removeDefaultTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Requests info about resource weights for a given draft schematic.
+ *
+ * @param requester				the player making the request
+ * @param draftSchematicName	the schematic the player wants to know about
+ */
+void DraftSchematicObject::requestResourceWeights(ServerObject & requester, uint32 draftSchematicCrc)
+{
+	if (requester.getClient() == NULL)
+	{
+		WARNING (true, ("DraftSchematicObject::requestResourceWeights invalid client for [%s]", requester.getNetworkId ().getValueString ().c_str ()));
+		return;
+	}
+
+	const DraftSchematicObject * const schematic = getSchematic(draftSchematicCrc);
+	if (schematic == NULL)
+	{
+		WARNING (true, ("DraftSchematicObject::requestResourceWeights invalid schematic [%lu] for [%s]", draftSchematicCrc, requester.getNetworkId ().getValueString ().c_str ()));
+		return;
+	}
+
+	const ServerDraftSchematicObjectTemplate * const schematicTemplate = safe_cast<const ServerDraftSchematicObjectTemplate *>(schematic->getObjectTemplate());
+	if (schematicTemplate == NULL)
+	{
+		WARNING (true, ("DraftSchematicObject::requestResourceWeights invalid schematic template [%lu] for [%s]", draftSchematicCrc, requester.getNetworkId ().getValueString ().c_str ()));
+		return;
+	}
+
+	std::vector<const char *> desiredAttribs;
+	{
+		for (NameToIndexMap::const_iterator i = schematic->m_attributes.begin(); i != schematic->m_attributes.end(); ++i)
+			desiredAttribs.push_back((*i).first.getText().c_str());
+	}
+
+	std::vector<const char *> attributes(MAX_ATTRIBUTES * 2, static_cast<const char *>(NULL));
+	std::vector<int> slots(MAX_ATTRIBUTES * 2, 0);
+	std::vector<int> counts(MAX_ATTRIBUTES * 2, 0);
+	std::vector<int> weights(MAX_ATTRIBUTES * 2 * Crafting::RA_numResourceAttributes * 2, 0);
+	ScriptParams params;
+	params.addParam(requester.getNetworkId());
+	params.addParam(desiredAttribs);
+	params.addParam(attributes);
+	params.addParam(slots);
+	params.addParam(counts);
+	params.addParam(weights);
+
+	// call script function
+	GameScriptObject::runOneScript(schematicTemplate->getManufactureScripts(0), REQUEST_RESOURCE_WEIGHTS_SCRIPT_METHOD, "Os[s*[i*[i*[i*[", params);
+
+	const std::vector<const char *> & newAttributes = params.getStringArrayParam(2);
+	const std::vector<int> & newSlots = params.getIntArrayParam(3);
+	const std::vector<int> & newCounts = params.getIntArrayParam(4);
+	const std::vector<int> & newWeights = params.getIntArrayParam(5);
+	std::vector<int>::const_iterator slotIter(newSlots.begin());
+	std::vector<int>::const_iterator countIter(newCounts.begin());
+	std::vector<int>::const_iterator weightIter(newWeights.begin());
+
+	MessageQueueResourceWeights * const message = new MessageQueueResourceWeights(schematic->getCombinedCrc());
+
+	// find out how many attributes were returned
+	int attribCount = 0;
+	{
+		for (std::vector<const char *>::const_iterator i(newAttributes.begin());
+			i != newAttributes.end(); ++i, ++attribCount)
+		{
+			if (*i == NULL)
+				break;
+		}
+	}
+	attribCount /= 2;
+
+	for (int i = 0; i < 2; ++i)
+	{
+		for (int j = 0; j < attribCount; ++j)
+		{
+			const StringId sid("crafting", newAttributes[j + i * attribCount]);;
+			const int attrib = schematic->getAttribIndex(sid);
+			if (attrib == -1)
+			{
+				// skip over the data for that attrib
+				slotIter++;
+				const int weightCount = *countIter++;
+				weightIter += weightCount * 2;
+				continue;
+			}
+			const int slot = *slotIter++;
+			const int weightCount = *countIter++;
+			for (int k = 0; k < weightCount; ++k)
+			{
+				const int resource = *weightIter++;
+				const int weight = *weightIter++;
+				if (i == 0)
+				{
+					message->addAssemblyWeight(attrib, slot, resource, weight);
+				}
+				else
+				{
+					message->addResourceMaxWeight(attrib, slot, resource, weight);
+				}
+			}
+		}
+	}
+
+	(safe_cast<ServerController *>(requester.getController()))->appendMessage(
+		static_cast<int>(CM_resourceWeights), 0.0f, message, 
+		GameControllerMessageFlags::SEND | 
+		GameControllerMessageFlags::RELIABLE | 
+		GameControllerMessageFlags::DEST_AUTH_CLIENT);
+}	// DraftSchematicObject::requestResourceWeights
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a manufacture schematic based on this schematic.
+ *
+ * @param creator		the player creating the schematic
+ *
+ * @return the manufacture schematic
+ */
+ManufactureSchematicObject * DraftSchematicObject::createManufactureSchematic(
+	const CachedNetworkId & creator) const
+{
+	Object * object = ServerManufactureSchematicObjectTemplate::createObject(
+		"object/manufacture_schematic/generic_schematic.iff", *this);
+	if (object == NULL)
+		return NULL;
+	ManufactureSchematicObject * schematic = safe_cast<ManufactureSchematicObject *>(object);
+	schematic->init(*this, creator);
+	schematic->setNetworkId(ObjectIdManager::getInstance().getNewObjectId());
+
+	return schematic;
+}	// DraftSchematicObject::createManufactureSchematic
+
+//-----------------------------------------------------------------------
+
+/**
+ * Gets a draft scrematic slot by name.
+ *
+ * @param slot		slot info to be filled
+ * @param name		name of the slot to get
+ *
+ * @return true on success, false if the slot wasn't found
+ */
+bool DraftSchematicObject::getSlot(
+	ServerDraftSchematicObjectTemplate::IngredientSlot & slot, int index) const
+{
+	if (index < 0 || index >= static_cast<int>((safe_cast<
+		const ServerDraftSchematicObjectTemplate*>(
+		getObjectTemplate()))->getSlotsCount()))
+	{
+		return false;
+	}
+
+	slot.options.clear();
+	(safe_cast<const ServerDraftSchematicObjectTemplate*>(getObjectTemplate()))->getSlots(slot, index);
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Gets a draft scrematic slot by name.
+ *
+ * @param slot		slot info to be filled
+ * @param name		name of the slot to get
+ *
+ * @return true on success, false if the slot wasn't found
+ */
+bool DraftSchematicObject::getSlot(
+	ServerDraftSchematicObjectTemplate::IngredientSlot & slot, const StringId & name) const
+{
+	NameToIndexMap::const_iterator iter = m_slots.find(name);
+	if (iter != m_slots.end())
+		return getSlot(slot, (*iter).second);
+	return false;
+}	// DraftSchematicObject::getSlot(const StringId &)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Gets the min and max values for an attribute of the schematic.
+ *
+ * @param index			index of the object attribute
+ * @param minValue		value that will be filled in with the min attribute value
+ * @param maxValue		value that will be filled in with the max attribute value
+ *
+ * @return true on success, false if the name is not a valid attribute
+ */
+bool DraftSchematicObject::getAttribMinMax(int index, int & minValue, 
+	int & maxValue) const
+{
+	const SharedDraftSchematicObjectTemplate::SchematicAttribute & minAttrib = 
+		getAttribMin(index);
+	minValue = minAttrib.value;
+	const SharedDraftSchematicObjectTemplate::SchematicAttribute & maxAttrib = 
+		getAttribMax(index);
+		
+	minValue = minAttrib.value;
+	maxValue = maxAttrib.value;
+	return true;
+}	// DraftSchematicObject::getAttribMinMax(int)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Gets the min and max values for an attribute of the schematic.
+ *
+ * @param name			the attribute name
+ * @param minValue		value that will be filled in with the min attribute value
+ * @param maxValue		value that will be filled in with the max attribute value
+ *
+ * @return true on success, false if the name is not a valid attribute
+ */
+bool DraftSchematicObject::getAttribMinMax(const StringId & name, int & minValue, 
+	int & maxValue) const
+{
+	NameToIndexMap::const_iterator iter = m_attributes.find(name);
+	if (iter == m_slots.end())
+		return false;
+
+	int index = (*iter).second;
+	return getAttribMinMax(index, minValue, maxValue);
+}	// DraftSchematicObject::getAttribMinMax(const StringId &)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the name of a experimental attribute associated with an object attribute.
+ * 
+ * @param index		index of the object attribute
+ *
+ * @return the experimental attribute name
+ */
+const StringId DraftSchematicObject::getExperimentalAttributeFromAttribute(
+	int index) const
+{
+static const StringId NO_EXPERIMENTATION;
+
+	const SharedDraftSchematicObjectTemplate::SchematicAttribute & attrib = 
+		getAttrib(index);
+	if (attrib.experiment == NO_EXPERIMENTATION)
+		return NO_EXPERIMENTATION;
+
+	// make sure we can really experiment with the attribute
+	int minValue, maxValue;
+	if (!getAttribMinMax(index, minValue, maxValue))
+		return NO_EXPERIMENTATION;
+
+	if (minValue == maxValue)
+	{
+		WARNING(true, ("Draft schematic %s has attribute %s with experimental "
+			"attribute %s even though the attribute min/max values are the "
+			"same! Not allowing experimentation.", getObjectTemplateName(),
+			attrib.name.getCanonicalRepresentation().c_str(),
+			attrib.experiment.getCanonicalRepresentation().c_str()));
+		return NO_EXPERIMENTATION;
+	}
+
+	return attrib.experiment;
+}	// DraftSchematicObject::getExperimentalAttributeFromAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the name of a experimental attribute associated with an object attribute.
+ * 
+ * @param attribName	the object attribute name
+ *
+ * @return the experimental attribute name
+ */
+const StringId DraftSchematicObject::getExperimentalAttributeFromAttribute(
+	const StringId & attribName) const
+{
+static const StringId NO_EXPERIMENTATION;
+
+	const SharedDraftSchematicObjectTemplate::SchematicAttribute & attrib = 
+		getAttrib(attribName);
+
+	if (attrib.experiment == NO_EXPERIMENTATION)
+		return NO_EXPERIMENTATION;
+
+	// make sure we can really experiment with the attribute
+	int minValue, maxValue;
+	if (!getAttribMinMax(attribName, minValue, maxValue))
+		return NO_EXPERIMENTATION;
+
+	if (minValue == maxValue)
+	{
+		WARNING(true, ("Draft schematic %s has attribute %s with experimental "
+			"attribute %s even though the attribute min/max values are the "
+			"same! Not allowing experimentation.", getObjectTemplateName(),
+			attrib.name.getCanonicalRepresentation().c_str(),
+			attrib.experiment.getCanonicalRepresentation().c_str()));
+		return NO_EXPERIMENTATION;
+	}
+
+	return attrib.experiment;
+}	// DraftSchematicObject::getExperimentalAttributeFromAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the names of object attributes associated with an experimental attribute.
+ * 
+ * @param attribName	the experimental attribute name
+ *
+ * @return the object attribute name list
+ */
+const std::vector<StringId> & DraftSchematicObject::getFromAttributeFromExperimentalAttribute(
+	const StringId & experimentAttribName) const
+{
+	return (*m_experimentalAttributes.find(experimentAttribName)).second;
+}	// DraftSchematicObject::getFromAttributeFromExperimentalAttribute
+
+
+// ======================================================================
+// factory methods
+
+/**
+ * Returns a draft schematic with a given name. If the schematic isn't loaded, 
+ * loads it.
+ *
+ * @param name		name of the schematic to load
+ *
+ * @return the draft schematic
+ */
+const DraftSchematicObject * DraftSchematicObject::getSchematic(
+	const std::string & name)
+{
+	NOT_NULL(m_schematics);
+	return getSchematic(Crc::calculate(name.c_str()));
+}	// DraftSchematicObject::getSchematic(const std::string &)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a draft schematic with a given name. If the schematic isn't loaded, 
+ * loads it.
+ *
+ * @param crc		crc of name of the schematic to load
+ *
+ * @return the draft schematic
+ */
+const DraftSchematicObject * DraftSchematicObject::getSchematic(uint32 crc)
+{
+	NOT_NULL(m_schematics);
+	if (m_schematics == NULL || crc == 0)
+		return NULL;
+
+	// see if the schematic is already loaded
+	SchematicMap::iterator result = m_schematics->find(crc);
+	if (result != m_schematics->end())
+		return (*result).second;
+
+	// get the template name from the crc
+	const ConstCharCrcString & name = ObjectTemplateList::lookUp(crc);
+	if (name.isEmpty())
+	{
+		WARNING(true, ("Unable to find template name for crc %u", crc));
+		return NULL;
+	}
+
+	// create a new schematic
+	if (!TreeFile::exists(name.getString()))
+	{
+		WARNING(true, ("Draft schematic template %s file not found", name.getString()));
+		return NULL;
+	}
+
+	const ObjectTemplate * objTemplate = ObjectTemplateList::fetch(name);
+	if (objTemplate == NULL)
+	{
+		WARNING(true, ("Can't create object template %s", name.getString()));
+		return NULL;
+	}
+
+	const ServerDraftSchematicObjectTemplate * schematicTemplate = 
+		dynamic_cast<const ServerDraftSchematicObjectTemplate *>(objTemplate);
+	if (schematicTemplate == NULL)
+	{
+		WARNING(true, ("Template %s is not a draft schematic", name.getString()));
+		objTemplate->releaseReference();
+		return NULL;
+	}
+
+	const DraftSchematicObject * schematic = new DraftSchematicObject(schematicTemplate);
+	objTemplate->releaseReference();
+
+	m_schematics->insert(std::make_pair(crc, schematic));
+	return schematic;
+}	// DraftSchematicObject::getSchematic(uint32)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets up the draft schematic factory.
+ */
+void DraftSchematicObject::install()
+{
+	if (m_schematics == NULL)
+		m_schematics = new SchematicMap();
+}	// DraftSchematicObject::install
+
+//-----------------------------------------------------------------------
+
+/**
+ * Cleans up the draft schematic factory
+ */
+void DraftSchematicObject::remove()
+{
+	if (m_schematics != NULL)
+	{
+		SchematicMap::iterator iter;
+		for (iter = m_schematics->begin(); iter != m_schematics->end(); ++iter)
+		{
+			delete (*iter).second;
+			(*iter).second = NULL;
+		}
+		delete m_schematics;
+		m_schematics = NULL;
+	}
+}	// DraftSchematicObject::remove
+
+// ----------------------------------------------------------------------
+
+void DraftSchematicObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+{
+	IntangibleObject::getAttributes(data);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/DraftSchematicObject.h b/engine/server/library/serverGame/src/shared/object/DraftSchematicObject.h
new file mode 100644
index 00000000..1b81581b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/DraftSchematicObject.h
@@ -0,0 +1,272 @@
+//========================================================================
+//
+// DraftSchematicObject.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef INCLUDED_DraftSchematicObject_H
+#define INCLUDED_DraftSchematicObject_H
+
+#include "serverGame/IntangibleObject.h"
+#include "serverGame/ServerDraftSchematicObjectTemplate.h"
+#include "sharedGame/CraftingDataArchive.h"
+#include "sharedGame/SharedDraftSchematicObjectTemplate.h"
+
+class ManufactureSchematicObject;
+
+
+/**
+  * A DraftSchematicObject is used to create designs for new objects.
+  */
+class DraftSchematicObject : public IntangibleObject
+{
+public:
+	// factory methods
+	static const DraftSchematicObject * getSchematic(const std::string & name);
+	static const DraftSchematicObject * getSchematic(uint32 crc);
+	static void install();
+	static void remove();
+
+public:
+
+	virtual ~DraftSchematicObject();
+
+	static void                                                    removeDefaultTemplate(void);
+	static void                                                    requestResourceWeights(ServerObject & requester, uint32 draftSchematicCrc);
+
+	const std::pair<uint32, uint32> &                              getCombinedCrc() const;
+
+	ServerIntangibleObjectTemplate::CraftingType                   getCategory(void) const;
+	const ServerObjectTemplate *                                   getCraftedObjectTemplate() const;
+	const ServerFactoryObjectTemplate *                            getCrateObjectTemplate() const;
+	bool                                                           getSlot(ServerDraftSchematicObjectTemplate::IngredientSlot & slot, const StringId & name) const;
+	bool                                                           getSlot(ServerDraftSchematicObjectTemplate::IngredientSlot & slot, int index) const;
+	int                                                            getSlotsCount(void) const;
+	int                                                            getAttribIndex(const StringId & name) const;
+	const SharedDraftSchematicObjectTemplate::SchematicAttribute & getAttrib(int index) const;
+	const SharedDraftSchematicObjectTemplate::SchematicAttribute & getAttrib(const StringId & name) const;
+	const SharedDraftSchematicObjectTemplate::SchematicAttribute & getAttribMin(int index) const;
+	const SharedDraftSchematicObjectTemplate::SchematicAttribute & getAttribMax(int index) const;
+	bool                                                           getAttribMinMax(const StringId & name, int & minValue, int & maxValue) const;
+	bool                                                           getAttribMinMax(int index, int & minValue, int & maxValue) const;
+	int                                                            getAttribsCount(void) const;
+	const StringId                                                 getExperimentalAttribute(int index) const;
+	size_t                                                         getExperimentalAttributesCount(void) const;
+	const std::string &                                            getSkillCommands(int index) const;
+	int                                                            getSkillCommandsCount(void) const;
+	int                                                            getItemsPerContainer(void) const;
+	float                                                          getManufactureTime(void) const;
+	float                                                          getPrototypeTime(void) const;
+	bool                                                           mustDestroyIngredients(void) const;
+	virtual void                                                   getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+
+	const StringId                getExperimentalAttributeFromAttribute(int index) const;
+	const StringId                getExperimentalAttributeFromAttribute(const StringId & attribName) const;
+	const std::vector<StringId> & getFromAttributeFromExperimentalAttribute(const StringId & experimentAttribName) const;
+
+	ManufactureSchematicObject * createManufactureSchematic(const CachedNetworkId & creator) const;
+
+protected:
+
+	virtual const SharedObjectTemplate *  getDefaultSharedTemplate(void) const;
+
+// if in debug mode, make constructor public for datalint, else make it private
+#ifdef _DEBUG
+public:
+	explicit DraftSchematicObject(const ServerDraftSchematicObjectTemplate* newTemplate);
+#else
+private:
+	explicit DraftSchematicObject(const ServerDraftSchematicObjectTemplate* newTemplate);
+#endif
+
+private:
+	DraftSchematicObject();
+	DraftSchematicObject(const DraftSchematicObject& rhs);
+	DraftSchematicObject&	operator=(const DraftSchematicObject& rhs);
+
+private:
+	typedef std::map<StringId, int>                    NameToIndexMap;
+	typedef std::map<StringId, std::vector<StringId> > ExpAttribsMap;
+	
+	NameToIndexMap m_slots;                   // for quick slot lookup by name
+	NameToIndexMap m_attributes;              // for quick attribute lookup by name
+	ExpAttribsMap  m_experimentalAttributes;  // maps experimental attribs to attribs
+
+	const std::pair<uint32, uint32> m_combinedCrc;  // server and shared template crcs
+
+private:
+
+	static const SharedObjectTemplate * m_defaultSharedTemplate;	// template to use if no shared template is given
+
+	// schematic factory fields
+	typedef std::map<uint32, const DraftSchematicObject *> SchematicMap;
+
+	// since draft schematics don't have valid NetworkIds, we keep track of them
+	// by their template name
+	static SchematicMap *m_schematics;
+};
+
+
+//========================================================================
+
+inline ServerIntangibleObjectTemplate::CraftingType DraftSchematicObject::getCategory() const
+{
+	return (safe_cast<const ServerDraftSchematicObjectTemplate *>(getObjectTemplate()))->getCategory();
+}
+
+//------------------------------------------------------------------------------
+
+inline const ServerObjectTemplate * DraftSchematicObject::getCraftedObjectTemplate() const
+{
+	return (safe_cast<const ServerDraftSchematicObjectTemplate*>(getObjectTemplate()))->getCraftedObjectTemplate();
+}
+
+//------------------------------------------------------------------------------
+
+inline const ServerFactoryObjectTemplate * DraftSchematicObject::getCrateObjectTemplate() const
+{
+	return (safe_cast<const ServerDraftSchematicObjectTemplate*>(getObjectTemplate()))->getCrateObjectTemplate();
+}
+
+//------------------------------------------------------------------------------
+
+inline const std::pair<uint32, uint32> & DraftSchematicObject::getCombinedCrc() const
+{
+	return m_combinedCrc;
+}
+
+//------------------------------------------------------------------------------
+
+inline int DraftSchematicObject::getSlotsCount(void) const
+{
+	return (safe_cast<const ServerDraftSchematicObjectTemplate*>(getObjectTemplate()))->getSlotsCount();
+}
+
+//------------------------------------------------------------------------------
+
+inline int DraftSchematicObject::getAttribIndex(const StringId & name) const
+{
+	NameToIndexMap::const_iterator iter = m_attributes.find(name);
+	if (iter == m_attributes.end())
+		return -1;
+	return (*iter).second;
+}
+
+//------------------------------------------------------------------------------
+
+inline const SharedDraftSchematicObjectTemplate::SchematicAttribute & 
+	DraftSchematicObject::getAttrib(int index) const
+{
+static SharedDraftSchematicObjectTemplate::SchematicAttribute slot;
+
+	(safe_cast<const SharedDraftSchematicObjectTemplate*>(getSharedTemplate()))->getAttributes(slot, index);
+	return slot;
+}
+
+//------------------------------------------------------------------------------
+
+inline const SharedDraftSchematicObjectTemplate::SchematicAttribute & 
+	DraftSchematicObject::getAttrib(const StringId & name) const
+{
+static SharedDraftSchematicObjectTemplate::SchematicAttribute slot;
+
+	NameToIndexMap::const_iterator iter = m_attributes.find(name);
+	if (iter != m_attributes.end())
+		return getAttrib((*iter).second);
+
+	return slot;
+}
+
+//------------------------------------------------------------------------------
+
+inline const SharedDraftSchematicObjectTemplate::SchematicAttribute & 
+	DraftSchematicObject::getAttribMin(int index) const
+{
+static SharedDraftSchematicObjectTemplate::SchematicAttribute slot;
+
+	(safe_cast<const SharedDraftSchematicObjectTemplate*>(getSharedTemplate()))->getAttributesMin(slot, index);
+	return slot;
+}
+
+//------------------------------------------------------------------------------
+
+inline const SharedDraftSchematicObjectTemplate::SchematicAttribute & 
+	DraftSchematicObject::getAttribMax(int index) const
+{
+static SharedDraftSchematicObjectTemplate::SchematicAttribute slot;
+
+	(safe_cast<const SharedDraftSchematicObjectTemplate*>(getSharedTemplate()))->getAttributesMax(slot, index);
+	return slot;
+}
+
+//------------------------------------------------------------------------------
+
+inline int DraftSchematicObject::getAttribsCount(void) const
+{
+	return (safe_cast<const SharedDraftSchematicObjectTemplate*>(getSharedTemplate()))->getAttributesCount();
+}
+
+//------------------------------------------------------------------------------
+
+inline const StringId DraftSchematicObject::getExperimentalAttribute(int index) const
+{
+	ExpAttribsMap::const_iterator iter = m_experimentalAttributes.begin();
+	for (int i = 0; i < index; ++i, ++iter);
+	return (*iter).first;
+}
+
+//------------------------------------------------------------------------------
+
+inline size_t DraftSchematicObject::getExperimentalAttributesCount(void) const
+{
+	return m_experimentalAttributes.size();
+}
+
+//------------------------------------------------------------------------------
+
+inline const std::string & DraftSchematicObject::getSkillCommands(int index) const
+{
+	return (safe_cast<const ServerDraftSchematicObjectTemplate*>(getObjectTemplate()))->getSkillCommands(index);
+}
+
+//------------------------------------------------------------------------------
+
+inline int DraftSchematicObject::getSkillCommandsCount() const
+{
+	return (safe_cast<const ServerDraftSchematicObjectTemplate*>(getObjectTemplate()))->getSkillCommandsCount();
+}
+
+//------------------------------------------------------------------------------
+
+inline int DraftSchematicObject::getItemsPerContainer(void) const
+{
+	return (safe_cast<const ServerDraftSchematicObjectTemplate*>(getObjectTemplate()))->getItemsPerContainer();
+}
+
+//------------------------------------------------------------------------------
+
+inline float DraftSchematicObject::getManufactureTime(void) const
+{
+	return (safe_cast<const ServerDraftSchematicObjectTemplate*>(getObjectTemplate()))->getManufactureTime();
+}
+
+//------------------------------------------------------------------------------
+
+inline float DraftSchematicObject::getPrototypeTime(void) const
+{
+	return (safe_cast<const ServerDraftSchematicObjectTemplate*>(getObjectTemplate()))->getPrototypeTime();
+}
+
+//------------------------------------------------------------------------------
+
+inline bool DraftSchematicObject::mustDestroyIngredients() const
+{
+	return (safe_cast<const ServerDraftSchematicObjectTemplate*>(getObjectTemplate()))->getDestroyIngredients();
+}
+
+
+//========================================================================
+
+#endif	// INCLUDED_DraftSchematicObject_H
diff --git a/engine/server/library/serverGame/src/shared/object/FactoryObject.cpp b/engine/server/library/serverGame/src/shared/object/FactoryObject.cpp
new file mode 100644
index 00000000..cb83f8fa
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/FactoryObject.cpp
@@ -0,0 +1,1599 @@
+//========================================================================
+//
+// FactoryObject.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/FactoryObject.h"
+
+#include "serverGame/Chat.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/DraftSchematicObject.h"
+#include "serverGame/ManufactureSchematicObject.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ProsePackageManagerServer.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerFactoryObjectTemplate.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/TangibleController.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedGame/GameObjectTypes.h"
+#include "sharedGame/OutOfBandPackager.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/SharedObjectAttributes.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/VolumeContainer.h"
+#include "sharedObject/VolumeContainmentProperty.h"
+#include "UnicodeUtils.h"
+
+
+//----------------------------------------------------------------------
+
+//const static ConstCharCrcLowerString OBJECT_SLOT_NAME("anythingnomod1");
+//const static ConstCharCrcLowerString COMPONENT_SLOT_NAME("anythingnomod2");
+
+const static std::string OBJVAR_OBJECT_LIST("factory.objects");
+const static std::string OBJVAR_PENDING_LIST("factory.pending");
+const static std::string OBJVAR_SHARED_TEMPLATE("factory.sharedTemplate");
+const static std::string OBJVAR_ATTRIBUTES("crafting_attributes");
+const static std::string OBJVAR_DRAFT_SCHEMATIC("draftSchematic");
+const static std::string OBJVAR_APPEARANCE_DATA("appearanceData");
+const static std::string OBJVAR_CUSTOM_APPEARANCE("customAppearance");
+
+static const StringId STRING_ID_CANT_DELETE("system_msg", "cant_delete_crafting_factory");
+static const StringId STRING_ID_CANT_SPLIT("system_msg", "cant_split_crate");
+
+
+//----------------------------------------------------------------------
+
+const SharedObjectTemplate * FactoryObject::m_defaultSharedTemplate = NULL;
+
+
+//-----------------------------------------------------------------------
+
+FactoryObject::FactoryObject(const ServerFactoryObjectTemplate* newTemplate) :
+	TangibleObject(newTemplate),
+	m_badFactoryLogged(false),
+	m_attributes(),
+	m_craftingSchematic(),
+	m_craftingCount(0)
+{
+	addMembersToPackages();
+}
+
+//-----------------------------------------------------------------------
+
+FactoryObject::~FactoryObject()
+{
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Initializes the factory for the type of object it will be storing.
+ *
+ * @param source		the schematic the objects in this factory are created from
+ */
+void FactoryObject::initialize(const ManufactureSchematicObject & source)
+{
+static const std::string _noCopyList[] = {
+	"crafting",
+	"crafting_attributes",
+	"ingr",
+	"item_attrib_keys",
+	"item_attrib_values",
+	"crafting_resource"
+	// @todo: it would be nice if we could get rid of crafting_components,
+	// but some scripts are incorrectly relying on that objvar list existing
+	};
+static const int _noCopyList_size = sizeof(_noCopyList) / sizeof(_noCopyList[0]);
+static const std::set<std::string> noCopyList(&_noCopyList[0], &_noCopyList[_noCopyList_size]);
+
+	int temp = source.getDraftSchematic();
+	setObjVarItem(OBJVAR_DRAFT_SCHEMATIC, temp);
+	if (!source.getAppearanceData().empty())
+		setObjVarItem(OBJVAR_APPEARANCE_DATA, source.getAppearanceData());
+
+	if (!source.getCustomAppearance().empty())
+	{
+		setObjVarItem(OBJVAR_CUSTOM_APPEARANCE, source.getCustomAppearance());
+	}
+
+	if (!source.getAssignedObjectName().empty())
+		setObjectName(source.getAssignedObjectName());
+
+	// copy the schematic attribute data
+	const AttribMap & attributes = source.getAttributes();
+	for (AttribMap::const_iterator iter = attributes.begin(); iter !=
+		attributes.end(); ++iter)
+	{
+		setAttribute((*iter).first, (*iter).second);
+	}
+
+	// copy objvars on the schematic, except for ones we know we don't need
+	std::string name;
+	const DynamicVariableList & list = source.getObjVars();
+	for (DynamicVariableList::MapType::const_iterator iter2 = list.begin();
+		iter2 != list.end(); ++iter2)
+	{
+		const std::string & fullName = (*iter2).first;
+		const std::string::size_type dot = fullName.find('.');
+		name = fullName.substr(0, dot);
+		if (noCopyList.find(name) == noCopyList.end())
+			copyObjVars(name, source, name);
+	}
+
+	// copy the manufacture scripts
+	const ScriptList & sourceScripts = source.getScriptObject()->getScripts();
+	for (ScriptList::const_iterator it = sourceScripts.begin(); it != sourceScripts.end(); ++it)
+		getScriptObject()->attachScript((*it).getScriptName(), false);
+}	// FactoryObject::initialize
+
+//-----------------------------------------------------------------------
+
+/**
+ * Initializes a newly created object.
+ */
+void FactoryObject::initializeFirstTimeObject()
+{
+	TangibleObject::initializeFirstTimeObject();
+}	// FactoryObject::initializeFirstTimeObject
+
+//-----------------------------------------------------------------------
+
+/**
+ * Initializes an object just proxied.
+ */
+void FactoryObject::endBaselines()
+{
+	TangibleObject::endBaselines();
+
+	if (isAuthoritative())
+		calculateAttributes();
+}	// FactoryObject::endBaselines
+
+//-----------------------------------------------------------------------
+
+/**
+ * Signal that we have just been loaded from the database.
+ */
+void FactoryObject::onLoadedFromDatabase()
+{
+	TangibleObject::onLoadedFromDatabase();
+
+	if (getLoadContents() && getCount() > 0)
+	{
+		// verify that we have a contained object
+		if (getContainedObject() == NULL)
+		{
+			WARNING_STRICT_FATAL(true, ("Factory object %s has a count of %d, "
+				"but no contained object! We are setting the count to 0.", 
+				getNetworkId().getValueString().c_str(), getCount()));
+			setCount(0);
+		}
+	}
+}	// FactoryObject::onLoadedFromDatabase
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a shared template if none was given for this object.
+ *
+ * @return the shared template
+ */
+const SharedObjectTemplate * FactoryObject::getDefaultSharedTemplate() const
+{
+	static const ConstCharCrcLowerString templateName("object/factory/base/shared_factory_default.iff");
+
+	if (m_defaultSharedTemplate == NULL)
+	{
+		m_defaultSharedTemplate = safe_cast<const SharedObjectTemplate *>(ObjectTemplateList::fetch(templateName));
+		WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create default shared object template %s", templateName.getString()));
+		if (m_defaultSharedTemplate != NULL)
+			ExitChain::add (removeDefaultTemplate, "FactoryObject::removeDefaultTemplate");
+	}
+	return m_defaultSharedTemplate;
+}	// FactoryObject::getDefaultSharedTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Cleans up the default shared template.
+ */
+void FactoryObject::removeDefaultTemplate()
+{
+	if (m_defaultSharedTemplate != NULL)
+	{
+		m_defaultSharedTemplate->releaseReference();
+		m_defaultSharedTemplate = NULL;
+	}
+}	// FactoryObject::removeDefaultTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a default controller for this object.
+ *
+ * @return the object's controller
+ */
+Controller* FactoryObject::createDefaultController()
+{
+	Controller* controller = new TangibleController(this);
+	NOT_NULL(controller);
+
+	setController(controller);
+	return controller;
+}	// FactoryObject::createDefaultController
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sets the item attributes from the factory's current objvars.
+ */
+void FactoryObject::calculateAttributes()
+{
+	if (isAuthoritative())
+	{
+		m_attributes.clear();
+		
+		const DynamicVariableList::NestedList attributes(getObjVars(), OBJVAR_ATTRIBUTES);
+		for (DynamicVariableList::NestedList::const_iterator i = attributes.begin();
+			i != attributes.end(); ++i)
+		{
+			float value;
+			i.getValue(value);
+			m_attributes.set(StringId(i.getName()), value);
+		}
+	}
+	else
+	{
+		WARNING_STRICT_FATAL(true, ("FactoryObject::calculateAttributes called on "
+			"non-auth object %s", getNetworkId().getValueString().c_str()));
+	}
+}	// FactoryObject::calculateAttributes
+
+// ----------------------------------------------------------------------
+
+/**
+ * Tests if this factory can be used in the game. If its source schematic has
+ * been removed we can no longer use this item to make new objects or in 
+ * crafting/manufactuing.
+ *
+ * @return true if the factory is useable, false if not
+ */
+bool FactoryObject::isFactoryOk() const
+{
+	// if we haven't been initialized, assume we are ok
+	if (!getObjVars().hasItem(OBJVAR_DRAFT_SCHEMATIC))
+		return true;
+
+	if (m_badFactoryLogged)
+		return false;
+
+	bool factoryOk = true;
+	if (getLoadContents())
+	{
+		static const int BUFSIZE = 1024;
+		char errBuffer[BUFSIZE];
+		const DraftSchematicObject * draft = DraftSchematicObject::getSchematic(
+			getDraftSchematic());
+		if (draft != NULL)
+		{
+			// make sure we have an object instance defined
+			if (getCount() > 0 && getContainedObject() == NULL)
+			{
+				sprintf(errBuffer, "not having a contained object instance");
+				factoryOk = false;
+			}
+		}
+		else
+		{
+			sprintf(errBuffer, "its source draft schematic (crc=%lu) not existing", 
+				getDraftSchematic());
+			factoryOk = false;
+		}
+		if (!factoryOk && !m_badFactoryLogged)
+		{
+			// send out logs/emails
+			m_badFactoryLogged = true;
+			const ServerObject * owner = NULL;
+			const Object * object = NetworkIdManager::getObjectById(getOwnerId());
+			if (object != NULL)
+				owner = object->asServerObject();
+
+			// log that the schematic can't be used
+			LOG("CustomerService", ("Crafting: factory crate object %s "
+				"owned by %s is unuseable due to %s", getNetworkId().getValueString().c_str(), 
+				PlayerObject::getAccountDescription(owner).c_str(), errBuffer));
+			if (owner != NULL)
+			{
+				// send mail to the owner telling them their schematic can't be used
+				const static StringId message("system_msg", "crate_unuseable");
+				Unicode::String oob;
+				ProsePackage pp;
+				ProsePackageManagerServer::createSimpleProsePackage (*this, message, pp);
+				OutOfBandPackager::pack(pp, -1, oob);
+				Unicode::String messageString = Unicode::narrowToWide("@" + message.getCanonicalRepresentation());
+				Chat::sendPersistentMessage("", Unicode::wideToNarrow(owner->getObjectName()), 
+					messageString, Unicode::emptyString, oob);
+			}
+		}
+	}
+	return factoryOk;
+}	// FactoryObject::isFactoryOk
+
+// ----------------------------------------------------------------------
+
+/**
+ * Called if we are being deleted. If we are being used in a crafting session,
+ * prevent the deletion.
+ */
+bool FactoryObject::canDestroy() const
+{
+	if (inCraftingSession() && m_craftingCount.get() != 0)
+	{
+		Unicode::String oob;
+		{
+			ProsePackage pp;
+			ProsePackageManagerServer::createSimpleProsePackage (*this, 
+				STRING_ID_CANT_DELETE, pp);
+			OutOfBandPackager::pack(pp, -1, oob);
+		}
+		const Object * const owner = NetworkIdManager::getObjectById(getOwnerId());
+		if (owner != NULL)
+		{
+			Chat::sendSystemMessage(*(owner->asServerObject()), Unicode::emptyString, oob);
+		}
+		return false;
+	}
+	return TangibleObject::canDestroy();
+}	// FactoryObject::canDestroy
+
+/**
+ * Called when the factory is transferred to another container. If it is being used
+ * in a crafting session, we create another factory for component items to reference.
+ */
+void FactoryObject::onContainerTransfer(ServerObject * destination,
+	ServerObject* transferer)
+{
+	if (inCraftingSession() && destination != NULL &&
+		destination->getNetworkId() != m_craftingSchematic.get())
+	{
+		if (!isFactoryOk())
+			return;
+
+		Object * schematic = m_craftingSchematic.get().getObject();
+		if (schematic == NULL)
+		{
+			WARNING(true, ("FactoryObject::onContainerTransfer: could not get the schematic for factory %s", getNetworkId().getValueString().c_str()));
+			return;
+		}
+		if (ContainerInterface::getTopmostContainer(*this) != 
+			ContainerInterface::getTopmostContainer(*schematic))
+		{
+			// if we're being used in crafting, and not being transferred to/from 
+			// the schematic, we need to make a new factory in the schematic for 
+			// our components to reference
+			if (m_craftingCount.get() != 0)
+			{
+				FactoryObject * newFactory = NULL;
+				if (getCount() > 1)
+				{
+					// make a new factory in the manf schematic
+					newFactory = makeCopy(*(m_craftingSchematic.get().getObject()->
+						asServerObject()), 1);
+					if (newFactory != NULL)
+					{
+						// NOTE: potential dupe here, but the player shouldn't be able to
+						// remove the new factory without decreasing the component count
+						// in the manf schematic
+						setCount(getCount() + 1);
+
+						// swap the contained item instances so that any current references
+						// will point to a local object
+						TangibleObject * myObject = const_cast<TangibleObject *>(getContainedObject());
+						if (myObject == NULL)
+						{
+							WARNING(true, ("FactoryObject::onContainerTransfer: getContainedObject for %s returned NULL", getNetworkId().getValueString().c_str()));
+							return;
+						}
+						TangibleObject * newObject = const_cast<TangibleObject *>(newFactory->getContainedObject());
+						if (newObject == NULL)
+						{
+							WARNING(true, ("FactoryObject::onContainerTransfer: getContainedObject for %s returned NULL", newFactory->getNetworkId().getValueString().c_str()));
+							newFactory->permanentlyDestroy(DeleteReasons::SetupFailed);
+							return;
+						}
+						Container::ContainerErrorCode error;
+						if (!ContainerInterface::transferItemToVolumeContainer (*newFactory, *myObject, NULL, error))
+						{
+							WARNING(true, ("FactoryObject::onContainerTransfer: could not transfer factory %s to container %s", newFactory->getNetworkId().getValueString().c_str(), myObject->getNetworkId().getValueString().c_str()));
+							newFactory->permanentlyDestroy(DeleteReasons::SetupFailed);
+							return;
+						}
+						if (!ContainerInterface::transferItemToVolumeContainer (*this, *newObject, NULL, error))
+						{
+							WARNING(true, ("FactoryObject::onContainerTransfer: could not transfer factory %s to container %s", getNetworkId().getValueString().c_str(), newObject->getNetworkId().getValueString().c_str()));
+							return;
+						}
+					}
+				}
+				else
+				{
+					// make a new factory with one item, but don't destroy ourself
+					newFactory = makeCopy(*(m_craftingSchematic.get().getObject()->
+						asServerObject()), 1, false);
+					if (newFactory == NULL)
+					{
+						WARNING(true, ("FactoryObject::onContainerTransfer: could not make a copy of factory %s", getNetworkId().getValueString().c_str()));
+						return;
+					}
+					// make a new object for ourself
+					// NOTE: potential dupe here, but the player shouldn't be able to
+					// remove the new factory without decreasing the component count
+					// in the manf schematic
+					addObject();
+				}
+				// update the crafting status of ourself and the new factory
+				ManufactureSchematicObject * schematic = safe_cast<ManufactureSchematicObject *>(
+					m_craftingSchematic.get().getObject());
+				if (schematic != NULL)
+				{
+					if (newFactory != NULL)
+					{
+						// set up the new factory to have the same crafting info
+						// that we do
+						newFactory->m_craftingSchematic = m_craftingSchematic;
+						newFactory->m_craftingCount = m_craftingCount.get();
+						schematic->addCraftingFactory(*newFactory);
+					}
+					schematic->removeCraftingFactory(*this);
+				}
+			}
+			endCraftingSession();
+		}
+	}
+	TangibleObject::onContainerTransfer(destination, transferer);
+}	// FactoryObject::onContainerTransfer
+
+// ----------------------------------------------------------------------
+
+/**
+ * Tells the factory that we are using it in a crafting session.
+ */
+bool FactoryObject::startCraftingSession(ManufactureSchematicObject & schematic)
+{
+	if (inCraftingSession() || getCount() <= 1 || !isFactoryOk())
+		return false;
+
+	m_craftingSchematic = CachedNetworkId(schematic);
+	m_craftingCount = 0;
+	schematic.addCraftingFactory(*this);
+	return true;
+}	// FactoryObject::startCraftingSession
+
+// ----------------------------------------------------------------------
+
+/**
+ * Tells the factory that we have stopped using it in a crafting session.
+ */
+bool FactoryObject::endCraftingSession()
+{
+	if (!inCraftingSession())
+		return false;
+
+	m_craftingSchematic = CachedNetworkId::cms_cachedInvalid;
+	m_craftingCount = 0;
+	return true;
+}	// FactoryObject::endCraftingSession
+
+// ----------------------------------------------------------------------
+
+/**
+ * Tells the factory to reset its object count for items used during this
+ * crafting session.
+ */
+bool FactoryObject::resetCraftingSession()
+{
+	if (!inCraftingSession())
+		return false;
+
+	incrementCount(m_craftingCount.get());
+	m_craftingCount = 0;
+	return true;
+}	// FactoryObject::resetCraftingSession
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns if the factory thinks it is in a crafting session or not.
+ */
+bool FactoryObject::inCraftingSession() const
+{
+	if (m_craftingSchematic.get() == CachedNetworkId::cms_cachedInvalid)
+		return false;
+
+	// make sure the crafting schematic id is a valid object
+	if (m_craftingSchematic.get().getObject() == NULL)
+	{
+		WARNING_STRICT_FATAL(true, ("FactoryObject %s has a schematic id of %s "
+			"that isn't a valid object!!!", getNetworkId().getValueString().c_str(),
+			m_craftingSchematic.get().getValueString().c_str()));
+		const_cast<FactoryObject*>(this)->m_craftingSchematic = CachedNetworkId::cms_cachedInvalid;
+		const_cast<FactoryObject*>(this)->m_craftingCount = 0;
+		return false;
+	}
+
+	return true;
+}	// FactoryObject::inCraftingSession
+
+// ----------------------------------------------------------------------
+
+/**
+ * Tells the factory to act as if items were removed from it to be used in a
+ * crafting session. We can remove all but one of our items. Removing the last
+ * item should be done by moving this factory to the manf schematic.
+ *
+ * @param count		the number of items to remove
+ *
+ * @return true on success, false if the items weren't removed
+ */
+bool FactoryObject::removeCraftingReferences(int count)
+{
+	if (!inCraftingSession() || count <= 0 || count >= getCount())
+		return false;
+
+	incrementCount(-count);
+	m_craftingCount.set(m_craftingCount.get() + count);
+	return true;
+}	// FactoryObject::removeCraftingReferences
+
+// ----------------------------------------------------------------------
+
+/**
+ * Tells the factory to add back crafting references that had been removed from
+ * it.
+ *
+ * @param count		the number of items to add
+ *
+ * @return true on success, false if the items weren't added
+ */
+bool FactoryObject::addCraftingReferences(int count)
+{
+	if (!inCraftingSession() || count <= 0 || count > m_craftingCount.get())
+		return false;
+
+	incrementCount(count);
+	m_craftingCount.set(m_craftingCount.get() - count);
+	return true;
+}	// FactoryObject::addCraftingReferences
+
+// ----------------------------------------------------------------------
+
+/**
+ * If the factory is empty, makes a new object and stores it in the factory.
+ * Otherwise just increases the count for the number of objects the factory
+ * contains.
+ *
+ * @return true if the object was added, false if not
+ */
+bool FactoryObject::addObject()
+{
+	if (!isFactoryOk())
+		return false;
+
+	if (isAuthoritative())
+	{
+		if (getCount() == 0)
+		{
+			TangibleObject * object = manufactureObject();
+			if (object != NULL)
+			{
+				setObjectName(object->getObjectName());
+				setComplexity(object->getComplexity());
+
+				incrementCount(1);
+			}
+			else
+				return false;
+		}
+		else
+		{
+			// just increment the count of the number of items we are storing
+			incrementCount(1);
+		}
+		
+		const ServerObject * parent = safe_cast<const ServerObject *>(ContainerInterface::getFirstParentInWorld(*this));
+		if (parent != NULL)
+			LOG("CustomerService", ("Crafting:incrementing count of crate %s (owner %s) to %d", getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(parent->getOwnerId()).c_str(), getCount()));
+		else
+			LOG("CustomerService", ("Crafting:incrementing count of crate %s to %d", getNetworkId().getValueString().c_str(), getCount()));
+	}
+	else
+	{
+		WARNING_STRICT_FATAL(true, ("Factory object %s addObject called for "
+			"non-authoritative factory", getNetworkId().getValueString().c_str()));
+	}
+	return true;
+}	// FactoryObject::addObject
+
+
+// ----------------------------------------------------------------------
+
+/**
+ * Removes an object from this factory, in order for it to be placed in the game.
+ *
+ * @param destination		where to transfer the object once it has been loaded
+ *
+ * @return true if the request to get the item was sent to the database, false on error
+ *
+ * @todo: do we need to add a count of items to remove?
+ */
+bool FactoryObject::removeObject(ServerObject & destination)
+{
+	if (!isFactoryOk())
+		return false;
+
+	if (getCount() > 0 && ContainerInterface::getVolumeContainer(destination) != NULL)
+	{
+		if (!getLoadContents())
+		{
+			// old style factory
+			// request the object from the database
+			NetworkId objectId(removeIdFromObjectList());
+			if (objectId != NetworkId::cms_invalid)
+			{
+				loadContainedObjectFromDB(objectId);
+				incrementCount(-1);
+
+				// add the object to a pending list
+				addIdToPendingList(objectId, destination);
+				return true;
+			}
+		}
+		else
+		{
+			// new style factory
+			TangibleObject * object = NULL;
+			if (getCount() > 1)
+			{
+				object = manufactureObject();
+			}
+			else
+			{
+				// use the 1st object that was created for the factory
+				// (we should actually be a slotted container, but we have to
+				// keep backward compatable)
+				const VolumeContainer * container = ContainerInterface::getVolumeContainer(*this);
+				if (container->getNumberOfItems() > 0)
+				{
+					if (container->getNumberOfItems() > 1)
+					{
+						WARNING_STRICT_FATAL(true, ("FactoryObject::removeObject "
+							"factory %s contains more than one item",
+							getNetworkId().getValueString().c_str()));
+					}
+					const CachedNetworkId & id = *(container->begin());
+					Object * obj = id.getObject();
+					if (obj != NULL && obj->asServerObject()->asTangibleObject() != NULL)
+					{
+						object = obj->asServerObject()->asTangibleObject();
+					}
+					else
+					{
+						WARNING_STRICT_FATAL(true, ("FactoryObject::removeObject "
+							"factory %s contains and invalid object",
+							getNetworkId().getValueString().c_str()));
+						object = manufactureObject();
+					}
+				}
+				else
+				{
+					WARNING_STRICT_FATAL(true, ("FactoryObject::removeObject "
+						"factory %s contains no objects, but the count is %d",
+						getNetworkId().getValueString().c_str(), getCount()));
+					object = manufactureObject();
+				}
+			}
+			if (object != NULL)
+			{
+				Container::ContainerErrorCode error;
+				if (ContainerInterface::transferItemToVolumeContainer(destination, *object, NULL, error))
+				{
+					incrementCount(-1);
+
+					const ServerObject * parent = safe_cast<const ServerObject *>(ContainerInterface::getFirstParentInWorld(destination));
+					if (parent != NULL)
+						LOG("CustomerService", ("Crafting:removed object %s from crate %s to container %s of player %s. Crate count = %d", object->getNetworkId().getValueString().c_str(), getNetworkId().getValueString().c_str(), destination.getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(parent->getNetworkId()).c_str(), getCount()));
+					else
+						LOG("CustomerService", ("Crafting:removed object %s from crate %s to container %s. Crate count = %d", object->getNetworkId().getValueString().c_str(), getNetworkId().getValueString().c_str(), destination.getNetworkId().getValueString().c_str(), getCount()));
+					if (getCount() == 0)
+					{
+						LOG("CustomerService", ("Crafting:destroying empty crate %s owned by %s", getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(getOwnerId()).c_str()));
+						permanentlyDestroy(DeleteReasons::Consumed);
+					}
+					return true;
+				}
+				else
+				{
+					object->permanentlyDestroy(DeleteReasons::BadContainerTransfer);
+				}
+			}
+		}
+	}
+	return false;
+}	// FactoryObject::removeObject
+
+// ----------------------------------------------------------------------
+
+/**
+ * Destroys some of the contents of the factory.
+ *
+ * @param count		the number of items to destroy
+ *
+ * @return the number of items actually destroyed
+ */
+int FactoryObject::deleteContents(int count)
+{
+	if (count > getCount())
+		count = getCount();
+
+	incrementCount(-count);
+	if (getCount() == 0)
+		permanentlyDestroy(DeleteReasons::Consumed);
+
+	return count;
+}	// FactoryObject::deleteContents
+
+// ----------------------------------------------------------------------
+
+/**
+ * Tansfers objects in this crate to another crate.
+ *
+ * @param toCrate		the crate to transfer to
+ * @param objectCount	the number of objects to transfer
+ *
+ * @return true on success, false on error
+ */
+bool FactoryObject::transferObjects(FactoryObject & toCrate, int objectCount)
+{
+	if (!isFactoryOk())
+		return false;
+
+	// verify the object count
+	if (objectCount < 0 || objectCount > getCount())
+		return false;
+
+	if (objectCount == 0)
+		return true;
+
+	// verify the to crate
+	if (toCrate.getCraftedId() != getCraftedId())
+		return false;
+
+	for (int i = 0; i < objectCount; ++i)
+	{
+		NetworkId objectId(removeIdFromObjectList());
+		if (objectId != NetworkId::cms_invalid)
+		{
+			incrementCount(-1);
+			// @todo: can we tell the db to change the owner of the object
+			toCrate.addIdToObjectList(objectId);
+			toCrate.incrementCount(1);
+		}
+		else
+		{
+			WARNING_STRICT_FATAL(true, ("FactoryObject::transferObjects factory "
+				"%s failed to get an object from its list even though the object "
+				"count said we should be able to!", getNetworkId().getValueString().c_str()));
+			// transfer all the objects back to us
+			for (int j = 0; j < i; ++j)
+			{
+				NetworkId objectId(toCrate.removeIdFromObjectList());
+				FATAL(objectId == NetworkId::cms_invalid, ("FactoryObject::transferObjects "
+					"trying to recover from prevoius error, couldn't get our "
+					"objects back!!!!"));
+				addIdToObjectList(objectId);
+				toCrate.incrementCount(-1);
+				incrementCount(-1);
+			}
+			return false;
+		}
+	}
+	LOG("CustomerService", ("Crafting:transferred %d objects from crate %s owned by %s to crate %s owned by %s. Counts = %d, %d", objectCount, getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(getOwnerId()).c_str(), toCrate.getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(toCrate.getOwnerId()).c_str(), getCount(), toCrate.getCount()));
+	return true;
+}	// FactoryObject::transferObjects
+
+// ----------------------------------------------------------------------
+
+/**
+ * Called when an object has been added to our container from the database. If
+ * the object is one that was requested by removeObject(), transfer the object
+ * to the destination.
+ */
+void FactoryObject::onContainedObjectLoaded(const NetworkId &oid)
+{
+	TangibleObject::onContainedObjectLoaded(oid);
+
+	// check if the object is on our pending list
+	ServerObject * destination = removeIdFromPendingList(oid);
+	if (destination != NULL)
+	{
+		TangibleObject * item = safe_cast<TangibleObject *>(NetworkIdManager::getObjectById(
+			oid));
+		if (item != NULL)
+		{
+			Container::ContainerErrorCode error = Container::CEC_Success;
+			if (ContainerInterface::transferItemToVolumeContainer(*destination, *item, NULL, error))
+			{
+				// if that was the last item of ours, delete ourself
+				if (getCount() == 0 && getPendingListCount() == 0)
+					permanentlyDestroy(DeleteReasons::Consumed);
+			}
+			else
+			{
+				// re-depersist the object
+				addIdToObjectList(oid);
+				incrementCount(1);
+				item->unload();
+				// tell the owner something went wrong
+				Object * owner = NetworkIdManager::getObjectById(getOwnerId());
+				if (owner != NULL)
+				{
+					ContainerInterface::sendContainerMessageToClient(*safe_cast<ServerObject*>(owner), error);
+				}
+			}
+		}
+		else
+		{
+			WARNING(true, ("FactoryObject::onContainedObjectLoaded factory %s received object %s which is not on the server",
+				getNetworkId().getValueString().c_str(), oid.getValueString().c_str()));
+			// add the object back for the moment
+			addIdToObjectList(oid);
+			incrementCount(1);
+		}
+	}
+}	// FactoryObject::onContainedObjectLoaded
+
+// ----------------------------------------------------------------------
+
+/**
+ * Creates a new object from the factory. Note this essentially duplicates the
+ * functionality of ManufactureSchematicObject::manufactureObject; if that
+ * function changes, this one should too.
+ *
+ * @return the new object, or NULL on error
+ */
+TangibleObject * FactoryObject::manufactureObject()
+{
+	if (!isFactoryOk())
+		return NULL;
+
+	const DraftSchematicObject * draftSchematic = DraftSchematicObject::getSchematic(getDraftSchematic());
+
+	if (draftSchematic == NULL)
+	{
+		return NULL;
+	}
+	if (draftSchematic->getCraftedObjectTemplate() == NULL)
+	{
+		DEBUG_WARNING(true, ("Draft schematic %s does not have a craftable object template!\n", draftSchematic->getTemplateName()));
+		return NULL;
+	}
+
+	// create the item
+	TangibleObject * const object = dynamic_cast<TangibleObject *>(
+		ServerWorld::createNewObject(*draftSchematic->getCraftedObjectTemplate(),
+		*this, false));
+	if (object == NULL)
+	{
+		DEBUG_WARNING(true, ("Player %s failed to create object for template "
+			"%s.\n", getOwnerId().getValueString().c_str(),
+			draftSchematic->getCraftedObjectTemplate()->getName()));
+		return NULL;
+	}
+
+	if (!getAssignedObjectName().empty())
+		object->setObjectName(getAssignedObjectName());
+
+	// set the object appearance
+	const std::string & appearance = getItemCustomAppearance();
+	if (!appearance.empty())
+		object->setCustomAppearance(appearance);
+
+	// set the customization data for the object
+	if (!getAppearanceData().empty())
+		object->setAppearanceData(getAppearanceData());
+
+	// mark the item as having been created by us
+	object->setCraftedId(getCraftedId());
+	object->setCraftedType(draftSchematic->getCategory());
+	object->setOwnerId(getOwnerId());
+	if (getCreatorId() != NetworkId::cms_invalid)
+		object->setCreatorId(getCreatorId());
+	else
+		object->setCreatorId(getOwnerId());
+
+	// set the creator xp type from the schematic template
+	const ServerObjectTemplate * schematicTemplate = safe_cast<const
+		ServerObjectTemplate *>(draftSchematic->getObjectTemplate());
+	if (schematicTemplate != NULL && schematicTemplate->getXpPointsCount() > 0)
+	{
+		ServerObjectTemplate::Xp xpData;
+		schematicTemplate->getXpPoints(xpData, 0);
+		object->setCreatorXpType(xpData.type);
+	}
+
+	// allow the schematic scripts to modify the object
+	// prototype objects are modified at the end of the crafting session
+	ScriptParams params;
+	params.addParam(getOwnerId());
+	params.addParam(object->getNetworkId());
+	params.addParam(*this);
+	params.addParam(false);
+	params.addParam(true);
+	int result = getScriptObject()->trigAllScripts(Scripting::TRIG_MANUFACTURE_OBJECT,
+		params);
+	if (result == SCRIPT_OVERRIDE)
+	{
+		object->permanentlyDestroy(DeleteReasons::Script);
+		return NULL;
+	}
+
+	return object;
+}	// FactoryObject::manufactureObject
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the of our content's template.
+ *
+ * @return the template name
+ */
+const char * FactoryObject::getContainedTemplateName() const
+{
+	if (getLoadContents() && getCount() > 0)
+	{
+		const VolumeContainer * container = ContainerInterface::getVolumeContainer(*this);
+		const CachedNetworkId & id = *(container->begin());
+		const Object * obj = id.getObject();
+		if (obj != NULL && obj->asServerObject() != NULL)
+			return obj->asServerObject()->getTemplateName();
+	}
+	return NULL;
+}	// FactoryObject::getContainedTemplateName
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the name of our content's shared template.
+ *
+ * @return the shared template name
+ */
+const char * FactoryObject::getContainedSharedTemplateName() const
+{
+static std::string sharedTemplateName;
+
+	if (!getLoadContents())
+	{
+		// old style factory
+		if (getObjVars().getItem(OBJVAR_SHARED_TEMPLATE, sharedTemplateName))
+			return sharedTemplateName.c_str();
+	}
+	else if (getCount() > 0)
+	{
+		// new style factory
+		const VolumeContainer * container = ContainerInterface::getVolumeContainer(*this);
+		const CachedNetworkId & id = *(container->begin());
+		const Object * obj = id.getObject();
+		if (obj != NULL && obj->asServerObject() != NULL)
+			return obj->asServerObject()->getSharedTemplateName();
+	}
+	return NULL;
+}	// FactoryObject::getContainedSharedTemplateName
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the template for our contents.
+ *
+ * @return the content template
+ */
+const ObjectTemplate * FactoryObject::getContainedObjectTemplate() const
+{
+	if (getLoadContents() && getCount() > 0)
+	{
+		const VolumeContainer * container = ContainerInterface::getVolumeContainer(*this);
+		const CachedNetworkId & id = *(container->begin());
+		const Object * obj = id.getObject();
+		if (obj != NULL && obj->asServerObject() != NULL)
+			return obj->asServerObject()->getObjectTemplate();
+	}
+	return NULL;
+}	// FactoryObject::getContainedObjectTemplate
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns our contained object.
+ *
+ * @return the contained object
+ */
+const TangibleObject * FactoryObject::getContainedObject() const
+{
+	if (getLoadContents() && getCount() > 0)
+	{
+		const VolumeContainer * container = ContainerInterface::getVolumeContainer(*this);
+		const CachedNetworkId & id = *(container->begin());
+		const Object * obj = id.getObject();
+		if (obj != NULL && obj->asServerObject() != NULL)
+		{
+			return obj->asServerObject()->asTangibleObject();
+		}
+	}
+	return NULL;
+}	// FactoryObject::getContainedObject
+
+// ----------------------------------------------------------------------
+
+/**
+ * Adds an object id to our id list.
+ *
+ * @param id		the id to add
+ */
+void FactoryObject::addIdToObjectList(const NetworkId & id)
+{
+	setObjVarItem(OBJVAR_OBJECT_LIST + "." + id.getValueString(), id);
+}	// FactoryObject::addIdToObjectList
+
+// ----------------------------------------------------------------------
+
+/**
+ * Removes an id from our id list.
+ *
+ * @return the id that was removed
+ */
+const NetworkId FactoryObject::removeIdFromObjectList()
+{
+	DynamicVariableList::NestedList objectsList(getObjVars(),OBJVAR_OBJECT_LIST);
+
+	if (objectsList.empty())
+		return NetworkId::cms_invalid;
+
+	DynamicVariableList::NestedList::const_iterator item = objectsList.begin();
+	NetworkId itemId;
+	item.getValue(itemId);
+	removeObjVarItem(item.getNameWithPath());
+
+	return itemId;
+}	// FactoryObject::removeIdFromObjectList
+
+// ----------------------------------------------------------------------
+
+/**
+ * Adds an object id to our pending list.
+ *
+ * @param id			the id to add
+ * @param destination	where to xfer the object once it is loaded
+ */
+void FactoryObject::addIdToPendingList(const NetworkId & id, const ServerObject & destination)
+{
+	setObjVarItem(OBJVAR_PENDING_LIST + "." + id.getValueString(), destination.getNetworkId());
+}	// FactoryObject::addIdToPendingList
+
+// ----------------------------------------------------------------------
+
+/**
+ * Removes an id from our pending list.
+ *
+ * @param id		the id to remove
+ *
+ * @return the container object associated with the id
+ */
+ServerObject * FactoryObject::removeIdFromPendingList(const NetworkId & id)
+{
+	const DynamicVariableList::NestedList pendingList(getObjVars(),OBJVAR_PENDING_LIST);
+
+	const std::string & idString = id.getValueString();
+
+	NetworkId objectId;
+	if (!pendingList.getItem(idString,objectId))
+		return NULL;
+
+	ServerObject * const object = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(objectId));
+	removeObjVarItem(pendingList.getContextName() + idString);
+	return object;
+}	// FactoryObject::removeIdFromPendingList
+
+// ----------------------------------------------------------------------
+
+/**
+ * Gets the number of objects in our object list.
+ *
+ * @return the list count
+ */
+int FactoryObject::getObjectListCount() const
+{
+	return DynamicVariableList::NestedList(getObjVars(),OBJVAR_OBJECT_LIST).getCount();
+}	// FactoryObject::getObjectListCount
+
+// ----------------------------------------------------------------------
+
+/**
+ * Gets the number of objects in our pending list.
+ *
+ * @return the list count
+ */
+int FactoryObject::getPendingListCount() const
+{
+	return DynamicVariableList::NestedList(getObjVars(),OBJVAR_PENDING_LIST).getCount();
+}	// FactoryObject::getPendingListCount
+
+// ----------------------------------------------------------------------
+
+const std::string & FactoryObject::getAppearanceData() const
+{
+	static const std::string emptyString;
+	static std::string result;
+
+	if (!getObjVars().getItem(OBJVAR_APPEARANCE_DATA,result))
+		return emptyString;
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the custom appearance objects made by this schematic will use.
+ *
+ * @return the appearance filename
+ */
+const std::string & FactoryObject::getItemCustomAppearance() const
+{
+	static const std::string emptyString;
+	static std::string result;
+
+	if (!getObjVars().getItem(OBJVAR_CUSTOM_APPEARANCE,result))
+		return emptyString;
+
+	return result;
+}	// FactoryObject::getItemCustomAppearance
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the draft schematic name crc for the schematic used to define this
+ * schematic.
+ *
+ * @return the schematic crc
+ */
+uint32 FactoryObject::getDraftSchematic() const
+{
+	int result = 0;
+	getObjVars().getItem(OBJVAR_DRAFT_SCHEMATIC, result);
+	return result;
+}	// FactoryObject::getDraftSchematic
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns an ingredient slot needed to manufacture an item with this schematic.
+ *
+ * @param index				slot to get
+ * @param data				structure to be filled in with the slot data
+ * @param creatingObject	flag that we are getting the slot in order to create
+ *							a crafted object; should always be true
+ *
+ * @return true on success, false if the index was out of range
+ */
+bool FactoryObject::getSlot(int index, Crafting::IngredientSlot & data, bool creatingObject) const
+{
+	UNREF(index);
+	UNREF(data);
+	UNREF(creatingObject);
+
+	WARNING_STRICT_FATAL(true, ("FactoryObject::getSlot called for object %s. This should never happen!",
+		getNetworkId().getValueString().c_str()));
+	return false;
+}	// FactoryObject::getSlot
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the number of ingredient slots needed to manufacture an item with
+ * this schematic.
+ *
+ * @return the ingredient count (always 0, since we don't need slot data)
+ */
+int FactoryObject::getSlotsCount() const
+{
+	return 0;
+}	// FactoryObject::getSlotsCount
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the list of attributes for the object this factory makes.
+ */
+const std::map<StringId, float> & FactoryObject::getAttributes() const
+{
+	return m_attributes.getMap();
+}	// FactoryObject::getAttributes
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the value for an attribute of the schematic
+ *
+ * @param attribute		the attribute data
+ */
+void FactoryObject::setAttribute(const ServerIntangibleObjectTemplate::SchematicAttribute & attribute)
+{
+	setAttribute(attribute.name, static_cast<float>(attribute.value));
+}	// FactoryObject::setAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the value for an attribute of the schematic
+ *
+ * @param name		the attribute name
+ * @param value		the attribute value
+ */
+void FactoryObject::setAttribute(const StringId & name, float value)
+{
+static const StringId XP_ATTRIB("crafting", "xp");
+
+	if (isAuthoritative())
+	{
+		if (name == XP_ATTRIB)
+			value = 0;
+		m_attributes.set(name, value);
+		setObjVarItem(OBJVAR_ATTRIBUTES + "." + name.getCanonicalRepresentation(), value);
+	}
+	else
+	{
+		WARNING_STRICT_FATAL(true, ("FactoryObject::setAttribute called on "
+			"non-auth object %s", getNetworkId().getValueString().c_str()));
+	}
+}	// FactoryObject::setAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * This is a dummy function needed for compatability with the
+ * ManufactureSchematicObject. Note that unlike the other dummy functions,
+ * this will get legitimately called while making an object, but the data
+ * won't be used.
+ */
+const std::map<StringId, float> & FactoryObject::getResourceMaxAttributes() const
+{
+static const AttribMap dummy;
+
+	return dummy;
+}	// FactoryObject::getResourceMaxAttributes
+
+//-----------------------------------------------------------------------
+
+/**
+ * This is a dummy function needed for compatability with the
+ * ManufactureSchematicObject.
+ */
+void FactoryObject::setResourceMaxAttribute(const StringId & name, float value)
+{
+	UNREF(name);
+	UNREF(value);
+
+	WARNING_STRICT_FATAL(true, ("FactoryObject::setResourceMaxAttribute "
+		"called for object %s. This should never happen!",
+		getNetworkId().getValueString().c_str()));
+}	// FactoryObject::setResourceMaxAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * This is a dummy function needed for compatability with the
+ * ManufactureSchematicObject.
+ */
+const std::vector<StringId> & FactoryObject::getExperimentAttributeNames() const
+{
+static const StringIdList dummy;
+
+	WARNING_STRICT_FATAL(true, ("FactoryObject::getExperimentAttributeNames "
+		"called for object %s. This should never happen!",
+		getNetworkId().getValueString().c_str()));
+	return dummy;
+}	// FactoryObject::getExperimentAttributeNames
+
+//-----------------------------------------------------------------------
+
+/**
+ * This is a dummy function needed for compatability with the
+ * ManufactureSchematicObject.
+ */
+void FactoryObject::setExperimentAttribute(const StringId & name, float value)
+{
+	UNREF(name);
+	UNREF(value);
+
+	WARNING_STRICT_FATAL(true, ("FactoryObject::setExperimentAttribute "
+		"called for object %s. This should never happen!",
+		getNetworkId().getValueString().c_str()));
+}	// FactoryObject::setExperimentAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * This is a dummy function needed for compatability with the
+ * ManufactureSchematicObject.
+ */
+void FactoryObject::getAllExperimentAttributeValues(const StringId & name,
+	float & value, float & minValue, float & maxValue, float & resourceMaxValue) const
+{
+	UNREF(name);
+	UNREF(value);
+	UNREF(minValue);
+	UNREF(maxValue);
+	UNREF(resourceMaxValue);
+
+	WARNING_STRICT_FATAL(true, ("FactoryObject::getAllExperimentAttributeValues "
+		"called for object %s. This should never happen!",
+		getNetworkId().getValueString().c_str()));
+}	// FactoryObject::getAllExperimentAttributeValues
+
+//-----------------------------------------------------------------------
+
+/**
+ * This is a dummy function needed for compatability with the
+ * ManufactureSchematicObject.
+ */
+void FactoryObject::setExperimentAttributeLimits(const StringId & name,
+	float minValue, float maxValue, float resourceMaxValue)
+{
+	UNREF(name);
+	UNREF(minValue);
+	UNREF(maxValue);
+	UNREF(resourceMaxValue);
+
+	WARNING_STRICT_FATAL(true, ("FactoryObject::setExperimentAttributeLimits "
+		"called for object %s. This should never happen!",
+		getNetworkId().getValueString().c_str()));
+}	// FactoryObject::setExperimentAttributeLimits
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns if we are creating a finished item or a prototype.
+ *
+ * @return true (we always make finished items)
+ */
+bool FactoryObject::isMakingObject(void) const
+{
+	return true;
+}	// FactoryObject::isMakingObject
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns our network id. Needed so that the ManufactureObjectInterface can 
+ * report its id.
+ *
+ * @return our network id
+ */
+const NetworkId & FactoryObject::getDerivedNetworkId() const
+{
+	return getNetworkId();
+}	// FactoryObject::getDerivedNetworkId
+
+//-----------------------------------------------------------------------
+
+/**
+ * Makes a copy of this factory.
+ *
+ * @param destination		where to create the copy (should be a volume container)
+ * @param count				how many items the new factory will be set to have;
+ *							items added to the new factory will be removed from
+ *							this one
+ * @param destroySource		flag that we should destroy ourself if all our items
+ *							are being moved to the copy
+ *
+ * @return the new factory
+ */
+FactoryObject * FactoryObject::makeCopy(ServerObject & destination, int count,
+	bool destroySource)
+{
+	if (!isFactoryOk())
+		return NULL;
+
+	// don't allow making a copy if we are an old crate
+	if (!getLoadContents())
+	{
+		Unicode::String oob;
+		{
+			ProsePackage pp;
+			ProsePackageManagerServer::createSimpleProsePackage (*this, 
+				STRING_ID_CANT_SPLIT, pp);
+			OutOfBandPackager::pack(pp, -1, oob);
+		}
+		const Object * const owner = NetworkIdManager::getObjectById(getOwnerId());
+		if (owner != NULL)
+		{
+			Chat::sendSystemMessage(*(owner->asServerObject()), Unicode::emptyString, oob);
+		}
+		return NULL;
+	}
+
+	if (count <= 0)
+	{
+		WARNING_STRICT_FATAL(true, ("FactoryObject::makeCopy %s passed invalid "
+			"count %d", getNetworkId().getValueString().c_str(), count));
+		return NULL;
+	}
+	if (count > getCount())
+	{
+		WARNING_STRICT_FATAL(true, ("FactoryObject::makeCopy %s given count %d "
+			"that is > than our count %d", getNetworkId().getValueString().c_str(),
+			count, getCount()));
+		return NULL;
+	}
+
+	VolumeContainer *destVolumeContainer = ContainerInterface::getVolumeContainer(destination);
+	
+	if (destVolumeContainer == NULL)
+	{
+		WARNING_STRICT_FATAL(true, ("FactoryObject::makeCopy %s passed "
+			"destination %s that is not a volume container",
+			getNetworkId().getValueString().c_str(),
+			destination.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+
+	// create the new factory
+	if (safe_cast<const ServerObjectTemplate *>(getObjectTemplate()) == NULL)
+	{
+		WARNING_STRICT_FATAL(true, ("FactoryObject::makeCopy: %s has no object template!", getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	FactoryObject * newFactory = safe_cast<FactoryObject *>(ServerWorld::createNewObject(
+		*safe_cast<const ServerObjectTemplate *>(getObjectTemplate()), destination,
+		false));
+	if (newFactory == NULL)
+	{
+		WARNING_STRICT_FATAL(true, ("FactoryObject::makeCopy %s could not create "
+			"the new factory", getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+
+	// copy our objvars and scripts to the new factory
+	{
+	const DynamicVariableList & list = getObjVars();
+	for (DynamicVariableList::MapType::const_iterator i = list.begin();
+		i != list.end(); ++i)
+	{
+		const std::string & name = (*i).first;
+		newFactory->copyObjVars(name, *this, name);
+	}
+	}
+
+	{
+	const ScriptList & sourceScripts = getScriptObject()->getScripts();
+	for (ScriptList::const_iterator i = sourceScripts.begin(); i != sourceScripts.end(); ++i)
+		newFactory->getScriptObject()->attachScript((*i).getScriptName(), false);
+	}
+
+	// copy other data
+	newFactory->setCraftedId(getCraftedId());
+	newFactory->setOwnerId(getOwnerId());
+
+	if (getCreatorId() != NetworkId::cms_invalid)
+		newFactory->setCreatorId(getCreatorId());
+	else
+		newFactory->setCreatorId(getOwnerId());
+
+	if (!getAssignedObjectName().empty())
+		newFactory->setObjectName(getAssignedObjectName());
+
+	// update the new factory's attributes
+	{
+	const DynamicVariableList::NestedList attributes(getObjVars(), OBJVAR_ATTRIBUTES);
+	for (DynamicVariableList::NestedList::const_iterator i = attributes.begin();
+		i != attributes.end(); ++i)
+	{
+		float value;
+		i.getValue(value);
+		newFactory->setAttribute(StringId(i.getName()), value);
+	}
+	}
+
+	// move items from us to the new factory
+	if (count == getCount())
+	{
+		// move our contained object to the new factory, and delete ourself if
+		// we aren't already being deleted
+		const TangibleObject * object = FactoryObject::getContainedObject();
+		if (object != NULL)
+		{
+			Container::ContainerErrorCode error;
+			ContainerInterface::transferItemToVolumeContainer(*newFactory,
+				*const_cast<TangibleObject *>(object), NULL, error);
+			newFactory->setCount(count);
+			setCount(0);
+			if (destroySource && !isBeingDestroyed())
+				permanentlyDestroy(DeleteReasons::Consumed);
+		}
+	}
+	else
+	{
+		if (newFactory->addObject())
+		{
+			newFactory->setCount(count);
+			setCount(getCount() - count);
+			IGNORE_RETURN(destVolumeContainer->recalculateVolume());
+		}
+		else
+		{
+			newFactory->permanentlyDestroy(DeleteReasons::SetupFailed);
+			newFactory = NULL;
+		}
+	}
+	return newFactory;
+}	// FactoryObject::makeCopy
+
+//-----------------------------------------------------------------------
+
+void FactoryObject::getAttributes(AttributeVector & data) const
+{
+	TangibleObject::getAttributes(data);
+
+	char valueBuffer[32];
+  	const size_t valueBuffer_size = sizeof (valueBuffer);
+
+	snprintf(valueBuffer, valueBuffer_size, "%i", getCount());
+	data.push_back(std::make_pair(SharedObjectAttributes::factory_count, Unicode::narrowToWide(valueBuffer)));
+
+	//-- show manufactured object attribs
+	data.push_back(std::make_pair(SharedObjectAttributes::factory_attribs, Unicode::narrowToWide("\\#pcontrast2 ----------\\#.")));
+
+	if (!getLoadContents())
+	{
+		// old-style crate
+		retrieveStoredObjectAttributes (data);
+	}
+	else
+	{
+		// new-style crate
+		const ServerObject * const storedObject = getContainedObject();
+		if (storedObject != NULL)
+		{
+			data.reserve (data.size () + 2);
+
+			data.push_back(std::make_pair(SharedObjectAttributes::object_type, 
+				Unicode::narrowToWide ("@") + Unicode::narrowToWide (GameObjectTypes::getStringId (storedObject->getGameObjectType ()).getCanonicalRepresentation ())));
+		
+			const Unicode::String & originalName = Unicode::narrowToWide ("@") + Unicode::narrowToWide (storedObject->getObjectNameStringId ().getCanonicalRepresentation ());
+
+			if (storedObject->asCreatureObject ())
+				data.push_back (std::make_pair (SharedObjectAttributes::original_name_creature, originalName));
+			else
+				data.push_back (std::make_pair (SharedObjectAttributes::original_name, originalName));
+
+			storedObject->getAttributes(getOwnerId(), data);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverGame/src/shared/object/FactoryObject.h b/engine/server/library/serverGame/src/shared/object/FactoryObject.h
new file mode 100644
index 00000000..70b87afd
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/FactoryObject.h
@@ -0,0 +1,112 @@
+// ======================================================================
+//
+// FactoryObject.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_FactoryObject_H
+#define INCLUDED_FactoryObject_H
+
+#include "serverGame/ManufactureObjectInterface.h"
+#include "serverGame/TangibleObject.h"
+#include "Archive/AutoDeltaMap.h"
+
+
+class ServerFactoryObjectTemplate;
+
+
+class FactoryObject : public TangibleObject, public ManufactureObjectInterface
+{
+public:
+	typedef std::map<StringId, float> AttribMap;
+	typedef std::vector<StringId>     StringIdList;
+
+	explicit FactoryObject(const ServerFactoryObjectTemplate* newTemplate);
+	virtual ~FactoryObject();
+
+	void                   initialize(const ManufactureSchematicObject & source);
+	void                   calculateAttributes();
+
+	bool                   isFactoryOk() const;
+
+	static void            removeDefaultTemplate(void);
+	virtual bool           canDestroy() const;
+	virtual void           onContainerTransfer(ServerObject * destination, ServerObject* transferer);
+
+	virtual Controller*    createDefaultController(void);
+	void                   addMembersToPackages   ();
+	virtual void           getAttributes          (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+
+	bool                   startCraftingSession(ManufactureSchematicObject & schematic);	
+	bool                   endCraftingSession();
+	bool                   resetCraftingSession();
+	bool                   inCraftingSession() const;
+	bool                   removeCraftingReferences(int count);
+	bool                   addCraftingReferences(int count);
+
+	bool                   addObject();
+	bool                   removeObject(ServerObject & destination);
+	int                    deleteContents(int count);
+	bool                   transferObjects(FactoryObject & toCrate, int objectCount);
+	FactoryObject *        makeCopy(ServerObject & destination, int count, bool destroySource = true);
+
+	virtual void           onContainedObjectLoaded(const NetworkId &oid);
+
+	const char *           getContainedTemplateName() const;
+	const char *           getContainedSharedTemplateName() const;
+	const ObjectTemplate * getContainedObjectTemplate() const;
+	const TangibleObject * getContainedObject() const;
+
+	const std::string &    getAppearanceData() const;
+	const std::string &    getItemCustomAppearance() const;
+
+	// ManufactureObjectInterface functions
+	virtual uint32               getDraftSchematic() const;
+	virtual bool                 getSlot(int index, Crafting::IngredientSlot & data, bool flag) const;
+	virtual int                  getSlotsCount() const;
+	virtual const AttribMap &    getAttributes() const;
+	virtual void                 setAttribute(const ServerIntangibleObjectTemplate::SchematicAttribute & attribute);
+	virtual void                 setAttribute(const StringId & name, float value);
+	virtual const AttribMap &    getResourceMaxAttributes() const;
+	virtual void                 setResourceMaxAttribute(const StringId & name, float value);
+	virtual const StringIdList & getExperimentAttributeNames() const;
+	virtual void                 setExperimentAttribute(const StringId & name, float value);
+	virtual void                 getAllExperimentAttributeValues(const StringId & name, float & value, float & minValue, float & maxValue, float & resourceMaxValue) const;
+	virtual void                 setExperimentAttributeLimits(const StringId & name, float minValue, float maxValue, float resourceMaxValue);
+	virtual bool                 isMakingObject(void) const;
+	virtual const NetworkId &    getDerivedNetworkId() const;
+
+protected:
+	virtual void        initializeFirstTimeObject();
+	virtual void        endBaselines();
+	virtual void        onLoadedFromDatabase();
+
+	virtual const SharedObjectTemplate *  getDefaultSharedTemplate(void) const;
+
+private:
+  	FactoryObject();
+	FactoryObject(const FactoryObject& rhs);
+	FactoryObject&	operator=(const FactoryObject& rhs);
+
+	TangibleObject *  manufactureObject();
+	void              addIdToObjectList(const NetworkId & id);
+	const NetworkId   removeIdFromObjectList(void);
+	void              addIdToPendingList(const NetworkId & id, const ServerObject & destination);
+	ServerObject *    removeIdFromPendingList(const NetworkId & id);
+	int               getPendingListCount() const;
+	int               getObjectListCount() const;
+
+private:
+	static const SharedObjectTemplate * m_defaultSharedTemplate;    // template to use if no shared template is given
+	
+	mutable bool m_badFactoryLogged;    // keep track if we've logged that this factory is bad to reduce spam
+
+	// manf schematic data for creating new objects
+	Archive::AutoDeltaMap<StringId, float> m_attributes;
+	Archive::AutoDeltaVariable<CachedNetworkId> m_craftingSchematic;     // the schematic being used during a crafting session
+	Archive::AutoDeltaVariable<int>        m_craftingCount;         // the number of our objects being used in the schematic
+};
+
+
+#endif	// INCLUDED_FactoryObject_H
diff --git a/engine/server/library/serverGame/src/shared/object/GroupIdObserver.cpp b/engine/server/library/serverGame/src/shared/object/GroupIdObserver.cpp
new file mode 100644
index 00000000..50373712
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/GroupIdObserver.cpp
@@ -0,0 +1,47 @@
+// ======================================================================
+//
+// GroupIdObserver.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/GroupIdObserver.h"
+
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+
+// ======================================================================
+
+GroupIdObserver::GroupIdObserver(CreatureObject *who, Archive::AutoDeltaObserverOp operation) :
+	m_profilerBlock("GroupIdObserver"),
+	m_pvpObserver(who, operation),
+	m_creature(who),
+	m_group(who->getGroup())
+{
+}
+
+// ----------------------------------------------------------------------
+
+GroupIdObserver::~GroupIdObserver()
+{
+	if (m_group && m_creature->getGroup() != m_group)
+		m_group->removeGroupMember(m_creature->getNetworkId());
+
+	if (m_creature->getGroup() != NULL)
+	{
+		PlayerObject *playerObject = PlayerCreatureController::getPlayerObject(m_creature);
+
+		if ((playerObject != NULL) &&
+		    playerObject->isLookingForGroup())
+		{
+			playerObject->setLookingForGroup(false);
+		}
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/GroupIdObserver.h b/engine/server/library/serverGame/src/shared/object/GroupIdObserver.h
new file mode 100644
index 00000000..4907e4d5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/GroupIdObserver.h
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// GroupIdObserver.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _GroupIdObserver_H_
+#define _GroupIdObserver_H_
+
+#include "Archive/AutoDeltaObserverOps.h"
+#include "serverGame/PvpUpdateObserver.h"
+#include "sharedDebug/Profiler.h"
+
+// ======================================================================
+
+class CreatureObject;
+class GroupObject;
+
+// ======================================================================
+
+class GroupIdObserver
+{
+public:
+	GroupIdObserver(CreatureObject *who, Archive::AutoDeltaObserverOp operation);
+	~GroupIdObserver();
+
+private:
+	GroupIdObserver(GroupIdObserver const &);
+	GroupIdObserver& operator=(GroupIdObserver const &);
+
+private:
+	ProfilerAutoBlock m_profilerBlock;
+	PvpUpdateObserver m_pvpObserver;
+	CreatureObject *m_creature;
+	GroupObject *m_group;
+};
+
+// ======================================================================
+
+#endif // _GroupIdObserver_H_
+
diff --git a/engine/server/library/serverGame/src/shared/object/GroupMissionCriticalObjectsBuilder.cpp b/engine/server/library/serverGame/src/shared/object/GroupMissionCriticalObjectsBuilder.cpp
new file mode 100644
index 00000000..fe2a493c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/GroupMissionCriticalObjectsBuilder.cpp
@@ -0,0 +1,124 @@
+// ======================================================================
+//
+// GroupMissionCriticalObjectsBuilder.cpp
+// asommers
+//
+// copyright 2004, sony online entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/GroupMissionCriticalObjectsBuilder.h"
+
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GroupObject.h"
+#include "sharedObject/NetworkIdManager.h"
+
+// ======================================================================
+
+namespace GroupMissionCriticalObjectsBuilderNamespace
+{
+	void buildGroupMissionCriticalObjects(GroupObject const & groupObject, CreatureObject::GroupMissionCriticalObjectSet & groupMissionCriticalObjects);
+	void buildGroupMissionCriticalObjects(CreatureObject const & creatureObject, CreatureObject::GroupMissionCriticalObjectSet & groupMissionCriticalObjects);
+	void updateGroupMissionCriticalObjects(GroupObject const & groupObject, CreatureObject::GroupMissionCriticalObjectSet const & groupMissionCriticalObjects);
+	void updateGroupMissionCriticalObjects(CreatureObject & creatureObject, CreatureObject::GroupMissionCriticalObjectSet const & groupMissionCriticalObjects);
+}
+
+using namespace GroupMissionCriticalObjectsBuilderNamespace;
+
+// ======================================================================
+// GroupMissionCriticalObjectsBuilderNamespace
+// ======================================================================
+
+void GroupMissionCriticalObjectsBuilderNamespace::buildGroupMissionCriticalObjects(GroupObject const & groupObject, CreatureObject::GroupMissionCriticalObjectSet & groupMissionCriticalObjects)
+{
+	GroupObject::GroupMemberVector const & groupMemberVector = groupObject.getGroupMembers();
+	for (GroupObject::GroupMemberVector::const_iterator groupMemberVectorIter = groupMemberVector.begin(); groupMemberVectorIter != groupMemberVector.end(); ++groupMemberVectorIter)
+	{
+		Object const * const object = NetworkIdManager::getObjectById(groupMemberVectorIter->first);
+		if (!object)
+			continue;
+
+		ServerObject const * serverObject = object->asServerObject();
+		if (!serverObject)
+			continue;
+
+		CreatureObject const * const creatureObject = serverObject->asCreatureObject();
+		if (!creatureObject)
+			continue;
+
+		buildGroupMissionCriticalObjects(*creatureObject, groupMissionCriticalObjects);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupMissionCriticalObjectsBuilderNamespace::buildGroupMissionCriticalObjects(CreatureObject const & creatureObject, CreatureObject::GroupMissionCriticalObjectSet & groupMissionCriticalObjects)
+{
+	CreatureObject::MissionCriticalObjectSet const & missionCriticalObjects = creatureObject.getMissionCriticalObjects();
+	for (CreatureObject::MissionCriticalObjectSet::const_iterator missionCriticalObjectsIter = missionCriticalObjects.begin(); missionCriticalObjectsIter != missionCriticalObjects.end(); ++missionCriticalObjectsIter)
+		groupMissionCriticalObjects.insert(std::make_pair(creatureObject.getNetworkId(), *missionCriticalObjectsIter));
+}
+
+// ----------------------------------------------------------------------
+
+void GroupMissionCriticalObjectsBuilderNamespace::updateGroupMissionCriticalObjects(GroupObject const & groupObject, CreatureObject::GroupMissionCriticalObjectSet const & groupMissionCriticalObjects)
+{
+	GroupObject::GroupMemberVector const & groupMemberVector = groupObject.getGroupMembers();
+	for (GroupObject::GroupMemberVector::const_iterator groupMemberVectorIter = groupMemberVector.begin(); groupMemberVectorIter != groupMemberVector.end(); ++groupMemberVectorIter)
+	{
+		Object * const object = NetworkIdManager::getObjectById(groupMemberVectorIter->first);
+		if (!object)
+			continue;
+
+		ServerObject * serverObject = object->asServerObject();
+		if (!serverObject)
+			continue;
+
+		CreatureObject * const creatureObject = serverObject->asCreatureObject();
+		if (!creatureObject)
+			continue;
+
+		updateGroupMissionCriticalObjects(*creatureObject, groupMissionCriticalObjects);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupMissionCriticalObjectsBuilderNamespace::updateGroupMissionCriticalObjects(CreatureObject & creatureObject, CreatureObject::GroupMissionCriticalObjectSet const & groupMissionCriticalObjects)
+{
+	if (creatureObject.isAuthoritative())
+		creatureObject.setGroupMissionCriticalObjects(groupMissionCriticalObjects);
+}
+
+// ======================================================================
+// PUBLIC GroupMissionCriticalObjectsBuilder
+// ======================================================================
+
+void GroupMissionCriticalObjectsBuilder::updateGroupMissionCriticalObjects(GroupObject const & groupObject)
+{
+	CreatureObject::GroupMissionCriticalObjectSet groupMissionCriticalObjects;
+	buildGroupMissionCriticalObjects(groupObject, groupMissionCriticalObjects);
+	GroupMissionCriticalObjectsBuilderNamespace::updateGroupMissionCriticalObjects(groupObject, groupMissionCriticalObjects);
+}
+
+// ----------------------------------------------------------------------
+
+void GroupMissionCriticalObjectsBuilder::updateGroupMissionCriticalObjects(CreatureObject & creatureObject, bool const updateGroup)
+{
+	GroupObject const * const groupObject = creatureObject.getGroup();
+	if (groupObject && updateGroup)
+	{
+		CreatureObject::GroupMissionCriticalObjectSet groupMissionCriticalObjects;
+		buildGroupMissionCriticalObjects(*groupObject, groupMissionCriticalObjects);
+		GroupMissionCriticalObjectsBuilderNamespace::updateGroupMissionCriticalObjects(*groupObject, groupMissionCriticalObjects);
+	}
+	else
+	{
+		CreatureObject::GroupMissionCriticalObjectSet groupMissionCriticalObjects;
+		buildGroupMissionCriticalObjects(creatureObject, groupMissionCriticalObjects);
+		GroupMissionCriticalObjectsBuilderNamespace::updateGroupMissionCriticalObjects(creatureObject, groupMissionCriticalObjects);
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/GroupMissionCriticalObjectsBuilder.h b/engine/server/library/serverGame/src/shared/object/GroupMissionCriticalObjectsBuilder.h
new file mode 100644
index 00000000..6e924bc5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/GroupMissionCriticalObjectsBuilder.h
@@ -0,0 +1,31 @@
+// ======================================================================
+//
+// GroupMissionCriticalObjectsBuilder.h
+// asommers
+//
+// copyright 2004, sony online entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_GroupMissionCriticalObjectsBuilder_H
+#define INCLUDED_GroupMissionCriticalObjectsBuilder_H
+
+// ======================================================================
+
+class CreatureObject;
+class GroupObject;
+class NetworkId;
+
+// ======================================================================
+
+class GroupMissionCriticalObjectsBuilder
+{
+public:
+
+	static void updateGroupMissionCriticalObjects(GroupObject const & groupObject);
+	static void updateGroupMissionCriticalObjects(CreatureObject & creatureObject, bool updateGroup);
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/GroupObject.cpp b/engine/server/library/serverGame/src/shared/object/GroupObject.cpp
new file mode 100644
index 00000000..d60e23be
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/GroupObject.cpp
@@ -0,0 +1,1490 @@
+// ======================================================================
+//
+// GroupObject.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/GroupObject.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/Chat.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/GroupController.h"
+#include "serverGame/GroupMissionCriticalObjectsBuilder.h"
+#include "serverGame/GroupWaypointBuilder.h"
+#include "serverGame/GroupStringId.h"
+#include "serverGame/ObjectTracker.h"
+#include "serverGame/ObserveTracker.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/GroupUpdateObserver.h"
+#include "serverGame/ServerGroupObjectTemplate.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ShipObject.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverNetworkMessages/GroupMemberParam.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/Crc.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/Controller.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/VolumeContainer.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+
+// ======================================================================
+
+SharedObjectTemplate const *GroupObject::m_defaultSharedTemplate = 0;
+
+// ======================================================================
+
+namespace GroupObjectNamespace
+{
+
+	// ----------------------------------------------------------------------
+
+	unsigned int const cs_maximumNumberInGroup = 8;
+	char const * const DEFAULT_GROUP_TEMPLATE = "object/group/group.iff";
+	std::map<NetworkId, NetworkId> s_leaderMap;
+	static const std::string cs_emptyString;
+
+	// ----------------------------------------------------------------------
+
+	std::string const &getChatRoomPrefix()
+	{
+		static std::string prefix = std::string("SWG.") + GameServer::getInstance().getClusterName() + ".group.";
+		return prefix;
+	}
+
+	// ----------------------------------------------------------------------
+
+	std::string const &getChatRoomSuffix()
+	{
+		static std::string suffix(".GroupChat");
+		return suffix;
+	}
+
+	// ----------------------------------------------------------------------
+
+
+}
+using namespace GroupObjectNamespace;
+
+// ======================================================================
+
+GroupObject::GroupObject(ServerGroupObjectTemplate const *newTemplate)
+: UniverseObject(newTemplate),
+m_groupName(),
+m_groupMembers(),
+m_groupShipFormationMembers(),
+m_groupPOBShipAndOwners(),
+m_groupLevel(),
+m_groupMemberLevels(),
+m_groupMemberProfessions(),
+m_formationNameCrc(Crc::crcNull),
+m_allMembers(),
+m_nonPCMembers(),
+m_lootMaster(),
+m_lootRule(0),
+m_groupPickupTimer(std::make_pair(0, 0)),
+m_groupPickupLocation(std::make_pair("", Vector()))
+{
+	m_groupMembers.setSourceObject(this);
+	m_groupShipFormationMembers.setSourceObject(this);
+	m_groupPOBShipAndOwners.setSourceObject(this);
+	m_lootMaster.setSourceObject(this);
+	addMembersToPackages();
+	ObjectTracker::addGroupObject();
+}
+
+// ----------------------------------------------------------------------
+
+GroupObject::~GroupObject()
+{
+	if (!GameServer::getInstance().getDone())
+	{
+		for (GroupMemberVector::const_iterator i = m_groupMembers.begin(); i != m_groupMembers.end(); ++i)
+			onGroupMemberRemoved((*i).first, true);
+	}
+
+	if (isInWorld())
+		removeFromWorld();
+	ObjectTracker::removeGroupObject();
+}
+
+// ----------------------------------------------------------------------
+
+Controller* GroupObject::createDefaultController()
+{
+	Controller* controller = new GroupController(this);
+	NOT_NULL(controller);
+
+	setController(controller);
+	return controller;
+}
+
+// ----------------------------------------------------------------------
+
+bool GroupObject::isVisibleOnClient(const Client &) const
+{
+	// Group objects are visible to all clients which are observing them, just which clients observe them
+	// are strictly managed to assure this.  See GroupUpdateObserver for how this is done.
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns a shared template if none was given for this object.
+ *
+ * @return the shared template
+ */
+const SharedObjectTemplate * GroupObject::getDefaultSharedTemplate() const
+{
+	static const ConstCharCrcLowerString templateName("object/group/base/shared_group_default.iff");
+
+	if (!m_defaultSharedTemplate)
+	{
+		m_defaultSharedTemplate = safe_cast<SharedObjectTemplate const *>(ObjectTemplateList::fetch(templateName));
+		WARNING_STRICT_FATAL(!m_defaultSharedTemplate, ("Cannot create default shared object template %s", templateName.getString()));
+		if (m_defaultSharedTemplate)
+			ExitChain::add(removeDefaultTemplate, "GroupObject::removeDefaultTemplate");
+	}
+	return m_defaultSharedTemplate;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Cleans up the default shared template.
+ */
+void GroupObject::removeDefaultTemplate()
+{
+	if (!m_defaultSharedTemplate)
+	{
+		m_defaultSharedTemplate->releaseReference();
+		m_defaultSharedTemplate = 0;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::addToLeaderMap(NetworkId const &leaderId, NetworkId const &groupId) // static
+{
+	s_leaderMap[leaderId] = groupId;
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::removeFromLeaderMap(NetworkId const &leaderId, NetworkId const &groupId) // static
+{
+	std::map<NetworkId, NetworkId>::iterator i = s_leaderMap.find(leaderId);
+	if (i != s_leaderMap.end() && (*i).second == groupId)
+		s_leaderMap.erase(i);
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId GroupObject::getGroupIdForLeader(NetworkId const &leaderId) // static
+{
+	NetworkId groupId = NetworkId::cms_invalid;
+
+	std::map<NetworkId, NetworkId>::iterator i = s_leaderMap.find(leaderId);
+	if (i != s_leaderMap.end())
+		groupId = (*i).second;
+
+	return groupId;
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::createAllGroupChatRooms() // static
+{
+	if (ServerUniverse::getInstance().isAuthoritative())
+	{
+		for (std::map<NetworkId, NetworkId>::const_iterator i = s_leaderMap.begin(); i != s_leaderMap.end(); ++i)
+		{
+			ServerObject const * const so = safe_cast<ServerObject const *>(NetworkIdManager::getObjectById((*i).second));
+			if (so)
+			{
+				GroupObject const * const groupObject = so->asGroupObject();
+				if (groupObject)
+					groupObject->createGroupChatRoom();
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+int GroupObject::maximumMembersInGroup()
+{
+	return cs_maximumNumberInGroup;
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::createGroup(GroupMemberParam const & leader, GroupMemberParamVector const & members)
+{
+	// If the leader already is leading a group, treat this as the specified member joining instead.
+	GroupObject *group = 0;
+
+	{
+		std::map<NetworkId, NetworkId>::const_iterator i = s_leaderMap.find(leader.m_memberId);
+		if (i != s_leaderMap.end())
+		{
+			Object *groupObj = NetworkIdManager::getObjectById((*i).second);
+			if (groupObj)
+			{
+				ServerObject *groupServerObj = groupObj->asServerObject();
+				if (groupServerObj)
+					group = groupServerObj->asGroupObject();
+			}
+		}
+	}
+
+	if (!group)
+	{
+		group = safe_cast<GroupObject *>(ServerWorld::createNewObject(DEFAULT_GROUP_TEMPLATE, Transform::identity, 0, false));
+		group->addToWorld();
+		group->addGroupMember(leader);
+		group->makeLootMaster(leader.m_memberId);
+	}
+
+	int const numberOfMembers = static_cast<int>(members.size());
+
+	for (int i = 0; i < numberOfMembers; ++i)
+	{
+		group->addGroupMember(members[i]);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::setupUniverse()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::getGroupMemberIds(std::vector<NetworkId> &members) const
+{
+	for (GroupMemberVector::const_iterator i = m_groupMembers.begin(); i != m_groupMembers.end(); ++i)
+		members.push_back((*i).first);
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const &GroupObject::getGroupLeaderId() const
+{
+	if (m_groupMembers.size())
+		return (*m_groupMembers.begin()).first;
+	return NetworkId::cms_invalid;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const &GroupObject::getGroupLeaderName() const
+{
+	static std::string nullStr;
+	if (m_groupMembers.size())
+		return (*m_groupMembers.begin()).second;
+	return nullStr;
+}
+
+// ----------------------------------------------------------------------
+
+bool GroupObject::isGroupFull() const
+{
+	return m_groupMembers.size() == cs_maximumNumberInGroup;
+}
+
+// ----------------------------------------------------------------------
+
+int GroupObject::getPCMemberCount() const
+{
+	if (m_groupMembers.size() > m_nonPCMembers.size())
+		return static_cast<int>(m_groupMembers.size() - m_nonPCMembers.size());
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+bool GroupObject::isMemberPC(NetworkId const & memberId) const
+{
+	return !m_nonPCMembers.contains(memberId);
+}
+
+// ----------------------------------------------------------------------
+
+bool GroupObject::doesGroupHaveRoomFor(int additionalMembers) const
+{
+	additionalMembers = std::max(0, additionalMembers);
+	return (m_groupMembers.size() + additionalMembers) <= cs_maximumNumberInGroup;
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::makeLeader(NetworkId const &newLeaderId)
+{
+	if (!isMemberPC(newLeaderId))
+	{
+		return;
+	}
+
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_groupMakeLeader,
+				0.0f,
+				new MessageQueueGenericValueType<NetworkId>(newLeaderId),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		// swap the specified person with the first person in the group
+		for (unsigned int pos = 1; pos < m_groupMembers.size(); ++pos)
+		{
+			if (m_groupMembers.get(pos).first == newLeaderId)
+			{
+				GroupUpdateObserver updater(this, Archive::ADOO_generic);
+				GroupMember tempMember = m_groupMembers.get(pos);
+				m_groupMembers.set(pos, m_groupMembers.get(0));
+				m_groupMembers.set(0, tempMember);
+
+				int16 tempMemberLevel = m_groupMemberLevels.get(pos);
+				m_groupMemberLevels.set(pos, m_groupMemberLevels.get(0));
+				m_groupMemberLevels.set(0, tempMemberLevel);
+
+				uint8 tempMemberProfession = m_groupMemberProfessions.get(pos);
+				m_groupMemberProfessions.set(pos, m_groupMemberProfessions.get(0));
+				m_groupMemberProfessions.set(0, tempMemberProfession);
+
+				GroupShipFormationMember tempMemberShip = m_groupShipFormationMembers.get(pos);
+				m_groupShipFormationMembers.set(pos, m_groupShipFormationMembers.get(0));
+				m_groupShipFormationMembers.set(0, tempMemberShip);
+
+				break;
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::setGroupName(std::string const &groupName)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_groupSetName,
+				0.0f,
+				new MessageQueueGenericValueType<std::string>(groupName),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		m_groupName = groupName;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::addGroupMember(GroupMemberParam const & member)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_groupAddMember,
+				0.0f,
+				new MessageQueueGenericValueType<GroupMemberParam>(member),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		if (isGroupFull())
+		{
+			Chat::sendSystemMessage(member.m_memberName, GroupStringId::SID_GROUP_JOIN_FULL, Unicode::String());
+			return;
+		}
+
+		// Don't try to add someone if they are already a member
+		if (isGroupMember(member.m_memberId))
+		{
+			return;
+		}
+
+		GroupUpdateObserver updater(this, Archive::ADOO_generic);
+
+		m_groupMembers.push_back(std::make_pair(member.m_memberId, member.m_memberName));
+		
+		m_allMembers.insert(member.m_memberId);
+		if (!member.m_memberIsPC)
+			m_nonPCMembers.insert(member.m_memberId);
+
+		m_groupShipFormationMembers.push_back(std::make_pair(member.m_memberShipId, m_groupShipFormationMembers.size()));
+
+		if ((member.m_memberShipId.isValid()) && (member.m_memberShipIsPOB) && (member.m_memberOwnsPOB))
+		{
+			bool POBShipIsAdded = false;
+			int const numberOfGroupPOBShipAndOwners = m_groupPOBShipAndOwners.size();
+
+			for (int i = 0; i < numberOfGroupPOBShipAndOwners; ++i)
+			{
+				if (m_groupPOBShipAndOwners[i].first == member.m_memberShipId)
+				{
+					POBShipIsAdded = true;
+				}
+			}
+			
+			if (!POBShipIsAdded)
+			{
+				m_groupPOBShipAndOwners.push_back(std::make_pair(member.m_memberShipId, member.m_memberId));
+			}
+		}
+
+		m_groupMemberLevels.push_back(static_cast<int16>(member.m_memberDifficulty));
+		m_groupMemberProfessions.push_back(static_cast<uint8>(member.m_memberProfession));
+
+		calcGroupLevel();
+
+		if (m_groupMembers.size() == 1)
+			createGroupChatRoom();
+		addToGroupChatRoom(member.m_memberName);
+		addToGroupVoiceChatRoom(member.m_memberId, member.m_memberName);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+GroupMemberParam const GroupObject::createGroupMemberParamForMember(NetworkId const & memberId) const
+{
+	std::string const & memberName = getMemberName(memberId);
+	int const memberLevel = getMemberLevel(memberId);
+	LfgCharacterData::Profession const memberProfession = static_cast<LfgCharacterData::Profession>(getMemberProfession(memberId));
+	bool const memberIsPC = !m_nonPCMembers.contains(memberId);
+	NetworkId const & memberShipId = getMemberShip(memberId);
+	bool const memberShipIsPOB = memberShipId.isValid() && getShipIsPOB(memberShipId);
+	bool const memberOwnsPOB = memberShipId.isValid() && memberShipId == getPOBShipOwnedByMember(memberId);
+
+	return GroupMemberParam(memberId, memberName, memberLevel, memberProfession, memberIsPC, memberShipId, memberShipIsPOB, memberOwnsPOB);
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::removeGroupMember(NetworkId const &memberId)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_groupRemoveMember,
+				0.0f,
+				new MessageQueueGenericValueType<NetworkId>(memberId),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		GroupUpdateObserver updater(this, Archive::ADOO_generic);
+		for (unsigned int i = 0; i < m_groupMembers.size(); ++i)
+		{
+			GroupMember const & member = m_groupMembers.get(i);
+			if (member.first == memberId)
+			{
+				removeFromGroupChatRoom(member.second);
+				removeFromGroupVoiceChatRoom(memberId, member.second);
+
+				m_groupMembers.erase(i);
+				m_allMembers.erase(memberId);
+				m_nonPCMembers.erase(memberId);
+				m_groupShipFormationMembers.erase(i);
+				m_groupMemberLevels.erase(i);
+				m_groupMemberProfessions.erase(i);
+				calcGroupLevel();
+
+				for (unsigned int j = 0; j < m_groupPOBShipAndOwners.size(); ++j)
+				{
+					if (m_groupPOBShipAndOwners.get(j).second == memberId)
+					{
+						m_groupPOBShipAndOwners.erase(j);
+						break;
+					}
+				}
+				
+				break;
+			}
+		}
+
+		if (m_groupMembers.size() < 2)
+		{
+			disbandGroup();
+		}
+		else
+		{
+			NetworkId firstNonPet = getGroupLeaderId();
+
+			if (!isMemberPC(firstNonPet))
+			{
+				unsigned int const numberOfGroupMembers = m_groupMembers.size();
+
+				for (unsigned int i = 1; i < numberOfGroupMembers; ++i)
+				{
+					if (isMemberPC(m_groupMembers.get(i).first))
+					{
+						firstNonPet = m_groupMembers.get(i).first;
+						break;
+					}
+				}
+
+				if (isMemberPC(firstNonPet))
+				{
+					makeLeader(firstNonPet);
+				}
+			}
+
+			if (getLootMasterId() == memberId)
+			{
+				m_lootMaster = getGroupLeaderId();
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::disbandGroup()
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_groupDisband,
+				0.0f,
+				0,
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else if (!getKill())
+	{
+		for (unsigned int i = 0; i < m_groupMembers.size(); ++i)
+		{
+			GroupMember const & member = m_groupMembers.get(i);
+			removeFromGroupVoiceChatRoom(member.first, member.second);
+		}
+
+		permanentlyDestroy(DeleteReasons::Player);
+		m_groupMembers.clear();
+		m_allMembers.clear();
+		m_nonPCMembers.clear();
+		m_groupShipFormationMembers.clear();
+		m_groupPOBShipAndOwners.clear();
+		destroyGroupChatRoom();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+std::string GroupObject::getChatRoomPath() const
+{
+	return getChatRoomPrefix() + getNetworkId().getValueString() + getChatRoomSuffix();
+}
+
+// ----------------------------------------------------------------------
+
+std::string GroupObject::getVoiceChatDisplayName() const
+{
+	static std::string displayName("GroupChat");
+	return displayName;
+}
+
+// ----------------------------------------------------------------------
+
+std::string GroupObject::getChatName(std::string const &memberName) const
+{
+	std::string firstName;
+	size_t pos = 0;
+	Unicode::getFirstToken(memberName, 0, pos, firstName);
+	return firstName;
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::createGroupChatRoom() const
+{
+	if (ConfigServerGame::getDebugGroupChat())
+		LOG("GroupChat", ("Creating group chat room %s (group id %s)", getChatRoomPath().c_str(), getNetworkId().getValueString().c_str()));
+
+	Chat::createRoom("System", false, getChatRoomPath(), getNetworkId().getValueString());
+	
+	//TODO: temporary separation of voice and text
+	Chat::requestGetChannel(getChatRoomPath(), getVoiceChatDisplayName());
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::destroyGroupChatRoom() const
+{
+	if (ConfigServerGame::getDebugGroupChat())
+		LOG("GroupChat", ("Destroying group chat room %s (group id %s)", getChatRoomPath().c_str(), getNetworkId().getValueString().c_str()));
+
+	Chat::destroyRoom(getChatRoomPath());
+
+	Chat::requestDestroyChannel(getChatRoomPath());
+}
+
+// ----------------------------------------------------------------------
+
+bool GroupObject::chatRoomCreated() const
+{
+	return hasAttributeAttained(1);
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::setChatRoomCreated()
+{
+	setAttributeAttained(1);
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::addToGroupChatRoom(std::string const &memberName) const
+{
+	// note: if the room has not already been created, everyone will be added when the notification of its creation arrives.
+	if (chatRoomCreated() && memberName.find("(") == std::string::npos)
+	{
+		if (ConfigServerGame::getDebugGroupChat())
+			LOG("GroupChat", ("Invite and enter: member %s (group id %s), chat room %s", getChatName(memberName).c_str(), getNetworkId().getValueString().c_str(), getChatRoomPath().c_str()));
+		Chat::invite(getChatName(memberName), getChatRoomPath());
+		Chat::enterRoom(getChatName(memberName), getChatRoomPath(), false, false);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::addToGroupVoiceChatRoom(NetworkId const & memberId, std::string const & memberName) const
+{
+	//TODO: temporary separation of voice and text
+	Chat::requestAddClientToChannel(memberId, getChatName(memberName), getChatRoomPath(), true);
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::removeFromGroupChatRoom(std::string const &memberName) const
+{
+	if (memberName.find("(") == std::string::npos)
+	{
+		if (ConfigServerGame::getDebugGroupChat())
+			LOG("GroupChat", ("Exit and uninvite: member %s (group id %s), chat room %s", getChatName(memberName).c_str(), getNetworkId().getValueString().c_str(), getChatRoomPath().c_str()));
+		Chat::exitRoom(getChatName(memberName), getChatRoomPath());
+		Chat::uninvite(getChatName(memberName), getChatRoomPath());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::removeFromGroupVoiceChatRoom(NetworkId const & memberId, std::string const & memberName) const
+{
+	//TODO: temporary separation of voice and text
+	Chat::requestRemoveClientFromChannel(memberId, memberName, getChatRoomPath());
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::sendGroupChat(NetworkId const &memberId, Unicode::String const &text) const
+{
+	bool sent = false;
+	for (unsigned int i = 0; i < m_groupMembers.size(); ++i)
+	{
+		if (m_groupMembers.get(i).first == memberId)
+		{
+			sent = true;
+			if (ConfigServerGame::getDebugGroupChat())
+				LOG("GroupChat", ("sendGroupChat: member %s (group id %s), chat room %s, text %s", getChatName(m_groupMembers.get(i).second).c_str(), getNetworkId().getValueString().c_str(), getChatRoomPath().c_str(), Unicode::wideToNarrow(text).c_str()));
+			Chat::sendToRoom(getChatName(m_groupMembers.get(i).second), getChatRoomPath(), text, Unicode::String());
+		}
+	}
+
+	if (!sent && ConfigServerGame::getDebugGroupChat())
+		LOG("GroupChat", ("sendGroupChat could not find member id %s (group id %s)", memberId.getValueString().c_str(), getNetworkId().getValueString().c_str()));
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::onGroupChatRoomCreated()
+{
+	if (ConfigServerGame::getDebugGroupChat())
+		LOG("GroupChat", ("group chat room created (group id %s)", getNetworkId().getValueString().c_str()));
+
+	setChatRoomCreated();
+	for (unsigned int i = 0; i < m_groupMembers.size(); ++i)
+		addToGroupChatRoom(m_groupMembers.get(i).second);
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::onGroupVoiceChatRoomCreated()
+{
+	if (ConfigServerGame::getDebugGroupChat())
+		LOG("GroupChat", ("group voice chat room created (group id %s)", getNetworkId().getValueString().c_str()));
+
+	for (unsigned int i = 0; i < m_groupMembers.size(); ++i)
+	{
+		GroupMember const & member = m_groupMembers.get(i);
+		addToGroupVoiceChatRoom(member.first, member.second);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::onChatRoomCreate(std::string const &path) // static
+{
+	if (ConfigServerGame::getDebugGroupChat())
+		LOG("GroupChat", ("onChatRoomCreate (%s)", path.c_str()));
+
+	std::string const &prefix = getChatRoomPrefix();
+	// is it a group channel?
+	if (!path.compare(0, prefix.length(), prefix))
+	{
+		// it's a group channel, so extract the networkId
+		NetworkId id(path.substr(prefix.length(), path.length()-prefix.length()-getChatRoomSuffix().length()));
+		Object *obj = NetworkIdManager::getObjectById(id);
+		if (obj)
+		{
+			ServerObject *serverObject = obj->asServerObject();
+			if (serverObject)
+			{
+				GroupObject *groupObject = serverObject->asGroupObject();
+				if (groupObject && groupObject->isAuthoritative())
+					groupObject->onGroupChatRoomCreated();
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::onVoiceChatRoomCreate(std::string const &name) // static
+{
+	if (ConfigServerGame::getDebugGroupChat())
+		LOG("GroupChat", ("onVoiceChatRoomCreate (%s)", name.c_str()));
+
+	std::string const &prefix = getChatRoomPrefix();
+	// is it a group channel?
+	if (!name.compare(0, prefix.length(), prefix))
+	{
+		// it's a group channel, so extract the networkId
+		std::string strid = name.substr(prefix.length());
+		NetworkId id(strid);
+		Object *obj = NetworkIdManager::getObjectById(id);
+		if (obj)
+		{
+			ServerObject *serverObject = obj->asServerObject();
+			if (serverObject)
+			{
+				GroupObject *groupObject = serverObject->asGroupObject();
+				if (groupObject && groupObject->isAuthoritative())
+					groupObject->onGroupVoiceChatRoomCreated();
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+{
+	UniverseObject::getAttributes(data);
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::calcGroupLevel()
+{
+	FATAL(!isAuthoritative(), ("calcGroupLevel called on nonauth group"));
+
+	int maxPlayerLevel = 0;
+	int groupLevel = 0;
+
+	const unsigned int numMembers = m_groupMembers.size();
+
+	if (numMembers > 0)
+	{
+		for (unsigned int i = 0; i < numMembers; ++i)
+		{
+			if (isMemberPC(m_groupMembers.get(i).first))
+			{
+				const int memberLevel = m_groupMemberLevels.get(i);
+				maxPlayerLevel = (maxPlayerLevel < memberLevel) ? memberLevel : maxPlayerLevel;
+			}
+		}
+
+		groupLevel = maxPlayerLevel;
+	}
+
+	m_groupLevel = static_cast<int16>(groupLevel);
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::setMemberLevel(NetworkId const &memberId, int memberLevel)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_setGroupMemberDifficulty,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<NetworkId, int> >(std::make_pair(memberId, memberLevel)),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		for (unsigned int i = 0; i < m_groupMembers.size(); ++i)
+		{
+			if (m_groupMembers.get(i).first == memberId)
+			{
+				m_groupMemberLevels.set(i, static_cast<int16>(memberLevel));
+				calcGroupLevel();
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::setMemberProfession(NetworkId const &memberId, uint8 profession)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_setGroupMemberProfession,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<NetworkId, uint32> >(std::make_pair(memberId, static_cast<uint32>(profession))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		for (unsigned int i = 0; i < m_groupMembers.size(); ++i)
+		{
+			if (m_groupMembers.get(i).first == memberId)
+			{
+				m_groupMemberProfessions.set(i, profession);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::onGroupMemberConnect(NetworkId const &memberId)
+{
+	// try to add them to the group chat room again
+	for (unsigned int i = 0; i < m_groupMembers.size(); ++i)
+		if (m_groupMembers.get(i).first == memberId)
+		{
+			GroupMember const & member = m_groupMembers.get(i);
+			addToGroupChatRoom(member.second);
+			addToGroupVoiceChatRoom(member.first, member.second);
+		}
+}
+
+// ----------------------------------------------------------------------
+
+GroupObject *GroupObject::asGroupObject()
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+GroupObject const *GroupObject::asGroupObject() const
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::onGroupMemberRemoved(NetworkId const &memberId, bool disbanding)
+{
+	// have removed members with clients unobserve the group object, clear their group id, and get remove or disband messages
+	Object *o = NetworkIdManager::getObjectById(memberId);
+	if (o)
+	{
+		ServerObject *so = o->asServerObject();
+		if (so)
+		{
+			CreatureObject *creature = so->asCreatureObject();
+			if (creature && creature->isAuthoritative())
+			{
+				if (creature->getGroup() == this)
+				{
+					if (creature->getScriptObject())
+					{
+						ScriptParams scriptParams;
+						scriptParams.addParam(getNetworkId());
+						IGNORE_RETURN(creature->getScriptObject()->trigAllScripts(Scripting::TRIG_REMOVED_FROM_GROUP, scriptParams));
+						if (disbanding)
+						{
+							IGNORE_RETURN(creature->getScriptObject()->trigAllScripts(Scripting::TRIG_GROUP_DISBANDED, scriptParams));
+						}
+					}
+
+					creature->setGroup(0, disbanding);
+					Client *client = creature->getClient();
+					if (client)
+					{
+						ObserveTracker::onClientLeftGroup(*client, *this);
+						ProsePackage pp;
+						pp.stringId = disbanding ? GroupStringId::SID_GROUP_DISBANDED : GroupStringId::SID_GROUP_REMOVED;
+						Chat::sendSystemMessage(*creature, pp);
+					}
+
+					//-- Update just the creature.  The group will be updated in ~GroupMemberObserver
+					GroupMissionCriticalObjectsBuilder::updateGroupMissionCriticalObjects(*creature, false);
+					if (creature->isPlayerControlled())
+					{
+						PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(creature);
+						if (playerObject)
+							GroupWaypointBuilder::updateGroupWaypoints(*playerObject, false);
+					}
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::setFormationNameCrc(uint32 const formationNameCrc)
+{
+	m_formationNameCrc.set(formationNameCrc);
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::setShipForMember(NetworkId const & memberId, NetworkId const & shipId)
+{
+	if (isAuthoritative())
+	{
+		FATAL((m_groupMembers.size() != m_groupShipFormationMembers.size()), ("GroupObject::setShipForMember: m_groupMembers should always be the same size as m_groupShipFormationMembers"));
+
+		int const numberOfGroupMembers = m_groupMembers.size();
+
+		for (int i = 0; i < numberOfGroupMembers; ++i)
+		{
+			if (m_groupMembers[i].first == memberId)
+			{
+				GroupShipFormationMember data = m_groupShipFormationMembers[i];
+				data.first = shipId;
+				m_groupShipFormationMembers.set(i, data);
+				return;
+			}
+		}
+	}
+	else
+	{
+		Controller *controller = getController();
+		if (controller != 0)
+		{
+			controller->appendMessage(
+				CM_setGroupShipForMember,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> >(std::make_pair(memberId, shipId)),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::setShipFormationSlotForMember(NetworkId const & memberId, int const formationSlot)
+{
+	if (isAuthoritative())
+	{
+		FATAL((m_groupMembers.size() != m_groupShipFormationMembers.size()), ("GroupObject::setShipForMember: m_groupMembers should always be the same size as m_groupShipFormationMembers"));
+
+		int const numberOfGroupMembers = m_groupMembers.size();
+		int previousFormationSlotOwnerIndex = -1;
+		int newFormationSlotOwnerIndex = -1;
+
+		for (int i = 0; i < numberOfGroupMembers; ++i)
+		{
+			// find the previous owner of this slot
+			if (m_groupShipFormationMembers[i].second == formationSlot)
+			{
+				previousFormationSlotOwnerIndex = i;
+			}
+
+			// find the next owner of this slot
+			if (m_groupMembers[i].first == memberId)
+			{
+				newFormationSlotOwnerIndex = i;
+			}
+		}
+
+		// set the previous owner's slot to the current member's slot
+		// and then set the member's slot to the new value.
+		// since we always set the slot values in ::addGroupMember
+		// we can just swap the slots to keep someone from sitting
+		// in 2 slots at the same time.
+		if (newFormationSlotOwnerIndex > -1)
+		{
+			GroupShipFormationMember data = m_groupShipFormationMembers[newFormationSlotOwnerIndex];
+			int const slotToSwapOccupantTo = data.second;
+			data.second = formationSlot;
+			m_groupShipFormationMembers.set(newFormationSlotOwnerIndex, data);
+
+			if (previousFormationSlotOwnerIndex > -1)
+			{
+				GroupShipFormationMember previousData = m_groupShipFormationMembers[previousFormationSlotOwnerIndex];
+				previousData.second = slotToSwapOccupantTo;
+				m_groupShipFormationMembers.set(previousFormationSlotOwnerIndex, previousData);
+			}
+		}
+	}
+	else
+	{
+		Controller *controller = getController();
+		if (controller != 0)
+		{
+			controller->appendMessage(
+				CM_setGroupShipFormationSlotForMember,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<NetworkId, int> >(std::make_pair(memberId, formationSlot)),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::addPOBShipAndOwner(NetworkId const & shipId, NetworkId const & ownerId)
+{
+	if (isAuthoritative())
+	{
+		// make sure that the POB ship isn't already in the list
+		int const numberOfGroupPOBShipAndOwners = m_groupPOBShipAndOwners.size();
+
+		for (int i = 0; i < numberOfGroupPOBShipAndOwners; ++i)
+		{
+			if (m_groupPOBShipAndOwners[i].first == shipId)
+			{
+				if (m_groupPOBShipAndOwners[i].second != ownerId)
+				{
+					GroupPOBShipAndOwner data = m_groupPOBShipAndOwners[i];
+					data.second = ownerId;
+					m_groupPOBShipAndOwners.set(i, data);
+				}
+				return;
+			}
+		}
+
+		// add if doesn't exist
+		m_groupPOBShipAndOwners.push_back(std::make_pair(shipId, ownerId));
+	}
+	else
+	{
+		Controller *controller = getController();
+		if (controller != 0)
+		{
+			controller->appendMessage(
+				CM_addGroupPOBShipAndOwner,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> >(std::make_pair(shipId, ownerId)),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::removePOBShip(NetworkId const & shipId)
+{
+	if (isAuthoritative())
+	{
+		int const numberOfGroupPOBShipAndOwners = m_groupPOBShipAndOwners.size();
+
+		for (int i = 0; i < numberOfGroupPOBShipAndOwners; ++i)
+		{
+			if (m_groupPOBShipAndOwners[i].first == shipId)
+			{
+				m_groupPOBShipAndOwners.erase(i);
+				break;
+			}
+		}
+	}
+	else
+	{
+		Controller *controller = getController();
+		if (controller != 0)
+		{
+			controller->appendMessage(
+				CM_removeGroupPOBShip,
+				0.0f,
+				new MessageQueueGenericValueType<NetworkId>(shipId),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & GroupObject::getPOBShipOwnedByMember(NetworkId const & memberId) const
+{
+	int const numberOfGroupPOBShipAndOwners = m_groupPOBShipAndOwners.size();
+
+	for (int i = 0; i < numberOfGroupPOBShipAndOwners; ++i)
+	{
+		if (m_groupPOBShipAndOwners[i].second == memberId)
+		{
+			return m_groupPOBShipAndOwners[i].first;
+		}
+	}
+	return NetworkId::cms_invalid;
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & GroupObject::getPOBShipMemberIsContainedIn(NetworkId const & memberId) const
+{
+	NetworkId const & shipId = getMemberShip(memberId);
+
+	if (shipId.isValid())
+	{
+		int const numberOfGroupPOBShipAndOwners = m_groupPOBShipAndOwners.size();
+
+		for (int i = 0; i < numberOfGroupPOBShipAndOwners; ++i)
+		{
+			if (m_groupPOBShipAndOwners[i].first == shipId)
+			{
+				return shipId;
+			}
+		}
+	}
+	return NetworkId::cms_invalid;
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & GroupObject::getMemberShip(NetworkId const & memberId) const
+{
+	int const numberOfGroupMembers = m_groupMembers.size();
+
+	for (int i = 0; i < numberOfGroupMembers; ++i)
+	{
+		if (m_groupMembers[i].first == memberId)
+		{
+			return m_groupShipFormationMembers[i].first;
+		}
+	}
+	return NetworkId::cms_invalid;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & GroupObject::getMemberName(NetworkId const & memberId) const
+{
+	int const numberOfGroupMembers = m_groupMembers.size();
+
+	for (int i = 0; i < numberOfGroupMembers; ++i)
+	{
+		if (m_groupMembers[i].first == memberId)
+		{
+			return m_groupMembers.get(i).second;
+		}
+	}
+
+	return cs_emptyString;
+}
+
+// ----------------------------------------------------------------------
+
+int GroupObject::getMemberLevel(NetworkId const & memberId) const
+{
+	int const numberOfGroupMembers = m_groupMembers.size();
+
+	for (int i = 0; i < numberOfGroupMembers; ++i)
+	{
+		if (m_groupMembers[i].first == memberId)
+		{
+			return m_groupMemberLevels.get(i);
+		}
+	}
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+int GroupObject::getMemberLevelByMemberIndex(unsigned int memberIndex) const
+{
+	if (memberIndex < m_groupMembers.size())
+		return m_groupMemberLevels.get(memberIndex);
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+uint8 GroupObject::getMemberProfession(NetworkId const & memberId) const
+{
+	int const numberOfGroupMembers = m_groupMembers.size();
+
+	for (int i = 0; i < numberOfGroupMembers; ++i)
+	{
+		if (m_groupMembers[i].first == memberId)
+		{
+			return m_groupMemberProfessions.get(i);
+		}
+	}
+
+	return static_cast<uint8>(LfgCharacterData::Prof_Unknown);
+}
+
+// ----------------------------------------------------------------------
+
+uint8 GroupObject::getMemberProfessionByMemberIndex(unsigned int memberIndex) const
+{
+	if (memberIndex < m_groupMembers.size())
+		return m_groupMemberProfessions.get(memberIndex);
+
+	return static_cast<uint8>(LfgCharacterData::Prof_Unknown);
+}
+
+// ----------------------------------------------------------------------
+
+bool GroupObject::getShipIsPOB(NetworkId const & shipId) const
+{
+	int const numberOfGroupPOBShipAndOwners = m_groupPOBShipAndOwners.size();
+
+	for (int i = 0; i < numberOfGroupPOBShipAndOwners; ++i)
+	{
+		if (m_groupPOBShipAndOwners[i].first == shipId)
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & GroupObject::getLootMasterId() const
+{
+	return m_lootMaster.get();
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::makeLootMaster(NetworkId const & newLootMasterId)
+{
+	if (!isMemberPC(newLootMasterId))
+	{
+		return;
+	}
+	
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller != 0)
+		{
+			controller->appendMessage(
+				CM_groupMakeLootMaster,
+				0.0f,
+				new MessageQueueGenericValueType<NetworkId>(newLootMasterId),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		GroupUpdateObserver updater(this, Archive::ADOO_generic);
+	
+		int const numberOfGroupMembers = m_groupMembers.size();
+
+		for (int i = 0; i < numberOfGroupMembers; ++i)
+		{
+			if (m_groupMembers[i].first == newLootMasterId)
+			{
+				m_lootMaster = newLootMasterId;
+				break;
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+int GroupObject::getLootRule() const
+{
+	return m_lootRule.get();
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::setLootRule(int const rule)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller != 0)
+		{
+			controller->appendMessage(
+				CM_groupSetLootRule,
+				0.0f,
+				new MessageQueueGenericValueType<int>(rule),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		m_lootRule = static_cast<uint32>(rule);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+unsigned int GroupObject::getSecondsLeftOnGroupPickup() const
+{
+	std::pair<int32, int32> const & groupPickupTimer = m_groupPickupTimer.get();
+	if ((groupPickupTimer.first > 0) && (groupPickupTimer.second > 0))
+	{
+		time_t const timeNow = ::time(NULL);
+		if (groupPickupTimer.second > timeNow)
+			return (groupPickupTimer.second - timeNow);
+	}
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::setGroupPickupTimer(time_t startTime, time_t endTime)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_setGroupPickupTimer,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<int32, int32> >(std::make_pair(static_cast<int32>(startTime), static_cast<int32>(endTime))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		m_groupPickupTimer.set(std::make_pair(static_cast<int32>(startTime), static_cast<int32>(endTime)));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::setGroupPickupLocation(std::string const & planetName, Vector const & location)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_setGroupPickupLocation,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<std::string, Vector> >(std::make_pair(planetName, location)),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		m_groupPickupLocation.set(std::make_pair(planetName, location));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupObject::reenterGroupChatRoom(CreatureObject const &who) const
+{
+	if (who.getGroup() != this)
+		return;
+
+	std::string firstName;
+	size_t pos = 0;
+	IGNORE_RETURN(Unicode::getFirstToken(Unicode::wideToNarrow(who.getObjectName()), 0, pos, firstName));
+
+	std::string const groupChatRoomPath = getChatRoomPath();
+	Chat::exitRoom(firstName, groupChatRoomPath);
+	Chat::uninvite(firstName, groupChatRoomPath);
+	Chat::invite(firstName, groupChatRoomPath);
+	Chat::enterRoom(firstName, groupChatRoomPath, false, false);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/GroupObject.h b/engine/server/library/serverGame/src/shared/object/GroupObject.h
new file mode 100644
index 00000000..ec2de442
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/GroupObject.h
@@ -0,0 +1,208 @@
+//========================================================================
+//
+// GroupObject.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef INCLUDED_GroupObject_H
+#define INCLUDED_GroupObject_H
+
+// ======================================================================
+
+#include "serverGame/UniverseObject.h"
+#include "Archive/AutoDeltaVariableObserver.h"
+#include "Archive/AutoDeltaVectorObserver.h"
+#include "serverGame/GroupUpdateObserver.h"
+#include "sharedMathArchive/VectorArchive.h"
+
+// ======================================================================
+
+class GroupMemberParam;
+class ServerGroupObjectTemplate;
+
+// ======================================================================
+
+class GroupObject: public UniverseObject
+{
+public:
+	typedef stdvector<GroupMemberParam>::fwd GroupMemberParamVector;
+
+	GroupObject(ServerGroupObjectTemplate const *newTemplate);
+	virtual ~GroupObject();
+
+	virtual GroupObject *asGroupObject();
+	virtual GroupObject const *asGroupObject() const;
+	virtual Controller * createDefaultController ();
+	virtual void         setupUniverse           ();
+	virtual bool         isVisibleOnClient       (const Client &client) const;
+	virtual void         getAttributes           (AttributeVector &data) const;
+
+	static void          removeDefaultTemplate   ();
+	static void          createGroup             (GroupMemberParam const & leader, GroupMemberParamVector const & members);
+	static void          onChatRoomCreate        (std::string const &path);
+	static void          onVoiceChatRoomCreate   (std::string const &channelName);
+	static void          addToLeaderMap          (NetworkId const &leaderId, NetworkId const &groupId);
+	static void          removeFromLeaderMap     (NetworkId const &leaderId, NetworkId const &groupId);
+	static NetworkId     getGroupIdForLeader     (NetworkId const &leaderId);
+	static void          createAllGroupChatRooms ();
+	static int           maximumMembersInGroup();
+
+	typedef std::pair<NetworkId, std::string> GroupMember;
+	typedef stdvector<GroupMember>::fwd GroupMemberVector;
+	typedef std::pair<NetworkId /*ship*/, int /*formation slot*/> GroupShipFormationMember;
+	typedef std::pair<NetworkId /*POB ship*/, NetworkId /*owner of the POB*/> GroupPOBShipAndOwner;
+
+	std::string const &       getGroupName       () const;
+	void                      getGroupMemberIds  (stdvector<NetworkId>::fwd &members) const;
+	NetworkId const &         getGroupLeaderId   () const;
+	std::string const &       getGroupLeaderName () const;
+	bool                      isGroupFull        () const;
+	int                       getPCMemberCount   () const;
+	bool isMemberPC(NetworkId const & memberId) const;
+	bool doesGroupHaveRoomFor(int additionalMembers) const;
+	GroupMemberVector const & getGroupMembers    () const;
+	int                       getGroupLevel () const;
+	uint32                    getFormationNameCrc() const;
+
+	void                 setGroupName       (std::string const &groupName);
+	void                 makeLeader         (NetworkId const &newLeaderId);
+	void                 addGroupMember     (GroupMemberParam const & member);
+	GroupMemberParam const createGroupMemberParamForMember(NetworkId const &memberId) const;
+	void                 removeGroupMember  (NetworkId const &memberId);
+	bool                 isGroupMember      (NetworkId const &memberId) const;
+	void                 disbandGroup       ();
+	void                 sendGroupChat      (NetworkId const &memberId, Unicode::String const &text) const;
+	void                 setMemberLevel(NetworkId const &memberId, int level);
+	void                 setMemberProfession(NetworkId const &memberId, uint8 profession);
+	void                 onGroupMemberConnect(NetworkId const &memberId);
+	void                 onGroupMemberRemoved(NetworkId const &memberId, bool disbanding);
+	void                 setFormationNameCrc (uint32 formationNameCrc);
+
+	void setShipForMember(NetworkId const & memberId, NetworkId const & shipId);
+	void setShipFormationSlotForMember(NetworkId const & memberId, int const formationSlot);
+	void addPOBShipAndOwner(NetworkId const & shipId, NetworkId const & ownerId);
+	void removePOBShip(NetworkId const & shipId);
+
+	NetworkId const & getPOBShipOwnedByMember(NetworkId const & memberId) const;
+	NetworkId const & getPOBShipMemberIsContainedIn(NetworkId const & memberId) const;
+	NetworkId const & getMemberShip(NetworkId const & memberId) const;
+	bool getShipIsPOB(NetworkId const & shipId) const;
+
+	std::string const & getMemberName(NetworkId const & memberId) const;
+	int getMemberLevel(NetworkId const & memberId) const;
+	int getMemberLevelByMemberIndex(unsigned int memberIndex) const;
+	uint8 getMemberProfession(NetworkId const & memberId) const;
+	uint8 getMemberProfessionByMemberIndex(unsigned int memberIndex) const;
+
+	NetworkId const & getLootMasterId() const;
+	void makeLootMaster(NetworkId const & newLootMasterId);
+	int getLootRule() const;
+	void setLootRule(int const rule);
+
+	std::pair<int32, int32> const & getGroupPickupTimer() const;
+	unsigned int getSecondsLeftOnGroupPickup() const;
+	void setGroupPickupTimer(time_t startTime, time_t endTime);
+
+	std::pair<std::string, Vector> const & getGroupPickupLocation() const;
+	void setGroupPickupLocation(std::string const & planetName, Vector const & location);
+
+	void reenterGroupChatRoom(CreatureObject const &who) const;
+
+protected:
+	virtual SharedObjectTemplate const *getDefaultSharedTemplate() const;
+
+private:
+	GroupObject();
+	GroupObject(GroupObject const &rhs);
+	GroupObject& operator=(GroupObject const &rhs);
+
+	void addMembersToPackages();
+	std::string getChatRoomPath() const;
+	std::string getVoiceChatDisplayName() const;
+	std::string getChatName(std::string const &memberName) const;
+	void createGroupChatRoom() const;
+	void destroyGroupChatRoom() const;
+	void addToGroupChatRoom(std::string const &memberName) const;
+	void addToGroupVoiceChatRoom(NetworkId const & memberId, std::string const &memberName) const;
+	void removeFromGroupChatRoom(std::string const &memberName) const;
+	void removeFromGroupVoiceChatRoom(NetworkId const & memberId, std::string const &memberName) const;
+	void onGroupChatRoomCreated();
+	void onGroupVoiceChatRoomCreated();
+	bool chatRoomCreated() const;
+	void setChatRoomCreated();
+	void calcGroupLevel();
+
+private:
+
+	static const SharedObjectTemplate * m_defaultSharedTemplate;	// template to use if no shared template is given
+
+	Archive::AutoDeltaVariable<std::string> m_groupName;
+	Archive::AutoDeltaVectorObserver<GroupMember, GroupUpdateObserver, GroupObject> m_groupMembers;
+	Archive::AutoDeltaVectorObserver<GroupShipFormationMember, GroupUpdateObserver, GroupObject> m_groupShipFormationMembers;
+	Archive::AutoDeltaVectorObserver<GroupPOBShipAndOwner, GroupUpdateObserver, GroupObject> m_groupPOBShipAndOwners;
+	Archive::AutoDeltaVariable<int16> m_groupLevel;
+	Archive::AutoDeltaVector<int16> m_groupMemberLevels;
+	Archive::AutoDeltaVector<uint8> m_groupMemberProfessions;
+	Archive::AutoDeltaVariable<uint32> m_formationNameCrc;
+	Archive::AutoDeltaSet<NetworkId> m_allMembers;
+	Archive::AutoDeltaSet<NetworkId> m_nonPCMembers;
+	Archive::AutoDeltaVariableObserver<NetworkId, GroupUpdateObserver, GroupObject> m_lootMaster;
+	Archive::AutoDeltaVariable<uint32> m_lootRule;
+	Archive::AutoDeltaVariable<std::pair<int32, int32> > m_groupPickupTimer; // <start time_t, end time_t> (may not be 0, but if the end time is < the current time, it means no group pickup is currently active)>
+	Archive::AutoDeltaVariable<std::pair<std::string, Vector> > m_groupPickupLocation; // planet/zone name, and (x,y,z) world location
+};
+
+// ======================================================================
+
+inline std::string const &GroupObject::getGroupName() const
+{
+	return m_groupName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline GroupObject::GroupMemberVector const &GroupObject::getGroupMembers() const
+{
+	return m_groupMembers.get();
+}
+
+//----------------------------------------------------------------------
+
+inline int GroupObject::getGroupLevel () const
+{
+	return m_groupLevel.get ();
+}
+
+//----------------------------------------------------------------------
+
+inline uint32 GroupObject::getFormationNameCrc () const
+{
+	return m_formationNameCrc.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool GroupObject::isGroupMember(NetworkId const &memberId) const
+{
+	return m_allMembers.contains(memberId);
+}
+
+// ----------------------------------------------------------------------
+
+inline std::pair<int32, int32> const & GroupObject::getGroupPickupTimer() const
+{
+	return m_groupPickupTimer.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::pair<std::string, Vector> const & GroupObject::getGroupPickupLocation() const
+{
+	return m_groupPickupLocation.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/GroupStringId.h b/engine/server/library/serverGame/src/shared/object/GroupStringId.h
new file mode 100644
index 00000000..dcce568d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/GroupStringId.h
@@ -0,0 +1,54 @@
+// ======================================================================
+//
+// GroupStringId.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _GroupStringId_H_
+#define _GroupStringId_H_
+
+// ======================================================================
+
+namespace GroupStringId
+{
+	const StringId SID_GROUP_MUST_BE_LEADER           ("group", "must_be_leader");
+	const StringId SID_GROUP_FULL                     ("group", "full");
+	const StringId SID_GROUP_ALREADY_GROUPED          ("group", "already_grouped");
+	const StringId SID_GROUP_CONSIDERING_YOUR_GROUP   ("group", "considering_your_group");
+	const StringId SID_GROUP_CONSIDERING_OTHER_GROUP  ("group", "considering_other_group");
+	const StringId SID_GROUP_INVITE_LEADER            ("group", "invite_leader");
+	const StringId SID_GROUP_INVITE_TARGET            ("group", "invite_target");
+	const StringId SID_GROUP_INVITE_NO_TARGET_SELF    ("group", "invite_no_target_self");
+	const StringId SID_GROUP_MUST_BE_INVITED          ("group", "must_be_invited");
+	const StringId SID_GROUP_DECLINE_SELF             ("group", "decline_self");
+	const StringId SID_GROUP_DECLINE_LEADER           ("group", "decline_leader");
+	const StringId SID_GROUP_UNINVITE_SELF            ("group", "uninvite_self");
+	const StringId SID_GROUP_UNINVITE_TARGET          ("group", "uninvite_target");
+	const StringId SID_GROUP_UNINVITE_NOT_INVITED     ("group", "uninvite_not_invited");
+	const StringId SID_GROUP_UNINVITE_NO_TARGET_SELF  ("group", "uninvite_no_target_self");
+	const StringId SID_GROUP_NEW_LEADER               ("group", "new_leader");
+	const StringId SID_GROUP_NEW_MASTER_LOOTER        ("group", "new_master_looter");
+	const StringId SID_GROUP_FORMED                   ("group", "formed_self");
+	const StringId SID_GROUP_JOIN                     ("group", "joined_self");
+	const StringId SID_GROUP_DISBANDED                ("group", "disbanded");
+	const StringId SID_GROUP_REMOVED                  ("group", "removed");
+	const StringId SID_GROUP_MUST_EJECT_FIRST         ("group", "must_eject_first");
+	const StringId SID_GROUP_ONLY_PLAYERS_IN_SPACE    ("group", "only_players_in_space");
+	const StringId SID_GROUP_NO_DISBAND_OWNER         ("group", "no_disband_owner");
+	const StringId SID_GROUP_NO_KICK_FROM_SHIP_OWNER  ("group", "no_kick_from_ship_owner");
+	const StringId SID_GROUP_BEASTS_CANT_JOIN         ("group", "beasts_cant_join");
+	const StringId SID_GROUP_EXISTING_GROUP_NOT_FOUND ("group", "existing_group_not_found");
+	const StringId SID_GROUP_JOIN_INVITER_NOT_LEADER  ("group", "join_inviter_not_leader");
+	const StringId SID_GROUP_JOIN_FULL                ("group", "join_full");
+	const StringId SID_GROUP_INVITE_IN_COMBAT         ("group", "invite_in_combat");
+	const StringId SID_GROUP_INVITE_TARGET_IN_COMBAT  ("group", "invite_target_in_combat");
+	const StringId SID_GROUP_JOIN_IN_COMBAT           ("group", "join_in_combat");
+	const StringId SID_GROUP_JOIN_LEADER_IN_COMBAT    ("group", "join_leader_in_combat");
+}
+
+// ======================================================================
+
+#endif // _GroupStringId_H_
+
diff --git a/engine/server/library/serverGame/src/shared/object/GroupUpdateObserver.cpp b/engine/server/library/serverGame/src/shared/object/GroupUpdateObserver.cpp
new file mode 100644
index 00000000..df7a6fb6
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/GroupUpdateObserver.cpp
@@ -0,0 +1,230 @@
+// ======================================================================
+//
+// GroupUpdateObserver.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/GroupUpdateObserver.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/Chat.h"
+#include "serverGame/Client.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GroupMissionCriticalObjectsBuilder.h"
+#include "serverGame/GroupWaypointBuilder.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/GroupStringId.h"
+#include "serverGame/ObserveTracker.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedObject/NetworkIdManager.h"
+
+// ======================================================================
+
+static std::set<GroupObject const *> s_activeUpdaters;
+
+// ======================================================================
+
+inline CreatureObject *findCreatureById(NetworkId const &networkId)
+{
+	Object *obj = NetworkIdManager::getObjectById(networkId);
+	if (obj)
+	{
+		ServerObject *serverObj = obj->asServerObject();
+		if (serverObj)
+			return serverObj->asCreatureObject();
+	}
+	return 0;
+}
+
+// ======================================================================
+
+GroupUpdateObserver::GroupUpdateObserver(GroupObject *group, Archive::AutoDeltaObserverOp) :
+	m_profilerBlock("GroupUpdateObserver"),
+	m_group(0),
+	m_members(),
+	m_leaderId(NetworkId::cms_invalid),
+	m_lootMasterId()
+{
+	if (!group || s_activeUpdaters.find(group) != s_activeUpdaters.end())
+		return;
+	m_group = group;
+	s_activeUpdaters.insert(group);
+	group->getGroupMemberIds(m_members);
+	m_leaderId = group->getGroupLeaderId();
+	m_lootMasterId = group->getLootMasterId();
+}
+
+// ----------------------------------------------------------------------
+
+GroupUpdateObserver::~GroupUpdateObserver()
+{
+	if (!m_group)
+		return;
+
+	s_activeUpdaters.erase(m_group);
+
+	std::vector<NetworkId> newMembers;
+	m_group->getGroupMemberIds(newMembers);
+
+	NetworkId const &newLeaderId = m_group->getGroupLeaderId();
+
+	// leader change notifications
+	{
+		if (newLeaderId != m_leaderId)
+		{
+			// script triggers on old and new leaders
+			if (m_leaderId != NetworkId::cms_invalid)
+			{
+				GroupObject::removeFromLeaderMap(m_leaderId, m_group->getNetworkId());
+				CreatureObject *oldLeaderCreature = findCreatureById(m_leaderId);
+				if (oldLeaderCreature && oldLeaderCreature->isAuthoritative() && oldLeaderCreature->getScriptObject())
+				{
+					ScriptParams scriptParams;
+					scriptParams.addParam(m_group->getNetworkId());
+					scriptParams.addParam(newLeaderId);
+					scriptParams.addParam(m_leaderId);
+					IGNORE_RETURN(oldLeaderCreature->getScriptObject()->trigAllScripts(Scripting::TRIG_GROUP_LEADER_CHANGED, scriptParams));
+				}
+			}
+			if (newLeaderId != NetworkId::cms_invalid)
+			{
+				GroupObject::addToLeaderMap(newLeaderId, m_group->getNetworkId());
+				CreatureObject *newLeaderCreature = findCreatureById(newLeaderId);
+				if (newLeaderCreature && newLeaderCreature->isAuthoritative() && newLeaderCreature->getScriptObject())
+				{
+					ScriptParams scriptParams;
+					scriptParams.addParam(m_group->getNetworkId());
+					scriptParams.addParam(newLeaderId);
+					scriptParams.addParam(m_leaderId);
+					IGNORE_RETURN(newLeaderCreature->getScriptObject()->trigAllScripts(Scripting::TRIG_GROUP_LEADER_CHANGED, scriptParams));
+				}
+			}
+
+			// messages to group members if there was a leader before
+			if (m_leaderId != NetworkId::cms_invalid)
+			{
+				ProsePackage pp;
+				pp.stringId = GroupStringId::SID_GROUP_NEW_LEADER;
+				pp.actor.str = Unicode::narrowToWide(m_group->getGroupLeaderName());
+				for (std::vector<NetworkId>::iterator i = newMembers.begin(); i != newMembers.end(); ++i)
+				{
+					CreatureObject *creature = findCreatureById(*i);
+					if (creature && creature->isAuthoritative())
+						Chat::sendSystemMessage(*creature, pp);
+				}
+			}
+		}
+
+		NetworkId const & newLootMasterId = m_group->getLootMasterId();
+
+		if ((m_lootMasterId != newLootMasterId) && (newLootMasterId.isValid()))
+		{
+			ProsePackage pp;
+			pp.stringId = GroupStringId::SID_GROUP_NEW_MASTER_LOOTER;
+			pp.actor.str = Unicode::narrowToWide(m_group->getMemberName(newLootMasterId));
+			for (std::vector<NetworkId>::iterator i = newMembers.begin(); i != newMembers.end(); ++i)
+			{
+				CreatureObject * const creature = findCreatureById(*i);
+				if (creature && creature->isAuthoritative())
+					Chat::sendSystemMessage(*creature, pp);
+			}
+		}
+	}
+
+	// gather any people removed from the group in delMembers
+	// and pare down newMembers to only those added to the group
+	std::vector<NetworkId> delMembers;
+	{
+		for (std::vector<NetworkId>::iterator i = m_members.begin(); i != m_members.end(); ++i)
+		{
+			bool found = false;
+			for (std::vector<NetworkId>::iterator j = newMembers.begin(); j != newMembers.end(); ++j)
+			{
+				if (*i == *j)
+				{
+					found = true;
+					newMembers.erase(j);
+					break;
+				}
+			}
+			if (!found)
+				delMembers.push_back(*i);
+		}
+	}
+
+	// If the group member list has changed, notify all the current and former group members
+	if (!delMembers.empty() || !newMembers.empty())
+	{
+		// Grab the list of current members
+		std::vector<NetworkId> currentMembers;
+		m_group->getGroupMemberIds(currentMembers);
+
+		// Create a combined list of members that includes both the current members and the deleted members
+		std::vector<NetworkId> currentAndDeletedGroupMembers(currentMembers.begin(), currentMembers.end());
+		currentAndDeletedGroupMembers.insert(currentAndDeletedGroupMembers.end(), delMembers.begin(), delMembers.end());
+
+		// Tell all the group members (both past and present) about the group member change
+		std::vector<NetworkId>::const_iterator i;
+		for (i = currentAndDeletedGroupMembers.begin(); i != currentAndDeletedGroupMembers.end(); ++i)
+		{
+			CreatureObject *creature = findCreatureById(*i);
+			if (creature && creature->isAuthoritative() && creature->getScriptObject())
+			{
+				ScriptParams scriptParams;
+				scriptParams.addParam(m_group->getNetworkId());
+				scriptParams.addParam(currentMembers);   // current group members
+				scriptParams.addParam(newMembers);       // the added group members
+				scriptParams.addParam(delMembers);       // the removed group members
+				IGNORE_RETURN(creature->getScriptObject()->trigAllScripts(Scripting::TRIG_GROUP_MEMBERS_CHANGED, scriptParams));
+			}
+		}
+	}
+
+	// have removed members with clients unobserve the group object, and get remove or disband messages
+	{
+		bool disbanding = newLeaderId == NetworkId::cms_invalid;
+		for (std::vector<NetworkId>::iterator i = delMembers.begin(); i != delMembers.end(); ++i)
+			m_group->onGroupMemberRemoved(*i, disbanding);
+	}
+	// have new members with clients observe the group object, and get join or formed messages
+	{
+		for (std::vector<NetworkId>::iterator i = newMembers.begin(); i != newMembers.end(); ++i)
+		{
+			CreatureObject *creature = findCreatureById(*i);
+			if (creature && creature->isAuthoritative())
+			{
+				creature->setGroup(m_group, true);
+				if (creature->getScriptObject())
+				{
+					ScriptParams scriptParams;
+					scriptParams.addParam(m_group->getNetworkId());
+					IGNORE_RETURN(creature->getScriptObject()->trigAllScripts(Scripting::TRIG_ADDED_TO_GROUP, scriptParams));
+					if ((*i) == newLeaderId)
+					{
+						IGNORE_RETURN(creature->getScriptObject()->trigAllScripts(Scripting::TRIG_GROUP_FORMED, scriptParams));
+					}
+				}
+
+				Client *client = creature->getClient();
+				if (client)
+				{
+					ObserveTracker::onClientJoinedGroup(*client, *m_group);
+					ProsePackage pp;
+					pp.stringId = (*i) == newLeaderId ? GroupStringId::SID_GROUP_FORMED : GroupStringId::SID_GROUP_JOIN;
+					Chat::sendSystemMessage(*creature, pp);
+				}
+			}
+		}
+	}
+
+	GroupMissionCriticalObjectsBuilder::updateGroupMissionCriticalObjects(*m_group);
+	GroupWaypointBuilder::updateGroupWaypoints(*m_group);
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/GroupUpdateObserver.h b/engine/server/library/serverGame/src/shared/object/GroupUpdateObserver.h
new file mode 100644
index 00000000..ba90833f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/GroupUpdateObserver.h
@@ -0,0 +1,45 @@
+// ======================================================================
+//
+// GroupUpdateObserver.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _GroupUpdateObserver_H_
+#define _GroupUpdateObserver_H_
+
+// ======================================================================
+
+#include "Archive/AutoDeltaObserverOps.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedDebug/Profiler.h"
+
+// ======================================================================
+
+class GroupObject;
+
+// ======================================================================
+
+class GroupUpdateObserver
+{
+public:
+	explicit GroupUpdateObserver(GroupObject *group, Archive::AutoDeltaObserverOp operation);
+	~GroupUpdateObserver();
+
+private:
+	GroupUpdateObserver(GroupUpdateObserver const &);
+	GroupUpdateObserver &operator=(GroupUpdateObserver const &);
+
+private:
+	ProfilerAutoBlock m_profilerBlock;
+	GroupObject *m_group;
+	std::vector<NetworkId> m_members;
+	NetworkId m_leaderId;
+	NetworkId m_lootMasterId;
+};
+
+// ======================================================================
+
+#endif // _GroupUpdateObserver_H_
+
diff --git a/engine/server/library/serverGame/src/shared/object/GroupWaypointBuilder.cpp b/engine/server/library/serverGame/src/shared/object/GroupWaypointBuilder.cpp
new file mode 100644
index 00000000..df72f250
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/GroupWaypointBuilder.cpp
@@ -0,0 +1,148 @@
+// ======================================================================
+//
+// GroupWaypointBuilder.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/GroupWaypointBuilder.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "sharedUtility/Location.h"
+#include "sharedObject/NetworkIdManager.h"
+
+// ======================================================================
+
+namespace GroupWaypointBuilderNamespace
+{
+	void buildGroupWaypoints(GroupObject const &groupObject, PlayerObject::WaypointMap &groupWaypoints);
+	void buildGroupWaypoints(PlayerObject const &playerObject, PlayerObject::WaypointMap &groupWaypoints);
+	void updateGroupWaypoints(GroupObject const &groupObject, PlayerObject::WaypointMap const &groupWaypoints);
+	void updateGroupWaypoints(PlayerObject &playerObject, PlayerObject::WaypointMap const &groupWaypoints);
+}
+
+using namespace GroupWaypointBuilderNamespace;
+
+// ======================================================================
+// GroupWaypointBuilderNamespace
+// ======================================================================
+
+void GroupWaypointBuilderNamespace::buildGroupWaypoints(GroupObject const &groupObject, PlayerObject::WaypointMap &groupWaypoints)
+{
+	GroupObject::GroupMemberVector const & groupMemberVector = groupObject.getGroupMembers();
+	for (GroupObject::GroupMemberVector::const_iterator groupMemberVectorIter = groupMemberVector.begin(); groupMemberVectorIter != groupMemberVector.end(); ++groupMemberVectorIter)
+	{
+		Object const * const object = NetworkIdManager::getObjectById(groupMemberVectorIter->first);
+		if (!object)
+			continue;
+
+		ServerObject const * serverObject = object->asServerObject();
+		if (!serverObject || !serverObject->isPlayerControlled())
+			continue;
+
+		CreatureObject const * const creatureObject = serverObject->asCreatureObject();
+		if (!creatureObject)
+			continue;
+
+		PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(creatureObject);
+		if (!playerObject)
+			continue;
+
+		buildGroupWaypoints(*playerObject, groupWaypoints);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupWaypointBuilderNamespace::buildGroupWaypoints(PlayerObject const &playerObject, PlayerObject::WaypointMap &groupWaypoints)
+{
+	PlayerObject::WaypointMap const &waypoints = playerObject.getWaypoints();
+	if (!waypoints.empty())
+	{
+		for (PlayerObject::WaypointMap::const_iterator i = waypoints.begin(); i != waypoints.end(); ++i)
+			if ((*i).second.isActive() && !strcmp((*i).second.getLocation().getSceneId(), ConfigServerGame::getSceneID()))
+				groupWaypoints[(*i).first] = (*i).second;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupWaypointBuilderNamespace::updateGroupWaypoints(GroupObject const &groupObject, PlayerObject::WaypointMap const &groupWaypoints)
+{
+	GroupObject::GroupMemberVector const &groupMemberVector = groupObject.getGroupMembers();
+	for (GroupObject::GroupMemberVector::const_iterator groupMemberVectorIter = groupMemberVector.begin(); groupMemberVectorIter != groupMemberVector.end(); ++groupMemberVectorIter)
+	{
+		Object * const object = NetworkIdManager::getObjectById(groupMemberVectorIter->first);
+		if (!object)
+			continue;
+
+		ServerObject * const serverObject = object->asServerObject();
+		if (!serverObject || !serverObject->isPlayerControlled())
+			continue;
+
+		CreatureObject * const creatureObject = serverObject->asCreatureObject();
+		if (!creatureObject)
+			continue;
+
+		PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(creatureObject);
+		if (!playerObject)
+			continue;
+
+		updateGroupWaypoints(*playerObject, groupWaypoints);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GroupWaypointBuilderNamespace::updateGroupWaypoints(PlayerObject &playerObject, PlayerObject::WaypointMap const &groupWaypoints)
+{
+	if (playerObject.isAuthoritative())
+		playerObject.setGroupWaypoints(groupWaypoints);
+}
+
+// ======================================================================
+// PUBLIC GroupWaypointBuilder
+// ======================================================================
+
+void GroupWaypointBuilder::updateGroupWaypoints(GroupObject const &groupObject)
+{
+#if 0
+	PlayerObject::WaypointMap groupWaypoints;
+	buildGroupWaypoints(groupObject, groupWaypoints);
+	GroupWaypointBuilderNamespace::updateGroupWaypoints(groupObject, groupWaypoints);
+#endif
+}
+
+// ----------------------------------------------------------------------
+
+void GroupWaypointBuilder::updateGroupWaypoints(PlayerObject &playerObject, bool const updateGroup)
+{
+#if 0
+	CreatureObject const * const creatureObject = playerObject.getCreatureObject();
+	if (creatureObject)
+	{
+		GroupObject const * const groupObject = creatureObject->getGroup();
+		if (groupObject && updateGroup)
+		{
+			PlayerObject::WaypointMap groupWaypoints;
+			buildGroupWaypoints(*groupObject, groupWaypoints);
+			GroupWaypointBuilderNamespace::updateGroupWaypoints(*groupObject, groupWaypoints);
+		}
+		else
+		{
+			PlayerObject::WaypointMap groupWaypoints;
+			buildGroupWaypoints(playerObject, groupWaypoints);
+			GroupWaypointBuilderNamespace::updateGroupWaypoints(playerObject, groupWaypoints);
+		}
+	}
+#endif
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/GroupWaypointBuilder.h b/engine/server/library/serverGame/src/shared/object/GroupWaypointBuilder.h
new file mode 100644
index 00000000..6b1fba6f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/GroupWaypointBuilder.h
@@ -0,0 +1,29 @@
+// ======================================================================
+//
+// GroupWaypointBuilder.h
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_GroupWaypointBuilder_H
+#define INCLUDED_GroupWaypointBuilder_H
+
+// ======================================================================
+
+class GroupObject;
+class PlayerObject;
+
+// ======================================================================
+
+class GroupWaypointBuilder
+{
+public:
+	static void updateGroupWaypoints(GroupObject const &groupObject);
+	static void updateGroupWaypoints(PlayerObject &playerObject, bool updateGroup);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_GroupWaypointBuilder_H
+
diff --git a/engine/server/library/serverGame/src/shared/object/GuildObject.cpp b/engine/server/library/serverGame/src/shared/object/GuildObject.cpp
new file mode 100644
index 00000000..bf0f4ea9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/GuildObject.cpp
@@ -0,0 +1,2685 @@
+// ======================================================================
+//
+// GuildObject.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/GuildObject.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/CityObject.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/GuildController.h"
+#include "serverGame/GuildInterface.h"
+#include "serverGame/GuildStringParser.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ServerGuildObjectTemplate.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedGame/GuildRankDataTable.h"
+#include "sharedGame/OutOfBandPackager.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedObject/Controller.h"
+
+// ======================================================================
+
+namespace GuildObjectNamespace
+{
+	void replaceSetIfNeeded(char const *label, Archive::AutoDeltaSet<std::string> &oldSet, std::set<std::string> const &newSet, bool force);
+	void replaceSetIfNeeded(char const *label, Archive::AutoDeltaSet<std::string, GuildObject> &oldSet, std::set<std::string> const &newSet, bool force);
+
+	void updateGuildInfoMembersCount(GuildInfo & gi, int const * oldPermissions, int const * newPermissions);
+
+	void updateGcwPercentileHistory(Archive::AutoDeltaMap<std::pair<std::string, int>, int> & history, Archive::AutoDeltaMap<std::string, int> & historyCount, std::string const & scoreName, int score);
+
+	std::string const getFactionString(uint32 factionId)
+	{
+		if (PvpData::isNeutralFactionId(factionId))
+			return "Neutral";
+		else if (PvpData::isImperialFactionId(factionId))
+			return "Imperial";
+		else if (PvpData::isRebelFactionId(factionId))
+			return "Rebel";
+
+		return "Unknown";
+	}
+}
+using namespace GuildObjectNamespace;
+
+// ======================================================================
+
+GuildObject::GuildObject(ServerGuildObjectTemplate const *newTemplate) :
+	UniverseObject(newTemplate),
+	m_names(),
+	m_abbrevs(),
+	m_leaders(),
+	m_members(),
+	m_enemies(),
+	m_guildsInfo(),
+	m_membersInfo(),
+	m_fullMembers(),
+	m_sponsoredMembers(),
+	m_guildLeaders(),
+	m_gcwImperialScorePercentileThisGalaxy(),
+	m_gcwRegionDefenderBonus(),
+	m_gcwGroupImperialScorePercentileThisGalaxy(),
+	m_gcwImperialScorePercentileHistoryThisGalaxy(),
+	m_gcwGroupImperialScorePercentileHistoryThisGalaxy(),
+	m_gcwImperialScorePercentileHistoryCountThisGalaxy(),
+	m_gcwGroupImperialScorePercentileHistoryCountThisGalaxy(),
+	m_gcwImperialScorePercentileOtherGalaxies(),
+	m_gcwGroupImperialScorePercentileOtherGalaxies(),
+	m_gcwGroupCategoryImperialScoreRawThisGalaxy(),
+	m_gcwGroupImperialScoreRawThisGalaxy(),
+	m_gcwImperialScoreOtherGalaxies(),
+	m_gcwRebelScoreOtherGalaxies(),
+	m_lowFreeGuildId(1000*GameServer::getInstance().getProcessId()),
+	m_nextGuildWarKillTrackingAdjustmentUpdate(0),
+	m_guildWarKillTrackingAdjustment(),
+	m_gcwRegionDefenderGuilds(),
+	m_gcwRegionDefenderGuildsCount(),
+	m_gcwRegionDefenderGuildsVersion(0)
+{
+	addMembersToPackages();
+
+	m_enemies.setOnChanged(this, &GuildObject::onGuildEnemiesChanged);
+
+	m_membersInfo.setOnErase(this, &GuildObject::onMembersInfoErase);
+	m_membersInfo.setOnInsert(this, &GuildObject::onMembersInfoInsert);
+	m_membersInfo.setOnSet(this, &GuildObject::onMembersInfoSet);
+}
+
+// ----------------------------------------------------------------------
+
+GuildObject::~GuildObject()
+{
+	if (isInWorld())
+		removeFromWorld();
+}
+
+// ----------------------------------------------------------------------
+
+Controller* GuildObject::createDefaultController()
+{
+	Controller* controller = new GuildController(this);
+	NOT_NULL(controller);
+
+	setController(controller);
+	return controller;
+}
+
+// ----------------------------------------------------------------------
+
+bool GuildObject::isVisibleOnClient(const Client &) const
+{
+	// The GuildObject is visible to all clients and is explicitly observed on login.
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::setupUniverse()
+{
+	ServerUniverse::getInstance().registerMasterGuildObject(*this);
+	// force update of the guild interface's structures so we have current data for sanity checking
+	GuildInterface::update();
+
+	if (isAuthoritative())
+	{
+		// build the guild and guild member info from data read in from DB
+
+		// disable notification while building the initial list
+		m_membersInfo.setOnErase(NULL, NULL);
+		m_membersInfo.setOnInsert(NULL, NULL);
+		m_membersInfo.setOnSet(NULL, NULL);
+
+		// build names
+		{
+			std::set<std::string> const &names = m_names.get();
+			for (std::set<std::string>::const_iterator i = names.begin(); i != names.end(); ++i)
+			{
+				int guildId;
+				std::string guildName;
+				int guildElectionPreviousEndTime;
+				int guildElectionNextEndTime;
+				uint32 guildFaction;
+				int timeLeftGuildFaction;
+				std::string guildGcwDefenderRegion;
+				int timeJoinedGuildGcwDefenderRegion;
+				int timeLeftGuildGcwDefenderRegion;
+				if (GuildStringParser::parseGuildName(*i, guildId, guildName, guildElectionPreviousEndTime, guildElectionNextEndTime, guildFaction, timeLeftGuildFaction, guildGcwDefenderRegion, timeJoinedGuildGcwDefenderRegion, timeLeftGuildGcwDefenderRegion))
+				{
+					GuildInfo gi(getGuildInfo(guildId));
+					gi.m_name = guildName;
+					gi.m_guildElectionPreviousEndTime = guildElectionPreviousEndTime;
+					gi.m_guildElectionNextEndTime = guildElectionNextEndTime;
+					gi.m_guildFaction = guildFaction;
+					gi.m_timeLeftGuildFaction = timeLeftGuildFaction;
+					gi.m_guildGcwDefenderRegion = guildGcwDefenderRegion;
+					gi.m_timeJoinedGuildGcwDefenderRegion = timeJoinedGuildGcwDefenderRegion;
+					gi.m_timeLeftGuildGcwDefenderRegion = timeLeftGuildGcwDefenderRegion;
+
+					m_guildsInfo.set(guildId, gi);
+
+					if (!gi.m_guildGcwDefenderRegion.empty() && (gi.m_timeLeftGuildGcwDefenderRegion <= 0))
+						addGcwRegionDefenderGuild(gi.m_guildGcwDefenderRegion, guildId, (((gi.m_timeLeftGuildFaction > 0) || PvpData::isNeutralFactionId(gi.m_guildFaction)) ? PvpData::getNeutralFactionId() : gi.m_guildFaction));
+				}
+			}
+		}
+
+		// build abbrevs
+		{
+			std::set<std::string> const &abbrevs = m_abbrevs.get();
+			for (std::set<std::string>::const_iterator i = abbrevs.begin(); i != abbrevs.end(); ++i)
+			{
+				int guildId;
+				std::string guildAbbrev;
+				if (GuildStringParser::parseGuildAbbrev(*i, guildId, guildAbbrev))
+				{
+					GuildInfo gi(getGuildInfo(guildId));
+					gi.m_abbrev = guildAbbrev;
+					m_guildsInfo.set(guildId, gi);
+				}
+			}
+		}
+
+		// build leaderIds
+		{
+			std::set<std::string> const &leaders = m_leaders.get();
+			for (std::set<std::string>::const_iterator i = leaders.begin(); i != leaders.end(); ++i)
+			{
+				int guildId;
+				NetworkId leaderId;
+				if (GuildStringParser::parseGuildLeader(*i, guildId, leaderId))
+				{
+					m_guildLeaders.set(leaderId, guildId);
+
+					GuildInfo gi(getGuildInfo(guildId));
+					gi.m_leaderId = leaderId;
+					m_guildsInfo.set(guildId, gi);
+				}
+			}
+		}
+
+		// build members
+		{
+			// make temporary list of guilds so that guild info members count can be updated
+			// in the temporary list rather than in the master list, because there will be lots
+			// of update, and we don't want to generated unnecessary deltas; by doing it using
+			// the temporary list, we'll generate only 1 delta when we write the information back
+			std::map<int, GuildInfo> guildInfoMembersCount = m_guildsInfo.getMap();
+
+			int const allAdministrativePermissions = GuildInterface::AllAdministrativePermissions;
+			std::set<std::string> const &members = m_members.get();
+			for (std::set<std::string>::const_iterator i = members.begin(); i != members.end(); ++i)
+			{
+				int guildId;
+				NetworkId memberId;
+				std::string name;
+				std::string professionSkillTemplate;
+				int level;
+				int permissions;
+				BitArray rank;
+				std::string title;
+				NetworkId allegiance;
+				if (GuildStringParser::parseMemberInfo(*i, guildId, memberId, name, professionSkillTemplate, level, permissions, rank, title, allegiance))
+				{
+					// update guild info members count
+					GuildInfo & gi = guildInfoMembersCount[guildId];
+					GuildMemberInfo const * const existingGmi = getGuildMemberInfo(guildId, memberId);
+					updateGuildInfoMembersCount(gi, (existingGmi ? ((existingGmi->m_permissions == -1) ? &allAdministrativePermissions : &(existingGmi->m_permissions)) : NULL), ((permissions == -1) ? &allAdministrativePermissions : &permissions));
+
+					if (existingGmi)
+					{
+						if (existingGmi->m_permissions == GuildInterface::None)
+							m_sponsoredMembers.erase(memberId);
+						else
+							m_fullMembers.erase(memberId);
+					}
+
+					if (permissions == GuildInterface::None)
+						m_sponsoredMembers.set(memberId, guildId);
+					else
+						m_fullMembers.set(memberId, guildId);
+
+					GuildMemberInfo gmi(existingGmi);
+					gmi.m_name = name;
+					gmi.m_professionSkillTemplate = professionSkillTemplate;
+					gmi.m_level = level;
+					gmi.m_permissions = permissions;
+					gmi.m_rank = rank;
+					gmi.m_title = title;
+					gmi.m_allegiance = allegiance;
+					m_membersInfo.set(std::make_pair(guildId, memberId), gmi);
+				}
+			}
+
+			// save off final guild member count info
+			{
+				for (std::map<int, GuildInfo>::const_iterator iterGuild = guildInfoMembersCount.begin(); iterGuild != guildInfoMembersCount.end(); ++iterGuild)
+					m_guildsInfo.set(iterGuild->first, iterGuild->second);
+			}
+		}
+
+		// rebuild names, abbrevs, leaders
+		{
+			std::set<std::string> names;
+			std::set<std::string> abbrevs;
+			std::set<std::string> leaders;
+			std::string gi;
+			for (std::map<int, GuildInfo>::const_iterator iterGuild = m_guildsInfo.begin(); iterGuild != m_guildsInfo.end(); ++iterGuild)
+			{
+				if (!iterGuild->second.m_name.empty())
+				{
+					GuildStringParser::buildNameSpec(iterGuild->first, iterGuild->second.m_name, iterGuild->second.m_guildElectionPreviousEndTime, iterGuild->second.m_guildElectionNextEndTime, iterGuild->second.m_guildFaction, iterGuild->second.m_timeLeftGuildFaction, iterGuild->second.m_guildGcwDefenderRegion, iterGuild->second.m_timeJoinedGuildGcwDefenderRegion, iterGuild->second.m_timeLeftGuildGcwDefenderRegion, gi);
+					names.insert(gi);
+				}
+
+				if (!iterGuild->second.m_abbrev.empty())
+				{
+					GuildStringParser::buildAbbrevSpec(iterGuild->first, iterGuild->second.m_abbrev, gi);
+					abbrevs.insert(gi);
+				}
+
+				GuildStringParser::buildLeaderSpec(iterGuild->first, iterGuild->second.m_leaderId, gi);
+				leaders.insert(gi);
+			}
+
+			replaceSetIfNeeded("names", m_names, names, false);
+			replaceSetIfNeeded("abbrevs", m_abbrevs, abbrevs, false);
+			replaceSetIfNeeded("leaders", m_leaders, leaders, false);
+		}
+
+		// rebuild members
+		{
+			std::set<std::string> members;
+			std::list<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::string> > > membersToConvertPermissions;
+			std::string gmi;
+			std::string gmiConverted;
+			for (std::map<std::pair<int, NetworkId>, GuildMemberInfo>::const_iterator iter = m_membersInfo.begin(); iter != m_membersInfo.end(); ++iter)
+			{
+				GuildStringParser::buildMemberSpec(iter->first.first, iter->first.second, iter->second.m_name, iter->second.m_professionSkillTemplate, iter->second.m_level, iter->second.m_permissions, iter->second.m_rank, iter->second.m_title, iter->second.m_allegiance, gmi);
+				members.insert(gmi);
+
+				// construct list of members with permission of -1, which will need to be converted
+				if (iter->second.m_permissions == -1)
+				{
+					GuildStringParser::buildMemberSpec(iter->first.first, iter->first.second, iter->second.m_name, iter->second.m_professionSkillTemplate, iter->second.m_level, static_cast<int>(GuildInterface::AllAdministrativePermissions), iter->second.m_rank, iter->second.m_title, iter->second.m_allegiance, gmiConverted);
+					membersToConvertPermissions.push_back(std::make_pair(iter->first, std::make_pair(gmi, gmiConverted)));
+				}
+			}
+
+			// convert members with permissions of -1
+			{
+				for (std::list<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::string> > >::const_iterator iter = membersToConvertPermissions.begin(); iter != membersToConvertPermissions.end(); ++iter)
+				{
+					GuildMemberInfo gmi(getGuildMemberInfo(iter->first.first, iter->first.second));
+					gmi.m_permissions = GuildInterface::AllAdministrativePermissions;
+					m_membersInfo.set(iter->first, gmi);
+				}
+			}
+
+			if (m_members.get() != members)
+			{
+				// since we're going to be replacing everything, take the opportunity
+				// to convert over those guild members with permissions of -1
+				for (std::list<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::string> > >::const_iterator iterConvert = membersToConvertPermissions.begin(); iterConvert != membersToConvertPermissions.end(); ++iterConvert)
+				{
+					members.erase(iterConvert->second.first);
+					members.insert(iterConvert->second.second);
+				}
+
+				replaceSetIfNeeded("members", m_members, members, true);
+			}
+			else
+			{
+				// convert over those guild members with permissions of -1
+				for (std::list<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::string> > >::const_iterator iterConvert = membersToConvertPermissions.begin(); iterConvert != membersToConvertPermissions.end(); ++iterConvert)
+				{
+					m_members.erase(iterConvert->second.first);
+					m_members.insert(iterConvert->second.second);
+				}
+			}
+		}
+
+		// rebuild enemies
+		{
+			std::set<std::string> enemies;
+			for (std::map<int, GuildInfo>::const_iterator i = m_guildsInfo.begin(); i != m_guildsInfo.end(); ++i)
+			{
+				std::map<int, std::pair<int, time_t> > const &enemyGuildIds = GuildInterface::getGuildEnemiesKillInfo(i->first);
+				for (std::map<int, std::pair<int, time_t> >::const_iterator j = enemyGuildIds.begin(); j != enemyGuildIds.end(); ++j)
+				{
+					std::string enemySpec;
+					GuildStringParser::buildEnemySpec(i->first, j->first, j->second.first, static_cast<int>(j->second.second), enemySpec);
+					enemies.insert(enemySpec);
+				}
+			}
+			replaceSetIfNeeded("enemies", m_enemies, enemies, false);
+		}
+
+		// re-enable notification
+		m_membersInfo.setOnErase(this, &GuildObject::onMembersInfoErase);
+		m_membersInfo.setOnInsert(this, &GuildObject::onMembersInfoInsert);
+		m_membersInfo.setOnSet(this, &GuildObject::onMembersInfoSet);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
+{
+	UniverseObject::getAttributes(data);
+}
+
+// ----------------------------------------------------------------------
+
+GuildInfo const * GuildObject::getGuildInfo(int guildId) const
+{
+	std::map<int, GuildInfo>::const_iterator const iterFind = m_guildsInfo.find(guildId);
+	if (iterFind != m_guildsInfo.end())
+		return &(iterFind->second);
+
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+GuildMemberInfo const * GuildObject::getGuildMemberInfo(int guildId, NetworkId const &memberId) const
+{
+	std::map<std::pair<int, NetworkId>, GuildMemberInfo, GuildObject>::const_iterator const iterFind = m_membersInfo.find(std::make_pair(guildId, memberId));
+	if (iterFind != m_membersInfo.end())
+		return &(iterFind->second);
+
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+std::set<std::string> const &GuildObject::getGuildEnemies() const
+{
+	return m_enemies.get();
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::getAllGuildIds(std::vector<int> &results) const
+{
+	results.clear();
+
+	for (std::map<int, GuildInfo>::const_iterator iter = m_guildsInfo.begin(); iter != m_guildsInfo.end(); ++iter)
+	{
+		results.push_back(iter->first);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+int GuildObject::findGuild(std::string const &name) const
+{
+	// Name may be either an abbreviation or a name, and we should match in either case.
+	char const *nameText = name.c_str();
+	for (std::map<int, GuildInfo>::const_iterator i = m_guildsInfo.begin(); i != m_guildsInfo.end(); ++i)
+	{
+		if (   !_stricmp(i->second.m_name.c_str(), nameText)
+			|| !_stricmp(i->second.m_abbrev.c_str(), nameText))
+			return i->first;
+	}
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+bool GuildObject::guildExists(int guildId) const
+{
+	return (m_guildsInfo.find(guildId) != m_guildsInfo.end());
+}
+
+// ----------------------------------------------------------------------
+
+int GuildObject::getGuildId(NetworkId const &memberId) const
+{
+	std::map<NetworkId, int>::const_iterator const iterFind = m_fullMembers.find(memberId);
+	if (iterFind != m_fullMembers.end())
+		return iterFind->second;
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+int GuildObject::getGuildIdForSponsored(NetworkId const &memberId) const
+{
+	std::map<NetworkId, int>::const_iterator const iterFind = m_sponsoredMembers.find(memberId);
+	if (iterFind != m_sponsoredMembers.end())
+		return iterFind->second;
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+int GuildObject::getGuildIdForGuildLeader(NetworkId const &leaderId) const
+{
+	std::map<NetworkId, int>::const_iterator const iterFind = m_guildLeaders.find(leaderId);
+	if (iterFind != m_guildLeaders.end())
+		return iterFind->second;
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::getGuildMemberIds(int guildId, std::vector<NetworkId> &results) const
+{
+	results.clear();
+
+	for (std::map<std::pair<int, NetworkId>, GuildMemberInfo, GuildObject>::const_iterator iter = m_membersInfo.lower_bound(std::make_pair(guildId, NetworkId::cms_invalid)); iter != m_membersInfo.end(); ++iter)
+	{
+		if (iter->first.first != guildId)
+			break;
+
+		results.push_back(iter->first.second);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::getMemberIdsWithPermissions(int guildId, int permissions, std::vector<NetworkId> &results) const
+{
+	results.clear();
+
+	for (std::map<std::pair<int, NetworkId>, GuildMemberInfo, GuildObject>::const_iterator iter = m_membersInfo.lower_bound(std::make_pair(guildId, NetworkId::cms_invalid)); iter != m_membersInfo.end(); ++iter)
+	{
+		if (iter->first.first != guildId)
+			break;
+
+		if (permissions == GuildInterface::None)
+		{
+			if (iter->second.m_permissions == GuildInterface::None)
+				results.push_back(iter->first.second);
+		}
+		else if ((iter->second.m_permissions & permissions) == permissions)
+		{
+			results.push_back(iter->first.second);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+int GuildObject::nextFreeGuildId()
+{
+	// Note: this must return a guild id which is not only unused, but also one
+	// that cannot have collisions with a free guildId generated by another
+	// server, even during the same frame.  This is because we need immediate
+	// feedback of what the newly created guild's ID is, regardless of whether
+	// the master guild object is authoritative on this server.
+	// In order to do this, we find the lowest unused id starting from
+	// 1000 * our process id + 1.  We also need to assure that if multiple guilds
+	// are created from the same process, they do not collide in the time before
+	// the creation actually takes place, since we may not have up to date
+	// guild info if we are not authoritative.
+
+	do
+	{
+		++m_lowFreeGuildId;
+	}
+	while (guildExists(m_lowFreeGuildId));
+	return m_lowFreeGuildId;
+}
+
+// ----------------------------------------------------------------------
+
+int GuildObject::createGuild(std::string const &guildName, std::string const &guildAbbrev, int guildId)
+{
+	if (guildId == 0)
+		guildId = nextFreeGuildId();
+
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_guildCreate,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<int, std::pair<std::string, std::string> > >(std::make_pair(guildId, std::make_pair(guildName, guildAbbrev))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else if (!guildExists(guildId))
+	{
+		{
+			std::string nameSpec;
+			GuildStringParser::buildNameSpec(guildId, guildName, 0, 0, 0, 0, std::string(), 0, 0, nameSpec);
+			m_names.insert(nameSpec);
+		}
+		{
+			std::string abbrevSpec;
+			GuildStringParser::buildAbbrevSpec(guildId, guildAbbrev, abbrevSpec);
+			m_abbrevs.insert(abbrevSpec);
+		}
+
+		GuildInfo gi;
+		gi.m_name = guildName;
+		gi.m_abbrev = guildAbbrev;
+		m_guildsInfo.set(guildId, gi);
+	}
+
+	return guildId;
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::disbandGuild(int guildId)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_guildDisband,
+				0.0f,
+				new MessageQueueGenericValueType<int>(guildId),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else if (guildExists(guildId))
+	{
+		// remove guild
+		{
+			GuildInfo const * const gi = getGuildInfo(guildId);
+			if (gi)
+			{
+				std::string nameSpec;
+				GuildStringParser::buildNameSpec(guildId, gi->m_name, gi->m_guildElectionPreviousEndTime, gi->m_guildElectionNextEndTime, gi->m_guildFaction, gi->m_timeLeftGuildFaction, gi->m_guildGcwDefenderRegion, gi->m_timeJoinedGuildGcwDefenderRegion, gi->m_timeLeftGuildGcwDefenderRegion, nameSpec);
+				m_names.erase(nameSpec);
+
+				std::string abbrevSpec;
+				GuildStringParser::buildAbbrevSpec(guildId, gi->m_abbrev, abbrevSpec);
+				m_abbrevs.erase(abbrevSpec);
+
+				std::string leaderSpec;
+				GuildStringParser::buildLeaderSpec(guildId, gi->m_leaderId, leaderSpec);
+				m_leaders.erase(leaderSpec);
+
+				std::map<NetworkId, int>::const_iterator iterGuildLeader = m_guildLeaders.find(gi->m_leaderId);
+				if ((iterGuildLeader != m_guildLeaders.end()) && (iterGuildLeader->second == guildId))
+					m_guildLeaders.erase(gi->m_leaderId);
+
+				if (!gi->m_guildGcwDefenderRegion.empty() && (gi->m_timeLeftGuildGcwDefenderRegion <= 0))
+					removeGcwRegionDefenderGuild(gi->m_guildGcwDefenderRegion, guildId, (((gi->m_timeLeftGuildFaction > 0) || PvpData::isNeutralFactionId(gi->m_guildFaction)) ? PvpData::getNeutralFactionId() : gi->m_guildFaction));
+
+				m_guildsInfo.erase(guildId);
+			}
+		}
+
+		// remove all members
+		{
+			std::vector<NetworkId> memberIds;
+			for (std::map<std::pair<int, NetworkId>, GuildMemberInfo, GuildObject>::const_iterator iter = m_membersInfo.lower_bound(std::make_pair(guildId, NetworkId::cms_invalid)); iter != m_membersInfo.end(); ++iter)
+			{
+				if (iter->first.first != guildId)
+					break;
+
+				memberIds.push_back(iter->first.second);
+
+				std::string memberSpec;
+				GuildStringParser::buildMemberSpec(iter->first.first, iter->first.second, iter->second.m_name, iter->second.m_professionSkillTemplate, iter->second.m_level, iter->second.m_permissions, iter->second.m_rank, iter->second.m_title, iter->second.m_allegiance, memberSpec);
+				m_members.erase(memberSpec);
+			}
+
+			for (std::vector<NetworkId>::const_iterator iterMemberId = memberIds.begin(); iterMemberId != memberIds.end(); ++iterMemberId)
+			{
+				std::map<NetworkId, int>::const_iterator iterFind = m_fullMembers.find(*iterMemberId);
+				if ((iterFind != m_fullMembers.end()) && (iterFind->second == guildId))
+					m_fullMembers.erase(*iterMemberId);
+
+				iterFind = m_sponsoredMembers.find(*iterMemberId);
+				if ((iterFind != m_sponsoredMembers.end()) && (iterFind->second == guildId))
+					m_sponsoredMembers.erase(*iterMemberId);
+
+				iterFind = m_guildLeaders.find(*iterMemberId);
+				if ((iterFind != m_guildLeaders.end()) && (iterFind->second == guildId))
+					m_guildLeaders.erase(*iterMemberId);
+
+				m_membersInfo.erase(std::make_pair(guildId, *iterMemberId));
+			}
+		}
+
+		// remove who we're at war with
+		{
+			std::vector<int> const &enemies = GuildInterface::getGuildEnemies(guildId);
+			for (std::vector<int>::const_iterator i = enemies.begin(); i != enemies.end(); ++i)
+			{
+				std::pair<int, time_t> const & killInfo = GuildInterface::getGuildEnemyKillInfo(guildId, *i);
+				std::string enemySpec;
+				GuildStringParser::buildEnemySpec(guildId, *i, killInfo.first, killInfo.second, enemySpec);
+				m_enemies.erase(enemySpec);
+
+				// remove any pending kill count updates for the 2 guilds
+				m_guildWarKillTrackingAdjustment.erase(std::make_pair(guildId, *i));
+
+				// if it's a guild war that's ending and there's at least 1 kill, update ended guild war tracking data
+				std::pair<int, time_t> const * killInfoBtoA = GuildInterface::hasDeclaredWarAgainst(*i, guildId);
+				if (killInfoBtoA && ((killInfoBtoA->first > 0) || (killInfo.first > 0)))
+					GuildInterface::updateInactiveGuildWarTrackingInfo(*this, guildId, killInfo.first, *i, killInfoBtoA->first);
+			}
+		}
+
+		// remove who's at war with us
+		{
+			std::vector<int> const &enemies = GuildInterface::getGuildsAtWarWith(guildId);
+			for (std::vector<int>::const_iterator i = enemies.begin(); i != enemies.end(); ++i)
+			{
+				std::pair<int, time_t> const & killInfo = GuildInterface::getGuildEnemyKillInfo(*i, guildId);
+				std::string enemySpec;
+				GuildStringParser::buildEnemySpec(*i, guildId, killInfo.first, killInfo.second, enemySpec);
+				m_enemies.erase(enemySpec);
+
+				// remove any pending kill count updates for the 2 guilds
+				m_guildWarKillTrackingAdjustment.erase(std::make_pair(*i, guildId));
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::removeGuildMember(int guildId, NetworkId const &memberId)
+{
+	GuildInfo const * const gi = getGuildInfo(guildId);
+	GuildMemberInfo const * const gmi = getGuildMemberInfo(guildId, memberId);
+	if (gi && gmi)
+	{
+		if (!isAuthoritative())
+		{
+			Controller *controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(
+					CM_guildRemoveMember,
+					0.0f,
+					new MessageQueueGenericValueType<std::pair<int, NetworkId> >(std::make_pair(guildId, memberId)),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+		else
+		{
+			{
+				std::string firstName;
+				size_t pos = 0;
+				IGNORE_RETURN(Unicode::getFirstToken(gmi->m_name, 0, pos, firstName));
+				GuildInterface::leaveGuildVoiceChatRoom(memberId, gmi->m_name, guildId);
+			}
+
+			std::string memberSpec;
+			GuildStringParser::buildMemberSpec(guildId, memberId, gmi->m_name, gmi->m_professionSkillTemplate, gmi->m_level, gmi->m_permissions, gmi->m_rank, gmi->m_title, gmi->m_allegiance, memberSpec);
+			m_members.erase(memberSpec);
+
+			GuildInfo updatedGi(gi);
+			updateGuildInfoMembersCount(updatedGi, &(gmi->m_permissions), NULL);
+			m_guildsInfo.set(guildId, updatedGi);
+
+			std::map<NetworkId, int>::const_iterator iterFind = m_fullMembers.find(memberId);
+			if ((iterFind != m_fullMembers.end()) && (iterFind->second == guildId))
+				m_fullMembers.erase(memberId);
+
+			iterFind = m_sponsoredMembers.find(memberId);
+			if ((iterFind != m_sponsoredMembers.end()) && (iterFind->second == guildId))
+				m_sponsoredMembers.erase(memberId);
+
+			iterFind = m_guildLeaders.find(memberId);
+			if ((iterFind != m_guildLeaders.end()) && (iterFind->second == guildId))
+				m_guildLeaders.erase(memberId);
+
+			m_membersInfo.erase(std::make_pair(guildId, memberId));
+
+			// cannot be a GCW region defender if doesn't meet minimum guild member count requirement
+			if (!updatedGi.m_guildGcwDefenderRegion.empty() && (updatedGi.m_timeLeftGuildGcwDefenderRegion <= 0) && (updatedGi.getCountMembersOnly() < ConfigServerGame::getGcwGuildMinMembersForGcwRegionDefender()))
+				setGuildGcwDefenderRegion(guildId, std::string());
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::addGuildCreatorMember(int guildId, NetworkId const &memberId, std::string const &memberName, std::string const &memberProfessionSkillTemplate, int const memberLevel)
+{
+	GuildMemberInfo const * const existingGmi = getGuildMemberInfo(guildId, memberId);
+	std::string realMemberName = memberName;
+	if (realMemberName.empty() && existingGmi)
+		realMemberName = existingGmi->m_name;
+
+	ServerObject const *so = NULL;
+	if (realMemberName.empty())
+	{
+		so = ServerWorld::findObjectByNetworkId(memberId);
+		if (so)
+			realMemberName = Unicode::wideToNarrow(so->getAssignedObjectName());
+	}
+
+	if (realMemberName.empty())
+	{
+		WARNING(true, ("Unable to find name for guild (%d) member (%s)", guildId, memberId.getValueString().c_str()));
+		return;
+	}
+
+	std::string realMemberProfessionSkillTemplate = memberProfessionSkillTemplate;
+	int realMemberLevel = memberLevel;
+	if (realMemberProfessionSkillTemplate.empty() || (realMemberLevel <= 0))
+	{
+		if (existingGmi)
+		{
+			realMemberProfessionSkillTemplate = existingGmi->m_professionSkillTemplate;
+			realMemberLevel = existingGmi->m_level;
+		}
+		else
+		{
+			if (!so)
+				so = ServerWorld::findObjectByNetworkId(memberId);
+
+			if (so)
+			{
+				CreatureObject const * const co = so->asCreatureObject();
+				if (co)
+				{
+					realMemberLevel = co->getLevel();
+
+					PlayerObject const * const player = PlayerCreatureController::getPlayerObject(co);
+					if (player)
+						realMemberProfessionSkillTemplate = player->getSkillTemplate();
+				}
+			}
+		}
+	}
+
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_guildAddCreatorMember,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::pair<std::string, int> > > >(std::make_pair(std::make_pair(guildId, memberId), std::make_pair(realMemberName, std::make_pair(realMemberProfessionSkillTemplate, realMemberLevel)))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		GuildInfo const * const gi = getGuildInfo(guildId);
+		if (gi)
+		{
+			if (existingGmi)
+			{
+				std::string oldMemberSpec;
+				GuildStringParser::buildMemberSpec(guildId, memberId, existingGmi->m_name, existingGmi->m_professionSkillTemplate, existingGmi->m_level, existingGmi->m_permissions, existingGmi->m_rank, existingGmi->m_title, existingGmi->m_allegiance, oldMemberSpec);
+				m_members.erase(oldMemberSpec);
+			}
+
+			int const permissions = (existingGmi ? (existingGmi->m_permissions | GuildInterface::AllAdministrativePermissions) : GuildInterface::AllAdministrativePermissions);
+			BitArray const rank = (existingGmi ? existingGmi->m_rank : BitArray());
+			std::string const title = (existingGmi ? existingGmi->m_title : std::string());
+			std::string memberSpec;
+			GuildStringParser::buildMemberSpec(guildId, memberId, realMemberName, realMemberProfessionSkillTemplate, realMemberLevel, permissions, rank, title, memberId, memberSpec);
+			m_members.insert(memberSpec);
+
+			GuildInfo updatedGi(gi);
+			updateGuildInfoMembersCount(updatedGi, (existingGmi ? &(existingGmi->m_permissions) : NULL), &permissions);
+			m_guildsInfo.set(guildId, updatedGi);
+
+			if (existingGmi)
+			{
+				if (existingGmi->m_permissions == GuildInterface::None)
+					m_sponsoredMembers.erase(memberId);
+				else
+					m_fullMembers.erase(memberId);
+			}
+
+			m_fullMembers.set(memberId, guildId);
+
+			GuildMemberInfo updatedGmi(existingGmi);
+			updatedGmi.m_name = realMemberName;
+			updatedGmi.m_professionSkillTemplate = realMemberProfessionSkillTemplate;
+			updatedGmi.m_level = realMemberLevel;
+			updatedGmi.m_permissions = permissions;
+			updatedGmi.m_rank = rank;
+			updatedGmi.m_title = title;
+			updatedGmi.m_allegiance = memberId;
+			m_membersInfo.set(std::make_pair(guildId, memberId), updatedGmi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::addGuildSponsorMember(int guildId, NetworkId const &memberId, std::string const &memberName, std::string const &memberProfessionSkillTemplate, int const memberLevel)
+{
+	GuildMemberInfo const * const existingGmi = getGuildMemberInfo(guildId, memberId);
+	std::string realMemberName = memberName;
+	if (realMemberName.empty() && existingGmi)
+		realMemberName = existingGmi->m_name;
+
+	ServerObject const *so = NULL;
+	if (realMemberName.empty())
+	{
+		so = ServerWorld::findObjectByNetworkId(memberId);
+		if (so)
+			realMemberName = Unicode::wideToNarrow(so->getAssignedObjectName());
+	}
+
+	if (realMemberName.empty())
+	{
+		WARNING(true, ("Unable to find name for guild (%d) member (%s)", guildId, memberId.getValueString().c_str()));
+		return;
+	}
+
+	std::string realMemberProfessionSkillTemplate = memberProfessionSkillTemplate;
+	int realMemberLevel = memberLevel;
+	if (realMemberProfessionSkillTemplate.empty() || (realMemberLevel <= 0))
+	{
+		if (existingGmi)
+		{
+			realMemberProfessionSkillTemplate = existingGmi->m_professionSkillTemplate;
+			realMemberLevel = existingGmi->m_level;
+		}
+		else
+		{
+			if (!so)
+				so = ServerWorld::findObjectByNetworkId(memberId);
+
+			if (so)
+			{
+				CreatureObject const * const co = so->asCreatureObject();
+				if (co)
+				{
+					realMemberLevel = co->getLevel();
+
+					PlayerObject const * const player = PlayerCreatureController::getPlayerObject(co);
+					if (player)
+						realMemberProfessionSkillTemplate = player->getSkillTemplate();
+				}
+			}
+		}
+	}
+
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			controller->appendMessage(
+				CM_guildAddSponsorMember,
+				0.0f,
+				new MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::pair<std::string, int> > > >(std::make_pair(std::make_pair(guildId, memberId), std::make_pair(realMemberName, std::make_pair(realMemberProfessionSkillTemplate, realMemberLevel)))),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+	}
+	else
+	{
+		GuildInfo const * const gi = getGuildInfo(guildId);
+		if (gi)
+		{
+			if (existingGmi)
+			{
+				std::string oldMemberSpec;
+				GuildStringParser::buildMemberSpec(guildId, memberId, existingGmi->m_name, existingGmi->m_professionSkillTemplate, existingGmi->m_level, existingGmi->m_permissions, existingGmi->m_rank, existingGmi->m_title, existingGmi->m_allegiance, oldMemberSpec);
+				m_members.erase(oldMemberSpec);
+			}
+
+			int const permissions = GuildInterface::None;
+			std::string memberSpec;
+			GuildStringParser::buildMemberSpec(guildId, memberId, realMemberName, realMemberProfessionSkillTemplate, realMemberLevel, permissions, BitArray(), std::string(), NetworkId::cms_invalid, memberSpec);
+			m_members.insert(memberSpec);
+
+			GuildInfo updatedGi(gi);
+			updateGuildInfoMembersCount(updatedGi, (existingGmi ? &(existingGmi->m_permissions) : NULL), &permissions);
+			m_guildsInfo.set(guildId, updatedGi);
+
+			if (existingGmi)
+			{
+				if (existingGmi->m_permissions == GuildInterface::None)
+					m_sponsoredMembers.erase(memberId);
+				else
+					m_fullMembers.erase(memberId);
+			}
+
+			m_sponsoredMembers.set(memberId, guildId);
+
+			GuildMemberInfo updatedGmi(existingGmi);
+			updatedGmi.m_name = realMemberName;
+			updatedGmi.m_professionSkillTemplate = realMemberProfessionSkillTemplate;
+			updatedGmi.m_level = realMemberLevel;
+			updatedGmi.m_permissions = permissions;
+			updatedGmi.m_rank.clear();
+			updatedGmi.m_title.clear();
+			updatedGmi.m_allegiance = NetworkId::cms_invalid;
+			m_membersInfo.set(std::make_pair(guildId, memberId), updatedGmi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::setGuildMemberPermission(int guildId, NetworkId const &memberId, int permissions)
+{
+	GuildInfo const * const gi = getGuildInfo(guildId);
+	GuildMemberInfo const * const gmi = getGuildMemberInfo(guildId, memberId);
+	if (gi && gmi)
+	{
+		if (!isAuthoritative())
+		{
+			Controller *controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(
+					CM_guildSetMemberPermission,
+					0.0f,
+					new MessageQueueGenericValueType<std::pair<std::pair<int, int>, NetworkId> >(std::make_pair(std::make_pair(guildId, permissions), memberId)),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+		else if (gmi->m_permissions != permissions)
+		{	
+			std::string memberSpec;
+			GuildStringParser::buildMemberSpec(guildId, memberId, gmi->m_name, gmi->m_professionSkillTemplate, gmi->m_level, gmi->m_permissions, gmi->m_rank, gmi->m_title, gmi->m_allegiance, memberSpec);
+			m_members.erase(memberSpec);
+
+			// if the existing guild member is already a guild member (i.e. not sponsored),
+			// absolutely, positively make sure  that the new permissions contain
+			// GuildPermissions::Member; once this permission has been set, it can
+			// never be removed; the guild member should be removed from the guild
+			// if you really want to remove the GuildPermissions::Member permission
+			if (gmi->m_permissions & GuildInterface::Member)
+				permissions |= GuildInterface::Member;
+
+			GuildStringParser::buildMemberSpec(guildId, memberId, gmi->m_name, gmi->m_professionSkillTemplate, gmi->m_level, permissions, gmi->m_rank, gmi->m_title, gmi->m_allegiance, memberSpec);
+			m_members.insert(memberSpec);
+
+			GuildInfo updatedGi(gi);
+			updateGuildInfoMembersCount(updatedGi, &gmi->m_permissions, &permissions);
+			m_guildsInfo.set(guildId, updatedGi);
+
+			// handle moving from the member from the sponsored list to the member
+			// list if the permission has been changed from sponsored to member
+			if ((gmi->m_permissions == GuildInterface::None) && (permissions & GuildInterface::Member))
+			{
+				std::map<NetworkId, int>::const_iterator const iterFind = m_sponsoredMembers.find(memberId);
+				if ((iterFind != m_sponsoredMembers.end()) && (iterFind->second == guildId))
+					m_sponsoredMembers.erase(memberId);
+
+				m_fullMembers.set(memberId, guildId);
+			}
+
+			GuildMemberInfo updatedGmi(gmi);
+			updatedGmi.m_permissions = permissions;
+			m_membersInfo.set(std::make_pair(guildId, memberId), updatedGmi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::setGuildMemberTitle(int guildId, NetworkId const &memberId, std::string const &title)
+{
+	GuildMemberInfo const * const gmi = getGuildMemberInfo(guildId, memberId);
+	if (gmi)
+	{
+		if (!isAuthoritative())
+		{
+			Controller *controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(
+					CM_guildSetMemberTitle,
+					0.0f,
+					new MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > >(std::make_pair(title, std::make_pair(memberId, guildId))),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+		else if (gmi->m_title != title)
+		{
+			std::string memberSpec;
+			GuildStringParser::buildMemberSpec(guildId, memberId, gmi->m_name, gmi->m_professionSkillTemplate, gmi->m_level, gmi->m_permissions, gmi->m_rank, gmi->m_title, gmi->m_allegiance, memberSpec);
+			m_members.erase(memberSpec);
+
+			GuildStringParser::buildMemberSpec(guildId, memberId, gmi->m_name, gmi->m_professionSkillTemplate, gmi->m_level, gmi->m_permissions, gmi->m_rank, title, gmi->m_allegiance, memberSpec);
+			m_members.insert(memberSpec);
+
+			GuildMemberInfo updatedGmi(gmi);
+			updatedGmi.m_title = title;
+			m_membersInfo.set(std::make_pair(guildId, memberId), updatedGmi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::setGuildMemberAllegiance(int guildId, NetworkId const &memberId, NetworkId const &allegiance)
+{
+	GuildMemberInfo const * const gmi = getGuildMemberInfo(guildId, memberId);
+	if (gmi)
+	{
+		if (!isAuthoritative())
+		{
+			Controller *controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(
+					CM_guildSetMemberAllegiance,
+					0.0f,
+					new MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, NetworkId> >(std::make_pair(std::make_pair(guildId, memberId), allegiance)),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+		else if (gmi->m_allegiance != allegiance)
+		{
+			std::string memberSpec;
+			GuildStringParser::buildMemberSpec(guildId, memberId, gmi->m_name, gmi->m_professionSkillTemplate, gmi->m_level, gmi->m_permissions, gmi->m_rank, gmi->m_title, gmi->m_allegiance, memberSpec);
+			m_members.erase(memberSpec);
+
+			GuildStringParser::buildMemberSpec(guildId, memberId, gmi->m_name, gmi->m_professionSkillTemplate, gmi->m_level, gmi->m_permissions, gmi->m_rank, gmi->m_title, allegiance, memberSpec);
+			m_members.insert(memberSpec);
+
+			GuildMemberInfo updatedGmi(gmi);
+			updatedGmi.m_allegiance = allegiance;
+			m_membersInfo.set(std::make_pair(guildId, memberId), updatedGmi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::setGuildMemberPermissionAndAllegiance(int guildId, NetworkId const &memberId, int permissions, NetworkId const &allegiance)
+{
+	GuildInfo const * const gi = getGuildInfo(guildId);
+	GuildMemberInfo const * const gmi = getGuildMemberInfo(guildId, memberId);
+	if (gi && gmi)
+	{
+		if (!isAuthoritative())
+		{
+			Controller *controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(
+					CM_guildSetMemberPermissionAndAllegiance,
+					0.0f,
+					new MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<int, NetworkId> > >(std::make_pair(std::make_pair(guildId, memberId), std::make_pair(permissions, allegiance))),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+		else if ((gmi->m_permissions != permissions) || (gmi->m_allegiance != allegiance))
+		{
+			std::string memberSpec;
+			GuildStringParser::buildMemberSpec(guildId, memberId, gmi->m_name, gmi->m_professionSkillTemplate, gmi->m_level, gmi->m_permissions, gmi->m_rank, gmi->m_title, gmi->m_allegiance, memberSpec);
+			m_members.erase(memberSpec);
+
+			// if the existing guild member is already a guild member (i.e. not sponsored),
+			// absolutely, positively make sure  that the new permissions contain
+			// GuildPermissions::Member; once this permission has been set, it can
+			// never be removed; the guild member should be removed from the guild
+			// if you really want to remove the GuildPermissions::Member permission
+			if (gmi->m_permissions & GuildInterface::Member)
+				permissions |= GuildInterface::Member;
+
+			memberSpec.clear();
+			GuildStringParser::buildMemberSpec(guildId, memberId, gmi->m_name, gmi->m_professionSkillTemplate, gmi->m_level, permissions, gmi->m_rank, gmi->m_title, allegiance, memberSpec);
+			m_members.insert(memberSpec);
+
+			if (gmi->m_permissions != permissions)
+			{
+				GuildInfo updatedGi(gi);
+				updateGuildInfoMembersCount(updatedGi, &gmi->m_permissions, &permissions);
+				m_guildsInfo.set(guildId, updatedGi);
+
+				// handle moving from the member from the sponsored list to the member
+				// list if the permission has been changed from sponsored to member
+				if ((gmi->m_permissions == GuildInterface::None) && (permissions & GuildInterface::Member))
+				{
+					std::map<NetworkId, int>::const_iterator const iterFind = m_sponsoredMembers.find(memberId);
+					if ((iterFind != m_sponsoredMembers.end()) && (iterFind->second == guildId))
+						m_sponsoredMembers.erase(memberId);
+
+					m_fullMembers.set(memberId, guildId);
+				}
+			}
+
+			GuildMemberInfo updatedGmi(gmi);
+			updatedGmi.m_permissions = permissions;
+			updatedGmi.m_allegiance = allegiance;
+			m_membersInfo.set(std::make_pair(guildId, memberId), updatedGmi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::setGuildMemberNameAndPermision(int guildId, NetworkId const &memberId, std::string const &memberName, int permissions)
+{
+	GuildInfo const * const gi = getGuildInfo(guildId);
+	GuildMemberInfo const * const gmi = getGuildMemberInfo(guildId, memberId);
+	if (gi && gmi)
+	{
+		if (!isAuthoritative())
+		{
+			Controller *controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(
+					CM_guildSetMemberNameAndPermission,
+					0.0f,
+					new MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > >(std::make_pair(std::make_pair(guildId, memberId), std::make_pair(memberName, permissions))),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+		else if ((gmi->m_name != memberName) || (gmi->m_permissions != permissions))
+		{
+			std::string memberSpec;
+			GuildStringParser::buildMemberSpec(guildId, memberId, gmi->m_name, gmi->m_professionSkillTemplate, gmi->m_level, gmi->m_permissions, gmi->m_rank, gmi->m_title, gmi->m_allegiance, memberSpec);
+			m_members.erase(memberSpec);
+
+			// if the existing guild member is already a guild member (i.e. not sponsored),
+			// absolutely, positively make sure  that the new permissions contain
+			// GuildPermissions::Member; once this permission has been set, it can
+			// never be removed; the guild member should be removed from the guild
+			// if you really want to remove the GuildPermissions::Member permission
+			if (gmi->m_permissions & GuildInterface::Member)
+				permissions |= GuildInterface::Member;
+
+			GuildStringParser::buildMemberSpec(guildId, memberId, memberName, gmi->m_professionSkillTemplate, gmi->m_level, permissions, gmi->m_rank, gmi->m_title, gmi->m_allegiance, memberSpec);
+			m_members.insert(memberSpec);
+
+			if (gmi->m_permissions != permissions)
+			{
+				GuildInfo updatedGi(gi);
+				updateGuildInfoMembersCount(updatedGi, &gmi->m_permissions, &permissions);
+				m_guildsInfo.set(guildId, updatedGi);
+
+				// handle moving from the member from the sponsored list to the member
+				// list if the permission has been changed from sponsored to member
+				if ((gmi->m_permissions == GuildInterface::None) && (permissions & GuildInterface::Member))
+				{
+					std::map<NetworkId, int>::const_iterator const iterFind = m_sponsoredMembers.find(memberId);
+					if ((iterFind != m_sponsoredMembers.end()) && (iterFind->second == guildId))
+						m_sponsoredMembers.erase(memberId);
+
+					m_fullMembers.set(memberId, guildId);
+				}
+			}
+
+			GuildMemberInfo updatedGmi(gmi);
+			updatedGmi.m_name = memberName;
+			updatedGmi.m_permissions = permissions;
+			m_membersInfo.set(std::make_pair(guildId, memberId), updatedGmi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::setGuildMemberProfessionInfo(int guildId, NetworkId const &memberId, std::string const &memberProfessionSkillTemplate, int memberLevel)
+{
+	GuildMemberInfo const * const gmi = getGuildMemberInfo(guildId, memberId);
+	if (gmi)
+	{
+		if (!isAuthoritative())
+		{
+			Controller *controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(
+					CM_guildSetMemberProfessionInfo,
+					0.0f,
+					new MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > >(std::make_pair(std::make_pair(guildId, memberId), std::make_pair(memberProfessionSkillTemplate, memberLevel))),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+		else if ((gmi->m_professionSkillTemplate != memberProfessionSkillTemplate) || (gmi->m_level != memberLevel))
+		{			
+			std::string memberSpec;
+			GuildStringParser::buildMemberSpec(guildId, memberId, gmi->m_name, gmi->m_professionSkillTemplate, gmi->m_level, gmi->m_permissions, gmi->m_rank, gmi->m_title, gmi->m_allegiance, memberSpec);
+			m_members.erase(memberSpec);
+
+			GuildStringParser::buildMemberSpec(guildId, memberId, gmi->m_name, memberProfessionSkillTemplate, memberLevel, gmi->m_permissions, gmi->m_rank, gmi->m_title, gmi->m_allegiance, memberSpec);
+			m_members.insert(memberSpec);
+
+			GuildMemberInfo updatedGmi(gmi);
+			updatedGmi.m_professionSkillTemplate = memberProfessionSkillTemplate;
+			updatedGmi.m_level = memberLevel;
+			m_membersInfo.set(std::make_pair(guildId, memberId), updatedGmi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::addGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName)
+{
+	GuildMemberInfo const * const gmi = getGuildMemberInfo(guildId, memberId);
+	if (gmi)
+	{
+		if (!isAuthoritative())
+		{
+			Controller *controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(
+					CM_guildAddMemberRank,
+					0.0f,
+					new MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > >(std::make_pair(rankName, std::make_pair(memberId, guildId))),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+		else
+		{
+			GuildRankDataTable::GuildRank const * rankData = GuildRankDataTable::getRank(rankName);
+			if (rankData && !gmi->m_rank.testBit(rankData->slotId))
+			{
+				std::string memberSpec;
+				GuildStringParser::buildMemberSpec(guildId, memberId, gmi->m_name, gmi->m_professionSkillTemplate, gmi->m_level, gmi->m_permissions, gmi->m_rank, gmi->m_title, gmi->m_allegiance, memberSpec);
+				m_members.erase(memberSpec);
+
+				BitArray rank = gmi->m_rank;
+				rank.setBit(rankData->slotId);
+				GuildStringParser::buildMemberSpec(guildId, memberId, gmi->m_name, gmi->m_professionSkillTemplate, gmi->m_level, gmi->m_permissions, rank, gmi->m_title, gmi->m_allegiance, memberSpec);
+				m_members.insert(memberSpec);
+
+				GuildMemberInfo updatedGmi(gmi);
+				updatedGmi.m_rank = rank;
+				m_membersInfo.set(std::make_pair(guildId, memberId), updatedGmi);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::removeGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName)
+{
+	GuildMemberInfo const * const gmi = getGuildMemberInfo(guildId, memberId);
+	if (gmi)
+	{
+		if (!isAuthoritative())
+		{
+			Controller *controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(
+					CM_guildRemoveMemberRank,
+					0.0f,
+					new MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > >(std::make_pair(rankName, std::make_pair(memberId, guildId))),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+		else
+		{
+			GuildRankDataTable::GuildRank const * rankData = GuildRankDataTable::getRank(rankName);
+			if (rankData && gmi->m_rank.testBit(rankData->slotId))
+			{
+				std::string memberSpec;
+				GuildStringParser::buildMemberSpec(guildId, memberId, gmi->m_name, gmi->m_professionSkillTemplate, gmi->m_level, gmi->m_permissions, gmi->m_rank, gmi->m_title, gmi->m_allegiance, memberSpec);
+				m_members.erase(memberSpec);
+
+				BitArray rank = gmi->m_rank;
+				rank.clearBit(rankData->slotId);
+				GuildStringParser::buildMemberSpec(guildId, memberId, gmi->m_name, gmi->m_professionSkillTemplate, gmi->m_level, gmi->m_permissions, rank, gmi->m_title, gmi->m_allegiance, memberSpec);
+				m_members.insert(memberSpec);
+
+				GuildMemberInfo updatedGmi(gmi);
+				updatedGmi.m_rank = rank;
+				m_membersInfo.set(std::make_pair(guildId, memberId), updatedGmi);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool GuildObject::hasGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName)
+{
+	GuildRankDataTable::GuildRank const * rankData = GuildRankDataTable::getRank(rankName);
+	GuildMemberInfo const * const gmi = getGuildMemberInfo(guildId, memberId);
+	return (rankData && gmi && gmi->m_rank.testBit(rankData->slotId));
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::getGuildMemberRank(int guildId, NetworkId const &memberId, std::vector<std::string> &ranks)
+{
+	ranks.clear();
+
+	GuildMemberInfo const * const gmi = getGuildMemberInfo(guildId, memberId);
+	if (!gmi)
+		return;
+
+	std::vector<GuildRankDataTable::GuildRank const *> const & allRanks = GuildRankDataTable::getAllRanks();
+	for (std::vector<GuildRankDataTable::GuildRank const *>::const_iterator iter = allRanks.begin(); iter != allRanks.end(); ++iter)
+	{
+		if (gmi->m_rank.testBit((*iter)->slotId))
+			ranks.push_back((*iter)->name);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::removeGuildEnemy(int guildId, int enemyId)
+{
+	if (GuildInterface::hasDeclaredWarAgainst(guildId, enemyId))
+	{
+		if (!isAuthoritative())
+		{
+			Controller *controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(
+					CM_guildRemoveEnemy,
+					0.0f,
+					new MessageQueueGenericValueType<std::pair<int, int> >(std::make_pair(guildId, enemyId)),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+		else
+		{
+			std::pair<int, time_t> const & killInfo = GuildInterface::getGuildEnemyKillInfo(guildId, enemyId);
+			std::string enemySpec;
+			GuildStringParser::buildEnemySpec(guildId, enemyId, killInfo.first, killInfo.second, enemySpec);
+			m_enemies.erase(enemySpec);
+
+			// if the other build B has declared war on us, clear the
+			// B -> A kill count as we are no longer at war with guild B
+			std::pair<int, time_t> const * killInfoBtoA = GuildInterface::hasDeclaredWarAgainst(enemyId, guildId);
+			if (killInfoBtoA)
+			{
+				if (killInfoBtoA->first > 0)
+				{
+					GuildStringParser::buildEnemySpec(enemyId, guildId, killInfoBtoA->first, killInfoBtoA->second, enemySpec);
+					m_enemies.erase(enemySpec);
+
+					GuildStringParser::buildEnemySpec(enemyId, guildId, 0, 0, enemySpec);
+					m_enemies.insert(enemySpec);
+				}
+
+				// if there's at least 1 kill in the guild war, update ended guild war tracking data
+				if ((killInfoBtoA->first > 0) || (killInfo.first > 0))
+					GuildInterface::updateInactiveGuildWarTrackingInfo(*this, guildId, killInfo.first, enemyId, killInfoBtoA->first);
+			}
+
+			// remove any pending kill count updates for the 2 guilds
+			m_guildWarKillTrackingAdjustment.erase(std::make_pair(guildId, enemyId));
+			m_guildWarKillTrackingAdjustment.erase(std::make_pair(enemyId, guildId));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::modifyGuildWarKillTracking(int killerGuildId, int victimGuildId, int adjustment, int updateTime)
+{
+	if (   !GuildInterface::hasDeclaredWarAgainst(killerGuildId, victimGuildId)
+		|| !GuildInterface::hasDeclaredWarAgainst(victimGuildId, killerGuildId))
+	{
+		return;
+	}
+
+	if (updateTime <= 0)
+		updateTime = static_cast<int>(::time(NULL));
+
+	// queue up adjustments and periodically update the data
+	std::pair<std::map<std::pair<int, int>, std::pair<int, int> >::iterator, bool> result = m_guildWarKillTrackingAdjustment.insert(std::make_pair(std::make_pair(killerGuildId, victimGuildId), std::make_pair(adjustment, updateTime)));
+	if (!result.second)
+	{
+		result.first->second.first += adjustment;
+		result.first->second.second = std::max(result.first->second.second, updateTime);
+	}
+
+	// non-auth game servers send their updates to auth game server in/every 10 seconds;
+	// auth game server updates the universe data in/every 60 seconds
+	if (m_nextGuildWarKillTrackingAdjustmentUpdate == 0)
+		m_nextGuildWarKillTrackingAdjustmentUpdate = ServerClock::getInstance().getGameTimeSeconds() + (isAuthoritative() ? 60 : 10);
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::updateGuildWarKillTrackingData()
+{
+	if (m_nextGuildWarKillTrackingAdjustmentUpdate == 0)
+		return;
+
+	if (ServerClock::getInstance().getGameTimeSeconds() <= m_nextGuildWarKillTrackingAdjustmentUpdate)
+		return;
+
+	if (!isAuthoritative())
+	{
+		// send updates to auth game server
+		Controller *controller = getController();
+		if (controller)
+		{
+			for (std::map<std::pair<int, int>, std::pair<int, int> >::const_iterator iter = m_guildWarKillTrackingAdjustment.begin(); iter != m_guildWarKillTrackingAdjustment.end(); ++iter)
+			{
+				controller->appendMessage(
+					CM_guildUpdateGuildWarKillTrackingData,
+					0.0f,
+					new MessageQueueGenericValueType<std::pair<std::pair<int, int>, std::pair<int, int> > >(std::make_pair(std::make_pair(iter->first.first, iter->first.second), std::make_pair(iter->second.first, iter->second.second))),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+	}
+	else
+	{
+		std::string enemySpec;
+		for (std::map<std::pair<int, int>, std::pair<int, int> >::const_iterator iter = m_guildWarKillTrackingAdjustment.begin(); iter != m_guildWarKillTrackingAdjustment.end(); ++iter)
+		{
+			if (   GuildInterface::hasDeclaredWarAgainst(iter->first.first, iter->first.second)
+				&& GuildInterface::hasDeclaredWarAgainst(iter->first.second, iter->first.first))
+			{
+				std::pair<int, time_t> const & killInfo = GuildInterface::getGuildEnemyKillInfo(iter->first.first, iter->first.second);
+				GuildStringParser::buildEnemySpec(iter->first.first, iter->first.second, killInfo.first, killInfo.second, enemySpec);
+				m_enemies.erase(enemySpec);
+
+				GuildStringParser::buildEnemySpec(iter->first.first, iter->first.second, killInfo.first + iter->second.first, std::max(killInfo.second, static_cast<time_t>(iter->second.second)), enemySpec);
+				m_enemies.insert(enemySpec);
+			}
+		}
+	}
+
+	m_guildWarKillTrackingAdjustment.clear();
+	m_nextGuildWarKillTrackingAdjustmentUpdate = 0;
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::setGuildEnemy(int guildId, int enemyId)
+{
+	if (!GuildInterface::hasDeclaredWarAgainst(guildId, enemyId))
+	{
+		if (!isAuthoritative())
+		{
+			Controller *controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(
+					CM_guildSetEnemy,
+					0.0f,
+					new MessageQueueGenericValueType<std::pair<int, int> >(std::make_pair(guildId, enemyId)),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+		else
+		{
+			std::string enemySpec;
+			GuildStringParser::buildEnemySpec(guildId, enemyId, 0, 0, enemySpec);
+			m_enemies.insert(enemySpec);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::setGuildElectionEndTime(int guildId, int electionPreviousEndTime, int electionNextEndTime)
+{
+	GuildInfo const * const gi = getGuildInfo(guildId);
+	if (gi)
+	{
+		if (!isAuthoritative())
+		{
+			Controller *controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(
+					CM_guildSetGuildElectionEndTime,
+					0.0f,
+					new MessageQueueGenericValueType<std::pair<std::pair<int, int>, int> >(std::make_pair(std::make_pair(electionPreviousEndTime, electionNextEndTime), guildId)),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+		else if ((gi->m_guildElectionPreviousEndTime != electionPreviousEndTime) || (gi->m_guildElectionNextEndTime != electionNextEndTime))
+		{
+			std::string oldNameSpec, newNameSpec;
+			GuildStringParser::buildNameSpec(guildId, gi->m_name, gi->m_guildElectionPreviousEndTime, gi->m_guildElectionNextEndTime, gi->m_guildFaction, gi->m_timeLeftGuildFaction, gi->m_guildGcwDefenderRegion, gi->m_timeJoinedGuildGcwDefenderRegion, gi->m_timeLeftGuildGcwDefenderRegion, oldNameSpec);
+			GuildStringParser::buildNameSpec(guildId, gi->m_name, electionPreviousEndTime, electionNextEndTime, gi->m_guildFaction, gi->m_timeLeftGuildFaction, gi->m_guildGcwDefenderRegion, gi->m_timeJoinedGuildGcwDefenderRegion, gi->m_timeLeftGuildGcwDefenderRegion, newNameSpec);
+			m_names.erase(oldNameSpec);
+			m_names.insert(newNameSpec);
+
+			GuildInfo updatedGi(gi);
+			updatedGi.m_guildElectionPreviousEndTime = electionPreviousEndTime;
+			updatedGi.m_guildElectionNextEndTime = electionNextEndTime;
+			m_guildsInfo.set(guildId, updatedGi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::setGuildFaction(int guildId, uint32 guildFaction)
+{
+	GuildInfo const * const gi = getGuildInfo(guildId);
+	if (gi)
+	{
+		if (!isAuthoritative())
+		{
+			Controller *controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(
+					CM_guildSetGuildFaction,
+					0.0f,
+					new MessageQueueGenericValueType<std::pair<int, int> >(std::make_pair(guildId, static_cast<int>(guildFaction))),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+		else
+		{
+			bool factionChange = false;
+			bool const isCurrentlyNeutral = ((gi->m_timeLeftGuildFaction > 0) || PvpData::isNeutralFactionId(gi->m_guildFaction));
+
+			if (isCurrentlyNeutral)
+			{
+				if (!PvpData::isNeutralFactionId(guildFaction))
+					factionChange = true;
+			}
+			else if (gi->m_guildFaction != guildFaction)
+			{
+				factionChange = true;
+			}
+
+			if (factionChange)
+			{
+				int const timeLeftGuildFaction = static_cast<int>(::time(NULL));
+
+				std::string oldNameSpec, newNameSpec;
+				GuildStringParser::buildNameSpec(guildId, gi->m_name, gi->m_guildElectionPreviousEndTime, gi->m_guildElectionNextEndTime, gi->m_guildFaction, gi->m_timeLeftGuildFaction, gi->m_guildGcwDefenderRegion, gi->m_timeJoinedGuildGcwDefenderRegion, gi->m_timeLeftGuildGcwDefenderRegion, oldNameSpec);
+				GuildStringParser::buildNameSpec(guildId, gi->m_name, gi->m_guildElectionPreviousEndTime, gi->m_guildElectionNextEndTime, (PvpData::isNeutralFactionId(guildFaction) ? gi->m_guildFaction : guildFaction), ((PvpData::isNeutralFactionId(guildFaction) && !PvpData::isNeutralFactionId(gi->m_guildFaction)) ? timeLeftGuildFaction : 0), gi->m_guildGcwDefenderRegion, gi->m_timeJoinedGuildGcwDefenderRegion, gi->m_timeLeftGuildGcwDefenderRegion, newNameSpec);
+				m_names.erase(oldNameSpec);
+				m_names.insert(newNameSpec);
+
+				GuildInfo updatedGi(gi);
+				updatedGi.m_guildFaction = (PvpData::isNeutralFactionId(guildFaction) ? gi->m_guildFaction : guildFaction);
+				updatedGi.m_timeLeftGuildFaction = ((PvpData::isNeutralFactionId(guildFaction) && !PvpData::isNeutralFactionId(gi->m_guildFaction)) ? timeLeftGuildFaction : 0);
+
+				// guild faction has changed, send mail to guild members
+				{
+					static const Unicode::String subject = Unicode::narrowToWide("@" + StringId("guild", "mail_subject_guild_faction_changed").getCanonicalRepresentation());
+
+					ProsePackage pp;
+					pp.stringId = StringId("guild", "mail_body_guild_faction_changed");
+					pp.actor.str = Unicode::narrowToWide(updatedGi.m_name);
+					pp.target.str = Unicode::narrowToWide(getFactionString(isCurrentlyNeutral ? PvpData::getNeutralFactionId() : gi->m_guildFaction));
+					pp.other.str = Unicode::narrowToWide(getFactionString(guildFaction));
+
+					Unicode::String oob;
+					OutOfBandPackager::pack(pp, -1, oob);
+
+					GuildInterface::mailToGuild(guildId, subject, Unicode::emptyString, oob);
+				}
+
+				if (!updatedGi.m_guildGcwDefenderRegion.empty() && (updatedGi.m_timeLeftGuildGcwDefenderRegion <= 0))
+				{
+					removeGcwRegionDefenderGuild(updatedGi.m_guildGcwDefenderRegion, guildId, (isCurrentlyNeutral ? PvpData::getNeutralFactionId() : gi->m_guildFaction));
+					addGcwRegionDefenderGuild(updatedGi.m_guildGcwDefenderRegion, guildId, guildFaction);
+				}
+
+				m_guildsInfo.set(guildId, updatedGi);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::setGuildGcwDefenderRegion(int guildId, std::string const &guildGcwDefenderRegion)
+{
+	if (!guildGcwDefenderRegion.empty())
+	{
+		Pvp::GcwScoreCategory const * const gcwScoreCategory = Pvp::getGcwScoreCategory(guildGcwDefenderRegion);
+		if (!gcwScoreCategory || !gcwScoreCategory->gcwRegionDefender)
+			return;
+	}
+
+	GuildInfo const * const gi = getGuildInfo(guildId);
+	if (gi)
+	{
+		if (!isAuthoritative())
+		{
+			Controller *controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(
+					CM_guildSetGuildGcwDefenderRegion,
+					0.0f,
+					new MessageQueueGenericValueType<std::pair<int, std::string> >(std::make_pair(guildId, guildGcwDefenderRegion)),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+		else
+		{
+			// cannot be a GCW region defender if doesn't meet minimum guild member count requirement
+			if (!guildGcwDefenderRegion.empty() && (gi->getCountMembersOnly() < ConfigServerGame::getGcwGuildMinMembersForGcwRegionDefender()))
+				return;
+
+			bool regionChange = false;
+			bool const isCurrentlyNoRegion = ((gi->m_timeLeftGuildGcwDefenderRegion > 0) || gi->m_guildGcwDefenderRegion.empty());
+
+			int timeJoinedGuildGcwDefenderRegion = 0;
+			int timeLeftGuildGcwDefenderRegion = 0;
+			if (isCurrentlyNoRegion)
+			{
+				if (!guildGcwDefenderRegion.empty())
+				{
+					regionChange = true;
+
+					if ((gi->m_guildGcwDefenderRegion == guildGcwDefenderRegion) && (gi->m_timeJoinedGuildGcwDefenderRegion > 0))
+						timeJoinedGuildGcwDefenderRegion = gi->m_timeJoinedGuildGcwDefenderRegion;
+					else
+						timeJoinedGuildGcwDefenderRegion = static_cast<int>(::time(NULL));
+				}
+			}
+			else if (gi->m_guildGcwDefenderRegion != guildGcwDefenderRegion)
+			{
+				regionChange = true;
+
+				if (!guildGcwDefenderRegion.empty())
+				{
+					timeJoinedGuildGcwDefenderRegion = static_cast<int>(::time(NULL));
+				}
+				else
+				{
+					// stop defending
+					timeJoinedGuildGcwDefenderRegion = gi->m_timeJoinedGuildGcwDefenderRegion;
+					timeLeftGuildGcwDefenderRegion = static_cast<int>(::time(NULL));
+				}
+			}
+
+			if (regionChange)
+			{
+				std::string oldNameSpec, newNameSpec;
+				GuildStringParser::buildNameSpec(guildId, gi->m_name, gi->m_guildElectionPreviousEndTime, gi->m_guildElectionNextEndTime, gi->m_guildFaction, gi->m_timeLeftGuildFaction, gi->m_guildGcwDefenderRegion, gi->m_timeJoinedGuildGcwDefenderRegion, gi->m_timeLeftGuildGcwDefenderRegion, oldNameSpec);
+				GuildStringParser::buildNameSpec(guildId, gi->m_name, gi->m_guildElectionPreviousEndTime, gi->m_guildElectionNextEndTime, gi->m_guildFaction, gi->m_timeLeftGuildFaction, (guildGcwDefenderRegion.empty() ? gi->m_guildGcwDefenderRegion : guildGcwDefenderRegion), timeJoinedGuildGcwDefenderRegion, timeLeftGuildGcwDefenderRegion, newNameSpec);
+				m_names.erase(oldNameSpec);
+				m_names.insert(newNameSpec);
+
+				GuildInfo updatedGi(gi);
+				updatedGi.m_guildGcwDefenderRegion = (guildGcwDefenderRegion.empty() ? gi->m_guildGcwDefenderRegion : guildGcwDefenderRegion);
+				updatedGi.m_timeJoinedGuildGcwDefenderRegion = timeJoinedGuildGcwDefenderRegion;
+				updatedGi.m_timeLeftGuildGcwDefenderRegion = timeLeftGuildGcwDefenderRegion;
+
+				// guild gcw defender region has changed, send mail to guild members
+				{
+					static const Unicode::String subject = Unicode::narrowToWide("@" + StringId("guild", "mail_subject_guild_gcw_defender_region_changed").getCanonicalRepresentation());
+
+					ProsePackage pp;
+					pp.stringId = StringId("guild", "mail_body_guild_gcw_defender_region_changed");
+					pp.actor.str = Unicode::narrowToWide(updatedGi.m_name);
+					pp.target.str = Unicode::narrowToWide(isCurrentlyNoRegion ? "(None)" : ("@" + StringId("gcw_regions", gi->m_guildGcwDefenderRegion).getCanonicalRepresentation()));
+					pp.other.str = Unicode::narrowToWide(guildGcwDefenderRegion.empty() ? "(None)" : ("@" + StringId("gcw_regions", guildGcwDefenderRegion).getCanonicalRepresentation()));
+
+					Unicode::String oob;
+					OutOfBandPackager::pack(pp, -1, oob);
+
+					GuildInterface::mailToGuild(guildId, subject, Unicode::emptyString, oob);
+				}
+
+				removeGcwRegionDefenderGuild((isCurrentlyNoRegion ? std::string() : gi->m_guildGcwDefenderRegion), guildId, (((updatedGi.m_timeLeftGuildFaction > 0) || PvpData::isNeutralFactionId(updatedGi.m_guildFaction)) ? PvpData::getNeutralFactionId() : updatedGi.m_guildFaction));
+				addGcwRegionDefenderGuild(guildGcwDefenderRegion, guildId, (((updatedGi.m_timeLeftGuildFaction > 0) || PvpData::isNeutralFactionId(updatedGi.m_guildFaction)) ? PvpData::getNeutralFactionId() : updatedGi.m_guildFaction));
+
+				m_guildsInfo.set(guildId, updatedGi);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::setGuildLeader(int guildId, NetworkId const &leaderId)
+{
+	if (!leaderId.isValid())
+		return;
+
+	GuildInfo const * const gi = getGuildInfo(guildId);
+	if (!gi || (gi->m_leaderId != leaderId))
+	{
+		if (!isAuthoritative())
+		{
+			Controller *controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(
+					CM_guildSetLeader,
+					0.0f,
+					new MessageQueueGenericValueType<std::pair<int, NetworkId> >(std::make_pair(guildId, leaderId)),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+		else if (gi && (gi->m_leaderId != leaderId))
+		{
+			std::string oldLeaderSpec, newLeaderSpec;
+			GuildStringParser::buildLeaderSpec(guildId, gi->m_leaderId, oldLeaderSpec);
+			GuildStringParser::buildLeaderSpec(guildId, leaderId, newLeaderSpec);
+			m_leaders.erase(oldLeaderSpec);
+			m_leaders.insert(newLeaderSpec);
+
+			std::map<NetworkId, int>::const_iterator iterGuildLeader = m_guildLeaders.find(gi->m_leaderId);
+			if ((iterGuildLeader != m_guildLeaders.end()) && (iterGuildLeader->second == guildId))
+				m_guildLeaders.erase(gi->m_leaderId);
+
+			m_guildLeaders.set(leaderId, guildId);
+
+			GuildInfo updatedGi(gi);
+			updatedGi.m_leaderId = leaderId;
+			m_guildsInfo.set(guildId, updatedGi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::setGuildName(int guildId, std::string const &newName)
+{
+	if (newName.empty())
+		return;
+
+	GuildInfo const * const gi = getGuildInfo(guildId);
+	if (gi)
+	{
+		if (!isAuthoritative())
+		{
+			Controller *controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(
+					CM_guildSetName,
+					0.0f,
+					new MessageQueueGenericValueType<std::pair<int, std::string> >(std::make_pair(guildId, newName)),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+		else if (gi->m_name != newName)
+		{
+			std::string oldNameSpec, newNameSpec;
+			GuildStringParser::buildNameSpec(guildId, gi->m_name, gi->m_guildElectionPreviousEndTime, gi->m_guildElectionNextEndTime, gi->m_guildFaction, gi->m_timeLeftGuildFaction, gi->m_guildGcwDefenderRegion, gi->m_timeJoinedGuildGcwDefenderRegion, gi->m_timeLeftGuildGcwDefenderRegion, oldNameSpec);
+			GuildStringParser::buildNameSpec(guildId, newName, gi->m_guildElectionPreviousEndTime, gi->m_guildElectionNextEndTime, gi->m_guildFaction, gi->m_timeLeftGuildFaction, gi->m_guildGcwDefenderRegion, gi->m_timeJoinedGuildGcwDefenderRegion, gi->m_timeLeftGuildGcwDefenderRegion, newNameSpec);
+			m_names.erase(oldNameSpec);
+			m_names.insert(newNameSpec);
+
+			GuildInfo updatedGi(gi);
+			updatedGi.m_name = newName;
+			m_guildsInfo.set(guildId, updatedGi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::setGuildAbbrev(int guildId, std::string const &newAbbrev)
+{
+	if (newAbbrev.empty())
+		return;
+
+	GuildInfo const * const gi = getGuildInfo(guildId);
+	if (gi)
+	{
+		if (!isAuthoritative())
+		{
+			Controller *controller = getController();
+			if (controller)
+			{
+				controller->appendMessage(
+					CM_guildSetAbbrev,
+					0.0f,
+					new MessageQueueGenericValueType<std::pair<int, std::string> >(std::make_pair(guildId, newAbbrev)),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+		else if (gi->m_abbrev != newAbbrev)
+		{
+			std::string oldAbbrevSpec, newAbbrevSpec;
+			GuildStringParser::buildAbbrevSpec(guildId, gi->m_abbrev, oldAbbrevSpec);
+			GuildStringParser::buildAbbrevSpec(guildId, newAbbrev, newAbbrevSpec);
+			m_abbrevs.erase(oldAbbrevSpec);
+			m_abbrevs.insert(newAbbrevSpec);
+
+			GuildInfo updatedGi(gi);
+			updatedGi.m_abbrev = newAbbrev;
+			m_guildsInfo.set(guildId, updatedGi);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::calculateGcwImperialScorePercentileForSwg()
+{
+	if (!isAuthoritative())
+		return;
+
+	if (m_gcwImperialScoreOtherGalaxies.empty() && m_gcwRebelScoreOtherGalaxies.empty())
+		return;
+
+	PlanetObject const * tatooine = ServerUniverse::getInstance().getTatooinePlanet();
+	if (!tatooine || !tatooine->isAuthoritative())
+		return;
+
+	std::map<std::string, std::pair<uint64, uint64> > gcwImperialScoreForSwg;
+	{
+		std::pair<std::map<std::string, std::pair<uint64, uint64> >::iterator, bool> insertResult;
+
+		std::map<std::string, std::pair<int64, int64> > const & gcwImperialScoreThisGalaxy = tatooine->getGcwImperialScore();
+		for (std::map<std::string, std::pair<int64, int64> >::const_iterator iterThisGalaxy = gcwImperialScoreThisGalaxy.begin(), iterThisGalaxyEnd = gcwImperialScoreThisGalaxy.end(); iterThisGalaxy != iterThisGalaxyEnd; ++iterThisGalaxy)
+		{
+			insertResult = gcwImperialScoreForSwg.insert(std::make_pair(iterThisGalaxy->first, std::make_pair(static_cast<uint64>(iterThisGalaxy->second.first), static_cast<uint64>(iterThisGalaxy->second.second))));
+			if (!insertResult.second)
+			{
+				insertResult.first->second.first += static_cast<uint64>(iterThisGalaxy->second.first);
+				insertResult.first->second.second += static_cast<uint64>(iterThisGalaxy->second.second);
+			}
+		}
+
+		for (std::map<std::pair<std::string, std::string>, std::pair<int64, int64> >::const_iterator iterOtherGalaxies = m_gcwImperialScoreOtherGalaxies.begin(), iterOtherGalaxiesEnd = m_gcwImperialScoreOtherGalaxies.end(); iterOtherGalaxies != iterOtherGalaxiesEnd; ++iterOtherGalaxies)
+		{
+			insertResult = gcwImperialScoreForSwg.insert(std::make_pair(iterOtherGalaxies->first.second, std::make_pair(static_cast<uint64>(iterOtherGalaxies->second.first), static_cast<uint64>(iterOtherGalaxies->second.second))));
+			if (!insertResult.second)
+			{
+				insertResult.first->second.first += static_cast<uint64>(iterOtherGalaxies->second.first);
+				insertResult.first->second.second += static_cast<uint64>(iterOtherGalaxies->second.second);
+			}
+		}
+	}
+
+	std::map<std::string, std::pair<uint64, uint64> > gcwRebelScoreForSwg;
+	{
+		std::pair<std::map<std::string, std::pair<uint64, uint64> >::iterator, bool> insertResult;
+
+		std::map<std::string, std::pair<int64, int64> > const & gcwRebelScoreThisGalaxy = tatooine->getGcwRebelScore();
+		for (std::map<std::string, std::pair<int64, int64> >::const_iterator iterThisGalaxy = gcwRebelScoreThisGalaxy.begin(), iterThisGalaxyEnd = gcwRebelScoreThisGalaxy.end(); iterThisGalaxy != iterThisGalaxyEnd; ++iterThisGalaxy)
+		{
+			insertResult = gcwRebelScoreForSwg.insert(std::make_pair(iterThisGalaxy->first, std::make_pair(static_cast<uint64>(iterThisGalaxy->second.first), static_cast<uint64>(iterThisGalaxy->second.second))));
+			if (!insertResult.second)
+			{
+				insertResult.first->second.first += static_cast<uint64>(iterThisGalaxy->second.first);
+				insertResult.first->second.second += static_cast<uint64>(iterThisGalaxy->second.second);
+			}
+		}
+
+		for (std::map<std::pair<std::string, std::string>, std::pair<int64, int64> >::const_iterator iterOtherGalaxies = m_gcwRebelScoreOtherGalaxies.begin(), iterOtherGalaxiesEnd = m_gcwRebelScoreOtherGalaxies.end(); iterOtherGalaxies != iterOtherGalaxiesEnd; ++iterOtherGalaxies)
+		{
+			insertResult = gcwRebelScoreForSwg.insert(std::make_pair(iterOtherGalaxies->first.second, std::make_pair(static_cast<uint64>(iterOtherGalaxies->second.first), static_cast<uint64>(iterOtherGalaxies->second.second))));
+			if (!insertResult.second)
+			{
+				insertResult.first->second.first += static_cast<uint64>(iterOtherGalaxies->second.first);
+				insertResult.first->second.second += static_cast<uint64>(iterOtherGalaxies->second.second);
+			}
+		}
+	}
+
+	// GCW category
+	std::map<std::string, int> gcwImperialScorePercentileForSwg;
+	{
+		int imperialScorePercentile;
+
+		std::map<std::string, Pvp::GcwScoreCategory const *> const & allGcwScoreCategory = Pvp::getAllGcwScoreCategory(); 
+		for (std::map<std::string, Pvp::GcwScoreCategory const *>::const_iterator iter = allGcwScoreCategory.begin(); iter != allGcwScoreCategory.end(); ++iter)
+		{
+			imperialScorePercentile = Pvp::calculateGcwImperialScorePercentile(iter->first, gcwImperialScoreForSwg, gcwRebelScoreForSwg);
+			m_gcwImperialScorePercentileOtherGalaxies.set(std::make_pair("SWG", iter->first), imperialScorePercentile);
+			gcwImperialScorePercentileForSwg.insert(std::make_pair(iter->first, imperialScorePercentile));
+		}
+	}
+
+	// GCW group
+	{
+		std::map<std::string, int> gcwGroupImperialScoreRawTotal;
+		std::map<std::string, int>::iterator iterInsertionPoint;
+
+		std::map<std::string, int>::const_iterator iterGcwImperialScorePercentileForSwg;
+
+		std::map<std::string, std::map<std::string, int> > const & gcwScoreCategoryGroups = Pvp::getGcwScoreCategoryGroups();
+		for (std::map<std::string, std::map<std::string, int> >::const_iterator iterGroup = gcwScoreCategoryGroups.begin(); iterGroup != gcwScoreCategoryGroups.end(); ++iterGroup)
+		{
+			iterInsertionPoint = gcwGroupImperialScoreRawTotal.insert(std::make_pair(iterGroup->first, 0)).first;
+
+			for (std::map<std::string, int>::const_iterator iterCategory = iterGroup->second.begin(); iterCategory != iterGroup->second.end(); ++iterCategory)
+			{
+				iterGcwImperialScorePercentileForSwg = gcwImperialScorePercentileForSwg.find(iterCategory->first);
+				if (iterGcwImperialScorePercentileForSwg == gcwImperialScorePercentileForSwg.end())
+					continue;
+
+				iterInsertionPoint->second += static_cast<int>(static_cast<int64>(iterGcwImperialScorePercentileForSwg->second) * static_cast<int64>(iterCategory->second) / static_cast<int64>(100));
+			}
+		}
+
+		int64 scaledScore;
+		int percentile;
+		for (std::map<std::string, int>::const_iterator iterGcwGroupImperialScoreRawTotal = gcwGroupImperialScoreRawTotal.begin(); iterGcwGroupImperialScoreRawTotal != gcwGroupImperialScoreRawTotal.end(); ++iterGcwGroupImperialScoreRawTotal)
+		{
+			scaledScore = static_cast<int64>(iterGcwGroupImperialScoreRawTotal->second) * static_cast<int64>(100);
+			percentile = static_cast<int>(scaledScore / static_cast<int64>(1000000000));
+
+			// round up to 50% so that when there is no score, it will be a tie
+			if ((percentile == 49) && ((scaledScore % static_cast<int64>(1000000000)) >= static_cast<int64>(500000000)))
+				percentile = 50;
+
+			// if the galaxies score is changing, CS log it
+			if (iterGcwGroupImperialScoreRawTotal->first == "galaxy")
+			{
+				Archive::AutoDeltaMap<std::pair<std::string, std::string>, int>::const_iterator iterFind = m_gcwGroupImperialScorePercentileOtherGalaxies.find(std::make_pair("SWG", iterGcwGroupImperialScoreRawTotal->first));
+				if ((iterFind != m_gcwGroupImperialScorePercentileOtherGalaxies.end()) && (iterFind->second != percentile))
+					LOG("CustomerService", ("GcwScore: galaxy SWG imperial percentile change (%d -> %d)", iterFind->second, percentile));
+			}
+
+			m_gcwGroupImperialScorePercentileOtherGalaxies.set(std::make_pair("SWG", iterGcwGroupImperialScoreRawTotal->first), percentile);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::depersistGcwImperialScorePercentile()
+{
+	if (!isAuthoritative())
+		return;
+
+	PlanetObject * const tatooine = ServerUniverse::getInstance().getTatooinePlanet();
+	if (!tatooine || !tatooine->isAuthoritative())
+		return;
+
+	m_gcwImperialScorePercentileThisGalaxy.clear();
+	m_gcwRegionDefenderBonus.clear();
+	m_gcwGroupImperialScorePercentileThisGalaxy.clear();
+	m_gcwImperialScorePercentileHistoryThisGalaxy.clear();
+	m_gcwGroupImperialScorePercentileHistoryThisGalaxy.clear();
+	m_gcwImperialScorePercentileHistoryCountThisGalaxy.clear();
+	m_gcwGroupImperialScorePercentileHistoryCountThisGalaxy.clear();
+	m_gcwGroupCategoryImperialScoreRawThisGalaxy.clear();
+	m_gcwGroupImperialScoreRawThisGalaxy.clear();
+
+	// GCW category
+	{
+		int const timeNow = static_cast<int>(::time(NULL));
+		int gcwImperialScorePercentile;
+		std::map<std::string, Pvp::GcwScoreCategory const *> const & allGcwScoreCategory = Pvp::getAllGcwScoreCategory(); 
+		for (std::map<std::string, Pvp::GcwScoreCategory const *>::const_iterator iter = allGcwScoreCategory.begin(); iter != allGcwScoreCategory.end(); ++iter)
+		{
+			if (m_gcwImperialScorePercentileThisGalaxy.find(iter->first) == m_gcwImperialScorePercentileThisGalaxy.end())
+			{
+				gcwImperialScorePercentile = tatooine->getGcwImperialScorePercentile(iter->first);
+				m_gcwImperialScorePercentileThisGalaxy.set(iter->first, gcwImperialScorePercentile);
+				updateGcwPercentileHistory(m_gcwImperialScorePercentileHistoryThisGalaxy, m_gcwImperialScorePercentileHistoryCountThisGalaxy, iter->first, gcwImperialScorePercentile);
+				updateGcwRegionDefenderBonus(iter->first);
+
+				// if the percentile is at least 70% for either side, start
+				// tracking how long the side has held the region at at least 70%
+				if (gcwImperialScorePercentile >= 70)
+				{
+					if (!tatooine->getObjVars().hasItem(std::string("gcwScore.timeControlled.") + iter->first))
+						IGNORE_RETURN(tatooine->setObjVarItem(std::string("gcwScore.timeControlled.") + iter->first, timeNow)); // imperial controlled
+				}
+				else if (gcwImperialScorePercentile <= 30)
+				{
+					if (!tatooine->getObjVars().hasItem(std::string("gcwScore.timeControlled.") + iter->first))
+						IGNORE_RETURN(tatooine->setObjVarItem(std::string("gcwScore.timeControlled.") + iter->first, -timeNow)); // rebel controlled
+				}
+				else
+				{
+					tatooine->removeObjVarItem(std::string("gcwScore.timeControlled.") + iter->first);
+				}
+			}
+		}
+	}
+
+	// GCW group
+	{
+		std::map<std::string, int> gcwGroupImperialScoreRawTotal;
+		std::map<std::string, int>::iterator iterInsertionPoint;
+
+		std::map<std::pair<std::string, std::string>, int>::const_iterator iterScoreRaw;
+		int scoreRaw;
+
+		std::map<std::string, std::map<std::string, int> > const & gcwScoreCategoryGroups = Pvp::getGcwScoreCategoryGroups();
+		for (std::map<std::string, std::map<std::string, int> >::const_iterator iterGroup = gcwScoreCategoryGroups.begin(); iterGroup != gcwScoreCategoryGroups.end(); ++iterGroup)
+		{
+			iterInsertionPoint = gcwGroupImperialScoreRawTotal.insert(std::make_pair(iterGroup->first, 0)).first;
+
+			for (std::map<std::string, int>::const_iterator iterCategory = iterGroup->second.begin(); iterCategory != iterGroup->second.end(); ++iterCategory)
+			{
+				iterScoreRaw = m_gcwGroupCategoryImperialScoreRawThisGalaxy.find(std::make_pair(iterGroup->first, iterCategory->first));
+				if (iterScoreRaw == m_gcwGroupCategoryImperialScoreRawThisGalaxy.end())
+				{
+					scoreRaw = static_cast<int>(static_cast<int64>(getGcwImperialScorePercentile(iterCategory->first)) * static_cast<int64>(iterCategory->second) / static_cast<int64>(100));
+					m_gcwGroupCategoryImperialScoreRawThisGalaxy.set(std::make_pair(iterGroup->first, iterCategory->first), scoreRaw);
+
+					iterInsertionPoint->second += scoreRaw;
+				}
+				else
+				{
+					iterInsertionPoint->second += iterScoreRaw->second;
+				}
+			}
+		}
+
+		int64 scaledScore;
+		int percentile;
+		for (std::map<std::string, int>::const_iterator iterGcwGroupImperialScoreRawTotal = gcwGroupImperialScoreRawTotal.begin(); iterGcwGroupImperialScoreRawTotal != gcwGroupImperialScoreRawTotal.end(); ++iterGcwGroupImperialScoreRawTotal)
+		{
+			if (m_gcwGroupImperialScoreRawThisGalaxy.find(iterGcwGroupImperialScoreRawTotal->first) == m_gcwGroupImperialScoreRawThisGalaxy.end())
+			{
+				m_gcwGroupImperialScoreRawThisGalaxy.set(iterGcwGroupImperialScoreRawTotal->first, iterGcwGroupImperialScoreRawTotal->second);
+			}
+
+			if (m_gcwGroupImperialScorePercentileThisGalaxy.find(iterGcwGroupImperialScoreRawTotal->first) == m_gcwGroupImperialScorePercentileThisGalaxy.end())
+			{
+				scaledScore = static_cast<int64>(iterGcwGroupImperialScoreRawTotal->second) * static_cast<int64>(100);
+				percentile = static_cast<int>(scaledScore / static_cast<int64>(1000000000));
+
+				// round up to 50% so that when there is no score, it will be a tie
+				if ((percentile == 49) && ((scaledScore % static_cast<int64>(1000000000)) >= static_cast<int64>(500000000)))
+					percentile = 50;
+
+				m_gcwGroupImperialScorePercentileThisGalaxy.set(iterGcwGroupImperialScoreRawTotal->first, percentile);
+				updateGcwPercentileHistory(m_gcwGroupImperialScorePercentileHistoryThisGalaxy, m_gcwGroupImperialScorePercentileHistoryCountThisGalaxy, iterGcwGroupImperialScoreRawTotal->first, percentile);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::updateGcwImperialScorePercentile(std::set<std::string> const & gcwScoreCategories)
+{
+	if (!isAuthoritative())
+		return;
+
+	PlanetObject * const tatooine = ServerUniverse::getInstance().getTatooinePlanet();
+	if (!tatooine || !tatooine->isAuthoritative())
+		return;
+
+	// if score hasn't been depersisted yet, do it now
+	if (m_gcwImperialScorePercentileThisGalaxy.empty())
+		depersistGcwImperialScorePercentile();
+
+	int const timeNow = static_cast<int>(::time(NULL));
+	GameScriptObject * const gameScriptObject = tatooine->getScriptObject();
+	int currentScorePercentile, newScorePercentile, newGroupCategoryScoreRaw, scoreCategoryGroupTotalPoints, deltaGroupCategoryScoreRaw;
+	std::map<std::pair<std::string, std::string>, int>::const_iterator iterGroupCategoryScoreRaw;
+	Pvp::GcwScoreCategory const * scoreCategory;
+	std::map<std::string, int> groupImperialScoreRawDelta;
+	std::map<std::string, int>::iterator iterGroupImperialScoreRawDelta;
+	std::map<std::string, std::pair<int, int> > notifyOnPercentileChange;
+	for (std::set<std::string>::const_iterator iter = gcwScoreCategories.begin(); iter != gcwScoreCategories.end(); ++iter)
+	{
+		scoreCategory = Pvp::getGcwScoreCategory(*iter);
+		if (scoreCategory)
+		{
+			currentScorePercentile = getGcwImperialScorePercentile(*iter);
+			newScorePercentile = tatooine->getGcwImperialScorePercentile(*iter);
+
+			if (currentScorePercentile != newScorePercentile)
+			{
+				m_gcwImperialScorePercentileThisGalaxy.set(*iter, newScorePercentile);
+				updateGcwPercentileHistory(m_gcwImperialScorePercentileHistoryThisGalaxy, m_gcwImperialScorePercentileHistoryCountThisGalaxy, *iter, newScorePercentile);
+				updateGcwRegionDefenderBonus(*iter);
+
+				// if the percentile is at least 70% for either side, start
+				// tracking how long the side has held the region at at least 70%
+				if (newScorePercentile >= 70)
+				{
+					if (currentScorePercentile < 70)
+						IGNORE_RETURN(tatooine->setObjVarItem(std::string("gcwScore.timeControlled.") + *iter, timeNow)); // imperial controlled
+				}
+				else if (newScorePercentile <= 30)
+				{
+					if (currentScorePercentile > 30)
+						IGNORE_RETURN(tatooine->setObjVarItem(std::string("gcwScore.timeControlled.") + *iter, -timeNow)); // rebel controlled
+				}
+				else
+				{
+					tatooine->removeObjVarItem(std::string("gcwScore.timeControlled.") + *iter);
+				}
+
+				// handles changes to the GCW group score for the
+				// GCW groups that this GCW category belong to
+				if (!scoreCategory->gcwScoreCategoryGroups.empty())
+				{
+					for (std::set<std::string>::const_iterator iterGroup = scoreCategory->gcwScoreCategoryGroups.begin(); iterGroup != scoreCategory->gcwScoreCategoryGroups.end(); ++iterGroup)
+					{
+						iterGroupCategoryScoreRaw = m_gcwGroupCategoryImperialScoreRawThisGalaxy.find(std::make_pair(*iterGroup, *iter));
+						if (iterGroupCategoryScoreRaw == m_gcwGroupCategoryImperialScoreRawThisGalaxy.end())
+							continue;
+
+						if (!Pvp::getGcwScoreCategoryGroupTotalPoints(*iterGroup, *iter, scoreCategoryGroupTotalPoints))
+							continue;
+
+						newGroupCategoryScoreRaw = static_cast<int>(static_cast<int64>(newScorePercentile) * static_cast<int64>(scoreCategoryGroupTotalPoints) / static_cast<int64>(100));
+						deltaGroupCategoryScoreRaw = newGroupCategoryScoreRaw - iterGroupCategoryScoreRaw->second;
+						if (deltaGroupCategoryScoreRaw == 0)
+							continue;
+
+						iterGroupImperialScoreRawDelta = groupImperialScoreRawDelta.find(*iterGroup);
+						if (iterGroupImperialScoreRawDelta != groupImperialScoreRawDelta.end())
+						{
+							iterGroupImperialScoreRawDelta->second += deltaGroupCategoryScoreRaw;
+						}
+						else
+						{
+							IGNORE_RETURN(groupImperialScoreRawDelta.insert(std::make_pair(*iterGroup, deltaGroupCategoryScoreRaw)));
+						}
+
+						m_gcwGroupCategoryImperialScoreRawThisGalaxy.set(std::make_pair(*iterGroup, *iter), newGroupCategoryScoreRaw);
+					}
+				}
+
+				// if requested, notify script if the score changes
+				if (scoreCategory->notifyOnPercentileChange && gameScriptObject)
+				{
+					notifyOnPercentileChange[*iter] = std::make_pair(currentScorePercentile, newScorePercentile);
+				}
+			}
+		}
+	}
+
+	// update changes to GCW group score
+	if (!groupImperialScoreRawDelta.empty())
+	{
+		std::map<std::string, int>::const_iterator iterFindGcwGroupImperialScoreRawThisGalaxy;
+		int64 scaledScore;
+		int newScore, percentile, oldPercentile;
+		for (std::map<std::string, int>::const_iterator iterGroup = groupImperialScoreRawDelta.begin(); iterGroup != groupImperialScoreRawDelta.end(); ++iterGroup)
+		{
+			if (iterGroup->second == 0)
+				continue;
+
+			iterFindGcwGroupImperialScoreRawThisGalaxy = m_gcwGroupImperialScoreRawThisGalaxy.find(iterGroup->first);
+			if (iterFindGcwGroupImperialScoreRawThisGalaxy == m_gcwGroupImperialScoreRawThisGalaxy.end())
+				continue;
+
+			newScore = iterFindGcwGroupImperialScoreRawThisGalaxy->second + iterGroup->second;
+			m_gcwGroupImperialScoreRawThisGalaxy.set(iterGroup->first, newScore);
+
+			scaledScore = static_cast<int64>(newScore) * static_cast<int64>(100);
+			percentile = static_cast<int>(scaledScore / static_cast<int64>(1000000000));
+
+			// round up to 50% so that when there is no score, it will be a tie
+			if ((percentile == 49) && ((scaledScore % static_cast<int64>(1000000000)) >= static_cast<int64>(500000000)))
+				percentile = 50;
+
+			oldPercentile = getGcwGroupImperialScorePercentile(iterGroup->first);
+			if (oldPercentile != percentile)
+			{
+				m_gcwGroupImperialScorePercentileThisGalaxy.set(iterGroup->first, percentile);
+				updateGcwPercentileHistory(m_gcwGroupImperialScorePercentileHistoryThisGalaxy, m_gcwGroupImperialScorePercentileHistoryCountThisGalaxy, iterGroup->first, percentile);
+
+				// if the galaxy score is changing, CS log it
+				if (iterGroup->first == "galaxy")
+					LOG("CustomerService", ("GcwScore: galaxy %s imperial percentile change (%d -> %d)", GameServer::getInstance().getClusterName().c_str(), oldPercentile, percentile));
+			}
+		}
+	}
+
+	// if requested, notify script if the score changes
+	if (gameScriptObject && !notifyOnPercentileChange.empty())
+	{
+		for (std::map<std::string, std::pair<int, int> >::const_iterator iterNotify = notifyOnPercentileChange.begin(); iterNotify != notifyOnPercentileChange.end(); ++iterNotify)
+		{
+			ScriptParams sp;
+			sp.addParam(iterNotify->first.c_str());
+			sp.addParam(iterNotify->second.first);
+			sp.addParam(iterNotify->second.second);
+
+			IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_ON_GCW_SCORE_CATEGORY_PERCENTILE_CHANGE, sp));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::updateGcwRegionDefenderBonus(std::string const & gcwScoreCategory)
+{
+	if (!isAuthoritative())
+		return;
+
+	// cannot use CityInterface::getGcwRegionDefenderCitiesCount() here
+	// because it is not guaranteed to be available at the time this is called
+	CityObject const * const co = ServerUniverse::getInstance().getMasterCityObject();
+	int totalImperial = 0;
+	int totalRebel = 0;
+
+	if (co)
+	{
+		std::map<std::string, std::pair<int, int> > const & gcwRegionDefenderCitiesCount = co->getGcwRegionDefenderCitiesCount();
+		std::map<std::string, std::pair<int, int> >::const_iterator iterFind = gcwRegionDefenderCitiesCount.find(gcwScoreCategory);
+		if (iterFind != gcwRegionDefenderCitiesCount.end())
+		{
+			totalImperial += iterFind->second.first;
+			totalRebel += iterFind->second.second;
+		}
+	}
+
+	{
+		std::map<std::string, std::pair<int, int> >::const_iterator iterFind = m_gcwRegionDefenderGuildsCount.find(gcwScoreCategory);
+		if (iterFind != m_gcwRegionDefenderGuildsCount.end())
+		{
+			totalImperial += iterFind->second.first;
+			totalRebel += iterFind->second.second;
+		}
+	}
+
+	float const imperialBonus = static_cast<float>((static_cast<double>(ServerUniverse::getInstance().getGcwImperialScorePercentile(gcwScoreCategory)) * static_cast<double>(ConfigServerGame::getGcwRegionDefenderTotalBonusPct())) / (static_cast<double>(100) * static_cast<double>(std::max(1, totalImperial))));
+	float const rebelBonus = static_cast<float>((static_cast<double>(100 - ServerUniverse::getInstance().getGcwImperialScorePercentile(gcwScoreCategory)) * static_cast<double>(ConfigServerGame::getGcwRegionDefenderTotalBonusPct())) / (static_cast<double>(100) * static_cast<double>(std::max(1, totalRebel))));
+
+	m_gcwRegionDefenderBonus.set(gcwScoreCategory, std::make_pair(imperialBonus, rebelBonus));
+}
+
+// ----------------------------------------------------------------------
+
+int GuildObject::getGcwImperialScorePercentile(std::string const & gcwCategory) const
+{
+	Archive::AutoDeltaMap<std::string, int>::const_iterator const iterFind = m_gcwImperialScorePercentileThisGalaxy.find(gcwCategory);
+	if (iterFind != m_gcwImperialScorePercentileThisGalaxy.end())
+	{
+		return iterFind->second;
+	}
+
+	return 50; // tie
+}
+
+// ----------------------------------------------------------------------
+
+int GuildObject::getGcwGroupImperialScorePercentile(std::string const & gcwGroup) const
+{
+	Archive::AutoDeltaMap<std::string, int>::const_iterator const iterFind = m_gcwGroupImperialScorePercentileThisGalaxy.find(gcwGroup);
+	if (iterFind != m_gcwGroupImperialScorePercentileThisGalaxy.end())
+	{
+		return iterFind->second;
+	}
+
+	return 50; // tie
+}
+
+// ----------------------------------------------------------------------
+
+float GuildObject::getGcwDefenderRegionImperialBonus(std::string const & gcwScoreCategory) const
+{
+	Archive::AutoDeltaMap<std::string, std::pair<float, float> >::const_iterator const iterFind = m_gcwRegionDefenderBonus.find(gcwScoreCategory);
+	if (iterFind != m_gcwRegionDefenderBonus.end())
+		return iterFind->second.first;
+
+	return 0.0f;
+}
+
+// ----------------------------------------------------------------------
+
+float GuildObject::getGcwDefenderRegionRebelBonus(std::string const & gcwScoreCategory) const
+{
+	Archive::AutoDeltaMap<std::string, std::pair<float, float> >::const_iterator const iterFind = m_gcwRegionDefenderBonus.find(gcwScoreCategory);
+	if (iterFind != m_gcwRegionDefenderBonus.end())
+		return iterFind->second.second;
+
+	return 0.0f;
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::setGcwImperialScorePercentileFromOtherGalaxy(std::string const & clusterName, std::map<std::string, int> const & gcwImperialScorePercentile, std::map<std::string, int> const & gcwGroupImperialScorePercentile)
+{
+	if (!isAuthoritative())
+		return;
+
+	if (0 == _stricmp(GameServer::getInstance().getClusterName().c_str(), clusterName.c_str()))
+		return;
+
+	if (!ConfigServerGame::getReceiveGcwScoreFromOtherGalaxies())
+		return;
+
+	for (std::map<std::string, int>::const_iterator iterCategory = gcwImperialScorePercentile.begin(); iterCategory != gcwImperialScorePercentile.end(); ++iterCategory)
+	{
+		m_gcwImperialScorePercentileOtherGalaxies.set(std::make_pair(clusterName, iterCategory->first), iterCategory->second);
+	}
+
+	for (std::map<std::string, int>::const_iterator iterGroup = gcwGroupImperialScorePercentile.begin(); iterGroup != gcwGroupImperialScorePercentile.end(); ++iterGroup)
+	{
+		m_gcwGroupImperialScorePercentileOtherGalaxies.set(std::make_pair(clusterName, iterGroup->first), iterGroup->second);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::setGcwRawScoreFromOtherGalaxy(std::string const & clusterName, std::map<std::string, std::pair<int64, int64> > const & gcwImperialScore, std::map<std::string, std::pair<int64, int64> > const & gcwRebelScore)
+{
+	if (!isAuthoritative())
+		return;
+
+	if (0 == _stricmp(GameServer::getInstance().getClusterName().c_str(), clusterName.c_str()))
+		return;
+
+	if (!ConfigServerGame::getReceiveGcwScoreFromOtherGalaxies())
+		return;
+
+	for (std::map<std::string, std::pair<int64, int64> >::const_iterator iterImperial = gcwImperialScore.begin(); iterImperial != gcwImperialScore.end(); ++iterImperial)
+	{
+		m_gcwImperialScoreOtherGalaxies.set(std::make_pair(clusterName, iterImperial->first), iterImperial->second);
+	}
+
+	for (std::map<std::string, std::pair<int64, int64> >::const_iterator iterRebel = gcwRebelScore.begin(); iterRebel != gcwRebelScore.end(); ++iterRebel)
+	{
+		m_gcwRebelScoreOtherGalaxies.set(std::make_pair(clusterName, iterRebel->first), iterRebel->second);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::unload()
+{
+	FATAL(true, ("Tried to unload guild object.\n"));
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::onGuildEnemiesChanged()
+{
+	GuildInterface::touchEnemies();
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::onMembersInfoErase(std::pair<int, NetworkId> const & key, GuildMemberInfo const & value)
+{
+	UNREF(value);
+
+	// member has been removed from a guild, so need to update CreatureObject
+	ServerObject * const member = ServerWorld::findObjectByNetworkId(key.second);
+	if (member)
+	{
+		CreatureObject * const memberCreatureObject = member->asCreatureObject();
+		if (memberCreatureObject && memberCreatureObject->isAuthoritative() && memberCreatureObject->isInitialized() && (memberCreatureObject->getGuildId() == key.first))
+		{
+			memberCreatureObject->setGuildId(0);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::onMembersInfoInsert(std::pair<int, NetworkId> const & key, GuildMemberInfo const & value)
+{
+	// member has been added to a guild, so need to update CreatureObject
+	ServerObject * const member = ServerWorld::findObjectByNetworkId(key.second);
+	if (member)
+	{
+		CreatureObject * const memberCreatureObject = member->asCreatureObject();
+		if (memberCreatureObject && memberCreatureObject->isAuthoritative() && memberCreatureObject->isInitialized() && (memberCreatureObject->getGuildId() == 0) && (value.m_permissions & GuildInterface::Member))
+		{
+			memberCreatureObject->setGuildId(key.first);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::onMembersInfoSet(std::pair<int, NetworkId> const & key, GuildMemberInfo const & oldValue, GuildMemberInfo const & newValue)
+{
+	UNREF(oldValue);
+
+	// member has been added to a guild, so need to update CreatureObject
+	ServerObject * const member = ServerWorld::findObjectByNetworkId(key.second);
+	if (member)
+	{
+		CreatureObject * const memberCreatureObject = member->asCreatureObject();
+		if (memberCreatureObject && memberCreatureObject->isAuthoritative() && memberCreatureObject->isInitialized() && (memberCreatureObject->getGuildId() == 0) && (newValue.m_permissions & GuildInterface::Member))
+		{
+			memberCreatureObject->setGuildId(key.first);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObjectNamespace::replaceSetIfNeeded(char const *label, Archive::AutoDeltaSet<std::string> &oldSet, std::set<std::string> const &newSet, bool force)
+{
+	if (force || (oldSet.get() != newSet))
+	{
+		WARNING(true, ("Guild vector %s was inconsistant on load.", label));
+		oldSet.clear();
+		for (std::set<std::string>::const_iterator i = newSet.begin(); i != newSet.end(); ++i)
+			oldSet.insert(*i);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObjectNamespace::replaceSetIfNeeded(char const *label, Archive::AutoDeltaSet<std::string, GuildObject> &oldSet, std::set<std::string> const &newSet, bool force)
+{
+	if (force || (oldSet.get() != newSet))
+	{
+		WARNING(true, ("Guild vector %s was inconsistant on load.", label));
+		oldSet.clear();
+		for (std::set<std::string>::const_iterator i = newSet.begin(); i != newSet.end(); ++i)
+			oldSet.insert(*i);
+	}
+}
+
+// ----------------------------------------------------------------------
+// NULL oldPermissions means wasn't an existing guild member
+// NULL newPermissions means will not be a guild member
+void GuildObjectNamespace::updateGuildInfoMembersCount(GuildInfo & gi, int const * const oldPermissions, int const * const newPermissions)
+{
+	bool existingMember = false;
+	bool existingSponsoredMember = false;
+	bool existingGuildWarInclusionMember = false;
+	bool existingGuildWarExclusionMember = false;
+
+	if (oldPermissions) // was a guild member
+	{
+		existingMember = true;
+		if (*oldPermissions == GuildInterface::None)
+		{
+			existingSponsoredMember = true;
+		}
+		else
+		{
+			existingGuildWarInclusionMember = ((*oldPermissions & GuildInterface::WarInclusion) == GuildInterface::WarInclusion);
+			existingGuildWarExclusionMember = ((*oldPermissions & GuildInterface::WarExclusion) == GuildInterface::WarExclusion);
+		}
+	}
+
+	if (!newPermissions) // no longer a guild member
+	{
+		if (existingMember)
+			--gi.m_sponsoredAndMemberCount;
+
+		if (existingSponsoredMember)
+			--gi.m_sponsoredCount;
+
+		if (existingGuildWarInclusionMember)
+			--gi.m_guildWarInclusionCount;
+
+		if (existingGuildWarExclusionMember)
+			--gi.m_guildWarExclusionCount;
+	}
+	else // still (or will be) a guild member
+	{
+		if (!existingMember)
+			++gi.m_sponsoredAndMemberCount;
+
+		if (*newPermissions == GuildInterface::None)
+		{
+			if (!existingSponsoredMember)
+				++gi.m_sponsoredCount;
+		}
+		else if (existingSponsoredMember)
+		{
+			--gi.m_sponsoredCount;
+		}
+
+		if (*newPermissions & GuildInterface::WarInclusion)
+		{
+			if (!existingGuildWarInclusionMember)
+				++gi.m_guildWarInclusionCount;
+		}
+		else if (existingGuildWarInclusionMember)
+		{
+			--gi.m_guildWarInclusionCount;
+		}
+
+		if (*newPermissions & GuildInterface::WarExclusion)
+		{
+			if (!existingGuildWarExclusionMember)
+				++gi.m_guildWarExclusionCount;
+		}
+		else if (existingGuildWarExclusionMember)
+		{
+			--gi.m_guildWarExclusionCount;
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObjectNamespace::updateGcwPercentileHistory(Archive::AutoDeltaMap<std::pair<std::string, int>, int> & history, Archive::AutoDeltaMap<std::string, int> & historyCount, std::string const & scoreName, int score)
+{
+	if (ConfigServerGame::getTrackGcwPercentileHistoryCount() <= 0)
+		return;
+
+	history.set(std::make_pair(scoreName, static_cast<int>(::time(NULL))), score);
+
+	int newCount = 1;
+	Archive::AutoDeltaMap<std::string, int>::const_iterator const iterHistoryCount = historyCount.find(scoreName);
+	if (iterHistoryCount != historyCount.end())
+	{
+		newCount += iterHistoryCount->second;
+	}
+
+	if (newCount <= ConfigServerGame::getTrackGcwPercentileHistoryCount())
+	{
+		// another history has been added
+		historyCount.set(scoreName, newCount);
+	}
+	else
+	{
+		// too many histories, purge the oldest entry
+		Archive::AutoDeltaMap<std::pair<std::string, int>, int>::const_iterator const iterOldestHistory = history.lower_bound(std::make_pair(scoreName, 0));
+		if (iterOldestHistory != history.end())
+		{
+			history.erase(iterOldestHistory->first);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::addGcwRegionDefenderGuild(std::string const & gcwRegion, int guildId, uint32 faction)
+{
+	if (!gcwRegion.empty())
+	{
+		m_gcwRegionDefenderGuilds.set(std::make_pair(gcwRegion, guildId), faction);
+
+		Archive::AutoDeltaMap<std::string, std::pair<int, int> >::const_iterator iter = m_gcwRegionDefenderGuildsCount.find(gcwRegion);
+		if (iter != m_gcwRegionDefenderGuildsCount.end())
+		{
+			if (PvpData::isImperialFactionId(faction))
+				m_gcwRegionDefenderGuildsCount.set(gcwRegion, std::make_pair(iter->second.first + 1, iter->second.second));
+			else if (PvpData::isRebelFactionId(faction))
+				m_gcwRegionDefenderGuildsCount.set(gcwRegion, std::make_pair(iter->second.first, iter->second.second + 1));
+		}
+		else
+		{
+			if (PvpData::isImperialFactionId(faction))
+				m_gcwRegionDefenderGuildsCount.set(gcwRegion, std::make_pair(1, 0));
+			else if (PvpData::isRebelFactionId(faction))
+				m_gcwRegionDefenderGuildsCount.set(gcwRegion, std::make_pair(0, 1));
+		}
+
+		m_gcwRegionDefenderGuildsVersion.set(m_gcwRegionDefenderGuildsVersion.get() + 1);
+
+		updateGcwRegionDefenderBonus(gcwRegion);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void GuildObject::removeGcwRegionDefenderGuild(std::string const & gcwRegion, int guildId, uint32 faction)
+{
+	if (!gcwRegion.empty())
+	{
+		m_gcwRegionDefenderGuilds.erase(std::make_pair(gcwRegion, guildId));
+
+		Archive::AutoDeltaMap<std::string, std::pair<int, int> >::const_iterator iter = m_gcwRegionDefenderGuildsCount.find(gcwRegion);
+		if (iter != m_gcwRegionDefenderGuildsCount.end())
+		{
+			std::pair<int, int> value = iter->second;
+
+			if (PvpData::isImperialFactionId(faction))
+				value.first = std::max(0, value.first - 1);
+			else if (PvpData::isRebelFactionId(faction))
+				value.second = std::max(0, value.second - 1);
+
+			if ((value.first > 0) || (value.second > 0))
+				m_gcwRegionDefenderGuildsCount.set(gcwRegion, value);
+			else
+				m_gcwRegionDefenderGuildsCount.erase(gcwRegion);
+		}
+
+		m_gcwRegionDefenderGuildsVersion.set(m_gcwRegionDefenderGuildsVersion.get() + 1);
+
+		updateGcwRegionDefenderBonus(gcwRegion);
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/GuildObject.h b/engine/server/library/serverGame/src/shared/object/GuildObject.h
new file mode 100644
index 00000000..d6c5e298
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/GuildObject.h
@@ -0,0 +1,210 @@
+//========================================================================
+//
+// GuildObject.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef INCLUDED_GuildObject_H
+#define INCLUDED_GuildObject_H
+
+// ======================================================================
+
+#include "Archive/AutoDeltaMap.h"
+#include "Archive/AutoDeltaSet.h"
+#include "serverGame/GuildInfo.h"
+#include "serverGame/GuildMemberInfo.h"
+#include "serverGame/UniverseObject.h"
+
+// ======================================================================
+
+class ServerGuildObjectTemplate;
+
+// ======================================================================
+
+class GuildObject: public UniverseObject
+{
+public:
+	GuildObject(ServerGuildObjectTemplate const *newTemplate);
+	virtual ~GuildObject();
+
+	virtual Controller* createDefaultController();
+	virtual void setupUniverse();
+	virtual bool isVisibleOnClient(const Client &client) const;
+	virtual void getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+	virtual void unload();
+
+	GuildInfo const * getGuildInfo(int guildId) const;
+	GuildMemberInfo const * getGuildMemberInfo(int guildId, NetworkId const &memberId) const;
+
+	stdset<std::string>::fwd const &getGuildEnemies() const;
+
+	void getAllGuildIds(stdvector<int>::fwd &results) const;
+	int findGuild(std::string const &name) const;
+	bool guildExists(int guildId) const;
+	int getGuildId(NetworkId const &memberId) const;
+	int getGuildIdForSponsored(NetworkId const &memberId) const;
+	int getGuildIdForGuildLeader(NetworkId const &leaderId) const;
+	void getGuildMemberIds(int guildId, stdvector<NetworkId>::fwd &results) const;
+	void getMemberIdsWithPermissions(int guildId, int permissions, stdvector<NetworkId>::fwd &results) const;
+
+	int createGuild(std::string const &guildName, std::string const &guildAbbrev, int guildId = 0);
+	void disbandGuild(int guildId);
+	void removeGuildMember(int guildId, NetworkId const &memberId);
+	void addGuildCreatorMember(int guildId, NetworkId const &memberId, std::string const &memberName, std::string const &memberProfessionSkillTemplate, int memberLevel);
+	void addGuildSponsorMember(int guildId, NetworkId const &memberId, std::string const &memberName, std::string const &memberProfessionSkillTemplate, int memberLevel);
+	void setGuildMemberPermission(int guildId, NetworkId const &memberId, int permissions);
+	void setGuildMemberTitle(int guildId, NetworkId const &memberId, std::string const &title);
+	void setGuildMemberAllegiance(int guildId, NetworkId const &memberId, NetworkId const &allegiance);
+	void setGuildMemberPermissionAndAllegiance(int guildId, NetworkId const &memberId, int permissions, NetworkId const &allegiance);
+	void setGuildMemberNameAndPermision(int guildId, NetworkId const &memberId, std::string const &memberName, int permissions);
+	void setGuildMemberProfessionInfo(int guildId, NetworkId const &memberId, std::string const &memberProfessionSkillTemplate, int memberLevel);
+	void addGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName);
+	void removeGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName);
+	bool hasGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName);
+	void getGuildMemberRank(int guildId, NetworkId const &memberId, stdvector<std::string>::fwd &ranks);
+	void setGuildLeader(int guildId, NetworkId const &leaderId);
+	void setGuildElectionEndTime(int guildId, int electionPreviousEndTime, int electionNextEndTime);
+	void setGuildFaction(int guildId, uint32 guildFaction);
+	void setGuildGcwDefenderRegion(int guildId, std::string const &guildGcwDefenderRegion);
+	void setGuildEnemy(int guildId, int enemyId);
+	void removeGuildEnemy(int guildId, int enemyId);
+	void modifyGuildWarKillTracking(int killerGuildId, int victimGuildId, int adjustment, int updateTime);
+	void updateGuildWarKillTrackingData();
+	void setGuildName(int guildId, std::string const &newName);
+	void setGuildAbbrev(int guildId, std::string const &newAbbrev);
+
+	void calculateGcwImperialScorePercentileForSwg();
+	void depersistGcwImperialScorePercentile();
+	void updateGcwImperialScorePercentile(stdset<std::string>::fwd const & gcwScoreCategories);
+	void updateGcwRegionDefenderBonus(std::string const & gcwScoreCategory);
+	std::map<std::string, int> const & getGcwImperialScorePercentile() const;
+	std::map<std::string, int> const & getGcwGroupImperialScorePercentile() const;
+	int getGcwImperialScorePercentile(std::string const & gcwCategory) const; // the rebel score is 100 - the imperial score
+	int getGcwGroupImperialScorePercentile(std::string const & gcwGroup) const; // the rebel score is 100 - the imperial score
+	float getGcwDefenderRegionImperialBonus(std::string const & gcwScoreCategory) const;
+	float getGcwDefenderRegionRebelBonus(std::string const & gcwScoreCategory) const;
+	std::map<std::pair<std::string, std::string>, int> const & getGcwGroupCategoryImperialScoreRaw() const;
+	std::map<std::string, int> const & getGcwGroupImperialScoreRaw() const;
+	void setGcwImperialScorePercentileFromOtherGalaxy(std::string const & clusterName, std::map<std::string, int> const & gcwImperialScorePercentile, std::map<std::string, int> const & gcwGroupImperialScorePercentile);
+	void setGcwRawScoreFromOtherGalaxy(std::string const & clusterName, std::map<std::string, std::pair<int64, int64> > const & gcwImperialScore, std::map<std::string, std::pair<int64, int64> > const & gcwRebelScore);
+
+	std::map<std::pair<std::string, int>, uint32> const & getGcwRegionDefenderGuilds() const;
+	std::map<std::string, std::pair<int, int> > const & getGcwRegionDefenderGuildsCount() const;
+	int getGcwRegionDefenderGuildsVersion() const;
+
+private:
+	GuildObject();
+	GuildObject(GuildObject const &rhs);
+	GuildObject& operator=(GuildObject const &rhs);
+
+	void addMembersToPackages();
+	int nextFreeGuildId();
+	void onGuildEnemiesChanged();
+
+	void onMembersInfoErase(std::pair<int, NetworkId> const & key, GuildMemberInfo const & value);
+	void onMembersInfoInsert(std::pair<int, NetworkId> const & key, GuildMemberInfo const & value);
+	void onMembersInfoSet(std::pair<int, NetworkId> const & key, GuildMemberInfo const & oldValue, GuildMemberInfo const & newValue);
+
+	void addGcwRegionDefenderGuild(std::string const & gcwRegion, int guildId, uint32 faction);
+	void removeGcwRegionDefenderGuild(std::string const & gcwRegion, int guildId, uint32 faction);
+
+private:
+// BPM GuildObject : UniverseObject // Begin persisted members
+	Archive::AutoDeltaSet<std::string> m_names;
+	Archive::AutoDeltaSet<std::string> m_abbrevs;
+	Archive::AutoDeltaSet<std::string> m_leaders;
+	Archive::AutoDeltaSet<std::string> m_members;
+	Archive::AutoDeltaSet<std::string, GuildObject> m_enemies;
+// EPM
+
+	// parallel maps to persisted members m_names, m_abbrevs, m_leaders, and m_members that
+	// will provide access to the data because the data in the persisted members are strings
+	Archive::AutoDeltaMap<int, GuildInfo> m_guildsInfo; // guild id -> GuildInfo
+	Archive::AutoDeltaMap<std::pair<int, NetworkId>, GuildMemberInfo, GuildObject> m_membersInfo; // (guild id, member id) -> GuildMemberInfo
+	Archive::AutoDeltaMap<NetworkId, int> m_fullMembers; // member id -> guild id
+	Archive::AutoDeltaMap<NetworkId, int> m_sponsoredMembers; // member id -> guild id
+	Archive::AutoDeltaMap<NetworkId, int> m_guildLeaders; // leader id -> guild id
+
+	// GCW score tracking
+	Archive::AutoDeltaMap<std::string, int> m_gcwImperialScorePercentileThisGalaxy;
+	Archive::AutoDeltaMap<std::string, std::pair<float, float> > m_gcwRegionDefenderBonus;
+	Archive::AutoDeltaMap<std::string, int> m_gcwGroupImperialScorePercentileThisGalaxy;
+
+	Archive::AutoDeltaMap<std::pair<std::string, int>, int> m_gcwImperialScorePercentileHistoryThisGalaxy;
+	Archive::AutoDeltaMap<std::pair<std::string, int>, int> m_gcwGroupImperialScorePercentileHistoryThisGalaxy;
+
+	Archive::AutoDeltaMap<std::string, int> m_gcwImperialScorePercentileHistoryCountThisGalaxy;
+	Archive::AutoDeltaMap<std::string, int> m_gcwGroupImperialScorePercentileHistoryCountThisGalaxy;
+
+	Archive::AutoDeltaMap<std::pair<std::string, std::string>, int> m_gcwImperialScorePercentileOtherGalaxies;
+	Archive::AutoDeltaMap<std::pair<std::string, std::string>, int> m_gcwGroupImperialScorePercentileOtherGalaxies;
+
+	Archive::AutoDeltaMap<std::pair<std::string, std::string>, int> m_gcwGroupCategoryImperialScoreRawThisGalaxy;
+	Archive::AutoDeltaMap<std::string, int> m_gcwGroupImperialScoreRawThisGalaxy;
+
+	Archive::AutoDeltaMap<std::pair<std::string, std::string>, std::pair<int64, int64> > m_gcwImperialScoreOtherGalaxies;
+	Archive::AutoDeltaMap<std::pair<std::string, std::string>, std::pair<int64, int64> > m_gcwRebelScoreOtherGalaxies;
+
+	int m_lowFreeGuildId;
+	unsigned long m_nextGuildWarKillTrackingAdjustmentUpdate;
+	std::map<std::pair<int, int>, std::pair<int, int> > m_guildWarKillTrackingAdjustment;
+
+	Archive::AutoDeltaMap<std::pair<std::string, int>, uint32> m_gcwRegionDefenderGuilds;
+	Archive::AutoDeltaMap<std::string, std::pair<int, int> > m_gcwRegionDefenderGuildsCount;
+	Archive::AutoDeltaVariable<int> m_gcwRegionDefenderGuildsVersion;
+};
+
+// ----------------------------------------------------------------------
+
+inline std::map<std::string, int> const & GuildObject::getGcwImperialScorePercentile() const
+{
+	return m_gcwImperialScorePercentileThisGalaxy.getMap();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::map<std::string, int> const & GuildObject::getGcwGroupImperialScorePercentile() const
+{
+	return m_gcwGroupImperialScorePercentileThisGalaxy.getMap();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::map<std::pair<std::string, std::string>, int> const & GuildObject::getGcwGroupCategoryImperialScoreRaw() const
+{
+	return m_gcwGroupCategoryImperialScoreRawThisGalaxy.getMap();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::map<std::string, int> const & GuildObject::getGcwGroupImperialScoreRaw() const
+{
+	return m_gcwGroupImperialScoreRawThisGalaxy.getMap();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::map<std::pair<std::string, int>, uint32> const & GuildObject::getGcwRegionDefenderGuilds() const
+{
+	return m_gcwRegionDefenderGuilds.getMap();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::map<std::string, std::pair<int, int> > const & GuildObject::getGcwRegionDefenderGuildsCount() const
+{
+	return m_gcwRegionDefenderGuildsCount.getMap();
+}
+
+// ----------------------------------------------------------------------
+
+inline int GuildObject::getGcwRegionDefenderGuildsVersion() const
+{
+	return m_gcwRegionDefenderGuildsVersion.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp b/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp
new file mode 100644
index 00000000..aa587877
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp
@@ -0,0 +1,871 @@
+//========================================================================
+//
+// HarvesterInstallationObject.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/HarvesterInstallationObject.h"
+
+#include "serverGame/Chat.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureController.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/HarvesterInstallationController.h"
+#include "serverGame/InstallationSynchronizedUi.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ResourceContainerObject.h"
+#include "serverGame/ResourcePoolObject.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerHarvesterInstallationObjectTemplate.h"
+#include "serverGame/ServerResourceClassObject.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverNetworkMessages/MessageToPayload.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedGame/SharedStringIds.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/MessageQueueGenericResponse.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedNetworkMessages/MessageQueueHarvesterResourceData.h"
+#include "sharedNetworkMessages/MessageQueueResourceEmptyHopper.h"
+#include "sharedObject/AlterResult.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedUtility/InstallationResourceData.h"
+#include "swgServerNetworkMessages/MessageQueueResourceFinishHarvest.h"
+#include "swgServerNetworkMessages/MessageQueueResourceSetInstalledEfficiency.h"
+
+#include <stdio.h>
+#include <vector>
+
+//-----------------------------------------------------------------------
+
+namespace
+{
+	namespace ObjVars
+	{
+		const std::string resource = "resource";
+	}
+}
+
+//----------------------------------------------------------------------
+
+
+HarvesterInstallationObject::HarvesterInstallationObject(const ServerHarvesterInstallationObjectTemplate* newTemplate) :
+	InstallationObject(newTemplate),
+	m_installedEfficiency(0.0f),
+	m_resourceType(NetworkId::cms_invalid),
+	m_maxExtractionRate(newTemplate->getMaxExtractionRate()),
+	m_currentExtractionRate(static_cast<float>(newTemplate->getCurrentExtractionRate())),
+	m_maxHopperAmount(newTemplate->getMaxHopperSize()),
+	m_hopperResource(NetworkId::cms_invalid),
+	m_hopperAmount(0.0f),
+	m_survey(NULL),
+	m_surveyTime(0)
+{
+	//Installation objects have real time updated UI
+	addMembersToPackages();
+}
+
+//-----------------------------------------------------------------------
+
+HarvesterInstallationObject::~HarvesterInstallationObject()
+{
+	delete m_survey;
+	m_survey = NULL;
+	// 	m_synchronizedUi deleted by superclass
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a default controller for this object.
+ *
+ * @return the object's controller
+ */
+Controller* HarvesterInstallationObject::createDefaultController(void)
+{
+	Controller* _controller = new HarvesterInstallationController(this);
+	NOT_NULL(_controller);
+
+	setController(_controller);
+	return _controller;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Activate an object as a harvester.  Assumes the object has already been
+ * placed in its intended location.
+ */
+void HarvesterInstallationObject::activate(const NetworkId &actorId)
+{
+	const ServerObject *actor = safe_cast<const ServerObject*>(NetworkIdManager::getObjectById(actorId));
+
+	if (getHopperContents() >= m_maxHopperAmount.get())
+	{
+		if (actor)
+			Chat::sendSystemMessage(*actor,SharedStringIds::harvester_hopper_full,Unicode::String());
+		return;
+	}
+
+	bool active = isActive();
+	InstallationObject::activate(actorId);
+	if (!active && isActive())
+	{
+		ResourcePoolObject const * const resourcePool = getSelectedResourcePool();
+
+		if (!resourcePool)
+		{
+			if (actor)
+				Chat::sendSystemMessage(*actor,SharedStringIds::harvester_no_resource,Unicode::String());
+			deactivate();
+			return;
+		}
+
+		if (resourcePool->isDepleted())
+		{
+			if (actor)
+				Chat::sendSystemMessage(*actor,SharedStringIds::harvester_resource_depleted,Unicode::String());
+			deactivate();
+			return;
+		}
+
+		if (ConfigServerGame::getDeactivateHarvesterIfDamaged() && (getDamageTaken() > 0))
+		{
+			if (actor)
+			{
+				// Send cute breakdown message
+
+				float damageScale = 1.0f-(static_cast<float>(getDamageTaken())/static_cast<float>(getMaxHitPoints()));
+
+				if (damageScale < 0.25)
+					Chat::sendSystemMessage(*actor,SharedStringIds::harvester_no_maint_1,Unicode::String());
+				else if (damageScale < 0.5)
+					Chat::sendSystemMessage(*actor,SharedStringIds::harvester_no_maint_2,Unicode::String());
+				else if (damageScale < 0.75)
+					Chat::sendSystemMessage(*actor,SharedStringIds::harvester_no_maint_3,Unicode::String());
+				else
+					Chat::sendSystemMessage(*actor,SharedStringIds::harvester_no_maint_4,Unicode::String());
+			}
+			deactivate();
+		}
+
+		Vector location(getTransform_o2p().getPosition_p());
+		//apply current extraction rate multplier for things like harvester bonus
+		m_installedEfficiency = (m_currentExtractionRate.get() * ConfigServerGame::getHarvesterExtractionRateMultiplier()) * resourcePool->getEfficiencyAtLocation(location.x,location.z);
+		setTickCount(static_cast<float>(ServerClock::getInstance().getGameTimeSeconds()));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Deactivate an object as a harvester.
+ */
+void HarvesterInstallationObject::deactivate()
+{
+	bool active = isActive();
+	InstallationObject::deactivate();
+	if (active && !isActive())
+	{
+		m_installedEfficiency=0.0f;
+		roundHopperContents(); // fractional units are discarded when harvester is deactivated
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void HarvesterInstallationObject::harvest()
+{
+	if (isAuthoritative() && isActive())
+	{
+		if (m_installedEfficiency.get() == 0)
+			return;
+
+		if (ConfigServerGame::getDeactivateHarvesterIfDamaged() && (getDamageTaken() > 0))
+			deactivate();
+		else
+		{
+			ResourcePoolObject const * const pool=getSelectedResourcePool();
+			if (pool)
+			{
+				float condition = static_cast<float>(getMaxHitPoints() - getDamageTaken()) / static_cast<float>(getMaxHitPoints());
+
+				DEBUG_FATAL(condition < 0 || condition > 1, ("Condition was %f, should have been between 0 and 1\n",condition));
+				if (condition< 0 || condition > 1)
+					condition = 0;
+
+				float oldTickCount = getTickCount();
+				float amountCollected = (pool->harvest(m_installedEfficiency.get(), static_cast<uint32>(getTickCount()))) * condition;
+				float newTickCount = static_cast<float>(ServerClock::getInstance().getGameTimeSeconds());
+				setTickCount(newTickCount);
+
+				// Check for out of power
+				if ((getOutOfPowerTime() > 0) && (getOutOfPowerTime() < newTickCount))
+				{
+					if (getOutOfPowerTime() < oldTickCount)
+					{
+						amountCollected = 0;
+					}
+					else
+					{
+						float runRatio = (getOutOfPowerTime() - oldTickCount) / (newTickCount - oldTickCount);
+						DEBUG_REPORT_LOG(true,("Scaling output by %f because power ran out.\n",runRatio));
+						amountCollected *= runRatio;
+					}
+					deactivate();
+					LOG("CustomerService", ("Power:shut down installation %s owned by %s due to 0 power", getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(getOwnerId()).c_str()));
+				}
+
+				int hopperContents=static_cast<int>(getHopperContents());
+				if (hopperContents + amountCollected > m_maxHopperAmount.get())
+				{
+					addResource(m_resourceType.get(),static_cast<float>(m_maxHopperAmount.get()-hopperContents));
+					deactivate();
+				}
+				else
+				{
+					addResource(m_resourceType.get(),amountCollected);
+				}
+			}
+
+			if (!pool || pool->isDepleted())
+			{
+				deactivate();
+			}
+		}
+	}
+	InstallationObject::harvest();
+}
+
+//----------------------------------------------------------------------
+
+void HarvesterInstallationObject::selectResource (const NetworkId & resourceTypeId, const NetworkId &actor)
+{
+	if (isAuthoritative())
+	{
+		bool found=false;
+		std::vector<NetworkId> pools;
+
+		if (!m_survey)
+			takeSurvey();
+		NOT_NULL(m_survey);
+		for (std::vector<ResourceTypeObject const *>::iterator i=m_survey->begin(); i!=m_survey->end(); ++i)
+		{
+			if (*i && (*i)->getNetworkId()==resourceTypeId)
+				found=true;
+		}
+
+		if (!found)
+		{
+			return;
+		}
+
+		if (isActive())
+		{
+			deactivate();
+			m_resourceType = resourceTypeId;
+			activate(actor);
+		}
+		else
+			m_resourceType = resourceTypeId;
+	
+		scheduleForAlter();
+	}
+	else
+	{
+		//TODO:  network message
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Record all the available resource pools.  This data is cached but not persisted.
+ */
+void HarvesterInstallationObject::takeSurvey()
+{
+	if (m_survey)
+		m_survey->clear();
+	else
+		m_survey = new std::vector<ResourceTypeObject const *>;
+
+	PlanetObject *planet=ServerUniverse::getInstance().getCurrentPlanet();
+
+	if (!planet)
+	{
+		WARNING (true, ("Cannot take survey if no planet object exists."));
+		return;
+	}
+
+	const ResourceClassObject *resClass = getMasterClass();
+	if (resClass)
+		planet->getAvailableResourceList(*m_survey, *resClass);
+
+	m_surveyTime = ServerClock::getInstance().getGameTimeSeconds();
+
+	InstallationSynchronizedUi * const syncUi = dynamic_cast<InstallationSynchronizedUi *>(getSynchronizedUi ());
+	if (syncUi)
+		syncUi->resetResourcePools ();
+}
+
+//----------------------------------------------------------------------
+
+ServerSynchronizedUi * HarvesterInstallationObject::createSynchronizedUi ()
+{
+	return new InstallationSynchronizedUi(*this);
+}
+
+//----------------------------------------------------------------------
+
+void HarvesterInstallationObject::getResourceData (ResourceDataVector & data)
+{
+	InstallationSynchronizedUi * const syncUi = dynamic_cast<InstallationSynchronizedUi *>(getSynchronizedUi ());
+
+	if (syncUi)
+		syncUi->getResourceData (data);
+}
+
+// ----------------------------------------------------------------------
+
+int HarvesterInstallationObject::getMaxExtractionRate() const
+{
+	return m_maxExtractionRate.get();
+}
+
+// ----------------------------------------------------------------------
+
+float HarvesterInstallationObject::getCurrentExtractionRate() const
+{
+	return m_currentExtractionRate.get();
+}
+
+// ----------------------------------------------------------------------
+
+float HarvesterInstallationObject::getInstalledExtractionRate() const
+{
+	return m_installedEfficiency.get(); //TODO:  rename ?
+}
+
+// ----------------------------------------------------------------------
+
+int HarvesterInstallationObject::getMaxHopperAmount() const
+{
+	return m_maxHopperAmount.get();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Add up the amounts of all the resources in the hopper
+ */
+float HarvesterInstallationObject::getCurrentHopperAmount() const
+{
+	if (m_hopperAmount.get() >= 0)
+		return m_hopperAmount.get();
+	else
+	{
+		float total=0;
+		DynamicVariableList::NestedList l(getObjVars(),ObjVars::resource);
+		{
+			for (DynamicVariableList::NestedList::const_iterator i=l.begin(); i!=l.end(); ++i)
+			{
+				float var=0;
+				if (i.getValue(var))
+					total+=var;
+			}
+		}
+	
+		return total;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Return all the resource pools known to the current survey.  If the
+ * survey is more than an hour old, refresh it.
+ */
+std::vector<ResourceTypeObject const *> const & HarvesterInstallationObject::getSurveyTypes()
+{
+	if (!m_survey || ServerClock::getInstance().getGameTimeSeconds() - m_surveyTime > (60*60))
+	{
+		delete m_survey;
+		m_survey = NULL;
+		takeSurvey();
+	}
+
+	NOT_NULL(m_survey);
+	return *m_survey;
+}
+
+//----------------------------------------------------------------------
+
+float HarvesterInstallationObject::alter(float time)
+{
+	DEBUG_REPORT_LOG(true,("HarvesterInstallationObject::alter\n"));
+
+	float const result = InstallationObject::alter (time);
+
+	PROFILER_AUTO_BLOCK_DEFINE("HarvesterInstallationObject::alter");
+
+	if (isAuthoritative() && isActive())
+		harvest ();
+
+	InstallationSynchronizedUi * const syncUi = dynamic_cast<InstallationSynchronizedUi *>(getSynchronizedUi ());
+	if (syncUi)
+	{
+		syncUi->refresh();
+	}
+
+	addObjectToConcludeList();
+
+	return getNextAlterTime(result);
+}
+
+//----------------------------------------------------------------------
+
+float HarvesterInstallationObject::getNextAlterTime(float baseAlterTime) const
+{
+	if (baseAlterTime == AlterResult::cms_kill || baseAlterTime == AlterResult::cms_alterNextFrame) //lint !e777 // == with floats
+		return baseAlterTime;
+
+	float result = baseAlterTime;
+
+	InstallationSynchronizedUi const *syncUi = dynamic_cast<InstallationSynchronizedUi const *>(getSynchronizedUi());
+
+    //If GUI active update harvester more quickly
+	if (syncUi)
+		AlterResult::incorporateAlterResult(result, ConfigServerGame::getWatchedHarvesterAlterTime());
+    
+	return result;
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Return the contents of the hopper.
+ * @data Vector to store the contents (optional)
+ * @returns The sum of the resources in the hopper, i.e. total hopper
+ * space consumed.
+ */
+float HarvesterInstallationObject::getHopperContents(HopperContentsVector * data) const
+{
+	if (m_hopperAmount.get() >= 0)
+	{
+		if (data && m_hopperAmount.get() != 0)
+			data->push_back(std::make_pair(m_hopperResource.get(), m_hopperAmount.get()));
+		return m_hopperAmount.get();
+	}
+	else
+	{
+		float total = 0;
+		const DynamicVariableList::NestedList l(getObjVars(),ObjVars::resource);
+		for (DynamicVariableList::NestedList::const_iterator pos=l.begin(); pos!=l.end(); ++pos)
+		{
+			float amount = 0;
+			if (pos.getValue(amount))
+			{
+				NetworkId networkIdValue(pos.getName());
+				if (data)
+				{
+					data->push_back (std::make_pair (networkIdValue, amount));
+				}
+				total += amount;
+			}
+		}
+		return total;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Throws away the contents of the hopper.
+ */
+void HarvesterInstallationObject::discardAllHopperContents()
+{
+	if (isAuthoritative())
+	{
+		removeObjVarItem(ObjVars::resource);
+		m_hopperAmount=0.0f;
+		m_hopperResource=NetworkId::cms_invalid;
+	}
+	else
+	{
+		//TODO: messages
+	}
+}
+
+//----------------------------------------------------------------------
+
+void HarvesterInstallationObject::emptyHopper(const NetworkId & playerId, const NetworkId & resourceId, int amount, bool discard, uint8 sequenceId)
+{
+	//TODO:  what if not authoritative?
+
+	if (isAuthoritative())
+	{
+		CreatureObject * const player = dynamic_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId (playerId));
+		if (!player)
+		{
+			WARNING (true, ("bad player"));
+			return;
+		}
+
+		bool success = false;
+
+		ServerObject * const inventory = (player && !discard) ? player->getInventory () : 0;
+
+		if (!discard && !inventory)
+		{
+			WARNING (true, ("no inventory"));
+		}
+		else
+		{
+			ResourceTypeObject const * const resType = ServerUniverse::getInstance().getResourceTypeById(resourceId);
+			if (!resType)
+			{
+				WARNING (true, ("bad resource specified"));
+			}
+			else
+			{
+				int amountToRemove=0;
+				if (amount < 0)
+					amountToRemove = static_cast<int>(getAmountOfResource(resourceId));
+				else
+					amountToRemove = std::min(amount,static_cast<int>(getAmountOfResource(resourceId)));
+
+				std::string crateTemplateName;
+				resType->getCrateTemplate(crateTemplateName);
+				ResourceContainerObject * crate = 0;
+						
+				if (inventory)
+				{
+					crate = dynamic_cast<ResourceContainerObject*>(ServerWorld::createNewObject(crateTemplateName, *inventory, true));
+					if (!crate)
+					{
+						DEBUG_REPORT_LOG (!crate, ("error making crate %s.  (Inventory was probably full.)\n", crateTemplateName.c_str()));	
+						amountToRemove = 0;
+					}
+				}
+				
+				if (crate)
+				{
+					amountToRemove = std::min (amountToRemove, crate->getMaxQuantity ());
+					if (!crate->addResource (CachedNetworkId (resourceId), amountToRemove, playerId))
+					{
+						WARNING (true, ("error adding resource to crate"));
+						amountToRemove = 0;
+					}
+				}
+						
+				if (amountToRemove == 0)
+					DEBUG_REPORT_LOG (true, ("removed zero from harvester\n"));
+				else
+					addResource(resourceId, static_cast<float>(-amountToRemove));
+				
+				success = true;
+			}
+		}
+
+		InstallationSynchronizedUi * const syncUi = dynamic_cast<InstallationSynchronizedUi *>(getSynchronizedUi ());
+		if (syncUi)
+			syncUi->refresh ();
+
+		{
+			MessageQueueGenericResponse * const resp = new MessageQueueGenericResponse (static_cast<int>(CM_clientResourceHarvesterEmptyHopper), success, sequenceId);
+
+			Controller *const controller = player->getController();
+			NOT_NULL(controller);
+			controller->appendMessage(static_cast<int>(CM_clientResourceHarvesterEmptyHopperResponse),0.0f,resp,
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_CLIENT);
+		}
+
+		return;
+	}
+
+	//----------------------------------------------------------------------
+
+	else
+	{
+
+		//TODO: multiserver messages
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Round the contents of the hopper to the nearest integer, discarding
+ * any fractional amounts.
+ */
+void HarvesterInstallationObject::roundHopperContents()
+{
+	DEBUG_FATAL(!isAuthoritative(),("Programmer bug:  roundHopperContents() is a helper function that should only be called on an authoritative object.\n"));
+
+	m_hopperAmount = static_cast<float>(static_cast<int>(m_hopperAmount.get()));
+   
+	std::vector<std::string> itemsToRemove;
+
+	DynamicVariableList::NestedList resources(getObjVars(),ObjVars::resource);
+	for (DynamicVariableList::NestedList::const_iterator i=resources.begin(); i!=resources.end(); ++i)
+	{
+		float floatVal = 0;
+		if (i.getValue(floatVal))
+		{
+			int intVal = static_cast<int>(floatVal);
+			if (intVal == 0)
+				itemsToRemove.push_back(i.getNameWithPath());
+			else
+			{
+				IGNORE_RETURN(setObjVarItem(i.getNameWithPath(),static_cast<float>(intVal)));
+			}
+		}
+	}
+
+	for (std::vector<std::string>::const_iterator j=itemsToRemove.begin(); j!=itemsToRemove.end(); ++j)
+		removeObjVarItem(*j);
+}
+
+// ----------------------------------------------------------------------
+
+void HarvesterInstallationObject::setCurrentExtractionRate(float currentExtractionRate)
+{
+	if (isAuthoritative())
+	{ 
+		if (currentExtractionRate > m_maxExtractionRate.get())
+		{
+			DEBUG_WARNING(true,("Ignoring setCurrentExtractionRate(%f) because it was above maxExtractionRate %i.\n",
+								currentExtractionRate,m_maxExtractionRate.get()));
+			return;
+		}
+
+		if (m_currentExtractionRate.get() == currentExtractionRate)
+			return;  
+
+		if (isActive())
+		{
+			//make sure we update the harvester contents with the old extraction rate
+			//before changing to the new extraction rate value
+			harvest();
+
+			deactivate();
+			m_currentExtractionRate = currentExtractionRate;
+			activate(NetworkId::cms_invalid);
+		}
+		else
+		{
+			m_currentExtractionRate = currentExtractionRate;
+		}
+	}
+	else
+	{
+		//TODO: messages
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sets the maximum extraction rate.
+ * If the new max rate is less than the current rate, sets the current
+ * rate to the max rate.
+ * @todo Is that how we want to handle that case?
+ */
+void HarvesterInstallationObject::setMaxExtractionRate(int maxExtractionRate)
+{
+	if (isAuthoritative())
+	{
+		m_maxExtractionRate=maxExtractionRate;
+		if (maxExtractionRate > m_currentExtractionRate.get())
+		{
+			DEBUG_REPORT_LOG(true,("Reducing current extraction rate to %i because max was changed.\n",maxExtractionRate));
+			setCurrentExtractionRate(static_cast<float>(maxExtractionRate));
+		}
+	}
+	else
+	{
+		//TODO: messages
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sets the maximum hopper amount.
+ * If the new max hopper amount is greater than the amount in the hopper,
+ * it sets the max but does not discard any resources.
+ * @todo Is that how we want to handle that case?
+ */
+void HarvesterInstallationObject::setMaxHopperAmount(int maxHopperAmount)
+{
+	if (isAuthoritative())
+	{
+		m_maxHopperAmount=maxHopperAmount;
+	}
+	else
+	{
+		//TODO: messages
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void HarvesterInstallationObject::handleCMessageTo (const MessageToPayload &message)
+{
+	InstallationObject::handleCMessageTo (message);
+}
+
+// ----------------------------------------------------------------------
+
+ResourceClassObject *HarvesterInstallationObject::getMasterClass() const
+{
+	ResourceClassObject *obj = NULL;
+	const ServerHarvesterInstallationObjectTemplate *harvesterTemplate = dynamic_cast<const ServerHarvesterInstallationObjectTemplate*>(getObjectTemplate());
+	if (harvesterTemplate)
+		obj=ServerUniverse::getInstance().getResourceClassByName(harvesterTemplate->getMasterClassName());
+	if (!obj)
+		obj=ServerUniverse::getInstance().getResourceTreeRoot();
+	return obj;
+}
+
+// ----------------------------------------------------------------------
+
+void HarvesterInstallationObject::sendResourceDataToClient(CreatureObject &clientObject)
+{
+	ResourceDataVector dv;
+	getResourceData (dv);
+
+	if (!dv.empty ())
+	{
+		MessageQueueHarvesterResourceData * const newData = new MessageQueueHarvesterResourceData (getNetworkId (), dv);
+		CreatureController *controller = safe_cast<CreatureController*>(clientObject.getController());
+		controller->appendMessage(static_cast<int>(CM_clientResourceHarvesterResourceData), 0.0f, newData, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void HarvesterInstallationObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+{
+	InstallationObject::getAttributes(data);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Add (or subtract) resources to the hopper.  In the case of subtraction,
+ * rounds a negative result to 0.
+ */
+void HarvesterInstallationObject::addResource(const NetworkId &resourceId, float amount)
+{
+	if(isAuthoritative())
+	{
+		if (amount >= 0)
+			LOG("CustomerService", ("Harvest:adding %.2f of resource %s to harvester %s owned by %s", amount, resourceId.getValueString().c_str(), getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(getOwnerId()).c_str()));
+		else
+			LOG("CustomerService", ("Harvest:removing %.2f of resource %s from harvester %s owned by %s", -amount, resourceId.getValueString().c_str(), getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(getOwnerId()).c_str()));
+		if (m_hopperAmount.get() == 0 || m_hopperResource.get()==resourceId)
+		{
+			m_hopperResource = resourceId;
+			float newValue = m_hopperAmount.get() + amount;
+			m_hopperAmount = newValue > 0 ? newValue : 0;
+		}	
+		else
+		{
+			if (m_hopperAmount.get() > 0) // splitting a single-resource harvester into a multi-resource harvester
+			{
+				std::string varName=std::string("resource.")+m_hopperResource.get().getValueString();
+				IGNORE_RETURN(setObjVarItem(varName,m_hopperAmount.get()));
+				m_hopperResource = NetworkId::cms_invalid;
+				m_hopperAmount = -1.0f; // flag that hopper amount is not meaningful and object variables should be used instead
+			}
+			
+			std::string varName=std::string("resource.")+resourceId.getValueString(); // The name of the object variable is resource.XXX, where XXX is the networkId.
+			float oldValue = 0.0f;
+			IGNORE_RETURN(getObjVars().getItem(varName, oldValue));
+			float newValue = oldValue + amount;
+			if (newValue <= 0.0f)
+			{
+				removeObjVarItem (varName);
+				if (!getObjVars().hasItem(std::string("resource")))
+					m_hopperAmount = 0.0f; // back to being a single-resource harvester
+			}
+			else
+				IGNORE_RETURN(setObjVarItem(varName,newValue));
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_addResource, new MessageQueueGenericValueType<std::pair<NetworkId, float> >(std::make_pair(resourceId, amount)));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the amount of a particular resource in the hopper
+ */
+float HarvesterInstallationObject::getAmountOfResource(const NetworkId &resourceId) const
+{
+	if (m_hopperAmount.get() >= 0)
+	{
+		if (resourceId == m_hopperResource.get())
+			return m_hopperAmount.get();
+		else
+			return 0;
+	}
+	else
+	{
+		// multiple resources in the hopper
+
+		float currentAmount = 0;
+		std::string objVarName(ObjVars::resource+'.'+resourceId.getValueString());
+		if (!getObjVars().getItem(objVarName, currentAmount))
+			return 0;
+		else
+			return currentAmount;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool HarvesterInstallationObject::isEmpty() const
+{
+	return (getHopperContents(0) == 0.f);
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const &HarvesterInstallationObject::getSelectedResourceTypeId() const
+{
+	return m_resourceType.get();
+}
+
+// ----------------------------------------------------------------------
+
+ResourcePoolObject const * HarvesterInstallationObject::getSelectedResourcePool() const
+{
+	if (getSelectedResourceTypeId() == NetworkId::cms_invalid)
+		return NULL;
+	
+	ResourceTypeObject const * const typeObject = ServerUniverse::getInstance().getResourceTypeById(getSelectedResourceTypeId());
+	if (typeObject)
+	{
+		return typeObject->getPoolForCurrentPlanet();
+	}
+	else
+		return NULL;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.h b/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.h
new file mode 100644
index 00000000..7616aba5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.h
@@ -0,0 +1,109 @@
+//========================================================================
+//
+// HarvesterInstallationObject.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_HarvesterInstallationObject_H
+#define _INCLUDED_HarvesterInstallationObject_H
+
+#include "serverGame/InstallationObject.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+struct InstallationResourceData;
+class ResourceClassObject;
+class ResourceTypeObject;
+class ResourcePoolObject;
+class ServerHarvesterInstallationObjectTemplate;
+
+/** 
+  *  A HarvesterInstallationObject is used to extract resources from the environment.
+  */
+
+class HarvesterInstallationObject : public InstallationObject
+{
+	friend class HarvesterInstallationController;
+	
+public:
+
+	HarvesterInstallationObject(const ServerHarvesterInstallationObjectTemplate* newTemplate);
+	virtual ~HarvesterInstallationObject();
+
+	virtual Controller* createDefaultController(void);
+	void                addMembersToPackages();
+	virtual float       alter(float time);
+	virtual void        getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+
+	//simulation functions:
+	virtual void activate         (const NetworkId &actorId);
+	virtual void deactivate       ();
+	virtual void harvest          ();
+	
+	void selectResource           (const NetworkId & resourceTypeId, const NetworkId &actor);
+	void discardAllHopperContents ();
+	void emptyHopper              (const NetworkId & playerId, const NetworkId & resourceId, int amount, bool discard, uint8 sequenceId);
+
+	virtual void handleCMessageTo (const MessageToPayload &message);
+
+	//getters
+	typedef stdvector<InstallationResourceData>::fwd ResourceDataVector;
+	typedef std::pair<NetworkId, float>              HopperContentElement;
+	typedef stdvector<HopperContentElement>::fwd     HopperContentsVector;
+	
+	float                   getHopperContents(HopperContentsVector * data=NULL) const;
+	void                    getResourceData(ResourceDataVector & data);
+	std::vector<ResourceTypeObject const *> const & getSurveyTypes();
+	int                     getMaxExtractionRate() const;
+	float                   getCurrentExtractionRate() const;
+	float                   getInstalledExtractionRate() const;
+    int                     getMaxHopperAmount() const;
+	float                   getCurrentHopperAmount() const;
+	float                   getAmountOfResource(const NetworkId &resourceId) const;
+	ResourceClassObject *   getMasterClass() const;
+	void                    sendResourceDataToClient(CreatureObject &clientObject);
+	bool                    isEmpty() const;
+	NetworkId const &       getSelectedResourceTypeId() const;
+
+	//setters
+	void                    setCurrentExtractionRate(float currentExtractionRate);
+	void                    setMaxExtractionRate(int maxExtractionRate);
+	void                    setMaxHopperAmount(int maxHopperAmount);
+	void                    addResource(const NetworkId &resourceId, float amount);
+			
+protected:
+	ServerSynchronizedUi * createSynchronizedUi ();
+
+private:
+	void roundHopperContents();
+	float getNextAlterTime(float baseAlterTime) const;
+	void takeSurvey();
+	ResourcePoolObject const * getSelectedResourcePool() const;
+
+private:
+  	HarvesterInstallationObject();
+	HarvesterInstallationObject(const HarvesterInstallationObject& rhs);
+	HarvesterInstallationObject&	operator=(const HarvesterInstallationObject& rhs);
+
+private:
+//BPM InstallationObject : BuildingObject // Begin persisted members.
+	Archive::AutoDeltaVariable<float> m_installedEfficiency; ///< For active harvesters, their resource collection efficiency
+	Archive::AutoDeltaVariable<NetworkId> m_resourceType; ///< The resource type this harvester is set to use
+	
+	Archive::AutoDeltaVariable<int> m_maxExtractionRate;
+	Archive::AutoDeltaVariable<float> m_currentExtractionRate;
+	Archive::AutoDeltaVariable<int> m_maxHopperAmount;
+	Archive::AutoDeltaVariable<NetworkId> m_hopperResource;
+	Archive::AutoDeltaVariable<float> m_hopperAmount; // amount of resource in the hopper.  0=empty, >0 = hopper containes that quantity of m_hopperResource, <0 = use object variables instead (contains multiple resources)
+//EPM
+
+	stdvector<ResourceTypeObject const *>::fwd * m_survey;
+	uint32 m_surveyTime;
+	
+/// Members yet to be implemented.
+// inputResourceTypes
+};
+
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp b/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp
new file mode 100644
index 00000000..1094b3d5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/InstallationObject.cpp
@@ -0,0 +1,503 @@
+//========================================================================
+//
+// InstallationObject.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/InstallationObject.h"
+
+#include "serverGame/Chat.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/InstallationController.h"
+#include "serverGame/InstallationSynchronizedUi.h"
+#include "serverGame/ObjectTracker.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ResourceContainerObject.h"
+#include "serverGame/ResourcePoolObject.h"
+#include "serverGame/ServerInstallationObjectTemplate.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverNetworkMessages/MessageToPayload.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedGame/SharedStringIds.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/MessageQueueGenericResponse.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "swgServerNetworkMessages/MessageQueueActivateInstallation.h"
+#include "swgServerNetworkMessages/MessageQueueDeactivateInstallation.h"
+#include "swgServerNetworkMessages/MessageQueueInstallationHarvest.h"
+#include "swgServerNetworkMessages/MessageQueueResourceFinishHarvest.h"
+#include "swgServerNetworkMessages/MessageQueueResourceSetInstalledEfficiency.h"
+
+#include <stdio.h>
+#include <vector>
+
+//----------------------------------------------------------------------
+
+static const std::string OBJVAR_ACCUMULATED_TIME("_installation.acclTime");
+
+const SharedObjectTemplate * InstallationObject::m_defaultSharedTemplate = NULL;
+
+namespace InstallationObjectNamespace
+{
+	InstallationObject::AllInstallationsSet g_installationList;
+}
+
+using namespace InstallationObjectNamespace;
+
+//----------------------------------------------------------------------
+
+
+InstallationObject::InstallationObject(const ServerInstallationObjectTemplate* newTemplate) :
+	TangibleObject(newTemplate),
+	m_installationType(0),
+	m_tickCount(0.0f),
+	m_activated(false),
+	m_power(0),
+	m_powerRate(0),
+	m_activateStartTime(0)
+{
+	addMembersToPackages();
+
+	IGNORE_RETURN(g_installationList.insert(this));
+
+	ObjectTracker::addInstallation();
+}
+
+//-----------------------------------------------------------------------
+
+InstallationObject::~InstallationObject()
+{
+	IGNORE_RETURN(g_installationList.erase(this));
+
+	ObjectTracker::removeInstallation();
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a shared template if none was given for this object.
+ *
+ * @return the shared template
+ */
+const SharedObjectTemplate * InstallationObject::getDefaultSharedTemplate(void) const
+{
+static const ConstCharCrcLowerString templateName("object/installation/base/shared_installation_default.iff");
+
+	if (m_defaultSharedTemplate == NULL)
+	{
+		m_defaultSharedTemplate = safe_cast<const SharedObjectTemplate *>(
+			ObjectTemplateList::fetch(templateName));
+		WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create "
+			"default shared object template %s", templateName.getString()));
+		if (m_defaultSharedTemplate != NULL)
+			ExitChain::add (removeDefaultTemplate, "InstallationObject::removeDefaultTemplate");
+	}
+	return m_defaultSharedTemplate;
+}	// InstallationObject::getDefaultSharedTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Cleans up the default shared template.
+ */
+void InstallationObject::removeDefaultTemplate(void)
+{
+	if (m_defaultSharedTemplate != NULL)
+	{
+		m_defaultSharedTemplate->releaseReference();
+		m_defaultSharedTemplate = NULL;
+	}
+}	// InstallationObject::removeDefaultTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a default controller for this object.
+ *
+ * @return the object's controller
+ */
+Controller* InstallationObject::createDefaultController(void)
+{
+	Controller* _controller = new InstallationController(this);
+	NOT_NULL(_controller);
+
+	setController(_controller);
+	return _controller;
+}
+
+//------------------------------------------------------------------------------------------
+
+void InstallationObject::getByteStreamFromAutoVariable(const std::string & name, Archive::ByteStream & target) const
+{
+	if(name == "powerValue")
+	{
+		m_power.pack(target);
+	}
+	else if(name == "powerRate")
+	{
+		m_powerRate.pack(target);
+	}
+	else
+	{
+		TangibleObject::getByteStreamFromAutoVariable(name, target);
+	}
+}
+
+//------------------------------------------------------------------------------------------
+
+void InstallationObject::setAutoVariableFromByteStream(const std::string & name, const Archive::ByteStream & source)
+{
+	Archive::ReadIterator ri(source);
+	if(name == "powerValue")
+	{
+		m_power.unpackDelta(ri);
+	}
+	else if(name == "powerRate")
+	{
+		m_powerRate.unpackDelta(ri);
+	}
+	else
+	{
+		TangibleObject::setAutoVariableFromByteStream(name, source);
+	}
+	addObjectToConcludeList();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Activate an object as an installation.  Assumes the object has already been
+ * placed in its intended location.
+ */
+void InstallationObject::activate(const NetworkId &actorId)
+{
+	if (isAuthoritative())
+	{
+		const ServerObject *actor = safe_cast<const ServerObject*>(NetworkIdManager::getObjectById(actorId));
+
+		if (m_activated.get())
+			return;
+
+		float currentPower = getPower();
+		if (currentPower <= 0 && getPowerRate() > 0)
+		{
+			if (actor)
+				Chat::sendSystemMessage(*actor, SharedStringIds::harvester_no_power, Unicode::String());
+			return;
+		}
+	
+		m_activated = true;
+		setCondition(ServerTangibleObjectTemplate::C_onOff);
+		setObjVarItem(OBJVAR_ACCUMULATED_TIME, 0.0f);
+		m_activateStartTime = static_cast<float>(ServerClock::getInstance().getGameTimeSeconds());
+		m_power = currentPower;
+		scheduleForAlter();
+	}
+	else
+	{
+		Controller *const controller = getController();
+		NOT_NULL(controller);
+		controller->appendMessage(static_cast<int>(CM_activateInstallation),0.0f,new MessageQueueActivateInstallation(),
+								  GameControllerMessageFlags::SEND | 
+								  GameControllerMessageFlags::RELIABLE |
+								  GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Deactivate an object as an installation.
+ */
+void InstallationObject::deactivate()
+{
+	if (isAuthoritative())
+	{
+		if (!m_activated.get())
+			return;
+
+		// adjust power for time active
+		float currentTime = static_cast<float>(ServerClock::getInstance().getGameTimeSeconds());
+		setActivateStartTime(currentTime);
+		
+		// turn the station off
+		m_tickCount = 0.0f;
+		m_activated = false;
+		clearCondition(ServerTangibleObjectTemplate::C_onOff);
+		scheduleForAlter();
+	}
+	else
+	{
+		Controller *const controller = getController();
+		NOT_NULL(controller);
+		controller->appendMessage(static_cast<int>(CM_deactivateInstallation),0.0f,new MessageQueueDeactivateInstallation(),
+								  GameControllerMessageFlags::SEND | 
+								  GameControllerMessageFlags::RELIABLE |
+								  GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void InstallationObject::harvest()
+{
+	if (isAuthoritative())
+	{
+	}
+	else
+	{
+		Controller *const controller = getController();
+		NOT_NULL(controller);
+		controller->appendMessage(static_cast<int>(CM_installationHarvest),0.0f,new MessageQueueInstallationHarvest(),
+								  GameControllerMessageFlags::SEND | 
+								  GameControllerMessageFlags::RELIABLE |
+								  GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void InstallationObject::finishActivate(float installedEfficiency, float tickCount)
+{
+	if (isAuthoritative())
+	{
+		if (m_activated.get())
+		{
+			m_tickCount = tickCount;
+		}
+		else
+		{
+			DEBUG_REPORT_LOG(true,("Got setInstalledEfficiency for installation %s, which was not activated.\n",getNetworkId().getValueString().c_str()));
+		}
+	}
+	else
+	{
+		MessageQueueResourceSetInstalledEfficiency* const message = new MessageQueueResourceSetInstalledEfficiency (installedEfficiency,tickCount);
+		Controller *const controller = getController();
+		NOT_NULL(controller);
+		controller->appendMessage(static_cast<int>(CM_resourceSetInstalledEfficiency),0.0f,message,
+								  GameControllerMessageFlags::SEND | 
+								  GameControllerMessageFlags::RELIABLE |
+								  GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+//----------------------------------------------------------------------
+
+float InstallationObject::alter(float time)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("InstallationObject::alter");
+	return TangibleObject::alter(time);
+}
+
+// ----------------------------------------------------------------------
+
+void InstallationObject::handleCMessageTo (const MessageToPayload &message)
+{
+	if (message.getMethod() == "C++deactivate")
+	{
+		deactivate();
+	}
+	else if (message.getMethod() == "C++finishActivate")
+	{
+		float installedEfficiency;
+		float tickCount;
+		std::string packedData(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+		sscanf(
+			packedData.c_str(),
+			"%f %f",
+			&installedEfficiency,
+			&tickCount);
+		finishActivate(installedEfficiency,tickCount);
+	}
+	else
+		TangibleObject::handleCMessageTo(message);
+}
+
+// ----------------------------------------------------------------------
+
+void InstallationObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+{
+	TangibleObject::getAttributes(data);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the amount of time the installation has been powered, based on the 
+ * current time.
+ *
+ * @return the time powered, in secs
+ */
+float InstallationObject::getTimePowered(void) const
+{
+	if (isActive())
+	{
+		float currentTime = static_cast<float>(ServerClock::getInstance().getGameTimeSeconds());
+		const_cast<InstallationObject*>(this)->setActivateStartTime(currentTime);
+	}
+
+	float accumulatedTime = 0.0f;
+	getObjVars().getItem(OBJVAR_ACCUMULATED_TIME, accumulatedTime);
+	return accumulatedTime;
+}	// InstallationObject::getTimePowered()
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the time at which the installation will run out of power.
+ *
+ * @return the time in secs, -1 if it never runs out, and 0 if the installation 
+ *         is inactive
+ */
+float InstallationObject::getOutOfPowerTime(void) const
+{
+	if (isActive() && m_powerRate.get() > 0)
+		return m_activateStartTime.get() + (m_power.get() / m_powerRate.get()) * 3600.0f;
+	else if (m_powerRate.get() <= 0)
+		return -1.0f;
+	return 0.0f;
+}	// InstallationObject::getOutOfPowerTime
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sets the power consumption rate of the installation, in units/hour.
+ *
+ * @param rate		the power rate
+ */
+void InstallationObject::setPowerRate(float rate)
+{
+	// don't do anything if we're not really changing the rate
+	if (abs(rate - m_powerRate.get()) < 0.01f)
+		return;
+	
+	if (isAuthoritative())
+	{
+		if (isActive())
+		{
+			// adjust the power for our current rate by changing the active time to our current time
+			setActivateStartTime(static_cast<float>(ServerClock::getInstance().getGameTimeSeconds()));
+		}
+		m_powerRate = rate;	
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Changes the activation time to a given value. Will adjust the power available 
+ * based on the difference between the current active time and the new one.
+ *
+ * @param time		the new activation time for the installation
+ */
+void InstallationObject::setActivateStartTime(float time)
+{
+	// if we're not active, there's no point in changing the time
+	if (!isActive())
+		return;
+
+	// see if we need to update the count of how long we've been powered
+	if (time > m_activateStartTime.get() && 
+		(m_power.get() > 0 || m_powerRate.get() <= 0))
+	{
+		// figure out how much power we used to get to the time value
+		float deltaTime = time - m_activateStartTime.get();
+		if (m_powerRate.get() > 0)
+		{
+			float deltaPower = (deltaTime / 3600.0f) * m_powerRate.get();
+			if (m_power.get() - deltaPower < 0.0f)
+			{
+				// we don't have enough power to make it to time; figure out
+				// when we ran out of power
+				deltaTime = (m_power.get() * 3600.0f / m_powerRate.get());
+			}
+		}
+		
+		float accumulatedTime = 0.0f;
+		getObjVars().getItem(OBJVAR_ACCUMULATED_TIME, accumulatedTime);
+		setObjVarItem(OBJVAR_ACCUMULATED_TIME, accumulatedTime + deltaTime);
+	}
+	m_activateStartTime = time;
+}	// InstallationObject::setActivateStartTime
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the amount of power the installation currently has left.
+ */
+float InstallationObject::getPower(void) const
+{
+	float result = m_power.get();
+	if (result > 0.0f && m_powerRate.get() > 0.0f)
+	{
+		// return the power minus the amount that would be drained now
+		float powerUsed = (getTimePowered() / 3600.0f) * m_powerRate.get();
+		result = m_power.get() - powerUsed;
+	}
+	if (result <= 0.0f)
+		result = 0.0f;
+	return result;
+}	// InstallationObject::getPower
+
+// ----------------------------------------------------------------------
+
+/**
+ * Adds or removes power from the installation.
+ *
+ * @param delta		amount to change the power by
+ */
+void InstallationObject::changePower(float delta)
+{
+	if (isAuthoritative())
+	{
+		if (delta >= 0)
+			LOG("CustomerService", ("Power:adding %.2f power to installation %s owned by %s", delta, getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(getOwnerId()).c_str()));
+		else
+			LOG("CustomerService", ("Power:removing %.2f power from installation %s owned by %s", -delta, getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(getOwnerId()).c_str()));
+		float currentPower = getPower();
+		float newPower = currentPower + delta;
+		if (newPower > 0)
+		{
+			if (m_powerRate.get() > 0.0f)
+				newPower += (getTimePowered() / 3600.0f) * m_powerRate.get();
+			m_power = newPower;
+		}
+		else
+		{
+			// turn the installation off, and set the power so getPower will
+			// return exactly 0
+			if (isActive())
+			{
+				deactivate();
+				LOG("CustomerService", ("Power:shut down installation %s owned by %s due to 0 power", getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(getOwnerId()).c_str()));
+			}
+			float powerUsed = (getTimePowered() / 3600.0f) * m_powerRate.get();
+			m_power = powerUsed;
+		}
+	}
+	else
+	{
+		WARNING(true, ("InstallationObject::changePower called for non-auth "
+			"object %s", getNetworkId().getValueString().c_str()));
+	}
+}	// InstallationObject::changePower
+
+//-----------------------------------------------------------------------
+
+const InstallationObject::AllInstallationsSet & InstallationObject::getAllInstallations()
+{
+	return g_installationList;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/InstallationObject.h b/engine/server/library/serverGame/src/shared/object/InstallationObject.h
new file mode 100644
index 00000000..642ea0a6
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/InstallationObject.h
@@ -0,0 +1,130 @@
+//========================================================================
+//
+// InstallationObject.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_InstallationObject_H
+#define _INCLUDED_InstallationObject_H
+
+#include "serverGame/TangibleObject.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+class MessageQueueResourceEmptyHopper;
+class ServerInstallationObjectTemplate;
+
+/** 
+  *  An InstallationObject typically represents a large un-enterable structure that performs the duties of an installation
+  *  as described by the installation documentation.
+  */
+
+class InstallationObject : public TangibleObject
+{
+	friend class InstallationController;
+	
+public:
+
+	InstallationObject(const ServerInstallationObjectTemplate* newTemplate);
+	virtual ~InstallationObject();
+
+	static void         removeDefaultTemplate(void);
+
+	virtual Controller* createDefaultController(void);
+	void                addMembersToPackages();
+	virtual float       alter(float time);
+	virtual void        getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+
+	virtual void getByteStreamFromAutoVariable(const std::string & name, Archive::ByteStream & target) const;
+	virtual void setAutoVariableFromByteStream(const std::string & name, const Archive::ByteStream & source);
+
+	//simulation functions:
+	virtual void activate         (const NetworkId &actorId);
+	virtual void finishActivate   (float installedEfficiency, float tickCount);
+	virtual void deactivate       ();
+	virtual void harvest          ();
+	virtual void handleCMessageTo (const MessageToPayload &message);
+
+	//getters
+	bool         isActive() const;
+	float        getTickCount() const;
+
+	// power functions
+	float        getPower(void) const;
+	void         setPower(float power);
+	void         changePower(float delta);
+	float        getPowerRate(void) const;
+	void         setPowerRate(float rate);
+	float        getTimePowered(void) const;
+	float        getOutOfPowerTime(void) const;
+
+	struct InstallationObjectPointerHash
+	{
+		size_t operator()(const InstallationObject * const ptr) const
+		{
+			return (reinterpret_cast<const size_t>(ptr) >> 4);
+		};
+	};
+
+	typedef stdhash_set<const InstallationObject *, InstallationObjectPointerHash>::fwd AllInstallationsSet;
+	static const AllInstallationsSet & getAllInstallations();
+
+protected:
+	
+	void         setTickCount(float count);
+	void         setActivateStartTime(float time);
+
+	virtual const SharedObjectTemplate *  getDefaultSharedTemplate(void) const;
+
+private:
+  	InstallationObject();
+	InstallationObject(const InstallationObject& rhs);
+	InstallationObject&	operator=(const InstallationObject& rhs);
+
+private:
+
+	static const SharedObjectTemplate * m_defaultSharedTemplate;	// template to use if no shared template is given
+
+//BPM InstallationObject : TangibleObject // Begin persisted members.
+	Archive::AutoDeltaVariable<int32>  m_installationType;	///< The type of installation (accessible by game scripts).
+	Archive::AutoDeltaVariable<float>  m_tickCount;         ///< For active installations, the tick count the last time they harvested resources
+	Archive::AutoDeltaVariable<bool>   m_activated;
+	Archive::AutoDeltaVariable<float>  m_power;             // Amount of power the installation has
+	Archive::AutoDeltaVariable<float>  m_powerRate;         // Power used, in units/hour
+	Archive::AutoDeltaVariable<float>  m_activateStartTime; // Time when the installation was turned on, from ServerClock::getGameTimeSeconds()
+//EPM
+	
+/// Members yet to be implemented.
+//  permissionsList
+};
+
+
+inline bool InstallationObject::isActive() const
+{
+	return m_activated.get();
+}
+
+inline float InstallationObject::getTickCount() const
+{
+	return m_tickCount.get();
+}
+
+inline void InstallationObject::setTickCount(float count)
+{
+	if (isAuthoritative())
+		m_tickCount = count;
+}
+
+inline void InstallationObject::setPower(float power)
+{
+	changePower(power - getPower());
+}
+
+inline float InstallationObject::getPowerRate(void) const
+{
+	return m_powerRate.get();
+}
+
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp b/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp
new file mode 100644
index 00000000..0f9216a9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp
@@ -0,0 +1,945 @@
+//========================================================================
+//
+// IntangibleObject.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/IntangibleObject.h"
+
+#include "serverGame/Client.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/ObjectTracker.h"
+#include "serverGame/ObserveTracker.h"
+#include "serverGame/Region.h"
+#include "serverGame/RegionMaster.h"
+#include "serverGame/ServerIntangibleObjectTemplate.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ServerWorldIntangibleNotification.h"
+#include "serverGame/TangibleObject.h"
+#include "serverNetworkMessages/UpdateObjectOnPlanetMessage.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedFoundation/Clock.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/Crc.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedTerrain/TerrainModificationHelper.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+
+
+// ======================================================================
+
+const SharedObjectTemplate * IntangibleObject::m_defaultSharedTemplate = NULL;
+uint32 IntangibleObject::ms_lastFrame = 0;
+uint32 IntangibleObject::ms_theaterTime = 0;
+
+static const uint32 THEATER_DATATABLE_TAG = Crc::calculate("THEATER");
+
+static const std::string THEATER_TEMPLATE("object/intangible/theater/base_theater.iff");
+static const std::string THEATER_FLATTEN_LAYER("terrain/poi_small.lay");
+
+static const std::string OBJVAR_THEATER_BASE("theater");
+static const std::string OBJVAR_THEATER_CENTER(OBJVAR_THEATER_BASE + ".center");
+static const std::string OBJVAR_THEATER_RADIUS(OBJVAR_THEATER_BASE + ".radius");
+static const std::string OBJVAR_THEATER_PLAYER(OBJVAR_THEATER_BASE + ".player");
+static const std::string OBJVAR_THEATER_OBJECTS(OBJVAR_THEATER_BASE + ".objects");
+static const std::string OBJVAR_THEATER_NAME(OBJVAR_THEATER_BASE + ".name");
+static const std::string OBJVAR_THEATER_FLATTEN(OBJVAR_THEATER_BASE + ".flatten");
+
+
+// ======================================================================
+
+IntangibleObject::IntangibleObject(const ServerIntangibleObjectTemplate* newTemplate) :
+	ServerObject(newTemplate, ServerWorldIntangibleNotification::getInstance()),
+	m_count(newTemplate->getCount()),
+	m_isTheater(false),
+	m_crcs(),
+	m_positions(),
+	m_headings(),
+	m_scripts(),
+	m_player(),
+	m_objects(),
+	m_center(),
+	m_radius(),
+	m_creator(),
+	m_theaterName()
+#ifdef _DEBUG
+	, m_theaterCreationTime(0)
+#endif
+{
+
+	WARNING_STRICT_FATAL(!getSharedTemplate(), ("Shared template for %s is NULL", getTemplateName()));
+	addMembersToPackages();
+	ObjectTracker::addIntangible();
+}	
+
+//-----------------------------------------------------------------------
+
+IntangibleObject::~IntangibleObject()
+{
+	ObjectTracker::removeIntangible();
+}	// IntangibleObject::~IntangibleObject
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a shared template if none was given for this object.
+ *
+ * @return the shared template
+ */
+const SharedObjectTemplate * IntangibleObject::getDefaultSharedTemplate(void) const
+{
+static const ConstCharCrcLowerString templateName("object/intangible/base/shared_intangible_default.iff");
+
+	if (m_defaultSharedTemplate == NULL)
+	{
+		m_defaultSharedTemplate = safe_cast<const SharedObjectTemplate *>(
+			ObjectTemplateList::fetch(templateName));
+		WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create "
+			"default shared object template %s", templateName.getString()));
+		if (m_defaultSharedTemplate != NULL)
+			ExitChain::add (removeDefaultTemplate, "IntangibleObject::removeDefaultTemplate");
+	}
+	return m_defaultSharedTemplate;
+}	// IntangibleObject::getDefaultSharedTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Cleans up the default shared template.
+ */
+void IntangibleObject::removeDefaultTemplate(void)
+{
+	if (m_defaultSharedTemplate != NULL)
+	{
+		m_defaultSharedTemplate->releaseReference();
+		m_defaultSharedTemplate = NULL;
+	}
+}	// IntangibleObject::removeDefaultTemplate
+
+//-----------------------------------------------------------------------
+
+void IntangibleObject::onLoadedFromDatabase()
+{
+	ServerObject::onLoadedFromDatabase();
+
+	if (isAuthoritative())
+	{
+		if (getObjVars().hasItem(OBJVAR_THEATER_BASE))
+		{
+			Vector center;
+			float radius;
+			NetworkId player;
+			std::string name;
+			int flatten;
+
+			m_isTheater = true;
+			if (getObjVars().getItem(OBJVAR_THEATER_CENTER, center))
+				m_center = center;
+			if (getObjVars().getItem(OBJVAR_THEATER_RADIUS, radius))
+				m_radius = radius;
+			if (getObjVars().getItem(OBJVAR_THEATER_PLAYER, player))
+				m_player = CachedNetworkId(player);
+			if (getObjVars().getItem(OBJVAR_THEATER_NAME, name))
+				setTheaterName(name);
+			if (getObjVars().getItem(OBJVAR_THEATER_FLATTEN, flatten))
+			{
+				if (flatten != 0)
+				{
+					TerrainGenerator::Layer * layer = TerrainModificationHelper::importLayer(THEATER_FLATTEN_LAYER.c_str());
+					if (layer != NULL)
+					{
+						setLayer(layer);
+					}
+				}
+			}
+
+			std::vector<NetworkId> ids;
+			DynamicVariableList::NestedList objects(getObjVars(), OBJVAR_THEATER_OBJECTS);
+			for (DynamicVariableList::NestedList::const_iterator i = objects.begin();
+				i != objects.end(); ++i)
+			{
+				ids.clear();
+				if (i.getValue(ids))
+				{
+					for (std::vector<NetworkId>::const_iterator j = ids.begin();
+						j != ids.end(); ++j)
+					{
+						m_objects.push_back(CachedNetworkId(*j));
+					}
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void IntangibleObject::sendObjectSpecificBaselinesToClient(Client const &client) const
+{
+	ServerObject::sendObjectSpecificBaselinesToClient(client);
+	if (getLayer() != NULL)
+	{
+		client.send(GenericValueTypeMessage<std::pair<NetworkId, bool> >(
+			"IsFlattenedTheaterMessage", std::make_pair(getNetworkId(), true)), true);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+float IntangibleObject::alter(float time)
+{
+size_t i;
+
+	float returnValue = ServerObject::alter(time);
+
+	if (isAuthoritative() && isTheater() && !isBeingDestroyed() && !isPlacing())
+	{
+		uint32 currentFrame = ServerClock::getInstance().getServerFrame();
+		if (currentFrame != ms_lastFrame)
+		{
+			ms_lastFrame = currentFrame;
+			ms_theaterTime = 0;
+		}
+		if (!m_crcs.empty() && m_crcs.size() > m_objects.size())
+		{
+#ifdef _DEBUG
+			int objectsCreated = 0;
+#endif
+			unsigned long totalTime = 0;
+			unsigned long startTime = Clock::timeMs();
+			const Vector myPos(getPosition_w());
+			size_t count = m_crcs.size();
+			for (i = m_objects.size(); i < count;)
+			{
+				if (ms_theaterTime + totalTime >= static_cast<unsigned long>
+					(ConfigServerGame::getTheaterCreationLimitMilliseconds()))
+				{
+					break;
+				}
+
+				Transform tr;
+				tr.setPosition_p(myPos+m_positions[i]);
+				ServerObject * newObject = ServerWorld::createNewObject(m_crcs[i], tr, 0, false);
+				if (newObject != NULL)
+				{
+					if (newObject->asTangibleObject() != NULL)
+						newObject->asTangibleObject()->setVisible(false);
+					newObject->addToWorld();
+					m_objects.push_back(CachedNetworkId(*newObject));
+					// set the object heading
+					if (i < m_headings.size())
+					{
+						newObject->yaw_o(m_headings[i] - newObject->getObjectFrameK_p().theta());
+					}
+					// attach the appropriate script to the object if needed
+					if (i < m_scripts.size() && !m_scripts[i].empty())
+					{
+						NOT_NULL(newObject->getScriptObject());
+						newObject->getScriptObject()->attachScript(m_scripts[i], true);
+					}
+#ifdef _DEBUG
+					++objectsCreated;
+#endif
+				}
+				else
+				{
+					m_objects.push_back(CachedNetworkId::cms_cachedInvalid);
+					WARNING(true, ("Theater object %s could not create object "
+						"from template crc %ul", getNetworkId().getValueString().c_str(), 
+						m_crcs[i]));
+				}
+				++i;
+
+				unsigned long endTime = Clock::timeMs();
+				if (endTime >= startTime)
+				{
+					totalTime = endTime - startTime;
+				}
+				else
+				{
+					// time wrapped
+					totalTime = endTime + (ULONG_MAX - startTime);
+				}
+			}
+			ms_theaterTime += totalTime;
+#ifdef _DEBUG
+			m_theaterCreationTime += totalTime;
+			DEBUG_LOG("Theater", ("Theater %s created %d objects, time = %lu\n", 
+				getNetworkId().getValueString().c_str(), objectsCreated, totalTime));
+#endif
+			if (i == count)
+			{
+				// we created all the objects
+#ifdef _DEBUG
+				DEBUG_LOG("Theater", ("Theater %s total creation time = %lu\n", 
+					getNetworkId().getValueString().c_str(), m_theaterCreationTime));
+				startTime = Clock::timeMs();
+#endif
+				std::vector<ServerObject *> players;
+				Vector sphereCenter(m_center.get());
+				sphereCenter.y = findPosition_w().y;
+				ServerWorld::findPlayerCreaturesInRange(sphereCenter, m_radius.get() + 64.0f, players);
+
+				// make the objects visible
+				count = m_objects.size();
+				for (i = 0; i < count; ++i)
+				{
+					ServerObject * object = safe_cast<ServerObject *>(m_objects[i].getObject());
+					if (object != NULL && object->asTangibleObject() != NULL)
+					{
+						const ServerObjectTemplate * objTemplate = safe_cast<const ServerObjectTemplate *>(object->getObjectTemplate());
+						for (size_t j = 0; j < objTemplate->getVisibleFlagsCount(); ++j)
+						{
+							if (objTemplate->getVisibleFlags(j) == ServerObjectTemplate::VF_player)
+							{
+								object->asTangibleObject()->setVisible(true);
+								ObserveTracker::onObjectMadeVisibleTo(*object, players);
+								break;
+							}
+						}
+					}
+				}
+
+				// clear out data we don't need anymore
+				m_crcs.clear();
+				m_positions.clear();
+				m_headings.clear();
+				m_scripts.clear();
+#ifdef _DEBUG
+				unsigned long endTime = Clock::timeMs();
+				if (endTime >= startTime)
+				{
+					totalTime = endTime - startTime;
+				}
+				else
+				{
+					// time wrapped
+					totalTime = endTime + (ULONG_MAX - startTime);
+				}
+				DEBUG_LOG("Theater", ("Theater %s make visible time = %lu\n", 
+					getNetworkId().getValueString().c_str(), totalTime));
+#endif
+
+				// tell scripts that we're done
+				NOT_NULL(getScriptObject());
+				ScriptParams params;
+				params.addParam(m_objects.get());
+				params.addParam(m_player.get());
+				params.addParam(m_creator.get());
+				IGNORE_RETURN(getScriptObject()->trigAllScripts(
+					Scripting::TRIG_THEATER_CREATED, params));
+			}
+			else
+			{
+				scheduleForAlter();
+			}
+		}
+	}
+
+	return returnValue;
+}
+
+//-----------------------------------------------------------------------
+
+bool IntangibleObject::isVisibleOnClient (const Client & client) const
+{
+	if (isTheater())
+	{
+		return getLayer() != NULL;
+	}
+	return true;
+}
+
+//------------------------------------------------------------------------------------------
+
+/**
+ * Called when we are being destroyed. We will destroy any objects we've created.
+ */
+void IntangibleObject::onPermanentlyDestroyed()
+{
+	if (isTheater())
+	{
+		DEBUG_LOG("Theater", ("IntangibleObject::onPermanentlyDestroyed destroying "
+			"theater %s", getNetworkId().getValueString().c_str()));
+
+		if (m_player.get() != CachedNetworkId::cms_invalid)
+		{
+			MessageToQueue::getInstance().sendMessageToC(m_player.get(), 
+				"C++TheaterDestroyed", getNetworkId().getValueString(), 0, 
+				false);
+		}
+
+		size_t count = m_objects.size();
+		for (size_t i = 0; i < count; ++i)
+		{
+			ServerObject * object = safe_cast<ServerObject *>(m_objects[i].getObject());
+			if (object != NULL)
+				object->permanentlyDestroy(DeleteReasons::Consumed);
+		}
+		if (!m_theaterName.get().empty())
+			ServerUniverse::getInstance().clearTheater(m_theaterName.get());
+	}
+
+	ServerObject::onPermanentlyDestroyed();
+}	// IntangibleObject::onPermanentlyDestroyed
+
+//------------------------------------------------------------------------------------------
+
+/**
+ * Persists this object in the database. Will also persist all the objects it 
+ * is keeping track of.
+ */
+void IntangibleObject::persist()
+{
+	if (isAuthoritative() && isTheater())
+	{
+		if (!m_crcs.empty() || m_objects.empty())
+		{
+			// we are not finished creating our objects, prevent persistance
+			WARNING(true, ("IntangibleObject::persist called before all objects created"));
+			return;
+		}
+
+		if (isPersisted())
+			return;
+
+		ServerObject::persist();
+
+		// We want to store our objects' ids in an objvar, but we can't store
+		// more than 1000 chars of data (which comes to about 47 network ids). 
+		// So we split our objects into separate lists for storage
+		static const int MAX_IDS = 45;
+		std::vector<std::vector<NetworkId> > splitObjects;
+		splitObjects.reserve(1000 / MAX_IDS + 1);
+		int splitCount = MAX_IDS + 1;
+
+		// persist the objects in the theater
+		for (std::vector<CachedNetworkId>::const_iterator i = m_objects.begin();
+			i != m_objects.end(); ++i, ++splitCount)
+		{
+			if (splitCount > MAX_IDS)
+			{
+				splitObjects.push_back(std::vector<NetworkId>());
+				splitObjects.back().reserve(MAX_IDS);
+				splitCount = 0;
+			}
+			ServerObject * o = safe_cast<ServerObject *>((*i).getObject());
+			if (o != NULL)
+			{
+				o->persist();
+				splitObjects.back().push_back(*i);
+			}
+		}
+
+		// since we don't have a database table, store our persisted data in objvars
+		setObjVarItem(OBJVAR_THEATER_CENTER, m_center.get());
+		setObjVarItem(OBJVAR_THEATER_RADIUS, m_radius.get());
+		if (m_player.get() != CachedNetworkId::cms_cachedInvalid)
+			setObjVarItem(OBJVAR_THEATER_PLAYER, m_player.get());
+		setObjVarItem(OBJVAR_THEATER_NAME, m_theaterName.get());
+		if (getLayer() != NULL)
+			setObjVarItem(OBJVAR_THEATER_FLATTEN, 1);
+		
+		char buffer[32];
+		int k = 0;
+		for (std::vector<std::vector<NetworkId> >::const_iterator j = splitObjects.begin(); 
+			j != splitObjects.end(); ++j, ++k)
+		{
+			int stored = snprintf(buffer, sizeof(buffer), "%s.%d", OBJVAR_THEATER_OBJECTS.c_str(), k);
+			if (static_cast<size_t>(stored) < sizeof(buffer))
+				setObjVarItem(buffer, *j);
+			else
+			{
+				WARNING_STRICT_FATAL(true, ("IntangibleObject::persist buffer "
+					"overflow, %d %d %u", k, stored, sizeof(buffer)));
+			}
+		}
+
+	}
+	else
+		ServerObject::persist();
+}	// IntangibleObject::persist
+
+//------------------------------------------------------------------------------------------
+
+bool IntangibleObject::onContainerAboutToTransfer(ServerObject * destination, ServerObject* transferer)
+{
+	if (transferer && !destination)
+	{
+		//You cannot drop an intangible into the world.
+		DEBUG_REPORT_LOG(true, ("Player tried to drop an intangible object\n"));
+		return false;
+	}
+	return ServerObject::onContainerAboutToTransfer(destination, transferer);
+}
+
+//------------------------------------------------------------------------------------------
+
+/**
+ * Sends a message to the Planet Server to update the position of the object.
+ */
+void IntangibleObject::updatePlanetServerInternal(const bool forceUpdate) const
+{
+	// Don't send updates for contained intangibles, and only send when forced or moving
+	if ((forceUpdate || getPositionChanged()) && !ContainerInterface::getContainedByObject(*this))
+	{
+		Vector const &position = getPosition_p();
+	
+		UpdateObjectOnPlanetMessage const msg(
+			getNetworkId(),
+			NetworkId::cms_invalid,
+			static_cast<int>(position.x),
+			static_cast<int>(position.y),
+			static_cast<int>(position.z),
+			0,
+			0,
+			false,
+			false,
+			static_cast<int>(getObjectType()),
+			0,
+			false,
+			getTemplateCrc(),
+			-1,
+			-1);
+		GameServer::getInstance().sendToPlanetServer(msg);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the approximate number of objects we can create per frame.
+ *
+ * @return the objects per frame
+ */
+int IntangibleObject::getObjectsCreatedPerFrame()
+{
+	return static_cast<int>((ConfigServerGame::getTheaterCreationLimitMilliseconds() / 
+		1000.0f) / 5.5f) + 1;
+}	// IntangibleObject::getObjectsCreatedPerFrame
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the number of objects defined in a theater datatable.
+ * 
+ * @param datatable		the datatable containing the theater objects
+ *
+ * @return the theater's object count
+ */
+int IntangibleObject::getNumObjects(const std::string & datatable)
+{
+	DataTable * dt = DataTableManager::getTable(datatable, true);
+	if (dt == NULL)
+	{
+		WARNING(true, ("IntangibleObject::getNumObjects could not open "
+			"datatable %s", datatable.c_str()));
+		return 0;
+	}
+	int rows = dt->getNumRows();
+	if (rows <= 0)
+	{
+		WARNING(true, ("IntangibleObject::getNumObjects datatable %s has no "
+			"rows", datatable.c_str()));
+		return 0;
+	}
+
+	int templateColumn = dt->findColumnNumber("template");
+
+	// if the 1st row's template is "THEATER", ignore it
+	if (static_cast<uint32>(dt->getIntValue(templateColumn, 0)) == THEATER_DATATABLE_TAG)
+		--rows;
+	return rows;
+}	// IntangibleObject::getNumObjects
+
+//-----------------------------------------------------------------------
+
+/**
+ * Determines the radius for the area taken up by a theater. Note that the radius
+ * is only determined by objects' positions, not size.
+ * 
+ * @param datatable		the datatable containing the theater objects
+ *
+ * @return the theater's radius
+ */
+float IntangibleObject::getRadius(const std::string & datatable)
+{
+	DataTable * dt = DataTableManager::getTable(datatable, true);
+	if (dt == NULL)
+	{
+		WARNING(true, ("IntangibleObject::getRadius could not open "
+			"datatable %s", datatable.c_str()));
+		return 0;
+	}
+	int rows = dt->getNumRows();
+	if (rows <= 0)
+	{
+		WARNING(true, ("IntangibleObject::getRadius datatable %s has no "
+			"rows", datatable.c_str()));
+		return 0;
+	}
+
+	int templateColumn = dt->findColumnNumber("template");
+	int xColumn        = dt->findColumnNumber("x");
+	int zColumn        = dt->findColumnNumber("z");
+
+	float minx = FLT_MAX;
+	float maxx = -FLT_MIN;
+	float minz = FLT_MAX;
+	float maxz = -FLT_MIN;
+	for (int i = 0; i < rows; ++i)
+	{
+		if (i == 0)
+		{
+			// if the 1st row's template is "THEATER", ignore it
+			if (static_cast<uint32>(dt->getIntValue(templateColumn, i)) == THEATER_DATATABLE_TAG)
+				continue;
+		}
+		float x = dt->getFloatValue(xColumn, i);
+		float z = dt->getFloatValue(zColumn, i);
+		if (x < minx)
+			minx = x;
+		else if (x > maxx)
+			maxx = x;
+		if (z < minz)
+			minz = z;
+		else if (z > maxz)
+			maxz = z;
+	}
+	float xrad = (maxx - minx) / 2.0f;
+	float zrad = (maxz - minz) / 2.0f;
+	return sqrt(xrad * xrad + zrad * zrad);	
+}	// IntangibleObject::getRadius
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a new theater from a datatable.
+ *
+ * @param datatable		the theater datatable
+ * @param postion		the location of the theater
+ * @param script		a script to be attached to the theater
+ * @param locationType	how to create the theater
+ *
+ * @return the theater object
+ */
+IntangibleObject * IntangibleObject::spawnTheater(const std::string & datatable, 
+	const Vector & position, const std::string & script, TheaterLocationType locationType)
+{
+	DataTable * dt = DataTableManager::getTable(datatable, true);
+	if (dt == NULL)
+	{
+		WARNING(true, ("IntangibleObject::spawnTheater could not open "
+			"datatable %s", datatable.c_str()));
+		return NULL;
+	}
+	int rows = dt->getNumRows();
+	if (rows <= 0)
+	{
+		WARNING(true, ("IntangibleObject::spawnTheater datatable %s has no "
+			"rows", datatable.c_str()));
+		return NULL;
+	}
+
+	int templateColumn = dt->findColumnNumber("template");
+	int xColumn        = dt->findColumnNumber("x");
+	int yColumn        = dt->findColumnNumber("y");
+	int zColumn        = dt->findColumnNumber("z");
+	int headingColumn  = dt->findColumnNumber("heading");
+	int scriptColumn   = dt->findColumnNumber("script");
+	
+	std::vector<int32> objectCrcs;
+	std::vector<Vector> objectPositions;
+	std::vector<float> objectHeadings;
+	std::vector<std::string> objectScripts;
+
+	dt->getIntColumn(templateColumn, objectCrcs);
+	dt->getFloatColumn(headingColumn, objectHeadings);
+
+	bool skipFirstRow = false;
+	if (static_cast<uint32>(objectCrcs[0]) == THEATER_DATATABLE_TAG)
+	{
+		if (rows == 1)
+		{
+			WARNING(true, ("IntangibleObject::spawnTheater datatable %s has no "
+				"objects", datatable.c_str()));
+			return NULL;
+		}
+		skipFirstRow = true;
+		objectCrcs.erase(objectCrcs.begin());
+		objectHeadings.erase(objectHeadings.begin());
+		objectPositions.resize(rows-1);
+		objectScripts.resize(rows-1);
+	}
+	else
+	{
+		objectPositions.resize(rows);
+		objectScripts.resize(rows);
+	}
+
+	std::vector<float> tempPos;
+	int i, j;
+	int startIndex = skipFirstRow ? 1 : 0;
+	float minx = FLT_MAX;
+	float maxx = -FLT_MIN;
+	float minz = FLT_MAX;
+	float maxz = -FLT_MIN;
+
+	dt->getFloatColumn(xColumn, tempPos);
+	for (i = startIndex, j = 0; i < rows; ++i, ++j)
+	{
+		objectPositions[j].x = tempPos[i];
+		if (tempPos[i] < minx)
+			minx = tempPos[i];
+		else if (tempPos[i] > maxx)
+			maxx = tempPos[i];
+	}
+	dt->getFloatColumn(yColumn, tempPos);
+	for (i = startIndex, j = 0; i < rows; ++i, ++j)
+		objectPositions[j].y = tempPos[i];
+	dt->getFloatColumn(zColumn, tempPos);
+	for (i = startIndex, j = 0; i < rows; ++i, ++j)
+	{
+		objectPositions[j].z = tempPos[i];
+		if (tempPos[i] < minz)
+			minz = tempPos[i];
+		else if (tempPos[i] > maxz)
+			maxz = tempPos[i];
+		objectScripts[j] = dt->getStringValue(scriptColumn, i);
+	}
+
+	// Find out the area the theater will take up and use getGoodLocation
+	// to try and find somewhere where we can place the theater. Our search
+	// area is the size of the theater * 3.
+	float dx = maxx - minx;
+	float dz = maxz - minz;
+	float centerX = minx + dx / 2.0f + position.x;
+	float centerZ = minz + dz / 2.0f + position.z;
+
+	TerrainGenerator::Layer * layer = NULL;
+	if (locationType == TLT_flatten)
+	{
+		layer = TerrainModificationHelper::importLayer(THEATER_FLATTEN_LAYER.c_str());
+		if (layer == NULL)
+		{
+			WARNING (true, ("Layer %s not found for theater %s, using getGoodLocation "
+				"instead", THEATER_FLATTEN_LAYER.c_str(), datatable.c_str()));
+			locationType = TLT_getGoodLocation;
+		}
+	}
+
+	Vector goodLoc(centerX, 0, centerZ);
+	if (locationType == TLT_getGoodLocation)
+	{
+		goodLoc = ServerWorld::getGoodLocation(dx, dz, Vector(minx - dx + position.x, 
+			0, minz - dz + position.z), Vector(maxx + dx + position.x, 0, maxz + dz + position.z), 
+			false, false);
+	}
+	if (goodLoc.x == 0 && goodLoc.z == 0)
+	{
+		WARNING(true, ("IntangibleObject::spawnTheater could not find good location "
+			"of size %f %f around point %f %f", dx, dz, centerX, centerZ));
+		return 0;
+	}
+	
+	// check the location region - don't spawn in cities or battlefields
+	std::vector<const Region *> regions;
+	RegionMaster::getRegionsAtPoint(ServerWorld::getSceneId(), goodLoc.x, goodLoc.z, regions);
+	for (std::vector<const Region *>::const_iterator iter = regions.begin();
+		iter != regions.end(); ++iter)
+	{
+		const Region * region = *iter;
+		if (region != NULL)
+		{
+			if (region->getPvp() == RegionNamespace::RP_pvpBattlefield ||
+				region->getPvp() == RegionNamespace::RP_pveBattlefield ||
+				region->getGeography() == RegionNamespace::RG_ocean ||
+				region->getGeography() == RegionNamespace::RG_underwater ||
+				region->getGeography() == RegionNamespace::RG_city)
+			{
+				WARNING(true, ("IntangibleObject::spawnTheater found good location "
+					"at %f %f in bad region %s", goodLoc.x, goodLoc.z, 
+					Unicode::wideToNarrow(region->getName()).c_str()));
+				return 0;
+			}
+		}
+	}
+
+	DEBUG_LOG("Theater", ("IntangibleObject::spawnTheater found goodloc at %f %f",
+		goodLoc.x, goodLoc.z));
+
+	// create an object at the center of the theater that will be used to represent 
+	// the entire theater
+	Transform tr;
+	tr.setPosition_p(goodLoc.x + position.x - centerX, 0, goodLoc.z + position.z - centerZ);
+	IntangibleObject * theater = safe_cast<IntangibleObject *>(ServerWorld::createNewObject(THEATER_TEMPLATE, tr, 0, false));
+	NOT_NULL(theater);
+
+	if (layer != NULL)
+	{
+		theater->setLayer(layer);
+	}
+	theater->setTheater();
+	theater->setObjects(objectCrcs, objectPositions, objectHeadings, objectScripts);
+	theater->addToWorld();
+	theater->scheduleForAlter();
+
+	if (!script.empty())
+	{
+		NOT_NULL(theater->getScriptObject());
+		theater->getScriptObject()->attachScript(script, true);
+	}
+
+	return theater;
+}	// IntangibleObject::spawnTheater
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the data for the objects that will be created for the theater.
+ *
+ * @param crcs			the object template crcs for the objects
+ * @param positions		the positions where to create the objects, relative to 
+ *						our position
+ * @param headings		the orientation of the objects
+ * @param scripts       list scripts to be attached to the objects
+ */
+void IntangibleObject::setObjects(const std::vector<int32> & crcs, 
+	const std::vector<Vector> & positions, const std::vector<float> & headings, 
+	const std::vector<std::string> & scripts)
+{
+	if (!isTheater())
+		return;
+
+	if (crcs.empty() || crcs.size() != positions.size())
+		return;
+
+	if (!headings.empty() && crcs.size() != headings.size())
+		return;
+
+	if (!scripts.empty() && crcs.size() != scripts.size())
+		return;
+
+	if (!isAuthoritative())
+	{
+		WARNING(true, ("IntangibleObject::setObjects called on non-authoritative "
+			"object"));
+		return;
+	}
+
+	float minx = FLT_MAX;
+	float maxx = -FLT_MIN;
+	float minz = FLT_MAX;
+	float maxz = -FLT_MIN;
+	size_t count = crcs.size();
+	for (size_t i = 0; i < count; ++i)
+	{
+		m_crcs.push_back(crcs[i]);
+		m_positions.push_back(positions[i]);
+		if (positions[i].x < minx)
+			minx = positions[i].x;
+		else if (positions[i].x > maxx)
+			maxx = positions[i].x;
+		if (positions[i].z < minz)
+			minz = positions[i].z;
+		else if (positions[i].z > maxz)
+			maxz = positions[i].z;
+
+		if (!headings.empty())
+			m_headings.push_back(convertDegreesToRadians(headings[i]));
+
+		if (!scripts.empty())
+			m_scripts.push_back(scripts[i]);
+	}
+	float xrad = (maxx - minx) / 2.0f;
+	float zrad = (maxz - minz) / 2.0f;
+	Vector mypos(getPosition_w());
+	m_center = Vector(minx + xrad + mypos.x, 0, minz + zrad + mypos.z);
+	m_radius = sqrt(xrad * xrad + zrad * zrad);
+	DEBUG_LOG("Theater", ("Theater %s center = %f %f, rad = %f", 
+		getNetworkId().getValueString().c_str(), m_center.get().x,
+		m_center.get().z, m_radius.get()));
+}	// IntangibleObject::setObjects
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the player this theater is created for.
+ *
+ * @param player		the theater's player
+ */
+void IntangibleObject::setPlayer(const CreatureObject & player)
+{
+	if (isTheater())
+		m_player = CachedNetworkId(player);
+}	// IntangibleObject::setPlayer
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sets the name of this theater.
+ *
+ * @param name		the theater's name
+ *
+ * @return true on success, false if there is already a theater with this name
+ */
+bool IntangibleObject::setTheaterName(const std::string & name)
+{
+	if (!isAuthoritative())
+		return false;
+
+	if (!isTheater())
+		return false;
+
+	// don't allow renaming theaters
+	if (!m_theaterName.get().empty())
+		return false;
+
+	if (!name.empty())
+	{
+		const NetworkId & oldTheater = ServerUniverse::getInstance().findTheaterId(name);
+		if (oldTheater != NetworkId::cms_invalid)
+			return false;
+		ServerUniverse::getInstance().setTheater(name, getNetworkId());
+	}
+	m_theaterName = name;
+	return true;
+}	// IntangibleObject::setTheaterName
+
+// ----------------------------------------------------------------------
+
+void IntangibleObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+{
+	ServerObject::getAttributes(data);
+}
+
+// ----------------------------------------------------------------------
+
+IntangibleObject *IntangibleObject::asIntangibleObject()
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+IntangibleObject const *IntangibleObject::asIntangibleObject() const
+{
+	return this;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/IntangibleObject.h b/engine/server/library/serverGame/src/shared/object/IntangibleObject.h
new file mode 100644
index 00000000..1d5a0b85
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/IntangibleObject.h
@@ -0,0 +1,142 @@
+//========================================================================
+//
+// IntangibleObject.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef INCLUDED_IntangibleObject_H
+#define INCLUDED_IntangibleObject_H
+
+//----------------------------------------------------------------------
+
+#include "serverGame/ServerObject.h"
+
+class ServerIntangibleObjectTemplate;
+
+//----------------------------------------------------------------------
+
+/**
+  * A IntangibleObject represents things that don't have a physical form in 
+  * the game.
+  */
+class IntangibleObject : public ServerObject
+{
+public:
+
+	// NOTE: If you change these values, change the corresponding ones in base_class.java!
+	enum TheaterLocationType
+	{
+		TLT_none,
+		TLT_getGoodLocation,
+		TLT_flatten
+	};
+
+public:
+	explicit IntangibleObject(const ServerIntangibleObjectTemplate* newTemplate);
+	virtual ~IntangibleObject();
+
+	virtual IntangibleObject *asIntangibleObject();
+	virtual IntangibleObject const *asIntangibleObject() const;
+
+	static void  removeDefaultTemplate (void);
+
+	virtual float alter(float time);
+	virtual void  onPermanentlyDestroyed();
+	virtual void  persist();
+	virtual bool  isVisibleOnClient (const Client & client) const;
+	virtual void  getAttributes     (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+	virtual bool  onContainerAboutToTransfer(ServerObject * destination, ServerObject* transferer);
+	
+	int  getCount(void) const;
+	void setCount(int value);
+	void incrementCount(int delta);
+
+	// Theater stuff
+	static IntangibleObject * spawnTheater(const std::string & datatable, const Vector & position, const std::string & script, TheaterLocationType locationType);
+	static int   getObjectsCreatedPerFrame();
+	static int   getNumObjects(const std::string & datatable);
+	static float getRadius(const std::string & datatable);
+	       void  setTheater();
+	       bool  isTheater() const;
+		   void  setTheaterCreator(const NetworkId & creator);
+	       bool  setTheaterName(const std::string & name);
+	       void  setObjects(const std::vector<int32> & crcs, const std::vector<Vector> & positions, const std::vector<float> & headings, const std::vector<std::string> & scripts);
+		   void  setPlayer(const CreatureObject & player);
+
+protected:
+
+	virtual void                          updatePlanetServerInternal(bool forceUpdate) const;
+	virtual const SharedObjectTemplate *  getDefaultSharedTemplate(void) const;
+	virtual void                          onLoadedFromDatabase();
+	virtual void                          sendObjectSpecificBaselinesToClient(Client const &client) const;
+
+private:
+	IntangibleObject();
+	IntangibleObject(const IntangibleObject& rhs);
+	IntangibleObject&	operator=(const IntangibleObject& rhs);
+
+private:
+	void addMembersToPackages();
+
+private:
+	static const SharedObjectTemplate * m_defaultSharedTemplate;	// template to use if no shared template is given
+
+	Archive::AutoDeltaVariable<int> m_count;         // generic counter
+
+	// Theater stuff
+	Archive::AutoDeltaVariable<bool>            m_isTheater;  // flag that this is a theater
+	Archive::AutoDeltaVector<int32>             m_crcs;       // template crcs
+	Archive::AutoDeltaVector<Vector>            m_positions;  // object positions (relative to us)
+	Archive::AutoDeltaVector<float>             m_headings;   // object orientation
+	Archive::AutoDeltaVector<std::string>       m_scripts;    // scripts to be attached to the created objects
+	Archive::AutoDeltaVariable<CachedNetworkId> m_player;     // the player the theater is created for
+	Archive::AutoDeltaVector<CachedNetworkId>   m_objects;    // objects created
+	Archive::AutoDeltaVariable<Vector>          m_center;     // center of the theater (not neccessarily our position)
+	Archive::AutoDeltaVariable<float>           m_radius;     // radius of the theater
+	Archive::AutoDeltaVariable<NetworkId>       m_creator;    // id of who created the theater
+	Archive::AutoDeltaVariable<std::string>     m_theaterName;// the name of the theater
+	static uint32                               ms_lastFrame;
+	static uint32                               ms_theaterTime;
+#ifdef _DEBUG
+	unsigned long m_theaterCreationTime;
+#endif
+};
+
+//----------------------------------------------------------------------
+
+inline int IntangibleObject::getCount(void) const
+{
+	return m_count.get();
+}
+
+inline void IntangibleObject::setCount(int value)
+{
+	m_count = value;
+}
+
+inline void IntangibleObject::incrementCount(int delta)
+{
+	m_count = m_count.get() + delta;
+}
+
+inline void IntangibleObject::setTheater()
+{
+	m_isTheater = true;
+}
+
+inline bool IntangibleObject::isTheater() const
+{
+	return m_isTheater.get();
+}
+
+inline void IntangibleObject::setTheaterCreator(const NetworkId & creator)
+{
+	m_creator = creator;
+}
+
+//----------------------------------------------------------------------
+
+
+#endif	// INCLUDED_IntangibleObject_H
diff --git a/engine/server/library/serverGame/src/shared/object/LineOfSightCache.cpp b/engine/server/library/serverGame/src/shared/object/LineOfSightCache.cpp
new file mode 100644
index 00000000..a7de4055
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/LineOfSightCache.cpp
@@ -0,0 +1,439 @@
+// ======================================================================
+//
+// LineOfSightCache.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/LineOfSightCache.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "sharedCollision/BaseExtent.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedCollision/ConfigSharedCollision.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFoundation/Clock.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/Object.h"
+#include "sharedObject/PortalProperty.h"
+#include "sharedUtility/Location.h"
+
+#include <queue>
+
+// ======================================================================
+
+namespace LineOfSightCacheNamespace
+{
+	typedef std::pair<Object const *, Object const *> ObjectPair;
+	typedef std::pair<Object const *, Location> ObjectLocationPair;
+	typedef std::map<ObjectPair, bool> LineOfSightCacheMap;
+	typedef std::map<ObjectLocationPair, bool> LineOfSightLocationCacheMap;
+	typedef std::pair<ObjectPair, unsigned long> LineOfSightCacheExpireQueueEntry;
+	typedef std::pair<ObjectLocationPair, unsigned long> LineOfSightLocationCacheExpireQueueEntry;
+	typedef std::queue<LineOfSightCacheExpireQueueEntry> LineOfSightCacheExpireQueue;
+	typedef std::queue<LineOfSightLocationCacheExpireQueueEntry> LineOfSightLocationCacheExpireQueue;
+
+	LineOfSightCacheMap s_lineOfSightCacheMap;
+	LineOfSightCacheExpireQueue s_lineOfSightCacheExpireQueue;
+	LineOfSightLocationCacheMap s_lineOfSightLocationCacheMap;
+	LineOfSightLocationCacheExpireQueue s_lineOfSightLocationCacheExpireQueue;
+}
+
+using namespace LineOfSightCacheNamespace;
+
+// ======================================================================
+
+void LineOfSightCache::update()
+{
+	unsigned long const frameStartTime = Clock::getFrameStartTimeMs();
+
+	while (!s_lineOfSightCacheExpireQueue.empty())
+	{
+		LineOfSightCacheExpireQueueEntry const &entry = s_lineOfSightCacheExpireQueue.front();
+		if (static_cast<int>(entry.second-frameStartTime) > 0)
+			break;
+		IGNORE_RETURN(s_lineOfSightCacheMap.erase(entry.first));
+		s_lineOfSightCacheExpireQueue.pop();
+	}
+	while (!s_lineOfSightLocationCacheExpireQueue.empty())
+	{
+		LineOfSightLocationCacheExpireQueueEntry const &entry = s_lineOfSightLocationCacheExpireQueue.front();
+		if (static_cast<int>(entry.second-frameStartTime) > 0)
+			break;
+		IGNORE_RETURN(s_lineOfSightLocationCacheMap.erase(entry.first));
+		s_lineOfSightLocationCacheExpireQueue.pop();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool LineOfSightCache::checkLOS(Object const &a, Object const &b)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("LineOfSightCache:checkLOS");
+
+	Object const *source = ContainerInterface::getFirstParentInWorld(a);
+	Object const *target = ContainerInterface::getFirstParentInWorld(b);
+
+	if (!source || !target)
+		return false;
+
+	if (source == target)
+		return true;
+
+	if (source > target)
+		std::swap(source, target);
+
+	std::pair<LineOfSightCacheMap::iterator, bool> result = s_lineOfSightCacheMap.insert(std::make_pair(ObjectPair(source, target), false));
+
+	if (result.second)
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("LineOfSightCache:checkLOS (uncached)");
+
+		s_lineOfSightCacheExpireQueue.push(
+			LineOfSightCacheExpireQueueEntry(
+				ObjectPair(source, target),
+				Clock::getFrameStartTimeMs() + ConfigServerGame::getLineOfSightCacheDurationMs()));
+
+		CellProperty const * const sourceCell = source->getParentCell();
+		CellProperty const * const targetCell = target->getParentCell();
+
+		// if source and target are in the same cell in a player structure, skip LOS check;
+		// this is similar to the skip collision check if the object is in a player structure
+		// (see CollisionProperty::canCollideWith)
+		if (sourceCell && (sourceCell == targetCell) && (sourceCell != CellProperty::getWorldCellProperty()))
+		{
+			PortalProperty const * portalProperty = sourceCell->getPortalProperty();
+
+			if (portalProperty)
+			{
+				IsPlayerHouseHook hook = ConfigSharedCollision::getIsPlayerHouseHook();
+
+				if (hook && hook(&portalProperty->getOwner()))
+				{
+					(*result.first).second = true; // line of sight is clear
+					return true;
+				}
+			}
+		}
+
+		Vector const sourcePos(source->getPosition_c());
+		Vector const targetPos(target->getPosition_c());
+
+		float const sourceHeight = sourcePos.y + ConfigServerGame::getLineOfSightCacheMinHeight();
+		float const targetHeight = targetPos.y + ConfigServerGame::getLineOfSightCacheMinHeight();
+
+		CollisionProperty const * const sourceCollision = NON_NULL(source->getCollisionProperty());
+		CollisionProperty const * const targetCollision = NON_NULL(target->getCollisionProperty());
+
+		if (!sourceCollision->isInCollisionWorld())
+			sourceCollision->updateExtents();
+		if (!targetCollision->isInCollisionWorld())
+			targetCollision->updateExtents();
+
+		BaseExtent const * const sourceExtent = sourceCollision ? sourceCollision->getExtent_p() : 0;
+		BaseExtent const * const targetExtent = targetCollision ? targetCollision->getExtent_p() : 0;
+
+		ServerObject const *sourceServerObject = source->asServerObject();
+		ServerObject const *targetServerObject = target->asServerObject();
+
+		CreatureObject const *sourceCreatureObject = (sourceServerObject) ? sourceServerObject->asCreatureObject() : 0;
+		CreatureObject const *targetCreatureObject = (targetServerObject) ? targetServerObject->asCreatureObject() : 0;
+
+		Postures::Enumerator sourcePosture = (sourceCreatureObject) ? sourceCreatureObject->getPosture() : Postures::Invalid;
+		Postures::Enumerator targetPosture = (targetCreatureObject) ? targetCreatureObject->getPosture() : Postures::Invalid;
+
+		Vector sourceTop = sourcePos;
+		Vector targetTop = targetPos;
+
+		// first process special handling for creature objects
+		if (sourceCreatureObject)
+		{
+			if (sourceExtent)
+			{
+				sourceTop = sourceExtent->getCenter();
+				if (sourceCreatureObject->isPlayerControlled())
+				{
+					if (sourcePosture == Postures::Upright)
+						sourceTop.y += sourceExtent->getRadius() * ConfigSharedCollision::getLosUprightScale();
+					else if (sourcePosture == Postures::Prone || sourcePosture == Postures::LyingDown || sourcePosture == Postures::KnockedDown)
+						sourceTop.y -= sourceExtent->getRadius() * ConfigSharedCollision::getLosProneScale();
+					else if (sourcePosture == Postures::Crouched || sourcePosture == Postures::Sitting)
+						sourceTop.y += sourceExtent->getRadius() * ConfigSharedCollision::getLosUprightScale() * 0.5f;
+				}
+				else
+				{
+					// we currently don't have a good algorithm for a LOS point on non-player creatures - use extent center
+				}
+			}
+		}
+		else
+		{
+			if (sourceExtent)
+			{
+				// if the extent exists, use the top of it
+				sourceTop = sourceExtent->getCenter();
+				sourceTop.y += sourceExtent->getRadius();
+			}
+			else
+			{
+				const Sphere sourceSphere = sourceCollision ? sourceCollision->getBoundingSphere_w() : Sphere(sourceTop, 0.0f);
+				if (sourceSphere.getRadius() != 0.0f)
+				{
+					// we move the point up to the top of the collision sphere
+					sourceTop = source->getTransform_p2w().rotateTranslate_p2l(sourceSphere.getCenter());
+					sourceTop.y += sourceSphere.getRadius();
+				}
+			}
+		}
+
+		if (targetCreatureObject)
+		{
+			if (targetExtent)
+			{
+				targetTop = targetExtent->getCenter();
+				if (targetCreatureObject->isPlayerControlled())
+				{
+					if (targetPosture == Postures::Upright)
+						targetTop.y += targetExtent->getRadius() * ConfigSharedCollision::getLosUprightScale();
+					else if (targetPosture == Postures::Prone || targetPosture == Postures::LyingDown || targetPosture == Postures::KnockedDown)
+						targetTop.y -= targetExtent->getRadius() * ConfigSharedCollision::getLosProneScale();
+					else if (targetPosture == Postures::Crouched || targetPosture == Postures::Sitting)
+						targetTop.y += targetExtent->getRadius() * ConfigSharedCollision::getLosUprightScale() * 0.5f;
+				}
+				else
+				{
+					// we currently don't have a good algorithm for a LOS point on non-player creatures - use extent center
+				}
+			}
+		}
+		else
+		{
+			if (targetExtent)
+			{
+				// if the extent exists, use the top of it
+				targetTop = targetExtent->getCenter();
+				targetTop.y += targetExtent->getRadius();
+			}
+			else
+			{
+				const Sphere targetSphere = targetCollision ? targetCollision->getBoundingSphere_w() : Sphere(targetTop, 0.0f);
+				if (targetSphere.getRadius() != 0.0f)
+				{
+					// we move the point up to the top of the collision sphere
+					targetTop = target->getTransform_p2w().rotateTranslate_p2l(targetSphere.getCenter());
+					targetTop.y += targetSphere.getRadius();
+				}
+			}
+		}
+
+		if (sourceTop.y < sourceHeight)
+			sourceTop.y = sourceHeight;
+		if (targetTop.y < targetHeight)
+			targetTop.y = targetHeight;
+
+		// Check both directions for obstructions
+		QueryInteractionResult qirResult = QIR_None;
+		float outHitTime = 0.f;
+		Object const *outHitObject = 0;
+
+		qirResult = CollisionWorld::queryInteraction(
+			sourceCell, sourceTop,
+			targetCell, targetTop,
+			source,
+			!ConfigSharedCollision::getIgnoreTerrainLos(),
+			ConfigSharedCollision::getGenerateTerrainLos(),
+			ConfigSharedCollision::getTerrainLOSMinDistance(),
+			ConfigSharedCollision::getTerrainLOSMaxDistance(),
+			outHitTime,
+			outHitObject);
+
+		if (qirResult == QIR_None || outHitObject == target)
+		{
+			// We don't need to do terrain LOS in the opposite direction if the
+			// initial terrain LOS check was done using all possible terrain
+			// between the 2 points (generating any missing terrain in the process).
+			qirResult = CollisionWorld::queryInteraction(
+				targetCell, targetTop,
+				sourceCell, sourceTop,
+				target,
+				(!ConfigSharedCollision::getIgnoreTerrainLos() && !ConfigSharedCollision::getGenerateTerrainLos()),
+				false,
+				ConfigSharedCollision::getTerrainLOSMinDistance(),
+				ConfigSharedCollision::getTerrainLOSMaxDistance(),
+				outHitTime,
+				outHitObject);
+
+			if (qirResult == QIR_None || outHitObject == source)
+				(*result.first).second = true; // line of sight is clear
+		}
+	}
+
+	// return the (now) cached result
+	return (*result.first).second;
+}
+
+// ----------------------------------------------------------------------
+
+bool LineOfSightCache::checkLOS(Object const &a, Location const &b)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("LineOfSightLocationCache:checkLOS");
+
+	Object const *source = ContainerInterface::getFirstParentInWorld(a);
+	if (!source)
+		return false;
+
+	// round the target location
+	float roundValue = ConfigServerGame::getLineOfSightLocationRoundValue();
+	Vector targetPos(b.getCoordinates());
+	targetPos.x -= static_cast<float>(fmod(static_cast<float>(targetPos.x), roundValue));
+	targetPos.y -= static_cast<float>(fmod(static_cast<float>(targetPos.y), roundValue));
+	targetPos.z -= static_cast<float>(fmod(static_cast<float>(targetPos.z), roundValue));
+	Location target(targetPos, b.getCell(), b.getSceneIdCrc());
+
+	std::pair<LineOfSightLocationCacheMap::iterator, bool> result = s_lineOfSightLocationCacheMap.insert(std::make_pair(ObjectLocationPair(source, target), false));
+
+	if (result.second)
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("LineOfSightLocationCache:checkLOS (uncached)");
+
+		s_lineOfSightLocationCacheExpireQueue.push(
+			LineOfSightLocationCacheExpireQueueEntry(
+				ObjectLocationPair(source, target),
+				Clock::getFrameStartTimeMs() + ConfigServerGame::getLineOfSightCacheDurationMs()));
+
+		CellProperty const * const sourceCell = source->getParentCell();
+		CellProperty const * targetCell = NULL;
+		if (b.getCell() != NetworkId::cms_invalid)
+		{
+			Object const * cellObject = NetworkIdManager::getObjectById(b.getCell());
+			if (cellObject != NULL)
+				targetCell = ContainerInterface::getCell(*cellObject);
+		}
+		if (targetCell == NULL)
+			targetCell = CellProperty::getWorldCellProperty();
+
+		// if source and target are in the same cell in a player structure, skip LOS check;
+		// this is similar to the skip collision check if the object is in a player structure
+		// (see CollisionProperty::canCollideWith)
+		if (sourceCell && (sourceCell == targetCell) && (sourceCell != CellProperty::getWorldCellProperty()))
+		{
+			PortalProperty const * portalProperty = sourceCell->getPortalProperty();
+
+			if (portalProperty)
+			{
+				IsPlayerHouseHook hook = ConfigSharedCollision::getIsPlayerHouseHook();
+
+				if (hook && hook(&portalProperty->getOwner()))
+				{
+					(*result.first).second = true; // line of sight is clear
+					return true;
+				}
+			}
+		}
+
+		Vector const sourcePos(source->getPosition_c());
+		float const sourceHeight = sourcePos.y + ConfigServerGame::getLineOfSightCacheMinHeight();
+
+		CollisionProperty const * const sourceCollision = NON_NULL(source->getCollisionProperty());
+		if (!sourceCollision->isInCollisionWorld())
+			sourceCollision->updateExtents();
+
+		BaseExtent const * const sourceExtent = sourceCollision ? sourceCollision->getExtent_p() : 0;
+		ServerObject const *sourceServerObject = source->asServerObject();
+		CreatureObject const *sourceCreatureObject = (sourceServerObject) ? sourceServerObject->asCreatureObject() : 0;
+		Postures::Enumerator sourcePosture = (sourceCreatureObject) ? sourceCreatureObject->getPosture() : Postures::Invalid;
+		Vector sourceTop(sourcePos);
+
+		// first process special handling for creature objects
+		if (sourceCreatureObject)
+		{
+			if (sourceExtent)
+			{
+				sourceTop = sourceExtent->getCenter();
+				if (sourceCreatureObject->isPlayerControlled())
+				{
+					if (sourcePosture == Postures::Upright)
+						sourceTop.y += sourceExtent->getRadius() * ConfigSharedCollision::getLosUprightScale();
+					else if (sourcePosture == Postures::Prone || sourcePosture == Postures::LyingDown || sourcePosture == Postures::KnockedDown)
+						sourceTop.y -= sourceExtent->getRadius() * ConfigSharedCollision::getLosProneScale();
+					else if (sourcePosture == Postures::Crouched || sourcePosture == Postures::Sitting)
+						sourceTop.y += sourceExtent->getRadius() * ConfigSharedCollision::getLosUprightScale() * 0.5f;
+				}
+				else
+				{
+					// we currently don't have a good algorithm for a LOS point on non-player creatures - use extent center
+				}
+			}
+		}
+		else
+		{
+			if (sourceExtent)
+			{
+				// if the extent exists, use the top of it
+				sourceTop = sourceExtent->getCenter();
+				sourceTop.y += sourceExtent->getRadius();
+			}
+			else
+			{
+				const Sphere sourceSphere = sourceCollision ? sourceCollision->getBoundingSphere_w() : Sphere(sourceTop, 0.0f);
+				if (sourceSphere.getRadius() != 0.0f)
+				{
+					// we move the point up to the top of the collision sphere
+					sourceTop = source->getTransform_p2w().rotateTranslate_p2l(sourceSphere.getCenter());
+					sourceTop.y += sourceSphere.getRadius();
+				}
+			}
+		}
+
+		if (sourceTop.y < sourceHeight)
+			sourceTop.y = sourceHeight;
+
+		// Check both directions for obstructions
+		QueryInteractionResult qirResult = QIR_None;
+		float outHitTime = 0.f;
+		Object const *outHitObject = 0;
+
+		qirResult = CollisionWorld::queryInteraction(
+			sourceCell, sourceTop,
+			targetCell, b.getCoordinates(),
+			source,
+			!ConfigSharedCollision::getIgnoreTerrainLos(),
+			ConfigSharedCollision::getGenerateTerrainLos(),
+			ConfigSharedCollision::getTerrainLOSMinDistance(),
+			ConfigSharedCollision::getTerrainLOSMaxDistance(),
+			outHitTime,
+			outHitObject);
+
+		if (qirResult == QIR_None)
+		{
+			// We don't need to do terrain LOS in the opposite direction if the
+			// initial terrain LOS check was done using all possible terrain
+			// between the 2 points (generating any missing terrain in the process).
+			qirResult = CollisionWorld::queryInteraction(
+				targetCell, b.getCoordinates(),
+				sourceCell, sourceTop,
+				NULL,
+				(!ConfigSharedCollision::getIgnoreTerrainLos() && !ConfigSharedCollision::getGenerateTerrainLos()),
+				false,
+				ConfigSharedCollision::getTerrainLOSMinDistance(),
+				ConfigSharedCollision::getTerrainLOSMaxDistance(),
+				outHitTime,
+				outHitObject);
+
+			if (qirResult == QIR_None || outHitObject == source)
+				(*result.first).second = true; // line of sight is clear
+		}
+	}
+
+	// return the (now) cached result
+	return (*result.first).second;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/LineOfSightCache.h b/engine/server/library/serverGame/src/shared/object/LineOfSightCache.h
new file mode 100644
index 00000000..cde98ed3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/LineOfSightCache.h
@@ -0,0 +1,30 @@
+// ======================================================================
+//
+// LineOfSightCache.h
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_LineOfSightCache_H
+#define INCLUDED_LineOfSightCache_H
+
+// ======================================================================
+
+class Location;
+class Object;
+
+// ======================================================================
+
+class LineOfSightCache
+{
+public:
+	static void update();
+	static bool checkLOS(Object const &a, Object const &b);
+	static bool checkLOS(Object const &a, Location const &b);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_LineOfSightCache_H
+
diff --git a/engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.cpp b/engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.cpp
new file mode 100644
index 00000000..dc5cc52e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.cpp
@@ -0,0 +1,1594 @@
+//========================================================================
+//
+// ManufactureInstallationObject.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ManufactureInstallationObject.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/Chat.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/DraftSchematicObject.h"
+#include "serverGame/FactoryObject.h"
+#include "serverGame/ManufactureInstallationController.h"
+#include "serverGame/ManufactureSchematicObject.h"
+#include "serverGame/NonCriticalTaskQueue.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ProsePackageManagerServer.h"
+#include "serverGame/ResourceContainerObject.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerFactoryObjectTemplate.h"
+#include "serverGame/ServerManufactureInstallationObjectTemplate.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedGame/CraftingData.h"
+#include "sharedGame/OutOfBandPackager.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/SharedObjectAttributes.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedObject/AlterResult.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/SlotId.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/VolumeContainer.h"
+
+//----------------------------------------------------------------------
+
+// slot names
+const static ConstCharCrcLowerString MANF_SCHEMATIC_SLOT_NAME("manf_schematic");
+const static ConstCharCrcLowerString INPUT_HOPPER_SLOT_NAME("ingredient_hopper");
+const static ConstCharCrcLowerString OUTPUT_HOPPER_SLOT_NAME("output_hopper");
+const static ConstCharCrcLowerString NEW_OBJECT_SLOT_NAME("anythingnomod1");
+
+const static std::string DEFAULT_FACTORY_OBJECT_TEMPLATE("object/factory/base/base_factory.iff");
+
+// skill names
+const static std::string FACTORY_SKILL_MOD("factory_speed");
+
+// objvar names
+const static std::string OBJVAR_CRAFTING_TYPE("crafting.type");
+const static std::string OBJVAR_OWNER_SKILL("manf.owner_skill");
+const static std::string OBJVAR_OWNER_NAME("manf.owner_name");
+const static std::string OBJVAR_OWNER_STATION_ID("manf.owner_station_id");
+const static std::string OBJVAR_NUM_ITEMS("manf.numItems");
+
+//----------------------------------------------------------------------
+
+namespace ManufactureInstallationObjectNamespace
+{
+	#define MAKE_STRING_ID(a, b) const StringId b(#a,#b);
+
+	namespace StringIds
+	{
+		MAKE_STRING_ID(system_msg, manf_done);
+		MAKE_STRING_ID(system_msg, manf_done_sub);
+		MAKE_STRING_ID(system_msg, manf_error);
+		MAKE_STRING_ID(system_msg, manf_error_1);
+		MAKE_STRING_ID(system_msg, manf_error_2);
+		MAKE_STRING_ID(system_msg, manf_error_3);
+		MAKE_STRING_ID(system_msg, manf_error_4);
+		MAKE_STRING_ID(system_msg, manf_error_5);
+		MAKE_STRING_ID(system_msg, manf_error_6);
+		MAKE_STRING_ID(system_msg, manf_error_7);
+		MAKE_STRING_ID(system_msg, manf_error_8);
+		MAKE_STRING_ID(system_msg, manf_error_9);
+		MAKE_STRING_ID(system_msg, manf_no_component);
+		MAKE_STRING_ID(system_msg, manf_no_named_resource);
+		MAKE_STRING_ID(system_msg, manf_no_power);
+		MAKE_STRING_ID(system_msg, manf_no_unknown_resource);
+		MAKE_STRING_ID(system_msg, no_ingredients);
+		MAKE_STRING_ID(system_msg, no_power);
+		MAKE_STRING_ID(system_msg, manf_schematic_error);
+		MAKE_STRING_ID(system_msg, manf_schematic_generic_component);
+		MAKE_STRING_ID(system_msg, manf_output_hopper_full);
+	}
+
+	bool isOutputHopperFull(ManufactureInstallationObject const & mio)
+	{
+		ServerObject const * const outputHopper = mio.getOutputHopper();
+		if (outputHopper == NULL)
+			return false;
+
+		VolumeContainer const * const hopperContainer = ContainerInterface::getVolumeContainer(*outputHopper);
+		if (hopperContainer == NULL)
+			return false;
+
+		return (hopperContainer->getCurrentVolume() >= hopperContainer->getTotalVolume());
+	}
+}
+
+using namespace ManufactureInstallationObjectNamespace;
+
+//----------------------------------------------------------------------
+
+class ManufactureInstallationObject::TaskManufactureObject : public NonCriticalTaskQueue::TaskRequest
+{
+public:
+	TaskManufactureObject          (const CachedNetworkId & manfInstallation);
+	virtual ~TaskManufactureObject ();
+	virtual bool run               ();
+	
+private:
+	
+	CachedNetworkId m_manfInstallation;
+	
+private:
+	TaskManufactureObject            (const TaskManufactureObject&);
+	TaskManufactureObject & operator=(const TaskManufactureObject&);
+};
+
+//----------------------------------------------------------------------
+
+ManufactureInstallationObject::ManufactureInstallationObject(const ServerManufactureInstallationObjectTemplate* newTemplate) :
+	InstallationObject(newTemplate),
+	m_currentCrate(CachedNetworkId::cms_cachedInvalid)
+{
+//	addMembersToPackages();
+}
+
+//-----------------------------------------------------------------------
+
+ManufactureInstallationObject::~ManufactureInstallationObject()
+{
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Initializes a newly created object.
+ */
+void ManufactureInstallationObject::initializeFirstTimeObject()
+{
+	InstallationObject::initializeFirstTimeObject();
+
+	// initialize the manufacturer's skill bonus
+	setObjVarItem(OBJVAR_OWNER_SKILL, 0);
+}	// ManufactureInstallationObject::initializeFirstTimeObject
+
+//-----------------------------------------------------------------------
+
+/**
+ * Initializes a newly created object.
+ */
+void ManufactureInstallationObject::endBaselines()
+{
+	InstallationObject::endBaselines();
+
+	// if we are active, make sure we have the right data
+	if (isAuthoritative() && isActive())
+	{
+		if (getSchematic() == NULL)
+		{
+			WARNING(true, ("Manufacture installation %s is set to active but has not schematic available!", 
+				getNetworkId().getValueString().c_str()));
+			setTickCount(0);
+			deactivate();
+		}
+	}
+}	// ManufactureInstallationObject::endBaselines
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a default controller for this object.
+ *
+ * @return the object's controller
+ */
+Controller* ManufactureInstallationObject::createDefaultController()
+{
+	Controller* const _controller = new ManufactureInstallationController(this);
+	NOT_NULL(_controller);
+
+	setController(_controller);
+	return _controller;
+}
+
+// ----------------------------------------------------------------------
+
+void ManufactureInstallationObject::onContainerChildLostItem(ServerObject * destination, ServerObject& item, ServerObject* source, ServerObject* transferer)
+{
+	InstallationObject::onContainerChildLostItem(destination, item, source, transferer);
+	if (source == getInputHopper())
+	{
+		LOG("CustomerService", ("Crafting:removed object %s from manf station %s input hopper by %s", item.getNetworkId().getValueString().c_str(), getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(transferer).c_str()));
+	}
+	else if (source == getOutputHopper())
+	{
+		LOG("CustomerService", ("Crafting:removed object %s from manf station %s output hopper by %s", item.getNetworkId().getValueString().c_str(), getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(transferer).c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ManufactureInstallationObject::onContainerChildGainItem(ServerObject& item, ServerObject* source, ServerObject* transferer)
+{
+	InstallationObject::onContainerChildGainItem(item, source, transferer);
+	const ServerObject * destination = safe_cast<const ServerObject *>(ContainerInterface::getContainedByObject(item));
+	if (destination == getInputHopper())
+	{
+		LOG("CustomerService", ("Crafting:added object %s to manf station %s input hopper by %s", item.getNetworkId().getValueString().c_str(), getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(transferer).c_str()));
+	}
+	else if (destination == getOutputHopper())
+	{
+		LOG("CustomerService", ("Crafting:added object %s to manf station %s output hopper by %s", item.getNetworkId().getValueString().c_str(), getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(transferer).c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns a bitmask giving the types of objects the station can manufacture.
+ *
+ * @return the types mask
+ */
+uint32 ManufactureInstallationObject::getValidSchematicTypes() const
+{
+	int temp;
+	if (getObjVars().getItem(OBJVAR_CRAFTING_TYPE,temp))
+		return static_cast<uint32>(temp);
+	else
+	{
+		WARNING_STRICT_FATAL(true, ("ManufactureInstallationObject::getValidSchematicTypes called on object %s that does not have the crafting type objvar <%s>", 
+			getNetworkId().getValueString().c_str(), OBJVAR_CRAFTING_TYPE.c_str()));
+		return 0;
+	}
+}	// ManufactureInstallationObject::getValidSchematicTypes
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the number of items created since the installation was last activated.
+ *
+ * @return the item count
+ */
+int ManufactureInstallationObject::getNumNewItems() const
+{
+	int numItems = 0;
+	getObjVars().getItem(OBJVAR_NUM_ITEMS, numItems);
+	return numItems;
+}	// ManufactureInstallationObject::getNumNewItems
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the name of the owner of the installation.
+ *
+ * @return the owner name
+ */
+const std::string & ManufactureInstallationObject::getOwnerName() const
+{
+	static std::string name;
+
+	getObjVars().getItem(OBJVAR_OWNER_NAME, name);
+	return name;
+}	// ManufactureInstallationObject::getOwnerName
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the station id of the owner of this installation.
+ *
+ * @return the owner station id
+ */
+StationId ManufactureInstallationObject::getOwnerStationId() const
+{
+	int id = 0;
+	getObjVars().getItem(OBJVAR_OWNER_STATION_ID, id);
+	return static_cast<StationId>(id);
+}	// ManufactureInstallationObject::getOwnerStationId
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sets the id of the owner of this installation. Also sets the owner name,
+ * since the owner may be offline when we need to send a message to him.
+ *
+ * @param id		the owner id
+ */
+void ManufactureInstallationObject::setOwnerId(const NetworkId &id)
+{
+	InstallationObject::setOwnerId(id);
+
+	const Object * const object = NetworkIdManager::getObjectById(id);
+	if (object != NULL)
+	{
+		const ServerObject * const owner = safe_cast<const ServerObject *>(object);
+		setObjVarItem(OBJVAR_OWNER_NAME, Unicode::wideToNarrow(owner->getObjectName()));
+
+		// we need to store the owner's Station id for logging purposes
+		const CreatureObject * const creatureOwner = owner->asCreatureObject();
+		if (creatureOwner != NULL)
+		{
+			const PlayerObject * const player = PlayerCreatureController::getPlayerObject(creatureOwner);
+			if (player != NULL)
+			{
+				setObjVarItem(OBJVAR_OWNER_STATION_ID, static_cast<int>(player->getStationId()));
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the input hopper object for this installation.
+ *
+ * @return the input hopper
+ */
+ServerObject * ManufactureInstallationObject::getInputHopper() const
+{
+	SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this);
+
+	if (container == NULL)
+	{
+		DEBUG_WARNING(true, ("Manufacture installation %s does not have a container!", getDebugInformation().c_str()));
+		return NULL;
+	}
+
+	Container::ContainerErrorCode tmp = Container::CEC_Success;
+	const Container::ContainedItem hopperId = container->getObjectInSlot(SlotIdManager::findSlotId(INPUT_HOPPER_SLOT_NAME), tmp);
+	if (hopperId == NetworkId::cms_invalid)
+	{
+		DEBUG_WARNING(true, ("Manufacture installation %s does not have an input hopper!", getDebugInformation().c_str()));
+		return NULL;
+	}
+
+	return safe_cast<ServerObject *>(hopperId.getObject());
+}	// ManufactureInstallationObject::getInputHopper
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the output hopper object for this installation.
+ *
+ * @return the output hopper
+ */
+ServerObject * ManufactureInstallationObject::getOutputHopper() const
+{
+	SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this);
+
+	if (container == NULL)
+	{
+		DEBUG_WARNING(true, ("Manufacture installation %s does not have a container!", getDebugInformation().c_str()));
+		return NULL;
+	}
+
+	Container::ContainerErrorCode tmp = Container::CEC_Success;
+	const Container::ContainedItem hopperId = container->getObjectInSlot(SlotIdManager::findSlotId(OUTPUT_HOPPER_SLOT_NAME), tmp);
+	if (hopperId == NetworkId::cms_invalid)
+	{
+		DEBUG_WARNING(true, ("Manufacture installation %s does not have an output hopper!", getDebugInformation().c_str()));
+		return NULL;
+	}
+
+	return safe_cast<ServerObject *>(hopperId.getObject());
+}	// ManufactureInstallationObject::getOutputHopper
+
+// ----------------------------------------------------------------------
+
+/**
+ * Adds a manufacturing schematic to this installation.
+ *
+ * @param schematic		the schematic to add
+ * @param transferrer	who is adding the schematic
+ *
+ * @return true on success, false on fail
+ */
+bool ManufactureInstallationObject::addSchematic(ManufactureSchematicObject & schematic, ServerObject * transferer)
+{
+	if(isAuthoritative())
+	{
+		if (isActive())
+			return false;
+
+		// make sure the schematic is of a type that can be used in this station
+		if ((schematic.getCategory() & getValidSchematicTypes()) == 0)
+			return false;
+
+		SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this);
+
+		if (container == NULL)
+		{
+			DEBUG_WARNING(true, ("Manufacture installation %s does not have a container!", getDebugInformation().c_str()));
+			return false;
+		}
+
+		// see if there is a schematic already in the slot
+		const SlotId slotId = SlotIdManager::findSlotId(MANF_SCHEMATIC_SLOT_NAME);
+		Container::ContainerErrorCode tmp = Container::CEC_Success;
+		const Container::ContainedItem schematicId = container->getObjectInSlot(slotId, tmp);
+		if (schematicId != Container::ContainedItem::cms_invalid)
+			return false;
+
+		bool result = ContainerInterface::transferItemToSlottedContainer(*this, schematic, slotId, transferer, tmp);
+		if (result)
+			LOG("CustomerService", ("Crafting:added schematic %s to manf station %s by %s", schematic.getNetworkId().getValueString().c_str(), getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(transferer).c_str()));
+		return result;
+	}
+
+	WARNING_STRICT_FATAL(! isAuthoritative(), ("ManufactureInstallationObject::addSchematic() returns a value and was inoked on a non-authoritative object (%s : %s)", getObjectTemplateName(), getNetworkId().getValueString().c_str()));
+	return false; //@todo : is this correct?
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Shuts down station if we are losing our schematic.
+ */
+bool ManufactureInstallationObject::onContainerAboutToLoseItem(ServerObject * destination, ServerObject& item, ServerObject* transferer)
+{
+	if (isAuthoritative())
+	{
+		bool isSchematic = false;
+		const ManufactureSchematicObject * const schematic = getSchematic();
+		if (schematic != NULL && schematic->getNetworkId() == item.getNetworkId())
+		{
+			isSchematic = true;
+			if (isActive())
+			{
+				WARNING(true, ("Manufacture installation %s is having its schematic %s removed while it is active, shutting down station",
+					getNetworkId().getValueString().c_str(),
+					item.getNetworkId().getValueString().c_str()));
+				deactivate();
+			}
+		}
+		bool result = InstallationObject::onContainerAboutToLoseItem(destination, item, transferer);
+		if (result && isSchematic)
+			LOG("CustomerService", ("Crafting:removed schematic %s from manf station %s by %s", schematic->getNetworkId().getValueString().c_str(), getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(transferer).c_str()));
+		return result;
+	}
+	else
+		return InstallationObject::onContainerAboutToLoseItem(destination, item, transferer);
+}	// ManufactureInstallationObject::onContainerAboutToLoseItem
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the manufacturing schematic for this installation.
+ *
+ * @return the schematic
+ */
+ManufactureSchematicObject * ManufactureInstallationObject::getSchematic() const
+{
+	// get our manufacturing schematic
+	SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this);
+
+	if (container == NULL)
+	{
+		DEBUG_WARNING(true, ("Manufacture installation %s does not have a container!", getDebugInformation().c_str()));
+		return NULL;
+	}
+
+	Container::ContainerErrorCode tmp = Container::CEC_Success;
+	return dynamic_cast<ManufactureSchematicObject *>(container->getObjectInSlot(
+														  SlotIdManager::findSlotId(MANF_SCHEMATIC_SLOT_NAME), tmp ).getObject());
+}	// ManufactureInstallationObject::getSchematic
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the time needed to manufacture an object.
+ *
+ * @return the manufacture time, in secs
+ */
+float ManufactureInstallationObject::getTimePerObject() const
+{
+	ManufactureSchematicObject * const schematic = getSchematic();
+	if (schematic == NULL)
+		return 0;
+
+#ifdef _DEBUG
+	if (ConfigServerGame::getManufactureTimeOverride() >= 1.0f)
+		return ConfigServerGame::getManufactureTimeOverride();
+#endif
+
+	float baseTime = schematic->getManufactureTime() * schematic->getComplexity();
+	if (baseTime < 1.0f)
+	{
+		WARNING(true, ("ManufactureInstallationObject::getTimePerObject base time = %.2f sec for manf schematic %s, using 1 sec.",
+			baseTime, schematic->getNetworkId().getValueString().c_str()));
+		baseTime = 1.0f;
+	}
+
+	float time = baseTime;
+
+	// adjust the base time for the manufacturer's skills
+	const NetworkId & ownerId = getOwnerId();
+	if (ownerId != NetworkId::cms_invalid)
+	{
+		// if the owner is online, we'll use his skill, else we'll use the
+		// skill value we saved as an objvar
+		const CreatureObject * const owner = dynamic_cast<const CreatureObject *>(NetworkIdManager::getObjectById(ownerId));
+
+		int ownerSkill = 0;
+		getObjVars().getItem(OBJVAR_OWNER_SKILL,ownerSkill);
+
+		int skill = 0;
+		if (owner != NULL)
+		{
+			skill = owner->getEnhancedModValue(FACTORY_SKILL_MOD);
+
+			// if the owner's skill doesn't match our saved value, change the
+			// saved value
+			if (ownerSkill != skill)
+			{
+				const_cast<ManufactureInstallationObject *>(this)->setObjVarItem(
+					OBJVAR_OWNER_SKILL, skill);
+			}
+		}
+		else
+		{
+			skill = ownerSkill;
+		}
+		time -= (skill / 100.0f) * time;
+	}
+
+	if (time < 1.0f)
+		time = 1.0f;
+
+	return time;
+}	// ManufactureInstallationObject::getTimePerObject
+
+// ----------------------------------------------------------------------
+
+/**
+ * Activate the installation. Assumes the installation has already been
+ * placed in its intended location.
+ */
+void ManufactureInstallationObject::activate(const NetworkId &actorId)
+{
+	if (isAuthoritative() && !isActive())
+	{
+		if (getSchematic() == NULL)
+		{
+			WARNING(true, ("Manufacture installation %s tried to activate with "
+				"no schematic available!", getNetworkId().getValueString().c_str()));
+			return;
+		}
+	}
+	InstallationObject::activate(actorId);
+
+	if (isActive())
+	{
+		setTickCount(static_cast<float>(ServerClock::getInstance().getGameTimeSeconds()));
+		setObjVarItem(OBJVAR_NUM_ITEMS, 0);
+
+#if 0
+		// TODO: createObject doesn't properly restore ingredients when it fails,
+		// until it is fixed, this will eat resources.
+
+		//-- see if we have the right ingredients
+		if (!createObject (true))
+		{
+			setTickCount(0);	// to avoid recursion
+			deactivate();
+		}
+#endif
+
+
+	}
+	else if (getPower() <= 0)
+	{
+		Unicode::String oob;
+		{
+			ProsePackage pp;
+			ProsePackageManagerServer::createSimpleProsePackage (*this, StringIds::manf_no_power, pp);
+			OutOfBandPackager::pack(pp, -1, oob);
+		}
+		const Object * const owner = NetworkIdManager::getObjectById(getOwnerId());
+		if (owner != NULL)
+		{
+			Chat::sendSystemMessage(getOwnerName(), Unicode::emptyString, oob);
+		}
+
+		Chat::sendPersistentMessage(*this, getOwnerName(), StringIds::no_power, Unicode::emptyString, oob);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Deactivate the installation.
+ */
+void ManufactureInstallationObject::deactivate()
+{
+	if (isAuthoritative() && isActive())
+	{
+		// tell the owner we have stopped making items
+		Unicode::String oob;
+		{
+			ProsePackage pp;
+			ProsePackageManagerServer::createSimpleProsePackage (*this, StringIds::manf_done, pp);
+			pp.digitInteger = getNumNewItems();
+			OutOfBandPackager::pack(pp, -1, oob);
+		}
+		const Object * const owner = NetworkIdManager::getObjectById(getOwnerId());
+		if (owner != NULL)
+		{
+			Chat::sendSystemMessage(getOwnerName(), Unicode::emptyString, oob);
+		}
+
+		Chat::sendPersistentMessage(*this, getOwnerName(), StringIds::manf_done_sub, Unicode::emptyString, oob);
+
+		InstallationObject::deactivate();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Based on the time passed and ingredients available, creates objects and puts
+ * them in the output hopper.
+ */
+void ManufactureInstallationObject::harvest()
+{
+	if (isAuthoritative() && isActive())
+	{
+		if (getTickCount() > 0)
+		{
+			ManufactureSchematicObject * schematic = getSchematic();
+			int maxItemCount = -1 ;
+			if (schematic)
+			{
+				maxItemCount = schematic->getCount();
+			}
+
+			if (schematic == NULL || maxItemCount <= 0)
+			{
+				setTickCount(0);	// to avoid recursion
+				deactivate();
+				if (schematic == NULL)
+				{
+					WARNING(true, ("ManufactureInstallationObject::harvest called on object %s with a NULL schematic", 
+						getNetworkId().getValueString().c_str()));
+
+					Chat::sendPersistentMessage(*this, getOwnerName(), StringIds::manf_error, StringIds::manf_error_1, Unicode::emptyString);
+				}
+				else
+				{
+					WARNING(true, ("ManufactureInstallationObject::harvest called on object %s with a max item count of %d", 
+						getNetworkId().getValueString().c_str(), maxItemCount));
+
+					Chat::sendPersistentMessage(*this, getOwnerName(), StringIds::manf_error, StringIds::manf_error_2, Unicode::emptyString);
+				}
+				return;
+			}
+
+			float currentTime = static_cast<float>(ServerClock::getInstance().getGameTimeSeconds());
+			float deltaTime = currentTime - getTickCount();
+			float timePerObject = getTimePerObject();
+			if (timePerObject < 1.0f)
+			{
+				WARNING(true, ("ManufactureInstallationObject::harvest time per object = %.2f sec for manf schematic %s, using 1 sec.",
+					timePerObject, schematic->getNetworkId().getValueString().c_str()));
+				timePerObject = 1.0f;
+			}
+			// make sure we had enough power to make the items
+			float outOfPowerTime = getOutOfPowerTime();
+			if (outOfPowerTime >= 0 && outOfPowerTime < currentTime)
+			{
+				deltaTime = outOfPowerTime - getTickCount();
+				if (deltaTime < timePerObject)
+				{
+					// turn off the station
+					setTickCount(0);	// to avoid recursion
+					deactivate();
+					LOG("CustomerService", ("Power:shut down installation %s owned by %s due to 0 power", getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(getOwnerId()).c_str()));
+					// tell the owner we are out of power
+					Unicode::String oob;
+					{
+						ProsePackage pp;
+						ProsePackageManagerServer::createSimpleProsePackage (*this, StringIds::manf_no_power, pp);
+						OutOfBandPackager::pack(pp, -1, oob);
+					}
+					const Object * owner = NetworkIdManager::getObjectById(getOwnerId());
+					if (owner != NULL)
+					{
+						Chat::sendSystemMessage(getOwnerName(), Unicode::emptyString, oob);
+					}
+
+					Chat::sendPersistentMessage(*this, getOwnerName(), StringIds::no_power, Unicode::emptyString, oob);
+
+					return;
+				}
+			}
+			else if (deltaTime < timePerObject)
+				return;
+			while (deltaTime >= timePerObject && maxItemCount > 0)
+			{
+				NonCriticalTaskQueue::getInstance().addTask(new TaskManufactureObject(CachedNetworkId(*this)));
+				deltaTime -= timePerObject;
+				--maxItemCount;
+			}
+			// if we've queued the max number of items, don't try to queue any more,
+			// but don't stop the station (this should give us enough time to make
+			// the items in the queue)
+			if (maxItemCount == 0)
+				deltaTime = 0;
+			setTickCount(currentTime - deltaTime);
+			return;
+		}
+	}
+	InstallationObject::harvest();
+}	// ManufactureInstallationObject::harvest
+
+// ----------------------------------------------------------------------
+
+/**
+ * Creates an object from the ingredients in the input hopper and put it in the
+ * output hopper.
+ *
+ * @return true on success, false if the object couldn't be created
+ */
+bool ManufactureInstallationObject::createObject(bool testOnly)
+{
+	static const SlotId newObjectSlotId(SlotIdManager::findSlotId(NEW_OBJECT_SLOT_NAME));
+
+	if (!isAuthoritative())
+	{
+		if (testOnly)
+			return false;
+
+		sendControllerMessageToAuthServer(CM_manufactureInstallationCreateObject, 0);
+		return true;
+	}
+	
+	int i;
+	
+	ManufactureSchematicObject * schematic = getSchematic();
+	if (schematic == NULL)
+	{
+		WARNING(true, ("ManufactureInstallationObject::createObject can't find schematic for station %s", 
+			getNetworkId().getValueString().c_str()));
+		
+		Chat::sendPersistentMessage(*this, getOwnerName(), StringIds::manf_error, StringIds::manf_error_3, Unicode::emptyString);
+		
+		return false;
+	}
+	
+	if (schematic->getCount() <= 0)
+	{
+		WARNING(true, ("ManufactureInstallationObject::createObject station %s has schematic %s with count %d", 
+			getNetworkId().getValueString().c_str(), 
+			schematic->getNetworkId().getValueString().c_str(),
+			schematic->getCount()));
+		
+		Chat::sendPersistentMessage(*this, getOwnerName(), StringIds::manf_error, StringIds::manf_error_4, Unicode::emptyString);
+		
+		return false;
+	}
+	
+	ServerObject * inputHopper = getInputHopper();
+	if (inputHopper == NULL)
+	{
+		WARNING_STRICT_FATAL(true, ("ManufactureInstallationObject::createObject can't find input hopper for station %s", 
+			getNetworkId().getValueString().c_str()));
+		
+		Chat::sendPersistentMessage(*this, getOwnerName(), StringIds::manf_error, StringIds::manf_error_5, Unicode::emptyString);
+		
+		return false;
+	}
+	
+	ServerObject * outputHopper = getOutputHopper();
+	if (outputHopper == NULL)
+	{
+		WARNING_STRICT_FATAL(true, ("ManufactureInstallationObject::createObject can't find output hopper for station %s", 
+			getNetworkId().getValueString().c_str()));
+		
+		Chat::sendPersistentMessage(*this, getOwnerName(), StringIds::manf_error, StringIds::manf_error_6, Unicode::emptyString);
+		
+		return false;
+	}
+
+	// before attempting to create object, make sure there is room in the output hopper
+	bool outputHopperFull = false;
+
+	if (schematic->getItemsPerContainer() == 1)
+	{
+		outputHopperFull = isOutputHopperFull(*this);
+	}
+	else
+	{
+		// is there a current crate in the output hopper put we can stuff objects into
+		FactoryObject * crate = getCurrentCrate(*schematic);
+		if (crate == NULL)
+		{
+			// is there room in the output hopper for a new crate
+			outputHopperFull = isOutputHopperFull(*this);
+		}
+	}
+
+	if (outputHopperFull)
+	{
+		Unicode::String oob;
+		{
+			ProsePackage pp;
+			ProsePackageManagerServer::createSimpleProsePackage (*this, StringIds::manf_output_hopper_full, pp);
+			OutOfBandPackager::pack(pp, -1, oob);
+		}
+		const Object * const owner = NetworkIdManager::getObjectById(getOwnerId());
+		if (owner != NULL)
+		{
+			Chat::sendSystemMessage(getOwnerName(), Unicode::emptyString, oob);
+		}
+
+		Chat::sendPersistentMessage(*this, getOwnerName(), StringIds::manf_error, Unicode::emptyString, oob);
+
+		return false;
+	}
+	
+	// remove ingredients from the input hopper and add them to the manufacturing
+	// schematic
+	IngredientVector ingredients;
+	Crafting::IngredientSlot slot;
+	Crafting::Ingredients::const_iterator ingredientIter;
+	int slotCount = schematic->getSlotsCount();
+	Container::ContainerErrorCode tmp = Container::CEC_Success;
+	bool invalidSchematicComponent = false;
+	for (i = 0; i < slotCount; ++i)
+	{
+		if (!schematic->getSlot(i, slot, false))
+		{
+			WARNING(true, ("ManufactureInstallationObject::createObject station %s can't find slot %d for schematic %s",
+				getNetworkId().getValueString().c_str(), i, 
+				schematic->getNetworkId().getValueString().c_str()));
+			break;
+		}
+		if (slot.ingredients.empty())
+		{
+			WARNING(true, ("ManufactureInstallationObject::createObject station %s, schematic %s: slot %d has no ingredient info",
+				getNetworkId().getValueString().c_str(),
+				schematic->getNetworkId().getValueString().c_str(), i));
+			break;
+		}
+		
+		for (ingredientIter = slot.ingredients.begin();
+			ingredientIter != slot.ingredients.end(); ++ingredientIter)
+		{
+			const NetworkId ingredientId((*ingredientIter)->ingredient);
+			int ingredientCount = (*ingredientIter)->count;
+			if (ingredientCount <= 0)
+			{
+				WARNING_STRICT_FATAL(true, ("ManufactureInstallationObject::createObject, Manufacture schematic %s has invalid ingredient %s count %d", 
+					schematic->getNetworkId().getValueString().c_str(), ingredientId.getValueString().c_str(), ingredientCount));
+				break;
+			}
+			if (slot.ingredientType == Crafting::IT_item ||
+				slot.ingredientType == Crafting::IT_template ||
+				slot.ingredientType == Crafting::IT_templateGeneric ||
+				slot.ingredientType == Crafting::IT_schematic ||
+				slot.ingredientType == Crafting::IT_schematicGeneric)
+			{
+				const Crafting::ComponentIngredient * componentInfo =
+					safe_cast<const Crafting::ComponentIngredient *>((*ingredientIter).get());
+				int j = 0;
+				if (slot.ingredientType != Crafting::IT_templateGeneric)
+				{
+					if (componentInfo->ingredient != NetworkId::cms_invalid)
+					{
+						// the ingredient needs to be made with the same schematic
+						if (transferCraftedIngredientToSchematic(*inputHopper, *schematic, componentInfo->ingredient, ingredientCount, ingredients))
+						{
+							j = ingredientCount;
+						}
+					}
+					else
+					{
+						invalidSchematicComponent = true;
+					}
+				}
+				else
+				{
+					// the ingredient needs to be made with the same template
+					const ObjectTemplate * componentTemplate = ObjectTemplateList::fetch(
+						componentInfo->templateName);
+					if (componentTemplate != NULL)
+					{
+						for (j = 0; j < ingredientCount; ++j)
+						{
+							if (transferTemplateIngredientToSchematic(*inputHopper, *schematic, *componentTemplate, ingredients) == NetworkId::cms_invalid)
+							{
+								break;
+							}
+						}
+						componentTemplate->releaseReference();
+					}
+				}
+				if (j != ingredientCount)
+					break;
+			}
+			else if (slot.ingredientType == Crafting::IT_resourceType ||
+				slot.ingredientType == Crafting::IT_resourceClass)
+			{
+				if (transferResourceTypeToSchematic(*inputHopper, *schematic,
+					ingredientId, ingredientCount) == NetworkId::cms_invalid)
+				{
+					break;
+				}
+			}
+			else
+				break;
+		}
+		if (ingredientIter != slot.ingredients.end())
+		{
+			// tell the player what ingredient is missing
+			Unicode::String oob;
+			if (slot.ingredientType == Crafting::IT_item ||
+				slot.ingredientType == Crafting::IT_template ||
+				slot.ingredientType == Crafting::IT_templateGeneric ||
+				slot.ingredientType == Crafting::IT_schematic ||
+				slot.ingredientType == Crafting::IT_schematicGeneric)
+			{
+				const Crafting::ComponentIngredient * const componentInfo = safe_cast<const Crafting::ComponentIngredient *>((*ingredientIter).get());
+				
+				ProsePackage pp;
+				ProsePackageManagerServer::createSimpleProsePackage (*this, StringIds::manf_no_component, pp);
+				pp.other.str = componentInfo->componentName;
+				OutOfBandPackager::pack(pp, -1, oob);
+			}
+			else
+			{
+				ResourceTypeObject const * const resource = ServerUniverse::getInstance().getResourceTypeById(ingredientIter->get()->ingredient);
+				
+				ProsePackage pp;
+				ProsePackageManagerServer::createSimpleProsePackageParticipant (*this, pp.target);
+				
+				if (resource != NULL)
+				{
+					pp.stringId = StringIds::manf_no_named_resource;
+					pp.other.str = Unicode::narrowToWide(resource->getResourceName());
+				}
+				else
+					pp.stringId = StringIds::manf_no_unknown_resource;
+				
+				OutOfBandPackager::pack(pp, -1, oob);
+			}
+
+			const Object * const owner = NetworkIdManager::getObjectById(getOwnerId());
+			if (owner != NULL)
+				Chat::sendSystemMessage(getOwnerName(), Unicode::emptyString, oob);
+			
+			Chat::sendPersistentMessage(*this, getOwnerName(), StringIds::no_ingredients, Unicode::emptyString, oob);
+			
+			break;
+		}
+	}
+
+	if (invalidSchematicComponent)
+	{
+		LOG("CustomerService", ("Crafting:schematic %s owned "
+			"by %s is invalid due to being made with a non-"
+			"serialized component", 
+			getNetworkId().getValueString().c_str(), 
+			PlayerObject::getAccountDescription(getOwnerId()).c_str()));
+		
+		Unicode::String oob;
+		ProsePackage pp;
+		ProsePackageManagerServer::createSimpleProsePackage (*this, StringIds::manf_schematic_generic_component, pp);
+		OutOfBandPackager::pack(pp, -1, oob);
+		Chat::sendPersistentMessage(*this, getOwnerName(), StringIds::manf_schematic_error, 
+			Unicode::emptyString, oob);
+//		Chat::sendPersistentMessage(*this, getOwnerName(), StringIds::manf_error, StringIds::manf_error_9, Unicode::emptyString);
+	}
+	if (i != slotCount)
+	{
+		restoreIngredients(ingredients);
+		schematic->clearSlotSources();
+		return false;
+	}
+	else
+	{
+		if (testOnly)
+			return true;
+
+		destroyIngredients(ingredients);
+	}
+	
+	if (schematic->getItemsPerContainer() == 1)
+	{
+		TangibleObject * object = safe_cast<TangibleObject *>(schematic->
+			manufactureObject(getOwnerId(), *this, newObjectSlotId, false));
+		if (object == NULL)
+		{
+			WARNING_STRICT_FATAL(true, ("ManufactureInstallationObject::createObject, Unable to create object for station %s", 
+				getNetworkId().getValueString().c_str()));
+			
+			Chat::sendPersistentMessage(*this, getOwnerName(), StringIds::manf_error, StringIds::manf_error_8, Unicode::emptyString);
+			
+			return false;
+		}
+		if (!ContainerInterface::transferItemToVolumeContainer(*outputHopper, *object, NULL, tmp))
+		{
+			object->permanentlyDestroy(DeleteReasons::BadContainerTransfer);
+			WARNING_STRICT_FATAL(true, ("ManufactureInstallationObject::createObject, Unable to transfer new object for station %s, error code = %d",
+				getNetworkId().getValueString().c_str(), tmp));
+			
+			Chat::sendPersistentMessage(*this, getOwnerName(), StringIds::manf_error, StringIds::manf_error_9, Unicode::emptyString);
+		
+			return false;
+		}
+	}
+	else
+	{
+		// put the object in a box of objects
+		FactoryObject * crate = getCurrentCrate(*schematic);
+		if (crate == NULL)
+		{
+			// make a new crate to put the object in
+			crate = makeNewCrate(*schematic);
+		}
+		if (crate == NULL)
+		{
+			WARNING_STRICT_FATAL(true, ("ManufactureInstallationObject::createObject, Unable to create factory crate for station %s", 
+				getNetworkId().getValueString().c_str()));
+			
+			Chat::sendPersistentMessage(*this, getOwnerName(), StringIds::manf_error, StringIds::manf_error_7, Unicode::emptyString);
+			
+			return false;
+		}
+		if (!crate->addObject())
+		{
+			// something went very wrong, shut down
+			setTickCount(0);	// to avoid recursion
+			deactivate();
+			return false;
+		}
+		schematic->incrementCount(-1);
+		if (schematic->getCount() == 0)
+		{
+			// delete the schematic
+			schematic->permanentlyDestroy(DeleteReasons::Consumed);
+			LOG("CustomerService", ("Crafting:destroyed schematic %s in manf station %s owned by %s", schematic->getNetworkId().getValueString().c_str(), getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(getOwnerId()).c_str()));
+		}
+	}
+	setObjVarItem(OBJVAR_NUM_ITEMS, getNumNewItems() + 1);
+	
+	if (schematic->isBeingDestroyed())
+	{
+		// turn off the station
+		setTickCount(0);	// to avoid recursion
+		deactivate();
+	}
+	else
+		schematic->clearSlotSources();
+
+	return true;
+}	// ManufactureInstallationObject::createObject
+
+// ----------------------------------------------------------------------
+
+/**
+ * Restores the ingredients in the ingredient list to the input hopper.
+ */
+void ManufactureInstallationObject::restoreIngredients(IngredientVector const &ingredients)
+{
+	// Ingredients with a 0 count are objects which are still in the input hopper, so don't need to be moved
+	for (IngredientVector::const_iterator i = ingredients.begin(); i != ingredients.end(); ++i)
+	{
+		const CachedNetworkId & itemId = (*i).first;
+		int count = (*i).second;
+		if (count != 0)
+		{
+			FactoryObject * crate = dynamic_cast<FactoryObject *>(itemId.getObject());
+			if (crate != NULL)
+				crate->incrementCount(count);
+		}
+	}
+}	// ManufactureInstallationObject::restoreIngredients
+
+// ----------------------------------------------------------------------
+
+/**
+ * Destroys the ingredients in the ingredient list.
+ */
+void ManufactureInstallationObject::destroyIngredients(IngredientVector const &ingredients)
+{
+	for (IngredientVector::const_iterator i = ingredients.begin(); i != ingredients.end(); ++i)
+	{
+		const CachedNetworkId & itemId = (*i).first;
+		int count = (*i).second;
+		if (count == 0)
+		{
+			// this is a single component, destroy it
+			itemId.getObject()->asServerObject()->permanentlyDestroy(
+				DeleteReasons::Consumed);
+			LOG("CustomerService", ("Crafting:destroying ingredient %s in manf station %s owned by %s", itemId.getValueString().c_str(), getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(getOwnerId()).c_str()));
+		}
+		else
+		{
+			FactoryObject * crate = dynamic_cast<FactoryObject *>(itemId.getObject());
+			if (crate != NULL)
+			{
+				LOG("CustomerService", ("Crafting:destroying %d ingredients from crate %s in manf station %s owned by %s", count, itemId.getValueString().c_str(), getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(getOwnerId()).c_str()));
+				if (crate->getCount() == 0)
+					crate->permanentlyDestroy(DeleteReasons::Consumed);
+			}
+		}
+	}
+}	// ManufactureInstallationObject::destroyIngredients
+
+// ----------------------------------------------------------------------
+
+/**
+ * Transfers an object from the input hopper to a manufacturing schematic, if
+ * the object was crafted with a given manufacturing schematic.
+ *
+ * @param inputHopper		the station's input hopper
+ * @param schematic			manf schematic to transfer to
+ * @param craftedId			id of the schematic the object must be crafted with
+ * @param ingredientCount	number of ingredients needed
+ *
+ * @return true if there were enough ingredients, false if not
+ */
+bool ManufactureInstallationObject::transferCraftedIngredientToSchematic(
+	ServerObject & inputHopper, ManufactureSchematicObject & schematic,
+	const NetworkId & craftedId, int ingredientCount, IngredientVector &ingredients)
+{
+	WARNING_STRICT_FATAL( ! ( inputHopper.isAuthoritative() && 
+		schematic.isAuthoritative() && isAuthoritative() ), (
+		"transferCrafterIngredientToSchematic on ManufactureInstallationObject (%s:%s) without all of the participants (inputHopper %s:%s and schematic %s:%s) authoritative on this server!", 
+		getObjectTemplateName(), 
+		getNetworkId().getValueString().c_str(), 
+		inputHopper.getObjectTemplateName(), 
+		inputHopper.getNetworkId().getValueString().c_str(), 
+		schematic.getObjectTemplateName(), 
+		schematic.getNetworkId().getValueString().c_str()));
+	// go through all the ingredients until we find one that has the same
+	// crafted id as the component wanted
+
+	VolumeContainer * container = ContainerInterface::getVolumeContainer(inputHopper);
+	if (container == NULL)
+		return false;
+
+	// stuff to keep track of crates that don't have enough ingredients
+	int partialCrateObjectCount = 0;
+	std::vector<FactoryObject *> partialCrates;
+
+	for (ContainerIterator iter = container->begin(); iter != container->end() && ingredientCount > 0; ++iter)
+	{
+		const Container::ContainedItem & itemId = *iter;
+		TangibleObject * object = safe_cast<TangibleObject *>(itemId.getObject());
+		if (object != NULL && object->getCraftedId() == craftedId)
+		{
+			// see if the object is a factory or not
+			FactoryObject * crate = dynamic_cast<FactoryObject *>(object);
+			if (crate != NULL)
+			{
+				// see if the crate has enough objects or not
+				int crateCount = crate->getCount();
+				if (crateCount >= ingredientCount)
+				{
+					ingredients.push_back(std::make_pair(CachedNetworkId(*crate), ingredientCount));
+					crate->incrementCount(-ingredientCount);
+					ingredientCount = 0;
+				}
+				else
+				{
+					// save off this crate in case we have other crates that
+					// will get us our ingredients
+					partialCrateObjectCount += crateCount;
+					partialCrates.push_back(crate);
+					if (partialCrateObjectCount >= ingredientCount)
+						break;
+				}
+			}
+			else
+			{
+				// Make sure the ingredient we are considering has not already been used, since they are still in the container.
+				std::pair<CachedNetworkId, int> const potentialIngredient(std::make_pair(CachedNetworkId(*object), 0));
+				if (std::find(ingredients.begin(), ingredients.end(), potentialIngredient) == ingredients.end())
+				{
+					ingredients.push_back(potentialIngredient);
+					--ingredientCount;
+				}
+			}
+		}
+	}
+
+	// if we aren't done, see if we have enough small crates to give us what we
+	// need
+	if (ingredientCount > 0 && partialCrateObjectCount >= ingredientCount)
+	{
+		for (std::vector<FactoryObject *>::iterator iter = partialCrates.begin();
+			iter != partialCrates.end() && ingredientCount > 0; ++iter)
+		{
+			FactoryObject * crate = *iter;
+			int crateCount = crate->getCount();
+			if (crateCount <= ingredientCount)
+			{
+				ingredients.push_back(std::make_pair(CachedNetworkId(*crate), crateCount));
+				crate->incrementCount(-crateCount);
+				ingredientCount -= crateCount;
+			}
+			else
+			{
+				ingredients.push_back(std::make_pair(CachedNetworkId(*crate), ingredientCount));
+				crate->incrementCount(-ingredientCount);
+				ingredientCount = 0;
+			}
+		}
+	}
+
+	if (ingredientCount == 0)
+		return true;
+	return false;
+}	// ManufactureInstallationObject::transferCraftedIngredientToSchematic
+
+// ----------------------------------------------------------------------
+
+/**
+ * Transfers an object from the input hopper to a manufacturing schematic, if
+ * the object was made with a given template.
+ *
+ * @param inputHopper			the station's input hopper
+ * @param schematic				manf schematic to transfer to
+ * @param componentTemplate		template the object must match
+ *
+ * @return the id of the object transferred, or NetworkId::cms_invalid on failure
+ */
+const NetworkId & ManufactureInstallationObject::transferTemplateIngredientToSchematic(
+	ServerObject & inputHopper, ManufactureSchematicObject & schematic,
+	const ObjectTemplate & componentTemplate, IngredientVector &ingredients)
+{
+	// go through all the ingredients until we find one that has the same
+	// template as the component wanted
+
+	VolumeContainer * container = ContainerInterface::getVolumeContainer(
+		inputHopper);
+	if (container == NULL)
+		return NetworkId::cms_invalid;
+
+	for (ContainerIterator iter = container->begin(); iter != container->end(); ++iter)
+	{
+		const Container::ContainedItem & itemId = *iter;
+		TangibleObject * object = safe_cast<TangibleObject *>(itemId.getObject());
+		if (object != NULL)
+		{
+			// see if the object is a factory or not
+			FactoryObject * crate = dynamic_cast<FactoryObject *>(object);
+			if (crate != NULL && crate->getCount() > 0)
+			{
+				if (crate->getContainedObjectTemplate() == &componentTemplate)
+				{
+					ingredients.push_back(std::make_pair(CachedNetworkId(*crate), 1));
+					crate->incrementCount(-1);
+					return crate->getNetworkId();
+				}
+			}
+			else if (object->getObjectTemplate() == &componentTemplate)
+			{
+				// Make sure the ingredient we are considering has not already been used, since they are still in the container.
+				std::pair<CachedNetworkId, int> const potentialIngredient(std::make_pair(CachedNetworkId(*object), 0));
+				if (std::find(ingredients.begin(), ingredients.end(), potentialIngredient) == ingredients.end())
+				{
+					ingredients.push_back(std::make_pair(CachedNetworkId(*object), 0));
+					return object->getNetworkId();
+				}
+			}
+		}
+	}
+
+	return NetworkId::cms_invalid;
+}	// ManufactureInstallationObject::transferTemplateIngredientToSchematic
+
+// ----------------------------------------------------------------------
+
+/**
+ * Transfers a resource type from the input hopper to a manufacturing schematic.
+ *
+ * @param inputHopper		the station's input hopper
+ * @param schematic			manf schematic to transfer to
+ * @param resourceTypeId	id of the resource type to transfer
+ * @param resourceCount		number of resource units to transfer
+ *
+ * @return the id of the resource transferred, or NetworkId::cms_invalid on failure
+ */
+const NetworkId & ManufactureInstallationObject::transferResourceTypeToSchematic(
+	ServerObject & inputHopper, ManufactureSchematicObject & schematic,
+	const NetworkId & resourceTypeId, int resourceCount)
+{
+	VolumeContainer * const container = ContainerInterface::getVolumeContainer(inputHopper);
+	if (container == NULL)
+		return NetworkId::cms_invalid;
+
+	// keep a map of the sources that are providing the resources
+	std::vector<std::pair<NetworkId, int> > sources;
+	std::vector<ResourceContainerObject *>  smallCrates;
+	int smallCrateResourceCount = 0;
+
+	ContainerIterator iter = container->begin();
+	// if no resource container has enough resources available, keep a list of
+	// valid containers around to see if we can combine them
+	bool foundIt = false;
+	while (!foundIt && iter != container->end())
+	{
+		const Container::ContainedItem & itemId = *iter;
+		ResourceContainerObject * object = dynamic_cast<ResourceContainerObject *>(
+			itemId.getObject());
+		if (object != NULL && object->getResourceTypeId() == resourceTypeId)
+		{
+			// see if this crate fills our requirements
+			if (object->getQuantity() >= resourceCount)
+			{
+				if (!object->removeResource(resourceTypeId, resourceCount, &sources))
+					return NetworkId::cms_invalid;
+				foundIt = true;
+			}
+			else
+			{
+				// keep track of small crates - we may be able to add their resources
+				// together to get what we need
+				smallCrates.push_back(object);
+				smallCrateResourceCount += object->getQuantity();
+				if (smallCrateResourceCount >= resourceCount)
+				{
+					int count = resourceCount;
+					std::vector<ResourceContainerObject *>::iterator crateIter = 
+						smallCrates.begin(); 
+					while (count > 0 && crateIter != smallCrates.end())
+					{
+						ResourceContainerObject * smallCrate = *crateIter;
+						if (smallCrate->getQuantity() <= count)
+						{
+							count -= smallCrate->getQuantity();
+							if (!smallCrate->removeResource(resourceTypeId, smallCrate->getQuantity(), &sources))
+								return NetworkId::cms_invalid;
+							// small crate has been deleted by the resource system
+							*crateIter = NULL;
+							++crateIter;
+						}
+						else
+						{
+							if (!smallCrate->removeResource(resourceTypeId, count, &sources))
+								return NetworkId::cms_invalid;
+							count = 0;
+						}
+					}
+					if (count > 0)
+					{
+						// WTF?!
+						WARNING_STRICT_FATAL(true, ("ManufactureInstallationObject::transferResourceTypeToSchematic was pulling resources off small crates and ran out! This should be impossible!"));
+						return NetworkId::cms_invalid;
+					}
+					foundIt = true;
+				}
+				else
+					++iter;
+			}
+		}
+		else
+			++iter;
+	}
+	if (!foundIt)
+		return NetworkId::cms_invalid;
+
+	// xfer the resource data to the schematic
+	for (std::vector<std::pair<NetworkId, int> >::const_iterator sourceIter =
+		sources.begin(); sourceIter != sources.end(); ++sourceIter)
+	{
+		schematic.addIngredient(resourceTypeId, (*sourceIter).second, (*sourceIter).first);
+	}
+	return resourceTypeId;
+}	// ManufactureInstallationObject::transferResourceTypeToSchematic
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns a non-full crate currently in the output hopper we can stuff objects into
+ *
+ * @param contents		an object we want to put in the crate
+ *
+ * @return the crate, or NULL if we have no crate
+ */
+FactoryObject * ManufactureInstallationObject::getCurrentCrate(const ManufactureSchematicObject & source)
+{
+	FactoryObject * crate = NULL;
+
+	ServerObject * outputHopper = getOutputHopper();
+	if (outputHopper == NULL)
+		return NULL;
+
+	if (m_currentCrate.getObject() != NULL)
+	{
+		crate = safe_cast<FactoryObject *>(m_currentCrate.getObject());
+
+		// make sure the crate is still in our hopper and is not full
+		if (crate != NULL && ContainerInterface::getContainedByObject(*crate) == outputHopper &&
+			crate->getCraftedId() == source.getOriginalId())
+		{
+			if (crate->getCount() < source.getItemsPerContainer())
+				return crate;
+			else
+				return NULL;
+		}
+	}
+
+	// see if there is another non-full crate in the output hopper we could use
+	const VolumeContainer * hopperContainer = ContainerInterface::getVolumeContainer(
+		*outputHopper);
+	if (hopperContainer != NULL)
+	{
+		for (ContainerConstIterator iter = hopperContainer->begin();
+			iter != hopperContainer->end(); ++iter)
+		{
+			crate = dynamic_cast<FactoryObject *>((*iter).getObject());
+			if (crate != NULL && crate->getCraftedId() == source.getOriginalId() && crate->getCount() < source.getItemsPerContainer())
+			{
+				// change our current crate to the one we found
+				m_currentCrate = CachedNetworkId(*crate);
+				return crate;
+			}
+		}
+	}
+
+	return NULL;
+}	// ManufactureInstallationObject::getCurrentCrate
+
+// ----------------------------------------------------------------------
+
+/**
+ * Creates a new FactoryObject crate that we will stuff manufactured objects
+ * into.
+ *
+ * @param contents		an object we want to put in the crate
+ *
+ * @return the new crate
+ */
+FactoryObject * ManufactureInstallationObject::makeNewCrate(const ManufactureSchematicObject & source)
+{
+	ServerObject * outputHopper = getOutputHopper();
+	if (outputHopper == NULL)
+		return NULL;
+
+	// get the correct factory object template from the draft schematic
+	const ManufactureSchematicObject * manfSchematic = getSchematic();
+	if (manfSchematic == NULL)
+		return NULL;
+	const DraftSchematicObject * draftSchematic = DraftSchematicObject::getSchematic(
+		manfSchematic->getDraftSchematic());
+	if (draftSchematic == NULL)
+		return NULL;
+
+	ServerObject * object = NULL;
+	const ServerFactoryObjectTemplate * crateTemplate = draftSchematic->getCrateObjectTemplate();
+	if (crateTemplate != NULL)
+	{
+		object = ServerWorld::createNewObject(*crateTemplate, *outputHopper, false);
+	}
+	else
+	{
+		object = ServerWorld::createNewObject(DEFAULT_FACTORY_OBJECT_TEMPLATE,
+			*outputHopper, false);
+	}
+	if (object == NULL)
+		return NULL;
+
+	FactoryObject * crate = dynamic_cast<FactoryObject *>(object);
+	if (crate == NULL)
+		object->permanentlyDestroy(DeleteReasons::SetupFailed);
+	else
+	{
+		crate->initialize(source);
+		crate->setCraftedId(source.getOriginalId());
+		crate->setOwnerId(getOwnerId());
+		crate->setCreatorId(source.getCreatorId());
+		crate->persist();
+	}
+
+	m_currentCrate = CachedNetworkId(*crate);
+	LOG("CustomerService", ("Crafting:manf station %s owned by %s created crate %s", getNetworkId().getValueString().c_str(), PlayerObject::getAccountDescription(getOwnerId()).c_str(), crate->getNetworkId().getValueString().c_str()));
+	return crate;
+}	// ManufactureInstallationObject::makeNewCrate
+
+
+// ======================================================================
+// ManufactureInstallationObject::TaskManufactureObject methods
+
+/**
+ * Class constructor.
+ */
+ManufactureInstallationObject::TaskManufactureObject::TaskManufactureObject(
+	const CachedNetworkId & manfInstallation) :
+	NonCriticalTaskQueue::TaskRequest(),
+	m_manfInstallation(manfInstallation)
+{
+}	// TaskManufactureObject::TaskManufactureObject
+
+//----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+ManufactureInstallationObject::TaskManufactureObject::~TaskManufactureObject()
+{
+}	// TaskManufactureObject::~TaskManufactureObject
+
+//----------------------------------------------------------------------
+
+/**
+ * Creates an object. Called when this task reaches the head of the queue.
+ *
+ * @return true on done, false if we need more time
+ */
+bool ManufactureInstallationObject::TaskManufactureObject::run()
+{
+	ManufactureInstallationObject * manfInst = safe_cast<ManufactureInstallationObject *>
+		(m_manfInstallation.getObject());
+	if (manfInst == NULL || !manfInst->isActive())
+		return true;
+
+	if (!manfInst->createObject())
+	{
+		manfInst->setTickCount(0);	// to avoid recursion
+		manfInst->deactivate();
+	}
+
+	return true;
+}	// TaskManufactureObject::run
+
+// ----------------------------------------------------------------------
+
+void ManufactureInstallationObject::getAttributes(AttributeVector & data) const
+{
+	InstallationObject::getAttributes(data);
+
+	ManufactureSchematicObject * schematic = getSchematic();
+	if (schematic != NULL)
+	{
+		char valueBuffer[32];
+  		const size_t valueBuffer_size = sizeof (valueBuffer);
+
+		if (!schematic->getAssignedObjectName().empty())
+		{
+			data.push_back(std::make_pair(SharedObjectAttributes::manufacture_object, 
+				schematic->getAssignedObjectName()));
+		}
+		else
+		{
+			data.push_back(std::make_pair(SharedObjectAttributes::manufacture_object, 
+				DraftSchematicObject::getSchematic(schematic->getDraftSchematic())->
+				getObjectName()));
+		}
+
+		snprintf(valueBuffer, valueBuffer_size, "%i", static_cast<int>(getTimePerObject() + 0.5f));
+		data.push_back(std::make_pair(SharedObjectAttributes::manufacture_time, Unicode::narrowToWide(valueBuffer)));
+
+		snprintf(valueBuffer, valueBuffer_size, "%i", getNumNewItems());
+		data.push_back(std::make_pair(SharedObjectAttributes::manufacture_count, Unicode::narrowToWide(valueBuffer)));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+float ManufactureInstallationObject::alter(float time)
+{
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("ManufactureInstallationObject::alter");
+		if (isAuthoritative() && isActive())
+			harvest ();
+	}
+
+	const float result = InstallationObject::alter (time);
+	if (result != AlterResult::cms_kill && isAuthoritative() && isActive())  //lint !e777 // != on floats
+	{
+		// we don't need to alter until the next object is ready to be made
+		// (plus a little bit to make sure we are definitely >= the time)
+		return getTimePerObject() + 0.1f;
+	}
+	return result;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.h b/engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.h
new file mode 100644
index 00000000..14cb8488
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.h
@@ -0,0 +1,104 @@
+//========================================================================
+//
+// ManufactureInstallationObject.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ManufactureInstallationObject_H
+#define _INCLUDED_ManufactureInstallationObject_H
+
+#include "serverGame/InstallationObject.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedFoundation/StationId.h"
+
+class FactoryObject;
+class ManufactureSchematicObject;
+class ServerManufactureInstallationObjectTemplate;
+
+
+/** 
+  * A ManufactureInstallationObject is used to create new objects from a 
+  * manufacture schematic. 
+  */
+class ManufactureInstallationObject : public InstallationObject
+{
+	friend class InstallationController;
+	
+public:
+
+	ManufactureInstallationObject(const ServerManufactureInstallationObjectTemplate* newTemplate);
+	virtual ~ManufactureInstallationObject();
+
+
+	virtual Controller* createDefaultController();
+	void                addMembersToPackages();
+	virtual void        getAttributes(AttributeVector &data) const;
+	virtual void        onContainerChildLostItem(ServerObject * destination, ServerObject& item, ServerObject* source, ServerObject* transferer);
+	virtual void        onContainerChildGainItem(ServerObject& item, ServerObject* source, ServerObject* transferer);
+
+	virtual float       alter(float time);
+	
+	uint32              getValidSchematicTypes() const;
+	int                 getNumNewItems() const;
+	const std::string & getOwnerName() const;
+	StationId           getOwnerStationId() const;
+	virtual void        setOwnerId(const NetworkId &id);
+	
+	ServerObject * getInputHopper() const;
+	ServerObject * getOutputHopper() const;
+
+	bool                         addSchematic(ManufactureSchematicObject & schematic, ServerObject * transferer);
+	virtual bool                 onContainerAboutToLoseItem(ServerObject * destination, ServerObject& item, ServerObject* transferer);
+	ManufactureSchematicObject * getSchematic() const;
+
+	float getTimePerObject() const;
+
+	//simulation functions:
+	virtual void activate         (const NetworkId &actorId);
+	virtual void deactivate       ();
+	virtual void harvest          ();
+
+	bool         createObject     (bool testOnly = false);
+
+protected:
+	virtual void        initializeFirstTimeObject();
+	virtual void        endBaselines();
+	
+	void setTickCount(float count);
+
+private:
+  	ManufactureInstallationObject();
+	ManufactureInstallationObject(const ManufactureInstallationObject& rhs);
+	ManufactureInstallationObject&	operator=(const ManufactureInstallationObject& rhs);
+
+private:
+
+	class TaskManufactureObject;
+	friend class TaskManufactureObject;
+
+	typedef stdvector<std::pair<CachedNetworkId, int> >::fwd IngredientVector;
+
+	void              restoreIngredients(IngredientVector const &ingredients);
+	void              destroyIngredients(IngredientVector const &ingredients);
+	bool              transferCraftedIngredientToSchematic(ServerObject & inputHopper, ManufactureSchematicObject & schematic, const NetworkId & craftedId, int ingredientCount, IngredientVector &ingredients);
+	const NetworkId & transferTemplateIngredientToSchematic(ServerObject & inputHopper, ManufactureSchematicObject & schematic, const ObjectTemplate & componentTemplate, IngredientVector &ingredients);
+	const NetworkId & transferResourceTypeToSchematic(ServerObject & inputHopper, ManufactureSchematicObject & schematic, const NetworkId & resourceTypeId, int resourceCount);
+
+	FactoryObject * getCurrentCrate(const ManufactureSchematicObject & contents);
+	FactoryObject * makeNewCrate(const ManufactureSchematicObject & contents);
+
+private:
+
+	CachedNetworkId                                  m_currentCrate; // crate we are stuffing objects into
+};
+
+
+inline void ManufactureInstallationObject::setTickCount(float count)
+{
+	InstallationObject::setTickCount(count);
+}
+
+
+#endif	// _INCLUDED_ManufactureInstallationObject_H
diff --git a/engine/server/library/serverGame/src/shared/object/ManufactureObjectInterface.h b/engine/server/library/serverGame/src/shared/object/ManufactureObjectInterface.h
new file mode 100644
index 00000000..6a7133e0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ManufactureObjectInterface.h
@@ -0,0 +1,53 @@
+//========================================================================
+//
+// ManufactureObjectInterface.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef INCLUDED_ManufactureObjectInterface_H
+#define INCLUDED_ManufactureObjectInterface_H
+
+#include "serverGame/ServerIntangibleObjectTemplate.h"
+
+
+namespace Crafting
+{
+	struct IngredientSlot;
+}
+
+//========================================================================
+
+/**
+ * Pure abstract class that must be implemented by objects that can be used to 
+ * create new crafted items
+ */
+class ManufactureObjectInterface
+{
+public:
+	typedef std::map<StringId, float> AttribMap;
+	typedef std::vector<StringId>     StringIdList;
+
+	virtual uint32               getDraftSchematic() const = 0;
+	virtual bool                 getSlot(int index, Crafting::IngredientSlot & data, bool flag) const = 0;
+	virtual int                  getSlotsCount() const = 0;
+	virtual const AttribMap &    getAttributes() const = 0;
+	virtual void                 setAttribute(const ServerIntangibleObjectTemplate::SchematicAttribute & attribute) = 0;
+	virtual void                 setAttribute(const StringId & name, float value) = 0;
+	virtual const AttribMap &    getResourceMaxAttributes() const = 0;
+	virtual void                 setResourceMaxAttribute(const StringId & name, float value) = 0;
+	virtual const StringIdList & getExperimentAttributeNames() const = 0;
+	virtual void                 setExperimentAttribute(const StringId & name, float value) = 0;
+	virtual void                 getAllExperimentAttributeValues(const StringId & name, float & value, float & minValue, float & maxValue, float & resourceMaxValue) const = 0;
+	virtual void                 setExperimentAttributeLimits(const StringId & name, float minValue, float maxValue, float resourceMaxValue) = 0;
+	virtual bool                 isMakingObject(void) const = 0;
+
+	virtual const NetworkId &    getDerivedNetworkId() const = 0;
+};
+
+
+//========================================================================
+
+
+#endif	// INCLUDED_ManufactureObjectInterface_H
diff --git a/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.cpp b/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.cpp
new file mode 100644
index 00000000..93a2e03f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.cpp
@@ -0,0 +1,3473 @@
+//========================================================================
+//
+// ManufactureSchematicObject.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ManufactureSchematicObject.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/Chat.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/DraftSchematicObject.h"
+#include "serverGame/FactoryObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ManufactureSchematicSynchronizedUi.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ProsePackageManagerServer.h"
+#include "serverGame/ResourceContainerObject.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerController.h"
+#include "serverGame/ServerManufactureSchematicObjectTemplate.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/Crc.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedGame/CraftingData.h"
+#include "sharedGame/OutOfBandPackager.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/SharedObjectAttributes.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlots.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlotsQueryResponse.h"
+#include "sharedObject/ArrangementDescriptor.h"
+#include "sharedObject/ArrangementDescriptorList.h"
+#include "sharedObject/CustomizationData.h"
+#include "sharedObject/CustomizationDataProperty.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/RangedIntCustomizationVariable.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainmentProperty.h"
+#include "sharedObject/VolumeContainer.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+
+
+namespace ManufactureSchematicObjectNamespace
+{
+	// objvar names
+	const std::string OBJVAR_CRAFTING_IS_PROTOTYPE("crafting.isPrototype");
+	const std::string OBJVAR_SLOTS("ingr");
+	const std::string OBJVAR_SLOT_NAME("name");
+	const std::string OBJVAR_SLOT_INDEX("index");
+	const std::string OBJVAR_SLOT_TYPE("type");
+	const std::string OBJVAR_SLOT_OPTION("option");
+	const std::string OBJVAR_SLOT_COMPLEXITY("complex");
+	const std::string OBJVAR_INGREDIENTS("ingr");
+	const std::string OBJVAR_RESOURCE_ID("id");
+	const std::string OBJVAR_INGR_RESOURCE_ID(OBJVAR_INGREDIENTS + '.' + OBJVAR_RESOURCE_ID);
+	const std::string OBJVAR_RESOURCE_IMPORTED_DATA("resourceData");
+	const std::string OBJVAR_INGR_RESOURCE_IMPORTED_DATA(OBJVAR_INGREDIENTS + '.' + OBJVAR_RESOURCE_IMPORTED_DATA);
+	const std::string OBJVAR_RESOURCE_COUNT("cnt");
+	const std::string OBJVAR_COMPONENT_NAME("name");
+	const std::string OBJVAR_COMPONENT_ID("realId");
+	const std::string OBJVAR_COMPONENT_CRAFTED_ID("id");
+	const std::string OBJVAR_COMPONENT_CRAFTED_XP_TYPE("xpType");
+	const std::string OBJVAR_COMPONENT_TEMPLATE_NAME("tpl");
+	const std::string OBJVAR_SLOT_SOURCES("src");
+	const std::string OBJVAR_ATTRIBUTES("crafting_attributes");
+	const std::string OBJVAR_COMPONENTS("crafting_components");
+	const std::string OBJVAR_STORED_RESOURCES("crafting_resource");
+	const std::string OBJVAR_ATTRIBUTE_BONUSES("attrib_bonuses");
+	const std::string OBJVAR_ATTRIBUTE_BONUS("attribute.bonus");
+	const std::string OBJVAR_INVALID_SCHEMATIC("ImAnInvalidSchematic");
+	const std::string OBJVAR_ORIGINAL_OBJECT_ID("original_object_id");
+
+	const StringId ATTRIBUTES_COMPLEXITY("crafting","complexity");
+
+	// this is a special schematic that we use to show an image for schematics
+	// that have been removed from the game
+	const std::string MISSING_SCHEMATIC_SUBSTITUTE("object/draft_schematic/base/missing_schematic_substitute.iff");
+}
+
+using namespace ManufactureSchematicObjectNamespace;
+
+//----------------------------------------------------------------------
+
+const SharedObjectTemplate * ManufactureSchematicObject::m_defaultSharedTemplate = NULL;
+
+
+//========================================================================
+
+/**
+ * Class constructor. This will only get called when making a schematic created 
+ * by a designer.
+ *
+ * @param newTemplate		template to create the schematic from.
+ */
+ManufactureSchematicObject::ManufactureSchematicObject(
+	const ServerManufactureSchematicObjectTemplate* newTemplate) :
+	IntangibleObject(newTemplate),
+	m_draftSchematicSharedTemplate(),
+	m_draftSchematic(),
+	m_creatorId(NetworkId::cms_invalid),
+	m_creatorName(Unicode::narrowToWide(newTemplate->getCreator())),
+	m_itemsPerContainer(1),
+	m_attributes(),
+	m_manufactureTime(1),
+	m_isCrafting(false),
+	m_customAppearance(),
+	m_appearanceData(),
+	m_resourceMaxAttributes(),
+	m_schematicChangedSignal(0),
+	m_factories(),
+	m_isMakingObject(false)
+{
+	addMembersToPackages();
+}	// ManufactureSchematicObject::ManufactureSchematicObject(designer made)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+ManufactureSchematicObject::~ManufactureSchematicObject()
+{
+	// 	m_synchronizedUi deleted by superclass
+}	// ManufactureSchematicObject::~ManufactureSchematicObject
+
+//-----------------------------------------------------------------------
+
+ManufactureSchematicObject * ManufactureSchematicObject::asManufactureSchematicObject()
+{
+	return this;
+}
+
+//-----------------------------------------------------------------------
+
+ManufactureSchematicObject const * ManufactureSchematicObject::asManufactureSchematicObject() const
+{
+	return this;
+}
+
+//-----------------------------------------------------------------------
+
+void ManufactureSchematicObject::kill()
+{
+	IntangibleObject::kill();
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a shared template if none was given for this object.
+ *
+ * @return the shared template
+ */
+const SharedObjectTemplate * ManufactureSchematicObject::getDefaultSharedTemplate() const
+{
+	static const ConstCharCrcLowerString templateName("object/manufacture_schematic/base/shared_manufacture_schematic_default.iff");
+
+	if (m_defaultSharedTemplate == NULL)
+	{
+		m_defaultSharedTemplate = safe_cast<const SharedObjectTemplate *>(ObjectTemplateList::fetch(templateName));
+		WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create default shared object template %s", templateName.getString()));
+		if (m_defaultSharedTemplate != NULL)
+			ExitChain::add (removeDefaultTemplate, "ManufactureSchematicObject::removeDefaultTemplate");
+	}
+	return m_defaultSharedTemplate;
+}	// ManufactureSchematicObject::getDefaultSharedTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Cleans up the default shared template.
+ */
+void ManufactureSchematicObject::removeDefaultTemplate()
+{
+	if (m_defaultSharedTemplate != NULL)
+	{
+		m_defaultSharedTemplate->releaseReference();
+		m_defaultSharedTemplate = NULL;
+	}
+}	// ManufactureSchematicObject::removeDefaultTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Initializes the schematic from a draft schematic being used at a crafting 
+ * station.
+ *
+ * @param schematic		the draft schematic used to make this schematic
+ * @param creator		the player crafting
+ */
+void ManufactureSchematicObject::init(const DraftSchematicObject & schematic, const CachedNetworkId & creator)
+{
+	m_draftSchematic               = schematic.getObjectTemplate()->getCrcName().getCrc();
+	m_draftSchematicSharedTemplate = schematic.getSharedTemplate()->getCrcName().getCrc();
+
+	m_creatorId = creator;
+	if (creator.getObject() != NULL)
+	{
+		m_creatorName = safe_cast<const ServerObject *>(creator.getObject())->
+			getObjectName();
+	}
+
+	m_itemsPerContainer = schematic.getItemsPerContainer();
+	m_manufactureTime   = schematic.getManufactureTime();
+
+	m_attributes.clear();
+	m_resourceMaxAttributes.clear();
+
+	if (isAuthoritative())
+		removeObjVarItem(".");
+
+	m_isCrafting = true;
+}	// ManufactureSchematicObject::init
+
+//-----------------------------------------------------------------------
+
+/**
+ * Initializes data for a newly created object.
+ */
+void ManufactureSchematicObject::initializeFirstTimeObject()
+{
+	IntangibleObject::initializeFirstTimeObject();
+
+	const DraftSchematicObject * const sourceSchematic = DraftSchematicObject::getSchematic(getDraftSchematic());
+	NOT_NULL(sourceSchematic);
+
+	const ServerDraftSchematicObjectTemplate * const sourceSchematicTemplate = 
+		safe_cast<const ServerDraftSchematicObjectTemplate *>(sourceSchematic->getObjectTemplate());
+	NOT_NULL(sourceSchematicTemplate);
+
+	setObjectName         (sourceSchematic->getAssignedObjectName ());
+	setObjectNameStringId (sourceSchematic->getObjectNameStringId ());
+
+	setCount(10);
+
+	// the slots need to be set up externally, filtered by player skill
+	eraseObjVarListEntries(OBJVAR_SLOTS);
+
+	computeComplexity();
+
+	// copy the draft schematic objvars onto us
+	{
+	DynamicVariableList objvars;
+	sourceSchematicTemplate->getObjvars(objvars);
+	for (DynamicVariableList::MapType::const_iterator i = objvars.begin(); 
+		i != objvars.end(); ++i)
+	{
+		setObjVarItem((*i).first, (*i).second);
+	}
+	}
+
+	{
+	const int count = sourceSchematicTemplate->getManufactureScriptsCount();
+	GameScriptObject * const scriptObject = getScriptObject();
+	NOT_NULL(scriptObject);
+	for (int i = 0; i < count; ++i)
+	{
+		scriptObject->attachScript(sourceSchematicTemplate->getManufactureScripts(i), true);
+	}
+	}
+}	// ManufactureSchematicObject::initializeFirstTimeObject
+
+//-----------------------------------------------------------------------
+
+/**
+ * Initializes an object just proxied.
+ */
+void ManufactureSchematicObject::endBaselines()
+{
+	IntangibleObject::endBaselines();
+
+	recalculateData();
+}	// ManufactureSchematicObject::endBaselines
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a synchronized ui class in order to get data to the client during a 
+ * crafting session.
+ *
+ * @return the newly created class
+ */
+ServerSynchronizedUi * ManufactureSchematicObject::createSynchronizedUi ()
+{
+	ManufactureSchematicSynchronizedUi * sync = new ManufactureSchematicSynchronizedUi(*this);
+	if (sync)
+	{
+		// set up the sync ui for our slots
+		int i;
+		int count;
+		const DraftSchematicObject * draft = DraftSchematicObject::getSchematic(
+			m_draftSchematic.get());
+		NOT_NULL(draft);
+		DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
+		{
+			Crafting::IngredientSlot slotData;
+			count = slots.getCount();
+			for (i = 0; i < count; ++i)
+			{
+				if (getSlot(i, slotData, false))
+				{
+					sync->createNewSlot(slotData.name, slotData.complexity);
+					sync->setSlotType(slotData.name, slotData.ingredientType);
+					sync->setSlotOption(slotData.name, slotData.draftSlotOption);
+					sync->setSlotIndex(slotData.name, slotData.draftSlotIndex);
+				}
+			}
+		}
+
+		count = draft->getExperimentalAttributesCount();
+		for (i = 0; i < count; ++i)
+		{
+			sync->setAttribute(draft->getExperimentalAttribute(i), 0);
+		}
+
+		sync->setReady();
+	}
+	return sync;
+}
+
+//------------------------------------------------------------------------------
+
+/**
+ * Re-initializes the schematic.
+ */
+void ManufactureSchematicObject::reset()
+{
+	const DraftSchematicObject * const schematic = DraftSchematicObject::getSchematic(m_draftSchematic.get());
+	NOT_NULL(schematic);
+
+	const CreatureObject * owner = NetworkIdManager::getObjectById(m_creatorId.get())->asServerObject()->asCreatureObject();
+	NOT_NULL(owner);
+
+	init(*schematic, CachedNetworkId(*owner));
+
+	computeComplexity();
+	setObjVarItem(OBJVAR_CRAFTING_IS_PROTOTYPE, true);
+	
+	Crafting::IngredientSlot manfSlot;
+	ServerDraftSchematicObjectTemplate::IngredientSlot slot;
+	const int slotCount = schematic->getSlotsCount();
+	for (int i = 0; i < slotCount; ++i)
+	{
+		if (!schematic->getSlot(slot, i))
+		{
+			DEBUG_WARNING(true, ("draft schematic slot %d for schematic %s not "
+				"found!",i, schematic->getObjectTemplateName()));
+			continue;
+		}
+		if (!slot.optional || slot.optionalSkillCommand.empty() ||
+			owner->hasCommand(slot.optionalSkillCommand))
+		{
+			// create the slot
+			IGNORE_RETURN(getSlot(slot.name, manfSlot));
+			// set the manufacturing slot->draft slot map
+			setSlotIndex(slot.name, i);
+		}
+	}
+}	// ManufactureSchematicObject::reset
+
+//------------------------------------------------------------------------------
+
+/**
+ * Returns the draft schematic name crc for the schematic used to define this 
+ * schematic.
+ *
+ * @return the schematic crc
+ */
+uint32 ManufactureSchematicObject::getDraftSchematic() const
+{
+	return m_draftSchematic.get();
+}
+
+//------------------------------------------------------------------------------
+
+/**
+ * Returns if we are creating a finished item or a prototype.
+ *
+ * @return true if we are making a finished item, false if a prototype
+ */
+bool ManufactureSchematicObject::isMakingObject() const
+{
+	return m_isMakingObject;
+}
+
+//------------------------------------------------------------------------------
+
+/**
+ * Returns our network id. Needed so that the ManufactureObjectInterface can 
+ * report its id.
+ *
+ * @return our network id
+ */
+const NetworkId & ManufactureSchematicObject::getDerivedNetworkId() const
+{
+	return getNetworkId();
+}	// ManufactureSchematicObject::getDerivedNetworkId
+
+//------------------------------------------------------------------------------
+
+/**
+ * Sets the value for an attribute of the schematic
+ *
+ * @param attribute		the attribute data
+ */
+void ManufactureSchematicObject::setAttribute(const ServerIntangibleObjectTemplate::SchematicAttribute & attribute)
+{
+	setAttribute(attribute.name, static_cast<float>(attribute.value));
+}
+
+//------------------------------------------------------------------------------
+
+/**
+ * Sets the value for an attribute of the schematic
+ *
+ * @param name		the attribute name
+ * @param value		the attribute value
+ */
+void ManufactureSchematicObject::setAttribute(const StringId & name, float value)
+{
+	if (isAuthoritative())
+	{
+		m_attributes.set(name, value);
+	}
+	else
+	{
+		WARNING_STRICT_FATAL(true, ("ManufactureSchematicObject::setAttribute "
+			"called on non-auth object %s", getNetworkId().getValueString().c_str()));
+	}
+}
+
+//-----------------------------------------------------------------------
+
+const std::map<StringId, float> & ManufactureSchematicObject::getResourceMaxAttributes() const
+{
+	return m_resourceMaxAttributes.getMap();
+}
+
+//-----------------------------------------------------------------------
+
+void ManufactureSchematicObject::setResourceMaxAttribute(const StringId & name, float value)
+{
+	m_resourceMaxAttributes.set(name, value);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the crafting type of this schematic.
+ *
+ * @return the crafting type
+ */
+ServerIntangibleObjectTemplate::CraftingType ManufactureSchematicObject::getCategory() const
+{
+	const DraftSchematicObject * draft = DraftSchematicObject::getSchematic(
+		getDraftSchematic());
+
+	// There's a possibility that the draft schematic this schematic is based on
+	// has been changed enough to make this schematic useless, or has been removed
+	// from the game. If this happens, we log it and tell the player to delete
+	// this schematic
+	static const int BUFSIZE = 1024;
+	char errBuffer[BUFSIZE];
+	bool schematicOk = true;
+	
+	if (getObjVars().hasItem(OBJVAR_INVALID_SCHEMATIC))
+	{
+		schematicOk = false;
+	}
+	else if (draft != NULL)
+	{
+		// test the ingredients
+		Crafting::IngredientSlot sourceSlot;
+		ServerDraftSchematicObjectTemplate::IngredientSlot draftSlot;
+		int numSlots = getSlotsCount();
+		for (int i = 0; i < numSlots; ++i)
+		{
+			// see if we can get the slot from ourself
+			if (!getSlot(i, sourceSlot, true))
+			{
+				sprintf(errBuffer, "slot # %d not existing", i);
+				schematicOk = false;
+				break;
+			}
+
+			// see if the draft schematic knows about the slot
+			if (!draft->getSlot(draftSlot, sourceSlot.name))
+			{
+				snprintf(errBuffer, BUFSIZE, "missing slot %s in draft schematic %s", 
+					sourceSlot.name.getCanonicalRepresentation().c_str(), 
+					draft->getObjectTemplateName());
+				errBuffer[BUFSIZE-1] = '\0';
+				schematicOk = false;
+				break;
+			}
+		}
+	}
+	else
+	{
+		sprintf(errBuffer, "its source draft schematic (crc=%lu) not existing", 
+			getDraftSchematic());
+		schematicOk = false;
+	}
+
+	if (schematicOk)
+		return draft->getCategory();
+
+	// this schematic can't be used, inform the player
+	const CreatureObject * owner = NULL;
+	const Object * object = ContainerInterface::getContainedByObject(*this);
+	while (owner == NULL && object != NULL && object->asServerObject() != NULL)
+	{
+		if (object->asServerObject()->asCreatureObject() != NULL)
+			owner = object->asServerObject()->asCreatureObject();
+		else
+			object = ContainerInterface::getContainedByObject(*object);
+	}
+
+	// log that the schematic can't be used
+	LOG("CustomerService", ("Crafting:Manufacturing schematic %s "
+		"owned by %s is unuseable due to %s", getNetworkId().getValueString().c_str(), 
+		PlayerObject::getAccountDescription(owner).c_str(), errBuffer));
+	if (owner != NULL)
+	{
+		// send mail to the owner telling them their schematic can't be used
+		const static StringId message("system_msg", "manf_schematic_unuseable");
+		Unicode::String oob;
+		ProsePackage pp;
+		ProsePackageManagerServer::createSimpleProsePackage (*this, message, pp);
+		OutOfBandPackager::pack(pp, -1, oob);
+		Unicode::String messageString = Unicode::narrowToWide("@" + message.getCanonicalRepresentation());
+		Chat::sendPersistentMessage("", Unicode::wideToNarrow(owner->getObjectName()), 
+			messageString, Unicode::emptyString, oob);
+	}
+
+	return static_cast<ServerIntangibleObjectTemplate::CraftingType>(0);
+}	// ManufactureSchematicObject::getCategory
+
+//-----------------------------------------------------------------------
+
+/**
+ * Forwards the draft schematic flag.
+ *
+ * @return true if a crafting session destroys it's ingredients
+ */
+bool ManufactureSchematicObject::mustDestroyIngredients() const
+{
+	const DraftSchematicObject * draft = DraftSchematicObject::getSchematic(
+		m_draftSchematic.get());
+	NOT_NULL(draft);
+	if (draft != NULL)
+		return draft->mustDestroyIngredients();
+	return false;
+}	// ManufactureSchematicObject::mustDestroyIngredients
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns an ingredient slot needed to manufacture an item with this schematic.
+ *
+ * @param index				slot to get
+ * @param data				structure to be filled in with the slot data
+ * @param creatingObject	flag that we are getting the slot in order to create 
+ *							a crafted object; if the slot is a component slot, 
+ *							this will cause the data.ingredient value to be the 
+ *                          component id, instead of the component's manf schematic id
+ *
+ * @return true on success, false if the index was out of range
+ */
+bool ManufactureSchematicObject::getSlot(int index, Crafting::IngredientSlot & data, 
+	bool creatingObject) const
+{
+	const DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
+
+	if (index < 0 || index >= static_cast<int>(slots.getCount()))
+		return false;
+
+	const DynamicVariableList::NestedList slot(slots.getItemByPosition(index).getNestedList());
+
+	int intval=0;
+	if (slot.getItem(OBJVAR_SLOT_TYPE,intval))
+		data.ingredientType = static_cast<enum Crafting::IngredientType>(intval);
+	slot.getItem(OBJVAR_SLOT_NAME,data.name);
+	slot.getItem(OBJVAR_SLOT_OPTION,data.draftSlotOption);
+	slot.getItem(OBJVAR_SLOT_INDEX,data.draftSlotIndex);
+	slot.getItem(OBJVAR_SLOT_COMPLEXITY,data.complexity);
+	data.ingredients.clear();
+
+	// get the draft schematic and slot info for the slot to determine the 
+	// ingredient type
+	const DraftSchematicObject * const draft = DraftSchematicObject::getSchematic(getDraftSchematic());
+	if (!draft)
+	{
+		WARNING (true, ("ManufactureSchematicObject [%d] has invalid draft "
+			"schematic [%u]", getNetworkId().getValueString().c_str(), 
+			getDraftSchematic()));
+		return false;
+	}
+
+	ServerDraftSchematicObjectTemplate::IngredientSlot draftSlot;
+	if (!draft->getSlot(draftSlot, data.name))
+		return false;
+
+	ServerIntangibleObjectTemplate::IngredientType ingredientType;
+	if (data.draftSlotOption < 0 || data.draftSlotOption >= static_cast<int>(draftSlot.options.size()))
+	{
+		ingredientType = draftSlot.options[0].ingredientType;
+	}
+	else
+		ingredientType = draftSlot.options[data.draftSlotOption].ingredientType;
+
+	DynamicVariableList::NestedList slotIngredients(slot,OBJVAR_INGREDIENTS);
+
+	if (ingredientType == ServerIntangibleObjectTemplate::IT_item ||
+		ingredientType == ServerIntangibleObjectTemplate::IT_template ||
+		ingredientType == ServerIntangibleObjectTemplate::IT_templateGeneric ||
+		ingredientType == ServerIntangibleObjectTemplate::IT_schematic ||
+		ingredientType == ServerIntangibleObjectTemplate::IT_schematicGeneric)
+	{
+		// ingredient is a component
+
+		// in theory there can be more components than sources (although not the
+		// reverse), so we need to keep track of the sources separately
+		DynamicVariableList::NestedList sources(slot,OBJVAR_SLOT_SOURCES);
+		int sourceIndex = 0;
+
+		char buffer[32];
+		const int count = slotIngredients.getCount();
+		for (int i = 0; i < count; ++i)
+		{
+			_itoa(i, buffer, 10);
+			const DynamicVariableList::NestedList ingredient(slotIngredients,buffer);
+
+			Crafting::ComponentIngredient * const component = new Crafting::ComponentIngredient();
+			if (component == NULL)
+				return false;
+			data.ingredients.push_back(Crafting::SimpleIngredientPtr(component));
+			component->count = 1;
+			if (!ingredient.hasItem(OBJVAR_COMPONENT_NAME))
+				return false;
+			ingredient.getItem(OBJVAR_COMPONENT_NAME,component->componentName);
+
+			const bool isComponentCrafted = ingredient.hasItem(OBJVAR_COMPONENT_CRAFTED_XP_TYPE);
+			if (isComponentCrafted)
+			{
+				// set the xp type
+				ingredient.getItem(OBJVAR_COMPONENT_CRAFTED_XP_TYPE,component->xpType);
+				
+				// set the xp source and amount
+				if (!sources.empty())
+				{
+					DynamicVariableList::NestedList::const_iterator data(sources.getItemByPosition(sourceIndex));
+					if (data != sources.end())
+					{
+						component->source = NetworkId(data.getName());
+						data.getValue(component->sourceXp);
+						++sourceIndex;
+					}
+				}
+			}
+			if (creatingObject)
+			{
+				ingredient.getItem(OBJVAR_COMPONENT_ID, component->ingredient);
+			}
+			else
+			{
+				if (ingredientType != ServerIntangibleObjectTemplate::IT_templateGeneric && isComponentCrafted)
+				{
+					ingredient.getItem(OBJVAR_COMPONENT_CRAFTED_ID, component->ingredient);
+				}
+				else
+				{
+					if (!ingredient.getItem(OBJVAR_COMPONENT_TEMPLATE_NAME,component->templateName))
+						return false;
+				}
+			}
+		}
+	}
+	else
+	{
+		// ingredient is a resource
+		NetworkId ingredientId;
+		if (slotIngredients.getItem(OBJVAR_RESOURCE_ID,ingredientId))
+		{
+			int resourceCount = 0;
+			slotIngredients.getItem(OBJVAR_RESOURCE_COUNT, resourceCount);
+
+			// get the xp type based on the resource container
+			int xpType = 0;
+			const ResourceTypeObject * const resourceType = ServerUniverse::getInstance().getResourceTypeById(ingredientId);
+			if (resourceType != NULL)
+			{
+				std::string crateTemplateName;
+				resourceType->getCrateTemplate(crateTemplateName);
+				const ServerObjectTemplate * crateTemplate = safe_cast<const ServerObjectTemplate *>(ObjectTemplateList::fetch(crateTemplateName));
+				if (crateTemplate != NULL && crateTemplate->getXpPointsCount() > 0)
+				{
+					ServerObjectTemplate::Xp xpData;
+					crateTemplate->getXpPoints(xpData, 0);
+					xpType = xpData.type;
+				}
+			}
+
+			const DynamicVariableList::NestedList sources(slot,OBJVAR_SLOT_SOURCES);
+			if (!sources.empty())
+			{
+				for (DynamicVariableList::NestedList::const_iterator source=sources.begin(); source!=sources.end(); ++source)
+				{
+					const NetworkId sourceId(source.getName());
+					int sourceResourceCount = 0;
+					source.getValue(sourceResourceCount);
+					data.ingredients.push_back(Crafting::SimpleIngredientPtr(
+												   new Crafting::SimpleIngredient(ingredientId, sourceResourceCount, 
+																				  sourceId, xpType)));
+				}
+			}
+			else
+			{
+				data.ingredients.push_back(Crafting::SimpleIngredientPtr(
+					new Crafting::SimpleIngredient(ingredientId, resourceCount, 
+					NetworkId::cms_invalid, xpType)));
+			}
+		}
+	}
+
+	return true;
+}	// ManufactureSchematicObject::getSlot(int)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Gets the ingredient slot with a given name. If the slot does not exist (which 
+ * may be the case for optional slots) the slot will be created.
+ *
+ * @param name		the slot name
+ * @param data		structure to be filled in with the slot data
+ *
+ * @return true on success, false on error
+ */
+bool ManufactureSchematicObject::getSlot(const StringId & name, Crafting::IngredientSlot & data)
+{
+	DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
+	DynamicVariableList::NestedList::const_iterator i(slots.begin());
+
+	int index=0;
+	
+	// see if the slot already exists
+	for (; i!=slots.end(); ++i)
+	{
+		DynamicVariableList::NestedList slot=i.getNestedList();
+		StringId nameValue;
+		if (slot.getItem(OBJVAR_SLOT_NAME,nameValue) && name == nameValue)
+		{
+			break;
+		}
+		++index;
+	}
+	if (i == slots.end())
+	{
+		// check the draft schematic for the slot
+		const DraftSchematicObject * draft = DraftSchematicObject::getSchematic(
+			m_draftSchematic.get());
+		NOT_NULL(draft);
+
+		ServerDraftSchematicObjectTemplate::IngredientSlot draftSlot;
+		if (!draft->getSlot(draftSlot, name))
+			return false;
+
+		// add the obvars for the new slot
+		// @todo: can we make the list name the slot name? Is the StringId text unique?
+		char buffer[256];
+		char secondBuffer[32];
+		if(slots.getCount() < 10)
+			sprintf(secondBuffer, "0%d", slots.getCount());
+		else
+			sprintf(secondBuffer, "%d", slots.getCount());
+		sprintf(buffer, "%s.%s.", OBJVAR_SLOTS.c_str(), secondBuffer);
+		setObjVarItem(buffer + OBJVAR_SLOT_TYPE, Crafting::IT_none);
+		setObjVarItem(buffer + OBJVAR_SLOT_NAME, draftSlot.name);
+		setObjVarItem(buffer + OBJVAR_SLOT_OPTION, -1);
+		setObjVarItem(buffer + OBJVAR_SLOT_INDEX, -1);
+		setObjVarItem(buffer + OBJVAR_SLOT_COMPLEXITY, draftSlot.complexity);
+
+		ManufactureSchematicSynchronizedUi * const sync = dynamic_cast<
+			ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+		if (sync)
+			sync->createNewSlot(draftSlot.name, draftSlot.complexity);
+	}
+
+	return getSlot(index, data, false);
+}	// ManufactureSchematicObject::getSlot(const StringId &)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the number of ingredient slots needed to manufacture an item with 
+ * this schematic.
+ *
+ * @return the ingredient count
+ */
+int ManufactureSchematicObject::getSlotsCount() const
+{
+	DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
+	return slots.getCount();
+}	// ManufactureSchematicObject::getSlotsCount
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the slot type of a manf slot.
+ *
+ * @param name		the name of the slot
+ * @param type		the slot type
+ */
+void ManufactureSchematicObject::setSlotType(const StringId & name, int type)
+{
+	DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
+
+	for (DynamicVariableList::NestedList::const_iterator i(slots.begin()); i!=slots.end(); ++i)
+	{
+		DynamicVariableList::NestedList slot=i.getNestedList();
+		StringId nameValue;
+		if (slot.getItem(OBJVAR_SLOT_NAME,nameValue) && name == nameValue)
+		{
+			setObjVarItem(slot.getNameWithPath()+'.'+OBJVAR_SLOT_TYPE, type);
+
+			ManufactureSchematicSynchronizedUi * sync = safe_cast<
+				ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+			if (sync)
+				sync->setSlotType(name, type);
+			break;
+		}
+	}
+}	// ManufactureSchematicObject::setSlotType
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the slot option index of a manf slot.
+ *
+ * @param name		the name of the slot
+ * @param option	the option index
+ */
+void ManufactureSchematicObject::setSlotOption(const StringId & name, int option)
+{
+	DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
+
+	for (DynamicVariableList::NestedList::const_iterator i(slots.begin()); i!=slots.end(); ++i)
+	{
+		DynamicVariableList::NestedList slot = i.getNestedList();
+		StringId nameValue;
+		if (slot.getItem(OBJVAR_SLOT_NAME,nameValue) && (name == nameValue))
+		{
+			setObjVarItem(slot.getNameWithPath()+'.'+OBJVAR_SLOT_OPTION, option);
+
+			ManufactureSchematicSynchronizedUi * sync = safe_cast<
+				ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+			if (sync)
+				sync->setSlotOption(name, option);
+			break;
+		}
+	}
+}	// ManufactureSchematicObject::setSlotOption
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the draft schematic slot index of a manf slot.
+ *
+ * @param name		the name of the slot
+ * @param index		the draft schematic index
+ */
+void ManufactureSchematicObject::setSlotIndex(const StringId & name, int index)
+{
+	DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
+
+	for (DynamicVariableList::NestedList::const_iterator i(slots.begin()); i!=slots.end(); ++i)
+	{
+		DynamicVariableList::NestedList slot=i.getNestedList();
+		StringId nameValue;
+		if (slot.getItem(OBJVAR_SLOT_NAME,nameValue) && (name==nameValue))
+		{
+			setObjVarItem(slot.getNameWithPath()+'.'+OBJVAR_SLOT_INDEX, index);
+
+			ManufactureSchematicSynchronizedUi * sync = safe_cast<
+				ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+			if (sync)
+				sync->setSlotIndex(name, index);
+			break;
+		}
+	}
+}	// ManufactureSchematicObject::setSlotIndex
+
+//-----------------------------------------------------------------------
+
+/**
+ * Modifies a slot's complexity by a value.
+ *
+ * @param name				the name of the slot
+ * @param complexityDelta	value to add to the current slot complexity
+ */ 
+void ManufactureSchematicObject::modifySlotComplexity(const StringId & name, 
+	float complexityDelta)
+{
+	DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
+
+	for (DynamicVariableList::NestedList::const_iterator i(slots.begin()); i!=slots.end(); ++i)
+	{
+		DynamicVariableList::NestedList slot=i.getNestedList();
+		StringId nameValue;
+		if (slot.getItem(OBJVAR_SLOT_NAME,nameValue) && (name==nameValue))
+		{
+			float complexity =0;
+			slot.getItem(OBJVAR_SLOT_COMPLEXITY,complexity);
+			setObjVarItem(slot.getNameWithPath()+'.'+OBJVAR_SLOT_COMPLEXITY, complexity + complexityDelta);
+
+			ManufactureSchematicSynchronizedUi * sync = safe_cast<
+				ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+			if (sync)
+				sync->setSlotComplexity(name, complexity + complexityDelta);
+			break;
+		}
+	}
+}	// ManufactureSchematicObject::modifySlotComplexity
+
+//-----------------------------------------------------------------------
+
+/**
+ * Adds a resource type to a schematic slot.
+ *
+ * @param name			the name of the slot
+ * @param resourceId	id of the resource to add
+ * @param count			number of resources to add
+ */
+void ManufactureSchematicObject::addSlotResource(const StringId & name, 
+	const NetworkId & resourceId, int count, const NetworkId & sourceId)
+{
+	DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
+
+	for (DynamicVariableList::NestedList::const_iterator i(slots.begin()); i!=slots.end(); ++i)
+	{
+		DynamicVariableList::NestedList slot=i.getNestedList();
+		StringId nameValue;
+		if (slot.getItem(OBJVAR_SLOT_NAME,nameValue) && (name==nameValue))
+		{
+			DynamicVariableList::NestedList slotIngredients(slot,OBJVAR_INGREDIENTS);
+
+			setObjVarItem(slotIngredients.getNameWithPath()+'.'+OBJVAR_RESOURCE_ID, resourceId);
+
+			// if the resource is an imported resource, save the resource data as well
+			removeObjVarItem(slotIngredients.getNameWithPath()+'.'+OBJVAR_RESOURCE_IMPORTED_DATA);
+			if (resourceId.getValue() > NetworkId::cms_maxNetworkIdWithoutClusterId)
+			{
+				ResourceTypeObject const * const rto = ServerUniverse::getInstance().getImportedResourceTypeById(resourceId);
+				if (rto)
+				{
+					std::string const resourceData = rto->getResourceTypeDataForExport();
+
+					if (!resourceData.empty())
+						setObjVarItem(slotIngredients.getNameWithPath()+'.'+OBJVAR_RESOURCE_IMPORTED_DATA, resourceData);
+				}
+			}
+
+			int ingredientCount=0;
+			if (slotIngredients.getItem(OBJVAR_RESOURCE_COUNT,ingredientCount))
+			{
+				setObjVarItem(slotIngredients.getNameWithPath()+'.'+OBJVAR_RESOURCE_COUNT, 
+					ingredientCount + count);
+			}
+			else
+			{
+				setObjVarItem(slotIngredients.getNameWithPath() + '.' + 
+					OBJVAR_RESOURCE_COUNT, count);
+			}
+
+			// create the name of the objvar for the resource xp source
+			char buffer[1024];
+			sprintf(buffer, "%s.%s.%s", slot.getNameWithPath().c_str(),
+				OBJVAR_SLOT_SOURCES.c_str(), sourceId.getValueString().c_str());
+			
+			// see if the xp source already contributed to this slot
+			int oldCount = 0;
+			IGNORE_RETURN(getObjVars().getItem(buffer, oldCount));
+			
+			// set the xp source objvar
+			setObjVarItem(buffer, count + oldCount);
+
+			// tell the client
+			ManufactureSchematicSynchronizedUi * sync = safe_cast<
+				ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+			if (sync)
+				sync->addSlotIngredient(name, resourceId, count);
+			break;
+		}
+	}
+}	// ManufactureSchematicObject::addSlotResource
+
+//-----------------------------------------------------------------------
+
+/**
+ * Adds a component to a schematic slot.
+ *
+ * @param name				the name of the slot
+ * @param component			the component to add
+ * @param ingredientType	the ingredient type that the slot requires
+ */
+void ManufactureSchematicObject::addSlotComponent(const StringId & name, 
+	const TangibleObject & component, ServerIntangibleObjectTemplate::IngredientType 
+	ingredientType)
+{
+	// Check if the object being added is a factory
+	const TangibleObject * componentPtr = &component;
+	const FactoryObject * factory = dynamic_cast<const FactoryObject *>(&component);
+	if (factory != NULL)
+	{
+		componentPtr = factory->getContainedObject();
+		if (componentPtr == NULL)
+		{
+			WARNING(true, ("ManufactureSchematicObject::addSlotComponent passed "
+				"FactoryObject %s with no contained object", 
+				factory->getNetworkId().getValueString().c_str()));
+			return;
+		}
+	}
+
+	DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
+
+	for (DynamicVariableList::NestedList::const_iterator i(slots.begin()); i!=slots.end(); ++i)
+	{
+		DynamicVariableList::NestedList slot=i.getNestedList();
+		StringId nameValue;
+		if (slot.getItem(OBJVAR_SLOT_NAME,nameValue) && (name==nameValue))
+		{
+			DynamicVariableList::NestedList slotIngredients(slot,OBJVAR_INGREDIENTS);
+			char buffer[1024];
+			sprintf(buffer, "%s.%s.%s.%d.", OBJVAR_SLOTS.c_str(), slot.getName().c_str(), 
+				OBJVAR_INGREDIENTS.c_str(), slotIngredients.getCount());
+			setObjVarItem(buffer + OBJVAR_COMPONENT_NAME, componentPtr->getEncodedObjectName());
+			setObjVarItem(buffer + OBJVAR_COMPONENT_ID, componentPtr->getNetworkId());
+			
+			if (ingredientType != ServerIntangibleObjectTemplate::IT_templateGeneric &&
+				componentPtr->isCrafted())
+			{
+				// set the ingredient id
+				setObjVarItem(buffer + OBJVAR_COMPONENT_CRAFTED_ID, componentPtr->getCraftedId());
+			}
+			else
+			{
+				// set the ingredient template
+				setObjVarItem(buffer + OBJVAR_COMPONENT_TEMPLATE_NAME, 
+					Unicode::narrowToWide(componentPtr->getObjectTemplateName()));
+			}
+			if (componentPtr->isCrafted())
+			{
+				// set the xp type
+				setObjVarItem(buffer + OBJVAR_COMPONENT_CRAFTED_XP_TYPE, componentPtr->getCreatorXpType());
+				
+				// add crafter xp data
+				sprintf(buffer, "%s.%s.%s", slot.getNameWithPath().c_str(), 
+					OBJVAR_SLOT_SOURCES.c_str(), componentPtr->getCreatorId().getValueString().c_str());
+
+				setObjVarItem(buffer, componentPtr->getCreatorXp());
+			}
+
+			// transfer component objvars on the component to us
+			StringId slotName;
+			slot.getItem(OBJVAR_SLOT_NAME,slotName);
+			std::string componentCopyName = OBJVAR_COMPONENTS + "." + slotName.getText();
+			if (!getObjVars().hasItem(componentCopyName))
+				copyObjVars(componentCopyName, *componentPtr, OBJVAR_COMPONENTS);
+
+			// transfer attrib bonuses on the component to us
+			std::vector<int> attribBonuses;
+			if (component.getAttribBonuses(attribBonuses))
+			{
+				const std::string bonusObjVarName(componentCopyName + "." + OBJVAR_ATTRIBUTE_BONUSES);
+				std::vector<float> componentBonuses(attribBonuses.size());
+				std::copy(attribBonuses.begin(), attribBonuses.end(), componentBonuses.begin());
+				setObjVarItem(componentCopyName + "." + OBJVAR_ATTRIBUTE_BONUSES, componentBonuses);
+			}
+
+			ManufactureSchematicSynchronizedUi * sync = safe_cast<ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+			if (sync)
+				sync->addSlotIngredient(name, componentPtr->getNetworkId(), 1);
+			break;
+		}
+	}
+}	// ManufactureSchematicObject::addSlotComponent
+
+//-----------------------------------------------------------------------
+
+/**
+ * Finds a component in our volume container that matches given component info.
+ *
+ * @param info		info about the component we want
+ *
+ * @return the component
+ */
+TangibleObject * ManufactureSchematicObject::getComponent(
+	const Crafting::ComponentIngredient & info) const
+{
+	const VolumeContainer * volumeContainer = ContainerInterface::getVolumeContainer(*this);
+	if (volumeContainer == NULL)
+	{
+		DEBUG_WARNING(true, ("Manf schematic %s does not have a volume container!",
+			getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+
+	// check if the component is in a FactoryObject; if it is, return the factory,
+	// whether it's in our volume container or not
+	if (info.ingredient != NetworkId::cms_invalid)
+	{
+		ServerObject * object = ServerWorld::findObjectByNetworkId(info.ingredient);
+		if (object != NULL)
+		{
+			Object * container = ContainerInterface::getContainedByObject(*object);
+			if (container != NULL && dynamic_cast<FactoryObject*>(container) != NULL)
+				return safe_cast<TangibleObject *>(container);
+		}
+	}
+
+	for (ContainerConstIterator iter = volumeContainer->begin(); 
+		iter != volumeContainer->end(); ++iter)
+	{
+		const Container::ContainedItem & item = *iter;
+		TangibleObject * object = safe_cast<TangibleObject *>(item.getObject());
+		if (object != NULL)
+		{
+			if (info.ingredient != NetworkId::cms_invalid)
+			{
+				// need matching crafted id
+//				if (info.ingredient == object->getCraftedId())
+				if (info.ingredient == object->getNetworkId())
+					return object;
+			}
+			else
+			{
+				// need matching template name
+				if (info.templateName == object->getObjectTemplateName())
+					return object;
+			}
+		}
+	}
+	return NULL;
+}	// ManufactureSchematicObject::getComponent
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the ids of the players who are supplying resources for a schematic slot.
+ *
+ * @param slotIndex		the slot index
+ * @param sources		the ids of the players and the amount of resources they 
+ *						supplied
+ */
+void ManufactureSchematicObject::setSlotSources(int slotIndex, 
+	const std::vector<std::pair<NetworkId, int> > & sources)
+{
+	DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
+	DynamicVariableList::NestedList::const_iterator slotIterator=slots.getItemByPosition(slotIndex);
+	DynamicVariableList::NestedList slot(slotIterator.getNestedList());
+	DynamicVariableList::NestedList slotSources(slot,OBJVAR_SLOT_SOURCES);
+
+	eraseObjVarListEntries(slotSources.getNameWithPath());
+
+	int count = sources.size();
+	for (int i = 0; i < count; ++i)
+	{
+		const std::pair<NetworkId, int> & source = sources[i];
+		setObjVarItem(slotSources.getNameWithPath()+'.'+source.first.getValueString(),
+					  source.second);
+	}
+}	// ManufactureSchematicObject::setSlotSources
+
+//-----------------------------------------------------------------------
+
+/**
+ * Clears the data for a given slot in the schematic.
+ *
+ * @param name		the name of the slot to clear
+ */
+void ManufactureSchematicObject::clearSlot(const StringId & name)
+{
+	const DraftSchematicObject * draft = DraftSchematicObject::getSchematic(
+		m_draftSchematic.get());
+	NOT_NULL(draft);
+
+	ServerDraftSchematicObjectTemplate::IngredientSlot draftSlot;
+	if (!draft->getSlot(draftSlot, name))
+		return;
+
+	const DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
+
+	for (DynamicVariableList::NestedList::const_iterator i(slots.begin()); i!=slots.end(); ++i)
+	{
+		const DynamicVariableList::NestedList slot(i.getNestedList());
+		StringId nameValue;
+		if (slot.getItem(OBJVAR_SLOT_NAME,nameValue) && (name == nameValue))
+		{
+			setObjVarItem(slot.getNameWithPath()+'.'+OBJVAR_SLOT_TYPE, Crafting::IT_none);
+			setObjVarItem(slot.getNameWithPath()+'.'+OBJVAR_SLOT_OPTION, -1);
+			setObjVarItem(slot.getNameWithPath()+'.'+OBJVAR_SLOT_COMPLEXITY, draftSlot.complexity);
+
+			eraseObjVarListEntries(slot.getNameWithPath()+'.'+OBJVAR_INGREDIENTS);
+			eraseObjVarListEntries(slot.getNameWithPath()+'.'+OBJVAR_SLOT_SOURCES);
+
+			std::string componentData = OBJVAR_COMPONENTS + "." + name.getText();
+			if (getObjVars().hasItem(componentData))
+				removeObjVarItem(componentData);
+
+			ManufactureSchematicSynchronizedUi * sync = safe_cast<ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+			if (sync)
+				sync->clearSlot(name, draftSlot.complexity);
+			break;
+		}
+	}
+}	// ManufactureSchematicObject::clearSlot(const StringId &)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Clears the data for a given slot in the schematic.
+ *
+ * @param index		index of the slot to clear
+ */
+void ManufactureSchematicObject::clearSlot(int index)
+{
+	const DraftSchematicObject * draft = DraftSchematicObject::getSchematic(
+		m_draftSchematic.get());
+	NOT_NULL(draft);
+
+	DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
+	DynamicVariableList::NestedList::const_iterator slotIterator(slots.getItemByPosition(index));
+	DynamicVariableList::NestedList slot(slotIterator.getNestedList());
+
+	StringId name;
+	slot.getItem(OBJVAR_SLOT_NAME, name);
+
+	ServerDraftSchematicObjectTemplate::IngredientSlot draftSlot;
+	if (!draft->getSlot(draftSlot, name))
+		return;
+
+	setObjVarItem(slot.getNameWithPath()+'.'+OBJVAR_SLOT_TYPE, Crafting::IT_none);
+	setObjVarItem(slot.getNameWithPath()+'.'+OBJVAR_SLOT_OPTION, -1);
+	setObjVarItem(slot.getNameWithPath()+'.'+OBJVAR_SLOT_COMPLEXITY, draftSlot.complexity);
+
+	eraseObjVarListEntries(slot.getNameWithPath()+'.'+OBJVAR_INGREDIENTS);
+	eraseObjVarListEntries(slot.getNameWithPath()+'.'+OBJVAR_SLOT_SOURCES);
+
+	std::string componentData = OBJVAR_COMPONENTS + "." + name.getText();
+	if (getObjVars().hasItem(componentData))
+		removeObjVarItem(componentData);
+
+	ManufactureSchematicSynchronizedUi * sync = safe_cast<
+		ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+	if (sync)
+		sync->clearSlot(name, draftSlot.complexity);
+}	// ManufactureSchematicObject::clearSlot(int)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Clears the sources for all the schematic's slots.
+ */
+void ManufactureSchematicObject::clearSlotSources()
+{
+	DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
+
+	for (DynamicVariableList::NestedList::const_iterator i(slots.begin()); 
+		i != slots.end(); ++i)
+	{
+		DynamicVariableList::NestedList slot = i.getNestedList();
+
+		DynamicVariableList::NestedList slotSources(slot,OBJVAR_SLOT_SOURCES);
+		eraseObjVarListEntries(slotSources.getNameWithPath());
+	}
+
+	// clear any factories being used
+	if (!m_factories.empty())
+	{
+		for (Archive::AutoDeltaVector<CachedNetworkId>::const_iterator iter =
+			m_factories.begin(); iter != m_factories.end(); ++iter)
+		{
+			FactoryObject * factory = safe_cast<FactoryObject *>((*iter).getObject());
+			if (factory != NULL)
+			{
+				factory->endCraftingSession();
+			}
+		}
+		m_factories.clear();
+	}
+
+	// get rid of all our held ingredients
+	VolumeContainer * volumeContainer = ContainerInterface::getVolumeContainer(*this);
+	if (volumeContainer != NULL && volumeContainer->getNumberOfItems() > 0)
+	{
+		// for a stacked ingredient, if there are still more than one items in the stack,
+		// "consume" 1 item from the stack, and return it to the player's inventory
+		std::set<ServerObject*> itemsToReturnToInventory;
+		ServerObject* inventory = NULL;
+
+		for (ContainerIterator iter = volumeContainer->begin(); 
+			iter != volumeContainer->end(); ++iter)
+		{
+			if ((*iter).getObject() != NULL)
+			{
+				bool destroyItem = true;
+				TangibleObject* to = safe_cast<ServerObject*>((*iter).getObject())->asTangibleObject();
+				if (to && (to->getCount() > 1) && (dynamic_cast<FactoryObject *>(to) == NULL))
+				{
+					if (inventory == NULL)
+					{
+						ServerObject * o = safe_cast<ServerObject*>(ContainerInterface::getContainedByObject(*to));
+						while (o)
+						{
+							if (o->asCreatureObject() && PlayerCreatureController::getPlayerObject(o->asCreatureObject()))
+							{
+								inventory = o->asCreatureObject()->getInventory();
+								break;
+							}
+
+							o = safe_cast<ServerObject*>(ContainerInterface::getContainedByObject(*o));
+						}
+					}
+
+					if (inventory)
+					{
+						to->setCount(to->getCount() - 1);
+						itemsToReturnToInventory.insert(to);
+						destroyItem = false;
+					}
+				}
+
+				if (destroyItem)
+				{
+					safe_cast<ServerObject*>((*iter).getObject())->permanentlyDestroy(
+						DeleteReasons::Replaced);
+				}
+			}
+		}
+
+		if (inventory && !itemsToReturnToInventory.empty())
+		{
+			Container::ContainerErrorCode errCode;
+			for (std::set<ServerObject*>::const_iterator iter = itemsToReturnToInventory.begin(); iter != itemsToReturnToInventory.end(); ++iter)
+			{
+				if (!ContainerInterface::transferItemToVolumeContainer(*inventory, **iter, NULL, errCode))
+				{
+					(*iter)->permanentlyDestroy(DeleteReasons::Replaced);
+				}
+			}
+		}
+	}
+
+	eraseObjVarListEntries(OBJVAR_STORED_RESOURCES);
+}	// ManufactureSchematicObject::clearSlotSources()
+
+//-----------------------------------------------------------------------
+
+/**
+ * Clears the sources for a given schematic slot.
+ *
+ * @param index		the slot index
+ */
+void ManufactureSchematicObject::clearSlotSources(int index)
+{
+	DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
+	DynamicVariableList::NestedList slot(slots,index);
+
+	DynamicVariableList::NestedList slotSources(slot,OBJVAR_SLOT_SOURCES);
+	eraseObjVarListEntries(slotSources.getNameWithPath());
+}	// ManufactureSchematicObject::clearSlotSources(int)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Removes an optional slot from the schematic.
+ *
+ * @param name		the name of the slot to remove
+ */
+void ManufactureSchematicObject::removeSlot(const StringId & name)
+{
+	const DraftSchematicObject * draft = DraftSchematicObject::getSchematic(
+		m_draftSchematic.get());
+	NOT_NULL(draft);
+
+	ServerDraftSchematicObjectTemplate::IngredientSlot draftSlot;
+	if (!draft->getSlot(draftSlot, name))
+		return;
+
+	DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
+
+	for (DynamicVariableList::NestedList::const_iterator i(slots.begin()); i!=slots.end(); ++i)
+	{
+		DynamicVariableList::NestedList slot(i.getNestedList());
+
+		StringId varName;
+		if (slot.getItem(OBJVAR_SLOT_NAME,varName) && (name == varName))
+		{
+			std::string slotName(OBJVAR_SLOTS + "." + slot.getName());
+
+			computeComplexity();
+			removeObjVarItem(slotName);
+
+			ManufactureSchematicSynchronizedUi * sync = safe_cast<
+				ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+			if (sync)
+				sync->removeSlot(name);
+			break;
+		}
+	}
+}	// ManufactureSchematicObject::removeSlot
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets an approximate experiment mod for an assembled schematic so the player 
+ * will have some idea of the risk experimenting with an item.
+ *
+ * @param mod		approximent mod that will be applied during experimentation
+ */
+void ManufactureSchematicObject::setExperimentMod(float mod)
+{
+	ManufactureSchematicSynchronizedUi * sync = safe_cast<
+		ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+	if (sync)
+		sync->setExperimentMod(mod);
+}	// ManufactureSchematicObject::setExperimentMod
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a list of the experimental attribute names.
+ *
+ * @return the name list
+ */
+const std::vector<StringId> & ManufactureSchematicObject::getExperimentAttributeNames() const
+{
+static const std::vector<StringId> emptyList;
+
+	const ManufactureSchematicSynchronizedUi * sync = safe_cast<
+		const ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+	if (sync)
+		return sync->getAttributeNames();
+	else
+		return emptyList;
+}	// ManufactureSchematicObject::getExperimentAttributeNames
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the value of an experimental attribute.
+ *
+ * @param name		name of the attribute
+ *
+ * @return value of the attribute
+ */
+float ManufactureSchematicObject::getExperimentAttribute(const StringId & name) const 
+{
+	float result = 0;
+	const ManufactureSchematicSynchronizedUi * sync = safe_cast<
+		const ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+	if (sync)
+		result = sync->getAttribute(name);
+	return result;
+}	// ManufactureSchematicObject::getExperimentAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the value of an experimental attribute.
+ *
+ * @param name		name of the attribute
+ * @param value		value of the attribute
+ */
+void ManufactureSchematicObject::setExperimentAttribute(const StringId & name, 
+	float value)
+{
+	ManufactureSchematicSynchronizedUi * sync = safe_cast<
+		ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+	if (sync)
+		sync->setAttribute(name, value);
+}	// ManufactureSchematicObject::setExperimentAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the min value of an experimental attribute.
+ *
+ * @param name		name of the attribute
+ *
+ * @return min value of the attribute
+ */
+float ManufactureSchematicObject::getMinExperimentAttribute(const StringId & name) const
+{
+	float result = 0;
+	const ManufactureSchematicSynchronizedUi * sync = safe_cast<
+		const ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+	if (sync)
+		result = sync->getMinAttribute(name);
+	return result;
+}	// ManufactureSchematicObject::getMinExperimentAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the min value of an experimental attribute.
+ *
+ * @param name		name of the attribute
+ * @param value		min value of the attribute
+ */
+void ManufactureSchematicObject::setMinExperimentAttribute(const StringId & name, 
+	float value)
+{
+	ManufactureSchematicSynchronizedUi * sync = safe_cast<
+		ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+	if (sync)
+		sync->setMinAttribute(name, value);
+}	// ManufactureSchematicObject::setMinExperimentAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the max value of an experimental attribute.
+ *
+ * @param name		name of the attribute
+ *
+ * @return max value of the attribute
+ */
+float ManufactureSchematicObject::getMaxExperimentAttribute(const StringId & name) const
+{
+	float result = 0;
+	const ManufactureSchematicSynchronizedUi * sync = safe_cast<
+		const ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+	if (sync)
+		result = sync->getMaxAttribute(name);
+	return result;
+}	// ManufactureSchematicObject::getMaxExperimentAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the max value of an experimental attribute.
+ *
+ * @param name		name of the attribute
+ * @param value		max value of the attribute
+ */
+void ManufactureSchematicObject::setMaxExperimentAttribute(const StringId & name, 
+	float value)
+{
+	ManufactureSchematicSynchronizedUi * sync = safe_cast<
+		ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+	if (sync)
+		sync->setMaxAttribute(name, value);
+}	// ManufactureSchematicObject::setMaxExperimentAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the resource max value of an experimental attribute.
+ *
+ * @param name		name of the attribute
+ *
+ * @return resource max value of the attribute
+ */
+float ManufactureSchematicObject::getResourceMaxExperimentAttribute(const StringId & name) const
+{
+	float result = 0;
+	const ManufactureSchematicSynchronizedUi * sync = safe_cast<
+		const ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+	if (sync)
+		result = sync->getResourceMaxAttribute(name);
+	return result;
+}	// ManufactureSchematicObject::getResourceMaxExperimentAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the resource max value of an experimental attribute.
+ *
+ * @param name		name of the attribute
+ * @param value		resource max value of the attribute
+ */
+void ManufactureSchematicObject::setResourceMaxExperimentAttribute(const StringId & name, 
+	float value)
+{
+	ManufactureSchematicSynchronizedUi * sync = safe_cast<
+		ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+	if (sync)
+		sync->setResourceMaxAttribute(name, value);
+}	// ManufactureSchematicObject::setResourceMaxExperimentAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns all the values associated with an experimental attribute.
+ *
+ * @param name					name of the attribute
+ * @param value                 filled in with the attribute value
+ * @param minValue				filled in with the min attribute value
+ * @param maxValue				filled in with the max attribute value
+ * @param resourceMaxValue		filled in with the resource max attribute value
+ */
+void ManufactureSchematicObject::getAllExperimentAttributeValues(const StringId & name, 
+	float & value, float & minValue, float & maxValue, float & resourceMaxValue) const
+{
+	const ManufactureSchematicSynchronizedUi * sync = safe_cast<
+		const ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+	if (sync)
+		sync->getAllAttributeValues(name, value, minValue, maxValue, resourceMaxValue);
+	else
+		value = minValue = maxValue = resourceMaxValue = 0;
+}	// ManufactureSchematicObject::getAllExperimentAttributeValues
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the limits of an experimental attribute.
+ *
+ * @param name					name of the attribute
+ * @param minValue				min attribute value
+ * @param maxValue				max attribute value
+ * @param resourceMaxValue		resource max attribute value
+ */
+void ManufactureSchematicObject::setExperimentAttributeLimits(const StringId & name, 
+	float minValue, float maxValue, float resourceMaxValue)
+{
+	ManufactureSchematicSynchronizedUi * sync = safe_cast<
+		ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+	if (sync)
+		sync->setAttributeLimits(name, minValue, maxValue, resourceMaxValue);
+}	// ManufactureSchematicObject::setExperimentAttributeLimits
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the list of available appearances a crafter may choose from.
+ *
+ * @return the appearance list
+ */
+const std::vector<std::string> & ManufactureSchematicObject::getAppearances() const
+{
+static const std::vector<std::string> emptyList;
+
+	const ManufactureSchematicSynchronizedUi * sync = safe_cast<
+		const ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+	if (sync)
+		return sync->getAppearances();
+	return emptyList;
+}	// ManufactureSchematicObject::getAppearances
+
+//-----------------------------------------------------------------------
+
+/**
+ * Adds an appearance to the list of available appearances.
+ *
+ * @param appearance		the appearance filename
+ */
+void ManufactureSchematicObject::addAppearance(const std::string & appearance)
+{
+	ManufactureSchematicSynchronizedUi * sync = safe_cast<
+		ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+	if (sync)
+		sync->addAppearance(appearance);
+}	// ManufactureSchematicObject::addAppearance
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the custom appearance objects made by this schematic will use.
+ *
+ * @return the appearance filename
+ */
+const std::string ManufactureSchematicObject::getCustomAppearance() const
+{
+	static const std::string emptyString;
+
+	std::string result;
+	if (!getObjVars().getItem("customAppearance",result))
+		return emptyString;
+
+	return result;
+}	// ManufactureSchematicObject::getCustomAppearance
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the custom appearance objects made by this schematic will use.
+ *
+ * @param appearance		the appearance filename
+ */
+void ManufactureSchematicObject::setCustomAppearance(const std::string & appearance)
+{
+	m_customAppearance = appearance;
+	setObjVarItem("customAppearance", appearance);
+}	// ManufactureSchematicObject::setCustomAppearance(const std::string &)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the custom appearance objects made by this schematic will use, based on 
+ * the appearance list available to a crafter.
+ *
+ * @param index		index into the appearance list to use
+ */
+void ManufactureSchematicObject::setCustomAppearance(int index)
+{
+	const std::vector<std::string> & appearances = getAppearances();
+	if (index < 0 || index >= static_cast<int>(appearances.size()))
+		return;
+	
+	setCustomAppearance(appearances[index]);
+}	// ManufactureSchematicObject::setCustomAppearance(int)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns customization data for the schematic.
+ *
+ * @param name		the name of the customization data
+ * @param data		structure to be filled in with the customization data
+ *
+ * @return true on success, false if the customization name wasn't found
+ *
+bool ManufactureSchematicObject::getCustomization(const std::string & name, 
+	Crafting::CustomInfo & data) const
+{
+	const DynamicVariableList * objvars = getObjVars();
+	NOT_NULL(objvars);
+	const DynamicVariableList * customs = safe_cast<const DynamicVariableList *>(objvars->getItemByName("cust"));
+	if (customs == NULL)	
+		return false;
+
+	const DynamicVariableList * custom = safe_cast<const DynamicVariableList *>(customs->getItemByName(name));
+	if (custom == NULL)
+		return false;
+
+	data.name = name;
+	data.index = safe_cast<const DynamicVariableInt *>(custom->getItemByName("index"))->getValue();
+	data.minIndex = safe_cast<const DynamicVariableInt *>(custom->getItemByName("mindex"))->getValue();
+	data.maxIndex = safe_cast<const DynamicVariableInt *>(custom->getItemByName("maxdex"))->getValue();
+	return true;
+}	// ManufactureSchematicObject::getCustomization(const std::string &)
+*/
+//-----------------------------------------------------------------------
+
+/**
+ * Returns customization data for the schematic.
+ *
+ * @param index		index of the customization data
+ * @param data		structure to be filled in with the customization data
+ *
+ * @return true on success, false if the index was out of range
+ *
+bool ManufactureSchematicObject::getCustomization(int index, 
+	Crafting::CustomInfo & data) const
+{
+	const DynamicVariableList * objvars = getObjVars();
+	NOT_NULL(objvars);
+	const DynamicVariableList * customs = safe_cast<const DynamicVariableList *>(objvars->getItemByName("cust"));
+	if (customs == NULL)	
+		return false;
+
+	int count = customs->getCount();
+	if (index < 0 || index >= count)
+		return false;
+
+	const DynamicVariableList * custom = safe_cast<const DynamicVariableList *>(customs->getItemByPosition(index));
+	NOT_NULL(custom);
+	data.name = custom->getName();
+	data.index = safe_cast<const DynamicVariableInt *>(custom->getItemByName("index"))->getValue();
+	data.minIndex = safe_cast<const DynamicVariableInt *>(custom->getItemByName("mindex"))->getValue();
+	data.maxIndex = safe_cast<const DynamicVariableInt *>(custom->getItemByName("maxdex"))->getValue();
+	return true;
+}	// ManufactureSchematicObject::getCustomization(int)
+*/
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the number of customization options available for the schematic.
+ *
+ * @return the customization count
+ *
+int ManufactureSchematicObject::getCustomizationsCount() const
+{
+	const DynamicVariableList * objvars = getObjVars();
+	NOT_NULL(objvars);
+	const DynamicVariableList * customs = safe_cast<const DynamicVariableList *>(objvars->getItemByName("cust"));
+	if (customs == NULL)	
+		return 0;
+
+	return customs->getCount();
+}	// ManufactureSchematicObject::getCustomizationsCount
+*/
+//-----------------------------------------------------------------------
+
+/**
+ * Sets or adds customization data to the schematic.
+ *
+ * @param name			the customization data name
+ * @param value			value of the customization data
+ * @param minValue		minimum possible value of the customization data
+ * @param maxValue		maximum possible value of the customization data
+ */
+void ManufactureSchematicObject::setCustomization(const std::string & name, 
+	int value, int minValue, int maxValue)
+{
+	ManufactureSchematicSynchronizedUi * sync = safe_cast<ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+	if (sync)
+		sync->setCustomization(name, value, minValue, maxValue);
+}	// ManufactureSchematicObject::setCustomization(const std::string &, int, int, int)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the value of customization data of the schematic.
+ *
+ * @param index			index of the customization data
+ * @param value			value of the customization data
+ * @param prototype		prototype object to change the customization of
+ *
+ * @return true if the value was set, false if not
+ */
+bool ManufactureSchematicObject::setCustomization(int index, int value, 
+	ServerObject & prototype)
+{
+	ManufactureSchematicSynchronizedUi * sync = safe_cast<ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+	if (sync == NULL)
+		return false;
+
+	const std::string & customName = sync->getCustomizationName(index);
+	if (customName.empty())
+		return false;
+
+	return setCustomization(customName, value, prototype);
+}	// ManufactureSchematicObject::setCustomization(int, int, ServerObject *)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the value of customization data of the schematic.
+ *
+ * @param name			the customization data name
+ * @param value			value of the customization data
+ * @param prototype		prototype object to change the customization of
+ *
+ * @return true if the value was set, false if not
+ */
+bool ManufactureSchematicObject::setCustomization(const std::string & name, 
+	int value, ServerObject & prototype)
+{
+	ManufactureSchematicSynchronizedUi * sync = safe_cast<ManufactureSchematicSynchronizedUi *>(getSynchronizedUi ());
+	if (sync == NULL)
+		return false;
+
+	// make sure the value is within range
+	if (value < sync->getMinCustomization(name))
+		return false;
+	if (value > sync->getMaxCustomization(name))
+		return false;
+	sync->setCustomization(name, value);
+
+	// update the prototype
+	prototype.customize(name, value);
+
+	// save the customization string
+	CustomizationDataProperty * const cdProperty = safe_cast<CustomizationDataProperty*>(prototype.getProperty(CustomizationDataProperty::getClassPropertyId()));
+	if (cdProperty != NULL)
+	{
+		CustomizationData *const customizationData = cdProperty->fetchCustomizationData();
+		if (customizationData != NULL)
+		{
+			m_appearanceData = customizationData->writeLocalDataToString();
+			setObjVarItem("customization_data", m_appearanceData.get());
+		}
+	}
+
+	return true;
+}	// ManufactureSchematicObject::setCustomization(const std::string &, int, ServerObject *)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Computes the complexity of the schematic based on the ingredients being used.
+ */
+void ManufactureSchematicObject::computeComplexity()
+{
+static const StringId COMPLEXITY_ID("crafting", "complexity");
+
+	const DraftSchematicObject * draft = DraftSchematicObject::getSchematic(
+		m_draftSchematic.get());
+	NOT_NULL(draft);
+
+	float complexity = draft->getComplexity();
+
+	DynamicVariableList::NestedList slots(getObjVars(),"ingr");
+	{
+		for (DynamicVariableList::NestedList::const_iterator i(slots.begin()); i!=slots.end(); ++i)
+		{
+			DynamicVariableList::NestedList slot(i.getNestedList());
+			int varType=0;
+			float varComplex=0;
+			if (slot.getItem("type",varType) && slot.getItem("complex",varComplex) && static_cast<enum Crafting::IngredientType>(varType) != Crafting::IT_none)
+				complexity += varComplex;
+		}
+	}
+
+	// set the current value of the "complexity" attribute
+	setAttribute(COMPLEXITY_ID, complexity); 
+
+	setComplexity(complexity);
+}	// ManufactureSchematicObject::computeComplexity
+
+//-----------------------------------------------------------------------
+
+/**
+ * Tells us that a FactoryObject has references that are being used as components
+ * during crafting. This will allow us to remove/clean up the components.
+ *
+ * @param factory		the factory object
+ */
+void ManufactureSchematicObject::addCraftingFactory(const FactoryObject & factory)
+{
+	if (isAuthoritative())
+	{
+		CachedNetworkId id(factory);
+
+		if (m_factories.find(id) < 0)
+			m_factories.push_back(id);
+		else
+		{
+			WARNING(true, ("ManufactureSchematicObject::addCraftingFactory %s tried "
+				"to add factory %s that was already added", 
+				getNetworkId().getValueString().c_str(),
+				factory.getNetworkId().getValueString().c_str()));
+		}
+	}
+	else
+	{
+		WARNING(true, ("ManufactureSchematicObject::addCraftingFactory called on "
+			"non-authoritative object %s", getNetworkId().getValueString().c_str()));
+	}
+}	// ManufactureSchematicObject::addCraftingFactory
+
+//-----------------------------------------------------------------------
+
+/**
+ * Tells us that a FactoryObject is being removed from a crafting session.
+ * In general this should only be called if the factory is being removed by
+ * some unexpected event, not as part of the crafting process.
+ *
+ * @param factory		the factory object
+ */
+void ManufactureSchematicObject::removeCraftingFactory(const FactoryObject & factory)
+{
+	if (isAuthoritative())
+	{
+		CachedNetworkId id(factory);
+
+		int index = m_factories.find(id);
+		if (index >= 0)
+			m_factories.erase(index);
+	}
+	else
+	{
+		WARNING(true, ("ManufactureSchematicObject::removeCraftingFactory called on "
+			"non-authoritative object %s", getNetworkId().getValueString().c_str()));
+	}
+}	// ManufactureSchematicObject::removeCraftingFactory
+
+//-----------------------------------------------------------------------
+
+/**
+ * Add a component ingredient to the schematic's volume container.
+ *
+ * @param component		the ingredient to add
+ *
+ * @return true on success, false on fail
+ */
+bool ManufactureSchematicObject::addIngredient(ServerObject & component)
+{
+	Container::ContainerErrorCode tmp = Container::CEC_Success;		
+	return ContainerInterface::transferItemToVolumeContainer(*this, component, NULL, tmp);
+}	// ManufactureSchematicObject::addIngredient
+
+//-----------------------------------------------------------------------
+
+/**
+ * Add a resource ingredient to the schematic's objvars.
+ *
+ * @param resourceId	the resource type id
+ * @param count			the amount of resource
+ * @param sourceId		who mined the resource
+ *
+ * @return true on success, false on fail
+ */
+bool ManufactureSchematicObject::addIngredient(const NetworkId & resourceId, int count, const NetworkId & sourceId)
+{
+	std::string objvarName(OBJVAR_STORED_RESOURCES + "." + resourceId.getValueString() + "." + sourceId.getValueString());
+	
+	// get how much the source has already contributed the resource
+	int currentCount = 0;
+	getObjVars().getItem(objvarName, currentCount);
+
+	// update the source's count
+	currentCount += count;
+	setObjVarItem(objvarName, currentCount);
+
+	return true;
+}	// ManufactureSchematicObject::addIngredient
+
+//-----------------------------------------------------------------------
+
+/**
+ * Remove a component ingredient from the schematic's volume container.
+ *
+ * @param component		the component to remove
+ * @param destination	the container to put the component into
+ *
+ * @return true on success, false on fail
+ */
+bool ManufactureSchematicObject::removeIngredient(ServerObject & component, 
+	ServerObject & destination)
+{
+	// if the component is a factory, treat is differently
+	FactoryObject * factory = dynamic_cast<FactoryObject *>(&component);
+	if (factory != NULL)
+	{
+		// if the factory is contained by us, move it to the destination,
+		// making sure that its count is 1; if it is not contained by us,
+		// just increase its count
+		if (ContainerInterface::getContainedByObject(*factory) == this)
+		{
+			// since components are removed one at a time from us, the factory
+			// should only contain one item when it is removed
+			if (factory->getCount() > 1)
+				factory->removeCraftingReferences(factory->getCount() - 1);
+			Container::ContainerErrorCode errCode;
+			return ContainerInterface::transferItemToVolumeContainer(destination, 
+				*factory, NULL, errCode);
+		}
+		else
+		{
+			// for the moment, just increment the factory count, even if the factory
+			// isn't in the destination container
+			factory->addCraftingReferences(1);
+			return true;
+		}
+	}
+	else
+	{
+		// make sure the component is in our container
+		Object * container = ContainerInterface::getContainedByObject(component);
+		if (container == NULL || container->getNetworkId() != getNetworkId())
+		{
+			FactoryObject * factory = dynamic_cast<FactoryObject *>(container);
+			if (factory != NULL)
+				return removeIngredient(*factory, destination);
+			return false;
+		}
+
+		Container::ContainerErrorCode errCode;
+		return ContainerInterface::transferItemToVolumeContainer(destination, component,
+			NULL, errCode);
+	}
+}	// ManufactureSchematicObject::removeIngredient
+
+//-----------------------------------------------------------------------
+
+/**
+ * Remove a resource ingredient from the schematic's objvars.
+ *
+ * @param resourceId	the resource type id
+ * @param count			the amount of resource
+ * @param destination	the resource container to put the resource in
+ *
+ * @return true on success, false on fail
+ */
+bool ManufactureSchematicObject::removeIngredient(const NetworkId & resourceId, int count, ResourceContainerObject & destination)
+{
+	// make sure the destination holds the resource type
+	if (destination.getResourceTypeId() != resourceId && 
+		destination.getResourceTypeId() != NetworkId::cms_invalid)
+	{
+		return false;
+	}
+
+	// make sure the destination has enough room
+	if (destination.getMaxQuantity() - destination.getQuantity() < count)
+		return false;
+
+	// find the resource from our objvars
+	std::vector<std::string> removedObjvars;
+	const std::string objvarName(OBJVAR_STORED_RESOURCES + "." + resourceId.getValueString());
+	{
+		DynamicVariableList::NestedList sources(getObjVars(), objvarName);
+		for (DynamicVariableList::NestedList::const_iterator i = sources.begin(); count > 0 && i != sources.end(); ++i)
+		{
+			int sourceCount = 0;
+			i.getValue(sourceCount);
+			if (sourceCount > count)
+			{
+				IGNORE_RETURN(destination.addResource(resourceId, count, NetworkId(i.getName())));
+				setObjVarItem(i.getNameWithPath(), sourceCount - count);
+				count = 0;
+			}
+			else
+			{
+				IGNORE_RETURN(destination.addResource(resourceId, sourceCount, NetworkId(i.getName())));
+				removedObjvars.push_back(i.getNameWithPath());
+				count -= sourceCount;
+			}
+		}
+	}
+	{
+		// remove sources that have all their contribution removed
+		for (std::vector<std::string>::const_iterator i = removedObjvars.begin();
+			i != removedObjvars.end(); ++i)
+		{
+			removeObjVarItem(*i);
+		}
+	}
+
+	if (count > 0)
+		return false;
+
+	return true;
+}	// ManufactureSchematicObject::removeIngredient
+
+//----------------------------------------------------------------------
+
+bool ManufactureSchematicObject::hasIngredient (const NetworkId & componentId) const
+{
+	const ServerObject * const obj = safe_cast<const ServerObject *>(NetworkIdManager::getObjectById (componentId));
+
+
+	if (obj && ContainerInterface::getContainedByObject (*obj) == this)
+		return true;
+
+	return false;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Destroys all the ingredients in the volume container and resets our slots.
+ */
+void ManufactureSchematicObject::destroyAllIngredients()
+{
+	if (isAuthoritative())
+	{
+		// clear any factories being used
+		if (!m_factories.empty())
+		{
+			for (Archive::AutoDeltaVector<CachedNetworkId>::const_iterator iter =
+				m_factories.begin(); iter != m_factories.end(); ++iter)
+			{
+				FactoryObject * factory = safe_cast<FactoryObject *>((*iter).getObject());
+				if (factory != NULL)
+				{
+					factory->endCraftingSession();
+				}
+			}
+			m_factories.clear();
+		}
+
+		// empty our volume container
+		VolumeContainer * const container = ContainerInterface::getVolumeContainer(*this);
+		if (container != NULL)
+		{
+			// for a stacked ingredient, if there are still more than one items in the stack,
+			// "consume" 1 item from the stack, and return it to the player's inventory
+			std::set<ServerObject*> itemsToReturnToInventory;
+			ServerObject* inventory = NULL;
+
+			ContainerIterator iter;
+			for (iter = container->begin(); iter != container->end(); ++iter)
+			{
+				CachedNetworkId & itemId = *iter;
+				if (itemId.getObject() != NULL)
+				{
+					bool destroyItem = true;
+					TangibleObject* to = safe_cast<ServerObject*>(itemId.getObject())->asTangibleObject();
+					if (to && (to->getCount() > 1) && (dynamic_cast<FactoryObject *>(to) == NULL))
+					{
+						if (inventory == NULL)
+						{
+							ServerObject * o = safe_cast<ServerObject*>(ContainerInterface::getContainedByObject(*to));
+							while (o)
+							{
+								if (o->asCreatureObject() && PlayerCreatureController::getPlayerObject(o->asCreatureObject()))
+								{
+									inventory = o->asCreatureObject()->getInventory();
+									break;
+								}
+
+								o = safe_cast<ServerObject*>(ContainerInterface::getContainedByObject(*o));
+							}
+						}
+
+						if (inventory)
+						{
+							to->setCount(to->getCount() - 1);
+							itemsToReturnToInventory.insert(to);
+							destroyItem = false;
+						}
+					}
+
+					if (destroyItem)
+					{
+						safe_cast<ServerObject*>(itemId.getObject())->permanentlyDestroy(DeleteReasons::Consumed);
+					}
+				}
+				else
+				{
+					WARNING_STRICT_FATAL(true, ("Manf schematic %s has ingredient id %s with no object", getNetworkId().getValueString().c_str(),itemId.getValueString().c_str()));
+				}
+			}
+
+			if (inventory && !itemsToReturnToInventory.empty())
+			{
+				Container::ContainerErrorCode errCode;
+				for (std::set<ServerObject*>::const_iterator iter = itemsToReturnToInventory.begin(); iter != itemsToReturnToInventory.end(); ++iter)
+				{
+					if (!ContainerInterface::transferItemToVolumeContainer(*inventory, **iter, NULL, errCode))
+					{
+						(*iter)->permanentlyDestroy(DeleteReasons::Consumed);
+					}
+				}
+			}
+		}
+
+		// dump the resource objvars
+		eraseObjVarListEntries(OBJVAR_STORED_RESOURCES);
+
+		// reset our slots
+		const DynamicVariableList::NestedList slots(getObjVars(),"ingr");
+
+		int count = slots.getCount();
+		for (int i = 0; i < count; ++i)
+		{
+			clearSlot(i);
+		}
+	}
+	else
+	{
+		WARNING(true, ("ManufactureSchematicObject::destroyAllIngredients called on "
+			"non-authoritative object %s", getNetworkId().getValueString().c_str()));
+	}
+}	// ManufactureSchematicObject::destroyAllIngredients
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates an item with this schematic. It is assumed that the ingredients 
+ * needed to make it are available. Note that this function is duplicated in
+ * FactoryObject::manufactureObject; if this function changes, that one should 
+ * too.
+ *
+ * @param creatorId			the id of the player making the object
+ * @param container			the container to create the object in
+ * @param containerSlotId	the slot in the container to put the object in
+ * @param prototype			flag that we are creating a prototype, and shouldn't 
+ *							check for the correct ingredients
+ *
+ * @return the manufactured object
+ */
+ServerObject * ManufactureSchematicObject::manufactureObject(const NetworkId & creatorId, ServerObject & container, const SlotId & containerSlotId, bool prototype)
+{
+	if (getCount() <= 0)
+		return NULL;
+
+	const DraftSchematicObject * draftSchematic = DraftSchematicObject::getSchematic(m_draftSchematic.get());
+
+	if (draftSchematic == NULL)
+	{
+		return NULL;
+	}
+	if (draftSchematic->getCraftedObjectTemplate() == NULL)
+	{
+		DEBUG_WARNING(true, ("Draft schematic %s does not have a craftable object template!\n", draftSchematic->getTemplateName()));
+		return NULL;
+	}
+
+	// create the item
+	TangibleObject * const object = 
+		dynamic_cast<TangibleObject *>(ServerWorld::createNewObject(*draftSchematic->getCraftedObjectTemplate(), container, containerSlotId, false));
+	if (object == NULL)
+	{
+		DEBUG_WARNING(true, ("Player %s failed to create object for template "
+			"%s.\n", creatorId.getValueString().c_str(), 
+			draftSchematic->getCraftedObjectTemplate()->getName()));
+		return NULL;
+	}
+
+	if (!getAssignedObjectName().empty())
+		object->setObjectName(getAssignedObjectName());
+
+	// set the object appearance
+	const std::string & appearance = getCustomAppearance();
+	if (!appearance.empty())
+		object->setCustomAppearance(appearance);
+
+	// set the customization data for the object
+	if (!m_appearanceData.get().empty())
+		object->setAppearanceData(m_appearanceData.get());
+
+	// mark the item as having been created by us
+	object->setCraftedId(getNetworkId());
+	object->setCraftedType(draftSchematic->getCategory());
+	object->setCreatorId(creatorId);
+	object->setOwnerId(creatorId);
+	
+	// set the creator xp type from the schematic template
+	const ServerObjectTemplate * schematicTemplate = safe_cast<const 
+		ServerObjectTemplate *>(draftSchematic->getObjectTemplate());
+	if (schematicTemplate != NULL && schematicTemplate->getXpPointsCount() > 0)
+	{
+		ServerObjectTemplate::Xp xpData;
+		schematicTemplate->getXpPoints(xpData, 0);
+		object->setCreatorXpType(xpData.type);
+	}
+
+	if (!prototype)
+	{
+		if (!setObjectComponents(object, true))
+		{
+			object->permanentlyDestroy(DeleteReasons::BadContainerTransfer);
+			return NULL;
+		}
+
+		// allow the schematic scripts to modify the object
+		// prototype objects are modified at the end of the crafting session
+		m_isMakingObject = true;
+		ScriptParams params;
+		params.addParam(creatorId);
+		params.addParam(object->getNetworkId());
+		params.addParam(*this);
+		params.addParam(false);
+		params.addParam(true);
+		int result = getScriptObject()->trigAllScripts(Scripting::TRIG_MANUFACTURE_OBJECT, params);
+		m_isMakingObject = false;
+		if (result == SCRIPT_OVERRIDE)
+		{
+			object->permanentlyDestroy(DeleteReasons::Script);
+			return NULL;
+		}
+
+		incrementCount(-1);
+		clearSlotSources();
+
+		if (getCount() == 0)
+		{
+			// delete myself
+			permanentlyDestroy(DeleteReasons::Consumed);
+		}		
+
+	}
+	else
+	{
+		// flag the object as a prototype
+		setObjVarItem(OBJVAR_CRAFTING_IS_PROTOTYPE, true);
+	}
+	
+	return object;
+}	// ManufactureSchematicObject::manufactureObject(const NetworkId &, ServerObject &, const SlotId &, bool)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates an item with this schematic. This is for use in creating a finished 
+ * object without ingredients.
+ *
+ * @position	where to create the object
+ *
+ * @return the manufactured object
+ */
+ServerObject * ManufactureSchematicObject::manufactureObject(const Vector & position)
+{
+	const DraftSchematicObject * draftSchematic = DraftSchematicObject::getSchematic(
+		m_draftSchematic.get());
+	if (draftSchematic == NULL)
+	{
+		return NULL;
+	}
+	if (draftSchematic->getCraftedObjectTemplate() == NULL)
+	{
+		DEBUG_WARNING(true, ("Draft schematic %s does not have a craftable "
+			"object template!\n", draftSchematic->getTemplateName()));
+		return NULL;
+	}
+
+	Transform tr;
+	tr.setPosition_p(position);
+	// create the item
+	TangibleObject * object = dynamic_cast<TangibleObject *>(ServerWorld::createNewObject(
+		*draftSchematic->getCraftedObjectTemplate(), tr, 0,
+		false));
+	if (object == NULL)
+	{
+		DEBUG_WARNING(true, ("Failed to create object for template "
+			"%s.\n", draftSchematic->getCraftedObjectTemplate()->getName()));
+		return NULL;
+	}
+
+	if (!getAssignedObjectName().empty())
+		object->setObjectName(getAssignedObjectName());
+
+	// set the object appearance
+	const std::string & appearance = getCustomAppearance();
+	if (!appearance.empty())
+		object->setCustomAppearance(appearance);
+
+	// set the customization data for the object
+	if (!m_appearanceData.get().empty())
+		object->setAppearanceData(m_appearanceData.get());
+
+	// mark the item as having been created by us
+	object->setCraftedId(getNetworkId());
+	object->setCraftedType(draftSchematic->getCategory());
+	object->setCreatorId(NetworkId::cms_invalid);
+	
+	// flag the object as a prototype
+	setObjVarItem(OBJVAR_CRAFTING_IS_PROTOTYPE, true);
+	
+	return object;
+}	// ManufactureSchematicObject::manufactureObject(const Vector &)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Transfers the components in the schematic's container to an object it has 
+ * created.
+ *
+ * @param object			the object that was created
+ * @param checkResources	flag to verify there are enough resources to craft 
+ *							the object
+ *
+ * @return true on success, false if there was an error
+ */
+bool ManufactureSchematicObject::setObjectComponents(TangibleObject * object, bool checkResources)
+{
+	static const uint32 INVALID_CRC = Crc::normalizeAndCalculate("invalid");
+	int i;
+
+	const DraftSchematicObject * draftSchematic = DraftSchematicObject::getSchematic(m_draftSchematic.get());
+	NOT_NULL(draftSchematic);
+
+	// get the visible components string; if missing, flag this as the 1st 
+	// item made
+	bool firstItem = false;
+	std::vector<int> visibleComponents;
+	if (!getObjVars().getItem("visComp",visibleComponents))
+		firstItem = true;
+
+	// check the objects in the schematic volume container to make sure they match 
+	VolumeContainer * volumeContainer = ContainerInterface::getVolumeContainer(*this);
+	if (volumeContainer == NULL)
+	{
+		DEBUG_WARNING(true, ("Manf schematic %s does not have a volume container!",
+			getNetworkId().getValueString().c_str()));
+		return false;
+	}
+
+	// for a stacked ingredient, if there are still more than one items in the stack,
+	// "consume" 1 item from the stack, and return it to the player's inventory
+	std::set<ServerObject*> itemsToReturnToInventory;
+	ServerObject* inventory = NULL;
+
+	DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
+
+	// check the objects in the schematic volume container to make sure they match 
+	// the ingredients needed
+	std::vector<ResourceContainerObject *> crateList;
+	Crafting::IngredientSlot slotData;
+	ContainerIterator iter;
+	Crafting::Ingredients::const_iterator ingredientIter;
+	std::vector<std::pair<NetworkId, int> > sources;
+	int slotCount = getSlotsCount();
+	for (i = 0; i < slotCount; ++i)
+	{
+		if (!getSlot(i, slotData, false))
+			break;
+		if (slotData.ingredients.empty())
+			break;
+
+		DynamicVariableList::NestedList slot(slots,i);
+		DynamicVariableList::NestedList slotIngredients(slot,OBJVAR_INGREDIENTS);
+
+		sources.clear();
+
+		for (ingredientIter = slotData.ingredients.begin(); 
+			ingredientIter != slotData.ingredients.end(); ++ingredientIter)
+		{
+			const Crafting::SimpleIngredient * ingredient = (*ingredientIter).get();
+			NOT_NULL(ingredient);
+			int ingredientCount = ingredient->count;
+			if (ingredientCount <= 0)
+			{
+				WARNING_STRICT_FATAL(true, ("Manufacture schematic %s has "
+					"invalid ingredient %s count %d", 
+					getNetworkId().getValueString().c_str(),
+					ingredient->ingredient.getValueString().c_str(), ingredientCount));
+				break;
+			}
+			if (slotData.ingredientType == Crafting::IT_item || 
+				slotData.ingredientType == Crafting::IT_template ||
+				slotData.ingredientType == Crafting::IT_templateGeneric ||
+				slotData.ingredientType == Crafting::IT_schematic ||
+				slotData.ingredientType == Crafting::IT_schematicGeneric)
+			{
+				const Crafting::ComponentIngredient * component = dynamic_cast<
+					const Crafting::ComponentIngredient *>(ingredient);
+				NOT_NULL(component);
+				
+				// find an ingredient in our volume container that matches the 
+				// component
+				for (iter = volumeContainer->begin(); 
+					iter != volumeContainer->end() && ingredientCount > 0; 
+					++iter)
+				{
+					Container::ContainedItem & item = *iter;
+					TangibleObject * const testComponent = dynamic_cast<TangibleObject *>(item.getObject());
+					if (testComponent == NULL)
+						continue;
+					if (itemsToReturnToInventory.count(testComponent) > 0)
+						continue;
+					FactoryObject * crate = NULL;
+					bool found = false;
+					bool foundCrate = false;
+					if (component->ingredient != NetworkId::cms_invalid)
+					{
+						if (component->ingredient == testComponent->getCraftedId())
+						{
+							found = true;
+							
+							// see if the test component is a crate
+							crate = dynamic_cast<FactoryObject *>(testComponent);
+							if (crate != NULL && crate->getCount() == ingredientCount)
+							{
+								foundCrate = true;
+							}
+						}
+					}
+					else
+					{
+						if (testComponent->getObjectTemplateName() == component->templateName)
+							found = true;
+					}
+					if (found)
+					{
+						if (foundCrate)
+							ingredientCount = 0;
+						else
+							--ingredientCount;
+
+						if (testComponent->isCrafted())
+						{
+							// set the xp type for the component
+							int ingredientIndex = ingredientIter - 
+								slotData.ingredients.begin();
+							DynamicVariableList::NestedList ingredientVars(slotIngredients,ingredientIndex);
+							{
+								setObjVarItem(ingredientVars.getContextName()+
+									OBJVAR_COMPONENT_CRAFTED_XP_TYPE, 
+									testComponent->getCreatorXpType());
+							}
+
+							// add xp info to the sources list
+							sources.push_back(std::make_pair(testComponent->getCreatorId(),
+								testComponent->getCreatorXp()));
+						}
+
+						// if the component is visible when attached to the object,
+						// get it's id from the component table and add it to the
+						// visible components list
+						if (firstItem)
+						{
+							ServerDraftSchematicObjectTemplate::IngredientSlot draftSlot;
+							if (draftSchematic->getSlot(draftSlot, slotData.draftSlotIndex))
+							{
+								if (!draftSlot.appearance.empty())
+								{
+									// check with the table for this type of component
+									const std::string & componentTableName = ConfigServerGame::getCraftingComponentTableFile(draftSlot.appearance);
+									if (!componentTableName.empty())
+									{
+										DataTable * componentTable = DataTableManager::getTable(componentTableName, true);
+										if (componentTable != NULL)
+										{
+											uint32 value = INVALID_CRC;
+											if (draftSlot.appearance == "component")
+											{
+												// use the component name directly
+												int row;
+												if (foundCrate)
+													row = componentTable->searchColumnString(0, crate->getContainedSharedTemplateName());
+												else
+													row = componentTable->searchColumnString(0, testComponent->getSharedTemplateName());
+												if (row >= 0)
+												{
+													value = componentTable->getIntValue(0, row);
+												}
+											}
+											else
+											{
+												// check if the component is compatable with the crafted object, and use a default component if not
+												int row = componentTable->searchColumnString(0, object->getObjectTemplateName());
+												int column;
+												if (foundCrate)
+													column = componentTable->findColumnNumber(crate->getItemCustomAppearance());
+												else
+													column = componentTable->findColumnNumber(testComponent->getCustomAppearance());
+												if (row >= 0 && column >= 0)
+												{
+													value = componentTable->getIntValue(column, row);
+												}
+												if (row >= 0 && value == INVALID_CRC)
+												{
+													column = componentTable->findColumnNumber("default");
+													if (column >= 0)
+														value = componentTable->getIntValue(column, row);
+												}
+											}
+											if (value != INVALID_CRC)
+											{
+												visibleComponents.push_back(value);
+											}
+										}
+									}
+								}
+							}
+						}
+
+						bool destroyItem = true;
+						if ((testComponent->getCount() > 1) && (dynamic_cast<FactoryObject *>(testComponent) == NULL))
+						{
+							if (inventory == NULL)
+							{
+								ServerObject * o = safe_cast<ServerObject*>(ContainerInterface::getContainedByObject(*testComponent));
+								while (o)
+								{
+									if (o->asCreatureObject() && PlayerCreatureController::getPlayerObject(o->asCreatureObject()))
+									{
+										inventory = o->asCreatureObject()->getInventory();
+										break;
+									}
+
+									o = safe_cast<ServerObject*>(ContainerInterface::getContainedByObject(*o));
+								}
+							}
+
+							if (inventory)
+							{
+								testComponent->setCount(testComponent->getCount() - 1);
+								itemsToReturnToInventory.insert(testComponent);
+								destroyItem = false;
+							}
+						}
+
+						if (destroyItem)
+						{
+							testComponent->permanentlyDestroy(DeleteReasons::Consumed);
+						}
+					}
+				}
+			}
+			else if (checkResources && (
+				slotData.ingredientType == Crafting::IT_resourceType || 
+				slotData.ingredientType == Crafting::IT_resourceClass))
+			{
+				//@todo: check resources against the OBJVAR_STORED_RESOURCES data
+			}
+			else if (checkResources)
+				break;
+		}
+		if (ingredientIter != slotData.ingredients.end())
+			break;
+
+		if (!sources.empty())
+		{
+			// set up the sources so they'll get experience
+			setSlotSources(i, sources);
+		}
+	}
+
+	if (inventory && !itemsToReturnToInventory.empty())
+	{
+		Container::ContainerErrorCode errCode;
+		for (std::set<ServerObject*>::const_iterator iter = itemsToReturnToInventory.begin(); iter != itemsToReturnToInventory.end(); ++iter)
+		{
+			if (!ContainerInterface::transferItemToVolumeContainer(*inventory, **iter, NULL, errCode))
+			{
+				(*iter)->permanentlyDestroy(DeleteReasons::Consumed);
+			}
+		}
+
+		itemsToReturnToInventory.clear();
+	}
+
+	if (i != slotCount)
+		return false;
+
+	// see if we have anything left in our volume container, and delete them
+	if (volumeContainer->getNumberOfItems() > 0)
+	{
+		WARNING(true, ("ManufactureSchematicObject::setObjectComponents schematic "
+			"%s(%s) has extra ingredients! Deleting them.", 
+			getNetworkId().getValueString().c_str(), 
+			draftSchematic->getCraftedObjectTemplate()->getName()));
+
+		for (iter = volumeContainer->begin(); iter != volumeContainer->end(); ++iter)
+		{
+			if ((*iter).getObject() != NULL)
+			{
+				ServerObject * temp = safe_cast<ServerObject*>((*iter).getObject());
+
+				bool destroyItem = true;
+				TangibleObject* to = temp->asTangibleObject();
+				if (to && (to->getCount() > 1) && (dynamic_cast<FactoryObject *>(to) == NULL))
+				{
+					if (inventory == NULL)
+					{
+						ServerObject * o = safe_cast<ServerObject*>(ContainerInterface::getContainedByObject(*to));
+						while (o)
+						{
+							if (o->asCreatureObject() && PlayerCreatureController::getPlayerObject(o->asCreatureObject()))
+							{
+								inventory = o->asCreatureObject()->getInventory();
+								break;
+							}
+
+							o = safe_cast<ServerObject*>(ContainerInterface::getContainedByObject(*o));
+						}
+					}
+
+					if (inventory)
+					{
+						to->setCount(to->getCount() - 1);
+						itemsToReturnToInventory.insert(to);
+						destroyItem = false;
+					}
+				}
+
+				if (destroyItem)
+				{
+					WARNING(true, ("ManufactureSchematicObject::setObjectComponents "
+						"deleting extra ingredient %s(%s).", 
+						(*iter).getValueString().c_str(),
+						temp->getObjectTemplateName()));
+					temp->permanentlyDestroy(DeleteReasons::Replaced);
+				}
+			}
+			else
+			{
+				WARNING(true, ("ManufactureSchematicObject::setObjectComponents "
+					"extra ingredient %s has no object.", 
+					(*iter).getValueString().c_str()));
+			}
+		}
+	}
+
+	eraseObjVarListEntries(OBJVAR_STORED_RESOURCES);
+
+	// tell the object what components are visible
+	object->setVisibleComponents(visibleComponents);
+	if (firstItem)
+	{
+		// add the visible component list to our objvars
+		setObjVarItem("visComp", visibleComponents);
+	}
+
+	if (inventory && !itemsToReturnToInventory.empty())
+	{
+		Container::ContainerErrorCode errCode;
+		for (std::set<ServerObject*>::const_iterator iter = itemsToReturnToInventory.begin(); iter != itemsToReturnToInventory.end(); ++iter)
+		{
+			if (!ContainerInterface::transferItemToVolumeContainer(*inventory, **iter, NULL, errCode))
+			{
+				(*iter)->permanentlyDestroy(DeleteReasons::Replaced);
+			}
+		}
+	}
+
+	return true;
+}	// ManufactureSchematicObject::setObjectComponents
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sends info about the ingredients needed by the schematic to a player.
+ *
+ * @param player		the player to send the data to
+ */
+void ManufactureSchematicObject::requestSlots(ServerObject & player) const
+{
+	Crafting::IngredientSlot slot;
+	MessageQueueDraftSlots::Slot slotInfo;
+	MessageQueueDraftSlots::Option optionInfo;
+	Crafting::Ingredients::const_iterator ingredientIter;
+
+	MessageQueueDraftSlotsQueryResponse * const message = 
+		new MessageQueueDraftSlotsQueryResponse(std::make_pair(m_draftSchematic.get(), 
+		m_draftSchematicSharedTemplate.get()));
+
+	int slotCount = getSlotsCount();
+	for (int i = 0; i < slotCount; ++i)
+	{
+		if (!getSlot(i, slot, false))
+			continue;
+
+		if (slot.ingredientType != Crafting::IT_invalid && 
+			slot.ingredientType != Crafting::IT_none)
+		{
+			slotInfo.name = slot.name;
+			slotInfo.optional = false;
+			optionInfo.type = slot.ingredientType;
+
+			// get the number of ingredients needed
+			optionInfo.amountNeeded = 0;
+			for (ingredientIter = slot.ingredients.begin(); 
+				ingredientIter != slot.ingredients.end(); ++ingredientIter)
+			{
+				optionInfo.amountNeeded += (*ingredientIter)->count;
+			}
+
+			// get the ingredient name
+			const NetworkId & ingredientId = slot.ingredients.front()->ingredient;
+			switch (slot.ingredientType)
+			{
+				case Crafting::IT_item:
+				case Crafting::IT_template:
+				case Crafting::IT_templateGeneric:
+				case Crafting::IT_schematic:
+				case Crafting::IT_schematicGeneric:
+					{
+						const TangibleObject * const ingredient = dynamic_cast<const TangibleObject *>(NetworkIdManager::getObjectById(ingredientId));
+						if (ingredient != NULL)
+						{
+							optionInfo.ingredient = ingredient->getEncodedObjectName();
+							// since names can be duplicated, concatinate the id of
+							// the manf schematic to the name
+							if (ingredient->isCrafted())
+							{
+								optionInfo.ingredient += Unicode::narrowToWide(TangibleObject::generateSerialNumber(ingredient->getCraftedId()));
+							}
+							else
+							{
+								optionInfo.ingredient += Unicode::narrowToWide(TangibleObject::generateSerialNumber(ingredient->getNetworkId()));
+							}
+						}
+						else
+							optionInfo.ingredient = Unicode::narrowToWide("unknown");
+					}
+					break;
+
+				case Crafting::IT_resourceType:
+				case Crafting::IT_resourceClass:
+					{
+						ResourceTypeObject const * const ingredient = ServerUniverse::getInstance().getResourceTypeById(ingredientId);
+						if (ingredient != NULL)
+							optionInfo.ingredient = Unicode::narrowToWide(ingredient->getResourceName());
+						else
+							optionInfo.ingredient = Unicode::narrowToWide("unknown");
+					}
+					break;
+			
+				default:
+					break;
+			}
+			slotInfo.options.push_back(optionInfo);
+			message->addSlot(slotInfo);
+			slotInfo.options.clear();
+		}
+	}
+}	// ManufactureSchematicObject::requestSlots
+
+//----------------------------------------------------------------------
+
+void ManufactureSchematicObject::getIngredientInfo (IngredientInfoVector & iiv) const
+{
+	Crafting::IngredientSlot slot;
+	Unicode::String ingredientName;
+	
+	typedef std::map<Unicode::String, std::pair<bool, int> > IngredientMap;
+	IngredientMap imap;
+	
+	// compute the total ingredients needed for the schematic
+	int slotCount = getSlotsCount();
+	for (int i = 0; i < slotCount; ++i)
+	{
+		if (!getSlot(i, slot, false))
+			continue;
+
+		if (slot.ingredientType == Crafting::IT_invalid ||
+			slot.ingredientType == Crafting::IT_none)
+			continue;
+
+		// get the number of ingredients needed
+		int amountNeeded = 0;
+		for (Crafting::Ingredients::const_iterator ingredientIter = slot.ingredients.begin(); 
+		ingredientIter != slot.ingredients.end(); ++ingredientIter)
+		{
+			amountNeeded += (*ingredientIter)->count;
+		}
+		
+		ingredientName.clear ();
+		
+		if (amountNeeded <= 0)
+			continue;
+		
+		bool isComponent = false;
+		
+		// get the ingredient name
+		const Crafting::SimpleIngredient * const info = slot.ingredients.front().get();
+		NOT_NULL(info);
+
+		const NetworkId & ingredientId = info->ingredient;
+		switch (slot.ingredientType)
+		{
+		case Crafting::IT_item:
+		case Crafting::IT_template:
+		case Crafting::IT_schematic:
+			{
+				const Crafting::ComponentIngredient * const component = safe_cast<const Crafting::ComponentIngredient *>(info);
+				NOT_NULL (component);
+
+				ingredientName = component->componentName;
+				// since names can be duplicated, concatenate the id of
+				// the manf schematic to the name
+				if (component->ingredient != NetworkId::cms_invalid)
+				{
+					//-- null-separate the string if needed
+					if (!ingredientName.empty () && ingredientName [0] == '@')
+						ingredientName.push_back ('\0');
+
+					ingredientName.push_back (' ');
+					ingredientName += Unicode::narrowToWide (TangibleObject::generateSerialNumber (component->ingredient));
+				}
+				
+				isComponent = true;
+			}
+			break;
+			
+		case Crafting::IT_templateGeneric:
+		case Crafting::IT_schematicGeneric:
+			{
+				const Crafting::ComponentIngredient * const component = safe_cast<const Crafting::ComponentIngredient *>(info);
+				NOT_NULL (component);
+				
+				const ServerObjectTemplate * const serverTemplate = dynamic_cast<const ServerObjectTemplate *>(ObjectTemplateList::fetch (component->templateName));
+				
+				if (serverTemplate)
+				{
+					const std::string & sharedTemplateName = serverTemplate->getSharedTemplate ();
+					const SharedObjectTemplate * const sharedTemplate = dynamic_cast<const SharedObjectTemplate *>(ObjectTemplateList::fetch (sharedTemplateName));
+					
+					if (sharedTemplate)
+					{
+						ingredientName.push_back ('@');
+						ingredientName += Unicode::narrowToWide (sharedTemplate->getObjectName ().getCanonicalRepresentation ());
+						sharedTemplate->releaseReference ();
+					}
+					else
+						WARNING (true, ("ManufactureSchematicObject templateGeneric shared template [%s] not found for server template [%s]", sharedTemplateName.c_str (), component->templateName.c_str ()));
+					
+					serverTemplate->releaseReference ();
+				}
+				else
+					WARNING (true, ("ManufactureSchematicObject templateGeneric server template [%s] not found", component->templateName.c_str ()));
+				
+				isComponent = true;
+				
+			}
+			break;
+			
+		case Crafting::IT_resourceType:
+		case Crafting::IT_resourceClass:
+			{
+				ResourceTypeObject const * const ingredient = ServerUniverse::getInstance().getResourceTypeById(ingredientId);
+				if (ingredient != NULL)
+					ingredientName = Unicode::narrowToWide(ingredient->getResourceName ());
+				}
+			break;
+			
+		default:
+			break;
+		}
+		
+		if (!ingredientName.empty ())
+		{
+			const IngredientMap::iterator result = imap.find (ingredientName);
+			if (result == imap.end())
+				imap.insert (std::make_pair(ingredientName, std::make_pair (isComponent, amountNeeded)));
+			else
+			{
+				int & totalAmountNeeded = (*result).second.second;
+				totalAmountNeeded += amountNeeded;
+			}
+		}
+	}
+	
+	iiv.reserve (iiv.size () + imap.size ());
+	{
+		for (IngredientMap::const_iterator iter = imap.begin(); iter != imap.end(); ++iter)
+		{
+			const Unicode::String & name = (*iter).first;
+			const bool isComponent       = (*iter).second.first;
+			const int amount             = (*iter).second.second;
+
+			iiv.push_back (IngredientInfo (name, std::make_pair (isComponent, amount)));
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Returns the attribute bonuses this object grants when equipped.
+ *
+ * @param attribBonuses		list to be filled in with the bonuses
+ */
+void ManufactureSchematicObject::getAttribBonuses(std::vector<std::pair<int, int> > & attribBonuses) const
+{
+	attribBonuses.clear();
+
+	DynamicVariableList::NestedList mods(getObjVars(), OBJVAR_ATTRIBUTE_BONUS);
+
+	for (DynamicVariableList::NestedList::const_iterator i = mods.begin();
+		i != mods.end(); ++i)
+	{
+		int bonus = 0;
+		i.getValue(bonus);
+		int attribute = atoi(i.getName().c_str());
+		if (isdigit(i.getName()[0]) && attribute >= 0 && 
+			attribute < Attributes::NumberOfAttributes)
+		{
+			if (bonus > ConfigServerGame::getMaxItemAttribBonus())
+				bonus = ConfigServerGame::getMaxItemAttribBonus();
+			else if (bonus < -ConfigServerGame::getMaxItemAttribBonus())
+				bonus = -ConfigServerGame::getMaxItemAttribBonus();
+			attribBonuses.push_back(std::make_pair(attribute, bonus));
+		}
+		else
+		{
+			WARNING(true, ("Object %s has invalid attribute bonus objvar name of %s",
+				getNetworkId().getValueString().c_str(), i.getName().c_str()));
+		}
+	}
+}	// ManufactureSchematicObject::getAttribBonuses
+
+//----------------------------------------------------------------------
+
+/**
+ * Returns the attribute bonus of this object for a given attribute.
+ *
+ * @param attribute		the attribute
+ *
+ * @return the bonus for the attribute
+ */
+int ManufactureSchematicObject::getAttribBonus(int attribute) const
+{
+	if (attribute < 0 || attribute >= Attributes::NumberOfAttributes)
+		return 0;
+
+	DynamicVariableList::NestedList mods(getObjVars(), OBJVAR_ATTRIBUTE_BONUS);
+	char buffer[8];
+	snprintf(buffer, sizeof(buffer), "%d", attribute);
+	int bonus = 0;
+	IGNORE_RETURN(mods.getItem(buffer, bonus));
+
+	if (bonus > ConfigServerGame::getMaxItemAttribBonus())
+		bonus = ConfigServerGame::getMaxItemAttribBonus();
+	else if (bonus < -ConfigServerGame::getMaxItemAttribBonus())
+		bonus = -ConfigServerGame::getMaxItemAttribBonus();
+	return bonus;
+}	// ManufactureSchematicObject::getAttribBonus
+
+//----------------------------------------------------------------------
+
+/**
+ * Sets the attribute bonus this object applies when equipped.
+ *
+ * @param attribute		the attribute
+ * @param bonus			the bonus
+ */
+void ManufactureSchematicObject::setAttribBonus(int attribute, int bonus)
+{
+	if (attribute < 0 || attribute >= Attributes::NumberOfAttributes)
+		return;
+
+	char buffer[8];
+	snprintf(buffer, sizeof(buffer), "%d", attribute);
+	if (bonus != 0)
+		setObjVarItem(OBJVAR_ATTRIBUTE_BONUS + '.' + buffer, bonus);
+	else
+		removeObjVarItem(OBJVAR_ATTRIBUTE_BONUS + '.' + buffer);
+}	// ManufactureSchematicObject::setAttribBonus
+
+// ----------------------------------------------------------------------
+
+const std::map<StringId, float> & ManufactureSchematicObject::getAttributes() const
+{
+	return m_attributes.getMap();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the volume the schematic takes up in a player's datapad. The volume
+ * is defined by the draft schematic template.
+ */
+int ManufactureSchematicObject::getVolume() const
+{
+	const DraftSchematicObject * const schematic = DraftSchematicObject::getSchematic(getDraftSchematic());
+	if (schematic != NULL)
+		return schematic->getObjectTemplate()->asServerObjectTemplate()->getVolume();
+	return IntangibleObject::getVolume();
+}	// ManufactureSchematicObject::getVolume
+
+// ----------------------------------------------------------------------
+
+void ManufactureSchematicObject::getAttributes (AttributeVector &data) const
+{
+	char valueBuffer[32];
+	const size_t valueBuffer_size = sizeof (valueBuffer);
+
+	IntangibleObject::getAttributes(data);
+
+	static IngredientInfoVector iiv;
+	iiv.clear ();
+
+	getIngredientInfo (iiv);
+
+	data.reserve (data.size () + iiv.size () + 3);
+
+	snprintf (valueBuffer, valueBuffer_size, "%d", getVolume ());
+	data.push_back (std::make_pair (SharedObjectAttributes::data_volume, Unicode::narrowToWide (valueBuffer)));
+
+	for (IngredientInfoVector::const_iterator it = iiv.begin (); it != iiv.end (); ++it)
+	{
+		const Unicode::String & name = (*it).first;
+		const int amount            = (*it).second.second;
+
+		if (name.empty ())
+			continue;
+
+		snprintf(valueBuffer, valueBuffer_size, "%i", amount);
+
+		if (name [0] == '@')
+			data.push_back (std::make_pair (SharedObjectAttributes::cat_manf_schem_ing_resource + "." + Unicode::wideToNarrow (name), Unicode::narrowToWide (valueBuffer)));
+		else
+			data.push_back (std::make_pair (SharedObjectAttributes::cat_manf_schem_ing_resource + ".\"" + Unicode::wideToNarrow (name), Unicode::narrowToWide (valueBuffer)));
+	}
+
+	snprintf(valueBuffer, valueBuffer_size, "%i", getCount());
+	data.push_back(std::make_pair(SharedObjectAttributes::manf_limit, Unicode::narrowToWide(valueBuffer)));
+
+	//-- show manufactured object attribs
+	data.push_back(std::make_pair(SharedObjectAttributes::manf_attribs, Unicode::narrowToWide("\\#pcontrast2 ----------\\#.")));
+
+	retrieveStoredObjectAttributes (data);
+}
+
+// ----------------------------------------------------------------------
+
+void ManufactureSchematicObject::recalculateData()
+{
+	if (isAuthoritative())
+	{
+		// copy the OBJVAR_ATTRIBUTES objvars to the m_attributes member
+		if (getObjVars().hasItem(OBJVAR_ATTRIBUTES))
+		{
+			const DynamicVariableList::NestedList attributes(getObjVars(), OBJVAR_ATTRIBUTES);
+			for (DynamicVariableList::NestedList::const_iterator i = attributes.begin();
+				i != attributes.end(); ++i)
+			{
+				float value;
+				i.getValue(value);
+				m_attributes.set(StringId(i.getName()), value);
+			}
+			removeObjVarItem(OBJVAR_ATTRIBUTES);
+		}
+
+		// bug fix - set the schematic's complexity from the "crafting:complexity" attrib
+		Archive::AutoDeltaMap<StringId, float>::const_iterator found = m_attributes.find(ATTRIBUTES_COMPLEXITY);
+		if (found != m_attributes.end())
+		{
+			float complexity = (*found).second;
+			if (complexity != getComplexity())
+				setComplexity(complexity);
+		}
+
+		const DraftSchematicObject * const schematic = DraftSchematicObject::getSchematic(m_draftSchematic.get());
+
+		if (schematic)
+		{
+			m_draftSchematicSharedTemplate = schematic->getSharedTemplate()->getCrcName().getCrc();
+		}
+		else
+		{
+			const DraftSchematicObject * const missingSchematic = DraftSchematicObject::getSchematic(MISSING_SCHEMATIC_SUBSTITUTE);
+			if (missingSchematic != NULL)
+				m_draftSchematicSharedTemplate = missingSchematic->getSharedTemplate()->getCrcName().getCrc();
+			else
+				WARNING_STRICT_FATAL(true, ("Cannot find draft schematic %s! This must always exist!", MISSING_SCHEMATIC_SUBSTITUTE.c_str()));
+		}
+
+		m_customAppearance = getCustomAppearance();
+
+		std::string appearanceString;
+		if (getObjVars().getItem("customization_data",appearanceString))
+			m_appearanceData = appearanceString;
+	}
+
+	// resource types for imported resources used in the manufacturing schematic
+	// needs to be registered on this game server; this must be done on each game
+	// server as it receives the manufacturing schematic
+	DynamicVariableList::NestedList const slots(getObjVars(),OBJVAR_SLOTS);
+	for (DynamicVariableList::NestedList::const_iterator i = slots.begin(); i != slots.end(); ++i)
+	{
+		DynamicVariableList::NestedList const slot(i.getNestedList());
+		if (slot.hasItem(OBJVAR_INGR_RESOURCE_IMPORTED_DATA) && slot.hasItem(OBJVAR_INGR_RESOURCE_ID))
+		{
+			NetworkId id;
+			if (slot.getItem(OBJVAR_INGR_RESOURCE_ID, id) && !ServerUniverse::getInstance().getImportedResourceTypeById(id))
+			{
+				std::string resourceData;
+				if (slot.getItem(OBJVAR_INGR_RESOURCE_IMPORTED_DATA, resourceData))
+				{
+					NetworkId const resourceTypeId = ResourceTypeObject::addImportedResourceType(resourceData);
+					if (isAuthoritative() && resourceTypeId.isValid())
+					{
+						if (resourceTypeId.getValue() <= NetworkId::cms_maxNetworkIdWithoutClusterId)
+							removeObjVarItem(slot.getNameWithPath() + '.' + OBJVAR_INGR_RESOURCE_IMPORTED_DATA);
+
+						if (resourceTypeId != id)
+							IGNORE_RETURN(setObjVarItem(slot.getNameWithPath() + '.' + OBJVAR_INGR_RESOURCE_ID, resourceTypeId));
+					}
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ManufactureSchematicObject::getByteStreamFromAutoVariable(const std::string & name, Archive::ByteStream & target) const
+{
+	if (name == "msoCtsPackUnpack")
+	{
+		// creator Id/Name
+		CreatureObject const * containingPlayer = NULL;
+
+		ServerObject const * parent = safe_cast<ServerObject const*>(ContainerInterface::getContainedByObject(*this));
+		while (parent)
+		{
+			containingPlayer = parent->asCreatureObject();
+			if (containingPlayer && PlayerCreatureController::getPlayerObject(containingPlayer))
+				break;
+
+			containingPlayer = NULL;
+			parent = safe_cast<ServerObject const*>(ContainerInterface::getContainedByObject(*parent));
+		}
+
+		bool const creatorIsOwner = (containingPlayer && (containingPlayer->getNetworkId() == m_creatorId.get()));
+		Archive::AutoDeltaVariable<bool>(creatorIsOwner).pack(target);
+
+		// items per container
+		m_itemsPerContainer.pack(target);
+
+		// manufacture time
+		m_manufactureTime.pack(target);
+
+		// attributes
+		m_attributes.pack(target);
+
+		// resource ingredients
+		Archive::AutoDeltaMap<std::string, std::pair<NetworkId, std::string> > resourceIngredients;
+
+		DynamicVariableList::NestedList const slots(getObjVars(),OBJVAR_SLOTS);
+		for (DynamicVariableList::NestedList::const_iterator i = slots.begin(); i != slots.end(); ++i)
+		{
+			DynamicVariableList::NestedList const slot(i.getNestedList());
+			if (slot.hasItem(OBJVAR_INGR_RESOURCE_ID))
+			{
+				NetworkId id;
+				if (slot.getItem(OBJVAR_INGR_RESOURCE_ID, id))
+				{
+					ResourceTypeObject const * const rto = ServerUniverse::getInstance().getResourceTypeById(id);
+					if (rto)
+						resourceIngredients.set(slot.getNameWithPath(), std::make_pair(((id.getValue() <= NetworkId::cms_maxNetworkIdWithoutClusterId) ? NetworkId(id.getValueWithClusterId(GameServer::getInstance().getClusterId(), static_cast<NetworkId::NetworkIdType>(1), NetworkId::cms_maxNetworkIdWithoutClusterId)) : id), rto->getResourceTypeDataForExport()));
+				}
+			}
+		}
+
+		resourceIngredients.pack(target);
+
+		// the manufacturing schematic "original" NetworkId; see the comment for getOriginalId() for more information
+		NetworkId const originalId = getOriginalId();
+		Archive::AutoDeltaVariable<NetworkId>(originalId).pack(target);
+	}
+	else
+	{
+		IntangibleObject::getByteStreamFromAutoVariable(name, target);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ManufactureSchematicObject::setAutoVariableFromByteStream(const std::string & name, const Archive::ByteStream & source)
+{
+	Archive::ReadIterator ri(source);
+	if (name == "msoCtsPackUnpack")
+	{
+		// creator Id/Name
+		Archive::AutoDeltaVariable<bool> creatorIsOwner;
+		creatorIsOwner.unpackDelta(ri);
+
+		CreatureObject const * containingPlayer = NULL;
+
+		if (creatorIsOwner.get())
+		{
+			ServerObject const * parent = safe_cast<ServerObject const*>(ContainerInterface::getContainedByObject(*this));
+			while (parent)
+			{
+				containingPlayer = parent->asCreatureObject();
+				if (containingPlayer && PlayerCreatureController::getPlayerObject(containingPlayer))
+					break;
+
+				containingPlayer = NULL;
+				parent = safe_cast<ServerObject const*>(ContainerInterface::getContainedByObject(*parent));
+			}
+		}
+
+		if (creatorIsOwner.get() && containingPlayer)
+		{
+			m_creatorId = containingPlayer->getNetworkId();
+			m_creatorName = containingPlayer->getObjectName();
+			replaceStoredObjectAttribute(Unicode::narrowToWide(SharedObjectAttributes::crafter), Unicode::toLower(containingPlayer->getAssignedObjectFirstName()));
+		}
+		else
+		{
+			// if the manufacturing schematic's creator is transferring the manufacturing schematic,
+			// then on the destination galaxy, preserve the manufacturing schematic's creator
+			// information by setting the destination manufacturing schematic's creator to the
+			// destination character; otherwise, set the destination manufacturing schematic's creator
+			// to some non-zero oid that cannot possibly be a player on the target galaxy (like 1), to
+			// make it look like the manufacturing schematic's creator is no longer on the galaxy,
+			// like the manufacturing schematic's creator has been deleted and removed from the DB
+			m_creatorId = NetworkId(static_cast<NetworkId::NetworkIdType>(10000000)); // 10,000,000 is max gold oid
+			m_creatorName = Unicode::String();
+			replaceStoredObjectAttribute(Unicode::narrowToWide(SharedObjectAttributes::crafter), Unicode::String());
+		}
+
+		// items per container
+		m_itemsPerContainer.unpackDelta(ri);
+
+		// manufacture time
+		m_manufactureTime.unpackDelta(ri);
+
+		// attributes
+		typedef Archive::AutoDeltaMap<StringId, float>::Command AttributeCommands;
+		std::vector<AttributeCommands> attributes;
+		Archive::AutoDeltaMap<StringId, float>::unpack(ri, attributes);
+
+		m_attributes.clear();
+		for (std::vector<AttributeCommands>::const_iterator attributeIter = attributes.begin(); attributeIter != attributes.end(); ++attributeIter)
+			m_attributes.set(attributeIter->key, attributeIter->value);
+
+		// resource ingredients
+		typedef Archive::AutoDeltaMap<std::string, std::pair<NetworkId, std::string> >::Command ResourceIngredientCommands;
+		std::vector<ResourceIngredientCommands> resourceIngredients;
+		Archive::AutoDeltaMap<std::string, std::pair<NetworkId, std::string> >::unpack(ri, resourceIngredients);
+
+		for (std::vector<ResourceIngredientCommands>::const_iterator resourceIngredientIter = resourceIngredients.begin(); resourceIngredientIter != resourceIngredients.end(); ++resourceIngredientIter)
+		{
+			IGNORE_RETURN(setObjVarItem(resourceIngredientIter->key + '.' + OBJVAR_INGR_RESOURCE_ID, resourceIngredientIter->value.first));
+			IGNORE_RETURN(setObjVarItem(resourceIngredientIter->key + '.' + OBJVAR_INGR_RESOURCE_IMPORTED_DATA, resourceIngredientIter->value.second));
+		}
+
+		// the manufacturing schematic "original" NetworkId; see the comment for getOriginalId() for more information
+		Archive::AutoDeltaVariable<NetworkId> originalId;
+		originalId.unpackDelta(ri);
+
+		removeObjVarItem(OBJVAR_ORIGINAL_OBJECT_ID);
+		IGNORE_RETURN(setObjVarItem(OBJVAR_ORIGINAL_OBJECT_ID, originalId.get()));
+
+		recalculateData();
+
+		// need to tell all proxy game servers, if any, to create the imported resource
+		// types for any ingredient, if it hasn't already been created on that game server
+		ProxyList const &proxyList = getExposedProxyList();
+		if (!proxyList.empty())
+		{
+			bool calledServerMessageForwardingBegin = false;
+			DynamicVariableList::NestedList const slots(getObjVars(),OBJVAR_SLOTS);
+			for (DynamicVariableList::NestedList::const_iterator i = slots.begin(); i != slots.end(); ++i)
+			{
+				DynamicVariableList::NestedList const slot(i.getNestedList());
+				if (slot.hasItem(OBJVAR_INGR_RESOURCE_IMPORTED_DATA) && slot.hasItem(OBJVAR_INGR_RESOURCE_ID))
+				{
+					NetworkId id;
+					std::string resourceData;
+					if (slot.getItem(OBJVAR_INGR_RESOURCE_ID, id) && (id.getValue() > NetworkId::cms_maxNetworkIdWithoutClusterId) && slot.getItem(OBJVAR_INGR_RESOURCE_IMPORTED_DATA, resourceData))
+					{
+						if (!calledServerMessageForwardingBegin)
+						{
+							ServerMessageForwarding::begin(std::vector<uint32>(proxyList.begin(), proxyList.end()));
+							calledServerMessageForwardingBegin = true;
+						}
+
+						GenericValueTypeMessage<std::pair<NetworkId, std::string> > const addImportedResourceTypeMsg("AddImportedResourceType", std::make_pair(id, resourceData));
+						ServerMessageForwarding::send(addImportedResourceTypeMsg);
+					}
+				}
+			}
+
+			if (calledServerMessageForwardingBegin)
+				ServerMessageForwarding::end();
+		}
+	}
+	else
+	{
+		IntangibleObject::setAutoVariableFromByteStream(name, source);
+	}
+
+	addObjectToConcludeList();
+}
+
+// ----------------------------------------------------------------------
+// crates that get generated from a manufacturing schematic use the
+// NetworkId of the manufacturing schematic to generate the crate's
+// (and the items pulled from the crate) serial number; however, when
+// a manufacturing schematic is CTS(ed), it gets a different NetworkId
+// on the destination cluster, thus causing it to create crate with a
+// different serial number; in order to preserve the serial number
+// of crates generated from a manufacturing schematic regardless of
+// how many times the manufacturing schematic gets CTS(ed), for
+// manufacturing schematic that is created because of CTS, we need
+// to preserve the NetworkId of the original schematic and use that
+// NetworkId when generating the crate from the schematic
+NetworkId ManufactureSchematicObject::getOriginalId() const
+{
+	DynamicVariableList const & objvar = getObjVars();
+
+	if (objvar.hasItem(OBJVAR_ORIGINAL_OBJECT_ID) && (objvar.getType(OBJVAR_ORIGINAL_OBJECT_ID) == DynamicVariable::NETWORK_ID))
+	{
+		NetworkId originalId;
+		IGNORE_RETURN(objvar.getItem(OBJVAR_ORIGINAL_OBJECT_ID, originalId));
+		return originalId;
+	}
+
+	return getNetworkId();
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.h b/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.h
new file mode 100644
index 00000000..29b29548
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.h
@@ -0,0 +1,249 @@
+//========================================================================
+//
+// ManufactureSchematicObject.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef INCLUDED_ManufactureSchematicObject_H
+#define INCLUDED_ManufactureSchematicObject_H
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "Archive/AutoDeltaMap.h"
+#include "serverGame/IntangibleObject.h"
+#include "serverGame/ManufactureObjectInterface.h"
+#include "serverGame/ServerIntangibleObjectTemplate.h"
+
+
+class CreatureObject;
+class DraftSchematicObject;
+class FactoryObject;
+class ManufactureSchematicSynchronizedUi;
+class ResourceContainerObject;
+class ServerManufactureSchematicObjectTemplate;
+class TangibleObject;
+
+namespace Crafting
+{
+	struct CustomInfo;
+	struct IngredientSlot;
+	class  SimpleIngredient;
+	class ComponentIngredient;
+}
+
+//========================================================================
+
+/**
+  * A ManufactureSchematicObject is used to create new objects.
+  */
+class ManufactureSchematicObject : public IntangibleObject, public ManufactureObjectInterface
+{
+public:
+	typedef std::map<StringId, float> AttribMap;
+	typedef std::vector<StringId>     StringIdList;
+
+	explicit ManufactureSchematicObject(const ServerManufactureSchematicObjectTemplate* newTemplate);
+	virtual ~ManufactureSchematicObject();
+
+	virtual ManufactureSchematicObject *       asManufactureSchematicObject();
+	virtual ManufactureSchematicObject const * asManufactureSchematicObject() const;
+
+	static void                     removeDefaultTemplate ();
+
+	virtual void                    kill                  ();
+
+	void                            init                  (const DraftSchematicObject & schematic, const CachedNetworkId & creator);
+	void                            reset                 ();
+	void                            addMembersToPackages  ();
+	virtual int                     getVolume             () const;
+	virtual void                    getAttributes         (AttributeVector &data) const;
+
+	ServerIntangibleObjectTemplate::CraftingType getCategory() const;
+
+	virtual uint32                  getDraftSchematic() const;
+	const NetworkId &               getCreatorId() const;
+	NetworkId                       getOriginalId() const;
+
+	bool                            mustDestroyIngredients() const;
+
+	bool                            getSlot(const StringId & name, Crafting::IngredientSlot & data);
+	virtual bool                    getSlot(int index, Crafting::IngredientSlot & data, bool flag) const;
+	virtual int                     getSlotsCount() const;
+	void                            setSlotType(const StringId & name, int type);
+	void                            setSlotOption(const StringId & name, int option);
+	void                            setSlotIndex(const StringId & name, int index);
+	void                            modifySlotComplexity(const StringId & name, float complexityDelta);
+	void                            addSlotResource(const StringId & name, const NetworkId & resourceId, int count, const NetworkId & sourceId);
+	void                            addSlotComponent(const StringId & name, const TangibleObject & component, ServerIntangibleObjectTemplate::IngredientType ingredientType);
+	TangibleObject *                getComponent(const Crafting::ComponentIngredient & info) const;
+	void                            setSlotSources(int slotIndex, const std::vector<std::pair<NetworkId, int> > & sources);
+	void                            clearSlot(const StringId & name);
+	void                            clearSlot(int index);
+	void                            clearSlotSources();
+	void                            clearSlotSources(int index);
+	void                            removeSlot(const StringId & name);
+
+	void                            addCraftingFactory(const FactoryObject & factory);
+	void                            removeCraftingFactory(const FactoryObject & factory);
+	bool                            addIngredient(ServerObject & component);
+	bool                            addIngredient(const NetworkId & resourceId, int count, const NetworkId & sourceId);
+	bool                            removeIngredient(ServerObject & component, ServerObject & destination);
+	bool                            removeIngredient(const NetworkId & resourceId, int count, ResourceContainerObject & destination);
+	void                            destroyAllIngredients();
+	bool                            hasIngredient (const NetworkId & componentId) const;
+
+	virtual const AttribMap &       getAttributes() const;
+	virtual void                    setAttribute(const ServerIntangibleObjectTemplate::SchematicAttribute & attribute);
+	virtual void                    setAttribute(const StringId & name, float value);
+	virtual const AttribMap &       getResourceMaxAttributes() const;
+	virtual void                    setResourceMaxAttribute(const StringId & name, float value);
+
+	void                            setExperimentMod(float mod);
+
+	virtual const StringIdList &    getExperimentAttributeNames() const;
+	float                           getExperimentAttribute(const StringId & name) const;
+	virtual void                    setExperimentAttribute(const StringId & name, float value);
+	float                           getMinExperimentAttribute(const StringId & name) const;
+	void                            setMinExperimentAttribute(const StringId & name, float value);
+	float                           getMaxExperimentAttribute(const StringId & name) const;
+	void                            setMaxExperimentAttribute(const StringId & name, float value);
+	float                           getResourceMaxExperimentAttribute(const StringId & name) const;
+	void                            setResourceMaxExperimentAttribute(const StringId & name, float value);
+	virtual void                    getAllExperimentAttributeValues(const StringId & name, float & value, float & minValue, float & maxValue, float & resourceMaxValue) const;
+	virtual void                    setExperimentAttributeLimits(const StringId & name, float minValue, float maxValue, float resourceMaxValue);
+
+	const std::vector<std::string> & getAppearances() const;
+	void                             addAppearance(const std::string & appearance);
+	const std::string                getCustomAppearance() const;
+	void                             setCustomAppearance(const std::string & appearance);
+	void                             setCustomAppearance(int index);
+	const std::string &              getAppearanceData() const;
+
+	void                            setCustomization(const std::string & name, int value, int minValue, int maxValue);
+	bool                            setCustomization(int index, int value, ServerObject & prototype);
+	bool                            setCustomization(const std::string & name, int value, ServerObject & prototype);
+
+	int                             getItemsPerContainer         () const;
+	void                            setItemsPerContainer         (int count);
+	float                           getManufactureTime           () const;
+	void                            setManufactureTime           (float time);
+	void                            computeComplexity            ();
+
+	void                            signalClientChange           ();
+
+	void                            requestSlots                 (ServerObject & player) const;
+
+	virtual bool                    isMakingObject(void) const;
+	ServerObject *                  manufactureObject(const NetworkId & creatorId, ServerObject & container, const SlotId & containerSlotId, bool prototype);
+	ServerObject *                  manufactureObject(const Vector & position);
+	bool                            setObjectComponents(TangibleObject * object, bool checkResources);
+
+	virtual const NetworkId &       getDerivedNetworkId() const;
+
+	void                               getAttribBonuses(std::vector<std::pair<int, int> > & attribBonuses) const;
+	int                                getAttribBonus(int attribute) const;
+	void                               setAttribBonus(int attribute, int bonus);
+
+	virtual void                    getByteStreamFromAutoVariable(const std::string & name, Archive::ByteStream & target) const;
+	virtual void                    setAutoVariableFromByteStream(const std::string & name, const Archive::ByteStream & source);
+
+public:
+	// <name, <isComponent, countPerItem> >
+	typedef std::pair<Unicode::String, std::pair<bool, int> >   IngredientInfo;
+	typedef stdvector<IngredientInfo>::fwd                      IngredientInfoVector;
+	void                            getIngredientInfo (IngredientInfoVector & iiv) const;
+
+protected:
+	ServerSynchronizedUi * createSynchronizedUi ();
+
+	virtual void                    initializeFirstTimeObject();
+	virtual void                    endBaselines();
+
+	virtual const SharedObjectTemplate *  getDefaultSharedTemplate() const;
+
+private:
+	ManufactureSchematicObject();
+	ManufactureSchematicObject(const ManufactureSchematicObject& rhs);
+	ManufactureSchematicObject&	operator=(const ManufactureSchematicObject& rhs);
+
+	void                            recalculateData();
+
+private:
+	static const SharedObjectTemplate * m_defaultSharedTemplate;	// template to use if no shared template is given
+
+	Archive::AutoDeltaVariable<uint32>      m_draftSchematicSharedTemplate;
+	Archive::AutoDeltaVariable<uint32>      m_draftSchematic;         // draft schematic this schematic is based on
+	Archive::AutoDeltaVariable<NetworkId>   m_creatorId;              // id of crafter
+	Archive::AutoDeltaVariable<Unicode::String> m_creatorName;            // name of crafter
+	Archive::AutoDeltaVariable<int>         m_itemsPerContainer;      // number of items per container (FactoryObject) when manufacturing
+	// @todo: move m_attributes to a non-persisted package after old manf schematics are gone
+	Archive::AutoDeltaMap<StringId, float>  m_attributes;             // object attributes this schematic affects
+	Archive::AutoDeltaVariable<float>       m_manufactureTime;        // time (in secs) to manufacture one object
+
+	// not persisted
+	Archive::AutoDeltaVariable<bool>             m_isCrafting;
+	Archive::AutoDeltaVariable<std::string>      m_customAppearance;        // this is the custom appearance template
+	Archive::AutoDeltaVariable<std::string>      m_appearanceData;          // this is the custom colors data
+	Archive::AutoDeltaMap<StringId, float>       m_resourceMaxAttributes;
+	Archive::AutoDeltaVariable<uint8>            m_schematicChangedSignal;
+	Archive::AutoDeltaVector<CachedNetworkId>    m_factories;               // FactoryObjects that have references being used as components
+
+	// internal flag - no need to sync
+	bool m_isMakingObject;
+};
+
+//========================================================================
+
+inline const NetworkId & ManufactureSchematicObject::getCreatorId() const
+{
+	return m_creatorId.get();
+}
+
+//------------------------------------------------------------------------------
+
+inline int ManufactureSchematicObject::getItemsPerContainer() const
+{
+	return m_itemsPerContainer.get();
+}
+
+//------------------------------------------------------------------------------
+
+inline void ManufactureSchematicObject::setItemsPerContainer(int count)
+{
+	m_itemsPerContainer = count;
+}
+
+//------------------------------------------------------------------------------
+
+inline float ManufactureSchematicObject::getManufactureTime() const
+{
+	return m_manufactureTime.get();
+}
+
+//------------------------------------------------------------------------------
+
+inline void ManufactureSchematicObject::setManufactureTime(float time)
+{
+	m_manufactureTime = time;
+}
+
+//------------------------------------------------------------------------------
+
+inline void ManufactureSchematicObject::signalClientChange()
+{
+	m_schematicChangedSignal = static_cast<uint8>(m_schematicChangedSignal.get() + 1);
+}
+
+//------------------------------------------------------------------------------
+
+inline const std::string & ManufactureSchematicObject::getAppearanceData() const
+{
+	return m_appearanceData.get();
+}
+
+
+//========================================================================
+
+
+#endif	// INCLUDED_ManufactureSchematicObject_H
diff --git a/engine/server/library/serverGame/src/shared/object/MissionObject.cpp b/engine/server/library/serverGame/src/shared/object/MissionObject.cpp
new file mode 100644
index 00000000..9aa5873a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/MissionObject.cpp
@@ -0,0 +1,856 @@
+// MissionObject.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/MissionObject.h"
+
+#include "UnicodeUtils.h"
+#include "boost/smart_ptr.hpp"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/ObjectIdManager.h"
+#include "serverGame/ObjectTracker.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/ServerMissionObjectTemplate.h"
+#include "serverGame/ServerObjectTemplate.h"
+#include "serverGame/ServerWorld.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptDictionary.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedGame/WaypointData.h"
+#include "sharedMessageDispatch/Transceiver.h"
+#include "sharedNetworkMessages/MessageQueueMissionCreateRequestData.h"
+#include "sharedNetworkMessages/MessageQueueMissionDetailsResponseData.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+
+//-----------------------------------------------------------------------
+
+const SharedObjectTemplate * MissionObject::m_defaultSharedTemplate = NULL;
+const char * const s_missionObjectTemplateName = "object/mission/base_mission_object.iff";
+
+//-----------------------------------------------------------------------
+
+MissionObject::MissionObject(const ServerMissionObjectTemplate * t) :
+IntangibleObject(t),
+m_callback(new MessageDispatch::Callback),
+m_description(),
+m_difficulty(0),
+m_endLocation(),
+m_missionCreator(),
+m_missionType(),
+m_reward(0),
+m_rootScriptName(),
+m_startLocation(),
+m_targetAppearance(),
+m_title(),
+m_missionHolderId(),
+m_status(0),
+m_targetName()
+{
+	addMembersToPackages();
+	ObjectTracker::addMissionObject();
+	Waypoint & w = const_cast<Waypoint &>(m_waypoint.get());
+	m_callback->connect(w.getChangeNotification(), *this, &MissionObject::setWaypoint);
+	m_callback->connect(w.getLoadNotification(), *this, &MissionObject::onWaypointLoad);
+}
+
+//-----------------------------------------------------------------------
+
+MissionObject::~MissionObject()
+{
+	ObjectTracker::removeMissionObject();
+	delete m_callback;
+}
+
+//-----------------------------------------------------------------------
+
+MissionObject * MissionObject::createMissionObjectInCreatureMissionBag(CreatureObject * creature)
+{
+	MissionObject * result = 0;
+	ServerObject * missionBag = creature->getMissionBag();
+	if(missionBag)
+		result = safe_cast<MissionObject *>(ServerWorld::createNewObject(s_missionObjectTemplateName, *missionBag, false));
+	return result;										   
+}
+
+//-----------------------------------------------------------------------
+
+bool MissionObject::canTrade() const
+{
+	return false;
+}
+
+//-----------------------------------------------------------------------
+
+bool MissionObject::onContainerAboutToLoseItem(ServerObject * destination, ServerObject& item, ServerObject* transferer)
+{
+	if (transferer)
+		return false;
+	return ServerObject::onContainerAboutToLoseItem(destination, item, transferer);
+}
+
+//-----------------------------------------------------------------------
+
+bool MissionObject::onContainerAboutToTransfer(ServerObject * destination, ServerObject* transferer)
+{
+
+	if (transferer)
+		return false;
+	return ServerObject::onContainerAboutToTransfer(destination, transferer);
+
+}
+//-----------------------------------------------------------------------
+
+int MissionObject::onContainerAboutToGainItem(ServerObject& item, ServerObject* transferer)
+{
+	if (transferer)
+		return Container::CEC_BlockedByDestinationContainer;
+	return ServerObject::onContainerAboutToGainItem(item, transferer);
+}
+
+//-----------------------------------------------------------------------
+/**
+ * Returns a shared template if none was given for this object.
+ *
+ * @return the shared template
+ */
+const SharedObjectTemplate * MissionObject::getDefaultSharedTemplate(void) const
+{
+static const ConstCharCrcLowerString templateName("object/mission/base/shared_mission_default.iff");
+
+	if (m_defaultSharedTemplate == NULL)
+	{
+		m_defaultSharedTemplate = safe_cast<const SharedObjectTemplate *>(
+			ObjectTemplateList::fetch(templateName));
+		WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create "
+			"default shared object template %s", templateName.getString()));
+		if (m_defaultSharedTemplate != NULL)
+			ExitChain::add (removeDefaultTemplate, "MissionObject::removeDefaultTemplate");
+	}
+	return m_defaultSharedTemplate;
+}	// MissionObject::getDefaultSharedTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Cleans up the default shared template.
+ */
+void MissionObject::removeDefaultTemplate(void)
+{
+	if (m_defaultSharedTemplate != NULL)
+	{
+		m_defaultSharedTemplate->releaseReference();
+		m_defaultSharedTemplate = NULL;
+	}
+}	// MissionObject::removeDefaultTemplate
+
+//-----------------------------------------------------------------------
+
+void MissionObject::abortMission()
+{
+	ScriptParams params;
+	ScriptDictionaryPtr dictionary;
+	getScriptObject()->makeScriptDictionary(params, dictionary);
+	if (dictionary.get() != NULL)
+	{
+		dictionary->serialize();
+		MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), 
+			"abortMission", dictionary->getSerializedData(), 0, true);
+	}
+/*
+	CreatureObject *player = safe_cast<CreatureObject *>(ServerWorld::findObjectByNetworkId(getMissionHolderId()));
+	if (player)
+	{
+		player->abortMission(this);
+	}
+	*/
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::endBaselines()
+{
+	CreatureObject * c = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(m_missionHolderId.get()));
+	if(c)
+	{
+		setMissionHolderId(c->getNetworkId());
+	}
+	ServerObject::endBaselines();
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::endMission(const bool)
+{
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::setMissionHolderId(const NetworkId & h)
+{
+	m_missionHolderId.set(h);
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+{
+	IntangibleObject::getAttributes(data);
+	std::string const & missionType = getMissionTypeString();
+	if (strncmp(missionType.c_str(),"space_",6)==0)
+	{
+		if (missionType=="space_battle")
+			data.push_back(std::make_pair(std::string("type"),Unicode::narrowToWide("@space/quest:space_battle"))); // unfortunately, this one is inconsistent
+		else if (missionType=="space_mining_destroy")
+			data.push_back(std::make_pair(std::string("type"),Unicode::narrowToWide("@space/quest:space_mining_destroy"))); // unfortunately, this one is also inconsistent
+		else
+			data.push_back(std::make_pair(std::string("type"),Unicode::narrowToWide(std::string("@space/quest:") + std::string(missionType,6))));
+	}
+	data.push_back(std::make_pair(std::string("description"),Unicode::narrowToWide(std::string("@") + getDescription().getCanonicalRepresentation())));
+}
+
+//-----------------------------------------------------------------------
+
+MissionObject * MissionObject::asMissionObject()
+{
+	return this;
+}
+
+//-----------------------------------------------------------------------
+
+MissionObject const * MissionObject::asMissionObject() const
+{
+	return this;
+}
+
+//-----------------------------------------------------------------------
+
+const NetworkId & MissionObject::getMissionHolderId() const
+{
+	return m_missionHolderId.get();
+}
+
+//-----------------------------------------------------------------------
+
+const StringId & MissionObject::getDescription() const
+{
+	return m_description.get();
+}
+
+//-----------------------------------------------------------------------
+
+const int MissionObject::getDifficulty() const
+{
+	return m_difficulty.get();
+}
+
+//-----------------------------------------------------------------------
+
+const Location & MissionObject::getEndLocation() const
+{
+	return m_endLocation.get();
+}
+
+//-----------------------------------------------------------------------
+
+const Unicode::String & MissionObject::getMissionCreator() const
+{
+	return m_missionCreator.get();
+}
+
+//-----------------------------------------------------------------------
+
+const unsigned int MissionObject::getMissionType() const
+{
+	return m_missionType.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & MissionObject::getMissionTypeString() const
+{
+	// @todo this should be a crc string table!
+	static const unsigned int destroy = CrcLowerString::calculateCrc("destroy");
+	static const unsigned int recon = CrcLowerString::calculateCrc("recon");
+	static const unsigned int deliver = CrcLowerString::calculateCrc("deliver");
+	static const unsigned int escorttocreator = CrcLowerString::calculateCrc("escorttocreator");
+	static const unsigned int escort = CrcLowerString::calculateCrc("escort");
+	static const unsigned int bounty = CrcLowerString::calculateCrc("bounty");
+	static const unsigned int survey = CrcLowerString::calculateCrc("survey");
+	static const unsigned int crafting = CrcLowerString::calculateCrc("crafting");
+	static const unsigned int musician = CrcLowerString::calculateCrc("musician");
+	static const unsigned int dancer =  CrcLowerString::calculateCrc("dancer");
+	static const unsigned int hunting =  CrcLowerString::calculateCrc("hunting");
+	static const unsigned int space_assassination = CrcLowerString::calculateCrc("space_assassination");
+	static const unsigned int space_delivery = CrcLowerString::calculateCrc("space_delivery");
+	static const unsigned int space_delivery_duty = CrcLowerString::calculateCrc("space_delivery_duty");
+	static const unsigned int space_destroy = CrcLowerString::calculateCrc("space_destroy");
+	static const unsigned int space_destroy_duty = CrcLowerString::calculateCrc("space_destroy_duty");
+	static const unsigned int space_surprise_attack = CrcLowerString::calculateCrc("space_surprise_attack");
+	static const unsigned int space_escort = CrcLowerString::calculateCrc("space_escort");
+	static const unsigned int space_escort_duty = CrcLowerString::calculateCrc("space_escort duty");
+	static const unsigned int space_inspection = CrcLowerString::calculateCrc("space_inspection");
+	static const unsigned int space_patrol = CrcLowerString::calculateCrc("space_patrol");
+	static const unsigned int space_recovery = CrcLowerString::calculateCrc("space_recovery");
+	static const unsigned int space_recovery_duty = CrcLowerString::calculateCrc("space_recovery_duty");
+	static const unsigned int space_rescue = CrcLowerString::calculateCrc("space_rescue");
+	static const unsigned int space_rescue_duty = CrcLowerString::calculateCrc("space_rescue_duty");
+	static const unsigned int space_battle = CrcLowerString::calculateCrc("space_battle");
+	static const unsigned int space_survival = CrcLowerString::calculateCrc("space_survival");
+	static const unsigned int space_mining_destroy = CrcLowerString::calculateCrc("space_mining_destroy");
+	
+	if(m_missionType.get() == destroy)
+	{
+		static const std::string r = "destroy";
+		return r;
+	}
+	else if(m_missionType.get() == recon)
+	{
+		static const std::string r = "recon";
+		return r;
+	}
+	else if(m_missionType.get() == deliver)
+	{
+		static const std::string r = "deliver";
+		return r;
+	}
+	else if(m_missionType.get() == escorttocreator)
+	{
+		static const std::string r = "escorttocreator";
+		return r;
+	}
+	else if(m_missionType.get() == escort)
+	{
+		static const std::string r = "escort";
+		return r;
+	}
+	else if(m_missionType.get() == bounty)
+	{
+		static const std::string r = "bounty";
+		return r;
+	}
+	else if(m_missionType.get() == survey)
+	{
+		static const std::string r = "survey";
+		return r;
+	}
+	else if(m_missionType.get() == crafting)
+	{
+		static const std::string r = "crafting";
+		return r;
+	}
+	else if(m_missionType.get() == musician)
+	{
+		static const std::string r = "musician";
+		return r;
+	}
+	else if(m_missionType.get() == dancer)
+	{
+		static const std::string r = "dancer";
+		return r;
+	}
+	else if(m_missionType.get() == hunting)
+	{
+		static const std::string r = "hunting";
+		return r;
+	}
+	else if(m_missionType.get() == space_assassination)
+	{
+		static const std::string r = "space_assassination";
+		return r;
+	}
+	else if(m_missionType.get() == space_delivery)
+	{
+		static const std::string r = "space_delivery";
+		return r;
+	}
+	else if(m_missionType.get() == space_delivery_duty)
+	{
+		static const std::string r = "space_delivery_duty";
+		return r;
+	}
+	else if(m_missionType.get() == space_destroy)
+	{
+		static const std::string r = "space_destroy";
+		return r;
+	}
+	else if(m_missionType.get() == space_destroy_duty)
+	{
+		static const std::string r = "space_destroy_duty";
+		return r;
+	}
+	else if(m_missionType.get() == space_surprise_attack)
+	{
+		static const std::string r = "space_surprise_attack";
+		return r;
+	}
+	else if(m_missionType.get() == space_escort)
+	{
+		static const std::string r = "space_escort";
+		return r;
+	}
+	else if(m_missionType.get() == space_escort_duty)
+	{
+		static const std::string r = "space_escort_duty";
+		return r;
+	}
+	else if(m_missionType.get() == space_inspection)
+	{
+		static const std::string r = "space_inspection";
+		return r;
+	}
+	else if(m_missionType.get() == space_patrol)
+	{
+		static const std::string r = "space_patrol";
+		return r;
+	}
+	else if(m_missionType.get() == space_recovery)
+	{
+		static const std::string r = "space_recovery";
+		return r;
+	}
+	else if(m_missionType.get() == space_recovery_duty)
+	{
+		static const std::string r = "space_recovery_duty";
+		return r;
+	}
+	else if(m_missionType.get() == space_rescue)
+	{
+		static const std::string r = "space_rescue";
+		return r;
+	}
+	else if(m_missionType.get() == space_rescue_duty)
+	{
+		static const std::string r = "space_rescue_duty";
+		return r;
+	}
+	else if(m_missionType.get() == space_battle)
+	{
+		static const std::string r = "space_battle";
+		return r;
+	}
+	else if(m_missionType.get() == space_survival)
+	{
+		static const std::string r = "space_survival";
+		return r;
+	}
+	else if(m_missionType.get() == space_mining_destroy)
+	{
+		static const std::string r = "space_mining_destroy";
+		return r;
+	}
+
+	static const std::string unknown("unknown");
+	return unknown;
+	
+}
+
+//-----------------------------------------------------------------------
+
+const int MissionObject::getReward() const
+{
+	return m_reward.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & MissionObject::getRootScriptName() const
+{
+	return m_rootScriptName.get();
+}
+
+//-----------------------------------------------------------------------
+
+const Location & MissionObject::getStartLocation() const
+{
+	return m_startLocation.get();
+}
+
+//-----------------------------------------------------------------------
+
+const int MissionObject::getStatus() const
+{
+	return m_status.get();
+}
+
+//-----------------------------------------------------------------------
+
+const unsigned int MissionObject::getTargetAppearance() const
+{
+	return m_targetAppearance.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & MissionObject::getTargetName() const
+{
+	return m_targetName.get();
+}
+
+//-----------------------------------------------------------------------
+
+const StringId & MissionObject::getTitle() const
+{
+	return m_title.get();
+}
+
+//-----------------------------------------------------------------------
+
+const Waypoint & MissionObject::getWaypoint() const
+{
+	return m_waypoint.get();
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::grantMissionTo(const NetworkId & target)
+{
+	ScriptParams p;
+	p.addParam(target);
+	getScriptObject()->trigAllScripts(Scripting::TRIG_GRANT_MISSION, p);
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::onAddedToWorld()
+{
+	IntangibleObject::onAddedToWorld();
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::setDescription(const StringId & d)
+{
+	m_description.set(d);
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::setDifficulty(const int v)
+{
+	m_difficulty.set(v);
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::setEndLocation(const Location & v)
+{
+	m_endLocation.set(v);
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::setMissionCreator(const Unicode::String & c)
+{
+	m_missionCreator.set(c);
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::setMissionType(const unsigned char t)
+{
+	m_missionType.set(t);
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::setMissionType(const std::string & t)
+{
+	m_missionType.set(CrcLowerString::calculateCrc(t.c_str()));
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::setReward(const int v)
+{
+	m_reward.set(v);
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::setRootScriptName(const std::string & r)
+{
+	if(! m_rootScriptName.get().empty())
+	{
+		getScriptObject()->detachScript(getRootScriptName());
+	}
+	m_rootScriptName.set(r);
+	getScriptObject()->attachScript(m_rootScriptName.get(), true);
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::setStartLocation(const Location & v)
+{
+	m_startLocation.set(v);
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::setStatus(int newStatus)
+{
+	if(newStatus != 0)
+	{
+		m_status.set(m_status.get() + 1);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::setTargetAppearance(const std::string & a)
+{
+	const ServerObjectTemplate * t = dynamic_cast<const ServerObjectTemplate *>(ObjectTemplateList::fetch(a));
+	if(t)
+	{
+		std::string s = t->getSharedTemplate();
+		ConstCharCrcString c(s.c_str());
+		setTargetAppearance(c.getCrc());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::setTargetAppearance(unsigned int a)
+{
+	m_targetAppearance.set(a);
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::setTargetName(const std::string & n)
+{
+	m_targetName.set(n);
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::setTitle(const StringId & t)
+{
+	m_title.set(t);
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::setWaypoint(const Waypoint & w)
+{
+	m_waypoint.set(w);
+}
+
+//-----------------------------------------------------------------------
+
+void MissionObject::onWaypointLoad(Waypoint::ChangeNotification & c)
+{
+	Waypoint & w = const_cast<Waypoint &>(m_waypoint.get());
+	m_callback->disconnect(w.getChangeNotification(), *this, &MissionObject::setWaypoint);
+	m_callback->connect(c, *this, &MissionObject::setWaypoint);
+}
+
+// ----------------------------------------------------------------------
+
+void MissionObject::initializeFirstTimeObject()
+{
+	m_waypoint.set(Waypoint(ObjectIdManager::getNewObjectId()));
+
+	IntangibleObject::initializeFirstTimeObject();
+}
+
+// ----------------------------------------------------------------------
+
+void MissionObject::getByteStreamFromAutoVariable(const std::string & name, Archive::ByteStream & target) const
+{
+	if (name == "moCtsPackUnpack")
+	{
+		// description
+		m_description.pack(target);
+
+		// difficulty
+		m_difficulty.pack(target);
+
+		// end location
+		m_endLocation.pack(target);
+
+		// mission creator
+		m_missionCreator.pack(target);
+
+		// mission type
+		m_missionType.pack(target);
+
+		// reward
+		m_reward.pack(target);
+
+		// root script name
+		m_rootScriptName.pack(target);
+
+		// start location
+		m_startLocation.pack(target);
+
+		// target appearance
+		m_targetAppearance.pack(target);
+
+		// title
+		m_title.pack(target);
+
+		// mission holder id
+		// don't need to pack this, will be assigned the id of the destination character object
+
+		// status
+		m_status.pack(target);
+
+		// target name
+		m_targetName.pack(target);
+
+		// waypoint
+		Archive::put(target, m_waypoint.get().getWaypointDataBase());
+
+		// mission location target
+		CreatureObject const * containingPlayer = NULL;
+		ServerObject const * parent = safe_cast<ServerObject const*>(ContainerInterface::getContainedByObject(*this));
+		while (parent)
+		{
+			containingPlayer = parent->asCreatureObject();
+			if (containingPlayer && PlayerCreatureController::getPlayerObject(containingPlayer))
+				break;
+
+			containingPlayer = NULL;
+			parent = safe_cast<ServerObject const*>(ContainerInterface::getContainedByObject(*parent));
+		}
+
+		bool hasMissionLocationTarget = false;
+		if (containingPlayer)
+		{
+			std::vector<LocationData> const & locationData = containingPlayer->getLocationTargets();
+			for (std::vector<LocationData>::const_iterator iter = locationData.begin(); iter != locationData.end(); ++iter)
+			{
+				if (iter->name == Unicode::narrowToWide(getNetworkId().getValueString()))
+				{
+					Archive::put(target, true);
+					Archive::put(target, *iter);
+					hasMissionLocationTarget = true;
+					break;
+				}
+			}
+		}
+
+		if (!hasMissionLocationTarget)
+			Archive::put(target, false);
+	}
+	else
+	{
+		IntangibleObject::getByteStreamFromAutoVariable(name, target);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void MissionObject::setAutoVariableFromByteStream(const std::string & name, const Archive::ByteStream & source)
+{
+	Archive::ReadIterator ri(source);
+	if (name == "moCtsPackUnpack")
+	{
+		// description
+		m_description.unpackDelta(ri);
+
+		// difficulty
+		m_difficulty.unpackDelta(ri);
+
+		// end location
+		m_endLocation.unpackDelta(ri);
+
+		// mission creator
+		m_missionCreator.unpackDelta(ri);
+
+		// mission type
+		m_missionType.unpackDelta(ri);
+
+		// reward
+		m_reward.unpackDelta(ri);
+
+		// root script name
+		m_rootScriptName.unpackDelta(ri);
+
+		// start location
+		m_startLocation.unpackDelta(ri);
+
+		// target appearance
+		m_targetAppearance.unpackDelta(ri);
+
+		// title
+		m_title.unpackDelta(ri);
+
+		// mission holder id
+		CreatureObject * containingPlayer = NULL;
+		ServerObject * parent = safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(*this));
+		while (parent)
+		{
+			containingPlayer = parent->asCreatureObject();
+			if (containingPlayer && PlayerCreatureController::getPlayerObject(containingPlayer))
+				break;
+
+			containingPlayer = NULL;
+			parent = safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(*parent));
+		}
+
+		if (containingPlayer)
+			m_missionHolderId.set(containingPlayer->getNetworkId());
+
+		// status
+		m_status.unpackDelta(ri);
+
+		// target name
+		m_targetName.unpackDelta(ri);
+
+		// waypoint
+		WaypointDataBase waypointDB;
+		Archive::get(ri, waypointDB);
+
+		Waypoint w = m_waypoint.get();
+
+		w.setAppearanceNameCrc(waypointDB.m_appearanceNameCrc);
+		w.setLocation(waypointDB.m_location);
+		w.setName(waypointDB.m_name);
+		w.setColor(waypointDB.m_color);
+		w.setActive(waypointDB.m_active);
+
+		m_waypoint.set(w);
+
+		DynamicVariableList const & objvar = getObjVars();
+		if (objvar.hasItem("objTargetWaypoint") && (objvar.getType("objTargetWaypoint") == DynamicVariable::NETWORK_ID))
+			IGNORE_RETURN(setObjVarItem("objTargetWaypoint", w.getNetworkId()));
+
+		// mission location target
+		bool hasMissionLocationTarget;
+		Archive::get(ri, hasMissionLocationTarget);
+		if (hasMissionLocationTarget)
+		{
+			LocationData locationData;
+			Archive::get(ri, locationData);
+			locationData.name = Unicode::narrowToWide(getNetworkId().getValueString());
+
+			if (containingPlayer)
+				containingPlayer->addLocationTarget(locationData);
+		}
+
+		// questOwner objvar
+		if (objvar.hasItem("questOwner") && (objvar.getType("questOwner") == DynamicVariable::NETWORK_ID) && containingPlayer)
+			IGNORE_RETURN(setObjVarItem("questOwner", containingPlayer->getNetworkId()));
+
+		// self objvar
+		if (objvar.hasItem("self") && (objvar.getType("self") == DynamicVariable::NETWORK_ID))
+			IGNORE_RETURN(setObjVarItem("self", getNetworkId()));
+	}
+	else
+	{
+		IntangibleObject::setAutoVariableFromByteStream(name, source);
+	}
+
+	addObjectToConcludeList();
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/MissionObject.h b/engine/server/library/serverGame/src/shared/object/MissionObject.h
new file mode 100644
index 00000000..48b4b729
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/MissionObject.h
@@ -0,0 +1,134 @@
+// MissionObject.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_MissionObject_H
+#define	_INCLUDED_MissionObject_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/CreatureObject.h"
+#include "serverGame/IntangibleObject.h"
+#include "sharedUtility/Location.h"
+#include "sharedGame/Waypoint.h"
+
+class Location;
+class ServerMissionObjectTemplate;
+class Token;
+class MessageQueueMissionCreateRequestData;
+class MessageQueueMissionDetailsResponse;
+
+namespace MessageDispatch
+{
+	class Callback;
+}
+
+//-----------------------------------------------------------------------
+
+class MissionObject : public IntangibleObject
+{
+public:
+    virtual ~MissionObject  ();
+
+	static MissionObject *         createMissionObjectInCreatureMissionBag(CreatureObject * creatureWithMissionBag);
+	virtual MissionObject *        asMissionObject();
+	virtual MissionObject const *  asMissionObject() const;
+
+	static void             removeDefaultTemplate(void);
+
+	void                    abortMission        ();
+	virtual bool            canTrade() const;
+	virtual bool            onContainerAboutToLoseItem(ServerObject * destination, ServerObject& item, ServerObject* transferer);
+	virtual bool            onContainerAboutToTransfer(ServerObject * destination, ServerObject* transferer);
+	virtual int             onContainerAboutToGainItem(ServerObject& item, ServerObject* transferer);
+
+	void                    endMission          (const bool succeeded);
+	const NetworkId &       getMissionHolderId  () const;
+	virtual void            getAttributes       (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+
+
+/*mission data*/
+	const int                getDifficulty             () const;
+	const StringId &         getDescription            () const;
+	const Location &         getEndLocation            () const;
+	const Unicode::String &  getMissionCreator         () const;
+	const unsigned int       getMissionType            () const;
+	const std::string &      getMissionTypeString      () const;
+	const int                getReward                 () const;
+	const std::string &      getRootScriptName         () const;
+	const Location &         getStartLocation          () const;
+	const unsigned int       getTargetAppearance       () const;
+	const std::string &      getTargetName             () const;
+	const StringId &         getTitle                  () const;
+	const int                getStatus                 () const;
+	const Waypoint &         getWaypoint               () const;
+
+	void                     grantMissionTo            (const NetworkId & target);
+	virtual void             onAddedToWorld            ();
+
+	void  setDescription          (const StringId & description);
+	void  setDifficulty           (const int difficulty);
+	void  setEndLocation          (const Location & endLocation);
+	void  setMissionCreator       (const Unicode::String & creator);
+	void  setMissionType          (const unsigned char);
+	void  setMissionType          (const std::string &);
+	void  setReward               (const int reward);
+	void  setRootScriptName       (const std::string & rootScriptName);
+	void  setStatus               (int newStatus);
+	void  setStartLocation        (const Location & startLocation);
+	void  setTargetAppearance     (const std::string & appearance);
+	void  setTargetAppearance     (unsigned int appearanceNameCrc);
+	void  setTargetName           (const std::string & targetName);
+	void  setTitle                (const StringId & title);
+	void  setMissionHolderId      (const NetworkId & h);
+	void  setWaypoint             (const Waypoint & w);
+/* end mission data*/
+
+	virtual void getByteStreamFromAutoVariable(const std::string & name, Archive::ByteStream & target) const;
+	virtual void setAutoVariableFromByteStream(const std::string & name, const Archive::ByteStream & source);
+
+protected:
+	virtual void            endBaselines        ();
+	virtual void            initializeFirstTimeObject();
+
+	virtual const SharedObjectTemplate *  getDefaultSharedTemplate(void) const;
+	friend class ServerMissionObjectTemplate;
+	MissionObject  (const ServerMissionObjectTemplate * missionObjectTemplate);
+
+private:
+	MissionObject & operator = (const MissionObject & rhs);
+	MissionObject(const MissionObject & source);
+	static const ServerMissionObjectTemplate * getBogusMissionObjectTemplate();
+	void notifyOwnerMissionAccepted();
+	void notifyOwnerMissionAborted();
+	void notifyOwnerMissionFailed();
+	void notifyOwnerMissionSucceeded();
+	void onWaypointLoad(Waypoint::ChangeNotification &);
+
+private:
+
+	static const SharedObjectTemplate * m_defaultSharedTemplate;	// template to use if no shared template is given
+	MessageDispatch::Callback *                  m_callback;
+	Archive::AutoDeltaVariable<StringId>         m_description;
+	Archive::AutoDeltaVariable<int>              m_difficulty;
+	Archive::AutoDeltaVariable<Location>         m_endLocation;
+	Archive::AutoDeltaVariable<Unicode::String>  m_missionCreator;
+	Archive::AutoDeltaVariable<unsigned int>     m_missionType;
+	Archive::AutoDeltaVariable<int>              m_reward;
+	Archive::AutoDeltaVariable<std::string>      m_rootScriptName;
+	Archive::AutoDeltaVariable<Location>         m_startLocation;
+	Archive::AutoDeltaVariable<unsigned int>     m_targetAppearance;
+	Archive::AutoDeltaVariable<StringId>         m_title;
+	Archive::AutoDeltaVariable<NetworkId>        m_missionHolderId;
+	Archive::AutoDeltaVariable<int>              m_status;
+	Archive::AutoDeltaVariable<std::string>      m_targetName;
+	Archive::AutoDeltaVariable<Waypoint>         m_waypoint;
+
+private:
+	void addMembersToPackages();
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_MissionObject_H
+
diff --git a/engine/server/library/serverGame/src/shared/object/NetworkTriggerVolume.cpp b/engine/server/library/serverGame/src/shared/object/NetworkTriggerVolume.cpp
new file mode 100644
index 00000000..ba360fb4
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/NetworkTriggerVolume.cpp
@@ -0,0 +1,54 @@
+// NetworkTriggerVolume.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "NetworkTriggerVolume.h"
+
+#include "serverGame/ObserveTracker.h"
+#include "serverGame/ServerObject.h"
+
+//-----------------------------------------------------------------------
+
+NetworkTriggerVolume::NetworkTriggerVolume(ServerObject & owner, real radius) :
+	TriggerVolume(owner, radius, NetworkTriggerVolumeNamespace::NetworkTriggerVolumeName, true)
+{
+}
+
+//-----------------------------------------------------------------------
+
+NetworkTriggerVolume::~NetworkTriggerVolume()
+{
+}
+
+//-----------------------------------------------------------------------
+
+bool NetworkTriggerVolume::isNetworkTriggerVolume() const
+{
+	return true;
+}
+	
+//-----------------------------------------------------------------------
+
+void NetworkTriggerVolume::virtualOnEnter(ServerObject& object)
+{
+	// we never observe ourself due to trigger volumes
+	if (&object == &getOwner())
+		return;
+
+	Client *client = object.getClient();
+	if (client)
+		ObserveTracker::onClientEnteredNetworkTriggerVolume(*client, *this);
+}
+
+//-----------------------------------------------------------------------
+
+void NetworkTriggerVolume::virtualOnExit(ServerObject& object)
+{
+	Client *client = object.getClient();
+	if (client)
+		ObserveTracker::onClientExitedNetworkTriggerVolume(*client, *this);
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/object/NetworkTriggerVolume.h b/engine/server/library/serverGame/src/shared/object/NetworkTriggerVolume.h
new file mode 100644
index 00000000..9e7ae0c6
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/NetworkTriggerVolume.h
@@ -0,0 +1,37 @@
+// NetworkTriggerVolume.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved.
+
+
+#ifndef	_INCLUDED_NetworkTriggerVolume_H
+#define	_INCLUDED_NetworkTriggerVolume_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/TriggerVolume.h"
+
+//-----------------------------------------------------------------------
+
+namespace NetworkTriggerVolumeNamespace
+{
+	const char NetworkTriggerVolumeName[] = "m_networkUpdateFar";
+}
+
+//-----------------------------------------------------------------------
+
+class NetworkTriggerVolume : public TriggerVolume
+{
+public:
+	NetworkTriggerVolume(ServerObject & owner, real radius);
+	virtual ~NetworkTriggerVolume();
+
+	virtual bool isNetworkTriggerVolume() const;
+	
+private:
+	virtual void virtualOnEnter(ServerObject& object);
+	virtual void virtualOnExit(ServerObject& object);
+
+	NetworkTriggerVolume(const NetworkTriggerVolume&);
+	NetworkTriggerVolume& operator= (const NetworkTriggerVolume& );
+};
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/ObjectFactory.cpp b/engine/server/library/serverGame/src/shared/object/ObjectFactory.cpp
new file mode 100644
index 00000000..bcba1d72
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ObjectFactory.cpp
@@ -0,0 +1,113 @@
+// ObjectFactory.cpp
+// copyright 2000 Verant Interactive
+// Author: Calan Thurow
+
+//Contains the ObjectFactory functions
+//(This is excluded from ServerWorld.cpp to reduce compile dependancies.)
+
+//-----------------------------------------------------------------------
+
+//TODO: we don't need to include the headers for all the object types after we remove CreateObjectByType()
+
+//TODO:  I have no idea why we need this pragma:
+#ifdef WIN32
+  #pragma warning (disable: 4100)
+#endif
+
+#include "serverGame/FirstServerGame.h"
+
+#include "sharedDebug/Profiler.h"
+#include "sharedObject/NetworkController.h"
+#include "sharedObject/Object.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ServerObjectTemplate.h"
+#include "sharedFile/TreeFile.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/Crc.h"
+#include "serverGame/ObjectIdManager.h"
+#include "serverGame/ServerObject.h"
+
+//-----------------------------------------------------------------------
+
+ServerObject * ServerWorld::createObjectFromTemplate(const std::string &templateName, const NetworkId & newId)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::createObjectFromTemplate1");
+	return createObjectFromTemplate(Crc::calculate(templateName.c_str()), newId);
+}	// ServerWorld::createObjectFromTemplate(const std::string &, NetworkId)
+
+//-----------------------------------------------------------------------
+
+ServerObject * ServerWorld::createObjectFromTemplate(uint32 templateCrc, const NetworkId & newId)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::createObjectFromTemplate1crc");
+
+	ObjectTemplate const *objectTemplate = 0;
+
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("ObjectTemplateList::fetch");
+		objectTemplate = ObjectTemplateList::fetch(templateCrc);
+	}
+
+	WARNING(!objectTemplate, ("Missing Template!  Can't create object from "
+		"template crc %lu(%s), file not found", templateCrc, 
+		ObjectTemplateList::lookUp(templateCrc).getString()));
+	Object *object = NULL;
+
+	if (objectTemplate)
+	{
+		ServerObjectTemplate const * serverObjectTemplate = objectTemplate->asServerObjectTemplate();
+
+		if (   (serverObjectTemplate == NULL)
+		    || ((serverObjectTemplate != NULL) && (ObjectTemplateList::lookUp(serverObjectTemplate->getSharedTemplate().c_str()).getCrc() != 0)))
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("ObjectTemplate::createObject");
+			object = objectTemplate->createObject();
+			if (object)
+			{
+				ServerObject *serverObject = object->asServerObject();
+				if (serverObject)
+				{
+					if (newId != NetworkId::cms_invalid)
+						serverObject->setNetworkId(newId);
+					else
+						serverObject->setNetworkId(ObjectIdManager::getInstance().getNewObjectId());
+					objectTemplate->releaseReference();
+					return serverObject;
+				}
+				WARNING(true, ("tried to create non-server object %lu(%s)", templateCrc,
+					ObjectTemplateList::lookUp(templateCrc).getString()));
+				delete object;
+			}
+			objectTemplate->releaseReference();
+		}
+		else
+		{
+			WARNING_STRICT_FATAL(true, ("ServerWorld::createObjectFromTemplate() Unable to create the ServerObject because there is no corresponding SharedObjectTemplate for the ServerObjectTemplate(%lu:%s)", templateCrc, ObjectTemplateList::lookUp(templateCrc).getString()));
+		}
+	}
+
+	return 0;
+}	// ServerWorld::createObjectFromTemplate(uint32, NetworkId)
+
+//-----------------------------------------------------------------------
+
+ServerObject * ServerWorld::createObjectFromTemplate(const ServerObjectTemplate &objectTemplate, const NetworkId & newId)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerWorld::createObjectFromTemplate2");
+
+	ServerObject *object = safe_cast<ServerObject*>(objectTemplate.createObject());
+	if (object)
+	{
+		if (newId != NetworkId::cms_invalid)
+			object->setNetworkId(newId);
+		else
+			object->setNetworkId(ObjectIdManager::getInstance().getNewObjectId());
+		return object;
+	}
+	return 0;
+}	// ServerWorld::createObjectFromTemplate(const ServerObjectTemplate &, NetworkId)
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverGame/src/shared/object/ObjectTracker.cpp b/engine/server/library/serverGame/src/shared/object/ObjectTracker.cpp
new file mode 100644
index 00000000..888b5d77
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ObjectTracker.cpp
@@ -0,0 +1,464 @@
+
+
+#include "serverGame/FirstServerGame.h"
+#include "ObjectTracker.h"
+
+#include "serverGame/CreatureObject.h"
+#include "serverGame/PlayerObject.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedGame/PvpData.h"
+#include "sharedTerrain/TerrainObject.h"
+
+
+int ObjectTracker::m_numBuildings=0;
+int ObjectTracker::m_numCreatures=0;
+int ObjectTracker::m_numInstallations=0;
+int ObjectTracker::m_numObjects=0;
+int ObjectTracker::m_numPlayers=0;
+time_t ObjectTracker::m_lastTimeCalculateFactionalPlayersCount=0;
+int ObjectTracker::m_numPlayersImperial=0;
+int ObjectTracker::m_numPlayersRebel=0;
+int ObjectTracker::m_numPlayersNeutral=0;
+int ObjectTracker::m_numRunTimeRules=0;
+int ObjectTracker::m_numTangibles=0;
+int ObjectTracker::m_numUniverseObjects=0;
+int ObjectTracker::m_numCombatAI=0;
+int ObjectTracker::m_numHibernatingAI=0;
+int ObjectTracker::m_numDelayedHibernatingAI=0;
+
+int ObjectTracker::m_numIntangibles=0;
+int ObjectTracker::m_numGroupObjects=0;
+int ObjectTracker::m_numMissionDatas=0;
+int ObjectTracker::m_numMissionObjects=0;
+int ObjectTracker::m_numMissionListEntries=0;
+int ObjectTracker::m_numWaypoints=0;
+
+int ObjectTracker::m_numPlayerQuestObjects = 0;
+
+//==========================================================================================
+
+int ObjectTracker::getNumAI()
+{
+	return m_numCreatures - m_numPlayers;
+}
+
+//------------------------------------------------------------------------------------------
+
+int ObjectTracker::getNumBuildings()
+{
+	return m_numBuildings;
+}
+
+//------------------------------------------------------------------------------------------
+
+int ObjectTracker::getNumCreatures()
+{
+	return m_numCreatures;
+}
+
+//------------------------------------------------------------------------------------------
+
+int ObjectTracker::getNumInstallations()
+{
+	return m_numInstallations;
+}
+
+//------------------------------------------------------------------------------------------
+
+int ObjectTracker::getNumObjects()
+{
+	return m_numObjects;
+}
+
+//------------------------------------------------------------------------------------------
+
+int ObjectTracker::getNumPlayers()
+{
+	return m_numPlayers;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::getNumPlayersByFaction(int & imperial, int & rebel, int & neutral)
+{
+	time_t const now = ::time(NULL);
+	if ((now - m_lastTimeCalculateFactionalPlayersCount) > 60)
+	{
+		m_numPlayersImperial = 0;
+		m_numPlayersRebel = 0;
+		m_numPlayersNeutral = 0;
+
+		std::set<PlayerObject const *> const &players = PlayerObject::getAllPlayerObjects();
+		if (!players.empty())
+		{
+			CreatureObject const * creatureObject;
+			for (std::set<PlayerObject const *>::const_iterator i = players.begin(); i != players.end(); ++i)
+			{
+				creatureObject = (*i)->getCreatureObject();
+				if (creatureObject && creatureObject->isAuthoritative() && creatureObject->getClient())
+				{
+					if (PvpData::isImperialFactionId(creatureObject->getPvpFaction()))
+						++m_numPlayersImperial;
+					else if (PvpData::isRebelFactionId(creatureObject->getPvpFaction()))
+						++m_numPlayersRebel;
+					else
+						++m_numPlayersNeutral;
+				}
+			}
+		}
+
+		m_lastTimeCalculateFactionalPlayersCount = now;
+	}
+
+	imperial = m_numPlayersImperial;
+	rebel = m_numPlayersRebel;
+	neutral = m_numPlayersNeutral;
+}
+
+//------------------------------------------------------------------------------------------
+
+int ObjectTracker::getNumRunTimeRules()
+{
+	return m_numRunTimeRules;
+}
+
+//------------------------------------------------------------------------------------------
+
+int ObjectTracker::getNumTangibles()
+{
+	return m_numTangibles;
+}
+
+//------------------------------------------------------------------------------------------
+
+int ObjectTracker::getNumUniverseObjects()
+{
+	return m_numUniverseObjects;
+}
+
+//------------------------------------------------------------------------------------------
+
+int ObjectTracker::getNumDynamicAI()
+{
+	int retval = 0;
+	TerrainObject* const terrain = TerrainObject::getInstance();
+	if (terrain)
+		retval = terrain->getNumberOfReferenceObjects() - getNumPlayers();
+
+	return retval < 0 ? 0 : retval;
+}
+
+//------------------------------------------------------------------------------------------
+
+int ObjectTracker::getNumStaticAI()
+{
+	int retval = getNumAI() - getNumDynamicAI();
+	return retval < 0 ? 0 : retval;
+}
+
+//------------------------------------------------------------------------------------------
+
+int ObjectTracker::getNumCombatAI()
+{
+	return m_numCombatAI;
+}
+
+//------------------------------------------------------------------------------------------
+
+int ObjectTracker::getNumHibernatingAI()
+{
+	return m_numHibernatingAI;
+}
+
+//------------------------------------------------------------------------------------------
+
+int ObjectTracker::getNumDelayedHibernatingAI()
+{
+	return m_numDelayedHibernatingAI;
+}
+
+//------------------------------------------------------------------------------------------
+
+int ObjectTracker::getNumIntangibles()
+{
+	return m_numIntangibles;
+}
+
+//------------------------------------------------------------------------------------------
+int ObjectTracker::getNumMissionDatas()
+{
+	return m_numMissionDatas;
+}
+//------------------------------------------------------------------------------------------
+int ObjectTracker::getNumMissionObjects()
+{
+	return m_numMissionObjects;
+}
+//------------------------------------------------------------------------------------------
+int ObjectTracker::getNumMissionListEntries()
+{
+	return m_numMissionListEntries;
+}
+//------------------------------------------------------------------------------------------
+int ObjectTracker::getNumGroupObjects()
+{
+	return m_numGroupObjects;
+}
+//------------------------------------------------------------------------------------------
+
+int ObjectTracker::getNumWaypoints()
+{
+	return m_numWaypoints;
+}
+
+//------------------------------------------------------------------------------------------
+
+int ObjectTracker::getNumPlayerQuestObjects()
+{
+	return m_numPlayerQuestObjects;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::addBuilding()
+{
+	++m_numBuildings;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::addCreature()
+{
+	++m_numCreatures;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::addInstallation()
+{
+	++m_numInstallations;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::addObject()
+{
+	++m_numObjects;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::addPlayer()
+{
+	++m_numPlayers;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::addRunTimeRule()
+{
+	++m_numRunTimeRules;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::addTangible()
+{
+	++m_numTangibles;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::addUniverseObject()
+{
+	++m_numUniverseObjects;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::addCombatAI()
+{
+	++m_numCombatAI;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::addHibernatingAI()
+{
+	++m_numHibernatingAI;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::addDelayedHibernatingAI()
+{
+	++m_numDelayedHibernatingAI;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::addIntangible()
+{
+	++m_numIntangibles;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::addMissionData()
+{
+	++m_numMissionDatas;
+}
+//------------------------------------------------------------------------------------------
+void ObjectTracker::addMissionObject()
+{
+	++m_numMissionObjects;
+}
+//------------------------------------------------------------------------------------------
+void ObjectTracker::addMissionListEntry()
+{
+	++m_numMissionListEntries;
+}
+//------------------------------------------------------------------------------------------
+void ObjectTracker::addGroupObject()
+{
+	++m_numGroupObjects;
+}
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::addWaypoint()
+{
+	++m_numWaypoints;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::addPlayerQuestObject()
+{
+	++m_numPlayerQuestObjects;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::removeBuilding()
+{
+	--m_numBuildings;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::removeCreature()
+{
+	--m_numCreatures;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::removeInstallation()
+{
+	--m_numInstallations;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::removeObject()
+{
+	--m_numObjects;
+}
+
+//------------------------------------------------------------------------------------------
+
+
+void ObjectTracker::removePlayer()
+{
+	--m_numPlayers;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::removeRunTimeRule()
+{
+	--m_numRunTimeRules;
+}
+
+//------------------------------------------------------------------------------------------
+
+
+void ObjectTracker::removeTangible()
+{
+	--m_numTangibles;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::removeUniverseObject()
+{
+	--m_numUniverseObjects;
+}
+
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::removeCombatAI()
+{
+	if (m_numCombatAI > 0) --m_numCombatAI;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::removeHibernatingAI()
+{
+	if (m_numHibernatingAI > 0)
+		--m_numHibernatingAI;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::removeDelayedHibernatingAI()
+{
+	if (m_numDelayedHibernatingAI > 0)
+		--m_numDelayedHibernatingAI;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::removeIntangible()
+{
+	--m_numIntangibles;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::removeMissionData()
+{
+	--m_numMissionDatas;
+}
+//------------------------------------------------------------------------------------------
+void ObjectTracker::removeMissionObject()
+{
+	--m_numMissionObjects;
+}
+//------------------------------------------------------------------------------------------
+void ObjectTracker::removeMissionListEntry()
+{
+	--m_numMissionListEntries;
+}
+//------------------------------------------------------------------------------------------
+void ObjectTracker::removeGroupObject()
+{
+	--m_numGroupObjects;
+}
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::removeWaypoint()
+{
+	--m_numWaypoints;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ObjectTracker::removePlayerQuestObject()
+{
+	--m_numPlayerQuestObjects;
+}
+
+//------------------------------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/object/ObjectTracker.h b/engine/server/library/serverGame/src/shared/object/ObjectTracker.h
new file mode 100644
index 00000000..3a055440
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ObjectTracker.h
@@ -0,0 +1,117 @@
+#ifndef _ObjectTracker_H_
+#define _ObjectTracker_H_
+
+// ======================================================================
+
+class ObjectTracker
+{
+public:
+
+	static int getNumAI();
+	static int getNumBuildings();
+	static int getNumCreatures();
+	static int getNumInstallations();
+	static int getNumObjects();
+	static int getNumPlayers();
+	static void getNumPlayersByFaction(int & imperial, int & rebel, int & neutral);
+	static int getNumRunTimeRules();
+	static int getNumTangibles();
+	static int getNumUniverseObjects();
+
+	static int getNumDynamicAI();
+	static int getNumStaticAI();
+	static int getNumCombatAI();
+	static int getNumHibernatingAI();
+	static int getNumDelayedHibernatingAI();
+
+	static int getNumIntangibles();
+	static int getNumMissionDatas();
+	static int getNumMissionObjects();
+	static int getNumGroupObjects();
+	static int getNumMissionListEntries();
+	static int getNumWaypoints();
+
+	static int getNumPlayerQuestObjects();
+
+	static void addBuilding();
+	static void addCreature();
+	static void addInstallation();
+	static void addObject();
+	static void addPlayer();
+	static void addRunTimeRule();
+	static void addTangible();
+	static void addUniverseObject();
+	static void addCombatAI();
+	static void addHibernatingAI();
+	static void addDelayedHibernatingAI();
+
+	static void addIntangible();
+	static void addGroupObject();
+	static void addMissionData();
+	static void addMissionObject();
+	static void addMissionListEntry();
+	static void addWaypoint();
+
+	static void addPlayerQuestObject();
+	
+	static void removeBuilding();
+	static void removeCreature();
+	static void removeInstallation();
+	static void removeObject();
+	static void removePlayer();
+	static void removeRunTimeRule();
+	static void removeTangible();
+	static void removeUniverseObject();
+	static void removeCombatAI();
+	static void removeHibernatingAI();
+	static void removeDelayedHibernatingAI();
+
+	static void removeIntangible();
+	static void removeGroupObject();
+	static void removeMissionData();
+	static void removeMissionObject();
+	static void removeMissionListEntry();
+	static void removeWaypoint();
+
+	static void removePlayerQuestObject();
+
+	
+private:
+	static int m_numBuildings;
+	static int m_numCreatures;
+	static int m_numInstallations;
+	static int m_numObjects;
+	static int m_numPlayers;
+
+	// we don't want to recalculate the factional
+	// distribution of the players too often
+	static time_t m_lastTimeCalculateFactionalPlayersCount;
+	static int m_numPlayersImperial;
+	static int m_numPlayersRebel;
+	static int m_numPlayersNeutral;
+
+	static int m_numRunTimeRules;
+	static int m_numTangibles;
+	static int m_numUniverseObjects;
+	static int m_numCombatAI;
+	static int m_numHibernatingAI;
+	static int m_numDelayedHibernatingAI;
+
+	static int m_numIntangibles;
+	static int m_numGroupObjects;
+	static int m_numMissionDatas;
+	static int m_numMissionObjects;
+	static int m_numMissionListEntries;
+	static int m_numWaypoints;
+
+	static int m_numPlayerQuestObjects;
+
+	
+private:
+	ObjectTracker();
+	~ObjectTracker();
+	ObjectTracker(const ObjectTracker&);
+	ObjectTracker& operator= (const ObjectTracker&);
+};
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/PatrolPathNodeProperty.cpp b/engine/server/library/serverGame/src/shared/object/PatrolPathNodeProperty.cpp
new file mode 100644
index 00000000..c17b6ca6
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/PatrolPathNodeProperty.cpp
@@ -0,0 +1,61 @@
+// ======================================================================
+//
+// PatrolPathNodeProperty.cpp
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PatrolPathNodeProperty.h"
+#include "serverGame/ServerObject.h"
+
+#include <set>
+
+
+// ======================================================================
+
+PropertyId PatrolPathNodeProperty::getClassPropertyId()
+{
+//	PropertyId id = LabelHash::hashLabel( "Property", "PatrolPathNode" );
+//	DEBUG_REPORT_LOG(true, ("PatrolPathNodeProperty::getClassPropertyId id = %lx\n", id));
+//	return id;
+	return PROPERTY_HASH(PatrolPathNode, 0xef800a48);
+}
+
+// ======================================================================
+
+PatrolPathNodeProperty::PatrolPathNodeProperty(Object& thisObject) : 
+Property(getClassPropertyId(), thisObject),
+m_roots(new std::set<CachedNetworkId>)
+{
+}
+
+//-------------------------------------------------------------------------
+
+PatrolPathNodeProperty::~PatrolPathNodeProperty()
+{
+	delete m_roots;
+	m_roots = NULL;
+}
+
+//-------------------------------------------------------------------------
+
+void PatrolPathNodeProperty::addRoot(const ServerObject & root)
+{
+	m_roots->insert(CachedNetworkId(root));
+}
+
+//-------------------------------------------------------------------------
+
+bool PatrolPathNodeProperty::hasRoot(const ServerObject & root) const
+{
+	for (std::set<CachedNetworkId>::const_iterator i = m_roots->begin(); i != m_roots->end(); ++i)
+	{
+		if (*i == root.getNetworkId())
+			return true;
+	}
+	return false;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/PatrolPathNodeProperty.h b/engine/server/library/serverGame/src/shared/object/PatrolPathNodeProperty.h
new file mode 100644
index 00000000..7d1cfebc
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/PatrolPathNodeProperty.h
@@ -0,0 +1,57 @@
+// ======================================================================
+//
+// PatrolPathNodeProperty.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef INCLUDED_PatrolPathNodeProperty_H
+#define INCLUDED_PatrolPathNodeProperty_H
+
+// ======================================================================
+
+#include "sharedObject/CachedNetworkId.h"
+#include "sharedObject/Property.h"
+
+
+// ======================================================================
+
+class PatrolPathNodeProperty : public Property
+{
+public:
+
+	static PropertyId getClassPropertyId();
+
+public:
+	PatrolPathNodeProperty(Object& thisObject);
+	~PatrolPathNodeProperty();
+
+	void                                 addRoot(const ServerObject & root);
+	const stdset<CachedNetworkId>::fwd & getRoots() const;
+	bool                                 hasRoot(const ServerObject & root) const;
+
+private:
+	
+	stdset<CachedNetworkId>::fwd * m_roots;
+
+private:
+	PatrolPathNodeProperty();
+	PatrolPathNodeProperty(const PatrolPathNodeProperty&);
+	PatrolPathNodeProperty& operator= (const PatrolPathNodeProperty&);
+};
+
+
+// ======================================================================
+
+inline const stdset<CachedNetworkId>::fwd & PatrolPathNodeProperty::getRoots() const
+{
+	return *m_roots;
+}
+
+
+// ======================================================================
+
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/object/PatrolPathRootProperty.cpp b/engine/server/library/serverGame/src/shared/object/PatrolPathRootProperty.cpp
new file mode 100644
index 00000000..2baf6a5e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/PatrolPathRootProperty.cpp
@@ -0,0 +1,67 @@
+// ======================================================================
+//
+// PatrolPathRootProperty.cpp
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PatrolPathRootProperty.h"
+#include "serverGame/ServerObject.h"
+
+#include <set>
+
+
+// ======================================================================
+
+PropertyId PatrolPathRootProperty::getClassPropertyId()
+{
+//	PropertyId id = LabelHash::hashLabel( "Property", "PatrolPathRoot" );
+//	DEBUG_REPORT_LOG(true, ("PatrolPathRootProperty::getClassPropertyId id = %lx\n", id));
+//	return id;
+	return PROPERTY_HASH(PatrolPathRoot, 0x2df829a2);
+}
+
+// ======================================================================
+
+PatrolPathRootProperty::PatrolPathRootProperty(Object& thisObject) : 
+Property(getClassPropertyId(), thisObject),
+m_observerCount(0),
+m_patrollers(new std::set<ConstWatcher<ServerObject> >)
+{
+}
+
+//-------------------------------------------------------------------------
+
+PatrolPathRootProperty::~PatrolPathRootProperty()
+{
+	m_observerCount = 0;
+
+	delete m_patrollers;
+	m_patrollers = 0;
+}
+
+//-------------------------------------------------------------------------
+
+void PatrolPathRootProperty::addPatrollingObject(const ServerObject & ai)
+{
+	m_patrollers->insert(ConstWatcher<ServerObject>(&ai));
+}
+
+//-------------------------------------------------------------------------
+
+void PatrolPathRootProperty::removePatrollingObject(const ServerObject & ai)
+{
+	m_patrollers->erase(ConstWatcher<ServerObject>(&ai));
+}
+
+//-------------------------------------------------------------------------
+
+const std::set<ConstWatcher<ServerObject> > & PatrolPathRootProperty::getPatrollingObjects() const
+{
+	return *m_patrollers;
+}
+
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/PatrolPathRootProperty.h b/engine/server/library/serverGame/src/shared/object/PatrolPathRootProperty.h
new file mode 100644
index 00000000..7463ff49
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/PatrolPathRootProperty.h
@@ -0,0 +1,75 @@
+// ======================================================================
+//
+// PatrolPathRootProperty.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef INCLUDED_PatrolPathRootProperty_H
+#define INCLUDED_PatrolPathRootProperty_H
+
+// ======================================================================
+
+#include "sharedFoundation/Watcher.h"
+#include "sharedObject/Property.h"
+
+
+class ServerObject;
+
+
+// ======================================================================
+
+class PatrolPathRootProperty : public Property
+{
+public:
+
+	static PropertyId getClassPropertyId();
+
+public:
+	PatrolPathRootProperty(Object& thisObject);
+	~PatrolPathRootProperty();
+
+	int getObserverCount() const;
+	void incrementObserverCount();
+	void decrementObserverCount();
+
+	void addPatrollingObject(const ServerObject & ai);
+	void removePatrollingObject(const ServerObject & ai);
+	const stdset<ConstWatcher<ServerObject> >::fwd & getPatrollingObjects() const;
+
+private:
+	
+	int                                        m_observerCount;
+	stdset<ConstWatcher<ServerObject> >::fwd * m_patrollers;
+
+private:
+	PatrolPathRootProperty();
+	PatrolPathRootProperty(const PatrolPathRootProperty&);
+	PatrolPathRootProperty& operator= (const PatrolPathRootProperty&);
+};
+
+
+// ======================================================================
+
+inline int PatrolPathRootProperty::getObserverCount() const
+{
+	return m_observerCount;
+}
+
+inline void PatrolPathRootProperty::incrementObserverCount()
+{
+	++m_observerCount;
+}
+
+inline void PatrolPathRootProperty::decrementObserverCount()
+{
+	--m_observerCount;
+}
+
+
+// ======================================================================
+
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp b/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp
new file mode 100644
index 00000000..2e14025d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/PlanetObject.cpp
@@ -0,0 +1,2655 @@
+//========================================================================
+//
+// PlanetObject.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PlanetObject.h"
+
+#include "UnicodeUtils.h"
+#include "boost/smart_ptr.hpp"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/GuildObject.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/ObjectIdManager.h"
+#include "serverGame/PlanetController.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/Pvp.h"
+#include "serverGame/ResourcePoolObject.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerBuildoutManager.h"
+#include "serverGame/ServerPlanetObjectTemplate.h"
+#include "serverGame/ServerResourceClassObject.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedFoundation/CalendarTime.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedFoundation/DynamicVariableListNestedList.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedGame/PlanetMapManager.h"
+#include "sharedGame/PvpData.h"
+#include "sharedGame/TravelPoint.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/MapLocation.h"
+#include "sharedNetworkMessages/MapLocationArchive.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "swgServerNetworkMessages/MessageQueuePlanetAddTravelPoint.h"
+
+#include <algorithm>
+#include <vector>
+
+//----------------------------------------------------------------------
+
+namespace PlanetObjectNamespace
+{
+	const int s_maxMapLocationsStatic  = 1000;
+	const int s_maxMapLocationsDynamic = 1000;
+	const int s_maxMapLocationsPersist = 1000;
+
+	// objvars for collection "server first" tracking
+	const std::string OBJVAR_COLLECTION_SERVER_FIRST("collectionServerFirst");
+	const std::string OBJVAR_COLLECTION_SERVER_FIRST_UPDATE_NUMBER("collectionServerFirstUpdateNumber");
+
+	typedef std::pair<std::string, std::string::size_type> StringIndexPair;
+
+	void ParseEventString(std::string const & eventString, std::vector<std::string> & parsedVector)
+	{
+		std::string delimiter = ",";
+
+		std::string::size_type index = eventString.find(delimiter);
+		std::string::size_type offset = 0;
+
+		parsedVector.clear();
+		
+		if(eventString.empty())
+			return;
+
+		if(index == std::string::npos)
+		{
+			parsedVector.push_back(eventString);
+			return;
+		}
+
+		while(index != std::string::npos)
+		{
+			std::string subString = eventString.substr(offset, (index - offset));
+			parsedVector.push_back(subString);
+			offset = index + 1;
+			index = eventString.find(delimiter, offset);
+		}
+
+		std::string subString = eventString.substr(offset, eventString.size());
+		parsedVector.push_back(subString);
+	}
+	
+	void ParseEventString(std::string const & eventString, std::vector<StringIndexPair> & parsedVector)
+	{
+		std::string delimiter = ",";
+
+		std::string::size_type index = eventString.find(delimiter);
+		std::string::size_type offset = 0;
+
+		parsedVector.clear();
+
+		if(eventString.empty())
+			return;
+
+		if(index == std::string::npos)
+		{
+			parsedVector.push_back(std::make_pair<std::string, std::string::size_type>(eventString, 0));
+			return;
+		}
+
+		while(index != std::string::npos)
+		{
+			std::string subString = eventString.substr(offset, (index - offset));
+			parsedVector.push_back(std::make_pair<std::string, std::string::size_type>(subString, index));
+			offset = index + 1;
+			index = eventString.find(delimiter, offset);
+		}
+
+		std::string subString = eventString.substr(offset, eventString.size());
+		parsedVector.push_back(std::make_pair<std::string, std::string::size_type>(subString, index));
+	}
+
+	const char * makeCopyOfString(const char * rhs)
+	{
+		char * lhs = NULL;
+		if (rhs)
+		{
+			lhs = new char[strlen(rhs) + 1];
+			strcpy(lhs, rhs);
+		}
+		else
+		{
+			lhs = new char[1];
+			lhs[0] = '\0';
+		}
+
+		return lhs;
+	}
+
+	int getNextGcwScoreDecayTime(int base);
+
+	// dictionary containing the table showing factional presence activity
+	ScriptParams * s_factionalPresenceSuiTable = NULL;
+	bool s_factionalPresenceSuiTableNeedRebuild = true;
+
+	void decrementConnectedCharacterLfgDataFactionalPresenceCount(Archive::AutoDeltaMap<std::string, std::pair<int, int>, PlanetObject> & connectedCharacterLfgDataFactionalPresence, const LfgCharacterData & lfgCharacterData);
+	void incrementConnectedCharacterLfgDataFactionalPresenceCount(Archive::AutoDeltaMap<std::string, std::pair<int, int>, PlanetObject> & connectedCharacterLfgDataFactionalPresence, const LfgCharacterData & lfgCharacterData);
+
+	void decrementConnectedCharacterLfgDataFactionalPresenceGridCount(Archive::AutoDeltaMap<std::pair<std::string, std::pair<int, int> >, std::pair<NetworkId, std::pair<int, int> > > & connectedCharacterLfgDataFactionalPresenceGrid, const LfgCharacterData & lfgCharacterData);
+	void incrementConnectedCharacterLfgDataFactionalPresenceGridCount(Archive::AutoDeltaMap<std::pair<std::string, std::pair<int, int> >, std::pair<NetworkId, std::pair<int, int> > > & connectedCharacterLfgDataFactionalPresenceGrid, const LfgCharacterData & lfgCharacterData);
+
+	void removeFactionalPresenceGridFromPlanetMap(std::string const & planetName, NetworkId const & locationId);
+	void addFactionalPresenceGridToPlanetMap(std::string const & planetName, NetworkId const & locationId, int gridX, int gridZ, bool imperial, bool rebel);
+
+#ifdef _DEBUG
+	bool ms_printEventDebug = false;
+#endif
+}
+
+using namespace PlanetObjectNamespace;
+
+//-----------------------------------------------------------------------
+
+PlanetObject::PlanetObject(const ServerPlanetObjectTemplate* newTemplate) : 
+	UniverseObject(newTemplate),
+	m_planetName(),
+	m_builtAvailableResourceList(false),
+	m_availableResourceListExpirationTime(0),
+	m_availableResourceList(),
+	m_travelPointList (),
+	m_weatherIndex(0),
+	m_windVelocityX(0.0f),
+	m_windVelocityY(0.0f),
+	m_windVelocityZ(0.0f),
+	m_mapLocationMapStatic          (),
+	m_mapLocationMapDynamic         (),
+	m_mapLocationMapPersist         (),
+
+	// reserve version number 0, so that the client can use 0 to force an update
+	m_mapLocationVersionStatic      (1),
+	m_mapLocationVersionDynamic     (1),
+	m_mapLocationVersionPersist     (1),
+
+	m_mapLocationListStatic         (),
+	m_mapLocationListDynamic        (),
+	m_mapLocationListPersist        (),
+
+	// reserve version number 0, so that the client can use 0 to force an update
+	m_mapLocationListVersionStatic  (1),
+	m_mapLocationListVersionDynamic (1),
+	m_mapLocationListVersionPersist (1),
+
+	// used to track changes to the collection system "server first" tracking system
+	m_collectionServerFirst         (),
+	m_collectionServerFirstUpdateNumber(0),
+
+	// information tracked for each connected character
+	m_connectedCharacterLfgData     (),
+	m_connectedCharacterLfgDataFactionalPresence(),
+	m_connectedCharacterLfgDataFactionalPresenceGrid(),
+	m_connectedCharacterBiographyData(),
+	
+	m_currentEvents                 (),
+
+	m_nextGcwTrackingUpdate         (0),
+	m_gcwImperialScoreAdjustment    (),
+	m_gcwRebelScoreAdjustment       (),
+	m_gcwImperialScore              (),
+	m_gcwRebelScore                 ()
+{
+	addMembersToPackages();
+
+	m_collectionServerFirst.setSourceObject(this);
+	m_currentEvents.setSourceObject(this);
+
+	m_connectedCharacterLfgDataFactionalPresence.setOnErase(this, &PlanetObject::connectedCharacterLfgDataFactionalPresenceOnErase);
+	m_connectedCharacterLfgDataFactionalPresence.setOnInsert(this, &PlanetObject::connectedCharacterLfgDataFactionalPresenceOnInsert);
+	m_connectedCharacterLfgDataFactionalPresence.setOnSet(this, &PlanetObject::connectedCharacterLfgDataFactionalPresenceOnSet);
+}
+
+//-----------------------------------------------------------------------
+
+PlanetObject::~PlanetObject()
+{
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a default controller for this object.
+ *
+ * @return the object's controller
+ */
+Controller* PlanetObject::createDefaultController(void)
+{
+	Controller* controller = new PlanetController(this);
+	NOT_NULL(controller);
+
+	setController(controller);
+	return controller;
+}	// PlanetObject::createDefaultController
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::debugOutputPools(std::string &output) const
+{
+	buildAvailableResourceList();
+
+	output+=m_planetName.get();
+	output+='\n';
+		
+	for (std::vector<ResourceTypeObject const *>::const_iterator i=m_availableResourceList.begin(); i!=m_availableResourceList.end(); ++i)
+	{
+		if (*i)
+			(*i)->debugOutput(output);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::setupUniverse()
+{
+	ServerUniverse::getInstance().registerPlanetObject(*this);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns a list of all the non-depleted resources that have a pool on this planet
+ */
+void PlanetObject::getAvailableResourceList(std::vector<ResourceTypeObject const *> &buffer) const
+{
+	buildAvailableResourceList();
+	
+	buffer = m_availableResourceList;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns a list of all non-depeleted resources that have a pool on this
+ * planet and are derived from the specified class
+ */
+void PlanetObject::getAvailableResourceList(std::vector<ResourceTypeObject const *> &buffer, const ResourceClassObject &masterClass) const
+{
+	buildAvailableResourceList();
+
+	buffer.clear();
+	
+	for (std::vector<ResourceTypeObject const *>::const_iterator i=m_availableResourceList.begin(); i!=m_availableResourceList.end(); ++i)
+	{
+		if (*i && (*i)->isDerivedFrom(masterClass))
+		{
+			buffer.push_back(*i);
+		}
+	}	
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::setPlanetName(const std::string &newName)
+{
+	if (isAuthoritative())
+	{
+		m_planetName=newName;
+	}
+	else
+	{
+		//TODO: message
+	}
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the weather for the planet.
+ */
+void PlanetObject::setWeather(int weather, float windVelocityX, float windVelocityY, float windVelocityZ)
+{
+	if (isAuthoritative())
+	{
+		m_weatherIndex = weather;
+		m_windVelocityX = windVelocityX;
+		m_windVelocityY = windVelocityY;
+		m_windVelocityZ = windVelocityZ;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setWeather, 
+			new MessageQueueGenericValueType<std::pair<int, Vector> >(
+			std::make_pair(weather, Vector(windVelocityX, windVelocityY, windVelocityZ))));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
+{
+	UniverseObject::getAttributes(data);
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::addTravelPoint (const std::string& name, const Vector& position_w, const int cost, const bool interplanetary, const TravelPoint::TravelPointType type)
+{
+	if (ConfigServerGame::getDisableTravel())
+	{
+		//travel in a planet is off.
+		return;
+	}
+	if (isAuthoritative ())
+	{
+		if (getTravelPoint (name))
+		{
+			DEBUG_WARNING (true, ("PlanetObject::addTravelPoint: adding existing travel point %s for planet %s", name.c_str (), getName ().c_str ()));
+			return;
+		}
+
+		m_travelPointList.push_back (TravelPoint (name, Pvp::getGcwScoreCategoryRegion(m_planetName.get(), position_w), position_w, cost, interplanetary, type));
+
+		DEBUG_REPORT_LOG_PRINT (true, ("PlanetObject::addTravelPoint: adding travel point %s for planet %s at position <%1.2f, %1.2f, %1.2f>\n", name.c_str (), getName ().c_str (), position_w.x, position_w.y, position_w.z));
+	}
+	else
+	{
+		Controller* const controller = getController ();
+		if (!controller)
+		{
+			DEBUG_WARNING (true, ("PlanetObject::addTravelPoint: planet object %s has no controller", getName ().c_str ()));
+			return;
+		}
+
+		MessageQueuePlanetAddTravelPoint* const message = new MessageQueuePlanetAddTravelPoint (name, position_w, cost, interplanetary, static_cast<uint32>(type));
+		getController ()->appendMessage (static_cast<int>(CM_planetAddTravelPoint), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+
+		DEBUG_REPORT_LOG_PRINT (true, ("PlanetObject::addTravelPoint: sending add travel point %s for planet %s at position <%1.2f, %1.2f, %1.2f> to authoritative server\n", name.c_str (), getName ().c_str (), position_w.x, position_w.y, position_w.z));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::removeTravelPoint (const std::string& name)
+{
+	if (isAuthoritative ())
+	{
+		int travelPointIndex;
+		if (!getTravelPointIndex (name, travelPointIndex))
+		{
+			DEBUG_WARNING (true, ("PlanetObject::removeTravelPoint: attempting to remove non-existant travel point %s for planet %s", name.c_str (), getName ().c_str ()));
+			return;
+		}
+
+		m_travelPointList.erase (static_cast<uint> (travelPointIndex));
+
+		DEBUG_REPORT_LOG_PRINT (true, ("PlanetObject::removeTravelPoint: removing travel point %s for planet %s\n", name.c_str (), getName ().c_str ()));
+	}
+	else
+	{
+		Controller* const controller = getController ();
+		if (!controller)
+		{
+			DEBUG_WARNING (true, ("PlanetObject::removeTravelPoint: planet object %s has no controller", getName ().c_str ()));
+			return;
+		}
+
+		MessageQueueGenericValueType<std::string>* const message = new MessageQueueGenericValueType<std::string> (std::string (name));
+		controller->appendMessage (static_cast<int>(CM_planetRemoveTravelPoint), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+
+		DEBUG_REPORT_LOG_PRINT (true, ("PlanetObject::removeTravelPoint: sending remove travel point %s for planet %s to authoritative server\n", name.c_str (), getName ().c_str ()));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+int PlanetObject::getNumberOfTravelPoints () const
+{
+	return static_cast<int>(m_travelPointList.size ());
+}
+
+// ----------------------------------------------------------------------
+
+const TravelPoint* PlanetObject::getTravelPoint (const int travelPointIndex) const
+{
+	if (travelPointIndex < 0 || travelPointIndex >= getNumberOfTravelPoints ())
+		return 0;
+
+	return &m_travelPointList [static_cast<uint> (travelPointIndex)];
+}
+
+// ----------------------------------------------------------------------
+
+const TravelPoint* PlanetObject::getTravelPoint (const std::string& name) const
+{
+	int i;
+	for (i = 0; i < getNumberOfTravelPoints (); ++i)
+	{
+		const TravelPoint* const travelPoint = getTravelPoint (i);
+
+		if (name == travelPoint->getName ())
+			return travelPoint;
+	}
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+bool PlanetObject::getTravelPointIndex (const std::string& name, int& travelPointIndex) const
+{
+	int i;
+	for (i = 0; i < getNumberOfTravelPoints (); ++i)
+	{
+		const TravelPoint* const travelPoint = getTravelPoint (i);
+
+		if (name == travelPoint->getName ())
+		{
+			travelPointIndex = i;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::getTravelPointNameList (std::vector<std::string>& travelPointNameList) const
+{
+	int i;
+	for (i = 0; i < getNumberOfTravelPoints (); ++i)
+	{
+		const TravelPoint* const travelPoint = getTravelPoint (i);
+
+		travelPointNameList.push_back (travelPoint->getName ());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::getTravelPointPointList (std::vector<Vector>& travelPointPointList) const
+{
+	int i;
+	for (i = 0; i < getNumberOfTravelPoints (); ++i)
+	{
+		const TravelPoint* const travelPoint = getTravelPoint (i);
+
+		travelPointPointList.push_back (travelPoint->getPosition_w ());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::getTravelPointCostList (std::vector<int>& travelPointCostList) const
+{
+	int i;
+	for (i = 0; i < getNumberOfTravelPoints (); ++i)
+	{
+		const TravelPoint* const travelPoint = getTravelPoint (i);
+
+		travelPointCostList.push_back (travelPoint->getCost ());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::getTravelPointInterplanetaryList (std::vector<bool>& travelPointInterplanetaryList) const
+{
+	int i;
+	for (i = 0; i < getNumberOfTravelPoints (); ++i)
+	{
+		const TravelPoint* const travelPoint = getTravelPoint (i);
+
+		travelPointInterplanetaryList.push_back (travelPoint->getInterplanetary ()); //lint !e1025 !e1703 // lint can't parse this line
+	}
+}
+
+//----------------------------------------------------------------------
+//-- Map Location Stuff
+//----------------------------------------------------------------------
+
+//----------------------------------------------------------------------
+
+bool PlanetObject::addMapLocation (const MapLocation &location, const int mapLocationType, const bool enforceLocationCountLimits)
+{
+	if (!location.m_category)
+	{
+		WARNING (true, ("PlanetObject can't add map location with zero category"));
+		return false;
+	}
+
+	if (!location.m_locationId.isValid ())
+	{
+		WARNING (true, ("PlanetObject can't add map location with invalid id"));
+		return false;
+	}
+
+	if (location.m_locationName.empty ())
+	{
+		WARNING (true, ("PlanetObject can't add map location with empty name"));
+		return false;
+	}
+
+	if (!isAuthoritative ())
+	{
+		sendControllerMessageToAuthServer(CM_serverAddPlanetMapLocation, new MessageQueueGenericValueType<std::pair<MapLocation, std::pair<int, int> > >(std::make_pair(location, std::make_pair(mapLocationType, (enforceLocationCountLimits ? static_cast<int>(1) : static_cast<int>(0))))));
+		return true;
+	}
+
+	int limit = 0;
+	switch (mapLocationType)
+	{
+	case PlanetMapManager::MLT_static:
+		limit = s_maxMapLocationsStatic;
+		break;
+	case PlanetMapManager::MLT_dynamic:
+		limit = s_maxMapLocationsDynamic;
+		break;
+	case PlanetMapManager::MLT_persist:
+		limit = s_maxMapLocationsPersist;
+		break;
+	default:
+		break;
+	}
+
+	ArchiveMapLocationMap & locationMap = getMapLocationMapForTypeInternal (mapLocationType);	
+
+	//-- see if we are adding a new location, or just overwriting it in place
+
+	MapLocationMap::const_iterator it = locationMap.find (location.m_locationId);
+	if (it == locationMap.end ())
+	{
+		if (enforceLocationCountLimits && (static_cast<int>(locationMap.size ()) >= limit))
+		{
+			WARNING (true, ("PlanetObject limit [%d] reached for type [%d], can't add map location [%s,%s,%d,%d]", 
+				limit, mapLocationType, location.m_locationId.getValueString ().c_str (), Unicode::wideToNarrow (location.m_locationName).c_str (), location.m_category, location.m_subCategory));
+			return false;
+		}
+	}
+
+	locationMap.set (location.m_locationId, location);
+
+	//-- remove the location if it exists on another list
+	{
+		for (int i = 0; i < static_cast<int>(PlanetMapManager::MLT_numTypes); ++i)
+		{
+			if (i != mapLocationType)
+				IGNORE_RETURN(removeMapLocation (location.m_locationId, i));
+		}
+	}
+
+	incrementMapLocationCacheVersion (mapLocationType);
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool PlanetObject::removeMapLocation (const NetworkId &id, int mapLocationType)
+{
+	if (!isAuthoritative ())
+	{
+		WARNING (true, ("PlanetObject::removeMapLocation (const NetworkId &id, int mapLocationType) invalid from non-auth planet object"));
+		return false;
+	}
+
+	ArchiveMapLocationMap & locationMap = getMapLocationMapForTypeInternal (mapLocationType);
+
+	if (locationMap.find (id) != locationMap.end ())
+	{
+		IGNORE_RETURN(locationMap.erase (id));
+		incrementMapLocationCacheVersion (mapLocationType);
+		return true;
+	}
+
+	return false;
+}
+
+//----------------------------------------------------------------------
+
+bool PlanetObject::removeMapLocation (const NetworkId &id)
+{
+	if (!isAuthoritative ())
+	{
+		sendControllerMessageToAuthServer(CM_serverRemovePlanetMapLocation, new MessageQueueGenericValueType<NetworkId>(id));
+		return true;
+	}
+
+	bool found = false;
+
+	for (int i = 0; i < static_cast<int>(PlanetMapManager::MLT_numTypes); ++i)
+	{
+		if (removeMapLocation (id, i))
+			found = true;
+	}
+	
+	return found;
+}
+
+//----------------------------------------------------------------------
+
+void PlanetObject::getMapLocations              (MapLocationVector & result) const
+{
+	for (int i = 0; i < static_cast<int>(PlanetMapManager::MLT_numTypes); ++i)
+	{
+		const MapLocationVector & mlv = getMapLocations (i);
+		result.insert (result.end (), mlv.begin (), mlv.end ());
+	}
+}
+
+//----------------------------------------------------------------------
+
+const PlanetObject::MapLocationVector & PlanetObject::getMapLocations (int mapLocationType) const
+{
+	const MapLocationVector & locationList = getMapLocationListForType (mapLocationType);
+	return locationList;
+}
+
+//----------------------------------------------------------------------
+
+void PlanetObject::getMapLocationsByCategories (int mapLocationType, uint8 category, uint8 subCategory, MapLocationVector & result) const
+{
+	const MapLocationVector & locationList = getMapLocationListForType (mapLocationType);
+	
+	for (MapLocationVector::const_iterator i = locationList.begin (); i != locationList.end (); ++i)
+	{
+		const MapLocation & ml = *i;
+		if (ml.getCategory() == category && ml.getSubCategory() == subCategory)
+		{
+			result.push_back (ml);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void PlanetObject::incrementMapLocationCacheVersion (int mapLocationType)
+{
+	if (!isAuthoritative ())
+	{
+		WARNING (true, ("PlanetObject::incrementMapLocationCacheVersion invalid from non-auth planet object"));
+		return;
+	}
+
+	Archive::AutoDeltaVariable<int> & var = getMapLocationVersionForTypeInternal (mapLocationType);
+	
+	// reserve version number 0, so that the client can use 0 to force an update
+	int version = var.get ();
+	if (++version == 0)
+		++version;
+
+	var.set (version);
+} //lint !e1762 // function looks like it could be made const, but better not to make it const because it uses a reference to set a member variable
+
+//----------------------------------------------------------------------
+
+int & PlanetObject::getMapLocationListVersionForTypeInternal (int mapLocationType) const
+{
+	switch (mapLocationType)
+	{
+	case PlanetMapManager::MLT_static:
+		return m_mapLocationListVersionStatic;
+	case PlanetMapManager::MLT_dynamic:
+		return m_mapLocationListVersionDynamic;
+	case PlanetMapManager::MLT_persist:
+		return m_mapLocationListVersionPersist;
+	default:
+		break;
+	}
+
+	FATAL (true, ("PlanetObject::getMapLocationVersionForType failed"));
+	static int broken; //lint !e527 // unreachable
+	return broken;
+}
+
+//----------------------------------------------------------------------
+
+int PlanetObject::getMapLocationVersionForType (int mapLocationType) const
+{
+	return const_cast<PlanetObject *>(this)->getMapLocationVersionForTypeInternal (mapLocationType).get ();
+}
+
+//----------------------------------------------------------------------
+
+Archive::AutoDeltaVariable<int> & PlanetObject::getMapLocationVersionForTypeInternal (int mapLocationType) const
+{
+	switch (mapLocationType)
+	{
+	case PlanetMapManager::MLT_static:
+		return m_mapLocationVersionStatic;
+	case PlanetMapManager::MLT_dynamic:
+		return m_mapLocationVersionDynamic;
+	case PlanetMapManager::MLT_persist:
+		return m_mapLocationVersionPersist;
+	default:
+		break;
+	}
+
+	FATAL (true, ("PlanetObject::getMapLocationVersionForType failed"));
+	static Archive::AutoDeltaVariable<int> broken;  //lint !e527 // unreachable
+	return broken;
+}
+
+//----------------------------------------------------------------------
+
+const PlanetObject::MapLocationVector & PlanetObject::getMapLocationListForType    (int mapLocationType) const
+{
+	checkUpdateInternalListVersion (mapLocationType);
+	return const_cast<PlanetObject *>(this)->getMapLocationListForTypeInternal (mapLocationType);
+}
+
+//----------------------------------------------------------------------
+
+PlanetObject::MapLocationVector & PlanetObject::getMapLocationListForTypeInternal    (int mapLocationType)
+{
+	switch (mapLocationType)
+	{
+	case PlanetMapManager::MLT_static:
+		return m_mapLocationListStatic;
+	case PlanetMapManager::MLT_dynamic:
+		return m_mapLocationListDynamic;
+	case PlanetMapManager::MLT_persist:
+		return m_mapLocationListPersist;
+	default:
+		break;
+	}
+	static MapLocationVector broken;
+	return broken;
+}
+
+//----------------------------------------------------------------------
+
+const PlanetObject::ArchiveMapLocationMap &      PlanetObject::getMapLocationMapForType                (int mapLocationType) const
+{
+	return const_cast<PlanetObject *>(this)->getMapLocationMapForTypeInternal (mapLocationType);
+}
+
+//----------------------------------------------------------------------
+
+PlanetObject::ArchiveMapLocationMap &            PlanetObject::getMapLocationMapForTypeInternal        (int mapLocationType)
+{
+	switch (mapLocationType)
+	{
+	case PlanetMapManager::MLT_static:
+		return m_mapLocationMapStatic;
+	case PlanetMapManager::MLT_dynamic:
+		return m_mapLocationMapDynamic;
+	case PlanetMapManager::MLT_persist:
+		return m_mapLocationMapPersist;
+	default:
+		break;
+	}
+	static ArchiveMapLocationMap broken;
+	return broken;
+}
+
+//----------------------------------------------------------------------
+
+void PlanetObject::getMapLocationCategories     (int parentCategory, int mapLocationType, IntVector & result) const
+{
+	const MapLocationVector & locationList = getMapLocationListForType (mapLocationType);	
+		
+	size_t const numLocations = locationList.size ();
+	for (size_t i = 0; i < numLocations; ++i)
+	{
+		const MapLocation & ml = locationList [i];
+		int cat = 0;
+		if (!parentCategory)
+			cat = ml.m_category;
+		else if (parentCategory == ml.m_category)
+			cat = ml.m_subCategory;
+
+		if (cat)
+		{
+			if (std::binary_search (result.begin (), result.end (), cat))
+				continue;
+			
+			result.push_back (cat);
+			std::sort (result.begin (), result.end ());
+		}
+	}
+}
+			
+//----------------------------------------------------------------------
+
+const MapLocation * PlanetObject::getMapLocation               (int mapLocationType, const NetworkId & id) const
+{
+	// call this to update the cache, if necessary
+	IGNORE_RETURN(getMapLocationListForType (mapLocationType));
+
+	// but perform the search in the map (rather than the cache) for performance
+	const ArchiveMapLocationMap & mapLocationMap = getMapLocationMapForType (mapLocationType);
+	const ArchiveMapLocationMap::const_iterator iterFind = mapLocationMap.find(id);
+	if (iterFind != mapLocationMap.end())
+		return &(iterFind->second);
+
+	return 0;
+}
+
+//----------------------------------------------------------------------
+
+void PlanetObject::checkUpdateInternalListVersion          (int mapLocationType) const
+{
+	const int mapVersion      = getMapLocationVersionForTypeInternal     (mapLocationType).get ();
+	int & internalListVersion = getMapLocationListVersionForTypeInternal (mapLocationType);
+
+	if (mapVersion != internalListVersion)
+	{
+		MapLocationVector & mapLocationList          = const_cast<PlanetObject *>(this)->getMapLocationListForTypeInternal (mapLocationType);
+		const ArchiveMapLocationMap & mapLocationMap = getMapLocationMapForType  (mapLocationType);
+
+		mapLocationList.clear ();
+		mapLocationList.reserve (mapLocationMap.size ());
+		for (ArchiveMapLocationMap::const_iterator it = mapLocationMap.begin (); it != mapLocationMap.end (); ++it)
+			mapLocationList.push_back ((*it).second);
+
+		internalListVersion = mapVersion;
+	}
+}
+
+//----------------------------------------------------------------------
+
+void PlanetObject::connectedCharacterLfgDataFactionalPresenceOnErase(std::string const & keyValue, std::pair<int, int> const & value)
+{
+	UNREF(keyValue);
+
+	if ((value.first > 0) || (value.second > 0))
+		s_factionalPresenceSuiTableNeedRebuild = true;
+}
+
+//----------------------------------------------------------------------
+
+void PlanetObject::connectedCharacterLfgDataFactionalPresenceOnInsert(std::string const & keyValue, std::pair<int, int> const & value)
+{
+	UNREF(keyValue);
+
+	if ((value.first > 0) || (value.second > 0))
+		s_factionalPresenceSuiTableNeedRebuild = true;
+}
+
+//----------------------------------------------------------------------
+
+void PlanetObject::connectedCharacterLfgDataFactionalPresenceOnSet(std::string const & keyValue, std::pair<int, int> const & oldValue, std::pair<int, int> const & newValue)
+{
+	UNREF(keyValue);
+
+	// 0 -> non-zero or non-zero -> 0
+	if ((oldValue.first != newValue.first) && ((oldValue.first <= 0) || (newValue.first <= 0)))
+		s_factionalPresenceSuiTableNeedRebuild = true;
+	else if ((oldValue.second != newValue.second) && ((oldValue.second <= 0) || (newValue.second <= 0)))
+		s_factionalPresenceSuiTableNeedRebuild = true;
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::unload()
+{
+	FATAL(true, ("Tried to unload PlanetObject %s.", getNetworkId().getValueString().c_str()));
+}
+
+//-----------------------------------------------------------------------
+
+void PlanetObject::onLoadedFromDatabase()
+{
+	UniverseObject::onLoadedFromDatabase();
+
+	// depersist collection "server first" information
+	if (m_planetName.get() != "tatooine")
+		return;
+
+	// to avoid inefficient multiple calls to the CollectionServerFirstObserver
+	// class, we temporarily disable it here while we depersist collection
+	// "server first" information and manually create the CollectionServerFirstObserver
+	// object, so that there will only be 1 call to the CollectionServerFirstObserver
+	// object when it goes out of scope at the end of the function
+	m_collectionServerFirst.setSourceObject(NULL);
+	CollectionServerFirstObserver observer(this, Archive::ADOO_set);
+
+	const DynamicVariableList & objvars = getObjVars();
+	std::string objvar;
+	std::vector<Unicode::String> value;
+	time_t claimTime;
+	NetworkId claimantId;
+	Unicode::String claimantName;
+
+	std::map<std::string, CollectionsDataTable::CollectionInfoCollection const *> const & allServerFirstCollections = CollectionsDataTable::getAllServerFirstCollections();
+	for (std::map<std::string, CollectionsDataTable::CollectionInfoCollection const *>::const_iterator iter = allServerFirstCollections.begin(); iter != allServerFirstCollections.end(); ++iter)
+	{
+		objvar = OBJVAR_COLLECTION_SERVER_FIRST + "." + iter->second->name;
+		if (!objvars.hasItem(objvar) || (DynamicVariable::STRING_ARRAY != objvars.getType(objvar)))
+			continue;
+
+		value.clear();
+		if (!objvars.getItem(objvar, value))
+			continue;
+
+		if (value.size() != 3)
+			continue;
+
+		claimTime = static_cast<time_t>(::atol(Unicode::wideToNarrow(value[0]).c_str()));
+		claimantId = NetworkId(Unicode::wideToNarrow(value[1]));
+		claimantName = value[2];
+
+		m_collectionServerFirst.insert(std::make_pair(std::make_pair(static_cast<int32>(claimTime), iter->second->name), std::make_pair(claimantId, claimantName)));
+	}
+
+	int collectionServerFirstUpdateNumber = 0;
+	if (!objvars.getItem(OBJVAR_COLLECTION_SERVER_FIRST_UPDATE_NUMBER, collectionServerFirstUpdateNumber))
+		collectionServerFirstUpdateNumber = 0;
+
+	m_collectionServerFirstUpdateNumber = collectionServerFirstUpdateNumber;
+
+	// restore observer
+	m_collectionServerFirst.setSourceObject(this);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Build or update the list of resources available on this planet, as appropriate.
+ * Keeps track of the minimum expiration time of the resources in the list.  If that
+ * time has passed, it rebuilds the list.
+ */
+void PlanetObject::buildAvailableResourceList() const
+{
+	if (!m_builtAvailableResourceList || ServerClock::getInstance().getGameTimeSeconds() > m_availableResourceListExpirationTime)
+	{
+		m_availableResourceListExpirationTime = ServerClock::cms_endOfTime;
+		m_availableResourceList.clear();
+
+		ServerResourceClassObject const * const root=NON_NULL(safe_cast<ServerResourceClassObject const *>(ServerUniverse::getInstance().getResourceTreeRoot()));
+		std::vector<ResourceTypeObject const *> typeList;
+		root->getAllDerivedResourceTypes(typeList);
+
+		for (std::vector<ResourceTypeObject const *>::const_iterator i=typeList.begin(); i!=typeList.end(); ++i)
+		{
+			NOT_NULL(*i);
+			m_availableResourceListExpirationTime = std::min(m_availableResourceListExpirationTime, (*i)->getDepletedTimestamp());
+			if ((*i)->hasPoolForPlanet(getNetworkId()))
+			{
+				m_availableResourceList.push_back(*i);
+			}
+		}
+
+		m_builtAvailableResourceList = true;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::setCollectionServerFirst(const CollectionsDataTable::CollectionInfoCollection& collectionInfo, const NetworkId& claimantId, const Unicode::String& claimantName, const std::string& claimantAccountInfo)
+{
+	if (m_planetName.get() != "tatooine")
+		return;
+
+	if (isAuthoritative())
+	{
+		if (!collectionInfo.trackServerFirst)
+			return;
+
+		const DynamicVariableList & objvars = getObjVars();
+		const std::string objvar = OBJVAR_COLLECTION_SERVER_FIRST + "." + collectionInfo.name;
+		if (objvars.hasItem(objvar) && (DynamicVariable::STRING_ARRAY == objvars.getType(objvar)))
+			return;
+
+		const time_t timeNow = ::time(NULL);
+		char buffer[64];
+		snprintf(buffer, sizeof(buffer)-1, "%ld", timeNow);
+		buffer[sizeof(buffer)-1] = '\0';
+
+		std::vector<Unicode::String> value;
+		value.push_back(Unicode::narrowToWide(buffer));
+		value.push_back(Unicode::narrowToWide(claimantId.getValueString()));
+		value.push_back(claimantName);
+
+		if (setObjVarItem(objvar, value))
+		{
+			int collectionServerFirstUpdateNumber = 0;
+			if (!objvars.getItem(OBJVAR_COLLECTION_SERVER_FIRST_UPDATE_NUMBER, collectionServerFirstUpdateNumber))
+				collectionServerFirstUpdateNumber = 0;
+
+			++collectionServerFirstUpdateNumber;
+			
+			IGNORE_RETURN(setObjVarItem(OBJVAR_COLLECTION_SERVER_FIRST_UPDATE_NUMBER, collectionServerFirstUpdateNumber));
+			m_collectionServerFirstUpdateNumber = collectionServerFirstUpdateNumber;
+			m_collectionServerFirst.insert(std::make_pair(std::make_pair(static_cast<int32>(timeNow), collectionInfo.name), std::make_pair(claimantId, claimantName)));
+
+			// let claimant know "server first" claim was successful
+			MessageToQueue::getInstance().sendMessageToC(claimantId,
+				"C++OnCollectionServerFirst",
+				collectionInfo.name,
+				0,
+				false);
+
+			// CS log
+			LOG("CustomerService", ("CollectionServerFirst:(%s/%s/%s) granted to %s at %ld (%s) (update #%d)",
+				collectionInfo.page.book.name.c_str(),
+				collectionInfo.page.name.c_str(),
+				collectionInfo.name.c_str(),
+				claimantAccountInfo.c_str(),
+				timeNow,
+				CalendarTime::convertEpochToTimeStringLocal(timeNow).c_str(),
+				collectionServerFirstUpdateNumber));
+		}
+	}
+	else
+	{
+		Controller* const controller = getController();
+		if (!controller)
+		{
+			DEBUG_WARNING(true, ("PlanetObject::setCollectionServerFirst: planet object %s has no controller", getName().c_str()));
+			return;
+		}
+
+		MessageQueueGenericValueType<std::pair<std::pair<std::string, NetworkId>, std::pair<Unicode::String, std::string> > >* const message = new MessageQueueGenericValueType<std::pair<std::pair<std::string, NetworkId>, std::pair<Unicode::String, std::string> > >(std::make_pair(std::make_pair(collectionInfo.name, claimantId), std::make_pair(claimantName, claimantAccountInfo)));
+		controller->appendMessage(static_cast<int>(CM_collectionRequestServerFirst), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::removeCollectionServerFirst(const CollectionsDataTable::CollectionInfoCollection& collectionInfo)
+{
+	if (m_planetName.get() != "tatooine")
+		return;
+
+	if (isAuthoritative())
+	{
+		const DynamicVariableList & objvars = getObjVars();
+		const std::string objvar = OBJVAR_COLLECTION_SERVER_FIRST + "." + collectionInfo.name;
+		if (!objvars.hasItem(objvar) || (DynamicVariable::STRING_ARRAY != objvars.getType(objvar)))
+			return;
+
+		std::vector<Unicode::String> value;
+		if (!objvars.getItem(objvar, value))
+			return;
+
+		if (value.size() != 3)
+			return;
+
+		const time_t claimTime = static_cast<time_t>(::atol(Unicode::wideToNarrow(value[0]).c_str()));
+		const NetworkId claimantId = NetworkId(Unicode::wideToNarrow(value[1]));
+		const Unicode::String claimantName = value[2];
+
+		removeObjVarItem(objvar);
+
+		int collectionServerFirstUpdateNumber = 0;
+		if (!objvars.getItem(OBJVAR_COLLECTION_SERVER_FIRST_UPDATE_NUMBER, collectionServerFirstUpdateNumber))
+			collectionServerFirstUpdateNumber = 0;
+
+		++collectionServerFirstUpdateNumber;
+
+		IGNORE_RETURN(setObjVarItem(OBJVAR_COLLECTION_SERVER_FIRST_UPDATE_NUMBER, collectionServerFirstUpdateNumber));
+		m_collectionServerFirstUpdateNumber = collectionServerFirstUpdateNumber;
+		IGNORE_RETURN(m_collectionServerFirst.erase(std::make_pair(std::make_pair(static_cast<int32>(claimTime), collectionInfo.name), std::make_pair(claimantId, claimantName))));
+
+		// CS log
+		LOG("CustomerService", ("CollectionServerFirst:revoked (%s/%s/%s) which was granted to (%s, %s) at %ld (%s) (update #%d)",
+			collectionInfo.page.book.name.c_str(),
+			collectionInfo.page.name.c_str(),
+			collectionInfo.name.c_str(),
+			claimantId.getValueString().c_str(),
+			Unicode::wideToNarrow(claimantName).c_str(),
+			claimTime,
+			CalendarTime::convertEpochToTimeStringLocal(claimTime).c_str(),
+			collectionServerFirstUpdateNumber));
+	}
+	else
+	{
+		Controller* const controller = getController();
+		if (!controller)
+		{
+			DEBUG_WARNING(true, ("PlanetObject::removeCollectionServerFirst: planet object %s has no controller", getName().c_str()));
+			return;
+		}
+
+		MessageQueueGenericValueType<std::string>* const message = new MessageQueueGenericValueType<std::string>(collectionInfo.name);
+		controller->appendMessage(static_cast<int>(CM_collectionRevokeServerFirst), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::handleCMessageTo(MessageToPayload const &message)
+{
+	if (message.getMethod() == "C++SetCollectionServerFirstTime")
+	{
+		if ((m_planetName.get() == "tatooine") && !message.getPackedDataVector().empty())
+		{
+			std::string const params(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			Unicode::String const delimiters(Unicode::narrowToWide("|"));
+			Unicode::UnicodeStringVector tokens;
+			if ((Unicode::tokenize(Unicode::narrowToWide(params), tokens, &delimiters, NULL)) && (tokens.size() == 2))
+			{
+				CollectionsDataTable::CollectionInfoCollection const * const collectionInfo = CollectionsDataTable::getCollectionByName(Unicode::wideToNarrow(tokens[0]));
+				if (collectionInfo && collectionInfo->trackServerFirst && (collectionInfo->serverFirstClaimTime > 0))
+				{
+					const DynamicVariableList & objvars = getObjVars();
+					const std::string objvar = OBJVAR_COLLECTION_SERVER_FIRST + "." + collectionInfo->name;
+					if (objvars.hasItem(objvar) && (DynamicVariable::STRING_ARRAY == objvars.getType(objvar)))
+					{
+						std::vector<Unicode::String> value;
+						if (objvars.getItem(objvar, value) && (value.size() == 3))
+						{
+							const time_t serverFirstOldTime = static_cast<time_t>(::atol(Unicode::wideToNarrow(value[0]).c_str()));
+							const time_t serverFirstNewTime = static_cast<time_t>(::atol(Unicode::wideToNarrow(tokens[1]).c_str()));
+
+							if (serverFirstOldTime != serverFirstNewTime)
+							{
+								const NetworkId claimantId = NetworkId(Unicode::wideToNarrow(value[1]));
+								const Unicode::String claimantName = value[2];
+
+								char buffer[64];
+								snprintf(buffer, sizeof(buffer)-1, "%ld", serverFirstNewTime);
+								buffer[sizeof(buffer)-1] = '\0';
+
+								// set the "server first" new completion time
+								value[0] = Unicode::narrowToWide(buffer);
+
+								if (setObjVarItem(objvar, value))
+								{
+									int collectionServerFirstUpdateNumber = 0;
+									if (!objvars.getItem(OBJVAR_COLLECTION_SERVER_FIRST_UPDATE_NUMBER, collectionServerFirstUpdateNumber))
+										collectionServerFirstUpdateNumber = 0;
+
+									++collectionServerFirstUpdateNumber;
+
+									IGNORE_RETURN(setObjVarItem(OBJVAR_COLLECTION_SERVER_FIRST_UPDATE_NUMBER, collectionServerFirstUpdateNumber));
+									m_collectionServerFirstUpdateNumber = collectionServerFirstUpdateNumber;
+
+									IGNORE_RETURN(m_collectionServerFirst.erase(std::make_pair(std::make_pair(static_cast<int32>(serverFirstOldTime), collectionInfo->name), std::make_pair(claimantId, claimantName))));
+									m_collectionServerFirst.insert(std::make_pair(std::make_pair(static_cast<int32>(serverFirstNewTime), collectionInfo->name), std::make_pair(claimantId, claimantName)));
+
+									// CS log
+									LOG("CustomerService", ("CollectionServerFirst:(%s/%s/%s) \"server first\" completion time changed from %ld (%s) to %ld (%s) (update #%d)",
+										collectionInfo->page.book.name.c_str(),
+										collectionInfo->page.name.c_str(),
+										collectionInfo->name.c_str(),
+										serverFirstOldTime,
+										CalendarTime::convertEpochToTimeStringLocal(serverFirstOldTime).c_str(),
+										serverFirstNewTime,
+										CalendarTime::convertEpochToTimeStringLocal(serverFirstNewTime).c_str(),
+										collectionServerFirstUpdateNumber));
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	else if (message.getMethod() == "C++DoGcwDecay")
+	{
+		// start decay handling loop
+		int const now = static_cast<int>(::time(NULL));
+		int timeNextGcwScoreDecay;
+		if (!getObjVars().getItem("gcwScore.nextDecayTime", timeNextGcwScoreDecay) || (timeNextGcwScoreDecay <= 0))
+		{
+			timeNextGcwScoreDecay = getNextGcwScoreDecayTime(now);				
+			if (timeNextGcwScoreDecay >= now)
+			{
+				setObjVarItem("gcwScore.nextDecayTime", timeNextGcwScoreDecay);
+			}
+		}
+
+		if ((timeNextGcwScoreDecay <= now) && (timeNextGcwScoreDecay > 0))
+		{
+			// decay GCW score
+			LOG("CustomerService", ("GcwScore: decaying GCW score for period ending (%s)", CalendarTime::convertEpochToTimeStringGMT(timeNextGcwScoreDecay).c_str()));
+
+			std::vector<NetworkId> scoreObjvar(2);
+			std::map<std::string, std::pair<int64, int64> > newGcwScore;
+			std::set<std::string> updatedScoreCategories;
+			std::map<std::string, std::pair<int64, int64> >::const_iterator iterBegin = m_gcwImperialScore.begin();
+			std::map<std::string, std::pair<int64, int64> >::const_iterator iterEnd = m_gcwImperialScore.end();
+			for (; iterBegin != iterEnd; ++iterBegin)
+			{
+				newGcwScore[iterBegin->first] = std::make_pair((iterBegin->second.first / static_cast<int64>(2)) + (iterBegin->second.second / static_cast<int64>(2)), 0);
+			}
+
+			iterBegin = newGcwScore.begin();
+			iterEnd = newGcwScore.end();
+			for (; iterBegin != iterEnd; ++iterBegin)
+			{
+				updatedScoreCategories.insert(iterBegin->first);
+
+				if (iterBegin->second.first <= 0)
+				{
+					m_gcwImperialScore.erase(iterBegin->first);
+					removeObjVarItem("gcwScore.Imp." + iterBegin->first);
+				}
+				else
+				{
+					m_gcwImperialScore.set(iterBegin->first, iterBegin->second);
+
+					scoreObjvar[0] = NetworkId(iterBegin->second.first);
+					scoreObjvar[1] = NetworkId(iterBegin->second.second);
+					setObjVarItem("gcwScore.Imp." + iterBegin->first, scoreObjvar);
+				}
+			}
+
+			newGcwScore.clear();
+			iterBegin = m_gcwRebelScore.begin();
+			iterEnd = m_gcwRebelScore.end();
+			for (; iterBegin != iterEnd; ++iterBegin)
+			{
+				newGcwScore[iterBegin->first] = std::make_pair((iterBegin->second.first / static_cast<int64>(2)) + (iterBegin->second.second / static_cast<int64>(2)), 0);
+			}
+
+			iterBegin = newGcwScore.begin();
+			iterEnd = newGcwScore.end();
+			for (; iterBegin != iterEnd; ++iterBegin)
+			{
+				updatedScoreCategories.insert(iterBegin->first);
+
+				if (iterBegin->second.first <= 0)
+				{
+					m_gcwRebelScore.erase(iterBegin->first);
+					removeObjVarItem("gcwScore.Reb." + iterBegin->first);
+				}
+				else
+				{
+					m_gcwRebelScore.set(iterBegin->first, iterBegin->second);
+
+					scoreObjvar[0] = NetworkId(iterBegin->second.first);
+					scoreObjvar[1] = NetworkId(iterBegin->second.second);
+					setObjVarItem("gcwScore.Reb." + iterBegin->first, scoreObjvar);
+				}
+			}
+
+			// we need to recalculate the score percentile for score categories that change;
+			// halving both the imperial and rebel score shouldn't cause the percentile to
+			// change, but as the number gets smaller, integer division truncation will start
+			// to cause the percentile to change; in the worse case, when one side hits 0,
+			// the other side will immediately jump to 100%, and then when that side hits 0,
+			// it then becomes 50/50
+			if (!updatedScoreCategories.empty())
+			{
+				GuildObject * const go = ServerUniverse::getInstance().getMasterGuildObject();
+				if (go && go->isAuthoritative())
+				{
+					go->updateGcwImperialScorePercentile(updatedScoreCategories);
+				}
+			}
+
+			// set up next decay calculation time
+			timeNextGcwScoreDecay = getNextGcwScoreDecayTime(now + 1);				
+			if (timeNextGcwScoreDecay > 0)
+			{
+				setObjVarItem("gcwScore.nextDecayTime", timeNextGcwScoreDecay);
+			}
+		}
+
+		if (timeNextGcwScoreDecay > 0)
+		{
+			MessageToQueue::sendMessageToC(getNetworkId(), "C++DoGcwDecay", std::string(), std::max(0, timeNextGcwScoreDecay - now) + 1, false);
+		}
+	}
+	else if (message.getMethod() == "C++DoGcwDecayImmediate")
+	{
+		if ((m_planetName.get() == "tatooine") && !message.getPackedDataVector().empty())
+		{
+			bool recalculatePercentile = false;
+
+			std::string const gcwScoreCategory(message.getPackedDataVector().begin(), message.getPackedDataVector().end());
+			std::map<std::string, std::pair<int64, int64> >::const_iterator iterFind = m_gcwImperialScore.find(gcwScoreCategory);
+			if (iterFind != m_gcwImperialScore.end())
+			{
+				int64 const newScore = (iterFind->second.first / static_cast<int64>(2)) + (iterFind->second.second / static_cast<int64>(2));
+				if (newScore <= 0)
+				{
+					m_gcwImperialScore.erase(gcwScoreCategory);
+					removeObjVarItem("gcwScore.Imp." + gcwScoreCategory);
+				}
+				else
+				{
+					m_gcwImperialScore.set(gcwScoreCategory, std::make_pair(newScore, 0));
+
+					std::vector<NetworkId> scoreObjvar(2);
+					scoreObjvar[0] = NetworkId(newScore);
+					scoreObjvar[1] = NetworkId(static_cast<NetworkId::NetworkIdType>(0));
+					setObjVarItem("gcwScore.Imp." + gcwScoreCategory, scoreObjvar);
+				}
+
+				recalculatePercentile = true;
+			}
+
+			iterFind = m_gcwRebelScore.find(gcwScoreCategory);
+			if (iterFind != m_gcwRebelScore.end())
+			{
+				int64 const newScore = (iterFind->second.first / static_cast<int64>(2)) + (iterFind->second.second / static_cast<int64>(2));
+				if (newScore <= 0)
+				{
+					m_gcwRebelScore.erase(gcwScoreCategory);
+					removeObjVarItem("gcwScore.Reb." + gcwScoreCategory);
+				}
+				else
+				{
+					m_gcwRebelScore.set(gcwScoreCategory, std::make_pair(newScore, 0));
+
+					std::vector<NetworkId> scoreObjvar(2);
+					scoreObjvar[0] = NetworkId(newScore);
+					scoreObjvar[1] = NetworkId(static_cast<NetworkId::NetworkIdType>(0));
+					setObjVarItem("gcwScore.Reb." + gcwScoreCategory, scoreObjvar);
+				}
+
+				recalculatePercentile = true;
+			}
+
+			if (recalculatePercentile)
+			{
+				std::set<std::string> updatedScoreCategories;
+				updatedScoreCategories.insert(gcwScoreCategory);
+
+				GuildObject * const go = ServerUniverse::getInstance().getMasterGuildObject();
+				if (go && go->isAuthoritative())
+				{
+					go->updateGcwImperialScorePercentile(updatedScoreCategories);
+				}
+			}
+		}
+	}
+	else
+	{
+		UniverseObject::handleCMessageTo(message);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::endBaselines()
+{
+	UniverseObject::endBaselines();
+
+	if (isAuthoritative() && (m_planetName.get() == "tatooine"))
+	{
+		// depersist GCW score
+		std::vector<NetworkId> scoreObjvar;
+
+		{
+			DynamicVariableList::NestedList const gcwImperialScore(getObjVars(), "gcwScore.Imp");
+			for (DynamicVariableList::NestedList::const_iterator i = gcwImperialScore.begin(); i != gcwImperialScore.end(); ++i)
+			{
+				if (Pvp::getGcwScoreCategory(i.getName()) && i.getValue(scoreObjvar) && (scoreObjvar.size() == 2))
+					m_gcwImperialScore.set(i.getName(), std::make_pair(scoreObjvar[0].getValue(), scoreObjvar[1].getValue()));
+			}
+		}
+
+		{
+			DynamicVariableList::NestedList const gcwRebelScore(getObjVars(), "gcwScore.Reb");
+			for (DynamicVariableList::NestedList::const_iterator i = gcwRebelScore.begin(); i != gcwRebelScore.end(); ++i)
+			{
+				if (Pvp::getGcwScoreCategory(i.getName()) && i.getValue(scoreObjvar) && (scoreObjvar.size() == 2))
+					m_gcwRebelScore.set(i.getName(), std::make_pair(scoreObjvar[0].getValue(), scoreObjvar[1].getValue()));
+			}
+		}
+
+		// start decay handling loop
+		int const now = static_cast<int>(::time(NULL));
+		int timeNextGcwScoreDecay;
+		if (!getObjVars().getItem("gcwScore.nextDecayTime", timeNextGcwScoreDecay) || (timeNextGcwScoreDecay <= 0))
+		{
+			timeNextGcwScoreDecay = getNextGcwScoreDecayTime(now);				
+			if (timeNextGcwScoreDecay >= now)
+			{
+				setObjVarItem("gcwScore.nextDecayTime", timeNextGcwScoreDecay);
+			}
+		}
+
+		if (timeNextGcwScoreDecay > 0)
+		{
+			MessageToQueue::sendMessageToC(getNetworkId(), "C++DoGcwDecay", std::string(), std::max(0, timeNextGcwScoreDecay - now) + 1, false);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::setConnectedCharacterLfgData(const NetworkId & characterId, const LfgCharacterData & lfgCharacterData)
+{
+	if (m_planetName.get() != "tatooine")
+		return;
+
+	if (isAuthoritative())
+	{
+		std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = m_connectedCharacterLfgData.find(characterId);
+		if (iterFind != m_connectedCharacterLfgData.end())
+		{
+			// don't call decrement followed by increment if it will result in the same
+			// final value, as that causes an unnecessary change to the AutoDeltaMap,
+			// causing the AutoDeltaMap change handlers to unnecessarily fire
+			if (iterFind->second.locationFactionalPresenceGcwRegion != lfgCharacterData.locationFactionalPresenceGcwRegion)
+			{
+				decrementConnectedCharacterLfgDataFactionalPresenceCount(m_connectedCharacterLfgDataFactionalPresence, iterFind->second);
+				incrementConnectedCharacterLfgDataFactionalPresenceCount(m_connectedCharacterLfgDataFactionalPresence, lfgCharacterData);
+
+				decrementConnectedCharacterLfgDataFactionalPresenceGridCount(m_connectedCharacterLfgDataFactionalPresenceGrid, iterFind->second);
+				incrementConnectedCharacterLfgDataFactionalPresenceGridCount(m_connectedCharacterLfgDataFactionalPresenceGrid, lfgCharacterData);
+			}
+			else if ((iterFind->second.faction != lfgCharacterData.faction) && !iterFind->second.locationFactionalPresenceGcwRegion.empty())
+			{
+				decrementConnectedCharacterLfgDataFactionalPresenceCount(m_connectedCharacterLfgDataFactionalPresence, iterFind->second);
+				incrementConnectedCharacterLfgDataFactionalPresenceCount(m_connectedCharacterLfgDataFactionalPresence, lfgCharacterData);
+
+				decrementConnectedCharacterLfgDataFactionalPresenceGridCount(m_connectedCharacterLfgDataFactionalPresenceGrid, iterFind->second);
+				incrementConnectedCharacterLfgDataFactionalPresenceGridCount(m_connectedCharacterLfgDataFactionalPresenceGrid, lfgCharacterData);
+			}
+			else if (((iterFind->second.locationFactionalPresenceGridX != lfgCharacterData.locationFactionalPresenceGridX) || (iterFind->second.locationFactionalPresenceGridZ != lfgCharacterData.locationFactionalPresenceGridZ)) && !iterFind->second.locationFactionalPresenceGcwRegion.empty())
+			{
+				decrementConnectedCharacterLfgDataFactionalPresenceGridCount(m_connectedCharacterLfgDataFactionalPresenceGrid, iterFind->second);
+				incrementConnectedCharacterLfgDataFactionalPresenceGridCount(m_connectedCharacterLfgDataFactionalPresenceGrid, lfgCharacterData);
+			}
+		}
+		else
+		{
+			incrementConnectedCharacterLfgDataFactionalPresenceCount(m_connectedCharacterLfgDataFactionalPresence, lfgCharacterData);
+			incrementConnectedCharacterLfgDataFactionalPresenceGridCount(m_connectedCharacterLfgDataFactionalPresenceGrid, lfgCharacterData);
+		}
+
+		m_connectedCharacterLfgData.set(characterId, lfgCharacterData);
+	}
+	else
+	{
+		Controller* const controller = getController();
+		if (!controller)
+		{
+			DEBUG_WARNING(true, ("PlanetObject::setConnectedCharacterLfgData: planet object %s has no controller", getName().c_str()));
+			return;
+		}
+
+		MessageQueueGenericValueType<std::pair<NetworkId, LfgCharacterData> >* const message = new MessageQueueGenericValueType<std::pair<NetworkId, LfgCharacterData> >(std::make_pair(characterId, lfgCharacterData));
+		controller->appendMessage(static_cast<int>(CM_setConnectedCharacterLfgData), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+ScriptParams const *PlanetObject::getConnectedCharacterLfgDataFactionalPresenceTableDictionary()
+{
+	if (s_factionalPresenceSuiTableNeedRebuild)
+	{
+		delete s_factionalPresenceSuiTable;
+		s_factionalPresenceSuiTable = NULL;
+
+		PlanetObject const * const tatooine = ServerUniverse::getInstance().getTatooinePlanet();
+		if (tatooine)
+		{
+			std::map<std::string, std::pair<int, int> > const & connectedCharacterLfgDataFactionalPresence = tatooine->getConnectedCharacterLfgDataFactionalPresence();
+			if (!connectedCharacterLfgDataFactionalPresence.empty())
+			{
+				size_t const size = connectedCharacterLfgDataFactionalPresence.size();
+				s_factionalPresenceSuiTable = new ScriptParams();
+				std::vector<const char *> * scriptParamsGcwContestedRegion = new std::vector<const char *>(size);
+				std::vector<const char *> * scriptParamsImperial = new std::vector<const char *>(size);
+				std::vector<const char *> * scriptParamsRebel = new std::vector<const char *>(size);
+
+				char buffer[128];
+				int index = 0;
+				for (std::map<std::string, std::pair<int, int> >::const_iterator iter = connectedCharacterLfgDataFactionalPresence.begin(); iter != connectedCharacterLfgDataFactionalPresence.end(); ++iter, ++index)
+				{
+					snprintf(buffer, sizeof(buffer)-1, "@gcw_regions:%s", iter->first.c_str());
+					buffer[sizeof(buffer)-1] = '\0';
+
+					(*scriptParamsGcwContestedRegion)[index] = makeCopyOfString(buffer);
+					(*scriptParamsImperial)[index] = makeCopyOfString((iter->second.first > 0) ? "X" : "");
+					(*scriptParamsRebel)[index] = makeCopyOfString((iter->second.second > 0) ? "X" : "");
+				}
+
+				// column header
+				static const char * s_scriptParamsColumnHeadersText[3] = 
+				{
+					"Region",
+					"Rebel",
+					"Imperial"
+				};
+				static std::vector<const char *> s_scriptParamsColumnHeaders(s_scriptParamsColumnHeadersText, s_scriptParamsColumnHeadersText + (sizeof(s_scriptParamsColumnHeadersText) / sizeof(const char *)));
+
+				// column type
+				static const char * s_scriptParamsColumnTypeText[3] = 
+				{
+					"text",
+					"text",
+					"text"
+				};
+				static std::vector<const char *> s_scriptParamsColumnType(s_scriptParamsColumnTypeText, s_scriptParamsColumnTypeText + (sizeof(s_scriptParamsColumnTypeText) / sizeof(const char *)));
+
+				s_factionalPresenceSuiTable->addParam(s_scriptParamsColumnHeaders, "column", false);
+				s_factionalPresenceSuiTable->addParam(s_scriptParamsColumnType, "columnType", false);
+				s_factionalPresenceSuiTable->addParam(*scriptParamsGcwContestedRegion, "column0", true);
+				s_factionalPresenceSuiTable->addParam(*scriptParamsRebel, "column1", true);
+				s_factionalPresenceSuiTable->addParam(*scriptParamsImperial, "column2", true);
+			}
+		}
+
+		s_factionalPresenceSuiTableNeedRebuild = false;
+	}
+
+	return s_factionalPresenceSuiTable;
+}
+
+// ----------------------------------------------------------------------
+
+void  PlanetObject::setConnectedCharacterGroupData(const NetworkId & characterId, const NetworkId & groupId)
+{
+	if (m_planetName.get() != "tatooine")
+		return;
+
+	if (isAuthoritative())
+	{
+		std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = m_connectedCharacterLfgData.find(characterId);
+		if ((iterFind != m_connectedCharacterLfgData.end()) && (iterFind->second.groupId != groupId))
+		{
+			LfgCharacterData lfgCharacterData = iterFind->second;
+			lfgCharacterData.groupId = groupId;
+
+			m_connectedCharacterLfgData.set(characterId, lfgCharacterData);	
+		}
+	}
+	else
+	{
+		Controller* const controller = getController();
+		if (!controller)
+		{
+			DEBUG_WARNING(true, ("PlanetObject::setConnectedCharacterGroupData: planet object %s has no controller", getName().c_str()));
+			return;
+		}
+
+		MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> >* const message = new MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> >(std::make_pair(characterId, groupId));
+		controller->appendMessage(static_cast<int>(CM_setConnectedCharacterGroupData), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::setConnectedCharacterPlanetData(const NetworkId & characterId, const std::string & planetName)
+{
+	if (m_planetName.get() != "tatooine")
+		return;
+
+	if (isAuthoritative())
+	{
+		std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = m_connectedCharacterLfgData.find(characterId);
+		if ((iterFind != m_connectedCharacterLfgData.end()) && (iterFind->second.locationPlanet != planetName))
+		{
+			LfgCharacterData lfgCharacterData = iterFind->second;
+
+			decrementConnectedCharacterLfgDataFactionalPresenceCount(m_connectedCharacterLfgDataFactionalPresence, lfgCharacterData);
+			decrementConnectedCharacterLfgDataFactionalPresenceGridCount(m_connectedCharacterLfgDataFactionalPresenceGrid, lfgCharacterData);
+
+			lfgCharacterData.locationPlanet = planetName;
+			
+			// changing planet, clear region and player city info, which will get updated separately
+			lfgCharacterData.locationRegion.clear();
+			lfgCharacterData.locationFactionalPresenceGcwRegion.clear();
+			lfgCharacterData.locationFactionalPresenceGridX = 0;
+			lfgCharacterData.locationFactionalPresenceGridZ = 0;
+			lfgCharacterData.locationPlayerCity.clear();
+
+			m_connectedCharacterLfgData.set(characterId, lfgCharacterData);	
+		}
+	}
+	else
+	{
+		Controller* const controller = getController();
+		if (!controller)
+		{
+			DEBUG_WARNING(true, ("PlanetObject::setConnectedCharacterPlanetData: planet object %s has no controller", getName().c_str()));
+			return;
+		}
+
+		MessageQueueGenericValueType<std::pair<std::string, NetworkId> >* const message = new MessageQueueGenericValueType<std::pair<std::string, NetworkId> >(std::make_pair(planetName, characterId));
+		controller->appendMessage(static_cast<int>(CM_setConnectedCharacterPlanetData), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::setConnectedCharacterRegionData(const NetworkId & characterId, const std::string & regionName)
+{
+	if (m_planetName.get() != "tatooine")
+		return;
+
+	if (isAuthoritative())
+	{
+		std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = m_connectedCharacterLfgData.find(characterId);
+		if ((iterFind != m_connectedCharacterLfgData.end()) && (iterFind->second.locationRegion != regionName))
+		{
+			LfgCharacterData lfgCharacterData = iterFind->second;
+			lfgCharacterData.locationRegion = regionName;
+
+			m_connectedCharacterLfgData.set(characterId, lfgCharacterData);	
+		}
+	}
+	else
+	{
+		Controller* const controller = getController();
+		if (!controller)
+		{
+			DEBUG_WARNING(true, ("PlanetObject::setConnectedCharacterRegionData: planet object %s has no controller", getName().c_str()));
+			return;
+		}
+
+		MessageQueueGenericValueType<std::pair<std::string, NetworkId> >* const message = new MessageQueueGenericValueType<std::pair<std::string, NetworkId> >(std::make_pair(regionName, characterId));
+		controller->appendMessage(static_cast<int>(CM_setConnectedCharacterRegionData), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::setConnectedCharacterPlayerCityData(const NetworkId & characterId, const std::string & playerCityName)
+{
+	if (m_planetName.get() != "tatooine")
+		return;
+
+	if (isAuthoritative())
+	{
+		std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = m_connectedCharacterLfgData.find(characterId);
+		if ((iterFind != m_connectedCharacterLfgData.end()) && (iterFind->second.locationPlayerCity != playerCityName))
+		{
+			LfgCharacterData lfgCharacterData = iterFind->second;
+			lfgCharacterData.locationPlayerCity = playerCityName;
+
+			m_connectedCharacterLfgData.set(characterId, lfgCharacterData);	
+		}
+	}
+	else
+	{
+		Controller* const controller = getController();
+		if (!controller)
+		{
+			DEBUG_WARNING(true, ("PlanetObject::setConnectedCharacterPlayerCityData: planet object %s has no controller", getName().c_str()));
+			return;
+		}
+
+		MessageQueueGenericValueType<std::pair<std::string, NetworkId> >* const message = new MessageQueueGenericValueType<std::pair<std::string, NetworkId> >(std::make_pair(playerCityName, characterId));
+		controller->appendMessage(static_cast<int>(CM_setConnectedCharacterPlayerCityData), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::setConnectedCharacterLevelData(const NetworkId & characterId, int16 level)
+{
+	if (m_planetName.get() != "tatooine")
+		return;
+
+	if (isAuthoritative())
+	{
+		std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = m_connectedCharacterLfgData.find(characterId);
+		if ((iterFind != m_connectedCharacterLfgData.end()) && (iterFind->second.level != level))
+		{
+			LfgCharacterData lfgCharacterData = iterFind->second;
+			lfgCharacterData.level = level;
+
+			m_connectedCharacterLfgData.set(characterId, lfgCharacterData);	
+		}
+	}
+	else
+	{
+		Controller* const controller = getController();
+		if (!controller)
+		{
+			DEBUG_WARNING(true, ("PlanetObject::setConnectedCharacterLevelData: planet object %s has no controller", getName().c_str()));
+			return;
+		}
+
+		MessageQueueGenericValueType<std::pair<NetworkId, int> >* const message = new MessageQueueGenericValueType<std::pair<NetworkId, int> >(std::make_pair(characterId, static_cast<int>(level)));
+		controller->appendMessage(static_cast<int>(CM_setConnectedCharacterLevelData), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::setConnectedCharacterProfessionData(const NetworkId & characterId, LfgCharacterData::Profession profession)
+{
+	if (m_planetName.get() != "tatooine")
+		return;
+
+	if (isAuthoritative())
+	{
+		std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = m_connectedCharacterLfgData.find(characterId);
+		if ((iterFind != m_connectedCharacterLfgData.end()) && (iterFind->second.profession != profession))
+		{
+			LfgCharacterData lfgCharacterData = iterFind->second;
+			lfgCharacterData.profession = profession;
+
+			m_connectedCharacterLfgData.set(characterId, lfgCharacterData);	
+		}
+	}
+	else
+	{
+		Controller* const controller = getController();
+		if (!controller)
+		{
+			DEBUG_WARNING(true, ("PlanetObject::setConnectedCharacterProfessionData: planet object %s has no controller", getName().c_str()));
+			return;
+		}
+
+		MessageQueueGenericValueType<std::pair<NetworkId, int> >* const message = new MessageQueueGenericValueType<std::pair<NetworkId, int> >(std::make_pair(characterId, static_cast<int>(profession)));
+		controller->appendMessage(static_cast<int>(CM_setConnectedCharacterProfessionData), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::setConnectedCharacterSearchableByCtsSourceGalaxyData(const NetworkId & characterId, bool searchableByCtsSourceGalaxy)
+{
+	if (m_planetName.get() != "tatooine")
+		return;
+
+	if (isAuthoritative())
+	{
+		std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = m_connectedCharacterLfgData.find(characterId);
+		if ((iterFind != m_connectedCharacterLfgData.end()) && (iterFind->second.searchableByCtsSourceGalaxy != searchableByCtsSourceGalaxy))
+		{
+			LfgCharacterData lfgCharacterData = iterFind->second;
+			lfgCharacterData.searchableByCtsSourceGalaxy = searchableByCtsSourceGalaxy;
+
+			m_connectedCharacterLfgData.set(characterId, lfgCharacterData);	
+		}
+	}
+	else
+	{
+		Controller* const controller = getController();
+		if (!controller)
+		{
+			DEBUG_WARNING(true, ("PlanetObject::setConnectedCharacterSearchableByCtsSourceGalaxyData: planet object %s has no controller", getName().c_str()));
+			return;
+		}
+
+		MessageQueueGenericValueType<std::pair<NetworkId, int> >* const message = new MessageQueueGenericValueType<std::pair<NetworkId, int> >(std::make_pair(characterId, static_cast<int>(searchableByCtsSourceGalaxy ? 1 : 0)));
+		controller->appendMessage(static_cast<int>(CM_setConnectedCharacterSearchableByCtsSourceGalaxyData), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::setConnectedCharacterDisplayLocationInSearchResultsData(const NetworkId & characterId, bool displayLocationInSearchResults)
+{
+	if (m_planetName.get() != "tatooine")
+		return;
+
+	if (isAuthoritative())
+	{
+		std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = m_connectedCharacterLfgData.find(characterId);
+		if ((iterFind != m_connectedCharacterLfgData.end()) && (iterFind->second.displayLocationInSearchResults != displayLocationInSearchResults))
+		{
+			LfgCharacterData lfgCharacterData = iterFind->second;
+			lfgCharacterData.displayLocationInSearchResults = displayLocationInSearchResults;
+
+			m_connectedCharacterLfgData.set(characterId, lfgCharacterData);	
+		}
+	}
+	else
+	{
+		Controller* const controller = getController();
+		if (!controller)
+		{
+			DEBUG_WARNING(true, ("PlanetObject::setConnectedCharacterDisplayLocationInSearchResultsData: planet object %s has no controller", getName().c_str()));
+			return;
+		}
+
+		MessageQueueGenericValueType<std::pair<NetworkId, int> >* const message = new MessageQueueGenericValueType<std::pair<NetworkId, int> >(std::make_pair(characterId, static_cast<int>(displayLocationInSearchResults ? 1 : 0)));
+		controller->appendMessage(static_cast<int>(CM_setConnectedCharacterDisplayLocationInSearchResultsData), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::setConnectedCharacterAnonymousData(const NetworkId & characterId, bool anonymous)
+{
+	if (m_planetName.get() != "tatooine")
+		return;
+
+	if (isAuthoritative())
+	{
+		std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = m_connectedCharacterLfgData.find(characterId);
+		if ((iterFind != m_connectedCharacterLfgData.end()) && (iterFind->second.anonymous != anonymous))
+		{
+			LfgCharacterData lfgCharacterData = iterFind->second;
+			lfgCharacterData.anonymous = anonymous;
+
+			m_connectedCharacterLfgData.set(characterId, lfgCharacterData);	
+		}
+	}
+	else
+	{
+		Controller* const controller = getController();
+		if (!controller)
+		{
+			DEBUG_WARNING(true, ("PlanetObject::setConnectedCharacterAnonymousData: planet object %s has no controller", getName().c_str()));
+			return;
+		}
+
+		MessageQueueGenericValueType<std::pair<NetworkId, int> >* const message = new MessageQueueGenericValueType<std::pair<NetworkId, int> >(std::make_pair(characterId, static_cast<int>(anonymous ? 1 : 0)));
+		controller->appendMessage(static_cast<int>(CM_setConnectedCharacterAnonymousData), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::setConnectedCharacterInterestsData(const NetworkId & characterId, BitArray const & interests)
+{
+	if (m_planetName.get() != "tatooine")
+		return;
+
+	if (isAuthoritative())
+	{
+		std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = m_connectedCharacterLfgData.find(characterId);
+		if ((iterFind != m_connectedCharacterLfgData.end()) && (iterFind->second.characterInterests != interests))
+		{
+			LfgCharacterData lfgCharacterData = iterFind->second;
+			lfgCharacterData.characterInterests = interests;
+
+			m_connectedCharacterLfgData.set(characterId, lfgCharacterData);	
+		}
+	}
+	else
+	{
+		Controller* const controller = getController();
+		if (!controller)
+		{
+			DEBUG_WARNING(true, ("PlanetObject::setConnectedCharacterInterestsData: planet object %s has no controller", getName().c_str()));
+			return;
+		}
+
+		MessageQueueGenericValueType<std::pair<NetworkId, BitArray> >* const message = new MessageQueueGenericValueType<std::pair<NetworkId, BitArray> >(std::make_pair(characterId, interests));
+		controller->appendMessage(static_cast<int>(CM_setConnectedCharacterInterestsData), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::setConnectedCharacterBiographyData(const NetworkId & characterId, const Unicode::String & biography)
+{
+	if (m_planetName.get() != "tatooine")
+		return;
+
+	if (isAuthoritative())
+	{
+		m_connectedCharacterBiographyData.set(characterId, biography);
+	}
+	else
+	{
+		Controller* const controller = getController();
+		if (!controller)
+		{
+			DEBUG_WARNING(true, ("PlanetObject::setConnectedCharacterBiographyData: planet object %s has no controller", getName().c_str()));
+			return;
+		}
+
+		MessageQueueGenericValueType<std::pair<Unicode::String, NetworkId> >* const message = new MessageQueueGenericValueType<std::pair<Unicode::String, NetworkId> >(std::make_pair(biography, characterId));
+		controller->appendMessage(static_cast<int>(CM_setConnectedCharacterBiographyData), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::removeConnectedCharacterBiographyData(const NetworkId & characterId)
+{
+	if (m_planetName.get() != "tatooine")
+		return;
+
+	if (isAuthoritative())
+	{
+		IGNORE_RETURN(m_connectedCharacterBiographyData.erase(characterId));
+	}
+	else
+	{
+		Controller* const controller = getController();
+		if (!controller)
+		{
+			DEBUG_WARNING(true, ("PlanetObject::removeConnectedCharacterBiographyData: planet object %s has no controller", getName().c_str()));
+			return;
+		}
+
+		MessageQueueGenericValueType<NetworkId>* const message = new MessageQueueGenericValueType<NetworkId>(characterId);
+		controller->appendMessage(static_cast<int>(CM_removeConnectedCharacterBiographyData), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::removeConnectedCharacterData(const NetworkId & characterId)
+{
+	if (m_planetName.get() != "tatooine")
+		return;
+
+	if (isAuthoritative())
+	{
+		std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = m_connectedCharacterLfgData.find(characterId);
+		if (iterFind != m_connectedCharacterLfgData.end())
+		{
+			decrementConnectedCharacterLfgDataFactionalPresenceCount(m_connectedCharacterLfgDataFactionalPresence, iterFind->second);
+			decrementConnectedCharacterLfgDataFactionalPresenceGridCount(m_connectedCharacterLfgDataFactionalPresenceGrid, iterFind->second);
+			IGNORE_RETURN(m_connectedCharacterLfgData.erase(characterId));
+		}
+	}
+	else
+	{
+		Controller* const controller = getController();
+		if (!controller)
+		{
+			DEBUG_WARNING(true, ("PlanetObject::removeConnectedCharacterData: planet object %s has no controller", getName().c_str()));
+			return;
+		}
+
+		MessageQueueGenericValueType<NetworkId>* const message = new MessageQueueGenericValueType<NetworkId>(characterId);
+		controller->appendMessage(static_cast<int>(CM_removeConnectedCharacterData), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+PlanetObject::CollectionServerFirstObserver::CollectionServerFirstObserver(PlanetObject *planet, Archive::AutoDeltaObserverOp)
+: m_target(planet)
+{
+}
+
+// ----------------------------------------------------------------------
+
+PlanetObject::CollectionServerFirstObserver::~CollectionServerFirstObserver()
+{
+	if (m_target && (m_target->m_planetName.get() == "tatooine"))
+	{
+		CollectionsDataTable::setServerFirstData(m_target->m_collectionServerFirst.get());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::addUniverseEvent(std::string const & eventName)
+{
+	if(m_planetName.get() != "tatooine")
+		return;
+
+	if(isAuthoritative())
+	{
+		std::string current = m_currentEvents.get();
+		std::vector<std::string> currentEventVector;
+
+		ParseEventString(current, currentEventVector);
+
+		std::vector<std::string>::size_type i = 0;
+		for(; i < currentEventVector.size(); ++i)
+		{
+			if(currentEventVector[i] == eventName)
+			{
+				return;
+			}
+		}
+
+		if(current.empty())
+			current.append(eventName);
+		else
+		{
+			current.append(",");
+			current.append(eventName);
+		}
+
+
+		m_currentEvents.set(current);
+	}
+	else
+	{
+		Controller* const controller = getController();
+		if (!controller)
+		{
+			DEBUG_WARNING(true, ("PlanetObject::addUniverseEvent: planet object %s has no controller", getName().c_str()));
+			return;
+		}
+
+		MessageQueueGenericValueType<std::string>* const message = new MessageQueueGenericValueType<std::string>(eventName);
+		controller->appendMessage(static_cast<int>(CM_addUniverseEvent), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::removeUniverseEvent(std::string const & eventName)
+{
+	if(m_planetName.get() != "tatooine")
+		return;
+
+	if(isAuthoritative())
+	{
+		std::string current = m_currentEvents.get();
+		std::string::size_type index = current.find(eventName);
+
+		if( index == std::string::npos)
+			return; // Event currently isn't running.
+
+		// Sanity check because of how String find works.
+		//////////////////////////////////////////////////
+		std::vector<StringIndexPair> currentEventVector;
+		bool entryValidated = false;
+		ParseEventString(current, currentEventVector);
+		
+		std::vector<StringIndexPair>::size_type i = 0;
+		for(; i < currentEventVector.size(); ++i)
+		{
+			if(currentEventVector[i].first == eventName)
+			{
+				index = currentEventVector[i].second;
+				entryValidated = true;
+			}
+		}
+
+		if(!entryValidated)
+			return;
+		//////////////////////////////////////////////////
+
+		if(index != 0) // See if we need to clean up the prepending ','.
+			current = current.erase(index - 1, eventName.size() + 1);
+		else
+			current = current.erase(index, index + eventName.size());
+
+		m_currentEvents.set(current);
+	}
+	else
+	{
+		Controller* const controller = getController();
+		if (!controller)
+		{
+			DEBUG_WARNING(true, ("PlanetObject::removeUniverseEvent: planet object %s has no controller", getName().c_str()));
+			return;
+		}
+
+		MessageQueueGenericValueType<std::string>* const message = new MessageQueueGenericValueType<std::string>(eventName);
+		controller->appendMessage(static_cast<int>(CM_removeUniverseEvent), 0.f, message, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & PlanetObject::getCurrentEvents() const
+{
+	return m_currentEvents.get();
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::EventsUpdatedCallback::modified(PlanetObject &/*target*/, std::string oldValue, std::string value, bool /*isLocal*/)
+{
+	if(oldValue != value)
+	{
+		std::vector<std::string> oldList;
+		std::vector<std::string> newList;
+
+		ParseEventString(oldValue, oldList);
+		ParseEventString(value, newList);
+
+		// First lets find out what events stopped. - O(n) UGHHHhhhhhh
+		std::vector<std::string>::size_type i = 0;
+		std::vector<std::string>::size_type oldListSize = oldList.size();
+		std::vector<std::string>::size_type newListSize = newList.size();
+
+		for(; i < oldListSize; ++i)
+		{
+			bool found = false;
+			std::vector<std::string>::size_type j = 0;
+			for(; j < newListSize; ++j)
+			{
+				if(newList[j] == oldList[i])
+				{
+					found = true;
+					break;
+				}
+			}
+
+			if(!found)
+			{
+				DEBUG_WARNING(ms_printEventDebug, ("------- PlanetObject - Trying to stop Event %s -------\n", oldList[i].c_str()));
+				ServerBuildoutManager::onEventStopped(oldList[i]);
+			}
+		}
+
+		// Now let's find out what events have started. - Same as above. Perhaps change this to a map/set/something else?
+		i = 0;
+		for(; i < newListSize; ++i)
+		{
+			bool found = false;
+			std::vector<std::string>::size_type j = 0;
+			for(; j < oldListSize; ++j)
+			{
+				if(oldList[j] == newList[i])
+				{
+					found = true;
+					break;
+				}
+			}
+
+			if(!found)
+			{
+				DEBUG_WARNING(ms_printEventDebug, ("------- PlanetObject - Trying to start Event %s -------\n", newList[i].c_str()));
+				ServerBuildoutManager::onEventStarted(newList[i]);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::parseCurrentEventsList(std::vector<std::string> & outVector)
+{
+	std::string const events = getCurrentEvents();
+	ParseEventString(events, outVector);
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::updateGcwTrackingData()
+{
+	// send our GCW score to the other clusters and process GCW scores we received from other clusters
+	if (isAuthoritative() && (ConfigServerGame::getBroadcastGcwScoreToOtherGalaxies() || ConfigServerGame::getReceiveGcwScoreFromOtherGalaxies()))
+	{
+		static time_t timeNextBroadcast = ::time(NULL) + ConfigServerGame::getBroadcastGcwScoreToOtherGalaxiesIntervalSeconds();
+		time_t const timeNow = ::time(NULL);
+		if (timeNextBroadcast < timeNow)
+		{
+			if (ConfigServerGame::getBroadcastGcwScoreToOtherGalaxies())
+			{
+				std::string const & clusterName = GameServer::getInstance().getClusterName();
+				GuildObject const * guildObject = ServerUniverse::getInstance().getMasterGuildObject();
+				if (!clusterName.empty() && guildObject && guildObject->isAuthoritative())
+				{
+#ifdef _DEBUG
+					// to allow testing without having to have another cluster
+					std::string gcwScoreReportDifferentClusterName;
+					getObjVars().getItem("gcwScoreReportDifferentClusterName", gcwScoreReportDifferentClusterName);
+
+					const GenericValueTypeMessage<std::pair<std::string, std::pair<std::map<std::string, std::pair<int64, int64> >, std::map<std::string, std::pair<int64, int64> > > > > gcwScoreStatRaw("GcwScoreStatRaw", std::make_pair((gcwScoreReportDifferentClusterName.empty() ? clusterName : gcwScoreReportDifferentClusterName), std::make_pair(getGcwImperialScore(), getGcwRebelScore())));
+					const GenericValueTypeMessage<std::pair<std::string, std::pair<std::map<std::string, int>, std::map<std::string, int> > > > gcwScoreStatPct("GcwScoreStatPct", std::make_pair((gcwScoreReportDifferentClusterName.empty() ? clusterName : gcwScoreReportDifferentClusterName), std::make_pair(guildObject->getGcwImperialScorePercentile(), guildObject->getGcwGroupImperialScorePercentile())));
+#else
+					const GenericValueTypeMessage<std::pair<std::string, std::pair<std::map<std::string, std::pair<int64, int64> >, std::map<std::string, std::pair<int64, int64> > > > > gcwScoreStatRaw("GcwScoreStatRaw", std::make_pair(clusterName, std::make_pair(getGcwImperialScore(), getGcwRebelScore())));
+					const GenericValueTypeMessage<std::pair<std::string, std::pair<std::map<std::string, int>, std::map<std::string, int> > > > gcwScoreStatPct("GcwScoreStatPct", std::make_pair(clusterName, std::make_pair(guildObject->getGcwImperialScorePercentile(), guildObject->getGcwGroupImperialScorePercentile())));
+#endif
+
+					GameServer::getInstance().sendToCentralServer(gcwScoreStatRaw);
+					GameServer::getInstance().sendToCentralServer(gcwScoreStatPct);
+				}
+			}
+
+			if (ConfigServerGame::getReceiveGcwScoreFromOtherGalaxies())
+			{
+				GuildObject * guildObject = ServerUniverse::getInstance().getMasterGuildObject();
+				if (guildObject && guildObject->isAuthoritative())
+				{
+					guildObject->calculateGcwImperialScorePercentileForSwg();
+				}
+			}
+
+			timeNextBroadcast = timeNow + ConfigServerGame::getBroadcastGcwScoreToOtherGalaxiesIntervalSeconds();
+		}
+	}
+
+	if (m_nextGcwTrackingUpdate == 0)
+		return;
+
+	if (ServerClock::getInstance().getGameTimeSeconds() <= m_nextGcwTrackingUpdate)
+		return;
+
+	if (!isAuthoritative())
+	{
+		// send updates to auth game server
+		Controller *controller = getController();
+		if (controller)
+		{
+			if (!m_gcwImperialScoreAdjustment.empty())
+			{
+				controller->appendMessage(
+					CM_adjustGcwImperialScore,
+					0.0f,
+					new MessageQueueGenericValueType<std::map<std::string, int64> >(m_gcwImperialScoreAdjustment),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+
+			if (!m_gcwRebelScoreAdjustment.empty())
+			{
+				controller->appendMessage(
+					CM_adjustGcwRebelScore,
+					0.0f,
+					new MessageQueueGenericValueType<std::map<std::string, int64> >(m_gcwRebelScoreAdjustment),
+					GameControllerMessageFlags::SEND |
+					GameControllerMessageFlags::RELIABLE |
+					GameControllerMessageFlags::DEST_AUTH_SERVER);
+			}
+		}
+	}
+	else
+	{
+		static std::pair<int64, int64> score;
+		static std::vector<NetworkId> scoreObjvar(2);
+
+		// we'll need to recalculate the score percentile for score categories that change
+		std::set<std::string> updatedScoreCategories;
+
+		std::map<std::string, std::pair<int64, int64> >::const_iterator iterFind;
+
+		{
+			for (std::map<std::string, int64>::const_iterator iterImp = m_gcwImperialScoreAdjustment.begin(); iterImp != m_gcwImperialScoreAdjustment.end(); ++iterImp)
+			{
+				if (iterImp->second == 0ll)
+					continue;
+
+				iterFind = m_gcwImperialScore.find(iterImp->first);
+				if (iterFind != m_gcwImperialScore.end())
+				{
+					score.first = iterFind->second.first;
+					score.second = iterFind->second.second + (iterImp->second * static_cast<int64>(Pvp::c_gcwScoreScaleFactor));
+				}
+				else
+				{
+					score.first = 0ll;
+					score.second = iterImp->second * static_cast<int64>(Pvp::c_gcwScoreScaleFactor);
+				}
+
+				// handle negative score
+				if (score.second < 0ll)
+				{
+					score.second = 0ll;
+				}
+
+				m_gcwImperialScore.set(iterImp->first, score);
+
+				scoreObjvar[0] = NetworkId(score.first);
+				scoreObjvar[1] = NetworkId(score.second);
+				setObjVarItem("gcwScore.Imp." + iterImp->first, scoreObjvar);
+
+				updatedScoreCategories.insert(iterImp->first);
+			}
+		}
+
+		{
+			for (std::map<std::string, int64>::const_iterator iterReb = m_gcwRebelScoreAdjustment.begin(); iterReb != m_gcwRebelScoreAdjustment.end(); ++iterReb)
+			{
+				if (iterReb->second == 0ll)
+					continue;
+
+				iterFind = m_gcwRebelScore.find(iterReb->first);
+				if (iterFind != m_gcwRebelScore.end())
+				{
+					score.first = iterFind->second.first;
+					score.second = iterFind->second.second + (iterReb->second * static_cast<int64>(Pvp::c_gcwScoreScaleFactor));
+				}
+				else
+				{
+					score.first = 0ll;
+					score.second = iterReb->second * static_cast<int64>(Pvp::c_gcwScoreScaleFactor);
+				}
+
+				// handle negative score
+				if (score.second < 0ll)
+				{
+					score.second = 0ll;
+				}
+
+				m_gcwRebelScore.set(iterReb->first, score);
+
+				scoreObjvar[0] = NetworkId(score.first);
+				scoreObjvar[1] = NetworkId(score.second);
+				setObjVarItem("gcwScore.Reb." + iterReb->first, scoreObjvar);
+
+				updatedScoreCategories.insert(iterReb->first);
+			}
+		}
+
+		// we need to recalculate the score percentile for score categories that change
+		if (!updatedScoreCategories.empty())
+		{
+			GuildObject * const go = ServerUniverse::getInstance().getMasterGuildObject();
+			if (go && go->isAuthoritative())
+			{
+				go->updateGcwImperialScorePercentile(updatedScoreCategories);
+			}
+		}
+	}
+
+	m_gcwImperialScoreAdjustment.clear();
+	m_gcwRebelScoreAdjustment.clear();
+	m_nextGcwTrackingUpdate = 0;
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::adjustGcwImperialScore(std::string const & source, CreatureObject * sourceObject, std::string const & gcwCategory, int64 adjustment)
+{
+	Pvp::GcwScoreCategory const * const gcwCategoryData = Pvp::getGcwScoreCategory(gcwCategory);
+	if (!gcwCategoryData)
+		return;
+
+	// queue up adjustments and periodically update the data
+	if (source != "CM_adjustGcwImperialScore")
+	{
+		if (sourceObject)
+		{
+			// if object is player object, store GCW contribution tracking information
+			PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(sourceObject);
+			if (playerObject)
+			{
+				int const timeNow = static_cast<int>(::time(NULL));
+				IGNORE_RETURN(playerObject->setObjVarItem(std::string("gcwContributionTracking.") + gcwCategory, timeNow));
+				IGNORE_RETURN(playerObject->setObjVarItem(std::string("gcwContributionTrackingLastUpdated"), timeNow));
+
+				// grant GCW Region Defender bonus
+				float bonus = 0.0f;
+				if (gcwCategoryData->gcwRegionDefender && PvpData::isImperialFactionId(sourceObject->getPvpFaction()) && (adjustment > 0) && (playerObject->getCurrentGcwRegion() == gcwCategory) && Pvp::getGcwDefenderRegionBonus(*sourceObject, *playerObject, bonus) && (bonus > 0.0f))
+					adjustment += std::max(1ll, static_cast<int64>(static_cast<double>(bonus) * static_cast<double>(adjustment) / static_cast<double>(100)));
+			}
+
+			LOG("CustomerService", ("GcwScore: imperial %s %d (from %s - %s)", gcwCategory.c_str(), static_cast<int>(adjustment), source.c_str(), sourceObject->getNetworkId().getValueString().c_str()));
+		}
+		else
+		{
+			LOG("CustomerService", ("GcwScore: imperial %s %d (from %s)", gcwCategory.c_str(), static_cast<int>(adjustment), source.c_str()));
+		}
+	}
+
+	std::pair<std::map<std::string, int64>::iterator, bool> result = m_gcwImperialScoreAdjustment.insert(std::make_pair(gcwCategory, adjustment));
+	if (!result.second)
+		result.first->second += adjustment;
+
+	// non-auth game servers send their updates to auth game server in/every 10 seconds;
+	// auth game server updates the universe data in/every 60 seconds
+	if (m_nextGcwTrackingUpdate == 0)
+		m_nextGcwTrackingUpdate = ServerClock::getInstance().getGameTimeSeconds() + (isAuthoritative() ? 60 : 10);
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObject::adjustGcwRebelScore(std::string const & source, CreatureObject * sourceObject, std::string const & gcwCategory, int64 adjustment)
+{
+	Pvp::GcwScoreCategory const * const gcwCategoryData = Pvp::getGcwScoreCategory(gcwCategory);
+	if (!gcwCategoryData)
+		return;
+
+	// queue up adjustments and periodically update the data
+	if (source != "CM_adjustGcwRebelScore")
+	{
+		if (sourceObject)
+		{
+			// if object is player object, store GCW contribution tracking information
+			PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(sourceObject);
+			if (playerObject)
+			{
+				int const timeNow = static_cast<int>(::time(NULL));
+				IGNORE_RETURN(playerObject->setObjVarItem(std::string("gcwContributionTracking.") + gcwCategory, timeNow));
+				IGNORE_RETURN(playerObject->setObjVarItem(std::string("gcwContributionTrackingLastUpdated"), timeNow));
+
+				// grant GCW Region Defender bonus
+				float bonus = 0.0f;
+				if (gcwCategoryData->gcwRegionDefender && PvpData::isRebelFactionId(sourceObject->getPvpFaction()) && (adjustment > 0) && (playerObject->getCurrentGcwRegion() == gcwCategory) && Pvp::getGcwDefenderRegionBonus(*sourceObject, *playerObject, bonus) && (bonus > 0.0f))
+					adjustment += std::max(1ll, static_cast<int64>(static_cast<double>(bonus) * static_cast<double>(adjustment) / static_cast<double>(100)));
+			}
+
+			LOG("CustomerService", ("GcwScore: rebel %s %d (from %s - %s)", gcwCategory.c_str(), static_cast<int>(adjustment), source.c_str(), sourceObject->getNetworkId().getValueString().c_str()));
+		}
+		else
+		{
+			LOG("CustomerService", ("GcwScore: rebel %s %d (from %s)", gcwCategory.c_str(), static_cast<int>(adjustment), source.c_str()));
+		}
+	}
+
+	std::pair<std::map<std::string, int64>::iterator, bool> result = m_gcwRebelScoreAdjustment.insert(std::make_pair(gcwCategory, adjustment));
+	if (!result.second)
+		result.first->second += adjustment;
+
+	// non-auth game servers send their updates to auth game server in/every 10 seconds;
+	// auth game server updates the universe data in/every 60 seconds
+	if (m_nextGcwTrackingUpdate == 0)
+		m_nextGcwTrackingUpdate = ServerClock::getInstance().getGameTimeSeconds() + (isAuthoritative() ? 60 : 10);
+}
+
+// ----------------------------------------------------------------------
+// the rebel score is 100 - the imperial score
+int PlanetObject::getGcwImperialScorePercentile(std::string const & gcwCategory) const
+{
+	return Pvp::calculateGcwImperialScorePercentile(gcwCategory, m_gcwImperialScore.getMap(), m_gcwRebelScore.getMap());
+}
+
+// ----------------------------------------------------------------------
+
+int PlanetObjectNamespace::getNextGcwScoreDecayTime(int base)
+{
+	int nextTime = -1;
+	int time;
+
+	std::vector<std::pair<std::pair<int, int>, std::pair<int, int> > > const & gcwScoreDecayTime = ConfigServerGame::getGcwScoreDecayTime();
+	for (std::vector<std::pair<std::pair<int, int>, std::pair<int, int> > >::const_iterator iter = gcwScoreDecayTime.begin(); iter != gcwScoreDecayTime.end(); ++iter)
+	{
+		time = static_cast<int>(CalendarTime::getNextGMTTimeOcurrence(static_cast<time_t>(base), iter->first.first, iter->first.second, iter->second.first, iter->second.second));
+		if (time > 0)
+		{
+			if ((nextTime < 0) || (time < nextTime))
+				nextTime = time;
+		}
+	}
+
+	if (nextTime < 0)
+		nextTime = static_cast<int>(::time(NULL)) + (60 * 60 * 24 * 7);
+
+	return nextTime;
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObjectNamespace::decrementConnectedCharacterLfgDataFactionalPresenceCount(Archive::AutoDeltaMap<std::string, std::pair<int, int>, PlanetObject> & connectedCharacterLfgDataFactionalPresence, const LfgCharacterData & lfgCharacterData)
+{
+	if (!lfgCharacterData.locationFactionalPresenceGcwRegion.empty())
+	{
+		std::map<std::string, std::pair<int, int> >::const_iterator iterFindFactionPresence = connectedCharacterLfgDataFactionalPresence.find(lfgCharacterData.locationFactionalPresenceGcwRegion);
+		if (iterFindFactionPresence != connectedCharacterLfgDataFactionalPresence.end())
+		{
+			std::pair<int, int> count = iterFindFactionPresence->second;
+			if (PvpData::isImperialFactionId(lfgCharacterData.faction))
+				count.first = std::max(0, count.first - 1);
+			else if (PvpData::isRebelFactionId(lfgCharacterData.faction))
+				count.second = std::max(0, count.second - 1);
+
+			if ((count.first <= 0) && (count.second <= 0))
+				IGNORE_RETURN(connectedCharacterLfgDataFactionalPresence.erase(lfgCharacterData.locationFactionalPresenceGcwRegion));
+			else
+				connectedCharacterLfgDataFactionalPresence.set(lfgCharacterData.locationFactionalPresenceGcwRegion, count);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObjectNamespace::incrementConnectedCharacterLfgDataFactionalPresenceCount(Archive::AutoDeltaMap<std::string, std::pair<int, int>, PlanetObject> & connectedCharacterLfgDataFactionalPresence, const LfgCharacterData & lfgCharacterData)
+{
+	if (!lfgCharacterData.locationFactionalPresenceGcwRegion.empty())
+	{
+		std::map<std::string, std::pair<int, int> >::const_iterator iterFindFactionPresence = connectedCharacterLfgDataFactionalPresence.find(lfgCharacterData.locationFactionalPresenceGcwRegion);
+		if (iterFindFactionPresence != connectedCharacterLfgDataFactionalPresence.end())
+		{
+			if (PvpData::isImperialFactionId(lfgCharacterData.faction))
+				connectedCharacterLfgDataFactionalPresence.set(lfgCharacterData.locationFactionalPresenceGcwRegion, std::make_pair(iterFindFactionPresence->second.first + 1, iterFindFactionPresence->second.second));
+			else if (PvpData::isRebelFactionId(lfgCharacterData.faction))
+				connectedCharacterLfgDataFactionalPresence.set(lfgCharacterData.locationFactionalPresenceGcwRegion, std::make_pair(iterFindFactionPresence->second.first, iterFindFactionPresence->second.second + 1));
+		}
+		else if (PvpData::isImperialFactionId(lfgCharacterData.faction))
+		{
+			connectedCharacterLfgDataFactionalPresence.set(lfgCharacterData.locationFactionalPresenceGcwRegion, std::make_pair(1, 0));
+		}
+		else if (PvpData::isRebelFactionId(lfgCharacterData.faction))
+		{
+			connectedCharacterLfgDataFactionalPresence.set(lfgCharacterData.locationFactionalPresenceGcwRegion, std::make_pair(0, 1));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObjectNamespace::decrementConnectedCharacterLfgDataFactionalPresenceGridCount(Archive::AutoDeltaMap<std::pair<std::string, std::pair<int, int> >, std::pair<NetworkId, std::pair<int, int> > > & connectedCharacterLfgDataFactionalPresenceGrid, const LfgCharacterData & lfgCharacterData)
+{
+	// factional presence grid tracking is only used for ground
+	if (::strncmp("space_", lfgCharacterData.locationPlanet.c_str(), 6) == 0)
+		return;
+
+	if (!lfgCharacterData.locationFactionalPresenceGcwRegion.empty())
+	{
+		std::map<std::pair<std::string, std::pair<int, int> >, std::pair<NetworkId, std::pair<int, int> > >::const_iterator iterFindFactionPresence = connectedCharacterLfgDataFactionalPresenceGrid.find(std::make_pair(lfgCharacterData.locationPlanet, std::make_pair(lfgCharacterData.locationFactionalPresenceGridX, lfgCharacterData.locationFactionalPresenceGridZ)));
+		if (iterFindFactionPresence != connectedCharacterLfgDataFactionalPresenceGrid.end())
+		{
+			std::pair<NetworkId, std::pair<int, int> > const oldValue = iterFindFactionPresence->second;
+			std::pair<NetworkId, std::pair<int, int> > newValue = iterFindFactionPresence->second;
+			if (PvpData::isImperialFactionId(lfgCharacterData.faction))
+				newValue.second.first = std::max(0, newValue.second.first - 1);
+			else if (PvpData::isRebelFactionId(lfgCharacterData.faction))
+				newValue.second.second = std::max(0, newValue.second.second - 1);
+
+			if ((newValue.second.first <= 0) && (newValue.second.second <= 0))
+			{
+				IGNORE_RETURN(connectedCharacterLfgDataFactionalPresenceGrid.erase(std::make_pair(lfgCharacterData.locationPlanet, std::make_pair(lfgCharacterData.locationFactionalPresenceGridX, lfgCharacterData.locationFactionalPresenceGridZ))));
+
+				// remove from planet map location
+				if ((oldValue.second.first > 0) || (oldValue.second.second > 0))
+					removeFactionalPresenceGridFromPlanetMap(lfgCharacterData.locationPlanet, oldValue.first);
+			}
+			else
+			{
+				// non-zero -> 0
+				if ((oldValue.second.first != newValue.second.first) && (newValue.second.first <= 0))
+				{
+					removeFactionalPresenceGridFromPlanetMap(lfgCharacterData.locationPlanet, oldValue.first);
+
+					newValue.first = ObjectIdManager::getInstance().getNewObjectId();
+					addFactionalPresenceGridToPlanetMap(lfgCharacterData.locationPlanet, newValue.first, lfgCharacterData.locationFactionalPresenceGridX, lfgCharacterData.locationFactionalPresenceGridZ, (newValue.second.first > 0), (newValue.second.second > 0));
+				}
+				else if ((oldValue.second.second != newValue.second.second) && (newValue.second.second <= 0))
+				{
+					removeFactionalPresenceGridFromPlanetMap(lfgCharacterData.locationPlanet, oldValue.first);
+
+					newValue.first = ObjectIdManager::getInstance().getNewObjectId();
+					addFactionalPresenceGridToPlanetMap(lfgCharacterData.locationPlanet, newValue.first, lfgCharacterData.locationFactionalPresenceGridX, lfgCharacterData.locationFactionalPresenceGridZ, (newValue.second.first > 0), (newValue.second.second > 0));
+				}
+
+				connectedCharacterLfgDataFactionalPresenceGrid.set(std::make_pair(lfgCharacterData.locationPlanet, std::make_pair(lfgCharacterData.locationFactionalPresenceGridX, lfgCharacterData.locationFactionalPresenceGridZ)), newValue);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObjectNamespace::incrementConnectedCharacterLfgDataFactionalPresenceGridCount(Archive::AutoDeltaMap<std::pair<std::string, std::pair<int, int> >, std::pair<NetworkId, std::pair<int, int> > > & connectedCharacterLfgDataFactionalPresenceGrid, const LfgCharacterData & lfgCharacterData)
+{
+	// factional presence grid tracking is only used for ground
+	if (::strncmp("space_", lfgCharacterData.locationPlanet.c_str(), 6) == 0)
+		return;
+
+	if (!lfgCharacterData.locationFactionalPresenceGcwRegion.empty())
+	{
+		std::pair<NetworkId, std::pair<int, int> > oldValue;
+		std::pair<NetworkId, std::pair<int, int> > newValue;
+
+		std::map<std::pair<std::string, std::pair<int, int> >, std::pair<NetworkId, std::pair<int, int> > >::const_iterator iterFindFactionPresence = connectedCharacterLfgDataFactionalPresenceGrid.find(std::make_pair(lfgCharacterData.locationPlanet, std::make_pair(lfgCharacterData.locationFactionalPresenceGridX, lfgCharacterData.locationFactionalPresenceGridZ)));
+		if (iterFindFactionPresence != connectedCharacterLfgDataFactionalPresenceGrid.end())
+		{
+			oldValue = iterFindFactionPresence->second;
+			newValue = iterFindFactionPresence->second;
+		}
+		else
+		{
+			oldValue = std::make_pair(NetworkId::cms_invalid, std::make_pair(0, 0));
+			newValue = std::make_pair(NetworkId::cms_invalid, std::make_pair(0, 0));
+		}
+
+		if (PvpData::isImperialFactionId(lfgCharacterData.faction))
+			++(newValue.second.first);
+		else if (PvpData::isRebelFactionId(lfgCharacterData.faction))
+			++(newValue.second.second);
+
+		// 0 -> non-zero
+		if ((oldValue.second.first != newValue.second.first) && (oldValue.second.first <= 0))
+		{
+			if (oldValue.first.isValid())
+				removeFactionalPresenceGridFromPlanetMap(lfgCharacterData.locationPlanet, oldValue.first);
+
+			newValue.first = ObjectIdManager::getInstance().getNewObjectId();
+			addFactionalPresenceGridToPlanetMap(lfgCharacterData.locationPlanet, newValue.first, lfgCharacterData.locationFactionalPresenceGridX, lfgCharacterData.locationFactionalPresenceGridZ, (newValue.second.first > 0), (newValue.second.second > 0));
+		}
+		else if ((oldValue.second.second != newValue.second.second) && (oldValue.second.second <= 0))
+		{
+			if (oldValue.first.isValid())
+				removeFactionalPresenceGridFromPlanetMap(lfgCharacterData.locationPlanet, oldValue.first);
+
+			newValue.first = ObjectIdManager::getInstance().getNewObjectId();
+			addFactionalPresenceGridToPlanetMap(lfgCharacterData.locationPlanet, newValue.first, lfgCharacterData.locationFactionalPresenceGridX, lfgCharacterData.locationFactionalPresenceGridZ, (newValue.second.first > 0), (newValue.second.second > 0));
+		}
+
+		connectedCharacterLfgDataFactionalPresenceGrid.set(std::make_pair(lfgCharacterData.locationPlanet, std::make_pair(lfgCharacterData.locationFactionalPresenceGridX, lfgCharacterData.locationFactionalPresenceGridZ)), newValue);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObjectNamespace::removeFactionalPresenceGridFromPlanetMap(std::string const & planetName, NetworkId const & locationId)
+{
+	// factional presence grid tracking is only used for ground
+	if (::strncmp("space_", planetName.c_str(), 6) == 0)
+		return;
+
+	PlanetObject * const planet = ServerUniverse::getInstance().getPlanetByName(planetName);
+	if (planet)
+		planet->removeMapLocation(locationId, static_cast<int>(PlanetMapManager::MLT_dynamic));
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObjectNamespace::addFactionalPresenceGridToPlanetMap(std::string const & planetName, NetworkId const & locationId, int gridX, int gridZ, bool imperial, bool rebel)
+{
+	// factional presence grid tracking is only used for ground
+	if (::strncmp("space_", planetName.c_str(), 6) == 0)
+		return;
+
+	if (!imperial && !rebel)
+		return;
+
+	PlanetObject * const planet = ServerUniverse::getInstance().getPlanetByName(planetName);
+	if (planet)
+	{
+		MapLocation ml;
+		ml.m_locationId = locationId;
+
+		if (imperial && rebel)
+		{
+			ml.m_subCategory = PlanetMapManager::findCategory("gcw_factional_presence_rebel_and_imperial");
+			ml.m_locationName = Unicode::narrowToWide(FormattedString<512>().sprintf("\\#FFFFFFGCW FP Grid (%d, %d) -> (%d, %d)", (gridX - (PvpData::getGcwFactionalPresenceGridSize() / 2)), (gridZ - (PvpData::getGcwFactionalPresenceGridSize() / 2)), (gridX + (PvpData::getGcwFactionalPresenceGridSize() / 2)), (gridZ + (PvpData::getGcwFactionalPresenceGridSize() / 2))));
+		}
+		else if (imperial)
+		{
+			ml.m_subCategory = PlanetMapManager::findCategory("gcw_factional_presence_imperial_only");
+			ml.m_locationName = Unicode::narrowToWide(FormattedString<512>().sprintf("\\#C2B5C9GCW FP Grid (%d, %d) -> (%d, %d)", (gridX - (PvpData::getGcwFactionalPresenceGridSize() / 2)), (gridZ - (PvpData::getGcwFactionalPresenceGridSize() / 2)), (gridX + (PvpData::getGcwFactionalPresenceGridSize() / 2)), (gridZ + (PvpData::getGcwFactionalPresenceGridSize() / 2))));
+		}
+		else
+		{
+			ml.m_subCategory = PlanetMapManager::findCategory("gcw_factional_presence_rebel_only");
+			ml.m_locationName = Unicode::narrowToWide(FormattedString<512>().sprintf("\\#D93311GCW FP Grid (%d, %d) -> (%d, %d)", (gridX - (PvpData::getGcwFactionalPresenceGridSize() / 2)), (gridZ - (PvpData::getGcwFactionalPresenceGridSize() / 2)), (gridX + (PvpData::getGcwFactionalPresenceGridSize() / 2)), (gridZ + (PvpData::getGcwFactionalPresenceGridSize() / 2))));
+		}
+
+		ml.m_location = Vector2d(static_cast<float>(gridX), static_cast<float>(gridZ));
+		ml.m_category = PlanetMapManager::findCategory("gcw_factional_presence");
+
+		planet->addMapLocation(ml, static_cast<int>(PlanetMapManager::MLT_dynamic), false);
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/PlanetObject.h b/engine/server/library/serverGame/src/shared/object/PlanetObject.h
new file mode 100644
index 00000000..63c4b5f3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/PlanetObject.h
@@ -0,0 +1,309 @@
+//========================================================================
+//
+// PlanetObject.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef INCLUDED_PlanetObject_H
+#define INCLUDED_PlanetObject_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaMap.h"
+#include "Archive/AutoDeltaSetObserver.h"
+#include "Archive/AutoDeltaVariableCallback.h"
+#include "serverGame/UniverseObject.h"
+#include "sharedGame/CollectionsDataTable.h"
+#include "sharedGame/LfgCharacterData.h"
+#include "sharedGame/TravelPoint.h"
+#include "sharedNetworkMessages/MapLocation.h"
+#include "sharedNetworkMessages/MapLocationArchive.h"
+
+class CreatureObject;
+class ResourceClassObject;
+class ResourcePoolObject;
+class ResourceTypeObject;
+class ScriptParams;
+class ServerPlanetObjectTemplate;
+class Vector2d;
+
+//-----------------------------------------------------------------------
+
+/** 
+ * A pool of a resource found on a planet.
+ *
+ * Represents the planet's supply of a particular resource.
+ */
+
+class PlanetObject : public UniverseObject
+{
+	friend class PlanetController;
+
+public:
+
+	PlanetObject(const ServerPlanetObjectTemplate* newTemplate);
+	virtual ~PlanetObject();
+
+	virtual Controller* createDefaultController (void);
+	void                addMembersToPackages    ();
+	virtual void        unload                  ();
+	virtual void        onLoadedFromDatabase    ();
+
+public:
+	const std::string &    getName               () const;
+	void                   setPlanetName         (const std::string &newName);
+	virtual void           getAttributes         (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+		
+	//resource pools functions
+	void                   getAvailableResourceList (std::vector<ResourceTypeObject const *> &buffer) const;
+	void                   getAvailableResourceList (std::vector<ResourceTypeObject const *> &buffer, const ResourceClassObject &masterClass) const;
+	void                   debugOutputPools         (std::string &output) const;
+
+	// weather functions
+	void setWeather(int weather, float windVelocityX, float windVelocityY, float windVelocityZ);
+	void getWeather(int & weather, float & windVelocityX, float & windVelocityY, float & windVelocityZ) const;
+
+	const std::vector<std::pair<NetworkId, unsigned long> > & getSpawnQueue() const;
+	public:
+	// Universe system functions (rebuild data structures on load)
+	virtual void  setupUniverse ();
+
+	//-- planetary map support
+
+	typedef stdvector<MapLocation>::fwd                    MapLocationVector;
+	typedef stdmap<NetworkId, MapLocation>::fwd            MapLocationMap;
+	typedef Archive::AutoDeltaMap<NetworkId, MapLocation>  ArchiveMapLocationMap;
+	typedef stdvector<int>::fwd                            IntVector;
+
+	bool                            addMapLocation               (const MapLocation &location, int mapLocationType, bool enforceLocationCountLimits);
+	bool                            removeMapLocation            (const NetworkId &id);
+	bool                            removeMapLocation            (const NetworkId &id, int mapLocationType);
+	const MapLocationVector &       getMapLocations              (int mapLocationType) const;
+	void                            getMapLocations              (MapLocationVector & result) const;
+	void                            getMapLocationsByCategories  (int mapLocationType, uint8 category, uint8 subCategory, MapLocationVector & result) const;
+	int                             getMapLocationVersionForType (int mapLocationType) const;
+	void                            getMapLocationCategories     (int parentCategory, int mapLocationType, IntVector & result) const;
+	const MapLocation *             getMapLocation               (int mapLocationType, const NetworkId & id) const;
+
+	//-- travel location support
+	void               addTravelPoint (const std::string& name, const Vector& position_w, int cost, bool interplanetary, TravelPoint::TravelPointType type);
+	void               removeTravelPoint (const std::string& name);
+	int                getNumberOfTravelPoints () const;
+	const TravelPoint* getTravelPoint (int travelPointIndex) const;
+	const TravelPoint* getTravelPoint (const std::string& name) const;
+	void               getTravelPointNameList (stdvector<std::string>::fwd& travelPointNameList) const;
+	void               getTravelPointPointList (stdvector<Vector>::fwd& travelPointPointList) const;
+	void               getTravelPointCostList (stdvector<int>::fwd& travelPointCostList) const;
+	void               getTravelPointInterplanetaryList (stdvector<bool>::fwd& travelPointInterplanetaryList) const;
+
+	std::set<std::pair<std::pair<int32, std::string>, std::pair<NetworkId, Unicode::String> > > const & getCollectionServerFirst() const;
+	int                getCollectionServerFirstUpdateNumber() const;
+	void               setCollectionServerFirst(const CollectionsDataTable::CollectionInfoCollection& collectionInfo, const NetworkId& claimantId, const Unicode::String& claimantName, const std::string& claimantAccountInfo);
+	void               removeCollectionServerFirst(const CollectionsDataTable::CollectionInfoCollection& collectionInfo);
+
+	void               setConnectedCharacterLfgData(const NetworkId & characterId, const LfgCharacterData & lfgCharacterData);
+	std::map<NetworkId, LfgCharacterData> const & getConnectedCharacterLfgData() const;
+	std::map<std::string, std::pair<int, int> > const & getConnectedCharacterLfgDataFactionalPresence() const;
+	static             ScriptParams const *getConnectedCharacterLfgDataFactionalPresenceTableDictionary();
+
+	void               setConnectedCharacterGroupData(const NetworkId & characterId, const NetworkId & groupId);
+
+	void               setConnectedCharacterPlanetData(const NetworkId & characterId, const std::string & planetName);
+
+	void               setConnectedCharacterRegionData(const NetworkId & characterId, const std::string & regionName);
+
+	void               setConnectedCharacterPlayerCityData(const NetworkId & characterId, const std::string & playerCityName);
+
+	void               setConnectedCharacterLevelData(const NetworkId & characterId, int16 level);
+
+	void               setConnectedCharacterProfessionData(const NetworkId & characterId, LfgCharacterData::Profession profession);
+
+	void               setConnectedCharacterSearchableByCtsSourceGalaxyData(const NetworkId & characterId, bool searchableByCtsSourceGalaxy);
+
+	void               setConnectedCharacterDisplayLocationInSearchResultsData(const NetworkId & characterId, bool displayLocationInSearchResults);
+
+	void               setConnectedCharacterAnonymousData(const NetworkId & characterId, bool anonymous);
+
+	void               setConnectedCharacterInterestsData(const NetworkId & characterId, BitArray const & interests);
+
+	void               setConnectedCharacterBiographyData(const NetworkId & characterId, const Unicode::String & biography);
+	void               removeConnectedCharacterBiographyData(const NetworkId & characterId);
+	std::map<NetworkId, Unicode::String> const & getConnectedCharacterBiographyData() const;
+
+	void               removeConnectedCharacterData(const NetworkId & characterId);
+
+	void                addUniverseEvent(std::string const & eventName);
+	void                removeUniverseEvent(std::string const & eventName);
+	std::string const & getCurrentEvents() const;
+	void                parseCurrentEventsList(std::vector<std::string> & outVector);
+
+	void               updateGcwTrackingData();
+
+	void               adjustGcwImperialScore(std::string const & source, CreatureObject * sourceObject, std::string const & gcwCategory, int64 adjustment);
+	void               adjustGcwRebelScore(std::string const & source, CreatureObject * sourceObject, std::string const & gcwCategory, int64 adjustment);
+	int                getGcwImperialScorePercentile(std::string const & gcwCategory) const; // the rebel score is 100 - the imperial score
+
+	std::map<std::string, std::pair<int64, int64> > const & getGcwImperialScore() const;
+	std::map<std::string, std::pair<int64, int64> > const & getGcwRebelScore() const;
+
+protected:
+	virtual void       handleCMessageTo(const MessageToPayload &message);
+	virtual void       endBaselines();
+
+private:
+
+	void               buildAvailableResourceList       () const;
+	bool               getTravelPointIndex              (const std::string& name, int& travelPointIndex) const;
+
+	void               cacheMapLocationsInternal        () const;
+	void               incrementMapLocationCacheVersion (int mapLocationType);
+
+	Archive::AutoDeltaVariable<int> &  getMapLocationVersionForTypeInternal     (int mapLocationType) const;
+	int &                              getMapLocationListVersionForTypeInternal (int mapLocationType) const;
+	const MapLocationVector &          getMapLocationListForType                (int mapLocationType) const;
+	MapLocationVector &                getMapLocationListForTypeInternal        (int mapLocationType);
+
+	const ArchiveMapLocationMap &      getMapLocationMapForType                 (int mapLocationType) const;
+	ArchiveMapLocationMap &            getMapLocationMapForTypeInternal         (int mapLocationType);
+
+	void                               checkUpdateInternalListVersion           (int mapLocationType) const;
+
+	void connectedCharacterLfgDataFactionalPresenceOnErase(std::string const & keyValue, std::pair<int, int> const & value);
+	void connectedCharacterLfgDataFactionalPresenceOnInsert(std::string const & keyValue, std::pair<int, int> const & value);
+	void connectedCharacterLfgDataFactionalPresenceOnSet(std::string const & keyValue, std::pair<int, int> const & oldValue, std::pair<int, int> const & newValue);
+
+private:
+	struct EventsUpdatedCallback
+	{
+		void modified(PlanetObject &target, std::string oldValue, std::string value, bool isLocal);
+	};
+
+	PlanetObject();
+	PlanetObject(const PlanetObject& rhs);
+	PlanetObject&	operator=(const PlanetObject& rhs);
+
+private:
+
+// BPM PlanetObject : UniverseObject // Begin persisted members.
+	Archive::AutoDeltaVariable<std::string>       m_planetName;      ///< The name of the planet.  Must match the sceneId of the gameservers that load objects on this planet.
+//EPM
+
+	//-- Resource data cache
+	bool mutable   m_builtAvailableResourceList;
+	uint32 mutable m_availableResourceListExpirationTime;
+	std::vector<ResourceTypeObject const *> mutable m_availableResourceList;
+	
+	//-- travel location support
+	Archive::AutoDeltaVector<TravelPoint>         m_travelPointList;
+
+	// weather support
+	Archive::AutoDeltaVariable<int>       m_weatherIndex;
+	Archive::AutoDeltaVariable<float>     m_windVelocityX;
+	Archive::AutoDeltaVariable<float>     m_windVelocityY;
+	Archive::AutoDeltaVariable<float>     m_windVelocityZ;
+
+	//-- planetary map support.  @todo remove this from PlanetObject
+
+	ArchiveMapLocationMap    m_mapLocationMapStatic;     // static stuff like buildings & cities
+	ArchiveMapLocationMap    m_mapLocationMapDynamic;    // dynamic stuff like camps
+	ArchiveMapLocationMap    m_mapLocationMapPersist;    // semi-permanent stuff like player structures, vendors, etc...
+
+	mutable Archive::AutoDeltaVariable<int>  m_mapLocationVersionStatic;  // version numbers for caching
+	mutable Archive::AutoDeltaVariable<int>  m_mapLocationVersionDynamic; //
+	mutable Archive::AutoDeltaVariable<int>  m_mapLocationVersionPersist; //
+
+	//-- planetary map local cache.  The maps above are synchronized and persisted.  The vectors below are stored
+	//-- and maintained on a per-instance basis.
+
+	mutable MapLocationVector                m_mapLocationListStatic;     // static stuff like buildings & cities
+	mutable MapLocationVector                m_mapLocationListDynamic;    // dynamic stuff like camps
+	mutable MapLocationVector                m_mapLocationListPersist;    // semi-permanent stuff like player structures, vendors, etc...
+
+	mutable int                              m_mapLocationListVersionStatic;  // version numbers for caching
+	mutable int                              m_mapLocationListVersionDynamic; //
+	mutable int                              m_mapLocationListVersionPersist; //
+
+	struct CollectionServerFirstObserver
+	{
+		CollectionServerFirstObserver(PlanetObject *planet, Archive::AutoDeltaObserverOp operation);
+		~CollectionServerFirstObserver();
+
+		PlanetObject * m_target;
+	};
+	friend struct CollectionServerFirstObserver;
+
+	Archive::AutoDeltaSetObserver<std::pair<std::pair<int32, std::string>, std::pair<NetworkId, Unicode::String> >, CollectionServerFirstObserver, PlanetObject> m_collectionServerFirst;
+	Archive::AutoDeltaVariable<int>          m_collectionServerFirstUpdateNumber;
+
+	Archive::AutoDeltaMap<NetworkId, LfgCharacterData> m_connectedCharacterLfgData;
+	Archive::AutoDeltaMap<std::string, std::pair<int, int>, PlanetObject> m_connectedCharacterLfgDataFactionalPresence;
+	Archive::AutoDeltaMap<std::pair<std::string, std::pair<int, int> >, std::pair<NetworkId, std::pair<int, int> > > m_connectedCharacterLfgDataFactionalPresenceGrid;
+	Archive::AutoDeltaMap<NetworkId, Unicode::String> m_connectedCharacterBiographyData;
+
+	// Event String
+	Archive::AutoDeltaVariableCallback<std::string, EventsUpdatedCallback, PlanetObject> m_currentEvents;
+
+	unsigned long m_nextGcwTrackingUpdate;
+	std::map<std::string, int64> m_gcwImperialScoreAdjustment;
+	std::map<std::string, int64> m_gcwRebelScoreAdjustment;
+
+	// the score is tracked as a <cumulative score, current period score> pair
+	Archive::AutoDeltaMap<std::string, std::pair<int64, int64> > m_gcwImperialScore;
+	Archive::AutoDeltaMap<std::string, std::pair<int64, int64> > m_gcwRebelScore;
+};
+
+// ----------------------------------------------------------------------
+
+inline const std::string &PlanetObject::getName() const
+{
+	return m_planetName.get();
+}
+
+inline void PlanetObject::getWeather(int & weather, float & windVelocityX, 
+	float & windVelocityY, float & windVelocityZ) const
+{
+	weather = m_weatherIndex.get();
+	windVelocityX = m_windVelocityX.get();
+	windVelocityY = m_windVelocityY.get();
+	windVelocityZ = m_windVelocityZ.get();
+}
+
+inline std::set<std::pair<std::pair<int32, std::string>, std::pair<NetworkId, Unicode::String> > > const & PlanetObject::getCollectionServerFirst() const
+{
+	return m_collectionServerFirst.get();
+}
+
+inline int PlanetObject::getCollectionServerFirstUpdateNumber() const
+{
+	return m_collectionServerFirstUpdateNumber.get();
+}
+
+inline std::map<NetworkId, LfgCharacterData> const & PlanetObject::getConnectedCharacterLfgData() const
+{
+	return m_connectedCharacterLfgData.getMap();
+}
+
+inline std::map<std::string, std::pair<int, int> > const & PlanetObject::getConnectedCharacterLfgDataFactionalPresence() const
+{
+	return m_connectedCharacterLfgDataFactionalPresence.getMap();
+}
+
+inline std::map<NetworkId, Unicode::String> const & PlanetObject::getConnectedCharacterBiographyData() const
+{
+	return m_connectedCharacterBiographyData.getMap();
+}
+
+inline std::map<std::string, std::pair<int64, int64> > const & PlanetObject::getGcwImperialScore() const
+{
+	return m_gcwImperialScore.getMap();
+}
+
+inline std::map<std::string, std::pair<int64, int64> > const & PlanetObject::getGcwRebelScore() const
+{
+	return m_gcwRebelScore.getMap();
+}
+
+//-----------------------------------------------------------------------
+#endif	// INCLUDED_PlanetObject_H
diff --git a/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp b/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp
new file mode 100644
index 00000000..39e6f335
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp
@@ -0,0 +1,9171 @@
+// ======================================================================
+//
+// PlayerObject.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PlayerObject.h"
+
+#include "LocalizationManager.h"
+#include "serverGame/BiographyManager.h"
+#include "serverGame/Chat.h"
+#include "serverGame/CitizenInfo.h"
+#include "serverGame/CityInfo.h"
+#include "serverGame/CityInterface.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/DestroyMessageManager.h"
+#include "serverGame/FactoryObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/GroupWaypointBuilder.h"
+#include "serverGame/GuildInfo.h"
+#include "serverGame/GuildInterface.h"
+#include "serverGame/GuildMemberInfo.h"
+#include "sharedGame/GuildRankDataTable.h"
+#include "serverGame/ManufactureSchematicObject.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/ObjectIdManager.h"
+#include "serverGame/ObserveTracker.h"
+#include "serverGame/PgcRatingInfo.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/ProsePackageManagerServer.h"
+#include "serverGame/RegionMaster.h"
+#include "serverGame/ResourceContainerObject.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerController.h"
+#include "serverGame/ServerPlayerObjectTemplate.h"
+#include "serverGame/ServerResourceClassObject.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/TangibleObject.h"
+#include "serverNetworkMessages/LoginUpgradeAccountMessage.h"
+#include "serverNetworkMessages/MessageToPayload.h"
+#include "serverScript/ConfigServerScript.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptDictionary.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/ConfigServerUtility.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedFoundation/CalendarTime.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/Crc.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/Os.h"
+#include "sharedGame/CitizenRankDataTable.h"
+#include "sharedGame/CityData.h"
+#include "sharedGame/DraftSchematicGroupManager.h"
+#include "sharedGame/GameLanguageManager.h"
+#include "sharedGame/LfgDataTable.h"
+#include "sharedGame/OutOfBandPackager.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/PvpData.h"
+#include "sharedGame/Quest.h"
+#include "sharedGame/QuestManager.h"
+#include "sharedGame/QuestTask.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedGame/TextIterator.h"
+#include "sharedGame/TextManager.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/MessageQueueDraftSchematics.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlots.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlotsQueryResponse.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedNetworkMessages/PlayMusicMessage.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/VolumeContainer.h"
+#include "sharedSkillSystem/SkillManager.h"
+#include "sharedSkillSystem/SkillObject.h"
+#include "sharedUtility/Location.h"
+#include "sharedUtility/LocationArchive.h"
+#include "UnicodeUtils.h"
+
+#include <list>
+
+const SharedObjectTemplate * PlayerObject::m_defaultSharedTemplate = NULL;
+bool PlayerObject::m_allowEmptySlot = false;
+
+
+//-----------------------------------------------------------------------
+PlayerObject::ChatLogEntry::ChatLogEntry()
+ : m_index(0)
+ , m_time(0)
+// , m_serverProcessId(0)
+{
+}
+
+// ======================================================================
+
+namespace PlayerObjectNamespace
+{
+	// slot that holds the datapad
+	const ConstCharCrcLowerString DATAPAD_SLOT_NAME("datapad");
+
+	// objvars for crafting
+	const std::string OBJVAR_CRAFTING_STATION("crafting.station");
+	const std::string OBJVAR_PRIVATE_STATION("crafting.private");
+	const std::string OBJVAR_CRAFTING_PROTOTYPE_TIME("crafting.prototypeTime");
+	const std::string OBJVAR_CRAFTING_PROTOTYPE_START_TIME("crafting.prototypeStartTime");
+	const std::string OBJVAR_CRAFTING_PROTOTYPE_OBJECT("crafting.prototypeObject");
+	const std::string OBJVAR_CRAFTING_PROTOTYPE_CRAFTER("crafting.prototypeCrafter");
+	const std::string OBJVAR_CRAFTING_FAKE_PROTOTYPE("crafting.isFakePrototype");
+	const std::string OBJVAR_CRAFTING_COMPONENT_CAN_BE_DAMAGED("crafting.damaged_ok");
+	const std::string OBJVAR_FORCE_CRITICAL_ASSEMBLY("crafting.force_critical_assembly");
+	const std::string OBJVAR_FORCE_CRITICAL_EXPERIMENT("crafting.force_critical_experiment");
+	const std::string OBJVAR_FORCE_CRITICAL_SUCCESS("crafting.force_critical_success");
+	const std::string OBJVAR_IN_CRAFTING_SESSION("crafting.inCraftingSession");
+
+	// objvars for chat spam info
+	const std::string OBJVAR_CHAT_SPAM_TIME_END_INTERVAL("chatSpam.timeEndInterval");
+	const std::string OBJVAR_CHAT_SPAM_SPATIAL("chatSpam.spatial");
+	const std::string OBJVAR_CHAT_SPAM_NON_SPATIAL("chatSpam.nonSpatial");
+
+	// objvars for privileged title
+	const std::string OBJVAR_PRIVILEGED_TITLE("privilegedTitle");
+
+	// objvars for squelch info
+	const std::string OBJVAR_SQUELCH_ID("squelch.id");
+	const std::string OBJVAR_SQUELCH_NAME("squelch.name");
+	const std::string OBJVAR_SQUELCH_EXPIRE("squelch.expire");
+
+	// skill data granted independently from skills
+	const std::string OBJVAR_NOT_SKILL_SCHEMATICS("_notskill.schematics");
+
+	const std::string OBJVAR_EXPERIENCE_MULTIPLIER("xp_multiplier");
+	const std::string OBJVAR_GAME_FACTION_RANKINGS("gcw");
+
+	const std::string OBJVAR_DELETED_QUEST_COUNT("quests.numQuestsDeleted");
+
+	const StringId COMPONENT_LOST_MSG("system_msg", "lost_component");
+
+	const int MAX_KILL_METER = 50;
+
+	//----------------------------------------------------------------------
+
+	std::set<PlayerObject const *> s_allPlayerObjects;
+
+	//----------------------------------------------------------------------
+
+	bool isNestedInContainer (const NetworkId & itemId, const NetworkId & containerId)
+	{
+		NetworkId theItemId = itemId;
+		for (;;)
+		{
+			if (theItemId == containerId)
+				return true;
+
+			const Object * const item = NetworkIdManager::getObjectById (theItemId);
+			if (!item)
+				break;
+
+			const Object * const parent = ContainerInterface::getContainedByObject (*item);
+			if (!parent)
+				break;
+
+			theItemId = parent->getNetworkId ();
+		}
+
+		return false;
+	}
+
+	void refScript(CreatureObject & owner, const std::string & scriptName)
+	{
+		GameScriptObject * script = owner.getScriptObject();
+		if(script)
+		{
+			if(! script->hasScript(scriptName))
+			{
+				script->attachScript(scriptName, false);
+			}
+
+			int scriptRefCount = 0;
+			const DynamicVariableList & objvars = owner.getObjVars();
+
+			const std::string itemName = "quest.script." + scriptName;
+			if (objvars.getItem(itemName, scriptRefCount))
+			{
+				scriptRefCount++;
+			}
+			else
+			{
+				scriptRefCount = 1;
+			}
+
+			owner.setObjVarItem(itemName, scriptRefCount);
+		}
+	}
+
+	void derefScript(CreatureObject & owner, const std::string & scriptName)
+	{
+		int scriptRefCount = 0;
+		const DynamicVariableList & objvars = owner.getObjVars();
+
+		const std::string itemName = "quest.script." + scriptName;
+		if (objvars.getItem(itemName, scriptRefCount))
+		{
+			scriptRefCount--;
+			if(scriptRefCount < 0)
+			{
+				scriptRefCount = 0;
+			}
+		}
+		else
+		{
+			scriptRefCount = 0;
+		}
+
+		if(scriptRefCount > 0)
+		{
+			owner.setObjVarItem(itemName, scriptRefCount);
+		}
+		else
+		{
+			owner.removeObjVarItem(itemName);
+			GameScriptObject * script = owner.getScriptObject();
+			if(script)
+			{
+				if(script->hasScript(scriptName))
+				{
+					script->detachScript(scriptName);
+				}
+			}
+		}
+	}
+
+	//----------------------------------------------------------------------
+
+	void checkAndSetCharacterAgeTitle(PlayerObject & player, bool thoroughCheck);
+	void checkAndSetAccountAgeTitle(PlayerObject & player);
+
+	//----------------------------------------------------------------------
+
+//	size_t s_waypointLimit = 10;
+	size_t s_questLimit = 1000;
+
+	//----------------------------------------------------------------------
+
+	// Class to help us sort quest data by age
+	class QuestDataToSort
+	{
+	public:
+		QuestDataToSort() :
+			m_key(0)
+		{}
+
+		QuestDataToSort( uint32 key, PlayerQuestData const& questData ) :
+			m_key(key),
+			m_questData(questData)
+		{}
+
+		bool operator<(QuestDataToSort const & rhs) const
+		{
+			return (m_questData.getRelativeAgeIndex() < rhs.m_questData.getRelativeAgeIndex());
+		}
+
+		uint32                 GetPlayerQuestDataKey() const { return m_key; }
+		PlayerQuestData const& GetPlayerQuestData() const    { return m_questData; }
+
+	private:
+		uint32          m_key;
+		PlayerQuestData m_questData;
+	};
+
+	typedef std::list<QuestDataToSort> SortableQuestList;
+	typedef std::vector< std::pair<int, int> > TaskChanceVector;
+
+	void grantGcwFactionalPresenceScore(std::string const & gcwCategory, PlayerObject const & po, CreatureObject const & co);
+};
+
+using namespace PlayerObjectNamespace;
+
+// ======================================================================
+
+PlayerObject::PlayerObject(const ServerPlayerObjectTemplate* newTemplate) :
+		IntangibleObject(newTemplate),
+		m_callback(new MessageDispatch::Callback),
+		m_stationId(0),
+		m_houseId(CachedNetworkId(NetworkId::cms_invalid)),
+		m_accountNumLots(0),
+		m_accountNumLotsOverLimitSpam(0),
+		m_accountMaxLotsAdjustment(0),
+		m_accountIsOutcast(false),
+		m_accountCheaterLevel(0.0f),
+		m_draftSchematics(),
+		m_experiencePoints(),
+		m_expModified(0),
+		m_maxForcePower(0),
+		m_forcePower(0),
+		m_forceRegenRate(0),
+		m_forceRegenValue(0),
+		m_craftingLevel(0),
+		m_experimentPoints(8),
+		m_craftingStage(static_cast<int>(Crafting::CS_none)),
+		m_craftingTool(),
+		m_craftingStation(),
+		m_craftingComponentBioLink(),
+		m_useableDraftSchematics(),
+		m_draftSchematic(NULL),
+		m_matchMakingPersonalProfileId(),
+		m_matchMakingCharacterProfileId(),
+		m_friendList(),
+		m_ignoreList(),
+		m_skillTitle(),
+		m_spokenLanguage(GameLanguageManager::getBasicLanguageId()),
+		m_waypoints(),
+		m_groupWaypoints(),
+		m_bornDate(0),
+		m_playedTime(0),
+		m_playedTimeAccum(0),
+		m_sessionStartPlayTime(0),
+		m_sessionLastActiveTime(0),
+		m_sessionActivePlayTimeDuration(0),
+		m_food(0),
+		m_maxFood(100),
+		m_drink(0),
+		m_maxDrink(100),
+		m_meds(0),
+		m_maxMeds(100),
+		m_privledgedTitle(static_cast<int8>(PlayerDataPriviledgedTitle::NormalPlayer)),
+		m_completedQuests(),
+		m_activeQuests(),
+		m_currentQuest(0),
+		m_theaterDatatable(),
+		m_theaterPosition(),
+		m_theaterScene(),
+		m_theaterScript(),
+		m_theaterNumObjects(),
+		m_theaterRadius(),
+		m_theaterCreator(),
+		m_theaterName(),
+		m_theaterId(),
+		m_theaterLocationType(IntangibleObject::TLT_getGoodLocation),
+		m_roleIconChoice(0),
+		m_aggroImmuneDuration(0),
+		m_aggroImmuneStartTime(0),
+		m_chatLog(new ChatLog),
+		m_chatLogPurgeTime(0),
+		m_isUnsticking(false),
+		m_pendingRequestQuestCrc(0),
+		m_pendingRequestQuestGiver(NetworkId::cms_invalid),
+		m_skillTemplate(),
+		m_workingSkill(),
+		m_isFromLogin(true),
+		m_currentGcwPoints(0),
+		m_currentGcwRating(-1),
+		m_currentPvpKills(0),
+		m_lifetimeGcwPoints(0),
+		m_maxGcwImperialRating(-1),
+		m_maxGcwRebelRating(-1),
+		m_lifetimePvpKills(0),
+		m_nextGcwRatingCalcTime(0),
+		m_currentGcwRank(0),
+		m_currentGcwRankProgress(0.0f),
+		m_maxGcwImperialRank(0),
+		m_maxGcwRebelRank(0),
+		m_gcwRatingActualCalcTime(0),
+		m_playerHateList(),
+		m_sessionActivity(0),
+		m_killMeter(0),
+		m_killMeterRemainder(0.0f),
+		m_petId(NetworkId::cms_invalid),
+		m_petCommandList(0),
+		m_petToggledCommands(0),
+		m_collections(),
+		m_collections2(),
+		m_chatSpamSpatialNumCharacters(0),
+		m_chatSpamNonSpatialNumCharacters(0),
+		m_chatSpamTimeEndInterval(0),
+		m_chatSpamNextTimeToSyncWithChatServer(0),
+		m_chatSpamNextTimeToNotifyPlayerWhenLimited(0),
+		m_citizenshipCity(),
+		m_citizenshipType(static_cast<int8>(CityDataCitizenType::NotACitizen)),
+		m_currentGcwRegion(),
+		m_cityGcwDefenderRegion(std::make_pair(std::string(), std::make_pair(false, false))),
+		m_guildGcwDefenderRegion(std::make_pair(std::string(), std::make_pair(false, false))),
+		m_squelchedById(NetworkId::cms_invalid),
+		m_squelchedByName(),
+		m_squelchExpireTime(0),
+		m_showBackpack(true),
+		m_showHelmet(true),
+		m_environmentFlags(0),
+		m_defaultAttackOverride(),
+		m_guildRank(),
+		m_citizenRank(),
+		m_pickupDropAllItemsOperationId(0),
+		m_pickupDropAllItemsCellId(NetworkId::cms_invalid),
+		m_pickupAllItemsAllowInventoryOverload(false),
+		m_pickupDropAllItemsNumItemsSoFar(0),
+		m_pickupDropAllItemsProcessedItemsSoFar(),
+		m_restoreDecorationOperationId(0),
+		m_restoreDecorationPobId(NetworkId::cms_invalid),
+		m_restoreDecorationObjectBeingRestored(NetworkId::cms_invalid),
+		m_restoreDecorationTotalCount(0),
+		m_restoreDecorationAttemptedCount(0),
+		m_restoreDecorationSuccessCount(0),
+		m_restoreDecorationLayoutList(),
+		m_galacticReserveDeposit(0),
+		m_pgcRatingCount(0),
+		m_pgcRatingTotal(0),
+		m_pgcLastRatingTime(0)
+{
+	m_allCollections[0] = &m_collections;
+	m_allCollections[1] = &m_collections2;
+
+	addMembersToPackages();
+	m_waypoints.setOnInsert(this, &PlayerObject::onWaypointCreated);
+	m_waypoints.setOnSet(this, &PlayerObject::onWaypointSet);
+	m_waypoints.setOnErase(this, &PlayerObject::onWaypointRemoved);
+	IGNORE_RETURN(s_allPlayerObjects.insert(this));
+}
+
+//-----------------------------------------------------------------------
+
+PlayerObject::~PlayerObject()
+{
+	delete m_callback;
+	delete m_chatLog;
+	IGNORE_RETURN(s_allPlayerObjects.erase(this));
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a shared template if none was given for this object.
+ *
+ * @return the shared template
+ */
+const SharedObjectTemplate * PlayerObject::getDefaultSharedTemplate() const
+{
+static const ConstCharCrcLowerString templateName("object/player/base/shared_player_default.iff");
+
+	if (m_defaultSharedTemplate == NULL)
+	{
+		m_defaultSharedTemplate = safe_cast<const SharedObjectTemplate *>(
+			ObjectTemplateList::fetch(templateName));
+		WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create "
+			"default shared object template %s", templateName.getString()));
+		if (m_defaultSharedTemplate != NULL)
+			ExitChain::add (removeDefaultTemplate, "PlayerObject::removeDefaultTemplate");
+	}
+	return m_defaultSharedTemplate;
+}	// PlayerObject::getDefaultSharedTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Cleans up the default shared template.
+ */
+void PlayerObject::removeDefaultTemplate()
+{
+	if (m_defaultSharedTemplate != NULL)
+	{
+		m_defaultSharedTemplate->releaseReference();
+		m_defaultSharedTemplate = NULL;
+	}
+}	// PlayerObject::removeDefaultTemplate
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setStationId(StationId account)
+{
+	DEBUG_FATAL(!isAuthoritative(),("PlayerObject %s wasn't authoritative in setStationId.\n",getNetworkId().getValueString().c_str()));
+	m_stationId=account;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setCheaterLevel(float level)
+{
+	m_accountCheaterLevel = level;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the current "birth" date. The birth date is defined as the number
+ * of days since Jan 1st, 2001 (Jan 1st, 2001 = 0)
+ */
+int PlayerObject::getCurrentBornDate()
+{
+	// get the base date of Jan 1st, 2001
+	struct tm baseTimeData;
+	baseTimeData.tm_hour = 0;
+	baseTimeData.tm_isdst = 0;
+	baseTimeData.tm_mday = 1;
+	baseTimeData.tm_min = 0;
+	baseTimeData.tm_mon = 0;
+	baseTimeData.tm_sec = 0;
+	baseTimeData.tm_wday = 0;
+	baseTimeData.tm_yday = 0;
+	baseTimeData.tm_year = 101;
+	time_t baseTime = mktime(&baseTimeData);
+
+	// get the current time and compute the birth date
+	time_t currentTime = time(NULL);
+	time_t delta = (currentTime - baseTime) / (60 * 60 * 24);
+	delta += ((currentTime - baseTime) % (60 * 60 * 24) != 0 ? 1 : 0);
+	return int(delta);
+}	// PlayerObject::getCurrentBornDate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the "birth" date of the player to the current date. The birth date is
+ * defined as the number of days since Jan 1st, 2001 (Jan 1st, 2001 = 0)
+ */
+void PlayerObject::setBornDate()
+{
+	if (m_bornDate.get() != 0)
+		return;
+
+	if (isAuthoritative())
+	{
+		m_bornDate = (int)getCurrentBornDate();
+	}
+	else
+	{
+		WARNING(true, ("PlayerObject::setBornDate called on non-authoritative player"));
+	}
+}	// PlayerObject::setBornDate
+
+//-----------------------------------------------------------------------
+
+/**
+* Adjust the "birth" date of the player by the specified number of days
+*
+* @param adjustment		the number of days (can be negative) to adjust the "birth" date by
+*/
+void PlayerObject::adjustBornDate(int adjustment)
+{
+	if (m_bornDate.get() == 0)
+		return;
+
+	if (isAuthoritative())
+	{
+		const int newBornDate = m_bornDate.get() + adjustment;
+		if ((newBornDate <= 0) || (newBornDate > getCurrentBornDate()))
+			return;
+
+		m_bornDate = newBornDate;
+	}
+	else
+	{
+		WARNING(true, ("PlayerObject::adjustBornDate called on non-authoritative player"));
+	}
+}	// PlayerObject::adjustBornDate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Changes the count of the amount of time this player has been online. Note we only
+ * update the time every 30 secs.
+ *
+ * @param time since last call to this function
+ */
+void PlayerObject::alterPlayedTime(float time)
+{
+static const float TIME_LIMIT = 30.0f;
+
+	if (isAuthoritative())
+	{
+		m_playedTimeAccum += time;
+		if (m_playedTimeAccum >= TIME_LIMIT)
+		{
+			m_playedTime = m_playedTime.get() + static_cast<uint32>(TIME_LIMIT);
+			m_playedTimeAccum -= TIME_LIMIT;
+		}
+	}
+	else
+	{
+		WARNING(true, ("PlayerObject::alterPlayedTime called on non-authoritative player"));
+	}
+}	// updatePlayedTime
+
+//-----------------------------------------------------------------------
+
+CreatureObject *PlayerObject::getCreatureObject()
+{
+	Object * const owner = ContainerInterface::getContainedByObject(*this);
+	if (owner)
+	{
+		ServerObject * const serverOwner = owner->asServerObject();
+		if (serverOwner)
+			return serverOwner->asCreatureObject();
+	}
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+CreatureObject const * PlayerObject::getCreatureObject() const
+{
+	Object const * const owner = ContainerInterface::getContainedByObject(*this);
+	if (owner)
+	{
+		ServerObject const * const serverOwner = owner->asServerObject();
+		if (serverOwner)
+			return serverOwner->asCreatureObject();
+	}
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::virtualOnSetAuthority()
+{
+	IntangibleObject::virtualOnSetAuthority();
+
+	if (isCrafting())
+	{
+		const TangibleObject * tool = safe_cast<TangibleObject *>(getCraftingTool().getObject());
+		if (tool != NULL)
+		{
+			const ManufactureSchematicObject * manfSchematic = tool->getCraftingManufactureSchematic();
+			if (manfSchematic != NULL)
+			{
+				m_draftSchematic = DraftSchematicObject::getSchematic(
+					manfSchematic->getDraftSchematic());
+				if (m_draftSchematic.getPointer() == NULL)
+				{
+					WARNING(true, ("PlayerObject::virtualOnSetAuthority object "
+						"%s is flagged as crafting, but has bad manf schematic %lu",
+						getNetworkId().getValueString().c_str(),
+						manfSchematic->getDraftSchematic()));
+				}
+			}
+			else
+			{
+				WARNING(true, ("PlayerObject::virtualOnSetAuthority object "
+					"%s is flagged as crafting, but has no manf schematic",
+					getNetworkId().getValueString().c_str()));
+			}
+		}
+		else
+		{
+			WARNING(true, ("PlayerObject::virtualOnSetAuthority object "
+				"%s is flagged as crafting, but has no crafting tool",
+				getNetworkId().getValueString().c_str()));
+		}
+	}
+
+	GroupWaypointBuilder::updateGroupWaypoints(*this, true);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::virtualOnLogout()
+{
+	IntangibleObject::virtualOnLogout();
+
+	// stop crafting
+	if (isCrafting())
+		stopCrafting(false);
+
+	// destroy any theater associated with us
+	if (m_theaterId.get() != NetworkId::cms_invalid)
+	{
+		MessageToQueue::getInstance().sendMessageToC(m_theaterId.get(),
+			"C++DestroySelf", "", 0, false);
+		m_theaterId = NetworkId::cms_invalid;
+	}
+
+	// persist chat statistics
+	setObjVarItem(OBJVAR_CHAT_SPAM_TIME_END_INTERVAL, m_chatSpamTimeEndInterval.get());
+	setObjVarItem(OBJVAR_CHAT_SPAM_SPATIAL, m_chatSpamSpatialNumCharacters.get());
+	setObjVarItem(OBJVAR_CHAT_SPAM_NON_SPATIAL, m_chatSpamNonSpatialNumCharacters.get());
+
+	// persist privileged title
+	if (m_privledgedTitle.get() != static_cast<int8>(PlayerDataPriviledgedTitle::NormalPlayer))
+		setObjVarItem(OBJVAR_PRIVILEGED_TITLE, static_cast<int>(m_privledgedTitle.get()));
+	else
+		removeObjVarItem(OBJVAR_PRIVILEGED_TITLE);
+
+	// persist squelch info
+	int const secondsUntilUnsquelched = getSecondsUntilUnsquelched();
+	if (secondsUntilUnsquelched != 0)
+	{
+		setObjVarItem(OBJVAR_SQUELCH_ID, m_squelchedById.get());
+		setObjVarItem(OBJVAR_SQUELCH_NAME, m_squelchedByName.get());
+		if (secondsUntilUnsquelched < 0)
+			setObjVarItem(OBJVAR_SQUELCH_EXPIRE, -1);
+		else
+			setObjVarItem(OBJVAR_SQUELCH_EXPIRE, static_cast<int>(ServerClock::getInstance().getGameTimeSeconds()) + secondsUntilUnsquelched);
+	}
+	else
+	{
+		removeObjVarItem(OBJVAR_SQUELCH_ID);
+		removeObjVarItem(OBJVAR_SQUELCH_NAME);
+		removeObjVarItem(OBJVAR_SQUELCH_EXPIRE);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+int PlayerObject::getExperiencePoints(const std::string & experienceType) const
+{
+	int result = 0;
+	std::map<std::string, int>::const_iterator f = m_experiencePoints.find(experienceType);
+	if(f != m_experiencePoints.end())
+	{
+		result = (*f).second;
+	}
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+const std::map<std::string, int> & PlayerObject::getExperiencePoints() const
+{
+	return m_experiencePoints.getMap();
+}
+
+// ----------------------------------------------------------------------
+
+int PlayerObject::getExperienceLimit(const std::string & experienceType) const
+{
+	uint32 limit = static_cast<uint32>(-1);
+	CreatureObject const * const owner = getCreatureObject();
+
+	if(owner)
+	{
+		// find out the xp limit based on the player's skills
+		const CreatureObject::SkillList & skills = owner->getSkillList();
+		for (CreatureObject::SkillList::const_iterator iter = skills.begin();
+			iter != skills.end(); ++iter)
+		{
+			if((*iter))
+			{
+				const SkillObject::ExperiencePair * xpInfo = (*iter)->getPrerequisiteExperience();
+				if (xpInfo != NULL && experienceType == xpInfo->first && xpInfo->second.second > 0)
+				{
+					if (limit == static_cast<uint32>(-1) ||
+						limit < static_cast<uint32>(xpInfo->second.second))
+					{
+						limit = xpInfo->second.second;
+					}
+				}
+			}
+		}
+		if (limit == static_cast<uint32>(-1))
+		{
+			// use the default limit
+			limit = SkillManager::getInstance().getDefaultXpLimit(experienceType);
+			WARNING(limit == static_cast<uint32>(-1), ("No default xp limit defined "
+				"for xp type %s for player object %s", experienceType.c_str(), getNetworkId().getValueString().c_str()));
+		}
+	}
+
+	WARNING(limit == static_cast<uint32>(-1), ("No xp limit defined "
+			"for xp type %s for player object %s", experienceType.c_str(), getNetworkId().getValueString().c_str()));
+
+	return limit;
+}
+
+// ----------------------------------------------------------------------
+
+int PlayerObject::grantExperiencePoints(const std::string & experienceType, int amount)
+{
+	CreatureObject * const owner = getCreatureObject();
+	NOT_NULL(owner);
+
+	int amountGranted = amount;
+
+	if(isAuthoritative())
+	{
+		if (amount > 0)
+		{
+			int multiplier = 1;
+
+			if (!getObjVars().getItem(OBJVAR_EXPERIENCE_MULTIPLIER, multiplier))
+				multiplier = ConfigServerGame::getXpMultiplier();
+
+			amount *= multiplier;
+
+			// adjust the xp based on what faction is doing best
+			// NOTE: HACK HACK HACK!
+			const PlanetObject * tatooine = ServerUniverse::getInstance().getTatooinePlanet();
+			if (tatooine == NULL)
+				tatooine = ServerUniverse::getInstance().getPlanetByName("Tatooine");
+			if (tatooine == NULL)
+			{
+				WARNING(true, ("Can't find planet tatooine from ServerUniverse"));
+			}
+			else
+			{
+				std::string factionName;
+				int factionPoints = 0;
+				bool tie = false;
+				const DynamicVariableList::NestedList factions(tatooine->getObjVars(),
+					OBJVAR_GAME_FACTION_RANKINGS);
+				for (DynamicVariableList::NestedList::const_iterator i(factions.begin());
+					i != factions.end(); ++i)
+				{
+					int points = 0;
+					if (i.getValue(points))
+					{
+						if (points > factionPoints)
+						{
+							tie = false;
+							factionPoints = points;
+							factionName = i.getName();
+						}
+						else if (points == factionPoints)
+							tie = true;
+					}
+					else
+					{
+						WARNING(true, ("GCW faction %s value not stored as int",
+							i.getName().c_str()));
+					}
+				}
+				if (!tie && factionPoints > 0)
+				{
+					uint32 factionCrc = Crc::calculate(factionName.c_str());
+					if (factionCrc == owner->getPvpFaction())
+					{
+						amount += static_cast<int>(amount * ConfigServerGame::getGcwXpBonus());
+					}
+				}
+			}
+
+		}
+
+		// find out the xp limit based on the player's skills
+		int const limit = getExperienceLimit(experienceType);
+
+		// get the current xp
+		int const current = getExperiencePoints(experienceType);
+
+		// calculate the new xp
+		int total = current + amount;
+
+		// cap the total xp, if necessary
+		if ((total > limit) && (limit >= 0))
+			total = limit;
+
+		if (ConfigServerScript::getLogBalance() && (total != current))
+		{
+			// log the grant
+			unsigned long time = ServerClock::getInstance().getGameTimeSeconds();
+			LOG("GameBalance", ("balancelog:%d:XP;%lu;%s;%s;%d;%d;%d;%d",
+				static_cast<int>(GameServer::getInstance().getProcessId()), time,
+				owner->getNetworkId().getValueString().c_str(), experienceType.c_str(),
+				amount, current, total, (m_expModified.get()+1)));
+		}
+
+		// calculate the actual xp granted
+		amountGranted = total - current;
+
+		// only update the XP if it actually changed
+		if (total != current)
+		{
+			m_experiencePoints.set(experienceType, total);
+			m_expModified.set(m_expModified.get() + 1);
+		}
+	}
+	else
+	{
+		owner->sendControllerMessageToAuthServer(CM_grantExperiencePoints, new MessageQueueGenericValueType<std::pair<std::string, int> >(std::make_pair(experienceType, amount)));
+	}
+
+	return amountGranted;
+}
+
+//-----------------------------------------------------------------------
+
+bool PlayerObject::grantSchematicGroup(const std::string & groupNameWithModifier, bool fromSkill)
+{
+	if (groupNameWithModifier.size() <= 1 || (groupNameWithModifier[0] != '+' && groupNameWithModifier[0] != '-'))
+		return true;
+
+	if (isAuthoritative())
+	{
+		const std::string & groupName = groupNameWithModifier.substr (1);
+		static DraftSchematicGroupManager::SchematicVector drafts;
+		drafts.clear ();
+		if (!DraftSchematicGroupManager::getSchematicsForGroup (groupName, drafts))
+		{
+			WARNING (true, ("Invalid schematic group [%s]", groupName.c_str ()));
+			return false;
+		}
+
+		const bool addGroup = (groupNameWithModifier[0] == '+');
+
+		for (DraftSchematicGroupManager::SchematicVector::const_iterator it = drafts.begin (); it != drafts.end (); ++it)
+		{
+			const std::pair<uint32, uint32> & schematic = *it;
+			if (addGroup)
+				grantSchematic(schematic.first, fromSkill);
+			else
+				revokeSchematic(schematic.first, fromSkill);
+		}
+	}
+	else
+	{
+		WARNING_STRICT_FATAL(true, ("Did not assign schematic group to proxy object %s", getNetworkId().getValueString().c_str()));
+	}
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+bool PlayerObject::grantSchematic(uint32 schematicCrc, bool fromSkill)
+{
+	if (isAuthoritative())
+	{
+		// if we are crafting, end the crafting session
+		if (isCrafting())
+			stopCrafting(false);
+
+		const DraftSchematicObject * schematic = DraftSchematicObject::getSchematic(
+			schematicCrc);
+		if (schematic != NULL)
+		{
+			// add the schematic to the player's draft schematic list
+			Archive::AutoDeltaMap<std::pair<uint32, uint32>, int>::const_iterator found = m_draftSchematics.find(schematic->getCombinedCrc());
+			if (found == m_draftSchematics.end())
+			{
+				m_draftSchematics.set(schematic->getCombinedCrc(), 1);
+				CreatureObject * owner = dynamic_cast<CreatureObject *>(ContainerInterface::getContainedByObject(*this));
+				NOT_NULL(owner);
+				if (!fromSkill)
+				{
+					// save schematic as objvar
+					char buffer[256];
+					sprintf(buffer, "%s.%lu", OBJVAR_NOT_SKILL_SCHEMATICS.c_str(),
+						schematicCrc);
+					owner->setObjVarItem(buffer, 1);
+				}
+
+				// tell scripts the schematic was given
+				NOT_NULL(owner->getScriptObject());
+				ScriptParams params;
+				params.addParam(static_cast<int>(schematic->getCombinedCrc().first));
+				params.addParam(fromSkill);
+				IGNORE_RETURN(owner->getScriptObject()->trigAllScripts(
+					Scripting::TRIG_GRANT_SCHEMATIC, params));
+			}
+			else if (fromSkill)
+			{
+				m_draftSchematics.set(schematic->getCombinedCrc(), (*found).second + 1);
+			}
+		}
+	}
+	else
+	{
+		WARNING_STRICT_FATAL(true, ("Did not assign schematic to proxy object %s", getNetworkId().getValueString().c_str()));
+	}
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+bool PlayerObject::revokeSchematic(uint32 schematicCrc, bool fromSkill)
+{
+	if (isAuthoritative())
+	{
+		// if we are crafting, end the crafting session
+		if (isCrafting())
+			stopCrafting(false);
+
+		const DraftSchematicObject * schematic = DraftSchematicObject::getSchematic(schematicCrc);
+		if (schematic != NULL)
+		{
+			// remove the schematic from the player's draft schematic list
+			Archive::AutoDeltaMap<std::pair<uint32, uint32>, int>::const_iterator found = m_draftSchematics.find(schematic->getCombinedCrc());
+			if ((*found).second > 1 && fromSkill)
+			{
+				m_draftSchematics.set(schematic->getCombinedCrc(), (*found).second - 1);
+			}
+			else
+			{
+				WARNING((*found).second > 1, ("PlayerObject::revokeSchematic revoking schematic %s that has a ref count of %d from player %s, due to it being revoked outside the skill system",
+					schematic->getObjectTemplateName(), (*found).second, getAccountDescription().c_str()));
+				m_draftSchematics.erase(found);
+				CreatureObject * owner = dynamic_cast<CreatureObject *>(ContainerInterface::getContainedByObject(*this));
+				NOT_NULL(owner);
+				if (!fromSkill)
+				{
+					// remove schematic from objvars
+					char buffer[256];
+					sprintf(buffer, "%s.%lu", OBJVAR_NOT_SKILL_SCHEMATICS.c_str(),
+						schematicCrc);
+					owner->removeObjVarItem(buffer);
+				}
+
+				// tell scripts the schematic was removed
+				NOT_NULL(owner->getScriptObject());
+				ScriptParams params;
+				params.addParam(static_cast<int>(schematic->getCombinedCrc().first));
+				params.addParam(fromSkill);
+				IGNORE_RETURN(owner->getScriptObject()->trigAllScripts(
+					Scripting::TRIG_REVOKE_SCHEMATIC, params));
+			}
+		}
+	}
+	else
+	{
+		WARNING_STRICT_FATAL(true, ("Did not remove schematic from proxy object %s", getNetworkId().getValueString().c_str()));
+	}
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+bool PlayerObject::hasSchematic(uint32 schematicCrc)
+{
+	const DraftSchematicObject * schematic = DraftSchematicObject::getSchematic(schematicCrc);
+	if (schematic != NULL)
+	{
+		std::map<std::pair<uint32, uint32>,int>::const_iterator found = m_draftSchematics.find(schematic->getCombinedCrc());
+		if (found != m_draftSchematics.end())
+			return true;
+	}
+	return false;
+}
+
+
+// ======================================================================
+// ======================================================================
+//
+// Crafting functions
+//
+// ======================================================================
+// ======================================================================
+
+/**
+ * Sets the player's crafting tool.
+ *
+ * @param tool		the crafting tool
+ */
+void PlayerObject::setCraftingTool(const TangibleObject & tool)
+{
+	m_craftingTool = CachedNetworkId(tool);
+}	// PlayerObject::setCraftingTool
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the player's crafting station.
+ *
+ * @param station		the crafting station
+ */
+void PlayerObject::setCraftingStation(const TangibleObject * station)
+{
+	if (station != NULL)
+	{
+		// verify the crafting station is valid
+		if (station->getObjVars().hasItem(OBJVAR_CRAFTING_STATION))
+		{
+			m_craftingStation = CachedNetworkId(*station);
+
+			// if we are private, make sure we have an ingredient hopper
+			int privateStation = 0;
+			station->getObjVars().getItem(OBJVAR_PRIVATE_STATION, privateStation);
+			if (privateStation == 1 && getCraftingLevel() == 3 && station->getIngredientHopper() == NULL)
+			{
+				CreatureObject * const owner = getCreatureObject();
+				NOT_NULL(owner);
+
+				WARNING(true, ("Player %s crafting near private station %s that "
+					"has no ingredient hopper! The crafting session level will "
+					"be reduced to 2",
+					owner->getNetworkId().getValueString().c_str(),
+					station->getNetworkId().getValueString().c_str()));
+				setCraftingLevel(2);
+			}
+			return;
+		}
+	}
+	m_craftingStation = CachedNetworkId::cms_cachedInvalid;
+}	// PlayerObject::setCraftingStation
+
+//-----------------------------------------------------------------------
+
+/**
+ * Called when the player wants to start crafting.
+ *
+ * @param toolId	the crafting tool the player wants to use
+ *
+ * @return true if the session was started, false if not
+ */
+bool PlayerObject::requestCraftingSession(const NetworkId & toolId)
+{
+	CreatureObject * const owner = getCreatureObject();
+	if (owner == NULL)
+		return false;
+
+	const std::string myId        = getNetworkId().getValueString();
+	const char * const myIdString = myId.c_str();
+	UNREF(myIdString);		// needed for release mode
+
+	const std::string toolIdStdString = toolId.getValueString();
+	const char * const toolIdString   = toolIdStdString.c_str();
+	UNREF(toolIdString);		// needed for release mode
+
+	if (getCraftingTool() != NetworkId::cms_invalid)
+	{
+		if (m_craftingStage.get() == Crafting::CS_none ||
+			m_craftingStage.get() == Crafting::CS_selectDraftSchematic)
+		{
+			stopCrafting(false);
+		}
+		else
+		{
+			DEBUG_WARNING(true, ("Player %s requesting crafting session with tool "
+				"%s while crafting with tool %s", myIdString, toolIdString,
+				getCraftingTool().getValueString().c_str()));
+			return false;
+		}
+	}
+
+	TangibleObject * const tool = dynamic_cast<TangibleObject *>(CachedNetworkId(toolId).getObject());
+	if (tool == NULL)
+	{
+		DEBUG_WARNING(true, ("Player %s requesting crafting session with invalid "
+			"object %s", myIdString, toolIdString));
+		return false;
+	}
+
+	// If the tool is a crafting station, try to find a compatible crafting tool to launch.
+	if (tool->isCraftingStation())
+	{
+		int const toolType = tool->getCraftingType();
+
+		ServerObject const * const inventory = owner->getInventory();
+		if (inventory)
+		{
+			VolumeContainer const * const inventoryContainer = ContainerInterface::getVolumeContainer(*inventory);
+			if (inventoryContainer)
+			{
+				std::vector<Unicode::String> objList;
+				for (ContainerConstIterator iter(inventoryContainer->begin()); iter != inventoryContainer->end(); ++iter)
+				{
+					CachedNetworkId const & objId = (*iter);
+					TangibleObject * const obj = safe_cast<TangibleObject *>(objId.getObject());
+					if ((obj != NULL) && obj->isCraftingTool() && (toolType & obj->getCraftingType()))
+					{
+						return requestCraftingSession(objId) ;
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+	return tool->startCraftingSession(*owner);
+	}
+
+	return false;
+}	// PlayerObject::requestCraftingSession
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sends a list of draft schematic names that a player may craft with to the
+ * player.
+ *
+ * @param schematicNames		draft schematic template names the player can use
+ */
+void PlayerObject::sendUseableDraftSchematics(std::vector<uint32> & schematicNames)
+{
+	CreatureObject * const owner = getCreatureObject();
+	if (owner == NULL)
+		return;
+
+	// keep around the names since we are just going to get an index back from
+	// the client; the calling function will free up the old names
+	m_useableDraftSchematics.swap(schematicNames);
+
+	MessageQueueDraftSchematics * message = new MessageQueueDraftSchematics(getCraftingTool(), getCraftingStation());
+
+	// get the name of each schematic and put it in the network message
+	std::vector<uint32>::iterator iter;
+	for (iter = m_useableDraftSchematics.begin(); iter != m_useableDraftSchematics.end();)
+	{
+		if (*iter != 0)
+		{
+			const DraftSchematicObject * const schematic = DraftSchematicObject::getSchematic(*iter);
+			if (schematic != NULL)
+			{
+				message->addSchematic(schematic->getCombinedCrc(),
+					static_cast<int>(schematic->getCategory()));
+				++iter;
+			}
+			else
+			{
+				const ConstCharCrcString & name = ObjectTemplateList::lookUp(*iter);
+				if (!name.isEmpty())
+				{
+					WARNING(true, ("PlayerObject::sendUseableDraftSchematics bad draft "
+						"schematic name %s", name.getString()));
+				}
+				else
+				{
+					WARNING(true, ("PlayerObject::sendUseableDraftSchematics bad draft "
+						"schematic crc %u", *iter));
+				}
+				iter = m_useableDraftSchematics.erase(iter);
+			}
+		}
+		else
+			iter = m_useableDraftSchematics.erase(iter);
+	}
+
+	// send the names to the player
+	(safe_cast<ServerController *>(owner->getController()))->appendMessage(
+		static_cast<int>(CM_draftSchematicsMessage), 0.0f, message,
+		GameControllerMessageFlags::SEND |
+		GameControllerMessageFlags::RELIABLE |
+		GameControllerMessageFlags::DEST_AUTH_CLIENT);
+
+	m_craftingStage = static_cast<int>(Crafting::CS_selectDraftSchematic);
+}	// PlayerObject::sendUseableDraftSchematics
+
+//----------------------------------------------------------------------
+
+/**
+ * Sends the player info about a draft schematic's slots, filtered by the
+ * player's skills.
+ *
+ * @param draftSchematicCrc  	the crc of the schematic to send
+ * @param message				message to be sent to the player if we are getting slots for an object we are crafting
+ * @param queryMessage			message to be sent to the player if we are getting slots for an arbitrary object
+ *
+ * @return true on success, false if draftSchematicName is not a valid schematic
+ */
+bool PlayerObject::requestDraftSlots(uint32 draftSchematicCrc, MessageQueueDraftSlots * message, MessageQueueDraftSlotsQueryResponse * queryMessage)
+{
+	ManufactureSchematicObject * manfSchematic = NULL;
+	MessageQueueDraftSlots::Slot slotInfo;
+	MessageQueueDraftSlots::Option optionInfo;
+
+	if ((message == NULL && queryMessage == NULL) ||
+		(message != NULL && queryMessage != NULL))
+	{
+		return false;
+	}
+
+	CreatureObject * const owner = getCreatureObject();
+	if (owner == NULL)
+		return false;
+
+	const ConstCharCrcString & schematicName = ObjectTemplateList::lookUp(draftSchematicCrc);
+	UNREF(schematicName);
+
+	const DraftSchematicObject * const draftSchematic = DraftSchematicObject::getSchematic(draftSchematicCrc);
+	if (draftSchematic == NULL)
+	{
+		DEBUG_WARNING(true, ("Player %s requested invalid draft schematic %s", owner->getNetworkId().getValueString().c_str(), schematicName.getString()));
+		return false;
+	}
+
+	if (message != NULL)
+	{
+		m_draftSchematic = draftSchematic;
+
+		TangibleObject * const tool = safe_cast<TangibleObject *>(getCraftingTool().getObject());
+		NOT_NULL(tool);
+		if (tool == NULL)
+			return false;
+
+		tool->clearCraftingManufactureSchematic();
+		tool->clearCraftingPrototype();
+
+		// make a temporary manufacturing schematic based on the draft scematic
+		manfSchematic = ServerWorld::createNewManufacturingSchematic(CachedNetworkId(
+			*owner), *tool, tool->getCraftingManufactureSchematicSlotId(), false);
+		if (manfSchematic == NULL)
+		{
+			DEBUG_WARNING(true, ("Error creating manufacturing schematic!"));
+			return false;
+		}
+		message->setManfSchemId(manfSchematic->getNetworkId ());
+		tool->setCraftingManufactureSchematic(*manfSchematic);
+
+		// flag that the schematic is being used in a crafting session
+		manfSchematic->setObjVarItem(OBJVAR_IN_CRAFTING_SESSION, 1);
+
+		// reset the experiment points
+		m_experimentPoints = -1;
+
+		// create a test prototype so the client will know what object is
+		// being made
+		ServerObject * prototype = manfSchematic->manufactureObject(owner->getNetworkId(),
+			*tool, tool->getCraftingPrototypeSlotId(), true);
+		if (prototype == NULL)
+		{
+			DEBUG_WARNING(true, ("Error creating temp prototype!"));
+			return false;
+		}
+		tool->setCraftingPrototype(*prototype);
+		message->setPrototypeId(prototype->getNetworkId());
+		message->setVolume(draftSchematic->getVolume());
+		message->setCanManufacture(draftSchematic->getItemsPerContainer() > 0);
+
+		DEBUG_LOG("crafting", ("PlayerObject::requestDraftSlots, created schematic "
+			"%s, prototype %s for player %s",
+			manfSchematic->getNetworkId().getValueString().c_str(),
+			prototype->getNetworkId().getValueString().c_str(),
+			getAccountDescription().c_str()));
+	}
+
+	if (queryMessage != NULL)
+	{
+		queryMessage->setComplexity(static_cast<int>(draftSchematic->getComplexity()));
+		queryMessage->setVolume(draftSchematic->getVolume());
+		queryMessage->setCanManufacture(draftSchematic->getItemsPerContainer() > 0);
+	}
+
+	// get info about each slot in the schematic
+	Crafting::IngredientSlot manfSlot;
+	ServerDraftSchematicObjectTemplate::IngredientSlot slot;
+	const int slotCount = draftSchematic->getSlotsCount();
+	for (int i = 0; i < slotCount; ++i)
+	{
+		if (!draftSchematic->getSlot(slot, i))
+		{
+			DEBUG_WARNING(true, ("draft schematic slot %d for schematic %s not found!",i, schematicName.getString()));
+			continue;
+		}
+		if (!slot.optional || slot.optionalSkillCommand.empty() ||
+			owner->hasCommand(slot.optionalSkillCommand))
+		{
+			if (manfSchematic != NULL)
+			{
+				// create the slot
+				IGNORE_RETURN(manfSchematic->getSlot(slot.name, manfSlot));
+				// set the manufacturing slot->draft slot map
+				manfSchematic->setSlotIndex(slot.name, i);
+			}
+
+			slotInfo.name = slot.name;
+			slotInfo.optional = slot.optional;
+			bool componentSlot = false;
+			const int optionsCount = static_cast<int>(slot.options.size());
+			for (int j = 0; j < optionsCount; ++j)
+			{
+				const ServerIntangibleObjectTemplate::Ingredient & option = slot.options[static_cast<unsigned int>(j)];
+
+				if (option.skillCommand.empty() || owner->hasCommand(option.skillCommand))
+				{
+					const ServerIntangibleObjectTemplate::SimpleIngredient & simple = option.ingredients[0];
+
+					switch (option.ingredientType)
+					{
+					case Crafting::IT_template:
+					case Crafting::IT_templateGeneric:
+						{
+							// get the default object name from the shared template
+							const ObjectTemplate *const ingredientTemplate = ObjectTemplateList::fetch(simple.ingredient);
+							if (ingredientTemplate == NULL)
+							{
+								DEBUG_WARNING(true, ("draft schematic component ingredient %s not found!", simple.ingredient.c_str()));
+								continue;
+							}
+							const SharedObjectTemplate * const sharedTemplate = safe_cast<const SharedObjectTemplate *>(ObjectTemplateList::fetch((safe_cast<const ServerObjectTemplate *>(ingredientTemplate))->getSharedTemplate()));
+							if (sharedTemplate == NULL)
+							{
+								DEBUG_WARNING(true, ("draft schematic component ingredient %s shared template not found!", simple.ingredient.c_str()));
+								continue;
+							}
+							optionInfo.ingredient = Unicode::narrowToWide(sharedTemplate->DataResource::getName());
+							sharedTemplate->releaseReference();
+							ingredientTemplate->releaseReference();
+						}
+						break;
+					case Crafting::IT_schematic:
+					case Crafting::IT_schematicGeneric:
+						{
+							// get the default object name from the shared template of the crafted object
+							const ObjectTemplate * const ingredientTemplate = ObjectTemplateList::fetch(simple.ingredient);
+							if (ingredientTemplate == NULL)
+							{
+								DEBUG_WARNING(true, ("draft schematic schematic ingredient %s not found!", simple.ingredient.c_str()));
+								continue;
+							}
+							const ServerObjectTemplate * const craftedTemplate = safe_cast<const ServerDraftSchematicObjectTemplate *>(ingredientTemplate)->getCraftedObjectTemplate();
+							if (craftedTemplate == NULL)
+							{
+								DEBUG_WARNING(true, ("draft schematic schematic ingredient %s not found!", simple.ingredient.c_str()));
+								continue;
+							}
+							const SharedObjectTemplate * const sharedTemplate = safe_cast<const SharedObjectTemplate *>(ObjectTemplateList::fetch((safe_cast<const ServerObjectTemplate *>(craftedTemplate))->getSharedTemplate()));
+							if (sharedTemplate == NULL)
+							{
+								DEBUG_WARNING(true, ("draft schematic component ingredient %s shared template not found!", simple.ingredient.c_str()));
+								continue;
+							}
+							optionInfo.ingredient = Unicode::narrowToWide(sharedTemplate->DataResource::getName());
+							sharedTemplate->releaseReference();
+							craftedTemplate->releaseReference();
+							ingredientTemplate->releaseReference();
+						}
+						break;
+					default:
+						optionInfo.ingredient = Unicode::narrowToWide(simple.ingredient);
+						break;
+					}
+					optionInfo.name = simple.name;
+					optionInfo.type = static_cast<Crafting::IngredientType>(static_cast<int>(option.ingredientType));
+					optionInfo.amountNeeded = simple.count;
+					slotInfo.options.push_back(optionInfo);
+					if (static_cast<int>(option.ingredientType) == static_cast<int>(Crafting::IT_template) ||
+						static_cast<int>(option.ingredientType) == static_cast<int>(Crafting::IT_templateGeneric) ||
+						static_cast<int>(option.ingredientType) == static_cast<int>(Crafting::IT_item) ||
+						static_cast<int>(option.ingredientType) == static_cast<int>(Crafting::IT_schematic) ||
+						static_cast<int>(option.ingredientType) == static_cast<int>(Crafting::IT_schematicGeneric))
+					{
+						componentSlot = true;
+					}
+				}	// if (hasCommand(option.skillCommand))
+			}	// for (int j = 0; j < optionsCount; ++j)
+			if (componentSlot)
+				slotInfo.hardpoint = slot.appearance;
+			if (message != NULL)
+				message->addSlot(slotInfo);
+			else
+				queryMessage->addSlot(slotInfo);
+			slotInfo.options.clear();
+		}	// if (hasCommand(slot.skillCommand))
+	}	// for (int i = 0; i < slotCount; ++i)
+
+	// send the slot info to the player
+	if (message != NULL)
+	{
+		(safe_cast<ServerController *>(owner->getController()))->appendMessage(
+			static_cast<int>(CM_draftSlotsMessage), 0.0f, message,
+			GameControllerMessageFlags::SEND |
+			GameControllerMessageFlags::RELIABLE |
+			GameControllerMessageFlags::DEST_AUTH_CLIENT);
+	}
+	else
+	{
+		(safe_cast<ServerController *>(owner->getController()))->appendMessage(
+			static_cast<int>(CM_draftSlotsQueryResponse), 0.0f, queryMessage,
+			GameControllerMessageFlags::SEND |
+			GameControllerMessageFlags::RELIABLE |
+			GameControllerMessageFlags::DEST_AUTH_CLIENT);
+	}
+	return true;
+}	// PlayerObject::requestDraftSlots
+
+//----------------------------------------------------------------------
+
+/**
+ * Called when a player has selected a draft schematic to use in a crafting
+ * tool. We send the player info about the slots that need to be filled
+ * in the schematic, filtered by his skills.
+ *
+ * @param index		index into the available schematics the player can use. The
+ *					index will be clipped if it is out of range.
+ */
+void PlayerObject::selectDraftSchematic(int index)
+{
+	CreatureObject * const owner = getCreatureObject();
+	if (owner == NULL)
+		return;
+
+	const std::string myId        = getNetworkId().getValueString();
+	const char * const myIdString = myId.c_str();
+	UNREF(myIdString);		// needed for release mode
+
+	// check the crafting tool
+	if (getCraftingTool() == NetworkId::cms_invalid)
+	{
+		DEBUG_WARNING(true, ("Player %s trying to select draft schematic with "
+			"no crafting tool!", myIdString));
+	}
+	else if (m_craftingStage.get() != static_cast<int>(Crafting::CS_selectDraftSchematic))
+	{
+		DEBUG_WARNING(true, ("Player %s trying to select draft schematic in wrong "
+			"crafting stage %d!", myIdString, static_cast<int>(m_craftingStage.get())));
+	}
+	else
+	{
+		// check the available draft schematics
+		if (m_useableDraftSchematics.empty ())
+		{
+			DEBUG_WARNING(true, ("Player %s selected a draft schematic to craft "
+				"when none are available!", myIdString));
+		}
+		else
+		{
+			if (index < 0)
+				index = 0;
+			else if (index >= static_cast<int>(m_useableDraftSchematics.size()))
+				index = static_cast<int>(m_useableDraftSchematics.size()) - 1;
+
+			MessageQueueDraftSlots * message = new MessageQueueDraftSlots(
+				getCraftingTool(), NetworkId::cms_invalid);
+			if (requestDraftSlots(m_useableDraftSchematics[static_cast<unsigned int>(index)], message, NULL))
+			{
+				m_craftingStage = static_cast<int>(Crafting::CS_assembly);
+				m_craftingComponentBioLink = NetworkId::cms_invalid;
+			}
+			else
+				delete message;
+		}
+	}
+}	// PlayerObject::selectDraftSchematic
+
+//----------------------------------------------------------------------
+
+/**
+ * Tries to fill the current manufacturing schematic with an ingredient in the player's
+ * inventory or the crafting station's input hopper.
+ *
+ * @param slotIndex			index of the slot to fill
+ * @param slotOptionIndex	index of the slot option to use
+ * @param ingredientId		id of the ingredient to use
+ *
+ * @return CE_success on success, error code if the ingredient wasn't added
+ */
+Crafting::CraftingError PlayerObject::fillSlot(int slotIndex, int slotOptionIndex, const NetworkId & ingredientId)
+{
+	std::string myId = getNetworkId().getValueString();
+	const char * myIdString = myId.c_str();
+	UNREF(myIdString);		// needed for release mode
+
+	CreatureObject * const owner = getCreatureObject();
+	if (owner == NULL)
+		return Crafting::CE_noOwner;
+
+	// check the draft schematic
+	if (m_draftSchematic.getPointer() == NULL)
+	{
+		WARNING(true, ("Player %s trying to fill slot with no draft schematic!", myIdString));
+		return Crafting::CE_noDraftSchematic;
+	}
+
+	if (m_draftSchematic->getGameObjectType() == SharedObjectTemplate::GOT_data_draft_schematic_read_only)
+	{
+		return Crafting::CE_readOnlyDraftSchematic;
+	}
+
+	if (getCraftingStage() != Crafting::CS_assembly)
+	{
+		WARNING(true, ("Player %s trying to fill slot when not in assembly stage! "
+			"Stage = %d, schematic = %s, ingredient = %s, slot = %d", myIdString,
+			getCraftingStage(), m_draftSchematic->getTemplateName(),
+			ingredientId.getValueString().c_str(), slotIndex));
+		return Crafting::CE_notAssemblyStage;
+	}
+
+	// check the crafting tool
+	if (getCraftingTool() == NetworkId::cms_invalid)
+	{
+		WARNING(true, ("Player %s trying to fill slot with no crafting tool!", myIdString));
+		return Crafting::CE_noCraftingTool;
+	}
+
+	TangibleObject * const tool = safe_cast<TangibleObject *>(getCraftingTool().getObject());
+	if (tool == NULL)
+	{
+		WARNING(true, ("Player %s trying to fill slot with crafting tool %s, but tool is NULL!", myIdString, getCraftingTool().getValueString().c_str()));
+		return Crafting::CE_noCraftingTool;
+	}
+
+	// get the crafting station (if any)
+	TangibleObject * const station = dynamic_cast<TangibleObject *>(getCraftingStation().getObject());
+
+	// check the manufacturing schematic
+	ManufactureSchematicObject * const manfSchematic = tool->getCraftingManufactureSchematic();
+	if (manfSchematic == NULL)
+	{
+		WARNING(true, ("Player %s trying to fill slot with no manufacturing schematic!", myIdString));
+		return Crafting::CE_noManfSchematic;
+	}
+
+	// verify the slot index
+	if (slotIndex < 0 || slotIndex >= manfSchematic->getSlotsCount())
+	{
+		WARNING(true, ("Player %s trying to fill invalid slot %d",myIdString, slotIndex));
+		return Crafting::CE_invalidSlot;
+	}
+
+	// get the manufacturing schematic object
+	Crafting::IngredientSlot manfSlot;
+	if (!manfSchematic->getSlot(slotIndex, manfSlot, false))
+	{
+		WARNING(true, ("Got invalid slot %d result for manf schematic %s, but we were told it was ok! What's going on?", slotIndex, manfSchematic->getNetworkId().getValueString().c_str()));
+		return Crafting::CE_invalidSlot;
+	}
+
+	// get the draft schematic slot
+	ServerDraftSchematicObjectTemplate::IngredientSlot draftSlot;
+	if (!m_draftSchematic->getSlot(draftSlot, manfSlot.draftSlotIndex))
+	{
+		return Crafting::CE_invalidSlot;
+	}
+
+	// get the draft schematic option, convert the passed-in option index to the
+	// unfiltered index
+	int i, j;
+	const ServerIntangibleObjectTemplate::Ingredient * slotOption = NULL;
+	const int optionsCount = static_cast<int>(draftSlot.options.size());
+	for (i = 0, j = 0; i < optionsCount; ++i)
+	{
+		const ServerIntangibleObjectTemplate::Ingredient & tempOption = draftSlot.options[static_cast<unsigned int>(i)];
+		if (tempOption.skillCommand.empty() || owner->hasCommand(tempOption.skillCommand))
+		{
+			if (j == slotOptionIndex)
+			{
+				slotOption = &tempOption;
+				break;
+			}
+			else
+				++j;
+		}
+	}
+	if (i == optionsCount)
+	{
+		WARNING(true, ("Player %s selected invalid slot option %d for slot %d", myIdString, slotOptionIndex, slotIndex));
+		return Crafting::CE_invalidSlotOption;
+	}
+	slotOptionIndex = i;
+
+	if (slotOption->ingredients.size() != 1)
+	{
+		WARNING(true, ("Ingredient %d for draft schematic %s, slot %s, has ingredient count != 1",
+			slotOptionIndex, m_draftSchematic->getTemplateName(), draftSlot.name.getText().c_str()));
+		return Crafting::CE_invalidIngredientSize;
+	}
+	const ServerIntangibleObjectTemplate::SimpleIngredient & slotIngredient = slotOption->ingredients[0];
+
+	// see if the slot is already filled - also get how many ingredients are
+	// needed and how many we already have
+	int neededIngredientCount = slotIngredient.count;
+	int currentIngredientCount = 0;
+	if (manfSlot.ingredientType != Crafting::IT_none)
+	{
+		// the slot has something in it, see if it is full or not
+		for (Crafting::Ingredients::const_iterator iter =
+			manfSlot.ingredients.begin(); iter != manfSlot.ingredients.end(); ++iter)
+		{
+			currentIngredientCount += (*iter)->count;
+		}
+		if (currentIngredientCount >= neededIngredientCount)
+		{
+			DEBUG_WARNING(currentIngredientCount == neededIngredientCount, (
+				"Player %s trying to fill filled slot %d", myIdString, slotIndex));
+			WARNING_STRICT_FATAL(currentIngredientCount > neededIngredientCount,
+				("HEY! Player %s trying to fill OVER filled slot %d (required = "
+				"%d, current = %d)", myIdString, slotIndex, neededIngredientCount,
+				currentIngredientCount));
+			return Crafting::CE_slotFull;
+		}
+	}
+	int numIngredientsToAdd = neededIngredientCount - currentIngredientCount;
+
+	TangibleObject * const ingredient = dynamic_cast<TangibleObject *>(NetworkIdManager::getObjectById(ingredientId));
+	if (ingredient == NULL)
+	{
+		WARNING(true, ("No object for ingredient id %s", ingredientId.getValueString().c_str()));
+		return Crafting::CE_invalidIngredient;
+	}
+
+	// check if the ingredient is bio-linked
+	NetworkId bioLinkId(ingredient->getBioLink());
+	if (bioLinkId != NetworkId::cms_invalid)
+	{
+		if (m_craftingComponentBioLink.get() == NetworkId::cms_invalid)
+		{
+			// this component defines the bio-link for the object
+			m_craftingComponentBioLink = bioLinkId;
+		}
+		else
+		{
+			return Crafting::CE_invalidBioLink;
+		}
+	}
+	else
+		m_craftingComponentBioLink = NetworkId::cms_invalid;
+
+	// see if the ingredient is in the player's inventory
+	if (!owner->isIngredientInInventory(*ingredient))
+	{
+		// if we are crafting level 3, also check the crafting station's hopper
+		if (getCraftingLevel() != 3 || (station != NULL &&
+			!station->isIngredientInHopper(ingredientId)))
+		{
+			DEBUG_WARNING(true, ("Player %s chose invalid ingredient %s", myIdString, ingredientId.getValueString().c_str()));
+			return Crafting::CE_ingredientNotInInventory;
+		}
+
+	}
+
+	// see if the ingredient is a resource or component
+	ResourceContainerObject * const crate = dynamic_cast<ResourceContainerObject *>(ingredient);
+	if (crate != NULL)
+	{
+		// get the resource type name and class name
+		ResourceTypeObject const * const resource = crate->getResourceType();
+		NetworkId const resourceId = resource ? resource->getNetworkId() : NetworkId::cms_invalid;
+
+		bool slotOk = false;
+
+		if (resource)
+		{
+			// make sure the selected slot is the right type
+			if (currentIngredientCount == 0)
+			{
+				if (slotOption->ingredientType == ServerIntangibleObjectTemplate::IT_resourceType)
+				{
+					const std::string typeName(resource->getResourceName());
+					if (typeName == slotIngredient.ingredient)
+						slotOk = true;
+				}
+				else if (slotOption->ingredientType == ServerIntangibleObjectTemplate::IT_resourceClass)
+				{
+					ResourceClassObject const * resourceClass = &(resource->getParentClass());
+					while (resourceClass != NULL)
+					{
+						const std::string className (resourceClass->getResourceClassName());
+						if (className == slotIngredient.ingredient)
+						{
+							slotOk = true;
+							break;
+						}
+						resourceClass = resourceClass->getParent();
+					}
+				}
+			}
+			else
+			{
+				// the resource type must be the exact one currently in the slot
+				if (resource->getNetworkId() == manfSlot.ingredients.front()->ingredient)
+					slotOk = true;
+			}
+		}
+
+		if (slotOk)
+		{
+			// if we need more resources than we have, just empty the crate
+			if (crate->getQuantity() < numIngredientsToAdd)
+				numIngredientsToAdd = crate->getQuantity();
+
+			// we can put the resource in the manufacturing schematic
+			std::vector<std::pair<NetworkId, int> > sources;
+			if (crate->removeResource(resourceId, numIngredientsToAdd, &sources))
+			{
+				if (currentIngredientCount == 0)
+				{
+					manfSchematic->setSlotOption(manfSlot.name, slotOptionIndex);
+					manfSchematic->modifySlotComplexity(manfSlot.name, slotOption->complexity);
+					manfSchematic->setSlotType(manfSlot.name, static_cast<int>(slotOption->ingredientType));
+				}
+				int count = sources.size();
+				for (int i = 0; i < count; ++i)
+				{
+					manfSchematic->addSlotResource(manfSlot.name, resourceId, sources[i].second, sources[i].first);
+					manfSchematic->addIngredient(resourceId, sources[i].second, sources[i].first);
+				}
+			}
+			else
+			{
+				return Crafting::CE_cantRemoveResource;
+			}
+		}
+		else
+		{
+			DEBUG_WARNING(true, ("Invalid resource ingredient for draft schematic %s, slot %s, option %d",
+				m_draftSchematic->getTemplateName(), draftSlot.name.getText().c_str(), slotOptionIndex));
+			return Crafting::CE_wrongResource;
+		}
+	}
+	else
+	{
+		if (manfSchematic->hasIngredient (ingredient->getNetworkId ()))
+		{
+			DEBUG_WARNING(true, ("Attempt to add ingredient multiple times."));
+			return Crafting::CE_invalidIngredient;
+		}
+
+		// see if the ingredient is a stacked loot item
+		// @todo: stacked loot should work the same as FactoryObject objects
+		if (ingredient->getScriptObject()->hasScript("object.onewayunstack"))
+		{
+			return Crafting::CE_stackedLoot;
+		}
+
+		// test if the component is a factory
+		FactoryObject * factory = dynamic_cast<FactoryObject *>(ingredient);
+
+		// if this is an old-style factory, we can't use it directly in crafting
+		if (factory != NULL && !factory->getLoadContents())
+			factory = NULL;
+
+		// make sure the component isn't damaged
+		if (factory == NULL && ingredient->getDamageTaken() != 0 &&
+			!ingredient->getObjVars().hasItem(OBJVAR_CRAFTING_COMPONENT_CAN_BE_DAMAGED))
+		{
+			DEBUG_WARNING(true, ("Tried to use damaged component %s for draft schematic %s, slot %s, option %d",
+				ingredientId.getValueString().c_str(),
+				m_draftSchematic->getTemplateName(), draftSlot.name.getText().c_str(),
+				slotOptionIndex));
+			return Crafting::CE_damagedComponent;
+		}
+
+		// make sure the ingredient is crafted, if required
+		if ((slotOption->ingredientType == ServerIntangibleObjectTemplate::IT_schematic ||
+			slotOption->ingredientType == ServerIntangibleObjectTemplate::IT_schematicGeneric) &&
+		    !ingredient->isCrafted())
+		{
+			DEBUG_WARNING(true, ("Invalid component ingredient for draft schematic %s, slot %s, option %d",
+				m_draftSchematic->getTemplateName(), draftSlot.name.getText().c_str(), slotOptionIndex));
+			return Crafting::CE_wrongComponent;
+		}
+
+		// find the matching ingredient for the draft slot
+		bool slotOk = false;
+		if (currentIngredientCount == 0)
+		{
+			if (slotOption->ingredientType == ServerIntangibleObjectTemplate::IT_item)
+			{
+				std::string tempName(Unicode::wideToNarrow(ingredient->getObjectName()));
+				if (tempName == slotIngredient.ingredient)
+				{
+					slotOk = true;
+				}
+			}
+			// for slots that require multiple non-generic components, make
+			// sure the component being added is crafted
+			else if (slotOption->ingredientType == ServerIntangibleObjectTemplate::IT_templateGeneric ||
+	            ((slotOption->ingredientType == ServerIntangibleObjectTemplate::IT_template ||
+				slotOption->ingredientType == ServerIntangibleObjectTemplate::IT_schematic ||
+				slotOption->ingredientType == ServerIntangibleObjectTemplate::IT_schematicGeneric) &&
+		        ingredient->isCrafted()))
+			{
+				std::string requiredIngredientName(slotIngredient.ingredient);
+
+				// check the ingredient template name for every template in it's
+				// heirarchy
+				const ObjectTemplate * testTemplate = NULL;
+				if (slotOption->ingredientType == ServerIntangibleObjectTemplate::IT_template ||
+					slotOption->ingredientType == ServerIntangibleObjectTemplate::IT_templateGeneric)
+				{
+					if (factory == NULL)
+						testTemplate = ingredient->getObjectTemplate();
+					else
+						testTemplate = factory->getContainedObjectTemplate();
+				}
+				else
+				{
+					const DraftSchematicObject * itemSchematic = NULL;
+					if (factory == NULL)
+						itemSchematic = DraftSchematicObject::getSchematic(ingredient->getSourceDraftSchematic());
+					else
+						itemSchematic = DraftSchematicObject::getSchematic(factory->getDraftSchematic());
+					if (itemSchematic != NULL)
+						testTemplate = itemSchematic->getObjectTemplate();
+				}
+
+				while (testTemplate != NULL)
+				{
+					const std::string ingredientName(testTemplate->getName());
+					if (ingredientName == requiredIngredientName)
+					{
+						slotOk = true;
+						break;
+					}
+					else
+					{
+						// travel down the ingredient template heirarchy
+						testTemplate = testTemplate->getBaseTemplate();
+					}
+				}
+			}
+		}
+		else
+		{
+			// the ingredient must either be from the same template, or from the
+			// same manufacturing schematic as the ingredient currently in the slot;
+			// this is a configureable setting
+			const Crafting::ComponentIngredient * testComponent = dynamic_cast<
+				const Crafting::ComponentIngredient *>(manfSlot.ingredients.front().get());
+			if (testComponent != NULL)
+			{
+				if (ConfigServerGame::getCraftingComponentStrict() &&
+					(slotOption->ingredientType != ServerIntangibleObjectTemplate::IT_templateGeneric &&
+					slotOption->ingredientType != ServerIntangibleObjectTemplate::IT_schematicGeneric))
+				{
+					// component from same manf schematic
+					if (ingredient->getCraftedId() == testComponent->ingredient)
+						slotOk = true;
+				}
+				else
+				{
+					// component from same template
+					if (factory == NULL)
+					{
+						if (ingredient->getObjectTemplateName() != NULL &&
+							ingredient->getObjectTemplateName() == testComponent->templateName)
+						{
+							slotOk = true;
+						}
+					}
+					else if (factory->getContainedTemplateName() != NULL &&
+						factory->getContainedTemplateName() == testComponent->templateName)
+					{
+						slotOk = true;
+					}
+				}
+			}
+		}
+		if (slotOk)
+		{
+			if (factory == NULL || factory->getCount() <= numIngredientsToAdd)
+			{
+				// adding normal component or a complete factory object
+				if (manfSchematic->addIngredient(*ingredient))
+				{
+					if (manfSlot.ingredientType == Crafting::IT_none)
+					{
+						manfSchematic->setSlotType(manfSlot.name, static_cast<int>(slotOption->ingredientType));
+						manfSchematic->setSlotOption(manfSlot.name, slotOptionIndex);
+						manfSchematic->modifySlotComplexity(manfSlot.name, slotOption->complexity);
+					}
+					if (factory == NULL)
+					{
+						manfSchematic->addSlotComponent(manfSlot.name, *ingredient,
+							slotOption->ingredientType);
+					}
+					else
+					{
+						int count = factory->getCount();
+						for (i = 0; i < count; ++i)
+						{
+							manfSchematic->addSlotComponent(manfSlot.name,
+								*factory, slotOption->ingredientType);
+						}
+					}
+				}
+				else
+					return Crafting::CE_cantTransferComponent;
+			}
+			else
+			{
+				// adding component(s) from a factory
+				if (!factory->inCraftingSession())
+				{
+					if (!factory->startCraftingSession(*manfSchematic))
+						return Crafting::CE_cantTransferComponent;
+				}
+				if (!factory->removeCraftingReferences(numIngredientsToAdd))
+				{
+					return Crafting::CE_cantTransferComponent;
+				}
+				if (manfSlot.ingredientType == Crafting::IT_none)
+				{
+					manfSchematic->setSlotType(manfSlot.name, static_cast<int>(slotOption->ingredientType));
+					manfSchematic->setSlotOption(manfSlot.name, slotOptionIndex);
+					manfSchematic->modifySlotComplexity(manfSlot.name, slotOption->complexity);
+				}
+				for (i = 0; i < numIngredientsToAdd; ++i)
+				{
+					manfSchematic->addSlotComponent(manfSlot.name, *factory,
+						slotOption->ingredientType);
+				}
+			}
+		}
+		else
+		{
+			DEBUG_WARNING(true, ("Invalid component ingredient for draft schematic %s, slot %s, option %d",
+				m_draftSchematic->getTemplateName(), draftSlot.name.getText().c_str(), slotOptionIndex));
+			return Crafting::CE_wrongComponent;
+		}
+	}
+
+	manfSchematic->computeComplexity();
+	manfSchematic->signalClientChange();
+	return Crafting::CE_success;
+}	// PlayerObject::fillSlot
+
+//----------------------------------------------------------------------
+
+/**
+ * Removes the ingredients in a schematic slot and returns them to the crafting
+ * tool's ingredient hopper.
+ *
+ * @param slotIndex		    schematic slot to empty
+ * @param targetContainerId the container the player wants to unload the slot into.
+ *                          If NetworkId::cms_invalid, then unload the slot into
+ *                          the same container it was loaded from.
+ *
+ * @return CE_success on success, error code if the ingredient wasn't removed
+ */
+Crafting::CraftingError PlayerObject::emptySlot(int slotIndex, const NetworkId & targetContainerId)
+{
+	const std::string & myId = getNetworkId().getValueString();
+	const char * const myIdString = myId.c_str();
+	UNREF(myIdString);		// needed for release mode
+
+	CreatureObject * const owner = getCreatureObject();
+	if (owner == NULL)
+		return Crafting::CE_noOwner;
+
+	if (getCraftingStage() != Crafting::CS_assembly && !m_allowEmptySlot)
+	{
+		WARNING(true, ("Player %s trying to empty slot when not in assembly stage!", myIdString));
+		return Crafting::CE_notAssemblyStage;
+	}
+
+	// check the draft schematic
+	if (m_draftSchematic.getPointer() == NULL)
+	{
+		WARNING(true, ("Player %s trying to empty slot with no draft schematic!", myIdString));
+		return Crafting::CE_noDraftSchematic;
+	}
+
+	// check the crafting tool
+	if (getCraftingTool() == NetworkId::cms_invalid)
+	{
+		WARNING(true, ("Player %s trying to empty slot with no crafting tool!", myIdString));
+		return Crafting::CE_noCraftingTool;
+	}
+	TangibleObject * const tool = safe_cast<TangibleObject *>(getCraftingTool().getObject());
+	if (tool == NULL)
+	{
+		WARNING(true, ("Player %s trying to empty slot with crafting tool %s, but tool is NULL!", myIdString, getCraftingTool().getValueString().c_str()));
+		return Crafting::CE_noCraftingTool;
+	}
+
+	// get the crafting station (if any)
+	TangibleObject * station = dynamic_cast<TangibleObject *>(getCraftingStation().getObject());
+	if (station != NULL && getCraftingLevel() == 3 && station->getIngredientHopper() == NULL)
+	{
+		WARNING_STRICT_FATAL(true, ("Player %s trying to empty crafting slot near "
+			"a crafting station %s that has no ingredient hopper!",
+			owner->getNetworkId().getValueString().c_str(),
+			station->getNetworkId().getValueString().c_str()));
+		return Crafting::CE_badTargetHopper;
+	}
+
+	ServerObject * const inventory = owner->getInventory();
+	if (inventory == NULL)
+	{
+		WARNING (true, ("Player %s has no inventory.", myIdString));
+		return Crafting::CE_noInventory;
+	}
+
+	//-- if the player specified a target container, try to use that
+	ServerObject * targetContainer = 0;
+	if (targetContainerId.isValid ())
+	{
+		if (!isNestedInContainer (targetContainerId, inventory->getNetworkId()))
+		{
+			// check worn containers, such as backpacks, but only check one level down so we don't catch the datapad
+			bool containerIsWorn = false;
+			Object const * const possibleContainer = NetworkIdManager::getObjectById (targetContainerId);
+			if (possibleContainer)
+			{
+				containerIsWorn = owner->isItemEquipped (*possibleContainer);
+			}
+
+			// if we are crafting level 3, also check the crafting station's hopper
+			if (!containerIsWorn &&
+				(getCraftingLevel() != 3 || (station != NULL &&
+				!isNestedInContainer (targetContainerId, station->getIngredientHopper()->getNetworkId()))))
+			{
+				WARNING (true, ("Player %s attempted to empty slot into invalid container [%s].", myIdString, targetContainerId.getValueString().c_str()));
+				return Crafting::CE_badTargetHopper;
+			}
+		}
+
+		targetContainer = safe_cast<ServerObject *>(NetworkIdManager::getObjectById (targetContainerId));
+
+		if (targetContainer == NULL)
+		{
+			WARNING (true, ("Player %s attempted to empty slot into non-existant container [%s].", myIdString, targetContainerId.getValueString ().c_str ()));
+			return Crafting::CE_badTargetContainer;
+		}
+	}
+	//-- otherwise use the container that the ingredient came from in the first place
+	else
+	{
+		//@todo: this needs to find the target container from which the slot was originally populated
+		targetContainer = inventory;
+	}
+
+	// check the manufacturing schematic
+	ManufactureSchematicObject * const manfSchematic = tool->getCraftingManufactureSchematic();
+	if (manfSchematic == NULL)
+	{
+		WARNING(true, ("Player %s trying to empty slot with no manufacturing schematic!", myIdString));
+		return Crafting::CE_noManfSchematic;
+	}
+
+	if (manfSchematic->mustDestroyIngredients() &&
+		getCraftingStage() != Crafting::CS_assembly)
+	{
+		WARNING(true, ("Player %s trying to empty slot when not in assembly stage!", myIdString));
+		return Crafting::CE_notAssemblyStage;
+	}
+
+	// verify the slot index
+	if (slotIndex < 0 || slotIndex >= manfSchematic->getSlotsCount())
+	{
+		WARNING(true, ("Player %s trying to empty invalid slot %d", myIdString, slotIndex));
+		return Crafting::CE_invalidSlot;
+	}
+
+	// get the manufacturing schematic object
+	Crafting::IngredientSlot manfSlot;
+	if (!manfSchematic->getSlot(slotIndex, manfSlot, true))
+	{
+		return Crafting::CE_invalidSlot;
+	}
+	Crafting::IngredientType ingredientType = manfSlot.ingredientType;
+	if (ingredientType == Crafting::IT_none || manfSlot.ingredients.empty())
+	{
+		DEBUG_WARNING(true, ("Player %s trying to empty already empty slot %d", myIdString, slotIndex));
+		return Crafting::CE_emptySlot;
+	}
+
+	// get the draft schematic slot
+	ServerDraftSchematicObjectTemplate::IngredientSlot draftSlot;
+	if (!m_draftSchematic->getSlot(draftSlot, manfSlot.draftSlotIndex))
+	{
+		return Crafting::CE_invalidSlot;
+	}
+
+	if (ingredientType == Crafting::IT_item || ingredientType == Crafting::IT_template ||
+		ingredientType == Crafting::IT_templateGeneric || ingredientType == Crafting::IT_schematic ||
+		ingredientType == Crafting::IT_schematicGeneric)
+	{
+		// ingredient is a component
+		Crafting::Ingredients::const_iterator iter;
+		for (iter = manfSlot.ingredients.begin(); iter != manfSlot.ingredients.end();
+			++iter)
+		{
+			const Crafting::ComponentIngredient * const componentInfo = dynamic_cast<const Crafting::ComponentIngredient *>((*iter).get());
+			NOT_NULL(componentInfo);
+			TangibleObject * const component = manfSchematic->getComponent(*componentInfo);
+			if (component != NULL)
+			{
+				// move the component from the schematic to the player
+				if (!manfSchematic->removeIngredient(*component, *targetContainer))
+				{
+					Unicode::String oob;
+					{
+						ProsePackage pp;
+						ProsePackageManagerServer::createSimpleProsePackage (*component, COMPONENT_LOST_MSG, pp);
+						OutOfBandPackager::pack(pp, -1, oob);
+					}
+					Chat::sendSystemMessage(*owner, Unicode::emptyString, oob);
+				}
+				// if this component is bio-linked, clear our link data
+				NetworkId bioLinkId(component->getBioLink());
+				if (bioLinkId != NetworkId::cms_invalid && bioLinkId == m_craftingComponentBioLink.get())
+				{
+					m_craftingComponentBioLink = NetworkId::cms_invalid;
+				}
+			}
+		}
+	}
+	else
+	{
+		// ingredient is a resource
+		VolumeContainer * const targetVolumeContainer = ContainerInterface::getVolumeContainer(*targetContainer);
+		if (targetVolumeContainer == NULL)
+		{
+			DEBUG_WARNING(true, ("PlayerObject::emptySlot: targetContainer %s does not have a volume container",
+								 targetContainer->getNetworkId().getValueString().c_str()));
+			return Crafting::CE_badTargetContainer;
+		}
+		Crafting::Ingredients::const_iterator iter;
+		for (iter = manfSlot.ingredients.begin(); iter != manfSlot.ingredients.end();
+			++iter)
+		{
+			Crafting::SimpleIngredient * resource = const_cast<Crafting::SimpleIngredient *>((*iter).get());
+			const NetworkId resourceId(resource->ingredient);
+			if (resourceId != NetworkId::cms_invalid)
+			{
+				// find a resource crate in the targetContainer containing the resourceId
+				ContainerIterator iter2;
+				for (iter2 = targetVolumeContainer->begin(); iter2 != targetVolumeContainer->end();
+					++iter2)
+				{
+					if (*iter2 != NetworkId::cms_invalid)
+					{
+						ResourceContainerObject * crate = dynamic_cast<
+							ResourceContainerObject *>(NetworkIdManager::getObjectById((*iter2)));
+						if (crate != NULL && crate->getResourceTypeId() == resourceId)
+						{
+							int emptySpace = crate->getMaxQuantity() - crate->getQuantity();
+							if (emptySpace > 0)
+							{
+								if (emptySpace >= resource->count)
+								{
+									// we can put all of the resource in the crate
+									IGNORE_RETURN(manfSchematic->removeIngredient(
+										resourceId, resource->count, *crate));
+									break;
+								}
+								else
+								{
+									// fill up the crate an keep looking
+									IGNORE_RETURN(manfSchematic->removeIngredient(
+										resourceId, emptySpace, *crate));
+									resource->count -= emptySpace;
+								}
+							}
+						}
+					}
+				}
+				if (iter2 == targetVolumeContainer->end())
+				{
+					// create a new crate(s) in the target container
+					std::string crateTemplateName;
+					ResourceTypeObject const * const resourceType = ServerUniverse::getInstance().getResourceTypeById(resourceId);
+					resourceType->getCrateTemplate(crateTemplateName);
+					while (resource->count > 0)
+					{
+						ServerObject * crateObject = ServerWorld::createNewObject(
+							crateTemplateName, *targetContainer, true);
+						if (crateObject == NULL)
+						{
+							// @todo: inform the player
+							DEBUG_WARNING(true, ("PlayerObject::emptySlot tried to "
+								"create a new resource crate %s in container %s but "
+								"failed!", crateTemplateName.c_str(),
+								targetContainerId.getValueString().c_str()));
+							return Crafting::CE_cantCreateResourceCrate;
+						}
+						ResourceContainerObject * crate = safe_cast<
+							ResourceContainerObject *>(crateObject);
+						if (crate->getMaxQuantity() >= resource->count)
+						{
+							IGNORE_RETURN(manfSchematic->removeIngredient(resourceId,
+								resource->count, *crate));
+							resource->count = 0;
+						}
+						else
+						{
+							IGNORE_RETURN(manfSchematic->removeIngredient(resourceId,
+								crate->getMaxQuantity(), *crate));
+							resource->count -= crate->getMaxQuantity();
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// empty the slot
+	manfSchematic->clearSlot(draftSlot.name);
+
+	manfSchematic->computeComplexity();
+	manfSchematic->signalClientChange();
+
+	return Crafting::CE_success;
+}	// PlayerObject::emptySlot
+
+//----------------------------------------------------------------------
+
+/**
+ * Goes from the current stage in a crafting session to the next one.
+ *
+ * @return error code
+ */
+int PlayerObject::goToNextCraftingStage ()
+{
+	int result = Crafting::CR_failure;
+
+	switch (m_craftingStage.get())
+	{
+		case Crafting::CS_assembly:
+			result = startCraftingExperiment();
+			break;
+		case Crafting::CS_experiment:
+			m_craftingStage = static_cast<int>(Crafting::CS_customize);
+			result = Crafting::CR_success;
+			break;
+		case Crafting::CS_customize:
+			m_craftingStage = static_cast<int>(Crafting::CS_finish);
+			result = Crafting::CR_success;
+			break;
+		case Crafting::CS_none:
+		case Crafting::CS_selectDraftSchematic:
+		case Crafting::CS_finish:
+		default:
+			break;
+	}
+	return result;
+}	// PlayerObject::goToNextCraftingStage
+
+//----------------------------------------------------------------------
+
+/**
+ * Moves a crafting session to the experimentation phase. This only occurs if
+ * all non-optional slots of the draft schematic have been filled. The ingredients
+ * used in the schematic will be destroyed unless the draft schematic is flagged
+ * as non-destroying.
+ *
+ * @return returns the success state of the assembly on success, -error code on fail
+ */
+int PlayerObject::startCraftingExperiment ()
+{
+	int i;
+
+	CreatureObject * const owner = getCreatureObject();
+	if (owner == NULL)
+		return -Crafting::CE_noOwner;
+
+	std::string myId = getNetworkId().getValueString();
+	const char * myIdString = myId.c_str();
+	UNREF(myIdString);		// needed for release mode
+
+	if (m_draftSchematic.getPointer() == NULL)
+	{
+		DEBUG_WARNING(true, ("Player %s tried to start crafting experimentation with invalid schematic.", myIdString));
+		return -Crafting::CE_noDraftSchematic;
+	}
+	if (getCraftingTool() == NetworkId::cms_invalid)
+	{
+		DEBUG_WARNING(true, ("Player %s tried to start crafting experimentation with invalid crafting tool.", myIdString));
+		return -Crafting::CE_noCraftingTool;
+	}
+
+	if (m_draftSchematic->getGameObjectType() == SharedObjectTemplate::GOT_data_draft_schematic_read_only)
+	{
+		return -Crafting::CE_readOnlyDraftSchematic;
+	}
+
+	TangibleObject * tool = safe_cast<TangibleObject *>(getCraftingTool().getObject());
+	NOT_NULL(tool);
+
+	if (!tool)
+	{
+		DEBUG_WARNING(true, ("Player %s tried to start crafting experimentation with null crafting tool [%s].", myIdString, getCraftingTool().getValueString().c_str()));
+		return -Crafting::CE_noCraftingTool;
+	}
+
+	// check the manufacturing schematic
+	ManufactureSchematicObject * const manfSchematic = tool->getCraftingManufactureSchematic();
+	if (manfSchematic == NULL)
+	{
+		DEBUG_WARNING(true, ("Player %s tried to start crafting experimentation with invalid manufacture schematic.", myIdString));
+		return -Crafting::CE_noManfSchematic;
+	}
+
+	// make sure all the manufacturing schematic slots are filled
+	Crafting::IngredientSlot slot;
+	ServerDraftSchematicObjectTemplate::IngredientSlot draftSlot;
+	int count = manfSchematic->getSlotsCount();
+	for (i = 0; i < count; ++i)
+	{
+		if (!manfSchematic->getSlot(i, slot, false))
+		{
+			return -Crafting::CE_invalidSlot;
+		}
+
+		// get the draft schematic slot
+		ServerDraftSchematicObjectTemplate::IngredientSlot draftSlot;
+		if (!m_draftSchematic->getSlot(draftSlot, slot.draftSlotIndex))
+			return -Crafting::CE_invalidSlot;
+
+		Crafting::IngredientType type = slot.ingredientType;
+		if (type == Crafting::IT_none)
+		{
+			if (!draftSlot.optional)
+			{
+				DEBUG_WARNING(true, ("Player %s tried to start crafting experimentation with empty slot #%d.", myIdString, i));
+				return -Crafting::CE_emptySlotAssembly;
+			}
+		}
+		else
+		{
+			int currentIngredientCount = 0;
+			for (Crafting::Ingredients::const_iterator iter =
+				slot.ingredients.begin(); iter != slot.ingredients.end(); ++iter)
+			{
+				currentIngredientCount += (*iter)->count;
+			}
+			if (currentIngredientCount != draftSlot.options[static_cast<unsigned int>(slot.draftSlotOption)].ingredients[0].count)
+			{
+				DEBUG_WARNING(true, ("Player %s tried to start crafting experimentation with partially full slot #%d.", myIdString, i));
+				return -Crafting::CE_partialSlotAssembly;
+			}
+		}
+	}
+
+	// remove unused optional slots from the schematic
+	for (i = 0; i < count;)
+	{
+		if (!manfSchematic->getSlot(i, slot, false))
+		{
+			continue;
+		}
+
+		// get the draft schematic slot
+		ServerDraftSchematicObjectTemplate::IngredientSlot draftSlot;
+		IGNORE_RETURN(m_draftSchematic->getSlot(draftSlot, slot.draftSlotIndex));
+
+		if (slot.ingredientType == Crafting::IT_none && draftSlot.optional)
+		{
+			manfSchematic->removeSlot(slot.name);
+			--count;
+		}
+		else
+			++i;
+	}
+
+	ServerObject * prototype = tool->getCraftingPrototype();
+	if (prototype == NULL)
+	{
+		DEBUG_WARNING(true, ("PlayerObject::startCraftingExperiment crafting "
+			"tool %s has no prototype object!",
+			tool->getNetworkId().getValueString().c_str()));
+		return -Crafting::CE_noPrototype;
+	}
+
+	// bio-link the prototype
+	if (m_craftingComponentBioLink.get() != NetworkId::cms_invalid)
+		safe_cast<TangibleObject *>(prototype)->setBioLink(m_craftingComponentBioLink.get());
+	else
+		safe_cast<TangibleObject *>(prototype)->clearBioLink();
+
+	// if the tool we are using has the special crit success objvar, store that
+	// info on the schematic
+	int forceCritSuccess = 0;
+	if (tool->getObjVars().getItem(OBJVAR_FORCE_CRITICAL_ASSEMBLY, forceCritSuccess))
+	{
+		if (forceCritSuccess > 0)
+			manfSchematic->setObjVarItem(OBJVAR_FORCE_CRITICAL_SUCCESS, forceCritSuccess);
+	}
+
+	// call the trigger OnManufacturingSchematicCreation
+	int successState = static_cast<int>(Crafting::CR_internalFailure);
+	m_experimentPoints = 0;
+	ScriptParams params;
+	params.addParam(owner->getNetworkId());
+	params.addParam(prototype->getNetworkId());
+	params.addParam(*manfSchematic);
+	params.addParam(successState);
+	params.addParam(m_experimentPoints.get());
+	IGNORE_RETURN(manfSchematic->getScriptObject()->trigAllScripts(
+		Scripting::TRIG_MANUFACTURING_SCHEMATIC_CREATION, params));
+	successState = params.getIntParam(3);
+	m_experimentPoints = params.getIntParam(4);
+
+	if (successState == static_cast<int>(Crafting::CR_internalFailure))
+	{
+		// either the script crashed or we didn't even make it to the script
+		WARNING(true, ("PlayerObject::startCraftingExperiment failed calling OnManufacturingSchematicCreation on schematic %s (%s). Prepare for no owner for player!",
+			manfSchematic->getNetworkId().getValueString().c_str(),
+			m_draftSchematic->getObjectTemplateName()));
+		return successState;
+	}
+
+	if (forceCritSuccess > 0)
+	{
+		// if the forced crit success count has changed, update the tool
+		int newForceCritSuccess = 0;
+		if (manfSchematic->getObjVars().getItem(OBJVAR_FORCE_CRITICAL_SUCCESS, newForceCritSuccess))
+		{
+			if (newForceCritSuccess != forceCritSuccess)
+			{
+				if (newForceCritSuccess > 0)
+					tool->setObjVarItem(OBJVAR_FORCE_CRITICAL_ASSEMBLY, newForceCritSuccess);
+				else
+					tool->removeObjVarItem(OBJVAR_FORCE_CRITICAL_ASSEMBLY);
+			}
+		}
+		manfSchematic->removeObjVarItem(OBJVAR_FORCE_CRITICAL_SUCCESS);
+	}
+
+	// important: we need to set the crafting stage here so restartCrafting
+	// will destroy the ingredients if we crit failed
+	m_craftingStage = static_cast<int>(Crafting::CS_experiment);
+
+	if (successState == static_cast<int>(Crafting::CR_criticalFailure))
+	{
+		// destroy the ingredients, restart the session at the assembly stage
+		IGNORE_RETURN(restartCrafting());
+		m_craftingStage = static_cast<int>(Crafting::CS_assembly);
+	}
+	else if (successState != static_cast<int>(Crafting::CR_internalFailure) &&
+		(getCraftingLevel() <= 1 || ((m_draftSchematic->getItemsPerContainer() == 0 ||
+		m_craftingComponentBioLink.get() != NetworkId::cms_invalid) &&
+		m_draftSchematic->getExperimentalAttributesCount() == 0)))
+	{
+		// if we are not near a station, we cannot experiment
+		m_craftingStage = static_cast<int>(Crafting::CS_customize);
+	}
+	// if we crit failed but don't want to destroy the object, change the success
+	// back to crit fail to the ui will show the right thing
+	if (successState == static_cast<int>(Crafting::CR_criticalFailureNoDestroy))
+	{
+		successState = static_cast<int>(Crafting::CR_criticalFailure);
+		m_craftingStage = static_cast<int>(Crafting::CS_assembly);
+	}
+
+	return successState;
+}	// PlayerObject::startCraftingExperiment
+
+//----------------------------------------------------------------------
+
+/**
+ * Tries to experiment on a schematic attribute.
+ *
+ * @param experiments		list of attributes and points assigned to them
+ * @param totalPoints		total experimentation points used
+ *
+ * @return error code
+ */
+Crafting::CraftingResult PlayerObject::experiment(const std::vector<MessageQueueCraftExperiment::ExperimentInfo> & experiments, int totalPoints, int corelevel)
+{
+	CreatureObject * const owner = getCreatureObject();
+	if (owner == NULL)
+		return Crafting::CR_internalFailure;
+
+	std::string myId = getNetworkId().getValueString();
+	const char * myIdString = myId.c_str();
+	UNREF(myIdString);		// needed for release mode
+
+	// verify we are experimenting
+	if (m_craftingStage.get() != static_cast<int>(Crafting::CS_experiment))
+	{
+		DEBUG_WARNING(true, ("Player %s tried to experiment when not in "
+			"experimentation phase", myIdString));
+		return Crafting::CR_internalFailure;
+	}
+
+	// verify the points allocated
+	if (totalPoints < 1 || totalPoints > m_experimentPoints.get())
+	{
+		DEBUG_WARNING(true, ("Player %s sent invalid number of experiment points "
+			"= %d (%d)", myIdString, totalPoints, m_experimentPoints.get() ));
+		return Crafting::CR_internalFailure;
+	}
+
+	// verify the tool
+	if (m_draftSchematic.getPointer() == NULL || getCraftingTool() == NetworkId::cms_invalid)
+	{
+		DEBUG_WARNING(true, ("Player %s tried to start crafting experimentation "
+			"with invalid schematic or crafting tool.", myIdString));
+		return Crafting::CR_internalFailure;
+	}
+	TangibleObject * tool = safe_cast<TangibleObject *>(getCraftingTool().getObject());
+	NOT_NULL(tool);
+	if (!tool)
+		return Crafting::CR_internalFailure;
+
+	// check the manufacturing schematic
+	ManufactureSchematicObject * const manfSchematic = tool->getCraftingManufactureSchematic();
+	if (manfSchematic == NULL)
+	{
+		DEBUG_WARNING(true, ("Player %s tried to experiment with invalid "
+			"manufacture schematic.", myIdString));
+		return Crafting::CR_internalFailure;
+	}
+	const std::vector<StringId> & attribNames = manfSchematic->getExperimentAttributeNames();
+
+	// check the test prototype
+	ServerObject * prototype = tool->getCraftingPrototype();
+	if (prototype == NULL)
+	{
+		DEBUG_WARNING(true, ("Player %s tried to experiment with invalid test "
+			"prototype.", myIdString));
+		return Crafting::CR_internalFailure;
+	}
+
+	std::vector<const StringId *> scriptAttributes;
+	std::vector<int>              scriptPoints;
+
+	std::vector<MessageQueueCraftExperiment::ExperimentInfo>::const_iterator iter;
+	for (iter = experiments.begin(); iter != experiments.end(); ++iter)
+	{
+		int attributeIndex = (*iter).attributeIndex;
+		int points = (*iter).experimentPoints;
+
+		// verify points
+		if (points <= 0)
+		{
+			DEBUG_WARNING(true, ("Player %s sent invalid experiment point count %d",
+				myIdString, points));
+			return Crafting::CR_internalFailure;
+		}
+
+		// verify attribute index
+		if (attributeIndex < 0 || attributeIndex >= static_cast<int>(attribNames.size()))
+		{
+			DEBUG_WARNING(true, ("Player %s sent invalid attribute index %d",
+				myIdString, attributeIndex));
+			return Crafting::CR_internalFailure;
+		}
+
+		// set the experiment data for the index
+		scriptAttributes.push_back(&attribNames[static_cast<unsigned int>(attributeIndex)]);
+		scriptPoints.push_back(points);
+	}
+
+	m_experimentPoints = m_experimentPoints.get() - totalPoints;
+
+	// if the tool we are using has the special crit success objvar, store that
+	// info on the schematic
+	int forceCritSuccess = 0;
+	if (tool->getObjVars().getItem(OBJVAR_FORCE_CRITICAL_EXPERIMENT, forceCritSuccess))
+	{
+		if (forceCritSuccess > 0)
+			manfSchematic->setObjVarItem(OBJVAR_FORCE_CRITICAL_SUCCESS, forceCritSuccess);
+	}
+
+	Crafting::CraftingResult experimentResult = Crafting::CR_failure;
+	ScriptParams params;
+	params.addParam(owner->getNetworkId());
+	params.addParam(prototype->getNetworkId());
+	params.addParam(scriptAttributes);
+	params.addParam(scriptPoints);
+	params.addParam(totalPoints);
+	params.addParam(static_cast<int>(experimentResult));
+	params.addParam(corelevel);
+	IGNORE_RETURN(manfSchematic->getScriptObject()->trigAllScripts(Scripting::TRIG_CRAFTING_EXPERIMENT, params));
+	experimentResult = static_cast<Crafting::CraftingResult>(params.getIntParam(5));
+
+	if (forceCritSuccess > 0)
+	{
+		// if the forced crit success count has changed, update the tool
+		int newForceCritSuccess = 0;
+		if (manfSchematic->getObjVars().getItem(OBJVAR_FORCE_CRITICAL_SUCCESS, newForceCritSuccess))
+		{
+			if (newForceCritSuccess != forceCritSuccess)
+			{
+				if (newForceCritSuccess > 0)
+					tool->setObjVarItem(OBJVAR_FORCE_CRITICAL_EXPERIMENT, newForceCritSuccess);
+				else
+					tool->removeObjVarItem(OBJVAR_FORCE_CRITICAL_EXPERIMENT);
+			}
+		}
+		manfSchematic->removeObjVarItem(OBJVAR_FORCE_CRITICAL_SUCCESS);
+	}
+
+	return experimentResult;
+}	// PlayerObject::experiment
+
+//----------------------------------------------------------------------
+
+/**
+ * Sets a customization property value for the current manufacturing schematic.
+ *
+ * @param property		index of the customization property
+ * @param value			value the property
+ *
+ * @return true if the property was set, false if not
+ */
+bool PlayerObject::customize(int property, int value) const
+{
+	std::string myId = getNetworkId().getValueString();
+	const char * myIdString = myId.c_str();
+	UNREF(myIdString);		// needed for release mode
+
+	if (m_craftingStage.get() != static_cast<int>(Crafting::CS_customize))
+	{
+		DEBUG_WARNING(true, ("Player %s tried to customize when not in "
+			"customization phase", myIdString));
+		return false;
+	}
+
+	if (m_draftSchematic.getPointer() == NULL || getCraftingTool() == NetworkId::cms_invalid)
+	{
+		DEBUG_WARNING(true, ("Player %s tried to customize with invalid "
+			"schematic or crafting tool.", myIdString));
+		return false;
+	}
+
+	TangibleObject * tool = safe_cast<TangibleObject *>(getCraftingTool().getObject());
+	NOT_NULL(tool);
+	if (!tool)
+		return false;
+	ManufactureSchematicObject * const manfSchematic = tool->getCraftingManufactureSchematic();
+	NOT_NULL(manfSchematic);
+	ServerObject * prototype = tool->getCraftingPrototype();
+	NOT_NULL(prototype);
+
+	return manfSchematic->setCustomization(property, value, *prototype);
+}	// PlayerObject::customize
+
+//----------------------------------------------------------------------
+
+/**
+ * Sets the customization data for a crafter's current manufacturing schematic.
+ *
+ * @param name              the name of the object being crafted
+ * @param appearanceIndex   index of the appearance of the object
+ * @param customizations    customization information
+ * @param itemCount         if making a manf schematic, the number of items the
+ *                          schematic can make
+ *
+ * @return error code
+ */
+int PlayerObject::setCustomizationData(const Unicode::String & name,
+	int appearanceIndex, const std::vector<Crafting::CustomValue> & customizations,
+	int itemCount) const
+{
+	// Strip any color codes from the text
+
+	TextIterator textIterator(name);
+	Unicode::String strippedText(textIterator.getPrintableText());
+
+	std::string myId = getNetworkId().getValueString();
+	const char * myIdString = myId.c_str();
+	UNREF(myIdString);		// needed for release mode
+
+	if (m_craftingStage.get() != static_cast<int>(Crafting::CS_customize))
+	{
+		DEBUG_WARNING(true, ("Player %s tried to customize when not in "
+			"customization phase", myIdString));
+		return Crafting::CE_notCustomizeStage;
+	}
+
+	if (m_draftSchematic.getPointer() == NULL)
+	{
+		DEBUG_WARNING(true, ("Player %s tried to customize with invalid schematic.", myIdString));
+		return Crafting::CE_noDraftSchematic;
+	}
+	if (getCraftingTool() == NetworkId::cms_invalid)
+	{
+		DEBUG_WARNING(true, ("Player %s tried to customize with invalid crafting tool.", myIdString));
+		return Crafting::CE_noCraftingTool;
+	}
+
+	// make sure the object name is ok
+	if (!strippedText.empty() && (strippedText.size() >= 127 || !TextManager::isAppropriateText(strippedText)))
+	{
+		return Crafting::CE_invalidCraftedName;
+	}
+
+	TangibleObject * tool = safe_cast<TangibleObject *>(getCraftingTool().getObject());
+	NOT_NULL(tool);
+	if (!tool)
+	{
+		LOG("Crafting", ("We should have FATALd in debug, but we didn't...no tool for player %s tool %s", myIdString, getCraftingTool().getValueString().c_str()));
+		return Crafting::CE_noCraftingTool;
+	}
+
+	ManufactureSchematicObject * const manfSchematic = tool->getCraftingManufactureSchematic();
+	NOT_NULL(manfSchematic);
+	if (!manfSchematic)
+	{
+		LOG("Crafting", ("We should have FATALd in debug, but we didn't...no manfschem for player %s", myIdString));
+		return Crafting::CE_noDraftSchematic;
+	}
+	TangibleObject * prototype = safe_cast<TangibleObject *>(tool->getCraftingPrototype());
+	NOT_NULL(prototype);
+
+	if (!prototype)
+	{
+		LOG("Crafting", ("We should have FATALd in debug, but we didn't...no prototype for player %s", myIdString));
+		return Crafting::CE_noCraftingTool;
+	}
+
+	if (!strippedText.empty())
+	{
+		prototype->setObjectName(strippedText);
+		manfSchematic->setObjectName(strippedText);
+	}
+
+	manfSchematic->setCustomAppearance(appearanceIndex);
+	manfSchematic->setCount(std::min (1000, itemCount));
+	prototype->setCustomAppearance(manfSchematic->getCustomAppearance());
+
+	std::vector<Crafting::CustomValue>::const_iterator iter;
+	for (iter = customizations.begin(); iter != customizations.end(); ++iter)
+	{
+		IGNORE_RETURN(manfSchematic->setCustomization((*iter).property, (*iter).value, *prototype));
+	}
+	return Crafting::CE_success;
+}	// PlayerObject::setCustomizationData
+
+//----------------------------------------------------------------------
+
+/**
+ * Creates a prototype object from the current manufacturing schematic.
+ *
+ * @param keepPrototype		flag that this is a real prototype; if this is false
+ *							we don't persist the prototype or give it to the player.
+ *
+ * @return true on success, false on fail
+ */
+bool PlayerObject::createPrototype(bool keepPrototype)
+{
+	CreatureObject * const owner = getCreatureObject();
+	if (owner == NULL)
+		return false;
+
+	std::string myId = getNetworkId().getValueString();
+	const char * myIdString = myId.c_str();
+	UNREF(myIdString);		// needed for release mode
+
+	// @todo: need to filter the name
+
+	// verify we are in the final crafting phase
+	if (m_craftingStage.get() != static_cast<int>(Crafting::CS_finish))
+	{
+		DEBUG_WARNING(true, ("Player %s tried to create prototype when not in "
+			"final phase", myIdString));
+		return false;
+	}
+
+	if (m_draftSchematic.getPointer() == NULL || getCraftingTool() == NetworkId::cms_invalid)
+	{
+		DEBUG_WARNING(true, ("Player %s tried to create prototype with invalid "
+			"schematic or crafting tool.", myIdString));
+		return false;
+	}
+
+	TangibleObject * tool = safe_cast<TangibleObject *>(getCraftingTool().getObject());
+	if (!tool)
+	{
+		WARNING_STRICT_FATAL(true, ("Could not find tool during create prototype phase."));
+		return false;
+	}
+	TangibleObject * prototype = safe_cast<TangibleObject *>(tool->getCraftingPrototype());
+	if (!prototype)
+	{
+		WARNING_STRICT_FATAL(true, ("Could not find prototype during create prototype phase."));
+		return false;
+	}
+
+	ManufactureSchematicObject * const manfSchematic = tool->getCraftingManufactureSchematic();
+	if (manfSchematic == NULL)
+	{
+		WARNING_STRICT_FATAL(true, ("No manf schematic in crafting tool %s",
+			tool->getNetworkId().getValueString().c_str()));
+		return false;
+	}
+
+	// double-check the schematic data
+	Crafting::IngredientSlot sourceSlot;
+	ServerDraftSchematicObjectTemplate::IngredientSlot draftSlot;
+	int numSlots = manfSchematic->getSlotsCount();
+	for (int i = 0; i < numSlots; ++i)
+	{
+		if (!manfSchematic->getSlot(i, sourceSlot, true))
+		{
+			WARNING_STRICT_FATAL(true, ("PlayerObject::createPrototype player "
+				"%s has invalid manf schematic: cannot get slot info for slot %d",
+				owner->getNetworkId().getValueString().c_str(), i));
+			return false;
+		}
+		if (!m_draftSchematic->getSlot(draftSlot, sourceSlot.name))
+		{
+			WARNING_STRICT_FATAL(true, ("PlayerObject::createPrototype player "
+				"%s has invalid manf schematic: cannot get draft info for slot %s",
+				owner->getNetworkId().getValueString().c_str(),
+				sourceSlot.name.getCanonicalRepresentation().c_str()));
+			return false;
+		}
+		if (sourceSlot.ingredientType == Crafting::IT_invalid ||
+			sourceSlot.ingredientType == Crafting::IT_none)
+		{
+			WARNING_STRICT_FATAL(true, ("PlayerObject::createPrototype player "
+				"%s has invalid manf schematic: slot %d has invalid ingredient "
+				"type %d", owner->getNetworkId().getValueString().c_str(), i,
+				static_cast<int>(sourceSlot.ingredientType)));
+			return false;
+		}
+		if (sourceSlot.draftSlotOption < 0 ||
+			sourceSlot.draftSlotOption >= static_cast<int>(draftSlot.options.size()))
+		{
+			WARNING_STRICT_FATAL(true, ("PlayerObject::createPrototype player "
+				"%s has invalid manf schematic: slot %d has invalid slot option %d",
+				owner->getNetworkId().getValueString().c_str(), i,
+				sourceSlot.draftSlotOption));
+			return false;
+		}
+		if (sourceSlot.draftSlotIndex < 0)
+		{
+			WARNING_STRICT_FATAL(true, ("PlayerObject::createPrototype player "
+				"%s has invalid manf schematic: slot %d has invalid slot index %d",
+				owner->getNetworkId().getValueString().c_str(), i,
+				sourceSlot.draftSlotIndex));
+			return false;
+		}
+	}
+
+	// call the trigger OnManufactureObject on the manf schematic to allow the
+	// script to initialize the prototype
+	ScriptParams params;
+	params.addParam(owner->getNetworkId());
+	params.addParam(prototype->getNetworkId());
+	params.addParam(*manfSchematic);
+	params.addParam(true);
+	params.addParam(keepPrototype);
+	if (manfSchematic->getScriptObject()->trigAllScripts(
+		Scripting::TRIG_MANUFACTURE_OBJECT, params) == SCRIPT_OVERRIDE)
+	{
+		return false;
+	}
+
+	if (!tool->addObjectToOutputSlot(*prototype, owner))
+		return false;
+
+	if (!manfSchematic->setObjectComponents(prototype, false))
+	{
+		return false;
+	}
+
+	// tell the client to delete the prototype - we will recreate it when it is
+	// finished being "built"; this is so that the client can be updated with
+	// the prototype's appearance, which may change during the crafting process
+	ObserveTracker::onCraftingPrototypeCreated(*owner, *prototype);
+
+	if (keepPrototype)
+	{
+		// save the prototype to the database
+		prototype->persist();
+
+		ScriptParams craftparams;
+		craftparams.addParam(prototype->getNetworkId());
+		craftparams.addParam(*manfSchematic);
+
+		GameScriptObject * scriptObject = owner->getScriptObject();
+		if(scriptObject)
+		{
+			scriptObject->trigAllScripts(Scripting::TRIG_CRAFTED_PROTOTYPE, craftparams);
+		}
+	}
+	else
+	{
+		prototype->setObjVarItem(OBJVAR_CRAFTING_FAKE_PROTOTYPE, 1);
+	}
+
+	// remove the manufacturing schematic
+	tool->clearCraftingManufactureSchematic();
+	m_experimentPoints = -1;
+	m_craftingStage = static_cast<int>(Crafting::CS_none);
+
+	// lock the tool for the time needed to create the prototype
+	float prototypeTime = m_draftSchematic->getPrototypeTime() * prototype->getComplexity();
+	if (prototypeTime < 1.0f)
+		prototypeTime = 1.0f;
+
+	// send a message to ourself that will unlock the prototype
+	params.clear();
+	params.addParam(owner->getNetworkId(), "crafter");
+	params.addParam(prototype->getNetworkId(), "prototype");
+	ScriptDictionaryPtr dictionary;
+	getScriptObject()->makeScriptDictionary(params, dictionary);
+	if (dictionary.get() != NULL)
+	{
+		dictionary->serialize();
+
+		if (owner->getObjVars().hasItem("crafting_qa"))
+		{
+			Client * client = owner->getClient();
+
+			if (client != NULL && client->isGod())
+			{
+				Chat::sendSystemMessage(*owner, Unicode::narrowToWide("Crafting time changed due to god mode and crafting_qa objvar."), Unicode::emptyString);
+				prototypeTime = 1;
+			}
+		}
+
+//		MessageToQueue::getInstance().sendMessageToJava(tool->getNetworkId(), "prototypeDone", dictionary->getSerializedData(), prototypeTime, true);
+		MessageToQueue::getInstance().sendMessageToJava(tool->getNetworkId(), "prototypeDone", dictionary->getSerializedData(), static_cast<int>(prototypeTime), false);
+
+		tool->setObjVarItem(OBJVAR_CRAFTING_PROTOTYPE_TIME, prototypeTime);
+		tool->setObjVarItem(OBJVAR_CRAFTING_PROTOTYPE_START_TIME, static_cast<int>(ServerClock::getInstance().getGameTimeSeconds()));
+		tool->setObjVarItem(OBJVAR_CRAFTING_PROTOTYPE_OBJECT, prototype->getNetworkId());
+		tool->setObjVarItem(OBJVAR_CRAFTING_PROTOTYPE_CRAFTER, owner->getNetworkId());
+
+		// message the object to update it's counter for the amount of time left
+		// before the prototype is done
+//		MessageToQueue::getInstance().sendMessageToC(tool->getNetworkId(), "C++updateCounter", "", 1.0f, true);
+		MessageToQueue::getInstance().sendMessageToC(tool->getNetworkId(), "C++updateCounter", "", 1, false);
+	}
+	else
+	{
+//		DEBUG_WARNING(true, ("Could not make script dictionary for prototype delay"));
+		WARNING(true, ("PlayerObject::createPrototype for player %s could not "
+			"make script dictionary for prototype delay",
+			owner->getNetworkId().getValueString().c_str()));
+	}
+
+	LOG("CustomerService", ("Crafting:%s has crafted a prototype item %s",
+//		PlayerObject::getAccountDescription(owner->getNetworkId()).c_str(), ServerObject::getLogDescription(prototype).c_str()));
+		PlayerObject::getAccountDescription(owner->getNetworkId()).c_str(),
+		ServerObject::getLogDescription(prototype).c_str()));
+
+	return true;
+}	// PlayerObject::createPrototype
+
+//----------------------------------------------------------------------
+
+/**
+ * Moves the manufacturing schematic from it's temporary container to the output
+ * hopper of the crafting tool.
+ *
+ * @return true on success, false on fail
+ */
+bool PlayerObject::createManufacturingSchematic()
+{
+	static SlotId datapadSlotId = SlotIdManager::findSlotId(DATAPAD_SLOT_NAME);
+
+	// if we are not near a station, we cannot make a manf schematic
+	if (getCraftingLevel() <= 1)
+		return false;
+
+	CreatureObject * const owner = getCreatureObject();
+	if (owner == NULL)
+		return false;
+
+	// @todo: need to filter the name
+
+	// verify we are in the final crafting phase
+	if (m_craftingStage.get() != static_cast<int>(Crafting::CS_finish))
+	{
+		WARNING(true, ("Player %s tried to create manf schematic when not in final phase", getNetworkId().getValueString().c_str ()));
+		return false;
+	}
+
+	if (m_draftSchematic.getPointer() == NULL || getCraftingTool() == NetworkId::cms_invalid)
+	{
+		WARNING(true, ("Player %s tried to create manf schematic with invalid schematic or crafting tool.", getNetworkId().getValueString().c_str ()));
+		return false;
+	}
+	if (m_draftSchematic->getItemsPerContainer() == 0)
+	{
+		WARNING(true, ("Player %s tried to create manf schematic with schematic "
+			"%s that disallows manufacturing.", getAccountDescription().c_str(),
+			m_draftSchematic->getObjectTemplateName()));
+		return false;
+	}
+
+	TangibleObject * const tool = safe_cast<TangibleObject *>(getCraftingTool().getObject());
+	if (tool == NULL)
+	{
+		WARNING_STRICT_FATAL(true, ("Could not find crafting tool during create manf schematic phase."));
+		return false;
+	}
+	ManufactureSchematicObject * const manfSchematic = tool->removeCraftingManufactureSchematic();
+	if (manfSchematic == NULL)
+	{
+		WARNING_STRICT_FATAL(true, ("Could not find manf schematic during create manf schematic phase."));
+		return false;
+	}
+	TangibleObject * const prototype = safe_cast<TangibleObject *>(tool->getCraftingPrototype());
+	if (prototype == NULL)
+	{
+		WARNING_STRICT_FATAL(true, ("Could not find prototype during create manf schematic phase."));
+		return false;
+	}
+
+	// no manufacturing a bio-linked item
+	if (m_craftingComponentBioLink.get() != NetworkId::cms_invalid)
+	{
+		WARNING(true, ("Player %s tried to create manf schematic while using a "
+			"bio-linked component %s.", getAccountDescription().c_str(),
+			m_craftingComponentBioLink.get().getValueString().c_str()));
+		return false;
+	}
+
+	// double-check the schematic data
+	Crafting::IngredientSlot sourceSlot;
+	ServerDraftSchematicObjectTemplate::IngredientSlot draftSlot;
+	int numSlots = manfSchematic->getSlotsCount();
+	for (int i = 0; i < numSlots; ++i)
+	{
+		if (!manfSchematic->getSlot(i, sourceSlot, true))
+		{
+			WARNING_STRICT_FATAL(true, ("PlayerObject::createManufacturingSchematic player "
+				"%s has invalid manf schematic: cannot get slot info for slot %d",
+				getAccountDescription().c_str(), i));
+			return false;
+		}
+		if (!m_draftSchematic->getSlot(draftSlot, sourceSlot.name))
+		{
+			WARNING_STRICT_FATAL(true, ("PlayerObject::createManufacturingSchematic player "
+				"%s has invalid manf schematic: cannot get draft info for slot %s",
+				getAccountDescription().c_str(),
+				sourceSlot.name.getCanonicalRepresentation().c_str()));
+			return false;
+		}
+		if (sourceSlot.ingredientType == Crafting::IT_invalid ||
+			sourceSlot.ingredientType == Crafting::IT_none)
+		{
+			WARNING_STRICT_FATAL(true, ("PlayerObject::createManufacturingSchematic player "
+				"%s has invalid manf schematic: slot %d has invalid ingredient "
+				"type %d", getAccountDescription().c_str(), i,
+				static_cast<int>(sourceSlot.ingredientType)));
+			return false;
+		}
+		if (sourceSlot.draftSlotOption < 0 ||
+			sourceSlot.draftSlotOption >= static_cast<int>(draftSlot.options.size()))
+		{
+			WARNING_STRICT_FATAL(true, ("PlayerObject::createManufacturingSchematic player "
+				"%s has invalid manf schematic: slot %d has invalid slot option %d",
+				getAccountDescription().c_str(), i,
+				sourceSlot.draftSlotOption));
+			return false;
+		}
+		if (sourceSlot.draftSlotIndex < 0)
+		{
+			WARNING_STRICT_FATAL(true, ("PlayerObject::createManufacturingSchematic player "
+				"%s has invalid manf schematic: slot %d has invalid slot index %d",
+				getAccountDescription().c_str(), i,
+				sourceSlot.draftSlotIndex));
+			return false;
+		}
+	}
+
+	// call the trigger OnFinalizeSchematic on the manf schematic to allow the
+	// script to initialize it
+	ScriptParams params;
+	params.addParam(owner->getNetworkId());
+	params.addParam(prototype->getNetworkId());
+	params.addParam(*manfSchematic);
+	if (manfSchematic->getScriptObject()->trigAllScripts(Scripting::TRIG_FINALIZE_SCHEMATIC, params) == SCRIPT_OVERRIDE)
+	{
+		return false;
+	}
+
+	manfSchematic->clearSlotSources();
+	manfSchematic->storeObjectAttributes (*prototype);
+	manfSchematic->removeObjVarItem(OBJVAR_IN_CRAFTING_SESSION);
+	manfSchematic->persist();
+
+	ServerObject * const datapad = owner->getDatapad ();
+	if (datapad == NULL)
+	{
+		DEBUG_WARNING(true, ("Can't find datapad for player %s", getAccountDescription().c_str()));
+		return false;
+	}
+
+	Container::ContainerErrorCode tmp = Container::CEC_Success;
+	if (!ContainerInterface::transferItemToVolumeContainer(*datapad, *manfSchematic, NULL, tmp))
+	{
+		return false;
+	}
+
+	tool->clearCraftingPrototype();
+	m_experimentPoints = -1;
+	m_craftingStage = static_cast<int>(Crafting::CS_none);
+
+	LOG("CustomerService", ("Crafting:%s has crafted a manufacturing schematic %s",
+		getAccountDescription().c_str(), ServerObject::getLogDescription(manfSchematic).c_str()));
+
+	return true;
+}	// PlayerObject::createManufacturingSchematic
+
+//----------------------------------------------------------------------
+
+/**
+ * Restarts the crafting session with the same draft schematic as this one.
+ *
+ * @return true on success, false on fail
+ */
+bool PlayerObject::restartCrafting ()
+{
+	CreatureObject * const owner = getCreatureObject();
+	if (owner == NULL)
+		return false;
+
+	std::string myId = getNetworkId().getValueString();
+	const char * myIdString = myId.c_str();
+	UNREF(myIdString);		// needed for release mode
+
+	// make sure we are crafting
+	if (m_craftingStage.get() == static_cast<int>(Crafting::CS_none))
+	{
+		DEBUG_WARNING(true, ("Player %s tried to restart crafting when not crafting",
+			myIdString));
+		return false;
+	}
+	if (m_craftingStage.get() == static_cast<int>(Crafting::CS_finish))
+	{
+		DEBUG_WARNING(true, ("Player %s tried to restart crafting when crafting over",
+			myIdString));
+		return false;
+	}
+
+	// verify the tool
+	if (m_draftSchematic.getPointer() == NULL || getCraftingTool() == NetworkId::cms_invalid)
+	{
+		DEBUG_WARNING(true, ("Player %s tried to start crafting experimentation "
+			"with invalid schematic or crafting tool.", myIdString));
+		return false;
+	}
+	TangibleObject * tool = safe_cast<TangibleObject *>(getCraftingTool().getObject());
+	NOT_NULL(tool);
+	if (!tool)
+		return false;
+
+	// reset the manf schematic
+	ManufactureSchematicObject * manfSchematic = tool->getCraftingManufactureSchematic();
+	if (manfSchematic == NULL)
+	{
+		DEBUG_WARNING(true, ("Player %s has no manufacturing schematic!", myIdString));
+		return false;
+	}
+
+	// if we are at the assembly stage of crafting, or the draft schematic says
+	// not to destroy the ingredients, put the ingredients in the schematic back
+	// in the player's inventory or station hopper
+	if (!manfSchematic->mustDestroyIngredients() ||
+		m_craftingStage.get() == static_cast<int>(Crafting::CS_assembly))
+	{
+		setAllowEmptySlot(true);
+		int count = manfSchematic->getSlotsCount();
+		// note this loop is odd because when we clear a slot it may
+		// actually be removed if it was optional
+		for (int i = 0; i < count;)
+		{
+			if (emptySlot(i, NetworkId::cms_invalid))
+			{
+				if (count == manfSchematic->getSlotsCount())
+					++i;
+				else
+					count = manfSchematic->getSlotsCount();
+			}
+			else
+				++i;
+		}
+		setAllowEmptySlot(false);
+	}
+	else
+	{
+		manfSchematic->destroyAllIngredients();
+	}
+
+	// reset the manf schematic data
+	manfSchematic->reset();
+	m_craftingComponentBioLink = NetworkId::cms_invalid;
+
+	m_craftingStage = static_cast<int>(Crafting::CS_assembly);
+	return true;
+}	// PlayerObject::restartCrafting
+
+//----------------------------------------------------------------------
+
+/**
+ * Ends a crafting session.
+ *
+ * @param normalExit		flag that we are exiting due to normal circumstances
+ */
+void PlayerObject::stopCrafting (bool normalExit)
+{
+	CreatureObject * const owner = getCreatureObject();
+
+	if (getCraftingTool().getObject() != NULL)
+	{
+		TangibleObject * tool = dynamic_cast<TangibleObject *>(getCraftingTool().getObject());
+		if (tool != NULL)
+		{
+			IGNORE_RETURN(tool->stopCraftingSession());
+		}
+
+		// tell scripts that the session has ended
+		ScriptParams params;
+		if (owner != NULL)
+			params.addParam(owner->getNetworkId());
+		else
+			params.addParam(getNetworkId());
+		if (getCurrentDraftSchematic() != NULL)
+			params.addParam(getCurrentDraftSchematic()->getTemplateName());
+		else
+			params.addParam("");
+		params.addParam(static_cast<int>(m_craftingStage.get()));
+		params.addParam(normalExit);
+		IGNORE_RETURN(tool->getScriptObject()->trigAllScripts(
+			Scripting::TRIG_CRAFTING_DONE, params));
+	}
+
+	m_craftingStage = static_cast<int>(Crafting::CS_none);
+	m_useableDraftSchematics.clear();
+	m_craftingTool = CachedNetworkId::cms_cachedInvalid;
+	m_craftingComponentBioLink = NetworkId::cms_invalid;
+
+	// tell the player crafting has ended
+	if (owner != NULL && owner->getController() != NULL)
+	{
+		(safe_cast<ServerController *>(owner->getController()))->appendMessage(
+			static_cast<int>(CM_craftingSessionEnded), 0.0f,
+				new MessageQueueGenericValueType<bool>(normalExit),
+			GameControllerMessageFlags::SEND |
+			GameControllerMessageFlags::RELIABLE |
+			GameControllerMessageFlags::DEST_AUTH_CLIENT);
+	}
+}	// PlayerObject::stopCrafting
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+{
+	IntangibleObject::getAttributes(data);
+}
+
+/**
+ * Sets the player's friend list
+ *
+ * @param friendList - The new player's friend list
+ */
+void PlayerObject::setFriendList(const StringVector &friendList)
+{
+	//DEBUG_REPORT_LOG(true, ("PlayerObject::setFriendList() - Old Friend List\n"));
+	//DEBUG_REPORT_LOG(true, ("PlayerObject::setFriendList() - <count> %d\n", m_friendList.size()));
+	//DEBUG_REPORT_LOG(true, ("PlayerObject::setFriendList() - New Friend List\n"));
+	//DEBUG_REPORT_LOG(true, ("PlayerObject::setFriendList() - <count> %d\n", friendList.size()));
+
+	if (isAuthoritative())
+	{
+		// construct lowercase, sorted friend list
+		size_t const size = friendList.size();
+		StringVector friendListLowercaseSorted(size);
+		for (size_t index = 0; index < size; ++index)
+		{
+			friendListLowercaseSorted[index] = Unicode::toLower(friendList[index]);
+		}
+
+		if (!friendListLowercaseSorted.empty())
+		{
+			std::sort(friendListLowercaseSorted.begin(), friendListLowercaseSorted.end());
+		}
+
+		LOG("ChatFriendIgnoreList", ("Friend=%d, %s", friendListLowercaseSorted.size(), getAccountDescription().c_str()));
+		m_friendList.set(friendListLowercaseSorted);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::requestFriendList() const
+{
+	CreatureObject const *owner = safe_cast<const CreatureObject *>(ContainerInterface::getContainedByObject(*this));
+
+	if (owner != NULL)
+	{
+		ChatAvatarId chatAvatarId(Chat::constructChatAvatarId(*owner));
+
+		DEBUG_WARNING(chatAvatarId.name.empty(), ("Chat avatar id name is empty"));
+
+		Chat::getFriendsList(chatAvatarId.getFullName());
+	}
+}
+
+/**
+ * Determines whether the specified name is a friend of this player
+ *
+ * @param name - The name of the friend
+ */
+bool PlayerObject::isFriend(const std::string &name) const
+{
+	std::string firstName;
+	size_t pos = 0;
+	IGNORE_RETURN(Unicode::getFirstToken(name, 0, pos, firstName));
+
+	return std::binary_search(m_friendList.begin(), m_friendList.end(), Unicode::toLower(firstName));
+}
+
+/**
+ * Sets the player's list of people to ignore
+ *
+ * @param ignoreList - The new player's list of people to ignore
+ */
+void PlayerObject::setIgnoreList(const StringVector &ignoreList)
+{
+	//DEBUG_REPORT_LOG(true, ("PlayerObject::setIgnoreList() - Old Ignore List\n"));
+	//DEBUG_REPORT_LOG(true, ("PlayerObject::setIgnoreList() - <count> %d\n", m_ignoreList.size()));
+	//DEBUG_REPORT_LOG(true, ("PlayerObject::setIgnoreList() - New Ignore List\n"));
+	//DEBUG_REPORT_LOG(true, ("PlayerObject::setIgnoreList() - <count> %d\n", ignoreList.size()));
+
+	if (isAuthoritative ())
+	{
+		// construct lowercase, sorted ignore list
+		size_t const size = ignoreList.size();
+		StringVector ignoreListLowercaseSorted(size);
+		for (size_t index = 0; index < size; ++index)
+		{
+			ignoreListLowercaseSorted[index] = Unicode::toLower(ignoreList[index]);
+		}
+
+		if (!ignoreListLowercaseSorted.empty())
+		{
+			std::sort(ignoreListLowercaseSorted.begin(), ignoreListLowercaseSorted.end());
+		}
+
+		LOG("ChatFriendIgnoreList", ("Ignore=%d, %s", ignoreListLowercaseSorted.size(), getAccountDescription().c_str()));
+		m_ignoreList.set(ignoreListLowercaseSorted);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::requestIgnoreList() const
+{
+	CreatureObject const *owner = safe_cast<const CreatureObject *>(ContainerInterface::getContainedByObject(*this));
+
+	if (owner != NULL)
+	{
+		ChatAvatarId chatAvatarId(Chat::constructChatAvatarId(*owner));
+
+		DEBUG_WARNING(chatAvatarId.name.empty(), ("Chat avatar id name is empty"));
+
+		Chat::getIgnoreList(chatAvatarId.getFullName());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::isIgnoring(const std::string &name) const
+{
+	std::string firstName;
+	size_t pos = 0;
+	IGNORE_RETURN(Unicode::getFirstToken(name, 0, pos, firstName));
+
+	return std::binary_search(m_ignoreList.begin(), m_ignoreList.end(), Unicode::toLower(firstName));
+}
+
+/**
+ * Sets a player's personal matchmaking id
+ *
+ * @param matchMakingId - The new match making id which describes their personality
+ */
+void PlayerObject::setMatchMakingPersonalProfileId(MatchMakingId const &id)
+{
+	if (isAuthoritative ())
+	{
+		//DEBUG_REPORT_LOG(true, ("PlayerObject::setMatchMakingPersonalProfileId() <old> %s <new> %s\n", m_matchMakingPersonalProfileId.get().getDebugIntString().c_str(), id.getDebugIntString().c_str()));
+
+		m_matchMakingPersonalProfileId = id;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+MatchMakingId const &PlayerObject::getMatchMakingPersonalProfileId() const
+{
+	return m_matchMakingPersonalProfileId.get();
+}
+
+/**
+ * Sets a player's character matchmaking id
+ *
+ * @param matchMakingId - The new match making id which describes their character
+ */
+void PlayerObject::setMatchMakingCharacterProfileId(MatchMakingId const &id)
+{
+	if (isAuthoritative())
+	{
+		m_matchMakingCharacterProfileId = id;
+
+		//DEBUG_REPORT_LOG(true, ("MatchMakingCharacterProfileId: <anonymous>         %s\n", m_matchMakingCharacterProfileId.get().isBitSet(MatchMakingId::B_anonymous) ? "Yes" : "No"));
+		//DEBUG_REPORT_LOG(true, ("MatchMakingCharacterProfileId: <helper>            %s\n", m_matchMakingCharacterProfileId.get().isBitSet(MatchMakingId::B_helper) ? "Yes" : "No"));
+		//DEBUG_REPORT_LOG(true, ("MatchMakingCharacterProfileId: <roleplay>          %s\n", m_matchMakingCharacterProfileId.get().isBitSet(MatchMakingId::B_rolePlay) ? "Yes" : "No"));
+		//DEBUG_REPORT_LOG(true, ("MatchMakingCharacterProfileId: <looking for group> %s\n", m_matchMakingCharacterProfileId.get().isBitSet(MatchMakingId::B_lookingForGroup) ? "Yes" : "No"));
+
+		CreatureObject const * const owner = getCreatureObject();
+		if (owner)
+		{
+			std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData();
+			std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = connectedCharacterLfgData.find(owner->getNetworkId());
+			if (iterFind != connectedCharacterLfgData.end())
+			{	
+				bool const anonymous = id.isBitSet(MatchMakingId::B_anonymous);
+				if (iterFind->second.anonymous != anonymous)
+					ServerUniverse::setConnectedCharacterAnonymousData(owner->getNetworkId(), anonymous);
+
+				bool const searchableByCtsSourceGalaxy = id.isBitSet(MatchMakingId::B_searchableByCtsSourceGalaxy);
+				if (iterFind->second.searchableByCtsSourceGalaxy != searchableByCtsSourceGalaxy)
+					ServerUniverse::setConnectedCharacterSearchableByCtsSourceGalaxyData(owner->getNetworkId(), searchableByCtsSourceGalaxy);
+
+				bool const displayLocationInSearchResults = id.isBitSet(MatchMakingId::B_displayLocationInSearchResults);
+				if (iterFind->second.displayLocationInSearchResults != displayLocationInSearchResults)
+					ServerUniverse::setConnectedCharacterDisplayLocationInSearchResultsData(owner->getNetworkId(), displayLocationInSearchResults);
+
+				BitArray characterInterests = iterFind->second.characterInterests;
+
+				if (id.isBitSet(MatchMakingId::B_lookingForGroup))
+					LfgDataTable::setBit("lfg", characterInterests);
+				else
+					LfgDataTable::clearBit("lfg", characterInterests);
+
+				if (id.isBitSet(MatchMakingId::B_helper))
+					LfgDataTable::setBit("helper", characterInterests);
+				else
+					LfgDataTable::clearBit("helper", characterInterests);
+
+				if (id.isBitSet(MatchMakingId::B_rolePlay))
+					LfgDataTable::setBit("rp", characterInterests);
+				else
+					LfgDataTable::clearBit("rp", characterInterests);
+
+				if (id.isBitSet(MatchMakingId::B_lookingForWork))
+					LfgDataTable::setBit("lfw", characterInterests);
+				else
+					LfgDataTable::clearBit("lfw", characterInterests);
+
+				if (iterFind->second.characterInterests != characterInterests)
+					ServerUniverse::setConnectedCharacterInterestsData(owner->getNetworkId(), characterInterests);
+			}
+		}
+	}
+}
+
+MatchMakingId const &PlayerObject::getMatchMakingCharacterProfileId() const
+{
+	return m_matchMakingCharacterProfileId.get();
+}
+
+/**
+* Toggles the player's SearchableByCtsSourceGalaxy status.
+*/
+void PlayerObject::toggleSearchableByCtsSourceGalaxy()
+{
+	if (isAuthoritative())
+	{
+		MatchMakingId matchMakingId(m_matchMakingCharacterProfileId.get());
+
+		matchMakingId.toggleBit(MatchMakingId::B_searchableByCtsSourceGalaxy);
+
+		setMatchMakingCharacterProfileId(matchMakingId);
+	}
+}
+
+/**
+* Toggles the player's DisplayLocationInSearchResults status.
+*/
+void PlayerObject::toggleDisplayLocationInSearchResults()
+{
+	if (isAuthoritative())
+	{
+		MatchMakingId matchMakingId(m_matchMakingCharacterProfileId.get());
+
+		matchMakingId.toggleBit(MatchMakingId::B_displayLocationInSearchResults);
+
+		setMatchMakingCharacterProfileId(matchMakingId);
+	}
+}
+
+/**
+ * Toggles the player's anonymous status.
+ */
+void PlayerObject::toggleAnonymous()
+{
+	if (isAuthoritative())
+	{
+		MatchMakingId matchMakingId(m_matchMakingCharacterProfileId.get());
+
+		matchMakingId.toggleBit(MatchMakingId::B_anonymous);
+
+		setMatchMakingCharacterProfileId(matchMakingId);
+	}
+}
+
+/**
+ * Toggles the player's helper status.
+ */
+void PlayerObject::toggleHelper()
+{
+	if (isAuthoritative())
+	{
+		MatchMakingId matchMakingId(m_matchMakingCharacterProfileId.get());
+
+		matchMakingId.toggleBit(MatchMakingId::B_helper);
+
+		setMatchMakingCharacterProfileId(matchMakingId);
+	}
+}
+
+/**
+ * Toggles the player's roleplay status.
+ */
+void PlayerObject::toggleRolePlay()
+{
+	if (isAuthoritative())
+	{
+		MatchMakingId matchMakingId(m_matchMakingCharacterProfileId.get());
+
+		matchMakingId.toggleBit(MatchMakingId::B_rolePlay);
+
+		setMatchMakingCharacterProfileId(matchMakingId);
+	}
+}
+
+// ----------------------------------------------------------------------
+bool PlayerObject::isLookingForGroup() const
+{
+	return m_matchMakingCharacterProfileId.get().isBitSet(MatchMakingId::B_lookingForGroup);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setLookingForGroup(bool const lookingForGroup)
+{
+	if (isAuthoritative())
+	{
+		MatchMakingId matchMakingId(m_matchMakingCharacterProfileId.get());
+
+		matchMakingId.resetBit(MatchMakingId::B_lookingForGroup);
+
+		setMatchMakingCharacterProfileId(matchMakingId);
+	}
+}
+
+/**
+ * Toggles the player's looking for group status.
+ */
+void PlayerObject::toggleLookingForGroup()
+{
+	if (isAuthoritative())
+	{
+		MatchMakingId matchMakingId(m_matchMakingCharacterProfileId.get());
+
+		matchMakingId.toggleBit(MatchMakingId::B_lookingForGroup);
+
+		setMatchMakingCharacterProfileId(matchMakingId);
+	}
+}
+
+/**
+ * Returns the player's away from keyboard status.
+ */
+bool PlayerObject::isAwayFromKeyBoard() const
+{
+	return m_matchMakingCharacterProfileId.get().isBitSet(MatchMakingId::B_awayFromKeyBoard);
+}
+
+/**
+ * Toggles the player's away from keyboard status.
+ */
+void PlayerObject::toggleAwayFromKeyBoard()
+{
+	if (isAuthoritative())
+	{
+		MatchMakingId matchMakingId(m_matchMakingCharacterProfileId.get());
+
+		matchMakingId.toggleBit(MatchMakingId::B_awayFromKeyBoard);
+
+		setMatchMakingCharacterProfileId(matchMakingId);
+	}
+}
+
+/**
+ * Toggles the player's display of their faction rank.
+ */
+void PlayerObject::toggleDisplayingFactionRank()
+{
+	if (isAuthoritative())
+	{
+		MatchMakingId matchMakingId(m_matchMakingCharacterProfileId.get());
+
+		matchMakingId.toggleBit(MatchMakingId::B_displayingFactionRank);
+
+		setMatchMakingCharacterProfileId(matchMakingId);
+	}
+}
+
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setLinkDead(bool const linkDead)
+{
+	if (isAuthoritative())
+	{
+		MatchMakingId matchMakingId(m_matchMakingCharacterProfileId.get());
+
+		if (linkDead)
+		{
+			matchMakingId.setBit(MatchMakingId::B_linkDead);
+		}
+		else
+		{
+			matchMakingId.resetBit(MatchMakingId::B_linkDead);
+		}
+
+		setMatchMakingCharacterProfileId(matchMakingId);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::getLinkDead() const
+{
+	MatchMakingId const matchMakingId(m_matchMakingCharacterProfileId.get());
+	return matchMakingId.isBitSet(MatchMakingId::B_linkDead);
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::adjustLotCount(int adjustment)
+{
+	CreatureObject * const owner = getCreatureObject();
+	if (!owner)
+		return false;
+
+	if (isAuthoritative())
+	{
+		if (adjustment > 0 &&
+			(m_accountNumLots.get() + adjustment) > (ConfigServerGame::getMaxLotsPerAccount() + m_accountMaxLotsAdjustment.get()))
+		{
+			DEBUG_REPORT_LOG(true,("Account %lu is not allowed to use any more lots.  (Already has %i, limit is %i, tried to use %i more.)\n",
+								   m_stationId.get(), m_accountNumLots.get(), ConfigServerGame::getMaxLotsPerAccount() + m_accountMaxLotsAdjustment.get(), adjustment));
+			return false;
+		}
+		else
+		{
+			m_accountNumLots = m_accountNumLots.get() + adjustment;
+			// make sure the number of used lot doesn't go below 0, because
+			// it means we would be giving the player extra lots
+			if (m_accountNumLots.get() < 0)
+				m_accountNumLots = 0;
+
+			// if no longer over the lot limit, remove lot over limit restriction
+			if (m_accountNumLots.get() <= owner->getMaxNumberOfLots())
+			{
+				m_accountNumLotsOverLimitSpam = 0;
+				owner->removeObjVarItem("lotOverlimit");
+			}
+
+			return true;
+		}
+	}
+	else
+	{
+		owner->sendControllerMessageToAuthServer(CM_adjustLotCount, new MessageQueueGenericValueType<int>(adjustment));
+		return true;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setTitle(std::string const &title)
+{
+	if (isAuthoritative())
+	{
+		// Make sure the skill title requested is valid
+		if (title == "city_gcw_region_defender")
+		{
+			std::pair<std::string, std::pair<bool, bool> > const & cityGcwDefenderRegionInfo = getCityGcwDefenderRegionInfo();
+			if (!cityGcwDefenderRegionInfo.first.empty() && cityGcwDefenderRegionInfo.second.second)
+			{
+				if (title != m_skillTitle.get())
+					m_skillTitle = title;
+			}
+		}
+		else if (title == "guild_gcw_region_defender")
+		{
+			std::pair<std::string, std::pair<bool, bool> > const & guildGcwDefenderRegionInfo = getGuildGcwDefenderRegionInfo();
+			if (!guildGcwDefenderRegionInfo.first.empty() && guildGcwDefenderRegionInfo.second.second)
+			{
+				if (title != m_skillTitle.get())
+					m_skillTitle = title;
+			}
+		}
+		else if (title.empty() || (title == "citizenship") || (SkillManager::getInstance().getSkill(title) != NULL) || (CollectionsDataTable::isASlotTitle(title) != NULL) || (CollectionsDataTable::isACollectionTitle(title) != NULL) || (CollectionsDataTable::isAPageTitle(title) != NULL) || (GuildRankDataTable::isARankTitle(title) != NULL) || (CitizenRankDataTable::isARankTitle(title) != NULL))
+		{
+			if (title != m_skillTitle.get())
+				m_skillTitle = title;
+		}
+		else
+		{
+			WARNING(true, ("The player is trying to set a title that does not exist in the SkillManager or the CollectionsDataTable or the GuildRankDataTable or the CitizenRankDataTable: [%s]", title.c_str()));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+std::string const &PlayerObject::getTitle() const
+{
+	return m_skillTitle.get();
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setSpokenLanguage(int const languageId)
+{
+	if (isAuthoritative() && GameLanguageManager::isLanguageValid(languageId))
+	{
+		m_spokenLanguage = languageId;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+int PlayerObject::getSpokenLanguage() const
+{
+	return m_spokenLanguage.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::isIgnoring(NetworkId const &target, NetworkId const &source)
+{
+	std::string const &sourceName = NameManager::getInstance().getPlayerName(source);
+	if (!sourceName.empty())
+	{
+		Object const * const o = NetworkIdManager::getObjectById(target);
+
+		if (o)
+		{
+			ServerObject const * const so = o->asServerObject();
+			if (so)
+			{
+				CreatureObject const * const co = so->asCreatureObject();
+				if (co)
+				{
+					PlayerObject const * const targetPlayerObject = PlayerCreatureController::getPlayerObject(co);
+					if (targetPlayerObject)
+						return targetPlayerObject->isIgnoring(sourceName);
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setMaxForcePower(int value)
+{
+	if (isAuthoritative())
+	{
+		if (value < 0)
+			value = 0;
+		m_maxForcePower = value;
+		if (m_forcePower.get() > value)
+			m_forcePower = value;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setMaxForcePower,
+			new MessageQueueGenericValueType<int>(value));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void PlayerObject::setForcePower(int value)
+{
+	if (isAuthoritative())
+	{
+		if (value < 0)
+			value = 0;
+		else if (value > m_maxForcePower.get())
+			value = m_maxForcePower.get();
+		m_forcePower = value;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setForcePower,
+			new MessageQueueGenericValueType<int>(value));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void PlayerObject::setForcePowerRegenRate(float value)
+{
+	if ((isJedi() == 0) && (getMaxForcePower() == 0))
+		return;
+
+	if (isAuthoritative())
+	{
+		if (value < ConfigServerGame::getMinForcePowerRegenRate())
+			value = ConfigServerGame::getMinForcePowerRegenRate();
+
+		m_forceRegenRate = value;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setForceRegenRate,
+			new MessageQueueGenericValueType<float>(value));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void PlayerObject::regenerateForcePower(float time)
+{
+	int forcePower = getForcePower();
+	if (forcePower < getMaxForcePower())
+	{
+		setForcePower(forcePower + getForcePowerRegen(time));
+	}
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Returns the amount of force power regenerated for a given timeslice.
+ *
+ * @param time		amount of time that has passed
+ *
+ * @return the amount of force power regenerated
+ */
+int PlayerObject::getForcePowerRegen(float time)
+{
+	// make sure we are force sensitive
+	if ((isJedi() == 0) && (getMaxForcePower() == 0))
+		return 0;
+
+	if (time <= 0)
+	{
+		WARNING(true, ("PlayerObject::getForcePowerRegen called for player %s "
+			"with time %f <= 0", getAccountDescription().c_str(), time));
+		return 0;
+	}
+
+	// double-check the regen rate
+	float minRate = ConfigServerGame::getMinForcePowerRegenRate();
+	if (minRate <= 0)
+	{
+		WARNING_STRICT_FATAL(true, ("PlayerObject::getForcePowerRegen: min regen "
+			"rate = %f", minRate));
+		minRate = 0.1f;
+	}
+	float rate = getForcePowerRegenRate();
+	if (rate < minRate)
+	{
+		WARNING(true, ("PlayerObject::getForcePowerRegen called for player %s "
+			"with regen rate %f < min rate %f", getAccountDescription().c_str(),
+			rate, minRate));
+		setForcePowerRegenRate(minRate);
+		rate = minRate;
+	}
+
+	float regenValue = 0;
+
+	// compute the amount of regen power accumulated; if it is over the threshold,
+	// we regenerate
+	float newValue = m_forceRegenValue.get() + rate * time;
+	if (newValue > ConfigServerGame::getRegenThreshold())
+	{
+		regenValue = static_cast<float>(floor(newValue));
+		newValue -= regenValue;
+
+	}
+	m_forceRegenValue = newValue;
+
+	return static_cast<int>(regenValue);
+}	// PlayerObject::getForcePowerRegen
+
+//----------------------------------------------------------------------
+
+/**
+ * Grant a Jedi slot to this account.  (Calling this function more than
+ * once will not create multiple Jedi slots.)
+ * NOTE:  Not guaranteed to succeed, because it depends on a connection to
+ * a LoginServer, which is not guaranteed to be up.  Call this function
+ * again if you don't get addJediToAccountAck() in a reasonable amount of time.
+ */
+void PlayerObject::addJediToAccount() const
+{
+	const CreatureObject * owner = safe_cast<const CreatureObject *>(ContainerInterface::getContainedByObject(*this));
+	if (owner)
+	{
+		LOG("CustomerService", ("Jedi: Requesting extra character slot for player %s", getAccountDescription().c_str()));
+		LoginUpgradeAccountMessage const luam(LoginUpgradeAccountMessage::UT_addJedi,m_stationId.get(),owner->getNetworkId(),getNetworkId(),"C++JediAdded","",false);
+		GameServer::getInstance().sendToCentralServer(luam);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Acknowledgement to addJediToAccount().  Until this function is called,
+ * it is not guaranteed that the account is enabled for Jedi.
+ */
+void PlayerObject::addJediToAccountAck() const
+{
+	CreatureObject * owner = const_cast<CreatureObject *>(safe_cast<
+		const CreatureObject *>(ContainerInterface::getContainedByObject(*this)));
+	if (owner)
+	{
+		LOG("CustomerService", ("Jedi: Got extra character slot ack for player %s", getAccountDescription().c_str()));
+		owner->addJediToAccountAck();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Flags that this character is spectral in the account database.  Not
+ * guaranteed -- repeat the call if makeSpectralOnAccountAck() is not called.
+ */
+void PlayerObject::makeSpectralOnAccount() const
+{
+	const CreatureObject * owner = safe_cast<const CreatureObject *>(ContainerInterface::getContainedByObject(*this));
+	if (owner)
+	{
+		LoginUpgradeAccountMessage const luam(LoginUpgradeAccountMessage::UT_setSpectral,m_stationId.get(),owner->getNetworkId(), getNetworkId(),"C++SpectralSet","",false);
+		GameServer::getInstance().sendToCentralServer(luam);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::makeSpectralOnAccountAck() const
+{
+	const CreatureObject * owner = safe_cast<const CreatureObject *>(ContainerInterface::getContainedByObject(*this));
+	if (owner)
+	{
+		Chat::sendSystemMessage(*owner,Unicode::narrowToWide("Character marked as spectral in the login database."),Unicode::String());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::handleCMessageTo(const MessageToPayload &message)
+{
+	if (message.getMethod() == "C++JediAdded")
+	{
+		addJediToAccountAck();
+	}
+	else if (message.getMethod() == "C++SpectralSet")
+	{
+		makeSpectralOnAccountAck();
+	}
+	else if (message.getMethod() == "C++ClearTheater")
+	{
+		clearTheater();
+	}
+	else if (message.getMethod() == "C++TheaterDestroyed")
+	{
+		const std::vector<int8> & data = message.getPackedDataVector();
+		std::string theaterIdString(data.begin(), data.end());
+		if (theaterIdString == m_theaterId.get().getValueString())
+			m_theaterId = NetworkId::cms_invalid;
+	}
+	else if (message.getMethod() == "C++RecalculateGcwRating")
+	{
+		m_gcwRatingActualCalcTime = 0;
+		handleRecalculateGcwRating();
+	}
+	else if (message.getMethod() == "C++updateConnectedCharacterLfgData")
+	{
+		CreatureObject * const owner = getCreatureObject();
+		if (m_sessionStartPlayTime.get() != 0)
+		{
+			if (owner)
+			{
+				// check for changes to the player's GCW Region information, and update if necessary; must be
+				// called first as it updates information that is used later by other stuff in this function
+				updateGcwRegionInfo();
+
+				{
+				LfgCharacterData lfgCharacterData;
+				owner->getLfgCharacterData(lfgCharacterData);
+
+				std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData();
+				std::map<NetworkId, LfgCharacterData>::const_iterator iterFindLfg = connectedCharacterLfgData.find(owner->getNetworkId());
+				if ((iterFindLfg == connectedCharacterLfgData.end()) || (iterFindLfg->second != lfgCharacterData))
+					ServerUniverse::setConnectedCharacterLfgData(owner->getNetworkId(), lfgCharacterData);
+
+				// grant GCW factional presence score
+				if (!lfgCharacterData.locationFactionalPresenceGcwRegion.empty())
+					grantGcwFactionalPresenceScore(lfgCharacterData.locationFactionalPresenceGcwRegion, *this, *owner);
+				}
+
+				{
+				BiographyManager::requestBiography(owner->getNetworkId(), NULL);
+				}
+
+				bool needsTitleCheck = false;
+
+				// if the character is a guild member (or just sponsored), make sure the guild member
+				// profession and level matches the actual profession and level of the character
+
+				// also check to see if the guild member rank has changed, and if so, update the guild member rank information
+				{
+					int guildId = owner->getGuildId();
+					bool const isGuildMember = (guildId != 0);
+
+					// if character is not a guild member, see if character has been sponsored for guild membership
+					if (guildId == 0)
+					{
+						guildId = GuildInterface::getGuildIdForSponsored(owner->getNetworkId());
+
+						// no longer a guild member, so make sure guild rank is empty
+						if (!m_guildRank.get().empty())
+						{
+							setGuildRank(BitArray());
+
+							// force a title check to make sure the character isn't
+							// using a guild rank title he is no longer entitled to
+							needsTitleCheck = true;
+						}
+					}
+
+					if (guildId > 0)
+					{
+						GuildMemberInfo const * const guildMemberInfo = GuildInterface::getGuildMemberInfo(guildId, owner->getNetworkId());
+						if (guildMemberInfo)
+						{
+							std::string const & professionSkillTemplate = getSkillTemplate();
+							bool const professionSkillTemplateDiffers = (!professionSkillTemplate.empty() && (guildMemberInfo->m_professionSkillTemplate != professionSkillTemplate));
+
+							int const level = owner->getLevel();
+							bool const levelDifers = ((level > 0) && (guildMemberInfo->m_level != level));
+
+							if (professionSkillTemplateDiffers || levelDifers)
+							{
+								GuildInterface::setGuildMemberProfessionInfo(guildId, owner->getNetworkId(), (professionSkillTemplateDiffers ? professionSkillTemplate : guildMemberInfo->m_professionSkillTemplate), (levelDifers ? level : guildMemberInfo->m_level));
+							}
+
+							// check to see if guild rank has changed
+							if (isGuildMember && (m_guildRank.get() != guildMemberInfo->m_rank))
+							{
+								setGuildRank(guildMemberInfo->m_rank);
+
+								// force a title check to make sure the character isn't
+								// using a guild rank title he is no longer entitled to
+								needsTitleCheck = true;
+							}
+						}
+					}
+				}
+
+				// if the character is a citizen, make sure the citizen profession and
+				// level matches the actual profession and level of the character
+
+				// also check to see if the citizen rank has changed, and if so, update the citizen rank information
+				{
+					std::vector<int> const & cityIds = CityInterface::getCitizenOfCityId(owner->getNetworkId());
+					CitizenInfo const * const citizenInfo = (!cityIds.empty() ? CityInterface::getCitizenInfo(cityIds.front(), owner->getNetworkId()) : NULL);
+					if (!citizenInfo)
+					{
+						// not a citizen, so make sure the citizen rank is empty
+						if (!m_citizenRank.get().empty())
+						{
+							setCitizenRank(BitArray());
+
+							// force a title check to make sure the character isn't
+							// using a citizen rank title he is no longer entitled to
+							needsTitleCheck = true;
+						}
+					}
+					else
+					{
+						std::string const & professionSkillTemplate = getSkillTemplate();
+						bool const professionSkillTemplateDiffers = (!professionSkillTemplate.empty() && (citizenInfo->m_citizenProfessionSkillTemplate != professionSkillTemplate));
+
+						int const level = owner->getLevel();
+						bool const levelDifers = ((level > 0) && (citizenInfo->m_citizenLevel != level));
+
+						if (professionSkillTemplateDiffers || levelDifers)
+						{
+							CityInterface::setCitizenProfessionInfo(cityIds.front(), owner->getNetworkId(), (professionSkillTemplateDiffers ? professionSkillTemplate : citizenInfo->m_citizenProfessionSkillTemplate), (levelDifers ? level : citizenInfo->m_citizenLevel));
+						}
+
+						// check to see if citizen rank has changed
+						if (m_citizenRank.get() != citizenInfo->m_citizenRank)
+						{
+							setCitizenRank(citizenInfo->m_citizenRank);
+
+							// force a title check to make sure the character isn't
+							// using a citizen rank title he is no longer entitled to
+							needsTitleCheck = true;
+						}
+					}
+				}
+
+				// if necessary, force a title check to make sure the character isn't
+				// using a guild or citizen rank title he is no longer entitled to
+				if (needsTitleCheck)
+				{
+					MessageToQueue::getInstance().sendMessageToC(owner->getNetworkId(),
+						"C++CheckCharacterTitle", "", 5, false);
+				}
+
+				// check for changes to the player's citizenship information, and update if necessary
+				updateCitizenshipInfo();
+
+				// check for changes to the player's GCW Region Defender information, and update if necessary
+				updateGcwDefenderRegionInfo();
+
+				// check for update to the player's PGC rating information
+				PgcRatingInfo const * const pgcRatingInfo = CityInterface::getPgcRating(owner->getNetworkId());
+				if (pgcRatingInfo)
+				{
+					if (m_pgcRatingCount.get() != pgcRatingInfo->m_ratingCount)
+					{
+						m_pgcRatingCount.set(pgcRatingInfo->m_ratingCount);
+					}
+
+					if (m_pgcRatingTotal.get() != pgcRatingInfo->m_ratingTotal)
+					{
+						m_pgcRatingTotal.set(pgcRatingInfo->m_ratingTotal);
+					}
+
+					if (m_pgcLastRatingTime.get() != pgcRatingInfo->m_lastRatingTime)
+					{
+						m_pgcLastRatingTime.set(pgcRatingInfo->m_lastRatingTime);
+					}
+				}
+			}
+
+			// check/set the character's proper "character age" title
+			checkAndSetCharacterAgeTitle(*this, false);
+		}
+
+		// check to see if the character needs to get (delay) flagged as enabled/disabled for guild war
+		//
+		// check to see if the guild member's guild war pvp status has changed, and if so, set the 
+		// delay time to start counting down to when the guild war pvp status will get changed
+		if (owner)
+		{
+			if (owner->getTimeToUpdateGuildWarPvpStatus())
+			{
+				if (ServerClock::getInstance().getGameTimeSeconds() > owner->getTimeToUpdateGuildWarPvpStatus())
+					owner->setGuildWarEnabled(GuildInterface::getGuildMemberGuildWarEnabled(owner->getGuildId(), owner->getNetworkId()));
+			}
+			else if (owner->getGuildId())
+			{
+				// see if guild war pvp status has changed, and if yes, start countdown timer to change the status
+				if (GuildInterface::getGuildMemberGuildWarEnabled(owner->getGuildId(), owner->getNetworkId()) != owner->getGuildWarEnabled())
+					owner->setTimeToUpdateGuildWarPvpStatus(ServerClock::getInstance().getGameTimeSeconds() + static_cast<unsigned long>(ConfigServerGame::getPvpGuildWarExemptionExclusiveDelaySeconds()));
+			}
+			else if (owner->getGuildWarEnabled())
+			{
+				// not in a guild, so should be guild war pvp disabled
+				owner->setGuildWarEnabled(false);
+			}
+		}
+
+		// check for over lot limit condition
+		setAccountNumLotsOverLimitSpam();
+	}
+	else if (message.getMethod() == "C++RequestChatFriendsList")
+	{
+		requestFriendList();
+	}
+	else if (message.getMethod() == "C++RequestChatIgnoreList")
+	{
+		requestIgnoreList();
+	}
+	else
+	{
+		IntangibleObject::handleCMessageTo(message);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::endBaselines()
+{
+	IntangibleObject::endBaselines();
+
+	const CreatureObject * owner = safe_cast<const CreatureObject *>(ContainerInterface::getContainedByObject(*this));
+
+	if (owner != NULL)
+	{
+		SharedCreatureObjectTemplate::Species const species = owner->getSpecies();
+		setSpokenLanguage(GameLanguageManager::getStartingLanguage(species));
+
+//		if (owner->isAuthoritative() && ServerUniverse::getInstance().getXpManager() != NULL)
+//		{
+//			// get any xp we earned while offline
+//			ServerUniverse::getInstance().getXpManager()->requestXp(*this);
+//		}
+	}
+
+	// check for empty force values from the db
+	if (m_maxForcePower.get() < 0)
+		m_maxForcePower = 0;
+	if (m_forcePower.get() < 0)
+		m_forcePower = 0;
+	if (m_forceRegenRate.get() < 0)
+		m_forceRegenRate = 0;
+
+	if (isAuthoritative())
+	{
+		GroupWaypointBuilder::updateGroupWaypoints(*this, true);
+
+		// calculate rank values when loaded for the first time from DB
+		Pvp::PvpRankInfo const & pvpRankInfo = Pvp::getRankInfo(m_currentGcwRating.get());
+		m_currentGcwRank = pvpRankInfo.rank;
+
+		if (pvpRankInfo.rank > 0)
+		{
+			m_currentGcwRankProgress = static_cast<float>(std::min(static_cast<int>(m_currentGcwRating.get()), pvpRankInfo.maxRating) - pvpRankInfo.minRating) * 100.0f / static_cast<float>(pvpRankInfo.maxRating - pvpRankInfo.minRating + 1);
+		}
+		else
+		{
+			m_currentGcwRankProgress = 0.0f;
+		}
+
+		m_maxGcwImperialRank = Pvp::getRankInfo(m_maxGcwImperialRating.get()).rank;
+		m_maxGcwRebelRank = Pvp::getRankInfo(m_maxGcwRebelRating.get()).rank;
+
+		// depersist chat statistics
+		int temp;
+		DynamicVariableList const & objVars = getObjVars();
+		if (objVars.getItem(OBJVAR_CHAT_SPAM_TIME_END_INTERVAL, temp))
+		{
+			m_chatSpamTimeEndInterval = temp;
+
+			if (objVars.getItem(OBJVAR_CHAT_SPAM_SPATIAL, temp))
+				m_chatSpamSpatialNumCharacters = temp;
+			else
+				m_chatSpamSpatialNumCharacters = 0;
+
+			if (objVars.getItem(OBJVAR_CHAT_SPAM_NON_SPATIAL, temp))
+				m_chatSpamNonSpatialNumCharacters = temp;
+			else
+				m_chatSpamNonSpatialNumCharacters = 0;
+
+			m_chatSpamNextTimeToSyncWithChatServer = 0;
+		}
+		else
+		{
+			m_chatSpamTimeEndInterval = static_cast<int>(::time(NULL)) + (ConfigServerGame::getChatSpamLimiterIntervalMinutes() * 60);
+			m_chatSpamSpatialNumCharacters = 0;
+			m_chatSpamNonSpatialNumCharacters = 0;
+			m_chatSpamNextTimeToSyncWithChatServer = 0;
+		}
+
+		// depersist privileged title
+		if (objVars.getItem(OBJVAR_PRIVILEGED_TITLE, temp))
+			m_privledgedTitle.set(static_cast<int8>(temp));
+		else
+			m_privledgedTitle.set(static_cast<int8>(PlayerDataPriviledgedTitle::NormalPlayer));
+
+		// depersist squelch info
+		m_squelchedById = NetworkId::cms_invalid;
+		m_squelchedByName = std::string();
+		m_squelchExpireTime = 0;
+
+		NetworkId tempNetworkId;
+		std::string tempString;
+		if ((objVars.getItem(OBJVAR_SQUELCH_ID, tempNetworkId)) && (objVars.getItem(OBJVAR_SQUELCH_NAME, tempString)) && (objVars.getItem(OBJVAR_SQUELCH_EXPIRE, temp)))
+		{
+			if (tempNetworkId.isValid())
+			{						
+				if (temp < 0)
+				{
+					m_squelchedById = tempNetworkId;
+					m_squelchedByName = tempString;
+					m_squelchExpireTime = -1;
+				}
+				else if (temp > 0)
+				{
+					int const gameTimeNow = static_cast<int>(ServerClock::getInstance().getGameTimeSeconds());
+					if (gameTimeNow < temp)
+					{
+						m_squelchedById = tempNetworkId;
+						m_squelchedByName = tempString;
+						m_squelchExpireTime = static_cast<int32>(::time(NULL)) + (temp - gameTimeNow);
+					}
+				}
+			}
+		}
+
+		// remove expired GCW contribution
+		{
+			DynamicVariableList::NestedList const gcwContribution(getObjVars(), "gcwContributionTracking");
+			if (!gcwContribution.empty())
+			{
+				int const timeExpired = static_cast<int>(::time(NULL)) - (60 * 60 * 24 * 30); // 30 days
+				std::list<std::string> gcwContributionToRemove;
+				int timeLastContributed;
+				for (DynamicVariableList::NestedList::const_iterator i = gcwContribution.begin(); i != gcwContribution.end(); ++i)
+				{
+					if (!Pvp::getGcwScoreCategory(i.getName()) || !i.getValue(timeLastContributed) || (timeLastContributed < timeExpired))
+						gcwContributionToRemove.push_back(std::string("gcwContributionTracking.") + i.getName());
+				}
+
+				if (!gcwContributionToRemove.empty())
+				{
+					for (std::list<std::string>::const_iterator iterRemove = gcwContributionToRemove.begin(); iterRemove != gcwContributionToRemove.end(); ++iterRemove)
+						removeObjVarItem(*iterRemove);
+				}
+			}
+		}
+
+		// check/set the character's proper "character age" title (age may/will changed while the character was logged out)
+		checkAndSetCharacterAgeTitle(*this, true);
+
+		// start timer to periodically update logged in character global data
+		MessageToQueue::sendRecurringMessageToC(getNetworkId(), "C++updateConnectedCharacterLfgData", std::string(), 60);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerObject::onLoadedFromDatabase()
+{
+	IntangibleObject::onLoadedFromDatabase();
+
+	// clear any deprecated quests
+	{
+		static std::vector<uint32> deprecatedQuests;
+		for (PlayerQuestDataMap::const_iterator i=m_quests.begin(); i!=m_quests.end(); ++i)
+		{
+			if (!QuestManager::getQuest(i->first))
+				deprecatedQuests.push_back(i->first);
+		}
+
+		for (std::vector<uint32>::const_iterator oldQuest=deprecatedQuests.begin(); oldQuest!=deprecatedQuests.end(); ++oldQuest)
+			questClearQuest(*oldQuest);
+
+		deprecatedQuests.clear();
+	}
+	CreatureObject * const owner = getCreatureObject();
+	if(owner && owner->isInitialized())
+	{
+		owner->fixupPersistentBuffsAfterLoading();
+		owner->fixupLevelXpAfterLoading();
+	}
+}
+
+//-----------------------------------------------------------------------
+
+Waypoint const PlayerObject::createWaypoint(const Location & location, bool ignoreLimits)
+{
+	float const maxSaneCoordinate = 100000;
+	Vector const & where = location.getCoordinates();
+	if ((where.x < -maxSaneCoordinate) ||
+		(where.x > maxSaneCoordinate) ||
+		(where.y < -maxSaneCoordinate) ||
+		(where.y > maxSaneCoordinate) ||
+		(where.z < -maxSaneCoordinate) ||
+		(where.z > maxSaneCoordinate))
+	{
+		WARNING(true,("INSANE_WAYPOINT_COORDINATES:  PlayerObject %s attempted to create a waypoint with coordinates that were way out of range", getNetworkId().getValueString().c_str()));
+		return Waypoint();
+	}
+
+	if (ignoreLimits || m_waypoints.size() < static_cast<size_t>(ConfigServerGame::getMaxWaypointsPerCharacter()))
+	{
+		Waypoint waypoint(ObjectIdManager::getNewObjectId());
+		waypoint.setLocation(location);
+		m_waypoints.set(waypoint.getNetworkId(), waypoint);
+		Archive::AutoDeltaMap<NetworkId, Waypoint>::const_iterator f = m_waypoints.find(waypoint.getNetworkId());
+		if(f != m_waypoints.end())
+		{
+			Waypoint & w = const_cast<Waypoint &>(f->second);
+			m_callback->connect(w.getChangeNotification(), *this, &PlayerObject::onWaypointChanged);
+
+			// call TRIG_WAYPOINT_CREATED
+			CreatureObject * const owner = getCreatureObject();
+			if(owner)
+			{
+				GameScriptObject * script = owner->getScriptObject();
+				if(script)
+				{
+					ScriptParams params;
+					params.addParam(w.getNetworkId());
+					IGNORE_RETURN(script->trigAllScripts(Scripting::TRIG_WAYPOINT_CREATED, params));
+				}
+			}
+
+			// set a reasonable default color (the caller can change it)
+			if (strncmp("space_",location.getSceneId(),6)==0)
+				w.setColor(Waypoint::Space);
+			else
+				w.setColor(Waypoint::Blue);
+
+			return w;
+		}
+	}
+
+	return Waypoint();
+}
+
+//-----------------------------------------------------------------------
+
+Waypoint const PlayerObject::createOrUpdateReusableWaypoint(const Location & location, const std::string & objvarTrackingName, const Unicode::String & waypointNameIfCreated, int waypointColorIfCreated /*= -1*/)
+{
+	const std::string objvarName = std::string("reuseableWp.") + objvarTrackingName;
+	const DynamicVariableList & objvars = getObjVars();
+	NetworkId waypointId;
+	bool newWpCreated = false;
+	if (!objvars.hasItem(objvarName) || (objvars.getType(objvarName) != DynamicVariable::NETWORK_ID))
+	{
+		// create a new waypoint
+		Waypoint waypoint(createWaypoint(location, true));
+		newWpCreated = true;
+		waypointId = waypoint.getNetworkId();
+		setObjVarItem(objvarName, waypointId);
+	}
+	else
+	{
+		objvars.getItem(objvarName, waypointId);
+
+		// find the existing waypoint in the datapad
+		std::vector<NetworkId> waypointsInDatapad;
+		getWaypointsInDatapad(waypointsInDatapad);
+		if(std::find(waypointsInDatapad.begin(), waypointsInDatapad.end(), waypointId) == waypointsInDatapad.end())
+		{
+			// original waypoint has been destroyed, create a new one
+			Waypoint waypoint(createWaypoint(location, true));
+			newWpCreated = true;
+			waypointId = waypoint.getNetworkId();
+			setObjVarItem(objvarName, waypointId);
+		}
+	}
+
+	if (waypointId != NetworkId::cms_invalid)
+	{
+		Waypoint waypoint = Waypoint::getWaypointById(waypointId);
+		waypoint.setActive(true);
+		waypoint.setLocation(location);
+
+		if (newWpCreated)
+		{
+			if (!waypointNameIfCreated.empty())
+				waypoint.setName(waypointNameIfCreated);
+
+			if ((waypointColorIfCreated >= 0) && (waypointColorIfCreated < static_cast<int>(Waypoint::NumColors)))
+				waypoint.setColor(static_cast<uint8>(waypointColorIfCreated));
+		}
+
+		return waypoint;
+	}
+
+	return Waypoint();
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerObject::destroyWaypoint(const NetworkId & id)
+{
+	// call TRIG_WAYPOINT_DESTROYED
+	Archive::AutoDeltaMap<NetworkId, Waypoint>::const_iterator f = m_waypoints.find(id);
+	if(f != m_waypoints.end())
+	{
+		Waypoint & w = const_cast<Waypoint &>(f->second);
+		CreatureObject * const owner = getCreatureObject();
+		if(owner)
+		{
+			GameScriptObject * script = owner->getScriptObject();
+			if(script)
+			{
+				ScriptParams params;
+				params.addParam(w.getNetworkId());
+				IGNORE_RETURN(script->trigAllScripts(Scripting::TRIG_WAYPOINT_DESTROYED, params));
+			}
+		}
+	}
+	m_waypoints.erase(id);
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerObject::onWaypointChanged(const Waypoint & waypointData)
+{
+	Archive::AutoDeltaMap<NetworkId, Waypoint>::const_iterator f = m_waypoints.find(waypointData.getNetworkId());
+	if(f != m_waypoints.end())
+	{
+		if(isAuthoritative())
+			m_waypoints.set(waypointData.getNetworkId(), waypointData);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerObject::onWaypointCreated(const NetworkId &, const Waypoint & w)
+{
+	m_callback->connect(const_cast<Waypoint &>(w).getChangeNotification(), *this, &PlayerObject::onWaypointChanged);
+	GroupWaypointBuilder::updateGroupWaypoints(*this, true);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::onWaypointSet(NetworkId const &, Waypoint const &, Waypoint const &)
+{
+	GroupWaypointBuilder::updateGroupWaypoints(*this, true);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::onWaypointRemoved(NetworkId const &, Waypoint const &)
+{
+	GroupWaypointBuilder::updateGroupWaypoints(*this, true);
+}
+
+//-----------------------------------------------------------------------
+
+Waypoint & PlayerObject::getWaypoint(const NetworkId & id)
+{
+	Archive::AutoDeltaMap<NetworkId, Waypoint>::const_iterator f = m_waypoints.find(id);
+	if(f != m_waypoints.end())
+	{
+		return const_cast<Waypoint &>(f->second);
+	}
+
+	static const Waypoint empty;
+	static Waypoint notFound;
+	notFound = empty;
+	return notFound;
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerObject::getWaypointsInDatapad(std::vector<NetworkId> & target)
+{
+	Archive::AutoDeltaMap<NetworkId, Waypoint>::const_iterator i;
+	for(i = m_waypoints.begin(); i != m_waypoints.end(); ++i)
+	{
+		target.push_back(i->second.getNetworkId());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerObject::getWaypointAttributes(const NetworkId & waypointId, ServerObject::AttributeVector & data)
+{
+	CreatureObject * const owner = getCreatureObject();
+	if(owner)
+	{
+		GameScriptObject * script = owner->getScriptObject();
+		if(script)
+		{
+			Archive::AutoDeltaMap<NetworkId, Waypoint>::const_iterator f = m_waypoints.find(waypointId);
+			if(f != m_waypoints.end())
+			{
+				if (script->hasTrigger (Scripting::TRIG_WAYPOINT_ON_GET_ATTRIBUTES))
+				{
+					static const int MAX_ATTRIBS = 20;
+
+					// allow scripts to add attribute data to the vector
+					static std::vector<const char *>            names   (MAX_ATTRIBS, static_cast<const char *>(0));
+					static std::vector<const Unicode::String *> attribs (MAX_ATTRIBS, static_cast<const Unicode::String *>(0));
+
+					//-- clear the vectors
+					names.clear    ();
+					attribs.clear  ();
+					names.resize   (MAX_ATTRIBS, static_cast<const char *>(0));
+					attribs.resize (MAX_ATTRIBS, static_cast<const Unicode::String *>(0));
+
+					ScriptParams params;
+					params.addParam (waypointId);
+					params.addParam (owner->getNetworkId());
+					params.addParam (names);
+					params.addParam (attribs);
+
+					IGNORE_RETURN(script->trigAllScripts(Scripting::TRIG_WAYPOINT_ON_GET_ATTRIBUTES, params));
+
+					const std::vector<const char *> & newNames              = params.getStringArrayParam  (2);
+					const std::vector<const Unicode::String *> & newAttribs = params.getUnicodeArrayParam (3);
+
+					// copy the returned strings to data
+					for (int i = 0; i < MAX_ATTRIBS; ++i)
+					{
+						const char * const            newName   = newNames   [i];
+						const Unicode::String * const newAttrib = newAttribs [i];
+
+						if (newName && *newName && newAttrib && !newAttrib->empty ())
+						{
+							data.push_back (std::make_pair (std::string (newName), *newAttrib));
+						}
+						else
+							break;
+					}
+				}
+
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+std::string PlayerObject::getAccountDescription(const NetworkId & creatureId)
+{
+	std::string result = getAccountDescription(safe_cast<ServerObject *>(NetworkIdManager::getObjectById(creatureId)));
+	if (result.empty() || result == "UNKNOWN")
+		result = creatureId.getValueString();
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+std::string PlayerObject::getAccountDescription(const ServerObject * creature)
+{
+	std::string desc = "";
+	if (creature)
+	{
+		const PlayerObject * player = PlayerCreatureController::getPlayerObject(creature->asCreatureObject());
+		if (creature->asCreatureObject() && player)
+		{
+			return player->getAccountDescription();
+		}
+		else if (creature->asCreatureObject())
+		{
+			desc += "Non-Player ";
+			desc += Unicode::wideToNarrow(creature->getObjectName());
+			desc += "(";
+			desc += creature->getNetworkId().getValueString();
+			desc += ") ";
+			desc += creature->getObjectTemplateName();
+		}
+		else
+			desc = creature->getNetworkId().getValueString();
+	}
+	else
+	{
+		desc = "UNKNOWN";
+	}
+	return desc;
+}
+
+//-----------------------------------------------------------------------
+
+std::string PlayerObject::getAccountDescription() const
+{
+	const ServerObject * owner = safe_cast<const ServerObject *>(
+		ContainerInterface::getContainedByObject(*this));
+	if (owner == NULL)
+		return "UNKNOWN";
+
+	bool isGod = false;
+	bool isSecure = false;
+	Client * client = NULL;
+	if (owner && owner->getClient())
+	{
+		client = owner->getClient();
+		if (client->isGod())
+			isGod = true;
+		if (client->isGodValidated())
+			isSecure = true;
+	}
+
+	std::string desc;
+	desc += "Player ";
+	desc += Unicode::wideToNarrow(owner->getObjectName());
+	desc += "(";
+	desc += owner->getNetworkId().getValueString();
+	desc += ") StationId(";
+	char stationIdBuf[32] = {"\0"};
+	snprintf(stationIdBuf, sizeof(stationIdBuf), "%lu", m_stationId.get());
+	stationIdBuf[sizeof(stationIdBuf) - 1] = 0;
+	desc += stationIdBuf;
+	if (isGod)
+		desc += " isGod";
+	else if (isSecure)
+		desc += " isSecure";
+
+	if (client && client->isFreeTrialAccount())
+	{
+		desc += " isFreeTrial";
+	}
+
+	desc += ")";
+
+	return desc;
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerObject::logChat(int const logIndex)
+{
+	if (m_chatLog != NULL)
+	{
+		time_t const logTime = Os::getRealSystemTime();
+
+		ChatLogEntry chatLogEntry;
+
+		chatLogEntry.m_index = logIndex;
+		chatLogEntry.m_time = logTime;
+
+		m_chatLog->push_back(chatLogEntry);
+
+		cleanChatLog();
+	}
+}
+
+//-----------------------------------------------------------------------
+
+PlayerObject::ChatLog const &PlayerObject::getChatLog() const
+{
+	NOT_NULL(m_chatLog);
+
+	return *m_chatLog;
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerObject::checkStomach()
+{
+	int temp = 0;
+
+	const CreatureObject * const creature = getCreatureObject();
+
+	if(creature)
+	{
+		const DynamicVariableList & objvars = creature->getObjVars();
+
+		if (objvars.getItem("stomach.food", temp))
+		{
+			m_food = temp;
+		}
+		if (objvars.getItem("stomach.drink",temp))
+		{
+			m_drink = temp;
+		}
+		if (objvars.getItem("stomach.medicine",temp))
+		{
+			m_meds = temp;
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerObject::cleanChatLog()
+{
+	// See if we need to purge any old messages
+
+	time_t currentTime;
+	time(&currentTime);
+
+	if (m_chatLogPurgeTime != currentTime)
+	{
+		m_chatLogPurgeTime = currentTime;
+
+		// See if anything needs to be purged from the front of the logs
+
+		time_t const chatLogTime = ConfigServerUtility::getChatLogMinutes() * 60;
+		int chatLogCount = static_cast<int>(m_chatLog->size());
+
+		ChatLog::iterator iterChatLog = m_chatLog->begin();
+		while (!m_chatLog->empty())
+		{
+			const time_t messageTime = iterChatLog->m_time;
+
+			if (messageTime < (currentTime - chatLogTime) || (chatLogCount > ConfigServerUtility::getPlayerMaxChatLogLines()))
+			{
+				iterChatLog = m_chatLog->erase(iterChatLog);
+				--chatLogCount;
+			}
+			else
+			{
+				break;
+			}
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+bool PlayerObject::isJedi() const
+{
+	return false;
+}
+
+//------------------------------------------------------------------------------------------
+
+bool PlayerObject::getIsUnsticking() const
+{
+	return m_isUnsticking;
+}
+
+//------------------------------------------------------------------------------------------
+
+void PlayerObject::setIsUnsticking(bool value)
+{
+	m_isUnsticking = value;
+}
+
+// ========================================================================================
+//----------------------------------------------------------------------
+
+void PlayerObject::findFriend(const std::string & friendName)
+{
+	// ask the name manager for the network id of the friend
+	std::string normalizedName = NameManager::normalizeName(friendName);
+	NetworkId target = NameManager::getInstance().getPlayerId(normalizedName);
+	const CreatureObject * creatureObject = getCreatureObject();
+	if(target != NetworkId::cms_invalid)
+	{
+		if(creatureObject)
+		{
+			std::string myName = Unicode::wideToNarrow(creatureObject->getAssignedObjectFirstName());
+
+			// shortcut: if the player is on this server, don't send a
+			// messageTo
+			CreatureObject * friendObject = safe_cast<CreatureObject *>(NetworkIdManager::getObjectById(target));
+			if(friendObject && friendObject->isAuthoritative() && PlayerCreatureController::getPlayerObject(friendObject))
+			{
+				// extract the PlayerObject from the CreatureObject
+				PlayerObject * friendPlayer = PlayerCreatureController::getPlayerObject(friendObject);
+				if(friendPlayer)
+				{
+					// go ahead and invoke replyLocationToFriend on the
+					// local PlayerObject.
+					friendPlayer->replyLocationToFriend(myName, creatureObject->getNetworkId());
+				}
+			}
+			else
+			{
+				// the player is not on this server, send a message to C for the
+				// friend's network ID.
+				Archive::ByteStream payload;
+				Archive::put(payload, creatureObject->getNetworkId());
+				Archive::put(payload, myName);
+
+				//@todo: This should really use sprintf to pack the data into a string, rather than reintrepreting a byte stream as a string
+
+				MessageToQueue::getInstance().sendMessageToC(target, "FindFriend", std::string(reinterpret_cast<const char * const>(payload.getBuffer()), payload.getSize()), 0, false);
+			}
+		}
+	}
+	else
+	{
+		StringId noName("ui_cmnty", "friend_location_failed_noname");
+		Chat::sendSystemMessage(*creatureObject, noName, Unicode::emptyString);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void PlayerObject::replyLocationToFriend(const std::string & friendName, const NetworkId & friendNetworkId)
+{
+	// Do not send location information to players who are not
+	// on this player's friend list (e.g. the Bounty hunter trying
+	// to find a Jedi)
+	if(isFriend(friendName))
+	{
+		// the requesting player is our friend, send the location
+		CreatureObject * creatureObject = getCreatureObject();
+		if(creatureObject)
+		{
+			Vector coordinates = creatureObject->findPosition_w();
+			std::string scene = ServerWorld::getSceneId();
+			Location location(coordinates, NetworkId::cms_invalid, Location::getCrcBySceneName(scene));
+			// If the requestor is on this server, invoke the response
+			// directly, otherwise send a message to the remote
+			// creature object with the data.
+			CreatureObject * friendCreatureObject = safe_cast<CreatureObject *>(NetworkIdManager::getObjectById(friendNetworkId));
+			if(friendCreatureObject && friendCreatureObject->isAuthoritative())
+			{
+				// retrieve the PlayerObject associated with the
+				// character and give it the coordinates
+				PlayerObject * playerObject = PlayerCreatureController::getPlayerObject(friendCreatureObject);
+				if(playerObject)
+				{
+					playerObject->receiveLocationToFriend(creatureObject->getNetworkId(), location);
+				}
+				else
+				{
+					// send an error to the requesting player
+					failLocationToFriend(friendNetworkId);
+				}
+			}
+			else
+			{
+				// the character is not on this server, send the response
+				// to the requestor's network Id
+				Archive::ByteStream response;
+				Archive::put(response, location);
+				Archive::put(response, creatureObject->getNetworkId());
+				MessageToQueue::getInstance().sendMessageToC(friendNetworkId, "LocationToFriend", std::string(reinterpret_cast<const char * const>(response.getBuffer()), response.getSize()), 0, false);
+
+			}
+		}
+		else
+		{
+			// send an error to the requesting player
+			failLocationToFriend(friendNetworkId);
+		}
+	}
+	else
+	{
+		// send a failure to the requestor, let them know that
+		// both players must be on the friends list
+		failLocationToFriend(friendNetworkId);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void PlayerObject::receiveLocationToFriend(const NetworkId & friendId, const Location & friendLocation)
+{
+	// receiving a response to the findFriend request
+	CreatureObject * creatureObject = getCreatureObject();
+	if(creatureObject)
+	{
+		const DynamicVariableList & objvars = creatureObject->getObjVars();
+		NetworkId friendWaypointId;
+		bool newWpCreated = false;
+		if(! objvars.hasItem("friend_waypoint_id"))
+		{
+			// create a new "friend" waypoint
+			Waypoint friendWaypoint(createWaypoint(friendLocation, true));
+			newWpCreated = true;
+			friendWaypointId = friendWaypoint.getNetworkId();
+			creatureObject->setObjVarItem("friend_waypoint_id", friendWaypointId);
+		}
+		else
+		{
+			objvars.getItem("friend_waypoint_id", friendWaypointId);
+			// find the existing waypoint in the datapad
+			std::vector<NetworkId> waypointsInDatapad;
+			getWaypointsInDatapad(waypointsInDatapad);
+			if(std::find(waypointsInDatapad.begin(), waypointsInDatapad.end(), friendWaypointId) == waypointsInDatapad.end())
+			{
+				// original waypoint has been destroyed, create a new one
+				Waypoint newWaypoint(createWaypoint(friendLocation, true));
+				newWpCreated = true;
+				friendWaypointId = newWaypoint.getNetworkId();
+				creatureObject->setObjVarItem("friend_waypoint_id", friendWaypointId);
+			}
+		}
+
+		std::string friendName = NameManager::getInstance().getPlayerName(friendId);
+		if(friendWaypointId != NetworkId::cms_invalid)
+		{
+			Waypoint friendWaypoint = Waypoint::getWaypointById(friendWaypointId);
+			friendWaypoint.setActive(true);
+			friendWaypoint.setLocation(friendLocation);
+			friendWaypoint.setName(Unicode::narrowToWide(NameManager::getInstance().getPlayerName(friendId)));
+
+			// findFriend waypoint is purple by default
+			if (newWpCreated)
+				friendWaypoint.setColor(Waypoint::Purple);
+
+			Unicode::String oob;
+			ProsePackage pp;
+			if(! friendName.empty())
+			{
+				if (newWpCreated)
+				{
+					pp.actor.str = Unicode::narrowToWide(friendName);
+					pp.stringId = StringId("ui_cmnty", "friend_location_create_new_wp");
+					OutOfBandPackager::pack(pp, -1, oob);
+					Chat::sendSystemMessage(*creatureObject, Unicode::emptyString, oob);
+				}
+				else
+				{
+					pp.actor.str = Unicode::narrowToWide(friendName);
+					pp.stringId = StringId("ui_cmnty", "friend_location");
+					OutOfBandPackager::pack(pp, -1, oob);
+					Chat::sendSystemMessage(*creatureObject, Unicode::emptyString, oob);
+				}
+			}
+			else
+			{
+				StringId noName("ui_cmnty", "friend_location_failed_noname");
+				Chat::sendSystemMessage(*creatureObject, noName, Unicode::emptyString);
+			}
+		}
+		else
+		{
+			if( !friendName.empty())
+			{
+				ProsePackage pp;
+				pp.actor.str = Unicode::narrowToWide(friendName);
+				pp.stringId = StringId("ui_cmnty", "friend_location_failed");
+				Unicode::String oob;
+				OutOfBandPackager::pack(pp, -1, oob);
+				Chat::sendSystemMessage(*creatureObject, Unicode::emptyString, oob);
+			}
+			else
+			{
+				StringId noName("ui_cmnty", "friend_location_failed_noname");
+				Chat::sendSystemMessage(*creatureObject, noName, Unicode::emptyString);
+			}
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void PlayerObject::failLocationToFriend(const NetworkId & friendId)
+{
+	CreatureObject * requestor = safe_cast<CreatureObject *>(NetworkIdManager::getObjectById(friendId));
+	if(requestor && requestor->isAuthoritative())
+	{
+		PlayerObject * player = PlayerCreatureController::getPlayerObject(requestor);
+		if(player)
+		{
+			player->receiveFailLocationToFriend(getCreatureObject()->getNetworkId());
+		}
+	}
+	else
+	{
+		Archive::ByteStream response;
+		Archive::put(response, getCreatureObject()->getNetworkId());
+		MessageToQueue::getInstance().sendMessageToC(friendId, "FailLocationToFriend", std::string(reinterpret_cast<const char * const>(response.getBuffer()), response.getSize()), 0, false);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void PlayerObject::receiveFailLocationToFriend(const NetworkId & friendId)
+{
+	CreatureObject * creatureObject = getCreatureObject();
+	if(creatureObject)
+	{
+		std::string friendName = NameManager::getInstance().getPlayerName(friendId);
+		if(! friendName.empty())
+		{
+			ProsePackage pp;
+			pp.actor.str = Unicode::narrowToWide(friendName);
+			pp.stringId = StringId("ui_cmnty", "friend_location_failed");
+			Unicode::String oob;
+			OutOfBandPackager::pack(pp, -1, oob);
+			Chat::sendSystemMessage(*creatureObject, Unicode::emptyString, oob);
+		}
+		else
+		{
+			StringId noName("ui_cmnty", "friend_location_failed_noname");
+			Chat::sendSystemMessage(*creatureObject, noName, Unicode::emptyString);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setPriviledgedTitle(int8 priviledgedTitle)
+{
+	if (isAuthoritative())
+	{
+		if (m_privledgedTitle.get() != priviledgedTitle)
+		{
+			// if becoming a warden, send system message and warden introduction mail
+			if (priviledgedTitle == static_cast<int8>(PlayerDataPriviledgedTitle::Warden))
+			{
+				CreatureObject * const owner = getCreatureObject();
+				if (owner)
+				{
+					static const Unicode::String mailSubject = Unicode::narrowToWide("@" + StringId("warden", "warden_introduction_subject").getCanonicalRepresentation());
+					
+					ProsePackage pp;
+					pp.stringId = StringId("warden", "warden_introduction_body");
+
+					Unicode::String oob;
+					OutOfBandPackager::pack(pp, -1, oob);
+
+					Chat::sendPersistentMessage("system", Unicode::wideToNarrow(owner->getAssignedObjectName()), mailSubject, Unicode::emptyString, oob);
+
+					Chat::sendSystemMessage(*owner, StringId("warden", "grant_warden"), Unicode::emptyString);
+				}
+			}
+			// if warden being revoked, send system message
+			else if (m_privledgedTitle.get() == static_cast<int8>(PlayerDataPriviledgedTitle::Warden))
+			{
+				CreatureObject * const owner = getCreatureObject();
+				if (owner)
+					Chat::sendSystemMessage(*owner, StringId("warden", "revoke_warden"), Unicode::emptyString);
+			}
+
+			m_privledgedTitle.set(priviledgedTitle);
+
+			// persist privileged title
+			if (priviledgedTitle != static_cast<int8>(PlayerDataPriviledgedTitle::NormalPlayer))
+				setObjVarItem(OBJVAR_PRIVILEGED_TITLE, static_cast<int>(priviledgedTitle));
+			else
+				removeObjVarItem(OBJVAR_PRIVILEGED_TITLE);
+		}
+	}
+	else
+	{
+		CreatureObject * const owner = getCreatureObject();
+		if (owner)
+			owner->sendControllerMessageToAuthServer(CM_setPriviledgedTitle, new MessageQueueGenericValueType<int>(static_cast<int>(priviledgedTitle)));
+	}
+}
+
+//------------------------------------------------------------------------------------------
+
+void PlayerObject::activateQuest(int questId)
+{
+	BitArray b = m_activeQuests.get();
+	b.setBit(questId);
+	m_activeQuests.set(b);
+	ScriptParams params;
+	params.addParam(questId);
+	CreatureObject * creatureObject = getCreatureObject();
+	if(creatureObject)
+	{
+		GameScriptObject * gameScriptObject = creatureObject->getScriptObject();
+		if(gameScriptObject)
+		{
+			IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_QUEST_ACTIVATED, params));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::deactivateQuest(int questId)
+{
+	BitArray b = m_activeQuests.get();
+	b.clearBit(questId);
+	m_activeQuests.set(b);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::completeQuest(int questId)
+{
+	BitArray b = m_activeQuests.get();
+	b.clearBit(questId);
+	m_activeQuests.set(b);
+	b = m_completedQuests.get();
+	b.setBit(questId);
+	m_completedQuests.set(b);
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::isQuestActive(int questId) const
+{
+	return m_activeQuests.get().testBit(questId);
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::isQuestComplete(int questId) const
+{
+	return m_completedQuests.get().testBit(questId);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::clearCompletedQuest(int questId)
+{
+	BitArray b = m_completedQuests.get();
+	b.clearBit(questId);
+	m_completedQuests.set(b);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Checks if the theater assigned to this player should be spawned. NOTE: if we
+ * spawn the theater, our theater data will be cleared.
+ *
+ * @param pos			our position
+ * @param scene			our scene
+ * @param speed			our speed
+ * @param updateRadius	distance when we start receiving objects
+ */
+void PlayerObject::checkTheater(const Vector & pos, const std::string & scene,
+	float speed, float updateRadius)
+{
+	if (!isAuthoritative())
+		return;
+
+	if (!hasTheater())
+		return;
+
+	if (m_theaterScene.get() != scene)
+		return;
+
+	// we want to spawn the theater so that all the objects will have been created
+	// by the time the theater comes into view
+	float timeToCreate = (m_theaterNumObjects.get() / IntangibleObject::getObjectsCreatedPerFrame()) * 0.25f;
+	float creationDistance = m_theaterRadius.get() + updateRadius * 1.5f + speed * timeToCreate;
+	float distance = pos.magnitudeBetweenSquared(m_theaterPosition.get());
+	if (distance < creationDistance * creationDistance)
+	{
+		DEBUG_LOG("Theater", ("PlayerObject spawning theater at a distance of "
+			"%f(%f, %f, %f, %f)\n", static_cast<float>(sqrt(distance)), creationDistance,
+			speed, updateRadius, timeToCreate));
+		IntangibleObject * theater = IntangibleObject::spawnTheater(m_theaterDatatable.get(),
+			m_theaterPosition.get(), m_theaterScript.get(),
+			static_cast<IntangibleObject::TheaterLocationType>(m_theaterLocationType.get()));
+		if (theater != NULL)
+		{
+			const CreatureObject * owner = getCreatureObject();
+			if (owner != NULL)
+				theater->setPlayer(*owner);
+			theater->setTheaterCreator(m_theaterCreator.get());
+			if (!theater->setTheaterName(m_theaterName.get()))
+			{
+				WARNING(true, ("PlayerObject::checkTheater could not create "
+					"theater with name %s", m_theaterName.get().c_str()));
+				theater->permanentlyDestroy(DeleteReasons::SetupFailed);
+				theater = NULL;
+			}
+		}
+		if (theater == NULL)
+		{
+			CreatureObject * creatureObject = getCreatureObject();
+			if (creatureObject)
+			{
+				GameScriptObject * gameScriptObject = creatureObject->getScriptObject();
+				if (gameScriptObject)
+				{
+					ScriptParams params;
+					params.addParam(m_theaterDatatable.get().c_str());
+					params.addParam(m_theaterName.get().c_str());
+					IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_PLAYER_THEATER_FAIL, params));
+				}
+			}
+		}
+		else
+			m_theaterId = theater->getNetworkId();
+
+		// there seems to be a problem if an objvar gets set and cleared in the
+		// same frame, so we message ourselves to clean up next frame
+		clearTheater();
+		//m_theaterDatatable = "";
+		//MessageToQueue::getInstance().sendMessageToC(getNetworkId(), "C++ClearTheater", std::string(), 0.1f, true);
+	}
+}	// PlayerObject::checkTheater
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sets the data for a theater that will be created when this player gets near
+ * it. NOTE: we do not store the data if the player already has a theater.
+ *
+ * @param datatable		the datatable where the theater info is stored
+ * @param position		the general location of the theater (the actual location
+ *						is determined by getGoodLocation() when the theater is spawned)
+ * @param scene			the planet/scene where the theater is
+ * @param script		the script to be attached to the theater object
+ * @param creator		who's creating the theater
+ * @param name          the theater's name
+ * @param locationType	how to create the theater
+ *
+ * @return true on success, false on fail
+ */
+bool PlayerObject::setTheater(const std::string & datatable, const Vector & position,
+	const std::string & scene, const std::string & script, const NetworkId & creator,
+	const std::string & name, IntangibleObject::TheaterLocationType locationType)
+{
+	if (!isAuthoritative())
+	{
+		WARNING(true, ("PlayerObject::setTheater called on unauthoritative player"));
+		return false;
+	}
+
+	if (hasTheater())
+	{
+		WARNING(true, ("PlayerObject::setTheater called on player with theater"));
+		return false;
+	}
+
+	m_theaterNumObjects = IntangibleObject::getNumObjects(datatable);
+	if (m_theaterNumObjects.get() == 0)
+	{
+		WARNING(true, ("PlayerObject::setTheater called with invalid datatable %s",
+			datatable.c_str()));
+		return false;
+	}
+
+	if (ServerUniverse::getInstance().getPlanetByName(scene) == NULL)
+	{
+		WARNING(true, ("PlayerObject::setTheater called with invalid scene %s",
+			scene.c_str()));
+		return false;
+	}
+
+	m_theaterDatatable = datatable;
+	m_theaterPosition = position;
+	m_theaterScene = scene;
+	m_theaterScript = script;
+	m_theaterCreator = creator;
+	m_theaterName = name;
+	m_theaterLocationType = static_cast<int>(locationType);
+
+	// note that we set the radius to 3 times the radius returned since that is
+	// the area that the theater could be created in
+	m_theaterRadius = IntangibleObject::getRadius(datatable) * 3.0f;
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Clears the player's theater data.
+ */
+void PlayerObject::clearTheater()
+{
+	if (!isAuthoritative())
+		return;
+
+	m_theaterDatatable = "";
+	m_theaterPosition = Vector(0,0,0);
+	m_theaterScene = "";
+	m_theaterScript = "";
+	m_theaterRadius = 0;
+	m_theaterCreator = NetworkId::cms_invalid;
+	m_theaterName = "";
+	m_theaterLocationType = IntangibleObject::TLT_getGoodLocation;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Checks if the player has theater data.
+ */
+bool PlayerObject::hasTheater() const
+{
+	return !m_theaterDatatable.get().empty();
+}
+
+// ----------------------------------------------------------------------
+
+PlayerObject *PlayerObject::asPlayerObject()
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+PlayerObject const *PlayerObject::asPlayerObject() const
+{
+	return this;
+}
+
+// ======================================================================
+// Quest System functions
+// ======================================================================
+
+PlayerObject::QuestResult PlayerObject::questCanActivateQuest(uint32 const questCrc) const
+{
+	Quest const * const quest=QuestManager::getQuest(questCrc);
+	if (!quest)
+		return QR_noSuchQuest;
+
+	if (questHasActiveQuest(questCrc))
+		return QR_alreadyActive;
+
+	if (!quest->isRepeatable() && questHasCompletedQuest(questCrc))
+		return QR_alreadyComplete;
+
+	{
+		std::vector<uint32> const & prerequisites = quest->getPrerequisiteQuests();
+		for (std::vector<uint32>::const_iterator i=prerequisites.begin(); i!=prerequisites.end(); ++i)
+		{
+			if (!questHasCompletedQuest(*i))
+				return QR_failedPrerequisites;
+		}
+	}
+
+	{
+		std::vector<uint32> const & exclusion = quest->getExclusionQuests();
+		for (std::vector<uint32>::const_iterator i=exclusion.begin(); i!=exclusion.end(); ++i)
+		{
+			if (questHasCompletedQuest(*i) || questHasActiveQuest(*i))
+				return QR_failedExclusion;
+		}
+	}
+
+	return QR_success;
+}
+
+// ----------------------------------------------------------------------
+
+
+PlayerObject::QuestResult PlayerObject::questActivateQuest(uint32 const questCrc, NetworkId const & questGiver)
+{
+	QuestResult canActivateResult = questCanActivateQuest(questCrc);
+	if (canActivateResult != QR_success)
+		return canActivateResult;
+
+	questCheckQuestLimits();
+
+	PlayerQuestData playerQuestData(questGiver);
+	m_quests.set(questCrc, playerQuestData);
+	setCurrentQuest(questCrc);
+
+	CreatureObject * owner = getCreatureObject();
+	if(owner)
+	{
+		GameScriptObject * script = owner->getScriptObject();
+		if(script)
+		{
+			ScriptParams params;
+			params.addParam(static_cast<int>(questCrc));
+			IGNORE_RETURN(script->trigAllScripts(Scripting::TRIG_QUEST_ACTIVATED, params));
+		}
+	}
+
+	questActivateQuestTask(questCrc, 0);
+
+	return QR_success;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::questCheckQuestLimits()
+{
+	if (m_quests.size() > s_questLimit)
+	{
+		// Randomly remove some quests to get the number back down to the limit
+		// Most of the quests in the list should be completed, so try
+		// to prefer completed quests when picking ones to delete
+		//
+		// The hope is that game mechanisms will keep the number of quests
+		// within the limits, and this code won't have to be used.
+
+		CreatureObject * const owner = NON_NULL(getCreatureObject());
+
+		size_t numberToDelete = m_quests.size() - s_questLimit;
+		int previousNumberDeleted;
+		if (!owner->getObjVars().getItem(OBJVAR_DELETED_QUEST_COUNT, previousNumberDeleted))
+			previousNumberDeleted=0;
+		IGNORE_RETURN(owner->setObjVarItem(OBJVAR_DELETED_QUEST_COUNT, previousNumberDeleted + static_cast<int>(numberToDelete)));
+
+		// We need to sort the quests to delete by age
+		SortableQuestList possibleQuestsToDelete;
+
+		// First find all the completed quests than can be deleted
+		for (PlayerQuestDataMap::const_iterator i=m_quests.begin(); i!=m_quests.end(); ++i)
+		{
+			PlayerQuestData const& questData = i->second;
+			if (questData.isCompleted())
+			{
+				possibleQuestsToDelete.push_back(QuestDataToSort(i->first, questData));
+			}
+		}
+
+		// Sort the possible quests by age
+		possibleQuestsToDelete.sort();
+
+		// Determine whether we found enough quests to delete
+		if (possibleQuestsToDelete.size() < numberToDelete)
+		{
+			SortableQuestList additionalPossibleQuestsToDelete;
+
+			// Our failure case has hit a failure case!  There aren't enough completed quests to stay within the limit.
+			for (PlayerQuestDataMap::const_iterator i=m_quests.begin(); i!=m_quests.end() && possibleQuestsToDelete.size() < numberToDelete; ++i)
+			{
+				PlayerQuestData const& questData = i->second;
+				if (!questData.isCompleted())
+				{
+					additionalPossibleQuestsToDelete.push_back(QuestDataToSort(i->first, questData));
+				}
+			}
+
+			// Sort the additional quests by age
+			additionalPossibleQuestsToDelete.sort();
+
+			// Add the additional quests to the end of the possibilities list
+			possibleQuestsToDelete.splice(possibleQuestsToDelete.end(),
+			                              additionalPossibleQuestsToDelete,
+			                              additionalPossibleQuestsToDelete.begin(),
+			                              additionalPossibleQuestsToDelete.end());
+		}
+
+		while (numberToDelete > 0)
+		{
+			DEBUG_FATAL(possibleQuestsToDelete.empty(),("Programmer bug:  there is an error in the questCheckQuestLimits logic such that possibleQuestsToDelete was unexpectedly empty"));
+
+			// Remove the "oldest" quest from the beginning of the list
+			QuestDataToSort const& questDataToSort    = possibleQuestsToDelete.front();
+			uint32 const           playerQuestDataKey = questDataToSort.GetPlayerQuestDataKey();
+			questClearQuest(playerQuestDataKey);
+			possibleQuestsToDelete.pop_front();
+			--numberToDelete;
+
+			LOG("CustomerService",("Removed quest %lu from player %s because there were too many quests in the journal", playerQuestDataKey, NON_NULL(getCreatureObject())->getNetworkId().getValueString().c_str()));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+PlayerObject::QuestResult PlayerObject::questCompleteQuest(uint32 const questCrc)
+{
+	Quest const * const quest = QuestManager::getQuest(questCrc);
+	if (!quest)
+		return QR_noSuchQuest;
+
+	if(!questHasActiveQuest(questCrc))
+		return QR_questNotActive;
+
+	if(questHasCompletedQuest(questCrc))
+		return QR_alreadyComplete;
+
+	PlayerQuestDataMap::const_iterator questData=m_quests.find(questCrc);
+	if (questData==m_quests.end())
+		return QR_questNotActive;
+
+	//clear any leftover tasks for this quest
+	int taskId = 0;
+	for(; taskId < quest->getNumberOfTasks(); ++taskId)
+	{
+		if(questHasActiveQuestTask(questCrc, taskId))
+			questClearQuestTask(questCrc, taskId);
+	}
+
+	PlayerQuestData newQuestData(questData->second); // unfortunately have to copy the quest data, because AutoDeltaPackedMap does not have non-const iterators
+	setPlayerQuestDataComplete(questCrc, newQuestData);
+
+	CreatureObject * owner = getCreatureObject();
+	if(owner)
+	{
+		ScriptParams params;
+		params.addParam(static_cast<int>(questCrc));
+		GameScriptObject * const scriptObject = owner->getScriptObject();
+		if(scriptObject)
+		{
+			scriptObject->trigAllScripts(Scripting::TRIG_QUEST_COMPLETED, params);
+		}
+	}
+
+	CreatureObject * const playerCreature = getCreatureObject();
+	//see if this quest needs to go through our acceptance/completion UI flow
+	if(QuestManager::isQuestAcceptable(quest->getName().getString()))
+	{
+		//-- Request the recipient's client to have the emitter object render the text.
+		Controller * const controller = playerCreature->getController();
+		if(controller)
+		{
+			setPendingRequestQuestInformation(questCrc, NetworkId::cms_invalid);
+			MessageQueueGenericValueType<int> * const msg = new MessageQueueGenericValueType<int>(static_cast<int>(questCrc));
+			controller->appendMessage(static_cast<int>(CM_requestCompleteQuest), 0.0f, msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+		}
+	}
+	else
+	{
+		questGrantQuestReward(static_cast<uint32>(questCrc), "");
+	}
+
+	return QR_success;
+}
+
+// ----------------------------------------------------------------------
+
+PlayerObject::QuestResult PlayerObject::questGrantQuestReward(uint32 const questCrc, std::string const & selectedReward)
+{
+	Quest const * const quest=QuestManager::getQuest(questCrc);
+	if (!quest)
+		return QR_noSuchQuest;
+
+	if(!questHasCompletedQuest(questCrc))
+		return QR_questNotCompleted;
+
+	PlayerQuestDataMap::const_iterator questData = m_quests.find(questCrc);
+
+	PlayerQuestData newQuestData(questData->second); // unfortunately have to copy the quest data, because AutoDeltaPackedMap does not have non-const iterators
+
+	if(newQuestData.hasReceivedReward())
+	{
+		return QR_alreadyReceivedReward;
+	}
+
+	CreatureObject * owner = getCreatureObject();
+	if(owner)
+	{
+		ScriptParams params;
+		params.addParam(static_cast<int>(questCrc));
+		if(quest->isAnExclusiveStaticLootReward(selectedReward))
+			params.addParam(selectedReward.c_str());
+		else
+			params.addParam("");
+		GameScriptObject * const scriptObject = owner->getScriptObject();
+		if(scriptObject)
+		{
+			if(scriptObject->trigAllScripts(Scripting::TRIG_QUEST_GRANT_REWARD, params) == SCRIPT_CONTINUE)
+			{
+				newQuestData.setHasReceivedReward(true);
+				setPlayerQuestDataComplete(questCrc, newQuestData);
+			}
+		}
+	}
+
+	return QR_success;
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::questPlayerCanClaimRewardFor(uint32 const questCrc)
+{
+	PlayerQuestDataMap::const_iterator const questData = m_quests.find(questCrc);
+
+	PlayerQuestData const newQuestData(questData->second); // unfortunately have to copy the quest data, because AutoDeltaPackedMap does not have non-const iterators
+
+	return (questHasCompletedQuest(questCrc) && !newQuestData.hasReceivedReward());
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::questClearQuest(uint32 const questCrc)
+{
+	Quest const * const quest=QuestManager::getQuest(questCrc);
+	if(quest)
+	{
+		//clear any leftover tasks for this quest
+		int taskId = 0;
+		for(; taskId < quest->getNumberOfTasks(); ++taskId)
+		{
+			if(questHasActiveQuestTask(questCrc, taskId))
+				questClearQuestTask(questCrc, taskId);
+		}
+	}
+
+	m_quests.erase(questCrc);
+
+	//-- if the cleared quest is the current quest, pick a new one
+	if (questCrc == getCurrentQuest())
+	{
+		pickNewCurrentQuest();
+	}
+
+	CreatureObject * owner = getCreatureObject();
+	if(owner)
+	{
+		ScriptParams params;
+		params.addParam(static_cast<int>(questCrc));
+		GameScriptObject * const scriptObject = owner->getScriptObject();
+		if(scriptObject)
+		{
+			scriptObject->trigAllScripts(Scripting::TRIG_QUEST_CLEARED, params);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+PlayerObject::QuestResult PlayerObject::questCanActivateQuestTask(uint32 const questCrc, int const taskId) const
+{
+	Quest const * const quest = QuestManager::getQuest(questCrc);
+	if (!quest)
+		return QR_noSuchQuest;
+	QuestTask const * const questTask = quest->getTask(taskId);
+	if (!questTask)
+		return QR_noSuchTask;
+	PlayerQuestDataMap::const_iterator questData=m_quests.find(questCrc);
+	if (questData==m_quests.end())
+		return QR_questNotActive;
+	if (questData->second.isTaskActive(taskId))
+		return QR_alreadyActive;
+	if (!questTask->isRepeatable() && questData->second.isTaskCompleted(taskId))
+		return QR_alreadyComplete;
+
+	// check for prerequisites/exclusions
+	{
+		std::vector<int> const & prerequisites = questTask->getPrerequisiteTasks();
+		for(std::vector<int>::const_iterator i = prerequisites.begin(); i!= prerequisites.end(); ++i)
+		{
+			if (!questData->second.isTaskCompleted(*i))
+				return QR_failedPrerequisites;
+		}
+	}
+	{
+		std::vector<int> const & exclustion = questTask->getExclusionTasks();
+		for(std::vector<int>::const_iterator i = exclustion.begin(); i!= exclustion.end(); ++i)
+		{
+			if (questData->second.isTaskCompleted(*i) || questData->second.isTaskActive(*i))
+				return QR_failedExclusion;
+		}
+	}
+
+	return QR_success;
+}
+
+// ----------------------------------------------------------------------
+
+PlayerObject::QuestResult PlayerObject::questActivateQuestTask(uint32 const questCrc, int const taskId)
+{
+	QuestResult canActivateResult = questCanActivateQuestTask(questCrc, taskId);
+	if (canActivateResult != QR_success)
+		return canActivateResult;
+
+	PlayerQuestDataMap::const_iterator questData=m_quests.find(questCrc);
+	DEBUG_FATAL(questData==m_quests.end(),("Programmer bug:  questCanActivateQuestTask(%lu, %i) returned success, but the quest was not in m_quests", questCrc, taskId));
+
+	PlayerQuestData newQuestData(questData->second); // unfortunately have to copy the quest data, because AutoDeltaPackedMap does not have non-const iterators
+	newQuestData.activateTask(taskId);
+	m_quests.set(questCrc, newQuestData);
+
+	const Quest * const quest = QuestManager::getQuest(questCrc);
+	if(quest)
+	{
+		const QuestTask * const task = quest->getTask(taskId);
+		if(task)
+		{
+			ScriptParams params;
+			params.addParam(static_cast<int>(questCrc));
+			params.addParam(static_cast<int>(taskId));
+
+			CreatureObject * owner = getCreatureObject();
+			if(owner)
+			{
+				GameScriptObject * script = owner->getScriptObject();
+				if(script)
+				{
+					const std::string & attachScript = task->getAttachScript();
+					if(!attachScript.empty())
+					{
+						refScript(*owner, attachScript);
+						{
+							IGNORE_RETURN(script->trigOneScript(attachScript, Scripting::TRIG_TASK_ACTIVATED, params));
+						}
+					}
+
+					IGNORE_RETURN(script->trigAllScripts(Scripting::TRIG_SOME_TASK_ACTIVATED, params));
+				}
+			}
+
+			CreatureObject * const co = getCreatureObject();
+			if(co)
+			{
+				if(!task->getMusicOnActivate().empty())
+				{
+					Client * const c = co->getClient();
+					if (c)
+					{
+						PlayMusicMessage const msg(task->getMusicOnActivate(), NetworkId::cms_invalid, 0, false);
+						c->send(msg, true);
+					}
+				}
+			}
+		}
+	}
+
+	return QR_success;
+}
+
+// ----------------------------------------------------------------------
+
+PlayerObject::QuestResult PlayerObject::questCompleteQuestTask(uint32 const questCrc, int const taskId)
+{
+	Quest const * const quest = QuestManager::getQuest(questCrc);
+	if (!quest)
+		return QR_noSuchQuest; // Quest has been removed from the data table, apparently
+	QuestTask const * const questTask = quest->getTask(taskId);
+	if (!questTask)
+		return QR_noSuchTask;
+
+	PlayerQuestDataMap::const_iterator questData=m_quests.find(questCrc);
+	if (questData==m_quests.end())
+		return QR_questNotActive;
+	if (!questData->second.isTaskActive(taskId))
+		return QR_taskNotActive;
+
+	PlayerQuestData newQuestData(questData->second);
+	newQuestData.completeTask(taskId);
+	m_quests.set(questCrc, newQuestData);
+
+	ScriptParams params;
+	params.addParam(static_cast<int>(questCrc));
+	params.addParam(static_cast<int>(taskId));
+
+	CreatureObject * owner = getCreatureObject();
+	if(owner)
+	{
+		GameScriptObject * script = owner->getScriptObject();
+		if(script)
+		{
+			const std::string & attachScript = questTask->getAttachScript();
+			if(!attachScript.empty())
+			{
+				IGNORE_RETURN(script->trigOneScript(attachScript, Scripting::TRIG_TASK_COMPLETED, params));
+				derefScript(*owner, attachScript);
+			}
+
+			IGNORE_RETURN(script->trigAllScripts(Scripting::TRIG_SOME_TASK_COMPLETED, params));
+		}
+	}
+
+	if (questTask->questCompletesOnTaskCompletion())
+	{
+		questCompleteQuest(questCrc);
+		return QR_success;
+	}
+	else if (questTask->questClearsOnTaskCompletion())
+	{
+		questClearQuest(questCrc);
+		return QR_success;
+	}
+
+	TaskChanceVector tasksWithChanceToActivate;
+	int totalChance = 0;
+
+	QuestTask::TaskIdList const & nextTasks = questTask->getTasksOnComplete();
+	for (QuestTask::TaskIdList::const_iterator i=nextTasks.begin(); i != nextTasks.end(); ++i)
+	{
+		QuestTask const * const taskOnComplete = quest->getTask(*i);
+		if (taskOnComplete)
+		{
+			int const chanceToActivate = taskOnComplete->getChanceToActivate();
+			if (chanceToActivate <= 0)
+				IGNORE_RETURN(questActivateQuestTask(questCrc, *i)); // activate all that are possible, ignore the ones that aren't
+			else
+			{
+				tasksWithChanceToActivate.push_back(std::make_pair(*i, chanceToActivate));
+				totalChance += chanceToActivate;
+			}
+		}
+	}
+
+	if (totalChance)
+	{
+		int const winningChance = Random::random(totalChance - 1);
+		int previousChance = 0;
+
+		TaskChanceVector::const_iterator currentTaskChance = tasksWithChanceToActivate.begin();
+
+		for (;currentTaskChance != tasksWithChanceToActivate.end(); ++currentTaskChance)
+		{
+			int const currentChance = previousChance + currentTaskChance->second;
+
+			if (winningChance >= previousChance && winningChance < currentChance)
+			{
+				IGNORE_RETURN(questActivateQuestTask(questCrc, currentTaskChance->first));
+				break;
+			}
+
+			previousChance = currentChance;
+		}
+	}
+
+	//closeout quest if they're done with all the tasks, if the quest is marked to allow this
+	//The "space quests" written using breinhart's quest backend will NOT use this, the "ground quests" will
+	bool questIsComplete = true;
+	for(int it = 0; it < quest->getNumberOfTasks(); ++it)
+	{
+		bool const completedTask = questHasCompletedQuestTask(questCrc, it);
+		if(!completedTask)
+		{
+			questIsComplete = false;
+			break;
+		}
+	}
+	if(questIsComplete && quest->getCompleteQuestWhenTasksComplete())
+	{
+		questCompleteQuest(questCrc);
+	}
+	return QR_success;
+}
+
+// ----------------------------------------------------------------------
+
+PlayerObject::QuestResult PlayerObject::questFailQuestTask(uint32 const questCrc, int const taskId)
+{
+	Quest const * const quest = QuestManager::getQuest(questCrc);
+	if (!quest)
+		return QR_noSuchQuest; // Quest has been removed from the data table, apparently
+	QuestTask const * const questTask = quest->getTask(taskId);
+	if (!questTask)
+		return QR_noSuchTask;
+
+	PlayerQuestDataMap::const_iterator questData=m_quests.find(questCrc);
+	if (questData==m_quests.end())
+		return QR_questNotActive;
+	if (!questData->second.isTaskActive(taskId))
+		return QR_taskNotActive;
+
+	PlayerQuestData newQuestData(questData->second);
+	newQuestData.clearTask(taskId);
+	m_quests.set(questCrc, newQuestData);
+
+	ScriptParams params;
+	params.addParam(static_cast<int>(questCrc));
+	params.addParam(static_cast<int>(taskId));
+
+	CreatureObject * owner = getCreatureObject();
+	if(owner)
+	{
+		GameScriptObject * script = owner->getScriptObject();
+		if(script)
+		{
+			const std::string & attachScript = questTask->getAttachScript();
+			if(!attachScript.empty())
+			{
+				IGNORE_RETURN(script->trigOneScript(attachScript, Scripting::TRIG_TASK_FAILED, params));
+				derefScript(*owner, attachScript);
+			}
+
+			IGNORE_RETURN(script->trigAllScripts(Scripting::TRIG_SOME_TASK_FAILED, params));
+		}
+	}
+
+	if (questTask->questCompletesOnTaskFailure())
+	{
+		questCompleteQuest(questCrc);
+		return QR_success;
+	}
+	else if (questTask->questClearsOnTaskFailure())
+	{
+		questClearQuest(questCrc);
+		return QR_success;
+	}
+
+	QuestTask::TaskIdList const & nextTasks = questTask->getTasksOnFail();
+	for (QuestTask::TaskIdList::const_iterator i=nextTasks.begin(); i != nextTasks.end(); ++i)
+	{
+		IGNORE_RETURN(questActivateQuestTask(questCrc, *i)); // activate all that are possible, ignore the ones that aren't
+	}
+
+	return QR_success;
+}
+
+// ----------------------------------------------------------------------
+
+PlayerObject::QuestResult PlayerObject::questClearQuestTask(uint32 const questCrc, int const taskId)
+{
+	Quest const * const quest = QuestManager::getQuest(questCrc);
+	if (!quest)
+		return QR_noSuchQuest; // Quest has been removed from the data table, apparently
+	QuestTask const * const questTask = quest->getTask(taskId);
+	if (!questTask)
+		return QR_noSuchTask;
+
+	PlayerQuestDataMap::const_iterator questData=m_quests.find(questCrc);
+	if (questData==m_quests.end())
+		return QR_questNotActive;
+	if (!questData->second.isTaskActive(taskId))
+		return QR_taskNotActive;
+
+	PlayerQuestData newQuestData(questData->second);
+	newQuestData.clearTask(taskId);
+	m_quests.set(questCrc, newQuestData);
+
+	ScriptParams params;
+	params.addParam(static_cast<int>(questCrc));
+	params.addParam(static_cast<int>(taskId));
+
+	CreatureObject * owner = getCreatureObject();
+	if(owner)
+	{
+		GameScriptObject * script = owner->getScriptObject();
+		if(script)
+		{
+			const std::string & attachScript = questTask->getAttachScript();
+			if(!attachScript.empty())
+			{
+				IGNORE_RETURN(script->trigOneScript(attachScript, Scripting::TRIG_TASK_CLEARED, params));
+				derefScript(*owner, attachScript);
+			}
+
+			IGNORE_RETURN(script->trigAllScripts(Scripting::TRIG_SOME_TASK_CLEARED, params));
+		}
+	}
+
+	return QR_success;
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::questHasActiveQuest(uint32 const questCrc) const
+{
+	PlayerQuestDataMap::const_iterator questData=m_quests.find(questCrc);
+	return (questData!=m_quests.end() && !questData->second.isCompleted());
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::questHasCompletedQuest(uint32 const questCrc) const
+{
+	PlayerQuestDataMap::const_iterator questData=m_quests.find(questCrc);
+	return (questData!=m_quests.end() && questData->second.isCompleted());
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::questHasActiveQuestTask(uint32 const questCrc, int const taskId) const
+{
+	PlayerQuestDataMap::const_iterator questData=m_quests.find(questCrc);
+	if (questData==m_quests.end())
+		return false;
+
+	return (questData->second.isTaskActive(taskId));
+
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::questHasCompletedQuestTask(uint32 const questCrc, int const taskId) const
+{
+	PlayerQuestDataMap::const_iterator questData=m_quests.find(questCrc);
+	if (questData==m_quests.end())
+		return false;
+
+	return (questData->second.isTaskCompleted(taskId));
+}
+
+// ----------------------------------------------------------------------
+
+uint32 PlayerObject::questGetQuestStatus(uint32 const questCrc) const
+{
+	PlayerQuestDataMap::const_iterator questData = m_quests.find(questCrc);
+
+	if (questData == m_quests.end())
+		return 0;
+
+	return (questData->second.getActiveTasks() << 16) | (questData->second.getCompletedTasks() & 0xFFFF);
+}
+
+// ----------------------------------------------------------------------
+
+std::set<PlayerObject const *> const &PlayerObject::getAllPlayerObjects() // static
+{
+	return s_allPlayerObjects;
+}
+
+// ----------------------------------------------------------------------
+
+PlayerObject::WaypointMap const &PlayerObject::getWaypoints() const
+{
+	return m_waypoints.getMap();
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::getByteStreamFromAutoVariable(const std::string & name, Archive::ByteStream & target) const
+{
+	if(name == "quests")
+	{
+		Archive::AutoDeltaMap<unsigned long, PlayerQuestData>(m_quests).pack(target);
+	}
+	else if(name == "completedQuests")
+	{
+		m_completedQuests.pack(target);
+	}
+	else if(name == "activeQuests")
+	{
+		m_activeQuests.pack(target);
+	}
+	else if(name == "currentQuest")
+	{
+		m_currentQuest.pack(target);
+	}
+	else if(name == "bornDate")
+	{
+		m_bornDate.pack(target);
+	}
+	else if(name == "playedTime")
+	{
+		m_playedTime.pack(target);
+	}
+	else if(name == "food")
+	{
+		m_food.pack(target);
+	}
+	else if(name == "maxFood")
+	{
+		m_maxFood.pack(target);
+	}
+	else if(name == "drink")
+	{
+		m_drink.pack(target);
+	}
+	else if(name == "maxDrink")
+	{
+		m_maxDrink.pack(target);
+	}
+	else if(name == "meds")
+	{
+		m_meds.pack(target);
+	}
+	else if(name == "maxMeds")
+	{
+		m_maxMeds.pack(target);
+	}
+	else if(name == "privledgedTitle")
+	{
+		m_privledgedTitle.pack(target);
+	}
+	else if(name == "matchMakingPersonalProfileId")
+	{
+		m_matchMakingPersonalProfileId.pack(target);
+	}
+	else if(name == "matchMakingCharacterProfileId")
+	{
+		m_matchMakingCharacterProfileId.pack(target);
+	}
+	else if(name == "workingSkill")
+	{
+		m_workingSkill.pack(target);
+	}
+	else if(name == "skillTemplate")
+	{
+		m_skillTemplate.pack(target);
+	}
+	else if(name == "collections")
+	{
+		m_collections.pack(target);
+	}
+	else if(name == "collections2")
+	{
+		m_collections2.pack(target);
+	}
+	else
+	{
+		IntangibleObject::getByteStreamFromAutoVariable(name, target);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setAutoVariableFromByteStream(const std::string & name, const Archive::ByteStream & source)
+{
+	Archive::ReadIterator ri(source);
+	if(name == "quests")
+	{
+		typedef Archive::AutoDeltaMap<unsigned long, PlayerQuestData>::Command Commands;
+		std::vector<Commands> quests;
+
+		m_quests.clear();
+		Archive::AutoDeltaMap<unsigned long, PlayerQuestData>(m_quests).unpack(ri, quests);
+
+		for (std::vector<Commands>::const_iterator questIter = quests.begin(); questIter != quests.end(); ++questIter)
+		{
+			if (questIter)
+				m_quests.set(questIter->key, questIter->value);
+		}
+	}
+	else if(name == "completedQuests")
+	{
+		m_completedQuests.unpackDelta(ri);
+	}
+	else if(name == "activeQuests")
+	{
+		m_activeQuests.unpackDelta(ri);
+	}
+	else if(name == "currentQuest")
+	{
+		m_currentQuest.unpackDelta(ri);
+	}
+	else if(name == "bornDate")
+	{
+		m_bornDate.unpackDelta(ri);
+	}
+	else if(name == "playedTime")
+	{
+		m_playedTime.unpackDelta(ri);
+	}
+	else if(name == "food")
+	{
+		m_food.unpackDelta(ri);
+	}
+	else if(name == "maxFood")
+	{
+		m_maxFood.unpackDelta(ri);
+	}
+	else if(name == "drink")
+	{
+		m_drink.unpackDelta(ri);
+	}
+	else if(name == "maxDrink")
+	{
+		m_maxDrink.unpackDelta(ri);
+	}
+	else if(name == "meds")
+	{
+		m_meds.unpackDelta(ri);
+	}
+	else if(name == "maxMeds")
+	{
+		m_maxMeds.unpackDelta(ri);
+	}
+	else if(name == "privledgedTitle")
+	{
+		m_privledgedTitle.unpackDelta(ri);
+	}
+	else if(name == "matchMakingPersonalProfileId")
+	{
+		m_matchMakingPersonalProfileId.unpackDelta(ri);
+	}
+	else if(name == "matchMakingCharacterProfileId")
+	{
+		m_matchMakingCharacterProfileId.unpackDelta(ri);
+	}
+	else if(name == "workingSkill")
+	{
+		m_workingSkill.unpackDelta(ri);
+	}
+	else if(name == "skillTemplate")
+	{
+		m_skillTemplate.unpackDelta(ri);
+	}
+	else if(name == "collections")
+	{
+		m_collections.unpackDelta(ri);
+	}
+	else if(name == "collections2")
+	{
+		m_collections2.unpackDelta(ri);
+	}
+	else
+	{
+		IntangibleObject::setAutoVariableFromByteStream(name, source);
+	}
+	addObjectToConcludeList();
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setGroupWaypoints(WaypointMap const &groupWaypoints)
+{
+	DEBUG_FATAL(!isAuthoritative(), ("PlayerObject::setGroupWaypoints: called on non-authoritative object %s", getDebugInformation().c_str()));
+	if (isAuthoritative())
+	{
+		//-- Anything in the new set, we need to set (the AutoDeltaMap will throw out anything unchanged)
+		{
+			for (WaypointMap::const_iterator i = groupWaypoints.begin(); i != groupWaypoints.end(); ++i)
+				m_groupWaypoints.set((*i).first, (*i).second);
+		}
+
+		//-- Anything that is not in the original set, we need to remove
+		{
+			for (WaypointMap::const_iterator i = m_groupWaypoints.begin(); i != m_groupWaypoints.end(); ++i)
+				if (groupWaypoints.find((*i).first) == groupWaypoints.end())
+					m_groupWaypoints.erase((*i).first);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+uint32 PlayerObject::getPlayedTime() const
+{
+	return static_cast<uint32>(m_playedTime.get() + m_playedTimeAccum);
+}
+
+// ----------------------------------------------------------------------
+
+float PlayerObject::getPlayedTimeAccumOnly() const
+{
+	return m_playedTimeAccum;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setPlayedTimeAccumOnly(float playedTimeAccum)
+{
+	m_playedTimeAccum = playedTimeAccum;
+}
+
+// ----------------------------------------------------------------------
+
+unsigned long PlayerObject::getSessionPlayTimeDuration() const
+{
+	time_t const sessionStartPlayTime = static_cast<time_t>(m_sessionStartPlayTime.get());
+	if (sessionStartPlayTime > 0)
+	{
+		time_t const now = ::time(NULL);
+		if (now > sessionStartPlayTime)
+			return static_cast<unsigned long>(now - sessionStartPlayTime);
+	}
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+unsigned long PlayerObject::getSessionActivePlayTimeDuration() const
+{
+	unsigned long activePlayTimeDuration = m_sessionActivePlayTimeDuration.get();
+
+	time_t const sessionLastActiveTime = static_cast<time_t>(m_sessionLastActiveTime.get());
+	if (sessionLastActiveTime > 0)
+	{
+		time_t const now = ::time(NULL);
+		if (now > sessionLastActiveTime)
+			activePlayTimeDuration += static_cast<unsigned long>(now - sessionLastActiveTime);
+	}
+
+	return activePlayTimeDuration;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setSessionPlayTimeInfo(int32 sessionStartPlayTime, int32 sessionLastActiveTime, unsigned long sessionActivePlayTimeDuration)
+{
+	// shouldn't be calling this on a non-auth object
+	if (!isAuthoritative())
+		return;
+
+	int32 const previousSessionStartPlayTime = m_sessionStartPlayTime.get();
+	int32 const previousSessionLastActiveTime = m_sessionLastActiveTime.get();
+
+	m_sessionStartPlayTime = sessionStartPlayTime;
+	m_sessionLastActiveTime = sessionLastActiveTime;
+	m_sessionActivePlayTimeDuration = sessionActivePlayTimeDuration;
+
+	// just connected
+	if ((previousSessionStartPlayTime == 0) && (sessionStartPlayTime != 0))
+	{
+		CreatureObject const * const owner = getCreatureObject();
+		if (owner)
+		{
+			LfgCharacterData lfgCharacterData;
+			owner->getLfgCharacterData(lfgCharacterData);
+
+			ServerUniverse::setConnectedCharacterLfgData(owner->getNetworkId(), lfgCharacterData);
+
+			BiographyManager::requestBiography(owner->getNetworkId(), NULL);
+
+			// check/set "account age" title
+			checkAndSetAccountAgeTitle(*this);
+		}
+	}
+	// just disconnected
+	else if ((sessionStartPlayTime == 0) && (previousSessionStartPlayTime != 0))
+	{
+		CreatureObject const * const owner = getCreatureObject();
+		if (owner)
+		{
+			ServerUniverse::removeConnectedCharacterData(owner->getNetworkId());
+		}
+	}
+	else if (sessionStartPlayTime != 0)
+	{
+		// just went active/inactive
+		if (((previousSessionLastActiveTime == 0) && (sessionLastActiveTime != 0)) ||
+		    ((sessionLastActiveTime == 0) && (previousSessionLastActiveTime != 0)))
+		{
+			CreatureObject const * const owner = getCreatureObject();
+			if (owner)
+			{
+				LfgCharacterData lfgCharacterData;
+				owner->getLfgCharacterData(lfgCharacterData);
+
+				std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData();
+				std::map<NetworkId, LfgCharacterData>::const_iterator iterFindLfg = connectedCharacterLfgData.find(owner->getNetworkId());
+				if ((iterFindLfg == connectedCharacterLfgData.end()) || (iterFindLfg->second != lfgCharacterData))
+					ServerUniverse::setConnectedCharacterLfgData(owner->getNetworkId(), lfgCharacterData);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setRoleIconChoice(int roleIconChoice)
+{
+	m_roleIconChoice = roleIconChoice;
+}
+
+// ----------------------------------------------------------------------
+
+int PlayerObject::getRoleIconChoice() const
+{
+	return m_roleIconChoice.get();
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setAggroImmuneDuration(int const time)
+{
+	m_aggroImmuneDuration = static_cast<time_t>(time);
+	m_aggroImmuneStartTime = Os::getRealSystemTime();
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::isAggroImmune() const
+{
+	time_t const elapsedTime = Os::getRealSystemTime() - m_aggroImmuneStartTime.get();
+
+	return (elapsedTime < m_aggroImmuneDuration.get());
+}
+
+// ----------------------------------------------------------------------
+
+int PlayerObject::getAgeInDays() const
+{
+	return int(getCurrentBornDate() - getBornDate());
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & PlayerObject::getSkillTemplate() const
+{
+	return m_skillTemplate.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::setSkillTemplate(std::string const & templateName, bool const clientRequest)
+{
+	std::string const previousTemplateName(m_skillTemplate.get());
+
+	// we need to pass an empty string to script to do cleanup, but we don't want to actually change the player's skill
+	if (!templateName.empty())
+		m_skillTemplate.set(templateName);
+
+	CreatureObject * const owner = getCreatureObject();
+	if(owner)
+	{
+		GameScriptObject * const script = owner->getScriptObject();
+		if(script)
+		{
+			ScriptParams params;
+
+			params.addParam(templateName.c_str());
+			params.addParam(clientRequest);
+
+			if (script->trigAllScripts(Scripting::TRIG_SKILL_TEMPLATE_CHANGED, params) == SCRIPT_DEFAULT)
+			{
+				m_skillTemplate.set(previousTemplateName);
+				LOG("ScriptInvestigation", ("Scripts blocked setSkillTemplate( %s ) on Player( %s ).  Reverting to %s.", templateName.c_str(), getAccountDescription().c_str(), previousTemplateName.c_str()));
+			}
+		}
+
+		if (previousTemplateName != m_skillTemplate.get())
+		{
+			uint8 const newProfession = static_cast<uint8>(LfgCharacterData::convertSkillTemplateToProfession(m_skillTemplate.get()));
+
+			GroupObject * const group = owner->getGroup();
+			if (group)
+			{
+				uint8 const currentProfessionForGroup = group->getMemberProfession(owner->getNetworkId());
+
+				if (newProfession != currentProfessionForGroup)
+					group->setMemberProfession(owner->getNetworkId(), newProfession);
+			}
+
+			std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData();
+			std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = connectedCharacterLfgData.find(owner->getNetworkId());
+			if ((iterFind != connectedCharacterLfgData.end()) && (iterFind->second.profession != static_cast<LfgCharacterData::Profession>(newProfession)))
+				ServerUniverse::setConnectedCharacterProfessionData(owner->getNetworkId(), static_cast<LfgCharacterData::Profession>(newProfession));
+		}
+	}
+
+	return (templateName != previousTemplateName);
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & PlayerObject::getWorkingSkill() const
+{
+	return m_workingSkill.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::setWorkingSkill(std::string const & skillName, bool const clientRequest)
+{
+	std::string const previousWorkingSkill(m_workingSkill.get());
+
+	m_workingSkill.set(skillName);
+
+	CreatureObject * const owner = getCreatureObject();
+	if(owner)
+	{
+		GameScriptObject * const script = owner->getScriptObject();
+		if(script)
+		{
+			ScriptParams params;
+
+			params.addParam(skillName.c_str());
+			params.addParam(clientRequest);
+
+			if (script->trigAllScripts(Scripting::TRIG_WORKING_SKILL_CHANGED, params) == SCRIPT_DEFAULT)
+			{
+				m_workingSkill.set(previousWorkingSkill);
+				LOG("ScriptInvestigation", ("Scripts blocked setWorkingSkill( %s ) on Player( %s ). Reverting to %s.", skillName.c_str(), getAccountDescription().c_str(), previousWorkingSkill.c_str()));
+			}
+		}
+	}
+
+
+	return (previousWorkingSkill != skillName);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setPendingRequestQuestInformation(uint32 questCrc, NetworkId const & questGiver)
+{
+	m_pendingRequestQuestCrc = questCrc;
+	m_pendingRequestQuestGiver = questGiver;
+}
+
+// ----------------------------------------------------------------------
+
+uint32 PlayerObject::getPendingRequestQuestCrc() const
+{
+	return m_pendingRequestQuestCrc;
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & PlayerObject::getPendingRequestQuestGiver() const
+{
+	return m_pendingRequestQuestGiver;
+}
+
+// ----------------------------------------------------------------------
+
+int PlayerObject::getNumberOfActiveQuests() const
+{
+	int counter = 0;
+	for (PlayerQuestDataMap::const_iterator i = m_quests.begin(); i != m_quests.end(); ++i)
+	{
+		PlayerQuestData const questData(i->second); // unfortunately have to copy the quest data, because AutoDeltaPackedMap does not have non-const iterators
+		if(!questData.isCompleted())
+		{
+			++counter;
+		}
+	}
+	return counter;
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<int> PlayerObject::questGetAllActiveQuestIds() const
+{
+	std::vector<int> result;
+	for (PlayerQuestDataMap::const_iterator i=m_quests.begin(); i!=m_quests.end(); ++i)
+	{
+		if(!i->second.isCompleted())
+		{
+			result.push_back(i->first);
+		}
+	}
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<int> PlayerObject::questGetAllCompletedQuestIds() const
+{
+	std::vector<int> result;
+	for (PlayerQuestDataMap::const_iterator i=m_quests.begin(); i!=m_quests.end(); ++i)
+	{
+		if(i->second.isCompleted())
+		{
+			result.push_back(i->first);
+		}
+	}
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setPlayerQuestDataComplete(uint32 questCrc, PlayerQuestData & playerQuestData)
+{
+	playerQuestData.complete();
+	m_quests.set(questCrc, playerQuestData);
+
+	//-- if the completed quest is the current quest, pick a new one
+	if (questCrc == getCurrentQuest())
+	{
+		pickNewCurrentQuest();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::pickNewCurrentQuest()
+{
+	uint32 lastRelativeAgeIndex = 0;
+	uint32 lastQuestCrc = 0;
+
+	for (PlayerQuestDataMap::const_iterator i = m_quests.begin(); i != m_quests.end(); ++i)
+	{
+		PlayerQuestData const & questData = i->second;
+		uint32 const questCrc = i->first;
+
+		if (!questData.isCompleted() && questData.getRelativeAgeIndex() >= lastRelativeAgeIndex)
+		{
+			lastQuestCrc = questCrc;
+			lastRelativeAgeIndex = questData.getRelativeAgeIndex();
+		}
+	}
+
+	setCurrentQuest(lastQuestCrc);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::modifyCurrentGcwPoints(int const count, bool modifyLifetimeValue)
+{
+	CreatureObject * const owner = getCreatureObject();
+	if (!owner)
+		return;
+
+	if (isAuthoritative())
+	{
+		if (PvpData::isImperialFactionId(owner->getPvpFaction()) || PvpData::isRebelFactionId(owner->getPvpFaction()))
+		{
+			static int32 const max = std::numeric_limits<int32>::max();
+
+			// m_currentGcwPoints should always be >= 0
+			int32 const currentValue = std::max(static_cast<int32>(0), m_currentGcwPoints.get());
+
+			// limit count so it doesn't cause overflow
+			int32 const adjustedCount = std::min(static_cast<int32>(count), max - currentValue);
+
+			int32 temp = 0;
+			if (adjustedCount != 0)
+			{
+				temp = m_currentGcwPoints.get();
+				m_currentGcwPoints = std::max(static_cast<int32>(0), currentValue + adjustedCount);
+			}
+
+			if (modifyLifetimeValue && (count > 0))
+				modifyLifetimeGcwPoints(count);
+
+			if (adjustedCount != 0)
+			{
+				char buffer[256];
+				sprintf(buffer, INT64_FORMAT_SPECIFIER, m_lifetimeGcwPoints.get());
+
+				LOG("CustomerService", ("PvP_Ranking:%s|adjust point=%d|current=%ld|new=%ld|lifetime=%s",
+					getAccountDescription().c_str(),
+					count,
+					temp,
+					m_currentGcwPoints.get(),
+					buffer));
+			}
+		}
+		else
+		{
+			// non-factional characters is always at 0
+			if (m_currentGcwPoints.get() != 0)
+			{
+				LOG("CustomerService", ("PvP_Ranking:%s|adjust point=%d|setting current points (%ld) to 0 because not factional",
+					getAccountDescription().c_str(),
+					count,
+					m_currentGcwPoints.get()));
+
+				m_currentGcwPoints = 0;
+			}
+		}
+
+		// make sure that m_nextGcwRatingCalcTime is set so that the
+		// rating will be recalculated at the next recalculation interval
+		setNextGcwRatingCalcTime(false);
+	}
+	else
+	{
+		owner->sendControllerMessageToAuthServer(CM_modifyCurrentGcwPoints, new MessageQueueGenericValueType<std::pair<int, int> >(std::make_pair(count, (modifyLifetimeValue ? 1 : 0))));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::modifyCurrentGcwRating(int const count, bool modifyMaxValue)
+{
+	CreatureObject * const owner = getCreatureObject();
+	if (!owner)
+		return;
+
+	if (isAuthoritative())
+	{
+		if (PvpData::isImperialFactionId(owner->getPvpFaction()) || PvpData::isRebelFactionId(owner->getPvpFaction()))
+		{
+			static int32 const max = std::numeric_limits<int32>::max();
+
+			// m_currentGcwRating should always be >= 0
+			int32 const currentValue = std::max(static_cast<int32>(Pvp::getMinRatingForRank()), m_currentGcwRating.get());
+
+			// limit count so it doesn't cause overflow
+			int32 const adjustedCount = std::min(static_cast<int32>(count), max - currentValue);
+
+			if (adjustedCount != 0)
+			{
+				int32 const temp = m_currentGcwRating.get();
+
+				m_currentGcwRating = std::min(std::max(static_cast<int32>(Pvp::getMinRatingForRank()), currentValue + adjustedCount), static_cast<int32>(Pvp::getMaxRatingForRank()));
+
+				// calculate new rank
+				Pvp::PvpRankInfo const & pvpRankInfo = Pvp::getRankInfo(m_currentGcwRating.get());
+				int const oldRank = m_currentGcwRank.get();
+				m_currentGcwRank = pvpRankInfo.rank;
+
+				if (pvpRankInfo.rank > 0)
+				{
+					m_currentGcwRankProgress = static_cast<float>(std::min(static_cast<int>(m_currentGcwRating.get()), pvpRankInfo.maxRating) - pvpRankInfo.minRating) * 100.0f / static_cast<float>(pvpRankInfo.maxRating - pvpRankInfo.minRating + 1);
+				}
+				else
+				{
+					m_currentGcwRankProgress = 0.0f;
+				}
+
+				if (modifyMaxValue)
+				{
+					if (PvpData::isImperialFactionId(owner->getPvpFaction()) && (m_currentGcwRating.get() > m_maxGcwImperialRating.get()))
+					{
+						m_maxGcwImperialRating = m_currentGcwRating;
+						m_maxGcwImperialRank = Pvp::getRankInfo(m_maxGcwImperialRating.get()).rank;
+					}
+					else if (PvpData::isRebelFactionId(owner->getPvpFaction()) && (m_currentGcwRating.get() > m_maxGcwRebelRating.get()))
+					{
+						m_maxGcwRebelRating = m_currentGcwRating;
+						m_maxGcwRebelRank = Pvp::getRankInfo(m_maxGcwRebelRating.get()).rank;
+					}
+				}
+
+				LOG("CustomerService", ("PvP_Ranking:%s|adjust rating=%d|current=%ld|new=%ld|max imp=%ld|max reb=%ld",
+					getAccountDescription().c_str(),
+					count,
+					temp,
+					m_currentGcwRating.get(),
+					m_maxGcwImperialRating.get(),
+					m_maxGcwRebelRating.get()));
+
+				// notify script if rank changed
+				if (oldRank != m_currentGcwRank.get())
+				{
+					GameScriptObject * const script = owner->getScriptObject();
+
+					if (script != 0)
+					{
+						ScriptParams params;
+						params.addParam(oldRank);
+						params.addParam(m_currentGcwRank.get());
+						script->trigAllScripts(Scripting::TRIG_PVP_RANKING_CHANGED, params);
+					}
+				}
+			}
+		}
+		else
+		{
+			// non-factional characters is always at -1
+			if (m_currentGcwRating.get() != -1)
+			{
+				LOG("CustomerService", ("PvP_Ranking:%s|adjust rating=%d|setting current rating (%ld) to -1 because not factional",
+					getAccountDescription().c_str(),
+					count,
+					m_currentGcwRating.get()));
+
+				m_currentGcwRating = -1;
+			}
+
+			int const oldRank = m_currentGcwRank.get();
+			m_currentGcwRank = 0;
+			m_currentGcwRankProgress = 0.0f;
+
+			// notify script if rank changed
+			if (oldRank != m_currentGcwRank.get())
+			{
+				GameScriptObject * const script = owner->getScriptObject();
+
+				if (script != 0)
+				{
+					ScriptParams params;
+					params.addParam(oldRank);
+					params.addParam(m_currentGcwRank.get());
+					script->trigAllScripts(Scripting::TRIG_PVP_RANKING_CHANGED, params);
+				}
+			}
+		}
+
+		// make sure that m_nextGcwRatingCalcTime is set so that the
+		// rating will be recalculated at the next recalculation interval
+		setNextGcwRatingCalcTime(false);
+	}
+	else
+	{
+		owner->sendControllerMessageToAuthServer(CM_modifyCurrentGcwRating, new MessageQueueGenericValueType<std::pair<int, int> >(std::make_pair(count, (modifyMaxValue ? 1 : 0))));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::modifyCurrentPvpKills(int const count, bool modifyLifetimeValue)
+{
+	CreatureObject * const owner = getCreatureObject();
+	if (!owner)
+		return;
+
+	if (isAuthoritative())
+	{
+		if (PvpData::isImperialFactionId(owner->getPvpFaction()) || PvpData::isRebelFactionId(owner->getPvpFaction()))
+		{
+			static int32 const max = std::numeric_limits<int32>::max();
+
+			// m_currentPvpKills should always be >= 0
+			int32 const currentValue = std::max(static_cast<int32>(0), m_currentPvpKills.get());
+
+			// limit count so it doesn't cause overflow
+			int32 const adjustedCount = std::min(static_cast<int32>(count), max - currentValue);
+
+			int32 temp = 0;
+			if (adjustedCount != 0)
+			{
+				temp = m_currentPvpKills.get();
+				m_currentPvpKills = std::max(static_cast<int32>(0), currentValue + adjustedCount);
+			}
+
+			if (modifyLifetimeValue && (count > 0))
+				modifyLifetimePvpKills(count);
+
+			if (adjustedCount != 0)
+			{
+				LOG("CustomerService", ("PvP_Ranking:%s|adjust pvp kill=%d|current=%ld|new=%ld|lifetime=%ld",
+					getAccountDescription().c_str(),
+					count,
+					temp,
+					m_currentPvpKills.get(),
+					m_lifetimePvpKills.get()));
+			}
+		}
+		else
+		{
+			// non-factional characters is always at 0
+			if (m_currentPvpKills.get() != 0)
+			{
+				LOG("CustomerService", ("PvP_Ranking:%s|adjust pvp kill=%d|setting current pvp kill (%ld) to 0 because not factional",
+					getAccountDescription().c_str(),
+					count,
+					m_currentPvpKills.get()));
+
+				m_currentPvpKills = 0;
+			}
+		}
+
+		// make sure that m_nextGcwRatingCalcTime is set so that the
+		// rating will be recalculated at the next recalculation interval
+		setNextGcwRatingCalcTime(false);
+	}
+	else
+	{
+		owner->sendControllerMessageToAuthServer(CM_modifyCurrentPvpKills, new MessageQueueGenericValueType<std::pair<int, int> >(std::make_pair(count, (modifyLifetimeValue ? 1 : 0))));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::modifyLifetimeGcwPoints(int const count)
+{
+	if (isAuthoritative())
+	{
+		static int64 const max = std::numeric_limits<int64>::max();
+
+		// m_lifetimeGcwPoints should always be >= 0
+		int64 const currentValue = std::max(static_cast<int64>(0), m_lifetimeGcwPoints.get());
+
+		// limit count so it doesn't cause overflow
+		int64 const adjustedCount = std::min(static_cast<int64>(count), max - currentValue);
+
+		if (adjustedCount != 0)
+			m_lifetimeGcwPoints = std::max(static_cast<int64>(0), currentValue + adjustedCount);
+	}
+	else
+	{
+		CreatureObject * const owner = getCreatureObject();
+		if (owner)
+			owner->sendControllerMessageToAuthServer(CM_modifyLifetimeGcwPoints, new MessageQueueGenericValueType<int>(count));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::modifyMaxGcwImperialRating(int const count)
+{
+	if (isAuthoritative())
+	{
+		static int32 const min = std::numeric_limits<int32>::min() + 1;
+		static int32 const max = std::numeric_limits<int32>::max() - 1;
+
+		// m_maxGcwImperialRating should always be >= -1
+		int32 currentValue = std::max(static_cast<int32>(-1), m_maxGcwImperialRating.get());
+		currentValue = std::min(currentValue, max);
+
+		// limit count so it doesn't cause underflow or overflow
+		int32 adjustedCount = std::max(static_cast<int32>(count), min);
+		adjustedCount = std::min(adjustedCount, max - currentValue);
+
+		if (adjustedCount != 0)
+		{
+			m_maxGcwImperialRating = std::min(std::max(static_cast<int32>(-1), currentValue + adjustedCount), static_cast<int32>(Pvp::getMaxRatingForRank()));
+			m_maxGcwImperialRank = Pvp::getRankInfo(m_maxGcwImperialRating.get()).rank;
+		}
+	}
+	else
+	{
+		CreatureObject * const owner = getCreatureObject();
+		if (owner)
+			owner->sendControllerMessageToAuthServer(CM_modifyMaxGcwImperialRating, new MessageQueueGenericValueType<int>(count));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::modifyMaxGcwRebelRating(int const count)
+{
+	if (isAuthoritative())
+	{
+		static int32 const min = std::numeric_limits<int32>::min() + 1;
+		static int32 const max = std::numeric_limits<int32>::max() - 1;
+
+		// m_maxGcwRebelRating should always be >= -1
+		int32 currentValue = std::max(static_cast<int32>(-1), m_maxGcwRebelRating.get());
+		currentValue = std::min(currentValue, max);
+
+		// limit count so it doesn't cause underflow or overflow
+		int32 adjustedCount = std::max(static_cast<int32>(count), min);
+		adjustedCount = std::min(adjustedCount, max - currentValue);
+
+		if (adjustedCount != 0)
+		{
+			m_maxGcwRebelRating = std::min(std::max(static_cast<int32>(-1), currentValue + adjustedCount), static_cast<int32>(Pvp::getMaxRatingForRank()));
+			m_maxGcwRebelRank = Pvp::getRankInfo(m_maxGcwRebelRating.get()).rank;
+		}
+	}
+	else
+	{
+		CreatureObject * const owner = getCreatureObject();
+		if (owner)
+			owner->sendControllerMessageToAuthServer(CM_modifyMaxGcwRebelRating, new MessageQueueGenericValueType<int>(count));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::modifyLifetimePvpKills(int const count)
+{
+	if (isAuthoritative())
+	{
+		static int32 const max = std::numeric_limits<int32>::max();
+
+		// m_lifetimePvpKills should always be >= 0
+		int32 const currentValue = std::max(static_cast<int32>(0), m_lifetimePvpKills.get());
+
+		// limit count so it doesn't cause overflow
+		int32 const adjustedCount = std::min(static_cast<int32>(count), max - currentValue);
+
+		if (adjustedCount != 0)
+			m_lifetimePvpKills = std::max(static_cast<int32>(0), currentValue + adjustedCount);
+	}
+	else
+	{
+		CreatureObject * const owner = getCreatureObject();
+		if (owner)
+			owner->sendControllerMessageToAuthServer(CM_modifyLifetimePvpKills, new MessageQueueGenericValueType<int>(count));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::modifyNextGcwRatingCalcTime(int const weekCount)
+{
+	if (isAuthoritative())
+	{
+		// don't need to do anything if the player doesn't need rating recalculated
+		if (!needsGcwRatingRecalculated())
+			return;
+
+		static int32 const max = std::numeric_limits<int32>::max();
+		int32 const now = static_cast<int32>(::time(NULL));
+
+		// m_nextGcwRatingCalcTime should always be >= 0
+		int32 const currentValue = std::max(static_cast<int32>(0), m_nextGcwRatingCalcTime.get());
+
+		// limit weekCount to -1000 to 1000 with 0 meaning "now"
+		int32 adjustedWeekCount = std::max(static_cast<int32>(-1000), static_cast<int32>(weekCount));
+		adjustedWeekCount = std::min(static_cast<int32>(1000), adjustedWeekCount);
+
+		// if necessary, cancel the currently pending messageTo for rating recalculation
+		if (m_nextGcwRatingCalcTime.get() > 0)
+		{
+			cancelMessageTo("C++RecalculateGcwRating");
+			m_gcwRatingActualCalcTime = 0;
+		}
+
+		if (adjustedWeekCount != 0)
+		{
+			int32 adjustedSeconds = 60 * 60 * 24 * 7 * adjustedWeekCount;
+
+			// limit adjustedSeconds so it doesn't cause overflow
+			adjustedSeconds = std::min(adjustedSeconds, max - currentValue);
+
+			// don't allow the recalc time to be too far in the past
+			if (adjustedSeconds != 0)
+				m_nextGcwRatingCalcTime = std::max(static_cast<int32>(CalendarTimeNamespace::g_CalendarTimeEarliestTime), currentValue + adjustedSeconds);
+		}
+		else // 0 means "now"
+		{
+			m_nextGcwRatingCalcTime = now;
+		}
+
+		// if necessary, send messageTo to trigger rating recalculation
+		if (m_nextGcwRatingCalcTime.get() > 0)
+		{
+			// randomly spread out the recalculation so they don't all
+			// happen at exactly the same time and lag out the server,
+			// unless the recalculation time has passed in which case
+			// we want to do the recalculation much more quickly
+			if (m_nextGcwRatingCalcTime.get() <= now)
+				sendRecalculateGcwRatingMessageTo(5);
+			else
+				sendRecalculateGcwRatingMessageTo(std::max(30, static_cast<int>(m_nextGcwRatingCalcTime.get() - now)) + 5 + (rand() % 60));
+		}
+	}
+	else
+	{
+		CreatureObject * const owner = getCreatureObject();
+		if (owner)
+			owner->sendControllerMessageToAuthServer(CM_modifyNextGcwRatingCalcTime, new MessageQueueGenericValueType<int>(weekCount));
+	}
+}
+
+// ----------------------------------------------------------------------
+void PlayerObject::ctsUseOnlySetGcwInfo(int32 currentGcwPoints, int32 currentGcwRating, int32 currentPvpKills, int64 lifetimeGcwPoints, int32 maxGcwImperialRating, int32 maxGcwRebelRating, int32 lifetimePvpKills, int32 nextGcwRatingCalcTime)
+{
+	// should only be called on authoritative object
+	if (!isAuthoritative())
+		return;
+
+	// can't do anything if we're not attached to the creature object
+	if (!getCreatureObject())
+		return;
+
+	int32 const oldCurrentGcwPoints = m_currentGcwPoints.get();
+	int32 const oldCurrentGcwRating = m_currentGcwRating.get();
+	int32 const oldCurrentPvpKills = m_currentPvpKills.get();
+	int64 const oldLifetimeGcwPoints = m_lifetimeGcwPoints.get();
+	int32 const oldMaxGcwImperialRating = m_maxGcwImperialRating.get();
+	int32 const oldMaxGcwRebelRating = m_maxGcwRebelRating.get();
+	int32 const oldLifetimePvpKills = m_lifetimePvpKills.get();
+	int32 const oldNextGcwRatingCalcTime = m_nextGcwRatingCalcTime.get();
+
+	m_currentGcwPoints = std::max(static_cast<int32>(0), currentGcwPoints);
+	m_currentGcwRating = std::min(std::max(static_cast<int32>(-1), currentGcwRating), static_cast<int32>(Pvp::getMaxRatingForRank()));
+	m_currentPvpKills = std::max(static_cast<int32>(0), currentPvpKills);
+	m_lifetimeGcwPoints = std::max(static_cast<int64>(0), lifetimeGcwPoints);
+	m_maxGcwImperialRating = std::min(std::max(static_cast<int32>(-1), maxGcwImperialRating), static_cast<int32>(Pvp::getMaxRatingForRank()));
+	m_maxGcwRebelRating = std::min(std::max(static_cast<int32>(-1), maxGcwRebelRating), static_cast<int32>(Pvp::getMaxRatingForRank()));
+	m_lifetimePvpKills = std::max(static_cast<int32>(0), lifetimePvpKills);
+
+	// don't allow the recalc time to be too far in the past
+	m_nextGcwRatingCalcTime = ((nextGcwRatingCalcTime == 0) ? 0 : std::max(static_cast<int32>(CalendarTimeNamespace::g_CalendarTimeEarliestTime), nextGcwRatingCalcTime));
+
+	Pvp::PvpRankInfo const & pvpRankInfo = Pvp::getRankInfo(m_currentGcwRating.get());
+	m_currentGcwRank = pvpRankInfo.rank;
+
+	if (pvpRankInfo.rank > 0)
+	{
+		m_currentGcwRankProgress = static_cast<float>(std::min(static_cast<int>(m_currentGcwRating.get()), pvpRankInfo.maxRating) - pvpRankInfo.minRating) * 100.0f / static_cast<float>(pvpRankInfo.maxRating - pvpRankInfo.minRating + 1);
+	}
+	else
+	{
+		m_currentGcwRankProgress = 0.0f;
+	}
+
+	m_maxGcwImperialRank = Pvp::getRankInfo(m_maxGcwImperialRating.get()).rank;
+	m_maxGcwRebelRank = Pvp::getRankInfo(m_maxGcwRebelRating.get()).rank;
+
+	char buffer1[128];
+	char buffer2[128];
+	sprintf(buffer1, INT64_FORMAT_SPECIFIER, oldLifetimeGcwPoints);
+	sprintf(buffer2, INT64_FORMAT_SPECIFIER, m_lifetimeGcwPoints.get());
+
+	LOG("CustomerService", ("PvP_Ranking:%s|applying info from CTS|point:%ld -> %ld|rating:%ld -> %ld|pvp kill:%ld -> %ld|lifetime point:%s -> %s|max imp rating:%ld -> %ld|max reb rating:%ld -> %ld|lifetime pvp kill:%ld -> %ld|calc time:%ld -> %ld",
+		getAccountDescription().c_str(),
+		oldCurrentGcwPoints, m_currentGcwPoints.get(),
+		oldCurrentGcwRating, m_currentGcwRating.get(),
+		oldCurrentPvpKills, m_currentPvpKills.get(),
+		buffer1, buffer2,
+		oldMaxGcwImperialRating, m_maxGcwImperialRating.get(),
+		oldMaxGcwRebelRating, m_maxGcwRebelRating.get(),
+		oldLifetimePvpKills, m_lifetimePvpKills.get(),
+		oldNextGcwRatingCalcTime, m_nextGcwRatingCalcTime.get()));
+
+	// if necessary, cancel the currently pending messageTo for rating recalculation
+	if (oldNextGcwRatingCalcTime > 0)
+	{
+		cancelMessageTo("C++RecalculateGcwRating");
+		m_gcwRatingActualCalcTime = 0;
+	}
+
+	// make sure that m_nextGcwRatingCalcTime is set so that the
+	// rating will be recalculated at the next recalculation interval
+	setNextGcwRatingCalcTime(true);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setNextGcwRatingCalcTime(bool const alwaysSendMessageToForRecalc)
+{
+	// should only be called on authoritative object
+	if (!isAuthoritative())
+		return;
+
+	bool needToSendMessageTo = alwaysSendMessageToForRecalc;
+	int32 const now = static_cast<int32>(::time(NULL));
+
+	// if the player needs a rating recalculation,
+	// make sure that m_nextGcwRatingCalcTime is set so that the
+	// rating will be recalculated at the next recalculation interval
+	if (needsGcwRatingRecalculated())
+	{
+		if (m_nextGcwRatingCalcTime.get() <= 0)
+		{
+			time_t const nextCalcTime = CalendarTime::getNextGMTTimeOcurrence(static_cast<time_t>(now), ConfigServerGame::getGcwRecalcTimeDayOfWeek(), ConfigServerGame::getGcwRecalcTimeHour(), ConfigServerGame::getGcwRecalcTimeMinute(), ConfigServerGame::getGcwRecalcTimeSecond());
+			if (nextCalcTime > 0)
+			{
+				m_nextGcwRatingCalcTime = static_cast<int32>(nextCalcTime);
+				needToSendMessageTo = true;
+			}
+		}
+	}
+	else
+	{
+		// if necessary, cancel the currently pending messageTo for rating recalculation
+		if (m_nextGcwRatingCalcTime.get() > 0)
+		{
+			cancelMessageTo("C++RecalculateGcwRating");
+			m_gcwRatingActualCalcTime = 0;
+		}
+
+		m_nextGcwRatingCalcTime = 0;
+	}
+
+	// send messageTo to trigger rating recalculation
+	if (needToSendMessageTo && (m_nextGcwRatingCalcTime.get() > 0))
+	{
+		// randomly spread out the recalculation so they don't all
+		// happen at exactly the same time and lag out the server,
+		// unless the recalculation time has passed in which case
+		// we want to do the recalculation much more quickly
+		if (m_nextGcwRatingCalcTime.get() <= now)
+			sendRecalculateGcwRatingMessageTo(5);
+		else
+			sendRecalculateGcwRatingMessageTo(std::max(30, static_cast<int>(m_nextGcwRatingCalcTime.get() - now)) + 5 + (rand() % 60));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::handleRecalculateGcwRating()
+{
+	// should only be called on authoritative object
+	if (!isAuthoritative())
+		return;
+
+	// can't do anything if we're not attached to the creature object
+	if (!getCreatureObject())
+		return;
+
+	// is it time to recalculate?
+	int32 const now = static_cast<int32>(::time(NULL));
+	if ((m_nextGcwRatingCalcTime.get() > 0) && (m_nextGcwRatingCalcTime.get() <= now))
+	{
+		// is recalculation required?
+		if (needsGcwRatingRecalculated())
+		{
+			int32 nextCalcInterval = m_nextGcwRatingCalcTime.get();
+			int32 points = std::max(static_cast<int32>(0), m_currentGcwPoints.get());
+			int32 currentRating = m_currentGcwRating.get();
+			int32 previousRating;
+			int totalRatingAdjustment, totalEarnedRating, totalEarnedRatingAfterDecay, cappedRatingAdjustment;
+			bool moreRecalculationNeeded = false;
+			while (true)
+			{
+				// calculate rating adjustment for interval
+				totalRatingAdjustment = Pvp::calculateRatingAdjustment(static_cast<int>(points), static_cast<int>(currentRating), totalEarnedRating, totalEarnedRatingAfterDecay, cappedRatingAdjustment);
+
+				// don't apply rating loss if we are in a "rating loss exclusion interval"
+				if ((totalRatingAdjustment < 0) && (Pvp::isInGcwRankDecayExclusionInterval(static_cast<time_t>(nextCalcInterval))))
+				{
+					// CS log
+					LOG("CustomerService", ("PvP_Ranking:%s|NOT APPLYING RATING LOSS|interval %ld (%s) (%s)|current rating=%ld|points=%ld|total earned rating=%ld|total earned rating after decay=%ld|capped rating adjustment=%ld|final rating adjustment=%ld",
+						getAccountDescription().c_str(),
+						nextCalcInterval,
+						CalendarTime::convertEpochToTimeStringGMT(static_cast<time_t>(nextCalcInterval)).c_str(),
+						CalendarTime::convertEpochToTimeStringLocal(static_cast<time_t>(nextCalcInterval)).c_str(),
+						currentRating,
+						points,
+						totalEarnedRating,
+						totalEarnedRatingAfterDecay,
+						cappedRatingAdjustment,
+						totalRatingAdjustment));
+				}
+				else
+				{
+					// update rating
+					previousRating = currentRating;
+					currentRating += static_cast<int32>(totalRatingAdjustment);
+
+					// make sure updated rating is in range of valid rating
+					currentRating = std::max(currentRating, static_cast<int32>(Pvp::getMinRatingForRank()));
+					currentRating = std::min(currentRating, static_cast<int32>(Pvp::getMaxRatingForRank()));
+
+					// CS log
+					LOG("CustomerService", ("PvP_Ranking:%s|interval %ld (%s) (%s)|current rating=%ld|new rating=%ld|points=%ld|total earned rating=%ld|total earned rating after decay=%ld|capped rating adjustment=%ld|final rating adjustment=%ld",
+						getAccountDescription().c_str(),
+						nextCalcInterval,
+						CalendarTime::convertEpochToTimeStringGMT(static_cast<time_t>(nextCalcInterval)).c_str(),
+						CalendarTime::convertEpochToTimeStringLocal(static_cast<time_t>(nextCalcInterval)).c_str(),
+						previousRating,
+						currentRating,
+						points,
+						totalEarnedRating,
+						totalEarnedRatingAfterDecay,
+						cappedRatingAdjustment,
+						totalRatingAdjustment));
+				}
+
+				// point have all been converted
+				points = 0;
+
+				// check to see if we need to do another calculation for the next interval
+				nextCalcInterval = static_cast<int32>(CalendarTime::getNextGMTTimeOcurrence(static_cast<time_t>(nextCalcInterval)+1, ConfigServerGame::getGcwRecalcTimeDayOfWeek(), ConfigServerGame::getGcwRecalcTimeHour(), ConfigServerGame::getGcwRecalcTimeMinute(), ConfigServerGame::getGcwRecalcTimeSecond()));
+				if (nextCalcInterval <= 0)
+					break;
+
+				if (nextCalcInterval > now)
+					break;
+
+				Pvp::PvpRankInfo const & pvpNewRankInfo = Pvp::getRankInfo(currentRating);
+				if (pvpNewRankInfo.rank < 1)
+					break;
+
+				if (pvpNewRankInfo.ratingDecayBalance <= 0)
+					break;
+
+				// if rating increased, then exit loop so that the new rating
+				// can be updated so that the max rating can be saved, and rank
+				// increase notification gets sent; otherwise, the rating
+				// increase may get "lost" with subsequent decrease due to decay
+				// as this loop iterates; if further calculation is required for more
+				// intervals, then send another messageTo to trigger more calculations
+				if (currentRating > m_currentGcwRating.get())
+				{
+					moreRecalculationNeeded = true;
+					break;
+				}
+			}
+
+			// decrementing the value by a really large
+			// number will cause it to reset to 0
+			static int const min = std::numeric_limits<int>::min();
+
+			// apply new GCW values
+			if (m_currentGcwPoints.get() != 0)
+				modifyCurrentGcwPoints(min, false);
+
+			if (m_currentPvpKills.get() != 0)
+				modifyCurrentPvpKills(min, false);
+
+			if (currentRating != m_currentGcwRating.get())
+				modifyCurrentGcwRating((currentRating - m_currentGcwRating.get()), true);
+
+			// if more recalculations are needed, send
+			// messageTo to trigger more recalculations
+			if (moreRecalculationNeeded)
+			{
+				m_nextGcwRatingCalcTime = nextCalcInterval;
+				sendRecalculateGcwRatingMessageTo(5);
+			}
+			else
+			{
+				// make sure that m_nextGcwRatingCalcTime is set so that the
+				// rating will be recalculated at the next recalculation interval
+				m_nextGcwRatingCalcTime = 0;
+				setNextGcwRatingCalcTime(false);
+			}
+		}
+		else
+		{
+			m_nextGcwRatingCalcTime = 0;
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::sendRecalculateGcwRatingMessageTo(int delay)
+{
+	// cancel any pending messageTo
+	cancelMessageTo("C++RecalculateGcwRating");
+
+	// send new messageTo
+	int const adjustedDelay = std::max(5, delay);
+	MessageToQueue::getInstance().sendMessageToC(getNetworkId(), "C++RecalculateGcwRating", "", adjustedDelay, false);
+	m_gcwRatingActualCalcTime = static_cast<int32>(::time(NULL) + adjustedDelay);
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::needsGcwRatingRecalculated() const
+{
+	Pvp::PvpRankInfo const & pvpRankInfo = Pvp::getRankInfo(m_currentGcwRating.get());
+	return ((m_currentGcwPoints.get() > 0) || (m_currentPvpKills.get() > 0) || ((pvpRankInfo.rank > 0) && (pvpRankInfo.ratingDecayBalance > 0)));
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::clearSessionActivity()
+{
+	if (isAuthoritative())
+	{
+		m_sessionActivity = 0;
+	}
+	else
+	{
+		CreatureObject * const owner = getCreatureObject();
+		if (owner)
+			owner->sendControllerMessageToAuthServer(CM_clearSessionActivity, 0);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::addSessionActivity(uint32 activity)
+{
+	if (isAuthoritative())
+	{
+		m_sessionActivity = m_sessionActivity.get() | activity;
+	}
+	else
+	{
+		CreatureObject * const owner = getCreatureObject();
+		if (owner)
+			owner->sendControllerMessageToAuthServer(CM_addSessionActivity, new MessageQueueGenericValueType<unsigned long>(static_cast<unsigned long>(activity)));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setPetId(NetworkId const & newId)
+{
+	m_petId.set(newId);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setPetCommandList(std::vector<std::string> const &commands)
+{
+	m_petCommandList.set(commands);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setPetToggledCommands(std::vector<std::string> const &commands)
+{
+	m_petToggledCommands.set(commands);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::updateKillMeter(float deltaTime)
+{
+	if(!isAuthoritative())
+		return;
+
+	if(m_killMeter.get() == 0)
+		return;
+	float currentValue = m_killMeter.get() + m_killMeterRemainder;
+	float newValue = (currentValue) - (m_killMeter.get() / 150.0f) * deltaTime;
+	int32 newValueInt = static_cast<int32>(newValue);
+	m_killMeterRemainder = (newValue - newValueInt);
+	if(m_killMeterRemainder > 0.01f)
+	{
+		newValueInt += 1;
+		m_killMeterRemainder -= 1.0f;
+	}
+	if(newValueInt != m_killMeter.get())
+		m_killMeter = newValueInt;
+
+	return;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::incrementKillMeter(int amount)
+{
+	if(isAuthoritative())
+	{
+		if(m_killMeter.get() + amount > MAX_KILL_METER)
+		{
+			m_killMeter = MAX_KILL_METER;
+			m_killMeterRemainder = 0.0f;
+		}
+		else
+		{
+			m_killMeter = m_killMeter.get() + amount;
+		}
+	}
+	else
+	{
+		CreatureObject *owner = getCreatureObject();
+		owner->sendControllerMessageToAuthServer(CM_incrementKillMeter, new MessageQueueGenericValueType<int>(amount));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::modifyCollectionSlotValue(std::string const & slotName, int64 delta)
+{
+	CreatureObject * const owner = getCreatureObject();
+	if (!owner)
+		return false;
+
+	if (isAuthoritative())
+	{
+		CollectionsDataTable::CollectionInfoSlot const * slotInfo = CollectionsDataTable::getSlotByName(slotName);
+		if (!slotInfo)
+		{
+			DEBUG_WARNING(true, ("Trying to modify a collection slot for (%s) using an invalid collection slot name (%s)", getAccountDescription().c_str(), slotName.c_str()));
+			return false;
+		}
+
+		Archive::AutoDeltaVariable<BitArray> * const collections = m_allCollections[slotInfo->slotIdIndex];
+
+		// bit-type slot
+		if (!slotInfo->counterTypeSlot)
+		{
+			// set bit-type slot
+			if (delta > 0)
+			{
+				if (!collections->get().testBit(slotInfo->beginSlotId))
+				{
+					// check prereqs first
+					if (!hasCompletedCollectionSlotPrereq(*slotInfo))
+						return false;
+
+					BitArray b = collections->get();
+					b.setBit(slotInfo->beginSlotId);
+					collections->set(b);
+
+					LOG("CustomerService", ("Collection:%s added collection %d (%s/%s/%s/%s)",
+						getAccountDescription().c_str(),
+						slotInfo->absoluteBeginSlotId,
+						slotInfo->collection.page.book.name.c_str(),
+						slotInfo->collection.page.name.c_str(),
+						slotInfo->collection.name.c_str(),
+						slotInfo->name.c_str()));
+
+					// for "server first" tracking, we need to check if the collection
+					// is completed *BEFORE* triggering script, because script may clear
+					// a completed collection (for repeatable collections), so that
+					// when we come back from triggering script, the collection will not
+					// appear to be completed, even though it really was completed and
+					// "server first" should have been granted
+					bool grantServerFirst = false;
+					if (slotInfo->collection.trackServerFirst && (slotInfo->collection.serverFirstClaimTime <= 0))
+					{
+						bool const isSecuredLogin = (owner->getClient() && owner->getClient()->isGodValidated());
+						if (!ConfigServerGame::getDisableCollectionServerFirstGrantForSecuredLogin() || !isSecuredLogin)
+						{
+							if (hasCompletedCollection(slotInfo->collection.name))
+							{
+								grantServerFirst = true;
+							}
+						}
+					}
+
+					GameScriptObject * gameScriptObject = owner->getScriptObject();
+					if (gameScriptObject && slotInfo->notifyScriptOnModify)
+					{
+						ScriptParams params;
+						params.addParam(slotInfo->collection.page.book.name.c_str()); // book
+						params.addParam(slotInfo->collection.page.name.c_str()); // page
+						params.addParam(slotInfo->collection.name.c_str());      // collection
+						params.addParam(slotInfo->name.c_str());                 // slot
+						params.addParam(false);                                  // is counter-type slot?
+						params.addParam(static_cast<int>(0));                    // previous slot value
+						params.addParam(static_cast<int>(1));                    // current slot value
+						params.addParam(static_cast<int>(1));                    // max slot value
+						params.addParam(true);                                   // slot completed?
+
+						IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_COLLECTION_SLOT_MODIFIED, params));
+					}
+
+					// grant "server first", if necessary
+					if (grantServerFirst)
+					{
+						PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+						if (planetObject)
+						{
+							planetObject->setCollectionServerFirst(slotInfo->collection, owner->getNetworkId(), owner->getAssignedObjectName(), getAccountDescription());
+						}
+					}
+				}
+			}
+			// clear bit-type slot
+			else if (delta < 0)
+			{
+				if (collections->get().testBit(slotInfo->beginSlotId))
+				{
+					BitArray b = collections->get();
+					b.clearBit(slotInfo->beginSlotId);
+					collections->set(b);
+
+					LOG("CustomerService", ("Collection:%s removed collection %d (%s/%s/%s/%s)",
+						getAccountDescription().c_str(),
+						slotInfo->absoluteBeginSlotId,
+						slotInfo->collection.page.book.name.c_str(),
+						slotInfo->collection.page.name.c_str(),
+						slotInfo->collection.name.c_str(),
+						slotInfo->name.c_str()));
+
+					GameScriptObject * gameScriptObject = owner->getScriptObject();
+					if (gameScriptObject && slotInfo->notifyScriptOnModify)
+					{
+						ScriptParams params;
+						params.addParam(slotInfo->collection.page.book.name.c_str()); // book
+						params.addParam(slotInfo->collection.page.name.c_str()); // page
+						params.addParam(slotInfo->collection.name.c_str());      // collection
+						params.addParam(slotInfo->name.c_str());                 // slot
+						params.addParam(false);                                  // is counter-type slot?
+						params.addParam(static_cast<int>(1));                    // previous slot value
+						params.addParam(static_cast<int>(0));                    // current slot value
+						params.addParam(static_cast<int>(1));                    // max slot value
+						params.addParam(false);                                  // slot completed?
+
+						IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_COLLECTION_SLOT_MODIFIED, params));
+					}
+				}
+			}
+		}
+		// counter-type slot
+		else if (delta != 0)
+		{
+			// check prereqs first
+			if ((delta > 0) && !hasCompletedCollectionSlotPrereq(*slotInfo))
+				return false;
+
+			int64 const currentSlotValue = static_cast<int64>(collections->get().getValue(slotInfo->beginSlotId, slotInfo->endSlotId));
+			int64 const newSlotValue = clamp(static_cast<int64>(0), (currentSlotValue + delta), ((slotInfo->maxSlotValue > 0) ? static_cast<int64>(slotInfo->maxSlotValue) : static_cast<int64>(slotInfo->maxValueForNumBits)));
+
+			// did slot value changed?
+			if (currentSlotValue != newSlotValue)
+			{
+				BitArray b = collections->get();
+				b.setValue(slotInfo->beginSlotId, slotInfo->endSlotId, static_cast<unsigned long>(newSlotValue));
+				collections->set(b);
+
+				LOG("CustomerService", ("Collection:%s modified collection %d-%d (%s/%s/%s/%s) from %lu to %lu",
+					getAccountDescription().c_str(),
+					slotInfo->absoluteBeginSlotId,
+					slotInfo->absoluteEndSlotId,
+					slotInfo->collection.page.book.name.c_str(),
+					slotInfo->collection.page.name.c_str(),
+					slotInfo->collection.name.c_str(),
+					slotInfo->name.c_str(),
+					static_cast<unsigned long>(currentSlotValue),
+					static_cast<unsigned long>(newSlotValue)));
+
+				bool const completedCollectionSlot = hasCompletedCollectionSlot(*slotInfo, static_cast<unsigned long>(newSlotValue));
+
+				// for "server first" tracking, we need to check if the collection
+				// is completed *BEFORE* triggering script, because script may clear
+				// a completed collection (for repeatable collections), so that
+				// when we come back from triggering script, the collection will not
+				// appear to be completed, even though it really was completed and
+				// "server first" should have been granted
+				bool grantServerFirst = false;
+				if (completedCollectionSlot && slotInfo->collection.trackServerFirst && (slotInfo->collection.serverFirstClaimTime <= 0))
+				{
+					bool const isSecuredLogin = (owner->getClient() && owner->getClient()->isGodValidated());
+					if (!ConfigServerGame::getDisableCollectionServerFirstGrantForSecuredLogin() || !isSecuredLogin)
+					{
+						if (hasCompletedCollection(slotInfo->collection.name))
+						{
+							grantServerFirst = true;
+						}
+					}
+				}
+
+				GameScriptObject * gameScriptObject = owner->getScriptObject();
+				if (gameScriptObject && slotInfo->notifyScriptOnModify)
+				{
+					ScriptParams params;
+					params.addParam(slotInfo->collection.page.book.name.c_str()); // book
+					params.addParam(slotInfo->collection.page.name.c_str()); // page
+					params.addParam(slotInfo->collection.name.c_str());      // collection
+					params.addParam(slotInfo->name.c_str());                 // slot
+					params.addParam(true);                                   // is counter-type slot?
+					params.addParam(static_cast<int>(currentSlotValue));     // previous slot value
+					params.addParam(static_cast<int>(newSlotValue));         // current slot value
+					params.addParam(static_cast<int>(slotInfo->maxSlotValue)); // max slot value
+					params.addParam(completedCollectionSlot);                // slot completed?
+
+					IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_COLLECTION_SLOT_MODIFIED, params));
+				}
+
+				// grant "server first", if necessary
+				if (grantServerFirst)
+				{
+					PlanetObject * const planetObject = ServerUniverse::getInstance().getTatooinePlanet();
+					if (planetObject)
+					{
+						planetObject->setCollectionServerFirst(slotInfo->collection, owner->getNetworkId(), owner->getAssignedObjectName(), getAccountDescription());
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+		owner->sendControllerMessageToAuthServer(CM_modifyCollectionSlotValue, new MessageQueueGenericValueType<std::pair<std::string, int64> >(std::make_pair(slotName, delta)));
+	}
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::getCollectionSlotValue(std::string const & slotName, unsigned long & value) const
+{
+	value = 0;
+
+	CollectionsDataTable::CollectionInfoSlot const * slotInfo = CollectionsDataTable::getSlotByName(slotName);
+	if (!slotInfo)
+	{
+		DEBUG_WARNING(true, ("Trying to get a collection slot value for (%s) using an invalid collection slot name (%s)", getAccountDescription().c_str(), slotName.c_str()));
+		return false;
+	}
+
+	return getCollectionSlotValue(*slotInfo, value);
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::getCollectionSlotValue(CollectionsDataTable::CollectionInfoSlot const & slotInfo, unsigned long & value) const
+{
+	// bit-type slot
+	if (!slotInfo.counterTypeSlot)
+	{
+		if (m_allCollections[slotInfo.slotIdIndex]->get().testBit(slotInfo.beginSlotId))
+			value = 1;
+		else
+			value = 0;
+	}
+	else
+	{
+		value = m_allCollections[slotInfo.slotIdIndex]->get().getValue(slotInfo.beginSlotId, slotInfo.endSlotId);
+	}
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::hasCompletedCollectionSlotPrereq(std::string const & slotName, std::vector<CollectionsDataTable::CollectionInfoSlot const *> * collectionInfo /*= NULL*/) const
+{
+	CollectionsDataTable::CollectionInfoSlot const * slotInfo = CollectionsDataTable::getSlotByName(slotName);
+	if (!slotInfo)
+	{
+		DEBUG_WARNING(true, ("Checking for collection slot prereq completion for (%s) using an invalid collection slot name (%s)", getAccountDescription().c_str(), slotName.c_str()));
+		return false;
+	}
+
+	return hasCompletedCollectionSlotPrereq(*slotInfo, collectionInfo);
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::hasCompletedCollectionSlotPrereq(CollectionsDataTable::CollectionInfoSlot const & slotInfo, std::vector<CollectionsDataTable::CollectionInfoSlot const *> * collectionInfo /*= NULL*/) const
+{
+	if (collectionInfo)
+		collectionInfo->clear();
+
+	if (slotInfo.prereqsPtr.empty())
+		return true;
+
+	bool completed = true;
+	for (std::vector<CollectionsDataTable::CollectionInfoSlot const *>::const_iterator iterPrereqs = slotInfo.prereqsPtr.begin(); iterPrereqs != slotInfo.prereqsPtr.end(); ++iterPrereqs)
+	{
+		if (!hasCompletedCollectionSlot(**iterPrereqs))
+		{
+			if (!collectionInfo)
+				return false;
+
+			collectionInfo->push_back(*iterPrereqs);
+			completed = false;
+		}
+	}
+
+	return completed;
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::hasCompletedCollectionSlot(std::string const & slotName) const
+{
+	CollectionsDataTable::CollectionInfoSlot const * slotInfo = CollectionsDataTable::getSlotByName(slotName);
+	if (!slotInfo)
+	{
+		DEBUG_WARNING(true, ("Checking for collection slot completion for (%s) using an invalid collection slot name (%s)", getAccountDescription().c_str(), slotName.c_str()));
+		return false;
+	}
+
+	return hasCompletedCollectionSlot(*slotInfo);
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::hasCompletedCollectionSlot(CollectionsDataTable::CollectionInfoSlot const & slotInfo) const
+{
+	// bit-type slot
+	if (!slotInfo.counterTypeSlot)
+		return m_allCollections[slotInfo.slotIdIndex]->get().testBit(slotInfo.beginSlotId);
+
+	// counter-type slot is only completed if a max slot value is
+	// specified and the current slot value equals the max slot value
+	return ((slotInfo.maxSlotValue > 0) && (m_allCollections[slotInfo.slotIdIndex]->get().getValue(slotInfo.beginSlotId, slotInfo.endSlotId) >= slotInfo.maxSlotValue));
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::hasCompletedCollectionSlot(CollectionsDataTable::CollectionInfoSlot const & slotInfo, unsigned long slotValue)
+{
+	// bit-type slot
+	if (!slotInfo.counterTypeSlot)
+		return (slotValue > 0);
+
+	// counter-type slot is only completed if a max slot value is
+	// specified and the current slot value equals the max slot value
+	return ((slotInfo.maxSlotValue > 0) && (slotValue >= slotInfo.maxSlotValue));
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::hasCompletedCollection(std::string const & collectionName) const
+{
+	std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & slots = CollectionsDataTable::getSlotsInCollection(collectionName);
+
+	if (slots.empty())
+		return false;
+
+	for (std::vector<CollectionsDataTable::CollectionInfoSlot const *>::const_iterator iter = slots.begin(); iter != slots.end(); ++iter)
+	{
+		if (!hasCompletedCollectionSlot(**iter))
+			return false;
+	}
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::hasCompletedCollectionPage(std::string const & pageName) const
+{
+	std::vector<CollectionsDataTable::CollectionInfoCollection const *> const & collections = CollectionsDataTable::getCollectionsInPage(pageName);
+
+	if (collections.empty())
+		return false;
+
+	for (std::vector<CollectionsDataTable::CollectionInfoCollection const *>::const_iterator iter = collections.begin(); iter != collections.end(); ++iter)
+	{
+		if (!hasCompletedCollection((*iter)->name))
+			return false;
+	}
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::hasCompletedCollectionBook(std::string const & bookName) const
+{
+	std::vector<CollectionsDataTable::CollectionInfoPage const *> const & pages = CollectionsDataTable::getPagesInBook(bookName);
+
+	if (pages.empty())
+		return false;
+
+	for (std::vector<CollectionsDataTable::CollectionInfoPage const *>::const_iterator iter = pages.begin(); iter != pages.end(); ++iter)
+	{
+		if (!hasCompletedCollectionPage((*iter)->name))
+			return false;
+	}
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+int PlayerObject::getCompletedCollectionSlotCountInCollection(std::string const & collectionName, stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd * collectionInfo /*= NULL*/) const
+{
+	if (collectionInfo)
+		collectionInfo->clear();
+
+	int count = 0;
+	std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & slots = CollectionsDataTable::getSlotsInCollection(collectionName);
+	for (std::vector<CollectionsDataTable::CollectionInfoSlot const *>::const_iterator iter = slots.begin(); iter != slots.end(); ++iter)
+	{
+		if (hasCompletedCollectionSlot(**iter))
+		{
+			++count;
+
+			if (collectionInfo)
+				collectionInfo->push_back(*iter);
+		}
+	}
+
+	return count;
+}
+
+// ----------------------------------------------------------------------
+
+int PlayerObject::getCompletedCollectionSlotCountInPage(std::string const & pageName, std::vector<CollectionsDataTable::CollectionInfoSlot const *> * collectionInfo /*= NULL*/) const
+{
+	if (collectionInfo)
+		collectionInfo->clear();
+
+	int count = 0;
+	std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & slots = CollectionsDataTable::getSlotsInPage(pageName);
+	for (std::vector<CollectionsDataTable::CollectionInfoSlot const *>::const_iterator iter = slots.begin(); iter != slots.end(); ++iter)
+	{
+		if (hasCompletedCollectionSlot(**iter))
+		{
+			++count;
+
+			if (collectionInfo)
+				collectionInfo->push_back(*iter);
+		}
+	}
+
+	return count;
+}
+
+// ----------------------------------------------------------------------
+
+int PlayerObject::getCompletedCollectionCountInPage(std::string const & pageName, std::vector<CollectionsDataTable::CollectionInfoCollection const *> * collectionInfo /*= NULL*/) const
+{
+	if (collectionInfo)
+		collectionInfo->clear();
+
+	int count = 0;
+	std::vector<CollectionsDataTable::CollectionInfoCollection const *> const & collections = CollectionsDataTable::getCollectionsInPage(pageName);
+	for (std::vector<CollectionsDataTable::CollectionInfoCollection const *>::const_iterator iter = collections.begin(); iter != collections.end(); ++iter)
+	{
+		if (hasCompletedCollection((*iter)->name))
+		{
+			++count;
+
+			if (collectionInfo)
+				collectionInfo->push_back(*iter);
+		}
+	}
+
+	return count;
+}
+
+// ----------------------------------------------------------------------
+
+int PlayerObject::getCompletedCollectionSlotCountInBook(std::string const & bookName, std::vector<CollectionsDataTable::CollectionInfoSlot const *> * collectionInfo /*= NULL*/) const
+{
+	if (collectionInfo)
+		collectionInfo->clear();
+
+	int count = 0;
+	std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & slots = CollectionsDataTable::getSlotsInBook(bookName);
+	for (std::vector<CollectionsDataTable::CollectionInfoSlot const *>::const_iterator iter = slots.begin(); iter != slots.end(); ++iter)
+	{
+		if (hasCompletedCollectionSlot(**iter))
+		{
+			++count;
+
+			if (collectionInfo)
+				collectionInfo->push_back(*iter);
+		}
+	}
+
+	return count;
+}
+
+// ----------------------------------------------------------------------
+
+int PlayerObject::getCompletedCollectionCountInBook(std::string const & bookName, std::vector<CollectionsDataTable::CollectionInfoCollection const *> * collectionInfo /*= NULL*/) const
+{
+	if (collectionInfo)
+		collectionInfo->clear();
+
+	int count = 0;
+	std::vector<CollectionsDataTable::CollectionInfoCollection const *> const & collections = CollectionsDataTable::getCollectionsInBook(bookName);
+	for (std::vector<CollectionsDataTable::CollectionInfoCollection const *>::const_iterator iter = collections.begin(); iter != collections.end(); ++iter)
+	{
+		if (hasCompletedCollection((*iter)->name))
+		{
+			++count;
+
+			if (collectionInfo)
+				collectionInfo->push_back(*iter);
+		}
+	}
+
+	return count;
+}
+
+// ----------------------------------------------------------------------
+
+int PlayerObject::getCompletedCollectionPageCountInBook(std::string const & bookName, std::vector<CollectionsDataTable::CollectionInfoPage const *> * collectionInfo /*= NULL*/) const
+{
+	if (collectionInfo)
+		collectionInfo->clear();
+
+	int count = 0;
+	std::vector<CollectionsDataTable::CollectionInfoPage const *> const & pages = CollectionsDataTable::getPagesInBook(bookName);
+	for (std::vector<CollectionsDataTable::CollectionInfoPage const *>::const_iterator iter = pages.begin(); iter != pages.end(); ++iter)
+	{
+		if (hasCompletedCollectionPage((*iter)->name))
+		{
+			++count;
+
+			if (collectionInfo)
+				collectionInfo->push_back(*iter);
+		}
+	}
+
+	return count;
+}
+
+// ----------------------------------------------------------------------
+
+int PlayerObject::getCompletedCollectionBookCount(std::vector<CollectionsDataTable::CollectionInfoBook const *> * collectionInfo /*= NULL*/) const
+{
+	if (collectionInfo)
+		collectionInfo->clear();
+
+	int count = 0;
+	std::vector<CollectionsDataTable::CollectionInfoBook const *> const & books = CollectionsDataTable::getAllBooks();
+	for (std::vector<CollectionsDataTable::CollectionInfoBook const *>::const_iterator iter = books.begin(); iter != books.end(); ++iter)
+	{
+		if (hasCompletedCollectionBook((*iter)->name))
+		{
+			++count;
+
+			if (collectionInfo)
+				collectionInfo->push_back(*iter);
+		}
+	}
+
+	return count;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::migrateLegacyBadgesToCollection(std::vector<int> const & badges)
+{
+	if (badges.empty())
+		return;
+
+	// get the list of all possible collection id for the old badges
+	static std::map<int, CollectionsDataTable::CollectionInfoSlot const *> badgeCollectionIds;
+	if (badgeCollectionIds.empty())
+	{
+		std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & badgeCollectionInfo = CollectionsDataTable::getSlotsInBook("badge_book");
+		for (std::vector<CollectionsDataTable::CollectionInfoSlot const *>::const_iterator iter = badgeCollectionInfo.begin(); iter != badgeCollectionInfo.end(); ++iter)
+		{
+			if ((*iter)->slotIdIndex == 0)
+			{
+				badgeCollectionIds[(*iter)->absoluteBeginSlotId] = *iter;
+			}
+		}
+	}
+
+	BitArray ba = m_collections.get();
+	bool anyBadgeMigrated = false;
+
+	char buffer[32];
+	std::string badgesString;
+	CollectionsDataTable::CollectionInfoSlot const * slotInfo;
+	int badgeIndex = 0;
+	for (std::vector<int>::const_iterator iter = badges.begin(); iter != badges.end(); ++iter)
+	{
+		// for CS logging
+		snprintf(buffer, sizeof(buffer)-1, "%d", *iter);
+		buffer[sizeof(buffer)-1] = '\0';
+		if (!badgesString.empty())
+			badgesString += ", ";
+		badgesString += buffer;
+
+		for (int i = 0; i < 32; ++i)
+		{
+			if (((*iter & (1 << i)) != 0) && (badgeCollectionIds.count(badgeIndex) >= 1) && (!ba.testBit(badgeIndex)))
+			{
+				anyBadgeMigrated = true;
+				ba.setBit(badgeIndex);
+
+				slotInfo = badgeCollectionIds[badgeIndex];
+				if (slotInfo)
+				{
+					LOG("CustomerService", ("Collection:%s migrated badge to collection %d (%s/%s/%s/%s)",
+						getAccountDescription().c_str(),
+						badgeIndex,
+						slotInfo->collection.page.book.name.c_str(),
+						slotInfo->collection.page.name.c_str(),
+						slotInfo->collection.name.c_str(),
+						slotInfo->name.c_str()));
+				}
+				else
+				{
+					LOG("CustomerService", ("Collection:%s migrated badge to collection %d",
+						getAccountDescription().c_str(),
+						badgeIndex));
+				}
+			}
+
+			++badgeIndex;
+		}
+	}
+
+	if (anyBadgeMigrated)
+		m_collections.set(ba);
+
+	// CS log the badge objvars so we have a record of badges that were migrated
+	if (!badgesString.empty())
+		LOG("CustomerService", ("Collection:%s migrated legacy badges (%s) over to collection system", getAccountDescription().c_str(), badgesString.c_str()));
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::updateChatSpamSpatialNumCharacters(NetworkId const & character, int spatialNumCharacters)
+{
+	if (!isAuthoritative())
+		return;
+
+	int const timeNow = static_cast<int>(::time(NULL));
+	bool syncChatServer = false;
+
+	// new interval, reset
+	if (timeNow > m_chatSpamTimeEndInterval.get())
+	{
+		m_chatSpamTimeEndInterval = timeNow + (ConfigServerGame::getChatSpamLimiterIntervalMinutes() * 60);
+		m_chatSpamSpatialNumCharacters = spatialNumCharacters;
+		m_chatSpamNonSpatialNumCharacters = 0;
+		syncChatServer = true;
+	}
+	// update spatial character count
+	else
+	{
+		m_chatSpamSpatialNumCharacters = m_chatSpamSpatialNumCharacters.get() + spatialNumCharacters;
+	}
+
+	// sync chat character count with chat server
+	if ((syncChatServer) || (timeNow > m_chatSpamNextTimeToSyncWithChatServer.get()))
+	{
+		time_t timeUnsquelch = static_cast<time_t>(getSecondsUntilUnsquelched());
+		if (timeUnsquelch > 0)
+			timeUnsquelch += ::time(NULL);
+
+		GenericValueTypeMessage<std::pair<std::pair<std::pair<NetworkId, int>, int>, std::pair<int, int> > > chatStatistics("ChatStatisticsGS", std::make_pair(std::make_pair(std::make_pair(character, static_cast<int>(timeUnsquelch)), m_chatSpamTimeEndInterval.get()), std::make_pair(m_chatSpamSpatialNumCharacters.get(), m_chatSpamNonSpatialNumCharacters.get())));
+		Chat::sendToChatServer(chatStatistics);
+		m_chatSpamNextTimeToSyncWithChatServer = timeNow + ConfigServerGame::getChatStatisticsReportIntervalSeconds();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::handleChatStatisticsFromChatServer(NetworkId const & character, int chatSpamTimeEndInterval, int spatialNumCharacters, int nonSpatialNumCharacters)
+{
+	if (!isAuthoritative())
+		return;
+
+	int const timeNow = static_cast<int>(::time(NULL));
+	bool syncChatServer = false;
+
+	// new interval, reset
+	if (timeNow > m_chatSpamTimeEndInterval.get())
+	{
+		m_chatSpamTimeEndInterval = timeNow + (ConfigServerGame::getChatSpamLimiterIntervalMinutes() * 60);
+		m_chatSpamSpatialNumCharacters = 0;
+		m_chatSpamNonSpatialNumCharacters = 0;
+		syncChatServer = true;
+	}
+	// chat server is in sync with us, update non-spatial
+	// character count with value from chat server
+	else if (chatSpamTimeEndInterval == m_chatSpamTimeEndInterval.get())
+	{
+		m_chatSpamNonSpatialNumCharacters = nonSpatialNumCharacters;
+	}
+	// chat server is out of sync, ignore data, and resync with chat server
+	else
+	{
+		syncChatServer = true;
+	}
+
+	// sync chat character count with chat server
+	if (syncChatServer || ((spatialNumCharacters != m_chatSpamSpatialNumCharacters.get()) && (timeNow > m_chatSpamNextTimeToSyncWithChatServer.get())))
+	{
+		time_t timeUnsquelch = static_cast<time_t>(getSecondsUntilUnsquelched());
+		if (timeUnsquelch > 0)
+			timeUnsquelch += ::time(NULL);
+
+		GenericValueTypeMessage<std::pair<std::pair<std::pair<NetworkId, int>, int>, std::pair<int, int> > > chatStatistics("ChatStatisticsGS", std::make_pair(std::make_pair(std::make_pair(character, static_cast<int>(timeUnsquelch)), m_chatSpamTimeEndInterval.get()), std::make_pair(m_chatSpamSpatialNumCharacters.get(), m_chatSpamNonSpatialNumCharacters.get())));
+		Chat::sendToChatServer(chatStatistics);
+		m_chatSpamNextTimeToSyncWithChatServer = timeNow + ConfigServerGame::getChatStatisticsReportIntervalSeconds();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::updateCitizenshipInfo()
+{
+	if (!isAuthoritative())
+		return;
+
+	CreatureObject const * const owner = getCreatureObject();
+	if (!owner)
+		return;
+
+	std::string cityName;
+	int8 citizenType = static_cast<int8>(CityDataCitizenType::NotACitizen);
+
+	std::vector<int> const & cityIds = CityInterface::getCitizenOfCityId(owner->getNetworkId());
+	if (!cityIds.empty())
+	{
+		int const cityId = cityIds.front();
+		CityInfo const & cityInfo = CityInterface::getCityInfo(cityId);
+		cityName = cityInfo.getCityName();
+		if (!cityName.empty())
+		{
+			if (owner->getNetworkId() == cityInfo.getLeaderId())
+				citizenType = static_cast<int8>(CityDataCitizenType::Mayor);
+			else if (CityInterface::isCityMilitia(cityId, owner->getNetworkId()))
+				citizenType = static_cast<int8>(CityDataCitizenType::Militia);
+			else
+				citizenType = static_cast<int8>(CityDataCitizenType::Citizen);
+		}
+	}
+
+	if (m_citizenshipCity.get() != cityName)
+		m_citizenshipCity = cityName;
+
+	if (m_citizenshipType.get() != citizenType)
+		m_citizenshipType = citizenType;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::updateGcwRegionInfo()
+{
+	if (!isAuthoritative())
+		return;
+
+	CreatureObject const * const owner = getCreatureObject();
+	if (!owner)
+		return;
+
+	std::string const & sceneId = ServerWorld::getSceneId();
+	Vector const pos = owner->findPosition_w();
+	std::string const * currentGcwRegion = &(Pvp::getGcwScoreCategoryRegion(sceneId, pos));
+	if (currentGcwRegion->empty())
+	{
+		// if not in a GCW contested region, use the default region
+		Pvp::GcwScoreCategory const * const defaultGcwRegion = Pvp::getGcwScoreDefaultCategoryForPlanet(sceneId);
+		if (defaultGcwRegion)
+			currentGcwRegion = &(defaultGcwRegion->categoryName);
+	}
+
+	// set the GCW region the character is currently in
+	m_currentGcwRegion.set(*currentGcwRegion);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::updateGcwDefenderRegionInfo()
+{
+	if (!isAuthoritative())
+		return;
+
+	CreatureObject const * const owner = getCreatureObject();
+	if (!owner)
+		return;
+
+	int timeQualifyForBonus = -1;
+	bool qualifyForWarPlannerTitle = false;
+
+	std::string cityGcwDefenderRegion;
+	bool cityGcwDefenderRegionHasBonus = false;;
+	bool cityGcwDefenderRegionHasTitle = false;;
+
+	std::vector<int> const & cityIds = CityInterface::getCitizenOfCityId(owner->getNetworkId());
+	if (!cityIds.empty())
+	{
+		CityInfo const & cityInfo = CityInterface::getCityInfo(cityIds.front());
+		uint32 const cityFaction = cityInfo.getFaction();
+
+		// mayor who is same aligned with his aligned city can use the "War Planner" title
+		if (!PvpData::isNeutralFactionId(cityFaction) && (cityFaction == owner->getPvpFaction()) && (cityInfo.getLeaderId() == owner->getNetworkId()))
+			qualifyForWarPlannerTitle = true;
+
+		std::string const & gcwDefenderRegion = cityInfo.getGcwDefenderRegion();
+		if (!gcwDefenderRegion.empty())
+		{
+			cityGcwDefenderRegion = gcwDefenderRegion;
+
+			int const timeJoinedGcwDefenderRegion = cityInfo.getTimeJoinedGcwDefenderRegion();
+			timeQualifyForBonus = static_cast<int>(::time(NULL)) - (ConfigServerGame::getGcwDaysRequiredForGcwRegionDefenderBonus() * 86400);
+			if (!PvpData::isNeutralFactionId(cityFaction) && (cityFaction == owner->getPvpFaction()) && (timeJoinedGcwDefenderRegion < timeQualifyForBonus))
+			{				
+				cityGcwDefenderRegionHasBonus = true;
+
+				int regionPercentileScore = 0;
+				if (PvpData::isImperialFactionId(cityFaction))
+					regionPercentileScore = ServerUniverse::getInstance().getGcwImperialScorePercentile(gcwDefenderRegion);
+				else if (PvpData::isRebelFactionId(cityFaction))
+					regionPercentileScore = 100 - ServerUniverse::getInstance().getGcwImperialScorePercentile(gcwDefenderRegion);
+
+				// title is available once the region is 70% controlled
+				if (regionPercentileScore >= 70)
+					cityGcwDefenderRegionHasTitle = true;
+			}
+		}
+	}
+
+	std::string guildGcwDefenderRegion;
+	bool guildGcwDefenderRegionHasBonus = false;;
+	bool guildGcwDefenderRegionHasTitle = false;;
+
+	int const guildId = owner->getGuildId();
+	if (guildId > 0)
+	{
+		GuildInfo const * const gi = GuildInterface::getGuildInfo(guildId);
+		if (gi)
+		{
+			uint32 const guildFaction = GuildInterface::getGuildCurrentFaction(*gi);
+
+			// guild leader who is same aligned with his aligned guild that meets the
+			// minimum guild member count requirement can use the "War Planner" title
+			if (!PvpData::isNeutralFactionId(guildFaction) && (guildFaction == owner->getPvpFaction()) && (gi->m_leaderId == owner->getNetworkId()) && (gi->getCountMembersOnly() >= ConfigServerGame::getGcwGuildMinMembersForGcwRegionDefender()))
+				qualifyForWarPlannerTitle = true;
+
+			std::string const & gcwDefenderRegion = GuildInterface::getGuildCurrentGcwDefenderRegion(*gi);
+			if (!gcwDefenderRegion.empty())
+			{
+				guildGcwDefenderRegion = gcwDefenderRegion;
+
+				int const timeJoinedGcwDefenderRegion = GuildInterface::getTimeJoinedGuildCurrentGcwDefenderRegion(*gi);
+				if (timeQualifyForBonus < 0)
+					timeQualifyForBonus = static_cast<int>(::time(NULL)) - (ConfigServerGame::getGcwDaysRequiredForGcwRegionDefenderBonus() * 86400);
+
+				if (!PvpData::isNeutralFactionId(guildFaction) && (guildFaction == owner->getPvpFaction()) && (timeJoinedGcwDefenderRegion < timeQualifyForBonus))
+				{
+					guildGcwDefenderRegionHasBonus = true;
+
+					int regionPercentileScore = 0;
+					if (PvpData::isImperialFactionId(guildFaction))
+						regionPercentileScore = ServerUniverse::getInstance().getGcwImperialScorePercentile(gcwDefenderRegion);
+					else if (PvpData::isRebelFactionId(guildFaction))
+						regionPercentileScore = 100 - ServerUniverse::getInstance().getGcwImperialScorePercentile(gcwDefenderRegion);
+
+					// title is available once the region is 70% controlled
+					if (regionPercentileScore >= 70)
+						guildGcwDefenderRegionHasTitle = true;
+				}
+			}
+		}
+	}
+
+	m_cityGcwDefenderRegion.set(std::make_pair(cityGcwDefenderRegion, std::make_pair(cityGcwDefenderRegionHasBonus, cityGcwDefenderRegionHasTitle)));
+	m_guildGcwDefenderRegion.set(std::make_pair(guildGcwDefenderRegion, std::make_pair(guildGcwDefenderRegionHasBonus, guildGcwDefenderRegionHasTitle)));
+
+	// clear title if not qualified
+	{
+		std::string const & currentTitle = getTitle();
+		if (currentTitle == "city_gcw_region_defender")
+		{
+			if (cityGcwDefenderRegion.empty() || !cityGcwDefenderRegionHasTitle)
+				setTitle(std::string());
+		}
+		else if (currentTitle == "guild_gcw_region_defender")
+		{
+			if (guildGcwDefenderRegion.empty() || !guildGcwDefenderRegionHasTitle)
+				setTitle(std::string());
+		}
+	}
+
+	// grant/clear "War Planner" title
+	{
+		std::string const & currentTitle = getTitle();
+		if (qualifyForWarPlannerTitle)
+		{
+			if (PvpData::isImperialFactionId(owner->getPvpFaction()))
+			{
+				modifyCollectionSlotValue("imperial_gcw_war_planner", 1ll);
+				modifyCollectionSlotValue("rebel_gcw_war_planner", -1ll);
+
+				if (currentTitle == "rebel_gcw_war_planner")
+					setTitle("imperial_gcw_war_planner");
+			}
+			else if (PvpData::isRebelFactionId(owner->getPvpFaction()))
+			{
+				modifyCollectionSlotValue("imperial_gcw_war_planner", -1ll);
+				modifyCollectionSlotValue("rebel_gcw_war_planner", 1ll);
+
+				if (currentTitle == "imperial_gcw_war_planner")
+					setTitle("rebel_gcw_war_planner");
+			}
+			else
+			{
+				modifyCollectionSlotValue("imperial_gcw_war_planner", -1ll);
+				modifyCollectionSlotValue("rebel_gcw_war_planner", -1ll);
+
+				if ((currentTitle == "imperial_gcw_war_planner") || (currentTitle == "rebel_gcw_war_planner"))
+					setTitle(std::string());
+			}
+		}
+		else
+		{
+			modifyCollectionSlotValue("imperial_gcw_war_planner", -1ll);
+			modifyCollectionSlotValue("rebel_gcw_war_planner", -1ll);
+
+			if ((currentTitle == "imperial_gcw_war_planner") || (currentTitle == "rebel_gcw_war_planner"))
+				setTitle(std::string());
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::squelch(NetworkId const & squelchedById, std::string const & squelchedByName, int squelchDurationSeconds)
+{
+	if (isAuthoritative())
+	{
+		m_squelchedById = squelchedById;
+		m_squelchedByName = squelchedByName;
+
+		// persist squelch info
+		setObjVarItem(OBJVAR_SQUELCH_ID, squelchedById);
+		setObjVarItem(OBJVAR_SQUELCH_NAME, squelchedByName);
+
+		if (squelchDurationSeconds < 0)
+		{
+			m_squelchExpireTime = -1;
+
+			// persist squelch info
+			setObjVarItem(OBJVAR_SQUELCH_EXPIRE, -1);
+		}
+		else
+		{
+			m_squelchExpireTime = static_cast<int32>(::time(NULL)) + squelchDurationSeconds;
+
+			// persist squelch info
+			setObjVarItem(OBJVAR_SQUELCH_EXPIRE, static_cast<int>(ServerClock::getInstance().getGameTimeSeconds()) + squelchDurationSeconds);
+		}
+
+		// update chat server
+		CreatureObject * const owner = getCreatureObject();
+		if (owner)
+		{
+			GenericValueTypeMessage<std::pair<NetworkId, int> > setUnsquelchTime("SetUnsquelchTime", std::make_pair(owner->getNetworkId(), static_cast<int>(m_squelchExpireTime.get())));
+			Chat::sendToChatServer(setUnsquelchTime);
+		}
+	}
+	else
+	{
+		CreatureObject * const owner = getCreatureObject();
+		if (owner)
+			owner->sendControllerMessageToAuthServer(CM_squelch, new MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > >(std::make_pair(squelchedByName, std::make_pair(squelchedById, squelchDurationSeconds))));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::unsquelch()
+{
+	if (isAuthoritative())
+	{
+		m_squelchedById = NetworkId::cms_invalid;
+		m_squelchedByName = std::string();
+		m_squelchExpireTime = 0;
+
+		// persist squelch info
+		removeObjVarItem(OBJVAR_SQUELCH_ID);
+		removeObjVarItem(OBJVAR_SQUELCH_NAME);
+		removeObjVarItem(OBJVAR_SQUELCH_EXPIRE);
+
+		// update chat server
+		CreatureObject * const owner = getCreatureObject();
+		if (owner)
+		{
+			GenericValueTypeMessage<std::pair<NetworkId, int> > setUnsquelchTime("SetUnsquelchTime", std::make_pair(owner->getNetworkId(), 0));
+			Chat::sendToChatServer(setUnsquelchTime);
+		}
+	}
+	else
+	{
+		CreatureObject * const owner = getCreatureObject();
+		if (owner)
+			owner->sendControllerMessageToAuthServer(CM_unsquelch, NULL);
+	}
+}
+
+// ----------------------------------------------------------------------
+// returns 0 if not currently squelched; returns < 0 if indefinitely squelched
+int PlayerObject::getSecondsUntilUnsquelched()
+{
+	// not squelched
+	if (!m_squelchedById.get().isValid())
+		return 0;
+
+	// squelched, but need to check to see if the squelch period has already expired
+	if (m_squelchExpireTime.get() < 0) // squelched indefinitely
+		return -1;
+
+	int32 const timeNow = static_cast<int32>(::time(NULL));
+	if (timeNow < m_squelchExpireTime.get()) // still in squelch period
+		return (m_squelchExpireTime.get() - timeNow);
+
+	// squelch has expired
+	if (isAuthoritative())
+	{
+		m_squelchedById = NetworkId::cms_invalid;
+		m_squelchedByName = std::string();
+		m_squelchExpireTime = 0;
+
+		// persist squelch info
+		removeObjVarItem(OBJVAR_SQUELCH_ID);
+		removeObjVarItem(OBJVAR_SQUELCH_NAME);
+		removeObjVarItem(OBJVAR_SQUELCH_EXPIRE);
+	}
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::modifyShowBackpack(bool b)
+{
+	if(m_showBackpack.get() != b)
+		m_showBackpack = b;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::modifyShowHelmet(bool b)
+{
+	if(m_showHelmet.get () != b)
+		m_showHelmet = b;
+}
+
+void PlayerObject::setEnvironmentFlags(EnvironmentInfo const & flags)
+{
+	m_environmentFlags = flags;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::toggleOutOfCharacter()
+{
+	if (isAuthoritative())
+	{
+		MatchMakingId matchMakingId(m_matchMakingCharacterProfileId.get());
+
+		matchMakingId.toggleBit(MatchMakingId::B_outOfCharacter);
+
+		setMatchMakingCharacterProfileId(matchMakingId);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::toggleLookingForWork()
+{
+	if (isAuthoritative())
+	{
+		MatchMakingId matchMakingId(m_matchMakingCharacterProfileId.get());
+
+		matchMakingId.toggleBit(MatchMakingId::B_lookingForWork);
+
+		setMatchMakingCharacterProfileId(matchMakingId);
+	}
+}
+
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::setAccountNumLotsOverLimitSpam()
+{
+	if (!isAuthoritative())
+		return;
+
+	// if over the lot limit, spam warning; otherwise, if no
+	// longer over the lot limit, remove lot over limit restriction
+	CreatureObject * const owner = getCreatureObject();
+	if (!owner)
+		return;
+
+	if (m_accountNumLots.get() > owner->getMaxNumberOfLots())
+	{
+		if (owner->getObjVars().hasItem("lotOverlimit"))
+		{
+			m_accountNumLotsOverLimitSpam = m_accountNumLots.get() - owner->getMaxNumberOfLots();
+
+			int const timeNow = static_cast<int>(::time(NULL));
+			int violationTime = 0;
+			if (!owner->getObjVars().getItem("lotOverlimit.violation_time", violationTime))
+			{
+				violationTime = timeNow;
+				IGNORE_RETURN(owner->setObjVarItem("lotOverlimit.violation_time", violationTime));
+			}
+
+			if (owner->getClient())
+			{
+				// spam once every 5 minutes for 24 hours after the violation, then once every minute after that
+				bool shouldSpam = true;
+				if ((violationTime + 86400) >= timeNow)
+				{
+					int timeLastSpam = 0;
+					if (owner->getObjVars().getItem("lotOverlimit.last_spam_time", timeLastSpam) && ((timeLastSpam + 300) >= timeNow))
+						shouldSpam = false;
+
+					if (shouldSpam)
+						IGNORE_RETURN(owner->setObjVarItem("lotOverlimit.last_spam_time", timeNow));
+				}
+				else
+				{
+					// over 24 hours after violation, spam every minute (i.e. each time this messageTo fires)
+					owner->removeObjVarItem("lotOverlimit.last_spam_time");
+				}
+
+				if (shouldSpam)
+				{
+					Chat::sendSystemMessage(*owner, Unicode::narrowToWide("!!!WARNING!!! !!!WARNING!!! !!!WARNING!!! !!!WARNING!!! !!!WARNING!!!"), Unicode::emptyString);
+					Chat::sendSystemMessage(*owner, Unicode::narrowToWide(FormattedString<256>().sprintf("YOU ARE %d LOTS OVER THE LOT LIMIT!!!", m_accountNumLotsOverLimitSpam.get())), Unicode::emptyString);
+
+					std::string lotOverlimitStructureName;
+					std::string lotOverlimitStructureLocation;
+					IGNORE_RETURN(owner->getObjVars().getItem("lotOverlimit.structure_name", lotOverlimitStructureName));
+					IGNORE_RETURN(owner->getObjVars().getItem("lotOverlimit.structure_location", lotOverlimitStructureLocation));
+					Chat::sendSystemMessage(*owner, Unicode::narrowToWide(FormattedString<256>().sprintf("THE %s STRUCTURE LOCATED AT %s CAUSED YOU TO EXCEED THE LOT LIMIT!!!", lotOverlimitStructureName.c_str(), lotOverlimitStructureLocation.c_str())), Unicode::emptyString);
+
+					Chat::sendSystemMessage(*owner, Unicode::narrowToWide("!!!WARNING!!! !!!WARNING!!! !!!WARNING!!! !!!WARNING!!! !!!WARNING!!!"), Unicode::emptyString);
+				}
+			}
+		}
+		else
+		{
+			// over the limit, but we shouldn't spam
+			m_accountNumLotsOverLimitSpam = 0;
+		}
+	}
+	else
+	{
+		m_accountNumLotsOverLimitSpam = 0;
+		owner->removeObjVarItem("lotOverlimit");
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool PlayerObject::canAccessGalacticReserve(real x, real z)
+{
+	// must be at a bank terminal in Mos Eisley, Theed, or Coronet to access the Galactic Reserve
+	std::string const & sceneId = ServerWorld::getSceneId();
+	if ((sceneId != "tatooine") && (sceneId != "naboo") && (sceneId != "corellia"))
+		return false;
+
+	std::vector<const Region *> result;
+	RegionMaster::getRegionsAtPoint(sceneId, x, z, result);
+	if (result.empty())
+		return false;
+
+	static Unicode::String const regionMosEisley = Unicode::narrowToWide("@tatooine_region_names:mos_eisley");
+	static Unicode::String const regionTheed = Unicode::narrowToWide("@naboo_region_names:theed");
+	static Unicode::String const regionCoronet = Unicode::narrowToWide("@corellia_region_names:coronet");
+	static uint32 const hashMosEisley = Crc::calculate(regionMosEisley.c_str(), regionMosEisley.length()*2);
+	static uint32 const hashTheed = Crc::calculate(regionTheed.c_str(), regionTheed.length()*2);
+	static uint32 const hashCoronet = Crc::calculate(regionCoronet.c_str(), regionCoronet.length()*2);
+
+	for(std::vector<const Region*>::iterator it = result.begin(); it != result.end(); ++it)
+	{
+		if (((sceneId == "tatooine") && ((*it)->getNameCrc() == hashMosEisley)) ||
+			((sceneId == "naboo") && ((*it)->getNameCrc() == hashTheed)) ||
+			((sceneId == "corellia") && ((*it)->getNameCrc() == hashCoronet)))
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::depositToGalacticReserve(bool ignoreCooldownAndLocationCheck)
+{
+	if (!isAuthoritative())
+		return;
+
+	CreatureObject * const co = getCreatureObject();
+	if (!co)
+		return;
+
+	Client const * const c = co->getClient();
+	if (c && c->isFreeTrialAccount())
+	{
+		Chat::sendSystemMessage(*co, Unicode::narrowToWide("Trial account cannot access the Galactic Reserve."), Unicode::emptyString);
+		return;
+	}
+
+	bool const isGod = (c && c->isGod());
+
+	// check for cooldown
+	if (!isGod && !ignoreCooldownAndLocationCheck)
+	{
+		int cooldown;
+		if (co->getObjVars().getItem("galactic_reserve_cooldown", cooldown))
+		{
+			int const timeNow = static_cast<int>(ServerClock::getInstance().getGameTimeSeconds());
+			if (cooldown > timeNow)
+			{
+				if (c)
+					Chat::sendSystemMessage(*co, Unicode::narrowToWide(FormattedString<1024>().sprintf("You must wait %s before you can access the Galactic Reserve again.", CalendarTime::convertSecondsToMS(static_cast<unsigned>(cooldown - timeNow)).c_str())), Unicode::emptyString);
+
+				return;
+			}
+		}
+	}
+
+	// must be at a bank terminal in Mos Eisley, Theed, or Coronet to access the Galactic Reserve
+	if (!ignoreCooldownAndLocationCheck)
+	{
+		Vector const positionW = co->getPosition_w();
+		if (!canAccessGalacticReserve(positionW.x, positionW.z))
+		{
+			if (c)
+				Chat::sendSystemMessage(*co, Unicode::narrowToWide("You must be at a bank terminal in Mos Eisley, Theed, or Coronet to access the Galactic Reserve."), Unicode::emptyString);
+
+			return;
+		}
+	}
+
+	if (static_cast<int>(m_galacticReserveDeposit.get()) >= ConfigServerGame::getMaxGalacticReserveDepositBillion())
+	{
+		if (c)
+			Chat::sendSystemMessage(*co, Unicode::narrowToWide(FormattedString<1024>().sprintf("You already have the maximum %d billion credits in the Galactic Reserve.", ConfigServerGame::getMaxGalacticReserveDepositBillion())), Unicode::emptyString);
+
+		return;
+	}
+
+	// transfer as much cash as necessary into bank to get 1 billion in bank
+	int amountToTransferToBank = 1000000000 - co->getBankBalance();
+	if (amountToTransferToBank > co->getCashBalance())
+	{
+		if (c)
+			Chat::sendSystemMessage(*co, Unicode::narrowToWide("You do not currently have 1 billion credits to deposit to the Galactic Reserve."), Unicode::emptyString);
+
+		return;
+	}
+
+	if (amountToTransferToBank > 0)
+	{
+		co->depositCashToBank(amountToTransferToBank);
+	}
+
+	// final sanity check to make sure there's 1 billion in the bank
+	if (co->getBankBalance() < 1000000000)
+	{
+		if (c)
+			Chat::sendSystemMessage(*co, Unicode::narrowToWide("You do not currently have 1 billion credits to deposit to the Galactic Reserve."), Unicode::emptyString);
+
+		return;
+	}
+
+	// do the transfer
+	if (!co->transferBankCreditsTo("galactic_reserve", 1000000000))
+	{
+		if (c)
+			Chat::sendSystemMessage(*co, Unicode::narrowToWide("Failed to transfer 1 billion credits to the Galactic Reserve."), Unicode::emptyString);
+
+		return;
+	}
+
+	// update reserve balance
+	m_galacticReserveDeposit = m_galacticReserveDeposit.get() + 1;
+	co->setObjVarItem("galactic_reserve", static_cast<int>(m_galacticReserveDeposit.get()));
+
+	// set cooldown (15 minutes)
+	if (!ignoreCooldownAndLocationCheck)
+	{
+		co->setObjVarItem("galactic_reserve_cooldown", static_cast<int>(ServerClock::getInstance().getGameTimeSeconds() + (15 * 60)));
+	}
+
+	// display confirmation message
+	if (c)
+		Chat::sendSystemMessage(*co, Unicode::narrowToWide(FormattedString<1024>().sprintf("1 billion credits have been deposited to the Galactic Reserve.  Your new Galactic Reserve balance is %d billion credits.", m_galacticReserveDeposit.get())), Unicode::emptyString);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::withdrawFromGalacticReserve()
+{
+	if (!isAuthoritative())
+		return;
+
+	CreatureObject * const co = getCreatureObject();
+	if (!co)
+		return;
+
+	Client const * const c = co->getClient();
+	if (!c)
+		return;
+
+	if (c->isFreeTrialAccount())
+	{
+		Chat::sendSystemMessage(*co, Unicode::narrowToWide("Trial account cannot access the Galactic Reserve."), Unicode::emptyString);
+		return;
+	}
+
+	// check for cooldown
+	if (!c->isGod())
+	{
+		int cooldown;
+		if (co->getObjVars().getItem("galactic_reserve_cooldown", cooldown))
+		{
+			int const timeNow = static_cast<int>(ServerClock::getInstance().getGameTimeSeconds());
+			if (cooldown > timeNow)
+			{
+				Chat::sendSystemMessage(*co, Unicode::narrowToWide(FormattedString<1024>().sprintf("You must wait %s before you can access the Galactic Reserve again.", CalendarTime::convertSecondsToMS(static_cast<unsigned>(cooldown - timeNow)).c_str())), Unicode::emptyString);
+				return;
+			}
+		}
+	}
+
+	// must be at a bank terminal in Mos Eisley, Theed, or Coronet to access the Galactic Reserve
+	Vector const positionW = co->getPosition_w();
+	if (!canAccessGalacticReserve(positionW.x, positionW.z))
+	{
+		Chat::sendSystemMessage(*co, Unicode::narrowToWide("You must be at a bank terminal in Mos Eisley, Theed, or Coronet to access the Galactic Reserve."), Unicode::emptyString);
+		return;
+	}
+
+	if (m_galacticReserveDeposit.get() <= 0)
+	{
+		Chat::sendSystemMessage(*co, Unicode::narrowToWide("You do not have any deposit in the Galactic Reserve to withdraw."), Unicode::emptyString);
+		return;
+	}
+
+	// move all the bank to cash to make room to receive the 1 billion into the bank
+	if (co->getBankBalance() > 0)
+	{
+		if ((co->getCashBalance() + co->getBankBalance()) > ConfigServerGame::getMaxMoney())
+		{
+			Chat::sendSystemMessage(*co, Unicode::narrowToWide("Withdrawing 1 billion credits from the Galactic Reserve would cause your cash/bank balance to exceed the maximum balance limit."), Unicode::emptyString);
+			return;
+		}
+
+		co->withdrawCashFromBank(co->getBankBalance());
+	}
+
+	// final sanity check to make sure the bank is empty to receive the 1 billion
+	if (co->getBankBalance() > 0)
+	{
+		Chat::sendSystemMessage(*co, Unicode::narrowToWide("Withdrawing 1 billion credits from the Galactic Reserve would cause your cash/bank balance to exceed the maximum balance limit."), Unicode::emptyString);
+		return;
+	}
+
+	// do the transfer
+	if (!co->transferBankCreditsFrom("galactic_reserve", 1000000000))
+	{
+		Chat::sendSystemMessage(*co, Unicode::narrowToWide("Failed to withdraw 1 billion credits from the Galactic Reserve."), Unicode::emptyString);
+		return;
+	}
+
+	// update reserve balance
+	m_galacticReserveDeposit = m_galacticReserveDeposit.get() - 1;
+	if (m_galacticReserveDeposit.get() > 0)
+		co->setObjVarItem("galactic_reserve", static_cast<int>(m_galacticReserveDeposit.get()));
+	else
+		co->removeObjVarItem("galactic_reserve");
+
+	// set cooldown (15 minutes)
+	co->setObjVarItem("galactic_reserve_cooldown", static_cast<int>(ServerClock::getInstance().getGameTimeSeconds() + (15 * 60)));
+
+	// display confirmation message
+	Chat::sendSystemMessage(*co, Unicode::narrowToWide(FormattedString<1024>().sprintf("1 billion credits have been withdrawn from the Galactic Reserve.  Your new Galactic Reserve balance is %d billion credits.", m_galacticReserveDeposit.get())), Unicode::emptyString);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObject::depersistGalacticReserveDeposit()
+{
+	if (!isAuthoritative())
+		return;
+
+	m_galacticReserveDeposit = 0;
+
+	CreatureObject const * const co = getCreatureObject();
+	if (!co)
+		return;
+
+	// depersist galactic reserve 
+	int temp;
+	if (co->getObjVars().getItem("galactic_reserve", temp))
+		m_galacticReserveDeposit = static_cast<int8>(temp);
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObjectNamespace::checkAndSetCharacterAgeTitle(PlayerObject & player, bool thoroughCheck)
+{
+	static std::vector<CollectionsDataTable::CollectionInfoSlot const *> s_vectorCharacterAgeTitle;
+	if (s_vectorCharacterAgeTitle.empty())
+	{
+		// we'll exit this loop as soon as we don't find the "next" character age title collection slot
+		for (int i = 1; i <= 1000000; ++i)
+		{
+			CollectionsDataTable::CollectionInfoSlot const * collectionSlot = CollectionsDataTable::getSlotByName(FormattedString<128>().sprintf("character_age_%dyr", i));
+			if (!collectionSlot)
+				break;
+
+			FATAL((collectionSlot->collection.name != std::string("character_age_collection")), ("collection slot %s must be in collection character_age_collection", collectionSlot->name.c_str()));
+			FATAL((collectionSlot->collection.page.name != std::string("character_age_page")), ("collection slot %s must be in collection page character_age_page", collectionSlot->name.c_str()));
+			FATAL((collectionSlot->collection.page.book.name != std::string("character_age_book")), ("collection slot %s must be in collection book character_age_book", collectionSlot->name.c_str()));
+
+			s_vectorCharacterAgeTitle.push_back(collectionSlot);
+		}
+	}
+
+	int const ageInYears = ((player.getBornDate() > 0) ? (player.getAgeInDays() / 365) : 0);
+
+	if (!thoroughCheck)
+	{
+		// just do quickie check to see if the player has turned a new year older
+		if (ageInYears <= static_cast<int>(s_vectorCharacterAgeTitle.size()))
+		{
+			if (ageInYears >= 1)
+			{
+				if (!player.hasCompletedCollectionSlot(*s_vectorCharacterAgeTitle[ageInYears - 1]))
+				{
+					// this will force a check/set/unset of the proper character age slot for the player
+					thoroughCheck = true;
+				}
+			}
+		}
+		else
+		{
+			// we need to add additional character age collection slots
+
+			// this will make sure to unset all previous character age slots the player may have
+			thoroughCheck = true;
+		}
+	}
+
+	// go through all possible character age titles and verify that the appropriate one is set and the others are unset
+	if (thoroughCheck)
+	{
+		for (int i = 0, size = s_vectorCharacterAgeTitle.size(); i < size; ++i)
+		{
+			if ((i + 1) == ageInYears)
+			{
+				player.modifyCollectionSlotValue(s_vectorCharacterAgeTitle[i]->name, 1ll);
+			}
+			else
+			{
+				player.modifyCollectionSlotValue(s_vectorCharacterAgeTitle[i]->name, -1ll);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObjectNamespace::checkAndSetAccountAgeTitle(PlayerObject & player)
+{
+	static std::vector<CollectionsDataTable::CollectionInfoSlot const *> s_vectorAccountAgeTitle;
+	if (s_vectorAccountAgeTitle.empty())
+	{
+		// we'll exit this loop as soon as we don't find the "next" account age title collection slot
+		for (int i = 1; i <= 1000000; ++i)
+		{
+			CollectionsDataTable::CollectionInfoSlot const * collectionSlot = CollectionsDataTable::getSlotByName(FormattedString<128>().sprintf("account_age_%dyr", i));
+			if (!collectionSlot)
+				break;
+
+			FATAL((collectionSlot->collection.name != std::string("account_age_collection")), ("collection slot %s must be in collection account_age_collection", collectionSlot->name.c_str()));
+			FATAL((collectionSlot->collection.page.name != std::string("account_age_page")), ("collection slot %s must be in collection page account_age_page", collectionSlot->name.c_str()));
+			FATAL((collectionSlot->collection.page.book.name != std::string("account_age_book")), ("collection slot %s must be in collection book account_age_book", collectionSlot->name.c_str()));
+
+			s_vectorAccountAgeTitle.push_back(collectionSlot);
+		}
+	}
+
+	CreatureObject const * const co = player.getCreatureObject();
+	if (!co)
+		return;
+
+	Client const * const c = co->getClient();
+	if (!c)
+		return;
+
+	if (c->isUsingAdminLogin())
+		return;
+
+	unsigned int const ageInYears = c->getEntitlementEntitledTime() / 365u;
+
+	// go through all possible account age titles and verify that the appropriate one is set and the others are unset
+	for (size_t i = 0, size = s_vectorAccountAgeTitle.size(); i < size; ++i)
+	{
+		if ((i + 1) == ageInYears)
+		{
+			player.modifyCollectionSlotValue(s_vectorAccountAgeTitle[i]->name, 1ll);
+		}
+		else
+		{
+			player.modifyCollectionSlotValue(s_vectorAccountAgeTitle[i]->name, -1ll);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PlayerObjectNamespace::grantGcwFactionalPresenceScore(std::string const & gcwCategory, PlayerObject const & po, CreatureObject const & co)
+{
+	// base_points = level * (level_% / 100)
+	// bonus_% = GCW_rank * bonus_%_per_rank
+	//
+	// if (in a same faction player city)
+	// {
+	//     bonus_% += player_city_bonus_%
+	//     bonus_% += (player_city_rank_bonus_% * city_rank)
+	//     bonus_% += (player_city_age_bonus_% * city_age_in_years)
+	// }
+	//
+	// final_points = base_points + (base_points * (bonus_% / 100))
+	int level = co.getLevel();
+	int bonus = 100 + (po.getCurrentGcwRank() * ConfigServerGame::getGcwFactionalPresenceGcwRankBonusPct());
+	int mountedPct = 100;
+
+	// for ground, give bonus if in same faction player city
+	//
+	// for space, give bonus if the player's citizenship city is on the
+	// corresponding ground planet and is the same faction as the player
+	CityInfo const * ci = NULL;
+	if (!ServerWorld::isSpaceScene())
+	{
+		Vector const creaturePosition = co.findPosition_w();
+		int const cityId = CityInterface::getCityAtLocation(ServerWorld::getSceneId(), static_cast<int>(creaturePosition.x), static_cast<int>(creaturePosition.z), 0);
+		if (cityId > 0)
+			ci = &(CityInterface::getCityInfo(cityId));
+
+		// for ground, there may be a reduction for being on a vehicle/mount
+		if (co.getMountedCreature())
+			mountedPct = std::min(std::max(ConfigServerGame::getGcwFactionalPresenceMountedPct(), 1), 100); // clamp to 1 - 100
+	}
+	else
+	{
+		// for space, the "level" for a pilot (i.e. character is
+		// sitting in the pilot chair) is based on the pilot skill
+		//
+		// Pilots with one of the following skills should be considered Level 90
+		//     pilot_rebel_navy_master
+		//     pilot_imperial_navy_master
+		//     pilot_neutral_master
+		//
+		// Pilots with one of the following skills should be considered Level 69
+		//     pilot_rebel_navy_droid_03
+		//     pilot_imperial_navy_droid_03
+		//     pilot_neutral_droid_03
+		//
+		// Pilots with one of the following skills should be considered Level 45
+		//     pilot_rebel_navy_droid_02
+		//     pilot_imperial_navy_droid_02
+		//     pilot_neutral_droid_02
+		//
+		// Pilots with one of the following skills should be considered Level 21
+		//     pilot_rebel_navy_droid_01
+		//     pilot_imperial_navy_droid_01
+		//     pilot_neutral_droid_01
+		//
+		// Else they should be consider level 1
+		ServerObject const * const container = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(co));
+		if (container && !container->asCellObject())
+		{
+			static std::list<std::pair<const SkillObject *, int> > sPilotSkillToLevel;
+			if (sPilotSkillToLevel.empty())
+			{
+				const SkillObject * skill = SkillManager::getInstance().getSkill("pilot_rebel_navy_master");
+				if (skill)
+					sPilotSkillToLevel.push_back(std::make_pair(skill, 90));
+
+				skill = SkillManager::getInstance().getSkill("pilot_imperial_navy_master");
+				if (skill)
+					sPilotSkillToLevel.push_back(std::make_pair(skill, 90));
+
+				skill = SkillManager::getInstance().getSkill("pilot_neutral_master");
+				if (skill)
+					sPilotSkillToLevel.push_back(std::make_pair(skill, 90));
+
+				skill = SkillManager::getInstance().getSkill("pilot_rebel_navy_droid_03");
+				if (skill)
+					sPilotSkillToLevel.push_back(std::make_pair(skill, 69));
+
+				skill = SkillManager::getInstance().getSkill("pilot_imperial_navy_droid_03");
+				if (skill)
+					sPilotSkillToLevel.push_back(std::make_pair(skill, 69));
+
+				skill = SkillManager::getInstance().getSkill("pilot_neutral_droid_03");
+				if (skill)
+					sPilotSkillToLevel.push_back(std::make_pair(skill, 69));
+
+				skill = SkillManager::getInstance().getSkill("pilot_rebel_navy_droid_02");
+				if (skill)
+					sPilotSkillToLevel.push_back(std::make_pair(skill, 45));
+
+				skill = SkillManager::getInstance().getSkill("pilot_imperial_navy_droid_02");
+				if (skill)
+					sPilotSkillToLevel.push_back(std::make_pair(skill, 45));
+
+				skill = SkillManager::getInstance().getSkill("pilot_neutral_droid_02");
+				if (skill)
+					sPilotSkillToLevel.push_back(std::make_pair(skill, 45));
+
+				skill = SkillManager::getInstance().getSkill("pilot_rebel_navy_droid_01");
+				if (skill)
+					sPilotSkillToLevel.push_back(std::make_pair(skill, 21));
+
+				skill = SkillManager::getInstance().getSkill("pilot_imperial_navy_droid_01");
+				if (skill)
+					sPilotSkillToLevel.push_back(std::make_pair(skill, 21));
+
+				skill = SkillManager::getInstance().getSkill("pilot_neutral_droid_01");
+				if (skill)
+					sPilotSkillToLevel.push_back(std::make_pair(skill, 21));
+			}
+
+			level = 1;
+			CreatureObject::SkillList const & creatureSkill = co.getSkillList();
+			for (std::list<std::pair<const SkillObject *, int> >::const_iterator iter = sPilotSkillToLevel.begin(); iter != sPilotSkillToLevel.end(); ++iter)
+			{
+				if (creatureSkill.count(iter->first) >= 1)
+				{
+					level = iter->second;
+					break;
+				}
+			}
+		}
+
+		std::vector<int> const & cityIds = CityInterface::getCitizenOfCityId(co.getNetworkId());
+		if (!cityIds.empty())
+		{
+			ci = &(CityInterface::getCityInfo(cityIds.front()));
+
+			// player city on Rori will be associated with space_naboo
+			// player city on Talus will be associated with space_corellia
+			std::string const & playerCityPlanet = ci->getPlanet();
+			std::string playerCitySpaceZone;
+			if (playerCityPlanet == std::string("rori"))
+				playerCitySpaceZone = std::string("space_naboo");
+			else if (playerCityPlanet == std::string("talus"))
+				playerCitySpaceZone = std::string("space_corellia");
+			else
+				playerCitySpaceZone = std::string("space_") + playerCityPlanet;
+
+			if (playerCitySpaceZone != ServerWorld::getSceneId())
+				ci = NULL;
+		}
+	}
+
+	if (ci)
+	{
+		if (!PvpData::isNeutralFactionId(ci->getFaction()) && (ci->getFaction() == co.getPvpFaction()))
+		{
+			bonus += ConfigServerGame::getGcwFactionalPresenceAlignedCityBonusPct();
+
+			int cityRank = 5;
+			if (ci->getRadius() < 200)
+				cityRank = 1;
+			else if (ci->getRadius() < 300)
+				cityRank = 2;
+			else if (ci->getRadius() < 400)
+				cityRank = 3;
+			else if (ci->getRadius() < 450)
+				cityRank = 4;
+
+			bonus += (cityRank * ConfigServerGame::getGcwFactionalPresenceAlignedCityRankBonusPct());
+
+			if (ci->getCreationTime() > 0)
+				bonus += std::max(0, (static_cast<int>(::time(NULL)) - std::max(1041408000, ci->getCreationTime())) / 31536000 * ConfigServerGame::getGcwFactionalPresenceAlignedCityAgeBonusPct());
+		}
+	}
+
+	int const points = std::max(1, level * ConfigServerGame::getGcwFactionalPresenceLevelPct() * std::min(1000, bonus) * mountedPct / 1000000);
+
+	if (PvpData::isImperialFactionId(co.getPvpFaction()))
+		ServerUniverse::getInstance().adjustGcwImperialScore(std::string("FactionalPresence"), const_cast<CreatureObject *>(&co), gcwCategory, points);
+	else if (PvpData::isRebelFactionId(co.getPvpFaction()))
+		ServerUniverse::getInstance().adjustGcwRebelScore(std::string("FactionalPresence"), const_cast<CreatureObject *>(&co), gcwCategory, points);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/PlayerObject.h b/engine/server/library/serverGame/src/shared/object/PlayerObject.h
new file mode 100644
index 00000000..2298e6bd
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/PlayerObject.h
@@ -0,0 +1,1336 @@
+// ======================================================================
+//
+// PlayerObject.h
+//
+// Copyright 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_PLAYER_OBJECT_H
+#define	_PLAYER_OBJECT_H
+
+// ======================================================================
+
+#include "Archive/AutoDeltaMap.h"
+#include "Archive/AutoDeltaPackedMap.h"
+#include "serverGame/DraftSchematicObject.h"
+#include "serverGame/IntangibleObject.h"
+#include "serverGame/Region.h"
+#include "sharedFoundation/BitArray.h"
+#include "sharedFoundation/StationId.h"
+#include "sharedFoundation/Watcher.h"
+#include "sharedGame/CollectionsDataTable.h"
+#include "sharedGame/CraftingData.h"
+#include "sharedGame/MatchMakingId.h"
+#include "sharedGame/PlayerData.h"
+#include "sharedGame/PlayerQuestData.h"
+#include "sharedGame/Waypoint.h"
+#include "sharedMath/Quaternion.h"
+#include "sharedNetworkMessages/MessageQueueCraftExperiment.h"
+#include "sharedObject/CachedNetworkId.h"
+#include "sharedSkillSystem/SkillObject.h"
+
+#include <set>
+
+// ======================================================================
+
+struct ChatAvatarId;
+class MessageQueueDraftSlots;
+class MessageQueueDraftSlotsQueryResponse;
+class ServerPlayerObjectTemplate;
+class TangibleObject;
+
+namespace MessageDispatch
+{
+	class Callback;
+}
+
+// ======================================================================
+
+/**
+ * Class to hold all the player and account-level data.  A character should
+ * keep this object, even if the creature/vehicle/etc. they control changes.
+ */
+class PlayerObject : public IntangibleObject
+{
+public:
+
+	struct ChatLogEntry
+	{
+		ChatLogEntry();
+
+		int m_index;
+		time_t m_time;
+	};
+
+	typedef stdlist<ChatLogEntry>::fwd    ChatLog;
+	typedef stdvector<std::string>::fwd   StringVector;
+	typedef stdmap<std::string, int>::fwd ExperiencePointMap;
+	typedef stdmap<NetworkId, Waypoint>::fwd WaypointMap;
+	typedef Archive::AutoDeltaPackedMap<uint32, PlayerQuestData> PlayerQuestDataMap;
+
+	explicit    PlayerObject(const ServerPlayerObjectTemplate* newTemplate);
+	virtual     ~PlayerObject();
+
+	virtual PlayerObject *asPlayerObject();
+	virtual PlayerObject const *asPlayerObject() const;
+
+	static void removeDefaultTemplate(void);
+	static stdset<PlayerObject const *>::fwd const &getAllPlayerObjects();
+
+	void               addMembersToPackages  ();
+	Waypoint const     createWaypoint        (const Location & location, bool ignoreLimits);
+	Waypoint const     createOrUpdateReusableWaypoint(const Location & location, const std::string & objvarTrackingName, const Unicode::String & waypointNameIfCreated, int waypointColorIfCreated = -1);
+	Waypoint &         getWaypoint           (const NetworkId & waypointId);
+	void               getWaypointsInDatapad (std::vector<NetworkId> & target);
+	void               getWaypointAttributes (const NetworkId & waypointId, ServerObject::AttributeVector & data);
+	void               destroyWaypoint       (const NetworkId & waypoint);
+	WaypointMap const &getWaypoints          () const;
+	void               setGroupWaypoints     (WaypointMap const &groupWaypointMap);
+
+	virtual void  getAttributes        (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+	virtual void  endBaselines();
+	virtual void  onLoadedFromDatabase();
+	static std::string  getAccountDescription(const ServerObject *);
+	static std::string  getAccountDescription(const NetworkId &);
+	       std::string  getAccountDescription() const;
+
+public:
+	StationId            getStationId() const;
+	float                getCheaterLevel() const;
+	int                  getBornDate() const;
+	int                  getAgeInDays() const;
+	static int           getCurrentBornDate();
+	uint32               getPlayedTime() const;
+	float                getPlayedTimeAccumOnly() const;
+	void                 setPlayedTimeAccumOnly(float playedTimeAccum);
+
+	unsigned long        getSessionPlayTimeDuration() const;
+	unsigned long        getSessionActivePlayTimeDuration() const;
+	int32                getSessionStartPlayTime() const;
+	int32                getSessionLastActiveTime() const;
+	void                 setSessionPlayTimeInfo(int32 sessionStartPlayTime, int32 sessionLastActiveTime, unsigned long sessionActivePlayTimeDuration);
+
+	void                 setStationId(StationId account);
+	void                 setCheaterLevel(float level);
+	void                 setBornDate();
+	void                 adjustBornDate(int adjustment);
+	void                 alterPlayedTime(float time);
+
+	void                 setMatchMakingPersonalProfileId(MatchMakingId const &id);
+	MatchMakingId const &getMatchMakingPersonalProfileId() const;
+
+	void                 setMatchMakingCharacterProfileId(MatchMakingId const &id);
+	MatchMakingId const &getMatchMakingCharacterProfileId() const;
+
+	void                 toggleSearchableByCtsSourceGalaxy();
+	void                 toggleDisplayLocationInSearchResults();
+	void                 toggleAnonymous();
+	void                 toggleHelper();
+	void                 toggleRolePlay();
+	void                 toggleOutOfCharacter();
+	void				 toggleLookingForWork();
+
+
+	bool                 isAwayFromKeyBoard() const;
+	void                 toggleAwayFromKeyBoard();
+
+	void                 toggleDisplayingFactionRank();
+
+	bool                 isLookingForGroup() const;
+	void                 setLookingForGroup(bool const lookingForGroup);
+	void                 toggleLookingForGroup();
+
+	StringVector const & getSortedLowercaseFriendList() const;
+	void                 setFriendList(const StringVector &friendList);
+	bool                 isFriend(const std::string &name) const;
+	void                 requestFriendList() const;
+	void                 findFriend(const std::string & name);
+	void                 replyLocationToFriend(const std::string & friendName, const NetworkId & friendId);
+	void                 receiveLocationToFriend(const NetworkId & friendId, const Location & friendLocation);
+	void                 failLocationToFriend(const NetworkId & friendId);
+	void                 receiveFailLocationToFriend(const NetworkId & friendId);
+	
+	StringVector const & getSortedLowercaseIgnoreList() const;
+	void                 setIgnoreList(const StringVector &ignoreList);
+	bool                 isIgnoring(const std::string &name) const;
+	void                 requestIgnoreList() const;
+
+	void                 setTitle(std::string const &title);
+	std::string const &  getTitle() const;
+
+	bool                 adjustLotCount(int adjustment);
+
+	void                 setSpokenLanguage(int const languageId);
+	int                  getSpokenLanguage() const;
+
+	void                 setLinkDead(bool const linkDead);
+	bool                 getLinkDead() const;
+
+	static bool          isIgnoring(NetworkId const &target, NetworkId const &source);
+
+	int                  getMaxForcePower         (void) const;
+	virtual void         setMaxForcePower         (int value);
+	int                  getForcePower            (void) const;
+	void                 setForcePower            (int value);
+	float                getForcePowerRegenRate   (void) const;
+	void                 setForcePowerRegenRate   (float value);
+	void                 regenerateForcePower     (float time);
+
+	//@todo It is unfortunate that these jedi-related things are in the supposedly generic PlayerObject
+    virtual bool         isJedi() const;			
+	void                 addJediToAccount() const;
+	void                 addJediToAccountAck() const;
+	void                 makeSpectralOnAccount() const;
+	void                 makeSpectralOnAccountAck() const;
+
+	void                 checkStomach();
+
+	virtual void         handleCMessageTo(const MessageToPayload &message);
+
+	void                  logChat(int const logIndex);
+
+	ChatLog const &getChatLog() const;
+	void cleanChatLog();
+
+	void checkTheater(const Vector & pos, const std::string & scene, float speed, float updateRadius);
+	bool setTheater(const std::string & datatable, const Vector & position, const std::string & scene, const std::string & script, const NetworkId & creator, const std::string & name, IntangibleObject::TheaterLocationType locationType);
+	void clearTheater();
+	bool hasTheater() const;
+	const NetworkId & getTheater() const;
+
+public:
+
+	int                                 getExperiencePoints(const std::string & experienceType) const;
+	const std::map<std::string, int> &  getExperiencePoints() const;
+	int                                 getExperienceLimit(const std::string & experienceType) const;
+	int                                 grantExperiencePoints(const std::string & experienceType, int amount);
+	void                                clearSchematics();
+	bool                                grantSchematicGroup(const std::string & groupNameWithModifier, bool fromSkill);
+	bool                                grantSchematic(uint32 schematicCrc, bool fromSkill);
+	bool                                revokeSchematic(uint32 schematicCrc, bool fromSkill);
+	bool                                hasSchematic(uint32 schematicCrc);
+
+	// crafting functions
+	bool                                isCrafting(void) const;
+	const stdmap<std::pair<uint32, uint32>,int>::fwd & getDraftSchematics () const;
+	const CachedNetworkId &             getCraftingTool () const;
+	void                                setCraftingTool(const TangibleObject & tool);
+	const CachedNetworkId &             getCraftingStation () const;
+	void                                setCraftingStation(const TangibleObject * station);
+	const DraftSchematicObject *        getCurrentDraftSchematic () const;
+	bool                                requestCraftingSession(const NetworkId & toolId);
+	void                                sendUseableDraftSchematics(stdvector<uint32>::fwd & schematicNames);
+	bool                                requestDraftSlots(uint32 draftSchematicCrc, MessageQueueDraftSlots * message, MessageQueueDraftSlotsQueryResponse * queryMessage);
+	void                                selectDraftSchematic(int index);
+	Crafting::CraftingError             fillSlot(int slotIndex, int slotOptionIndex, const NetworkId & ingredientIndex);
+	Crafting::CraftingError             emptySlot(int slotIndex, const NetworkId & targetContainer);
+	int                                 goToNextCraftingStage ();
+	int                                 startCraftingExperiment ();
+	Crafting::CraftingResult            experiment(const stdvector<MessageQueueCraftExperiment::ExperimentInfo>::fwd & experiments, int totalPoints, int corelevel);
+	bool                                customize(int property, int value) const;
+	int                                 setCustomizationData(const Unicode::String & name, int appearanceIndex, const std::vector<Crafting::CustomValue> & customizations, int itemCount) const;
+	bool                                createPrototype(bool keepPrototype);
+	bool                                createManufacturingSchematic(void);
+	bool                                restartCrafting ();
+	void                                stopCrafting (bool normalExit);
+	enum Crafting::CraftingStage        getCraftingStage () const;
+	void                                setCraftingLevel(int level);
+	int                                 getCraftingLevel() const;
+	void                                setAllowEmptySlot(bool allow);
+
+	int                                 getAccountNumLots() const;
+	void                                setAccountNumLotsOverLimitSpam();
+
+	CreatureObject *                    getCreatureObject();
+	const CreatureObject *              getCreatureObject() const;
+
+	void                                setPriviledgedTitle(int8 priviledgedTitle);
+
+	bool                                getIsUnsticking() const;
+	void                                setIsUnsticking(bool value);
+
+	//-- old quest system
+	bool                                isQuestComplete(int questId) const;
+	bool                                isQuestActive(int questId) const;
+	void                                activateQuest(int questId);
+	void                                deactivateQuest(int questId);
+	void                                completeQuest(int questId);
+	void                                clearCompletedQuest(int questId);
+
+	//--new quest system
+	enum QuestResult {QR_success, QR_alreadyActive, QR_noSuchQuest, QR_noSuchTask, QR_alreadyComplete, QR_failedPrerequisites, QR_failedExclusion, QR_questNotActive, QR_taskNotActive, QR_noSuchPlayer, QR_questNotCompleted, QR_alreadyReceivedReward};
+
+	QuestResult                         questCanActivateQuest(uint32 questCrc) const;
+	QuestResult                         questActivateQuest(uint32 questCrc, NetworkId const & questGiver);
+	QuestResult                         questCompleteQuest(uint32 questCrc);
+	QuestResult                         questGrantQuestReward(uint32 questCrc, std::string const & selectedReward);
+	void                                questClearQuest(uint32 questCrc);
+	QuestResult                         questCanActivateQuestTask(uint32 questCrc, int taskId) const;
+	QuestResult                         questActivateQuestTask(uint32 questCrc, int taskId);
+	QuestResult                         questCompleteQuestTask(uint32 questCrc, int taskId);
+	QuestResult                         questFailQuestTask(uint32 questCrc, int taskId);
+	QuestResult                         questClearQuestTask(uint32 questCrc, int taskId);
+	bool                                questHasActiveQuest(uint32 questCrc) const;
+	bool                                questHasCompletedQuest(uint32 questCrc) const;
+	bool                                questHasActiveQuestTask(uint32 questCrc, int taskId) const;
+	bool                                questHasCompletedQuestTask(uint32 questCrc, int taskId) const;
+	uint32                              questGetQuestStatus(uint32 const questCrc) const;
+	stdvector<int>::fwd                 questGetAllActiveQuestIds() const;
+	stdvector<int>::fwd                 questGetAllCompletedQuestIds() const;
+	bool                                questPlayerCanClaimRewardFor(uint32 questCrc);
+
+	uint32                              getCurrentQuest() const;
+	void                                setCurrentQuest(uint32 questCrc);
+	
+	virtual void                         virtualOnLogout();
+	virtual void                         getByteStreamFromAutoVariable(const std::string & name, Archive::ByteStream & target) const;
+	virtual void                         setAutoVariableFromByteStream(const std::string & name, const Archive::ByteStream & source);
+	
+	void                                setRoleIconChoice(int roleIconChoice);
+	int                                 getRoleIconChoice() const;
+	void setAggroImmuneDuration(int const duration);
+	bool isAggroImmune() const;
+
+	std::string const & getSkillTemplate() const;
+	bool setSkillTemplate(std::string const & templateName, bool clientRequest);
+
+	std::string const & getWorkingSkill() const;
+	bool setWorkingSkill(std::string const & skillName, bool clientRequest);
+
+	bool getIsFromLogin(void) const;
+	void setIsFromLogin(bool val); 
+
+	bool isNormalPlayer() const;
+	bool isCustomerServiceRepresentative() const;
+	bool isDeveloper() const;
+	bool isWarden() const;
+
+	void setPendingRequestQuestInformation(uint32 questCrc, NetworkId const & questGiver);
+	uint32 getPendingRequestQuestCrc() const;
+	NetworkId const & getPendingRequestQuestGiver() const;
+
+	int getNumberOfActiveQuests() const;
+	void setPlayerQuestDataComplete(uint32 questCrc, PlayerQuestData & playerQuestData);
+	void pickNewCurrentQuest();
+
+	int32 getCurrentGcwPoints() const;
+	int32 getCurrentGcwRating() const;
+	int32 getCurrentPvpKills() const;
+	int64 getLifetimeGcwPoints() const;
+	int32 getMaxGcwImperialRating() const;
+	int32 getMaxGcwRebelRating() const;
+	int32 getLifetimePvpKills() const;
+	int32 getNextGcwRatingCalcTime() const;
+	int getCurrentGcwRank() const;
+	float getCurrentGcwRankProgress() const;
+	int getMaxGcwImperialRank() const;
+	int getMaxGcwRebelRank() const;
+	int32 getGcwRatingActualCalcTime() const;
+	bool needsGcwRatingRecalculated() const;
+
+	void modifyCurrentGcwPoints(int count, bool modifyLifetimeValue);
+	void modifyCurrentGcwRating(int count, bool modifyMaxValue);
+	void modifyCurrentPvpKills(int count, bool modifyLifetimeValue);
+	void modifyLifetimeGcwPoints(int count);
+	void modifyMaxGcwImperialRating(int count);
+	void modifyMaxGcwRebelRating(int count);
+	void modifyLifetimePvpKills(int count);
+	void modifyNextGcwRatingCalcTime(int weekCount);
+	void setNextGcwRatingCalcTime(bool alwaysSendMessageToForRecalc);
+	void ctsUseOnlySetGcwInfo(int32 currentGcwPoints, int32 currentGcwRating, int32 currentPvpKills, int64 lifetimeGcwPoints, int32 maxGcwImperialRating, int32 maxGcwRebelRating, int32 lifetimePvpKills, int32 nextGcwRatingCalcTime);
+
+	void addToPlayerHateList(NetworkId const & id);
+	void removeFromPlayerHateList(NetworkId const & id);
+	void clearPlayerHateList();
+
+	uint32 getSessionActivity() const;
+	void clearSessionActivity();
+	void addSessionActivity(uint32 activity);
+	int32 getKillMeter() const;
+	void incrementKillMeter(int amount);
+	void updateKillMeter(float deltaTime);
+
+	NetworkId const &getPetId() const;
+	void setPetId(NetworkId const & newId);
+	void setPetCommandList(std::vector<std::string> const &commands);
+	void setPetToggledCommands(std::vector<std::string> const &commands);
+
+	bool modifyCollectionSlotValue(std::string const & slotName, int64 delta);
+
+	bool getCollectionSlotValue(std::string const & slotName, unsigned long & value) const;
+	bool getCollectionSlotValue(CollectionsDataTable::CollectionInfoSlot const & slotInfo, unsigned long & value) const;
+
+	bool hasCompletedCollectionSlotPrereq(std::string const & slotName, stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd * collectionInfo = NULL) const;
+	bool hasCompletedCollectionSlotPrereq(CollectionsDataTable::CollectionInfoSlot const & slotInfo, stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd * collectionInfo = NULL) const;
+
+	bool hasCompletedCollectionSlot(std::string const & slotName) const;
+	bool hasCompletedCollectionSlot(CollectionsDataTable::CollectionInfoSlot const & slotInfo) const;
+	static bool hasCompletedCollectionSlot(CollectionsDataTable::CollectionInfoSlot const & slotInfo, unsigned long slotValue);
+
+	bool hasCompletedCollection(std::string const & collectionName) const;
+
+	bool hasCompletedCollectionPage(std::string const & pageName) const;
+
+	bool hasCompletedCollectionBook(std::string const & bookName) const;
+
+	int getCompletedCollectionSlotCountInCollection(std::string const & collectionName, stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd * collectionInfo = NULL) const;
+
+	int getCompletedCollectionSlotCountInPage(std::string const & pageName, stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd * collectionInfo = NULL) const;
+	int getCompletedCollectionCountInPage(std::string const & pageName, stdvector<CollectionsDataTable::CollectionInfoCollection const *>::fwd * collectionInfo = NULL) const;
+
+	int getCompletedCollectionSlotCountInBook(std::string const & bookName, stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd * collectionInfo = NULL) const;
+	int getCompletedCollectionCountInBook(std::string const & bookName, stdvector<CollectionsDataTable::CollectionInfoCollection const *>::fwd * collectionInfo = NULL) const;
+	int getCompletedCollectionPageCountInBook(std::string const & bookName, stdvector<CollectionsDataTable::CollectionInfoPage const *>::fwd * collectionInfo = NULL) const;
+	int getCompletedCollectionBookCount(stdvector<CollectionsDataTable::CollectionInfoBook const *>::fwd * collectionInfo = NULL) const;
+
+	void migrateLegacyBadgesToCollection(stdvector<int>::fwd const & badges);
+
+	// chat spam info
+	int getChatSpamSpatialNumCharacters() const;
+	void updateChatSpamSpatialNumCharacters(NetworkId const & character, int spatialNumCharacters);
+
+	int getChatSpamNonSpatialNumCharacters() const;
+	void handleChatStatisticsFromChatServer(NetworkId const & character, int chatSpamTimeEndInterval, int spatialNumCharacters, int nonSpatialNumCharacters);
+
+	int getChatSpamTimeEndInterval() const;
+
+	time_t getChatSpamNextTimeToNotifyPlayerWhenLimited() const;
+	void setChatSpamNextTimeToNotifyPlayerWhenLimited(time_t chatSpamNextTimeToNotifyPlayerWhenLimited);
+
+	// citizenship info
+	void updateCitizenshipInfo();
+
+	// GCW Region info
+	void updateGcwRegionInfo();
+	std::string const & getCurrentGcwRegion() const;
+
+	void updateGcwDefenderRegionInfo();
+	std::pair<std::string, std::pair<bool, bool> > const & getCityGcwDefenderRegionInfo() const;
+	std::pair<std::string, std::pair<bool, bool> > const & getGuildGcwDefenderRegionInfo() const;
+
+	// squelch info
+	void squelch(NetworkId const & squelchedById, std::string const & squelchedByName, int squelchDurationSeconds);
+	void unsquelch();
+	NetworkId const & getSquelchedById() const;
+	int getSecondsUntilUnsquelched(); // returns 0 if not currently squelched; returns < 0 if indefinitely squelched
+
+	void modifyShowBackpack(bool b);
+	void modifyShowHelmet(bool b);
+
+	bool getShowBackpack() const;
+	bool getShowHelmet() const;
+
+	void setGuildRank(BitArray const & guildRank);
+	BitArray const & getGuildRank() const;
+
+	void setCitizenRank(BitArray const & citizenRank);
+	BitArray const & getCitizenRank() const;
+
+	EnvironmentInfo getEnvironmentFlags() const;
+	void overrideDefaultAttack(std::string const & attack);
+	std::string const & getDefaultAttackOverride() const;
+
+	void setEnvironmentFlags(EnvironmentInfo const & flags);
+
+	// getter/setter for variables to track the status of the
+	// /pickupAllRoomItemsIntoInventory and
+	// /dropAllInventoryItemsIntoRoom commands
+	int getPickupDropAllItemsOperationId() const;
+	void setPickupDropAllItemsOperationId(int pickupDropAllItemsOperationId);
+
+	NetworkId const & getPickupDropAllItemsCellId() const;
+	void setPickupDropAllItemsCellId(NetworkId const & pickupDropAllItemsCellId);
+
+	bool getPickupAllItemsAllowInventoryOverload() const;
+	void setPickupAllItemsAllowInventoryOverload(bool pickupAllItemsAllowInventoryOverload);
+
+	int getPickupDropAllItemsNumItemsSoFar() const;
+	void setPickupDropAllItemsNumItemsSoFar(int pickupDropAllItemsNumItemsSoFar);
+
+	std::set<NetworkId> & getPickupDropAllItemsProcessedItemsSoFar();
+
+	// getter/setter for variables to track the status of a restore decoration layout operation
+	int getRestoreDecorationOperationId() const;
+	void setRestoreDecorationOperationId(int restoreDecorationOperationId);
+
+	NetworkId const & getRestoreDecorationPobId() const;
+	void setRestoreDecorationPobId(NetworkId const & restoreDecorationPobId);
+
+	NetworkId const & getRestoreDecorationObjectBeingRestored() const;
+	void setRestoreDecorationObjectBeingRestored(NetworkId const & restoreDecorationObjectBeingRestored);
+
+	int getRestoreDecorationTotalCount() const;
+	void setRestoreDecorationTotalCount(int restoreDecorationTotalCount);
+
+	int getRestoreDecorationAttemptedCount() const;
+	void setRestoreDecorationAttemptedCount(int restoreDecorationAttemptedCount);
+
+	int getRestoreDecorationSuccessCount() const;
+	void setRestoreDecorationSuccessCount(int restoreDecorationSuccessCount);
+
+	std::list<std::pair<std::pair<CachedNetworkId, CachedNetworkId>, std::pair<Vector, Quaternion> > > & getRestoreDecorationLayoutList();
+
+	static bool canAccessGalacticReserve(real x, real z);
+	void depositToGalacticReserve(bool ignoreCooldownAndLocationCheck);
+	void withdrawFromGalacticReserve();
+	void depersistGalacticReserveDeposit();
+	int8 getGalacticReserveDeposit() const;
+
+protected:
+
+	virtual const SharedObjectTemplate * getDefaultSharedTemplate(void) const;
+	virtual void                         virtualOnSetAuthority();
+
+private:
+	int   getForcePowerRegen(float time);
+	void  onWaypointChanged(const Waypoint & newValue);
+	void  onWaypointCreated(const NetworkId &, const Waypoint &);
+	void  onWaypointSet(NetworkId const &, Waypoint const &, Waypoint const &);
+	void  onWaypointRemoved(NetworkId const &, const Waypoint &);
+
+	void  questCheckQuestLimits();
+
+	void  handleRecalculateGcwRating();
+	void  sendRecalculateGcwRatingMessageTo(int delay);
+
+private:
+	static const SharedObjectTemplate * m_defaultSharedTemplate;	// template to use if no shared template is given
+
+	MessageDispatch::Callback *  m_callback;
+
+	Archive::AutoDeltaVariable<StationId> m_stationId;
+
+	// ***DEPRECATED DO NOT USE*** 
+	// see CreatureObject::getHouse() and CreatureObject::setHouse() for replacement
+	Archive::AutoDeltaVariable<CachedNetworkId> m_houseId; ///< The player's domicile
+
+	Archive::AutoDeltaVariable<int> m_accountNumLots;   ///< Number of lots used by all the characters on this account (on this server cluster only)
+	Archive::AutoDeltaVariable<int> m_accountNumLotsOverLimitSpam; /// controls whether the player should be spammed for exceeding the lot limit
+	Archive::AutoDeltaVariable<int> m_accountMaxLotsAdjustment;   ///< Extra lots available to this account (or possibly penalty lots taken away)
+	Archive::AutoDeltaVariable<bool>  m_accountIsOutcast;  ///< Is this account outcast?
+	Archive::AutoDeltaVariable<float> m_accountCheaterLevel; ///< how suspected of cheating this person is, for use with movement validation
+
+	PlayerObject(const PlayerObject &);
+	PlayerObject & operator = ( const PlayerObject & );
+
+	// player abilities
+	Archive::AutoDeltaMap<std::pair<uint32, uint32>, int> m_draftSchematics;    // draft schematics the player may use
+	Archive::AutoDeltaMap<std::string, int>              m_experiencePoints;   // xp name->amount map
+	Archive::AutoDeltaVariable<int>                      m_expModified;        // just a flag that we increment any time the creature is granted new xp
+	Archive::AutoDeltaVariable<int>                      m_maxForcePower;      ///< Maximum force power the player can have
+	Archive::AutoDeltaVariable<int>                      m_forcePower;         ///< Current force power the player has
+	Archive::AutoDeltaVariable<float>                    m_forceRegenRate;     ///< Rate at which the force power regenerates (units/sec)
+	Archive::AutoDeltaVariable<float>                    m_forceRegenValue;    ///< Amount of force power that's regenerated
+
+	// crafting system data
+	Archive::AutoDeltaVariable<int>                  m_craftingLevel;           // crafting level of the current crafting session
+	Archive::AutoDeltaVariable<int>                  m_experimentPoints;        // experiment points available to the player
+	Archive::AutoDeltaVariable<int>                  m_craftingStage;           // what stage in the crafting process a player is in
+	Archive::AutoDeltaVariable<CachedNetworkId>      m_craftingTool;         // tool a player is crafting with
+	Archive::AutoDeltaVariable<CachedNetworkId>      m_craftingStation;         // station a player is crafting with
+	Archive::AutoDeltaVariable<NetworkId>            m_craftingComponentBioLink;// bio-link id of a component
+	stdvector<uint32>::fwd                           m_useableDraftSchematics;  // draft schematics a player may currently select from
+	ConstWatcher<DraftSchematicObject>               m_draftSchematic;          // draft schematic the player is crafting with
+	static bool                                      m_allowEmptySlot;          // flag to allow emptySlot() to be called when not in the crafting assembly stage.
+
+	Archive::AutoDeltaVariable<MatchMakingId> m_matchMakingPersonalProfileId;    // What the player defines their personality as 
+	Archive::AutoDeltaVariable<MatchMakingId> m_matchMakingCharacterProfileId;   // What the player defines their character as
+	
+	// these 2 lists ***MUST BE LOWERCASE AND MUST BE KEPT SORTED FOR QUICK LOOKUP***
+	Archive::AutoDeltaVector<std::string>                     m_friendList;
+	Archive::AutoDeltaVector<std::string>                     m_ignoreList;
+	
+	Archive::AutoDeltaVariable<std::string>                   m_skillTitle;
+	Archive::AutoDeltaVariable<int>                           m_spokenLanguage;
+	Archive::AutoDeltaMap<NetworkId, Waypoint, PlayerObject>  m_waypoints;
+	Archive::AutoDeltaMap<NetworkId, Waypoint, PlayerObject>  m_groupWaypoints;
+	Archive::AutoDeltaVariable<int>                           m_bornDate;
+	Archive::AutoDeltaVariable<uint32>                        m_playedTime;
+	float                                                     m_playedTimeAccum;
+
+	// information to track player's play time during this particular session
+	// this information is kept and tracked in the connection server, but is
+	// cached here for use by the game server
+	Archive::AutoDeltaVariable<int32>                         m_sessionStartPlayTime;          // time when the player started playing the character
+	Archive::AutoDeltaVariable<int32>                         m_sessionLastActiveTime;         // the client will detect when the player is "active" or "inactive"; this keeps track of the last time that the client said the player was "active"; if 0, it means the client is currently "inactive"
+	Archive::AutoDeltaVariable<unsigned long>                 m_sessionActivePlayTimeDuration; // total amount of play time player was active (i.e. at the mouse/keyboard/joystick)
+
+	Archive::AutoDeltaVariable<int>                           m_food;
+	Archive::AutoDeltaVariable<int>                           m_maxFood;
+	Archive::AutoDeltaVariable<int>                           m_drink;
+	Archive::AutoDeltaVariable<int>                           m_maxDrink;
+	Archive::AutoDeltaVariable<int>                           m_meds;
+	Archive::AutoDeltaVariable<int>                           m_maxMeds;
+
+	Archive::AutoDeltaVariable<int8>                          m_privledgedTitle;
+	Archive::AutoDeltaVariable<BitArray>                      m_completedQuests;
+	Archive::AutoDeltaVariable<BitArray>                      m_activeQuests;
+	Archive::AutoDeltaVariable<uint32>                        m_currentQuest;
+
+	Archive::AutoDeltaPackedMap<uint32, PlayerQuestData>      m_quests;
+	
+	Archive::AutoDeltaVariable<std::string>                   m_theaterDatatable;
+	Archive::AutoDeltaVariable<Vector>                        m_theaterPosition;
+	Archive::AutoDeltaVariable<std::string>                   m_theaterScene;
+	Archive::AutoDeltaVariable<std::string>                   m_theaterScript;
+	Archive::AutoDeltaVariable<int>                           m_theaterNumObjects;
+	Archive::AutoDeltaVariable<float>                         m_theaterRadius;
+	Archive::AutoDeltaVariable<NetworkId>                     m_theaterCreator;
+	Archive::AutoDeltaVariable<std::string>                   m_theaterName;
+	Archive::AutoDeltaVariable<NetworkId>                     m_theaterId;
+	Archive::AutoDeltaVariable<int>                           m_theaterLocationType;
+	Archive::AutoDeltaVariable<int>                           m_roleIconChoice;
+	Archive::AutoDeltaVariable<time_t> m_aggroImmuneDuration;
+	Archive::AutoDeltaVariable<time_t> m_aggroImmuneStartTime;
+
+	ChatLog * const m_chatLog;
+	time_t m_chatLogPurgeTime;
+	bool m_isUnsticking;
+
+	//when asking a player to accept or complete a quest, remember the quest that we asked them about
+
+	//TODO sync to other servers as necessary?
+	uint32 m_pendingRequestQuestCrc;
+	NetworkId m_pendingRequestQuestGiver;
+
+	Archive::AutoDeltaVariable<std::string> m_skillTemplate;
+	Archive::AutoDeltaVariable<std::string> m_workingSkill;
+	Archive::AutoDeltaVariable<bool>                          m_isFromLogin;   ///< This defaults to true, and is set to false in CreatureObject::virtualOnSetClient, (used to distinguish when coming from login as opposed to from a scene warp)
+
+	Archive::AutoDeltaVariable<int32>                         m_currentGcwPoints;
+	Archive::AutoDeltaVariable<int32>                         m_currentGcwRating;
+	Archive::AutoDeltaVariable<int32>                         m_currentPvpKills;
+	Archive::AutoDeltaVariable<int64>                         m_lifetimeGcwPoints;
+	Archive::AutoDeltaVariable<int32>                         m_maxGcwImperialRating;
+	Archive::AutoDeltaVariable<int32>                         m_maxGcwRebelRating;
+	Archive::AutoDeltaVariable<int32>                         m_lifetimePvpKills;
+	Archive::AutoDeltaVariable<int32>                         m_nextGcwRatingCalcTime;
+	Archive::AutoDeltaVariable<int>                           m_currentGcwRank;
+	Archive::AutoDeltaVariable<float>                         m_currentGcwRankProgress;
+	Archive::AutoDeltaVariable<int>                           m_maxGcwImperialRank;
+	Archive::AutoDeltaVariable<int>                           m_maxGcwRebelRank;
+
+	// the Epoch when the next messageTo to cause GCW rating recalculation will occur
+	Archive::AutoDeltaVariable<int32>                         m_gcwRatingActualCalcTime;
+
+	// copy of the player's hate list sent to the authoritative client
+	Archive::AutoDeltaSet<NetworkId>                          m_playerHateList;
+
+	// activity that the player has done during this session
+	Archive::AutoDeltaVariable<uint32>                        m_sessionActivity;
+	// these two variables represent the commando kill meter
+	Archive::AutoDeltaVariable<int32>                         m_killMeter;
+	// this variable stores the fractional state of the meter but is not persisted nor synchronized across servers.
+	float                                                     m_killMeterRemainder;
+
+	Archive::AutoDeltaVariable<NetworkId>					  m_petId;
+	Archive::AutoDeltaVector<std::string>                     m_petCommandList;
+	Archive::AutoDeltaVector<std::string>                     m_petToggledCommands;  // These are the commands on the
+																					 // pet toolbar that should display
+																					 // visually as being toggled on
+
+	// both m_collections and m_collections2 form a "contiguous" collections bit array
+	// we only break them up into multiple members because of DB storage restrictions
+	Archive::AutoDeltaVariable<BitArray>                      m_collections;
+	Archive::AutoDeltaVariable<BitArray>                      m_collections2;
+	Archive::AutoDeltaVariable<BitArray> *                    m_allCollections[2];
+
+	// chat spam info
+	Archive::AutoDeltaVariable<int>                           m_chatSpamSpatialNumCharacters;
+	Archive::AutoDeltaVariable<int>                           m_chatSpamNonSpatialNumCharacters;
+	Archive::AutoDeltaVariable<int>                           m_chatSpamTimeEndInterval;
+	Archive::AutoDeltaVariable<int>                           m_chatSpamNextTimeToSyncWithChatServer;
+	time_t                                                    m_chatSpamNextTimeToNotifyPlayerWhenLimited;
+
+	// citizenship info
+	Archive::AutoDeltaVariable<std::string>                   m_citizenshipCity;
+	Archive::AutoDeltaVariable<int8>                          m_citizenshipType; // CityDataCitizenType
+
+	// GCW Region info
+	Archive::AutoDeltaVariable<std::string>                   m_currentGcwRegion;
+	// std::pair<region, std::pair<qualify for region bonus, qualify to use region defender title> >
+	Archive::AutoDeltaVariable<std::pair<std::string, std::pair<bool, bool> > > m_cityGcwDefenderRegion;
+	Archive::AutoDeltaVariable<std::pair<std::string, std::pair<bool, bool> > > m_guildGcwDefenderRegion;
+
+	// squelch info
+	Archive::AutoDeltaVariable<NetworkId>                     m_squelchedById;   // id of the toon who squelched this toon; is NetworkId::cms_invalid if this toon is not squelched
+	Archive::AutoDeltaVariable<std::string>                   m_squelchedByName; // name of the toon who squelched this toon
+	Archive::AutoDeltaVariable<int32>                         m_squelchExpireTime; // the Epoch time when the toon will be unsquelched; is < 0 for indefinite squelch
+
+	Archive::AutoDeltaVariable<bool>						  m_showBackpack;
+	Archive::AutoDeltaVariable<bool>						  m_showHelmet;
+
+	Archive::AutoDeltaVariable<EnvironmentInfo>               m_environmentFlags; // Force Day, Night, whatever else.
+	// Default attack override
+	Archive::AutoDeltaVariable<std::string>                   m_defaultAttackOverride; // This string will override the user's default attack
+
+	Archive::AutoDeltaVariable<BitArray>                      m_guildRank;
+	Archive::AutoDeltaVariable<BitArray>                      m_citizenRank;
+
+	// for use to track the status of the /pickupAllRoomItemsIntoInventory
+	// and /dropAllInventoryItemsIntoRoom commands, which occurs over a
+	// period of time; these are not proxied, as the only way the cell/structure
+	// in which the player is standing when the command is executed can
+	// change authority is during a game server crash recovery scenario
+	// (or a warp in the case of a POB ship), in which case we'll just cancel
+	// the currently executing /pickupAllRoomItemsIntoInventory
+	// or /dropAllInventoryItemsIntoRoom command, and the player do it again
+	int m_pickupDropAllItemsOperationId;
+	NetworkId m_pickupDropAllItemsCellId;
+	bool m_pickupAllItemsAllowInventoryOverload;
+	int m_pickupDropAllItemsNumItemsSoFar;
+	std::set<NetworkId> m_pickupDropAllItemsProcessedItemsSoFar;
+
+	// for use to track the status of a restore decoration layout operation,
+	// which occurs over a period of time; these are not proxied, as the only
+	// way the structure in which the player is standing when the command
+	// is executed can change authority is during a game server crash recovery
+	// scenario (or a warp in the case of a POB ship), in which case we'll just
+	// cancel the currently executing operation, and the player can do it again
+	int m_restoreDecorationOperationId;
+	NetworkId m_restoreDecorationPobId;
+	NetworkId m_restoreDecorationObjectBeingRestored;
+	int m_restoreDecorationTotalCount;
+	int m_restoreDecorationAttemptedCount;
+	int m_restoreDecorationSuccessCount;
+	std::list<std::pair<std::pair<CachedNetworkId, CachedNetworkId>, std::pair<Vector, Quaternion> > > m_restoreDecorationLayoutList;
+
+	Archive::AutoDeltaVariable<int8> m_galacticReserveDeposit;
+
+	Archive::AutoDeltaVariable<int64> m_pgcRatingCount;
+	Archive::AutoDeltaVariable<int64> m_pgcRatingTotal;
+	Archive::AutoDeltaVariable<int> m_pgcLastRatingTime;
+};
+
+// ======================================================================
+
+inline StationId PlayerObject::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline float PlayerObject::getCheaterLevel() const
+{
+	return m_accountCheaterLevel.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int PlayerObject::getBornDate() const
+{
+	return m_bornDate.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int32 PlayerObject::getSessionStartPlayTime() const
+{
+	return m_sessionStartPlayTime.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int32 PlayerObject::getSessionLastActiveTime() const
+{
+	return m_sessionLastActiveTime.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const stdmap<std::pair<uint32, uint32>,int>::fwd & PlayerObject::getDraftSchematics () const
+{
+	return m_draftSchematics.getMap();
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::clearSchematics()
+{
+	m_draftSchematics.clear();
+}
+
+// ----------------------------------------------------------------------
+
+inline const CachedNetworkId & PlayerObject::getCraftingTool() const
+{
+	return m_craftingTool.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const CachedNetworkId & PlayerObject::getCraftingStation() const
+{
+	return m_craftingStation.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const DraftSchematicObject * PlayerObject::getCurrentDraftSchematic () const
+{
+	return m_draftSchematic.getPointer();
+}
+
+// ----------------------------------------------------------------------
+
+inline enum Crafting::CraftingStage PlayerObject::getCraftingStage () const
+{
+	return static_cast<enum Crafting::CraftingStage>(m_craftingStage.get());
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::setCraftingLevel(int level)
+{
+	m_craftingLevel = level;
+}
+
+// ----------------------------------------------------------------------
+
+inline int PlayerObject::getCraftingLevel() const
+{
+	return m_craftingLevel.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool PlayerObject::isCrafting(void) const
+{
+	return getCraftingStage() != Crafting::CS_none;
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::setAllowEmptySlot(bool allow)
+{
+	m_allowEmptySlot = allow;	
+}
+
+// ----------------------------------------------------------------------
+
+inline int PlayerObject::getAccountNumLots() const
+{
+	return m_accountNumLots.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int PlayerObject::getMaxForcePower(void) const
+{
+	return m_maxForcePower.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int PlayerObject::getForcePower(void) const
+{
+	return m_forcePower.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline float PlayerObject::getForcePowerRegenRate() const
+{
+	return m_forceRegenRate.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & PlayerObject::getTheater() const
+{
+	return m_theaterId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool PlayerObject::getIsFromLogin(void) const
+{
+	return m_isFromLogin.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::setIsFromLogin(bool val) 
+{
+	m_isFromLogin = val;
+}
+
+//----------------------------------------------------------------------
+
+inline bool PlayerObject::isNormalPlayer() const
+{
+	return m_privledgedTitle.get() == static_cast<int8>(PlayerDataPriviledgedTitle::NormalPlayer);
+}
+
+//----------------------------------------------------------------------
+
+inline bool PlayerObject::isCustomerServiceRepresentative() const
+{
+	return m_privledgedTitle.get() == static_cast<int8>(PlayerDataPriviledgedTitle::CustomerServiceRepresentative);
+}
+
+//----------------------------------------------------------------------
+
+inline bool PlayerObject::isDeveloper() const
+{
+	return m_privledgedTitle.get() == static_cast<int8>(PlayerDataPriviledgedTitle::Developer);
+}
+
+//----------------------------------------------------------------------
+
+inline bool PlayerObject::isWarden() const
+{
+	return m_privledgedTitle.get() == static_cast<int8>(PlayerDataPriviledgedTitle::Warden);
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 PlayerObject::getCurrentQuest() const
+{
+	return m_currentQuest.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::setCurrentQuest(uint32 questCrc)
+{
+	m_currentQuest = questCrc;
+}
+
+// ----------------------------------------------------------------------
+
+inline int32 PlayerObject::getCurrentGcwPoints() const
+{
+	return m_currentGcwPoints.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int32 PlayerObject::getKillMeter() const
+{
+	return m_killMeter.get();
+}
+
+inline NetworkId const & PlayerObject::getPetId() const
+{
+	return m_petId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int32 PlayerObject::getCurrentGcwRating() const
+{
+	return m_currentGcwRating.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int32 PlayerObject::getCurrentPvpKills() const
+{
+	return m_currentPvpKills.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int64 PlayerObject::getLifetimeGcwPoints() const
+{
+	return m_lifetimeGcwPoints.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int32 PlayerObject::getMaxGcwImperialRating() const
+{
+	return m_maxGcwImperialRating.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int32 PlayerObject::getMaxGcwRebelRating() const
+{
+	return m_maxGcwRebelRating.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int32 PlayerObject::getLifetimePvpKills() const
+{
+	return m_lifetimePvpKills.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int32 PlayerObject::getNextGcwRatingCalcTime() const
+{
+	return m_nextGcwRatingCalcTime.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int PlayerObject::getCurrentGcwRank() const
+{
+	return m_currentGcwRank.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline float PlayerObject::getCurrentGcwRankProgress() const
+{
+	return m_currentGcwRankProgress.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int PlayerObject::getMaxGcwImperialRank() const
+{
+	return m_maxGcwImperialRank.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int PlayerObject::getMaxGcwRebelRank() const
+{
+	return m_maxGcwRebelRank.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int32 PlayerObject::getGcwRatingActualCalcTime() const
+{
+	return m_gcwRatingActualCalcTime.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::addToPlayerHateList(NetworkId const & id)
+{
+	m_playerHateList.insert(id);
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::removeFromPlayerHateList(NetworkId const & id)
+{
+	m_playerHateList.erase(id);
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::clearPlayerHateList()
+{
+	m_playerHateList.clear();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 PlayerObject::getSessionActivity() const
+{
+	return m_sessionActivity.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int PlayerObject::getChatSpamSpatialNumCharacters() const
+{
+	return m_chatSpamSpatialNumCharacters.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int PlayerObject::getChatSpamNonSpatialNumCharacters() const
+{
+	return m_chatSpamNonSpatialNumCharacters.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int PlayerObject::getChatSpamTimeEndInterval() const
+{
+	return m_chatSpamTimeEndInterval.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline time_t PlayerObject::getChatSpamNextTimeToNotifyPlayerWhenLimited() const
+{
+	return m_chatSpamNextTimeToNotifyPlayerWhenLimited;
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::setChatSpamNextTimeToNotifyPlayerWhenLimited(time_t chatSpamNextTimeToNotifyPlayerWhenLimited)
+{
+	m_chatSpamNextTimeToNotifyPlayerWhenLimited = chatSpamNextTimeToNotifyPlayerWhenLimited;
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & PlayerObject::getSquelchedById() const
+{
+	return m_squelchedById.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool PlayerObject::getShowHelmet() const
+{
+	return m_showHelmet.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool PlayerObject::getShowBackpack() const
+{
+	return m_showBackpack.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline PlayerObject::StringVector const & PlayerObject::getSortedLowercaseFriendList() const
+{
+	return m_friendList.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline PlayerObject::StringVector const & PlayerObject::getSortedLowercaseIgnoreList() const
+{
+	return m_ignoreList.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline EnvironmentInfo PlayerObject::getEnvironmentFlags() const
+{
+	return m_environmentFlags.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::overrideDefaultAttack(std::string const & attack)
+{
+	m_defaultAttackOverride = attack;
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const & PlayerObject::getDefaultAttackOverride() const
+{
+	return m_defaultAttackOverride.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::setGuildRank(BitArray const & guildRank)
+{
+	m_guildRank.set(guildRank);
+}
+
+// ----------------------------------------------------------------------
+
+inline BitArray const & PlayerObject::getGuildRank() const
+{
+	return m_guildRank.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::setCitizenRank(BitArray const & citizenRank)
+{
+	m_citizenRank.set(citizenRank);
+}
+
+// ----------------------------------------------------------------------
+
+inline BitArray const & PlayerObject::getCitizenRank() const
+{
+	return m_citizenRank.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int PlayerObject::getPickupDropAllItemsOperationId() const
+{
+	return m_pickupDropAllItemsOperationId;
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::setPickupDropAllItemsOperationId(int pickupDropAllItemsOperationId)
+{
+	m_pickupDropAllItemsOperationId = pickupDropAllItemsOperationId;
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & PlayerObject::getPickupDropAllItemsCellId() const
+{
+	return m_pickupDropAllItemsCellId;
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::setPickupDropAllItemsCellId(NetworkId const & pickupDropAllItemsCellId)
+{
+	m_pickupDropAllItemsCellId = pickupDropAllItemsCellId;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool PlayerObject::getPickupAllItemsAllowInventoryOverload() const
+{
+	return m_pickupAllItemsAllowInventoryOverload;
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::setPickupAllItemsAllowInventoryOverload(bool pickupAllItemsAllowInventoryOverload)
+{
+	m_pickupAllItemsAllowInventoryOverload = pickupAllItemsAllowInventoryOverload;
+}
+
+// ----------------------------------------------------------------------
+
+inline int PlayerObject::getPickupDropAllItemsNumItemsSoFar() const
+{
+	return m_pickupDropAllItemsNumItemsSoFar;
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::setPickupDropAllItemsNumItemsSoFar(int pickupDropAllItemsNumItemsSoFar)
+{
+	m_pickupDropAllItemsNumItemsSoFar = pickupDropAllItemsNumItemsSoFar;
+}
+
+// ----------------------------------------------------------------------
+
+inline std::set<NetworkId> & PlayerObject::getPickupDropAllItemsProcessedItemsSoFar()
+{
+	return m_pickupDropAllItemsProcessedItemsSoFar;
+}
+
+// ----------------------------------------------------------------------
+
+inline int PlayerObject::getRestoreDecorationOperationId() const
+{
+	return m_restoreDecorationOperationId;
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::setRestoreDecorationOperationId(int restoreDecorationOperationId)
+{
+	m_restoreDecorationOperationId = restoreDecorationOperationId;
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & PlayerObject::getRestoreDecorationPobId() const
+{
+	return m_restoreDecorationPobId;
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::setRestoreDecorationPobId(NetworkId const & restoreDecorationPobId)
+{
+	m_restoreDecorationPobId = restoreDecorationPobId;
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & PlayerObject::getRestoreDecorationObjectBeingRestored() const
+{
+	return m_restoreDecorationObjectBeingRestored;
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::setRestoreDecorationObjectBeingRestored(NetworkId const & restoreDecorationObjectBeingRestored)
+{
+	m_restoreDecorationObjectBeingRestored = restoreDecorationObjectBeingRestored;
+}
+
+// ----------------------------------------------------------------------
+
+inline int PlayerObject::getRestoreDecorationTotalCount() const
+{
+	return m_restoreDecorationTotalCount;
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::setRestoreDecorationTotalCount(int restoreDecorationTotalCount)
+{
+	m_restoreDecorationTotalCount = restoreDecorationTotalCount;
+}
+
+// ----------------------------------------------------------------------
+
+inline int PlayerObject::getRestoreDecorationAttemptedCount() const
+{
+	return m_restoreDecorationAttemptedCount;
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::setRestoreDecorationAttemptedCount(int restoreDecorationAttemptedCount)
+{
+	m_restoreDecorationAttemptedCount = restoreDecorationAttemptedCount;
+}
+
+// ----------------------------------------------------------------------
+
+inline int PlayerObject::getRestoreDecorationSuccessCount() const
+{
+	return m_restoreDecorationSuccessCount;
+}
+
+// ----------------------------------------------------------------------
+
+inline void PlayerObject::setRestoreDecorationSuccessCount(int restoreDecorationSuccessCount)
+{
+	m_restoreDecorationSuccessCount = restoreDecorationSuccessCount;
+}
+
+// ----------------------------------------------------------------------
+
+inline std::list<std::pair<std::pair<CachedNetworkId, CachedNetworkId>, std::pair<Vector, Quaternion> > > & PlayerObject::getRestoreDecorationLayoutList()
+{
+	return m_restoreDecorationLayoutList;
+}
+
+// ----------------------------------------------------------------------
+
+inline int8 PlayerObject::getGalacticReserveDeposit() const
+{
+	return m_galacticReserveDeposit.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const & PlayerObject::getCurrentGcwRegion() const
+{
+	return m_currentGcwRegion.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::pair<std::string, std::pair<bool, bool> > const & PlayerObject::getCityGcwDefenderRegionInfo() const
+{
+	return m_cityGcwDefenderRegion.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::pair<std::string, std::pair<bool, bool> > const & PlayerObject::getGuildGcwDefenderRegionInfo() const
+{
+	return m_guildGcwDefenderRegion.get();
+}
+
+// ======================================================================
+
+#endif	// _PLAYER_OBJECT_H
diff --git a/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp b/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp
new file mode 100644
index 00000000..edf50d8d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp
@@ -0,0 +1,685 @@
+// PlayerQuestObject.cpp
+// Copyright 2009, Sony Online Entertainment Inc., all rights reserved.
+// Author: Matt Boudreaux
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PlayerQuestObject.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/ObjectIdManager.h"
+#include "serverGame/ObjectTracker.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/ServerPlayerQuestObjectTemplate.h"
+#include "serverGame/ServerObjectTemplate.h"
+#include "serverGame/ServerWorld.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptDictionary.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+
+//-----------------------------------------------------------------------
+
+const SharedObjectTemplate * PlayerQuestObject::m_defaultSharedTemplate = NULL;
+
+namespace PlayerQuestObjectNamespace
+{
+	const char * const s_playerQuestObjectTemplateName = "object/player_quest/base_player_quest_object.iff";
+	const char * const s_tasksObjVar = "pgc.tasks";
+	const char * const s_numTasksObjVar = "pgc.numTasks";
+	const char * const s_taskCounterObjVar = "pgc.taskCounters";
+	const char * const s_taskMaxCounterObjVar = "pgc.taskMaxCounters";
+	const char * const s_taskStatusObjVar = "pgc.taskStatus";
+	const char * const s_waypointsObjVar = "pgc.waypoints";
+	const char * const s_recipeObjVar = "pgc.recipe";
+	const char * const s_rewardObjVar = "pgc.rewards";
+
+	const int s_taskCompleted = 2;
+}
+
+using namespace PlayerQuestObjectNamespace;
+//-----------------------------------------------------------------------
+
+PlayerQuestObject::PlayerQuestObject(const ServerPlayerQuestObjectTemplate * t) :
+TangibleObject(t),
+m_tasks(),
+m_taskCounters(),
+m_taskStatus(),
+m_waypoints(),
+m_rewards(),
+m_creatorName(),
+m_completed(),
+m_recipe(false),
+m_title(),
+m_description(),
+m_creator(),
+m_totalTasks(),
+m_difficulty(),
+m_taskTitle1(),
+m_taskDescription1(),
+m_taskTitle2(),
+m_taskDescription2(),
+m_taskTitle3(),
+m_taskDescription3(),
+m_taskTitle4(),
+m_taskDescription4(),
+m_taskTitle5(),
+m_taskDescription5(),
+m_taskTitle6(),
+m_taskDescription6(),
+m_taskTitle7(),
+m_taskDescription7(),
+m_taskTitle8(),
+m_taskDescription8(),
+m_taskTitle9(),
+m_taskDescription9(),
+m_taskTitle10(),
+m_taskDescription10(),
+m_taskTitle11(),
+m_taskDescription11(),
+m_taskTitle12(),
+m_taskDescription12(),
+m_taskTitles(),
+m_taskDescriptions()
+{
+	addMembersToPackages();
+	ObjectTracker::addPlayerQuestObject();
+
+	m_taskTitles.push_back(&m_taskTitle1);
+	m_taskTitles.push_back(&m_taskTitle2);
+	m_taskTitles.push_back(&m_taskTitle3);
+	m_taskTitles.push_back(&m_taskTitle4);
+	m_taskTitles.push_back(&m_taskTitle5);
+	m_taskTitles.push_back(&m_taskTitle6);
+	m_taskTitles.push_back(&m_taskTitle7);
+	m_taskTitles.push_back(&m_taskTitle8);
+	m_taskTitles.push_back(&m_taskTitle9);
+	m_taskTitles.push_back(&m_taskTitle10);
+	m_taskTitles.push_back(&m_taskTitle11);
+	m_taskTitles.push_back(&m_taskTitle12);
+
+	m_taskDescriptions.push_back(&m_taskDescription1);
+	m_taskDescriptions.push_back(&m_taskDescription2);
+	m_taskDescriptions.push_back(&m_taskDescription3);
+	m_taskDescriptions.push_back(&m_taskDescription4);
+	m_taskDescriptions.push_back(&m_taskDescription5);
+	m_taskDescriptions.push_back(&m_taskDescription6);
+	m_taskDescriptions.push_back(&m_taskDescription7);
+	m_taskDescriptions.push_back(&m_taskDescription8);
+	m_taskDescriptions.push_back(&m_taskDescription9);
+	m_taskDescriptions.push_back(&m_taskDescription10);
+	m_taskDescriptions.push_back(&m_taskDescription11);
+	m_taskDescriptions.push_back(&m_taskDescription12);
+
+
+}
+
+//-----------------------------------------------------------------------
+
+PlayerQuestObject::~PlayerQuestObject()
+{
+	ObjectTracker::removePlayerQuestObject();
+}
+
+//-----------------------------------------------------------------------
+
+bool PlayerQuestObject::canTrade() const
+{
+	return ServerObject::canTrade();
+}
+
+//-----------------------------------------------------------------------
+
+PlayerQuestObject * PlayerQuestObject::asPlayerQuestObject()
+{
+	return this;
+}
+
+//-----------------------------------------------------------------------
+
+PlayerQuestObject const * PlayerQuestObject::asPlayerQuestObject() const
+{
+	return this;
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::removeDefaultTemplate()
+{
+	if(m_defaultSharedTemplate)
+	{
+		m_defaultSharedTemplate->releaseReference();
+		m_defaultSharedTemplate = NULL;
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::endBaselines()
+{
+	ServerObject::endBaselines();
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+{
+	TangibleObject::getAttributes(data);
+
+	// Push on any extra data here.
+}
+
+//-----------------------------------------------------------------------
+
+bool PlayerQuestObject::onContainerAboutToLoseItem(ServerObject * destination, ServerObject& item, ServerObject* transferer)
+{
+	return ServerObject::onContainerAboutToLoseItem(destination, item, transferer);
+}
+
+//-----------------------------------------------------------------------
+
+bool PlayerQuestObject::onContainerAboutToTransfer(ServerObject * destination, ServerObject* transferer)
+{
+	return ServerObject::onContainerAboutToTransfer(destination, transferer);
+}
+
+//-----------------------------------------------------------------------
+
+int PlayerQuestObject::onContainerAboutToGainItem(ServerObject& item, ServerObject* transferer)
+{
+	return ServerObject::onContainerAboutToGainItem(item, transferer);
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::onAddedToWorld()
+{
+	TangibleObject::onAddedToWorld();
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::initializeFirstTimeObject()
+{
+	TangibleObject::initializeFirstTimeObject();
+	saveDataToObjVars();
+}
+
+//-----------------------------------------------------------------------
+
+SharedObjectTemplate const * PlayerQuestObject::getDefaultSharedTemplate() const
+{
+	return m_defaultSharedTemplate;
+}
+
+//-----------------------------------------------------------------------
+
+PlayerQuestObject * PlayerQuestObject::createPlayerQuestObjectInCreatureDatapad(CreatureObject * creatureWithDatapad)
+{
+	PlayerQuestObject * result = 0;
+	ServerObject * dataPad = creatureWithDatapad->getDatapad();
+	if(dataPad)
+		result = safe_cast<PlayerQuestObject *>(ServerWorld::createNewObject(s_playerQuestObjectTemplateName, *dataPad, false));
+
+	return result;
+}
+
+
+//-----------------------------------------------------------------------
+
+PlayerQuestObject * PlayerQuestObject::createPlayerQuestObjectInCreatureInventory(CreatureObject * creatureWithInventory)
+{
+	PlayerQuestObject * result = 0;
+	ServerObject * inventory = creatureWithInventory->getInventory();
+	if(inventory)
+		result = safe_cast<PlayerQuestObject *>(ServerWorld::createNewObject(s_playerQuestObjectTemplateName, *inventory, false));
+
+	return result;
+}
+
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::getTasks( std::vector<Unicode::String> &taskVector)
+{
+	taskVector.clear();
+	for(std::vector<Unicode::String>::size_type i = 0; i < m_tasks.get().size(); ++i)
+		taskVector.push_back(m_tasks.get()[i]);
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::getTaskStatus(std::vector<int> &taskStatus)
+{
+	taskStatus.clear();
+	for(std::vector<int>::size_type i = 0; i < m_taskStatus.get().size(); ++i)
+		taskStatus.push_back(m_taskStatus.get()[i]);
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::getTaskCounters(std::vector<int> & counterVector)
+{
+	counterVector.clear();
+	for(std::vector<int>::size_type i = 0; i < m_taskCounters.get().size(); ++i)
+		counterVector.push_back(m_taskCounters.get()[i].first);
+
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::addNewTask(std::string title, std::string description, int counterMax, std::string waypoint)
+{
+
+	m_taskStatus.push_back(0);
+	m_taskCounters.push_back(std::make_pair<int,int>(0, counterMax));
+
+	m_waypoints.push_back(waypoint);
+
+	m_totalTasks = m_totalTasks.get() + 1;
+
+	setTaskTitle(m_totalTasks.get() - 1, title);
+	setTaskDescription(m_totalTasks.get() - 1, description);
+
+	saveDataToObjVars();
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::readInObjVarData()
+{
+	// Total Tasks
+	int numTasks = 0;
+	if(getObjVars().getItem(s_numTasksObjVar, numTasks))
+		m_totalTasks = numTasks;
+
+	// Task Information
+	std::vector<Unicode::String> tasks;
+	if(getObjVars().getItem(s_tasksObjVar, tasks))
+	{
+		for(std::vector<Unicode::String>::size_type i = 0; i < tasks.size(); ++i)
+			m_tasks.push_back(tasks[i]);
+	}
+
+	// Task Counters
+	std::vector<int> counters;
+	if(getObjVars().getItem(s_taskCounterObjVar, counters))
+	{
+		std::vector<int> maxValues;
+		if(getObjVars().getItem(s_taskMaxCounterObjVar, maxValues))
+			for(std::vector<int>::size_type i = 0; i < counters.size(); ++i)
+				m_taskCounters.push_back(std::make_pair<int,int>(counters[i], maxValues[i]));
+	}
+
+	// Task Status
+	std::vector<int> status;
+	if(getObjVars().getItem(s_taskStatusObjVar, status))
+	{
+		for(std::vector<int>::size_type i = 0; i < status.size(); ++i)
+			m_taskStatus.push_back(status[i]);
+	}
+
+	// Waypoints.
+	std::vector<Unicode::String> waypoints;
+	if(getObjVars().getItem(s_waypointsObjVar, waypoints))
+	{
+		for(std::vector<Unicode::String>::size_type i = 0; i < waypoints.size(); ++i)
+			m_waypoints.push_back(Unicode::wideToNarrow(waypoints[i]));
+	}
+
+	// Recipe info
+	int recipe;
+	if(getObjVars().getItem(s_recipeObjVar, recipe))
+	{
+		m_recipe = (recipe == 1 ? true: false);
+	}
+
+	if(m_creator.get() != NetworkId::cms_invalid)
+	{
+		m_creatorName = NameManager::getInstance().getPlayerFullName(m_creator.get());
+	}
+
+	// Rewards
+	std::string rewards;
+	if(getObjVars().getItem(s_rewardObjVar, rewards))
+	{
+		m_rewards = rewards;
+	}
+
+	checkForCompleted();
+
+	fixObjVarDelimiter();
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::saveDataToObjVars()
+{
+	setObjVarItem(s_tasksObjVar, m_tasks.get());
+	setObjVarItem(s_numTasksObjVar, m_totalTasks.get());
+	setObjVarItem(s_taskStatusObjVar, m_taskStatus.get());
+
+	// Save counter obj vars.
+	std::vector<int> currentValues;
+	std::vector<int> maxValues;
+	std::vector< std::pair<int,int> >::const_iterator iter = m_taskCounters.begin();
+	for(; iter != m_taskCounters.end(); ++iter)
+	{
+		currentValues.push_back((*iter).first);
+		maxValues.push_back((*iter).second);
+	}
+
+	setObjVarItem(s_taskCounterObjVar, currentValues);
+	setObjVarItem(s_taskMaxCounterObjVar, maxValues);
+
+	//Waypoints
+	std::vector<Unicode::String> convertedWaypoints;
+	for(std::vector<std::string>::size_type i = 0; i < m_waypoints.size(); ++i)
+	{
+		convertedWaypoints.push_back(Unicode::narrowToWide(m_waypoints.get()[i]));
+	}
+
+	setObjVarItem(s_waypointsObjVar, convertedWaypoints);
+
+	setObjVarItem(s_recipeObjVar, m_recipe.get() ? 1 : 0);
+
+	setObjVarItem(s_rewardObjVar, m_rewards.get());
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::onLoadedFromDatabase()
+{
+	readInObjVarData();
+}
+
+//-----------------------------------------------------------------------
+
+int PlayerQuestObject::getTaskStatus(int taskIndex)
+{
+	if(taskIndex < 0 || static_cast<unsigned int>(taskIndex) > m_taskStatus.size())
+		return -1;
+
+	return m_taskStatus.get()[taskIndex];
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::setTaskStatus(int taskIndex, int status)
+{
+	if(taskIndex < 0 || static_cast<unsigned int>(taskIndex) > m_taskStatus.size())
+		return;
+
+	m_taskStatus.set(taskIndex, status);
+
+	saveDataToObjVars();
+
+	checkForCompleted();
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::setTaskTitle(int index, std::string title)
+{
+	if(index < 0 || index >= m_totalTasks.get())
+		return;
+
+	*(m_taskTitles[index]) = title;
+}
+
+//-----------------------------------------------------------------------
+
+std::string const & PlayerQuestObject::getTaskTitle(int index)
+{
+	return m_taskTitles[index]->get();
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::setTaskDescription(int index, std::string description)
+{
+	if(index < 0 || index >= m_totalTasks.get())
+		return;
+
+	*(m_taskDescriptions[index]) = description;
+}
+
+//-----------------------------------------------------------------------
+
+std::string const & PlayerQuestObject::getTaskDescription(int index)
+{
+	return m_taskDescriptions[index]->get();
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::setTaskCounter(int index, int value)
+{
+	int maxValue = m_taskCounters.get()[index].second;
+	m_taskCounters.set(static_cast<unsigned int>(index), std::make_pair<int, int>(value, maxValue));
+
+	saveDataToObjVars();
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::checkForCompleted()
+{
+	std::vector<int>::size_type i = 0;
+	for(; i < m_taskStatus.size(); ++i)
+	{
+		if(m_taskStatus.get()[i] != s_taskCompleted)
+		{
+			m_completed = false;
+			return;
+		}
+	}
+
+	m_completed = true;
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::setRecipe(bool recipe)
+{
+	m_recipe = recipe;
+	saveDataToObjVars();
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::addRecipeTaskData(std::string data)
+{
+	m_tasks.push_back(Unicode::narrowToWide(data));
+
+	saveDataToObjVars();
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::setRecipeTaskData(int index, std::string data)
+{
+	m_tasks.set(static_cast<unsigned int>(index), Unicode::narrowToWide(data));
+
+	saveDataToObjVars();
+}
+
+//-----------------------------------------------------------------------
+
+
+std::string const PlayerQuestObject::getRecipeTaskData(int index)
+{
+	return Unicode::wideToNarrow(m_tasks.get()[index]);
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::setRewards(std::string data)
+{
+	m_rewards = data;
+	saveDataToObjVars();
+}
+
+//-----------------------------------------------------------------------
+
+std::string const & PlayerQuestObject::getRewards()
+{
+	return m_rewards.get();
+}
+
+//-----------------------------------------------------------------------
+
+void PlayerQuestObject::setCreator(NetworkId const & creator)
+{
+	m_creator = creator;
+
+	if(m_creator.get() != NetworkId::cms_invalid)
+	{
+		m_creatorName = NameManager::getInstance().getPlayerFullName(m_creator.get());
+	}
+}
+
+void PlayerQuestObject::resetAllData()
+{
+	for(unsigned int i = 0; i < m_taskTitles.size(); ++i)
+	{
+		*(m_taskTitles[i]) = "";
+	}
+
+	for(unsigned int i = 0; i < m_taskDescriptions.size(); ++i)
+	{
+		*(m_taskDescriptions[i]) = "";
+	}
+
+	m_title = "";
+	m_description = "";
+
+	m_tasks.clear();
+	m_totalTasks = 0;
+	m_difficulty = 0;
+	m_taskStatus.clear();
+	m_taskCounters.clear();
+	m_waypoints.clear();
+	m_recipe = 0;
+	m_rewards = "";
+	m_completed = false;
+	m_creator = NetworkId::cms_invalid;
+	m_creatorName = "";
+
+	saveDataToObjVars();
+}
+
+void PlayerQuestObject::getByteStreamFromAutoVariable(const std::string & name, Archive::ByteStream & target) const
+{
+	if(name == "PGCPacked")
+	{
+		// title
+		m_title.pack(target);
+
+		// description
+		m_description.pack(target);
+
+		// creator
+		m_creator.pack(target);
+
+		// total tasks
+		m_totalTasks.pack(target);
+
+		// difficulty
+		m_difficulty.pack(target);
+
+		// All our task titles/descriptions
+		for(int i = 0; i < m_totalTasks.get(); ++i)
+		{
+			m_taskTitles[i]->pack(target);
+			m_taskDescriptions[i]->pack(target);
+		}
+
+		// Everything else should be stored as objvars.
+	}
+	else
+	{
+		TangibleObject::getByteStreamFromAutoVariable(name, target);
+	}
+}
+
+void PlayerQuestObject::setAutoVariableFromByteStream(const std::string & name, const Archive::ByteStream & source)
+{
+	Archive::ReadIterator ri(source);
+	if(name == "PGCPacked")
+	{
+		// title
+		m_title.unpackDelta(ri);
+
+		// description
+		m_description.unpackDelta(ri);
+
+		// creator
+		m_creator.unpackDelta(ri);
+
+		// total tasks
+		m_totalTasks.unpackDelta(ri);
+
+		// difficulty
+		m_difficulty.unpackDelta(ri);
+
+		// All our task titles/descriptions
+		for(int i = 0; i < m_totalTasks.get(); ++i)
+		{
+			m_taskTitles[i]->unpackDelta(ri);
+			m_taskDescriptions[i]->unpackDelta(ri);
+		}
+
+		// Make sure our other auto-deltas are up to date.
+		readInObjVarData();
+	}
+	else
+	{
+		TangibleObject::setAutoVariableFromByteStream(name, source);
+	}
+
+	addObjectToConcludeList();
+}
+
+void PlayerQuestObject::fixObjVarDelimiter()
+{
+	// This should only affect Recipe/Task Data and Rewards string
+	bool saveNeeded = false;
+	for(unsigned int i = 0; i < m_tasks.size(); ++i)
+	{
+		std::string narrowString = Unicode::wideToNarrow(m_tasks[i]);
+
+		std::string::size_type iter = narrowString.find('|');
+		while(iter != std::string::npos)
+		{
+			narrowString.replace(iter, iter, 1, '~');
+			saveNeeded = true;
+			iter = narrowString.find('|', iter + 1);
+		}
+
+		if(saveNeeded)
+			m_tasks.set(i,Unicode::narrowToWide(narrowString));
+	}
+
+	std::string rewards = m_rewards.get();
+	std::string::size_type iter = rewards.find('|');
+	while(iter != std::string::npos)
+	{
+		rewards.replace(iter, iter, 1, '~');
+		saveNeeded = true;
+		iter = rewards.find('|', iter + 1);
+	}
+
+	if(saveNeeded)
+	{
+		m_rewards = rewards;
+		saveDataToObjVars();
+	}
+}
diff --git a/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.h b/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.h
new file mode 100644
index 00000000..b60b1d0c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/PlayerQuestObject.h
@@ -0,0 +1,237 @@
+// PlayerQuestObject.h
+// Copyright 2009, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Matt Boudreaux
+
+#ifndef	_INCLUDED_PlayerQuestObject_H
+#define	_INCLUDED_PlayerQuestObject_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/CreatureObject.h"
+#include "serverGame/TangibleObject.h"
+
+class ServerPlayerQuestObjectTemplate;
+//-----------------------------------------------------------------------
+
+class PlayerQuestObject : public TangibleObject
+{
+public:
+	virtual ~PlayerQuestObject  ();
+
+	static PlayerQuestObject *         createPlayerQuestObjectInCreatureDatapad(CreatureObject * creatureWithDatapad);
+	static PlayerQuestObject *         createPlayerQuestObjectInCreatureInventory(CreatureObject * creatureWithInventory);
+
+	virtual PlayerQuestObject *        asPlayerQuestObject();
+	virtual PlayerQuestObject const *  asPlayerQuestObject() const;
+
+	static void             removeDefaultTemplate(void);
+
+	virtual bool            canTrade() const;
+	virtual bool            onContainerAboutToLoseItem(ServerObject * destination, ServerObject& item, ServerObject* transferer);
+	virtual bool            onContainerAboutToTransfer(ServerObject * destination, ServerObject* transferer);
+	virtual int             onContainerAboutToGainItem(ServerObject& item, ServerObject* transferer);
+
+	virtual void            getAttributes       (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+
+	virtual void             onAddedToWorld            ();
+
+	int						 getTotalTasks();
+	void					 getTasks(std::vector<Unicode::String> & taskVector );
+	void					 getTaskCounters(std::vector<int> & counterVector);
+	void					 getTaskStatus(std::vector<int> & taskStatus);
+	int						 getTaskStatus(int taskIndex);
+
+	void					 addNewTask(std::string title, std::string description, int counterMax, std::string waypoint);
+	void					 setTaskStatus(int taskIndex, int status);
+
+	void					 setQuestTitle(std::string title);
+	std::string const &		 getQuestTitle();
+	void					 setQuestDescription(std::string description);
+	std::string const &		 getQuestDescription();
+
+	void					 setTaskTitle(int index, std::string title);
+	std::string const &      getTaskTitle(int index);
+
+	void					 setTaskDescription(int index, std::string description);
+	std::string const &      getTaskDescription(int index);
+
+	void					 setQuestDifficulty(int difficulty);
+	int						 getQuestDifficulty();
+
+	int						 getTaskCounter(int index);
+	void					 setTaskCounter(int index, int value);
+
+	std::string const &      getWaypoint(int index);
+
+	bool					 isCompleted() const;
+
+	void					 setRecipe(bool recipe);
+	bool					 isRecipe() const;
+
+	void					 addRecipeTaskData(std::string data);
+	void					 setRecipeTaskData(int index, std::string data);
+	std::string const 		 getRecipeTaskData(int index);
+
+	void					 setRewards(std::string data);
+	std::string const &		 getRewards();
+
+	void					 setCreator(NetworkId const & creator);
+
+	void					 resetAllData();
+
+	virtual void             getByteStreamFromAutoVariable(const std::string & name, Archive::ByteStream & target) const;
+	virtual void             setAutoVariableFromByteStream(const std::string & name, const Archive::ByteStream & source);
+
+protected:
+	virtual void            endBaselines        ();
+	virtual void            initializeFirstTimeObject();
+
+	virtual const SharedObjectTemplate *  getDefaultSharedTemplate(void) const;
+	friend class ServerPlayerQuestObjectTemplate;
+	PlayerQuestObject  (const ServerPlayerQuestObjectTemplate * playerQuestObjectTemplate);
+
+private:
+	PlayerQuestObject & operator = (const PlayerQuestObject & rhs);
+	PlayerQuestObject(const PlayerQuestObject & source);
+
+	void	readInObjVarData();
+	void    saveDataToObjVars();
+
+	void    checkForCompleted();
+	void	fixObjVarDelimiter();
+
+	virtual void			onLoadedFromDatabase();
+
+private:
+
+	static const SharedObjectTemplate * m_defaultSharedTemplate;	// template to use if no shared template is given
+
+	// Auto deltas.
+	Archive::AutoDeltaVector<Unicode::String>					m_tasks;
+	Archive::AutoDeltaVector<std::pair<int, int> >				m_taskCounters;
+	Archive::AutoDeltaVector<int>								m_taskStatus;
+	Archive::AutoDeltaVector<std::string>						m_waypoints;
+	Archive::AutoDeltaVariable<std::string>						m_rewards;
+	Archive::AutoDeltaVariable<std::string>						m_creatorName;
+	Archive::AutoDeltaVariable<bool>							m_completed;
+	Archive::AutoDeltaVariable<bool>							m_recipe;
+	Archive::AutoDeltaVariable<std::string>					    m_title;
+	Archive::AutoDeltaVariable<std::string>						m_description;
+	Archive::AutoDeltaVariable<NetworkId>						m_creator;
+	Archive::AutoDeltaVariable<int>								m_totalTasks;
+	Archive::AutoDeltaVariable<int>								m_difficulty;
+	
+	// Task Titles and Descriptions.
+	Archive::AutoDeltaVariable<std::string>					    m_taskTitle1;
+	Archive::AutoDeltaVariable<std::string>					    m_taskDescription1;
+	Archive::AutoDeltaVariable<std::string>					    m_taskTitle2;
+	Archive::AutoDeltaVariable<std::string>					    m_taskDescription2;
+	Archive::AutoDeltaVariable<std::string>					    m_taskTitle3;
+	Archive::AutoDeltaVariable<std::string>					    m_taskDescription3;
+	Archive::AutoDeltaVariable<std::string>					    m_taskTitle4;
+	Archive::AutoDeltaVariable<std::string>					    m_taskDescription4;
+	Archive::AutoDeltaVariable<std::string>					    m_taskTitle5;
+	Archive::AutoDeltaVariable<std::string>					    m_taskDescription5;
+	Archive::AutoDeltaVariable<std::string>					    m_taskTitle6;
+	Archive::AutoDeltaVariable<std::string>					    m_taskDescription6;
+	Archive::AutoDeltaVariable<std::string>					    m_taskTitle7;
+	Archive::AutoDeltaVariable<std::string>					    m_taskDescription7;
+	Archive::AutoDeltaVariable<std::string>					    m_taskTitle8;
+	Archive::AutoDeltaVariable<std::string>					    m_taskDescription8;
+	Archive::AutoDeltaVariable<std::string>					    m_taskTitle9;
+	Archive::AutoDeltaVariable<std::string>					    m_taskDescription9;
+	Archive::AutoDeltaVariable<std::string>					    m_taskTitle10;
+	Archive::AutoDeltaVariable<std::string>					    m_taskDescription10;
+	Archive::AutoDeltaVariable<std::string>					    m_taskTitle11;
+	Archive::AutoDeltaVariable<std::string>					    m_taskDescription11;
+	Archive::AutoDeltaVariable<std::string>					    m_taskTitle12;
+	Archive::AutoDeltaVariable<std::string>					    m_taskDescription12;
+
+	// Helper containers to keep access simple.
+	std::vector<Archive::AutoDeltaVariable<std::string> *>		m_taskTitles;
+	std::vector<Archive::AutoDeltaVariable<std::string> *>		m_taskDescriptions;
+
+private:
+	void addMembersToPackages();
+};
+
+//-----------------------------------------------------------------------
+
+inline int PlayerQuestObject::getTotalTasks()
+{
+	return m_totalTasks.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline void PlayerQuestObject::setQuestTitle(std::string title)
+{
+	m_title = title;
+}
+
+//-----------------------------------------------------------------------
+
+inline std::string const & PlayerQuestObject::getQuestTitle()
+{
+	return m_title.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline void PlayerQuestObject::setQuestDescription(std::string description)
+{
+	m_description = description;
+}
+
+//-----------------------------------------------------------------------
+
+inline std::string const & PlayerQuestObject::getQuestDescription()
+{
+	return m_description.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline void PlayerQuestObject::setQuestDifficulty(int difficulty)
+{
+	m_difficulty = difficulty;
+}
+
+//-----------------------------------------------------------------------
+
+inline int PlayerQuestObject::getQuestDifficulty()
+{
+	return m_difficulty.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int PlayerQuestObject::getTaskCounter(int index)
+{
+	return m_taskCounters.get()[index].first;
+}
+
+//-----------------------------------------------------------------------
+
+inline std::string const & PlayerQuestObject::getWaypoint(int index)
+{
+	return m_waypoints.get()[index];
+}
+
+//-----------------------------------------------------------------------
+
+inline bool PlayerQuestObject::isCompleted() const
+{
+	return m_completed.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool PlayerQuestObject::isRecipe() const
+{
+	return m_recipe.get();
+}
+
+
+#endif	// _INCLUDED_PlayerQuestObject_H
+
diff --git a/engine/server/library/serverGame/src/shared/object/PortalTriggerVolume.cpp b/engine/server/library/serverGame/src/shared/object/PortalTriggerVolume.cpp
new file mode 100644
index 00000000..275f1723
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/PortalTriggerVolume.cpp
@@ -0,0 +1,70 @@
+// ======================================================================
+//
+// PortalTriggerVolume.cpp
+//
+// Copyright 2000-04 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "PortalTriggerVolume.h"
+
+#include "serverGame/ObserveTracker.h"
+#include "serverGame/ServerObject.h"
+
+// ======================================================================
+
+namespace PortalTriggerVolumeNamespace
+{
+	const char* ms_name = "portalTriggerVolume";
+}
+
+using namespace PortalTriggerVolumeNamespace;
+
+// ======================================================================
+
+PortalTriggerVolume::PortalTriggerVolume(ServerObject &owner, real radius) :
+	TriggerVolume(owner, radius, ms_name, true)
+{
+}
+
+// ----------------------------------------------------------------------
+
+PortalTriggerVolume::~PortalTriggerVolume()
+{
+}
+
+// ----------------------------------------------------------------------
+
+const char* PortalTriggerVolume::getName()
+{
+	return ms_name;
+}
+
+// ----------------------------------------------------------------------
+
+void PortalTriggerVolume::virtualOnEnter(ServerObject &object)
+{
+	Client *client = object.getClient();
+	if (client)
+		ObserveTracker::onClientEnteredPortalTriggerVolume(*client, *this);
+}
+
+// ----------------------------------------------------------------------
+
+void PortalTriggerVolume::virtualOnExit(ServerObject &object)
+{
+	Client *client = object.getClient();
+	if (client)
+		ObserveTracker::onClientExitedPortalTriggerVolume(*client, *this);
+}
+
+// ----------------------------------------------------------------------
+
+bool PortalTriggerVolume::isPortalTriggerVolume() const
+{
+	return true;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/PortalTriggerVolume.h b/engine/server/library/serverGame/src/shared/object/PortalTriggerVolume.h
new file mode 100644
index 00000000..0f1a5713
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/PortalTriggerVolume.h
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// PortalTriggerVolume.h
+//
+// Copyright 2000-04 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _INCLUDED_PortalTriggerVolume_H
+#define _INCLUDED_PortalTriggerVolume_H
+
+// ======================================================================
+
+#include "serverGame/TriggerVolume.h"
+
+// ======================================================================
+
+class PortalTriggerVolume : public TriggerVolume
+{
+public:
+	PortalTriggerVolume(ServerObject &owner, real radius);
+	virtual ~PortalTriggerVolume();
+
+	virtual bool isPortalTriggerVolume() const;
+
+	static char const *getName();
+	
+private:
+	virtual void virtualOnEnter(ServerObject &object);
+	virtual void virtualOnExit(ServerObject &object);
+
+	PortalTriggerVolume(PortalTriggerVolume const &);
+	PortalTriggerVolume &operator=(PortalTriggerVolume const &);
+};
+
+// ======================================================================
+
+#endif // _INCLUDED_PortalTriggerVolume_H
+
diff --git a/engine/server/library/serverGame/src/shared/object/PvpEnemiesObserver.cpp b/engine/server/library/serverGame/src/shared/object/PvpEnemiesObserver.cpp
new file mode 100644
index 00000000..7675a7d0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/PvpEnemiesObserver.cpp
@@ -0,0 +1,128 @@
+// ======================================================================
+//
+// PvpEnemiesObserver.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PvpEnemiesObserver.h"
+
+#include "serverGame/BuildingObject.h"
+#include "serverGame/CellObject.h"
+#include "serverGame/Client.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/Pvp.h"
+#include "sharedNetworkMessages/UpdateCellPermissionMessage.h"
+#include "sharedObject/Container.h"
+
+// ======================================================================
+
+static std::set<CreatureObject *> s_activeUpdaters;
+
+// ======================================================================
+
+PvpEnemiesObserver::PvpEnemiesObserver(TangibleObject *who, Archive::AutoDeltaObserverOp operation) :
+	m_profilerBlock("PvpEnemiesObserver"),
+	m_obj(0),
+	m_pvpObserver(who, operation),
+	m_hadAnyAlignedTimedEnemyFlag(false),
+	m_hadAnyBountyDuelEnemyFlag(false)
+{
+	CreatureObject * const co = who ? who->asCreatureObject() : 0;
+	if (!co || !co->getClient() || s_activeUpdaters.find(co) != s_activeUpdaters.end())
+		return;
+
+	m_obj = co;
+	s_activeUpdaters.insert(co);
+
+	m_hadAnyAlignedTimedEnemyFlag = Pvp::hasAnyAlignedTimedEnemyFlag(*co);
+	m_hadAnyBountyDuelEnemyFlag = Pvp::hasAnyBountyDuelEnemyFlag(*co);
+}
+
+// ----------------------------------------------------------------------
+
+PvpEnemiesObserver::~PvpEnemiesObserver()
+{
+	if (!m_obj)
+		return;
+
+	s_activeUpdaters.erase(m_obj);
+
+	Client * const client = m_obj->getClient();
+
+	if (client)
+	{
+		bool const alignedTimedEnemyFlagChanged = (m_hadAnyAlignedTimedEnemyFlag != Pvp::hasAnyAlignedTimedEnemyFlag(*m_obj));
+		bool const bountyDuelEnemyFlagChanged = (m_hadAnyBountyDuelEnemyFlag != Pvp::hasAnyBountyDuelEnemyFlag(*m_obj));
+
+		if (!alignedTimedEnemyFlagChanged && !bountyDuelEnemyFlagChanged)
+			return;
+
+		// run through all buildings we are observing that care about this and send updates
+		Client::ObservingList const &observing = client->getObserving();
+		for (Client::ObservingList::const_iterator i = observing.begin(); i != observing.end(); ++i)
+		{
+			BuildingObject * const building = (*i)->asBuildingObject();
+			if (building && !building->playersWithAlignedEnemyFlagsAllowed())
+			{
+				// This building cares about enemy flags, so send cell permission updates
+				Container * const container = ContainerInterface::getContainer(*building);
+				for (ContainerIterator j = container->begin(); j != container->end(); ++j)
+				{
+					Object const * const o = (*j).getObject();
+					if (o)
+					{
+						ServerObject const * const so = o->asServerObject();
+						if (so)
+						{
+							CellObject const * const co = so->asCellObject();
+							if (co)
+							{
+								// We cannot possibly be allowed unless we just lost our last aligned temp enemy flag,
+								// so only query our status if that is the case.  Likewise, we don't need to send a
+								// status update if we are still not allowed after losing our last aligned temp
+								// enemy flag.  We will still generate unnecesary messages when we were previously
+								// not allowed, and are gaining our first aligned temp enemy flag, but not needing
+								// to know the old state allows us to avoid a lot of work.
+								bool allowed = false;
+								if ((alignedTimedEnemyFlagChanged && m_hadAnyAlignedTimedEnemyFlag) || (bountyDuelEnemyFlagChanged && m_hadAnyBountyDuelEnemyFlag))
+									allowed = co->isAllowed(*m_obj);
+								if (allowed || (alignedTimedEnemyFlagChanged && !m_hadAnyAlignedTimedEnemyFlag) || (bountyDuelEnemyFlagChanged && !m_hadAnyBountyDuelEnemyFlag))
+								{
+									UpdateCellPermissionMessage const permissionsMessage(co->getNetworkId(), allowed);
+									client->send(permissionsMessage, true);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// expel from the building we are in if no longer allowed
+		if ((alignedTimedEnemyFlagChanged && !m_hadAnyAlignedTimedEnemyFlag) || (bountyDuelEnemyFlagChanged && !m_hadAnyBountyDuelEnemyFlag)) // if we didn't have aligned enemy flags but we do now
+		{
+			Object * const o = m_obj->getAttachedTo();
+			if (o)
+			{
+				ServerObject * const so = o->asServerObject();
+				if (so)
+				{
+					CellObject * const co = so->asCellObject();
+					if (co)
+					{
+						BuildingObject * const bo = co->getOwnerBuilding();
+						if (bo && !bo->playersWithAlignedEnemyFlagsAllowed())
+							bo->expelObject(*m_obj);
+					}
+				}
+			}
+		}
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/PvpEnemiesObserver.h b/engine/server/library/serverGame/src/shared/object/PvpEnemiesObserver.h
new file mode 100644
index 00000000..d1cfa623
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/PvpEnemiesObserver.h
@@ -0,0 +1,46 @@
+// ======================================================================
+//
+// PvpEnemiesObserver.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _PvpEnemiesObserver_H_
+#define _PvpEnemiesObserver_H_
+
+// ======================================================================
+
+#include "Archive/AutoDeltaObserverOps.h"
+#include "serverGame/PvpUpdateObserver.h"
+#include "sharedDebug/Profiler.h"
+
+// ======================================================================
+
+class CreatureObject;
+class TangibleObject;
+
+// ======================================================================
+
+class PvpEnemiesObserver
+{
+public:
+	PvpEnemiesObserver(TangibleObject *who, Archive::AutoDeltaObserverOp operation);
+	~PvpEnemiesObserver();
+
+private:
+	PvpEnemiesObserver(PvpEnemiesObserver const &);
+	PvpEnemiesObserver& operator=(PvpEnemiesObserver const &);
+
+private:
+	ProfilerAutoBlock m_profilerBlock;
+	CreatureObject *m_obj;
+	PvpUpdateObserver m_pvpObserver;
+	bool m_hadAnyAlignedTimedEnemyFlag;
+	bool m_hadAnyBountyDuelEnemyFlag;
+};
+
+// ======================================================================
+
+#endif // _PvpEnemiesObserver_H_
+
diff --git a/engine/server/library/serverGame/src/shared/object/PvpUpdateAndCellPermissionsObserver.cpp b/engine/server/library/serverGame/src/shared/object/PvpUpdateAndCellPermissionsObserver.cpp
new file mode 100644
index 00000000..642538ee
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/PvpUpdateAndCellPermissionsObserver.cpp
@@ -0,0 +1,29 @@
+// ======================================================================
+//
+// PvpUpdateAndCellPermissionsObserver.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PvpUpdateAndCellPermissionsObserver.h"
+#include "serverGame/TangibleObject.h"
+
+// ======================================================================
+
+PvpUpdateAndCellPermissionsObserver::PvpUpdateAndCellPermissionsObserver(TangibleObject *who, Archive::AutoDeltaObserverOp operation) :
+	m_profilerBlock("PvpUpdateAndCellPermissionsObserver"),
+	m_pvpObserver(who, operation),
+	m_cellPermsObserver(who ? who->asCreatureObject() : 0)
+{
+}
+
+// ----------------------------------------------------------------------
+
+PvpUpdateAndCellPermissionsObserver::~PvpUpdateAndCellPermissionsObserver()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/PvpUpdateAndCellPermissionsObserver.h b/engine/server/library/serverGame/src/shared/object/PvpUpdateAndCellPermissionsObserver.h
new file mode 100644
index 00000000..998d9d2d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/PvpUpdateAndCellPermissionsObserver.h
@@ -0,0 +1,44 @@
+// ======================================================================
+//
+// PvpUpdateAndCellPermissionsObserver.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _PvpUpdateAndCellPermissionsObserver_H_
+#define _PvpUpdateAndCellPermissionsObserver_H_
+
+// ======================================================================
+
+#include "Archive/AutoDeltaObserverOps.h"
+#include "serverGame/PvpUpdateObserver.h"
+#include "serverGame/CellPermissions.h"
+#include "sharedDebug/Profiler.h"
+
+// ======================================================================
+
+class TangibleObject;
+
+// ======================================================================
+
+class PvpUpdateAndCellPermissionsObserver
+{
+public:
+	PvpUpdateAndCellPermissionsObserver(TangibleObject *who, Archive::AutoDeltaObserverOp operation);
+	~PvpUpdateAndCellPermissionsObserver();
+
+private:
+	PvpUpdateAndCellPermissionsObserver(PvpUpdateAndCellPermissionsObserver const &);
+	PvpUpdateAndCellPermissionsObserver& operator=(PvpUpdateAndCellPermissionsObserver const &);
+
+private:
+	ProfilerAutoBlock m_profilerBlock;
+	PvpUpdateObserver m_pvpObserver;
+	CellPermissions::ViewerChangeObserver m_cellPermsObserver;
+};
+
+// ======================================================================
+
+#endif // _PvpUpdateAndCellPermissionsObserver_H_
+
diff --git a/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.cpp b/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.cpp
new file mode 100644
index 00000000..45845613
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.cpp
@@ -0,0 +1,676 @@
+// ======================================================================
+//
+// ResourceContainerObject.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ResourceContainerObject.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/ResourceContainerController.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerResourceClassObject.h"
+#include "serverGame/ServerResourceContainerObjectTemplate.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedGame/SharedObjectAttributes.h"
+#include "sharedGame/SharedResourceContainerObjectTemplate.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/SlottedContainmentProperty.h"
+
+// ======================================================================
+
+const SharedObjectTemplate * ResourceContainerObject::m_defaultSharedTemplate = NULL;
+
+namespace ResourceContainerObjectNamespace
+{
+	const std::string OBJVAR_RESOURCE_DATA("resourceData");
+};
+
+using namespace ResourceContainerObjectNamespace;
+
+// ======================================================================
+
+ResourceContainerObject::ResourceContainerObject(const ServerResourceContainerObjectTemplate* newTemplate) :
+TangibleObject  (newTemplate),
+m_resourceType  (NetworkId::cms_invalid),
+m_quantity      (0),
+m_source        (NetworkId::cms_invalid),
+m_maxQuantity   (newTemplate->getMaxResources()),
+m_resourceName  (),
+m_parentName    ()
+{
+	addMembersToPackages();
+}
+//-----------------------------------------------------------------------
+
+ResourceContainerObject::~ResourceContainerObject()
+{
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a shared template if none was given for this object.
+ *
+ * @return the shared template
+ */
+const SharedObjectTemplate * ResourceContainerObject::getDefaultSharedTemplate(void) const
+{
+	static const ConstCharCrcLowerString templateName("object/resource_container/base/shared_resource_container_default.iff");
+
+	if (m_defaultSharedTemplate == NULL)
+	{
+		m_defaultSharedTemplate = safe_cast<const SharedObjectTemplate *>(ObjectTemplateList::fetch(templateName));
+		WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create default shared object template %s", templateName.getString()));
+		if (m_defaultSharedTemplate != NULL)
+			ExitChain::add (removeDefaultTemplate, "ResourceContainerObject::removeDefaultTemplate");
+	}
+	return m_defaultSharedTemplate;
+}	// ResourceContainerObject::getDefaultSharedTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Cleans up the default shared template.
+ */
+void ResourceContainerObject::removeDefaultTemplate(void)
+{
+	if (m_defaultSharedTemplate != NULL)
+	{
+		m_defaultSharedTemplate->releaseReference();
+		m_defaultSharedTemplate = NULL;
+	}
+}	// ResourceContainerObject::removeDefaultTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a default controller for this object.
+ *
+ * @return the object's controller
+ */
+Controller* ResourceContainerObject::createDefaultController(void)
+{
+	Controller* _controller = new ResourceContainerController(this);
+	NOT_NULL(_controller);
+
+	setController(_controller);
+	return _controller;
+}	// ResourceContainerObject::createDefaultController
+
+// ----------------------------------------------------------------------
+
+bool ResourceContainerObject::addResource(ResourceTypeObject const * const resourceType, int amount, NetworkId const & sourcePlayer)
+{
+	if (!resourceType)
+		return false;
+
+	return addResource(resourceType->getNetworkId(), amount, sourcePlayer);
+}
+
+// ----------------------------------------------------------------------
+
+bool ResourceContainerObject::addResource(const NetworkId &resourceType, int amount, const NetworkId &sourcePlayer)
+{
+	if (amount <= 0)
+	{
+		WARNING_STRICT_FATAL(amount<0,("Use removeResource to remove resources from a ResourceContainer.\n"));
+		return amount == 0;
+	}
+	
+	if (isAuthoritative())
+	{
+		if (m_quantity.get() + amount > m_maxQuantity.get())
+			return false; // too much
+		
+		if (m_quantity.get()==0)
+		{
+			// need to set the resource attribute objvar for imported resource type
+			if (resourceType.getValue() > NetworkId::cms_maxNetworkIdWithoutClusterId)
+			{
+				DynamicVariableList const & objvars = getObjVars();
+				if (!objvars.hasItem(OBJVAR_RESOURCE_DATA) || (DynamicVariable::STRING != objvars.getType(OBJVAR_RESOURCE_DATA)))
+				{
+					ResourceTypeObject const * const rto = ServerUniverse::getInstance().getImportedResourceTypeById(resourceType);
+					if (!rto)
+						return false;
+
+					std::string const resourceData = rto->getResourceTypeDataForExport();
+					if (resourceData.empty())
+						return false;
+
+					removeObjVarItem(OBJVAR_RESOURCE_DATA);
+					IGNORE_RETURN(setObjVarItem(OBJVAR_RESOURCE_DATA, resourceData));
+				}
+			}
+
+			m_resourceType = resourceType; // note that m_quantity should be 0 only if this is a brand new crate
+			m_source = sourcePlayer;
+
+			updateResourceNames();
+		}
+		else if (resourceType != m_resourceType.get())
+			return false; // can't contain two different kinds of resource
+		
+		m_quantity=m_quantity.get() + amount;
+		if (sourcePlayer!=NetworkId::cms_invalid)
+			addResourceSource(sourcePlayer, amount);
+		
+		setAttributeRevisionDirty();
+
+		return true;
+	}
+	else
+	{
+		WARNING_STRICT_FATAL(true,("Cross-server container transfers are not supported.\n"));
+		return false;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ResourceContainerObject::removeResource(const NetworkId &resourceType, int amount, std::vector<std::pair<NetworkId, int> > *sources)
+{
+	while (amount > 0)
+	{
+		int actualAmountRemoved;
+		NetworkId source(NetworkId::cms_invalid);
+		if (!internalRemoveResource(resourceType, amount, source, actualAmountRemoved))
+			return false;
+		amount -= actualAmountRemoved;
+		if (sources)
+		{
+			sources->push_back(std::pair<NetworkId, int>(source, actualAmountRemoved));
+		}
+	}
+
+	return true;
+}
+
+/**
+ * Remove up to a certain amount of resource.  The resource removed will
+ * always be from a single source player.  It may be necessary to call this
+ * function more than once to extract the total amount desired.
+ *
+ * @param resourceType The type of resource desired
+ * @param amount The maximum amount to remove
+ * @param source (output) Which player the resource came from (can be cms_invalid)
+ * @param amountRemoved (output) The actual amount removed.  Will be <= amount
+ * @return True if at least 1 unit of the specified resource is removed
+ */
+bool ResourceContainerObject::internalRemoveResource(const NetworkId &resourceType, int amount, NetworkId &source, int &amountRemoved)
+{
+	if (amount <= 0)
+	{
+		WARNING_STRICT_FATAL(amount<0,("Trying to make a deposit with a withdrawal slip. (Called removeResource with a negative amount.)\n"));
+		return amount == 0;
+	}
+	
+	if (isAuthoritative())
+	{
+		if (resourceType!=m_resourceType.get())
+			return false; // wrong kind of resource
+		amountRemoved = std::min(m_quantity.get(), amount);
+
+		// Identify source (if possible)
+		if (m_source.get() == NetworkId::cms_invalid)
+		{
+			// multi-source container.  Complicated
+			source = NetworkId::cms_invalid;
+			DynamicVariableList::NestedList varList(getObjVars(),"source");
+			DynamicVariableList::NestedList::const_iterator var(varList.begin());
+			if (var!=varList.end())
+			{
+				int varInt;
+				if (var.getValue(varInt))
+				{
+					amountRemoved = std::min(amountRemoved, varInt);
+					int remainingAmountFromSource = varInt - amountRemoved;
+					source = NetworkId(var.getName());
+					if (remainingAmountFromSource > 0)
+					{
+						IGNORE_RETURN(setObjVarItem(var.getNameWithPath(), remainingAmountFromSource));
+					}
+					else
+						removeObjVarItem(var.getNameWithPath());
+				}
+			}
+		}
+		else
+		{
+			// single-source container.  Simple
+			source = m_source.get();
+		}
+
+		// Adjust the quantity remaining
+		m_quantity=m_quantity.get() - amountRemoved;
+		if (m_quantity.get() == 0)
+			IGNORE_RETURN(permanentlyDestroy(DeleteReasons::Consumed)); // containers delete themselves when empty
+
+		setAttributeRevisionDirty();
+
+		return true;
+	}
+	else
+	{
+		WARNING_STRICT_FATAL(true,("Cross-server container transfers are not supported.\n"));
+		return false;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+std::string ResourceContainerObject::getResourceCtsData() const
+{
+	// resource came from another galaxy, so all the data is stored in the objvar
+	DynamicVariableList const & objvars = getObjVars();
+	if (objvars.hasItem(OBJVAR_RESOURCE_DATA) && (DynamicVariable::STRING == objvars.getType(OBJVAR_RESOURCE_DATA)))
+	{
+		std::string resourceData;
+		IGNORE_RETURN(objvars.getItem(OBJVAR_RESOURCE_DATA, resourceData));
+		return resourceData;
+	}
+	// resource came from this cluster, so construct the resource data
+	else
+	{
+		ResourceTypeObject const * const typeObj = getResourceType();
+		if (typeObj)
+			return typeObj->getResourceTypeDataForExport();
+		
+		return std::string();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ResourceContainerObject::setResourceCtsData(int quantity, const std::string & resourceData)
+{
+	if (!isAuthoritative())
+		return;
+	
+	if (m_resourceType.get().isValid())
+		return;
+
+	if (m_quantity.get() > 0)
+		return;
+
+	if (quantity <= 0)
+		return;
+
+	if (resourceData.empty())
+		return;
+
+	removeObjVarItem(OBJVAR_RESOURCE_DATA);
+	NetworkId const importedResourceType = ResourceTypeObject::addImportedResourceType(resourceData);
+	if (importedResourceType.isValid())
+	{
+		if (importedResourceType.getValue() > NetworkId::cms_maxNetworkIdWithoutClusterId)
+		{
+			// need to tell all proxy game servers, if any, to create the imported
+			// resource type, if it hasn't already been created on that game server
+			ProxyList const &proxyList = getExposedProxyList();
+			if (!proxyList.empty())
+			{
+				ServerMessageForwarding::begin(std::vector<uint32>(proxyList.begin(), proxyList.end()));
+
+				GenericValueTypeMessage<std::pair<NetworkId, std::string> > const addImportedResourceTypeMsg("AddImportedResourceType", std::make_pair(importedResourceType, resourceData));
+				ServerMessageForwarding::send(addImportedResourceTypeMsg);
+
+				ServerMessageForwarding::end();
+			}
+		}
+
+		IGNORE_RETURN(!addResource(importedResourceType, quantity, NetworkId::cms_invalid));
+	}
+
+	if (!getObjVars().hasItem(OBJVAR_RESOURCE_DATA))
+	{
+		if (!m_resourceType.get().isValid() || (m_resourceType.get().getValue() > NetworkId::cms_maxNetworkIdWithoutClusterId))
+			IGNORE_RETURN(setObjVarItem(OBJVAR_RESOURCE_DATA, resourceData));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+std::string ResourceContainerObject::debugPrint() const
+{
+	char buffer[20];
+	IGNORE_RETURN(snprintf(buffer, 20, "%i",m_quantity.get()));
+	ResourceTypeObject const * const r=ServerUniverse::getInstance().getResourceTypeById(m_resourceType.get());
+	if (r)
+		return (std::string("Resource Container with ")+buffer+" units of "+r->getResourceName());
+	else
+		return ("Invalid resource container");
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Transfer resources from one container to another.
+ * @return true if all the resource was tranferred, false if no resources
+ * or less than the requested amount was transferred.
+ * @todo Inter-server authority issues
+ */
+bool ResourceContainerObject::transferTo(ResourceContainerObject &destination, int amount)
+{
+	if (isAuthoritative())
+	{
+		if ((m_resourceType.get() != destination.m_resourceType.get() && (destination.m_resourceType.get() != NetworkId::cms_invalid))
+			|| amount > m_quantity.get())
+			return false;
+
+		NetworkId sourcePlayer(NetworkId::cms_invalid);
+		int amountRemoved = 0;
+		while (amount > 0)
+		{
+			if (!internalRemoveResource(m_resourceType.get(), amount, sourcePlayer, amountRemoved))
+				return false;
+			if (!destination.addResource(m_resourceType.get(), amountRemoved, sourcePlayer))
+			{
+				// failed to add resource to destination, put it back into the source
+				IGNORE_RETURN(addResource(m_resourceType.get(), amountRemoved, sourcePlayer));
+				return false;
+			}
+
+			amount -= amountRemoved;
+		}
+		return true;		
+	}
+	else
+	{
+		WARNING_STRICT_FATAL(true,("Cross-server container transfers are not supported.\n"));
+		return false;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/** 
+ * Split this container into two containers
+ * @param amount The amount to put in the new ResourceContainer
+ * @param destContainer The container into which the new ResourceContainer should be placed, or cms_Invalid if no container
+ * @param arrangementId -1 If destContainer is not slotted, otherwise the ID of the arrangement to use
+ * @param newLocation The coordinates at which to place the new ResourceContainer.  (Ignored if it is going into a non-positional container.)
+ * @param actor The player making the split, or NULL
+ */
+
+bool ResourceContainerObject::splitContainer(int amount, const CachedNetworkId &destContainer, int arrangementId, const Vector &newLocation, ServerObject *actor)
+{
+	UNREF(actor);
+
+	bool result = false;
+	
+	ResourceContainerObject *newCrate = NULL;
+	
+	if (destContainer == CachedNetworkId::cms_cachedInvalid)
+	{
+		// create in world
+		Transform tr;
+		tr.setPosition_p(newLocation);
+		newCrate = dynamic_cast<ResourceContainerObject*>(ServerWorld::createNewObject(getObjectTemplateName(), tr, 0, isPersisted()));
+	}
+	else if (arrangementId < 0)
+	{
+		// create in volume container
+		ServerObject * destObject = safe_cast<ServerObject *>(destContainer.getObject());
+		if (destObject == NULL)
+			return false;
+		newCrate = dynamic_cast<ResourceContainerObject*>(ServerWorld::createNewObject(getObjectTemplateName(), *destObject, isPersisted()));
+	}
+	else
+	{
+		// create in slotted container
+		ServerObject * destObject = safe_cast<ServerObject *>(destContainer.getObject());
+		if (destObject == NULL)
+			return false;
+		const SlottedContainmentProperty* containmentProperty = ContainerInterface::getSlottedContainmentProperty(*destObject);
+		if (containmentProperty == NULL)
+			return false;
+		const SlottedContainmentProperty::SlotArrangement & slots = containmentProperty->getSlotArrangement(arrangementId);
+		if (slots.empty())
+			return false;
+		newCrate = dynamic_cast<ResourceContainerObject*>(ServerWorld::createNewObject(getObjectTemplateName(), *destObject, slots.front(), isPersisted()));
+	}
+	if (newCrate)
+	{
+		result = transferTo(*newCrate, amount);
+
+		if (!result)
+			IGNORE_RETURN(newCrate->permanentlyDestroy(DeleteReasons::BadContainerTransfer));
+	}
+	
+	return result;
+}
+
+//----------------------------------------------------------------------
+
+void ResourceContainerObject::updateResourceNames()
+{
+	if (!isAuthoritative())
+		return;
+
+	m_resourceName.set (Unicode::emptyString);
+	m_parentName.set   (std::string ());
+	m_resourceNameId.set (StringId::cms_invalid);
+
+	setAttributeRevisionDirty();
+
+	if (!m_resourceType.get ().isValid ())
+	{
+		setObjectName (Unicode::emptyString);
+		return;
+	}
+
+	//-- setup the parent inheritance chain.
+	//-- the client needs this information
+
+	ResourceTypeObject const * const type = ServerUniverse::getInstance().getResourceTypeById(m_resourceType.get());
+
+	if (type)
+	{
+		m_resourceName = Unicode::narrowToWide(type->getResourceName ());
+		if ((m_resourceName.get())[0] == '@')
+		{
+			m_resourceNameId = StringId(Unicode::wideToNarrow(m_resourceName.get()));
+		}
+		
+		ResourceClassObject const & parentClass = type->getParentClass();
+
+		m_parentName = parentClass.getResourceClassName ();
+
+		ResourceClassObject const * const parentClass2 = parentClass.getParent ();
+
+		if (parentClass2)
+		{
+			setObjectName(Unicode::emptyString);
+			setObjectNameStringId (parentClass2->getFriendlyName());
+		}
+		else
+		{
+			setObjectName(Unicode::emptyString);
+			setObjectNameStringId (parentClass.getFriendlyName());
+		}
+
+	}
+	else
+		DEBUG_WARNING (true, ("Unable to find specified resource type %s", m_resourceType.get ().getValueString ().c_str ()));
+}
+
+// ----------------------------------------------------------------------
+
+std::string ResourceContainerObject::getItemLog() const
+{
+	char tmpBuffer[1024];
+	IGNORE_RETURN(snprintf(tmpBuffer, sizeof(tmpBuffer) - 1, ": %d units of %s", getQuantity(), Unicode::wideToNarrow(m_resourceName.get()).c_str()));
+	tmpBuffer[sizeof(tmpBuffer)-1] = 0;
+
+	return TangibleObject::getItemLog() + tmpBuffer;
+}
+
+// ----------------------------------------------------------------------
+
+void ResourceContainerObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+{
+	TangibleObject::getAttributes(data);
+
+	char valueBuffer[32];
+	IGNORE_RETURN(snprintf (valueBuffer, sizeof (valueBuffer), "%d/%d", getQuantity (), getMaxQuantity ()));
+	data.push_back (std::make_pair (SharedObjectAttributes::resource_contents, Unicode::narrowToWide (valueBuffer)));
+
+	ResourceTypeObject const * const typeObj = getResourceType();
+	if (typeObj)
+	{
+		data.push_back (std::make_pair (SharedObjectAttributes::resource_name, Unicode::narrowToWide(typeObj->getResourceName ())));
+
+		ResourceClassObject const & parent = typeObj->getParentClass ();
+		data.push_back (std::make_pair (SharedObjectAttributes::resource_class, Unicode::narrowToWide ("@" + parent.getFriendlyName ().getCanonicalRepresentation())));
+
+		typeObj->getResourceAttributes(data);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ResourceContainerObject::endBaselines()
+{
+	TangibleObject::endBaselines();
+
+	if (isAuthoritative())
+	{
+		// if resource is an imported resource, register the imported resource type on
+		// this game server, if it hasn't already been registered on this game server;
+		// this must be done on each game server as it receives the resource container
+		DynamicVariableList const & objvars = getObjVars();
+		if (objvars.hasItem(OBJVAR_RESOURCE_DATA) && (DynamicVariable::STRING == objvars.getType(OBJVAR_RESOURCE_DATA)))
+		{
+			bool const alreadyRegistered = (m_resourceType.get().isValid() && (m_resourceType.get().getValue() > NetworkId::cms_maxNetworkIdWithoutClusterId) && ServerUniverse::getInstance().getImportedResourceTypeById(m_resourceType.get()));
+			if (!alreadyRegistered)
+			{
+				std::string resourceData;
+				IGNORE_RETURN(objvars.getItem(OBJVAR_RESOURCE_DATA, resourceData));
+				NetworkId const importedResourceType = ResourceTypeObject::addImportedResourceType(resourceData);
+				if (importedResourceType.isValid())
+				{
+					if (importedResourceType != m_resourceType.get())
+						m_resourceType = importedResourceType;
+
+					if (importedResourceType.getValue() <= NetworkId::cms_maxNetworkIdWithoutClusterId)
+						removeObjVarItem(OBJVAR_RESOURCE_DATA);
+				}
+			}
+		}
+
+		updateResourceNames();
+	}
+	else
+	{
+		// if resource is an imported resource, register the imported resource type on
+		// this game server, if it hasn't already been registered on this game server;
+		// this must be done on each game server as it receives the resource container
+		if (m_resourceType.get().isValid() && (m_resourceType.get().getValue() > NetworkId::cms_maxNetworkIdWithoutClusterId) && !ServerUniverse::getInstance().getImportedResourceTypeById(m_resourceType.get()))
+		{
+			DynamicVariableList const & objvars = getObjVars();
+			if (objvars.hasItem(OBJVAR_RESOURCE_DATA) && (DynamicVariable::STRING == objvars.getType(OBJVAR_RESOURCE_DATA)))
+			{
+				std::string resourceData;
+				IGNORE_RETURN(objvars.getItem(OBJVAR_RESOURCE_DATA, resourceData));
+				IGNORE_RETURN(ResourceTypeObject::addImportedResourceType(resourceData));
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ResourceContainerObject::addResourceSource(const NetworkId &source, int amount)
+{
+	if (source == m_source.get())
+		return;  // single-source container adding more resource from the same source -- no change needed
+
+	if (m_source.get() != NetworkId::cms_invalid)
+	{
+		// converting a single-source container into a multi-source container.  All resources except the ones from the new source get credited to the first source
+		const std::string & varname = std::string("source.") + m_source.get().getValueString();
+		IGNORE_RETURN(setObjVarItem(varname, m_quantity.get() - amount));
+		m_source = NetworkId::cms_invalid;
+	}
+	
+	const std::string & varname = std::string("source.") + source.getValueString ();
+	int intvar = 0;
+	if (getObjVars().getItem(varname,intvar))
+	{
+		IGNORE_RETURN(setObjVarItem(varname, intvar+amount));
+	}
+	else
+	{
+		removeObjVarItem(varname);
+
+		IGNORE_RETURN(setObjVarItem(varname, amount));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ResourceContainerObject::removeResourceWithoutExperience(const NetworkId &resourceType, int amount)
+{
+	while (amount > 0)
+	{
+		int amountRemoved = 0;
+		NetworkId source;
+		if (!internalRemoveResource(resourceType, amount, source, amountRemoved))
+			return false;
+		amount -= amountRemoved;
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+ResourceTypeObject const * const ResourceContainerObject::getResourceType() const
+{
+	return ServerUniverse::getInstance().getResourceTypeById(m_resourceType.get());
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId ResourceContainerObject::getResourceTypeId() const
+{
+	return m_resourceType.get();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * For debugging only, convert this container to the recycled equivalent.
+ * This is not intended for uses other than debugging, because the container
+ * might not be the right kind of container to hold the recycled resource
+ */
+bool ResourceContainerObject::debugRecycle()
+{
+	if (!isAuthoritative())
+		return false;
+
+	ResourceTypeObject const * const resourceType=getResourceType();
+	if (!resourceType)
+		return false;
+	if (resourceType->isRecycled())
+		return true; // already recycled
+	ResourceTypeObject const * const recycledType=resourceType->getRecycledVersion();
+	if (!recycledType)
+		return false; // no recycled version of this resource
+	DEBUG_FATAL(recycledType == resourceType,("Programmer bug:  resourceType->getRecycledVersion on %s returned the same type.",resourceType->getResourceName().c_str()));
+
+	m_resourceType = recycledType->getNetworkId();
+	updateResourceNames();
+	return true;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.h b/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.h
new file mode 100644
index 00000000..8dcaee0b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ResourceContainerObject.h
@@ -0,0 +1,101 @@
+//========================================================================
+//
+// ResourceContainerObject.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ResourceContainerObject_H
+#define _INCLUDED_ResourceContainerObject_H
+
+#include "serverGame/TangibleObject.h"
+
+class ResourceTypeObject;
+class ServerResourceContainerObjectTemplate;
+
+// ======================================================================
+
+class ResourceContainerObject : public TangibleObject
+{
+  public:
+	
+	ResourceContainerObject(const ServerResourceContainerObjectTemplate* newTemplate);
+	virtual               ~ResourceContainerObject();
+
+	static void            removeDefaultTemplate(void);
+	virtual Controller*    createDefaultController(void);
+
+	// Container transfers
+	bool                   addResource     (const NetworkId &resourceType, int amount, const NetworkId &sourcePlayer);
+	bool                   addResource     (ResourceTypeObject const * const resourceType, int amount, NetworkId const & sourcePlayer);
+	bool                   removeResource  (const NetworkId &resourceType, int amount, stdvector<std::pair<NetworkId, int> >::fwd *sources);
+	bool                   removeResourceWithoutExperience(const NetworkId &resourceType, int amount); //TODO: rewrite crafting to handle experience, remove this function
+	bool                   transferTo      (ResourceContainerObject &destination, int amount);
+	bool                   splitContainer  (int amount, const CachedNetworkId &destContainer, int arrangementId, const Vector &newLocation, ServerObject *actor);
+	bool                   debugRecycle    ();
+
+	ResourceTypeObject const * const getResourceType () const;
+	NetworkId              getResourceTypeId () const;
+	int                    getQuantity     () const;
+	int                    getMaxQuantity  () const;
+
+	std::string            getResourceCtsData() const;
+	void                   setResourceCtsData(int quantity, const std::string & resourceData);
+
+	std::string            debugPrint      () const;
+	virtual void           getAttributes   (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+	virtual void           endBaselines    ();
+
+	virtual std::string    getItemLog() const;
+	
+  protected:
+
+	virtual const SharedObjectTemplate *  getDefaultSharedTemplate(void) const;
+
+  private:
+	void                   addResourceSource(const NetworkId &source, int amount);
+	bool                   transferHelper   (ResourceContainerObject &destination, int amount, const NetworkId &resourceSourcePlayer);
+	bool                   internalRemoveResource (const NetworkId &resourceType, int amount, NetworkId &source, int &amountRemoved);
+		
+  private:
+	ResourceContainerObject();
+	ResourceContainerObject(const ResourceContainerObject& rhs);
+	ResourceContainerObject&	operator=(const ResourceContainerObject& rhs);
+
+  private:
+	void                    addMembersToPackages();
+	void                    updateResourceNames ();
+
+	static const SharedObjectTemplate * m_defaultSharedTemplate;	// template to use if no shared template is given
+
+	// persisted
+	Archive::AutoDeltaVariable<NetworkId>        m_resourceType;
+
+	Archive::AutoDeltaVariable<int>              m_quantity;
+	Archive::AutoDeltaVariable<NetworkId>        m_source;
+
+	//non-persisted
+	Archive::AutoDeltaVariable<int>              m_maxQuantity;
+	Archive::AutoDeltaVariable<Unicode::String>  m_resourceName;
+	Archive::AutoDeltaVariable<std::string>      m_parentName;
+	Archive::AutoDeltaVariable<StringId>         m_resourceNameId;
+};
+
+// ----------------------------------------------------------------------
+
+inline int ResourceContainerObject::getQuantity() const
+{
+	return m_quantity.get();
+}
+	
+// ----------------------------------------------------------------------
+
+inline int ResourceContainerObject::getMaxQuantity() const
+{
+	return m_maxQuantity.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_ResourceContainerObject_H
diff --git a/engine/server/library/serverGame/src/shared/object/ResourcePoolObject.cpp b/engine/server/library/serverGame/src/shared/object/ResourcePoolObject.cpp
new file mode 100644
index 00000000..c5efc41b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ResourcePoolObject.cpp
@@ -0,0 +1,135 @@
+//========================================================================
+//
+// ResourcePoolObject.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ResourcePoolObject.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedFractal/MultiFractal.h"
+
+#include <stdio.h>
+
+// ----------------------------------------------------------------------
+
+ResourcePoolObject::ResourcePoolObject(ResourceTypeObject const & resourceType, PlanetObject const & planetObject, uint32 fractalSeed) :
+		m_resourceType(resourceType),
+		m_planet(planetObject),
+		m_fractalData(resourceType.getFractalData()),
+		m_fractalSeed(fractalSeed),
+		m_depletedTimestamp(resourceType.getDepletedTimestamp()),
+		m_efficiencyMap(NULL)
+{
+}
+
+//-----------------------------------------------------------------------
+
+ResourcePoolObject::~ResourcePoolObject()
+{
+	delete m_efficiencyMap;
+	m_efficiencyMap=NULL;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Called to harvest resources from the pool.
+ * @param lastHarvestTick Tick count the last time this harvester
+ * harvested from the pool.
+ * @param installedEfficiency The value returned by placeHarvester() when
+ * the harvester was placed.
+ * @param harvesterId The objectID of the harvester collecting the resource.
+ */
+float ResourcePoolObject::harvest(float installedEfficiency, uint32 lastHarvestTime) const
+{
+	int elapsedTime=static_cast<int>(std::min(ServerClock::getInstance().getGameTimeSeconds(),m_depletedTimestamp) - lastHarvestTime);
+	if (elapsedTime < 0)
+		return 0;
+	float elapsedTicks =static_cast<float>(elapsedTime) / static_cast<float>(ConfigServerGame::getSecondsPerResourceTick());
+	float amountHarvested = elapsedTicks * installedEfficiency;
+
+	return amountHarvested;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Get the value of the efficiency map at a specific location.
+ */
+
+float ResourcePoolObject::getEfficiencyAtLocation(float x, float z) const
+{
+	if (!m_efficiencyMap)
+	{
+		m_efficiencyMap = new MultiFractal;
+		
+		m_efficiencyMap->setSeed(m_fractalSeed);
+		m_efficiencyMap->setScale(m_fractalData.m_scaleX, m_fractalData.m_scaleY);
+		m_efficiencyMap->setBias(true,m_fractalData.m_bias);
+		m_efficiencyMap->setGain(true,m_fractalData.m_gain);
+		m_efficiencyMap->setCombinationRule(static_cast<MultiFractal::CombinationRule>(m_fractalData.m_combinationRule));
+		m_efficiencyMap->setFrequency(m_fractalData.m_frequency);
+		m_efficiencyMap->setAmplitude(m_fractalData.m_amplitude);
+		m_efficiencyMap->setNumberOfOctaves(m_fractalData.m_octaves);
+	}
+	return m_efficiencyMap->getValue(x,z);
+}
+
+// ----------------------------------------------------------------------
+
+void ResourcePoolObject::debugOutput(Unicode::String &output) const
+{
+	char buffer[256];
+
+	sprintf(buffer,"Pool of %s:  ",m_resourceType.getNetworkId().getValueString().c_str());
+	output+=Unicode::narrowToWide(buffer)+Unicode::narrowToWide(m_resourceType.getResourceName());
+
+	if (isDepleted())
+		output+=Unicode::narrowToWide("  DEPLETED");
+	else
+	{
+		sprintf(buffer,"  %lu time units left\n",(m_depletedTimestamp - ServerClock::getInstance().getGameTimeSeconds())/ConfigServerGame::getResourceTimeScale());
+		output+=Unicode::narrowToWide(buffer);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Extract resource from the pool once only.  To avoid requiring a callback,
+ * this function will allow you to harvest from a proxy object, possibly
+ * giving you a little more than you could normally get if the pool is
+ * almost depleted.
+ * @param amount Maximum amount to harvest.
+ * @location Point to use for the effeciency calculation.
+ * @return Amount of resource you receive.
+ */
+int ResourcePoolObject::oneTimeHarvest(int amount, const Vector & location) const
+{
+	if (isDepleted())
+		return 0;
+	
+	int result = static_cast<int>(static_cast<float>(amount) * getEfficiencyAtLocation(location.x, location.z));
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+bool ResourcePoolObject::isDepleted() const
+{
+	return m_resourceType.isDepleted();
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/ResourcePoolObject.h b/engine/server/library/serverGame/src/shared/object/ResourcePoolObject.h
new file mode 100644
index 00000000..99661f56
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ResourcePoolObject.h
@@ -0,0 +1,75 @@
+//========================================================================
+//
+// ResourcePoolObject.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef INCLUDED_ResourcePoolObject_H
+#define INCLUDED_ResourcePoolObject_H
+
+#include "serverGame/UniverseObject.h"
+#include "sharedObject/CachedNetworkId.h"
+
+class DynamicVariableList;
+class MultiFractal;
+class PlanetObject;
+class ResourceTypeObject;
+struct ResourceFractalData;
+
+// ======================================================================
+
+/** 
+ * A pool of a resource found on a planet.
+ *
+ * Represents the planet's supply of a particular resource.
+ */
+
+class ResourcePoolObject
+{
+  public:
+	// getter functions
+	ResourceTypeObject const & getResourceType       () const;
+	bool                    isDepleted               () const;
+	float                   getEfficiencyAtLocation  (float x, float z) const;
+	CachedNetworkId const & getPlanet                () const;
+	void                    debugOutput              (Unicode::String &output) const;
+
+	// simulation functions
+	float                   harvest                  (float installedEfficiency, uint32 lastHarvestTick) const;
+	int                     oneTimeHarvest           (int amount, const Vector &location) const;
+
+	ResourcePoolObject(ResourceTypeObject const & resourceType, PlanetObject const & planetObject, uint32 fractalSeed);
+	virtual ~ResourcePoolObject();
+
+  private:
+	ResourcePoolObject(const ResourcePoolObject& rhs);
+	ResourcePoolObject&	operator=(const ResourcePoolObject& rhs);
+
+  private:
+	ResourceTypeObject const & m_resourceType;
+	CachedNetworkId const m_planet;
+	ResourceFractalData const & m_fractalData;
+	uint32 const m_fractalSeed;
+	uint32 m_depletedTimestamp;
+	MultiFractal mutable * m_efficiencyMap;
+};
+
+// ======================================================================
+
+inline ResourceTypeObject const & ResourcePoolObject::getResourceType() const
+{
+	return m_resourceType;
+}
+
+// ----------------------------------------------------------------------
+
+inline CachedNetworkId const & ResourcePoolObject::getPlanet() const
+{
+	return m_planet;
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/ResourceTypeObject.cpp b/engine/server/library/serverGame/src/shared/object/ResourceTypeObject.cpp
new file mode 100644
index 00000000..536c4e4f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ResourceTypeObject.cpp
@@ -0,0 +1,547 @@
+//========================================================================
+//
+// ResourceTypeObject.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ResourceTypeObject.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ObjectIdManager.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/ResourcePoolObject.h"
+#include "serverGame/ServerResourceClassObject.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverNetworkMessages/AddResourceTypeMessage.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedRandom/Random.h"
+
+#include <map>
+#include <cstdio>
+#include <vector>
+
+// ======================================================================
+
+/**
+ * Constructor to spawn a new resource type from the specified class
+ */
+ResourceTypeObject::ResourceTypeObject(ServerResourceClassObject & parent) :
+		m_networkId(ObjectIdManager::getNewObjectId()),
+		m_resourceName((parent.isRecycled() || parent.isPermanent()) ? "@" + parent.getFriendlyName().getCanonicalRepresentation() : ServerUniverse::getInstance().generateRandomResourceName(parent.getNameTable())),
+		m_resourceClass(parent),
+		m_attributes(),
+		m_fractalData(parent.getFractalData()),
+		m_fractalSeeds(),
+		m_depletedTimestamp((parent.isRecycled() || parent.isPermanent()) ? ServerClock::cms_endOfTime : ServerClock::getInstance().getGameTimeSeconds() + static_cast<uint32>(Random::random(parent.getMinPoolSize(),parent.getMaxPoolSize())) * ConfigServerGame::getResourceTimeScale()),
+		m_pools()
+{
+	
+	LOG("CustomerService",("Resource Type %s spawned from class %s",getResourceName().c_str(),m_resourceClass.getResourceClassName().c_str()));
+
+	rollAttributes();
+
+	if (!parent.isRecycled() && !parent.isPermanent())
+	{
+		// Pick planets and fractal seeds
+		std::vector<std::string> possiblePlanets = parent.getPossiblePlanets();
+		for (int numPools = Random::random(parent.getMinPools(), parent.getMaxPools()); numPools > 0; --numPools)
+		{
+			if (possiblePlanets.size()==0)
+			{
+				WARNING_STRICT_FATAL(true,("Needed to spawn pool for resource %s (%s), but there were no possible planets remaining.",m_resourceName.c_str(), parent.getResourceClassName().c_str()));
+				break;
+			}
+
+			size_t const choiceIndex = static_cast<size_t>(Random::random(0,static_cast<int>(possiblePlanets.size())-1));
+			PlanetObject const * const planet = ServerUniverse::getInstance().getPlanetByName(possiblePlanets[choiceIndex]);
+			if (!planet)
+				WARNING_STRICT_FATAL(true,("Resource type %s specified planet %s, which could not be found\n",
+										   getNetworkId().getValueString().c_str(),possiblePlanets[choiceIndex].c_str()));
+			else
+			{
+				IGNORE_RETURN(m_fractalSeeds.insert(std::make_pair(planet->getNetworkId(), Random::random())));  //lint !e1025 !e1703 // lint can't parse this for some reason
+				LOG("CustomerService",("Resource Pool of %s (class %s) spawned on %s",
+									   getResourceName().c_str(),m_resourceClass.getResourceClassName().c_str(),possiblePlanets[choiceIndex].c_str()));
+				
+				possiblePlanets[choiceIndex] = possiblePlanets.back();
+				possiblePlanets.pop_back();
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+ResourceTypeObject::~ResourceTypeObject()
+{
+
+}
+
+// ----------------------------------------------------------------------
+
+void ResourceTypeObject::debugOutput(std::string &output, int numSpaces) const
+{
+	char buffer[30];
+	sprintf(buffer,"%s",getNetworkId().getValueString().c_str());
+
+	{
+		for (int i=0; i<numSpaces; ++i)
+		{
+			output+="  ";
+		}
+	}
+
+	output+=buffer;
+	output+=":  ";
+	output+=getResourceName();
+	output+=" ";
+	if (!isDepleted())
+	{
+		output+=ServerClock::getInstance().getDebugPrintableTimeframe(m_depletedTimestamp - ServerClock::getInstance().getGameTimeSeconds());
+		output+=" remaining";
+	}
+	else
+		output+="depleted";
+	output+=" (";
+	{
+		for (FractalSeedsType::const_iterator i=m_fractalSeeds.begin(); i!=m_fractalSeeds.end(); )
+		{
+			PlanetObject const * const planet = safe_cast<PlanetObject const *>(NetworkIdManager::getObjectById(i->first));
+			if (planet)
+			{
+				output += planet->getName();
+			}
+			if (++i != m_fractalSeeds.end())
+				output += ',';
+		}
+	}
+	output+=")\n";
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Change a resource name (console/god command)
+ */
+void ResourceTypeObject::setName(const std::string &newName)
+{
+	if (ServerUniverse::getInstance().isAuthoritative())
+	{
+		ServerUniverse::getInstance().renameResourceType(m_resourceName,newName);
+		m_resourceName=newName;
+		ServerUniverse::getInstance().sendUpdatedTypeToAllServers(*this);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+ResourcePoolObject *ResourceTypeObject::getPoolForPlanet(PlanetObject const &planetObject) const
+{
+	if (isRecycled())
+		return NULL;
+
+	std::map<NetworkId, ResourcePoolObject*>::const_iterator i=m_pools.find(planetObject.getNetworkId());
+	if (i==m_pools.end())
+	{
+		FractalSeedsType::const_iterator seed = m_fractalSeeds.find(planetObject.getNetworkId());
+		if (seed != m_fractalSeeds.end())
+		{
+			// create the object for the pool the first time someone needs it
+			ResourcePoolObject *obj = new ResourcePoolObject(*this, planetObject, seed->second);
+			m_pools[planetObject.getNetworkId()]=obj;
+			return obj;
+		}
+		else
+		{
+			if (ConfigServerGame::getSpawnAllResources())
+			{
+				ResourcePoolObject *obj = new ResourcePoolObject(*this, planetObject, 0);
+				m_pools[planetObject.getNetworkId()]=obj;
+				return obj;
+			}
+			return NULL; // no pool for this planet
+		}
+	}
+	else
+		return i->second;
+}
+
+// ----------------------------------------------------------------------
+
+bool ResourceTypeObject::hasPoolForPlanet (const NetworkId &planet) const
+{
+	return (!isDepleted()) && (m_fractalSeeds.find(planet) != m_fractalSeeds.end());
+
+}
+
+// ----------------------------------------------------------------------
+
+ServerResourceClassObject const & ResourceTypeObject::getParentClass() const
+{
+	return m_resourceClass; //   lint !e1536 // exposing "low access member" -- Lint thinks we're returning a reference to m_resouceClass itself, but we're actually returning a reference to the thing m_resourceClass refers to
+}
+
+// ----------------------------------------------------------------------
+
+bool ResourceTypeObject::isDepleted() const
+{
+	return (m_depletedTimestamp <= ServerClock::getInstance().getGameTimeSeconds());
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the number of non-depleted pools of this resource.
+ */
+int ResourceTypeObject::getNumPools() const
+{
+	return isDepleted() ? 0 : static_cast<int>(m_fractalSeeds.size());
+}
+
+// ----------------------------------------------------------------------
+
+/** 
+ * Returns true if this ResourceType is derived (directly or indirectly) from the class.
+ */
+bool ResourceTypeObject::isDerivedFrom(const ResourceClassObject &masterClass) const
+{
+	return m_resourceClass.isDerivedFrom(masterClass);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the template name for the appropriate kind of crate to use for this resource.
+ */
+void ResourceTypeObject::getCrateTemplate(std::string &buffer) const
+{
+	m_resourceClass.getCrateTemplate(buffer);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Get only those attributes specific to the resource
+ */
+void ResourceTypeObject::getResourceAttributes (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+{
+	for (AttributesType::const_iterator i=m_attributes.begin(); i!=m_attributes.end(); ++i)
+	{
+		char buffer[300];
+		sprintf(buffer,"%i",i->second);
+		data.push_back(std::pair<std::string, Unicode::String>(i->first,Unicode::narrowToWide(buffer)));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & ResourceTypeObject::getResourceName() const
+{
+	static std::string const unnamed("unnamed");
+	
+	if (isNamed())
+		return m_resourceName;
+	else
+		return unnamed;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Force this resource type to be depleted.
+ * (Console/God command)
+ */
+void ResourceTypeObject::deplete()
+{
+	DEBUG_FATAL(!ServerUniverse::getInstance().isAuthoritative(),("Programmer bug:  ResourceTypeObject::deplete() should only be called on the authoritative server.  Use ServerUniverse::manualDepleteResource() instead."));
+
+	if (ServerUniverse::getInstance().isAuthoritative())
+	{
+		m_depletedTimestamp = ServerClock::getInstance().getGameTimeSeconds();
+		ServerUniverse::getInstance().sendUpdatedTypeToAllServers(*this);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+ResourcePoolObject * ResourceTypeObject::getPoolForCurrentPlanet() const
+{
+	return getPoolForPlanet(*(NON_NULL(ServerUniverse::getInstance().getCurrentPlanet())));
+}
+
+// ----------------------------------------------------------------------
+
+ResourceFractalData const & ResourceTypeObject::getFractalData() const
+{
+	return m_fractalData;
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & ResourceTypeObject::getNetworkId() const
+{
+	return m_networkId;
+}
+
+// ----------------------------------------------------------------------
+
+uint32 ResourceTypeObject::getDepletedTimestamp() const
+{
+	return m_depletedTimestamp;
+}
+
+// ----------------------------------------------------------------------
+
+int ResourceTypeObject::getAttribute(std::string const & attributeName) const
+{
+	AttributesType::const_iterator i=m_attributes.find(attributeName);
+	if (i==m_attributes.end())
+		return -1;
+	else
+		return i->second;	
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Pack this resource type into a AddResourceTypeMessageNamespace::ResourceTypeData,
+ * which can be used to send it on the network.
+ */
+void ResourceTypeObject::getDataForMessage(AddResourceTypeMessageNamespace::ResourceTypeData & buffer) const
+{
+	buffer.m_networkId = m_networkId;
+	buffer.m_name = m_resourceName;
+	buffer.m_depletedTimestamp = m_depletedTimestamp;	
+	buffer.m_parentClass=m_resourceClass.getResourceClassName();
+		
+	buffer.m_attributes.clear();
+	buffer.m_attributes.reserve(m_attributes.size());
+	{
+		for(AttributesType::const_iterator i=m_attributes.begin(); i!=m_attributes.end(); ++i)
+			buffer.m_attributes.push_back(*i); //lint !e1561 // (Reference initialization causes loss of const/volatile integrity (arg. no. 1))
+	}
+	buffer.m_fractalSeeds.clear();
+	buffer.m_fractalSeeds.reserve(m_fractalSeeds.size());
+	{
+		for(FractalSeedsType::const_iterator i=m_fractalSeeds.begin(); i!=m_fractalSeeds.end(); ++i)
+			buffer.m_fractalSeeds.push_back(*i); //lint !e1025 !e1703 // lint can't parse this line
+	}
+}
+
+// ----------------------------------------------------------------------
+
+ResourceTypeObject::ResourceTypeObject(AddResourceTypeMessageNamespace::ResourceTypeData const & data, ServerResourceClassObject & parentClass) :
+		m_networkId(data.m_networkId),
+		m_resourceName(data.m_name),
+		m_resourceClass(parentClass),
+		m_attributes(),
+		m_fractalData(parentClass.getFractalData()),
+		m_fractalSeeds(),
+		m_depletedTimestamp(data.m_depletedTimestamp),
+		m_pools()
+{
+	if (getParentClass().isRecycled())
+	{
+		// Recalculate recycled resource attributes on every startup, because they may have changed in the data table.  Otherwise recycled resource attributes
+		// could never be changed.  (Regular resources that turn over keep their current attributes, even if the data table changes, until they turn over.)
+		// Since each server does this independantly, recycled resources must have fixed attributes (enforced by rollAttributes()).
+		rollAttributes();
+	}
+	else
+	{
+		for(std::vector<std::pair<std::string, int> >::const_iterator i=data.m_attributes.begin(); i!=data.m_attributes.end(); ++i)
+			IGNORE_RETURN(m_attributes.insert(*i));
+	}
+	for(std::vector<std::pair<NetworkId, int> >::const_iterator j=data.m_fractalSeeds.begin(); j!=data.m_fractalSeeds.end(); ++j)
+		IGNORE_RETURN(m_fractalSeeds.insert(*j)); //lint !e1025 !e1703 // lint can't parse this line
+}
+
+// ----------------------------------------------------------------------
+
+ResourceTypeObject const * ResourceTypeObject::getRecycledVersion() const
+{
+	ServerResourceClassObject const * const recycledClass = safe_cast<ServerResourceClassObject const *>(m_resourceClass.getRecycledVersion());
+	if (recycledClass)
+	{
+		ResourceTypeObject const * const result = recycledClass->getAResourceType();
+		DEBUG_FATAL(!result,("Programmer or Data bug:  Recycled class %s had no resource types derived from it.  Recycled resources should require 1 resource type be derived from them",recycledClass->getResourceClassName().c_str()));
+		DEBUG_FATAL(result->isDepleted(),("Programmer bug:  recycledClass->getAResourceType() returned a depleted resource.  Recycled resources should never be depleted."));
+		return result;
+	}
+	else
+		return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+std::string ResourceTypeObject::getResourceTypeDataForExport() const
+{
+	std::string resourceData;
+	if (m_networkId.getValue() <= NetworkId::cms_maxNetworkIdWithoutClusterId)
+	{
+		resourceData = FormattedString<512>().sprintf("%s~%u~%s~%s~%s", GameServer::getInstance().getClusterName().c_str(), GameServer::getInstance().getClusterId(), getResourceName().c_str(), m_networkId.getValueString().c_str(), m_resourceClass.getResourceClassName().c_str());
+
+		for (std::map<std::string, int>::const_iterator iter = m_attributes.begin(); iter != m_attributes.end(); ++iter)
+		{
+			resourceData += "~";
+			resourceData += FormattedString<512>().sprintf("%s %d", iter->first.c_str(), iter->second);
+		}
+
+		return resourceData;
+	}
+
+	std::string const & resourceNameWithCluster = getResourceName();
+	std::string::size_type const openParenPos = resourceNameWithCluster.find('(');
+	if (openParenPos != std::string::npos)
+	{
+		std::string::size_type const closeParenPos = resourceNameWithCluster.find(')');
+		if ((closeParenPos != std::string::npos) && ((openParenPos + 1) < closeParenPos) && ((closeParenPos + 1) < resourceNameWithCluster.size()))
+		{
+			std::string const clusterName = resourceNameWithCluster.substr((openParenPos + 1), (closeParenPos - openParenPos - 1));
+			std::string const resourceName = resourceNameWithCluster.substr(closeParenPos + 1);
+
+			if (!clusterName.empty() && !resourceName.empty())
+			{
+				NetworkId const resourceId = NetworkId(m_networkId.getValueWithoutClusterId());
+				uint8 const clusterId = m_networkId.getValueClusterId();
+				if (resourceId.isValid() && (resourceId.getValue() <= NetworkId::cms_maxNetworkIdWithoutClusterId) && (clusterId > 0))
+				{
+					resourceData = FormattedString<512>().sprintf("%s~%u~%s~%s~%s", clusterName.c_str(), clusterId, resourceName.c_str(), resourceId.getValueString().c_str(), m_resourceClass.getResourceClassName().c_str());
+
+					for (std::map<std::string, int>::const_iterator iter = m_attributes.begin(); iter != m_attributes.end(); ++iter)
+					{
+						resourceData += "~";
+						resourceData += FormattedString<512>().sprintf("%s %d", iter->first.c_str(), iter->second);
+					}
+				}
+			}
+		}
+	}
+
+	return resourceData;
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId ResourceTypeObject::addImportedResourceType(std::string const & resourceData)
+{
+	static Unicode::String const delimiters(Unicode::narrowToWide("~"));
+	static Unicode::String const attributeDelimiters(Unicode::narrowToWide(" "));
+	Unicode::UnicodeStringVector tokens;
+	static size_t const resourceAttributeIndex = 5;
+	if ((Unicode::tokenize(Unicode::narrowToWide(resourceData), tokens, &delimiters, NULL)) && (tokens.size() > resourceAttributeIndex))
+	{
+		AddResourceTypeMessageNamespace::ResourceTypeData rtd;
+		rtd.m_depletedTimestamp = 1;
+
+		std::string const sourceGalaxy = Unicode::wideToNarrow(tokens[0]);
+		int const sourceGalaxyId = ::atoi(Unicode::wideToNarrow(tokens[1]).c_str());
+		rtd.m_name = Unicode::wideToNarrow(tokens[2]);
+		NetworkId const resourceType = NetworkId(Unicode::wideToNarrow(tokens[3]));
+		rtd.m_parentClass = Unicode::wideToNarrow(tokens[4]);
+
+		// save off resource attributes
+		Unicode::UnicodeStringVector attributeTokens;
+		for (size_t i = resourceAttributeIndex; i < tokens.size(); ++i)
+		{
+			attributeTokens.clear();
+			if ((Unicode::tokenize(tokens[i], attributeTokens, &attributeDelimiters, NULL)) && (attributeTokens.size() == 2))
+			{
+				rtd.m_attributes.push_back(std::make_pair(Unicode::wideToNarrow(attributeTokens[0]), ::atoi(Unicode::wideToNarrow(attributeTokens[1]).c_str())));
+			}
+		}
+
+		if (sourceGalaxy.empty() || (sourceGalaxyId < 1) || (sourceGalaxyId > 255) || rtd.m_name.empty() || !resourceType.isValid() || rtd.m_parentClass.empty() || rtd.m_attributes.empty())
+			return NetworkId::cms_invalid;
+
+		rtd.m_name = std::string("(") + sourceGalaxy + std::string(")") + rtd.m_name;
+
+		// resource is locally spawned
+		if (sourceGalaxy == GameServer::getInstance().getClusterName())
+			return resourceType;
+
+		// get the resource parent class
+		ServerResourceClassObject * const parentClass = safe_cast<ServerResourceClassObject *>(ServerUniverse::getInstance().getResourceClassByName(rtd.m_parentClass));
+		if (!parentClass)
+			return NetworkId::cms_invalid;
+
+		// if the resource container is a recycled or permanent resource,
+		// just "convert" it to use the resource on the local galaxy, since
+		// recycled or permanent resource are the same on all galaxies
+		if (parentClass->isRecycled() || parentClass->isPermanent())
+		{
+			ResourceTypeObject const * recycledType = parentClass->getAResourceType();
+			if (recycledType)
+				return recycledType->getNetworkId();
+			else
+				return NetworkId::cms_invalid;
+		}
+
+		rtd.m_networkId = NetworkId(resourceType.getValueWithClusterId(static_cast<uint8>(sourceGalaxyId), static_cast<NetworkId::NetworkIdType>(1), NetworkId::cms_maxNetworkIdWithoutClusterId));
+		if (rtd.m_networkId.getValue() <= NetworkId::cms_maxNetworkIdWithoutClusterId)
+			return NetworkId::cms_invalid;
+
+		if (!ServerUniverse::getInstance().getImportedResourceTypeById(rtd.m_networkId))
+		{
+			ResourceTypeObject * const newType = new ResourceTypeObject(rtd, *parentClass);
+			ServerUniverse::getInstance().registerResourceTypeObject(*newType, false);
+		}
+
+		return rtd.m_networkId;
+	}
+
+	return NetworkId::cms_invalid;
+}
+
+// ----------------------------------------------------------------------
+
+bool ResourceTypeObject::isRecycled() const
+{
+	return m_resourceClass.isRecycled();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * We received another AddResourceType message for this type.  Check whether
+ * any of the data needs to be updated.
+ * Updating the name and depleted timestamp is supported.  Other properties
+ * can't be updated in this manner.
+ */
+void ResourceTypeObject::handlePossibleUpdates(AddResourceTypeMessageNamespace::ResourceTypeData const & newData)
+{
+	m_depletedTimestamp = newData.m_depletedTimestamp;
+	if (newData.m_name != m_resourceName)
+	{
+		ServerUniverse::getInstance().renameResourceType(m_resourceName,newData.m_name);
+		m_resourceName=newData.m_name;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Roll up random attributes
+ */
+void ResourceTypeObject::rollAttributes()
+{
+	ServerResourceClassObject const & parent = getParentClass();
+	ServerResourceClassObject::ResourceAttributeRangesType const & ranges = parent.getResourceAttributeRanges();
+	bool const recycled = parent.isRecycled();
+	m_attributes.clear();
+	for (ServerResourceClassObject::ResourceAttributeRangesType::const_iterator i=ranges.begin(); i!=ranges.end(); ++i)
+	{
+		WARNING_DEBUG_FATAL(recycled && (i->second.first != i->second.second),("Data bug:  resource type %s is recycled but specifies a range for attribute %s.  Recycled resources must always have fixed attributes",getResourceName().c_str(), i->first.c_str()));
+		IGNORE_RETURN(m_attributes.insert(std::make_pair(i->first, Random::random(i->second.first, i->second.second)))); //lint !e1025 !e1703 // lint can't parse this for some reason
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/ResourceTypeObject.h b/engine/server/library/serverGame/src/shared/object/ResourceTypeObject.h
new file mode 100644
index 00000000..ab7cd184
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ResourceTypeObject.h
@@ -0,0 +1,107 @@
+//========================================================================
+//
+// ResourceTypeObject.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef INCLUDED_ResourceTypeObject_H
+#define INCLUDED_ResourceTypeObject_H
+
+#include "serverGame/UniverseObject.h"
+#include "serverUtility/ResourceFractalData.h"
+#include "sharedObject/CachedNetworkId.h"
+
+class PlanetObject;
+class ResourceClassObject;
+class ResourcePoolObject;
+class ServerResourceClassObject;
+
+// ======================================================================
+
+namespace AddResourceTypeMessageNamespace
+{
+	class ResourceTypeData;
+}
+
+// ======================================================================
+
+/** 
+ * A pool of a resource found on a planet.
+ *
+ * Represents the planet's supply of a particular resource.
+ */
+
+class ResourceTypeObject
+{
+  public:
+	ResourceTypeObject(ServerResourceClassObject &parent);
+	ResourceTypeObject(AddResourceTypeMessageNamespace::ResourceTypeData const & data, ServerResourceClassObject & parentClass);
+	virtual ~ResourceTypeObject();
+
+  public:
+	void setName(const std::string &newName);
+	void debugOutput(std::string &output, int numSpaces=0) const;
+
+	NetworkId const &           getNetworkId     () const;
+	std::string const &         getResourceName  () const;
+	bool                        isNamed          () const;
+	bool                        isDepleted       () const;
+	bool                        isRecycled       () const;
+	int                         getNumPools      () const;
+	ServerResourceClassObject const & getParentClass() const;
+	ResourcePoolObject *        getPoolForPlanet(PlanetObject const &planetObject) const;
+	ResourcePoolObject *        getPoolForCurrentPlanet() const;
+	bool                        hasPoolForPlanet (const NetworkId &planet) const;
+	bool                        isDerivedFrom    (const ResourceClassObject &masterClass) const;
+	void                        getCrateTemplate (std::string &buffer) const;
+	void                        getResourceAttributes (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+	const stdmap<std::string, int>::fwd & getResourceAttributes () const;
+	ResourceFractalData const & getFractalData() const;
+	uint32                      getDepletedTimestamp() const;
+	void                        deplete          ();
+	void                        handlePossibleUpdates(AddResourceTypeMessageNamespace::ResourceTypeData const & newData);
+	int                         getAttribute     (std::string const & attributeName) const;
+	void                        getDataForMessage(AddResourceTypeMessageNamespace::ResourceTypeData & buffer) const;
+	ResourceTypeObject const *  getRecycledVersion () const;
+	std::string                 getResourceTypeDataForExport() const;
+	static NetworkId            addImportedResourceType(std::string const & resourceData);
+	
+  private:
+	PlanetObject *pickPlanetForSpawn ();
+	void rollAttributes();
+		
+  private:
+	ResourceTypeObject(const ResourceTypeObject& rhs);
+	ResourceTypeObject&	operator=(const ResourceTypeObject& rhs);
+
+  private:
+	NetworkId       m_networkId;
+	std::string m_resourceName;
+	ServerResourceClassObject & m_resourceClass;
+	typedef std::map<std::string, int> AttributesType;
+	AttributesType m_attributes;
+	ResourceFractalData m_fractalData;
+	typedef std::map<NetworkId, uint32> FractalSeedsType;
+	FractalSeedsType m_fractalSeeds;
+	uint32 m_depletedTimestamp;
+	
+	mutable std::map<NetworkId, ResourcePoolObject*> m_pools;
+};
+
+// ======================================================================
+
+inline bool ResourceTypeObject::isNamed() const
+{
+	return (m_resourceName.size() > 0);
+}
+
+inline const std::map<std::string, int> & ResourceTypeObject::getResourceAttributes () const
+{
+	return m_attributes;
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/ServerClearCollidableFloraNotification.cpp b/engine/server/library/serverGame/src/shared/object/ServerClearCollidableFloraNotification.cpp
new file mode 100644
index 00000000..9cb266b0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerClearCollidableFloraNotification.cpp
@@ -0,0 +1,115 @@
+//===================================================================
+//
+// ServerClearCollidableFloraNotification.cpp
+// asommers
+//
+// copyright 2001, sony online entertainment
+//
+//===================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerClearCollidableFloraNotification.h"
+
+#include "serverGame/ServerObject.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedTerrain/ProceduralTerrainAppearance.h"
+#include "sharedTerrain/TerrainObject.h"
+
+//===================================================================
+// STATIC PUBLIC ServerClearCollidableFloraNotification
+//===================================================================
+
+ServerClearCollidableFloraNotification ServerClearCollidableFloraNotification::ms_instance;
+
+//-------------------------------------------------------------------
+
+ServerClearCollidableFloraNotification& ServerClearCollidableFloraNotification::getInstance ()
+{
+	return ms_instance;
+}
+
+//===================================================================
+// PUBLIC ServerClearCollidableFloraNotification
+//===================================================================
+
+ServerClearCollidableFloraNotification::ServerClearCollidableFloraNotification () :
+	ObjectNotification ()
+{
+}
+
+//-------------------------------------------------------------------
+	
+ServerClearCollidableFloraNotification::~ServerClearCollidableFloraNotification ()
+{
+}
+
+//-------------------------------------------------------------------
+
+void ServerClearCollidableFloraNotification::addToWorld (Object& object) const
+{
+	const ServerObject* const serverObject = dynamic_cast<const ServerObject*> (&object);
+	if (!serverObject)
+	{
+		DEBUG_WARNING (true, ("ServerClearCollidableFloraNotification::addToWorld - [%s] is not a server object", object.getObjectTemplate ()->getName ()));
+		return;
+	}
+
+	const SharedObjectTemplate* const objectTemplate = dynamic_cast<const SharedObjectTemplate*> (serverObject->getSharedTemplate ());
+	if (!objectTemplate)
+	{
+		DEBUG_WARNING (true, ("ServerClearCollidableFloraNotification::addToWorld - [%s] does not have a shared object template", object.getObjectTemplate ()->getName ()));
+		return;
+	}
+
+	const float clearFloraRadius = objectTemplate->getClearFloraRadius ();
+	if (clearFloraRadius <= 0.f)
+	{
+		DEBUG_WARNING (true, ("ServerClearCollidableFloraNotification::addToWorld - [%s] has a clearFloraRadius (%1.2f) <= 0", object.getObjectTemplate ()->getName (), clearFloraRadius));
+		return;
+	}
+
+	TerrainObject* const terrainObject = TerrainObject::getInstance ();
+	if (!terrainObject)
+	{
+		DEBUG_WARNING (true, ("ServerClearCollidableFloraNotification::addToWorld - no terrain"));
+		return;		
+	}
+
+	terrainObject->addClearCollidableFloraObject (&object, object.getPosition_w (), clearFloraRadius);
+}
+
+//-------------------------------------------------------------------
+
+void ServerClearCollidableFloraNotification::removeFromWorld (Object& object) const
+{
+	TerrainObject* const terrainObject = TerrainObject::getInstance ();
+	if (!terrainObject)
+	{
+		DEBUG_WARNING (true, ("ServerClearCollidableFloraNotification::addToWorld - no terrain"));
+		return;		
+	}
+
+	terrainObject->removeClearCollidableFloraObject (&object);
+}
+
+//-------------------------------------------------------------------
+
+bool ServerClearCollidableFloraNotification::positionChanged (Object& object, bool /*dueToParentChange*/, const Vector& /*oldPosition*/) const
+{
+	removeFromWorld (object);
+	addToWorld (object);
+
+	return true;
+}
+
+//-------------------------------------------------------------------
+
+bool ServerClearCollidableFloraNotification::positionAndRotationChanged (Object& object, bool /*dueToParentChange*/, const Vector& /*oldPosition*/) const
+{
+	removeFromWorld (object);
+	addToWorld (object);
+
+	return true;
+}
+
+//===================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/ServerClearCollidableFloraNotification.h b/engine/server/library/serverGame/src/shared/object/ServerClearCollidableFloraNotification.h
new file mode 100644
index 00000000..de3aaf8f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerClearCollidableFloraNotification.h
@@ -0,0 +1,48 @@
+//===================================================================
+//
+// ServerClearCollidableFloraNotification.h
+// asommers
+//
+// copyright 2002, sony online entertainment
+//
+//===================================================================
+
+#ifndef INCLUDED_ServerClearCollidableFloraNotification_H
+#define INCLUDED_ServerClearCollidableFloraNotification_H
+
+//===================================================================
+
+#include "sharedObject/ObjectNotification.h"
+
+//===================================================================
+
+class ServerClearCollidableFloraNotification : public ObjectNotification
+{
+public:
+
+	static ServerClearCollidableFloraNotification& getInstance ();
+
+public:
+
+	ServerClearCollidableFloraNotification ();
+	virtual ~ServerClearCollidableFloraNotification ();
+
+	virtual void addToWorld (Object& object) const;
+	virtual void removeFromWorld (Object& object) const;
+
+	virtual bool positionChanged (Object& object, bool dueToParentChange, const Vector& oldPosition) const;
+	virtual bool positionAndRotationChanged (Object& object, bool dueToParentChange, const Vector& oldPosition) const;
+
+private:
+
+	ServerClearCollidableFloraNotification (const ServerClearCollidableFloraNotification&);
+	ServerClearCollidableFloraNotification& operator= (const ServerClearCollidableFloraNotification&);
+
+private:
+
+	static ServerClearCollidableFloraNotification ms_instance;
+};
+
+//===================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/ServerCollisionProperty.cpp b/engine/server/library/serverGame/src/shared/object/ServerCollisionProperty.cpp
new file mode 100644
index 00000000..824b35bf
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerCollisionProperty.cpp
@@ -0,0 +1,53 @@
+// ======================================================================
+//
+// ServerCollisionProperty.cpp
+//
+// Copyright 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerCollisionProperty.h"
+
+#include "serverGame/CreatureObject.h"
+
+// ======================================================================
+
+ServerCollisionProperty::ServerCollisionProperty(ServerObject &owner) :
+	CollisionProperty(owner)
+{
+}
+
+// ----------------------------------------------------------------------
+
+ServerCollisionProperty::ServerCollisionProperty(ServerObject &owner, SharedObjectTemplate const *objTemplate) :
+	CollisionProperty(owner, objTemplate)
+{
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerCollisionProperty::canCollideWith (CollisionProperty const *otherCollision) const
+{
+	if (!otherCollision)
+		return false;
+
+	if (isMobile() && otherCollision->isMobile())
+	{
+		ServerObject const * const ownerServerObject = getOwner().asServerObject();
+		ServerObject const * const otherOwnerServerObject = otherCollision->getOwner().asServerObject();
+
+		CreatureObject const * const ownerA = (ownerServerObject != 0) ? ownerServerObject->asCreatureObject() : 0;
+		CreatureObject const * const ownerB = (otherOwnerServerObject != 0) ? otherOwnerServerObject->asCreatureObject() : 0;
+
+		if (ownerA && (ownerA->isDead() || ownerA->isIncapacitated()))
+			return false;
+		if (ownerB && (ownerB->isDead() || ownerB->isIncapacitated()))
+			return false;
+	}
+
+	return CollisionProperty::canCollideWith(otherCollision);
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/ServerCollisionProperty.h b/engine/server/library/serverGame/src/shared/object/ServerCollisionProperty.h
new file mode 100644
index 00000000..54683e13
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerCollisionProperty.h
@@ -0,0 +1,37 @@
+// ======================================================================
+//
+// ServerCollisionProperty.h
+// Copyright 2002 Sony Online Entertainment
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef INCLUDED_ServerCollisionProperty_H
+#define INCLUDED_ServerCollisionProperty_H
+
+#include "sharedCollision/CollisionProperty.h"
+
+class ServerObject;
+class SharedObjectTemplate;
+
+// ----------------------------------------------------------------------
+
+class ServerCollisionProperty : public CollisionProperty
+{
+public:
+
+	ServerCollisionProperty( ServerObject & owner );
+	ServerCollisionProperty( ServerObject & owner, SharedObjectTemplate const * objTemplate );
+
+	virtual bool canCollideWith ( CollisionProperty const * otherCollision ) const;
+
+private:
+	
+	ServerCollisionProperty();
+	ServerCollisionProperty( ServerCollisionProperty const & copy );
+	ServerCollisionProperty & operator = ( ServerCollisionProperty const & copy );
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/ServerLotManagerNotification.cpp b/engine/server/library/serverGame/src/shared/object/ServerLotManagerNotification.cpp
new file mode 100644
index 00000000..448a8866
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerLotManagerNotification.cpp
@@ -0,0 +1,70 @@
+//===================================================================
+//
+// ServerLotManagerNotification.cpp
+// asommers
+//
+// copyright 2001, sony online entertainment
+//
+//===================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerLotManagerNotification.h"
+
+#include "serverGame/ServerObject.h"
+#include "sharedGame/SharedTangibleObjectTemplate.h"
+
+//===================================================================
+// STATIC PUBLIC ServerLotManagerNotification
+//===================================================================
+
+ServerLotManagerNotification ServerLotManagerNotification::ms_instance;
+
+//-------------------------------------------------------------------
+
+ServerLotManagerNotification& ServerLotManagerNotification::getInstance ()
+{
+	return ms_instance;
+}
+
+//===================================================================
+// PUBLIC ServerLotManagerNotification
+//===================================================================
+
+ServerLotManagerNotification::ServerLotManagerNotification () :
+	LotManagerNotification ()
+{
+}
+
+//-------------------------------------------------------------------
+	
+ServerLotManagerNotification::~ServerLotManagerNotification ()
+{
+}
+
+//-------------------------------------------------------------------
+
+void ServerLotManagerNotification::addToWorld (Object& object) const
+{
+	const ServerObject* const serverObject = dynamic_cast<const ServerObject*> (&object);
+	if (!serverObject)
+	{
+		DEBUG_WARNING (true, ("ServerLotManagerNotification::addToWorld - [%s] is not a server object", object.getObjectTemplate ()->getName ()));
+		return;
+	}
+
+	const SharedTangibleObjectTemplate* const sharedTangibleObjectTemplate = dynamic_cast<const SharedTangibleObjectTemplate*> (serverObject->getSharedTemplate ());
+	if (!sharedTangibleObjectTemplate)
+	{
+		DEBUG_WARNING (true, ("ServerLotManagerNotification::addToWorld - [%s] does not have a shared tangible object template", object.getObjectTemplate ()->getName ()));
+		return;
+	}
+
+	const StructureFootprint* const structureFootprint = sharedTangibleObjectTemplate->getStructureFootprint ();
+	NOT_NULL (structureFootprint);
+
+	if (structureFootprint)
+		LotManagerNotification::addToWorld (object, *structureFootprint);
+}
+
+//===================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/ServerLotManagerNotification.h b/engine/server/library/serverGame/src/shared/object/ServerLotManagerNotification.h
new file mode 100644
index 00000000..43d87c81
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerLotManagerNotification.h
@@ -0,0 +1,44 @@
+//===================================================================
+//
+// ServerLotManagerNotification.h
+// asommers
+//
+// copyright 2001, sony online entertainment
+//
+//===================================================================
+
+#ifndef INCLUDED_ServerLotManagerNotification_H
+#define INCLUDED_ServerLotManagerNotification_H
+
+//===================================================================
+
+#include "sharedGame/LotManagerNotification.h"
+
+//===================================================================
+
+class ServerLotManagerNotification : public LotManagerNotification
+{
+public:
+
+	static ServerLotManagerNotification& getInstance ();
+
+public:
+
+	ServerLotManagerNotification ();
+	virtual ~ServerLotManagerNotification ();
+
+	virtual void addToWorld (Object& object) const;
+
+private:
+
+	ServerLotManagerNotification (const ServerLotManagerNotification&);
+	ServerLotManagerNotification& operator= (const ServerLotManagerNotification&);
+
+private:
+
+	static ServerLotManagerNotification ms_instance;
+};
+
+//===================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/ServerNoBuildNotification.cpp b/engine/server/library/serverGame/src/shared/object/ServerNoBuildNotification.cpp
new file mode 100644
index 00000000..0fb804d0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerNoBuildNotification.cpp
@@ -0,0 +1,67 @@
+//===================================================================
+//
+// ServerNoBuildNotification.cpp
+// asommers
+//
+// copyright 2001, sony online entertainment
+//
+//===================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerNoBuildNotification.h"
+
+#include "serverGame/ServerObject.h"
+#include "sharedGame/SharedObjectTemplate.h"
+
+//===================================================================
+// STATIC PUBLIC ServerNoBuildNotification
+//===================================================================
+
+ServerNoBuildNotification ServerNoBuildNotification::ms_instance;
+
+//-------------------------------------------------------------------
+
+ServerNoBuildNotification& ServerNoBuildNotification::getInstance ()
+{
+	return ms_instance;
+}
+
+//===================================================================
+// PUBLIC ServerNoBuildNotification
+//===================================================================
+
+ServerNoBuildNotification::ServerNoBuildNotification () :
+	NoBuildNotification ()
+{
+}
+
+//-------------------------------------------------------------------
+	
+ServerNoBuildNotification::~ServerNoBuildNotification ()
+{
+}
+
+//-------------------------------------------------------------------
+
+void ServerNoBuildNotification::addToWorld (Object& object) const
+{
+	const ServerObject* const serverObject = dynamic_cast<const ServerObject*> (&object);
+	if (!serverObject)
+	{
+		DEBUG_WARNING (true, ("ServerNoBuildNotification::addToWorld - [%s] is not a server object", object.getObjectTemplate ()->getName ()));
+		return;
+	}
+
+	const SharedObjectTemplate* const sharedObjectTemplate = dynamic_cast<const SharedObjectTemplate*> (serverObject->getSharedTemplate ());
+	if (!sharedObjectTemplate)
+	{
+		DEBUG_WARNING (true, ("ServerNoBuildNotification::addToWorld - [%s] does not have a shared object template", object.getObjectTemplate ()->getName ()));
+		return;
+	}
+
+	const float noBuildRadius = sharedObjectTemplate->getNoBuildRadius ();
+	NoBuildNotification::addToWorld (object, noBuildRadius);
+}
+
+//===================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/ServerNoBuildNotification.h b/engine/server/library/serverGame/src/shared/object/ServerNoBuildNotification.h
new file mode 100644
index 00000000..9312d9c7
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerNoBuildNotification.h
@@ -0,0 +1,44 @@
+//===================================================================
+//
+// ServerNoBuildNotification.h
+// asommers
+//
+// copyright 2001, sony online entertainment
+//
+//===================================================================
+
+#ifndef INCLUDED_ServerNoBuildNotification_H
+#define INCLUDED_ServerNoBuildNotification_H
+
+//===================================================================
+
+#include "sharedGame/NoBuildNotification.h"
+
+//===================================================================
+
+class ServerNoBuildNotification : public NoBuildNotification
+{
+public:
+
+	static ServerNoBuildNotification& getInstance ();
+
+public:
+
+	ServerNoBuildNotification ();
+	virtual ~ServerNoBuildNotification ();
+
+	virtual void addToWorld (Object& object) const;
+
+private:
+
+	ServerNoBuildNotification (const ServerNoBuildNotification&);
+	ServerNoBuildNotification& operator= (const ServerNoBuildNotification&);
+
+private:
+
+	static ServerNoBuildNotification ms_instance;
+};
+
+//===================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp
new file mode 100644
index 00000000..b32f84a9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp
@@ -0,0 +1,8558 @@
+// ======================================================================
+//
+//ServerObject.cpp
+//
+//Copyright 2000-2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerObject.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/AuthTransferTracker.h"
+#include "serverGame/BuildingObject.h"
+#include "serverGame/CellObject.h"
+#include "serverGame/Chat.h"
+#include "serverGame/Client.h"
+#include "serverGame/CommoditiesMarket.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ConnectionServerConnection.h"
+#include "serverGame/ConsoleManager.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/ContainmentMessageManager.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/DistributionListStack.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/InstantDeleteList.h"
+#include "serverGame/IntangibleVolumeContainer.h"
+#include "serverGame/LineOfSightCache.h"
+#include "serverGame/LogoutTracker.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/NetworkTriggerVolume.h"
+#include "serverGame/NewbieTutorial.h"
+#include "serverGame/ObjectIdManager.h"
+#include "serverGame/ObjectTracker.h"
+#include "serverGame/ObserveTracker.h"
+#include "serverGame/PatrolPathNodeProperty.h"
+#include "serverGame/PatrolPathRootProperty.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerQuestObject.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/PlayerSanityChecker.h"
+#include "serverGame/PlayerShipController.h"
+#include "serverGame/PositionUpdateTracker.h"
+#include "serverGame/ResourceContainerObject.h"
+#include "serverGame/ServerClearCollidableFloraNotification.h"
+#include "serverGame/ServerController.h"
+#include "serverGame/ServerCreatureObjectTemplate.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerNoBuildNotification.h"
+#include "serverGame/ServerObjectTemplate.h"
+#include "serverGame/ServerObjectTerrainModificationNotification.h"
+#include "serverGame/ServerResourceContainerObjectTemplate.h"
+#include "serverGame/ServerSecureTrade.h"
+#include "serverGame/ServerSynchronizedUi.h"
+#include "serverGame/ServerUIManager.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/SpaceVisibilityManager.h"
+#include "serverGame/SceneGlobalData.h"
+#include "serverGame/TangibleObject.h"
+#include "serverGame/TangibleVolumeContainer.h"
+#include "serverGame/TeleportFixupHandler.h"
+#include "serverGame/TriggerVolume.h"
+#include "serverGame/VeteranRewardManager.h"
+#include "serverNetworkMessages/AccountFeatureIdRequest.h"
+#include "serverNetworkMessages/AdjustAccountFeatureIdResponse.h"
+#include "serverNetworkMessages/FlagObjectForDeleteMessage.h"
+#include "serverNetworkMessages/GameConnectionServerMessages.h"
+#include "serverNetworkMessages/LoadContainedObjectMessage.h"
+#include "serverNetworkMessages/LoadContentsMessage.h"
+#include "serverNetworkMessages/MessageQueueTeleportObject.h"
+#include "serverNetworkMessages/MessageToAckMessage.h"
+#include "serverNetworkMessages/MessageToMessage.h"
+#include "serverNetworkMessages/MessageToPayload.h"
+#include "serverNetworkMessages/UnloadObjectMessage.h"
+#include "serverPathfinding/ServerPathfindingConstants.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/ChatLogManager.h"
+#include "serverUtility/ServerClock.h"
+#include "Session/CommonAPI/CommonAPI.h"
+#include "sharedCollision/BaseExtent.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFoundation/CalendarTime.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/Clock.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/DynamicVariableLocationData.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/Os.h"
+#include "sharedGame/LfgCharacterData.h"
+#include "sharedGame/PlatformFeatureBits.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/QuestManager.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedGame/SharedStringIds.h"
+#include "sharedGame/SocialsManager.h"
+#include "sharedGame/SpatialChatManager.h"
+#include "sharedLog/Log.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedMessageDispatch/Message.h"
+#include "sharedMessageDispatch/Transceiver.h"
+#include "sharedNetworkMessages/AIDebuggingMessages.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/CommandChannelMessages.h"
+#include "sharedNetworkMessages/DeltasMessage.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/LogoutMessage.h"
+#include "sharedNetworkMessages/MessageQueueCombatSpam.h"
+#include "sharedNetworkMessages/MessageQueueDataTransform.h"
+#include "sharedNetworkMessages/MessageQueueDataTransformWithParent.h"
+#include "sharedNetworkMessages/MessageQueueGeneric.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedNetworkMessages/MessageQueueNetworkIdAndTransform.h"
+#include "sharedNetworkMessages/MessageQueueSocial.h"
+#include "sharedNetworkMessages/MessageQueueSpatialChat.h"
+#include "sharedNetworkMessages/ObjectChannelMessages.h"
+#include "sharedObject/AlterResult.h"
+#include "sharedObject/AlterScheduler.h"
+#include "sharedObject/Appearance.h"
+#include "sharedObject/ArrangementDescriptor.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/ContainedByProperty.h"
+#include "sharedObject/Container.h"
+#include "sharedObject/CustomizationData.h"
+#include "sharedObject/CustomizationDataProperty.h"
+#include "sharedObject/LayerProperty.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/PortalProperty.h"
+#include "sharedObject/RangedIntCustomizationVariable.h"
+#include "sharedObject/SlotDescriptor.h"
+#include "sharedObject/SlotDescriptorList.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/SlottedContainmentProperty.h"
+#include "sharedObject/VolumeContainmentProperty.h"
+#include "sharedTerrain/TerrainObject.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+#include "swgServerNetworkMessages/MessageQueueScriptTransferMoney.h"
+#include <algorithm>
+
+// ======================================================================
+
+namespace DeleteReasons
+{
+	const std::string & describeDeleteReason(const int reason)
+	{
+		switch(reason)
+		{
+		case NotDeleted:
+			{
+				static const std::string r = "NotDeleted";
+				return r;
+			}
+			break;
+		case Decay:
+			{
+				static const std::string r = "Decay";
+				return r;
+			}
+			break;
+		case God:
+			{
+				static const std::string r = "God";
+				return r;
+			}
+			break;
+		case Player:
+			{
+				static const std::string r = "Player";
+				return r;
+			}
+			break;
+		case Script:
+			{
+				static const std::string r = "Script";
+				return r;
+			}
+			break;
+		case CharacterDeleted:
+			{
+				static const std::string r = "CharacterDeleted";
+				return r;
+			}
+			break;
+		case ContainerDeleted:
+			{
+				static const std::string r = "ContainerDeleted";
+				return r;
+			}
+			break;
+		case Publish:
+			{
+				static const std::string r = "Publish";
+				return r;
+			}
+			break;
+		case BadContainerTransfer:
+			{
+				static const std::string r = "BadContainerTransfer";
+				return r;
+			}
+			break;
+		case Consumed:
+			{
+				static const std::string r = "Consumed";
+				return r;
+			}
+			break;
+		case SetupFailed:
+			{
+				static const std::string r = "SetupFailed";
+				return r;
+			}
+			break;
+		case Replaced:
+			{
+				static const std::string r = "Replaced";
+				return r;
+			}
+			break;
+		}
+		static const std::string unknown = "UNKNOWN";
+		return unknown;
+	}
+}
+
+using namespace DeleteReasons;
+
+// ======================================================================
+
+namespace ServerObjectNamespace
+{
+	const std::string OBJVAR_STRUCTURE_PLAYER_PACK("structure.player.pack");
+
+	const std::string OBJVAR_OPEN_BANK_TERMINAL_ID("open_bank_location");
+
+	unsigned long gs_objectCount = 0;
+
+	const char * const portalPropertyCrcObjectVariableName = "portalProperty.crc";
+
+	// ----------------------------------------------------------------------
+
+	const std::string objvar_item_attribute_keys   = "item_attrib_keys";
+	const std::string objvar_item_attribute_values = "item_attrib_values";
+
+	// ----------------------------------------------------------------------
+
+	const uint32 s_clearLocalFlagsOnConcludeMask =
+		~(
+		    (1u<<LocalObjectFlags::ServerObject_DirtyObjectMenuSent)
+		  | (1u<<LocalObjectFlags::ServerObject_DirtyAttributesSent)
+		  | (1u<<LocalObjectFlags::ServerObject_GoingToConclude));
+
+	// ----------------------------------------------------------------------
+
+	// sentinel to keep the messageTo current being
+	// handled from getting removed from m_messageTos
+	std::pair<std::pair<unsigned long, uint64>, MessageToId> s_currentMessageToBeingHandled = std::make_pair(std::make_pair(0, 0), MessageToId::cms_invalid);
+
+	// ----------------------------------------------------------------------
+
+	// list of object types that supports no trade "shared" behavior
+	// (no trade item of those types can be picked up by another character
+	// on the same account as the character who currently owns the item)
+	std::set<uint32> s_noTradeSharedTemplateItemType;
+	std::set<std::string> s_noTradeSharedStaticItemType;
+
+	// ----------------------------------------------------------------------
+
+	void sendDeleteToDatabase(const ServerObject& obj, int reason)
+	{
+		bool const immediate = InstantDeleteList::isOnList(*obj.getObjectTemplate());
+		bool const cascadeDeleteReason = !obj.getLoadContents() && reason == DeleteReasons::House; // Anything that is deleted by house deletion and is demanded-loaded (i.e. cells) should have the delete reason of its contents set to DeleteReasons::House also, instead of DeleteReasons::ContainerDeleted.  This is so the /restoreHouse command can identify these items
+
+		FlagObjectForDeleteMessage const dm(obj.getNetworkId(), reason, immediate, !obj.getLoadContents(), cascadeDeleteReason);
+		GameServer::getInstance().sendToDatabaseServer(dm);
+	}
+
+	//----------------------------------------------------------------------
+
+	void flagChildObjectsForDeletion(ServerObject &obj, int reason)
+	{
+		Container * const container = ContainerInterface::getContainer(obj);
+		if (container)
+		{
+			for (ContainerIterator containerIterator = container->begin(); containerIterator != container->end(); ++containerIterator)
+			{
+				ServerObject * const containedObject = safe_cast<ServerObject *>((*containerIterator).getObject());
+				if (containedObject && containedObject->isPersisted())
+				{
+					sendDeleteToDatabase(*containedObject, reason);
+					LOG("CustomerService",("Deletion:%s deleted from game.  Reason: %s", ServerObject::getLogDescription(containedObject).c_str(), describeDeleteReason(reason).c_str()));
+					flagChildObjectsForDeletion(*containedObject, reason);
+				}
+			}
+		}
+	}
+
+	//----------------------------------------------------------------------
+
+	void endBaselinesInitializeScript(ServerObject& obj, bool doChildCheck)
+	{
+		if (doChildCheck)
+		{
+			ServerObject * parent = safe_cast<ServerObject*>(ContainerInterface::getContainedByObject(obj));
+			if (parent && !parent->isInitialized())
+				return;
+		}
+
+		obj.getScriptObject()->initScriptInstances();
+		obj.getScriptObject()->setOwnerIsInitialized();
+
+		Container* container = ContainerInterface::getContainer(obj);
+		if (container)
+
+		{
+			std::vector<CachedNetworkId> initList;
+
+			for (ContainerIterator containerIterator = container->begin(); containerIterator != container->end(); ++containerIterator)
+			{
+				initList.push_back(*containerIterator);
+			}
+			for(std::vector<CachedNetworkId>::iterator i = initList.begin(); i != initList.end(); ++i)
+			{
+				ServerObject * containedObject = safe_cast<ServerObject*>((*i).getObject());
+				if (!containedObject)
+				{
+					WARNING_STRICT_FATAL(true, ("Cannot initialize object %s because it did not resolve to an object from an id", (*i).getValueString().c_str()));
+				}
+				else
+					endBaselinesInitializeScript(*containedObject, false);
+			}
+		}
+	}
+
+	//----------------------------------------------------------------------
+
+	const std::string OBJVAR_BANK_NAME_ID = "banking_bankid";
+
+	//----------------------------------------------------------------------
+
+	bool checkBankTransfer(ServerObject* dest, const ServerObject& item, const ServerObject* transferer)
+	{
+		if (!dest || !transferer)
+			return true;
+
+		bool isBankTransfer = false;
+		const CreatureObject * const creature = transferer->asCreatureObject();
+		if (creature && dest == creature->getBankContainer())
+		{
+			float distance = 0.0f;
+			//Banks are carried along with the player, so their distance
+			//is always going to be 0.  This block changes the parentInWorld
+			//to be the bank terminal that was opened rather than the bank
+			//itself.
+			const ServerObject * const bank = creature->getBankContainer();
+			if (bank)
+			{
+				NetworkId bankTerminalId;
+				if (bank->areContentsLoaded() && creature->getObjVars().getItem(OBJVAR_OPEN_BANK_TERMINAL_ID,bankTerminalId))
+				{
+
+					const TangibleObject * const bankTerminal = safe_cast<TangibleObject *>(NetworkIdManager::getObjectById(bankTerminalId));
+					if (bankTerminal)
+					{
+						isBankTransfer = true;
+						Unicode::String bankName;
+						if (bankTerminal->getObjVars().getItem(OBJVAR_BANK_NAME_ID, bankName))
+						{
+							if (!creature->isBankMember(bankName))
+							{
+								return false;
+							}
+						}
+
+						distance = creature->getPosition_w().magnitudeBetween(bankTerminal->getPosition_w());
+						distance -= dest->getRadius();
+						distance -= bankTerminal->getRadius();
+						// Check range on the server with a 1m fudge factor in it.
+						if (distance > 6.0f + 1.0f) //todo MLS make that range of 6.0 configurable
+						{
+							static const StringId message("system_msg", "out_of_range");
+							Chat::sendSystemMessage(*creature, message, Unicode::emptyString);
+							return false;
+						}
+					}
+					else
+					{
+						return false;
+					}
+				}
+				else
+				{
+					return false;
+				}
+			}
+		}
+
+		return true;
+
+	}
+
+	//----------------------------------------------------------------------
+
+	void getPlayerControlledContents(ServerObject &obj, std::vector<CachedNetworkId> &results)
+	{
+		if (obj.isPlayerControlled())
+			results.push_back(CachedNetworkId(obj));
+
+		Container *container = ContainerInterface::getContainer(obj);
+		if (container)
+		{
+			for (ContainerIterator i = container->begin(); i != container->end(); ++i)
+			{
+				ServerObject *containedObject = safe_cast<ServerObject *>((*i).getObject());
+				if (containedObject)
+					getPlayerControlledContents(*containedObject, results);
+			}
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	void getContainedClients(ServerObject &obj, std::vector<Watcher<Client> > &containedClients)
+	{
+		// find all clients for primary controlled objects in the containment hierarchy under obj (including obj)
+
+		Client * const client = obj.getClient();
+		if (client && client->getCharacterObjectId() == obj.getNetworkId())
+			containedClients.push_back(Watcher<Client>(client));
+
+		Container * const container = ContainerInterface::getContainer(obj);
+		if (container)
+		{
+			for (ContainerIterator i = container->begin(); i != container->end(); ++i)
+			{
+				ServerObject * const containedObject = safe_cast<ServerObject *>((*i).getObject());
+				if (containedObject)
+					getContainedClients(*containedObject, containedClients);
+			}
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	unsigned int getPackedObjVarField(std::string const &buf, unsigned int offset, std::string &result)
+	{
+		std::vector<char> s;
+		while (offset < buf.size())
+		{
+			if (buf[offset] == '|')
+				break;
+			s.push_back(buf[offset++]);
+		}
+		s.push_back('\0');
+		result = &(s[0]);
+		return offset+1;
+	}
+
+	// ----------------------------------------------------------------------
+
+	unsigned int getPackedObjVarField(std::string const &buf, unsigned int offset, int &result)
+	{
+		std::string s;
+		offset = getPackedObjVarField(buf, offset, s);
+		result = atoi(s.c_str());
+		return offset;
+	}
+
+	// ----------------------------------------------------------------------
+
+	void appendPackedObjVarField(std::vector<char> &buf, char const *s)
+	{
+		while (*s)
+		{
+			if ((*s) != '|')
+				buf.push_back(*s);
+			++s;
+		}
+		buf.push_back('|');
+	}
+
+	// ----------------------------------------------------------------------
+
+	void appendPackedObjVarField(std::vector<char> &buf, int val)
+	{
+		char tempbuf[32];
+		sprintf(tempbuf, "%d", val);
+		appendPackedObjVarField(buf, tempbuf);
+	}
+
+	// ----------------------------------------------------------------------
+
+	void remove()
+	{
+	}
+}
+
+using namespace ServerObjectNamespace;
+
+// ======================================================================
+
+const SharedObjectTemplate * ServerObject::m_defaultSharedTemplate = NULL;
+float ServerObject::ms_buildingUpdateRadiusMultiplier = 0;
+
+// ======================================================================
+
+class ServerObject::PobFixupNotification : public ObjectNotification
+{
+public:
+	PobFixupNotification();
+	~PobFixupNotification();
+
+	virtual void pobFixupComplete(Object &object) const;
+	
+private:
+	PobFixupNotification(const PobFixupNotification & );
+	PobFixupNotification& operator= (const PobFixupNotification&);
+};
+
+//------------------------------------------------------------------------------------------
+
+ServerObject::PobFixupNotification::PobFixupNotification() : ObjectNotification()
+	{
+	}
+
+//------------------------------------------------------------------------------------------
+
+ServerObject::PobFixupNotification::~PobFixupNotification()
+{
+}
+
+//------------------------------------------------------------------------------------------
+
+void ServerObject::PobFixupNotification::pobFixupComplete(Object &object) const
+{
+	static_cast<ServerObject*>(&object)->onPobFixupComplete();
+//	object.removeNotification(*this);
+}
+
+//------------------------------------------------------------------------------------------
+
+static ServerObject::PobFixupNotification pobFixupNotification;
+
+//------------------------------------------------------------------------------------------
+
+class ServerObject::MoveNotification : public ObjectNotification
+{
+public:
+	MoveNotification();
+	~MoveNotification();
+	virtual void addToWorld(Object &object) const;
+	virtual void cellChanged(Object &object, bool dueToParentChange) const;
+	virtual bool positionChanged(Object &object, bool dueToParentChange, const Vector &oldPosition) const;
+	virtual void rotationChanged(Object &object, bool dueToParentChange) const;
+	virtual bool positionAndRotationChanged(Object &object, bool dueToParentChange, const Vector &oldPosition) const;
+	virtual void visibilityDataChanged(Object &object) const;
+
+private:
+	void checkForGoldObject(const Object &object) const;
+
+private:
+	MoveNotification(const MoveNotification &);
+	MoveNotification & operator= (const MoveNotification &);
+};
+
+static ServerObject::MoveNotification moveNotification;
+
+
+//------------------------------------------------------------------------------------------
+ServerObject::MoveNotification::MoveNotification() :
+		ObjectNotification()
+{
+
+}
+
+//------------------------------------------------------------------------------------------
+
+ServerObject::MoveNotification::~MoveNotification()
+{
+
+}
+
+//------------------------------------------------------------------------------------------
+
+void ServerObject::MoveNotification::addToWorld(Object &object) const
+{
+	static_cast<ServerObject &>(object).updateWorldSphere();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::MoveNotification::checkForGoldObject(const Object &object) const
+{
+	if (ConfigServerGame::getMaxGoldNetworkId()!=NetworkId::cms_invalid && object.getNetworkId() < ConfigServerGame::getMaxGoldNetworkId())
+	{
+		FATAL(ConfigServerGame::getFatalOnMovingGoldObject(),("Attempted to move object %s, which is a gold object that should not be movable.", object.getNetworkId().getValueString().c_str()));
+		WARNING(true,("Attempted to move object %s, which is a gold object that should not be movable.", object.getNetworkId().getValueString().c_str()));
+	}
+}
+
+//------------------------------------------------------------------------------------------
+
+void ServerObject::MoveNotification::cellChanged(Object &object, bool dueToParentChange) const
+{
+	checkForGoldObject(object);
+
+	static_cast<ServerObject &>(object).updateWorldSphere();
+	if (!dueToParentChange)
+	{
+		DEBUG_FATAL(object.getCellProperty() && !object.getKill(), ("Cell object changing cells"));
+		static_cast<ServerObject &>(object).setTransformChanged(true);
+	}
+}
+
+//------------------------------------------------------------------------------------------
+
+bool ServerObject::MoveNotification::positionChanged(Object &object, bool dueToParentChange, const Vector &oldPosition) const
+{
+	checkForGoldObject(object);
+
+	UNREF(oldPosition);
+	static_cast<ServerObject &>(object).updateWorldSphere();
+	if (!dueToParentChange)
+	{
+		DEBUG_FATAL(object.getCellProperty() && !object.getKill(), ("Cell object changing position"));
+		static_cast<ServerObject &>(object).setTransformChanged(true);
+	}
+	return true;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ServerObject::MoveNotification::rotationChanged(Object &object, bool dueToParentChange) const
+{
+	checkForGoldObject(object);
+
+	static_cast<ServerObject &>(object).updateWorldSphere();
+	if (!dueToParentChange)
+	{
+		DEBUG_FATAL(object.getCellProperty() && !object.getKill(), ("Cell object changing rotation"));
+		static_cast<ServerObject &>(object).setTransformChanged(true);
+	}
+}
+
+//------------------------------------------------------------------------------------------
+
+bool ServerObject::MoveNotification::positionAndRotationChanged(Object &object, bool dueToParentChange, const Vector &oldPosition) const
+{
+	checkForGoldObject(object);
+
+	UNREF(oldPosition);
+	static_cast<ServerObject &>(object).updateWorldSphere();
+	if (!dueToParentChange)
+	{
+		DEBUG_FATAL(object.getCellProperty() && !object.getKill(), ("Cell object changing position and rotation"));
+		static_cast<ServerObject &>(object).setTransformChanged(true);
+	}
+	return true;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ServerObject::MoveNotification::visibilityDataChanged(Object &object) const
+{
+	static_cast<ServerObject &>(object).updateWorldSphere();
+	static_cast<ServerObject &>(object).addObjectToConcludeList();
+}
+
+// ======================================================================
+
+void ServerObject::AuthProcessIdCallback::modified(ServerObject &target, uint32 oldValue, uint32, bool) const
+{
+	AuthTransferTracker::sendConfirmAuthTransfer(target.getNetworkId(), oldValue);
+}
+
+void ServerObject::ObserversCountCallback::modified(ServerObject &target, int oldValue, int, bool) const
+{
+	target.observersCountChanged();
+}
+
+// ======================================================================
+
+ServerObject::ServerObject(const ServerObjectTemplate* newTemplate, const ObjectNotification &notification, bool const hyperspaceOnCreate) :
+Object                        (newTemplate, NetworkId::cms_invalid),
+m_oldPosition                 (),
+m_sharedTemplate              (NULL),
+m_client                      (0),
+m_observers                   (),
+m_localFlags                  (0),
+m_scriptObject                (new GameScriptObject),
+m_objVars                     (),
+m_observersCount              (0),
+m_volume                      (newTemplate->getVolume()),
+m_complexity                  (newTemplate->getComplexity()),
+m_sceneId                     (ServerWorld::getSceneId()),
+m_objectName                  (),
+m_includeInBuildout           (false),
+m_nameStringId                (),
+m_staticItemName              (),
+m_staticItemVersion           (0),
+m_conversionId                (0),
+m_playerControlled            (false),
+m_synchronizedUi              (),
+m_pendingSyncUi               (0),
+m_persisted                   (false),
+m_authServerProcessId         (),
+m_proxyServerProcessIds       (),
+m_transformSequence           (),
+m_cacheVersion                (0),
+m_loadContents                (true),
+m_contentsLoaded              (false),
+m_contentsRequested           (false),
+m_loadWith                    (NetworkId::cms_invalid),
+m_cashBalance                 (0),
+m_bankBalance                 (0),
+m_defaultAlterTime            (AlterResult::cms_keepNoAlter),
+m_broadcastListeners          (),
+m_broadcastBroadcasters       (),
+m_authClientServerPackage     (),
+m_authClientServerPackage_np  (),
+m_firstParentAuthClientServerPackage(),
+m_firstParentAuthClientServerPackage_np(),
+m_serverPackage               (),
+m_serverPackage_np            (),
+m_sharedPackage               (),
+m_sharedPackage_np            (),
+m_networkUpdateFar            (NULL),
+m_triggerVolumes              (),
+m_attributesAttained          (),
+m_attributesInterested        (),
+m_triggerVolumeInfo           (),
+m_messageTos                  (),
+m_worldSphere                 (Sphere::unit),
+m_dirtyArchiveCallback        (),
+m_unreliableControllerMessageSequenceNumber(0),
+m_gameObjectType              (0),
+m_calledTriggerDestroy        (false),
+m_calledTriggerRemovingFromWorld(false),
+m_loadCTSBank(false),
+m_loadCTSPackedHouses(false)
+{
+	synchronizationOnConstruct();
+
+	m_observersCount.setSourceObject(this);
+	m_authServerProcessId.setSourceObject(this);
+
+	NOT_NULL(newTemplate);
+
+	setLocalFlag(LocalObjectFlags::ServerObject_HyperspaceOnCreate, hyperspaceOnCreate);
+	setLocalFlag(LocalObjectFlags::ServerObject_HyperspaceOnDestruct, false);
+
+#ifdef _DEBUG
+	setDebugName(getTemplateName());
+#endif
+
+	updateWorldSphere();
+
+	const std::string & sharedTemplateName = newTemplate->getSharedTemplate();
+	m_sharedTemplate = dynamic_cast<const SharedObjectTemplate *>(ObjectTemplateList::fetch(sharedTemplateName));
+	if (m_sharedTemplate == NULL)
+	{
+		WARNING_STRICT_FATAL(!sharedTemplateName.empty(), ("Template %s has an invalid shared template %s. We will use the default shared template for now.",
+			newTemplate->getName(), sharedTemplateName.c_str()));
+	}
+
+	if (getSharedTemplate() != NULL)
+	{
+		m_nameStringId = getSharedTemplate()->getObjectName();
+		m_descriptionStringId = getSharedTemplate()->getDetailedDescription();
+	}
+
+	m_scriptObject->setOwner(this);
+
+	ContainedByProperty *containedBy = new ContainedByProperty(*this, NULL);
+	addProperty(*containedBy);
+
+	//-- create the SlottedContainment property
+	SlottedContainmentProperty *slottedProperty = new SlottedContainmentProperty(*this);
+	addProperty(*slottedProperty);
+
+	//-- get ArrangementDescriptor if specified
+	if (getSharedTemplate() != NULL)
+	{
+		const ArrangementDescriptor *const arrangementDescriptor = getSharedTemplate()->getArrangementDescriptor();
+		if (arrangementDescriptor)
+		{
+			const int arrangementCount = arrangementDescriptor->getArrangementCount();
+			for (int i = 0; i < arrangementCount; ++i)
+			{
+				slottedProperty->addArrangement(arrangementDescriptor->getArrangement(i));
+			}
+		}
+	}
+
+	//set up containers on this object if it has any
+	if (getSharedTemplate() != NULL)
+	{
+		SharedObjectTemplate::ContainerType const containerType = getSharedTemplate()->getContainerType();
+
+		switch (containerType)
+		{
+			//buildings (portal properties get added below
+		case SharedObjectTemplate::CT_none:
+			break;
+
+		case SharedObjectTemplate::CT_slotted:
+		case SharedObjectTemplate::CT_ridable:
+		{
+			const SlotDescriptor *const slotDescriptor = getSharedTemplate()->getSlotDescriptor();
+			if (slotDescriptor)
+			{
+				//-- create a SlottedContainer with the given slots
+				SlottedContainer* slotContainer = new SlottedContainer(*this, slotDescriptor->getSlots());
+				addProperty(*slotContainer);
+				slotContainer = 0;
+			}
+			else
+			{
+				DEBUG_WARNING(true, ("DATA ERROR: specified slotted container type but could not get slot descriptor"));
+			}
+			break;
+		}
+		case SharedObjectTemplate::CT_volume:
+		{
+			VolumeContainer * volumeContainer = 0;
+			int maxVolume = getSharedTemplate()->getContainerVolumeLimit();
+			if (maxVolume <= 0)
+			{
+				maxVolume = VolumeContainer::VL_NoVolumeLimit;
+			}
+			volumeContainer = new TangibleVolumeContainer(*this, maxVolume);
+			addProperty(*volumeContainer);
+			volumeContainer = 0;
+			break;
+		}
+		case SharedObjectTemplate::CT_volumeIntangible:
+		{
+			int maxVolume = getSharedTemplate()->getContainerVolumeLimit();
+			if (maxVolume <= 0)
+			{
+				maxVolume = VolumeContainer::VL_NoVolumeLimit;
+			}
+			VolumeContainer * volumeContainer = new IntangibleVolumeContainer(*this, maxVolume);
+			addProperty(*volumeContainer);
+			volumeContainer = 0;
+			break;
+		}
+		case SharedObjectTemplate::CT_volumeGeneric:
+		{
+			int maxVolume = getSharedTemplate()->getContainerVolumeLimit();
+			if (maxVolume <= 0)
+			{
+				maxVolume = VolumeContainer::VL_NoVolumeLimit;
+			}
+			VolumeContainer * volumeContainer = new VolumeContainer(*this, maxVolume);
+			addProperty(*volumeContainer);
+			volumeContainer = 0;
+			break;
+		}
+
+		default:
+			DEBUG_WARNING(true, ("Invalid container type specified."));
+			break;
+		}
+
+		setLocalFlag(LocalObjectFlags::ServerObject_SendToClient, getSharedTemplate()->getSendToClient());
+		m_gameObjectType = static_cast<int>(getSharedTemplate()->getGameObjectType());
+	}
+
+	//If the object template specifies a volume, give it a volumeContainment
+	int vol = newTemplate->getVolume();
+	VolumeContainmentProperty* volumeProperty = new VolumeContainmentProperty(*this, (vol < 1 ? 1 : vol) );
+	addProperty(*volumeProperty);
+	volumeProperty = 0;   //lint !e423 // creation of memory leak // no, managed by property list
+
+
+	// add the portal property if one is requested
+	if (getSharedTemplate() != NULL)
+	{
+		const std::string &portalLayoutFileName = getSharedTemplate()->getPortalLayoutFilename();
+		if (!portalLayoutFileName.empty())
+		{
+			PortalProperty *portalProperty = new PortalProperty(*this, portalLayoutFileName.c_str());
+			addProperty(*portalProperty);
+		}
+	}
+
+	m_triggerVolumeInfo.setOnChanged(this, &ServerObject::updateTriggerVolumes);
+
+	addMembersToPackages();
+
+	addNotification(notification);
+
+	addNotification(moveNotification);
+
+	gs_objectCount++;
+	ObjectTracker::addObject();
+
+	//-- add the no build notification
+	{
+		if (getSharedTemplate () && getSharedTemplate ()->getNoBuildRadius () > 0.f)
+			addNotification (ServerNoBuildNotification::getInstance ());
+	}
+
+	//-- add the clear flora notification
+	{
+		if (getSharedTemplate () && getSharedTemplate ()->getClearFloraRadius () > 0.f)
+			addNotification (ServerClearCollidableFloraNotification::getInstance ());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+ServerObject::~ServerObject()
+{
+	//-- This must be the first line in the destructor to invalidate any watchers watching this object
+	nullWatchers();
+
+	ObserveTracker::onObjectDestroyed(*this, getLocalFlag(LocalObjectFlags::ServerObject_HyperspaceOnDestruct));
+	PositionUpdateTracker::serverObjDestroyed(*this);
+
+	synchronizationOnDestruct();
+
+	if (getLayer())
+		ObjectTracker::removeRunTimeRule();
+
+	if (getClient())
+		getClient()->removeControlledObject(*this);
+
+	WARNING_STRICT_FATAL(getClient(),("Deleting server object %s which had a client.",getNetworkId().getValueString().c_str()));
+
+	{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerObject::~ServerObject removeFromWorld");
+	//remove from world
+	if (isInWorld())
+		removeFromWorld();
+	}
+
+	WARNING_STRICT_FATAL(!m_triggerVolumes.empty(), ("Deleting object %s that still has trigger volumes attached", getNetworkId().getValueString().c_str()));
+
+	{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerObject::~ServerObject destroyTriggerVolumes");
+	// make absolutely sure our trigger volumes are removed from the world
+	destroyTriggerVolumes();
+	}
+
+	if (m_sharedTemplate != NULL)
+	{
+		m_sharedTemplate->releaseReference();
+		m_sharedTemplate = NULL;
+	}
+
+	if (getClient())
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("ServerObject::~ServerObject dropClient");
+		//Object has a client!!
+		WARNING(true, ("Destroying object %s which isAuth: %d", getNetworkId().getValueString().c_str(), isAuthoritative()));
+		GameServer::getInstance().dropClient(getNetworkId());
+	}
+
+	{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerObject::~ServerObject removeObjectFromGame");
+	// clean ourselves off any of ServerWorlds lists.
+	ServerWorld::removeObjectFromGame(*this);
+	}
+
+	delete m_pendingSyncUi;
+	m_pendingSyncUi = 0;
+
+	delete m_synchronizedUi;
+	m_synchronizedUi = 0;
+
+	{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerObject::~ServerObject delete script object");
+	if (m_scriptObject != NULL)
+		delete m_scriptObject;
+	}
+	m_scriptObject = NULL;
+
+	gs_objectCount--;
+
+	{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerObject::~ServerObject ObjectTracker::removeObject");
+	ObjectTracker::removeObject();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::install()
+{
+	// read in list of object types that supports no trade "shared" behavior
+	// (no trade item of those types can be picked up by another character
+	// on the same account as the character who currently owns the item)
+	char const * const noTradeSharedDataTableName = "datatables/no_trade/no_trade_shared.iff";
+	DataTable * table = DataTableManager::getTable(noTradeSharedDataTableName, true);
+	if (table)
+	{
+		int const columnObjectTemplate = table->findColumnNumber("Object Template");
+		if (columnObjectTemplate >= 0)
+		{
+			std::string objectTemplate;
+
+			for (int i = 0, numRows = table->getNumRows(); i < numRows; ++i)
+			{
+				objectTemplate = table->getStringValue(columnObjectTemplate, i);
+				if (objectTemplate.empty())
+					continue;
+
+				if (objectTemplate.find(".iff") != std::string::npos)
+					s_noTradeSharedTemplateItemType.insert(CrcLowerString::calculateCrc(objectTemplate.c_str()));
+				else
+					s_noTradeSharedStaticItemType.insert(objectTemplate);
+			}
+		}
+
+		DataTableManager::close(noTradeSharedDataTableName);
+	}
+
+	ExitChain::add(ServerObjectNamespace::remove, "ServerObjectNamespace::remove");
+}
+
+//-----------------------------------------------------------------------
+
+ServerObject * ServerObject::getServerObject(NetworkId const & networkId)
+{
+	return asServerObject(NetworkIdManager::getObjectById(networkId));
+}
+
+//-----------------------------------------------------------------------
+
+ServerObject * ServerObject::asServerObject(Object * const object)
+{
+	return (object != NULL) ? object->asServerObject() : NULL;
+}
+
+//-----------------------------------------------------------------------
+
+ServerObject const * ServerObject::asServerObject(Object const * const object)
+{
+	return (object != NULL) ? object->asServerObject() : NULL;
+}
+
+//-----------------------------------------------------------------------
+
+ServerObject * ServerObject::asServerObject()
+{
+	return this;
+}
+
+//-----------------------------------------------------------------------
+
+ServerObject const * ServerObject::asServerObject() const
+{
+	return this;
+}
+
+//-----------------------------------------------------------------------
+
+CreatureObject * ServerObject::asCreatureObject()
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+CreatureObject const * ServerObject::asCreatureObject() const
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+BuildingObject * ServerObject::asBuildingObject()
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+BuildingObject const * ServerObject::asBuildingObject() const
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+StaticObject * ServerObject::asStaticObject()
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+StaticObject const * ServerObject::asStaticObject() const
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+TangibleObject * ServerObject::asTangibleObject()
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+TangibleObject const * ServerObject::asTangibleObject() const
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+IntangibleObject *ServerObject::asIntangibleObject()
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+IntangibleObject const *ServerObject::asIntangibleObject() const
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+MissionObject * ServerObject::asMissionObject()
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+MissionObject const * ServerObject::asMissionObject() const
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+CellObject * ServerObject::asCellObject()
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+CellObject const * ServerObject::asCellObject() const
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+GroupObject * ServerObject::asGroupObject()
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+GroupObject const * ServerObject::asGroupObject() const
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+ShipObject * ServerObject::asShipObject()
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+ShipObject const * ServerObject::asShipObject() const
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+PlayerObject *ServerObject::asPlayerObject()
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+PlayerObject const * ServerObject::asPlayerObject() const
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+WeaponObject *ServerObject::asWeaponObject()
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+WeaponObject const * ServerObject::asWeaponObject() const
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+ManufactureSchematicObject *ServerObject::asManufactureSchematicObject()
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+ManufactureSchematicObject const * ServerObject::asManufactureSchematicObject() const
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+PlayerQuestObject * ServerObject::asPlayerQuestObject()
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+PlayerQuestObject const * ServerObject::asPlayerQuestObject() const
+{
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a shared template if none was given for this object.
+ *
+ * @return the shared template
+ */
+const SharedObjectTemplate * ServerObject::getDefaultSharedTemplate(void) const
+{
+static const ConstCharCrcLowerString templateName("object/object/base/shared_object_default.iff");
+
+	if (m_defaultSharedTemplate == NULL)
+	{
+		m_defaultSharedTemplate = safe_cast<const SharedObjectTemplate *>(
+			ObjectTemplateList::fetch(templateName));
+		WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create default shared object template %s", templateName.getString()));
+		if (m_defaultSharedTemplate != NULL)
+			ExitChain::add (removeDefaultTemplate, "ServerObject::removeDefaultTemplate");
+	}
+	return m_defaultSharedTemplate;
+}	// ServerObject::getDefaultSharedTemplate
+
+//-----------------------------------------------------------------------
+
+const unsigned long ServerObject::getObjectCount()
+{
+	return gs_objectCount;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Cleans up the default shared template.
+ */
+void ServerObject::removeDefaultTemplate(void)
+{
+	if (m_defaultSharedTemplate != NULL)
+	{
+		m_defaultSharedTemplate->releaseReference();
+		m_defaultSharedTemplate = NULL;
+	}
+}	// ServerObject::removeDefaultTemplate
+
+// ----------------------------------------------------------------------
+
+void ServerObject::addObjectToConcludeList()
+{
+	if (!isInitialized())
+		return;
+	if (!isGoingToConclude())
+	{
+		setGoingToConclude(true);
+		ServerWorld::addObjectToConcludeList(this);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Called during the alter phase of the game.
+ *
+ * @param time		time since last frame
+ *
+ * @return true or false
+ */
+float ServerObject::alter(float time)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerObject::alter");
+
+	//Check initialization
+	WARNING_STRICT_FATAL(!isInitialized(), ("Alter called on unitialized object %s.", getNetworkId().getValueString().c_str()));
+	if (!isInitialized())
+		return 1.0f;
+
+	// Alter the base class.
+	float result = Object::alter(time);
+
+	if (isPlacing())
+	{
+		TerrainObject* terrain = TerrainObject::getInstance();
+		if (terrain && getSharedTemplate() && getSharedTemplate()->getSnapToTerrain() && isInWorldCell() && isInWorld())
+		{
+			terrain->placeObject(*this, false, true);
+		}
+		setPlacing(false);
+	}
+
+	if (result == AlterResult::cms_kill)
+	{
+		if (isAuthoritative())
+		{
+			//If we are being deleted this frame, make sure to update our deltas, position, etc.
+			sendDeltasForSelfAndContents();
+		}
+		if (isUnloading())
+		{
+			Object * const containerObject = ContainerInterface::getContainedByObject(*this);
+			//If we're contained, remove ourself from the container before destruction
+			if (containerObject)
+			{
+				Container * const container = ContainerInterface::getContainer(*containerObject);
+				NOT_NULL(container);
+				container->internalItemRemoved(*this);
+				DEBUG_REPORT_LOG(true, ("Removing %s from container %s because it is being unloaded\n",
+										getNetworkId().getValueString().c_str(),
+										containerObject->getNetworkId().getValueString().c_str()));
+			}
+		}
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::canDropInWorld() const
+{
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::canManipulateObject(ServerObject const &target, bool movingObject, bool checkPermissions, bool checkPermissionsOnParent, float maxDistance, Container::ContainerErrorCode&, bool skipNoTradeCheck, bool * allowedByGodMode) const
+{
+	//In general objects cannot manipulate other objects, unless they are creatures.  This may not be true of all
+	//objects, however, which is why the function is implemented this way (ie a player object that derives from ServerObject).
+	UNREF(target);
+	UNREF(maxDistance);
+	UNREF(checkPermissions);
+	UNREF(checkPermissionsOnParent);
+	UNREF(movingObject);
+	UNREF(skipNoTradeCheck);
+	UNREF(allowedByGodMode);
+	return false;
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerObject::canTrade() const
+{
+	if( isInBazaarOrVendor() )
+	{
+		return false;
+	}
+
+	return !markedNoTrade();
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerObject::canTradeRecursive(bool testPlayers) const
+{
+	if( testPlayers || !isPlayerControlled() )
+	{
+		if( !canTrade() )
+		{
+			return false;
+		}
+		else
+		{
+			// check the contained items
+			const Container * const container = ContainerInterface::getContainer(*this);
+			if( container )
+			{
+				for( ContainerConstIterator i = container->begin(); i != container->end(); ++i )
+				{
+					const ServerObject * const content = safe_cast<const ServerObject *>((*i).getObject());
+					if( content )
+					{
+						if( !content->canTradeRecursive(testPlayers) )
+							return false;
+					}
+				}
+			}
+		}
+	}
+
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerObject::markedNoTrade() const
+{
+	return ( getObjVars().hasItem("noTrade") || getObjVars().hasItem("notrade") );
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerObject::markedNoTradeRecursive(bool testPlayers, bool testOnlyContainedItems) const
+{
+	if( testPlayers || !isPlayerControlled() )
+	{
+		if( !testOnlyContainedItems && markedNoTrade() )
+		{
+			return true;
+		}
+		else
+		{
+			// check the contained items
+			const Container * const container = ContainerInterface::getContainer(*this);
+			if( container )
+			{
+				for( ContainerConstIterator i = container->begin(); i != container->end(); ++i )
+				{
+					const ServerObject * const content = safe_cast<const ServerObject *>((*i).getObject());
+					if( content )
+					{
+						if( content->markedNoTradeRecursive(testPlayers) )
+							return true;
+					}
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerObject::markedNoTradeShared(bool includeCheckForNoTrade) const
+{
+	if (includeCheckForNoTrade)
+	{
+		if (!markedNoTrade())
+			return false;
+	}
+
+	if (getObjVars().hasItem("noTradeShared"))
+		return true;
+
+	// see if the item type is no trade "shared"
+	if (m_staticItemName.get().empty())
+		return (s_noTradeSharedTemplateItemType.count(getTemplateCrc()) > 0);
+
+	return (s_noTradeSharedStaticItemType.count(m_staticItemName.get()) > 0);
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerObject::isInSecureTrade() const
+{
+	const ServerObject *parent = safe_cast<const ServerObject*>(ContainerInterface::getFirstParentInWorld(*this));
+	if( parent )
+	{
+		const CreatureObject *creatureObjParent = parent->asCreatureObject();
+		if( creatureObjParent )
+		{
+			const CreatureController *cc = creatureObjParent->getCreatureController();
+			if( cc )
+			{
+				const ServerSecureTrade *trade = cc->getSecureTrade();
+				if( trade && trade->hasItemInSecureTrade(*creatureObjParent, *this) )
+				{
+					return true;
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns whether an object is bio-linked
+ *
+ * @return true if a the object is bio-linked
+ */
+bool ServerObject::isBioLinked() const
+{
+	// By default, objects are not bio-linked
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns whether an object, or any contained object, is biolinked
+ *
+ * @return true if a biolinked object is found
+ */
+bool ServerObject::isBioLinkedRecursive() const
+{
+	if( isBioLinked() )
+	{
+		return true;
+	}
+	else
+	{
+		// If we are a container, see if any of the contained objects are bio-linked
+		const Container * const container = ContainerInterface::getContainer(*this);
+		if( container )
+		{
+			for( ContainerConstIterator i = container->begin(); i != container->end(); ++i )
+			{
+				const ServerObject * const content = safe_cast<const ServerObject *>((*i).getObject());
+				if( content )
+				{
+					if( content->isBioLinkedRecursive() )
+					{
+						return true;
+					}
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerObject::isWaypoint() const
+{
+	return getObjectTemplate()->derivesFrom(SERVER_PATHFINDING_WAYPOINT_TEMPLATE_BASE);
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerObject::isInBazaarOrVendor() const
+{
+	bool inBazaarOrVendor = false;
+	const ServerObject *parent = safe_cast<const ServerObject*>(ContainerInterface::getFirstParentInWorld(*this));
+	const ServerObject *grandParent = NULL;
+	if( parent )
+	{
+		grandParent = safe_cast<const ServerObject*>(ContainerInterface::getFirstParentInWorld(*parent));
+	}
+
+	if( parent && (parent->isVendor() || parent->isBazaarTerminal() ) )
+	{
+		inBazaarOrVendor = true;
+	}
+	else if( grandParent && (grandParent->isVendor() || grandParent->isBazaarTerminal()) )
+	{
+		inBazaarOrVendor = true;
+	}
+
+	return inBazaarOrVendor;
+}
+
+void ServerObject::removeAllAuctions()
+{
+	if ( isVendor() )
+	{
+		ServerObject *inv = getBazaarContainer();
+		NetworkId playerOwnerId;
+		getObjVars().getItem("vendor_owner", playerOwnerId);
+		if( inv && playerOwnerId.getValue()>0 )
+		{
+			// if this was an uninitialized vendor, remove objvar from owner
+			ServerObject *owner = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(playerOwnerId));
+			if (owner)
+			{
+				NetworkId notInitalizedVendor;
+				if (owner->getObjVars().getItem("vendor_not_initialized", notInitalizedVendor))
+				{
+					if (notInitalizedVendor == Object::getNetworkId())
+					{
+						owner->removeObjVarItem("vendor_not_initialized");
+					}
+				}
+			}
+			CommoditiesMarket::destroyVendorMarket(playerOwnerId, *inv);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::checkLOSTo(ServerObject const &target) const
+{
+	return LineOfSightCache::checkLOS(*this, target);
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerObject::checkLOSTo(Location const &target) const
+{
+	return LineOfSightCache::checkLOS(*this, target);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::conclude()
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerObject::conclude");
+
+	// everything has updated, check trigger volume
+
+	if (getTransformChanged() && isInWorld())
+	{
+		Vector const &newPosition = getTransform_o2w().getPosition_p();
+		// move the object and trigger volumes, detect volume enter/leave
+		ServerWorld::moveObject(*this, m_oldPosition, newPosition);
+		updatePositionOnPlanetServer();
+		m_oldPosition = newPosition;
+	}
+
+	m_localFlags &= s_clearLocalFlagsOnConcludeMask;
+
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("Object::conclude");
+		Object::conclude();
+	}
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a default controller for this object.
+ *
+ * @return the object's controller
+ * @todo This function should be removed.  Use the controller factory instead.
+ */
+Controller* ServerObject::createDefaultController(void)
+{
+	Controller* controller = new ServerController(this);
+	NOT_NULL(controller);
+
+	setController(controller);
+	return controller;
+}	// Object::createDefaultController
+
+//-----------------------------------------------------------------------
+/** Called by the container system when this object's contained By value is changed
+ */
+
+void ServerObject::containedByModified(NetworkId const &oldValue, NetworkId const &newValue, bool isLocal)
+{
+	UNREF(isLocal);
+
+	if (oldValue == newValue)
+		return;
+
+	ServerObject * const oldContainer = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(oldValue));
+	ServerObject * const newContainer = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(newValue));
+
+	// TODO: reenable these fatals after container proxying changes are done
+	//FATAL(oldValue.isValid() && !oldContainer, ("ServerObject::containedByModified: obj %s, could not resolve old container %s.", getDebugInformation().c_str(), oldValue.getValueString().c_str()));
+	//FATAL(newValue.isValid() && !newContainer, ("ServerObject::containedByModified: obj %s, could not resolve new container %s.", getDebugInformation().c_str(), newValue.getValueString().c_str()));
+
+	if (isAuthoritative())
+	{
+		FATAL((newContainer && !newContainer->isAuthoritative()), ("Invalid container transfer with auth object to/from non-auth containers."));
+	}
+	else if (isInitialized())
+	{
+		FATAL((oldContainer && oldContainer->isAuthoritative()) || (newContainer && newContainer->isAuthoritative()), ("Invalid container transfer with non-auth object to/from auth containers."));
+
+		// For proxy objects and mounts, it is essential for this function
+		// to setup new container state before calling
+		// isContentItemExposedWith.  Failure to do this causes proxy
+		// server objects of a rider to handle dismounting improperly
+		// because wasInWorld will be set to false erroneously.
+		// Also, it is essential to call this function prior to calling
+		// containerHandleUpdateClients() below since that function
+		// assumes the objects are in the new containment state.
+		containerDepersistContents(oldContainer, newContainer);
+
+		Container const * const newContainerProperty = newContainer ? ContainerInterface::getContainer(*newContainer) : 0;
+		bool const wasInWorld = isInWorld();
+		bool const nowInWorld = newValue == NetworkId::cms_invalid || (newContainerProperty && newContainer->isInWorld() && newContainerProperty->isContentItemExposedWith(*this));
+
+//		DEBUG_REPORT_LOG(true, ("Updating %s with old container %s and new container %s\n",
+//								getNetworkId().getValueString().c_str(),
+//								oldValue.getValueString().c_str(),
+//								newValue.getValueString().c_str()));
+		containerHandleUpdateClients(oldContainer, newContainer, (wasInWorld && !nowInWorld), (!wasInWorld && nowInWorld));
+	}
+
+	scheduleForAlter();
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::arrangementModified(int oldValue, int newValue, bool isLocal)
+{
+	if (!isLocal && !isAuthoritative() && isInitialized())
+	{
+		ServerObject * const parent = safe_cast<ServerObject*>(ContainerInterface::getContainedByObject(*this));
+		if (parent)
+		{
+			SlottedContainer * const slotContainer = ContainerInterface::getSlottedContainer(*parent);
+			if (slotContainer)
+			{
+				SlottedContainmentProperty* const slotted = ContainerInterface::getSlottedContainmentProperty(*this);
+				DEBUG_FATAL(!slotted, ("Error unpacking non slotted objects into a slotted container"));
+				slotContainer->updateArrangement(*this, oldValue, slotted->getCurrentArrangement());
+			}
+		}
+		ObserveTracker::onObjectArrangementChanged(*this);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::destroyTriggerVolumes()
+{
+	// get rid of any trigger volumes
+	for (TriggerVolumeMap::iterator i = m_triggerVolumes.begin(); i != m_triggerVolumes.end(); ++i)
+	{
+		ServerWorld::removeObjectTriggerVolume((*i).second);
+		delete (*i).second;
+	}
+	m_triggerVolumes.clear();
+	m_networkUpdateFar = 0;
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::updateTriggerVolumes()
+{
+	ServerObject *topMost = safe_cast<ServerObject *>(ContainerInterface::getFirstParentInWorld(*this));
+	if (!topMost || topMost != this || !topMost->isInWorld())
+	{
+		destroyTriggerVolumes();
+		return;
+	}
+
+	// keep track of what trigger volumes should exist so we can destroy the rest afterwards
+	std::vector<TriggerVolume*> newVolumes;
+
+	// create any new volumes
+	{
+		for (std::vector<TriggerVolumeInfo>::const_iterator i = m_triggerVolumeInfo.begin(); i != m_triggerVolumeInfo.end(); ++i)
+		{
+			const TriggerVolumeMap::iterator j = m_triggerVolumes.find((*i).name);
+			if (j != m_triggerVolumes.end())
+			{
+				TriggerVolume *t = (*j).second;
+				// if we already have one that matches, leave it alone
+				if (   t->getPromiscuous() == (*i).isPromiscuous
+				    && t->getRadius() == (*i).radius)
+				{
+					newVolumes.push_back(t);
+					continue;
+				}
+				// does not match, so destroy it and fall through to creating the new one
+				ServerWorld::removeObjectTriggerVolume(t);
+				delete t;
+				m_triggerVolumes.erase(j);
+			}
+
+			TriggerVolume * t = new TriggerVolume(*this, (*i).radius, (*i).name, (*i).isPromiscuous);
+			addTriggerVolume(t);
+			newVolumes.push_back(t);
+		}
+	}
+
+	// remove any volumes which no longer exist
+	{
+		TriggerVolumeMap::iterator i = m_triggerVolumes.begin();
+		while (i != m_triggerVolumes.end())
+		{
+			TriggerVolume *t = (*i).second;
+			if (   t != m_networkUpdateFar
+			    && std::find(newVolumes.begin(), newVolumes.end(), t) == newVolumes.end())
+			{
+				ServerWorld::removeObjectTriggerVolume(t);
+				delete t;
+				m_triggerVolumes.erase(i++);
+			}
+			else
+				++i;
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::addTriggerVolume(TriggerVolume * t)
+{
+	if (!t)
+	{
+		WARNING_STRICT_FATAL(true, ("Cannot add null volume"));
+		return;
+	}
+	m_triggerVolumes.insert(std::make_pair(t->getName(), t));
+	ServerWorld::addObjectTriggerVolume(t);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::createTriggerVolume(const real radius, const std::string & name, const bool isPromiscuous)
+{
+	removeTriggerVolume(name);
+
+	TriggerVolumeInfo triggerVolumeInfo;
+	triggerVolumeInfo.name = name;
+	triggerVolumeInfo.radius = radius;
+	triggerVolumeInfo.isPromiscuous = isPromiscuous;
+	m_triggerVolumeInfo.push_back(triggerVolumeInfo);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::serverObjectEndBaselines(bool fromDatabase)
+{
+	setInEndBaselines(true);
+
+	// handle trying to create a player in an incorrect scene, or without a PlayerObject
+	bool needSceneFix = false;
+
+	if (isPlayerControlled())
+	{
+		bool doUnload = false;
+		if (!PlayerCreatureController::getPlayerObject(asCreatureObject()))
+		{
+			WARNING(true, ("TRACE_LOGIN: Loading a player controlled creature object (%s) without a player object.", getNetworkId().getValueString().c_str()));
+			doUnload = true;
+		}
+		else if (getSceneId() != ServerWorld::getSceneId())
+		{
+			Client* p_client = GameServer::getInstance().getClient( getNetworkId() );
+
+
+			if ( (p_client) && ( p_client->getSendToStarport() ) )
+			{
+				needSceneFix = true;
+				GameServer::getInstance().requestSceneWarp(CachedNetworkId(*this),"tatooine",Vector(3528,5,-4804),
+					NetworkId::cms_invalid,Vector(3528,5,-4804));
+			}
+			else if (isAuthoritative() && ContainerInterface::getContainedByObject(*this))
+			{
+				needSceneFix = true;
+			}
+
+			else
+			{
+				WARNING(true,
+					("Unloading object id=[%s] on game server id=[%d] due to incorrect scene during baselines: server scene=[%s], object scene=[%s], fromDatabase=[%s], authoritative=[%s])",
+					getNetworkId().getValueString().c_str(),
+					static_cast<int>(GameServer::getInstance().getProcessId()),
+					ServerWorld::getSceneId().c_str(),
+					getSceneId().c_str(),
+					fromDatabase ? "true" : "false",
+					isAuthoritative() ? "true" : "false"
+					));
+
+				//-- As a precautionary measure, force CentralServer to clear out its player id/scene id map since a bug in the updating of Central's map probably is the origin of this routing error.
+				GenericValueTypeMessage<std::pair<NetworkId, std::pair<std::string, bool> > > const setSceneMsg("SetSceneForPlayer", std::make_pair(getNetworkId(), std::make_pair(std::string(""), false)));
+				GameServer::getInstance().sendToCentralServer(setSceneMsg);
+
+				doUnload = true;
+			}
+		}
+		if (doUnload)
+		{
+			if (getClient())
+				GameServer::getInstance().dropClient(getNetworkId());
+			unload();
+			delete this;
+			return;
+		}
+	}
+
+	//This is the public interface to end baselines.  ::endBaselines is a protected virtual function now
+	// so that we can enforce order.
+	endBaselines();
+
+	if (needSceneFix)
+	{
+		WARNING(true, ("Fixing scene id for contained object %s due to incorrect scene id during baselines", getNetworkId().getValueString().c_str()));
+		setSceneIdOnThisAndContents(ServerWorld::getSceneId());
+	}
+
+	if (fromDatabase)
+		onLoadedFromDatabase();
+
+	updateWorldSphere();
+	if (getScriptObject() != NULL)
+	{
+		endBaselinesInitializeScript(*this, true);
+		// If the object was created authoritative, trigger if needed
+		if (isAuthoritative())
+			triggerMadeAuthoritative();
+	}
+
+	if (isPlayerControlled())
+		PlayerSanityChecker::add(getNetworkId());
+
+	//-- Validate the object transform.
+	checkAndLogInvalidTransform();
+
+	//-- Schedule for alter just in case something needs an alter.
+	scheduleForAlter();
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::onLoadedFromDatabase()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::endBaselines()
+{
+	// This should always go first: it ensures there are no deltas
+	// accumulated for this object at the time we start processing
+	// our baselined data. Only changes after this point will
+	// generate deltas.
+	clearDeltas();
+
+	//Handle updating container info
+	bool addToWorldFlag = handleContentsSetup();
+	setInitialized(true);
+
+	ServerController * c = safe_cast<ServerController*>(getController());
+	c->endBaselines();
+	setTransformChanged(false);
+
+	// check for parent getting uncached
+	if (isAuthoritative() && getCacheVersion() != 0)
+	{
+		ServerObject *parent = safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(*this));
+		if (parent && parent->getCacheVersion() == 0)
+			setCacheVersion(0);
+	}
+
+	// handle version numbering for contents on portal properties
+	PortalProperty *portalProperty = getPortalProperty();
+	if (portalProperty)
+	{
+		int crcValue=0;
+		getObjVars().getItem(portalPropertyCrcObjectVariableName,crcValue);
+		std::vector<Object*> unfixables;
+		if (portalProperty->serverEndBaselines(crcValue, unfixables, isAuthoritative()))
+		{
+			FATAL(ConfigServerGame::getFatalOnGoldPobChange() && getCacheVersion() != 0, 
+				("Object %s is a client cached object and the POB changed from [%d] to [%d]", getNetworkId().getValueString().c_str(), crcValue, portalProperty->getCrc()));
+			WARNING(getCacheVersion() != 0, ("Object %s is a client cached object and the POB changed from [%d] to [%d]", getNetworkId().getValueString().c_str(), crcValue, portalProperty->getCrc()));
+			if (isAuthoritative())
+				setCacheVersion(0);
+		}
+		if (isAuthoritative())
+			setObjVarItem(portalPropertyCrcObjectVariableName, portalProperty->getCrc());
+
+		if (!unfixables.empty())
+		{
+			WARNING(true, ("Object %s contained objects that could not be placed after pob fixup", getNetworkId().getValueString().c_str()));
+		}
+	}
+
+	if (addToWorldFlag)
+		addToWorld();
+
+	if (isAuthoritative())
+	{
+		// don't allow login if the character is in the middle of CTS or has been successfully CTS(ed)
+		Client * const client = GameServer::getInstance().getClient(getNetworkId());
+		if (client && !getClient() && (client->getCharacterObjectId() == getNetworkId()))
+		{
+			bool kickRequested = false;
+
+			DynamicVariableList const & objVars = getObjVars();
+			int timeOut;
+			if (objVars.getItem("disableLoginCtsInProgress", timeOut))
+			{
+				if (timeOut > static_cast<int>(ServerClock::getInstance().getGameTimeSeconds()))
+				{
+					MessageToQueue::getInstance().sendMessageToC(getNetworkId(), "C++kickPlayerCtsCompletedOrInProgress", "", 0, false);
+					kickRequested = true;
+				}
+				else
+				{
+					removeObjVarItem("disableLoginCtsInProgress");
+				}
+			}
+
+			int transferredTime;
+			if (!kickRequested && objVars.getItem("disableLoginCtsCompleted", transferredTime) && !client->isUsingAdminLogin())
+			{
+				MessageToQueue::getInstance().sendMessageToC(getNetworkId(), "C++kickPlayerCtsCompletedOrInProgress", "", 0, false);
+				kickRequested = true;
+			}
+		}
+
+		// attach a pending client to this object if needed
+		checkAndAddClientControl(client);
+
+		// Make sure the PlanetServer knows about the new object if it needs to
+		updatePositionOnPlanetServer(true);
+
+		// for initialized, unpacked vendor, sync the vendor location with the commodities server
+		if (isVendor())
+			CommoditiesMarket::updateVendorLocation(*this);
+
+		// if this is a reward item that supports trade in, attach the trade in script to it to provide the trade in functionality
+		VeteranRewardManager::attachTradeInScriptToItem(*this);
+
+		// sanity check - fix up any player character negative cash/bank balance
+		if (client)
+		{
+			if (m_cashBalance.get() < 0)
+				m_cashBalance = 0;
+
+			if (m_bankBalance.get() < 0)
+				m_bankBalance = 0;
+		}
+	}
+
+	// If our immediate container is initialized, we were just added to the container so update the ObserveTracker
+	ServerObject *immediateContainer = safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(*this));
+	if (immediateContainer && immediateContainer->isInitialized())
+	{
+		// handle the case of a player who logged out in a buildout cell
+		// and that buildout id got changed to some other object, like a rock
+		if (isPlayerControlled() && isAuthoritative() && (immediateContainer->getNetworkId().getValue() < static_cast<NetworkId::NetworkIdType>(0)))
+		{
+			if (immediateContainer->asCellObject() != NULL || ContainerInterface::getCell(*immediateContainer) != NULL)
+				ObserveTracker::onObjectContainerChanged(*this);
+			else
+			{
+				WARNING(true, ("ServerObject::endBaselines player (%s) is trying to be put into non-cell object (%s). We will put the player in the world instead.",
+					PlayerObject::getAccountDescription(this).c_str(), immediateContainer->getDebugInformation().c_str()));
+				ContainedByProperty * const cby = ContainerInterface::getContainedByProperty(*this);
+				if (cby)
+				{
+					cby->setContainedBy(NetworkId::cms_invalid, true);
+					if (!ServerWorld::isSpaceScene())
+					{
+						// if the player was in a building, try and put them at the building's ejection point
+						DynamicVariableLocationData ejectionPoint;
+						if (getObjVars().getItem("building_ejection_point", ejectionPoint) && (ServerWorld::getSceneId() == ejectionPoint.scene) && (!ejectionPoint.cell.isValid()))
+						{
+							removeObjVarItem("building_ejection_point");
+							setPosition_p(ejectionPoint.pos);
+						}
+					}
+					addToWorld();
+				}
+			}
+		}
+		else
+		{
+			//@todo: we may want to do something here if this call fails
+			ObserveTracker::onObjectContainerChanged(*this);
+		}
+	}
+
+	if (isAuthoritative() && (!isPlayerControlled() || getClient()) && getObjVars().hasItem("teleportFixup"))
+		TeleportFixupHandler::add(*this);
+
+	setInEndBaselines(false);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::getAuthClients(std::set<Client const *> &authClients) const
+{
+	Client const * const client = getClient();
+	if (client)
+		IGNORE_RETURN(authClients.insert(client));
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::handlePlayerInInteriorSetup(ContainedByProperty *containedBy)
+{
+	// If we are player-controlled, assume that it may have been a while since we logged in.
+	// If we were in a POB, it might have changed.  So, ignore the persisted cell number and look
+	// for the best cell.  If anything goes wrong looking for the cell, warp to a good location.
+
+	bool retval = false;
+
+	Object * const originalCell = containedBy->getContainedBy();
+	if (originalCell)
+	{
+		bool fixOk = false;
+
+		CellProperty * const originalCellProp = originalCell->getCellProperty();
+		ServerObject * const pob = safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(*originalCell));
+		BuildingObject * const building = pob ? pob->asBuildingObject() : 0;
+		PortalProperty * const portal = pob ? pob->getPortalProperty() : 0;
+
+		// Don't ever put the character into a packed house
+		if ((building) && (!building->isInWorld()))
+		{
+			DEBUG_REPORT_LOG(true,("Ejecting player %s from building %s, because the building is packed\n",getNetworkId().getValueString().c_str(), building->getNetworkId().getValueString().c_str()));
+			LOG("CustomerService",("Login:  Ejecting player %s from building %s, because the building is packed",getNetworkId().getValueString().c_str(), building->getNetworkId().getValueString().c_str()));
+
+			// settting fixOk to false will cause the character to get moved
+			// into the world at the building ejection point (see below)
+			fixOk = false;
+		}
+		else if (portal)
+		{
+			originalCellProp->depersistContents(*this);
+
+			if (pob->isInitialized())
+			{
+				if (isAuthoritative())
+				{
+					Transform const saveTransform(getTransform_o2p());
+					Container::ContainerErrorCode tmp = Container::CEC_Success;
+					originalCellProp->remove(*this, tmp);
+					containedBy->setContainedBy(NetworkId::cms_invalid);
+
+					fixOk = portal->fixupObject(*this, saveTransform);
+					containerHandleUpdateProxies(NULL, safe_cast<ServerObject*>(ContainerInterface::getContainedByObject(*this)));
+
+					if (building)
+						building->gainedPlayer(*this);
+				}
+				else
+				{
+					fixOk = true;
+					DEBUG_REPORT_LOG(true,("Skipping POB fixup on non-authoritative player %s\n",getNetworkId().getValueString().c_str()));
+					retval = true;
+				}
+			}
+			else
+			{
+				if (isAuthoritative())
+				{
+					Container::ContainerErrorCode tmp = Container::CEC_Success;
+					portal->queueObjectForFixup(*this);
+					originalCellProp->remove(*this, tmp);
+					containedBy->setContainedBy(NetworkId::cms_invalid);
+					setNeedsPobFixup(true);
+					addNotification(pobFixupNotification);
+				}
+				else
+					DEBUG_REPORT_LOG(true,("Skipping POB fixup on non-authoritative player %s\n",getNetworkId().getValueString().c_str()));
+				fixOk = true;
+			}
+		}
+
+		if (!fixOk)
+		{
+			// warp to safe location
+			DEBUG_WARNING(true,("Player-controlled object %s was warped outside of its container because a good cell could not be found.",getNetworkId().getValueString().c_str()));
+
+			containedBy->setContainedBy(NetworkId::cms_invalid);
+
+			// attempt to put the character at the ejection point of the building
+			if (!ServerWorld::isSpaceScene())
+			{
+				DynamicVariableLocationData ejectionPoint;
+				if (getObjVars().getItem("building_ejection_point", ejectionPoint) && (ServerWorld::getSceneId() == ejectionPoint.scene) && (!ejectionPoint.cell.isValid()))
+				{
+					removeObjVarItem("building_ejection_point");
+					setPosition_p(ejectionPoint.pos);
+				}
+			}
+
+			retval = true;
+		}
+	}
+	else
+	{
+		// the container (most likely a building) we were in doesn't exist any more
+		DEBUG_REPORT_LOG(true,("Ejecting player %s from building %s, because the building does not exist anymore\n",getNetworkId().getValueString().c_str(), containedBy->getContainedByNetworkId().getValueString().c_str()));
+		LOG("CustomerService",("Login:  Ejecting player %s from building %s, because the building does not exist anymore",getNetworkId().getValueString().c_str(), containedBy->getContainedByNetworkId().getValueString().c_str()));
+
+		containedBy->setContainedBy(NetworkId::cms_invalid);
+
+		// attempt to put the character at the ejection point of the building
+		if (!ServerWorld::isSpaceScene())
+		{
+			DynamicVariableLocationData ejectionPoint;
+			if (getObjVars().getItem("building_ejection_point", ejectionPoint) && (ServerWorld::getSceneId() == ejectionPoint.scene) && (!ejectionPoint.cell.isValid()))
+			{
+				removeObjVarItem("building_ejection_point");
+				setPosition_p(ejectionPoint.pos);
+			}
+			else
+			// warp the player to the Mos Eisley Starport
+			{
+				DEBUG_REPORT_LOG(true, ("Tried to load creature %s into invalid container. Moving to Mos Eisley Starport.\n", getNetworkId().getValueString().c_str()));
+				LOG("CustomerService",("Login:  Tried to load creature %s into invalid container. Moving to Mos Eisley Starport.\n", getNetworkId().getValueString().c_str()));
+				GameServer::getInstance().requestSceneWarp(CachedNetworkId(*this),"tatooine",Vector(3528,5,-4804),NetworkId::cms_invalid,Vector(3528,5,-4804));
+			}
+		}
+
+		retval = true;
+	}
+	return retval;
+}
+
+//-----------------------------------------------------------------------
+/**
+ * Handle setting up the contents of any containedby objects while de-persisting this object
+ */
+
+bool ServerObject::handleContentsSetup()
+{
+	ContainedByProperty * const containedBy = ContainerInterface::getContainedByProperty(*this);
+	if (!containedBy || containedBy->getContainedByNetworkId() == NetworkId::cms_invalid)
+		return true;
+
+	ServerObject * const containingObject = safe_cast<ServerObject *>(containedBy->getContainedBy());
+	DEBUG_REPORT_LOG(!containingObject, ("Could not depersist object %s into non-existant object %s.\n", getNetworkId().getValueString().c_str(), containedBy->getContainedByNetworkId().getValueString().c_str()));
+
+	// handle special case of player controlled objects depersisting into interiors
+	if (   isPlayerControlled()
+	    && (   (containingObject && containingObject->getCellProperty())
+	        || (containedBy->getContainedByNetworkId() != NetworkId::cms_invalid && !containingObject)))
+		return handlePlayerInInteriorSetup(containedBy);
+
+	if (containingObject)
+	{
+		Container * const container = ContainerInterface::getContainer(*containingObject);
+		SlottedContainer * const slotContainer = dynamic_cast<SlottedContainer *>(container);
+		if (slotContainer)
+		{
+			SlottedContainmentProperty * const slottedProperty = ContainerInterface::getSlottedContainmentProperty(*this);
+			if (slottedProperty)
+				slotContainer->depersistSlotContents(*this, slottedProperty->getCurrentArrangement());
+			else
+				WARNING_STRICT_FATAL(true, ("Tried to depersist an object with no arrangement into a slotted container"));
+		}
+		else if (container)
+		{
+			container->depersistContents(*this);
+			if (containingObject->isInitialized() && containingObject->isInWorld() && container->isContentItemExposedWith(*this))
+				addToWorld();
+		}
+
+		synchronizationOnLoadedInContainer();
+		return false;
+	}
+
+	LOG("CustomerService", ("BadContainerDepersist: Tried to depersist non-player object %s into container %s which could not be found.", getDebugInformation().c_str(), containedBy->getContainedByNetworkId().getValueString().c_str()));
+	unload();
+	return false;
+}
+
+//-----------------------------------------------------------------------
+
+unsigned long ServerObject::getAndIncrementMoveSequenceNumber()
+{
+	unsigned long newValue = m_transformSequence.get();
+	newValue++;
+	m_transformSequence = newValue;
+	return newValue;
+}
+
+//-----------------------------------------------------------------------
+
+const bool ServerObject::getPositionChanged() const
+{
+	return (getTransform_o2w().getPosition_p() != m_oldPosition);
+}
+
+//-----------------------------------------------------------------------
+
+const int ServerObject::getCacheVersion() const
+{
+	return m_cacheVersion.get();
+}
+
+//-----------------------------------------------------------------------
+
+const char * ServerObject::getSharedTemplateName() const
+{
+	if (getSharedTemplate() == NULL)
+		return NULL;
+	return getSharedTemplate()->ObjectTemplate::getName();
+}
+
+//-----------------------------------------------------------------------
+
+const char * ServerObject::getClientSharedTemplateName () const
+{
+	return getSharedTemplateName();
+}
+
+//-----------------------------------------------------------------------
+
+const Unicode::String ServerObject::getObjectName(void) const
+{
+	// try the player defined name first
+	const Unicode::String & name = m_objectName.get();
+	if (!name.empty ())
+		return name;
+
+	// try the stringId name
+	const StringId & nameId = m_nameStringId.get();
+	if (!nameId.isInvalid ())
+		return Unicode::narrowToWide(nameId.getDebugString ());
+
+	// use the template name
+	return Unicode::narrowToWide(getTemplateName());
+}
+
+//-----------------------------------------------------------------------
+
+const Sphere & ServerObject::getSphereExtent() const
+{
+	return m_worldSphere;
+}
+
+//-----------------------------------------------------------------------
+
+const Sphere ServerObject::getLocalSphere() const
+{
+	Sphere sphere (Sphere::unit);
+	const CollisionProperty * collision = getCollisionProperty();
+	if (collision)
+	{
+		sphere = collision->getBoundingSphere_l();
+	}
+	else
+	{
+		const Appearance * appearance = getAppearance();
+		if (appearance)
+		{
+			sphere = appearance->getSphere();
+		}
+	}
+
+	if (sphere.getRadius() == 0.0f)
+	{
+		sphere.setRadius(1.0f);
+	}
+	return sphere;
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::updateWorldSphere()
+{
+	Sphere sphere (getLocalSphere());
+	m_worldSphere.setCenter (rotateTranslate_o2w(sphere.getCenter()));
+	m_worldSphere.setRadius(sphere.getRadius());
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Gets the approximate height of the object.
+ *
+ * @return the object's height
+ */
+float ServerObject::getHeight() const
+{
+	return getSphereExtent().getRadius() * 2.0f * getScale().y;
+}	// ServerObject::getHeight
+
+//-----------------------------------------------------------------------
+
+/**
+ * Gets the approximate radius of the object.
+ *
+ * @return the object's radius
+ */
+float ServerObject::getRadius() const
+{
+	return getSphereExtent().getRadius() * std::max(getScale().x, getScale().z);
+}	// ServerObject::getHeight
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the volume of this object (and it's contents, if it's a container)
+ *
+ * @return the object's volume
+ */
+int ServerObject::getVolume(void) const
+{
+	const VolumeContainmentProperty* volumeProperty = ContainerInterface::getVolumeContainmentProperty(*this);
+	return volumeProperty ? volumeProperty->getVolume() : 1;
+#if 0
+	const VolumeContainer * container = ContainerInterface::getVolumeContainer(*this);
+	if (container)
+		return m_volume.get()+container->getCurrentVolume();
+	else
+		return m_volume.get();
+#endif
+}
+
+//-----------------------------------------------------------------------
+
+
+const TriggerVolume * ServerObject::getTriggerVolume(const std::string & triggerVolumeName) const
+{
+	const TriggerVolume * result = 0;
+	const TriggerVolumeMap::const_iterator i = m_triggerVolumes.find(triggerVolumeName);
+	if(i != m_triggerVolumes.end())
+	{
+		result = (*i).second;
+	}
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+TriggerVolume * ServerObject::getTriggerVolume(const std::string & triggerVolumeName)
+{
+	TriggerVolume * result = 0;
+	const TriggerVolumeMap::iterator i = m_triggerVolumes.find(triggerVolumeName);
+	if (i != m_triggerVolumes.end())
+	{
+		result = (*i).second;
+	}
+	return result;
+}
+
+//----------------------------------------------------------------------
+
+void ServerObject::seeCombatSpam (const MessageQueueCombatSpam & spamMsg)
+{
+	if (!isPlayerControlled())
+		return;
+
+	if (!isAuthoritative ())
+	{
+		sendControllerMessageToAuthServer(CM_combatSpam, new MessageQueueCombatSpam(spamMsg));
+		return;
+	}
+
+	if (getClient ())
+	{
+		bool shouldSend = (spamMsg.m_attacker == getNetworkId());
+		if (!shouldSend)
+		{
+			ServerObject * sourceObject = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(spamMsg.m_attacker));
+			if (   sourceObject
+			    && ObserveTracker::isObserving(*getClient(), *sourceObject)
+			    && !PlayerObject::isIgnoring(getNetworkId(), spamMsg.m_attacker))
+			{
+				shouldSend = true;
+			}
+		}
+
+		if (shouldSend)
+		{
+			MessageQueueCombatSpam * const msg = new MessageQueueCombatSpam (spamMsg);
+			Controller *const controller = NON_NULL (getController());
+			controller->appendMessage(CM_combatSpam, 0, msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ServerObject::seeSocial (const MessageQueueSocial & socialMsg)
+{
+	Controller * const controller = NON_NULL (getController());
+
+	if (!isAuthoritative ())
+	{
+		MessageQueueSocial * const msg = new MessageQueueSocial (socialMsg);
+		controller->appendMessage(CM_socialReceive, 0, msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+		return;
+	}
+
+	if (getClient ())
+	{
+		ServerObject *sourceObject = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(socialMsg.getSourceId()));
+		if (   sourceObject
+		    && (   sourceObject->getCacheVersion() > 0
+		        || (   ObserveTracker::isObserving(*getClient(), *sourceObject)
+		            && !PlayerObject::isIgnoring(getNetworkId(), socialMsg.getSourceId()))))
+		{
+			MessageQueueSocial * const msg = new MessageQueueSocial (socialMsg);
+			controller->appendMessage(CM_socialReceive, 0, msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerObject::serverObjectInitializeFirstTimeObject(ServerObject *cell, Transform const &transform)
+{
+	//This is the public interface for initializeFirstTimeObject.  ::initializeFirstTimeObject has been made
+	//protected virtual so that we could enforce order.
+
+	initializeFirstTimeObject();
+
+	// attach template scripts to this object
+	NOT_NULL(getScriptObject());
+	getScriptObject()->initScriptInstances();
+
+	ServerObjectTemplate const * const newTemplate = safe_cast<ServerObjectTemplate const *>(getObjectTemplate());
+	NOT_NULL(newTemplate);
+
+	int count = newTemplate->getScriptsCount();
+	for (int i = 0; i < count; ++i)
+		getScriptObject()->attachScript(newTemplate->getScripts(i), true);
+
+	if (cell)
+	{
+		Container::ContainerErrorCode tmp = Container::CEC_Success;
+		if (!ContainerInterface::transferItemToCell(*cell, *this, transform, NULL, tmp))
+		{
+			WARNING(true, ("ServerWorld::createNewObjectIntermediate tried to create a new object in a cell, but it failed."));
+			return false;
+		}
+	}
+	else if (transform != Transform::identity)
+		setTransform_o2p(transform);
+
+	getScriptObject()->setOwnerIsInitialized();
+
+	addObjectToConcludeList();
+
+	// validate the object transform
+	checkAndLogInvalidTransform();
+
+	//-- Initialize the controller
+	{
+		ServerController * const controller = safe_cast<ServerController *>(getController());
+		controller->endBaselines();
+	}
+
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::initializeFirstTimeObject()
+{
+	DEBUG_FATAL(!isAuthoritative(), ("Calling initialize on non authoritative object %s", getNetworkId().getValueString().c_str()));
+	setInitialized(true);
+	setPlacing(true);
+
+	const ServerObjectTemplate* newTemplate = safe_cast<const ServerObjectTemplate*>(getObjectTemplate());
+	NOT_NULL(newTemplate);
+
+	// set up objvars - we know we are authoritative so we can get by with this
+	newTemplate->getObjvars(m_objVars);
+
+	// record the crc of the pob used to create this object
+	PortalProperty *portalProperty = getPortalProperty();
+	if (portalProperty)
+		m_objVars.setItem(portalPropertyCrcObjectVariableName, portalProperty->getCrc());
+
+	// add template equipment to this object
+	int i;
+	int count = newTemplate->getContentsCount();
+	for (i = 0; i < count; ++i)
+	{
+		//Don't move this declaration of contents out of the loop or you will leak a ref.
+		ServerObjectTemplate::Contents contents;
+		newTemplate->getContents(contents, i);
+		if (contents.content == NULL)
+		{
+			DEBUG_WARNING(true, ("No template for contents item %d", i));
+			continue;
+		}
+		if (contents.equipObject)
+		{
+			// find out where the contents go
+			const SlotId & slotId = SlotIdManager::findSlotId(CrcLowerString(contents.slotName.c_str()));
+			if (slotId != SlotId::invalid)
+			{
+				//We'll persist the contents automatically if the parent object is persisted.
+				ServerObject * newObject = ServerWorld::createNewObject(*(safe_cast<const ServerObjectTemplate*>(contents.content)), *this,slotId, false);
+				if (newObject == NULL)
+				{
+					DEBUG_WARNING(true, ("Can't create object from template %s",contents.content->getName()));
+				}
+			}
+			else
+			{
+				DEBUG_WARNING(true, ("Slot %s is not a valid slot name", contents.slotName.c_str()));
+			}
+		}
+		else
+		{
+			// get the object (which we assume is a volume container) in the
+			// desired slot
+			SlottedContainer * const container = ContainerInterface::getSlottedContainer(*this);
+			if (container != NULL)
+			{
+				Container::ContainerErrorCode tmp = Container::CEC_Success;
+				CachedNetworkId equippedObjectId = container->getObjectInSlot(SlotIdManager::findSlotId(CrcLowerString(contents.slotName.c_str())), tmp);
+				if (equippedObjectId != NetworkId::cms_invalid)
+				{
+					// put the contents in the volume container
+					ServerObject * equippedObject = safe_cast<ServerObject *>(equippedObjectId.getObject());
+					if (equippedObject != NULL)
+					{
+
+						//We'll persist the contents automatically if the parent object is persisted.
+						ServerObject * newObject = ServerWorld::createNewObject(*(safe_cast<const ServerObjectTemplate*>(contents.content)), *equippedObject,false);
+						if (newObject == NULL)
+						{
+							DEBUG_WARNING(true, ("Can't create object from template %s", contents.content->getName()));
+						}
+					}
+					else
+					{
+						DEBUG_WARNING(true, ("Object in slot %s not loaded",contents.slotName.c_str()));
+					}
+				}
+				else
+				{
+					DEBUG_WARNING(true, ("No object in slot %s", contents.slotName.c_str()));
+				}
+			}
+			else
+				DEBUG_WARNING(true, ("No slotted container for object"));
+		}
+	}
+	{
+		const PropertyList::iterator iEnd = m_propertyList->end();
+		for (PropertyList::iterator i = m_propertyList->begin(); i != iEnd; ++i)
+			(*i)->initializeFirstTimeObject();
+	}
+
+	SharedObjectTemplate::GameObjectType got  =
+		static_cast<SharedObjectTemplate::GameObjectType> (getGameObjectType());
+	if (got == SharedObjectTemplate::GOT_terminal_bazaar)
+	{
+		setLoadContents(false);
+	}
+
+	//-- Assume this object wants to be altered.
+	scheduleForAlter();
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::kill()
+{
+	Object::kill();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Mark all the children of this object as persisted.
+ */
+void ServerObject::markChildrenPersisted()
+{
+	if (!safe_cast<const ServerObjectTemplate *>(getObjectTemplate())->getPersistContents())
+		return;
+
+	Container *container = ContainerInterface::getContainer(*this);
+	if (container)
+	{
+		for (ContainerIterator containerIterator = container->begin(); containerIterator != container->end(); ++containerIterator)
+		{
+			ServerObject *containedObject = safe_cast<ServerObject *>((*containerIterator).getObject());
+			if (containedObject)
+			{
+				containedObject->m_persisted=true;
+				containedObject->markChildrenPersisted();
+			}
+		}
+	}
+
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::addToWorld()
+{
+	if (getKill())
+		return;
+
+	if (isInWorld())
+	{
+		DEBUG_WARNING(true, ("Calling add to world on object already in it %s", getNetworkId().getValueString().c_str()));
+		return;
+	}
+	updateWorldSphere();
+
+	Object::addToWorld();
+	updateTriggerVolumes();
+
+	if (getScriptObject() != NULL)
+		getScriptObject()->setOwnerIsLoaded();
+
+	onAddedToWorld();
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::onAddedToWorld()
+{
+	m_oldPosition = getTransform_o2w().getPosition_p();
+
+	// sanity check whether we should really be in the world or not
+	ContainedByProperty const * const containedByProperty = getContainedByProperty();
+	if (containedByProperty && containedByProperty->getContainedByNetworkId().isValid())
+	{
+		Object const * const containedByObject = containedByProperty->getContainedBy();
+		if (containedByObject)
+		{
+			WARNING_DEBUG_FATAL(
+				!containedByObject->isInWorld(),
+				(
+					"Tried to add object %s to the world with container %s which is not in the world.",
+					getDebugInformation().c_str(),
+					containedByObject->getDebugInformation().c_str()));
+			Container const * const containerProperty = ContainerInterface::getContainer(*containedByObject);
+			if (containerProperty)
+			{
+				WARNING_DEBUG_FATAL(
+					!containerProperty->isContentItemExposedWith(*this),
+					(
+						"Tried to add object %s to the world with container %s which does not expose it.",
+						getDebugInformation().c_str(),
+						containedByObject->getDebugInformation().c_str()));
+			}
+			else
+			{
+				WARNING_DEBUG_FATAL(
+					true,
+					(
+						"Tried to add object %s to the world with container %s with no container property.",
+						getDebugInformation().c_str(),
+						containedByObject->getDebugInformation().c_str()));
+			}
+		}
+		else
+		{
+			WARNING_DEBUG_FATAL(
+				true,
+				(
+					"Tried to add object %s to the world with unresolvable container %s",
+					getDebugInformation().c_str(),
+					containedByProperty->getContainedByNetworkId().getValueString().c_str()));
+		}
+	}
+
+	// Add networkUpdate volume
+	if (isInWorldCell())
+		onAddedToWorldCell();
+
+	if (isAuthoritative())
+	{
+		//Tell scripts we are added to world
+		ScriptParams params;
+		IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_ADDED_TO_WORLD, params));
+
+		//remove the vendor reinitialization flag if it exists
+		removeObjVarItem(CommoditiesMarket::OBJVAR_VENDOR_REINITIALIZING);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerObject::checkAndAddClientControl(Client* client)
+{
+	if (isPlayerControlled())
+	{
+		CreatureObject* creature = asCreatureObject();
+		if (client && creature && isInitialized() && isAuthoritative() && !isNeedingPobFixup())
+		{
+			client->onLoadPlayer(*creature);
+			return true;
+		}
+		}
+	return false;
+	}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::onPobFixupComplete()
+{
+	setNeedsPobFixup(false);
+	checkAndAddClientControl(GameServer::getInstance().getClient(getNetworkId()));
+	BuildingObject * const building = static_cast<ServerObject*>(ContainerInterface::getTopmostContainer(*this))->asBuildingObject();
+	if (building)
+		building->gainedPlayer(*this);
+	
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::onClientReady(Client *c)
+{
+	NOT_NULL(c);
+	CmdSceneReady const readyMessage;
+	c->send(readyMessage, true);
+
+	ScriptParams params;
+	IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_LOGIN, params));
+
+	int galacticReserve = 0;
+	if (!getObjVars().getItem("galactic_reserve", galacticReserve))
+	{
+		galacticReserve = 0;
+	}
+
+	LOG("CustomerService", ("Money:%s logged in with %d money, %d galactic reserve", PlayerObject::getAccountDescription(getNetworkId()).c_str(), getTotalMoney(), galacticReserve));
+
+	if (getClient() && getClient()->isFreeTrialAccount())
+	{
+		bool addToConcludeList = false;
+
+		if ((m_cashBalance.get() + m_bankBalance.get()) > ConfigServerGame::getMaxFreeTrialMoney())
+		{
+			int amountOver = (m_cashBalance.get() + m_bankBalance.get()) - ConfigServerGame::getMaxFreeTrialMoney();
+			if (amountOver <= m_bankBalance.get())
+			{
+				m_bankBalance = m_bankBalance.get() - amountOver;
+				LOG("CustomerService", ("Money:%s is a free trial user and logged in with too much.  Deducting %d from bank.", PlayerObject::getAccountDescription(getNetworkId()).c_str(), amountOver));
+			}
+			else
+			{
+				m_cashBalance = m_cashBalance.get() - (amountOver - m_bankBalance.get());
+				LOG("CustomerService", ("Money:%s is a free trial user and logged in with too much.  Deducting %d from bank and %d from cash.", PlayerObject::getAccountDescription(getNetworkId()).c_str(), m_bankBalance.get(), amountOver - m_bankBalance.get()));
+				m_bankBalance = 0;			
+			}
+
+			// sanity check - fix up any negative cash/bank balance
+			if (m_cashBalance.get() < 0)
+				m_cashBalance = 0;
+
+			if (m_bankBalance.get() < 0)
+				m_bankBalance = 0;
+
+			addToConcludeList = true;
+		}
+
+		// trial accounts cannot have galactic reserve
+		if (galacticReserve > 0)
+		{
+			LOG("CustomerService", ("Money:%s is a free trial user and logged in with %d galactic reserve.  Setting galactic reserve to 0.", PlayerObject::getAccountDescription(getNetworkId()).c_str(), galacticReserve));
+			removeObjVarItem("galactic_reserve");
+			PlayerObject * const po = PlayerCreatureController::getPlayerObject(asCreatureObject());
+			if (po)
+			{
+				po->depersistGalacticReserveDeposit();
+			}
+
+			addToConcludeList = true;
+		}
+
+		if (addToConcludeList)
+			addObjectToConcludeList();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::onClientAboutToLoad()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::onLoadingScreenComplete()
+{
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::onContainerAboutToLoseItem(ServerObject * destination, ServerObject& item, ServerObject* transferer)
+{
+	if (transferer && !checkBankTransfer(this, item, transferer))
+		return false;
+
+	Object *parent = ContainerInterface::getContainedByObject(*this);
+	if (parent && parent->asServerObject())
+		return parent->asServerObject()->onContainerChildAboutToLoseItem(destination, item, transferer);
+
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerObject::onContainerAboutToTransfer(ServerObject * destination, ServerObject* transferer)
+{
+	UNREF(destination);
+	UNREF(transferer);
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+int ServerObject::onContainerAboutToGainItem(ServerObject& item, ServerObject* transferer)
+{
+	if (transferer && !checkBankTransfer(this, item, transferer))
+		return Container::CEC_BlockedByDestinationContainer;
+
+	Object *parent = ContainerInterface::getContainedByObject(*this);
+	//disallow putting crafting stations in other crafting stations
+	if (transferer && parent && parent->asServerObject())
+	{
+		SharedObjectTemplate::GameObjectType parentGot = static_cast<SharedObjectTemplate::GameObjectType> (parent->asServerObject()->getGameObjectType());
+		SharedObjectTemplate::GameObjectType itemGot = static_cast<SharedObjectTemplate::GameObjectType> (item.getGameObjectType());
+
+		if (parentGot == SharedObjectTemplate::GOT_misc_crafting_station && itemGot == parentGot)
+		{
+			return Container::CEC_BlockedByDestinationContainer;
+		}
+	}
+
+	if (parent && parent->asServerObject())
+		return parent->asServerObject()->onContainerChildAboutToGainItem(item, this, transferer) ? Container::CEC_Success : Container::CEC_BlockedByDestinationContainer;
+
+	return Container::CEC_Success;
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::onContainerLostItem(ServerObject * destination, ServerObject& item, ServerObject* transferer)
+{
+	Object *parent = ContainerInterface::getContainedByObject(*this);
+	if (parent && parent->asServerObject())
+		parent->asServerObject()->onContainerChildLostItem(destination, item, this, transferer);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::onContainerTransfer(ServerObject * destination, ServerObject* transferer)
+{
+	UNREF(destination);
+	UNREF(transferer);
+}
+
+//-----------------------------------------------------------------------
+
+void  ServerObject::onContainerGainItem(ServerObject& item, ServerObject* source, ServerObject* transferer)
+{
+	Object *parent = ContainerInterface::getContainedByObject(*this);
+	if (parent && parent->asServerObject())
+		parent->asServerObject()->onContainerChildGainItem(item, source, transferer);
+	combineResourceContainers(item);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::onContainerTransferComplete(ServerObject *oldContainer, ServerObject *newContainer)
+{
+	if (!isAuthoritative())
+	{
+		WARNING_STRICT_FATAL(true, ("onContainerTransferComplete called on non auth object %s", getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	if (newContainer)
+	{
+		//If this object is not persisted, but it placed into a container that is
+		// Then persist the object
+		if (!isPersisted() && newContainer->isPersisted() && safe_cast<ServerObjectTemplate const *>(newContainer->getObjectTemplate())->getPersistContents())
+			persist();
+	}
+
+	DEBUG_FATAL(getCellProperty(), ("Cell object container transfer complete"));
+
+	setTransformChanged(true);
+
+	if (   (oldContainer && !oldContainer->asCellObject())
+	    || (newContainer && !newContainer->asCellObject()))
+		PositionUpdateTracker::flushPositionUpdate(*this);
+
+	containerHandleUpdateProxies(oldContainer, newContainer);
+
+	Container const * const newContainerProperty = newContainer ? ContainerInterface::getContainer(*newContainer) : 0;
+	bool const wasInWorld = isInWorld();
+	bool const nowInWorld = !newContainer || (newContainerProperty && newContainer->isInWorld() && newContainerProperty->isContentItemExposedWith(*this));
+
+	containerHandleUpdateClients(oldContainer, newContainer, (wasInWorld && !nowInWorld), (!wasInWorld && nowInWorld));
+
+	ObserveTracker::onObjectArrangementChanged(*this);
+	scheduleForAlter();
+
+	updatePositionOnPlanetServer(true);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::containerDepersistContents(ServerObject * oldParent, ServerObject * newParent)
+{
+	Container * const oldContainer = oldParent ? ContainerInterface::getContainer(*oldParent) : NULL;
+	Container * const newContainer = newParent ? ContainerInterface::getContainer(*newParent) : NULL;
+
+	if (oldContainer)
+		oldContainer->internalItemRemoved(*this);
+	if (newContainer)
+	{
+		SlottedContainer * const slotContainer = dynamic_cast<SlottedContainer*>(newContainer);
+		if (slotContainer)
+		{
+			SlottedContainmentProperty* const slotted = ContainerInterface::getSlottedContainmentProperty(*this);
+			DEBUG_FATAL(!slotted, ("Error unpacking non slotted objects into a slotted container"));
+			slotContainer->depersistSlotContents(*this, -1);
+			slotContainer->updateArrangement(*this, -1, slotted->getCurrentArrangement());
+		}
+		else
+		{
+			newContainer->depersistContents(*this);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::containerHandleUpdateClients(ServerObject* oldContainer, ServerObject* newContainer, bool remFromWorld, bool addWorld)
+{
+	if (remFromWorld)
+		removeFromWorld();
+
+	// If we're moving in or out of the world cell, update as appropriate (adds or removes farUpdateVolume)
+	if (oldContainer && !newContainer && !addWorld)
+		onAddedToWorldCell();
+	else if (newContainer && !oldContainer && !remFromWorld)
+		onRemovedFromWorldCell();
+
+	if (addWorld)
+		addToWorld();
+
+	ObserveTracker::onObjectContainerChanged(*this);
+	synchronizationOnContainerChange(oldContainer, newContainer);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::createFarNetworkUpdateVolume(float const overrideVal)
+{
+	if (isBeingDestroyed() || isUnloading())
+	{
+		DEBUG_REPORT_LOG(true, ("Not creating volume for object that is being destroyed\n"));
+		return;
+	}
+	if (m_networkUpdateFar)
+	{
+		WARNING_STRICT_FATAL(true, ("Object %s already has a far update volume", getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	// There's no reason for a contained item to have a far network update volume
+	// if this object is contained by something else.
+	Object const *const containedByObject = ContainerInterface::getContainedByObject(*this);
+	if (containedByObject)
+	{
+		DEBUG_REPORT_LOG(true, ("SO::createFarNetworkUpdateVolume(): server id=[%lu],object id=[%s],container id=[%s]: skipping creation of far network update volume because item is contained.\n",
+								GameServer::getInstance().getProcessId(),
+								getNetworkId().getValueString().c_str(),
+								containedByObject->getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	if (getCacheVersion() == 0)
+	{
+		const ServerObjectTemplate * myTemplate = safe_cast<const ServerObjectTemplate *>(getObjectTemplate());
+		UNREF(myTemplate);
+		float const radius_far = overrideVal != 0.0f ? overrideVal : getFarNetworkUpdateRadius();
+		if (radius_far > 0)
+		{
+			if (ServerWorld::isSpaceScene())
+			{
+				DEBUG_REPORT_LOG(ConfigServerGame::getLogObservers(), ("creating far update volume (space version) for %s (template=%s, radius=%g)\n", getNetworkId().getValueString().c_str(), myTemplate->getName(), radius_far));
+				// don't make link-dead creatures visible to other people at the top level in space
+				if (getSendToClient() && (getClient() || !asCreatureObject()))
+					SpaceVisibilityManager::addObject (*this, static_cast<int>(radius_far));
+			}
+			else
+			{
+				DEBUG_REPORT_LOG(ConfigServerGame::getLogObservers(), ("creating far update volume for %s (template=%s, radius=%g)\n", getNetworkId().getValueString().c_str(), myTemplate->getName(), radius_far));
+				TriggerVolume * t = new NetworkTriggerVolume(*this, radius_far);
+				addTriggerVolume(t);
+				m_networkUpdateFar = t;
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::destroyFarNetworkUpdateVolume()
+{
+	if (!m_networkUpdateFar)
+		return;
+
+	DEBUG_REPORT_LOG(ConfigServerGame::getLogObservers(), ("Removing far update volume for %s\n", getNetworkId().getValueString().c_str()));
+	ServerWorld::removeObjectTriggerVolume(m_networkUpdateFar);
+	TriggerVolumeMap::iterator i = m_triggerVolumes.find(NetworkTriggerVolumeNamespace::NetworkTriggerVolumeName);
+	if (i == m_triggerVolumes.end() || i->second != m_networkUpdateFar)
+	{
+		WARNING_STRICT_FATAL(true, ("Called destroyFarNetworkUpdateVolume but could not find it in m_triggerVolumes"));
+	}
+	else
+		m_triggerVolumes.erase(i);
+
+	delete m_networkUpdateFar;
+	m_networkUpdateFar = 0;
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerObject::isNetworkUpdateFarTriggerVolume(TriggerVolume const &triggerVolume) const
+{
+	return triggerVolume.isNetworkTriggerVolume();
+}
+
+// ----------------------------------------------------------------------
+
+TriggerVolume *ServerObject::getNetworkTriggerVolume()
+{
+	return m_networkUpdateFar;
+}
+
+// ----------------------------------------------------------------------
+
+float ServerObject::getFarNetworkUpdateRadius() const
+{
+	if (ServerWorld::getSceneId() == NewbieTutorial::getSceneId())
+		return 0.f;
+
+	// Overide update radius for all scenes for all objects gloablly with config entry
+	int const overrideRadius = ConfigServerGame::getOverrideUpdateRadius();
+	// Overide the update radius for a specific scene if the above global overide is not set
+	// If Scene overide is disabled in ConfigServerGame::getEnableSceneGlobalData() it will return zero 
+	float radius = overrideRadius > 0 ? static_cast<float>(overrideRadius) : SceneGlobalData::getUpdateRadius(ServerWorld::getSceneId()); 
+        // Set the radius to the far update range of from the object template if it hasn't already been overiden
+	radius = radius > 0 ? radius : safe_cast<ServerObjectTemplate const *>(getObjectTemplate())->getUpdateRanges(ServerObjectTemplate::UR_far);
+	
+	if (!ServerWorld::isSpaceScene())
+	{
+		if (ms_buildingUpdateRadiusMultiplier == 0)
+			setBuildingUpdateRadiusMultiplier(ConfigServerGame::getBuildingUpdateRadiusMultiplier());
+
+		// Potentially allow larger objects to come into range sooner if the cfg setting to do so is set
+		if (radius >= 127.0f && radius < 512.0f && !asCreatureObject())
+			radius *= ms_buildingUpdateRadiusMultiplier;
+	}
+	return radius;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::onTriggerEnter(ServerObject & object, TriggerVolume & triggerVolume)
+{
+}
+
+//-----------------------------------------------------------------------
+// object is leaving this' volume
+void ServerObject::onTriggerExit(ServerObject & object, TriggerVolume & triggerVolume)
+{
+}
+
+// ----------------------------------------------------------------------
+// this object got added to a trigger volume
+void ServerObject::onAddedToTriggerVolume(TriggerVolume & triggerVolume)
+{
+	// only CreatureObject should ever be added to a TriggerVolume
+	WARNING(true, ("ServerObject (%s) being added to TriggerVolume (%s) owned by (%s)",
+		getDebugInformation().c_str(),
+		triggerVolume.getName().c_str(),
+		triggerVolume.getOwner().getDebugInformation().c_str()));
+}
+
+// ----------------------------------------------------------------------
+// this object got removed from a trigger volume
+void ServerObject::onRemovedFromTriggerVolume(TriggerVolume & triggerVolume)
+{
+	// NOTE: be careful about referencing the TriggerVolume because this
+	// function can be called from the TriggerVolume's dtor
+
+	// only CreatureObject should ever be added to a TriggerVolume
+	WARNING(true, ("ServerObject (%s) being removed from TriggerVolume (%s) owned by (%s)",
+		getDebugInformation().c_str(),
+		triggerVolume.getName().c_str(),
+		triggerVolume.getOwner().getDebugInformation().c_str()));
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Send an object to the database process to be persisted, if it isn't already.
+ * After this function is called, changes to this object will be sent to the database.
+ */
+
+void ServerObject::persist()
+{
+	// Do not persist buildout objects (buildout objects have negative networkIds)
+	if (getNetworkId() < NetworkId::cms_invalid)
+		return;
+
+	if (isAuthoritative())
+	{
+		ContainedByProperty *containedBy = getContainedByProperty();
+
+		bool const contained = containedBy && containedBy->getContainedByNetworkId().isValid();
+
+		if (ServerWorld::isSpaceScene())
+		{
+			// in space, non-player objects are only allowed to persist at the origin
+			if (!contained && !isPlayerControlled() && getPosition_p() != Vector::zero)
+			{
+				WARNING_STRICT_FATAL(true, ("Tried to persist non-player object %s in a space scene away from the origin (not persisting).", getDebugInformation().c_str()));
+				return;
+			}
+		}
+		else
+		{
+			WARNING_STRICT_FATAL((getPosition_w() == Vector::zero) && !contained && (getSceneId() != "universe"), ("Persisting object %s (%s) at (0,0,0)",getNetworkId().getValueString().c_str(),getTemplateName()));
+		}
+
+		if (!m_persisted.get())
+		{
+#ifdef _DEBUG
+			ServerObject *parent = static_cast<ServerObject*>(ContainerInterface::getContainedByObject(*this));
+			if (parent && !parent->isPersisted())
+			{
+				WARNING(true, ("Persisting %s into %s which is not persisted!", getNetworkId().getValueString().c_str(), parent->getNetworkId().getValueString().c_str()));
+			}
+#endif
+
+			m_persisted = true;
+
+			markChildrenPersisted();
+			sendCreateAndBaselinesToDatabaseServer();
+
+			PositionUpdateTracker::sendPositionUpdate(*this);
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_persistObject, 0);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::removeTriggerVolume(const std::string & name)
+{
+	for (unsigned int i = 0; i < m_triggerVolumeInfo.size(); ++i)
+	{
+		if (m_triggerVolumeInfo[i].name == name)
+		{
+			m_triggerVolumeInfo.erase(i);
+			break;
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::sendControllerMessageToAuthServer(enum GameControllerMessage cm, MessageQueue::Data * msg, float value)
+{
+#ifdef _DEBUG
+	// debug stuff done this way so it is easy to break on
+	if (!isInitialized() || isInEndBaselines())
+	{
+		WARNING(isInEndBaselines(), ("sendControllerMessageToAuthServer while ending baselines: message id=(%d) from object id=[%s], template=[%s], on server id=[%d]", static_cast<int>(cm), getNetworkId().getValueString().c_str(), getObjectTemplateName(), static_cast<int>(GameServer::getInstance().getProcessId())));
+		WARNING(!isInitialized(), ("sendControllerMessageToAuthServer while uninitialized: message id=(%d) from object id=[%s], template=[%s], on server id=[%d]", static_cast<int>(cm), getNetworkId().getValueString().c_str(), getObjectTemplateName(), static_cast<int>(GameServer::getInstance().getProcessId())));
+	}
+#endif
+
+	Controller * controller = getController();
+	if(controller)
+	{
+		controller->appendMessage(cm, value, msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+	else
+	{
+		DEBUG_WARNING(true, ("No controller for sendControllerMessageToAuthServer"));
+		delete msg;
+	}
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerObject::getSendToClient() const
+{
+	return getCacheVersion() == 0 && getLocalFlag(LocalObjectFlags::ServerObject_SendToClient);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::sendToClientsInUpdateRange(const GameNetworkMessage & message, bool reliable, bool includeSelf) const
+{
+	std::set<Client *> const &clients = getObservers();
+	std::set<Client *>::const_iterator i;
+	std::map<ConnectionServerConnection *, std::vector<NetworkId> > &tmpDistributionList = DistributionListStack::alloc();
+
+	Client const * const myClient = getClient();
+
+	float minDistanceSquared = 0.0f;
+
+	if (!reliable)
+	{
+		if (m_unreliableControllerMessageSequenceNumber == 0)
+		{
+			// Send reliable
+
+			reliable = true;
+			++m_unreliableControllerMessageSequenceNumber;
+		}
+		else
+		{
+			// Send un-reliable based on distance
+
+			switch (m_unreliableControllerMessageSequenceNumber)
+			{
+				// The server is guaranteed to send one reliable transform update per 2 seconds (8:1 ratio for unreliable/reliable)
+
+				case 1: { minDistanceSquared = ConfigServerGame::getUpdateRange7PacketsSquared(); } break; // 7 unreliable per 2 seconds
+				case 2: { minDistanceSquared = ConfigServerGame::getUpdateRange3PacketsSquared(); } break; // 3 unreliable per 2 seconds
+				case 3: { minDistanceSquared = ConfigServerGame::getUpdateRange5PacketsSquared(); } break; // 5 unreliable per 2 seconds
+				case 4: { minDistanceSquared = ConfigServerGame::getUpdateRange1PacketsSquared(); } break; // 1 unreliable per 2 seconds
+				case 5: { minDistanceSquared = ConfigServerGame::getUpdateRange4PacketsSquared(); } break; // 4 unreliable per 2 seconds
+				case 6: { minDistanceSquared = ConfigServerGame::getUpdateRange2PacketsSquared(); } break; // 2 unreliable per 2 seconds
+				case 7: { minDistanceSquared = ConfigServerGame::getUpdateRange6PacketsSquared(); } break; // 6 unreliable per 2 seconds
+				default:
+					{
+						DEBUG_WARNING(true, ("All cases should be handled for the sequence numbers: %d", m_unreliableControllerMessageSequenceNumber));
+					}
+
+			}
+
+			if (m_unreliableControllerMessageSequenceNumber >= 7)
+			{
+				m_unreliableControllerMessageSequenceNumber = 0;
+			}
+			else
+			{
+				++m_unreliableControllerMessageSequenceNumber;
+			}
+		}
+	}
+
+	// need to do special handling for CM_combatSpam controller
+	// message to determine if the client should get the message
+	bool isCombatSpamMessage = false;
+	NetworkId combatSpamAttacker, combatSpamDefender;
+	Vector combatSpamAttackerPosition_w, combatSpamDefenderPosition_w;
+	if (!clients.empty())
+	{
+		static unsigned long int const controllerMessageCrc = MessageDispatch::MessageBase::makeMessageTypeFromString("ObjControllerMessage");
+		if (controllerMessageCrc == message.getType())
+		{
+			ObjControllerMessage const & ocm = static_cast<ObjControllerMessage const &>(message);
+			if (ocm.getMessage() == CM_combatSpam)
+			{
+				MessageQueueCombatSpam const * mqcs = static_cast<MessageQueueCombatSpam const *>(ocm.getData());
+
+				if (mqcs)
+				{
+					isCombatSpamMessage = true;
+					combatSpamAttacker = mqcs->m_attacker;
+					combatSpamAttackerPosition_w = mqcs->m_attackerPosition_w;
+					combatSpamDefender = mqcs->m_defender;
+					combatSpamDefenderPosition_w = mqcs->m_defenderPosition_w;
+				}
+			}
+		}
+	}
+
+	for (i = clients.begin(); i != clients.end(); ++i)
+	{
+		// build connection list
+		Client * const c = (*i);
+
+		if (isCombatSpamMessage && !c->shouldReceiveCombatSpam(combatSpamAttacker, combatSpamAttackerPosition_w, combatSpamDefender, combatSpamDefenderPosition_w))
+			continue;
+
+		if (!reliable)
+		{
+			// if it's time to try to send to this client
+			// because it is close enough, add it to the
+			// target list, otherwise continue looking
+			// through clients.
+
+			ServerObject * const obj = c->getCharacterObject();
+
+			if (obj != NULL)
+			{
+				if (   (ConfigServerGame::getSkipUnreliableTransformsForOtherCells() && obj->getAttachedTo() != getAttachedTo())
+					|| (obj->getPosition_w().magnitudeBetweenSquared(getPosition_w()) > minDistanceSquared)
+					|| (!CellProperty::areAdjacent(getParentCell(), obj->getParentCell())))
+				{
+					// Throw out this un-reliable packet due to distance
+
+					continue;
+				}
+			}
+		}
+
+		if(includeSelf || ( (!includeSelf) && c != myClient) )
+		{
+			ConnectionServerConnection * const n = c->getConnection();
+			if (n)
+				tmpDistributionList[n].push_back(c->getCharacterObjectId());
+		}
+	}
+
+	for (std::map<ConnectionServerConnection *, std::vector<NetworkId> >::const_iterator connIter = tmpDistributionList.begin(); connIter != tmpDistributionList.end(); ++connIter)
+	{
+		GameClientMessage const msg((*connIter).second, reliable, message);
+		(*connIter).first->send(msg, reliable);
+	}
+
+	DistributionListStack::release();
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::sendToSpecifiedClients(const GameNetworkMessage & message, bool reliable, const std::vector<NetworkId> & clients)
+{
+	for (std::vector<NetworkId>::const_iterator i = clients.begin(); i != clients.end(); ++i)
+	{
+		ServerObject * o = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(*i));
+		if (o != NULL && o->getClient() != NULL)
+			o->getClient()->send(message, reliable);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::appendMessage(int const message, float const value, uint32 const flags)
+{
+	Controller * const co = getController();
+	if (co)
+		co->appendMessage(message, value, flags);
+	else
+		DEBUG_REPORT_LOG(true, ("ServerObject::appendMessage: %s called without a controller.\n", getDebugInformation().c_str()));
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::appendMessage(int const message, float const value, MessageQueue::Data * const data, uint32 const flags)
+{
+	Controller * const co = getController();
+	if (co)
+		co->appendMessage(message, 0.0f, data, flags);
+	else
+		DEBUG_REPORT_LOG(true, ("ServerObject::appendMessage: %s called without a controller.\n", getDebugInformation().c_str()));
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::forwardServerObjectSpecificBaselines() const
+{
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::sendObjectSpecificBaselinesToClient(Client const &) const
+{
+}
+
+//-----------------------------------------------------------------------
+
+BaselinesMessage * ServerObject::createSharedBaselinesMessage() const
+{
+	return new BaselinesMessage(getNetworkId(), getObjectType(), m_sharedPackage, BaselinesMessage::BASELINES_SHARED);
+}
+
+//-----------------------------------------------------------------------
+
+BaselinesMessage * ServerObject::createSharedNpBaselinesMessage() const
+{
+	return new BaselinesMessage(getNetworkId(), getObjectType(), m_sharedPackage_np, BaselinesMessage::BASELINES_SHARED_NP);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::setAuthority()
+{
+	// We make sure to send out deltas before setting authority, so that we don't push out deltas at the
+	// end of the frame which were intended to be nonauthoritative.
+	if (isInitialized())
+		sendDeltasForSelfAndContents();
+
+	DEBUG_REPORT_LOG(ConfigServerGame::getLogObservers(), ("Called setAuthority on %s\n", getNetworkId().getValueString().c_str()));
+
+	Container * const container = ContainerInterface::getContainer(*this);
+	if (container)
+	{
+		std::vector<CachedNetworkId> idList;
+		idList.reserve(container->getNumberOfItems());
+		for (ContainerIterator containerIterator = container->begin(); containerIterator != container->end(); ++containerIterator)
+			idList.push_back(*containerIterator);
+
+		for (std::vector<CachedNetworkId>::iterator i = idList.begin(); i != idList.end(); ++i)
+		{
+			ServerObject * const containedObject = safe_cast<ServerObject *>(i->getObject());
+			if (containedObject)
+				containedObject->setAuthority();
+		}
+	}
+
+	safe_cast<ServerController*>(getController())->setAuthoritative(true);
+
+	if (getScriptObject())
+		getScriptObject()->setOwnerIsAuthoritative(true, GameServer::getInstance().getProcessId());
+
+	setAuthServerProcessId(GameServer::getInstance().getProcessId());
+
+	if (isInitialized())
+		updatePositionOnPlanetServer(true);
+
+	if (isAuthoritative() && (!isPlayerControlled() || getClient()) && getObjVars().hasItem("teleportFixup"))
+		TeleportFixupHandler::add(*this);
+
+	// Update loadWith so we don't depend on a stale value for objects that
+	// drop authority and regain it later without unloading.
+	setLoadWith(ContainerInterface::getLoadWithContainerId(*this));
+
+	virtualOnSetAuthority();
+	scheduleForAlter();
+	if (!m_messageTos.empty())
+		MessageToQueue::getInstance().addToScheduler(*this, m_messageTos.begin()->second.getCallTime());
+
+	if (isPlayerControlled())
+	{
+		// Make sure Central knows the right sceneId for the player
+		GenericValueTypeMessage<std::pair<NetworkId, std::pair<std::string, bool> > > const msg(
+			"SetSceneForPlayer",
+			std::make_pair(
+				getNetworkId(),
+				std::make_pair(ServerWorld::getSceneId(), false)));
+
+		GameServer::getInstance().sendToCentralServer(msg);
+
+		std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData();
+		std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = connectedCharacterLfgData.find(getNetworkId());
+		if ((iterFind != connectedCharacterLfgData.end()) && (iterFind->second.locationPlanet != ServerWorld::getSceneId()))
+			ServerUniverse::setConnectedCharacterPlanetData(getNetworkId(), ServerWorld::getSceneId());
+	}
+
+	// When a top level object or an object whose contiaining object is
+	// authoritative gets to this point, all its contents have been
+	// made authoritative, so it is now safe to trigger appropriate objects
+	// to notify them of gaining authority.
+	ServerObject * const containingObject = safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(*this));
+	if (!containingObject || containingObject->isAuthoritative())
+		triggerMadeAuthoritative();
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::virtualOnSetClient()
+{
+	if (getObjVars().hasItem("teleportFixup"))
+		TeleportFixupHandler::add(*this);
+
+	if (m_pendingSyncUi)
+	{
+		for (std::vector<NetworkId>::const_iterator i = m_pendingSyncUi->begin(); i != m_pendingSyncUi->end(); ++i)
+		{
+			ServerObject *uiObject = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(*i));
+			if (uiObject && uiObject->getSynchronizedUi())
+				uiObject->addSynchronizedUiClient(*this);
+		}
+		delete m_pendingSyncUi;
+		m_pendingSyncUi = 0;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setClient(Client &newClient)
+{
+	m_client = &newClient;
+
+	virtualOnSetClient();
+
+	safe_cast<ServerController *>(getController())->onClientReady();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::clearClient()
+{
+	if (m_client)
+	{
+		safe_cast<ServerController *>(getController())->onClientLost();
+		m_client = 0;
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::setCacheVersion(const int c)
+{
+	if (isAuthoritative())
+	{
+		bool const becomingUncached = c == 0 && m_cacheVersion.get() != 0;
+
+		if (becomingUncached)
+			ObserveTracker::onObjectDestroyed(*this, false);
+
+		m_cacheVersion.set(c);
+		if (c == 0)
+		{
+			Container* container = ContainerInterface::getContainer(*this);
+			if (container)
+			{
+				for (ContainerIterator i = container->begin(); i != container->end(); ++i)
+				{
+					ServerObject *containedObject = safe_cast<ServerObject*>((*i).getObject());
+					if (containedObject && containedObject->getCacheVersion() != 0)
+						containedObject->setCacheVersion(0);
+				}
+			}
+
+			if (becomingUncached && isInWorld() && !ContainerInterface::getContainedByObject(*this))
+				createFarNetworkUpdateVolume();
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setCacheVersion, new MessageQueueGenericValueType<int>(c));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setDefaultAlterTime(float time)
+{
+	// if the server is running in build mode, always alter, so that designers' changes
+	// will be made even if there are no players around
+	if (ConfigServerGame::getBuildoutAreaEditingEnabled() && time > AlterResult::cms_alterQuickly)
+		time = AlterResult::cms_alterQuickly;
+	m_defaultAlterTime = time;
+}
+
+// ----------------------------------------------------------------------
+// CellProperty::addObject_w calls around this function (it calls Object::setParentCell directly)
+// to ensure that server-side objects send cellChanged notifications correctly.
+
+void ServerObject::setParentCell(CellProperty * newCell)
+{
+	// Uninitialized or proxy objects can set the parent cell directly
+
+	if (!isInitialized() || !isAuthoritative())
+	{
+		Object::setParentCell(newCell);
+		return;
+	}
+
+	// Everything else has to go through ContainerInterface
+
+	Transform oldTransform = getTransform_o2p();
+
+	bool result = false;
+
+	CellProperty * oldCell = getParentCell();
+
+	if(oldCell == NULL) oldCell = CellProperty::getWorldCellProperty();
+	if(newCell == NULL) newCell = CellProperty::getWorldCellProperty();
+
+	// ----------
+
+	if(oldCell == newCell)
+	{
+		// Cells are the same - nothing to do
+	}
+	if(newCell == CellProperty::getWorldCellProperty())
+	{
+		// Object was in a cell and is moving to the world, transfer from cell container to world
+
+		Object * oldCellObject = &oldCell->getOwner();
+
+		Transform oldCellTransform = oldCellObject->getTransform_o2w();
+
+		Transform newTransform;
+
+		newTransform.multiply(oldCellTransform,oldTransform);
+
+		Container::ContainerErrorCode tmp = Container::CEC_Success;
+		result = ContainerInterface::transferItemToWorld(*this, newTransform, NULL, tmp);
+
+		DEBUG_REPORT_LOG(!result, ("Object %s (id=%s) transfer to world was denied via ContainerInterface::transferItemToWorld()\n", getObjectTemplateName(), getNetworkId().getValueString().c_str()));
+	}
+	else
+	{
+		// Object is moving to a different cell
+
+		Object * newCellObject = &newCell->getOwner();
+
+		ServerObject * newCellServerObject = safe_cast<ServerObject*>(newCellObject);
+
+		Container::ContainerErrorCode tmp = Container::CEC_Success;
+		result = ContainerInterface::transferItemToCell(*newCellServerObject, *this, NULL, tmp);
+
+		DEBUG_REPORT_LOG(!result, ("Object %s (id=%s) transfer to cell (id=%s) was denied via ContainerInterface::transferItemToCell()\n", getObjectTemplateName(), getNetworkId().getValueString().c_str(), newCellObject->getNetworkId().getValueString().c_str()));
+	}
+
+	// ----------
+
+	if(!result)
+	{
+		// A failed transfer may have mucked up the transform, so restore it now.
+
+		setTransform_o2p(oldTransform);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+NetworkId const &ServerObject::getOwnerId() const
+{
+	return NetworkId::cms_invalid;
+}
+
+//-----------------------------------------------------------------------
+
+bool ServerObject::isOwner(NetworkId const &, Client const *client) const
+{
+	return client && client->isGod();
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::setOwnerId(NetworkId const &)
+{
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Rename an object.
+ * @param newName The new name for the object
+ * You cannot rename a player-controlled object using this function.
+ * @see PlayerCreationManagerServer::renamePlayer()
+ */
+
+void ServerObject::setObjectName(const Unicode::String &newName)
+{
+	if(isAuthoritative())
+	{
+		if (isPlayerControlled())
+		{
+			DEBUG_WARNING(true, ("You cannot set the name of a player controlled object directly.  Name:<%s>", Unicode::wideToNarrow(newName).c_str()));
+			return;
+		}
+		
+		std::string UTF8String = Unicode::wideToUTF8(newName);
+		if (UTF8String.length() > 127)
+		{
+			DEBUG_WARNING(true, ("Tried to set object %s's name to something too long (truncating). [%s]", getNetworkId().getValueString().c_str(), UTF8String.c_str()));
+			m_objectName = Unicode::utf8ToWide(UTF8String.substr(0, 127));
+		}
+		else
+			m_objectName = newName;
+
+		if (newName[0] == '@')
+		{
+			StringId id(Unicode::wideToNarrow(newName));
+			setObjectNameStringId(id);
+			setObjectName(Unicode::emptyString);
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setObjectName, new MessageQueueGenericValueType<Unicode::String>(newName));
+	}
+}
+
+//-----------------------------------------------------------------
+
+void ServerObject::setObjectNameStringId (const StringId & id)
+{
+	if(isAuthoritative())
+	{
+		m_nameStringId = id;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setObjectNameStringId, new MessageQueueGenericValueType<StringId>(id));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ServerObject::setSceneIdOnThisAndContents  (const std::string & sceneId)
+{
+	setSceneId(sceneId);
+	Container *container = ContainerInterface::getContainer(*this);
+	if (container)
+	{
+		for (ContainerIterator containerIterator = container->begin(); containerIterator != container->end(); ++containerIterator)
+		{
+			ServerObject *containedObject = safe_cast<ServerObject *>((*containerIterator).getObject());
+			if (containedObject)
+			{
+				containedObject->setSceneIdOnThisAndContents(sceneId);
+			}
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ServerObject::speakText(NetworkId const &target, uint32 chatType, uint32 mood, uint32 flags, Unicode::String const &speech, int language, Unicode::String const &oob)
+{
+	if (speech.empty())
+	{
+		return;
+	}
+
+	if (chatType > 16384 || mood > 16384 || flags > 16384)
+	{
+		WARNING (true, ("ChatType, Mood, or Flags are out of 16 bit range. %d, %d, %d", chatType, mood, flags));
+		return;
+	}
+
+	const bool isTypePrivate = SpatialChatManager::isPrivate (chatType);
+	if (isTypePrivate)
+		flags |= MessageQueueSpatialChat::F_isPrivate;
+
+	const uint16 volume = SpatialChatManager::getVolume (chatType);
+
+	MessageQueueSpatialChat const chatMessage(
+		getNetworkId(),
+		target,
+		speech,
+		volume,
+		static_cast<uint16>(chatType),
+		static_cast<uint16>(mood),
+		flags,
+		language,
+		oob);
+	speakText(chatMessage);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::speakText(MessageQueueSpatialChat const &spatialChat)
+{
+	if (!isAuthoritative ())
+	{
+		Controller * const controller = getController();
+		NOT_NULL (controller);
+
+		MessageQueueSpatialChat * msg = new MessageQueueSpatialChat (spatialChat);
+		controller->appendMessage(CM_spatialChatSend, 0, msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+		return;
+	}
+
+	if (m_scriptObject)
+	{
+		ScriptParams params;
+		params.addParam(spatialChat.getText ());
+		if (m_scriptObject->trigAllScripts(Scripting::TRIG_SPEAKING, params) != SCRIPT_CONTINUE)
+		{
+			LOG("ScriptInvestigation", ("Chat could not speak for %s because scripts said not to", getNetworkId().getValueString().c_str()));
+			return;
+		}
+	}
+
+	const float distance         = static_cast<float>(spatialChat.getVolume ());
+	const uint32 flags           = spatialChat.getFlags();
+	const bool isPrivate         = (flags & MessageQueueSpatialChat::F_isPrivate) != 0;
+	const bool isTargetOnly      = (flags & MessageQueueSpatialChat::F_targetOnly) != 0;
+	const bool isTargetGroupOnly = (flags & MessageQueueSpatialChat::F_targetGroupOnly) != 0;
+	const bool isTargetAndSourceGroup = (flags & MessageQueueSpatialChat::F_targetAndSourceGroup) != 0;
+
+	const NetworkId & chatTargetId = spatialChat.getTargetId ();
+	const NetworkId & chatSourceId = spatialChat.getSourceId ();
+
+	typedef std::vector<ServerObject *> ServerObjectVector;
+	ServerObjectVector results;
+	ServerWorld::getSpatialChatListeners(*this, distance, results);
+
+	const ServerObject * const chatTarget           = safe_cast<const ServerObject *>(NetworkIdManager::getObjectById (chatTargetId));
+	const CreatureObject * const chatTargetCreature = chatTarget ? chatTarget->asCreatureObject () : 0;
+	int const chatMessageIndex = ChatLogManager::getNextMessageIndex();
+
+	const ServerObject * const chatSource = safe_cast<const ServerObject *>(NetworkIdManager::getObjectById (chatSourceId));
+	const CreatureObject * const chatSourceCreature = chatSource ? chatSource->asCreatureObject () : 0;
+
+	for(ServerObjectVector::iterator i = results.begin(); i != results.end(); ++i)
+	{
+		ServerObject * const target = NON_NULL (*i);
+
+		const NetworkId & targetId = target->getNetworkId ();
+
+		//-- see if the target is valid for the flags
+		if ((spatialChat.getFlags() & MessageQueueSpatialChat::F_skipTarget) != 0 && target->getNetworkId() == spatialChat.getTargetId())
+			continue;
+		if ((spatialChat.getFlags() & MessageQueueSpatialChat::F_skipSource) != 0 && target->getNetworkId() == spatialChat.getSourceId())
+			continue;
+
+		if (isTargetAndSourceGroup)
+		{
+			const CreatureObject * const targetCreature = target->asCreatureObject ();
+			if (!targetCreature)
+			{
+				continue;
+			}
+
+			const GroupObject * const chatSourceGroup = chatSourceCreature ? chatSourceCreature->getGroup () : 0;
+			const GroupObject * const chatTargetGroup = chatTargetCreature ? chatTargetCreature->getGroup () : 0;
+			const GroupObject * const targetGroup = targetCreature ? targetCreature->getGroup () : 0;
+
+			//continue if targetCreature is not in a group with the chat source or chat target
+			if (targetId != chatTargetId && targetId != chatSourceId)
+			{
+				if (!targetGroup || (targetGroup != chatSourceGroup && targetGroup != chatTargetGroup))
+				{
+					continue;
+				}
+			}
+
+		}
+		else if (isTargetGroupOnly)
+		{
+			if (!chatTargetCreature)
+				continue;
+
+			if (targetId != chatTargetId)
+			{
+				const CreatureObject * const targetCreature = target->asCreatureObject ();
+				if (!targetCreature || !targetCreature->getGroup() || targetCreature->getGroup () != chatTargetCreature->getGroup ())
+					continue;
+			}
+		}
+		else if (isTargetOnly)
+		{
+			if (targetId != chatTargetId)
+				continue;
+		}
+
+		if (isPrivate)
+		{
+			if (targetId == chatTargetId || getNetworkId () == chatTargetId || getNetworkId () == chatSourceId)
+			{
+				//-- don't send text to ourselves if we are an NPC
+				if (isPlayerControlled () || chatSourceId != getNetworkId ())
+				{
+					target->hearText(*this, spatialChat, chatMessageIndex);
+				}
+			}
+			else
+			{
+				const MessageQueueSpatialChat noTextMsg (spatialChat.getSourceId (),
+					spatialChat.getTargetId  (),
+					Unicode::emptyString,
+					spatialChat.getVolume    (),
+					spatialChat.getChatType  (),
+					spatialChat.getMoodType  (),
+					spatialChat.getFlags     (),
+					spatialChat.getLanguage  (),
+					Unicode::emptyString);
+
+				target->hearText(*this, noTextMsg, chatMessageIndex);
+			}
+		}
+		else
+		{
+			target->hearText(*this, spatialChat, chatMessageIndex);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ServerObject::hearText(ServerObject const &source, MessageQueueSpatialChat const &spatialChat, int chatMessageIndex)
+{
+	Controller * const controller = NON_NULL (getController());
+	if (!isAuthoritative())
+	{
+		MessageQueueSpatialChat * const msg = new MessageQueueSpatialChat (spatialChat);
+		controller->appendMessage(CM_spatialChatReceive, 0, msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+		return;
+	}
+
+	if (m_scriptObject)
+	{
+		ScriptParams params;
+		params.addParam(spatialChat.getSourceId());
+		params.addParam(spatialChat.getText());
+		if (!m_scriptObject->trigAllScripts(Scripting::TRIG_HEAR_SPEECH_STRING, params))
+			return;
+	}
+
+	if (getClient ())
+	{
+		if (   source.getCacheVersion() > 0
+		    || (   ObserveTracker::isObserving(*getClient(), source)
+		        && !PlayerObject::isIgnoring(getNetworkId(), spatialChat.getSourceId())))
+		{
+			// Log the chat a player hears
+
+			CreatureObject * const creatureObject = asCreatureObject();
+
+			if (creatureObject != NULL)
+			{
+				PlayerObject * const playerObject = PlayerCreatureController::getPlayerObject(creatureObject);
+
+				if (playerObject != NULL)
+				{
+					ChatAvatarId playerChatAvatarId(Chat::constructChatAvatarId(source));
+					Unicode::String playerName(Unicode::narrowToWide(playerChatAvatarId.getFullName()));
+
+					std::string chatTypeName;
+
+					if (spatialChat.getChatType() == 0)
+					{
+						chatTypeName = "spatial";
+					}
+					else
+					{
+						if (!SpatialChatManager::getChatNameByType(spatialChat.getChatType(), chatTypeName))
+						{
+							chatTypeName = "error";
+						}
+					}
+
+					ChatLogManager::logChat(playerName, Unicode::emptyString, spatialChat.getText(), Unicode::narrowToWide(chatTypeName), chatMessageIndex, Os::getRealSystemTime());
+
+					playerObject->logChat(chatMessageIndex);
+				}
+			}
+
+			MessageQueueSpatialChat * const msg = new MessageQueueSpatialChat (spatialChat);
+			controller->appendMessage(CM_spatialChatReceive, 0, msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ServerObject::performSocial (const NetworkId & target, uint32 socialType, bool animationOk, bool textOk)
+{
+	const MessageQueueSocial socialMsg (CachedNetworkId (*this), CachedNetworkId (target), socialType, animationOk, textOk);
+	performSocial (socialMsg);
+}
+
+//----------------------------------------------------------------------
+
+void ServerObject::performSocial (const MessageQueueSocial & socialMsg)
+{
+	// a permanently squelched player cannot do any emote
+	PlayerObject * p = PlayerCreatureController::getPlayerObject(asCreatureObject());
+	if (p && (p->getSecondsUntilUnsquelched() < 0))
+	{
+		return;
+	}
+
+	if (!isAuthoritative ())
+	{
+		Controller *const controller = NON_NULL (getController());
+
+		MessageQueueSocial * const msg = new MessageQueueSocial (socialMsg);
+		controller->appendMessage(CM_socialSend, 0, msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+		return;
+	}
+
+	// todo: this needs to have a better value sometime
+	static const float distance = 50.0f;
+
+	const Vector & pos_w = getPosition_w ();
+	typedef std::vector<ServerObject *> ServerObjectVector;
+	ServerObjectVector results;
+	ServerWorld::findObjectsInRange (pos_w, distance, results);
+
+
+	bool triggerOk = false;
+	std::string socialTypeName;
+	triggerOk = SocialsManager::getSocialNameByType (socialMsg.getSocialType(), socialTypeName);
+	Unicode::String unicodeSocialTypeName(Unicode::narrowToWide(socialTypeName));
+
+	// allow scripts to prevent the player from performing the emote
+	ScriptParams params;
+
+	if (getScriptObject() != NULL)
+	{
+		params.addParam(unicodeSocialTypeName);
+		if (getScriptObject()->trigAllScripts(Scripting::TRIG_PERFORM_EMOTE, params) != SCRIPT_CONTINUE)
+			return;
+		params.clear();
+	}
+
+	if (triggerOk)
+	{
+		params.addParam(getNetworkId());
+		params.addParam(unicodeSocialTypeName);
+	}
+
+	static const float trigger_range = 4.0f;
+
+	for (ServerObjectVector::const_iterator it = results.begin(); it != results.end(); ++it)
+	{
+		ServerObject * const target = *it;
+		NOT_NULL (target);
+
+		if (triggerOk && this != target)
+		{
+			const float target_trigger_range_sqr = sqr (trigger_range + target->getSphereExtent ().getRadius ());
+			const float distance_sqr = pos_w.magnitudeBetweenSquared (target->getPosition_w ());
+
+			if (distance_sqr < target_trigger_range_sqr)
+				IGNORE_RETURN(target->getScriptObject()->trigAllScripts(Scripting::TRIG_SAW_EMOTE, params));
+		}
+
+		(*it)->seeSocial (socialMsg);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ServerObject::performCombatSpam (const MessageQueueCombatSpam & spamMsg, bool sendToSelf, bool sendToTarget, bool sendToBystanders)
+{
+	if (!isAuthoritative ())
+	{
+		WARNING_STRICT_FATAL (true, ("Do not call performCombatSpam on non-authoritative objects"));
+		return;
+	}
+
+	if (sendToSelf && !sendToBystanders)
+		seeCombatSpam (spamMsg);
+
+	if (sendToTarget && !sendToBystanders)
+	{
+		ServerObject * const target = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(spamMsg.m_defender));
+		if (target)
+			if (target->getNetworkId() != spamMsg.m_attacker)
+				target->seeCombatSpam (spamMsg);
+		else
+			WARNING_STRICT_FATAL (!sendToSelf && !sendToBystanders, ("null target_obj in commandFuncCombatSpam, when sendToTarget was set true"));
+	}
+
+	if (sendToBystanders)
+	{
+		Controller *const controller = NON_NULL (getController());
+		controller->appendMessage (CM_combatSpam, 0, new MessageQueueCombatSpam(spamMsg), GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_ALL_CLIENT);
+	}
+}
+
+// ---------------------------------------------------------------------
+
+void ServerObject::teleportObject(Vector const &position_w, NetworkId const &targetContainer, std::string const &targetCellName, Vector const &position_p, std::string const &scriptCallback, bool forceLoadScreen)
+{
+	Vector destPosition_w(position_w);
+
+	// clamp destination if in space
+	if (   ServerWorld::isSpaceScene()
+	    && (   abs(position_w.x) > 8000.f
+	        || abs(position_w.y) > 8000.f
+	        || abs(position_w.z) > 8000.f))
+	{
+		WARNING(true, ("Tried to warp object %s outside of space zone boundaries (%g,%g,%g)", getDebugInformation().c_str(), position_w.x, position_w.y, position_w.z));
+		destPosition_w.set(
+			clamp(-8000.f, position_w.x, 8000.f),
+			clamp(-8000.f, position_w.y, 8000.f),
+			clamp(-8000.f, position_w.z, 8000.f));
+	}
+
+
+
+	if (!isAuthoritative())
+	{
+		sendControllerMessageToAuthServer(CM_teleportObject, new MessageQueueTeleportObject(destPosition_w, targetContainer, targetCellName, position_p, scriptCallback));
+		return;
+	}
+
+	// make a copy of the destination position, as it might change if we are
+	// warping to a cloning facility
+	Vector finalPosition_p(position_p);
+
+	bool doWarp = forceLoadScreen;
+	bool ignoreContainer = true;
+
+	Client * const client = m_client;
+	std::vector<Watcher<Client> > containedClients;
+	getContainedClients(*this, containedClients);
+
+	ServerObject *targetContainerObject = 0;
+	if (targetContainer != NetworkId::cms_invalid)
+	{
+		ignoreContainer = false;
+		targetContainerObject = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(targetContainer));
+		if (targetContainerObject && !targetCellName.empty())
+		{
+			PortalProperty *portalProp = targetContainerObject->getPortalProperty();
+			targetContainerObject = 0; // clear in case we have a building that doesn't have the cell
+			if (portalProp != NULL)
+			{
+				CellProperty *cellProp = portalProp->getCell(targetCellName.c_str());
+				if (cellProp != NULL)
+					targetContainerObject = safe_cast<ServerObject *>(&(cellProp->getOwner()));
+			}
+			if (!targetContainerObject)
+			{
+				WARNING(true, ("Tried to teleport to nonexistant cell '%s' of building %s.", targetCellName.c_str(), targetContainer.getValueString().c_str()));
+				ignoreContainer = true;
+			}
+		}
+	}
+
+	Vector const oldPosition_w(NON_NULL(ContainerInterface::getTopmostContainer(*this))->getPosition_w());
+	if (   destPosition_w.magnitudeBetweenSquared(oldPosition_w) >= sqr(ConfigServerGame::getMaxTeleportDistanceWithoutSceneWarp())
+	    || (   targetContainer != NetworkId::cms_invalid
+	        && (   !targetContainerObject
+	            || (   getClient()
+	                && !ObserveTracker::isObserving(*getClient(), *targetContainerObject)))))
+		doWarp = true;
+
+	if (doWarp && !containedClients.empty())
+	{
+		for (std::vector<Watcher<Client> >::const_iterator i = containedClients.begin(); i != containedClients.end(); ++i)
+		{
+			Client * const containedClient = (*i).getPointer();
+			if (containedClient)
+			{
+				ServerObject * const characterObject = containedClient->getCharacterObject();
+				if (characterObject)
+					characterObject->onClientAboutToLoad();
+				containedClient->clearControlledObjects();
+			}
+		}
+	}
+
+	bool moveNeeded = true;
+	if (!ignoreContainer && targetContainer != NetworkId::cms_invalid)
+	{
+		if (!doWarp && targetContainerObject && targetContainerObject->isAuthoritative())
+		{
+			// allow the destination container to change the warp position
+			float yaw = getObjectFrameK_p().theta();
+			const ServerObject * targetObject = safe_cast<const ServerObject *>(
+				ContainerInterface::getTopmostContainer(*targetContainerObject));
+			if (targetObject && targetObject->isAuthoritative())
+				targetObject->changeTeleportDestination(finalPosition_p, yaw);
+
+			// teleporting to a container on this server
+			if (targetContainerObject->asCellObject())
+			{
+				Transform worldToCell;
+				worldToCell.invert(targetContainerObject->getTransform_o2w());
+				Transform objectToCell;
+				objectToCell.multiply(worldToCell, getTransform_o2w());
+				objectToCell.setPosition_p(finalPosition_p);
+				yaw -= getObjectFrameK_p().theta();
+				if (yaw != 0.0f)
+				{
+					objectToCell.yaw_l(yaw);
+					objectToCell.reorthonormalize();
+				}
+				safe_cast<ServerController *>(getController())->teleport(objectToCell, targetContainerObject);
+			}
+			else
+			{
+				if (isPlayerControlled())
+				{
+					WARNING(true, ("Tried to use ServerObject::teleportObject to teleport a player controlled object into a non-cell container!"));
+					return;
+				}
+
+				Container::ContainerErrorCode err = Container::CEC_Success;
+				ContainerInterface::transferItemToGeneralContainer(*targetContainerObject, *this, 0, err, false);
+			}
+
+			moveNeeded = false;
+		}
+		else
+		{
+			// container is on a different server - flag to move us into the container as soon as we change authority
+			setInteriorTeleportDestination(targetContainer, targetCellName, position_p);
+		}
+	}
+
+	//-- setup the script callback
+	if (!scriptCallback.empty())
+		setTeleportScriptCallback(scriptCallback);
+
+	if (moveNeeded)
+	{
+		// Moves the object.  If the new area is on a different server, the PlanetServer will change our authority.
+
+		// What we really want to check here is whether we want to use the ServerController's teleport
+		// if a player has logged out, but we still have them loaded in game, their client will be null, 
+		// but we still want to use the ServerController's teleport method
+		// so, we check against the player creature controller and player ship controller as well
+		ServerController * controller = safe_cast<ServerController *>(getController());
+		if (controller && (client || dynamic_cast<PlayerCreatureController *>(controller) || dynamic_cast<PlayerShipController *>(controller)))
+		{
+			Transform newTransform(getTransform_o2w());
+			newTransform.setPosition_p(destPosition_w);
+			controller->teleport(newTransform, 0);
+		}
+		else
+		{
+			if (ContainerInterface::getContainedByObject(*this))
+			{
+				Transform newTransform(getTransform_o2w());
+				newTransform.setPosition_p(destPosition_w);
+				Container::ContainerErrorCode err = Container::CEC_Success;
+				ContainerInterface::transferItemToWorld(*this, newTransform, 0, err);
+			}
+			else
+				setPosition_p(destPosition_w);
+		}
+	}
+
+	if (doWarp && !containedClients.empty())
+	{
+		for (std::vector<Watcher<Client> >::const_iterator i = containedClients.begin(); i != containedClients.end(); ++i)
+		{
+			Client * const containedClient = (*i).getPointer();
+			if (containedClient)
+			{
+				ServerObject * const so = NON_NULL(safe_cast<ServerObject *>(NetworkIdManager::getObjectById(containedClient->getCharacterObjectId())));
+				CreatureObject * const primaryControlledCreature = NON_NULL(so->asCreatureObject());
+				containedClient->assumeControl(*primaryControlledCreature);
+			}
+		}
+	}
+
+	CollisionWorld::objectWarped(this);
+
+	if (isAuthoritative() && (!isPlayerControlled() || getClient()) && getObjVars().hasItem("teleportFixup"))
+		TeleportFixupHandler::add(*this);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::changeTeleportDestination(Vector &, float &) const
+{
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::updatePositionOnPlanetServer(bool forceUpdate)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("updatePositionOnPlanetServer");
+	// In space, only send the forced updates
+	if (isAuthoritative() && isInitialized() && (forceUpdate || !ServerWorld::isSpaceScene()))
+		updatePlanetServerInternal(forceUpdate);
+}
+
+//----------------------------------------------------------------------
+
+void ServerObject::updatePlanetServerInternal(bool) const
+{
+}
+
+//----------------------------------------------------------------------
+
+/**
+* Attempts to create a synchronized ui object.  If the synchronized ui object
+* does not exist, its creation is attempted via createSynchronizedUi.  The default implementation
+* of createSynchronizedUi returns null, and renders this method a no-op.
+*/
+void ServerObject::addSynchronizedUi(const std::vector<NetworkId> & clients)
+{
+	if (!m_synchronizedUi.getPointer())
+		m_synchronizedUi = createSynchronizedUi ();
+
+	if (m_synchronizedUi.getPointer())
+	{
+		for (std::vector<NetworkId>::const_iterator i = clients.begin(); i != clients.end(); ++i)
+		{
+			ServerObject * client = safe_cast<ServerObject *>(
+				NetworkIdManager::getObjectById(*i));
+			if (client != NULL)
+			{
+				if (client->getClient() != NULL)
+					m_synchronizedUi->addClientObject (*client);
+				else
+				{
+					client->addPendingSynchronizedUi(*this);
+				}
+			}
+			else
+			{
+				WARNING(true, ("Object %s tried to add non-existant client %s to its sync ui",
+					getNetworkId().getValueString().c_str(), i->getValueString().c_str()));
+			}
+		}
+		scheduleForAlter();
+	}
+}
+
+//----------------------------------------------------------------------
+
+/**
+* Attempts to add a client to the synchronized ui object.  If the synchronized ui object
+* does not exist, its creation is attempted via createSynchronizedUi.  The default implementation
+* of createSynchronizedUi returns null, and renders this method a no-op.
+*
+*/
+void ServerObject::addSynchronizedUiClient(ServerObject & client)
+{
+	if (isAuthoritative())
+	{
+		if (!m_synchronizedUi.getPointer())
+			m_synchronizedUi = createSynchronizedUi ();
+
+		if (!m_synchronizedUi.getPointer())
+			return;
+
+		m_synchronizedUi->addClientObject (client);
+		scheduleForAlter();
+	}
+	else
+	{
+		WARNING_STRICT_FATAL(true, ("Non-authoritative object %s is being asked to create a synchronizedUi for client %s",
+			getNetworkId().getValueString().c_str(), client.getNetworkId().getValueString().c_str()));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ServerObject::removeSynchronizedUiClient(const NetworkId & clientId)
+{
+	if (!m_synchronizedUi.getPointer())
+		return;
+
+	WARNING(!isAuthoritative(), ("ServerObject::removeSynchronizedUiClient being called on non-authoritative object %s for client %s",
+		getNetworkId().getValueString().c_str(), clientId.getValueString().c_str()));
+
+	m_synchronizedUi->removeClientObject (clientId);
+
+	if (m_synchronizedUi->getNumClients () == 0)
+	{
+		delete m_synchronizedUi.getPointer();
+	}
+	scheduleForAlter();
+}
+
+//----------------------------------------------------------------------
+
+/**
+* Subclasses implement this if they have an appropriate synchronized ui object.
+* Base class implementation returns null.
+*/
+ServerSynchronizedUi * ServerObject::createSynchronizedUi ()
+{
+	return 0;
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Adds a object to the list of objects that have a synchronized ui and are
+ * waiting for this object to have a client attached.
+ *
+ * @param uiObject		the object with the synchronized ui
+ */
+void ServerObject::addPendingSynchronizedUi(const ServerObject & uiObject)
+{
+	if (getClient() != NULL)
+	{
+		WARNING(true, ("ServerObject::addPendingSynchronizedUi called on object %s that already has a client", getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	if (m_pendingSyncUi == NULL)
+		m_pendingSyncUi = new std::vector<NetworkId>;
+	m_pendingSyncUi->push_back(uiObject.getNetworkId());
+}
+
+//----------------------------------------------------------------------
+
+void ServerObject::setPlayerControlled(bool newValue)
+{
+	if(isAuthoritative())
+	{
+		m_playerControlled=newValue;
+		if (newValue)
+			setDefaultAlterTime(0);
+		else
+			setDefaultAlterTime(AlterResult::cms_keepNoAlter);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setPlayerControlled, new MessageQueueGenericValueType<bool>(newValue));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::internalAdjustBankBalance(int const amount, bool makeRoom)
+{
+	if ((amount > 0) && ((amount + m_bankBalance.get()) > ConfigServerGame::getMaxMoney()) && makeRoom && isAuthoritative())
+	{
+		PlayerObject * const po = PlayerCreatureController::getPlayerObject(asCreatureObject());
+		if (po && po->isAuthoritative())
+		{
+			int attempt = 0;
+			do 
+			{
+				int amountToMove = amount + m_bankBalance.get() - ConfigServerGame::getMaxMoney();
+				if (amountToMove > m_bankBalance.get())
+				{
+					amountToMove = m_bankBalance.get();
+				}
+
+				if (amountToMove <= 0)
+					break;
+
+				if ((amountToMove + m_cashBalance.get()) > ConfigServerGame::getMaxMoney())
+				{
+					// not enough room in cash, see if there's still room in galactic reserve
+					int8 const galacticReserve = po->getGalacticReserveDeposit();
+					if (static_cast<int>(galacticReserve) < ConfigServerGame::getMaxGalacticReserveDepositBillion())
+					{
+						// transfer 1 billion into galactic reserve, and try again, if necessary
+						po->depositToGalacticReserve(true);
+
+						// failed to transfer to galactic reserve, don't try again
+						if (galacticReserve == po->getGalacticReserveDeposit())
+						{
+							break;
+						}
+					}
+					else
+					{
+						// no more room in galactic reserve, move as much as possible into cash
+						amountToMove = ConfigServerGame::getMaxMoney() - m_cashBalance.get();
+						if (amountToMove > m_bankBalance.get())
+						{
+							amountToMove = m_bankBalance.get();
+						}
+
+						if (amountToMove > 0)
+						{
+							withdrawCashFromBank(amountToMove);
+						}
+
+						break;
+					}
+				}
+				else
+				{
+					if (amountToMove > 0)
+					{
+						withdrawCashFromBank(amountToMove);
+					}
+
+					break;
+				}
+
+				++attempt;
+
+			} while (((amount + m_bankBalance.get()) > ConfigServerGame::getMaxMoney()) && (attempt < 2));
+		}
+	}
+
+	m_bankBalance = m_bankBalance.get() + amount;
+	if (m_bankBalance.get() > ConfigServerGame::getMaxMoney())
+	{
+		LOG("CustomerService",("SuspectedCheaterChannel: %s has %i credits in the bank.", PlayerObject::getAccountDescription(this).c_str(), m_bankBalance.get()));
+		m_bankBalance = ConfigServerGame::getMaxMoney();
+	}
+
+	if (getClient() && getClient()->isFreeTrialAccount()
+		&& (m_cashBalance.get() + m_bankBalance.get()) > ConfigServerGame::getMaxFreeTrialMoney())
+	{
+		LOG("CustomerService",("FreeTrial: %s has exceeded max free trial balance of %d from a bank transfer amount of %d.  Money lost: %d.",PlayerObject::getAccountDescription(this).c_str(), ConfigServerGame::getMaxFreeTrialMoney(), amount, m_cashBalance.get() + m_bankBalance.get() - ConfigServerGame::getMaxFreeTrialMoney()));
+		m_bankBalance = ConfigServerGame::getMaxFreeTrialMoney() - m_cashBalance.get();
+		ProsePackage prosePackage;
+		prosePackage.stringId = StringId("ui_trade", "err_max_free_trial_money");
+		prosePackage.digitInteger = ConfigServerGame::getMaxFreeTrialMoney();
+		Chat::sendSystemMessage(*this, prosePackage);
+	}
+
+	// sanity check - fix up any player character negative cash/bank balance
+	if ((m_cashBalance.get() < 0) && PlayerCreatureController::getPlayerObject(asCreatureObject()))
+		m_cashBalance = 0;
+
+	if ((m_bankBalance.get() < 0) && PlayerCreatureController::getPlayerObject(asCreatureObject()))
+		m_bankBalance = 0;
+
+	addObjectToConcludeList();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::internalAdjustCashBalance(int const amount, bool makeRoom)
+{
+	if ((amount > 0) && ((amount + m_cashBalance.get()) > ConfigServerGame::getMaxMoney()) && makeRoom && isAuthoritative())
+	{
+		PlayerObject * const po = PlayerCreatureController::getPlayerObject(asCreatureObject());
+		if (po && po->isAuthoritative())
+		{
+			int attempt = 0;
+			do 
+			{
+				int amountToMove = amount + m_cashBalance.get() - ConfigServerGame::getMaxMoney();
+				if (amountToMove > m_cashBalance.get())
+				{
+					amountToMove = m_cashBalance.get();
+				}
+
+				if (amountToMove <= 0)
+					break;
+
+				if ((amountToMove + m_bankBalance.get()) > ConfigServerGame::getMaxMoney())
+				{
+					// not enough room in bank, see if there's still room in galactic reserve
+					int8 const galacticReserve = po->getGalacticReserveDeposit();
+					if (static_cast<int>(galacticReserve) < ConfigServerGame::getMaxGalacticReserveDepositBillion())
+					{
+						// transfer 1 billion into galactic reserve, and try again, if necessary
+						po->depositToGalacticReserve(true);
+
+						// failed to transfer to galactic reserve, don't try again
+						if (galacticReserve == po->getGalacticReserveDeposit())
+						{
+							break;
+						}
+					}
+					else
+					{
+						// no more room in galactic reserve, move as much as possible into bank
+						amountToMove = ConfigServerGame::getMaxMoney() - m_bankBalance.get();
+						if (amountToMove > m_cashBalance.get())
+						{
+							amountToMove = m_cashBalance.get();
+						}
+
+						if (amountToMove > 0)
+						{
+							depositCashToBank(amountToMove);
+						}
+
+						break;
+					}
+				}
+				else
+				{
+					if (amountToMove > 0)
+					{
+						depositCashToBank(amountToMove);
+					}
+
+					break;
+				}
+
+				++attempt;
+
+			} while (((amount + m_cashBalance.get()) > ConfigServerGame::getMaxMoney()) && (attempt < 2));
+		}
+	}
+
+	m_cashBalance = m_cashBalance.get() + amount;
+	if (m_cashBalance.get() > ConfigServerGame::getMaxMoney())
+	{
+		LOG("CustomerService",("SuspectedCheaterChannel: %s has %i credits cash.",PlayerObject::getAccountDescription(this).c_str(), m_cashBalance.get()));
+		m_cashBalance = ConfigServerGame::getMaxMoney();
+	}
+
+	if (getClient() && getClient()->isFreeTrialAccount()
+		&& (m_cashBalance.get() + m_bankBalance.get()) > ConfigServerGame::getMaxFreeTrialMoney())
+	{
+		LOG("CustomerService",("FreeTrial: %s has exceeded max free trial balance of %d from a cash transfer amount of %d.  Money lost: %d.",PlayerObject::getAccountDescription(this).c_str(), ConfigServerGame::getMaxFreeTrialMoney(), amount, m_cashBalance.get() + m_bankBalance.get() - ConfigServerGame::getMaxFreeTrialMoney()));
+		m_cashBalance = ConfigServerGame::getMaxFreeTrialMoney() - m_bankBalance.get();
+		ProsePackage prosePackage;
+		prosePackage.stringId = StringId("ui_trade", "err_max_free_trial_money");
+		prosePackage.digitInteger = ConfigServerGame::getMaxFreeTrialMoney();
+		Chat::sendSystemMessage(*this, prosePackage);
+	}
+
+	// sanity check - fix up any player character negative cash/bank balance
+	if ((m_cashBalance.get() < 0) && PlayerCreatureController::getPlayerObject(asCreatureObject()))
+		m_cashBalance = 0;
+
+	if ((m_bankBalance.get() < 0) && PlayerCreatureController::getPlayerObject(asCreatureObject()))
+		m_bankBalance = 0;
+
+	addObjectToConcludeList();
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::transferCashTo(const NetworkId &target, int amount, const NetworkId &transactionId)
+{
+	if (amount <= 0)
+	{
+		DEBUG_REPORT_LOG(true, ("Attempting to transfer 0 or negative money on object %s, amount %d\n", getNetworkId().getValueString().c_str(), amount));
+		return false;
+	}
+
+	if (isAuthoritative())
+	{
+		if (amount > ConfigServerGame::getMaxMoneyTransfer())
+		{
+			DEBUG_REPORT_LOG(true,("Tried to transfer too much cash.  Source object %s, target %s, amount %i",
+								   getNetworkId().getValueString().c_str(),target.getValueString().c_str(),amount));
+			return false;
+		}
+
+		int sourceBalance=getCashBalance();
+		if (sourceBalance < amount)
+		{
+			DEBUG_REPORT_LOG(true,("Tried to transfer too much cash.  Source object %s, target %s, amount %i",
+								   getNetworkId().getValueString().c_str(),target.getValueString().c_str(),amount));
+			return false;
+		}
+		internalAdjustCashBalance(-amount, true);
+
+		// send persistent message to add money to target.
+		char buffer[100];
+		snprintf(buffer,100,"%i",amount);
+		MessageToQueue::getInstance().sendMessageToC(target, "C++FinishCashTransfer", buffer, 0, true);
+
+		LOG("CustomerService", ("Money: cash transfer from %s to %s, amount %i, total(from) %i", PlayerObject::getAccountDescription(getNetworkId()).c_str(),PlayerObject::getAccountDescription(target).c_str(),amount, getTotalMoney()));
+
+		return true;
+	}
+	else
+	{
+		//TODO: handle multi-server banking
+		DEBUG_FATAL(true,("Banking across game servers is not yet implemented.\n"));
+		return false;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::transferBankCreditsTo(const NetworkId &target, int amount, const NetworkId &transactionId)
+{
+	if (amount <= 0)
+	{
+		DEBUG_REPORT_LOG(true, ("Attempting to transfer 0 or negative money on object %s, amount %d\n", getNetworkId().getValueString().c_str(), amount));
+		return false;
+	}
+
+
+	if (isAuthoritative())
+	{
+		if (amount > ConfigServerGame::getMaxMoneyTransfer())
+		{
+			DEBUG_REPORT_LOG(true,("Tried to transfer too many bank credits.  Source object %s, target %s, amount %i",
+								   getNetworkId().getValueString().c_str(),target.getValueString().c_str(),amount));
+			return false;
+		}
+
+		int sourceBalance=getBankBalance();
+		if (sourceBalance < amount)
+		{
+			DEBUG_REPORT_LOG(true,("Tried to transfer too many bank credits.  Source object %s, target %s, amount %i",
+								   getNetworkId().getValueString().c_str(),target.getValueString().c_str(),amount));
+			return false;
+		}
+		internalAdjustBankBalance(-amount, true);
+
+		// send persistent message to add money to target.
+		char buffer[100];
+		snprintf(buffer,100,"%i",amount);
+		MessageToQueue::getInstance().sendMessageToC(target, "C++FinishBankTransfer", buffer, 0, true);
+
+		LOG("CustomerService", ("Money: bank transfer from %s to %s, amount %i, total(from) %i", PlayerObject::getAccountDescription(getNetworkId()).c_str(),PlayerObject::getAccountDescription(target).c_str(),amount, getTotalMoney()));
+
+		return true;
+	}
+	else
+	{
+		//TODO: handle multi-server banking
+		DEBUG_FATAL(true,("Banking across game servers is not yet implemented.\n"));
+		return false;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::transferBankCreditsTo(const std::string &target, int amount, const NetworkId &transactionId)
+{
+	if (amount <= 0)
+	{
+		DEBUG_REPORT_LOG(true, ("Attempting to transfer 0 or negative money on object %s, amount %d\n", getNetworkId().getValueString().c_str(), amount));
+		return false;
+	}
+
+	if (isAuthoritative())
+	{
+		// allow transfers to/from the commodities escrow account or galactic reserve to bypass
+		// the max transfer limit because commodities item can be sold/bought for more than the
+		// transfer limit and the galactic reserve transfers 1 billion credits at a time
+		if ((target != CommoditiesMarket::getCommoditiesNamedEscrowAccount()) && (target != std::string("galactic_reserve")))
+		{
+			if (amount > ConfigServerGame::getMaxMoneyTransfer())
+			{
+				DEBUG_REPORT_LOG(true,("Tried to transfer too many bank credits.  Source object %s, target %s, amount %i",
+									   getNetworkId().getValueString().c_str(),target.c_str(),amount));
+				return false;
+			}
+		}
+
+		int sourceBalance=getBankBalance();
+		if (sourceBalance < amount)
+		{
+			DEBUG_REPORT_LOG(true,("Tried to transfer too many bank credits.  Source object %s, target %s, amount %i",
+								   getNetworkId().getValueString().c_str(),target.c_str(),amount));
+			return false;
+		}
+		internalAdjustBankBalance(-amount, true);
+
+		LOG("CustomerService", ("Money: bank transfer from %s to named account %s, amount %i, total %i", PlayerObject::getAccountDescription(getNetworkId()).c_str(),target.c_str(), amount, getTotalMoney()));
+
+		return true;
+	}
+	else
+	{
+		//TODO: handle multi-server banking
+		DEBUG_FATAL(true,("Banking across game servers is not yet implemented.\n"));
+		return false;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::transferBankCreditsFrom(const std::string &target, int amount, const NetworkId &transactionId)
+{
+	if (amount <= 0)
+	{
+		DEBUG_REPORT_LOG(true, ("Attempting to transfer 0 or negative money on object %s, amount %d\n", getNetworkId().getValueString().c_str(), amount));
+		return false;
+	}
+
+	if (isAuthoritative())
+	{
+		// allow transfers to/from the commodities escrow account or galactic reserve to bypass
+		// the max transfer limit because commodities item can be sold/bought for more than the
+		// transfer limit and the galactic reserve transfers 1 billion credits at a time
+		if ((target != CommoditiesMarket::getCommoditiesNamedEscrowAccount()) && (target != std::string("galactic_reserve")))
+		{
+			if (amount > ConfigServerGame::getMaxMoneyTransfer())
+			{
+				DEBUG_REPORT_LOG(true,("Tried to transfer too many bank credits.  Source object %s, target %s, amount %i",
+									   getNetworkId().getValueString().c_str(),target.c_str(),amount));
+				return false;
+			}
+		}
+
+		internalAdjustBankBalance(amount, true);
+
+		LOG("CustomerService", ("Money: bank transfer from named account %s to %s, amount %i, total %i", target.c_str(),PlayerObject::getAccountDescription(getNetworkId()).c_str(), amount, getTotalMoney()));
+
+		return true;
+	}
+	else
+	{
+		//TODO: handle multi-server banking
+		DEBUG_FATAL(true,("Banking across game servers is not yet implemented.\n"));
+		return false;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::withdrawCashFromBank(int amount, const NetworkId &transactionId)
+{
+	if (amount <= 0)
+	{
+		DEBUG_REPORT_LOG(true, ("Attempting to transfer 0 or negative money on object %s, amount %d\n", getNetworkId().getValueString().c_str(), amount));
+		return false;
+	}
+	if (isAuthoritative())
+	{
+		// adjust amount so it won't overflow the cash limit
+		if ((getCashBalance() + amount) > ConfigServerGame::getMaxMoney())
+		{
+			amount = ConfigServerGame::getMaxMoney() - getCashBalance();
+		}
+
+		if (amount > 0)
+		{
+			int bankBalance=getBankBalance();
+
+			if (bankBalance < amount)
+			{
+				DEBUG_REPORT_LOG(true,("Object %s tried to bounce a check.  Bank balance %i, requested %i.\n",getNetworkId().getValueString().c_str(),bankBalance,amount));
+				return false;
+			}
+
+			internalAdjustBankBalance(-amount, false);
+			internalAdjustCashBalance(amount, false);
+
+			LOG("CustomerService", ("Money: cash withdraw from bank by %s, amount %i, total %i", PlayerObject::getAccountDescription(getNetworkId()).c_str(), amount, getTotalMoney()));
+		}
+
+		return true;
+	}
+	else
+	{
+		//TODO: handle multi-server banking
+		DEBUG_FATAL(true,("Banking across game servers is not yet implemented.\n"));
+		return false;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::depositCashToBank(int amount, const NetworkId &transactionId)
+{
+	if (amount <= 0)
+	{
+		DEBUG_REPORT_LOG(true, ("Attempting to transfer 0 or negative money on object %s, amount %d\n", getNetworkId().getValueString().c_str(), amount));
+		return false;
+	}
+
+	if (isAuthoritative())
+	{
+		// adjust amount so it won't overflow the bank limit
+		if ((getBankBalance() + amount) > ConfigServerGame::getMaxMoney())
+		{
+			amount = ConfigServerGame::getMaxMoney() - getBankBalance();
+		}
+
+		if (amount > 0)
+		{
+			int cashBalance=getCashBalance();
+
+			if (cashBalance < amount)
+			{
+				DEBUG_REPORT_LOG(true,("Object %s tried to deposit %i credits, but only has %i credits\n",getNetworkId().getValueString().c_str(),amount,cashBalance));
+				return false;
+			}
+
+			internalAdjustCashBalance(-amount, false);
+			internalAdjustBankBalance(amount, false);
+
+			LOG("CustomerService", ("Money: cash deposit to bank by %s, amount %i, total %i", PlayerObject::getAccountDescription(getNetworkId()).c_str(), amount, getTotalMoney()));
+		}
+
+		return true;
+	}
+	else
+	{
+		//TODO: handle multi-server banking
+		DEBUG_FATAL(true,("Banking across game servers is not yet implemented.\n"));
+		return false;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+char const *ServerObject::getTemplateName() const
+{
+	return getObjectTemplate()->getName();
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::getHyperspaceOnCreate () const
+{
+	return getLocalFlag(LocalObjectFlags::ServerObject_HyperspaceOnCreate);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setHyperspaceOnCreate (bool const hyperspaceOnCreate)
+{
+	setLocalFlag(LocalObjectFlags::ServerObject_HyperspaceOnCreate, hyperspaceOnCreate);
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::getHyperspaceOnDestroy () const
+{
+	return getLocalFlag(LocalObjectFlags::ServerObject_HyperspaceOnDestruct);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setHyperspaceOnDestroy (bool const hyperspaceOnDestroy)
+{
+	setLocalFlag(LocalObjectFlags::ServerObject_HyperspaceOnDestruct, hyperspaceOnDestroy);
+}
+
+// ----------------------------------------------------------------------
+
+std::string const ServerObject::getPackedObjVars(std::string const &prefix) const
+{
+	std::vector<char> buf;
+	for (DynamicVariableList::MapType::const_iterator i = getObjVars().begin(); i != getObjVars().end(); ++i)
+	{
+		if (!(*i).first.compare(0, prefix.size(), prefix))
+	{
+			appendPackedObjVarField(buf, (*i).first.c_str());
+			appendPackedObjVarField(buf, (*i).second.getType());
+			appendPackedObjVarField(buf, Unicode::wideToNarrow((*i).second.getPackedValueString()).c_str());
+	}
+	}
+	appendPackedObjVarField(buf, "$");
+	return std::string(buf.begin(), buf.end());
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setPackedObjVars(std::string const &packedVarString)
+	{
+	unsigned int offset = 0;
+
+	while (offset < packedVarString.size())
+	{
+		std::string name;
+		offset = getPackedObjVarField(packedVarString, offset, name);
+		if (name == "$")
+	return true;
+		int typeId;
+		offset = getPackedObjVarField(packedVarString, offset, typeId);
+		std::string valueString;
+		offset = getPackedObjVarField(packedVarString, offset, valueString);
+		DynamicVariable value;
+		value.load(0, typeId, Unicode::narrowToWide(valueString));
+		setObjVarItem(name, value);
+}
+		return false;
+}
+
+// ----------------------------------------------------------------------
+
+#ifdef _WIN32
+#define atoll(a) _atoi64(a)
+#endif
+
+// ----------------------------------------------------------------------
+
+std::string ServerObject::debugGetMessageToList() const
+{
+	unsigned long const now = ServerClock::getInstance().getGameTimeSeconds();
+	std::string result;
+	time_t const timeNow = ::time(NULL);
+	for (Archive::AutoDeltaMap<std::pair<std::pair<unsigned long, uint64>, MessageToId>, MessageToPayload>::const_iterator i=m_messageTos.begin(); i!=m_messageTos.end(); ++i)
+	{
+		char temp[256];
+
+		if (i->second.getCallTime() > now)
+		{
+			snprintf(temp,sizeof(temp)-1,"%s: %s [call time = %lu (%s) (%s) (%s), persisted = %s, recurring = %i]\n",i->second.getMessageId().getValueString().c_str(), i->second.getMethod().c_str(), i->second.getCallTime(), CalendarTime::convertSecondsToDHMS(static_cast<unsigned int>(i->second.getCallTime() - now)).c_str(), CalendarTime::convertEpochToTimeStringGMT(i->second.getCallTime() - now + timeNow).c_str(), CalendarTime::convertEpochToTimeStringLocal(i->second.getCallTime() - now + timeNow).c_str(), (i->second.getPersisted() ? "true" : "false"), i->second.getRecurringTime());
+		}
+		else
+		{
+			snprintf(temp,sizeof(temp)-1,"%s: %s [call time = %lu, persisted = %s, recurring = %i]\n",i->second.getMessageId().getValueString().c_str(), i->second.getMethod().c_str(), i->second.getCallTime(), (i->second.getPersisted() ? "true" : "false"), i->second.getRecurringTime());
+		}
+
+		temp[sizeof(temp)-1]='\0';
+		result += temp;
+	}
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Go through the list of messageTos and handle any whose time has been
+ * reached.
+ * @param effectiveMessageToTime The current Server Clock, for the purpose of MessageTos
+ * @return The delivery time of the next message, or 0 if there are no more messages
+ */
+
+unsigned long ServerObject::processQueuedMessageTos(unsigned long effectiveMessageToTime)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerObject::processQueuedMessageTos");
+
+	if (isAuthoritative())
+	{
+		int handledMessageCount = 0;
+		unsigned long startTime = Clock::timeMs();
+		while (!m_messageTos.empty() && m_messageTos.begin()->second.getCallTime() <= effectiveMessageToTime)
+		{
+			++handledMessageCount;
+			if ((ConfigServerGame::getMaxMessageTosPerObjectPerFrame() !=0 ) &&
+				(handledMessageCount > ConfigServerGame::getMaxMessageTosPerObjectPerFrame()))
+			{
+				std::string nextTenMessages;
+				{
+					int count = 1;
+					for (Archive::AutoDeltaMap<std::pair<std::pair<unsigned long, uint64>, MessageToId>, MessageToPayload>::const_iterator iter = m_messageTos.begin(); ((iter != m_messageTos.end()) && (count <= 10)); ++iter, ++count)
+					{
+						nextTenMessages += iter->second.getMethod();
+						nextTenMessages += ", ";
+					}
+				}
+
+				WARNING(true,("MessageTo Backlog:  object %s had more than %i messages to be handled in one frame.  Remaining %d messages will be delayed until next frame.  Next ten messages are (%s).", getNetworkId().getValueString().c_str(), ConfigServerGame::getMaxMessageTosPerObjectPerFrame(), m_messageTos.size(), nextTenMessages.c_str()));
+				MessageToQueue::getInstance().incrementBackloggedObjectCount();
+				break;
+			}
+			if ((ConfigServerGame::getMaxMessageToTimePerObjectPerFrame() != 0) &&
+				(static_cast<int>(Clock::timeMs() - startTime) > ConfigServerGame::getMaxMessageToTimePerObjectPerFrame()))
+			{
+				WARNING(true,("MessageTo Backlog:  object %s spent more than %i ms processing messages.  Remaining %d messages will be delayed until next frame.", getNetworkId().getValueString().c_str(), ConfigServerGame::getMaxMessageToTimePerObjectPerFrame(), m_messageTos.size()));
+				MessageToQueue::getInstance().incrementBackloggedObjectCount();
+				break;
+			}
+
+			Archive::AutoDeltaMap<std::pair<std::pair<unsigned long, uint64>, MessageToId>, MessageToPayload>::const_iterator message = m_messageTos.begin();
+
+			// if the message is going to be recurring, create a
+			// new messageTo to reschedule the recurring message
+			MessageToPayload * copyOfRecurringMessage = NULL;
+			if (message->second.getRecurringTime() > 0)
+			{
+				copyOfRecurringMessage = new MessageToPayload(
+					getNetworkId(), 
+					message->second.getMessageId(), 
+					message->second.getMethod(), 
+					message->second.getPackedDataVector(), 
+					ServerClock::getInstance().getGameTimeSeconds() + static_cast<unsigned long>(message->second.getRecurringTime()), 
+					false, 
+					message->second.getDeliveryType(), 
+					NetworkId::cms_invalid, 
+					"", 
+					message->second.getRecurringTime());
+			}
+
+			// set sentinel to prevent this message from being removed
+			// from m_messageTos while it is being handled
+			s_currentMessageToBeingHandled = message->first;
+			handleMessageTo(message->second);
+
+			// remove message that just got handled
+			IGNORE_RETURN(m_messageTos.erase(s_currentMessageToBeingHandled));
+
+			s_currentMessageToBeingHandled = std::make_pair(std::make_pair(0, 0), MessageToId::cms_invalid);
+
+			// Reschedule the recurring message, if necessary
+			if (copyOfRecurringMessage)
+			{
+				deliverMessageTo(*copyOfRecurringMessage);
+				delete copyOfRecurringMessage;
+			}
+		}
+
+		// Make sure object will handle messages again when the next message is due
+		if (!m_messageTos.empty())
+			return m_messageTos.begin()->second.getCallTime();
+		else
+			return 0;
+	}
+	else
+		return 0;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::handleMessageTo(MessageToPayload const & message)
+{
+	if (message.getDeliveryType() == MessageToPayload::DT_c)
+	{
+		handleCMessageTo(message);
+	}
+	else if (message.getDeliveryType() == MessageToPayload::DT_java)
+	{
+		GameScriptObject *scriptObj=getScriptObject();
+		if (scriptObj)
+		{
+			if (!scriptObj->handleMessage(message.getMethod(), message.getPackedDataVector()))
+			{
+				WARNING_STRICT_FATAL(true, ("ServerObject::handleMessageTo, message %s to object %s - script function was not called!",
+										   message.getMethod().c_str(), message.getNetworkId().getValueString().c_str()));
+			}
+		}
+		else
+		{
+			WARNING_STRICT_FATAL(true, ("ServerObject::handleMessageTo, message %s to object %s - object does not have a ScriptObject attached!", 
+										message.getMethod().c_str(), message.getNetworkId().getValueString().c_str()));
+		}
+	}
+	else
+		WARNING_STRICT_FATAL(true,("Called ServerObject::handleMessageTo with a message that had an unrecognized delivery type.  Message is %s, delivery type is %i", message.getMethod().c_str(), message.getDeliveryType()));
+
+	if (message.getPersisted())
+	{
+		MessageToAckMessage const reply(message.getMessageId());
+		GameServer::getInstance().sendToDatabaseServer(reply);		
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::handleCMessageTo(const MessageToPayload &message)
+{
+	std::vector<int8> const &packedData = message.getPackedDataVector();
+
+	if (message.getMethod() == "C++ForceAlter")
+	{
+		scheduleForAlter();
+	}
+	else if (message.getMethod() == "C++RenameCharacter")
+	{
+		//TODO: resolve Unicode issues with messageto's
+		m_objectName=Unicode::narrowToWide(std::string(packedData.begin(), packedData.end()));
+
+		// rename has been completed, remove the objvar so the system won't think there's a pending rename request
+		Unicode::String previousRenameName;
+		if (getObjVars().getItem("renameCharacterRequest.requestNewName", previousRenameName) && (previousRenameName == m_objectName.get()))
+			removeObjVarItem("renameCharacterRequest.requestNewName");
+
+		// if character is connected, update the client (character selection) with the new name
+		Client * const client = getClient();
+		if (client)
+		{
+			GenericValueTypeMessage<std::pair<std::pair<std::string, NetworkId>, Unicode::String> > const characterNameChanged("CharacterNameChanged", std::make_pair(std::make_pair(GameServer::getInstance().getClusterName(), getNetworkId()), m_objectName.get()));
+			client->send(characterNameChanged, true);
+		}
+	}
+	else if (message.getMethod() == "C++FinishBankTransfer")
+	{
+		std::string packedDataString(packedData.begin(), packedData.end());
+		int m_amount=strtoul(packedDataString.c_str(), 0, 10);
+		DEBUG_FATAL(m_amount < 0,("C++FinishBankTransaction had a negative amount.  This message should always have a positive amount.\n"));
+		internalAdjustBankBalance(m_amount, true);
+	}
+	// transfers money from a named account to the bank
+	else if( message.getMethod() == "C++FromNamedAccountToBank")
+	{
+		char *params = new char[packedData.size()+1];
+		memcpy(params, &(*packedData.begin()), packedData.size());
+		params[packedData.size()] = 0;
+		//DEBUG_WARNING(true, ("Processing C++FromNamedAccountToBank.  Params = '%s' MessageId=%Ld", params, message.getMessageId().getValue() ));
+		char *splitPos = strstr(params, " ");
+		if( splitPos)
+		{
+			*splitPos = 0;
+			std::string const named_account(params);
+			int const amount = atoi(splitPos+1);
+			DEBUG_FATAL(amount < 0,("C++FromNamedAccountToBank had a negative amount.  This message should always have a positive amount.\n"));
+			transferBankCreditsFrom(named_account,  amount);
+		}
+		delete [] params;
+	}
+	else if (message.getMethod() == "C++FinishCashTransfer")
+	{
+		std::string packedDataString(packedData.begin(), packedData.end());
+		int m_amount=strtoul(packedDataString.c_str(), 0, 10);
+		DEBUG_FATAL(m_amount < 0,("C++FinishCashTransaction had a negative amount.  This message should always have a positive amount.\n"));
+		internalAdjustCashBalance(m_amount, true);
+	}
+	else if (message.getMethod() == "C++ModifyCash")
+	{
+		char *params = new char[packedData.size()+1];
+		memcpy(params, &(*packedData.begin()), packedData.size());
+		params[packedData.size()] = 0;
+		char *splitPos = strstr(params, " ");
+		if (splitPos)
+		{
+			*splitPos = 0;
+			NetworkId recipient(atoll(params));
+			int amount = atoi(splitPos+1);
+			transferCashTo(recipient, amount);
+		}
+		delete [] params;
+	}
+	else if (message.getMethod() == "C++ModifyBank")
+	{
+		char *params = new char[packedData.size()+1];
+		memcpy(params, &(*packedData.begin()), packedData.size());
+		params[packedData.size()] = 0;
+		char *splitPos = strstr(params, " ");
+		if (splitPos)
+		{
+			*splitPos = 0;
+			NetworkId recipient(atoll(params));
+			int amount = atoi(splitPos+1);
+			transferBankCreditsTo(recipient, amount);
+		}
+		delete [] params;
+	}
+	else if (message.getMethod() == "C++DestroySelf")
+	{
+		permanentlyDestroy(DeleteReasons::Script);
+	}
+	else if (message.getMethod() == "C++VendorStatusChange")
+	{
+		char *params = new char[packedData.size()+1];
+		memcpy(params, &(*packedData.begin()), packedData.size());
+		params[packedData.size()] = 0;
+		int status =  atoi(params);
+		CommoditiesMarket::vendorStatusChange(getNetworkId(), status);
+		delete [] params;
+	}
+	else if (message.getMethod() == "C++Unstick")
+	{
+		CreatureObject* creatureObject = asCreatureObject();
+		if (creatureObject && creatureObject->isInWorld())
+		{
+			PlayerObject * p = PlayerCreatureController::getPlayerObject(creatureObject);
+			if (p && p->getIsUnsticking())
+			{
+				//Receive positional information with this unstick message.  If you change
+				//the format of this positional information, you must also change it in the sender in CommandCppFuncs.cpp
+				Vector position = getPosition_p();
+				char buf[255];
+				snprintf(buf, sizeof(buf), "%f:%f", position.x, position.z);
+				buf[sizeof(buf) - 1] = '\0';
+				
+				char *params = new char[packedData.size()+1];
+				memcpy(params, &(*packedData.begin()), packedData.size());
+				params[packedData.size()] = 0;
+				
+				if (strcmp(buf, params) == 0)
+				{
+					//handle unstick
+					static MessageDispatch::Emitter e;
+					Chat::sendSystemMessageSimple(*this, SharedStringIds::unstick_request_complete, NULL);
+					RequestUnstick r;
+					r.setClientId(getNetworkId());
+					e.emitMessage(r);
+					p->setIsUnsticking(false);
+				}
+				delete [] params;
+			}
+		}
+	}
+	else if (message.getMethod() == "C++WaitForPatrolPreload")
+	{
+		WARNING(true, ("Non-creature object %s received a C++WaitForPatrolPreload message",
+			getNetworkId().getValueString().c_str()));
+		MessageToQueue::cancelRecurringMessageTo(getNetworkId(), "C++WaitForPatrolPreload");
+	}
+	else if (message.getMethod() == "CancelRecurringMessageTo")
+	{
+		std::string const & methodName = message.getDataAsString();
+		for (Archive::AutoDeltaMap<std::pair<std::pair<unsigned long, uint64>, MessageToId>, MessageToPayload>::const_iterator i=m_messageTos.begin(); i!=m_messageTos.end(); ++i)
+		{
+			if ((i->second.getRecurringTime() != 0) && (i->second.getMethod() == methodName) && (i->first != s_currentMessageToBeingHandled))
+			{
+				IGNORE_RETURN(m_messageTos.erase(i));
+				break;
+			}
+		}
+	}
+	else if (message.getMethod() == "C++updateObserversCount")
+	{
+		std::string const & buffer = message.getDataAsString();
+		if (!buffer.empty())
+		{
+			int count = atoi(buffer.c_str());
+			updateObserversCount(count);
+		}
+	}
+	else if (message.getMethod() == "C++addBroadcastListener")
+	{
+		char *params = new char[packedData.size()+1];
+		memcpy(params, &(*packedData.begin()), packedData.size());
+		params[packedData.size()] = 0;
+		char *splitPos = strstr(params, " ");
+		if (splitPos)
+		{
+			*splitPos = 0;
+			addBroadcastListener(std::string(params), NetworkId(std::string(splitPos+1)));
+		}
+		delete [] params;
+	}
+	else if (message.getMethod() == "C++removeBroadcastListener")
+	{
+		char *params = new char[packedData.size()+1];
+		memcpy(params, &(*packedData.begin()), packedData.size());
+		params[packedData.size()] = 0;
+		char *splitPos = strstr(params, " ");
+		if (splitPos)
+		{
+			*splitPos = 0;
+			removeBroadcastListener(std::string(params), NetworkId(std::string(splitPos+1)));
+		}
+		delete [] params;
+	}
+	else if (message.getMethod() == "C++removeBroadcastListenerAllMessage")
+	{
+		char *params = new char[packedData.size()+1];
+		memcpy(params, &(*packedData.begin()), packedData.size());
+		params[packedData.size()] = 0;
+		removeBroadcastListener(NetworkId(std::string(params)));
+		delete [] params;
+	}
+	else if (message.getMethod() == "C++listenToBroadcastMessage")
+	{
+		char *params = new char[packedData.size()+1];
+		memcpy(params, &(*packedData.begin()), packedData.size());
+		params[packedData.size()] = 0;
+		char *splitPos = strstr(params, " ");
+		if (splitPos)
+		{
+			*splitPos = 0;
+			listenToBroadcastMessage(std::string(params), NetworkId(std::string(splitPos+1)));
+		}
+		delete [] params;
+	}
+	else if (message.getMethod() == "C++stopListeningToBroadcastMessage")
+	{
+		char *params = new char[packedData.size()+1];
+		memcpy(params, &(*packedData.begin()), packedData.size());
+		params[packedData.size()] = 0;
+		char *splitPos = strstr(params, " ");
+		if (splitPos)
+		{
+			*splitPos = 0;
+			stopListeningToBroadcastMessage(std::string(params), NetworkId(std::string(splitPos+1)));
+		}
+		delete [] params;
+	}
+	else if (message.getMethod() == "C++stopListeningToAllBroadcastMessage")
+	{
+		stopListeningToAllBroadcastMessages();
+	}
+	else if (message.getMethod() == "C++AdjustAccountFeatureIdResponse")
+	{
+		if (!packedData.empty())
+		{
+			Archive::ByteStream bs;
+			bs.put(reinterpret_cast<const void *>(&packedData[0]), static_cast<unsigned int>(packedData.size()));
+
+			Archive::ReadIterator ri = bs.begin();
+			AdjustAccountFeatureIdResponse const msg(ri);
+
+			if (msg.getTargetPlayer() == getNetworkId())
+			{
+				if (msg.getResultCode() == RESULT_SUCCESS)
+				{
+					Client * client = getClient();
+					if (client)
+					{
+						if (msg.getGameCode() == PlatformGameCode::SWG)
+						{
+							// request an updated list of feature id
+							AccountFeatureIdRequest const req(NetworkId::cms_invalid, GameServer::getInstance().getProcessId(), msg.getTargetPlayer(), msg.getTargetStationId(), msg.getGameCode(), AccountFeatureIdRequest::RR_Reload);
+							client->sendToConnectionServer(req);
+
+							// let player know that the reward was successfully traded in
+							if (VeteranRewardManager::isTradeInRewardFeatureId(msg.getFeatureId()) && !msg.getTargetPlayerDescription().empty() && msg.getTargetItem().isValid() && !msg.getTargetItemDescription().empty())
+								Chat::sendSystemMessage(*this, StringId("veteran_new", "trade_in_success"), Unicode::emptyString);
+						}
+						else if (msg.getGameCode() == PlatformGameCode::SWGTCG)
+						{
+							// let player know that the card was successfully redeemed
+							Chat::sendSystemMessage(*this, StringId("veteran_new", "redeem_tcg_card_success"), Unicode::emptyString);
+						}
+					}
+				}
+				else if (msg.getGameCode() == PlatformGameCode::SWGTCG)
+				{
+					Client * client = getClient();
+					if (client)
+					{
+						// let player know that the card failed to redeem
+						Chat::sendSystemMessage(*this, StringId("veteran_new", "redeem_tcg_card_failure"), Unicode::emptyString);
+					}
+				}
+				else if ((msg.getGameCode() == PlatformGameCode::SWG) && VeteranRewardManager::isTradeInRewardFeatureId(msg.getFeatureId()) && !msg.getTargetPlayerDescription().empty() && msg.getTargetItem().isValid() && !msg.getTargetItemDescription().empty())
+				{
+					Client * client = getClient();
+					if (client)
+					{
+						// let player know that the reward trade in failed
+						Chat::sendSystemMessage(*this, StringId("veteran_new", "trade_in_failure"), Unicode::emptyString);
+					}
+				}
+			}
+
+			if (msg.getRequestingPlayer() == getNetworkId())
+			{
+				if (msg.getResultCode() == RESULT_SUCCESS)
+				{
+					if (msg.getResultCameFromSession())
+						ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("feature Id (%lu) on account (%lu) has been adjusted from (%d) to (%d); session/Platform reported successful result code (%u, %s:%s)", msg.getFeatureId(), msg.getTargetStationId(), msg.getOldValue(), msg.getNewValue(), msg.getResultCode(), msg.getSessionResultString().c_str(), msg.getSessionResultText().c_str()), getClient());
+					else
+						ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("feature Id (%lu) on account (%lu) has been adjusted from (%d) to (%d)", msg.getFeatureId(), msg.getTargetStationId(), msg.getOldValue(), msg.getNewValue()), getClient());
+				}
+				else
+				{
+					if (msg.getResultCameFromSession())
+						ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("request to adjust feature Id for account (%lu) failed with error code (%u, %s:%s)", msg.getTargetStationId(), msg.getResultCode(), msg.getSessionResultString().c_str(), msg.getSessionResultText().c_str()), getClient());
+					else
+						ConsoleMgr::broadcastString(FormattedString<1024>().sprintf("request to adjust feature Id for account (%lu) failed", msg.getTargetStationId()), getClient());
+				}
+			}
+
+			if (msg.getTargetItem() == getNetworkId())
+			{
+				if (msg.getGameCode() == PlatformGameCode::SWGTCG)
+					VeteranRewardManager::handleTcgRedemptionResponse(*this, msg);
+				else if ((msg.getGameCode() == PlatformGameCode::SWG) && VeteranRewardManager::isTradeInRewardFeatureId(msg.getFeatureId()) && !msg.getTargetPlayerDescription().empty() && !msg.getTargetItemDescription().empty())
+					VeteranRewardManager::handleTradeInResponse(*this, msg);
+			}
+		}
+	}
+	else if (message.getMethod() == "C++kickPlayerCtsCompletedOrInProgress")
+	{
+		LOG("CustomerService",("Login: dropping %s because of CTS completed or in progress", PlayerObject::getAccountDescription(this).c_str()));
+
+		KickPlayer const kickMessage(getNetworkId(), "CTS completed or in progress");
+		GameServer::getInstance().sendToConnectionServers(kickMessage);
+		GameServer::getInstance().dropClient(getNetworkId(), true);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::handleTeleportFixup(bool force)
+{
+	if (getObjVars().hasItem("teleportFixup"))
+	{
+		LOG("TeleportFixup", ("Teleport fixup called for %s\n", getNetworkId().getValueString().c_str()));
+		if (getObjVars().hasItem("teleportFixup.x"))
+		{
+			// Ignore the container portion of a teleport fixup if we are already contained
+			if (!ContainerInterface::getContainedByObject(*this))
+			{
+				ServerObject *container = 0;
+				NetworkId destContainer;
+				std::string destCellName;
+				Vector destPosition_p;
+
+				getObjVars().getItem("teleportFixup.x", destPosition_p.x);
+				getObjVars().getItem("teleportFixup.y", destPosition_p.y);
+				getObjVars().getItem("teleportFixup.z", destPosition_p.z);
+				getObjVars().getItem("teleportFixup.container", destContainer);
+
+
+				if (getObjVars().getItem("teleportFixup.cellname", destCellName))
+				{
+						ServerObject * const destBuilding = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(destContainer));
+					if (destBuilding)
+					{
+							PortalProperty * const portalProp = destBuilding->getPortalProperty();
+						if (portalProp)
+						{
+								CellProperty * const cellProp = portalProp->getCell(destCellName.c_str());
+							if (cellProp)
+								container = safe_cast<ServerObject*>(&(cellProp->getOwner()));
+						}
+					}
+				}
+				else
+					container = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(destContainer));
+
+				if (container)
+				{
+					// allow the destination container to change the warp position
+					float yaw = 0.0f;
+						ServerObject * const topmost = safe_cast<ServerObject *>(ContainerInterface::getTopmostContainer(*container));
+					if (topmost && topmost->isAuthoritative())
+						topmost->changeTeleportDestination(destPosition_p, yaw);
+
+					Transform t;
+					t.setPosition_p(destPosition_p);
+					yaw -= getObjectFrameK_p().theta();
+					if (yaw != 0.0f)
+					{
+						t.yaw_l(yaw);
+						t.reorthonormalize();
+					}
+					LOG("TeleportFixup", ("TeleportFixup from (%g,%g,%g) in world to (%g,%g,%g) in %s\n",
+						getPosition_w().x, getPosition_w().y, getPosition_w().z,
+						t.getPosition_p().x, t.getPosition_p().y, t.getPosition_p().z,
+						container->getNetworkId().getValueString().c_str()));
+					safe_cast<ServerController*>(getController())->teleport(t, container);
+				}
+				else if (destContainer != NetworkId::cms_invalid && !force)
+				{
+					LOG("TeleportFixup", ("Failing teleport fixup because object %s is in a null dest container and force was passed in\n", getNetworkId().getValueString().c_str()));
+					return false; // going to a container and it wasn't loaded, defer
+				}
+			}
+			else
+				LOG("TeleportFixup", ("Ignoring teleport fixup because object %s is already contained by %s\n", getNetworkId().getValueString().c_str(), ContainerInterface::getContainedByObject(*this)->getNetworkId().getValueString().c_str()));
+		}
+
+		// Teleporting may cause us to become nonauthoritative here, and if so we should not clear the fixup, so it is
+		// reapplied on the new auth server.
+		if (!isAuthoritative())
+			return true;
+
+		std::string scriptCallback;
+		if (getObjVars().getItem("teleportFixup.callback", scriptCallback))
+		{
+			DEBUG_REPORT_LOG(true, ("Player warp making callback %s\n", scriptCallback.c_str()));
+			MessageToQueue::getInstance().sendMessageToJava(getNetworkId(), scriptCallback, std::vector<int8>(), 0, true);
+		}
+
+		LOG("TeleportFixup", ("Removing teleport fixup objvars for object %s\n", getNetworkId().getValueString().c_str()));
+		removeObjVarItem("teleportFixup");
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sets customization data for this object.
+ *
+ * @param customName		name of the customization parameter
+ * @param value				value to set the customization to
+ */
+void ServerObject::customize(const std::string & customName, int value)
+{
+	if(isAuthoritative())
+	{
+		CustomizationDataProperty *const cdProperty = safe_cast<CustomizationDataProperty*>(getProperty(CustomizationDataProperty::getClassPropertyId()));
+		if (cdProperty != NULL)
+		{
+			CustomizationData *const customizationData = cdProperty->fetchCustomizationData();
+			if (customizationData != NULL)
+			{
+				RangedIntCustomizationVariable * variable = dynamic_cast<
+					RangedIntCustomizationVariable*>(customizationData->findVariable(
+					customName));
+				if (variable != NULL)
+					variable->setValue(value);
+				else
+				{
+					DEBUG_WARNING(true, ("ServerObject::customize() tried to access var [%s] as ranged int, but not right type.", customName.c_str()));
+				}
+				//-- release local references
+				customizationData->release();
+			}
+			else
+			{
+				// this shouldn't happen
+				DEBUG_WARNING(true, ("CustomizationDataProperty returned NULL CustomizationData on fetch."));
+			}
+		}
+		else
+		{
+			// this shouldn't happen
+			DEBUG_WARNING(true, ("ServerObject::customize() object does not have customization property"));
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_customize, new MessageQueueGenericValueType<std::pair<std::string, int> >(std::make_pair(customName, value)));
+	}
+}	// ServerObject::customize
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::isInWorldCell() const
+{
+	return isInWorld() && (ContainerInterface::getTopmostContainer(*this) == this);
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::canDestroy() const
+{
+	if (isPlayerControlled())
+		return false;
+	const Container * container = ContainerInterface::getContainer(*this);
+	if (container)
+	{
+		//Check contents to make sure they can be destroyed.
+		ContainerConstIterator i = container->begin();
+		for (; i != container->end(); ++i)
+		{
+			const ServerObject* child = safe_cast<const ServerObject *>((*i).getObject());
+			if (child && !child->canDestroy())
+			{
+				DEBUG_REPORT_LOG(true, ("Tried to delete object %s but could not delete child %s\n", getNetworkId().getValueString().c_str(), child->getNetworkId().getValueString().c_str()));
+				return false;
+			}
+		}
+	}
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::permanentlyDestroy(DeleteReasons::Enumerator reason)
+{
+	// prevent recursion
+	if (isBeingDestroyed())
+		return true;
+
+	if (!isAuthoritative())
+	{
+		sendControllerMessageToAuthServer(CM_permanentlyDestroy, new MessageQueueGenericValueType<int>(reason));
+		return false;
+	}
+
+	if (!canDestroy())
+	{
+		return false;
+	}
+
+	// can't destroy an initialized vendor unless the commodities server is up because
+	// there is commodities server data that *MUST* be removed when the vendor is
+	// destroyed, or else the commodities server will think the player has more
+	// vendors than he actually has
+	if ( isVendor() && getObjVars().hasItem("vendor_initialized") && !CommoditiesMarket::isCommoditiesServerAvailable() )
+	{
+		return false;
+	}
+
+	BuildingObject* buildingObject = asBuildingObject();
+	const bool houseDestroyedByScript = (reason == DeleteReasons::Script && buildingObject && buildingObject->isPlayerPlaced());
+
+	// tell scripts we want to destroy the object
+	if (getScriptObject() != NULL && !m_calledTriggerDestroy)
+	{
+		m_calledTriggerDestroy = true;
+		ScriptParams params;
+		if (getScriptObject()->trigAllScripts(Scripting::TRIG_DESTROY, params) == SCRIPT_OVERRIDE)
+		{
+			if(reason != DeleteReasons::God)
+			{
+				m_calledTriggerDestroy = false;
+				return false;
+			}
+		}
+	}
+
+	if (isAuthoritative() && (getScriptObject() != NULL) && !m_calledTriggerRemovingFromWorld)
+	{
+		ScriptParams params;
+		m_calledTriggerRemovingFromWorld = true;
+		IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_REMOVING_FROM_WORLD, params));
+	}
+	
+	setBeingDestroyed(true);
+
+	if (isInBazaarOrVendor())
+	{
+		CommoditiesMarket::auctionCancel(getOwnerId(), getNetworkId().getValue());
+	}
+
+	// need to remove all the items from the Commodities Market
+	// TODO: how to remove an item that might get deleted from a vendor's inventory without the vendor being deleted? (GM deleting and item for instance)
+	// TODO PROBLEM: contents of vendors aren't guaranteed to be loaded
+	if ( isVendor() )
+	{
+		ServerObject *inv = getBazaarContainer();
+		NetworkId playerOwnerId;
+		getObjVars().getItem("vendor_owner", playerOwnerId);
+		if( inv && playerOwnerId.getValue()>0 )
+		{
+			// if this was an uninitialized vendor, remove objvar from owner
+			ServerObject *owner = dynamic_cast<ServerObject*>(NetworkIdManager::getObjectById(playerOwnerId));
+			if (owner)
+			{
+				NetworkId notInitalizedVendor;
+				if (owner->getObjVars().getItem("vendor_not_initialized", notInitalizedVendor))
+				{
+					if (notInitalizedVendor == Object::getNetworkId())
+					{
+						owner->removeObjVarItem("vendor_not_initialized");
+					}
+				}
+			}
+			CommoditiesMarket::destroyVendorMarket(playerOwnerId, *inv);
+		}
+	}
+
+	if (isPersisted())
+	{
+		sendDeleteToDatabase(*this, houseDestroyedByScript ? DeleteReasons::House : reason);
+		ServerObject const * const oldContainer = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*this));
+		LOG("CustomerService",("Deletion: %s in container: %s deleted from game.  Reason: %s", ServerObject::getLogDescription(this).c_str(), oldContainer ? ServerObject::getLogDescription(oldContainer).c_str() : "none", describeDeleteReason(static_cast<int>(reason)).c_str()));
+		int childReason = DeleteReasons::ContainerDeleted;
+		if (houseDestroyedByScript)
+			childReason = DeleteReasons::House;
+		flagChildObjectsForDeletion(*this, childReason);
+	}
+
+	// grab the proxy list prior to removing it from the container, because it's about to lose its proxy list
+	ProxyList const &proxyList = getExposedProxyList();
+	if (!proxyList.empty())
+	{
+		ServerMessageForwarding::begin(std::vector<uint32>(proxyList.begin(), proxyList.end()));
+
+	UnloadObjectMessage const unloadMessage(getNetworkId());
+		ServerMessageForwarding::send(unloadMessage);
+
+		ServerMessageForwarding::end();
+	}
+
+	onPermanentlyDestroyed();
+	unload();
+
+	//-- Ensure state is set to initialized (i.e. have received end baselines or
+	//   created on this server).  This is required so that the AlterScheduler
+	//   can accept the Object.  If changing initialization state, warn about it here.
+	if (!isInitialized())
+	{
+		DEBUG_WARNING(true, ("ServerObject::permanentlyDestroy(): object is not initialized, setting to initialized to allow submission to alter scheduler for delete. id=[%s],template=[%s].", getNetworkId().getValueString().c_str(), getObjectTemplateName()));
+		setInitialized(true);
+	}
+
+	//-- Ensure this object gets altered next frame so that kill() can take effect.
+	AlterScheduler::submitForAlter(*this);
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Allows an object to do pre-deletion cleanup.
+ */
+void ServerObject::onRemovingFromWorld()
+{
+	// If we're being removed from the world, we may need to remove ourselves from the parent container list.
+ 	if (isAuthoritative() && isPlayerControlled() && isUnloading())
+ 	{
+ 		Object * const parent = ContainerInterface::getContainedByObject(*this);
+ 		if (parent)
+ 		{
+ 			Container * const container = parent->getCellProperty();
+ 			if (container)
+ 			{
+ 				container->internalItemRemoved(*this);
+ 			}
+ 		}
+ 	}
+
+	if (m_networkUpdateFar)
+		onRemovedFromWorldCell();
+
+	destroyTriggerVolumes();
+}
+
+// ----------------------------------------------------------------------
+/* Why would I unload something?
+ * - It might be a player character logging out
+ * - Or the planet server might be telling me to unload an object */
+// ----------------------------------------------------------------------
+
+void ServerObject::unload()
+{
+	scheduleForAlter();
+	addObjectToConcludeList();
+
+	// prevent recursion
+	if (isUnloading())
+	{
+		kill();
+		return;
+	}
+
+	setUnloading(true);
+
+	DEBUG_REPORT_LOG(ConfigServerGame::getLogObjectLoading(), ("Unloading object (%s : %s)\n", getObjectTemplateName(), getNetworkId().getValueString().c_str()));
+
+	// If the object has a client, uncontrol it.  When the primary controlled
+	// object is unloaded, this prevents us from sending destroys to ourself,
+	if (getClient())
+		getClient()->removeControlledObject(*this);
+
+	synchronizationOnUnload();
+
+	if (isAuthoritative())
+	{
+		ScriptParams params;
+		IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_UNLOADED_FROM_MEMORY, params));
+	}
+
+	kill();
+
+	// if this object is in a slot in a slotted container, immediately remove
+	// it from the slot, because another object may be immediately put into
+	// the slot before this object is eventually destroyed and removed from the container
+	Object * const containedBy = ContainerInterface::getContainedByObject(*this);
+	if (containedBy)
+	{
+		Container * const container = ContainerInterface::getContainer(*containedBy);
+		SlottedContainer * const slotContainer = dynamic_cast<SlottedContainer *>(container);
+		if (slotContainer)
+			slotContainer->removeItemFromSlotOnly(*this);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Unload the object, and tell the database to move it to a specified player
+ */
+void ServerObject::moveToPlayerAndUnload(const NetworkId &player)
+{
+	GenericValueTypeMessage<std::pair<NetworkId, NetworkId> > const moveToPlayerMessage(
+		"MoveToPlayer",
+		std::make_pair(getNetworkId(), player));
+	GameServer::getInstance().sendToDatabaseServer(moveToPlayerMessage);
+
+	unload();
+}
+
+
+// ----------------------------------------------------------------------
+
+/**
+ * Unload the object, and tell the database to move it to a specified player's bank
+ */
+void ServerObject::moveToPlayerBankAndUnload(const NetworkId &player)
+{
+	GenericValueTypeMessage<std::pair<NetworkId, NetworkId> > const moveToPlayerMessage(
+		"MoveToPlayerBankMessage",
+		std::make_pair(getNetworkId(), player));
+	GameServer::getInstance().sendToDatabaseServer(moveToPlayerMessage);
+
+	unload();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Unload the object, and tell the database to move it to a specified player's bank
+ */
+void ServerObject::moveToPlayerDatapadAndUnload(const NetworkId &player, int maxDepth)
+{
+	GenericValueTypeMessage<std::pair<std::pair<NetworkId, NetworkId>, int> > const moveToPlayerMessage(
+		"MoveToPlayerDatapadMessage",
+		std::make_pair(std::make_pair(getNetworkId(), player), maxDepth));
+	GameServer::getInstance().sendToDatabaseServer(moveToPlayerMessage);
+
+	unload();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::onPermanentlyDestroyed()
+{
+	IGNORE_RETURN(ContainerInterface::onObjectDestroy(*this));
+}
+
+// ------------------------------------------------------------------------------------------
+
+
+/**
+ * Request to load a specific object contained by this object.
+ * (This object must be a demand-load container, i.e. m_loadContents==false.)
+ */
+
+void ServerObject::loadContainedObjectFromDB(const NetworkId &oid) const
+{
+	LoadContainedObjectMessage const msg(getNetworkId(), oid);
+	GameServer::getInstance().sendToDatabaseServer(msg);
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::areContentsLoaded() const
+{
+	return m_contentsLoaded.get();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::loadAllContentsFromDB() const
+{
+	if (m_contentsLoaded.get() || m_contentsRequested.get())
+	{
+		DEBUG_REPORT_LOG(true,("Ignoring LoadAllContentsFromDB for object %s because they are already loaded\n",getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	DEBUG_REPORT_LOG(true,("LoadAllContentsFromDB, object %s\n",getNetworkId().getValueString().c_str()));
+
+	if (m_loadContents.get())
+		WARNING_STRICT_FATAL(true,("Requested loading contents of container %s, but the container is not a demand-load container.",getNetworkId().getValueString().c_str()));
+	else
+	{
+		m_contentsRequested = true;
+		LoadContentsMessage const msg(getNetworkId());
+		GameServer::getInstance().sendToDatabaseServer(msg);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ServerObject::setLoadContents(bool loadContents)
+{
+	if (isAuthoritative())
+	{
+		m_loadContents = loadContents;
+	}
+	else
+	{
+		// this function should probably never be called on a proxy object
+		WARNING_STRICT_FATAL(true,("Setting loadContent across game servers is not allowed."));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ServerObject::unloadPersistedContents()
+{
+	if (!areContentsLoaded())
+	{
+		return;
+	}
+
+	Container *container = ContainerInterface::getContainer(*this);
+	if (container)
+	{
+		for (ContainerIterator j = container->begin(); j != container->end(); ++j)
+		{
+			ServerObject * obj = safe_cast<ServerObject *>((*j).getObject());
+			if (obj && obj->isPersisted())
+			{
+				obj->unload();
+			}
+		}
+		m_contentsLoaded = false;
+		m_contentsRequested = false;
+	}
+}
+
+//----------------------------------------------------------------------
+
+const Unicode::String ServerObject::getAssignedObjectFirstName () const
+{
+	const Unicode::String & name = m_objectName.get ();
+	// split off the last name from toName
+	std::string::size_type spacePos = name.find(' ');
+	if (spacePos != std::string::npos)
+		return name.substr(0, spacePos);
+
+	return name;
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * This function is used to obtain a client-displayable name regardless of whether
+ * the object has an assigned name or string id.
+ */
+
+const Unicode::String ServerObject::getEncodedObjectName           () const
+{
+	static const Unicode::String at (1, '@');
+
+	if (!m_objectName.get ().empty ())
+		return m_objectName.get ();
+	else
+		return at + Unicode::narrowToWide (m_nameStringId.get().getCanonicalRepresentation ());
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Do a money transfer and send the reply to a script
+ * @param target Target of the money transfer
+ * @param replyTo Object that wants the reply message (this object does not need to be involved in the transaction)
+ * @param successCallback Script method on the object to call on success.
+ * @param failCallback Script method on the object to call on failure.
+ * @param packedDictionary Dictionary to be passed to the script (packed into a string)
+ */
+void ServerObject::scriptTransferCashTo(const NetworkId &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const std::vector<int8> &packedDictionary)
+{
+	if (isAuthoritative())
+	{
+		bool result = transferCashTo(target, amount);
+		if (result)
+		{
+			if (!successCallback.empty())
+			MessageToQueue::getInstance().sendMessageToJava(replyTo,successCallback,packedDictionary,0,true);
+		}
+		else
+		{
+			if (!failCallback.empty())
+			MessageToQueue::getInstance().sendMessageToJava(replyTo,failCallback,packedDictionary,0,true);
+	}
+	}
+	else
+	{
+		MessageQueueScriptTransferMoney *msg = new MessageQueueScriptTransferMoney(MessageQueueScriptTransferMoney::TT_cashTransfer, target, "", amount, replyTo, successCallback, failCallback, packedDictionary);
+		Controller *const controller = getController();
+		NOT_NULL(controller);
+		controller->appendMessage(CM_scriptTransferMoney,0,msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Do a money transfer and send the reply to a script
+ * @param target Target of the money transfer
+ * @param replyTo Object that wants the reply message (this object does not need to be involved in the transaction)
+ * @param successCallback Script method on the object to call on success.
+ * @param failCallback Script method on the object to call on failure.
+ * @param packedDictionary Dictionary to be passed to the script (packed into a string)
+ */
+void ServerObject::scriptTransferBankCreditsTo(const NetworkId &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const std::vector<int8> &packedDictionary)
+{
+	if (isAuthoritative())
+	{
+		bool result = transferBankCreditsTo(target, amount);
+		if (result)
+		{
+			if (!successCallback.empty())
+			MessageToQueue::getInstance().sendMessageToJava(replyTo,successCallback,packedDictionary,0,true);
+		}
+		else
+		{
+			if (!failCallback.empty())
+			MessageToQueue::getInstance().sendMessageToJava(replyTo,failCallback,packedDictionary,0,true);
+	}
+	}
+	else
+	{
+		MessageQueueScriptTransferMoney *msg = new MessageQueueScriptTransferMoney(MessageQueueScriptTransferMoney::TT_bankTransfer, target, "", amount, replyTo, successCallback, failCallback, packedDictionary);
+		Controller *const controller = getController();
+		NOT_NULL(controller);
+		controller->appendMessage(CM_scriptTransferMoney,0,msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::scriptWithdrawCashFromBank(int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const std::vector<int8> &packedDictionary)
+{
+	if (isAuthoritative())
+	{
+		bool result = withdrawCashFromBank(amount);
+		if (result)
+		{
+			if (!successCallback.empty())
+			MessageToQueue::getInstance().sendMessageToJava(replyTo,successCallback,packedDictionary,0,true);
+		}
+		else
+		{
+			if (!failCallback.empty())
+			MessageToQueue::getInstance().sendMessageToJava(replyTo,failCallback,packedDictionary,0,true);
+	}
+	}
+	else
+	{
+		MessageQueueScriptTransferMoney *msg = new MessageQueueScriptTransferMoney(MessageQueueScriptTransferMoney::TT_bankWithdrawal, NetworkId::cms_invalid, "", amount, replyTo, successCallback, failCallback, packedDictionary);
+		Controller *const controller = getController();
+		NOT_NULL(controller);
+		controller->appendMessage(CM_scriptTransferMoney,0,msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::scriptDepositCashToBank(int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const std::vector<int8> &packedDictionary)
+{
+	if (isAuthoritative())
+	{
+		bool result = depositCashToBank(amount);
+		if (result)
+		{
+			if (!successCallback.empty())
+			MessageToQueue::getInstance().sendMessageToJava(replyTo,successCallback,packedDictionary,0,true);
+		}
+		else
+		{
+			if (!failCallback.empty())
+			MessageToQueue::getInstance().sendMessageToJava(replyTo,failCallback,packedDictionary,0,true);
+	}
+	}
+	else
+	{
+		MessageQueueScriptTransferMoney *msg = new MessageQueueScriptTransferMoney(MessageQueueScriptTransferMoney::TT_bankDeposit, NetworkId::cms_invalid, "", amount, replyTo, successCallback, failCallback, packedDictionary);
+		Controller *const controller = getController();
+		NOT_NULL(controller);
+		controller->appendMessage(CM_scriptTransferMoney,0,msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Do a money transfer and send the reply to a script
+ * @param target Target of the money transfer
+ * @param replyTo Object that wants the reply message (this object does not need to be involved in the transaction)
+ * @param successCallback Script method on the object to call on success.
+ * @param failCallback Script method on the object to call on failure.
+ * @param packedDictionary Dictionary to be passed to the script (packed into a string)
+ */
+void ServerObject::scriptTransferBankCreditsTo(const std::string &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const std::vector<int8> &packedDictionary)
+{
+	if (isAuthoritative())
+	{
+		bool result = transferBankCreditsTo(target, amount);
+		if (result)
+		{
+			if (!successCallback.empty())
+			MessageToQueue::getInstance().sendMessageToJava(replyTo,successCallback,packedDictionary,0,true);
+		}
+		else
+		{
+			if (!failCallback.empty())
+			MessageToQueue::getInstance().sendMessageToJava(replyTo,failCallback,packedDictionary,0,true);
+	}
+	}
+	else
+	{
+		MessageQueueScriptTransferMoney *msg = new MessageQueueScriptTransferMoney(MessageQueueScriptTransferMoney::TT_bankTransferToNamedAccount, NetworkId::cms_invalid, target, amount, replyTo, successCallback, failCallback, packedDictionary);
+		Controller *const controller = getController();
+		NOT_NULL(controller);
+		controller->appendMessage(CM_scriptTransferMoney,0,msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::scriptTransferBankCreditsFrom(const std::string &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const std::vector<int8> &packedDictionary)
+{
+	if (isAuthoritative())
+	{
+		bool result = transferBankCreditsFrom(target, amount);
+		if (result)
+		{
+			if (!successCallback.empty())
+			MessageToQueue::getInstance().sendMessageToJava(replyTo,successCallback,packedDictionary,0,true);
+		}
+		else
+		{
+			if (!failCallback.empty())
+			MessageToQueue::getInstance().sendMessageToJava(replyTo,failCallback,packedDictionary,0,true);
+	}
+	}
+	else
+	{
+		MessageQueueScriptTransferMoney *msg = new MessageQueueScriptTransferMoney(MessageQueueScriptTransferMoney::TT_bankTransferFromNamedAccount, NetworkId::cms_invalid, target, amount, replyTo, successCallback, failCallback, packedDictionary);
+		Controller *const controller = getController();
+		NOT_NULL(controller);
+		controller->appendMessage(CM_scriptTransferMoney,0,msg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ServerObject::getAttributes(const NetworkId & playerId, AttributeVector &data) const
+{
+	getAttributes (data);
+
+	if (!isAuthoritative())
+	{
+		DEBUG_WARNING (true, ("ServerObject::getAttributes invoked on non-auth object %s", getNetworkId ().getValueString ().c_str ()));
+		return;
+	}
+
+	GameScriptObject * const gso = const_cast<GameScriptObject *>(getScriptObject());
+
+	if (gso->hasTrigger (Scripting::TRIG_GET_ATTRIBS))
+	{
+		const CreatureObject * player  = safe_cast<const CreatureObject *>(ServerWorld::findObjectByNetworkId(playerId));
+		int MAX_ATTRIBS = 80;
+		if(player)
+		{
+			if(player->getClient())
+			{
+				if(player->getClient()->isGod())
+				{
+					MAX_ATTRIBS = 2000;
+				}
+			}
+		}
+
+		// allow scripts to add attribute data to the vector
+		static std::vector<const char *>            names   (MAX_ATTRIBS, static_cast<const char *>(0));
+		static std::vector<const Unicode::String *> attribs (MAX_ATTRIBS, static_cast<const Unicode::String *>(0));
+
+		//-- clear the vectors
+		names.clear    ();
+		attribs.clear  ();
+		names.resize   (MAX_ATTRIBS, static_cast<const char *>(0));
+		attribs.resize (MAX_ATTRIBS, static_cast<const Unicode::String *>(0));
+
+		ScriptParams params;
+		params.addParam (playerId);
+		params.addParam (names);
+		params.addParam (attribs);
+
+		NOT_NULL (gso);
+
+		IGNORE_RETURN(gso->trigAllScripts(Scripting::TRIG_GET_ATTRIBS, params));
+
+		const std::vector<const char *> & newNames              = params.getStringArrayParam  (1);
+		const std::vector<const Unicode::String *> & newAttribs = params.getUnicodeArrayParam (2);
+
+		// copy the returned strings to data
+		for (int i = 0; i < MAX_ATTRIBS; ++i)
+		{
+			const char * const            newName   = newNames   [i];
+			const Unicode::String * const newAttrib = newAttribs [i];
+
+			if (newName && *newName && newAttrib && !newAttrib->empty ())
+			{
+				data.push_back (std::make_pair (std::string (newName), *newAttrib));
+			}
+			else
+				break;
+		}
+
+		// if the requestor is a gm, add objvars and scriptvars
+		// to result data (ignore max attribs as well!)
+
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::getAttributes(AttributeVector &) const
+{
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Return all the standard attributes for an item, plus special
+ * auction-specific attributes.
+ *
+ * May eventually make this into a virtual function if we add more to it.
+ */
+void ServerObject::getAttributesForAuction(AttributeVector &data) const
+{
+	static const std::string attributeClientSharedTemplateName("ClientSharedTemplateName");
+	static const std::string attributeAppearanceData("AppearanceData");
+
+	DEBUG_FATAL(strlen(getClientSharedTemplateName()) > 1000,("Client shared template name was more than 1000 characters long, too long to save."));
+	
+	getAttributes(NetworkId::cms_invalid,data);
+	data.push_back(std::make_pair(attributeClientSharedTemplateName, Unicode::narrowToWide(getClientSharedTemplateName())));
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::alwaysSendReliableTransform() const
+{
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Called when a request to load a contained object has been completed.
+ *
+ * Two Important Notes:
+ * 1)  This is called in response to loadContainedObjectFromDB.  It is not
+ *     called in response to loadAllContentsFromDB
+ * 2)  There is no guarantee the requested object exists.  If the object
+ *     id was wrong or the object wasn't in the container, it will not
+ *     have been loaded.
+ */
+void ServerObject::onContainedObjectLoaded(NetworkId const &oid)
+{
+	CommoditiesMarket::checkPendingLoads(oid);
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::isBazaarTerminal() const
+{
+	SharedObjectTemplate::GameObjectType got  =
+		static_cast<SharedObjectTemplate::GameObjectType> (getGameObjectType());
+	return (got == SharedObjectTemplate::GOT_terminal_bazaar);
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::isVendor() const
+{
+	const TangibleObject *tangibleObject = asTangibleObject();
+	if (tangibleObject)
+	{
+		return tangibleObject->hasCondition(ServerTangibleObjectTemplate::C_vendor);
+	}
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::makeVendor()
+{
+	CreatureObject *creatureObject = asCreatureObject();
+	if (creatureObject)
+	{
+		const char* s_inventoryTemplate = "object/tangible/inventory/vendor_inventory.iff";
+		std::set<Client *> inventoryObservers;
+		ServerObject *inventory = creatureObject->getInventory();
+		if (inventory)
+		{
+			// if there's already a vendor inventory on the creature,
+			// then it means this creature is already a vendor; we
+			// don't want to destroy that vendor inventory and create
+			// another vendor inventory, because the vendor inventory
+			// is already registered with the commodities server and
+			// may have items in it, and deleting the vendor inventory
+			// would cause those items to be orphaned; 
+			
+			// doing what we are doing here will cause the existing
+			// vendor inventory to be registered with the commodities
+			// server again, but it won't hurt, and it covers the
+			// recovery case where if for some reason the first
+			// registration failed, we will try the registration again
+			if(strcmp(inventory->getTemplateName(), s_inventoryTemplate) == 0)
+			{
+				LOG("CustomerService", ("vendor: Calling makeVendor() for vendor (%s) who already has a vendor inventory object (%s)", getDebugInformation().c_str(), inventory->getDebugInformation().c_str()));
+				return;
+			}
+
+			// make a copy of the current inventory observers
+			inventoryObservers = inventory->getObservers();
+
+			// destroy the existing inventory
+			LOG("CustomerService", ("vendor: makeVendor() for vendor (%s), destroying existing inventory object (%s)", getDebugInformation().c_str(), inventory->getDebugInformation().c_str()));
+
+			inventory->permanentlyDestroy(DeleteReasons::Replaced);
+		}
+		const SlotId invenSlot = SlotIdManager::findSlotId(ConstCharCrcLowerString("inventory"));
+		ServerObject *vendorInventory = ServerWorld::createNewObject(std::string(s_inventoryTemplate), *this, invenSlot, true);
+		if (vendorInventory)
+		{
+			LOG("CustomerService", ("vendor: makeVendor() for vendor (%s), created vendor inventory object (%s)", getDebugInformation().c_str(), vendorInventory->getDebugInformation().c_str()));
+
+			vendorInventory->setLoadContents(false);
+
+			// make sure that the new inventory object has
+			// the same observers as the old inventory object
+			ObserveTracker::onMakeVendorInventory(*vendorInventory, inventoryObservers);
+		}
+		else
+		{
+			LOG("CustomerService", ("vendor: makeVendor() for vendor (%s), failed to create vendor inventory object", getDebugInformation().c_str()));
+		}
+	}
+	else
+	{
+		setLoadContents(false);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+ServerObject *ServerObject::getBazaarContainer()
+{
+	CreatureObject *creatureObject = asCreatureObject();
+	if (creatureObject)
+	{
+		return creatureObject->getInventory();
+	}
+	else
+	{
+		return this;
+	}
+}
+
+
+// ----------------------------------------------------------------------
+
+const ServerObject *ServerObject::getBazaarContainer() const
+{
+	const CreatureObject *creatureObject = asCreatureObject();
+	if (creatureObject)
+	{
+		return creatureObject->getInventory();
+	}
+	else
+	{
+		return this;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Called when a request to load a contained object has been completed.
+ *
+ * Two Important Notes:
+ * 1)  This is called in response to loadAllContentsFromDB.  It is not
+ *     called in response to loadContainedObjectFromDB
+ * 2)  There is no guarantee the container now contains any objects.
+ *     If there were no contained objects in the database, the container
+ *     will be empty.
+ */
+void ServerObject::onAllContentsLoaded()
+{
+	GameServer::removePendingLoadRequest(getNetworkId());
+
+	m_contentsLoaded=true;
+	if (getObjVars().hasItem(CommoditiesMarket::OBJVAR_VENDOR_REINITIALIZING))
+	{
+		//vendor is re-initializing
+		setLoadContents( false );
+		CommoditiesMarket::reinitializeVendorContents(*this);
+	}
+	else if (getObjVars().hasItem(OBJVAR_STRUCTURE_PLAYER_PACK))
+	{
+		//Get player initiating load
+		NetworkId playerId;
+
+		if (getObjVars().getItem(OBJVAR_STRUCTURE_PLAYER_PACK, playerId))
+		{
+			bool failed = true;
+
+			if (isAuthoritative())
+			{
+				ServerObject *player = NULL;
+				if ((player = getServerObject(playerId)) != NULL)
+				{
+					//Tell scripts we are loaded
+					ScriptParams params;
+					params.addParam( getNetworkId() );
+					IGNORE_RETURN(player->getScriptObject()->trigAllScripts(Scripting::TRIG_BUILDING_CONTENTS_LOADED, params));
+					failed = false;
+				}
+			}
+
+			if (failed)
+			{
+				// fail pack-up as authority lost on player - notify script
+				MessageToQueue::getInstance().sendMessageToJava(playerId, "handleFailedStructurePackup", std::vector<int8>(), 0, false);
+			}
+		}
+
+		//remove the vendor reinitialization flag if it exists
+		removeObjVarItem(OBJVAR_STRUCTURE_PLAYER_PACK);
+	}
+	else
+	{
+		ServerObject const * const containedBy = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*this));
+		if (containedBy)
+		{
+			Client * const client = containedBy->getClient();
+			if (client)
+			{
+				CreatureObject const * const containedByCreature = containedBy->asCreatureObject();
+				if (containedByCreature && containedByCreature->getBankContainer() == this)
+				{
+					if (containedBy->getLoadCTSBank())
+					{
+						LOG("CustomerService", ("CharacterTransfer: serverObject has LoadCTSBank flag set, sending ReplyBankCTSLoaded message"));
+						GenericValueTypeMessage<NetworkId> setFromCTSLoadBank("ReplyBankCTSLoaded", containedBy->getNetworkId());
+						client->sendToConnectionServer(setFromCTSLoadBank);
+					}
+					else
+						client->openContainer(*this, 0, std::string());
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::immediateLogoutAllowed()
+{
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::disconnect()
+{
+	if (!isAuthoritative())
+		sendControllerMessageToAuthServer(CM_disconnect, 0);
+	else if (getClient())
+		GameServer::getInstance().dropClient(getNetworkId());
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::handleDisconnect(bool immediate)
+{
+	if (isPlayerControlled())
+	{
+		// client has disconnected, log pertinent information about the play session
+		CreatureObject * const creatureObject = asCreatureObject();
+		PlayerObject * playerObject = NULL;
+		if (creatureObject)
+		{
+			playerObject = PlayerCreatureController::getPlayerObject(creatureObject);
+			if (playerObject && (playerObject->getSessionStartPlayTime() != 0))
+			{
+				char buffer[128];
+				std::string logText;
+
+				// leading delimiter
+				logText += "|";
+
+				// character name
+				logText += Unicode::wideToNarrow(getObjectName());
+				logText += "|";
+
+				// character id
+				logText += getNetworkId().getValueString();
+				logText += "|";
+
+				// character birth date
+				// get the base date of Jan 1st, 2001
+				struct tm baseTimeData;
+				baseTimeData.tm_hour = 0;
+				baseTimeData.tm_isdst = 0;
+				baseTimeData.tm_mday = 1;
+				baseTimeData.tm_min = 0;
+				baseTimeData.tm_mon = 0;
+				baseTimeData.tm_sec = 0;
+				baseTimeData.tm_wday = 0;
+				baseTimeData.tm_yday = 0;
+				baseTimeData.tm_year = 101;
+				time_t baseTime = mktime(&baseTimeData);
+
+				// the birth date is the number of days since Jan 1st, 2001
+				baseTime += static_cast<time_t>(playerObject->getBornDate() * 60 * 60 * 24);
+
+				struct tm * birthDateTimeData = gmtime(&baseTime);
+
+				snprintf(buffer, sizeof(buffer)-1, "%d%02d%02d", (birthDateTimeData->tm_year + 1900), (birthDateTimeData->tm_mon + 1), birthDateTimeData->tm_mday);
+				buffer[sizeof(buffer)-1] = '\0';
+				logText += buffer;
+				logText += "|";
+
+				// station id
+				snprintf(buffer, sizeof(buffer)-1, "%lu", playerObject->getStationId());
+				buffer[sizeof(buffer)-1] = '\0';
+				logText += buffer;
+				logText += "|";
+
+				// session play time
+				logText += CalendarTime::convertSecondsToHMS(static_cast<unsigned int>(playerObject->getSessionPlayTimeDuration()));
+				logText += "|";
+
+				// session active play time
+				logText += CalendarTime::convertSecondsToHMS(static_cast<unsigned int>(playerObject->getSessionActivePlayTimeDuration()));
+				logText += "|";
+
+				// session activity
+				snprintf(buffer, sizeof(buffer)-1, "%lu", playerObject->getSessionActivity());
+				buffer[sizeof(buffer)-1] = '\0';
+				logText += buffer;
+				logText += "|";
+
+				// scene name
+				logText += ServerWorld::getSceneId();
+				logText += "|";
+
+				// container id (0 if in world cell)
+				Object const * const container  = ContainerInterface::getContainedByObject(*this);
+				snprintf(buffer, sizeof(buffer)-1, "%s", (container ? container->getNetworkId().getValueString().c_str() : "0"));
+				buffer[sizeof(buffer)-1] = '\0';
+				logText += buffer;
+				logText += "|";
+
+				// x,y,z in container
+				Vector const posContainer = getPosition_p();
+				snprintf(buffer, sizeof(buffer)-1, "%d %d %d", static_cast<int>(posContainer.x), static_cast<int>(posContainer.y), static_cast<int>(posContainer.z));
+				buffer[sizeof(buffer)-1] = '\0';
+				logText += buffer;
+				logText += "|";
+
+				// x,y,z in world
+				Vector const posWorld = getPosition_w();
+				snprintf(buffer, sizeof(buffer)-1, "%d %d %d", static_cast<int>(posWorld.x), static_cast<int>(posWorld.y), static_cast<int>(posWorld.z));
+				buffer[sizeof(buffer)-1] = '\0';
+				logText += buffer;
+				logText += "|";
+
+				// profession
+				logText += playerObject->getSkillTemplate();
+				logText += "|";
+
+				// level
+				snprintf(buffer, sizeof(buffer)-1, "%d", creatureObject->getLevel());
+				buffer[sizeof(buffer)-1] = '\0';
+				logText += buffer;
+				logText += "|";
+
+				// current quest id
+				snprintf(buffer, sizeof(buffer)-1, "%lu", playerObject->getCurrentQuest());
+				buffer[sizeof(buffer)-1] = '\0';
+				logText += buffer;
+				logText += "|";
+
+				// current quest name
+				if (playerObject->getCurrentQuest() != 0)
+				{
+					logText += QuestManager::getQuestName(playerObject->getCurrentQuest());
+				}
+				else
+				{
+					logText += "none";
+				}
+				logText += "|";
+
+				// xp
+				bool hasLoggedFirstXp = false;
+				std::map<std::string, int> const & xp = playerObject->getExperiencePoints();
+				for (std::map<std::string, int>::const_iterator iter = xp.begin(); iter != xp.end(); ++iter)
+				{
+					if (iter->second == 0)
+						continue;
+
+					if (hasLoggedFirstXp)
+						logText += ",";
+
+					logText += iter->first;
+					logText += "=";
+
+					snprintf(buffer, sizeof(buffer)-1, "%d", iter->second);
+					buffer[sizeof(buffer)-1] = '\0';
+					logText += buffer;
+
+					hasLoggedFirstXp = true;
+				}
+				logText += "|";
+
+				// log it
+				LOG("CustomerService", ("Logout:%s", logText.c_str()));
+
+				// clear the session play time info
+				playerObject->setSessionPlayTimeInfo(0, 0, 0);
+
+				// clear the session activity info
+				playerObject->clearSessionActivity();
+			}
+		}
+
+		if (!immediate && !immediateLogoutAllowed())
+			LogoutTracker::add(getNetworkId());
+		else
+		{
+			virtualOnLogout();
+
+			if (ConfigServerGame::getLogoutTriggerEnabled())
+			{
+				ScriptParams params;
+				getScriptObject()->trigAllScripts(Scripting::TRIG_LOGOUT, params);
+			}
+
+			Client * const client = getClient();
+			if (client)
+			{
+				LogoutMessage const logoutMessage;
+				client->send(logoutMessage, true);
+			}
+
+			PositionUpdateTracker::flushPositionUpdate(*this);
+			LogoutTracker::addPendingSave(this);
+
+			// get rid of the proxies
+			clearProxyList();
+
+			// if we're inside a container, it's the topmost parent that contains our proxy
+			// list, so the above clearProxyList() call will not get rid of the proxies
+			synchronizationOnUnload();
+
+			// don't allow anyone to continue observing this object (and associated PlayerObject)
+			if (playerObject)
+				ObserveTracker::onObjectDestroyed(*playerObject, false);
+
+			ObserveTracker::onObjectDestroyed(*this, false);
+
+			// remove from world and/or container as necessary but keep containment information available
+			if (isInWorld())
+				removeFromWorld();
+			else
+				WARNING(getTriggerVolumeEntered() && !getTriggerVolumeEntered()->empty(), ("ServerObject::handleDisconnect called for (%s) which is not in the world but is contained in one or more trigger volumes", getDebugInformation().c_str()));
+
+			// the object should have been removed from all TriggerVolumes
+			// (from removeFromWorld() above) by now, but as a safety measure,
+			// we'll do a final check and remove the object from any
+			// TriggerVolumes that it is still in
+			if (getTriggerVolumeEntered())
+			{
+				std::set<TriggerVolume *> const triggerVolumeEntered = *(getTriggerVolumeEntered());
+				for (std::set<TriggerVolume *>::const_iterator i = triggerVolumeEntered.begin(); i != triggerVolumeEntered.end(); ++i)
+				{
+					WARNING(true, ("Object (%s) added to LogoutTracker but hasn't been removed from TriggerVolume (%s) owned by (%s)",
+						getDebugInformation().c_str(),
+						(*i)->getName().c_str(),
+						(*i)->getOwner().getDebugInformation().c_str()));
+
+					(*i)->removeObject(*this);
+				}
+			}
+
+			Object *containerObject = ContainerInterface::getContainedByObject(*this);
+			if (containerObject)
+			{
+				NON_NULL(ContainerInterface::getContainer(*containerObject))->internalItemRemoved(*this);
+
+				// if the character was in a building, tell the building it has lost
+				// the player so the building demand load/unload system can work correctly
+				Object *buildingObj = ContainerInterface::getTopmostContainer(*containerObject);
+				if (buildingObj && buildingObj->isAuthoritative() && buildingObj->asServerObject() && buildingObj->asServerObject()->asBuildingObject())
+					buildingObj->asServerObject()->asBuildingObject()->lostPlayer(*this);
+			}
+
+			// remove all sui pages for character
+			ServerUIManager::onPlayerLogout(getNetworkId());
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setAttributeAttained(int attribute)
+{
+	BitArray tmp(m_attributesAttained.get());
+	tmp.setBit(attribute);
+	m_attributesAttained = tmp;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::clearAttributeAttained(int attribute)
+{
+	BitArray tmp(m_attributesAttained.get());
+	tmp.clearBit(attribute);
+	m_attributesAttained = tmp;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::hasAttributeAttained(int attribute) const
+{
+	return m_attributesAttained.get().testBit(attribute);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setAttributeInterested(int attribute)
+{
+	BitArray tmp(m_attributesInterested.get());
+	tmp.setBit(attribute);
+	m_attributesInterested = tmp;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::clearAttributeInterested(int attribute)
+{
+	BitArray tmp(m_attributesInterested.get());
+	tmp.clearBit(attribute);
+	m_attributesInterested = tmp;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::hasAttributeInterest(int attribute) const
+{
+	return m_attributesInterested.get().testBit(attribute);
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::isInterested(const ServerObject &rhs) const
+{
+	return m_attributesInterested.get().matchAnyBit(rhs.m_attributesAttained.get());
+}
+
+// ----------------------------------------------------------------------
+
+std::string ServerObject::getItemLog() const
+{
+	return getNetworkId().getValueString() + ' ' + Unicode::wideToNarrow(getObjectName());
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::checkAndLogInvalidTransform() const
+{
+	Transform const &transform_o2p = getTransform_o2p();
+	bool const isValid = transform_o2p.validate(true);
+
+	if (!isValid)
+	{
+		Object const *const container  = ContainerInterface::getContainedByObject(*this);
+		Vector const position          = transform_o2p.getPosition_p();
+		Vector const containerPosition = container ? container->getTransform_o2w().getPosition_p() : Vector::zero;
+
+		WARNING(!isValid,
+			("transform is invalid for object id=[%s], object template name=[%s], server id=[%d], server scene id=[%s], position=[%.2f,%.2f,%.2f], container id=[%s], container position=[%.2f,%.2f,%.2f]",
+			getNetworkId().getValueString().c_str(),
+			getObjectTemplateName(),
+			static_cast<int>(GameServer::getInstance().getProcessId()),
+			ServerWorld::getSceneId().c_str(),
+			position.x,
+			position.y,
+			position.z,
+			container ? container->getNetworkId().getValueString().c_str() : "<not contained>",
+			containerPosition.x,
+			containerPosition.y,
+			containerPosition.z
+			));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+ServerObject * ServerObject::combineResourceContainers(ServerObject &item)
+{
+	if (isVendor() || isBazaarTerminal() || isInBazaarOrVendor() )
+	{
+		//Do not combine resources on vendors or bazaars, as they need
+		//to remain separate to sell separately.
+		return &item;
+	}
+
+	ServerObject * returnedItem = &item;
+	typedef std::vector<ResourceContainerObject *> SimilarContainers;
+	static SimilarContainers similarContainers;
+
+	if (item.getObjectType() == ServerResourceContainerObjectTemplate::ServerResourceContainerObjectTemplate_tag)
+	{
+		ResourceContainerObject *resourceContainerObject = safe_cast<ResourceContainerObject *>(&item);
+
+		if (resourceContainerObject != NULL)
+		{
+			// If this is a container, see if it contains another resource container of the same type
+
+			Container *container = ContainerInterface::getContainer(*this);
+
+			if (container != NULL)
+			{
+				ContainerIterator iterContainer = container->begin();
+
+				for (; iterContainer != container->end(); ++iterContainer)
+				{
+					Object *containedObject = NetworkIdManager::getObjectById(*iterContainer);
+
+					// Make sure the contained item is not the item we are gaining and that
+					// the item is a resource container
+
+					if ((containedObject != &item) &&
+					    (containedObject != NULL) &&
+					    (containedObject->getObjectType() == ServerResourceContainerObjectTemplate::ServerResourceContainerObjectTemplate_tag))
+					{
+						ResourceContainerObject *containedResourceContainerObject = safe_cast<ResourceContainerObject *>(containedObject);
+
+						if ((containedResourceContainerObject != NULL) &&
+						    (resourceContainerObject->getResourceType() == containedResourceContainerObject->getResourceType()))
+						{
+							// This is a container of similar type, if it is not full, save it to the list
+
+							int const quantity = containedResourceContainerObject->getQuantity();
+							int const maxQuantity = containedResourceContainerObject->getMaxQuantity();
+
+							if (quantity != maxQuantity)
+							{
+								similarContainers.push_back(containedResourceContainerObject);
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// Combine the resources as much as possible
+
+		bool done = false;
+		int resourcesLeftToAdd = resourceContainerObject->getQuantity();
+
+		while (!done)
+		{
+			// Find the most full container
+
+			SimilarContainers::iterator iterSimilarContainers = similarContainers.begin();
+			SimilarContainers::iterator fullestContainer = similarContainers.end();
+
+			for (; iterSimilarContainers != similarContainers.end(); ++iterSimilarContainers)
+			{
+				if (fullestContainer == similarContainers.end())
+				{
+					fullestContainer = iterSimilarContainers;
+				}
+				else
+				{
+					int const currentQuantity = (*iterSimilarContainers)->getQuantity();
+					int const fullestQuantity = (*fullestContainer)->getQuantity();
+
+					if (currentQuantity > fullestQuantity)
+					{
+						fullestContainer = iterSimilarContainers;
+					}
+				}
+			}
+
+			// Add as much as we can to the fullest container
+
+			if (fullestContainer != similarContainers.end())
+			{
+				int const fullestQuantity = (*fullestContainer)->getQuantity();
+				int const fullestMaxQuantity = (*fullestContainer)->getMaxQuantity();
+				int const amountToAdd = std::min(resourcesLeftToAdd, fullestMaxQuantity - fullestQuantity);
+
+				// Add the amount to the fullest container
+
+				ResourceContainerObject *sourceObj = resourceContainerObject;
+				ResourceContainerObject *destObj = *fullestContainer;
+
+				if (sourceObj && destObj && (amountToAdd > 0))
+				{
+					sourceObj->transferTo(*destObj, amountToAdd);
+					if (sourceObj->isBeingDestroyed())
+						returnedItem = destObj;
+				}
+
+				resourcesLeftToAdd -= amountToAdd;
+
+				// Remove this container from the list
+
+				similarContainers.erase(fullestContainer);
+			}
+			else
+			{
+				// There are no more containers to combine to, so we are done
+
+				done = true;
+			}
+
+			if (resourcesLeftToAdd <= 0)
+			{
+				// If there is no more resources left to combine, then we are done
+
+				done = true;
+			}
+		}
+
+		similarContainers.clear();
+	}
+	return returnedItem;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Determines if this object is contained by another object.
+ *
+ * @param container			the object that might contain this one
+ * @param includeContents	if true, return true if one of the container's contents contains us
+ *
+ * @return true if we are contained by the container (or its contents)
+ */
+bool ServerObject::isContainedBy(const ServerObject & container, bool includeContents) const
+{
+	// we actually check what we are contained by instead of checking the
+	// container's contents
+	const Object * test = ContainerInterface::getContainedByObject(*this);
+	if (test == &container)
+	{
+		// our container is the desired container
+		return true;
+	}
+	else if (test != NULL && test != this && includeContents)
+	{
+		// our container isn't the desired container, see if it is contained
+		return safe_cast<const ServerObject *>(test)->isContainedBy(container, true);
+	}
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::concludeScriptVars()
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerObject::concludeScriptVars");
+	GameScriptObject::packAllScriptVarDeltas();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::scheduleForAlter()
+{
+	// ServerObjects do not recurse into containers, so are always responsible for scheduling themselves directly.
+	if (isInitialized())
+	{
+//		DEBUG_REPORT_LOG(true, ("[aitest] Scheduling %s for alter\n", getNetworkId().getValueString().c_str()));
+		AlterScheduler::submitForAlter(*this);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::onAddedToWorldCell()
+{
+	createFarNetworkUpdateVolume();
+	virtualOnAddedToWorldCell();
+	updatePositionOnPlanetServer(true);
+}
+
+
+// ----------------------------------------------------------------------
+
+void ServerObject::virtualOnAddedToWorldCell()
+{
+}
+
+//------------------------------------------------------------------------------------------
+
+void ServerObject::onRemovedFromWorldCell()
+{
+	virtualOnRemovedFromWorldCell();
+}
+
+//------------------------------------------------------------------------------------------
+
+void ServerObject::virtualOnRemovedFromWorldCell()
+{
+	destroyFarNetworkUpdateVolume();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::virtualOnSetAuthority()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::virtualOnReleaseAuthority()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::virtualOnLogout()
+{
+}
+
+//------------------------------------------------------------------------------------------
+
+bool ServerObject::wantSawAttackTriggers() const
+{
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setTeleportScriptCallback(std::string const &scriptCallback)
+{
+	setObjVarItem("teleportFixup.callback", scriptCallback);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setInteriorTeleportDestination(NetworkId const &destContainerId, std::string const &destCellName, Vector const &destPosition_p)
+{
+	LOG("TeleportFixup", ("Setting interior telerport destination for %s: into %f %f %f %s %s\n", getNetworkId().getValueString().c_str(), destPosition_p.x, destPosition_p.y, destPosition_p.z, destCellName.c_str(), destContainerId.getValueString().c_str()));
+	removeObjVarItem("teleportFixup");
+	setObjVarItem("teleportFixup.x", destPosition_p.x);
+	setObjVarItem("teleportFixup.y", destPosition_p.y);
+	setObjVarItem("teleportFixup.z", destPosition_p.z);
+	setObjVarItem("teleportFixup.container", destContainerId);
+	if (!destCellName.empty())
+		setObjVarItem("teleportFixup.cellname", destCellName);
+}
+
+// ----------------------------------------------------------------------
+
+Vector const &ServerObject::getTriggerPosition() const
+{
+	return m_oldPosition;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::getTransformChanged() const
+{
+	return getLocalFlag(LocalObjectFlags::ServerObject_TransformChanged);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setTransformChanged(bool c)
+{
+	setLocalFlag(LocalObjectFlags::ServerObject_TransformChanged, c);
+	if (c)
+	{
+		addObjectToConcludeList();
+		if (isAuthoritative() && isPersisted())
+			PositionUpdateTracker::positionChanged(*this);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::onContainerChildAboutToLoseItem(ServerObject * destination, ServerObject& item, ServerObject* transferer)
+{
+	if (transferer && !checkBankTransfer(this, item, transferer))
+		return false;
+
+	Object * const parent = ContainerInterface::getContainedByObject(*this);
+	if (parent && parent->asServerObject())
+		return parent->asServerObject()->onContainerChildAboutToLoseItem(destination, item, transferer);
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::onContainerChildAboutToGainItem(ServerObject& item, ServerObject* destination, ServerObject* transferer)
+{
+	if (transferer && !checkBankTransfer(this, item, transferer))
+		return false;
+
+	Object * const parent = ContainerInterface::getContainedByObject(*this);
+	if (parent && parent->asServerObject())
+		return parent->asServerObject()->onContainerChildAboutToGainItem(item, destination, transferer);
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::onContainerChildLostItem(ServerObject * destination, ServerObject& item, ServerObject* source, ServerObject* transferer)
+{
+	Object * const parent = ContainerInterface::getContainedByObject(*this);
+	if (parent && parent->asServerObject())
+		parent->asServerObject()->onContainerChildLostItem(destination, item, source, transferer);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::onContainerChildGainItem(ServerObject& item, ServerObject* source, ServerObject* transferer)
+{
+	Object * const parent = ContainerInterface::getContainedByObject(*this);
+	if (parent && parent->asServerObject())
+		parent->asServerObject()->onContainerChildGainItem(item, source, transferer);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setLoadCTSBank(bool isForCTS)
+{
+	m_loadCTSBank = isForCTS;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setLoadCTSPackedHouses(bool isForCTS)
+{
+	m_loadCTSPackedHouses = isForCTS;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::getLoadCTSBank() const
+{
+	return m_loadCTSBank;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::getLoadCTSPackedHouses() const
+{
+	return m_loadCTSPackedHouses;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::packedHouseLoaded()
+{
+	// see if we have the objvar
+	if (getLoadCTSPackedHouses())
+	{
+		if (getObjVars().hasItem("cts.packed_house_count"))
+		{
+			int count = 0;
+			if (getObjVars().getItem("cts.packed_house_count", count))
+			{
+				--count;
+				if (count <= 0)
+				{
+					LOG("CustomerService", ("CharacterTransfer: all houses loaded, responding to connection server."));
+					removeObjVarItem("cts.packed_house_count");
+
+					// tell the connection server.
+					Client * client = getClient();
+					if (client && client->getConnection())
+					{
+						GenericValueTypeMessage <NetworkId> loadedMsg("PackedHousesLoaded", getNetworkId());
+						client->getConnection()->send(loadedMsg, true);
+					}
+				}
+				else
+				{
+					LOG("CustomerService", ("CharacterTransfer: packed house is loaded, but we expect %d more.", count));
+					setObjVarItem("cts.packed_house_count", count);
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setLoadWith(const NetworkId& id)
+{
+	m_loadWith = id;
+}
+
+//-----------------------------------------------------------------------
+
+std::string ServerObject::getLogDescription(const NetworkId & id)
+{
+	std::string const result = getLogDescription(safe_cast<ServerObject *>(NetworkIdManager::getObjectById(id)));
+	if (result.empty())
+		return id.getValueString();
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+std::string ServerObject::getLogDescription(const ServerObject * source)
+{
+	std::string desc = "";
+	if(source)
+	{
+		desc += "NonPlayerObject ";
+		desc += Unicode::wideToNarrow(source->getObjectName());
+		desc += "(";
+		desc += source->getNetworkId().getValueString();
+		desc += ") ";
+		desc += source->getObjectTemplateName();
+	}
+	return desc;
+}
+
+//----------------------------------------------------------------------
+
+void ServerObject::retrieveStoredObjectAttributes (AttributeVector & av) const
+{
+	typedef stdvector<Unicode::String>::fwd UnicodeStringVector;
+
+	static UnicodeStringVector kv;
+	static UnicodeStringVector vv;
+
+	kv.clear ();
+	vv.clear ();
+
+	getObjVars ().getItem (objvar_item_attribute_keys,   kv);
+	getObjVars ().getItem (objvar_item_attribute_values, vv);
+
+	if (kv.size () == vv.size ())
+	{
+		const size_t size = vv.size ();
+
+		av.reserve (av.size () + kv.size ());
+
+		for (size_t i = 0; i < size; ++i)
+		{
+			const std::string & key       = Unicode::wideToNarrow (kv [i]);
+			const Unicode::String & value = vv [i];
+
+			av.push_back (std::make_pair (key, value));
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ServerObject::storeObjectAttributes     (const ServerObject & prototype)
+{
+	typedef stdvector<Unicode::String>::fwd UnicodeStringVector;
+
+	static UnicodeStringVector kv;
+	static UnicodeStringVector vv;
+	static AttributeVector     av;
+
+	av.clear ();
+	kv.clear ();
+	vv.clear ();
+
+	prototype.getAttributes (NetworkId::cms_invalid, av);
+
+	kv.reserve (av.size());
+	vv.reserve (av.size());
+
+	for (AttributeVector::const_iterator it = av.begin (); it != av.end (); ++it)
+	{
+		const std::string & key       = (*it).first;
+		const Unicode::String & value = (*it).second;
+
+		kv.push_back (Unicode::narrowToWide (key));
+		vv.push_back (value);
+	}
+
+	setObjVarItem (objvar_item_attribute_keys,   kv);
+	setObjVarItem (objvar_item_attribute_values, vv);
+}
+
+//----------------------------------------------------------------------
+
+void ServerObject::clearStoredObjectAttributes    ()
+{
+	m_objVars.removeItemByName (objvar_item_attribute_keys);
+	m_objVars.removeItemByName (objvar_item_attribute_values);
+}
+
+//----------------------------------------------------------------------
+
+void ServerObject::replaceStoredObjectAttribute(Unicode::String const & attribute, Unicode::String const & value)
+{
+	typedef stdvector<Unicode::String>::fwd UnicodeStringVector;
+
+	static UnicodeStringVector kv;
+	static UnicodeStringVector vv;
+
+	kv.clear ();
+	vv.clear ();
+
+	getObjVars ().getItem (objvar_item_attribute_keys,   kv);
+	getObjVars ().getItem (objvar_item_attribute_values, vv);
+
+	if (kv.size () == vv.size ())
+	{
+		const size_t size = vv.size ();
+		for (size_t i = 0; i < size; ++i)
+		{
+			if (kv [i] == attribute)
+			{
+				vv [i] = value;
+				setObjVarItem (objvar_item_attribute_values, vv);
+
+				break;
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setInitialized(bool initialized)
+{
+	setLocalFlag(LocalObjectFlags::ServerObject_Initialized, initialized);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setBeingDestroyed(bool beingDestroyed)
+{
+	setLocalFlag(LocalObjectFlags::ServerObject_BeingDestroyed, beingDestroyed);
+
+	// set corresponding flag in script
+	if (beingDestroyed && isAuthoritative() && getScriptObject())
+		getScriptObject()->setOwnerDestroyed();
+
+	// stop listening to broadcast messages
+	if (beingDestroyed && isAuthoritative())
+		stopListeningToAllBroadcastMessages();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setPlacing(bool placing)
+{
+	setLocalFlag(LocalObjectFlags::ServerObject_Placing, placing);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setUnloading(bool unloading)
+{
+	setLocalFlag(LocalObjectFlags::ServerObject_Unloading, unloading);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setGoingToConclude(bool goingToConclude)
+{
+	setLocalFlag(LocalObjectFlags::ServerObject_GoingToConclude, goingToConclude);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setInEndBaselines(bool inEndBaselines)
+{
+	setLocalFlag(LocalObjectFlags::ServerObject_InEndBaselines, inEndBaselines);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setNeedsPobFixup(bool needsFixup)
+{
+	setLocalFlag(LocalObjectFlags::ServerObject_NeedsPobFixup, needsFixup);
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::isInitialized() const
+{
+	return getLocalFlag(LocalObjectFlags::ServerObject_Initialized);
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::isPlacing() const
+{
+	return getLocalFlag(LocalObjectFlags::ServerObject_Placing);
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::isUnloading() const
+{
+	return getLocalFlag(LocalObjectFlags::ServerObject_Unloading);
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::isBeingDestroyed() const
+{
+	return getLocalFlag(LocalObjectFlags::ServerObject_BeingDestroyed);
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::isGoingToConclude() const
+{
+	return getLocalFlag(LocalObjectFlags::ServerObject_GoingToConclude);
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::isInEndBaselines() const
+{
+	return getLocalFlag(LocalObjectFlags::ServerObject_InEndBaselines);
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::isNeedingPobFixup() const
+{
+	return getLocalFlag(LocalObjectFlags::ServerObject_NeedsPobFixup);
+}
+
+// ----------------------------------------------------------------------
+
+float ServerObject::getLocationReservationRadius() const
+{
+	return getSharedTemplate() ? getSharedTemplate()->getLocationReservationRadius() : 0.f;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::sendDirtyObjectMenuNotification()
+{
+	if (getLocalFlag(LocalObjectFlags::ServerObject_DirtyObjectMenuSent))
+		return;
+	setLocalFlag(LocalObjectFlags::ServerObject_DirtyObjectMenuSent, true);
+
+	Controller * const controller = getController();
+	if (controller)
+		controller->appendMessage(CM_objectMenuDirty, 0, NULL, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_ALL_CLIENT);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::sendDirtyAttributesNotification()
+{
+	if (getLocalFlag(LocalObjectFlags::ServerObject_DirtyAttributesSent))
+		return;
+	setLocalFlag(LocalObjectFlags::ServerObject_DirtyAttributesSent, true);
+
+	Controller * const controller = getController();
+	if (controller)
+		controller->appendMessage(CM_attributesDirty, 0, NULL, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_ALL_CLIENT);
+}
+
+//------------------------------------------------------------------------------------------
+
+void ServerObject::setBuildingUpdateRadiusMultiplier(float m)
+{
+	if (m <= 0)
+	{
+		ms_buildingUpdateRadiusMultiplier = 1.0f;
+		DEBUG_WARNING(true, ("Building Update Radius Multiplier was set to a value (%f) <= 0", m));
+	}
+	else
+		ms_buildingUpdateRadiusMultiplier = m;
+
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::triggerMadeAuthoritative()
+{
+	std::vector<CachedNetworkId> trigObjs;
+	getPlayerControlledContents(*this, trigObjs);
+	for (std::vector<CachedNetworkId>::const_iterator i = trigObjs.begin(); i != trigObjs.end(); ++i)
+	{
+		ServerObject *trigObj = safe_cast<ServerObject *>((*i).getObject());
+		if (trigObj && trigObj->isAuthoritative())
+		{
+			ScriptParams params;
+			IGNORE_RETURN(trigObj->getScriptObject()->trigAllScripts(Scripting::TRIG_MADE_AUTHORITATIVE, params));
+		}
+	}
+}
+
+//------------------------------------------------------------------------------------------
+
+void ServerObject::setLayer(TerrainGenerator::Layer* layer)
+{
+	LayerProperty * layerProperty = NULL;
+	Property * property = getProperty(LayerProperty::getClassPropertyId());
+	if (property != NULL)
+		layerProperty = safe_cast<LayerProperty *>(property);
+	else
+		layerProperty = new LayerProperty(*this);
+
+	layerProperty->setLayer(layer);
+	if (property == NULL)
+	{
+		addProperty(*layerProperty, true);
+		ObjectTracker::addRunTimeRule();
+		addNotification (ServerObjectTerrainModificationNotification::getInstance ());
+	}
+}
+
+//------------------------------------------------------------------------------------------
+
+TerrainGenerator::Layer* ServerObject::getLayer() const
+{
+	const Property * property = getProperty(LayerProperty::getClassPropertyId());
+	if (property != NULL)
+	{
+		const LayerProperty * layerProperty = safe_cast<const LayerProperty *>(property);
+		return layerProperty->getLayer();
+	}
+	return NULL;
+}
+
+//------------------------------------------------------------------------------------------
+
+void ServerObject::getByteStreamFromAutoVariable(const std::string & name, Archive::ByteStream & target) const
+{
+	if(name == "complexity")
+	{
+		m_complexity.pack(target);
+	}
+	else if(name == "bankBalance")
+	{
+		m_bankBalance.pack(target);
+	}
+}
+
+//------------------------------------------------------------------------------------------
+
+void ServerObject::setAutoVariableFromByteStream(const std::string & name, const Archive::ByteStream & source)
+{
+	Archive::ReadIterator ri(source);
+	if(name == "complexity")
+	{
+		m_complexity.unpackDelta(ri);
+	}
+	else if(name == "bankBalance")
+	{
+		m_bankBalance.unpackDelta(ri);
+	}
+	addObjectToConcludeList();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Deliver a MessageTo to this object.  If the object is not
+ * authoritative, send the message to the authoritative server.
+ * If the MessageTo's time has expired, handle it.  If not, enqueue it
+ * for later.
+ */
+void ServerObject::deliverMessageTo(MessageToPayload & message)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerObject::deliverMessageTo");
+		
+	if (message.getRecurringTime() != 0)
+	{
+		// Recurring messages can have only one instance each.  Ignore
+		// this message if there is already a recurring one with the same method name.
+		for (Archive::AutoDeltaMap<std::pair<std::pair<unsigned long, uint64>, MessageToId>, MessageToPayload>::const_iterator i=m_messageTos.begin(); i!=m_messageTos.end(); ++i)
+		{
+			if ((i->second.getRecurringTime() != 0) && (i->second.getMethod() == message.getMethod()))
+				return;
+		}
+	}
+	
+	if (isAuthoritative())
+	{
+		if (message.getCallTime() <= MessageToQueue::getInstance().getEffectiveMessageToTime())
+		{
+			// Message is already due, handle it right away
+			handleMessageTo(message);
+		}
+		else
+		{
+			if (isPersisted() && message.getGuaranteed() && !message.getPersisted())
+			{
+				// Message is guaranteed.  Since it's being delayed, make sure the DB saves it
+				// in case of a server crash
+				message.setPersisted(true);
+				MessageToMessage const msg(message, GameServer::getInstance().getProcessId());
+				GameServer::getInstance().sendToDatabaseServer(msg);	
+			}
+			if (m_messageTos.empty() || message.getCallTime() < m_messageTos.begin()->second.getCallTime())
+				MessageToQueue::getInstance().addToScheduler(*this, message.getCallTime());
+			pushMessageTo(message);
+		}
+	}
+	else
+	{
+		message.addBounceServer(GameServer::getInstance().getProcessId());
+		ServerMessageForwarding::begin(getAuthServerProcessId());
+		ServerMessageForwarding::send(MessageToMessage(message, GameServer::getInstance().getProcessId()));
+		ServerMessageForwarding::end();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Add a MessageTo to the sorted vector of pending messages
+ *
+ * Does a binary search to find the appropriate insertion point.
+ */
+void ServerObject::pushMessageTo(MessageToPayload const & newMessage)
+{
+	m_messageTos.set(std::make_pair(std::make_pair(newMessage.getCallTime(), newMessage.getCounterMessageToPayload()), newMessage.getMessageId()), newMessage);
+}
+
+// ----------------------------------------------------------------------
+
+int ServerObject::cancelMessageTo(std::string const & messageName)
+{
+	int removeCount;
+
+	if (isAuthoritative())
+	{
+		removeCount = 0;
+
+		for (Archive::AutoDeltaMap<std::pair<std::pair<unsigned long, uint64>, MessageToId>, MessageToPayload>::const_iterator i=m_messageTos.begin(); i!=m_messageTos.end();)
+		{
+			if ((i->second.getMethod() == messageName) && (i->first != s_currentMessageToBeingHandled))
+			{
+				i = m_messageTos.erase(i);
+				++removeCount;
+			}
+			else
+				++i;
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(
+			CM_cancelMessageTo,
+			new MessageQueueGenericValueType<std::string>(messageName));
+
+		// -1 means request has been forward to authoritative server for processing
+		removeCount = -1;
+	}
+
+	return removeCount;
+}
+
+// ----------------------------------------------------------------------
+
+int ServerObject::cancelMessageToByMessageId(NetworkId const & messageId)
+{
+	int removeCount;
+
+	if (isAuthoritative())
+	{
+		removeCount = 0;
+
+		for (Archive::AutoDeltaMap<std::pair<std::pair<unsigned long, uint64>, MessageToId>, MessageToPayload>::const_iterator i=m_messageTos.begin(); i!=m_messageTos.end();)
+		{
+			if ((i->second.getMessageId() == messageId) && (i->first != s_currentMessageToBeingHandled))
+			{
+				i = m_messageTos.erase(i);
+				++removeCount;
+				break;
+			}
+			else
+				++i;
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(
+			CM_cancelMessageTo,
+			new MessageQueueGenericValueType<std::string>(messageId.getValueString()));
+
+		// -1 means request has been forward to authoritative server for processing
+		removeCount = -1;
+	}
+
+	return removeCount;
+}
+
+// ----------------------------------------------------------------------
+// returns the number of seconds until the messageTo fires, which *CAN* be 0
+// returns -1 if object doesn't have the messageTo
+int ServerObject::timeUntilMessageTo(std::string const & messageName) const
+{
+	for (Archive::AutoDeltaMap<std::pair<std::pair<unsigned long, uint64>, MessageToId>, MessageToPayload>::const_iterator i=m_messageTos.begin(); i!=m_messageTos.end(); ++i)
+	{
+		if (i->second.getMethod() == messageName)
+		{
+			if ((i->first != s_currentMessageToBeingHandled) || (i->second.getRecurringTime() > 0))
+			{
+				unsigned long const now = ServerClock::getInstance().getGameTimeSeconds();
+				unsigned long const callTime = i->second.getCallTime();
+				if (callTime > now)
+					return static_cast<int>(callTime - now);
+
+				return 0;
+			}
+		}
+	}
+
+	return -1; // doesn't have the messageTo
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sets the root node for a patrol path node.
+ *
+ * @param root		the root node
+ *
+ * NOTE: Does not work multiserver!
+ */
+void ServerObject::setPatrolPathRoot(const ServerObject & root)
+{
+	if (!isAuthoritative())
+	{
+		WARNING(true, ("ServerObject::setPatrolPathRoot called on non-authoritative object %s for %s",
+			getNetworkId().getValueString().c_str(), root.getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	// make sure we aren't already a root node
+	Property * p = getProperty(PatrolPathRootProperty::getClassPropertyId());
+	if (p != NULL)
+	{
+		if (root.getNetworkId() != getNetworkId())
+		{
+			WARNING(true, ("ServerObject::setPatrolPathRoot trying to set root node %s on node %s that is already a root",
+				root.getNetworkId().getValueString().c_str(), getNetworkId().getValueString().c_str()));
+		}
+		return;
+	}
+
+	// see if we are going to be the root node
+	if (root.getNetworkId() == getNetworkId())
+	{
+		p = new PatrolPathRootProperty(*this);
+		addProperty(*p, true);
+	}
+	else
+	{
+		// add the root node to our node list
+		p = getProperty(PatrolPathNodeProperty::getClassPropertyId());
+		if (p == NULL)
+		{
+			p = new PatrolPathNodeProperty(*this);
+			addProperty(*p, true);
+		}
+		else if (safe_cast<PatrolPathNodeProperty *>(p)->hasRoot(root))
+			return;
+		safe_cast<PatrolPathNodeProperty *>(p)->addRoot(root);
+
+		if (!root.isPatrolPathRoot())
+		{
+			// the root has not been set up, do it now
+			WARNING(true, ("ServerObject::setPatrolPathRoot for node %s: root node %s was not initialized, doing it now (THIS SHOULD NEVER HAPPEN)",
+				getNetworkId().getValueString().c_str(), root.getNetworkId().getValueString().c_str()));
+			const_cast<ServerObject &>(root).setPatrolPathRoot(root);
+		}
+	}
+
+	// we need to add any players in range to our path observer count
+	TriggerVolume * triggerVolume = getNetworkTriggerVolume();
+	if (triggerVolume != NULL)
+	{
+		TriggerVolume::ContentsSet const & contents = triggerVolume->getContents();
+		for (TriggerVolume::ContentsSet::const_iterator i = contents.begin(); i != contents.end(); ++i)
+		{
+			if (*i != NULL)
+			{
+				Client * client = (*i)->getClient();
+				if (client != NULL)
+				{
+					if (!ObserveTracker::isObserving(*client, *this))
+						ObserveTracker::onClientEnteredNetworkTriggerVolume(*client, *triggerVolume);
+					else
+					{
+						// note: we call addPatrolPathObserver() on the root instead of us so 
+						// that we don't update the count of any paths we already belong to
+						const_cast<ServerObject &>(root).addPatrolPathObserver();
+					}
+				}
+			}
+		}
+	}
+}	// ServerObject::setPatrolPathRoot
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the root node for a patrol path node.
+ *
+ * @return the root node, or NULL if this isn't a patrol path node
+ */
+const std::set<CachedNetworkId> & ServerObject::getPatrolPathRoots() const
+{
+static const std::set<CachedNetworkId> noRoots;
+
+	const Property * p = getProperty(PatrolPathNodeProperty::getClassPropertyId());
+	if (p != NULL)
+	{
+		return safe_cast<const PatrolPathNodeProperty *>(p)->getRoots();
+	}
+	return noRoots;
+}	// ServerObject::getPatrolPathRoot
+
+// ----------------------------------------------------------------------
+
+/**
+ * Adds an object that is moving along a patrol path where this object is the 
+ * root node. If our path goes from being unobserved to observed, all the objects 
+ * using this path will be scheduled for alter.
+ * 
+ * @param ai	the object that's on our path
+ *
+ * NOTE: Does not work multiserver!
+ */
+void ServerObject::addPatrolPathingObject(const ServerObject & ai)
+{
+	if (!isAuthoritative())
+	{
+		WARNING(true, ("ServerObject::addPatrolPathingObject called on non-authoritative object %s for %s",
+			getNetworkId().getValueString().c_str(), ai.getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	Property * p = getProperty(PatrolPathRootProperty::getClassPropertyId());
+	if (p != NULL)
+	{
+		safe_cast<PatrolPathRootProperty *>(p)->addPatrollingObject(ai);
+		DEBUG_REPORT_LOG(true, ("[patrolpath] add patrol ai %s to root %s\n", 
+			ai.getNetworkId().getValueString().c_str(),
+			getNetworkId().getValueString().c_str()));
+	}
+	else
+	{
+		// if we are not a root, try to add the ai to our root (but only do so if we have
+		// one root)
+		DEBUG_WARNING(true, ("ServerObject::addPatrolPathingObject trying to add an ai %s to a non-root path node %s, going to use our root",
+			ai.getNetworkId().getValueString().c_str(), getNetworkId().getValueString().c_str()));
+		const std::set<CachedNetworkId> & roots = getPatrolPathRoots();
+		if (roots.size() == 1)
+		{
+			ServerObject * root = safe_cast<ServerObject *>(roots.begin()->getObject());
+			if (root != NULL)
+				root->addPatrolPathingObject(ai);
+		}
+		else
+		{
+			WARNING(true, ("ServerObject::addPatrolPathingObject trying to add an ai %s to a non-root path node %s which has muliple roots.",
+				ai.getNetworkId().getValueString().c_str(), getNetworkId().getValueString().c_str()));
+		}
+	}
+}	// ServerObject::addPatrolPathingObject
+
+// ----------------------------------------------------------------------
+
+/**
+ * Removes an object that is moving along our patrol path.
+ *
+ * @param ai	the object to remove
+ *
+ * NOTE: Does not work multiserver!
+ */
+void ServerObject::removePatrolPathingObject(const ServerObject & ai)
+{
+	if (!isAuthoritative())
+	{
+		WARNING(true, ("ServerObject::removePatrolPathingObject called on non-authoritative object %s for %s",
+			getNetworkId().getValueString().c_str(), ai.getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	Property * p = getProperty(PatrolPathRootProperty::getClassPropertyId());
+	if (p != NULL)
+	{
+		safe_cast<PatrolPathRootProperty *>(p)->removePatrollingObject(ai);
+		DEBUG_REPORT_LOG(true, ("[patrolpath] remove patrol ai %s from root %s\n", 
+			ai.getNetworkId().getValueString().c_str(),
+			getNetworkId().getValueString().c_str()));
+	}
+	else
+	{
+		// if we are not a root, try to remove the ai to our root (but only do so if we have
+		// one root)
+		const std::set<CachedNetworkId> & roots = getPatrolPathRoots();
+		if (roots.size() == 1)
+		{
+			ServerObject * root = safe_cast<ServerObject *>(roots.begin()->getObject());
+			if (root != NULL)
+				root->removePatrolPathingObject(ai);
+		}
+		else
+		{
+			WARNING(true, ("ServerObject::removePatrolPathingObject trying to remove an ai %s from a non-root path node %s which has muliple roots.",
+				ai.getNetworkId().getValueString().c_str(), getNetworkId().getValueString().c_str()));
+		}
+	}
+}	// ServerObject::removePatrolPathingObject
+
+// ----------------------------------------------------------------------
+
+/**
+ * Increments the observer count for this patrol path. If this is the first observer,
+ * schedules any patrolling objects for alter.
+ *
+ * NOTE: Does not work multiserver!
+ */
+void ServerObject::addPatrolPathObserver()
+{
+	if (!isAuthoritative())
+	{
+		WARNING(true, ("ServerObject::addPatrolPathObserver called on non-authoritative object %s",
+			getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	// if we are a root node, increment our observer count
+	Property * p = getProperty(PatrolPathRootProperty::getClassPropertyId());
+	if (p != NULL)
+	{
+		PatrolPathRootProperty * pprp = safe_cast<PatrolPathRootProperty *>(p);
+		pprp->incrementObserverCount();
+		DEBUG_REPORT_LOG(true, ("[patrolpath] add observer to %s, count = %d\n", 
+			getNetworkId().getValueString().c_str(), pprp->getObserverCount()));
+		if (pprp->getObserverCount() == 1)
+		{
+			// we need to wake up hibernating ai
+			const std::set<ConstWatcher<ServerObject> > & ai = pprp->getPatrollingObjects();
+			for (std::set<ConstWatcher<ServerObject> >::const_iterator i = ai.begin(); i != ai.end(); ++i)
+			{
+				if (*i != NULL)
+				{
+					const ServerObject * ai = *i;
+					if (ai->getController()->asCreatureController() != NULL)
+					{
+						const CreatureController * controller = ai->getController()->asCreatureController();
+						if (controller->getHibernate())
+						{
+							DEBUG_REPORT_LOG(true, ("[patrolpath] path root %s waking up ai %s",
+								getNetworkId().getValueString().c_str(),
+								ai->getNetworkId().getValueString().c_str()));
+							const_cast<ServerObject *>(ai)->scheduleForAlter();
+						}
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+		// increment the count of the root nodes of any paths we belong to
+		const std::set<CachedNetworkId> & roots = getPatrolPathRoots();
+		for (std::set<CachedNetworkId>::const_iterator i = roots.begin(); i != roots.end(); ++i)
+		{
+			ServerObject * root = safe_cast<ServerObject *>(i->getObject());
+			if (root != NULL)
+			{
+				root->addPatrolPathObserver();
+			}
+		}
+	}	
+}	// ServerObject::addPatrolPathObserver
+
+// ----------------------------------------------------------------------
+
+/**
+ * Decrements the observer count for this patrol path.
+ *
+ * NOTE: Does not work multiserver!
+ */
+void ServerObject::removePatrolPathObserver()
+{
+	if (!isAuthoritative())
+	{
+		WARNING(true, ("ServerObject::removePatrolPathObserver called on non-authoritative object %s",
+			getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	// if we are a root node, decrement our observer count
+	Property * p = getProperty(PatrolPathRootProperty::getClassPropertyId());
+	if (p != NULL)
+	{
+		PatrolPathRootProperty * pprp = safe_cast<PatrolPathRootProperty *>(p);
+		pprp->decrementObserverCount();
+		DEBUG_REPORT_LOG(true, ("[patrolpath] remove observer from %s, count = %d\n", 
+			getNetworkId().getValueString().c_str(), pprp->getObserverCount()));
+		if (pprp->getObserverCount() < 0)
+		{
+			WARNING(true, ("ServerObject::removePatrolPathObserver %s has negative patrol path observer count of %d",
+				getNetworkId().getValueString().c_str(), pprp->getObserverCount()));
+		}
+	}
+	else
+	{
+		// decrement the count of the root nodes of any paths we belong to
+		const std::set<CachedNetworkId> & roots = getPatrolPathRoots();
+		for (std::set<CachedNetworkId>::const_iterator i = roots.begin(); i != roots.end(); ++i)
+		{
+			ServerObject * root = safe_cast<ServerObject *>(i->getObject());
+			if (root != NULL)
+			{
+				root->removePatrolPathObserver();
+			}
+		}
+	}
+}	// ServerObject::removePatrolPathObserver
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the number of observers of this patrol path. If this node connects to multiple
+ * roots, we will return the total for all paths it connects to.
+ *
+ * @return the observer count
+ */
+int ServerObject::getPatrolPathObservers() const
+{
+	int observers = 0;
+
+	const Property * p = getProperty(PatrolPathRootProperty::getClassPropertyId());
+	if (p != NULL)
+	{
+		observers = safe_cast<const PatrolPathRootProperty *>(p)->getObserverCount();
+	}
+	else
+	{	
+		const std::set<CachedNetworkId> & roots = getPatrolPathRoots();
+		for (std::set<CachedNetworkId>::const_iterator i = roots.begin(); i != roots.end(); ++i)
+		{
+			const ServerObject * root = safe_cast<const ServerObject *>(i->getObject());
+			if (root != NULL && root->isPatrolPathRoot())
+			{
+				observers += root->getPatrolPathObservers();
+			}
+		}
+	}
+	return observers;
+}	// ServerObject::getPatrolPathObservers
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::isPatrolPathNode() const
+{
+	return (getProperty(PatrolPathNodeProperty::getClassPropertyId()) != NULL) || isPatrolPathRoot();
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::isPatrolPathRoot() const
+{
+	return getProperty(PatrolPathRootProperty::getClassPropertyId()) != NULL;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::hasAttributeCaching() const
+{
+	// rls - if attribute caching breaks for an object, you can disable
+	// caching by returning false here.
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+int ServerObject::getAttributeRevision() const
+{
+	return m_objVars.getRevision();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setAttributeRevisionDirty()
+{
+	m_objVars.updateRevision();
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::getIncludeInBuildout() const
+{
+	return m_includeInBuildout.get();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setIncludeInBuildout( bool value )
+{
+	m_includeInBuildout = value;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setDescriptionStringId(const StringId & id)
+{
+	m_descriptionStringId.set(id);
+}
+
+// ----------------------------------------------------------------------
+
+StringId const & ServerObject::getDescriptionStringId()
+{
+	return m_descriptionStringId.get();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::addBroadcastListener(std::string const & messageName, NetworkId const & listener)
+{
+	if (!isAuthoritative())
+		return;
+
+	m_broadcastListeners.insert(std::make_pair(messageName, listener));
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::removeBroadcastListener(std::string const & messageName, NetworkId const & listener)
+{
+	if (!isAuthoritative())
+		return;
+
+	IGNORE_RETURN(m_broadcastListeners.erase(std::make_pair(messageName, listener)));
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::removeBroadcastListener(NetworkId const & listener)
+{
+	if (!isAuthoritative())
+		return;
+
+	for (BroadcastMap::const_iterator iter = m_broadcastListeners.begin(); iter != m_broadcastListeners.end();)
+	{
+		if (iter->second == listener)
+		{
+			// AutoDeltaSet's erase() will increment iter to point to the next item
+			m_broadcastListeners.erase(iter);
+		}
+		else
+		{
+			++iter;
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::addBroadcastBroadcaster(std::string const & messageName, NetworkId const & broadcaster)
+{
+	if (!isAuthoritative())
+		return;
+
+	m_broadcastBroadcasters.insert(std::make_pair(messageName, broadcaster));
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::removeBroadcastBroadcaster(std::string const & messageName, NetworkId const & broadcaster)
+{
+	if (!isAuthoritative())
+		return;
+
+	IGNORE_RETURN(m_broadcastBroadcasters.erase(std::make_pair(messageName, broadcaster)));
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::removeBroadcastAllBroadcasters()
+{
+	if (!isAuthoritative())
+		return;
+
+	m_broadcastBroadcasters.clear();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::listenToBroadcastMessage(std::string const & messageName, NetworkId const & broadcaster)
+{
+	if (messageName.empty() || !broadcaster.isValid())
+		return;
+
+	if (!isAuthoritative())
+	{
+		char buffer[128];
+		snprintf(buffer, sizeof(buffer)-1, "%s %s", messageName.c_str(), broadcaster.getValueString().c_str());
+		buffer[sizeof(buffer)-1] = '\0';
+		MessageToQueue::getInstance().sendMessageToC(getNetworkId(), "C++listenToBroadcastMessage", buffer, 0, false);
+	}
+	else
+	{
+		// need to send a message to the broadcaster if the broadcaster is not on this game server
+		ServerObject * objBroadcaster = ServerWorld::findObjectByNetworkId(broadcaster);
+		if (objBroadcaster && objBroadcaster->isAuthoritative())
+		{
+			// tell broadcaster that I want to listen
+			objBroadcaster->addBroadcastListener(messageName, getNetworkId());
+		}
+		else
+		{
+			char buffer[128];
+			snprintf(buffer, sizeof(buffer)-1, "%s %s", messageName.c_str(), getNetworkId().getValueString().c_str());
+			buffer[sizeof(buffer)-1] = '\0';
+			MessageToQueue::getInstance().sendMessageToC(broadcaster, "C++addBroadcastListener", buffer, 0, false);
+		}
+
+		// this object is now listening to the broadcaster
+		// @TODO: technically, we should have the remote broadcaster
+		// send a message back confirming that this object has
+		// been added to the broadcaster's listener list before
+		// we mark this object as listening to the broadcaster
+		addBroadcastBroadcaster(messageName, broadcaster);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::stopListeningToBroadcastMessage(std::string const & messageName, NetworkId const & broadcaster)
+{
+	if (messageName.empty() || !broadcaster.isValid())
+		return;
+
+	if (!isAuthoritative())
+	{
+		char buffer[128];
+		snprintf(buffer, sizeof(buffer)-1, "%s %s", messageName.c_str(), broadcaster.getValueString().c_str());
+		buffer[sizeof(buffer)-1] = '\0';
+		MessageToQueue::getInstance().sendMessageToC(getNetworkId(), "C++stopListeningToBroadcastMessage", buffer, 0, false);
+	}
+	else
+	{
+		// need to send a message to the broadcaster if the broadcaster is not on this game server
+		ServerObject * objBroadcaster = ServerWorld::findObjectByNetworkId(broadcaster);
+		if (objBroadcaster && objBroadcaster->isAuthoritative())
+		{
+			// tell broadcaster that I no longer want to listen
+			objBroadcaster->removeBroadcastListener(messageName, getNetworkId());
+		}
+		else
+		{
+			char buffer[128];
+			snprintf(buffer, sizeof(buffer)-1, "%s %s", messageName.c_str(), getNetworkId().getValueString().c_str());
+			buffer[sizeof(buffer)-1] = '\0';
+			MessageToQueue::getInstance().sendMessageToC(broadcaster, "C++removeBroadcastListener", buffer, 0, false);
+		}
+
+		// this object is no longer listening to the broadcaster
+		// @TODO: technically, we should have the remote broadcaster
+		// send a message back confirming that this object has
+		// been removed from the broadcaster's listener list before
+		// we mark this object as no longer listening to the broadcaster
+		removeBroadcastBroadcaster(messageName, broadcaster);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::stopListeningToAllBroadcastMessages()
+{
+	if (!isAuthoritative())
+	{
+		MessageToQueue::getInstance().sendMessageToC(getNetworkId(), "C++stopListeningToAllBroadcastMessage", "", 0, false);
+	}
+	else
+	{
+		// build list of all broadcasters this object is currently listening to
+		std::hash_set<NetworkId> broadcasters;
+		for (BroadcastMap::const_iterator iter = m_broadcastBroadcasters.begin(); iter != m_broadcastBroadcasters.end(); ++iter)
+			IGNORE_RETURN(broadcasters.insert(iter->second));
+
+		for (std::hash_set<NetworkId>::const_iterator iter2 = broadcasters.begin(); iter2 != broadcasters.end(); ++iter2)
+		{
+			// need to send a message to the broadcaster if the broadcaster is not on this game server
+			ServerObject * objBroadcaster = ServerWorld::findObjectByNetworkId(*iter2);
+			if (objBroadcaster && objBroadcaster->isAuthoritative())
+			{
+				// tell broadcaster that I no longer want to listen
+				objBroadcaster->removeBroadcastListener(getNetworkId());
+			}
+			else
+			{
+				char buffer[128];
+				snprintf(buffer, sizeof(buffer)-1, "%s", getNetworkId().getValueString().c_str());
+				buffer[sizeof(buffer)-1] = '\0';
+				MessageToQueue::getInstance().sendMessageToC(*iter2, "C++removeBroadcastListenerAllMessage", buffer, 0, false);
+			}
+		}
+
+		// this object is no longer listening to any broadcasters
+		// @TODO: technically, we should have the remote broadcaster
+		// send a message back confirming that this object has
+		// been removed from the broadcaster's listener list before
+		// we mark this object as no longer listening to the broadcaster
+		removeBroadcastAllBroadcasters();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::addObserver(Client * client)
+{
+	std::pair<std::set<Client *>::const_iterator, bool> result = m_observers.insert(client);
+	
+	if (result.second)
+	{
+		if (isAuthoritative())
+		{
+			m_observersCount = m_observersCount.get() + 1;
+		}
+		else
+		{
+			sendControllerMessageToAuthServer(CM_updateObserversCount, new MessageQueueGenericValueType<int>(1));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::removeObserver(Client * client)
+{
+	int erased = m_observers.erase(client);
+		
+	if (erased > 0)
+	{
+		if (isAuthoritative())
+		{
+			m_observersCount = m_observersCount.get() - erased;
+			if (m_observersCount.get() < 0)
+			{
+				WARNING(true, ("ServerObject::removeObserver for object %s has observer count of %d", getNetworkId().getValueString().c_str(), m_observersCount.get()));
+				m_observersCount = 0;
+			}
+		}
+		else
+		{
+			sendControllerMessageToAuthServer(CM_updateObserversCount, new MessageQueueGenericValueType<int>(-erased));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::clearObservers()
+{
+	int erased = m_observers.size();
+	m_observers.clear();
+
+	if (erased > 0)
+	{
+		if (isAuthoritative())
+		{
+			m_observersCount = m_observersCount.get() - erased;
+			if (m_observersCount.get() < 0)
+			{
+				WARNING(true, ("ServerObject::clearObservers for object %s has observer count of %d", getNetworkId().getValueString().c_str(), m_observersCount.get()));
+				m_observersCount = 0;
+			}
+		}
+		else
+		{
+			// if we aren't being deleted, send a controller message, otherwise send a messageTo
+			if (!getKill())
+				sendControllerMessageToAuthServer(CM_updateObserversCount, new MessageQueueGenericValueType<int>(-erased));
+			else
+			{
+				char buffer[32];
+				_itoa(-erased, buffer, 10);
+				MessageToQueue::getInstance().sendMessageToC(getNetworkId(), "C++updateObserversCount", buffer, 0, false);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::clearObserversCount()
+{
+	if (isAuthoritative())
+	{
+		m_observersCount = 0;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::updateObserversCount(int delta)
+{
+	if (isAuthoritative())
+	{
+		m_observersCount = m_observersCount.get() + delta;
+		if (m_observersCount.get() < 0)
+		{
+			WARNING(m_observersCount.get() < 0, ("ServerObject::updateObserversCount for object %s has observer count of %d", getNetworkId().getValueString().c_str(), m_observersCount.get()));
+			m_observersCount = 0;
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Do nothing; this function is base virtual function so that creatures can go 
+ * in and out of hibernation when observed.
+ */
+void ServerObject::observersCountChanged()
+{
+}
+
+// ======================================================================
+
+namespace Archive
+{
+	void put(Archive::ByteStream &target, TriggerVolumeInfo const &source)
+	{
+		put(target, source.name);
+		put(target, source.radius);
+		put(target, source.isPromiscuous);
+	}
+
+	void get(Archive::ReadIterator &source, TriggerVolumeInfo &target)
+	{
+		get(source, target.name);
+		get(source, target.radius);
+		get(source, target.isPromiscuous);
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject.h b/engine/server/library/serverGame/src/shared/object/ServerObject.h
new file mode 100644
index 00000000..e20e0e8e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerObject.h
@@ -0,0 +1,1147 @@
+//ServerObject.h
+//Copyright 2000-2003 Sony Online Entertainment
+
+#ifndef	INCLUDED_ServerObject_H
+#define	INCLUDED_ServerObject_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "Archive/AutoDeltaSet.h"
+#include "Archive/AutoDeltaVariableCallback.h"
+#include "Archive/AutoDeltaVector.h"
+#include "StringId.h"
+#include "Unicode.h"
+#include "localizationArchive/StringIdArchive.h"
+#include "serverGame/Client.h"
+#include "serverGame/ProxyList.h"
+#include "serverGame/ServerWorldTangibleNotification.h"
+#include "serverNetworkMessages/MessageToPayload.h"
+#include "sharedCollision/CollisionEnums.h"
+#include "sharedFoundation/BitArray.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedMath/Sphere.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedObject/CachedNetworkIdArchive.h"
+#include "sharedObject/Container.h"
+#include "sharedObject/Object.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedTerrain/TerrainGenerator.h"
+#include "sharedUtility/PooledString.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+class BaselinesMessage;
+class BuildingObject;
+class CachedNetworkId;
+class CellObject;
+class Client;
+class ConnectionServerConnection;
+class ConsoleCommandParserObject;
+class ContainedByProperty;
+class CreatureObject;
+class DeltasMessage;
+class DynamicVariableLocationData;
+class GameNetworkMessage;
+class GameScriptObject;
+class GroupObject;
+class IntangibleObject;
+class Location;
+class ManufactureSchematicObject;
+class MessageQueueCombatSpam;
+class MessageQueueSocial;
+class MessageQueueSpatialChat;
+class MessageToPayload;
+class MissionObject;
+class PlayerQuestObject;
+class PlayerObject;
+class ServerObjectTemplate;
+class ServerSynchronizedUi;
+class SharedObjectTemplate;
+class ShipObject;
+class SlottedContainmentProperty;
+class StaticObject;
+class TangibleObject;
+class TriggerVolume;
+class UpdateObjectPositionMessage;
+class WeaponObject;
+
+template <typename T> class Watcher;
+
+//----------------------------------------------------------------------
+
+namespace MessageDispatch
+{
+	class Callback;
+}
+
+//----------------------------------------------------------------------
+
+
+namespace DeleteReasons
+{
+	
+	// NOTE NOTE NOTE !!!!
+	// Do not change these without updating the data in the delete_reasons
+	// table in the database.  I mean it.  The database may reject any
+	// attempt to delete an object for a reason that's not on this list.
+	// (see src/game/server/database/data/delete_reasons.sql)
+
+	const int NotDeleted = 0;
+//	const int Unknown = 1;
+	const int Decay = 2;
+	const int God = 3;  
+	const int Player = 4;
+	const int Script = 5;
+	const int CharacterDeleted = 6;
+	const int ContainerDeleted = 7;
+	const int Publish = 8;
+	const int BadContainerTransfer = 9;
+	const int Consumed = 10;
+	const int SetupFailed = 11;
+	const int Replaced = 12;
+	const int House = 13;
+	
+	typedef int Enumerator;
+
+	const std::string & describeDeleteReason(const int reason);
+}
+
+//-----------------------------------------------------------------------
+
+namespace LocalObjectFlags
+{
+	enum
+	{
+		ServerObject_Initialized          = 0, // Set once either endBaselines or initializeFirstTime has been called
+		ServerObject_BeingDestroyed       = 1, // Set when the object is being destroyed
+		ServerObject_Placing              = 2, // Set when the object should snap to terrain first alter
+		ServerObject_TransformChanged     = 3, // Set when transform has changed this frame
+		ServerObject_Unloading            = 4, // Set when the object is being unloaded from memory 
+		ServerObject_GoingToConclude      = 5, // Set when the object is going to conclude this frame
+		ServerObject_InEndBaselines       = 6, // Set during endBaselines
+		ServerObject_AutoDeltaChanged     = 7, // Set when an AutoDeltaVariable on the object is modified
+		ServerObject_SendToClient         = 8, // Cached sendToClient value from shared template
+		ServerObject_HyperspaceOnCreate   = 9, // Set when an object should hyperspace on creation
+		ServerObject_HyperspaceOnDestruct = 10, // Set when an object should hyperspace on destruction
+		ServerObject_DirtyObjectMenuSent  = 11, // set to avoid multiple dirty object menu messages in a frame
+		ServerObject_DirtyAttributesSent  = 12, // set to avoid multiple dirty attributes messages in a frame
+		ServerObject_NeedsPobFixup        = 13, // set when added to a building that needs to re-add the object in case of pob changes
+		ServerObject_Max                  = 14
+	};
+}
+
+//-----------------------------------------------------------------------
+
+struct TriggerVolumeInfo
+{
+	PooledString name;
+	float radius;
+	bool isPromiscuous;
+
+	bool operator==(TriggerVolumeInfo const &rhs) const
+	{
+		return rhs.radius == radius && rhs.isPromiscuous == isPromiscuous && rhs.name == name;
+	}
+};
+
+//-----------------------------------------------------------------------
+
+class ServerObject : public Object
+{
+	friend class ConsoleCommandParserObject;
+	friend class ServerObjectBaselinesManager;
+	
+public:
+
+	struct Messages
+	{
+		static const char * const TRIGGER_VOLUME_REMOVE;
+		static const char * const TRIGGER_VOLUME_CREATE;
+	};
+
+public:
+	class PobFixupNotification;
+	friend class PobFixupNotification;
+	class MoveNotification;
+	friend class MoveNotification;
+	friend class ServerController;
+
+	ServerObject                                                (const ServerObjectTemplate* newTemplate, const ObjectNotification &notifcation = ServerWorldTangibleNotification::getInstance(), bool hyperspaceOnCreate = false);
+	virtual                     ~ServerObject                   ();
+
+	static void install();
+
+	static ServerObject * getServerObject(NetworkId const & networkId);
+	static ServerObject * asServerObject(Object * object);
+	static ServerObject const * asServerObject(Object const * object);
+
+	virtual ServerObject *             asServerObject();
+	virtual ServerObject const *       asServerObject() const;
+	virtual CreatureObject *           asCreatureObject();
+	virtual CreatureObject const *     asCreatureObject() const;
+	virtual BuildingObject *           asBuildingObject();
+	virtual BuildingObject const *     asBuildingObject() const;
+	virtual StaticObject *             asStaticObject();
+	virtual StaticObject const *       asStaticObject() const;
+	virtual TangibleObject *           asTangibleObject();
+	virtual TangibleObject const *     asTangibleObject() const;
+	virtual IntangibleObject *         asIntangibleObject();
+	virtual IntangibleObject const *   asIntangibleObject() const;
+	virtual MissionObject *            asMissionObject();
+	virtual MissionObject const *      asMissionObject() const;
+	virtual CellObject *               asCellObject();
+	virtual CellObject const *         asCellObject() const;
+	virtual GroupObject *              asGroupObject();
+	virtual GroupObject const *        asGroupObject() const;
+	virtual ShipObject *               asShipObject();
+	virtual ShipObject const *         asShipObject() const;
+	virtual PlayerObject *             asPlayerObject();
+	virtual PlayerObject const *       asPlayerObject() const;
+	virtual WeaponObject *             asWeaponObject();
+	virtual WeaponObject const *       asWeaponObject() const;
+	virtual ManufactureSchematicObject *       asManufactureSchematicObject();
+	virtual ManufactureSchematicObject const * asManufactureSchematicObject() const;
+	virtual PlayerQuestObject *		   asPlayerQuestObject();
+	virtual PlayerQuestObject const *  asPlayerQuestObject() const;
+
+	static void                  removeDefaultTemplate          (void);
+	static void                  concludeScriptVars             ();
+	virtual void                 scheduleForAlter();
+	virtual float                alter(float time);
+	virtual bool                 alwaysSendReliableTransform    () const;
+	BaselinesMessage *           createSharedBaselinesMessage   () const;
+	BaselinesMessage *           createSharedNpBaselinesMessage () const;
+	void                         applyBaselines                 (BaselinesMessage const &source);
+	void                         applyBaselines                 (char type, Archive::ByteStream const & package);
+	void                         applyDeltas                    (DeltasMessage const &source);
+	void                         applyObjectPositionUpdate      (UpdateObjectPositionMessage const &source);
+	void                         updateContainment              (NetworkId const &containerId, int slotArrangement);
+	bool                         removeFromBaselineDistributionList(Client const &client) const;
+	virtual bool                 canDestroy                     () const;
+	virtual bool                 canDropInWorld                 () const;
+	virtual bool                 canTrade                       () const;
+	virtual bool                 canTradeRecursive              (bool testPlayers) const;
+	virtual bool                 markedNoTrade                  () const;
+	virtual bool                 markedNoTradeRecursive         (bool testPlayers, bool testOnlyContainedItems = false) const;
+	virtual bool                 markedNoTradeShared            (bool includeCheckForNoTrade) const;
+	virtual bool                 isInBazaarOrVendor             () const;
+	virtual bool                 isInSecureTrade                () const;
+	virtual void				 removeAllAuctions				();
+	virtual bool                 isBioLinked                    () const;
+	virtual bool                 isBioLinkedRecursive           () const;
+	bool                         isWaypoint                     () const;
+	bool                         checkLOSTo(ServerObject const &target) const;
+	bool                         checkLOSTo(Location const &target) const;
+	void                         clearProxyList                 ();
+	virtual void                 conclude                       ();
+	virtual Controller*          createDefaultController        ();
+	void                         addMembersToPackages           ();
+	const SharedObjectTemplate * getSharedTemplate              () const;
+	const char *                 getSharedTemplateName          () const;
+	virtual const char *         getClientSharedTemplateName    () const;
+
+	const Unicode::String        getObjectName                  () const;
+	const StringId &             getObjectNameStringId          () const;
+	const Unicode::String &      getAssignedObjectName          () const;
+	const Unicode::String        getAssignedObjectFirstName     () const;
+	const Unicode::String        getEncodedObjectName           () const;
+
+	const std::string &          getStaticItemName              () const;
+	void                         setStaticItemName              (std::string const & newStaticName);
+	int                          getStaticItemVersion           () const;
+	void                         setStaticItemVersion           (int newStaticVersion);
+	int                          getConversionId                () const;
+	void                         setConversionId                (int newConversionId);
+
+	static const unsigned long   getObjectCount                 ();
+	const bool                   getPositionChanged             () const;
+	const Sphere                 getLocalSphere                 () const;
+	const Sphere &               getSphereExtent                () const;
+	Vector const &               getTriggerPosition             () const;
+	virtual float                getHeight                      () const;
+	virtual float                getRadius                      () const;
+	virtual int                  getVolume                      () const;
+	const char *                 getTemplateName                () const;
+	bool                         getHyperspaceOnCreate          () const;
+	void                         setHyperspaceOnCreate          (bool hyperspaceOnCreate);
+	bool                         getHyperspaceOnDestroy         () const;
+	void                         setHyperspaceOnDestroy         (bool hyperspaceOnDestroy);
+	uint32                       getTemplateCrc                 () const;
+	bool                         isPlayerControlled             () const;
+	bool                         isPersisted                    () const;
+	float                        getComplexity                  () const;
+	void                         setComplexity                  (float complexity);
+	bool                         isBazaarTerminal               () const;
+	bool                         isVendor                       () const;
+	void                         makeVendor                     ();
+	ServerObject *               getBazaarContainer             ();
+	const ServerObject *         getBazaarContainer             () const;
+	virtual void                 addToWorld();
+	virtual void                 onAddedToWorld                 ();
+
+	virtual bool                 checkAndAddClientControl(Client* client);
+	virtual void                 onClientReady (Client *c);
+	virtual void                 onClientAboutToLoad();
+	virtual void                 onLoadingScreenComplete();
+	virtual void                 onPobFixupComplete();
+	bool                         isBeingDestroyed() const;
+	bool                         isPlacing() const;
+	bool                         isUnloading() const;
+	bool                         isGoingToConclude() const;
+	bool                         isInEndBaselines() const;
+	bool                         isNeedingPobFixup() const;
+	bool                         permanentlyDestroy             (DeleteReasons::Enumerator reason);
+	virtual void                 persist                        ();
+	virtual void                 onRemovingFromWorld            ();
+	virtual void                 unload                         ();
+	void                         moveToPlayerAndUnload          (const NetworkId &player);
+	void                         moveToPlayerBankAndUnload      (const NetworkId &player);
+	void                         moveToPlayerDatapadAndUnload   (const NetworkId &player, int maxDepth);
+	virtual void                 onPermanentlyDestroyed         ();
+	virtual bool                 immediateLogoutAllowed         ();
+	void                         handleDisconnect               (bool immediate);
+	void                         disconnect                     ();
+	void                         triggerMadeAuthoritative       ();
+	bool                         getIncludeInBuildout           () const;
+	void                         setIncludeInBuildout           ( bool value );
+
+
+//-----------------------------------------------------------------------
+// Object manipulation
+// Can this object manipulate other objects.  CreatureObject overrides.  Base class returns false.
+	// generally an object is allowed to manipulate another object if it is container or "nearby".
+public:
+	virtual bool                 canManipulateObject(ServerObject const &target, bool movingObject, bool checkPermission, bool checkPermissionOnParent, float maxDistance, Container::ContainerErrorCode&, bool skipNoTradeCheck = false, bool * allowedByGodMode = NULL) const;
+
+//-----------------------------------------------------------------------
+// container support
+	virtual void                          arrangementModified(int oldValue, int newValue, bool isLocal);
+	virtual void                          containedByModified(NetworkId const &oldValue, NetworkId const &newValue, bool isLocal);
+	virtual void                          onContainerTransferComplete(ServerObject *oldContainer, ServerObject *newContainer);
+	void                                  loadContainedObjectFromDB(const NetworkId& oid) const;
+	void                                  loadAllContentsFromDB() const;
+	virtual void                          onContainedObjectLoaded(const NetworkId &oid);
+	virtual void                          onAllContentsLoaded();
+	bool                                  areContentsLoaded() const;
+	bool                                  getLoadContents() const;
+	const NetworkId&                      getLoadWith() const;
+	void                                  setLoadWith(const NetworkId& id);
+	void                                  setLoadContents(bool loadContents);
+	void                                  unloadPersistedContents();
+	ServerObject *                        combineResourceContainers(ServerObject &item);
+	bool                                  isContainedBy(const ServerObject & container, bool includeContents) const;
+
+	//Container triggers
+	virtual bool                          onContainerAboutToLoseItem(ServerObject * destination, ServerObject& item, ServerObject* transferer);
+	virtual bool                          onContainerAboutToTransfer(ServerObject * destination, ServerObject* transferer);
+	virtual int                           onContainerAboutToGainItem(ServerObject& item, ServerObject* transferer);
+	virtual void                          onContainerLostItem(ServerObject * destination, ServerObject& item, ServerObject* transferer);
+	virtual void                          onContainerTransfer(ServerObject * destination, ServerObject* transferer);
+	virtual void                          onContainerGainItem(ServerObject& item, ServerObject* source, ServerObject* transferer);
+	virtual bool                          onContainerChildAboutToLoseItem(ServerObject * destination, ServerObject& item, ServerObject* transferer);
+	virtual bool                          onContainerChildAboutToGainItem(ServerObject& item, ServerObject* destination, ServerObject* transferer);
+	virtual void                          onContainerChildLostItem(ServerObject * destination, ServerObject& item, ServerObject* source, ServerObject* transferer);
+	virtual void                          onContainerChildGainItem(ServerObject& item, ServerObject* source, ServerObject* transferer);
+	void                                  containerDepersistContents(ServerObject *, ServerObject *);
+	
+	//CTS
+	void                                  setLoadCTSBank(bool isForCTS);
+	bool                                  getLoadCTSBank() const;
+
+	void                                  setLoadCTSPackedHouses(bool isForCTS);
+	bool                                  getLoadCTSPackedHouses() const;
+	void								  packedHouseLoaded();
+
+private:
+	void                                  synchronizationOnConstruct();
+	void                                  synchronizationOnDestruct();
+	void                                  synchronizationOnContainerChange(ServerObject const *oldContainer, ServerObject const *newContainer) const;
+	void                                  synchronizationOnLoadedInContainer();
+	void                                  synchronizationOnUnload() const;
+	void                                  containerHandleUpdateProxies(ServerObject* oldContainer, ServerObject* newContainer);
+	void                                  containerHandleUpdateClients(ServerObject* oldContainer, ServerObject* newContainer, bool removeFromWorld, bool addToWorld);
+	
+// ----------------------------------------------------------------------
+// Money functions
+public:
+	bool               transferCashTo               (const NetworkId &target, int amount, const NetworkId &transactionId = NetworkId::cms_invalid);
+	bool               transferBankCreditsTo        (const NetworkId &target, int amount, const NetworkId &transactionId = NetworkId::cms_invalid);
+	bool               transferBankCreditsTo        (const std::string &target, int amount, const NetworkId &transactionId = NetworkId::cms_invalid);
+	bool               transferBankCreditsFrom      (const std::string &target, int amount, const NetworkId &transactionId = NetworkId::cms_invalid);
+	bool               withdrawCashFromBank         (int amount, const NetworkId &transactionId = NetworkId::cms_invalid);
+	bool               depositCashToBank            (int amount, const NetworkId &transactionId = NetworkId::cms_invalid);
+	int                getCashBalance               () const;
+	int                getBankBalance               () const;
+	int                getTotalMoney                () const;
+
+public:
+	void               scriptTransferCashTo         (const NetworkId &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const stdvector<int8>::fwd &packedDictionary);
+	void               scriptTransferBankCreditsTo  (const NetworkId &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const stdvector<int8>::fwd &packedDictionary);
+	void               scriptWithdrawCashFromBank   (int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const stdvector<int8>::fwd &packedDictionary);
+	void               scriptDepositCashToBank      (int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const stdvector<int8>::fwd &packedDictionary);
+	void               scriptTransferBankCreditsTo  (const std::string &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const stdvector<int8>::fwd &packedDictionary);
+	void               scriptTransferBankCreditsFrom(const std::string &source, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const stdvector<int8>::fwd &packedDictionary);
+
+	void        sendControllerMessageToAuthServer(GameControllerMessage cm, MessageQueue::Data *msg, float value = 0.0f);
+	static std::string  getLogDescription(const ServerObject * object);
+	static std::string  getLogDescription(const NetworkId &);
+
+private:
+	// makeRoom specifies that if the amount would cause the bank/cash limit to be exceeded,
+	// move some credits from the bank/cash into cash/bank/galactic reserve (if there is room
+	// there) to make room
+	void               internalAdjustBankBalance(int amount, bool makeRoom);
+	void               internalAdjustCashBalance(int amount, bool makeRoom);
+
+public:
+	void               sendAuthClientBaselines(Client const &client) const;
+	void               sendFirstParentBaselines(Client const &client) const;
+
+private:
+	void               flushCreateMessages() const;
+	void               onAddedToWorldCell();
+	void               onRemovedFromWorldCell();
+
+protected:
+	virtual void       virtualOnAddedToWorldCell();
+	virtual void       virtualOnRemovedFromWorldCell();
+	virtual void       virtualOnSetAuthority();
+	virtual void       virtualOnReleaseAuthority();
+	virtual void       virtualOnSetClient();
+	virtual void       virtualOnLogout();
+	
+//-----------------------------------------------------------------------
+// trigger volume support
+
+protected:
+	void updateTriggerVolumes();
+	void destroyTriggerVolumes();
+	void                                      addTriggerVolume (TriggerVolume* t);
+	
+public:
+	
+	void                                      createTriggerVolume          (const real radius, const std::string & name, bool isPromiscuous);
+	void                                      removeTriggerVolume          (const std::string & name);
+
+	const TriggerVolume *                     getTriggerVolume             (const std::string & volumeName) const;
+	TriggerVolume *                           getTriggerVolume             (const std::string & volumeName);
+
+	typedef std::map<PooledString, TriggerVolume *> TriggerVolumeMap;
+	TriggerVolumeMap &                        getTriggerVolumeMap          ();
+
+	void                                      onTriggerEnter               (ServerObject & object, TriggerVolume & triggerVolume);
+	void                                      onTriggerExit                (ServerObject & object, TriggerVolume & triggerVolume);
+
+	virtual void                              onAddedToTriggerVolume       (TriggerVolume & triggerVolume);
+	virtual void                              onRemovedFromTriggerVolume   (TriggerVolume & triggerVolume);
+
+	virtual const std::set<TriggerVolume *> * getTriggerVolumeEntered      () const;
+
+public:
+	void                                      setAttributeAttained         (int attribute);
+	void                                      clearAttributeAttained       (int attribute);
+	bool                                      hasAttributeAttained         (int attribute) const;
+
+	void                                      setAttributeInterested       (int attribute);
+	void                                      clearAttributeInterested     (int attribute);
+	bool                                      hasAttributeInterest         (int attribute) const;
+
+	bool                                      isInterested                 (const ServerObject &rhs) const;
+
+//-----------------------------------------------------------------------
+// broadcast system
+
+private:
+	void                          addBroadcastListener      (std::string const & messageName, NetworkId const & listener);
+	void                          removeBroadcastListener   (std::string const & messageName, NetworkId const & listener);
+	void                          removeBroadcastListener   (NetworkId const & listener);
+	void                          addBroadcastBroadcaster   (std::string const & messageName, NetworkId const & broadcaster);
+	void                          removeBroadcastBroadcaster(std::string const & messageName, NetworkId const & broadcaster);
+	void                          removeBroadcastAllBroadcasters();
+	void                          stopListeningToAllBroadcastMessages();
+
+public:
+	typedef std::pair<std::string, NetworkId>                    BroadcastMapItem;
+	typedef std::set<BroadcastMapItem>                           BroadcastMap;
+	BroadcastMap const &          getBroadcastListeners          () const;
+	BroadcastMap const &          getBroadcastBroadcasters       () const;
+	void                          listenToBroadcastMessage       (std::string const & messageName, NetworkId const & broadcaster);
+	void                          stopListeningToBroadcastMessage(std::string const & messageName, NetworkId const & broadcaster);
+
+//-----------------------------------------------------------------------
+
+public:
+
+	void                          addSynchronizedUi              (const stdvector<NetworkId>::fwd & clients);
+	void                          addSynchronizedUiClient        (ServerObject & client);
+	bool                          areContentsVisibleToClient     (const Client &) const;
+	void                          attachStartupScripts           ();
+	void                          customize                      (const std::string & customName, int value);
+	void                          serverObjectEndBaselines       (bool fromDatabase);
+	unsigned long                 getAndIncrementMoveSequenceNumber ();
+	uint32                        getAuthServerProcessId         () const;
+	const int                     getCacheVersion                () const;
+	Client *                      getClient                      () const;
+	int                           getObserversCount              () const;
+	stdset<Client *>::fwd const & getObservers                   () const;
+	void                          addObserver                    (Client * client);
+	void                          removeObserver                 (Client * client);
+	void                          clearObservers                 ();
+	void                          updateObserversCount           (int delta);
+	void                          onObserversChanged             ();
+
+	size_t                        getProxyCount                  () const;
+	ProxyList const &             getExposedProxyList            () const;
+	bool                          isProxiedOnServer              (uint32 pid) const;
+	void                          addServerToProxyList           (uint32 proxyServerProcessId);
+	void                          removeServerFromProxyList      (uint32 proxyServerProcessId);
+
+	// objvar functions
+	DynamicVariableList const &   getObjVars                     () const;
+	void                          removeObjVarItem(std::string const &name);
+	void                          eraseObjVarListEntries(std::string const &name);
+	void                          copyObjVars(std::string const &name, ServerObject const &srcObject, std::string const &srcVarName);
+	bool                          setObjVarItem(std::string const &name, int value);
+	bool                          setObjVarItem(std::string const &name, stdvector<int>::fwd const &value);
+	bool                          setObjVarItem(std::string const &name, float value);
+	bool                          setObjVarItem(std::string const &name, stdvector<float>::fwd const &value);
+	bool                          setObjVarItem(std::string const &name, std::string const &value);
+	bool                          setObjVarItem(std::string const &name, Unicode::String const &value);
+	bool                          setObjVarItem(std::string const &name, stdvector<Unicode::String>::fwd const &value);
+	bool                          setObjVarItem(std::string const &name, NetworkId const &value);
+	bool                          setObjVarItem(std::string const &name, stdvector<NetworkId>::fwd const &value);
+	bool                          setObjVarItem(std::string const &name, DynamicVariableLocationData const &value);
+	bool                          setObjVarItem(std::string const &name, stdvector<DynamicVariableLocationData>::fwd const &value);
+	bool                          setObjVarItem(std::string const &name, StringId const &value);
+	bool                          setObjVarItem(std::string const &name, stdvector<StringId>::fwd const &value);
+	bool                          setObjVarItem(std::string const &name, Transform const &value);
+	bool                          setObjVarItem(std::string const &name, stdvector<Transform>::fwd const &value);
+	bool                          setObjVarItem(std::string const &name, Vector const &value);
+	bool                          setObjVarItem(std::string const &name, stdvector<Vector>::fwd const &value);
+	bool                          setObjVarItem(std::string const &name, DynamicVariable const &value);
+
+	std::string const             getPackedObjVars(std::string const &prefix) const;
+	bool                          setPackedObjVars(std::string const &packedVarString);
+
+	const std::string &           getSceneId                     () const;
+	GameScriptObject *            getScriptObject                (); 
+	const GameScriptObject *      getScriptObject                () const;
+	ServerSynchronizedUi *        getSynchronizedUi              ();
+	const ServerSynchronizedUi *  getSynchronizedUi              () const;
+	bool                          getTransformChanged() const;
+	void                          deliverMessageTo               (MessageToPayload & message);
+	int                           cancelMessageTo                (std::string const & messageName);
+	int                           cancelMessageToByMessageId     (NetworkId const & messageId);
+	int                           timeUntilMessageTo             (std::string const & messageName) const;
+	unsigned long                 processQueuedMessageTos        (unsigned long effectiveMessageToTime);
+	std::string                   debugGetMessageToList          () const;
+	bool                          handleTeleportFixup            (bool force);
+	bool                          serverObjectInitializeFirstTimeObject(ServerObject *cell, Transform const &transform);
+	bool                          getLocalFlag                   (int flag) const;
+	void                          setLocalFlag                   (int flag, bool enabled);
+	virtual bool                  isInitialized() const;
+	bool                          isInWorldCell() const;
+	virtual bool                  isVisibleOnClient              (const Client & client) const = 0;
+	virtual void                  kill                           ();
+
+	void                          performSocial                  (const NetworkId & target, unsigned long socialType, bool animationOk, bool textOk);
+	void                          performSocial                  (const MessageQueueSocial & socialMsg);
+
+	void                          performCombatSpam              (const MessageQueueCombatSpam & combatSpam, bool sendToSelf, bool sendToTarget, bool sendToBystanders);
+
+	void                          releaseAuthority               (uint32 newAuthoritativeProcessId);
+	void                          removeSynchronizedUiClient     (const NetworkId & clientId);
+
+	void                          seeSocial                      (const MessageQueueSocial & socialMsg);
+	void                          seeCombatSpam                  (const MessageQueueCombatSpam & spamMsg);
+
+	bool                          getSendToClient                () const;
+	void                          sendCreateAndBaselinesToClient (Client &client) const;
+	void                          sendCreateAndBaselinesToDatabaseServer() const;
+	void                          forwardServerCreateAndBaselines() const;
+	void                          sendToClientsInUpdateRange     (const GameNetworkMessage & message, bool reliable, bool includeSelf=true) const;
+	static void                   sendToSpecifiedClients         (const GameNetworkMessage & message, bool reliable, const stdvector<NetworkId>::fwd & clients);
+	void                          appendMessage                  (int message, float value, uint32 flags = GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+	void                          appendMessage                  (int message, float value, MessageQueue::Data *data, uint32 flags = GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+	virtual void                  setAuthServerProcessId         (uint32 processId);
+	void                          setClient                      (Client &newClient);
+	void                          clearClient                    ();
+	virtual void                  setParentCell                  (CellProperty *cellProperty);
+	virtual void                  setAuthority                   ();
+	void                          setObjectName                  (const Unicode::String &newName);
+	void                          setObjectNameStringId          (const StringId & id);
+	void                          setSceneId                     (const std::string & sceneId);
+	virtual const NetworkId &     getOwnerId() const;
+	virtual bool                  isOwner(NetworkId const &id, Client const *client) const;
+	virtual void                  setOwnerId(const NetworkId &id);
+	void                          setSceneIdOnThisAndContents    (const std::string & sceneId);
+	void                          setPlayerControlled            (bool newValue);
+	void                          speakText                      (NetworkId const &target, unsigned long chatType, unsigned long mood, unsigned long flags, Unicode::String const &speech, int language, Unicode::String const &oob);
+	virtual void                  speakText                      (MessageQueueSpatialChat const &spatialChat);
+	virtual void                  hearText                       (ServerObject const &source, MessageQueueSpatialChat const &spatialChat, int chatMessageIndex);
+	void                          teleportObject                 (Vector const & position_w, NetworkId const &targetContainer, std::string const &targetCellName, Vector const &position_p, std::string const &scriptCallback, bool forceLoadScreen = false);
+	virtual void                  changeTeleportDestination      (Vector & position, float & yaw) const;
+	void                          transferAuthority              (uint32 newAuthoritativeGameServerProcessId, bool skipLoadScreen, bool handlingCrash, bool informPlanetServer);
+	void                          transferAuthority              (uint32 newAuthoritativeGameServerProcessId, bool skipLoadScreen, bool handlingCrash, const NetworkId &goalCell, const Transform &goalTransform, bool informPlanetServer);
+	void                          updatePositionOnPlanetServer   (bool forceUpdate = false);
+	int                           getGameObjectType              () const;
+
+	typedef stdvector<std::pair<std::string, Unicode::String> >::fwd AttributeVector;
+	virtual void                  getAttributes                  (AttributeVector &data) const = 0;
+	virtual void                  getAttributes                  (const NetworkId & playerId, AttributeVector &data) const;
+	virtual void                  getAttributesForAuction        (AttributeVector &data) const;
+
+	void                          retrieveStoredObjectAttributes (AttributeVector & av) const;
+	void                          storeObjectAttributes          (const ServerObject & prototype);
+	void                          clearStoredObjectAttributes    ();
+	void                          replaceStoredObjectAttribute   (Unicode::String const & attribute, Unicode::String const & value);
+
+	void                          clearDeltas() const;
+	virtual bool                  wantSawAttackTriggers() const;
+	void                          setTeleportScriptCallback(std::string const &scriptCallback);
+	void                          setInteriorTeleportDestination(NetworkId const &destContainerId, std::string const &destCellName, Vector const &destPosition_p);
+
+	void                          sendDirtyObjectMenuNotification ();
+	void                          sendDirtyAttributesNotification ();
+
+	virtual std::string           getItemLog() const;
+
+	void                          checkAndLogInvalidTransform() const;
+
+	void                          setLayer (TerrainGenerator::Layer* layer);
+	TerrainGenerator::Layer*      getLayer () const;
+	virtual void                  getAuthClients(stdset<Client const *>::fwd &authClients) const;
+	virtual void                  setCacheVersion (const int cacheVersion);
+
+	void                          setDefaultAlterTime(float time);
+	float                         getDefaultAlterTime() const;
+
+	bool hasAttributeCaching() const;
+	int getAttributeRevision() const;
+	void setAttributeRevisionDirty();
+
+	// ai patrol pathing support
+	void                                 setPatrolPathRoot         (const ServerObject & root);
+	const stdset<CachedNetworkId>::fwd & getPatrolPathRoots        () const;
+	void                                 addPatrolPathingObject    (const ServerObject & ai);
+	void                                 removePatrolPathingObject (const ServerObject & ai);
+	void                                 addPatrolPathObserver     ();
+	void                                 removePatrolPathObserver  ();
+	int                                  getPatrolPathObservers    () const;
+	bool                                 isPatrolPathNode          () const;
+	bool                                 isPatrolPathRoot          () const;
+
+	void                          setDescriptionStringId(const StringId &);
+	StringId const &              getDescriptionStringId();
+
+protected:
+
+	virtual void                  addObjectToConcludeList();
+	void                          onAutoDeltaChanged();
+	virtual void                  endBaselines();
+	virtual void                  onLoadedFromDatabase();
+	virtual void                  initializeFirstTimeObject();
+	void                          sendDeltasForSelfAndContents(ProxyList const *proxyList = 0) const;
+	void                          sendDeltas(ProxyList const *proxyList = 0) const;
+
+	//Package functions, for adding shared data to be auto-synchronized.
+	//_np is the package that gets ignored by the DB (i.e. not persisted)
+	void                    addAuthClientServerVariable    (Archive::AutoDeltaVariableBase & Source);
+	void                    addAuthClientServerVariable_np (Archive::AutoDeltaVariableBase & Source);
+	void                    addFirstParentAuthClientServerVariable(Archive::AutoDeltaVariableBase & source);
+	void                    addFirstParentAuthClientServerVariable_np(Archive::AutoDeltaVariableBase & source);
+	void                    addServerVariable              (Archive::AutoDeltaVariableBase & Source);
+	void                    addServerVariable_np           (Archive::AutoDeltaVariableBase & Source);
+	void                    addSharedVariable              (Archive::AutoDeltaVariableBase & source);
+	void                    addSharedVariable_np           (Archive::AutoDeltaVariableBase & source);
+	
+	virtual bool            handleContentsSetup();
+	virtual void            forwardServerObjectSpecificBaselines() const;
+	virtual void            sendObjectSpecificBaselinesToClient(Client const &client) const;
+	virtual void            updatePlanetServerInternal     (bool forceUpdate) const;
+
+	virtual void            handleCMessageTo               (MessageToPayload const & message);
+
+public:
+	void         createFarNetworkUpdateVolume(float const overrideVal = 0.0f);
+	void         destroyFarNetworkUpdateVolume();
+	bool         isNetworkUpdateFarTriggerVolume(TriggerVolume const &triggerVolume) const;
+	TriggerVolume *getNetworkTriggerVolume();
+	virtual float getFarNetworkUpdateRadius() const;
+	virtual void getByteStreamFromAutoVariable(const std::string & name, Archive::ByteStream & target) const;
+	virtual void setAutoVariableFromByteStream(const std::string & name, const Archive::ByteStream & source);
+
+private:
+	ServerObject(const ServerObject & other);
+	ServerObject& operator=(const ServerObject & rhs);
+
+	virtual ServerSynchronizedUi * createSynchronizedUi ();
+
+	bool         handlePlayerInInteriorSetup(ContainedByProperty* containedBy);
+	void         markChildrenPersisted();
+	void         beginAuthTransfer(uint32 pid) const;
+	void         transferAuthoritySceneChange(uint32 pid);
+	void         transferAuthorityNoSceneChange(uint32 pid, bool skipLoadScreen, const NetworkId &goalCell, const Transform &goalTransform, bool informPlanetServer);
+	void         addPendingSynchronizedUi(const ServerObject & uiObject);
+
+	ProxyList const &getPrivateProxyList() const;
+	void             copyProxyList(ServerObject const &source);
+
+	void         handleMessageTo   (MessageToPayload const & message);
+	void         pushMessageTo     (MessageToPayload const & newMessage);
+	void         popMessageTo      ();
+	void         removeMessageTo   (unsigned int position);
+
+	void         clearObserversCount();
+
+protected:
+	void         setTransformChanged (bool);
+	void         updateWorldSphere();
+
+	virtual const SharedObjectTemplate *  getDefaultSharedTemplate(void) const;
+	void setInitialized(bool initialized);
+	void setBeingDestroyed(bool beingDestroyed);
+	void setPlacing(bool placing);
+	void setUnloading(bool unloading);
+	void setGoingToConclude(bool goingToConclude);
+	void setInEndBaselines(bool inEndBaselines);
+	void setNeedsPobFixup(bool needsPobFixup);
+
+	float getLocationReservationRadius() const;
+
+	virtual void observersCountChanged();
+
+	Vector                        m_oldPosition;
+
+private:
+
+	struct AuthProcessIdCallback
+	{
+		void modified(ServerObject &target, uint32 oldValue, uint32 newValue, bool isLocal) const;
+	};
+
+	struct ObserversCountCallback
+	{
+		void modified(ServerObject &target, int oldValue, int newValue, bool isLocal) const;
+	};
+	friend struct ObserversCountCallback;
+
+	static const SharedObjectTemplate * m_defaultSharedTemplate;	// template to use if no shared template is given
+	const        SharedObjectTemplate * m_sharedTemplate;			// template shared between client and server
+
+	static float ms_buildingUpdateRadiusMultiplier;
+	static void setBuildingUpdateRadiusMultiplier(float m);
+
+	/** If this object is being controlled by a client, this pointer will be set.  NULL otherwise
+	 */
+	Client *              m_client;
+	std::set<Client *>    m_observers;
+	uint32                m_localFlags;
+	GameScriptObject *    m_scriptObject;
+	DynamicVariableList   m_objVars;
+	
+	Archive::AutoDeltaVariableCallback<int, ObserversCountCallback, ServerObject> m_observersCount; // the total number of clients observing this object and its proxies
+	
+	Archive::AutoDeltaVariable<int>   m_volume;			// volume this object takes up
+	Archive::AutoDeltaVariable<float> m_complexity;		// difficulty crafting/manufacturing the object
+
+	/** Which scene is this object in?  For development -- will be replaced
+	 * by a spacial division node number or something similar.
+	 */
+	Archive::AutoDeltaVariable<PooledString> m_sceneId;
+
+	/** A name for this object.  For characters, will be their character name.
+	 * May be empty for other types of objects.
+	 */
+	Archive::AutoDeltaVariable<Unicode::String> m_objectName;
+
+	/** set this flag to true if you want it included
+	 * in buildout file exports
+	 */
+	Archive::AutoDeltaVariable<bool>            m_includeInBuildout;
+	
+	/** A name for this object.  It is overridden by the existance of a characterName datamember.  Otherwise
+	 *  it is an id for the entry in the localized string table for the name of the object.
+	 */
+	Archive::AutoDeltaVariable<StringId> m_nameStringId;
+
+	Archive::AutoDeltaVariable<StringId> m_descriptionStringId;
+
+	Archive::AutoDeltaVariable<std::string> m_staticItemName;
+	Archive::AutoDeltaVariable<int>         m_staticItemVersion;
+
+	Archive::AutoDeltaVariable<int>         m_conversionId;
+
+	/** Flag for whether this object is player-controlled (e.g. a player or a vehicle piloted by a player)
+	 */
+	Archive::AutoDeltaVariable<bool> m_playerControlled;
+
+	/** SynchronizedUI package for objects that require real time updated UI.
+	 */
+
+	Watcher<ServerSynchronizedUi>                 m_synchronizedUi;
+	// list of objects with sync ui that are waiting for this object to have a client
+	// attached, due to an authority transfer
+	stdvector<NetworkId>::fwd *            m_pendingSyncUi;
+
+	/** Flag for whether the object is persisted
+	 */
+	Archive::AutoDeltaVariable<bool> m_persisted;
+
+	Archive::AutoDeltaVariableCallback<uint32, AuthProcessIdCallback, ServerObject> m_authServerProcessId;
+	Archive::AutoDeltaSet<uint32> m_proxyServerProcessIds;
+
+	Archive::AutoDeltaVariable<unsigned long> m_transformSequence;
+
+	Archive::AutoDeltaVariable<int> m_cacheVersion;
+	Archive::AutoDeltaVariable<bool> m_loadContents;
+	mutable Archive::AutoDeltaVariable<bool> m_contentsLoaded;
+	mutable Archive::AutoDeltaVariable<bool> m_contentsRequested;
+	NetworkId m_loadWith;
+	
+	// There are no setters for these deliberately!  Don't add setters.  Use the money transfer functions
+	// instead.
+	Archive::AutoDeltaVariable<int> m_cashBalance;
+	Archive::AutoDeltaVariable<int> m_bankBalance;
+
+	Archive::AutoDeltaVariable<float> m_defaultAlterTime;
+
+	// broadcast system
+	Archive::AutoDeltaSet<BroadcastMapItem>   m_broadcastListeners;    // who is currently listening to me
+	Archive::AutoDeltaSet<BroadcastMapItem>   m_broadcastBroadcasters; // who I am currently listening to
+
+protected:
+	/** Synchronization packages.  _np indicates that it is ignored by the DB (ie not persisted)
+	 *  authClient refers to the authoritative client for this object (if it has one)
+	 *  server refers to proxies of this object on other servers
+	 *  authClientServer is both of the above
+	 *  shared is all of the above + proxies on other clients
+   *  firstParentAuthClient refers to the auth client for the firstParentInWorld of this object (if any)
+	 */
+	Archive::AutoDeltaByteStream m_authClientServerPackage;
+	Archive::AutoDeltaByteStream m_authClientServerPackage_np;
+	Archive::AutoDeltaByteStream m_firstParentAuthClientServerPackage;
+	Archive::AutoDeltaByteStream m_firstParentAuthClientServerPackage_np;
+	Archive::AutoDeltaByteStream m_serverPackage;
+	Archive::AutoDeltaByteStream m_serverPackage_np;
+	Archive::AutoDeltaByteStream m_sharedPackage;
+	Archive::AutoDeltaByteStream m_sharedPackage_np;
+
+
+	TriggerVolume *                        m_networkUpdateFar;
+	TriggerVolumeMap                       m_triggerVolumes;
+
+	Archive::AutoDeltaVariable<BitArray>   m_attributesAttained;
+	Archive::AutoDeltaVariable<BitArray>   m_attributesInterested;
+
+private:
+	
+	Archive::AutoDeltaVector<TriggerVolumeInfo, ServerObject> m_triggerVolumeInfo;
+	Archive::AutoDeltaMap<std::pair<std::pair<unsigned long, uint64>, MessageToId>, MessageToPayload> m_messageTos;
+
+	Sphere                                 m_worldSphere;
+
+	//members to be added
+//	equipmentSlotType;
+
+	Archive::OnDirtyCallback<ServerObject>       m_dirtyArchiveCallback;
+
+	mutable int                                  m_unreliableControllerMessageSequenceNumber;
+	int                                          m_gameObjectType;
+	bool                                         m_calledTriggerDestroy;
+	bool                                         m_calledTriggerRemovingFromWorld;
+	bool                                         m_loadCTSBank;
+	bool                                         m_loadCTSPackedHouses;
+};
+
+//-----------------------------------------------------------------------
+
+inline Client * ServerObject::getClient(void) const
+{
+	return m_client;
+}
+
+//-----------------------------------------------------------------------
+
+inline const SharedObjectTemplate * ServerObject::getSharedTemplate() const
+{
+	if (m_sharedTemplate != NULL)
+		return m_sharedTemplate;
+	return getDefaultSharedTemplate();
+}
+
+//-----------------------------------------------------------------------
+
+inline const StringId & ServerObject::getObjectNameStringId() const
+{
+	return m_nameStringId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline DynamicVariableList const &ServerObject::getObjVars() const
+{
+	return m_objVars;
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ServerObject::getSceneId() const
+{
+	return m_sceneId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 ServerObject::getTemplateCrc() const
+{
+	return getObjectTemplate()->getCrcName().getCrc();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ServerObject::isPlayerControlled() const
+{
+	return m_playerControlled.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline float ServerObject::getComplexity() const
+{
+	return m_complexity.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void ServerObject::setComplexity(float complexity)
+{
+	m_complexity = complexity;
+}
+
+//-----------------------------------------------------------------------
+
+inline ServerObject::TriggerVolumeMap & ServerObject::getTriggerVolumeMap()
+{
+	return m_triggerVolumes;
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::set<TriggerVolume *> * ServerObject::getTriggerVolumeEntered() const
+{
+	return NULL;
+}
+
+//-----------------------------------------------------------------------
+
+inline ServerObject::BroadcastMap const & ServerObject::getBroadcastListeners() const
+{
+	return m_broadcastListeners.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline ServerObject::BroadcastMap const & ServerObject::getBroadcastBroadcasters() const
+{
+	return m_broadcastBroadcasters.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline void ServerObject::setSceneId(const std::string & newSceneId)
+{
+	m_sceneId = newSceneId;
+}
+
+//-----------------------------------------------------------------------
+
+inline ServerSynchronizedUi *        ServerObject::getSynchronizedUi            ()
+{
+	return m_synchronizedUi;
+}
+
+//----------------------------------------------------------------------
+
+inline const ServerSynchronizedUi *  ServerObject::getSynchronizedUi            () const
+{
+	return m_synchronizedUi;
+}
+
+//-----------------------------------------------------------------------
+
+inline GameScriptObject* ServerObject::getScriptObject()
+{
+	return m_scriptObject;
+}
+
+//-----------------------------------------------------------------------
+
+inline const GameScriptObject* ServerObject::getScriptObject() const
+{
+	return m_scriptObject;
+}
+
+//-----------------------------------------------------------------------
+
+
+inline int ServerObject::getTotalMoney() const
+{
+	return getCashBalance() + getBankBalance();
+}
+
+//-----------------------------------------------------------------
+
+inline const Unicode::String & ServerObject::getAssignedObjectName () const
+{
+	return m_objectName.get ();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ServerObject::isPersisted() const
+{
+	return m_persisted.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ServerObject::getLoadContents() const
+{
+	return m_loadContents.get();
+}
+
+//------------------------------------------------------------------------------------------
+
+inline const NetworkId& ServerObject::getLoadWith() const
+{
+	return m_loadWith;//.get();
+}
+
+// ----------------------------------------------------------------------
+
+
+inline int ServerObject::getCashBalance() const
+{
+	return m_cashBalance.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int ServerObject::getBankBalance() const
+{
+	return m_bankBalance.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline ProxyList const &ServerObject::getPrivateProxyList() const
+{
+	return m_proxyServerProcessIds.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int ServerObject::getObserversCount() const
+{
+	return m_observersCount.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline stdset<Client *>::fwd const &ServerObject::getObservers() const
+{
+	return m_observers;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ServerObject::getLocalFlag(int flag) const
+{
+	return (m_localFlags&(1u<<flag)) ? true : false;
+}
+
+// ----------------------------------------------------------------------
+
+inline void ServerObject::setLocalFlag(int flag, bool enabled)
+{
+	if (enabled)
+		m_localFlags |= (1u<<flag);
+	else
+		m_localFlags &= ~(1u<<flag);
+}
+
+// ----------------------------------------------------------------------
+
+inline float ServerObject::getDefaultAlterTime() const
+{
+	return m_defaultAlterTime.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::string & ServerObject::getStaticItemName() const
+{
+	return m_staticItemName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void ServerObject::setStaticItemName(std::string const & newStaticName)
+{
+	m_staticItemName = newStaticName;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ServerObject::getStaticItemVersion() const
+{
+	return m_staticItemVersion.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void ServerObject::setStaticItemVersion(int newStaticVersion)
+{
+	m_staticItemVersion = newStaticVersion;
+}
+
+// ----------------------------------------------------------------------
+
+inline int ServerObject::getConversionId() const
+{
+	return m_conversionId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void ServerObject::setConversionId(int newConversionId)
+{
+	m_conversionId = newConversionId;
+}
+
+//----------------------------------------------------------------------
+
+inline int ServerObject::getGameObjectType() const
+{
+	return m_gameObjectType;
+}
+
+// ======================================================================
+
+namespace Archive
+{
+	void put(Archive::ByteStream &target, TriggerVolumeInfo const &source);
+	void get(Archive::ReadIterator &source, TriggerVolumeInfo &target);
+}
+
+// ======================================================================
+
+#endif	// INCLUDED_ServerObject_H
+
diff --git a/engine/server/library/serverGame/src/shared/object/ServerObjectBaselinesManager.cpp b/engine/server/library/serverGame/src/shared/object/ServerObjectBaselinesManager.cpp
new file mode 100644
index 00000000..3724a38f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerObjectBaselinesManager.cpp
@@ -0,0 +1,130 @@
+// ======================================================================
+//
+// ServerObjectBaselinesManager.cpp
+//
+// Copyright 2000-2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerObjectBaselinesManager.h"
+
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/ServerObject.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+
+// ======================================================================
+
+class ContainerOpenInfo
+{
+public:
+	ContainerOpenInfo() :
+		m_client(),
+		m_sequence(0),
+		m_containerId(NetworkId::cms_invalid),
+		m_slotName()
+	{
+	}
+
+	ContainerOpenInfo(Client &client, int sequence, NetworkId const &containerId, std::string const &slotName) :
+		m_client(&client),
+		m_sequence(sequence),
+		m_containerId(containerId),
+		m_slotName(slotName)
+	{
+	}
+
+	void flushContainerOpen() const
+	{
+		Client * const client = m_client.getPointer();
+		if (client)
+		{
+			GenericValueTypeMessage<std::pair<int, std::pair<NetworkId, std::string> > > const msg(
+				"OpenedContainerMessage",
+				std::make_pair(m_sequence, std::make_pair(m_containerId, m_slotName)));
+			client->send(msg, true);
+		}
+	}
+
+private:
+	Watcher<Client> m_client;
+	int m_sequence;
+	NetworkId m_containerId;
+	std::string m_slotName;
+};
+
+// ======================================================================
+
+static std::set<ServerObject const *> s_topmostObjectsToFlush;
+static std::vector<ContainerOpenInfo> s_containerOpens;
+
+// ======================================================================
+
+void ServerObjectBaselinesManager::add(ServerObject const &object)
+{
+	IGNORE_RETURN(s_topmostObjectsToFlush.insert(safe_cast<ServerObject const *>(ContainerInterface::getTopmostContainer(object))));
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObjectBaselinesManager::addOpenedContainer(Client &client, int sequence, NetworkId const &containerId, std::string const &slotName)
+{
+	s_containerOpens.push_back(ContainerOpenInfo(client, sequence, containerId, slotName));
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObjectBaselinesManager::serverObjDestroyed(ServerObject const &obj)
+{
+	IGNORE_RETURN(s_topmostObjectsToFlush.erase(&obj));
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObjectBaselinesManager::onContainerChanged(ServerObject const &object, ServerObject const *oldContainer, ServerObject const *newContainer)
+{
+	// object is changing containers, so we need to adjust which topmost
+	// parents may potentially have pending baselines.
+
+	ServerObject const * const oldTopmost = oldContainer ? safe_cast<ServerObject const *>(ContainerInterface::getTopmostContainer(*oldContainer)) : &object;
+	ServerObject const * const newTopmost = newContainer ? safe_cast<ServerObject const *>(ContainerInterface::getTopmostContainer(*newContainer)) : &object;
+
+	// if object keeps the same topmost parent, there are no updates to make
+	if (oldTopmost == newTopmost)
+		return;
+
+	std::set<ServerObject const *>::iterator i = s_topmostObjectsToFlush.find(oldTopmost);
+	if (i == s_topmostObjectsToFlush.end())
+		return; // old topmost had no baselines pending, so nothing to update
+
+	// if object was previously a top level object, remove from the set
+	if (!oldContainer)
+		s_topmostObjectsToFlush.erase(i);
+
+	// There were baselines pending for the old topmost or its children,
+	// which means possible for object or its contents, so we add the new
+	// topmost to the set of pending baselines.
+	IGNORE_RETURN(s_topmostObjectsToFlush.insert(newTopmost));
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObjectBaselinesManager::update()
+{
+	// flush baselines
+	{
+		for (std::set<ServerObject const *>::const_iterator i = s_topmostObjectsToFlush.begin(); i != s_topmostObjectsToFlush.end(); ++i)
+			(*i)->flushCreateMessages();
+		s_topmostObjectsToFlush.clear();
+	}
+
+	// flush container opens
+	{
+		for (std::vector<ContainerOpenInfo>::const_iterator i = s_containerOpens.begin(); i != s_containerOpens.end(); ++i)
+			(*i).flushContainerOpen();
+		s_containerOpens.clear();
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/ServerObjectBaselinesManager.h b/engine/server/library/serverGame/src/shared/object/ServerObjectBaselinesManager.h
new file mode 100644
index 00000000..6d5e0dfc
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerObjectBaselinesManager.h
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// ServerObjectBaselinesManager.h
+//
+// Copyright 2000-2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ServerObjectBaselinesManager_H
+#define INCLUDED_ServerObjectBaselinesManager_H
+
+// ======================================================================
+
+class Client;
+class NetworkId;
+class ServerObject;
+
+// ======================================================================
+
+class ServerObjectBaselinesManager
+{
+public:
+	static void add(ServerObject const &object);
+	static void addOpenedContainer(Client &client, int sequence, NetworkId const &containerId, std::string const &slotName);
+	static void update();
+	static void serverObjDestroyed(ServerObject const &obj);
+	static void onContainerChanged(ServerObject const &object, ServerObject const *oldContainer, ServerObject const *newContainer);
+	
+private:
+	ServerObjectBaselinesManager();
+	~ServerObjectBaselinesManager();
+	ServerObjectBaselinesManager(ServerObjectBaselinesManager const &);
+	ServerObjectBaselinesManager &operator=(ServerObjectBaselinesManager const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_ServerObjectBaselinesManager_H
+
diff --git a/engine/server/library/serverGame/src/shared/object/ServerObjectTerrainModificationNotification.cpp b/engine/server/library/serverGame/src/shared/object/ServerObjectTerrainModificationNotification.cpp
new file mode 100644
index 00000000..ba10ac54
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerObjectTerrainModificationNotification.cpp
@@ -0,0 +1,198 @@
+//===================================================================
+//
+// ServerObjectTerrainModificationNotification.cpp
+// asommers
+//
+// copyright 2001, sony online entertainment
+//
+//===================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerObjectTerrainModificationNotification.h"
+
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedMath/Vector2d.h"
+#include "sharedTerrain/ProceduralTerrainAppearance.h"
+#include "sharedTerrain/TerrainModificationHelper.h"
+
+//===================================================================
+
+namespace ServerObjectTerrainModificationNotificationNamespace
+{
+	void snapObjectsToTerrain (Rectangle2d const & extent, float const height)
+	{
+		Vector const center (extent.getCenter ().x, height, extent.getCenter ().y);
+		float const radius = sqrt (sqr (extent.getWidth ()) + sqr (extent.getHeight ()));
+
+		typedef std::vector<ServerObject *> ServerObjectList;
+		ServerObjectList result;
+		ServerWorld::findObjectsInRange (center, radius, result);
+
+		ServerObjectList::iterator end = result.end ();
+		for (ServerObjectList::iterator iter = result.begin (); iter != end; ++iter)
+		{
+			ServerObject * const serverObject = *iter;
+			if (serverObject)
+			{
+				SharedObjectTemplate const * const sharedObjectTemplate = serverObject->getSharedTemplate ();
+				if (sharedObjectTemplate)
+				{
+					SharedObjectTemplate::GameObjectType const gameObjectType = sharedObjectTemplate->getGameObjectType ();
+					if (gameObjectType == SharedObjectTemplate::GOT_corpse)
+						World::snapObjectToTerrain (serverObject);
+				}
+			}
+		}
+	}
+}
+
+using namespace ServerObjectTerrainModificationNotificationNamespace;
+
+//===================================================================
+
+ProceduralTerrainAppearance* ServerObjectTerrainModificationNotification::ms_terrainAppearance;
+ServerObjectTerrainModificationNotification ServerObjectTerrainModificationNotification::ms_instance;
+
+//===================================================================
+
+ServerObjectTerrainModificationNotification &ServerObjectTerrainModificationNotification::getInstance()
+{
+	return ms_instance;
+}
+
+//-------------------------------------------------------------------
+
+void ServerObjectTerrainModificationNotification::setTerrainAppearance (ProceduralTerrainAppearance* const terrainAppearance)
+{
+	ms_terrainAppearance = terrainAppearance;
+}
+
+//-------------------------------------------------------------------
+
+ServerObjectTerrainModificationNotification::ServerObjectTerrainModificationNotification () :
+	ObjectNotification ()
+{
+}
+
+//-------------------------------------------------------------------
+	
+ServerObjectTerrainModificationNotification::~ServerObjectTerrainModificationNotification ()
+{
+}
+
+//-------------------------------------------------------------------
+
+void ServerObjectTerrainModificationNotification::addToWorld (Object& object) const
+{
+	//-- insert the layer into the terrain system
+	ServerObject* const serverObject = object.asServerObject();
+	TerrainGenerator::Layer* const layer = serverObject->getLayer ();
+	ms_terrainAppearance->addLayer (layer);
+
+	updateTerrain (object, false, true);
+}
+
+//-------------------------------------------------------------------
+
+void ServerObjectTerrainModificationNotification::removeFromWorld (Object& object) const
+{
+	//-- remove the layer from the terrain system
+	ServerObject* const serverObject = object.asServerObject();
+	TerrainGenerator::Layer* const layer = serverObject->getLayer ();
+	ms_terrainAppearance->removeLayer (layer);
+
+	updateTerrain (object, true, false);
+}
+
+//-------------------------------------------------------------------
+
+bool ServerObjectTerrainModificationNotification::positionChanged (Object& object, bool /*dueToParentChange*/, const Vector& /*oldPosition*/) const
+{
+	//-- update the layer with new position data
+	if (object.isInWorld ())
+		updateTerrain (object, true, true);
+
+	return true;
+}
+
+//-------------------------------------------------------------------
+
+void ServerObjectTerrainModificationNotification::rotationChanged (Object& object, bool /*dueToParentChange*/) const
+{
+	//-- update the layer with new position data
+	if (object.isInWorld ())
+		updateTerrain (object, false, false);
+}
+
+//-------------------------------------------------------------------
+
+bool ServerObjectTerrainModificationNotification::positionAndRotationChanged (Object& object, bool /*dueToParentChange*/, const Vector& /*oldPosition*/) const
+{
+	//-- update the layer with new position data
+	if (object.isInWorld ())
+		updateTerrain (object, true, true);
+
+	return true;
+}
+
+//-------------------------------------------------------------------
+
+void ServerObjectTerrainModificationNotification::updateTerrain (Object& object, bool const updateOldExtent, bool const updateNewExtent) const
+{
+	ServerObject* const serverObject = object.asServerObject();
+	TerrainGenerator::Layer* const layer = serverObject->getLayer ();
+	ProceduralTerrainAppearance* const proceduralTerrainAppearance = safe_cast<ProceduralTerrainAppearance*> (ms_terrainAppearance);
+	NOT_NULL (proceduralTerrainAppearance);
+	
+	//-- get the new position of the object
+	const Vector position = object.getPosition_w ();
+
+	//-- save the current extent of the layer
+	layer->calculateExtent ();
+	Rectangle2d oldExtent;
+	float oldHeight = 0.f;
+	bool hasOldExtent = updateOldExtent && layer->getUseExtent ();
+	if (hasOldExtent)
+	{
+		oldExtent = layer->getExtent ();
+		oldHeight = layer->getModificationHeight ();
+	}
+
+	//-- calculate the updated layer information (position and heights)
+	const Vector2d& position2d = Vector2d (position.x, position.z);
+	TerrainModificationHelper::setPosition (layer, position2d);
+	TerrainModificationHelper::setRotation (layer, object.getObjectFrameK_w ().theta ());
+	TerrainModificationHelper::setHeight (layer, ms_terrainAppearance->generateHeight_expensive (position2d));
+
+	//-- prepare the terrain
+	ms_terrainAppearance->prepareGenerator ();
+
+	//-- get the new extent of the layer
+	layer->calculateExtent ();
+	Rectangle2d newExtent;
+	float newHeight = 0.f;
+	bool hasNewExtent = updateNewExtent && layer->getUseExtent ();
+	if (hasNewExtent)
+	{
+		newExtent = layer->getExtent ();
+		newHeight = layer->getModificationHeight ();
+	}
+
+	//-- tell the terrain system the old and new extent regions have changed
+	if (hasOldExtent)
+	{
+		ms_terrainAppearance->invalidateRegion (oldExtent);
+		snapObjectsToTerrain (oldExtent, oldHeight);
+	}
+
+	if (hasNewExtent)
+	{
+		ms_terrainAppearance->invalidateRegion (newExtent);
+		snapObjectsToTerrain (newExtent, newHeight);
+	}
+}
+
+//===================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/ServerObjectTerrainModificationNotification.h b/engine/server/library/serverGame/src/shared/object/ServerObjectTerrainModificationNotification.h
new file mode 100644
index 00000000..cb473928
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerObjectTerrainModificationNotification.h
@@ -0,0 +1,57 @@
+//===================================================================
+//
+// ServerObjectTerrainModificationNotification.h
+// asommers
+//
+// copyright 2001, sony online entertainment
+//
+//===================================================================
+
+#ifndef INCLUDED_ServerObjectTerrainModificationNotification_H
+#define INCLUDED_ServerObjectTerrainModificationNotification_H
+
+//===================================================================
+
+class ProceduralTerrainAppearance;
+
+#include "sharedObject/ObjectNotification.h"
+
+//===================================================================
+
+class ServerObjectTerrainModificationNotification : public ObjectNotification
+{
+public:
+
+	static void setTerrainAppearance (ProceduralTerrainAppearance* const terrainAppearance);
+	static ServerObjectTerrainModificationNotification &getInstance();
+
+public:
+
+	ServerObjectTerrainModificationNotification ();
+	virtual ~ServerObjectTerrainModificationNotification ();
+
+	virtual void addToWorld (Object& object) const;
+	virtual void removeFromWorld (Object& object) const;
+
+	virtual bool positionChanged (Object& object, bool dueToParentChange, const Vector& oldPosition) const;
+	virtual void rotationChanged (Object& object, bool dueToParentChange) const;
+	virtual bool positionAndRotationChanged (Object& object, bool dueToParentChange, const Vector& oldPosition) const;
+
+private:
+
+	void updateTerrain (Object& object, bool updateOldExtent, bool updateNewExtent) const;
+
+private:
+
+	ServerObjectTerrainModificationNotification (const ServerObjectTerrainModificationNotification&);
+	ServerObjectTerrainModificationNotification& operator= (const ServerObjectTerrainModificationNotification&);
+
+private:
+
+	static ProceduralTerrainAppearance* ms_terrainAppearance;
+	static ServerObjectTerrainModificationNotification ms_instance;
+};
+
+//===================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject_AuthTransfer.cpp b/engine/server/library/serverGame/src/shared/object/ServerObject_AuthTransfer.cpp
new file mode 100644
index 00000000..65655198
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerObject_AuthTransfer.cpp
@@ -0,0 +1,455 @@
+// ======================================================================
+//
+// ServerObject_AuthTransfer.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerObject.h"
+
+#include "serverGame/AuthTransferTracker.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ConnectionServerConnection.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ObserveTracker.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/PositionUpdateTracker.h"
+#include "serverGame/ServerController.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerUIManager.h"
+#include "serverGame/ServerWorld.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverNetworkMessages/AuthTransferClientMessage.h"
+#include "serverNetworkMessages/GameConnectionServerMessages.h"
+#include "serverNetworkMessages/GameServerForceChangeAuthorityMessage.h"
+#include "serverNetworkMessages/PlanetRemoveObject.h"
+#include "serverNetworkMessages/PlayedTimeAccumMessage.h"
+#include "serverNetworkMessages/SetAuthoritativeMessage.h"
+#include "serverNetworkMessages/UnloadObjectMessage.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedObject/NetworkIdManager.h"
+
+// ======================================================================
+
+namespace ServerObject_AuthTransferNamespace
+{
+
+	// ----------------------------------------------------------------------
+
+	void getContainedClients(ServerObject &obj, std::vector<Watcher<Client> > &containedClients)
+	{
+		// find all clients for primary controlled objects in the containment hierarchy under obj (including obj)
+
+		Client * const client = obj.getClient();
+		if (client && client->getCharacterObjectId() == obj.getNetworkId())
+			containedClients.push_back(Watcher<Client>(client));
+
+		Container * const container = ContainerInterface::getContainer(obj);
+		if (container)
+		{
+			for (ContainerIterator i = container->begin(); i != container->end(); ++i)
+			{
+				ServerObject * const containedObject = safe_cast<ServerObject *>((*i).getObject());
+				if (containedObject)
+					getContainedClients(*containedObject, containedClients);
+			}
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+}
+using namespace ServerObject_AuthTransferNamespace;
+
+// ======================================================================
+
+void ServerObject::beginAuthTransfer(uint32 pid) const
+{
+	AuthTransferTracker::beginAuthTransfer(getNetworkId(), pid, getExposedProxyList());
+	Container const * const container = ContainerInterface::getContainer(*this);
+	if (container)
+	{
+		for (ContainerConstIterator containerIterator = container->begin(); containerIterator != container->end(); ++containerIterator)
+		{
+			ServerObject const * const containedObject = safe_cast<ServerObject const *>((*containerIterator).getObject());
+			if (containedObject)
+				containedObject->beginAuthTransfer(pid);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::transferAuthoritySceneChange(uint32 pid)
+{
+	std::vector<Watcher<Client> > containedClients;
+	getContainedClients(*this, containedClients);
+
+	{
+		for (std::vector<Watcher<Client> >::const_iterator i = containedClients.begin(); i != containedClients.end(); ++i)
+		{
+			Client * const client = (*i).getPointer();
+			if (client)
+			{
+				ServerObject * const characterObject = (*i)->getCharacterObject();
+				if (characterObject)
+					characterObject->onClientAboutToLoad();
+			}
+		}
+	}
+
+	beginAuthTransfer(pid);
+
+	ProxyList proxyList = getExposedProxyList();
+
+	// Before we send baselines to the new server, we need to clear out the proxy list,
+	if (!m_proxyServerProcessIds.empty())
+		m_proxyServerProcessIds.clear();
+
+	setAuthServerProcessId(pid);
+	sendDeltasForSelfAndContents(&proxyList);
+
+	// get rid of the old proxies now, because we already had to remove them from the proxy list
+	if (!proxyList.empty())
+	{
+		ServerMessageForwarding::begin(std::vector<uint32>(proxyList.begin(), proxyList.end()));
+
+		UnloadObjectMessage const unloadMessage(getNetworkId());
+		ServerMessageForwarding::send(unloadMessage);
+
+		ServerMessageForwarding::end();
+	}
+
+	// set up message forwarding
+	ServerMessageForwarding::begin(pid);
+
+	forwardServerCreateAndBaselines();
+
+	// build transfer authority message
+	SetAuthoritativeMessage const sam(getNetworkId(), pid, true, false, NetworkId::cms_invalid, getTransform_o2w(), true);
+
+	releaseAuthority(pid);
+
+	{
+		for (std::vector<Watcher<Client> >::const_iterator i = containedClients.begin(); i != containedClients.end(); ++i)
+		{
+			Client * const client = (*i).getPointer();
+
+			if (client)
+			{
+				ObserveTracker::onClientAboutToTransferAuthority(*client);
+				// transfer the client to the new authoritative server before
+				// transfering authority so that when the new authoritative
+				// takes authority, it will immediately attach the client
+				// to the object, so there's no possibility of the game
+				// client missing updates to the object
+				ConnectionServerConnection * const connectionServer = client->getConnection();
+				if (connectionServer)
+				{
+					DEBUG_REPORT_LOG(ConfigServerGame::getLogObservers(), ("%s is now sending AuthTransferClientMessage\n", client->getCharacterObjectId().getValueString().c_str()));
+					AuthTransferClientMessage const atcm(
+						client->getCharacterObjectId(),
+						connectionServer->getRemoteAddress(),
+						connectionServer->getRemotePort(),
+						false,
+						client->getAccountName(),
+						client->getIpAddress(),
+						client->isSecure(),
+						client->getStationId(),
+						NULL,
+						client->getGameFeatures(),
+						client->getSubscriptionFeatures(),
+						client->getAccountFeatureIds(),
+						client->getEntitlementTotalTime(),
+						client->getEntitlementEntitledTime(),
+						client->getEntitlementTotalTimeSinceLastLogin(),
+						client->getEntitlementEntitledTimeSinceLastLogin(),
+						client->getBuddyPoints(),
+						GameServer::getInstance().getProcessId(),
+						client->getConsumedRewardEvents(),
+						client->getClaimedRewardItems(),
+						client->isUsingAdminLogin(),
+						static_cast<int>(client->getCombatSpamFilter()),
+						client->getCombatSpamRangeSquaredFilter(),
+						client->getFurnitureRotationDegree(),
+						client->getHasUnoccupiedJediSlot(),
+						client->getIsJediSlotCharacter());
+
+					ServerMessageForwarding::send(atcm);
+				}
+				client->clearControlledObjects();
+			}
+		}
+	}
+
+	// transfer authority to the new authoritative server
+	ServerMessageForwarding::send(sam);
+
+	// End forwarding
+	ServerMessageForwarding::end();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::transferAuthorityNoSceneChange(uint32 pid, bool skipLoadScreen, const NetworkId &goalCell, const Transform &goalTransform, bool informPlanetServer)
+{
+	beginAuthTransfer(pid);
+
+	ProxyList proxyList = getExposedProxyList();
+	m_proxyServerProcessIds.insert(GameServer::getInstance().getProcessId());
+	bool needCreate = !isProxiedOnServer(pid);
+	setAuthServerProcessId(pid);
+	sendDeltasForSelfAndContents(&proxyList);
+
+	// Set up message forwarding
+	ServerMessageForwarding::begin(pid);
+
+	if (needCreate)
+		forwardServerCreateAndBaselines();
+
+	// build transfer authority message
+	SetAuthoritativeMessage const sam(getNetworkId(), pid, false, false, goalCell, goalTransform, true);
+
+	std::vector<Watcher<Client> > containedClients;
+	getContainedClients(*this, containedClients);
+
+	releaseAuthority(pid);
+
+	for (std::vector<Watcher<Client> >::const_iterator i = containedClients.begin(); i != containedClients.end(); ++i)
+	{
+		Client * const client = (*i).getPointer();
+
+		if (client)
+		{
+			// force any UpdatePvpStatusMessage waiting to be sent to this
+			// client at the end of the frame to be send now, because the
+			// client object is going away, and the receiving game server
+			// doesn't have the list of UpdatePvpStatusMessage waiting to
+			// be sent to this client at the end of the frame; we only need
+			// to do this when there is an authority transfer that doesn't
+			// involve a scene change, because with scene change, the game
+			// client will unload all objects and get fresh baselines and
+			// UpdatePvpStatusMessage for observed objects
+			PvpUpdateObserver::sendUpdateAndRemoveClientFromPvpStatusCache(client);
+
+			ObserveTracker::onClientAboutToTransferAuthority(*client);
+			// transfer the client to the new authoritative server before
+			// transfering authority so that when the new authoritative
+			// takes authority, it will immediately attach the client
+			// to the object, so there's no possibility of the game
+			// client missing updates to the object
+			ConnectionServerConnection * const connectionServer = client->getConnection();
+			if (connectionServer)
+			{
+				std::vector<NetworkId> observeListIds;
+				if (skipLoadScreen)
+				{
+					Client::ObservingList const &observeList = client->getObserving();
+					for (Client::ObservingList::const_iterator j = observeList.begin(); j != observeList.end(); ++j)
+						observeListIds.push_back((*j)->getNetworkId());
+				}
+
+				DEBUG_REPORT_LOG(ConfigServerGame::getLogObservers(), ("%s is now sending AuthTransferClientMessage\n", client->getCharacterObjectId().getValueString().c_str()));
+				AuthTransferClientMessage const atcm(
+					client->getCharacterObjectId(),
+					connectionServer->getRemoteAddress(),
+					connectionServer->getRemotePort(),
+					skipLoadScreen,
+					client->getAccountName(),
+					client->getIpAddress(),
+					client->isSecure(),
+					client->getStationId(),
+					(observeListIds.empty() ? NULL : &observeListIds),
+					client->getGameFeatures(),
+					client->getSubscriptionFeatures(),
+					client->getAccountFeatureIds(),
+					client->getEntitlementTotalTime(),
+					client->getEntitlementEntitledTime(),
+					client->getEntitlementTotalTimeSinceLastLogin(),
+					client->getEntitlementEntitledTimeSinceLastLogin(),
+					client->getBuddyPoints(),
+					GameServer::getInstance().getProcessId(),
+					client->getConsumedRewardEvents(),
+					client->getClaimedRewardItems(),
+					client->isUsingAdminLogin(),
+					static_cast<int>(client->getCombatSpamFilter()),
+					client->getCombatSpamRangeSquaredFilter(),
+					client->getFurnitureRotationDegree(),
+					client->getHasUnoccupiedJediSlot(),
+					client->getIsJediSlotCharacter());
+
+				ServerMessageForwarding::send(atcm);
+			}
+			client->clearControlledObjects();
+		}
+	}
+
+	// transfer authority to the new authoritative server
+	ServerMessageForwarding::send(sam);
+
+	if (informPlanetServer)
+	{
+		GameServerForceChangeAuthorityMessage const authMessage(getNetworkId(), GameServer::getInstance().getProcessId(), pid);
+		GameServer::getInstance().sendToPlanetServer(authMessage);
+	}
+
+	// End forwarding
+	ServerMessageForwarding::end();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::transferAuthority(uint32 pid, bool skipLoadScreen, bool handlingCrash, bool informPlanetServer)
+{
+	transferAuthority(pid, skipLoadScreen, handlingCrash, getAttachedTo() ? getAttachedTo()->getNetworkId() : NetworkId::cms_invalid, getTransform_o2p(), informPlanetServer);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::transferAuthority(uint32 pid, bool skipLoadScreen, bool handlingCrash, const NetworkId &goalCell, const Transform &goalTransform, bool informPlanetServer)
+{
+	// If we are handling a crash and being told to become authoritative, we do so directly.
+	// If we are not authoritative, but have been set as the auth server process id for this object,
+	// then we are completing the transfer process and should set ourselves authoritative.
+	// If neither of these is true, then we are beginning the auth transfer process, or should tell
+	// the auth object to do so if we aren't it.
+	if (   pid == GameServer::getInstance().getProcessId()
+	    && (handlingCrash || getAuthServerProcessId() == GameServer::getInstance().getProcessId()))
+	{
+		// setting authority to this server
+		if (!isAuthoritative())
+		{
+			if (handlingCrash)
+			{
+				// normally this stuff is done by the server that's giving up authority
+				setAuthServerProcessId(pid);
+				if (isPlayerControlled())
+				{
+					std::vector<NetworkId> nothing; //TODO:  do we need to worry about this in the crash recovery case?
+					TransferControlMessage const tcm(getNetworkId(), pid, true, nothing);
+					GameServer::getInstance().sendToConnectionServers(tcm);
+				}
+			}
+
+			if (goalCell == NetworkId::cms_invalid)
+			{
+				safe_cast<ServerController *>(getController())->teleport(goalTransform, 0);
+				setAuthority();
+			}
+			else
+			{
+				ServerObject * const cell = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(goalCell));
+				safe_cast<ServerController *>(getController())->teleport(goalTransform, cell);
+				setAuthority();
+			}
+		}
+	}
+	else
+	{
+		// setting authority to a different server
+		if (!isAuthoritative())
+		{
+			sendControllerMessageToAuthServer(CM_transferAuthority, new MessageQueueGenericValueType<std::pair<uint32, bool> >(std::make_pair(pid, skipLoadScreen)));
+			return;
+		}
+
+		if (GameServer::getInstance().isGameServerConnected(pid))
+		{
+			if (getSceneId() != ServerWorld::getSceneId() && getSceneId() != "universe")
+				transferAuthoritySceneChange(pid);
+			else
+				transferAuthorityNoSceneChange(pid, skipLoadScreen, goalCell, goalTransform, informPlanetServer);
+		}
+
+		else
+		{
+			WARNING(true, ("GameServer(%d) is not connected to this gameserver! TransferAuthority for (%s : %s) will not continue because it CANNOT send authority transfer network messages to a server that is not running or not connected!", pid, getObjectTemplateName(), getNetworkId().getValueString().c_str()));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::releaseAuthority(uint32 newProcessId)
+{
+	DEBUG_REPORT_LOG(ConfigServerGame::getLogObservers(), ("Called releaseAuthority on %s to process %lu\n", getNetworkId().getValueString().c_str(), newProcessId));
+
+	PositionUpdateTracker::flushPositionUpdate(*this);
+
+	// remove our synchronizedUi
+	ServerSynchronizedUi * const syncUI = m_synchronizedUi.getPointer();
+	if (syncUI)
+	{
+		DEBUG_WARNING(true, ("Object %s is being set non-authoritative but still has a synchronizedUi", getNetworkId().getValueString().c_str()));
+		syncUI->onAuthorityTransferred();
+		delete syncUI;
+	}
+
+	NetworkController * const controller = safe_cast<NetworkController *>(getController());
+	NOT_NULL(controller);
+
+	if (isPlayerControlled())
+	{
+		//DEBUG_WARNING(true, ("ServerUIManager: ServerObject is calling clientLosingAuthority, network id = %s, newProcessId = %lu", getNetworkId().getValueString().c_str(), newProcessId));
+		ServerUIManager::onPlayerAuthorityTransferred(getNetworkId());
+	}
+
+	PlayerObject *thisAsPlayer = this->asPlayerObject();
+	if(thisAsPlayer)
+	{
+		PlayedTimeAccumMessage ptam(getNetworkId(), thisAsPlayer->getPlayedTimeAccumOnly());
+		ServerMessageForwarding::send(ptam);
+	}
+	else
+	{
+		CreatureObject *thisAsCreature = this->asCreatureObject();
+		if(thisAsCreature)
+		{
+			PlayedTimeAccumMessage ptam(getNetworkId(), thisAsCreature->getPseudoPlayedTime());
+			ServerMessageForwarding::send(ptam);
+		}
+	}
+
+	Container * const container = ContainerInterface::getContainer(*this);
+	if (container)
+	{
+		std::vector<CachedNetworkId> idList;
+		idList.reserve(static_cast<size_t>(container->getNumberOfItems()));
+
+		for (ContainerIterator containerIterator = container->begin(); containerIterator != container->end(); ++containerIterator)
+			idList.push_back(*containerIterator);
+
+		for (std::vector<CachedNetworkId>::const_iterator i = idList.begin(); i != idList.end(); ++i)
+		{
+			ServerObject * const containedObject = safe_cast<ServerObject*>(i->getObject());
+			if (containedObject)
+				containedObject->releaseAuthority(newProcessId);
+		}
+	}
+
+	// if we're in another scene and losing authority, unload and notify the planet server
+	if (   getSceneId() != ServerWorld::getSceneId()
+	    && getSceneId() != "universe"
+	    && (isPlayerControlled() || ContainerInterface::getTopmostContainer(*this) == this))
+	{
+		PlanetRemoveObject const removeMessage(getNetworkId());
+		GameServer::getInstance().sendToPlanetServer(removeMessage);
+		unload();
+	}
+
+	controller->setAuthoritative(false);
+
+	if (getScriptObject())
+		getScriptObject()->setOwnerIsAuthoritative(false, newProcessId);
+
+	virtualOnReleaseAuthority();
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject_ObjVar.cpp b/engine/server/library/serverGame/src/shared/object/ServerObject_ObjVar.cpp
new file mode 100644
index 00000000..ccbf5e33
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerObject_ObjVar.cpp
@@ -0,0 +1,415 @@
+// ======================================================================
+//
+// ServerObject_ObjVar.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerObject.h"
+
+#include "UnicodeUtils.h"
+#include "sharedFoundation/DynamicVariableLocationData.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+
+// ======================================================================
+
+void ServerObject::removeObjVarItem(std::string const &name)
+{
+	if (isAuthoritative())
+	{
+		IGNORE_RETURN(m_objVars.removeItemByName(name));
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(
+			CM_removeObjVarItem,
+			new MessageQueueGenericValueType<std::string>(name));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::eraseObjVarListEntries(std::string const &name)
+{
+	if (isAuthoritative())
+	{
+		IGNORE_RETURN(m_objVars.removeItemByName(name));
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(
+			CM_eraseObjVarListEntries,
+			new MessageQueueGenericValueType<std::string>(name));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::copyObjVars(std::string const &name, ServerObject const &srcObject, std::string const &srcVarName)
+{
+	m_objVars.copy(name, srcObject.getObjVars(), srcVarName);
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setObjVarItem(std::string const &name, int value)
+{
+	if (isAuthoritative())
+	{
+		if (!m_objVars.setItem(name, value))
+			return false;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(
+			CM_setIntDynamicVariable,
+			new MessageQueueGenericValueType<std::pair<std::string, int> >(
+				std::make_pair(name, value)));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setObjVarItem(std::string const &name, std::vector<int> const &value)
+{
+	if (isAuthoritative())
+	{
+		if (!m_objVars.setItem(name, value))
+			return false;
+	}
+	else
+	{
+		if (DynamicVariable::getUTF8Length(value) > DynamicVariable::MAX_DYNAMIC_VARIABLE_UTF8_LENGTH)
+			return false;
+		sendControllerMessageToAuthServer(
+			CM_setIntArrayDynamicVariable,
+			new MessageQueueGenericValueType<std::pair<std::string, std::vector<int> > >(
+				std::make_pair(name, value)));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setObjVarItem(std::string const &name, float value)
+{
+	if (isAuthoritative())
+	{
+		if (!m_objVars.setItem(name, value))
+			return false;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(
+			CM_setFloatDynamicVariable,
+			new MessageQueueGenericValueType<std::pair<std::string, float> >(
+				std::make_pair(name, value)));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setObjVarItem(std::string const &name, std::vector<float> const &value)
+{
+	if (isAuthoritative())
+	{
+		if (!m_objVars.setItem(name, value))
+			return false;
+	}
+	else
+	{
+		if (DynamicVariable::getUTF8Length(value) > DynamicVariable::MAX_DYNAMIC_VARIABLE_UTF8_LENGTH)
+			return false;
+		sendControllerMessageToAuthServer(
+			CM_setFloatArrayDynamicVariable,
+			new MessageQueueGenericValueType<std::pair<std::string, std::vector<float> > >(
+				std::make_pair(name, value)));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setObjVarItem(std::string const &name, std::string const &value)
+{
+	if (isAuthoritative())
+	{
+		if (!m_objVars.setItem(name, value))
+			return false;
+	}
+	else
+	{
+		if (DynamicVariable::getUTF8Length(value) > DynamicVariable::MAX_DYNAMIC_VARIABLE_UTF8_LENGTH)
+			return false;
+		sendControllerMessageToAuthServer(
+			CM_setStringDynamicVariable,
+			new MessageQueueGenericValueType<std::pair<std::string, Unicode::String> >(
+				std::make_pair(name, Unicode::narrowToWide(value))));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setObjVarItem(std::string const &name, Unicode::String const &value)
+{
+	if (isAuthoritative())
+	{
+		if (!m_objVars.setItem(name, value))
+			return false;
+	}
+	else
+	{
+		if (DynamicVariable::getUTF8Length(value) > DynamicVariable::MAX_DYNAMIC_VARIABLE_UTF8_LENGTH)
+			return false;
+		sendControllerMessageToAuthServer(
+			CM_setStringDynamicVariable,
+			new MessageQueueGenericValueType<std::pair<std::string, Unicode::String> >(
+				std::make_pair(name, value)));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setObjVarItem(std::string const &name, std::vector<Unicode::String> const &value)
+{
+	if (isAuthoritative())
+	{
+		if (!m_objVars.setItem(name, value))
+			return false;
+	}
+	else
+	{
+		if (DynamicVariable::getUTF8Length(value) > DynamicVariable::MAX_DYNAMIC_VARIABLE_UTF8_LENGTH)
+			return false;
+		sendControllerMessageToAuthServer(
+			CM_setStringArrayDynamicVariable,
+			new MessageQueueGenericValueType<std::pair<std::string, std::vector<Unicode::String> > >(
+				std::make_pair(name, value)));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setObjVarItem(std::string const &name, NetworkId const &value)
+{
+	if (isAuthoritative())
+	{
+		if (!m_objVars.setItem(name, value))
+			return false;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(
+			CM_setObjIdDynamicVariable,
+			new MessageQueueGenericValueType<std::pair<std::string, NetworkId> >(
+				std::make_pair(name, value)));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setObjVarItem(std::string const &name, std::vector<NetworkId> const &value)
+{
+	if (isAuthoritative())
+	{
+		if (!m_objVars.setItem(name, value))
+			return false;
+	}
+	else
+	{
+		if (DynamicVariable::getUTF8Length(value) > DynamicVariable::MAX_DYNAMIC_VARIABLE_UTF8_LENGTH)
+			return false;
+		sendControllerMessageToAuthServer(
+			CM_setObjIdArrayDynamicVariable,
+			new MessageQueueGenericValueType<std::pair<std::string, std::vector<NetworkId> > >(
+				std::make_pair(name, value)));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setObjVarItem(std::string const &name, DynamicVariableLocationData const &value)
+{
+	if (isAuthoritative())
+	{
+		if (!m_objVars.setItem(name, value))
+			return false;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(
+			CM_setLocationDynamicVariable,
+			new MessageQueueGenericValueType<std::pair<std::string, DynamicVariableLocationData> >(
+				std::make_pair(name, value)));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setObjVarItem(std::string const &name, std::vector<DynamicVariableLocationData> const &value)
+{
+	if (isAuthoritative())
+	{
+		if (!m_objVars.setItem(name, value))
+			return false;
+	}
+	else
+	{
+		if (DynamicVariable::getUTF8Length(value) > DynamicVariable::MAX_DYNAMIC_VARIABLE_UTF8_LENGTH)
+			return false;
+		sendControllerMessageToAuthServer(
+			CM_setLocationArrayDynamicVariable,
+			new MessageQueueGenericValueType<std::pair<std::string, std::vector<DynamicVariableLocationData> > >(
+				std::make_pair(name, value)));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setObjVarItem(std::string const &name, StringId const &value)
+{
+	if (isAuthoritative())
+	{
+		if (!m_objVars.setItem(name, value))
+			return false;
+	}
+	else
+	{
+		if (DynamicVariable::getUTF8Length(value) > DynamicVariable::MAX_DYNAMIC_VARIABLE_UTF8_LENGTH)
+			return false;
+		sendControllerMessageToAuthServer(
+			CM_setStringIdDynamicVariable,
+			new MessageQueueGenericValueType<std::pair<std::string, StringId> >(
+				std::make_pair(name, value)));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setObjVarItem(std::string const &name, std::vector<StringId> const &value)
+{
+	if (isAuthoritative())
+	{
+		if (!m_objVars.setItem(name, value))
+			return false;
+	}
+	else
+	{
+		if (DynamicVariable::getUTF8Length(value) > DynamicVariable::MAX_DYNAMIC_VARIABLE_UTF8_LENGTH)
+			return false;
+		sendControllerMessageToAuthServer(
+			CM_setStringIdArrayDynamicVariable,
+			new MessageQueueGenericValueType<std::pair<std::string, std::vector<StringId> > >(
+				std::make_pair(name, value)));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setObjVarItem(std::string const &name, Transform const &value)
+{
+	if (isAuthoritative())
+	{
+		if (!m_objVars.setItem(name, value))
+			return false;
+	}
+	else
+	{
+		if (DynamicVariable::getUTF8Length(value) > DynamicVariable::MAX_DYNAMIC_VARIABLE_UTF8_LENGTH)
+			return false;
+		sendControllerMessageToAuthServer(
+			CM_setTransformDynamicVariable,
+			new MessageQueueGenericValueType<std::pair<std::string, Transform> >(
+				std::make_pair(name, value)));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setObjVarItem(std::string const &name, std::vector<Transform> const &value)
+{
+	if (isAuthoritative())
+	{
+		if (!m_objVars.setItem(name, value))
+			return false;
+	}
+	else
+	{
+		if (DynamicVariable::getUTF8Length(value) > DynamicVariable::MAX_DYNAMIC_VARIABLE_UTF8_LENGTH)
+			return false;
+		sendControllerMessageToAuthServer(
+			CM_setTransformArrayDynamicVariable,
+			new MessageQueueGenericValueType<std::pair<std::string, std::vector<Transform> > >(
+				std::make_pair(name, value)));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setObjVarItem(std::string const &name, Vector const &value)
+{
+	if (isAuthoritative())
+	{
+		if (!m_objVars.setItem(name, value))
+			return false;
+	}
+	else
+	{
+		if (DynamicVariable::getUTF8Length(value) > DynamicVariable::MAX_DYNAMIC_VARIABLE_UTF8_LENGTH)
+			return false;
+		sendControllerMessageToAuthServer(
+			CM_setVectorDynamicVariable,
+			new MessageQueueGenericValueType<std::pair<std::string, Vector> >(
+				std::make_pair(name, value)));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setObjVarItem(std::string const &name, std::vector<Vector> const &value)
+{
+	if (isAuthoritative())
+	{
+		if (!m_objVars.setItem(name, value))
+			return false;
+	}
+	else
+	{
+		if (DynamicVariable::getUTF8Length(value) > DynamicVariable::MAX_DYNAMIC_VARIABLE_UTF8_LENGTH)
+			return false;
+		sendControllerMessageToAuthServer(
+			CM_setVectorArrayDynamicVariable,
+			new MessageQueueGenericValueType<std::pair<std::string, std::vector<Vector> > >(
+				std::make_pair(name, value)));
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::setObjVarItem(std::string const &name, DynamicVariable const &value)
+{
+	FATAL(!isAuthoritative(), ("setObjVarItem using a DynamicVariable value can only be used on auth objects"));
+	if (!m_objVars.setItem(name, value))
+		return false;
+	return true;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject_Synchronization.cpp b/engine/server/library/serverGame/src/shared/object/ServerObject_Synchronization.cpp
new file mode 100644
index 00000000..a869fcf9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerObject_Synchronization.cpp
@@ -0,0 +1,1107 @@
+// ======================================================================
+//
+// ServerObject_Synchronization.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerObject.h"
+
+#include "serverGame/BaselineDistributionListPool.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ConnectionServerConnection.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/ContainmentMessageManager.h"
+#include "serverGame/DestroyMessageManager.h"
+#include "serverGame/DistributionListStack.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerObjectBaselinesManager.h"
+#include "serverGame/ServerWorld.h"
+#include "serverNetworkMessages/CreateObjectMessage.h"
+#include "serverNetworkMessages/EndBaselinesMessage.h"
+#include "serverNetworkMessages/GameConnectionServerMessages.h"
+#include "serverNetworkMessages/SynchronizeScriptVarsMessage.h"
+#include "serverNetworkMessages/UnloadObjectMessage.h"
+#include "serverNetworkMessages/UpdateObjectPositionMessage.h"
+#include "serverScript/GameScriptObject.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/ContainedByProperty.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/PortalProperty.h"
+#include "sharedObject/SlottedContainmentProperty.h"
+#include "sharedNetworkMessages/BaselinesMessage.h"
+#include "sharedNetworkMessages/DeltasMessage.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/SceneChannelMessages.h"
+#include "sharedNetworkMessages/UpdateContainmentMessage.h"
+
+// ======================================================================
+
+namespace ServerObject_SynchronizationNamespace
+{
+
+	// ----------------------------------------------------------------------
+
+	Client const *getParentPlayerClient(ServerObject const *o)
+	{
+		while (o && !o->isInWorld() && !o->isPlayerControlled())
+			o = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*o));
+		return o ? o->getClient() : 0;
+	}
+
+	// ----------------------------------------------------------------------
+
+	void logBaselines(NetworkId const &senderId, char const *messageType, std::vector<NetworkId> const & clients)
+	{
+		if (!ConfigServerGame::getLogBaselines())
+			return;
+
+		for (std::vector<NetworkId>::const_iterator i = clients.begin(); i != clients.end(); ++i)
+		{
+			DEBUG_REPORT_LOG(true, ("Baselines: %s for object %s to client %s\n", messageType, senderId.getValueString().c_str(), (*i).getValueString().c_str()));
+			LOG(
+				"Baselines",
+				(
+					"%s for object %s to client %s",
+					messageType,
+					senderId.getValueString().c_str(),
+					(*i).getValueString().c_str()));
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+}
+using namespace ServerObject_SynchronizationNamespace;
+
+// ======================================================================
+
+void ServerObject::synchronizationOnConstruct()
+{
+	m_dirtyArchiveCallback.set(*this, &ServerObject::onAutoDeltaChanged);
+	m_authClientServerPackage.addOnDirtyCallback(&m_dirtyArchiveCallback);
+	m_authClientServerPackage_np.addOnDirtyCallback(&m_dirtyArchiveCallback);
+	m_firstParentAuthClientServerPackage.addOnDirtyCallback(&m_dirtyArchiveCallback);
+	m_firstParentAuthClientServerPackage_np.addOnDirtyCallback(&m_dirtyArchiveCallback);
+	m_serverPackage.addOnDirtyCallback(&m_dirtyArchiveCallback);
+	m_serverPackage_np.addOnDirtyCallback(&m_dirtyArchiveCallback);
+	m_sharedPackage.addOnDirtyCallback(&m_dirtyArchiveCallback);
+	m_sharedPackage_np.addOnDirtyCallback(&m_dirtyArchiveCallback);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::synchronizationOnDestruct()
+{
+	BaselineDistributionListPool::free(*this);
+
+	m_authClientServerPackage.removeOnDirtyCallback();
+	m_authClientServerPackage_np.removeOnDirtyCallback();
+	m_firstParentAuthClientServerPackage.removeOnDirtyCallback();
+	m_firstParentAuthClientServerPackage_np.removeOnDirtyCallback();
+	m_serverPackage.removeOnDirtyCallback();
+	m_serverPackage_np.removeOnDirtyCallback();
+	m_sharedPackage.removeOnDirtyCallback();
+	m_sharedPackage_np.removeOnDirtyCallback();
+
+	ServerObjectBaselinesManager::serverObjDestroyed(*this);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::synchronizationOnContainerChange(ServerObject const *oldContainer, ServerObject const *newContainer) const
+{
+	ServerObjectBaselinesManager::onContainerChanged(*this, oldContainer, newContainer);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::synchronizationOnLoadedInContainer()
+{
+	ServerObject * const containingObject = safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(*this));
+	FATAL(!containingObject, ("ServerObject::synchronizationOnLoadedInContainer: obj %s with unresolvable container", getDebugInformation().c_str()));
+
+	if (containingObject->isInitialized() && containingObject->isAuthoritative())
+	{
+		ProxyList const &proxyList = containingObject->getExposedProxyList();
+		if (!proxyList.empty())
+		{
+			ServerMessageForwarding::begin(std::vector<uint32>(proxyList.begin(), proxyList.end()));
+
+			forwardServerCreateAndBaselines();
+
+			ServerMessageForwarding::end();
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::synchronizationOnUnload() const
+{
+	if (isAuthoritative())
+	{
+		ProxyList const &proxyList = getExposedProxyList();
+		if (!proxyList.empty())
+		{
+			ServerMessageForwarding::begin(std::vector<uint32>(proxyList.begin(), proxyList.end()));
+
+			UnloadObjectMessage const unloadMessage(getNetworkId());
+			ServerMessageForwarding::send(unloadMessage);
+
+			ServerMessageForwarding::end();
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::onAutoDeltaChanged()
+{
+	setLocalFlag(LocalObjectFlags::ServerObject_AutoDeltaChanged, true);
+	addObjectToConcludeList();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::addAuthClientServerVariable(Archive::AutoDeltaVariableBase &source)
+{
+	m_authClientServerPackage.addVariable(source);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::addAuthClientServerVariable_np(Archive::AutoDeltaVariableBase &source)
+{
+	m_authClientServerPackage_np.addVariable(source);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::addFirstParentAuthClientServerVariable(Archive::AutoDeltaVariableBase &source)
+{
+	m_firstParentAuthClientServerPackage.addVariable(source);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::addFirstParentAuthClientServerVariable_np(Archive::AutoDeltaVariableBase &source)
+{
+	m_firstParentAuthClientServerPackage_np.addVariable(source);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::addServerVariable(Archive::AutoDeltaVariableBase &source)
+{
+	m_serverPackage.addVariable(source);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::addServerVariable_np(Archive::AutoDeltaVariableBase &source)
+{
+	m_serverPackage_np.addVariable(source);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::addSharedVariable(Archive::AutoDeltaVariableBase &source)
+{
+	m_sharedPackage.addVariable(source);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::addSharedVariable_np(Archive::AutoDeltaVariableBase &source)
+{
+	m_sharedPackage_np.addVariable(source);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::sendCreateAndBaselinesToClient(Client &client) const
+{
+	if (getSendToClient() && !isBeingDestroyed())
+	{
+		if (!DestroyMessageManager::remove(&client, getNetworkId()))
+		{
+			std::vector<Watcher<Client> > *baselineDistributionList = BaselineDistributionListPool::get(*this, true);
+			if (baselineDistributionList->empty())
+				ServerObjectBaselinesManager::add(*this);
+			baselineDistributionList->push_back(Watcher<Client>(&client));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::sendCreateAndBaselinesToDatabaseServer() const
+{
+	if (isBeingDestroyed())
+		return;
+
+	FATAL(!isAuthoritative(), ("ServerObject::sendCreateAndBaselinesToDatabaseServer: obj %s, while non-auth", getDebugInformation().c_str()));
+	FATAL(!isPersisted(), ("ServerObject::sendCreateAndBaselinesToDatabaseServer: obj %s, while nonpersisted", getDebugInformation().c_str()));
+
+	GameServer::incrementTotalObjectCreatesSent();
+
+	NetworkId const &containedById = ContainerInterface::getContainedByProperty(*this)->getContainedByNetworkId();
+	NetworkId const &loadWithId = ContainerInterface::getLoadWithContainerId(*this);
+	int const currentArrangement = ContainerInterface::getSlottedContainmentProperty(*this)->getCurrentArrangement();
+
+	CreateObjectByCrcMessage const createMessage(getNetworkId(), getTemplateCrc(), getObjectType(), false, containedById);
+
+	//Vector vp = getTransform_o2p().getPosition_p();
+	//Vector vw = getTransform_o2w().getPosition_p();
+	//LOG("ServerObject",("Baseline PS XYZ (%f %f %f)   WS XYZ (%f %f %f)",vp.x, vp.y, vp.z, vw.x, vw.y, vw.z));
+
+	Transform worldspaceTransformForDatabase(getTransform_o2w());
+
+	// if it's a player inside a container, the world space coordinate
+	// that should be saved is the world space coordinate of the topmost
+	// container; this way, player logging out of a house will get
+	// loaded back into the same game server as the house, thus maximizing
+	// that chance that the player will loaded back into the house
+	if (isPlayerControlled() && asCreatureObject())
+	{
+		Object const *containerObj = ContainerInterface::getTopmostContainer(*this);
+
+		if (containerObj && (containerObj != this))
+		{
+			worldspaceTransformForDatabase = containerObj->getTransform_o2w();
+		}
+	}
+
+	UpdateObjectPositionMessage const uop(getNetworkId(), getTransform_o2p(), worldspaceTransformForDatabase, containedById, currentArrangement, loadWithId, isPlayerControlled(), asCreatureObject() ? true : false);
+	BaselinesMessage const shared(getNetworkId(), getObjectType(), m_sharedPackage, BaselinesMessage::BASELINES_SHARED);
+	BaselinesMessage const authClient(getNetworkId(), getObjectType(), m_authClientServerPackage, BaselinesMessage::BASELINES_CLIENT_SERVER);
+	BaselinesMessage const servers(getNetworkId(), getObjectType(), m_serverPackage, BaselinesMessage::BASELINES_SERVER);
+	BaselinesMessage const firstParentAuthClient(getNetworkId(), getObjectType(), m_firstParentAuthClientServerPackage, BaselinesMessage::BASELINES_FIRST_PARENT_CLIENT_SERVER);
+
+	GameServer::getInstance().sendToDatabaseServer(createMessage);
+	GameServer::getInstance().sendToDatabaseServer(uop);
+	GameServer::getInstance().sendToDatabaseServer(shared);
+	GameServer::getInstance().sendToDatabaseServer(authClient);
+	GameServer::getInstance().sendToDatabaseServer(servers);
+	GameServer::getInstance().sendToDatabaseServer(firstParentAuthClient);
+
+	Container const * const container = ContainerInterface::getContainer(*this);
+	if (container)
+	{
+		for (ContainerConstIterator containerIterator = container->begin(); containerIterator != container->end(); ++containerIterator)
+		{
+			ServerObject const * const containedObject = safe_cast<ServerObject const *>((*containerIterator).getObject());
+			if (containedObject && containedObject->isPersisted())
+				containedObject->sendCreateAndBaselinesToDatabaseServer();
+		}
+	}
+
+	EndBaselinesMessage const endBaselinesMessage(getNetworkId());
+	GameServer::getInstance().sendToDatabaseServer(endBaselinesMessage);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::forwardServerCreateAndBaselines() const
+{
+	if (isBeingDestroyed())
+		return;
+
+	FATAL(!isAuthoritative(), ("ServerObject::forwardServerCreateAndBaselines: obj %s, while non-auth", getDebugInformation().c_str()));
+
+	GameServer::incrementTotalObjectCreatesSent();
+
+	NetworkId const &containedById = ContainerInterface::getContainedByProperty(*this)->getContainedByNetworkId();
+	NetworkId const &loadWithId = ContainerInterface::getLoadWithContainerId(*this);
+	int const currentArrangement = ContainerInterface::getSlottedContainmentProperty(*this)->getCurrentArrangement();
+
+	CreateObjectByCrcMessage const createMessage(getNetworkId(), getTemplateCrc(), getObjectType(), false, containedById);
+
+	//Vector vp = getTransform_o2p().getPosition_p();
+	//Vector vw = getTransform_o2w().getPosition_p();
+	//LOG("ServerObject",("forwardServerCreateAndBaselines PS XYZ (%f %f %f)   WS XYZ (%f %f %f)",vp.x, vp.y, vp.z, vw.x, vw.y, vw.z));
+
+	UpdateObjectPositionMessage const uop(getNetworkId(), getTransform_o2p(), getTransform_o2w(), containedById, currentArrangement, loadWithId, isPlayerControlled(), asCreatureObject() ? true : false);
+	BaselinesMessage const shared(getNetworkId(), getObjectType(), m_sharedPackage, BaselinesMessage::BASELINES_SHARED);
+	BaselinesMessage const authClient(getNetworkId(), getObjectType(), m_authClientServerPackage, BaselinesMessage::BASELINES_CLIENT_SERVER);
+	BaselinesMessage const servers(getNetworkId(), getObjectType(), m_serverPackage, BaselinesMessage::BASELINES_SERVER);
+	BaselinesMessage const sharedNp(getNetworkId(), getObjectType(), m_sharedPackage_np, BaselinesMessage::BASELINES_SHARED_NP);
+	BaselinesMessage const authClientNp(getNetworkId(), getObjectType(), m_authClientServerPackage_np, BaselinesMessage::BASELINES_CLIENT_SERVER_NP);
+	BaselinesMessage const serversNp(getNetworkId(), getObjectType(), m_serverPackage_np, BaselinesMessage::BASELINES_SERVER_NP);
+	BaselinesMessage const firstParentAuthClient(getNetworkId(), getObjectType(), m_firstParentAuthClientServerPackage, BaselinesMessage::BASELINES_FIRST_PARENT_CLIENT_SERVER);
+	BaselinesMessage const firstParentAuthClientNp(getNetworkId(), getObjectType(), m_firstParentAuthClientServerPackage_np, BaselinesMessage::BASELINES_FIRST_PARENT_CLIENT_SERVER_NP);
+
+	ServerMessageForwarding::send(createMessage);
+	ServerMessageForwarding::send(uop);
+	ServerMessageForwarding::send(shared);
+	ServerMessageForwarding::send(authClient);
+	ServerMessageForwarding::send(servers);
+	ServerMessageForwarding::send(sharedNp);
+	ServerMessageForwarding::send(authClientNp);
+	ServerMessageForwarding::send(firstParentAuthClient);
+	ServerMessageForwarding::send(firstParentAuthClientNp);
+	ServerMessageForwarding::send(serversNp);
+
+	if (m_scriptObject)
+	{
+		std::vector<int8> scriptVars;
+		m_scriptObject->packScriptVars(scriptVars);
+		if (!scriptVars.empty())
+		{
+			SynchronizeScriptVarsMessage const scriptVarsMessage(getNetworkId(), scriptVars);
+			ServerMessageForwarding::send(scriptVarsMessage);
+		}
+	}
+
+	forwardServerObjectSpecificBaselines();
+
+	Container const * const container = ContainerInterface::getContainer(*this);
+	if (container)
+	{
+		for (ContainerConstIterator containerIterator = container->begin(); containerIterator != container->end(); ++containerIterator)
+		{
+			ServerObject const * const containedObject = safe_cast<ServerObject const *>((*containerIterator).getObject());
+			if (containedObject)
+				containedObject->forwardServerCreateAndBaselines();
+		}
+	}
+
+	EndBaselinesMessage const endBaselinesMessage(getNetworkId());
+	ServerMessageForwarding::send(endBaselinesMessage);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::sendDeltasForSelfAndContents(ProxyList const *proxyList) const
+{
+	sendDeltas(proxyList);
+
+	Container const * const container = ContainerInterface::getContainer(*this);
+	if (container)
+	{
+		for (ContainerConstIterator i = container->begin(); i != container->end(); ++i)
+		{
+			ServerObject const * const containedObject = safe_cast<ServerObject const *>((*i).getObject());
+			if (containedObject)
+				containedObject->sendDeltasForSelfAndContents(proxyList);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::sendDeltas(ProxyList const *proxyList) const
+{
+	FATAL(!isInitialized(), ("ServerObject::sendDeltas: %s while uninitialized.", getDebugInformation().c_str()));
+
+	if (!getLocalFlag(LocalObjectFlags::ServerObject_AutoDeltaChanged) || isBeingDestroyed())
+		return;
+
+	PROFILER_AUTO_BLOCK_DEFINE("ServerObject::sendDeltas");
+
+	ProxyList const * const proxyServers = proxyList ? proxyList : &getExposedProxyList();
+
+	bool const sendServerDeltas = !proxyServers->empty();
+
+	if (sendServerDeltas)
+		ServerMessageForwarding::begin(std::vector<uint32>(proxyServers->begin(), proxyServers->end()));
+
+	// sync auth client data (if we have an auth client)
+	if (   m_authClientServerPackage.getItemCount() > 0
+	    || m_authClientServerPackage_np.getItemCount() > 0)
+	{
+		static std::set<Client const *> authClients;
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("getAuthClients");
+			getAuthClients(authClients);
+		}
+
+		if (m_authClientServerPackage.getItemCount() > 0)
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("authClientServerPackage");
+			DeltasMessage const cdm(getNetworkId(), getObjectType(), m_authClientServerPackage, DeltasMessage::DELTAS_CLIENT_SERVER);
+			for (std::set<Client const *>::const_iterator i = authClients.begin(); i != authClients.end(); ++i)
+				(*i)->send(cdm, true);
+			if (isAuthoritative())
+			{
+				if (sendServerDeltas)
+					ServerMessageForwarding::send(cdm);
+				if (isPersisted())
+					GameServer::getInstance().sendToDatabaseServer(cdm);
+			}
+		}
+		if (m_authClientServerPackage_np.getItemCount() > 0)
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("authClientServerPackage_np");
+			DeltasMessage const cdm(getNetworkId(), getObjectType(), m_authClientServerPackage_np, DeltasMessage::DELTAS_CLIENT_SERVER_NP);
+			for (std::set<Client const *>::const_iterator i = authClients.begin(); i != authClients.end(); ++i)
+				(*i)->send(cdm, true);
+			if (isAuthoritative() && sendServerDeltas)
+				ServerMessageForwarding::send(cdm);
+		}
+		authClients.clear();
+	}
+
+	// first parent auth client data
+	{
+		Client const * const parentPlayerClient = getParentPlayerClient(this);
+
+		if (m_firstParentAuthClientServerPackage.getItemCount() > 0)
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("firstParentAuthClientServerPackage");
+			DeltasMessage const cdm(getNetworkId(), getObjectType(), m_firstParentAuthClientServerPackage, DeltasMessage::DELTAS_FIRST_PARENT_CLIENT_SERVER);
+			if (parentPlayerClient)
+				parentPlayerClient->send(cdm, true);
+			if (isAuthoritative())
+			{
+				if (sendServerDeltas)
+					ServerMessageForwarding::send(cdm);
+				if (isPersisted())
+					GameServer::getInstance().sendToDatabaseServer(cdm);
+			}
+		}
+
+		if (m_firstParentAuthClientServerPackage_np.getItemCount() > 0)
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("firstParentAuthClientServerPackage_np");
+			DeltasMessage const cdm(getNetworkId(), getObjectType(), m_firstParentAuthClientServerPackage_np, DeltasMessage::DELTAS_FIRST_PARENT_CLIENT_SERVER_NP);
+			if (parentPlayerClient)
+				parentPlayerClient->send(cdm, true);
+			if (isAuthoritative() && sendServerDeltas)
+				ServerMessageForwarding::send(cdm);
+		}
+	}
+
+	// sync shared data
+	if (m_sharedPackage.getItemCount() > 0)
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("sharedPackage");
+		DeltasMessage const sharedPkg(getNetworkId(), getObjectType(), m_sharedPackage, DeltasMessage::DELTAS_SHARED);
+		sendToClientsInUpdateRange(sharedPkg, true);
+		if (isAuthoritative())
+		{
+			if (sendServerDeltas)
+				ServerMessageForwarding::send(sharedPkg);
+			if (isPersisted())
+				GameServer::getInstance().sendToDatabaseServer(sharedPkg);
+		}
+	}
+	if (m_sharedPackage_np.getItemCount() > 0)
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("sharedPackage_np");
+		DeltasMessage const sharedPkgNp(getNetworkId(), getObjectType(), m_sharedPackage_np, DeltasMessage::DELTAS_SHARED_NP);
+		sendToClientsInUpdateRange(sharedPkgNp, true);
+		if (isAuthoritative() && sendServerDeltas)
+			ServerMessageForwarding::send(sharedPkgNp);
+	}
+
+	// sync server data (if we are authoritative)
+	if (isAuthoritative())
+	{
+		if (m_serverPackage.getItemCount() > 0)
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("serverPackage");
+			DeltasMessage const server(getNetworkId(), getObjectType(), m_serverPackage, DeltasMessage::DELTAS_SERVER);
+			if (sendServerDeltas)
+				ServerMessageForwarding::send(server);
+			if (isPersisted())
+				GameServer::getInstance().sendToDatabaseServer(server);
+		}
+		if (sendServerDeltas && m_serverPackage_np.getItemCount() > 0)
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("serverPackage_np");
+			DeltasMessage const serverNp(getNetworkId(), getObjectType(), m_serverPackage_np, DeltasMessage::DELTAS_SERVER_NP);
+			ServerMessageForwarding::send(serverNp);
+		}
+	}
+
+	clearDeltas();
+
+	if (sendServerDeltas)
+		ServerMessageForwarding::end();
+
+	// sync any real time UI
+	if (m_synchronizedUi.getPointer())
+		m_synchronizedUi->sendDeltas();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::applyObjectPositionUpdate(UpdateObjectPositionMessage const &source)
+{
+	FATAL(isInitialized(), ("ServerObject::applyObjectPositionUpdate: obj %s, while initialized", getDebugInformation().c_str()));
+
+	// catch the situation where we are trying to put the
+	// (authoritative) object into a proxy container;
+	// there are bad contained_by/load_with data in the DB
+	// that can cause this situation
+	ServerObject * const container = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(source.getContainerId()));
+	if (container && !container->isAuthoritative() && isAuthoritative())
+	{
+		// it's OK if this happens to a character object;
+		// fix it by moving the character outside of the container
+		if (source.getPlayerControlled() && !ServerWorld::isSpaceScene())
+		{
+			DEBUG_REPORT_LOG(true,("Ejecting player %s from container %s, because the container is not authoritative\n",getNetworkId().getValueString().c_str(), container->getNetworkId().getValueString().c_str()));
+			LOG("CustomerService",("Login:  Ejecting player %s from container %s, because the container is not authoritative",getNetworkId().getValueString().c_str(), container->getNetworkId().getValueString().c_str()));
+
+			// attempt to put the character at the ejection point of the building
+			Object * const topmostObject = ContainerInterface::getTopmostContainer(*container);
+			if (topmostObject)
+			{
+				PortalProperty * const portalProperty = topmostObject->getPortalProperty();
+				if (portalProperty)
+				{
+					Transform destinationTransform(Transform::IF_none);
+					destinationTransform.multiply(topmostObject->getTransform_o2w(), portalProperty->getEjectionLocationTransform());
+					setTransform_o2p(destinationTransform);
+				}
+				else
+				{
+					// put the character at the location of the building
+					setTransform_o2p(topmostObject->getTransform_o2w());
+				}
+			}
+			else
+			{
+				// last resort, just leave him where he is, out
+				// in the world, which will most likely put him
+				// near the origin
+				setTransform_o2p(source.getTransform());
+			}
+
+			getContainedByProperty()->setContainedBy(NetworkId::cms_invalid, false);
+			ContainerInterface::getSlottedContainmentProperty(*this)->setCurrentArrangement(-1, false);
+		}
+		else
+		{
+			ServerObject const * const loadWith = safe_cast<ServerObject const *>(NetworkIdManager::getObjectById(source.getLoadWith()));
+
+			LOG("CustomerService", ("BadContainerDepersist: Tried to depersist auth object %s (load with %s) into non-auth container %s.", getDebugInformation().c_str(), (loadWith ? loadWith->getDebugInformation().c_str() : source.getLoadWith().getValueString().c_str()) , container->getDebugInformation().c_str()));
+			unload();
+		}
+
+		return;
+	}
+
+	setTransform_o2p(source.getTransform());
+	getContainedByProperty()->setContainedBy(source.getContainerId(), false);
+	ContainerInterface::getSlottedContainmentProperty(*this)->setCurrentArrangement(source.getSlotArrangement(), false);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::updateContainment(NetworkId const &containerId, int slotArrangement)
+{
+	FATAL(isAuthoritative(), ("ServerObject::updateContainment: obj %s, container %s, arrangement %d, while auth", getDebugInformation().c_str(), containerId.getValueString().c_str(), slotArrangement));
+
+	getContainedByProperty()->setContainedBy(containerId, false);
+	ContainerInterface::getSlottedContainmentProperty(*this)->setCurrentArrangement(slotArrangement, false);
+	ContainmentMessageManager::addContainmentMessage(*this);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::containerHandleUpdateProxies(ServerObject *oldContainer, ServerObject *newContainer)
+{
+	FATAL(!isAuthoritative(), ("ServerObject::containerHandleUpdateProxies: obj %s, while non-auth", getDebugInformation().c_str()));
+
+	// Queue containment update to be sent to local clients - proxy clients will get the update from the change on their server.
+	ContainmentMessageManager::addContainmentMessage(*this);
+
+	// determine old and new topmost containers
+	ServerObject * const oldTopmost = oldContainer ? NON_NULL(safe_cast<ServerObject *>(ContainerInterface::getTopmostContainer(*oldContainer))) : this;
+	ServerObject * const newTopmost = newContainer ? NON_NULL(safe_cast<ServerObject *>(ContainerInterface::getTopmostContainer(*newContainer))) : this;
+
+	// determine old and new proxy lists
+	ProxyList const &oldProxyList = oldTopmost->getPrivateProxyList();
+	ProxyList const &newProxyList = newContainer ? newTopmost->getPrivateProxyList() : oldProxyList;
+
+	// send unloads to servers only in old proxy lists
+	// send baselines to servers only in new proxy lists
+	// send containment update to servers in both old and new proxy lists
+
+	if (oldTopmost == newTopmost)
+	{
+		// If we have not changed topmost containers, our proxy list has not changed,
+		// so send containment updates to everything in our proxy list.
+		if (!newProxyList.empty())
+		{
+			ServerMessageForwarding::begin(std::vector<uint32>(newProxyList.begin(), newProxyList.end()));
+
+			UpdateContainmentMessage const ucm(
+				getNetworkId(),
+				newContainer ? newContainer->getNetworkId() : NetworkId::cms_invalid,
+				ContainerInterface::getSlottedContainmentProperty(*this)->getCurrentArrangement());
+			ServerMessageForwarding::send(ucm);
+
+			ServerMessageForwarding::end();
+		}
+	}
+	else
+	{
+		std::vector<uint32> addedProxies;
+		std::vector<uint32> removedProxies;
+		std::vector<uint32> sustainedProxies;
+
+		for (ProxyList::const_iterator i = oldProxyList.begin(); i != oldProxyList.end(); ++i)
+		{
+			if (!newProxyList.count(*i))
+				removedProxies.push_back(*i);
+			else
+				sustainedProxies.push_back(*i);
+		}
+
+		for (ProxyList::const_iterator j = newProxyList.begin(); j != newProxyList.end(); ++j)
+			if (!oldProxyList.count(*j))
+				addedProxies.push_back(*j);
+
+		if (!removedProxies.empty())
+		{
+			ServerMessageForwarding::begin(removedProxies);
+
+			UnloadObjectMessage const unloadMessage(getNetworkId());
+			ServerMessageForwarding::send(unloadMessage);
+
+			ServerMessageForwarding::end();
+		}
+
+		if (!sustainedProxies.empty())
+		{
+			ServerMessageForwarding::begin(sustainedProxies);
+
+			UpdateContainmentMessage const ucm(
+				getNetworkId(),
+				newContainer ? newContainer->getNetworkId() : NetworkId::cms_invalid,
+				ContainerInterface::getSlottedContainmentProperty(*this)->getCurrentArrangement());
+			ServerMessageForwarding::send(ucm);
+
+			ServerMessageForwarding::end();
+		}
+
+		if (!addedProxies.empty())
+		{
+			ServerMessageForwarding::begin(addedProxies);
+
+			forwardServerCreateAndBaselines();
+
+			ServerMessageForwarding::end();
+		}
+	}
+
+	if (newContainer)
+		m_proxyServerProcessIds.clear();
+	else
+		copyProxyList(*oldTopmost);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::applyBaselines(BaselinesMessage const &source)
+{
+	applyBaselines(source.getPackageId(), source.getPackage());
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::applyBaselines(char type, Archive::ByteStream const & package)
+{
+	Archive::ReadIterator ri = package.begin();
+	switch (type)
+	{
+	case BaselinesMessage::BASELINES_CLIENT_SERVER:
+		m_authClientServerPackage.unpack(ri);
+		break;
+	case BaselinesMessage::BASELINES_SERVER:
+		m_serverPackage.unpack(ri);
+		break;
+	case BaselinesMessage::BASELINES_SHARED:
+		m_sharedPackage.unpack(ri);
+		break;
+	case BaselinesMessage::BASELINES_CLIENT_SERVER_NP:
+		m_authClientServerPackage_np.unpack(ri);
+		break;
+	case BaselinesMessage::BASELINES_SERVER_NP:
+		m_serverPackage_np.unpack(ri);
+		break;
+	case BaselinesMessage::BASELINES_SHARED_NP:
+		m_sharedPackage_np.unpack(ri);
+		break;
+	case BaselinesMessage::BASELINES_FIRST_PARENT_CLIENT_SERVER:
+		m_firstParentAuthClientServerPackage.unpack(ri);
+		break;
+	case BaselinesMessage::BASELINES_FIRST_PARENT_CLIENT_SERVER_NP:
+		m_firstParentAuthClientServerPackage_np.unpack(ri);
+		break;
+	case BaselinesMessage::BASELINES_UI:
+		#ifdef _DEBUG
+		WARNING_STRICT_FATAL(!m_synchronizedUi, ("Got UI package for %s with no UI object", getNetworkId().getValueString().c_str()));
+		#endif
+		if (m_synchronizedUi.getPointer())
+			m_synchronizedUi->applyBaselines(ri);
+		break;
+	default:
+		FATAL(true, ("ServerObject::applyBaselines on %s with unknown package %d", getDebugInformation().c_str(), static_cast<int>(type)));
+		break;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::applyDeltas(DeltasMessage const &source)
+{
+	FATAL(!isInitialized(), ("ServerObject::applyDeltas on unitinialized object %s.", getDebugInformation().c_str()));
+	WARNING(isAuthoritative(), ("ServerObject::applyDeltas on auth object %s.", getDebugInformation().c_str()));
+
+	unsigned char const type = source.getPackageId();
+	Archive::ReadIterator ri = source.getPackage().begin();
+	switch (type)
+	{
+	case DeltasMessage::DELTAS_CLIENT_SERVER:
+		m_authClientServerPackage.unpackDeltas(ri);
+		break;
+	case DeltasMessage::DELTAS_SERVER:
+		m_serverPackage.unpackDeltas(ri);
+		break;
+	case DeltasMessage::DELTAS_SHARED:
+		m_sharedPackage.unpackDeltas(ri);
+		break;
+	case DeltasMessage::DELTAS_CLIENT_SERVER_NP:
+		m_authClientServerPackage_np.unpackDeltas(ri);
+		break;
+	case DeltasMessage::DELTAS_SERVER_NP:
+		m_serverPackage_np.unpackDeltas(ri);
+		break;
+	case DeltasMessage::DELTAS_SHARED_NP:
+		m_sharedPackage_np.unpackDeltas(ri);
+		break;
+	case DeltasMessage::DELTAS_FIRST_PARENT_CLIENT_SERVER:
+		m_firstParentAuthClientServerPackage.unpackDeltas(ri);
+		break;
+	case DeltasMessage::DELTAS_FIRST_PARENT_CLIENT_SERVER_NP:
+		m_firstParentAuthClientServerPackage_np.unpackDeltas(ri);
+		break;
+	case DeltasMessage::DELTAS_UI:
+		#ifdef _DEBUG
+		WARNING_STRICT_FATAL(!m_synchronizedUi, ("Got UI delta package for %s with no UI object", getNetworkId().getValueString().c_str()));
+		#endif
+		if (m_synchronizedUi.getPointer())
+			m_synchronizedUi->applyDeltas(source);
+		break;
+	default:
+		FATAL(true, ("ServerObject::applyDeltas on %s with unknown package %d", getDebugInformation().c_str(), static_cast<int>(type)));
+		break;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::removeFromBaselineDistributionList(Client const &client) const
+{
+	std::vector<Watcher<Client> > *baselineDistributionList = BaselineDistributionListPool::get(*this, false);
+	if (baselineDistributionList)
+	{
+		std::vector<Watcher<Client> >::iterator i = std::find(baselineDistributionList->begin(), baselineDistributionList->end(), &client);
+		if (i != baselineDistributionList->end())
+		{
+			IGNORE_RETURN(baselineDistributionList->erase(i));
+			return true;
+		}
+	}
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::sendAuthClientBaselines(Client const &client) const
+{
+	BaselinesMessage const authClientSvrPkg(getNetworkId(), getObjectType(), m_authClientServerPackage, BaselinesMessage::BASELINES_CLIENT_SERVER);
+	BaselinesMessage const authClientSvrPkgNp(getNetworkId(), getObjectType(), m_authClientServerPackage_np, BaselinesMessage::BASELINES_CLIENT_SERVER_NP);
+	client.send(authClientSvrPkg, true);
+	client.send(authClientSvrPkgNp, true);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::sendFirstParentBaselines(Client const &client) const
+{
+	BaselinesMessage const firstParentAuthClientSvrPkg(getNetworkId(), getObjectType(), m_firstParentAuthClientServerPackage, BaselinesMessage::BASELINES_FIRST_PARENT_CLIENT_SERVER);
+	BaselinesMessage const firstParentAuthClientSvrPkgNp(getNetworkId(), getObjectType(), m_firstParentAuthClientServerPackage_np, BaselinesMessage::BASELINES_FIRST_PARENT_CLIENT_SERVER_NP);
+	client.send(firstParentAuthClientSvrPkg, true);
+	client.send(firstParentAuthClientSvrPkgNp, true);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::flushCreateMessages() const
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ServerObject::flushCreateMessages");
+
+	// Validate this object's transform prior to sending baseline messages.
+	checkAndLogInvalidTransform();
+
+	std::map<ConnectionServerConnection *, std::vector<NetworkId> > &tmpDistributionList = DistributionListStack::alloc();
+
+	std::vector<Watcher<Client> > * const baselineDistributionList = BaselineDistributionListPool::get(*this, false);
+
+	if (baselineDistributionList && !baselineDistributionList->empty())
+	{
+		ContainmentMessageManager::addFrameBaselines(getNetworkId(), *baselineDistributionList);
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("ServerObject::flushCreateMessages.buildConnectionList");
+			for (std::vector<Watcher<Client> >::const_iterator i = baselineDistributionList->begin(); i != baselineDistributionList->end(); ++i)
+			{
+				// build connection list
+				Client * const c = *i;
+				if (c)
+				{
+					ConnectionServerConnection * const n = c->getConnection();
+					if (n)
+					{
+						std::vector<NetworkId> &list = tmpDistributionList[n];
+						list.push_back(c->getCharacterObjectId());
+					}
+				}
+			}
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("ServerObject::flushCreateMessages.send");
+			//-- build client object creation messages
+			GameNetworkMessage *com = 0;
+			ConstCharCrcString const clientSharedTemplateNameCrcString = ObjectTemplateList::lookUp(getClientSharedTemplateName());
+			if (clientSharedTemplateNameCrcString.isEmpty())
+				com = new SceneCreateObjectByName(getNetworkId(), getTransform_o2p(), getClientSharedTemplateName(), getLocalFlag(LocalObjectFlags::ServerObject_HyperspaceOnCreate));
+			else
+				com = new SceneCreateObjectByCrc(getNetworkId(), getTransform_o2p(), clientSharedTemplateNameCrcString.getCrc(), getLocalFlag(LocalObjectFlags::ServerObject_HyperspaceOnCreate));
+
+			UpdateContainmentMessage const ucm(
+				getNetworkId(),
+				ContainerInterface::getContainedByProperty(*this)->getContainedByNetworkId(),
+				ContainerInterface::getSlottedContainmentProperty(*this)->getCurrentArrangement());
+			bool sendContainmentUpdate = (ucm.getContainerId() != NetworkId::cms_invalid || ucm.getSlotArrangement() != -1);
+
+			BaselinesMessage const sharedPkg(getNetworkId(), getObjectType(), m_sharedPackage, BaselinesMessage::BASELINES_SHARED);
+			BaselinesMessage const sharedPkgNp(getNetworkId(), getObjectType(), m_sharedPackage_np, BaselinesMessage::BASELINES_SHARED_NP);
+
+			for (std::map<ConnectionServerConnection *, std::vector<NetworkId> >::const_iterator i = tmpDistributionList.begin(); i != tmpDistributionList.end(); ++i)
+			{
+				GameClientMessage const msgCom((*i).second, true, *com);
+				(*i).first->send(msgCom, true);
+				logBaselines(getNetworkId(), com->getCmdName().c_str(), (*i).second);
+
+				// send containment updates
+				if (sendContainmentUpdate)
+				{
+					GameClientMessage const msgUpdateContainment((*i).second, true, ucm);
+					(*i).first->send(msgUpdateContainment, true);
+				}
+
+				// send shared data baselines
+				GameClientMessage const msgSharedPkg((*i).second, true, sharedPkg);
+				(*i).first->send(msgSharedPkg, true);
+
+				GameClientMessage const msgSharedPkgNp((*i).second, true, sharedPkgNp);
+				(*i).first->send(msgSharedPkgNp, true);
+			}
+			delete com;
+		}
+
+		// send auth client data
+		{
+			static std::set<Client const *> authClients;
+			getAuthClients(authClients);
+			for (std::set<Client const *>::const_iterator i = authClients.begin(); i != authClients.end(); ++i)
+				if ((*i) && std::find(baselineDistributionList->begin(), baselineDistributionList->end(), (*i)) != baselineDistributionList->end())
+					sendAuthClientBaselines(**i);
+			authClients.clear();
+
+			Client const * const parentPlayerClient = getParentPlayerClient(this);
+			if (parentPlayerClient && std::find(baselineDistributionList->begin(), baselineDistributionList->end(), parentPlayerClient) != baselineDistributionList->end())
+				sendFirstParentBaselines(*parentPlayerClient);
+		}
+	}
+
+	// Flush create messages for contents
+	Container const * const container = ContainerInterface::getContainer(*this);
+	if (container)
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("ServerObject::flushCreateMessages.flushContents");
+		for (ContainerConstIterator i = container->begin(); i != container->end(); ++i)
+		{
+			ServerObject const * const containedObject = safe_cast<ServerObject const *>((*i).getObject());
+			if (containedObject)
+				containedObject->flushCreateMessages();
+		}
+	}
+
+	if (baselineDistributionList && !baselineDistributionList->empty())
+	{
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("ServerObject::flushCreateMessages.sendObjectSpecificBaselinesToClient");
+			for (std::vector<Watcher<Client> >::const_iterator i = baselineDistributionList->begin(); i != baselineDistributionList->end(); ++i)
+				if ((*i).getPointer())
+					sendObjectSpecificBaselinesToClient(**i);
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("ServerObject::flushCreateMessages.sendEndBaselines");
+			SceneEndBaselines const ebm(getNetworkId());
+			for (std::map<ConnectionServerConnection *, std::vector<NetworkId> >::const_iterator i = tmpDistributionList.begin(); i != tmpDistributionList.end(); ++i)
+			{
+				GameClientMessage const msgEbm((*i).second, true, ebm);
+				(*i).first->send(msgEbm, true);
+				logBaselines(getNetworkId(), "SceneEndBaselines", (*i).second);
+			}
+		}
+
+		baselineDistributionList->clear();
+	}
+
+	if (baselineDistributionList)
+		BaselineDistributionListPool::free(*this);
+
+	DistributionListStack::release();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::clearDeltas() const
+{
+	m_authClientServerPackage.clearDeltas();
+	m_authClientServerPackage_np.clearDeltas();
+	m_firstParentAuthClientServerPackage.clearDeltas();
+	m_firstParentAuthClientServerPackage_np.clearDeltas();
+	m_serverPackage.clearDeltas();
+	m_serverPackage_np.clearDeltas();
+	m_sharedPackage.clearDeltas();
+	m_sharedPackage_np.clearDeltas();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::addServerToProxyList(uint32 proxyServerProcessId)
+{
+	FATAL(!isAuthoritative(), ("ServerObject::addServerToProxyList: obj %s, processId %lu, while non-auth", getDebugInformation().c_str(), proxyServerProcessId));
+
+	if (isProxiedOnServer(proxyServerProcessId))
+		return;
+
+	m_proxyServerProcessIds.insert(proxyServerProcessId);
+
+	if (ContainerInterface::getTopmostContainer(*this) == this)
+	{
+		ServerMessageForwarding::begin(proxyServerProcessId);
+
+		forwardServerCreateAndBaselines();
+
+		ServerMessageForwarding::end();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::removeServerFromProxyList(uint32 proxyServerProcessId)
+{
+	if (!isProxiedOnServer(proxyServerProcessId))
+		return;
+
+	if (getAuthServerProcessId() != proxyServerProcessId)
+	{
+		FATAL(!isAuthoritative(), ("ServerObject::removeServerFromProxyList: obj %s, processId %lu, while non-auth", getDebugInformation().c_str(), proxyServerProcessId));
+
+		ServerMessageForwarding::begin(proxyServerProcessId);
+
+		UnloadObjectMessage const unloadMessage(getNetworkId());
+		ServerMessageForwarding::send(unloadMessage);
+
+		ServerMessageForwarding::end();
+	}
+
+	m_proxyServerProcessIds.erase(proxyServerProcessId);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::clearProxyList()
+{
+	if (!m_proxyServerProcessIds.empty())
+	{
+		ProxyList const proxyList = m_proxyServerProcessIds.get();
+		for (ProxyList::const_iterator i = proxyList.begin(); i != proxyList.end(); ++i)
+			removeServerFromProxyList(*i);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::copyProxyList(ServerObject const &source)
+{
+	m_proxyServerProcessIds.clear();
+	ProxyList const &sourceList = source.getPrivateProxyList();
+	for (ProxyList::const_iterator i = sourceList.begin(); i != sourceList.end(); ++i)
+		m_proxyServerProcessIds.insert(*i);
+}
+
+// ----------------------------------------------------------------------
+
+size_t ServerObject::getProxyCount() const
+{
+	return m_proxyServerProcessIds.get().size();
+}
+
+// ----------------------------------------------------------------------
+
+uint32 ServerObject::getAuthServerProcessId() const
+{
+	return m_authServerProcessId.get();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerObject::setAuthServerProcessId(uint32 processId)
+{
+	if (processId)
+	{
+		m_authServerProcessId = processId;
+		removeServerFromProxyList(processId);
+
+		Container * const container = ContainerInterface::getContainer(*this);
+		if (container)
+		{
+			for (ContainerIterator containerIterator = container->begin(); containerIterator != container->end(); ++containerIterator)
+			{
+				ServerObject * const containedObject = safe_cast<ServerObject *>((*containerIterator).getObject());
+				if (containedObject)
+					containedObject->setAuthServerProcessId(processId);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+ProxyList const &ServerObject::getExposedProxyList() const
+{
+	ServerObject const * const topmost = NON_NULL(safe_cast<ServerObject const *>(ContainerInterface::getTopmostContainer(*this)));
+	return topmost->getPrivateProxyList();
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerObject::isProxiedOnServer(uint32 processId) const
+{
+	return m_proxyServerProcessIds.contains(processId);
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/ServerResourceClassObject.cpp b/engine/server/library/serverGame/src/shared/object/ServerResourceClassObject.cpp
new file mode 100644
index 00000000..7ffad27d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerResourceClassObject.cpp
@@ -0,0 +1,600 @@
+//========================================================================
+//
+// ServerResourceClassObject.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerResourceClassObject.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerUniverse.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedRandom/Random.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+#include "swgServerNetworkMessages/MessageQueueResourceTypeDepleted.h"
+
+#include <limits>
+#include <map>
+#include <vector>
+#include <stdio.h>
+
+// ======================================================================
+
+namespace ServerResourceClassObjectNamespace
+{
+	struct ChildrenAttributeMinMax
+	{
+		std::string minClassName;
+		int minValue;
+
+		std::string nextMinClassName;
+		int nextMinValue;
+
+		std::string maxClassName;
+		int maxValue;
+
+		std::string nextMaxClassName;
+		int nextMaxValue;
+	};
+}
+
+using namespace ServerResourceClassObjectNamespace;
+
+// ======================================================================
+
+ServerResourceClassObject::ServerResourceClassObject() :
+		ResourceClassObject(),
+		m_types(),
+		m_fractalData(),
+		m_possiblePlanets(),
+		m_minPoolSize(0),
+		m_maxPoolSize(0)
+{
+}
+
+//-----------------------------------------------------------------------
+
+ServerResourceClassObject::~ServerResourceClassObject()
+{
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Create a new ResourceTypeObject based on this ResourceClass,
+ * or one of its children.
+ *
+ */
+void ServerResourceClassObject::spawnNewTypes(int howMany)
+{
+	DEBUG_FATAL(!ServerUniverse::getInstance().isAuthoritative(),("Programmer bug:  ServerResourceClassObject::spawnNewTypes called on non-authoritative ServerResourceClassObject."));
+
+	if (isLeaf())
+	{
+		// no children, so spawn type directly from this class
+
+		for (int i=0; i<howMany; ++i)
+		{
+			ResourceTypeObject * newObject = new ResourceTypeObject(*this);			
+			m_types.push_back(newObject);
+			ServerUniverse::getInstance().registerResourceTypeObject(*newObject, true);
+		}
+	}
+	else
+	{
+		// pick children and pass the spawn message down to them
+		// the odds of picking a child should be proportional to the number the child could spawn
+
+		std::vector<SpawnChoice> choices;
+		int numChoices(0);
+			
+		NOT_NULL (m_children);
+		for (ClassList::iterator child=m_children->begin(); child!=m_children->end(); ++child)
+		{
+			SpawnChoice s;
+
+			s.m_class=safe_cast<ServerResourceClassObject*>(*child);
+			s.m_numCouldSpawn=s.m_class->numTypesCouldSpawn();
+			s.m_numToSpawn=0;
+
+			numChoices+=s.m_numCouldSpawn;
+			if (s.m_numCouldSpawn!=0)
+				choices.push_back(s);
+		}
+
+		for (int i=0; i<howMany; ++i)
+		{
+			if (numChoices==0)
+			{
+				WARNING_STRICT_FATAL(true,("Tried to spawn a ResourceType from non-leaf class %s, but no child classes were available.\n",
+										   getResourceClassName().c_str()));
+				return;
+			}
+			int selection=Random::random(numChoices-1);
+
+			for (std::vector<SpawnChoice>::iterator j=choices.begin(); j!=choices.end(); ++j)
+			{
+				selection-=(*j).m_numCouldSpawn;
+				if (selection < 0)
+				{
+					(*j).m_numToSpawn++;
+					(*j).m_numCouldSpawn--;
+					numChoices--;
+					break;
+				}
+			}
+			FATAL(selection>=0,("Here's the bug.\n"));
+		}
+
+		for (std::vector<SpawnChoice>::iterator k=choices.begin(); k!=choices.end(); ++k)
+		{
+			if ((*k).m_numToSpawn > 0)
+				(*k).m_class->spawnNewTypes((*k).m_numToSpawn);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/** 
+ * Check whether it would be legal to spawn a new resource type from this class.
+ * @return true if a new resource type could be spawned by this class (or a descendant)
+ */
+
+int ServerResourceClassObject::numTypesCouldSpawn() const
+{
+	int result=m_maxTypes - getNumTypes();
+	return (result>0)?result:0;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Build a string out of the ResourceClass tree, for debugging.
+ */
+void ServerResourceClassObject::debugOutput(std::string &output, int numSpaces) const
+{
+	char buffer[200];
+
+	for (int i=0; i<numSpaces; ++i)
+	{
+		output+="  ";
+	}
+	
+	output+=m_resourceClassName;
+	output+=" (";
+	output+=getFriendlyName().getCanonicalRepresentation();
+	output+=") ";
+	sprintf(buffer,"(%i, %i - %i)",getNumTypes(),m_minTypes,m_maxTypes);
+	output+=buffer;
+	output+="\n";
+	
+	if (isLeaf())
+	{
+		for (TypeList::const_iterator i=m_types.begin(); i!=m_types.end(); ++i)
+		{
+			(*i)->debugOutput(output,numSpaces+1);
+		}
+	}
+	else
+	{
+		NOT_NULL (m_children);
+		for (ClassList::const_iterator i=m_children->begin(); i!=m_children->end(); ++i)
+		{
+			(*i)->debugOutput(output,numSpaces+1);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerResourceClassObject::addType(ResourceTypeObject & newType)
+{
+	NOT_NULL (m_children);
+	WARNING_STRICT_FATAL(!m_children->empty(),("Resource Class %s has both child types and child classes.\n",getResourceClassName().c_str()));
+	
+	//The list will be pretty small, so iterating through it actually isn't that bad.  Almost certanly faster than making it into a map to avoid this iteration.
+	//We have to check, because we add things right away when we spawn them, and setupUniverse() would therefore create a duplicate.
+	for (TypeList::const_iterator i=m_types.begin(); i!=m_types.end(); ++i)
+		if (*i==&newType) return;
+	
+	m_types.push_back(&newType);
+} //lint !e1764 // newType can't be made const because push_back takes a non-const pointer
+
+// ----------------------------------------------------------------------
+
+/**
+ * Computes the number of ResourceTypes derived from this object or its
+ * children.
+ * @todo Might be a lot more efficient to cache this data, so that we
+ * don't have to recursively add it up each time.
+ */
+int ServerResourceClassObject::getNumTypes() const
+{
+	int count=0;
+	
+	if (m_types.empty())
+	{
+		NOT_NULL (m_children);
+		for (ClassList::const_iterator j=m_children->begin(); j!=m_children->end(); ++j)
+			count += safe_cast<ServerResourceClassObject*>((*j))->getNumTypes();
+	}
+	else
+	{
+		for (TypeList::const_iterator i=m_types.begin(); i!=m_types.end(); ++i)
+			if (!(*i)->isDepleted())
+				++count;
+	}
+	
+	return count;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Walks the resource tree and checks that the minTypes and maxTypes
+ * parameters all make sense.  Adjusts them where they do not.
+ * For example, parent.maxTypes should be >= sum(children.minTypes), etc.
+ */
+void ServerResourceClassObject::checkRanges()
+{
+	int childMinTypes(0);
+	int childMaxTypes(0);
+		
+	if (!isLeaf())
+	{
+		NOT_NULL (m_children);
+
+		bool hasZeroMinTypesChild = false;
+		for (ClassList::const_iterator i=m_children->begin(); i!=m_children->end(); ++i)
+		{
+			safe_cast<ServerResourceClassObject*>((*i))->checkRanges();
+			childMinTypes+=(*i)->getMinTypes();
+			childMaxTypes+=(*i)->getMaxTypes();
+
+			if ((*i)->getMinTypes() <= 0)
+				hasZeroMinTypesChild = true;
+		}
+
+		if (childMaxTypes < m_minTypes)
+		{
+			m_minTypes=childMaxTypes;
+			DEBUG_REPORT_LOG(true,("RESOURCE TREE ERROR:  minTypes for ResourceClass %s(%s) reduced to %i because children can only spawn that many.\n",
+								   getResourceClassName().c_str(),getResourceClassName().c_str(),childMaxTypes));
+		}
+		if (childMinTypes > m_maxTypes)
+		{
+			m_maxTypes=childMinTypes;
+			DEBUG_REPORT_LOG(true,("RESOURCE TREE ERROR:  maxTypes for ResourceClass %s(%s) increased to %i because children require at least that many.\n",
+								   getResourceClassName().c_str(),getResourceClassName().c_str(),childMinTypes));
+		}
+
+		if (childMinTypes > m_minTypes)
+		{
+			m_minTypes=childMinTypes;
+			DEBUG_REPORT_LOG(true,("RESOURCE TREE ERROR:  minTypes for ResourceClass %s(%s) increased to %i because children require at least that many.\n",
+								   getResourceClassName().c_str(),getResourceClassName().c_str(),childMinTypes));
+		}
+
+		if (childMaxTypes < m_maxTypes)
+		{
+			m_maxTypes=childMaxTypes;
+			DEBUG_REPORT_LOG(true,("RESOURCE TREE ERROR:  maxTypes for ResourceClass %s(%s) reduced to %i because children can only spawn that many.\n",
+								   getResourceClassName().c_str(),getResourceClassName().c_str(),childMaxTypes));
+		}
+
+		// check for possible starvation
+		if (hasZeroMinTypesChild && (m_minTypes == childMinTypes))
+		{
+			DEBUG_REPORT_LOG(true,("RESOURCE TREE ERROR:  minTypes value of %i for ResourceClass %s(%s) is the same as minTypes for children, which will cause no random spawn of the children (i.e. starvation).\n",
+								   m_minTypes,getResourceClassName().c_str(),getResourceClassName().c_str()));
+		}
+
+		if (childMaxTypes < childMinTypes)
+		{
+			DEBUG_REPORT_LOG(true,("RESOURCE TREE UNCORRECTIBLE ERROR:  Children of ResourceClass %s (%s) require minimum %i types but allow maximum %i types\n",
+								   getResourceClassName().c_str(),getResourceClassName().c_str(),childMinTypes,childMaxTypes));
+			return;
+		}
+						
+	}
+	else
+		if (ConfigServerGame::getSpawnAllResources())
+			m_minTypes = std::max(1,m_minTypes); // in this mode, all leaf classes are set to spawn at least one type
+		
+	if (m_maxTypes < m_minTypes)
+	{
+		m_maxTypes=m_minTypes;
+		DEBUG_REPORT_LOG(true,("RESOURCE TREE ERROR:  maxTypes for ResourceClass %s(%s) increased to %i because minTypes was greater than maxTypes.\n",
+							   getResourceClassName().c_str(),getResourceClassName().c_str(),m_maxTypes));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+* Walks the resource tree and checks the resource attribute ranges
+* for any possible inconsistency
+*/
+void ServerResourceClassObject::checkAttributeLimits()
+{
+	const ServerResourceClassObject::ResourceAttributeRangesType & myClassAttribs = getResourceAttributeRanges();
+
+	if (!isLeaf())
+	{
+		typedef std::map<std::string, ChildrenAttributeMinMax> ChildrenClassAttributeRanges;
+		ChildrenClassAttributeRanges childrenClassAttributeRanges;
+
+		for (ClassList::const_iterator i=m_children->begin(); i!=m_children->end(); ++i)
+		{
+			safe_cast<ServerResourceClassObject*>((*i))->checkAttributeLimits();
+
+			const ServerResourceClassObject::ResourceAttributeRangesType & classAttribs = safe_cast<ServerResourceClassObject*>((*i))->getResourceAttributeRanges();
+			for (ServerResourceClassObject::ResourceAttributeRangesType::const_iterator iClassAttribs = classAttribs.begin(); iClassAttribs != classAttribs.end(); ++iClassAttribs)
+			{
+				ChildrenClassAttributeRanges::iterator found = childrenClassAttributeRanges.find(iClassAttribs->first);
+				if (found != childrenClassAttributeRanges.end())
+				{
+					// min
+					if (iClassAttribs->second.first < found->second.nextMinValue)
+					{
+						found->second.nextMinValue = iClassAttribs->second.first;
+						found->second.nextMinClassName = safe_cast<ServerResourceClassObject*>((*i))->getResourceClassName();
+
+						if (found->second.nextMinValue < found->second.minValue)
+						{
+							std::swap(found->second.minValue, found->second.nextMinValue);
+							std::swap(found->second.minClassName, found->second.nextMinClassName);
+						}
+					}
+
+					// max
+					if (iClassAttribs->second.second > found->second.nextMaxValue)
+					{
+						found->second.nextMaxValue = iClassAttribs->second.second;
+						found->second.nextMaxClassName = safe_cast<ServerResourceClassObject*>((*i))->getResourceClassName();
+
+						if (found->second.nextMaxValue > found->second.maxValue)
+						{
+							std::swap(found->second.maxValue, found->second.nextMaxValue);
+							std::swap(found->second.maxClassName, found->second.nextMaxClassName);
+						}
+					}
+				}
+				else
+				{
+					ChildrenAttributeMinMax camm;
+					camm.minValue = iClassAttribs->second.first;
+					camm.minClassName = safe_cast<ServerResourceClassObject*>((*i))->getResourceClassName();
+					camm.nextMinValue = std::numeric_limits<int>::max();
+					camm.nextMinClassName = "";
+					camm.maxValue = iClassAttribs->second.second;
+					camm.maxClassName = camm.minClassName;
+					camm.nextMaxValue = std::numeric_limits<int>::min();
+					camm.nextMaxClassName = "";
+
+					childrenClassAttributeRanges[iClassAttribs->first] = camm;
+				}
+			}
+		}
+
+		ServerResourceClassObject::ResourceAttributeRangesType::const_iterator iterClassAttribs;
+		ServerResourceClassObject::ResourceAttributeRangesType::const_iterator findClassAttribs;
+		ChildrenClassAttributeRanges::const_iterator iterChildrenClassAttribs;
+		ChildrenClassAttributeRanges::const_iterator findChildrenClassAttribs;
+		for (iterClassAttribs = myClassAttribs.begin(); iterClassAttribs != myClassAttribs.end(); ++iterClassAttribs)
+		{
+			findChildrenClassAttribs = childrenClassAttributeRanges.find(iterClassAttribs->first);
+			if (findChildrenClassAttribs != childrenClassAttributeRanges.end())
+			{
+				if (iterClassAttribs->second.first != findChildrenClassAttribs->second.minValue)
+				{
+					DEBUG_REPORT_LOG(true,("RESOURCE TREE ERROR (attribute ranges): class (%s), attribute (%s), class min (%d), children min (%d, %s) (%d, %s)\n",
+						getResourceClassName().c_str(), iterClassAttribs->first.c_str(), iterClassAttribs->second.first, findChildrenClassAttribs->second.minValue, findChildrenClassAttribs->second.minClassName.c_str(), findChildrenClassAttribs->second.nextMinValue, findChildrenClassAttribs->second.nextMinClassName.c_str()));
+				}
+
+				if (iterClassAttribs->second.second != findChildrenClassAttribs->second.maxValue)
+				{
+					DEBUG_REPORT_LOG(true,("RESOURCE TREE ERROR (attribute ranges): class (%s), attribute (%s), class max (%d), children max (%d, %s) (%d, %s)\n",
+						getResourceClassName().c_str(), iterClassAttribs->first.c_str(), iterClassAttribs->second.second, findChildrenClassAttribs->second.maxValue, findChildrenClassAttribs->second.maxClassName.c_str(), findChildrenClassAttribs->second.nextMaxValue, findChildrenClassAttribs->second.nextMaxClassName.c_str()));
+				}
+			}
+		}
+
+		for (iterClassAttribs = myClassAttribs.begin(); iterClassAttribs != myClassAttribs.end(); ++iterClassAttribs)
+		{
+			findChildrenClassAttribs = childrenClassAttributeRanges.find(iterClassAttribs->first);
+			if (findChildrenClassAttribs == childrenClassAttributeRanges.end())
+			{
+				DEBUG_REPORT_LOG(true,("RESOURCE TREE ERROR (attribute ranges): class (%s), attribute (%s), class min (%d), class max (%d), MISSING CHILDREN MIN/MAX\n",
+					getResourceClassName().c_str(), iterClassAttribs->first.c_str(), iterClassAttribs->second.first, iterClassAttribs->second.second));
+			}
+		}
+
+		for (iterChildrenClassAttribs = childrenClassAttributeRanges.begin(); iterChildrenClassAttribs != childrenClassAttributeRanges.end(); ++iterChildrenClassAttribs)
+		{
+			findClassAttribs = myClassAttribs.find(iterChildrenClassAttribs->first);
+			if (findClassAttribs == myClassAttribs.end())
+			{
+				DEBUG_REPORT_LOG(true,("RESOURCE TREE ERROR (attribute ranges): class (%s), attribute (%s), MISSING MY MIN/MAX, children min (%d, %s) (%d, %s), children max (%d, %s) (%d, %s)\n",
+					getResourceClassName().c_str(), iterChildrenClassAttribs->first.c_str(), iterChildrenClassAttribs->second.minValue, iterChildrenClassAttribs->second.minClassName.c_str(), iterChildrenClassAttribs->second.nextMinValue, iterChildrenClassAttribs->second.nextMinClassName.c_str(), iterChildrenClassAttribs->second.maxValue, iterChildrenClassAttribs->second.maxClassName.c_str(), iterChildrenClassAttribs->second.nextMaxValue, iterChildrenClassAttribs->second.nextMaxClassName.c_str()));
+			}
+		}
+	}
+
+	for (ServerResourceClassObject::ResourceAttributeRangesType::const_iterator iterClassAttribs = myClassAttribs.begin(); iterClassAttribs != myClassAttribs.end(); ++iterClassAttribs)
+	{
+		if (iterClassAttribs->second.first < 1)
+		{
+			DEBUG_REPORT_LOG(true,("RESOURCE TREE ERROR (attribute ranges): class (%s), attribute (%s), min (%d) is < 1\n",
+				getResourceClassName().c_str(), iterClassAttribs->first.c_str(), iterClassAttribs->second.first));
+		}
+
+		if (iterClassAttribs->second.second > 1000)
+		{
+			DEBUG_REPORT_LOG(true,("RESOURCE TREE ERROR (attribute ranges): class (%s), attribute (%s), max (%d) is > 1000\n",
+				getResourceClassName().c_str(), iterClassAttribs->first.c_str(), iterClassAttribs->second.second));
+		}
+
+		if (iterClassAttribs->second.first > iterClassAttribs->second.second)
+		{
+			DEBUG_REPORT_LOG(true,("RESOURCE TREE ERROR (attribute ranges): class (%s) (%s), attribute (%s), min (%d) is > max (%d)\n",
+				getResourceClassName().c_str(), iterClassAttribs->first.c_str(), (isLeaf() ? "leaf" : "non-leaf"), iterClassAttribs->second.first, iterClassAttribs->second.second));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * As part of the import process, spawn enough types to bring everything
+ * up to the required minimums.
+ */
+void ServerResourceClassObject::spawnAsNeeded()
+{
+	if (!isLeaf())
+	{
+		NOT_NULL (m_children);
+		for (ClassList::iterator child=m_children->begin(); child!=m_children->end(); ++child)
+		{
+			safe_cast<ServerResourceClassObject*>(*child)->spawnAsNeeded();
+		}
+	}
+
+	if (getNumTypes() < m_minTypes)
+		spawnNewTypes(m_minTypes-getNumTypes());
+}
+
+// ----------------------------------------------------------------------
+
+void ServerResourceClassObject::loadDistributionFromIff(std::map<int, ResourceClassObject*> &resourceClasses)
+{
+	DataTable * distributionDataTable = DataTableManager::getTable("datatables/resource/resource_distribution.iff", true);
+	if (distributionDataTable)
+	{
+		int numRows = distributionDataTable->getNumRows();
+		for (int row=0; row<numRows; ++row)
+		{
+			int index = distributionDataTable->getIntValue("Resource Index#",row);
+			ServerResourceClassObject *resClass = safe_cast<ServerResourceClassObject*>(resourceClasses[index]);
+			if (resClass)
+			{
+				std::string planetList (distributionDataTable->getStringValue("Planet",row));
+				planetList += ","; // Adding ',' at end makes parsing easier
+				size_t pos = 0;
+				size_t nextComma = 0;
+				for (nextComma = planetList.find(',',0); nextComma != std::string::npos; nextComma = planetList.find(',',pos))
+				{
+					resClass->m_possiblePlanets.push_back(std::string(planetList, pos, nextComma-pos));
+					pos = nextComma+1;
+				}
+
+				resClass->m_minPoolSize = distributionDataTable->getIntValue("Pool Size Min",row);
+				resClass->m_maxPoolSize = distributionDataTable->getIntValue("Pool Size Max",row);
+			
+				resClass->m_fractalData.m_scaleX = distributionDataTable->getFloatValue("Fractal X Scale",row);
+				resClass->m_fractalData.m_scaleY = distributionDataTable->getFloatValue("Fractal Y Scale",row);
+				resClass->m_fractalData.m_bias = distributionDataTable->getFloatValue("Fractal Bias",row);
+				resClass->m_fractalData.m_gain = distributionDataTable->getFloatValue("Fractal Gain",row);
+				resClass->m_fractalData.m_combinationRule = distributionDataTable->getIntValue("Fractal Combo Rule",row);
+				resClass->m_fractalData.m_frequency = distributionDataTable->getFloatValue("Fractal Frequency",row);
+				resClass->m_fractalData.m_amplitude = distributionDataTable->getFloatValue("Fractal Amplitude",row);
+				resClass->m_fractalData.m_octaves = distributionDataTable->getIntValue("Fractal Octaves",row);				
+			}
+		}
+		DataTableManager::close("datatables/resource/resource_distribution.iff");
+		distributionDataTable = 0;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerResourceClassObject::getResourceTypes(std::vector<ResourceTypeObject const *> & types) const
+{
+	for (TypeList::const_iterator i = m_types.begin(); i != m_types.end(); ++i)
+	{
+		types.push_back(*i);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerResourceClassObject::getAllDerivedResourceTypes(std::vector<ResourceTypeObject const *> & types) const
+{
+	if (isLeaf())
+	{
+		getResourceTypes(types);
+	}
+	else
+	{
+		for (ClassList::iterator child=m_children->begin(); child!=m_children->end(); ++child)
+			(safe_cast<ServerResourceClassObject const *>(*child))->getAllDerivedResourceTypes(types);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+ResourceFractalData const & ServerResourceClassObject::getFractalData() const
+{
+	return m_fractalData;
+}
+
+// ----------------------------------------------------------------------
+
+int ServerResourceClassObject::getMinPoolSize() const
+{
+	return m_minPoolSize;
+}
+
+// ----------------------------------------------------------------------
+
+int ServerResourceClassObject::getMaxPoolSize() const
+{
+	return m_maxPoolSize;
+}
+
+// ----------------------------------------------------------------------
+
+ServerResourceClassObject::PossiblePlanetsType const & ServerResourceClassObject::getPossiblePlanets() const
+{
+	return m_possiblePlanets;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Return a resource type derived from this class
+ */
+ResourceTypeObject const * ServerResourceClassObject::getAResourceType() const
+{
+	if (!m_types.empty())
+		return m_types.front();
+	else
+		return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerResourceClassObject::hasDerivedResourceType() const
+{
+	if (getMinTypes() > 0)
+		return true;
+
+	if (!m_types.empty())
+		return true;
+
+	for (ClassList::iterator child=m_children->begin(); child!=m_children->end(); ++child)
+		if (safe_cast<ServerResourceClassObject const *>(*child)->hasDerivedResourceType())
+			return true;
+
+	return false;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/ServerResourceClassObject.h b/engine/server/library/serverGame/src/shared/object/ServerResourceClassObject.h
new file mode 100644
index 00000000..7888218c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerResourceClassObject.h
@@ -0,0 +1,91 @@
+//========================================================================
+//
+// ServerResourceClassObject.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef INCLUDED_ServerResourceClassObject_H
+#define INCLUDED_ServerResourceClassObject_H
+
+// ======================================================================
+
+#include "serverUtility/ResourceFractalData.h"
+#include "sharedGame/ResourceClassObject.h"
+
+class DynamicVariableList;
+class NetworkId;
+class ResourceTypeObject;
+
+// ======================================================================
+
+/**
+ * Represents a resource class, i.e. a non-leaf node in the resource
+ * tree.  The resource class hierarchy is static at runtime, and is read
+ * in from a datatable.
+ */
+
+class ServerResourceClassObject : public ResourceClassObject
+{
+  public:
+	typedef std::vector<std::string> PossiblePlanetsType;
+
+  public:
+	ServerResourceClassObject();
+	virtual ~ServerResourceClassObject();
+
+  public:
+	// getter functions
+	virtual void  debugOutput        (std::string &output, int numSpaces=0) const;
+	int           numTypesCouldSpawn () const;
+	int           getNumTypes        () const;
+	void          getResourceTypes   (stdvector<ResourceTypeObject const *>::fwd & types) const;
+	void          getAllDerivedResourceTypes(stdvector<ResourceTypeObject const *>::fwd & types) const;
+	bool          hasDerivedResourceType() const;
+	ResourceTypeObject const * getAResourceType() const;
+	ResourceFractalData const & getFractalData() const;
+	PossiblePlanetsType const & getPossiblePlanets() const;
+	int           getMinPoolSize() const;
+	int           getMaxPoolSize() const;
+
+	// Universe system functions (rebuild data structures on load)
+	void          addType            (ResourceTypeObject & newType);
+
+	// Setup functions, insure the system is in a consistent state
+	void          checkRanges        ();
+	void          checkAttributeLimits();
+	void          spawnAsNeeded      ();
+	static void   loadDistributionFromIff (stdmap<int, ResourceClassObject*>::fwd &resourceClasses);
+
+  private:
+	// simulation helper functions
+	void          spawnNewTypes       (int howMany);
+		
+  private:
+	ServerResourceClassObject(const ServerResourceClassObject& rhs);
+	ServerResourceClassObject& operator=(const ServerResourceClassObject& rhs);
+
+  private:
+	typedef std::vector<ResourceTypeObject*>  TypeList;
+	
+  private:
+	TypeList  m_types;
+	ResourceFractalData m_fractalData;
+	PossiblePlanetsType m_possiblePlanets;
+	int m_minPoolSize;
+	int m_maxPoolSize;
+
+  private:
+	struct SpawnChoice
+	{
+		ServerResourceClassObject *m_class;
+		int m_numCouldSpawn;
+		int m_numToSpawn;
+	};
+
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/ServerShipObjectInterface.cpp b/engine/server/library/serverGame/src/shared/object/ServerShipObjectInterface.cpp
new file mode 100644
index 00000000..5aff2af9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerShipObjectInterface.cpp
@@ -0,0 +1,99 @@
+// ======================================================================
+//
+// ServerShipObjectInterface.cpp
+// asommers
+//
+// copyright 2004, sony online entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerShipObjectInterface.h"
+
+#include "serverGame/ShipObject.h"
+
+// ======================================================================
+
+ServerShipObjectInterface::ServerShipObjectInterface(ShipObject const * const shipObject) :
+	ShipObjectInterface(),
+	m_shipObject(shipObject)
+{
+}
+
+// ----------------------------------------------------------------------
+
+ServerShipObjectInterface::~ServerShipObjectInterface()
+{
+}
+
+// ----------------------------------------------------------------------
+
+float ServerShipObjectInterface::getMaximumSpeed() const
+{
+	return m_shipObject->getShipActualSpeedMaximum();
+}
+
+// ----------------------------------------------------------------------
+
+float ServerShipObjectInterface::getSpeedAcceleration() const
+{
+	return m_shipObject->getShipActualAccelerationRate();
+}
+
+// ----------------------------------------------------------------------
+
+float ServerShipObjectInterface::getSpeedDeceleration() const
+{
+	return m_shipObject->getShipActualDecelerationRate();
+}
+
+// ----------------------------------------------------------------------
+
+float ServerShipObjectInterface::getSlideDampener() const
+{
+	return m_shipObject->getSlideDampener();
+}
+
+// ----------------------------------------------------------------------
+
+float ServerShipObjectInterface::getMaximumYaw() const
+{
+	return m_shipObject->getShipActualYawRateMaximum();
+}
+
+// ----------------------------------------------------------------------
+
+float ServerShipObjectInterface::getYawAcceleration() const
+{
+	return m_shipObject->getShipActualYawAccelerationRate();
+}
+
+// ----------------------------------------------------------------------
+
+float ServerShipObjectInterface::getMaximumPitch() const
+{
+	return m_shipObject->getShipActualPitchRateMaximum();
+}
+
+// ----------------------------------------------------------------------
+
+float ServerShipObjectInterface::getPitchAcceleration() const
+{
+	return m_shipObject->getShipActualPitchAccelerationRate();
+}
+
+// ----------------------------------------------------------------------
+
+float ServerShipObjectInterface::getMaximumRoll() const
+{
+	return m_shipObject->getShipActualRollRateMaximum();
+}
+
+// ----------------------------------------------------------------------
+
+float ServerShipObjectInterface::getRollAcceleration() const
+{
+	return m_shipObject->getShipActualRollAccelerationRate();
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/ServerShipObjectInterface.h b/engine/server/library/serverGame/src/shared/object/ServerShipObjectInterface.h
new file mode 100644
index 00000000..bc9b0199
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ServerShipObjectInterface.h
@@ -0,0 +1,52 @@
+// ======================================================================
+//
+// ServerShipObjectInterface.h
+// asommers
+//
+// copyright 2004, sony online entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ServerShipObjectInterface_H
+#define INCLUDED_ServerShipObjectInterface_H
+
+// ======================================================================
+
+#include "sharedGame/ShipObjectInterface.h"
+
+class ShipObject;
+
+// ======================================================================
+
+class ServerShipObjectInterface : public ShipObjectInterface
+{
+public:
+
+	explicit ServerShipObjectInterface(ShipObject const * shipObject);
+	virtual ~ServerShipObjectInterface();
+
+	virtual float getMaximumSpeed() const;
+	virtual float getSpeedAcceleration() const;
+	virtual float getSpeedDeceleration() const;
+	virtual float getSlideDampener() const;
+	virtual float getMaximumYaw() const;
+	virtual float getYawAcceleration() const;
+	virtual float getMaximumPitch() const;
+	virtual float getPitchAcceleration() const;
+	virtual float getMaximumRoll() const;
+	virtual float getRollAcceleration() const;
+
+protected:
+
+	ShipObject const * const m_shipObject;
+
+private:
+
+	ServerShipObjectInterface();
+	ServerShipObjectInterface(ServerShipObjectInterface const &);
+	ServerShipObjectInterface & operator=(ServerShipObjectInterface const &);
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/ShipObject.cpp b/engine/server/library/serverGame/src/shared/object/ShipObject.cpp
new file mode 100644
index 00000000..45f573c2
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ShipObject.cpp
@@ -0,0 +1,2612 @@
+// ======================================================================
+//
+// ShipObject.cpp
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipObject.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/AiShipController.h"
+#include "serverGame/Chat.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/GuildInterface.h"
+#include "serverGame/MiningAsteroidController.h"
+#include "serverGame/MissileManager.h"
+#include "serverGame/NebulaManagerServer.h"
+#include "serverGame/ObserveTracker.h"
+#include "serverGame/PlayerShipController.h"
+#include "serverGame/ProjectileManager.h"
+#include "serverGame/PvpUpdateObserver.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerResourceClassObject.h"
+#include "serverGame/ServerShipObjectTemplate.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipComponentDataBooster.h"
+#include "serverGame/ShipComponentDataCapacitor.h"
+#include "serverGame/ShipComponentDataEngine.h"
+#include "serverGame/ShipComponentDataManager.h"
+#include "serverGame/ShipComponentDataReactor.h"
+#include "serverGame/ShipComponentDataShield.h"
+#include "serverGame/ShipComponentDataWeapon.h"
+#include "serverGame/ShipController.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFoundation/BitArray.h"
+#include "sharedFoundation/ConfigFile.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/PointerDeleter.h"
+#include "sharedFoundation/Timer.h"
+#include "sharedGame/Nebula.h"
+#include "sharedGame/NebulaManager.h"
+#include "sharedGame/SharedShipObjectTemplate.h"
+#include "sharedGame/ShipChassis.h"
+#include "sharedGame/ShipComponentDescriptor.h"
+#include "sharedGame/ShipComponentFlags.h"
+#include "sharedGame/ShipComponentWeaponManager.h"
+#include "sharedGame/ShipSlotIdManager.h"
+#include "sharedGame/ShipTurretManager.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/DeltasMessage.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedNetworkMessages/MessageQueueSpatialChat.h"
+#include "serverNetworkMessages/MessageToPayload.h"
+#include "sharedObject/AlterResult.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/PortalProperty.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/SlottedContainmentProperty.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+#include <algorithm>
+
+//lint -esym(749,ColumnData::CD_weaponCapacitorIndex)
+
+// ======================================================================
+
+namespace ShipObjectNamespace
+{
+	//-- Column data for cs_shipTypeFileName
+	enum ColumnData
+	{
+		CD_name,
+		CD_slideDampener,
+		CD_maximumChassisHitPoints,
+		CD_maximumChassisComponentMass
+	};
+
+	//-- ShipData holds data per ship type for cs_shipTypeFileName
+	struct ShipData
+	{
+	public:
+
+		ShipData();
+		~ShipData();
+
+	public:
+
+		std::string m_name;
+		float m_slideDampener;
+		float m_maximumChassisHitPoints;
+		float m_chassisComponentMassMaximum;
+		ShipComponentData * m_components [static_cast<int>(ShipChassisSlotType::SCST_num_types)];
+		int m_lotsConsumed;
+
+	private:
+		ShipData(ShipData const &); //lint -esym(754, ShipData::ShipData)
+		ShipData & operator=(ShipData const &);
+	};
+
+	char const * const cs_shipTypeFileName = "datatables/ship/shiptype.iff";
+	std::string const cs_defaultShipType = "default";
+
+	typedef std::map<std::string, ShipData *> ShipTypeShipDataMap;
+	ShipTypeShipDataMap ms_shipTypeShipDataMap;
+	ShipData const * ms_defaultShipData = NULL;
+
+	ShipComponentDataEngine * ms_defaultEngine = NULL;
+
+	unsigned int s_lastShipId = 0;
+	unsigned int const s_maxShipId = 4096;
+	uint32 s_shipIdUsed[(s_maxShipId+31)/32];
+
+	// ----------------------------------------------------------------------
+
+	void remove();
+	CreatureObject const *findPilotingCreature(ShipObject const &ship);
+	void loadShipTypeDataTable(DataTable const &dataTable);
+	uint16 allocateShipId();
+	void freeShipId(uint16 shipId);
+
+	// ----------------------------------------------------------------------
+
+	float const s_boosterAvailableTimeMinimum = 2.0f;
+	float const s_boosterAvailableTimeMaximum = 10.0f;
+
+	float ms_shotValidationTolerance = 0.75f;
+}
+
+using namespace ShipObjectNamespace;
+
+// ======================================================================
+// PUBLIC ShipObjectNamespace::ShipData
+// ======================================================================
+
+ShipData::ShipData() :
+m_name(),
+m_slideDampener(0.f),
+m_maximumChassisHitPoints(0.f),
+m_chassisComponentMassMaximum(0.0f),
+m_lotsConsumed(0)
+{
+	Zero(m_components); //lint !e1514 // (Creating temporary to copy 'ShipComponentData *[20]' to 'ShipComponentData **&' (context: arg. no. 1))
+}
+
+// ----------------------------------------------------------------------
+
+ShipData::~ShipData()
+{
+	std::for_each (m_components, m_components + static_cast<int>(ShipChassisSlotType::SCST_num_types), PointerDeleter ());
+}
+
+// ======================================================================
+// STATIC PUBLIC ShipObject
+// ======================================================================
+
+void ShipObject::install()
+{
+	DEBUG_FATAL(!ms_shipTypeShipDataMap.empty(), ("ShipObject::install - already installed"));
+	ExitChain::add(ShipObjectNamespace::remove, "ShipObjectNamespace::remove");
+
+	//-- Load the ship type data table
+	Iff iff;
+	if (!iff.open(cs_shipTypeFileName, true))
+	{
+		DEBUG_WARNING(true, ("ShipObject::install: could not open file %s", cs_shipTypeFileName));
+		return;
+	}
+
+	DataTable dataTable;
+	dataTable.load(iff);
+	loadShipTypeDataTable(dataTable);
+	DataTableManager::addReloadCallback(cs_shipTypeFileName, loadShipTypeDataTable);
+
+	ShipComponentDescriptor const * const genericEngineDescriptor = ShipComponentDescriptor::findShipComponentDescriptorByName(ConstCharCrcString("eng_generic"));
+	FATAL(genericEngineDescriptor == NULL, ("ShipObject genericEngineDescriptor [eng_generic] not found"));
+	ms_defaultEngine = new ShipComponentDataEngine(*genericEngineDescriptor);
+
+	// mark shipId 0 as used
+	memset(s_shipIdUsed, 0, sizeof(s_shipIdUsed));
+	s_shipIdUsed[0] = 1;
+
+	ms_shotValidationTolerance = ConfigFile::getKeyBool("GameServer", "shotValidationTolerance", ms_shotValidationTolerance);
+}
+
+// ----------------------------------------------------------------------
+
+class ShipObject::FireShotQueueData
+{
+public:
+	ConstWatcher<Client> gunnerClient; //lint !e1925 //public
+	int weaponIndex; //lint !e1925 //public
+	Transform transform_p; //lint !e1925 //public
+	int targetComponent; //lint !e1925 //public
+	uint32 syncStampLong; //lint !e1925 //public
+
+	FireShotQueueData(Client const &_gunnerClient, int _weaponIndex, Transform const & _transform_p, int _targetComponent, uint32 _syncStampLong) :
+		gunnerClient(&_gunnerClient),
+		weaponIndex(_weaponIndex),
+		transform_p(_transform_p),
+		targetComponent(_targetComponent),
+		syncStampLong(_syncStampLong)
+	{
+	}
+
+	FireShotQueueData() :
+		gunnerClient(0),
+		weaponIndex(0),
+		transform_p(),
+		targetComponent(0),
+		syncStampLong(0)
+	{
+	}
+};
+
+// ----------------------------------------------------------------------
+
+ShipObject const * ShipObject::getContainingShipObject(ServerObject const * serverObject)
+{
+	return getContainingShipObject(const_cast<ServerObject *>(serverObject));
+}
+
+// ----------------------------------------------------------------------
+
+ShipObject * ShipObject::getContainingShipObject(ServerObject * serverObject)
+{
+	while (serverObject && !serverObject->asShipObject())
+		serverObject = safe_cast<ServerObject *>(ContainerInterface::getContainedByObject(*serverObject));
+
+	return serverObject ? serverObject->asShipObject() : 0;
+}
+
+// ======================================================================
+// STATIC PRIVATE ShipObject
+// ======================================================================
+
+void ShipObjectNamespace::remove()
+{
+	ms_defaultShipData = NULL;
+
+	delete ms_defaultEngine;
+	ms_defaultEngine = NULL;
+
+	//-- Delete the ship type to ship data map
+	std::for_each(ms_shipTypeShipDataMap.begin(), ms_shipTypeShipDataMap.end(), PointerDeleterPairSecond());
+	ms_shipTypeShipDataMap.clear();
+}
+
+// ======================================================================
+// PUBLIC ShipObject
+// ======================================================================
+
+float const ShipObject::ms_powerPulsePeriodSecs = 1.5f;
+
+// ----------------------------------------------------------------------
+
+ShipObject::ShipObject(ServerShipObjectTemplate const *newTemplate) :
+	TangibleObject(newTemplate),
+	m_shipId(0),
+	m_slideDampener(0.f),
+	m_currentYaw(0.f),
+	m_currentPitch(0.f),
+	m_currentRoll(0.f),
+	m_currentChassisHitPoints(0.f),
+	m_maximumChassisHitPoints(0.f),
+	m_weaponRefireTimers(NULL),
+	m_numberOfHits(0),
+	m_chassisType                      (0),
+	m_chassisComponentMassMaximum(0.0f),
+	m_chassisComponentMassCurrent(0.0f),
+	m_chassisSpeedMaximumModifier(1.0f),
+	m_shipActualAccelerationRate       (0.0f),
+	m_shipActualDecelerationRate       (0.0f),
+	m_shipActualPitchAccelerationRate  (0.0f),
+	m_shipActualYawAccelerationRate    (0.0f),
+	m_shipActualRollAccelerationRate   (0.0f),
+	m_shipActualPitchRateMaximum       (0.0f),
+	m_shipActualYawRateMaximum         (0.0f),
+	m_shipActualRollRateMaximum        (0.0f),
+	m_shipActualSpeedMaximum           (0.0f),
+	m_componentArmorHitpointsMaximum   (),
+	m_componentArmorHitpointsCurrent   (),
+	m_componentEfficiencyGeneral       (),
+	m_componentEfficiencyEnergy        (),
+	m_componentEnergyMaintenanceRequirement   (),
+	m_componentMass                    (),
+	m_componentCrc                     (),
+	m_componentCrcForClient            (),
+	m_componentHitpointsCurrent        (),
+	m_componentHitpointsMaximum        (),
+	m_componentFlags                   (),
+	m_componentNames(),
+	m_weaponDamageMaximum              (),
+	m_weaponDamageMinimum              (),
+	m_weaponEffectivenessShields       (),
+	m_weaponEffectivenessArmor         (),
+	m_weaponEnergyPerShot              (),
+	m_weaponRefireRate                 (),
+	m_weaponEfficiencyRefireRate(),
+	m_weaponAmmoCurrent                (),
+	m_weaponAmmoMaximum                (),
+	m_weaponAmmoType                   (),
+	m_shieldHitpointsFrontCurrent      (0.0f),
+	m_shieldHitpointsFrontMaximum      (0.0f),
+	m_shieldHitpointsBackCurrent       (0.0f),
+	m_shieldHitpointsBackMaximum       (0.0f),
+	m_shieldRechargeRate               (0.0f),
+	m_capacitorEnergyCurrent           (0.0f),
+	m_capacitorEnergyMaximum           (0.0f),
+	m_capacitorEnergyRechargeRate      (0.0f),
+	m_engineAccelerationRate           (0.0f),
+	m_engineDecelerationRate           (0.0f),
+	m_enginePitchAccelerationRate      (0.0f),
+	m_engineYawAccelerationRate        (0.0f),
+	m_engineRollAccelerationRate       (0.0f),
+	m_enginePitchRateMaximum           (0.0f),
+	m_engineYawRateMaximum             (0.0f),
+	m_engineRollRateMaximum            (0.0f),
+	m_engineSpeedMaximum               (0.0f),
+	m_engineSpeedRotationFactorMaximum(1.0f),
+	m_engineSpeedRotationFactorMinimum(1.0f),
+	m_engineSpeedRotationFactorOptimal(0.5f),
+	m_reactorEnergyGenerationRate      (0.0f),
+	m_boosterEnergyCurrent             (0.0f),
+	m_boosterEnergyMaximum             (0.0f),
+	m_boosterEnergyRechargeRate        (0.0f),
+	m_boosterEnergyConsumptionRate     (0.0f),
+	m_boosterAcceleration              (0.0f),
+	m_boosterSpeedMaximum              (0.0f),
+	m_droidInterfaceCommandSpeed       (0.0f),
+	m_installedDroidControlDevice      (),
+	m_cargoHoldContentsMaximum(0),
+	m_cargoHoldContentsCurrent(0),
+	m_cargoHoldContents(),
+	m_cargoHoldContentsResourceTypeInfo(),
+	m_timeSinceLastPowerPulse          (0.0f),
+	m_fireShotQueue(new FireShotQueue),
+	m_nebulas(new IntVector),
+	m_nebulaEffectReactor(0.0f),
+	m_nebulaEffectEngine(0.0f),
+	m_nebulaEffectShields(0.0f),
+	m_pilotLookAtTarget(),
+	m_pilotLookAtTargetSlot(ShipChassisSlotType::SCST_invalid),
+	m_targetableSlotBitfield      (),
+	m_turretTargets(),
+	m_wingName(),
+	m_typeName(),
+	m_difficulty(),
+	m_faction(),
+	m_guildId(),
+	m_spaceFaction(0),
+	m_spaceFactionAllies(),
+	m_spaceFactionEnemies(),
+	m_spaceFactionIsAggro(false),
+	m_lotsConsumed(0),
+	m_autoAggroImmuneTimer(new Timer),
+	m_damageAggroImmune(false),
+	m_turretWeaponIndices(new BitArray),
+	m_movementPercent(1.0f),
+	m_invulnerabilityTimer(0.f),
+	m_boosterAvailableTimer(new Timer(0.0f)),
+	m_fastestWeaponProjectileSpeed(0.0f)
+{
+	m_weaponRefireTimers = new Timer[ShipChassisSlotType::cms_numWeaponIndices];
+
+	calcPvpableState();
+
+	//--
+	addMembersToPackages();
+
+	//-- Extract data from the ship data table
+	constructFromTemplate();
+
+	SharedObjectTemplate const * const sharedObjectTemplate = getSharedTemplate();
+	if (!sharedObjectTemplate)
+	{
+		WARNING(true, ("ShipObject [%s] unable to load shared template [%s]", newTemplate->getName(), newTemplate->getSharedTemplate().c_str()));
+	}
+	else
+	{
+		SharedShipObjectTemplate const * const sharedShipObjectTemplate = safe_cast<SharedShipObjectTemplate const *>(sharedObjectTemplate);
+		if (!sharedShipObjectTemplate)
+		{
+			WARNING(true, ("ShipObject [%s] shared template [%s] is not a SharedShipObjectTemplate", newTemplate->getName(), newTemplate->getSharedTemplate().c_str()));
+		}
+		else
+		{
+			setLocalFlag(LocalObjectFlags::ShipObject_PlayerControlled, sharedShipObjectTemplate->getPlayerControlled());
+			setLocalFlag(LocalObjectFlags::ShipObject_HasWings, sharedShipObjectTemplate->getHasWings());
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+ShipObject::~ShipObject()
+{
+	//-- This must be the first line in the destructor to invalidate any watchers watching this object
+	nullWatchers();
+
+	delete m_boosterAvailableTimer;
+	m_boosterAvailableTimer = NULL;
+	
+	if (getLocalFlag(LocalObjectFlags::ShipObject_ShipIdAssigned))
+		freeShipId(m_shipId.get());
+
+	delete m_fireShotQueue;
+	m_fireShotQueue = NULL;
+
+	delete[] m_weaponRefireTimers;
+	m_weaponRefireTimers = NULL;
+
+	delete m_nebulas;
+	m_nebulas = NULL;
+
+	delete m_autoAggroImmuneTimer;
+	delete m_turretWeaponIndices;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::endBaselines()
+{
+	// Assure we don't have a stale shipId (breaks AutoDelta rules because there is not an appropriate package for m_shipId)
+	if (!getLocalFlag(LocalObjectFlags::ShipObject_ShipIdAssigned))
+		m_shipId = 0;
+
+	TangibleObject::endBaselines();
+
+	if (isAuthoritative())
+	{
+		m_componentCrcForClient.clear();
+		for (Archive::AutoDeltaPackedMap<int, uint32>::const_iterator it = m_componentCrc.begin(); it != m_componentCrc.end(); ++it)
+		{
+			int const key = (*it).first;
+			uint32 const value = (*it).second;
+			m_componentCrcForClient.set(key, value);
+		}
+		internalSetChassisComponentMassCurrent(computeChassisComponentMassCurrent());
+
+		if (isPlayerShip())
+			m_guildId = GuildInterface::getGuildId(getOwnerId());
+	}
+
+	if (!getAppearance())
+	{
+		PortalProperty * const portalProperty = getPortalProperty();
+		if (portalProperty)
+			portalProperty->createAppearance();
+	}
+	
+	//-- obtain the resource type info
+	{
+		m_cargoHoldContentsResourceTypeInfo.clear();
+		NetworkIdIntMap::const_iterator const end = m_cargoHoldContents.end();
+		for (NetworkIdIntMap::const_iterator it = m_cargoHoldContents.begin(); it != end; ++it)
+		{
+			NetworkId const & resourceTypeId = (*it).first;
+			
+			ResourceTypeObject const * const resourceTypeObject = ServerUniverse::getInstance().getResourceTypeById(resourceTypeId);
+			if (NULL == ServerUniverse::getInstance().getResourceTypeById(resourceTypeId))
+			{
+				WARNING(true, ("ShipObject::endBaselines invalid resource type [%s]", resourceTypeId.getValueString().c_str()));
+				continue;
+			}
+			m_cargoHoldContentsResourceTypeInfo.set(
+				resourceTypeId, 
+				ResourceTypeInfoPair(Unicode::narrowToWide(resourceTypeObject->getResourceName()), resourceTypeObject->getParentClass().getResourceClassName()));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::virtualOnSetAuthority()
+{
+	if (isPlayerShip())
+		m_guildId = GuildInterface::getGuildId(getOwnerId());
+	TangibleObject::virtualOnSetAuthority();
+}
+
+// ----------------------------------------------------------------------
+
+ShipObject * ShipObject::asShipObject()
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+ShipObject const * ShipObject::asShipObject() const
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::onAddedToWorld()
+{
+	if (isPlayerShip() && !getClient())
+		setInvulnerabilityTimer(ConfigServerGame::getShipLoadInvulnerableTimeWithoutClient());
+
+	NON_NULL(safe_cast<ShipController *>(getController()))->onAddedToWorld();
+	TangibleObject::onAddedToWorld();
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::onContainerGainItem(ServerObject &item, ServerObject *source, ServerObject *transferer)
+{
+	// notify of gunner add if needed
+	if (item.isPlayerControlled())
+		handleGunnerChange(item);
+
+	TangibleObject::onContainerGainItem(item, source, transferer);
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::onContainerChildGainItem(ServerObject &item, ServerObject *source, ServerObject *transferer)
+{
+	// If an object with a client has been transferred into a subcontainer of a
+	// ship, and is not in the world, they need auth client baselines.
+	Client const * const client = item.getClient();
+	if (client && !item.isInWorld())
+		sendAuthClientBaselines(*client);
+
+	// notify of gunner add if needed
+	if (item.isPlayerControlled())
+		handleGunnerChange(item);
+
+	// chain to base class
+	TangibleObject::onContainerChildGainItem(item, source, transferer);
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::onContainerLostItem(ServerObject *destination, ServerObject &item, ServerObject *transferer)
+{
+	// notify of gunner remove if needed
+	if (item.isPlayerControlled())
+		handleGunnerChange(item);
+
+	TangibleObject::onContainerLostItem(destination, item, transferer);
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::onContainerChildLostItem(ServerObject *destination, ServerObject &item, ServerObject *source, ServerObject *transferer)
+{
+	// notify of gunner remove if needed
+	if (item.isPlayerControlled())
+		handleGunnerChange(item);
+
+	TangibleObject::onContainerChildLostItem(destination, item, source, transferer);
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::isVisibleOnClient(Client const &client) const
+{
+	if (!TangibleObject::isVisibleOnClient(client))
+		return false;
+
+	// In ground scenes, ships in the world are only visible to clients they contain, and gods
+	if (client.isGod() || !isInWorld() || ServerWorld::isSpaceScene())
+		return true;
+
+	for (ServerObject const *o = client.getCharacterObject(); o; o = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*o)))
+		if (o == this)
+			return true;
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::onLoadingScreenComplete()
+{
+	TangibleObject::onLoadingScreenComplete();
+
+	if (isInvulnerable())
+		setInvulnerabilityTimer(ConfigServerGame::getShipLoadInvulnerableTimeWithClient());
+}
+
+// ----------------------------------------------------------------------
+
+float ShipObject::getCurrentSpeed() const
+{
+	return NON_NULL(safe_cast<const ShipController *>(getController()))->getSpeed();
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::setSlideDampener(float slideDampener)
+{
+	m_slideDampener = slideDampener;
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+float ShipObject::getSlideDampener() const
+{
+	return m_slideDampener.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::setCurrentYaw(float const currentYaw)
+{
+	FATAL(!isAuthoritative(), ("ShipObject::setCurrentYaw: called on non-authoritative object [%s]", getNetworkId().getValueString().c_str()));
+
+	if (currentYaw >= 0.f && currentYaw <= getShipActualYawRateMaximum())
+	{
+		m_currentYaw = currentYaw;
+		return true;
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+float ShipObject::getCurrentYaw() const
+{
+	return m_currentYaw;
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::setCurrentPitch(float const currentPitch)
+{
+	FATAL(!isAuthoritative(), ("ShipObject::setCurrentPitch: called on non-authoritative object [%s]", getNetworkId().getValueString().c_str()));
+
+	if (currentPitch >= 0.f && currentPitch <= getShipActualPitchRateMaximum())
+	{
+		m_currentPitch = currentPitch;
+		return true;
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+float ShipObject::getCurrentPitch() const
+{
+	return m_currentPitch;
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::setCurrentRoll(float const currentRoll)
+{
+	FATAL(!isAuthoritative(), ("ShipObject::setCurrentRoll: called on non-authoritative object [%s]", getNetworkId().getValueString().c_str()));
+
+	if (currentRoll >= 0.f && currentRoll <= getShipActualRollRateMaximum())
+	{
+		m_currentRoll = currentRoll;
+		return true;
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+float ShipObject::getCurrentRoll() const
+{
+	return m_currentRoll;
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::setCurrentChassisHitPoints(float const currentChassisHitPoints)
+{
+	FATAL(!isAuthoritative(), ("ShipObject::setCurrentChassisHitPoints: called on non-authoritative object [%s]", getNetworkId().getValueString().c_str()));
+
+	if (currentChassisHitPoints >= 0.f && currentChassisHitPoints <= m_maximumChassisHitPoints.get())
+	{
+		m_currentChassisHitPoints = currentChassisHitPoints;
+		return true;
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+float ShipObject::getCurrentChassisHitPoints() const
+{
+	return m_currentChassisHitPoints.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::setMaximumChassisHitPoints(float const maximumChassisHitPoints)
+{
+	FATAL(!isAuthoritative(), ("ShipObject::setMaximumChassisHitPoints: called on non-authoritative object [%s]", getNetworkId().getValueString().c_str()));
+
+	if (maximumChassisHitPoints >= 0.f)
+	{
+		m_maximumChassisHitPoints = maximumChassisHitPoints;
+		return true;
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+float ShipObject::getMaximumChassisHitPoints() const
+{
+	return m_maximumChassisHitPoints.get();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Updates the ship.
+ *
+ * @param time		current game time
+ *
+ * @return alter result
+ */
+float ShipObject::alter(float const elapsedTime)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ShipObject::alter");
+
+	if (!isInWorld())
+		return TangibleObject::alter(elapsedTime);
+
+	if (!m_boosterAvailableTimer->isExpired())
+		m_boosterAvailableTimer->updateNoReset(elapsedTime);
+
+	if (m_invulnerabilityTimer)
+	{
+		PvpUpdateObserver o(this, Archive::ADOO_generic);
+		m_invulnerabilityTimer = std::max(0.f, m_invulnerabilityTimer-elapsedTime);
+	}
+
+	//----------------------------------------------------------------------
+	//-- update the list of nebulas containing the ship
+
+	{
+		PROFILER_AUTO_BLOCK_DEFINE("nebulas");
+
+		m_nebulaEffectReactor = 0.0f;
+		m_nebulaEffectEngine = 0.0f;
+		m_nebulaEffectShields = 0.0f;
+
+		static IntVector oldNebulas;
+		oldNebulas = *m_nebulas;
+
+		m_nebulas->clear();
+
+		static NebulaManager::NebulaVector nebulaVector;
+		nebulaVector.clear();
+		NebulaManager::getNebulasAtPosition(getPosition_w(), nebulaVector);
+		if (!nebulaVector.empty())
+		{
+			m_nebulas->reserve(nebulaVector.size());
+			for (NebulaManager::NebulaVector::const_iterator it = nebulaVector.begin(); it != nebulaVector.end(); ++it)
+			{
+				Nebula const * const nebula = NON_NULL(*it);
+				int const id = nebula->getId();
+				m_nebulas->push_back(id);
+
+				if (!std::binary_search(oldNebulas.begin(), oldNebulas.end(), id))
+				{
+					//-- todo: trigger script
+				}
+
+				m_nebulaEffectReactor += nebula->getEffectReactor();
+				m_nebulaEffectEngine += nebula->getEffectEngine();
+				m_nebulaEffectShields += nebula->getEffectShields();
+
+			}
+
+			std::sort(m_nebulas->begin(), m_nebulas->end());
+		}
+
+		for (IntVector::const_iterator it = oldNebulas.begin(); it != oldNebulas.end(); ++it)
+		{
+			int const id = *it;
+			if (!std::binary_search(m_nebulas->begin(), m_nebulas->end(), id))
+			{
+				//-- todo: trigger script
+			}
+			else
+			{
+				NebulaManagerServer::handleEnvironmentalDamage(*this, id);
+			}
+		}
+
+		m_nebulaEffectReactor = clamp(-0.5f, m_nebulaEffectReactor, 1.0f);
+		m_nebulaEffectEngine = clamp(-0.5f, m_nebulaEffectEngine, 1.0f);
+		m_nebulaEffectShields = clamp(-2.0f, m_nebulaEffectShields, 1.0f);
+
+	}
+
+	//----------------------------------------------------------------------
+
+	if (isAuthoritative())
+	{
+		//-- Weapon system updates
+		for (int i = 0; i < ShipChassisSlotType::cms_numWeaponIndices; ++i)
+		{
+			ShipChassisSlotType::Type const weaponChassisSlotType = static_cast<ShipChassisSlotType::Type>(i + static_cast<int>(ShipChassisSlotType::SCST_weapon_first));
+			m_weaponRefireTimers [i].setExpireTime(getWeaponActualRefireRate (weaponChassisSlotType));
+			IGNORE_RETURN(m_weaponRefireTimers [i].updateNoReset(elapsedTime));
+		}
+
+		m_timeSinceLastPowerPulse += elapsedTime;
+
+		if (m_timeSinceLastPowerPulse > ms_powerPulsePeriodSecs)
+		{
+			handlePowerPulse (ms_powerPulsePeriodSecs);
+			m_timeSinceLastPowerPulse -= ms_powerPulsePeriodSecs;
+		}
+
+		//-- fire all queued shots
+		if (!m_fireShotQueue->empty())
+		{
+			for (FireShotQueue::iterator it = m_fireShotQueue->begin(); it != m_fireShotQueue->end();)
+			{
+				FireShotQueueData const & fireShotQueueData = *it;
+				//-- Make sure our refire timer has expired.  This is necessary because long server frames can
+				//-- cause multiple shots on the same weapon to be enqueued in the same frame
+				if (m_weaponRefireTimers[fireShotQueueData.weaponIndex].isExpired())
+					internalHandleFireShot(fireShotQueueData.gunnerClient, fireShotQueueData.weaponIndex, fireShotQueueData.transform_p, fireShotQueueData.syncStampLong, true, NetworkId::cms_invalid, static_cast<ShipChassisSlotType::Type>(fireShotQueueData.targetComponent), false);
+
+				it = m_fireShotQueue->erase(it);
+			}
+		}
+
+		{
+			PROFILER_AUTO_BLOCK_DEFINE("compute");
+
+			PlayerShipController * const controller = isPlayerShip() ? safe_cast<PlayerShipController *>(getController()) : 0;
+
+			{
+				float const accelerationRate = computeShipActualAccelerationRate();
+				if (accelerationRate != m_shipActualAccelerationRate.get())
+				{
+					m_shipActualAccelerationRate = accelerationRate;
+					if (controller)
+						controller->onShipAccelerationRateChanged(accelerationRate);
+				}
+			}
+
+			{
+				float const decelerationRate = computeShipActualDecelerationRate();
+				if (decelerationRate != m_shipActualDecelerationRate.get())
+				{
+					m_shipActualDecelerationRate = decelerationRate;
+					if (controller)
+						controller->onShipDecelerationRateChanged(decelerationRate);
+				}
+			}
+
+			m_shipActualPitchAccelerationRate   = computeShipActualPitchAccelerationRate();
+			m_shipActualYawAccelerationRate     = computeShipActualYawAccelerationRate();
+			m_shipActualRollAccelerationRate    = computeShipActualRollAccelerationRate();
+
+			{
+				float const pitchRateMaximum = computeShipActualPitchRateMaximum();
+				float const yawRateMaximum = computeShipActualYawRateMaximum();
+				float const rollRateMaximum = computeShipActualRollRateMaximum();
+				if (   pitchRateMaximum != m_shipActualPitchRateMaximum.get()
+				    || yawRateMaximum != m_shipActualYawRateMaximum.get()
+				    || rollRateMaximum != m_shipActualRollRateMaximum.get())
+				{
+					m_shipActualPitchRateMaximum = pitchRateMaximum;
+					m_shipActualYawRateMaximum = yawRateMaximum;
+					m_shipActualRollRateMaximum = rollRateMaximum;
+					if (controller)
+						controller->onShipYprMaximumChanged(std::max(std::max(pitchRateMaximum, yawRateMaximum), rollRateMaximum));
+				}
+			}
+
+			{
+				float const speedMaximum = computeShipActualSpeedMaximum();
+				if (speedMaximum != m_shipActualSpeedMaximum.get())
+				{
+					m_shipActualSpeedMaximum = speedMaximum;
+					if (controller)
+						controller->onShipSpeedMaximumChanged(speedMaximum);
+				}
+			}
+		}
+		
+		IGNORE_RETURN(m_autoAggroImmuneTimer->updateNoReset(elapsedTime));
+		
+		if (getShieldHitpointsFrontCurrent() > 0.0f)
+			IGNORE_RETURN(setComponentFlags(ShipChassisSlotType::SCST_shield_0, getComponentFlags(ShipChassisSlotType::SCST_shield_0) | ShipComponentFlags::F_shieldsFront));
+		else if (isSlotInstalled(ShipChassisSlotType::SCST_shield_0))
+			IGNORE_RETURN(setComponentFlags(ShipChassisSlotType::SCST_shield_0, getComponentFlags(ShipChassisSlotType::SCST_shield_0) & ~ShipComponentFlags::F_shieldsFront));
+		
+		if (getShieldHitpointsBackCurrent() > 0.0f)
+			IGNORE_RETURN(setComponentFlags(ShipChassisSlotType::SCST_shield_0, getComponentFlags(ShipChassisSlotType::SCST_shield_0) | ShipComponentFlags::F_shieldsBack));
+		else if (isSlotInstalled(ShipChassisSlotType::SCST_shield_0))
+			IGNORE_RETURN(setComponentFlags(ShipChassisSlotType::SCST_shield_0, getComponentFlags(ShipChassisSlotType::SCST_shield_0) & ~ShipComponentFlags::F_shieldsBack));
+	}
+	else
+		m_timeSinceLastPowerPulse = 0.0f;
+
+	float alterResult = TangibleObject::alter(elapsedTime);
+	AlterResult::incorporateAlterResult(alterResult, AlterResult::cms_alterNextFrame);
+	return alterResult;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Creates a controller for the ship.
+ *
+ * @return the new controller
+ */
+Controller *ShipObject::createDefaultController()
+{
+	Controller * controller = 0;
+	if (isPlayerShip())
+		controller = new PlayerShipController(this);
+	else if (getGameObjectType() == SharedObjectTemplate::GOT_ship_mining_asteroid_dynamic ||
+			getGameObjectType() == SharedObjectTemplate::GOT_ship_mining_asteroid_static)
+		controller = new MiningAsteroidController(this);
+	else
+		controller = new AiShipController(this);
+
+	setController(controller);
+
+	return controller;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Get the ship's pilot, if any.
+ *
+ * @return the pilot if there is one, otherwise NULL
+ */
+CreatureObject *ShipObject::getPilot()
+{
+	return const_cast<CreatureObject *>(findPilotingCreature(*this));
+} //lint !e1762 logically nonconst
+
+// ----------------------------------------------------------------------
+
+CreatureObject const *ShipObject::getPilot() const
+{
+	return findPilotingCreature(*this);
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::findAllPassengers(std::vector<CreatureObject *> & passengers, bool onlyPlayerControlled)
+{
+	if (!getPortalProperty())
+	{
+		SlottedContainer const * const slottedContainer = getSlottedContainerProperty();
+		if (slottedContainer != 0)
+		{
+			ContainerConstIterator ii = slottedContainer->begin();
+			ContainerConstIterator iiEnd = slottedContainer->end();
+
+			for (; ii != iiEnd; ++ii)
+			{
+				Object * const object = (*ii).getObject();
+				ServerObject * const serverObject = (object != 0) ? object->asServerObject() : 0;
+				CreatureObject * const creatureObject = (serverObject != 0) ? serverObject->asCreatureObject() : 0;
+				if (creatureObject != 0)
+				{
+					if ((onlyPlayerControlled) && (!creatureObject->isPlayerControlled()))
+					{
+						continue;
+					}
+					passengers.push_back(creatureObject);
+				}
+			}
+		}
+	}
+
+	else
+	{
+		// ship is a POB ship
+		Container const * const pobContainer = ContainerInterface::getContainer(*this);
+		if (pobContainer != 0)
+		{
+			ContainerConstIterator ii = pobContainer->begin();
+			ContainerConstIterator iiEnd = pobContainer->end();
+			for (; ii != iiEnd; ++ii)
+			{
+				Object * const containerObject = (*ii).getObject();
+				ServerObject * const cell = (containerObject != 0) ? containerObject->asServerObject() : 0;
+
+				if (cell != 0)
+				{
+					Container const * const cellContainer = ContainerInterface::getContainer(*cell);
+
+					if (cellContainer != 0)
+					{
+						ContainerConstIterator jj = cellContainer->begin();
+						ContainerConstIterator jjEnd = cellContainer->end();
+						for (; jj != jjEnd; ++jj)
+						{
+							Object * const cellObject = (*jj).getObject();
+							ServerObject * const cellContent = (cellObject != 0) ? cellObject->asServerObject() : 0;
+							CreatureObject * const cellCreatureObject = (cellContent != 0) ? cellContent->asCreatureObject() : 0;
+
+							if (cellCreatureObject != 0)
+							{
+								if ((onlyPlayerControlled) && (!cellCreatureObject->isPlayerControlled()))
+								{
+									continue;
+								}
+								passengers.push_back(cellCreatureObject);
+							}
+							else
+							{
+								SlottedContainer const * const slottedContainer = (cellContent != 0) ? cellContent->getSlottedContainerProperty() : 0;
+
+								if (slottedContainer != 0)
+								{
+									ContainerConstIterator kk = slottedContainer->begin();
+									ContainerConstIterator kkEnd = slottedContainer->end();
+
+									for (; kk != kkEnd; ++kk)
+									{
+										Object * const object = (*kk).getObject();
+										ServerObject * const serverObject = (object != 0) ? object->asServerObject() : 0;
+										CreatureObject * const slotCreatureObject = (serverObject != 0) ? serverObject->asCreatureObject() : 0;
+
+										if (slotCreatureObject != 0)
+										{
+											if ((onlyPlayerControlled) && (!slotCreatureObject->isPlayerControlled()))
+											{
+												continue;
+											}
+					
+											passengers.push_back(slotCreatureObject);
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::hasWings() const
+{
+	return getLocalFlag(LocalObjectFlags::ShipObject_HasWings);
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::wingsOpened() const
+{
+	return hasCondition(static_cast<int>(C_wingsOpened));
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::openWings()
+{
+	setCondition(static_cast<int>(C_wingsOpened));
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::closeWings()
+{
+	clearCondition(static_cast<int>(C_wingsOpened));
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::hasEnergyForAShot(int const weaponIndex) const
+{
+	if (weaponIndex < 0 || weaponIndex >= ShipChassisSlotType::cms_numWeaponIndices)
+		return false;
+
+	ShipChassisSlotType::Type const weaponChassisSlotType = static_cast<ShipChassisSlotType::Type>(weaponIndex + static_cast<int>(ShipChassisSlotType::SCST_weapon_first));
+
+	float const energyRequired = getWeaponActualEnergyPerShot(weaponChassisSlotType);
+
+	if (energyRequired <= 0.0f)
+		return true;
+
+	if (isSlotInstalled(ShipChassisSlotType::SCST_capacitor) && isComponentFunctional(ShipChassisSlotType::SCST_capacitor))
+		return energyRequired <= getCapacitorEnergyCurrent ();
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::hasAmmoForAShot(int const weaponIndex) const
+{
+	if (weaponIndex < 0 || weaponIndex >= ShipChassisSlotType::cms_numWeaponIndices)
+		return false;
+
+	ShipChassisSlotType::Type const weaponChassisSlotType = static_cast<ShipChassisSlotType::Type>(weaponIndex + static_cast<int>(ShipChassisSlotType::SCST_weapon_first));
+
+	uint32 const componentCrc = getComponentCrc(weaponChassisSlotType);
+
+	if (componentCrc)
+	{
+		if (ShipComponentWeaponManager::isAmmoConsuming(componentCrc))
+		{
+			int const ammoAvailable = getWeaponAmmoCurrent (weaponChassisSlotType);
+			return ammoAvailable > 0;
+		}
+		return true;
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::internalHandleFireShot(Client const *gunnerClient, int const weaponIndex, Transform const & transform_p, uint32 const syncStampLong, bool clientShot, NetworkId const & targetId, ShipChassisSlotType::Type targetedComponent, bool const fromAutoTurret)
+{
+	if (!canFireShot(weaponIndex))
+		return;
+
+	if (weaponIndex < 0 || weaponIndex >= ShipChassisSlotType::cms_numWeaponIndices)
+		return;
+
+	ShipChassisSlotType::Type const weaponChassisSlotType = static_cast<ShipChassisSlotType::Type>(weaponIndex + static_cast<int>(ShipChassisSlotType::SCST_weapon_first));
+	Transform serverTransform_p(transform_p);
+	float deltaTime = 0.f;
+
+	bool const isBeam = isBeamWeapon(weaponIndex);
+
+	//-- client shots must be synchronized
+	if (clientShot && !isBeam)
+	{
+		//-- Adjust to where the shot would be now even though it was fired on the client
+		if (gunnerClient)
+		{
+			deltaTime = gunnerClient->computeDeltaTimeInSeconds(syncStampLong);
+			DEBUG_WARNING(deltaTime < 0.f, ("ShipObject::internalHandleFireShot: deltaTime %1.2f computed for object [id=%s, template=%s] is < 0", getNetworkId().getValueString().c_str(), getObjectTemplateName()));
+		}
+
+		serverTransform_p.move_l(Vector::unitZ * deltaTime * getWeaponProjectileSpeed(weaponIndex));
+	}
+
+	//-- non-client shots don't need validation
+	if (clientShot && !validateShot(weaponIndex, transform_p))
+		return;
+
+	CreatureObject const *gunnerCreature = gunnerClient ? safe_cast<CreatureObject const *>(gunnerClient->getCharacterObject()) : 0;
+
+	uint32 const componentCrc = getComponentCrc(weaponChassisSlotType);
+
+	bool const isMissileWeapon = ShipComponentWeaponManager::isMissile(componentCrc);
+	bool const isCountermeasureWeapon = ShipComponentWeaponManager::isCountermeasure(componentCrc);
+
+	NetworkId missileTargetId = targetId;
+
+	if (!missileTargetId.isValid())
+	{
+		//-- find the target for the missile if applicable
+		if (isMissileWeapon)
+		{
+			if (!gunnerCreature)
+			{
+				WARNING(true, ("ShipObject::internalHandleFireShot cannot fire missile with a null gunner"));
+				return;
+			}
+
+			missileTargetId = gunnerCreature->getLookAtTarget();
+
+			if (!missileTargetId.isValid())
+			{
+				StringId cantFireStringId("space_pilot_command", "cannot_fire_without_lookat");
+				Chat::sendSystemMessage(*gunnerCreature, cantFireStringId, Unicode::emptyString);
+				return;
+			}
+		}
+	}
+
+	//-- Reset the refire timer
+	VALIDATE_RANGE_INCLUSIVE_EXCLUSIVE(0, weaponIndex, ShipChassisSlotType::cms_numWeaponIndices);
+	m_weaponRefireTimers[weaponIndex].reset();
+
+	if (isMissileWeapon)
+	{
+		uint32 const ammoType = getWeaponAmmoType(weaponChassisSlotType);
+		if (!MissileManager::getInstance().requestFireMissile(gunnerCreature ? gunnerCreature->getNetworkId() : NetworkId::cms_invalid, getNetworkId(), missileTargetId, weaponIndex, static_cast<int>(ammoType), targetedComponent))
+		{
+			if (gunnerCreature)
+			{
+				StringId cantFireStringId("space_pilot_command", "gunner_fire_missile_failed");
+				Chat::sendSystemMessage(*gunnerCreature, cantFireStringId, Unicode::emptyString);
+			}
+			return;
+		}
+	}
+	else if (isCountermeasureWeapon)
+	{
+		MissileManager::getInstance().requestFireCountermeasure(gunnerCreature ? gunnerCreature->getNetworkId() : NetworkId::cms_invalid, getNetworkId(), weaponIndex);
+	}
+	else
+	{
+		int const projectileIndex = getProjectileIndexForWeapon(weaponIndex);
+		float const projectileTimeToLive = computeWeaponProjectileTimeToLive(weaponIndex);
+		float const projectileSpeed = getWeaponProjectileSpeed(weaponIndex);
+
+		float const timeToLive = projectileTimeToLive - deltaTime;
+		if (timeToLive > 0.0f)
+			ProjectileManager::create(gunnerClient, *this, weaponIndex, projectileIndex, targetedComponent, deltaTime, serverTransform_p, 10.f, projectileSpeed, timeToLive, fromAutoTurret);
+	}
+
+	//-- deduct the energy and ammo used
+	float const energyRequired = getWeaponActualEnergyPerShot(weaponChassisSlotType);
+	float const newEnergy = getCapacitorEnergyCurrent () - energyRequired;
+	IGNORE_RETURN(setCapacitorEnergyCurrent (newEnergy));
+
+	if (ShipComponentWeaponManager::isAmmoConsuming(componentCrc))
+		IGNORE_RETURN(setWeaponAmmoCurrent(weaponChassisSlotType, getWeaponAmmoCurrent(weaponChassisSlotType) - 1));
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::enqueueFireShotClient(Client const &gunnerClient, int const weaponIndex, Transform const & transform_p, int targetComponent, uint32 const syncStampLong)
+{
+	m_fireShotQueue->push_back(FireShotQueueData(gunnerClient, weaponIndex, transform_p, targetComponent, syncStampLong));
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Shoot at the specified target, if possible.
+ */
+void ShipObject::fireShotNonTurretServer(int const weaponIndex, NetworkId const & targetId, ShipChassisSlotType::Type targetedComponent, float const yawErrorRadians, float const pitchErrorRadians)
+{
+	DEBUG_FATAL(isTurret(weaponIndex),("Programmer bug:  called fireShotNonTurretServer on object %s, weapon %i, but the weapon is a turret.",getNetworkId().getValueString().c_str(), weaponIndex));
+
+	Transform fireTransform = getTransform_o2p(); 
+
+	if (pitchErrorRadians > FLT_MIN)
+	{
+		float const pitch = pitchErrorRadians * 0.5f;
+		fireTransform.pitch_l(Random::randomReal(-pitch, pitch));
+	}
+	
+	if (yawErrorRadians > FLT_MIN)
+	{
+		float const yaw = yawErrorRadians * 0.5f;
+		fireTransform.yaw_l(Random::randomReal(-yaw, yaw));
+	}
+
+	internalHandleFireShot(0, weaponIndex, fireTransform, 0, false, targetId, targetedComponent, false);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Shoot a turret at the specified target, if possible.
+ *
+ * @param turretMissYaw the amount of yaw to miss the target by
+ * @param turretMissYaw the amount of pitch to miss the target by
+ */
+void ShipObject::fireShotTurretServer(int const weaponIndex, NetworkId const & targetId, ShipChassisSlotType::Type targetedComponent, bool const goodShot, bool const fromAutoTurret)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ShipObject::FireShotTurretServer");
+	DEBUG_FATAL(!isTurret(weaponIndex),("Programmer bug:  called fireShotTurretServer on object %s, weapon %i, but the weapon is not a turret.",getNetworkId().getValueString().c_str(), weaponIndex));
+
+	Object const * const targetObject = NetworkIdManager::getObjectById(targetId);
+
+	if (targetObject == NULL)
+	{
+		WARNING(true, ("ERROR: The targetId(%s) could not be resolved to an Object. A turret shot will NOT be fired.", targetId.getValueString().c_str()));
+		return;
+	}
+
+	ServerObject const * const targetServerObject = targetObject->asServerObject();
+	ShipObject const * const targetShipObject = (targetServerObject != NULL) ? targetServerObject->asShipObject() : NULL;
+
+	if (   !targetShipObject
+	    && goodShot)
+	{
+		WARNING(true, ("ERROR: The targetId(%s) could not be resolved to a ShipObject. Perfect shot requested, but there is no way to lead with a perfect shot.", targetId.getValueString().c_str()));
+	}
+
+	if (   (targetShipObject != NULL)
+	    && goodShot)
+	{
+		// If its a good shot, lead perfectly
+
+		Transform const & turretTransform = getTurretTransform(weaponIndex);
+		Vector const & turretPosition_p = turretTransform.getPosition_p();
+		float const weaponProjectileSpeed = getWeaponProjectileSpeed(weaponIndex);
+		Vector const & perfectShotPosition_p = targetShipObject->getTargetLead_p(turretPosition_p, weaponProjectileSpeed);
+		Vector const k(perfectShotPosition_p - turretPosition_p);
+		Vector const j(Vector::perpendicular(k));
+
+		Transform perfectShotTransform;
+		perfectShotTransform.setPosition_p(turretPosition_p);
+		perfectShotTransform.setLocalFrameKJ_p(k, j);
+		perfectShotTransform.reorthonormalize();
+		
+		internalHandleFireShot(0, weaponIndex, perfectShotTransform, 0, false, targetId, targetedComponent, fromAutoTurret);
+	}
+	else
+	{
+		// If its a bad shot, miss with greater error the further away the target
+
+		Transform const & turretTransform = getTurretTransform(weaponIndex);
+		Vector const & turretPosition_p = turretTransform.getPosition_p();
+		Vector const & targetPosition_w = targetObject->getPosition_w();
+		Vector const directionToTargetPosition_w(targetPosition_w - turretPosition_p);
+		float const approximateDistanceToTarget = directionToTargetPosition_w.approximateMagnitude();
+
+		// Calculate the error for the shot in local space
+
+		Vector badShotPosition_l;
+		{
+			ShipController const * const ownerShipController = getController()->asShipController();
+			DEBUG_WARNING(!ownerShipController, ("ERROR: Controller could not be resolved to a ShipController(%s)", getDebugInformation().c_str()));
+			
+			float const missHalfAngle = (ownerShipController != NULL) ? (ownerShipController->getTurretMissAngle() / 2.0f) : 0.0f;
+			float const targetRadius = (targetServerObject != NULL) ? targetServerObject->getRadius() : 0.0f;
+
+			Transform transform;
+			transform.roll_l(Random::randomReal() * PI_TIMES_2);
+
+			badShotPosition_l = transform.rotate_l2p(Vector(0.0f, targetRadius + missHalfAngle * approximateDistanceToTarget, 0.0f));
+		}
+
+		// Calculate the final shot position in world space
+
+		Vector badShotPosition_w;
+		{
+			Transform transform;
+			transform.setPosition_p(turretPosition_p);
+			transform.setLocalFrameKJ_p(directionToTargetPosition_w, Vector::perpendicular(directionToTargetPosition_w));
+			transform.reorthonormalize();
+
+			float const x = badShotPosition_l.x;
+			float const y = badShotPosition_l.y;
+			float const z = approximateDistanceToTarget;
+
+			badShotPosition_w = transform.rotateTranslate_l2p(Vector(x, y, z));
+		}
+
+		Vector const directionToBadShotPosition_w(badShotPosition_w - turretPosition_p);
+
+		Transform badShotTransform;
+		badShotTransform.setPosition_p(turretPosition_p);
+		badShotTransform.setLocalFrameKJ_p(directionToBadShotPosition_w, Vector::perpendicular(directionToBadShotPosition_w));
+		badShotTransform.reorthonormalize();
+
+		internalHandleFireShot(0, weaponIndex, badShotTransform, 0, false, targetId, targetedComponent, fromAutoTurret);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+int ShipObject::getNumberOfHits() const
+{
+	return m_numberOfHits;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::setNumberOfHits(int const numberOfHits)
+{
+	m_numberOfHits = numberOfHits;
+}
+
+// ----------------------------------------------------------------------
+
+TangibleObject const &ShipObject::getPvpViewer(Client const &client) const
+{
+	TangibleObject const * const clientObj = safe_cast<TangibleObject const *>(client.getCharacterObject());
+	FATAL(!clientObj, ("Client trying to get pvp viewer with no character object?"));
+	ShipObject const * const clientShip = getContainingShipObject(clientObj);
+	if (clientShip)
+		return *clientShip;
+	return *clientObj;
+}
+
+// ----------------------------------------------------------------------
+
+int ShipObject::getNumberOfLots() const
+{
+	return m_lotsConsumed;
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::isAlwaysStationary() const
+{
+	return getGameObjectType() == static_cast<int>(SharedObjectTemplate::GOT_ship_station);
+}
+
+// ======================================================================
+// PRIVATE ShipObject
+// ======================================================================
+
+void ShipObject::constructFromTemplate()
+{
+	//-- Get the ship object template
+	ServerShipObjectTemplate const * const serverShipObjectTemplate = safe_cast<ServerShipObjectTemplate const *>(getObjectTemplate());
+
+	//-- Find the ship data corresponding to the ship type
+	ShipData const * shipData = ms_defaultShipData;
+	std::string const & shipType = serverShipObjectTemplate->getShipType();
+	
+	if (!shipType.empty())
+	{
+		ShipTypeShipDataMap::iterator iter = ms_shipTypeShipDataMap.find(shipType);
+		if (iter != ms_shipTypeShipDataMap.end())
+			shipData = iter->second;
+		else
+			DEBUG_WARNING(true, ("Could not find shipType %s in %s, using default", shipType.c_str(), cs_shipTypeFileName));
+	}
+	
+	m_slideDampener = shipData->m_slideDampener;
+	m_maximumChassisHitPoints = shipData->m_maximumChassisHitPoints;
+	m_chassisComponentMassMaximum = shipData->m_chassisComponentMassMaximum;
+	m_currentChassisHitPoints = m_maximumChassisHitPoints;
+	m_lotsConsumed = shipData->m_lotsConsumed;
+
+	//-- setup ship chassis
+
+	ShipChassis const * shipChassis = ShipChassis::findShipChassisByName (TemporaryCrcString (shipType.c_str (), true));
+	if (shipChassis == NULL)
+	{
+		WARNING (true, ("ShipObject::constructFromTemplate failed to find a valid ship chassis for [%s], trying generic", shipType.c_str ()));
+		shipChassis = ShipChassis::findShipChassisByName (TemporaryCrcString ("generic", true));
+	}
+
+	if (shipChassis != NULL)
+		m_chassisType = shipChassis->getCrc ();
+	else
+	{
+		WARNING (true, ("ShipObject::constructFromTemplate failed to find a valid ship chassis for [%s] or generic", shipType.c_str ()));
+	}
+
+	//set initial slot targetability from the chassis setttings.  Code or script can change these at runtime
+	if(shipChassis != NULL)
+	{
+		for (int slot = 0; slot < static_cast<int>(ShipChassisSlotType::SCST_num_types); ++slot)
+		{
+			if(ShipChassis::isSlotTargetable(shipChassis->getCrc(), static_cast<ShipChassisSlotType::Type>(slot)))
+				setSlotTargetable(static_cast<ShipChassisSlotType::Type>(slot));
+			else
+				clearSlotTargetable(static_cast<ShipChassisSlotType::Type>(slot));
+		}
+	}
+
+	//-- setup pseudo components
+	{
+		for (int i = 0; i < static_cast<int>(ShipChassisSlotType::SCST_num_types); ++i)
+		{
+			ShipComponentData * const shipComponentData = shipData->m_components[i];
+
+			if (shipComponentData != NULL)
+			{
+				if (!installComponentFromData(i, *shipComponentData))
+					WARNING(true, ("ShipObject::constructFromTemplate() failed to install component at slot [%s]", ShipChassisSlotType::getNameFromType(static_cast<ShipChassisSlotType::Type>(i)).c_str()));
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::canFireShot(int const weaponIndex) const
+{
+	//-- Make sure if the ship has wings, that the wings are opened
+	if (!isCountermeasure(weaponIndex) && hasWings() && !wingsOpened())
+		return false;
+
+	if (weaponIndex < 0 || weaponIndex >= ShipChassisSlotType::cms_numWeaponIndices)
+		return false;
+
+	ShipChassisSlotType::Type const weaponChassisSlotType = static_cast<ShipChassisSlotType::Type>(weaponIndex + static_cast<int>(ShipChassisSlotType::SCST_weapon_first));
+
+	if (!isSlotInstalled(weaponChassisSlotType))
+		return false;
+
+	if (!isComponentFunctional(weaponChassisSlotType))
+		return false;
+
+	//-- Make sure we have enough energy
+	if (!hasEnergyForAShot(weaponIndex))
+		return false;
+
+	if (!hasAmmoForAShot(weaponIndex))
+		return false;
+
+	//-- Make sure we have a refire rate
+	if (getWeaponActualRefireRate(weaponChassisSlotType) <= 0.f)
+		return false;
+
+	//-- Make sure our refire timer has expired
+	if (!m_weaponRefireTimers[weaponIndex].isExpired())
+		return false;
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::validateShot(int const weaponIndex, Transform const & transform_p) const
+{
+	if (weaponIndex >= ShipChassisSlotType::cms_numWeaponIndices)
+		return false;
+
+	ShipChassisSlotType::Type const weaponChassisSlotType = static_cast<ShipChassisSlotType::Type>(weaponIndex + static_cast<int>(ShipChassisSlotType::SCST_weapon_first));
+
+	//@todo: get weapon projectile index from weapon component
+	if (!isSlotInstalled(weaponChassisSlotType))
+		return false;
+
+	if (!ConfigServerGame::getShipShotValidationEnabled())
+		return true;
+
+	Vector testDirection_p;
+	Vector testPosition_p;
+	float const maximumYawPitchRoll = std::max(getShipActualYawRateMaximum(), std::max(getShipActualPitchRateMaximum(), getShipActualRollRateMaximum()));
+	float const testOrientationTolerance = maximumYawPitchRoll * ms_shotValidationTolerance;
+
+	if (isTurret(weaponIndex))
+	{
+		// For turrets, we determine the direction within the rotation constraints
+		// closest to the shot direction to use for the orientation test.
+
+		Transform turretTransform_p = getTurretTransform(weaponIndex);
+		Vector const direction_o = turretTransform_p.rotate_p2l(transform_p.getLocalFrameK_p());
+
+		float yaw = direction_o.theta();
+		float pitch = direction_o.phi();
+
+		uint32 const chassisCrc = getChassisType();
+		float const minYaw = ShipTurretManager::getTurretMinYaw(chassisCrc, weaponIndex);
+		float const maxYaw = ShipTurretManager::getTurretMaxYaw(chassisCrc, weaponIndex);
+		float const minPitch = ShipTurretManager::getTurretMinPitch(chassisCrc, weaponIndex);
+		float const maxPitch = ShipTurretManager::getTurretMaxPitch(chassisCrc, weaponIndex);
+
+    // clamp yaw and/or pitch if they are not allowed complete rotation
+		if ((maxYaw-(minYaw+0.001)) < PI_TIMES_2)
+			yaw = clamp(minYaw, yaw, maxYaw);
+		if ((maxPitch-(minPitch+0.001)) < PI_TIMES_2)
+			pitch = clamp(minPitch, pitch, maxPitch);
+
+		turretTransform_p.yaw_l(yaw);
+		turretTransform_p.pitch_l(pitch);
+
+		testDirection_p = turretTransform_p.getLocalFrameK_p();
+		testPosition_p = turretTransform_p.getPosition_p();
+	}
+	else
+	{
+		testDirection_p = getObjectFrameK_p();
+		testPosition_p = getPosition_p();
+	}
+
+	//-- Is our angle too far out of sync?
+	if (acos(transform_p.getLocalFrameK_p().dot(testDirection_p)) > testOrientationTolerance)
+	{
+		//-- LOG("cheater", ("firing guns in wrong direction"));
+		return false;
+	}
+
+	//-- Is our gun position too far from where we are? (max ship speed * ms_shotValidationTolerance)
+	if (transform_p.getPosition_p().magnitudeBetweenSquared(testPosition_p) > sqr(getShipActualSpeedMaximum() * ms_shotValidationTolerance))
+	{
+		//-- LOG("cheater", ("firing guns too far from current position"));
+		return false;
+	}
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+ServerObject const *ShipObject::getControlDevice() const
+{
+	// If the ship is in a control device, return it
+	ServerObject const * const containedBy = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*this));
+	if (containedBy && containedBy->getGameObjectType() == static_cast<int>(SharedObjectTemplate::GOT_data_ship_control_device))
+		return containedBy;
+
+	// Find the owner of the ship, and search their datapad for an empty ship control device
+	ServerObject const * const owner = safe_cast<ServerObject const *>(NetworkIdManager::getObjectById(getOwnerId()));
+	if (owner)
+	{
+		CreatureObject const * const ownerCreature = owner->asCreatureObject();
+		if (ownerCreature)
+		{
+			ServerObject const * const datapad = ownerCreature->getDatapad();
+			if (datapad)
+			{
+				Container const * const container = ContainerInterface::getContainer(*datapad);
+				if (container)
+				{
+					for (ContainerConstIterator i = container->begin(); i != container->end(); ++i)
+					{
+						ServerObject const * const content = safe_cast<ServerObject const *>((*i).getObject());
+						if (   content
+						    && content->getGameObjectType() == static_cast<int>(SharedObjectTemplate::GOT_data_ship_control_device)
+						    && !content->isBeingDestroyed())
+						{
+							// content is a ship control device, but we only want to return it if it is empty
+							bool empty = true;
+							Container const * const scdContainer = ContainerInterface::getContainer(*content);
+							if (scdContainer)
+							{
+								for (ContainerConstIterator j = scdContainer->begin(); j != scdContainer->end(); ++j)
+								{
+									ServerObject const * const scdContent = safe_cast<ServerObject const *>((*j).getObject());
+									if (scdContent && !scdContent->isBeingDestroyed())
+									{
+										empty = false;
+										break;
+									}
+								}
+							}
+
+							if (empty)
+								return content;
+						}
+					}
+				}
+			}
+		}
+	}
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::calcPvpableState()
+{
+	setPvpable(true);
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId ShipObject::getInstalledDroidControlDevice() const
+{
+	return m_installedDroidControlDevice.get();
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::setInstalledDroidControlDevice(NetworkId const & droidControlDevice)
+{
+	m_installedDroidControlDevice.set(droidControlDevice);
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::setPilotLookAtTarget(const NetworkId& id)
+{
+	if(isAuthoritative())
+	{
+		m_pilotLookAtTarget.set(id);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setLookAtTarget, new MessageQueueGenericValueType<NetworkId>(id));
+	}
+
+	CreatureObject * const pilot = getPilot();
+	if(pilot)
+	{
+		pilot->setLookAtTarget(id);
+	}
+
+	setPilotLookAtTargetSlot (ShipChassisSlotType::SCST_num_types);
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::setLookAtTargetFromPilot(const NetworkId& id)
+{
+	if(isAuthoritative())
+	{
+		m_pilotLookAtTarget.set(id);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setLookAtTarget, new MessageQueueGenericValueType<NetworkId>(id));
+	}
+
+	setPilotLookAtTargetSlot (ShipChassisSlotType::SCST_num_types);
+}
+
+// ----------------------------------------------------------------------
+
+ShipComponentDataEngine const & ShipObject::getShipDataEngine() const
+{
+	ServerShipObjectTemplate const * const serverShipObjectTemplate = safe_cast<ServerShipObjectTemplate const *>(getObjectTemplate());
+
+	//-- Find the ship data corresponding to the ship type
+	ShipData const * shipData = ms_defaultShipData;
+	std::string const & shipType = serverShipObjectTemplate->getShipType();
+	
+	if (!shipType.empty())
+	{
+		ShipTypeShipDataMap::iterator iter = ms_shipTypeShipDataMap.find(shipType);
+		if (iter != ms_shipTypeShipDataMap.end())
+			shipData = iter->second;
+		else
+			DEBUG_WARNING(true, ("Could not find shipType %s in %s, using default", shipType.c_str(), cs_shipTypeFileName));
+	}
+
+	ShipComponentDataEngine const * const engine = safe_cast<ShipComponentDataEngine const *>(shipData->m_components[static_cast<size_t>(ShipChassisSlotType::SCST_engine)]);
+
+	if (engine == NULL)
+		return *ms_defaultEngine;
+
+	return *engine;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::handleGunnerChange(ServerObject const &player)
+{
+	int gunnerWeaponIndex = -1;
+
+	SlottedContainmentProperty const * const slottedContainmentProperty = ContainerInterface::getSlottedContainmentProperty(player);
+	if (slottedContainmentProperty)
+	{
+		int const currentArrangement = slottedContainmentProperty->getCurrentArrangement();
+		if (currentArrangement != -1)
+		{
+			SlottedContainmentProperty::SlotArrangement const &slotArrangement = slottedContainmentProperty->getSlotArrangement(currentArrangement);
+			for (SlottedContainmentProperty::SlotArrangement::const_iterator i = slotArrangement.begin(); i != slotArrangement.end(); ++i)
+			{
+				int const weaponIndex = ShipSlotIdManager::getGunnerSlotWeaponIndex(*i);
+				if (weaponIndex != -1)
+					gunnerWeaponIndex = weaponIndex;
+			}
+		}
+	}
+
+	ShipController * const shipController = getController()->asShipController();
+	PlayerShipController * const playerShipController = (shipController != NULL) ? shipController->asPlayerShipController() : NULL;
+
+	if (playerShipController != NULL)
+	{
+		playerShipController->updateGunnerWeaponIndex(player.getNetworkId(), gunnerWeaponIndex);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::getAuthClients(std::set<Client const *> &authClients) const
+{
+	if (!isPlayerShip())
+		return;
+
+	// Build the set of clients which should receive authClient packages.
+	// This should mean only clients with this object in their containment
+	// chain which are in slots of containers, but to make the check
+	// cheaper we actually check for not in world rather than in slot.
+	std::set<Client *> const &observers = getObservers();
+	for (std::set<Client *>::const_iterator i = observers.begin(); i != observers.end(); ++i)
+	{
+		ServerObject * const characterObject = (*i)->getCharacterObject();
+		if (characterObject && !characterObject->isInWorld())
+		{
+			for (ServerObject const *so = characterObject; so; so = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*so)))
+				if (so == this)
+					IGNORE_RETURN(authClients.insert(*i));
+		}
+	}
+	// Also, we want any client we are contained by to receive authClient packages.
+	{
+		for (ServerObject const *so = this; so; so = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*so)))
+		{
+			Client const * const client = so->getClient();
+			if (client)
+				IGNORE_RETURN(authClients.insert(client));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns a vector representing the ship's current velocity (speed * direction of travel)
+ */
+Vector ShipObject::getCurrentVelocity_p() const
+{
+	return NON_NULL(safe_cast<const ShipController *>(getController()))->getVelocity();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Given the starting position and the speed of a projectile, compute a
+ * point to aim at that would hit this ship.
+ */
+Vector ShipObject::getTargetLead_p(const Vector & startPosition_p, float projectileSpeed) const
+{
+	//TODO:  There is also a formula for this on the client.  It is a little bit different, but it is derived from the same trig principles.  We should consolidate the two formulas (or pick the fastest one) and put them in a shared library
+
+	DEBUG_FATAL((projectileSpeed <= 0.0f), ("ShipObject::getTargetLead_p() Invalid projectile speed specified(%.f), must be > 0.0", projectileSpeed));
+
+	if (projectileSpeed <= 0.0f)
+	{
+		return startPosition_p;
+	}
+
+	// Step 1:  figure out the angles involved
+	Vector normalizedVelocity = getCurrentVelocity_p();
+	if (!normalizedVelocity.normalize())
+		return getPosition_p();
+
+	Vector normalizedToTarget = getPosition_p() - startPosition_p;
+	if (!normalizedToTarget.normalize())
+		return getPosition_p();
+
+	float cosineAlpha = normalizedVelocity.dot(normalizedToTarget);
+	float alpha = acos (cosineAlpha);
+	float sineAlpha = sin(alpha);
+	float sineBeta = sineAlpha * getCurrentSpeed() / projectileSpeed;
+	float beta = asin (sineBeta);
+	float gamma = (PI-alpha)-beta; //lint !e578 //hides global ::gamma
+	float sineGamma = sin(gamma);
+
+	// Step 2:  figure out the time to target
+	float time = 0.0f;
+	
+	if ((getCurrentSpeed() * sineGamma) > 0.0f)
+	{
+		time = (getPosition_p().magnitudeBetween(startPosition_p) * sineBeta) / (getCurrentSpeed() * sineGamma);
+	}
+
+	// Step 3:  figure out where we'd be by then
+	Vector const endLocation_p(getPosition_p() + getCurrentVelocity_p() * time);
+
+	return endLocation_p;
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::isCapitalShip() const
+{
+	SharedObjectTemplate::GameObjectType got = static_cast<SharedObjectTemplate::GameObjectType>(getGameObjectType());
+	return got == SharedObjectTemplate::GOT_ship_capital || got == SharedObjectTemplate::GOT_ship_station;
+}
+
+// ----------------------------------------------------------------------
+
+uint32 ShipObject::getSpaceFaction() const
+{
+	return m_spaceFaction;
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<uint32> const &ShipObject::getSpaceFactionAllies() const
+{
+	return m_spaceFactionAllies;
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<uint32> const &ShipObject::getSpaceFactionEnemies() const
+{
+	return m_spaceFactionEnemies;
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::getSpaceFactionIsAggro() const
+{
+	return m_spaceFactionIsAggro;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::setSpaceFaction(uint32 spaceFaction)
+{
+	DEBUG_FATAL(!isAuthoritative(), ("ShipObject::setSpaceFaction called for %s while nonauthoritative", getNetworkId().getValueString().c_str()));
+	PvpUpdateObserver o(this, Archive::ADOO_generic);
+	m_spaceFaction = spaceFaction;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::setSpaceFactionAllies(std::vector<uint32> const &spaceFactionAllies)
+{
+	DEBUG_FATAL(!isAuthoritative(), ("ShipObject::setSpaceFactionAllies called for %s while nonauthoritative", getNetworkId().getValueString().c_str()));
+	PvpUpdateObserver o(this, Archive::ADOO_generic);
+	m_spaceFactionAllies = spaceFactionAllies;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::setSpaceFactionEnemies(std::vector<uint32> const &spaceFactionEnemies)
+{
+	DEBUG_FATAL(!isAuthoritative(), ("ShipObject::setSpaceFactionEnemies called for %s while nonauthoritative", getNetworkId().getValueString().c_str()));
+	PvpUpdateObserver o(this, Archive::ADOO_generic);
+	m_spaceFactionEnemies = spaceFactionEnemies;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::setSpaceFactionIsAggro(bool isAggro)
+{
+	DEBUG_FATAL(!isAuthoritative(), ("ShipObject::setSpaceFactionIsAggro called for %s while nonauthoritative", getNetworkId().getValueString().c_str()));
+	PvpUpdateObserver o(this, Archive::ADOO_generic);
+	m_spaceFactionIsAggro = isAggro;
+}
+
+// ----------------------------------------------------------------------
+
+ShipObject::IntVector const & ShipObject::getNebulas() const
+{
+	return *NON_NULL(m_nebulas);
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::setWingName(std::string const & wingName)
+{
+	m_wingName.set(wingName);
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & ShipObject::getWingName() const
+{
+	return m_wingName.get();
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::setTypeName(std::string const & typeName)
+{
+	m_typeName.set(typeName);
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & ShipObject::getTypeName() const
+{
+	return m_typeName.get();
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::setDifficulty(std::string const & difficulty)
+{
+	m_difficulty.set(difficulty);
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & ShipObject::getDifficulty() const
+{
+	return m_difficulty.get();
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::setFaction(std::string const & faction)
+{
+	m_faction.set(faction);
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & ShipObject::getFaction() const
+{
+	return m_faction.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::hasTurrets() const
+{
+	return !m_turretWeaponIndices->empty();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the approximate distance at which the ship can shoot a target, i.e.
+ * the longest range of any installed weapons (excluding missiles).
+ * Does not take into account the position of the weapons on the ship, only
+ * their range.
+ */
+
+float ShipObject::getApproximateAttackRange(bool const includeMissiles) const
+{
+	float maxSoFar = 0.0f;
+	for(int weaponIndex = 0; weaponIndex < ShipChassisSlotType::cms_numWeaponIndices; ++weaponIndex)
+	{
+		ShipChassisSlotType::Type const chassisSlot = static_cast<ShipChassisSlotType::Type>(static_cast<int>(ShipChassisSlotType::SCST_weapon_0) + weaponIndex);
+		uint32 const componentCrc = getComponentCrc(chassisSlot);
+		
+		if (   isSlotInstalled(chassisSlot)
+			&& !ShipComponentWeaponManager::isCountermeasure(componentCrc)
+		    && (includeMissiles || !ShipComponentWeaponManager::isMissile(componentCrc)))
+		{
+			float const range = getWeaponRange(weaponIndex);
+			if (range > maxSoFar)
+				maxSoFar = range;
+		}
+	}
+	return maxSoFar;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::onTargetedByMissile(int const missileId)
+{
+	NON_NULL(safe_cast<ShipController *>(getController()))->onTargetedByMissile(missileId);	
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::setAutoAggroImmuneTime(float const time) const
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("ShipObject::setAutoAggroImmuneTime() owner(%s) time(%.2f)", getNetworkId().getValueString().c_str(), time));
+
+	m_autoAggroImmuneTimer->setExpireTime(time);
+	m_autoAggroImmuneTimer->reset();
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::isAutoAggroImmune() const
+{
+	return WithinEpsilonInclusive(m_autoAggroImmuneTimer->getExpireTime(), -1.0f, 0.0001f) || !m_autoAggroImmuneTimer->isExpired();
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::setDamageAggroImmune(bool const enabled)
+{
+	m_damageAggroImmune = enabled;
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::isDamageAggroImmune() const
+{
+	return m_damageAggroImmune;
+}
+
+// ----------------------------------------------------------------------
+
+Vector ShipObject::getInterceptPosition(float timeDelta) const
+{
+	return getPosition_w() + (getCurrentVelocity_p() * timeDelta);
+}
+
+// ----------------------------------------------------------------------
+
+CreatureObject const *ShipObjectNamespace::findPilotingCreature(ShipObject const &ship)
+{
+	if (!ship.getPortalProperty())
+	{
+		// non-portallized ship, so check ship_pilot slot of ship
+		SlottedContainer const * const slottedContainer = ship.getSlottedContainerProperty();
+		if (slottedContainer)
+		{
+			Container::ContainerErrorCode err = Container::CEC_Success;
+			Container::ContainedItem const item = slottedContainer->getObjectInSlot(ShipSlotIdManager::getShipPilotSlotId(), err);
+			ServerObject const * const so = safe_cast<ServerObject const *>(item.getObject());
+			if (so)
+				return so->asCreatureObject();
+		}
+	}
+	else
+	{
+		// portallized ship, so check ship_pilot_pob slot of immediate contents of cells
+		Container const * const pobContainer = ContainerInterface::getContainer(ship);
+		if (pobContainer)
+		{
+			for (ContainerConstIterator i = pobContainer->begin(); i != pobContainer->end(); ++i)
+			{
+				ServerObject const * const cell = safe_cast<ServerObject const *>((*i).getObject());
+				if (cell)
+				{
+					Container const * const cellContainer = ContainerInterface::getContainer(*cell);
+					for (ContainerConstIterator j = cellContainer->begin(); j != cellContainer->end(); ++j)
+					{
+						ServerObject const * const cellContent = safe_cast<ServerObject const *>((*j).getObject());
+						SlottedContainer const * const slottedContainer = cellContent->getSlottedContainerProperty();
+						if (slottedContainer)
+						{
+							Container::ContainerErrorCode err = Container::CEC_Success;
+							Container::ContainedItem const item = slottedContainer->getObjectInSlot(ShipSlotIdManager::getPobShipPilotSlotId(), err);
+							ServerObject const * const so = safe_cast<ServerObject const *>(item.getObject());
+							if (so)
+								return so->asCreatureObject();
+						}
+					}
+				}
+			}
+		}
+	}
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObjectNamespace::loadShipTypeDataTable(DataTable const &dataTable)
+{
+	std::for_each(ms_shipTypeShipDataMap.begin(), ms_shipTypeShipDataMap.end(), PointerDeleterPairSecond());
+	ms_shipTypeShipDataMap.clear();
+
+	int const numberOfRows = dataTable.getNumRows();
+	for (int row = 0; row < numberOfRows; ++row)
+	{
+		std::string const name = dataTable.getStringValue(static_cast<int>(CD_name), row);
+		if (ms_shipTypeShipDataMap.find(name) != ms_shipTypeShipDataMap.end())
+		{
+			DEBUG_WARNING(true, ("ShipObjectNamespace::loadShipTypeDataTable: file %s specifies duplicate shipType %s", cs_shipTypeFileName, name.c_str()));
+			continue;
+		}
+
+		ShipData * const shipData = new ShipData;
+		shipData->m_name = name;
+		shipData->m_slideDampener = dataTable.getFloatValue(static_cast<int>(CD_slideDampener), row);
+		shipData->m_maximumChassisHitPoints = dataTable.getFloatValue(static_cast<int>(CD_maximumChassisHitPoints), row);
+		shipData->m_chassisComponentMassMaximum = dataTable.getFloatValue(static_cast<int>(CD_maximumChassisComponentMass), row);
+		shipData->m_lotsConsumed = dataTable.getIntValue("lots_consumed", row);
+
+		//-- find components
+		for (int i = 0; i < static_cast<int>(ShipChassisSlotType::SCST_num_types); ++i)
+		{
+			shipData->m_components [i] = NULL;
+			std::string const & slotName = ShipChassisSlotType::getNameFromType (static_cast<ShipChassisSlotType::Type>(i));
+			if (!dataTable.doesColumnExist (slotName))
+				continue;
+
+			std::string const & componentName = dataTable.getStringValue (slotName, row);
+			if (componentName.empty ())
+				continue;
+
+			uint32 const componentCrc = Crc::normalizeAndCalculate (componentName.c_str ());
+			ShipComponentDescriptor const * const shipComponentDescriptor = ShipComponentDescriptor::findShipComponentDescriptorByCrc (componentCrc);
+
+			if (shipComponentDescriptor == NULL)
+				WARNING (true, ("ShipObject ship type [%s] specified invalid [%s] component [%s]", name.c_str (), slotName.c_str (), componentName.c_str ()));
+			else
+				shipData->m_components[i] = ShipComponentDataManager::create(*shipComponentDescriptor);
+
+			ShipComponentData * const shipComponentData = shipData->m_components[i];
+
+			if (shipComponentData == NULL)
+				continue;
+
+			//-- get common data
+			const std::string colname_armor = slotName + "_arm";
+			const std::string colname_hitpoints = slotName + "_hp";
+
+			shipComponentData->m_armorHitpointsCurrent = dataTable.getFloatValue(colname_armor, row);
+			shipComponentData->m_armorHitpointsMaximum = shipComponentData->m_armorHitpointsCurrent;
+			shipComponentData->m_hitpointsCurrent = dataTable.getFloatValue(colname_hitpoints, row);
+			shipComponentData->m_hitpointsMaximum = shipComponentData->m_hitpointsCurrent;
+
+			//-- get component-specific data
+			switch (shipComponentData->getDescriptor().getComponentType())
+			{
+			case ShipComponentType::SCT_reactor:
+				{
+					ShipComponentDataReactor * const reactor = safe_cast<ShipComponentDataReactor *>(shipComponentData);
+
+					//-- npc ships reactors' generate unlimited energy
+					reactor->m_energyGenerationRate = 999999999.0f;
+				}
+				break;
+			case ShipComponentType::SCT_engine:
+				{
+					ShipComponentDataEngine * const engine = safe_cast<ShipComponentDataEngine *>(shipComponentData);
+
+					static std::string const colname_accelerationRate = slotName + "_accel";
+					static std::string const colname_decelerationRate = slotName + "_decel";
+					static std::string const colname_pitchAccelerationRate = slotName + "_pitch_accel";
+					static std::string const colname_yawAccelerationRate = slotName + "_yaw_accel";
+					static std::string const colname_rollAccelerationRate = slotName + "_roll_accel";
+					static std::string const colname_pitchRateMaximum = slotName + "_pitch";
+					static std::string const colname_yawRateMaximum = slotName + "_yaw";
+					static std::string const colname_rollRateMaximum = slotName + "_roll";
+					static std::string const colname_speedMaximum = slotName + "_speed";
+
+					engine->m_engineAccelerationRate = dataTable.getFloatValue(colname_accelerationRate, row);
+					engine->m_engineDecelerationRate = dataTable.getFloatValue(colname_decelerationRate, row);
+					engine->m_enginePitchAccelerationRate = convertDegreesToRadians(dataTable.getFloatValue(colname_pitchAccelerationRate, row));
+					engine->m_engineYawAccelerationRate = convertDegreesToRadians(dataTable.getFloatValue(colname_yawAccelerationRate, row));
+					engine->m_engineRollAccelerationRate = convertDegreesToRadians(dataTable.getFloatValue(colname_rollAccelerationRate, row));
+					engine->m_enginePitchRateMaximum = convertDegreesToRadians(dataTable.getFloatValue(colname_pitchRateMaximum, row));
+					engine->m_engineYawRateMaximum = convertDegreesToRadians(dataTable.getFloatValue(colname_yawRateMaximum, row));
+					engine->m_engineRollRateMaximum = convertDegreesToRadians(dataTable.getFloatValue(colname_rollRateMaximum, row));
+					engine->m_engineSpeedMaximum = dataTable.getFloatValue(colname_speedMaximum, row);
+				}
+				break;
+			case ShipComponentType::SCT_shield:
+				{
+					ShipComponentDataShield * const shield = safe_cast<ShipComponentDataShield *>(shipComponentData);
+
+					static std::string const colname_hitpointsFront = slotName + "_front";
+					static std::string const colname_hitpointsBack = slotName + "_back";
+					static std::string const colname_rechargeRate = slotName + "_regen";
+
+					shield->m_shieldHitpointsFrontCurrent = dataTable.getFloatValue(colname_hitpointsFront, row);
+					shield->m_shieldHitpointsFrontMaximum = shield->m_shieldHitpointsFrontCurrent;
+					shield->m_shieldHitpointsBackCurrent = dataTable.getFloatValue(colname_hitpointsBack, row);
+					shield->m_shieldHitpointsBackMaximum = shield->m_shieldHitpointsBackCurrent;
+					shield->m_shieldRechargeRate = dataTable.getFloatValue(colname_rechargeRate, row);
+				}
+				break;
+			case ShipComponentType::SCT_armor:
+				//-- nothing to do for armor
+				break;
+			case ShipComponentType::SCT_weapon:
+				{
+					ShipComponentDataWeapon * const weapon = safe_cast<ShipComponentDataWeapon *>(shipComponentData);
+
+					std::string const colname_weaponDamageMaximum = slotName + "_dam_max";
+					std::string const colname_weaponDamageMinimum = slotName + "_dam_min";
+					std::string const colname_weaponEffectivenessShields = slotName + "_eff_sh";
+					std::string const colname_weaponEffectivenessArmor = slotName + "_eff_arm";
+					std::string const colname_weaponEnergyPerShot = slotName + "_drain";
+					std::string const colname_weaponRefireRate = slotName + "_rate";
+					std::string const colname_weaponAmmoCurrent = slotName + "_ammo";
+					std::string const colname_weaponAmmoType = slotName + "_ammo_type";
+
+					weapon->m_weaponDamageMaximum = dataTable.getFloatValue(colname_weaponDamageMaximum, row);
+					weapon->m_weaponDamageMinimum = dataTable.getFloatValue(colname_weaponDamageMinimum, row);
+					weapon->m_weaponEffectivenessShields = dataTable.getFloatValue(colname_weaponEffectivenessShields, row);
+					weapon->m_weaponEffectivenessArmor = dataTable.getFloatValue(colname_weaponEffectivenessArmor, row);
+					weapon->m_weaponEnergyPerShot = dataTable.getFloatValue(colname_weaponEnergyPerShot, row);
+					weapon->m_weaponRefireRate = dataTable.getFloatValue(colname_weaponRefireRate, row);
+					weapon->m_weaponAmmoCurrent = dataTable.getIntValue(colname_weaponAmmoCurrent, row);
+					weapon->m_weaponAmmoMaximum = weapon->m_weaponAmmoCurrent;
+					weapon->m_weaponAmmoType = static_cast<uint32>(dataTable.getIntValue(colname_weaponAmmoType, row));
+				}
+				break;
+			case ShipComponentType::SCT_capacitor:
+				{
+					ShipComponentDataCapacitor * const capacitor = safe_cast<ShipComponentDataCapacitor *>(shipComponentData);
+
+					static std::string const colname_energy = slotName + "_energy";
+					static std::string const colname_recharge = slotName + "_recharge";
+
+					capacitor->m_capacitorEnergyCurrent = dataTable.getFloatValue(colname_energy, row);
+					capacitor->m_capacitorEnergyMaximum = capacitor->m_capacitorEnergyCurrent;
+					capacitor->m_capacitorEnergyRechargeRate = dataTable.getFloatValue(colname_recharge, row);
+				}
+				break;
+			case ShipComponentType::SCT_booster:
+				{
+					ShipComponentDataBooster * const booster = safe_cast<ShipComponentDataBooster *>(shipComponentData);
+
+					static std::string const colname_energy = slotName + "_energy";
+					static std::string const colname_recharge = slotName + "_recharge";
+					static std::string const colname_consumption = slotName + "_consumption";
+					static std::string const colname_accel = slotName + "_accel";
+					static std::string const colname_speed = slotName + "_speed";
+
+					booster->m_boosterEnergyCurrent = dataTable.getFloatValue(colname_energy, row);
+					booster->m_boosterEnergyMaximum = booster->m_boosterEnergyCurrent;
+					booster->m_boosterEnergyRechargeRate = dataTable.getFloatValue(colname_recharge, row);
+					booster->m_boosterEnergyConsumptionRate = dataTable.getFloatValue(colname_consumption, row);
+					booster->m_boosterAcceleration = dataTable.getFloatValue(colname_accel, row);
+					booster->m_boosterSpeedMaximum = dataTable.getFloatValue(colname_speed, row);
+				}
+				break;
+			case ShipComponentType::SCT_droid_interface:
+				break;
+			case ShipComponentType::SCT_bridge:
+				break;
+			case ShipComponentType::SCT_hangar:
+				break;
+			case ShipComponentType::SCT_targeting_station:
+				break;
+			case ShipComponentType::SCT_cargo_hold:
+				break;
+			case ShipComponentType::SCT_modification:
+				break;
+			case ShipComponentType::SCT_num_types:
+				break;
+			}
+		}
+
+		std::pair<ShipTypeShipDataMap::iterator, bool> result = ms_shipTypeShipDataMap.insert(std::make_pair(name, shipData));
+		DEBUG_FATAL(!result.second, ("ShipObjectNamespace::loadShipTypeDataTable: Failed to insert %s", name.c_str()));
+		UNREF(result);
+	}
+
+	//-- Extract the default ship data
+	ShipTypeShipDataMap::iterator iter = ms_shipTypeShipDataMap.find(cs_defaultShipType);
+	if (iter != ms_shipTypeShipDataMap.end())
+		ms_defaultShipData = iter->second;
+	else
+		DEBUG_WARNING(true, ("ShipObjectNamespace::loadShipTypeDataTable: file %s does not specify shipType %s", cs_shipTypeFileName, cs_defaultShipType.c_str()));
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::hearText(ServerObject const &source, MessageQueueSpatialChat const &spatialChat, int chatMessageIndex)
+{
+	CreatureObject const * const sourceCreature = source.asCreatureObject();
+	if (sourceCreature)
+	{
+		// let player creatures in ship stations hear it, but use the ship as the source
+		static std::vector<CreatureObject *> passengers;
+		findAllPassengers(passengers, true);
+		if (!passengers.empty())
+		{
+			uint32 flags = spatialChat.getFlags();
+			if (   sourceCreature->getState(States::PilotingShip)
+			    || sourceCreature->getState(States::PilotingPobShip))
+				flags |= MessageQueueSpatialChat::F_shipPilot;
+			else if (sourceCreature->getState(States::ShipOperations))
+				flags |= MessageQueueSpatialChat::F_shipOperations;
+			else if (sourceCreature->getState(States::ShipGunner))
+				flags |= MessageQueueSpatialChat::F_shipGunner;
+			ServerObject const * const sourceShip = safe_cast<ServerObject const *>(ContainerInterface::getTopmostContainer(source));
+			MessageQueueSpatialChat const shipSpatialChat(
+				sourceShip->getNetworkId(),
+				spatialChat.getTargetId(),
+				spatialChat.getText(),
+				spatialChat.getVolume(),
+				spatialChat.getChatType(),
+				spatialChat.getMoodType(),
+				flags,	
+				spatialChat.getLanguage(),
+				spatialChat.getOutOfBand(),
+				sourceCreature->getAssignedObjectName());
+			for (std::vector<CreatureObject *>::const_iterator i = passengers.begin(); i != passengers.end(); ++i)
+				if (!(*i)->isInWorld())
+					(*i)->hearText(*sourceShip, shipSpatialChat, chatMessageIndex);
+			passengers.clear();
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+uint16 ShipObject::getShipId()
+{
+	FATAL(!isAuthoritative() || !isInWorld(), ("ShipObject::getShipId - tried to get a shipId for %s while either nonauth or not in world", getDebugInformation().c_str()));
+
+	if (!getLocalFlag(LocalObjectFlags::ShipObject_ShipIdAssigned))
+	{
+		m_shipId = allocateShipId();
+		setLocalFlag(LocalObjectFlags::ShipObject_ShipIdAssigned, true);
+	}
+
+	return m_shipId.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::setMovementPercent (float newMultiplier)
+{
+	if (isAuthoritative())
+	{
+		m_movementPercent = newMultiplier;
+		return true;
+	}
+	else
+		return false;
+}
+
+// ----------------------------------------------------------------------
+
+float ShipObject::getMovementPercent() const
+{
+	return m_movementPercent;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::setInvulnerabilityTimer(float duration)
+{
+	DEBUG_REPORT_LOG(true, ("Setting ship invulnerability timer for %s to %g\n", getDebugInformation().c_str(), duration));
+	PvpUpdateObserver o(this, Archive::ADOO_generic);
+	m_invulnerabilityTimer = duration;
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::isInvulnerable() const
+{
+	if (m_invulnerabilityTimer)
+		return true;
+	return TangibleObject::isInvulnerable();
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::handleCMessageTo(MessageToPayload const &message)
+{
+	if (message.getMethod() == "C++SceneWarpDelayed")
+	{
+		if (isInWorld())
+		{
+			std::vector<int8> const &packedData = message.getPackedDataVector();
+			std::string const packedDataString(packedData.begin(), packedData.end());
+			Unicode::String const packedDataStringWide(Unicode::narrowToWide(packedDataString));
+			Unicode::UnicodeStringVector result;
+			Unicode::tokenize(packedDataStringWide, result);
+			if (result.size() == 10) //number of params pushed in by the C++SceneWarpDelayed Message in GameServer::requestSceneWarpDelayed
+			{
+				std::string const &sceneName = Unicode::wideToNarrow(result[0]);
+				Vector newPosition_w;
+				newPosition_w.x = static_cast<float>(atof(Unicode::wideToNarrow(result[1]).c_str()));
+				newPosition_w.y = static_cast<float>(atof(Unicode::wideToNarrow(result[2]).c_str()));
+				newPosition_w.z = static_cast<float>(atof(Unicode::wideToNarrow(result[3]).c_str()));
+				NetworkId const newContainer(Unicode::wideToNarrow(result[4]));
+				Vector newPosition_p;
+				newPosition_p.x = static_cast<float>(atof(Unicode::wideToNarrow(result[5]).c_str()));
+				newPosition_p.y = static_cast<float>(atof(Unicode::wideToNarrow(result[6]).c_str()));
+				newPosition_p.z = static_cast<float>(atof(Unicode::wideToNarrow(result[7]).c_str()));
+				std::string callback = Unicode::wideToNarrow(result[8]);
+				if (callback == "noCallback")
+					callback.clear();
+				std::string const &forceLoadScreenStr = Unicode::wideToNarrow(result[9]);
+				bool const forceLoadScreen = (forceLoadScreenStr == "1") ? true : false;
+
+				GameServer::getInstance().requestSceneWarp(
+					CachedNetworkId(*this),
+					sceneName,
+					newPosition_w,
+					newContainer,
+					newPosition_p,
+					callback.c_str(),
+					forceLoadScreen);
+			}
+		}
+	}
+	else if (message.getMethod() == "C++SceneWarpDelayedContainer")
+	{
+		if (isInWorld())
+		{
+			std::vector<int8> const &packedData = message.getPackedDataVector();
+			std::string const packedDataString(packedData.begin(), packedData.end());
+			Unicode::String const packedDataStringWide(Unicode::narrowToWide(packedDataString));
+			Unicode::UnicodeStringVector result;
+			Unicode::tokenize(packedDataStringWide, result);
+			if (result.size() == 11) //number of params pushed in by the C++SceneWarpDelayedContainer Message in GameServer::requestSceneWarpDelayed
+			{
+				std::string const &sceneName = Unicode::wideToNarrow(result[0]);
+				Vector newPosition_w;
+				newPosition_w.x = static_cast<float>(atof(Unicode::wideToNarrow(result[1]).c_str()));
+				newPosition_w.y = static_cast<float>(atof(Unicode::wideToNarrow(result[2]).c_str()));
+				newPosition_w.z = static_cast<float>(atof(Unicode::wideToNarrow(result[3]).c_str()));
+				NetworkId const newBuilding(Unicode::wideToNarrow(result[4]));
+				std::string const & newCellName = Unicode::wideToNarrow(result[5]);
+				Vector newPosition_p;
+				newPosition_p.x = static_cast<float>(atof(Unicode::wideToNarrow(result[6]).c_str()));
+				newPosition_p.y = static_cast<float>(atof(Unicode::wideToNarrow(result[7]).c_str()));
+				newPosition_p.z = static_cast<float>(atof(Unicode::wideToNarrow(result[8]).c_str()));
+				std::string callback = Unicode::wideToNarrow(result[9]);
+				if (callback == "noCallback")
+					callback.clear();
+				std::string const &forceLoadScreenStr = Unicode::wideToNarrow(result[10]);
+				bool const forceLoadScreen = (forceLoadScreenStr == "1") ? true : false;
+
+				GameServer::getInstance().requestSceneWarp(
+					CachedNetworkId(*this),
+					sceneName,
+					newPosition_w,
+					newBuilding,
+					newCellName,
+					newPosition_p,
+					callback.c_str(),
+					forceLoadScreen);
+			}
+		}
+	}
+	else
+	{
+		TangibleObject::handleCMessageTo(message);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+uint16 ShipObjectNamespace::allocateShipId()
+{
+	unsigned int shipId = s_lastShipId;
+	unsigned int sentinel = 0;
+	do
+	{
+		// infinite loop sentinel
+		FATAL(++sentinel > s_maxShipId, ("No more available ship id"));
+
+		shipId = (shipId+1u)%s_maxShipId;
+	} while (s_shipIdUsed[shipId/32]&(1u<<(shipId%32)));
+	s_shipIdUsed[shipId/32] |= (1u<<(shipId%32));
+	s_lastShipId = shipId;
+	return static_cast<uint16>(shipId);
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObjectNamespace::freeShipId(uint16 shipId)
+{
+	s_shipIdUsed[shipId/32] &= ~(1u<<(shipId%32));
+}
+
+// ----------------------------------------------------------------------
+
+ShipObject const * ShipObject::asShipObject(Object const * object)
+{
+	ServerObject const * const serverObject = (object != NULL) ? object->asServerObject() : NULL;
+
+	return (serverObject != NULL) ? serverObject->asShipObject() : NULL;
+}
+
+// ----------------------------------------------------------------------
+
+ShipObject * ShipObject::asShipObject(Object * object)
+{
+	ServerObject * const serverObject = (object != NULL) ? object->asServerObject() : NULL;
+
+	return (serverObject != NULL) ? serverObject->asShipObject() : NULL;
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipObject::isBoosterReady() const
+{
+	return m_boosterAvailableTimer->isExpired();
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::restartBoosterTimer()
+{
+	float const boosterSpeedBonus = getBoosterSpeedMaximum();
+	float const decelRate = getShipActualDecelerationRate();
+
+	float expireTime = 0.0f;
+
+	//-- compute how long it will take to decelerate to our normal speed
+	if (decelRate > 0.0f)
+		expireTime = boosterSpeedBonus / decelRate;
+
+	expireTime = clamp(s_boosterAvailableTimeMinimum, expireTime, s_boosterAvailableTimeMaximum);
+
+	m_boosterAvailableTimer->setExpireTime(expireTime);
+	m_boosterAvailableTimer->reset();
+}
+
+// ----------------------------------------------------------------------
+
+float ShipObject::getChassisSpeedMaximumModifier() const
+{
+	return m_chassisSpeedMaximumModifier.get();
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::setChassisSpeedMaximumModifier(float f)
+{
+	m_chassisSpeedMaximumModifier = f;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::isBeamWeapon(int weaponIndex)
+{
+	if(weaponIndex >= 0 && weaponIndex < ShipChassisSlotType::cms_numWeaponIndices)
+	{
+		int const chassisSlot = static_cast<int>(ShipChassisSlotType::SCST_weapon_first) + weaponIndex;
+		uint32 const componentCrc = getComponentCrc(chassisSlot);
+		if (componentCrc != 0)
+			return ShipComponentWeaponManager::hasFlags(componentCrc, ShipComponentWeaponManager::F_beam);
+	}
+
+	return false;
+}
+
+//----------------------------------------------------------------------
+
+void ShipObject::stopFiringWeapon(int weaponIndex)
+{
+	ProjectileManager::stopBeam(*this, weaponIndex);
+
+	typedef MessageQueueGenericValueType<int> MessageType;
+	MessageType * const newMsg = new MessageType(weaponIndex);
+						
+	appendMessage(CM_shipStopFiring, 0.0f, newMsg, GameControllerMessageFlags::SEND | GameControllerMessageFlags::DEST_ALL_CLIENT | GameControllerMessageFlags::RELIABLE);
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/ShipObject.h b/engine/server/library/serverGame/src/shared/object/ShipObject.h
new file mode 100644
index 00000000..eb19d5a0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ShipObject.h
@@ -0,0 +1,688 @@
+// ======================================================================
+//
+// ShipObject.h
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _INCLUDED_ShipObject_H
+#define _INCLUDED_ShipObject_H
+
+// ======================================================================
+
+#include "Archive/AutoDeltaPackedMap.h"
+#include "serverGame/TangibleObject.h"
+#include "sharedGame/ShipChassisSlotType.h"
+
+// ======================================================================
+
+class AppearanceTemplate;
+class BitArray;
+class MessageQueueSpatialChat;
+class ServerShipObjectTemplate;
+class ShipComponentData;
+class ShipComponentDataEngine;
+class Timer;
+
+// ======================================================================
+
+namespace LocalObjectFlags
+{
+	enum
+	{
+		ShipObject_PlayerControlled = TangibleObject_Max,
+		ShipObject_HasWings         = TangibleObject_Max+1,
+		ShipObject_ShipIdAssigned   = TangibleObject_Max+2,
+
+		// This must come last.
+		ShipObject_Max
+	};
+}
+
+// ======================================================================
+
+class ShipObject: public TangibleObject
+{
+	friend class ShipController;
+	class FireShotQueueData;
+
+public:
+
+	static void install();
+
+	static ShipObject const * getContainingShipObject(ServerObject const * serverObject);
+	static ShipObject * getContainingShipObject(ServerObject * serverObject);
+
+	static ShipObject const * asShipObject(Object const * object);
+	static ShipObject * asShipObject(Object * object);
+
+	typedef stdvector<int>::fwd IntVector;
+	typedef stdmap<NetworkId, int>::fwd NetworkIdIntMap;
+	typedef std::pair<Unicode::String, std::string> ResourceTypeInfoPair;
+	typedef stdmap<NetworkId, ResourceTypeInfoPair>::fwd ResourceTypeInfoMap;
+
+public:
+
+	ShipObject(ServerShipObjectTemplate const *newTemplate);
+	virtual ~ShipObject();
+
+	virtual float alter(float time);
+
+	virtual ShipObject * asShipObject();
+	virtual ShipObject const * asShipObject() const;
+
+	uint16 getShipId();
+
+	virtual void hearText(ServerObject const &source, MessageQueueSpatialChat const &spatialChat, int chatMessageIndex);
+
+	virtual Controller *createDefaultController();
+	virtual void onAddedToWorld();
+	virtual void onContainerGainItem(ServerObject &item, ServerObject *source, ServerObject *transferer);
+	virtual void onContainerChildGainItem(ServerObject &item, ServerObject *source, ServerObject *transferer);
+	virtual void onContainerLostItem(ServerObject *destination, ServerObject &item, ServerObject *transferer);
+	virtual void onContainerChildLostItem(ServerObject *destination, ServerObject &item, ServerObject *source, ServerObject *transferer);
+	virtual bool isVisibleOnClient(const Client & client) const;
+	virtual void onLoadingScreenComplete();
+
+	CreatureObject const *getPilot() const;
+	CreatureObject *getPilot();
+	void findAllPassengers(stdvector<CreatureObject *>::fwd & passengers, bool onlyPlayerControlled);
+
+	Vector getCurrentVelocity_p() const;
+	Vector getTargetLead_p(const Vector & startPosition_p, float projectileSpeed) const;
+	float getApproximateAttackRange(bool includeMissiles = false) const;
+
+	bool isCapitalShip() const;
+	
+	//-- Engine system
+	float getCurrentSpeed() const;
+	bool setSlideDampener(float slideDampener);
+	float getSlideDampener() const;
+	bool setCurrentYaw(float currentYaw);
+	float getCurrentYaw() const;
+	bool setCurrentPitch(float currentPitch);
+	float getCurrentPitch() const;
+	bool setCurrentRoll(float currentRoll);
+	float getCurrentRoll() const;
+
+	//-- Chassis system
+	bool setCurrentChassisHitPoints(float currentChassisHitPoints);
+	float getCurrentChassisHitPoints() const;
+	bool setMaximumChassisHitPoints(float maximumChassisHitPoints);
+	float getMaximumChassisHitPoints() const;
+
+	bool hasWings() const;
+	bool wingsOpened() const;
+	void openWings();
+	void closeWings();
+
+	bool hasEnergyForAShot(int weaponIndex) const;
+	bool hasAmmoForAShot(int weaponIndex) const;
+	bool hasTurrets() const;
+	void setTurretTarget(int weaponIndex, CachedNetworkId const & target);
+	CachedNetworkId const & getTurretTarget(int weaponIndex) const;
+	Transform const getTurretTransform(int weaponIndex) const;
+	bool isMissile(int weaponIndex) const;
+	bool isTurret(int weaponIndex) const;
+	bool isCountermeasure(int weaponIndex) const;
+	bool isProjectile(int weaponIndex) const;
+	bool canTurretFireTowardsLocation_p(int weaponIndex, Vector const & targetLocation_p) const;
+	void setWeaponRefireTimerPercent(int weaponId, float refireTimerPercent);
+	bool isBeamWeapon(int weaponIndex);
+	
+	//-- Create a projectile from an authoritative client
+	void enqueueFireShotClient(Client const &gunnerClient, int weaponIndex, Transform const & transform_p, int targetComponent, uint32 syncStampLong);
+
+	//-- Create a projectile from our current position (used for ai ships)
+	void fireShotNonTurretServer(int const weaponIndex, NetworkId const & targetId, ShipChassisSlotType::Type targetedComponent, float yawErrorRadians = 0.0f, float pitchErrorRadians = 0.0f);
+	void fireShotTurretServer(int const weaponIndex, NetworkId const & targetId, ShipChassisSlotType::Type targetedComponent, bool const goodShot, bool const fromAutoTurret);
+
+	void onTargetedByMissile(int const missileId);
+	
+	const NetworkId&    getPilotLookAtTarget() const;
+	void                setPilotLookAtTarget(const NetworkId&);
+	void                setLookAtTargetFromPilot(const NetworkId&);
+	ShipChassisSlotType::Type getPilotLookAtTargetSlot() const;
+	void                setPilotLookAtTargetSlot(ShipChassisSlotType::Type slot);
+	void                setSlotTargetable(ShipChassisSlotType::Type slot);
+	void                clearSlotTargetable(ShipChassisSlotType::Type slot);
+	bool                getSlotTargetable(ShipChassisSlotType::Type slot) const;
+	bool                isValidTargetableSlot (ShipChassisSlotType::Type slot) const;
+	int findTargetChassisSlotByPosition(Vector const & position_o) const;
+	void findTransformsForComponent(int const chassisSlot, stdvector<Transform>::fwd & transforms) const;
+	AppearanceTemplate const * getExteriorAppearance() const;
+
+	int getNumberOfHits() const;
+	void setNumberOfHits(int numberOfHits);
+
+	//--
+	//-- Componentized ship physics system.
+	//-- these accessors return the correctly modified physics parameters
+	//-- these computed parameters include:
+	//--    engine component parameters
+	//--    engine efficiency
+	//--    booster component parameters, if active
+	//--    booster component efficiency, if active
+	//--    mass of the ship
+	//--    rotational inertia of the ship
+	//--
+
+	float     getShipActualAccelerationRate       () const;
+	float     getShipActualDecelerationRate       () const;
+	float     getShipActualPitchAccelerationRate  () const;
+	float     getShipActualYawAccelerationRate    () const;
+	float     getShipActualRollAccelerationRate   () const;
+	float     getShipActualPitchRateMaximum       () const;
+	float     getShipActualYawRateMaximum         () const;
+	float     getShipActualRollRateMaximum        () const;
+	float     getShipActualYprRateMaximum         () const;
+	float     getShipActualSpeedMaximum           () const;
+
+	//-- 
+	//-- Ship Component System
+	//--
+
+	float getOverallHealth() const;
+	float getOverallHealthWithShieldsAndArmor() const;
+
+	uint32    getChassisType                           () const;
+	float getChassisComponentMassMaximum() const;
+	float getChassisComponentMassCurrent() const;
+
+	bool      isSlotInstalled                          (int chassisSlot) const;
+	bool      isComponentDisabled                      (int chassisSlot) const;
+	bool      isComponentLowPower                      (int chassisSlot) const;
+	bool      isComponentActive                        (int chassisSlot) const;
+	bool      isComponentDemolished(int chassisSlot) const;
+	bool isComponentDisabledNeedsPower(int chassisSlot) const;
+	bool isComponentFunctional(int chassisSlot) const;
+
+	//-- all components
+	float     getComponentArmorHitpointsMaximum        (int chassisSlot) const;
+	float     getComponentArmorHitpointsCurrent        (int chassisSlot) const;
+	float     getComponentEfficiencyGeneral            (int chassisSlot) const;
+	float     getComponentEfficiencyEnergy             (int chassisSlot) const;
+	float     getComponentEnergyMaintenanceRequirement (int chassisSlot) const;
+	float     getComponentMass                         (int chassisSlot) const;
+	uint32    getComponentCrc                          (int chassisSlot) const;
+	float     getComponentHitpointsCurrent             (int chassisSlot) const;
+	float     getComponentHitpointsMaximum             (int chassisSlot) const;
+	int       getComponentFlags                        (int chassisSlot) const;
+	Unicode::String const &getComponentName(int chassisSlot) const;
+	NetworkId const & getComponentCreator(int chassisSlot) const;
+
+	//-- weapons
+	//-- The following methods are per weapon
+
+	float     getWeaponDamageMaximum            (int chassisSlot) const;
+	float     getWeaponDamageMinimum            (int chassisSlot) const;
+	float     getWeaponEffectivenessShields     (int chassisSlot) const;
+	float     getWeaponEffectivenessArmor       (int chassisSlot) const;
+	float     getWeaponEnergyPerShot            (int chassisSlot) const;
+	float     getWeaponActualEnergyPerShot(int chassisSlot) const;
+	float     getWeaponRefireRate               (int chassisSlot) const;
+	float     getWeaponActualRefireRate         (int chassisSlot) const;
+
+	float getWeaponEfficiencyRefireRate(int chassisSlot) const;
+	int getWeaponAmmoCurrent(int chassisSlot) const;
+	int getWeaponAmmoMaximum(int chassisSlot) const;
+	uint32 getWeaponAmmoType(int chassisSlot) const;
+
+	float getFastestWeaponProjectileSpeed() const;
+	float getWeaponProjectileSpeed(int weaponIndex) const;
+	int getProjectileIndexForWeapon(int weaponIndex) const;
+	float getWeaponRange(int weaponIndex) const;
+	float computeWeaponProjectileTimeToLive(int weaponIndex) const;
+
+	//-- shields
+	//-- The following methods are per shield
+
+	float     getShieldHitpointsFrontCurrent    () const;
+	float     getShieldHitpointsFrontMaximum    () const;
+	float     getShieldHitpointsBackCurrent     () const;
+	float     getShieldHitpointsBackMaximum     () const;
+	float     getShieldRechargeRate             () const;
+
+	//-- capacitor
+	//-- The following methods are per capacitor
+
+	float     getCapacitorEnergyCurrent         () const;
+	float     getCapacitorEnergyMaximum         () const; // raw maximum of fully functioning capacitor
+	float     getCapacitorEnergyEffectiveMaximum() const; // zero if capacitor disabled
+	float     getCapacitorEnergyRechargeRate    () const;
+
+	//-- engine
+	float     getEngineAccelerationRate         () const;
+	float     getEngineDecelerationRate         () const;
+	float     getEnginePitchAccelerationRate    () const;
+	float     getEngineYawAccelerationRate      () const;
+	float     getEngineRollAccelerationRate     () const;
+	float     getEnginePitchRateMaximum         () const;
+	float     getEngineYawRateMaximum           () const;
+	float     getEngineRollRateMaximum          () const;
+	float     getEngineSpeedMaximum             () const;
+	float getEngineSpeedRotationFactorMaximum() const;
+	float getEngineSpeedRotationFactorMinimum() const;
+	float getEngineSpeedRotationFactorOptimal() const;
+
+	//-- reactor
+	float     getReactorEnergyGenerationRate    () const;
+
+	//-- booster
+	float     getBoosterEnergyCurrent           () const;
+	float     getBoosterEnergyMaximum           () const;
+	float     getBoosterEnergyRechargeRate      () const;
+	float     getBoosterEnergyConsumptionRate   () const;
+	float     getBoosterAcceleration            () const;
+	float     getBoosterSpeedMaximum            () const;
+	bool      isBoosterActive                   () const;
+
+	//-- droid interface
+	float     getDroidInterfaceCommandSpeed     () const;
+
+	void setChassisComponentMassMaximum(float massMaximum);
+
+	//-- setters for all components
+
+	bool       setComponentArmorHitpointsMaximum        (int chassisSlot, float componentArmorHitpointsMaximum);
+	bool       setComponentArmorHitpointsCurrent        (int chassisSlot, float componentArmorHitpointsCurrent);
+	bool       setComponentEfficiencyGeneral            (int chassisSlot, float componentEfficiencyGeneral);
+	bool       setComponentEfficiencyEnergy             (int chassisSlot, float componentEfficiencyEnergy);
+	bool       setComponentEnergyMaintenanceRequirement (int chassisSlot, float componentEnergyMaintenanceRequirement);
+	bool       setComponentMass                         (int chassisSlot, float componentMass);
+	void       setComponentCrc                          (int chassisSlot, uint32 componentCrc);
+	bool       setComponentHitpointsCurrent             (int chassisSlot, float componentHitpointsCurrent);
+	bool       setComponentHitpointsMaximum             (int chassisSlot, float componentHitpointsMaximum);
+	bool       setComponentFlags                        (int chassisSlot, int componentFlags);
+	bool       setComponentName(int chassisSlot, Unicode::String const & name);
+	bool       setComponentCreator(int chassisSlot, NetworkId const & creator);
+	bool       setComponentDisabled                     (int chassisSlot, bool componentDisabled);
+	bool setComponentDisabledNeedsPower(int chassisSlot, bool componentDisabledNeedsPower);
+
+	bool       setComponentLowPower                     (int chassisSlot, bool componentLowPower);
+	bool       setComponentActive                       (int chassisSlot, bool componentActive);
+	bool       setComponentDemolished(int chassisSlot, bool componentDemolished);
+
+	//-- weapons
+	//-- The following methods are per weapon
+
+	bool       setWeaponDamageMaximum            (int chassisSlot, float weaponDamageMaximum);
+	bool       setWeaponDamageMinimum            (int chassisSlot, float weaponDamageMinimum);
+	bool       setWeaponEffectivenessShields     (int chassisSlot, float weaponEffectivenessShields);
+	bool       setWeaponEffectivenessArmor       (int chassisSlot, float weaponEffectivenessArmor);
+	bool       setWeaponEnergyPerShot            (int chassisSlot, float weaponEnergyPerShot);
+	bool       setWeaponRefireRate               (int chassisSlot, float weaponRefireRate);
+	bool setWeaponEfficiencyRefireRate(int chassisSlot, float weaponEfficiencyRefire);
+	bool setWeaponAmmoCurrent(int chassisSlot, int weaponAmmoCurrent);
+	bool setWeaponAmmoMaximum(int chassisSlot, int weaponAmmoMaximum);
+	bool setWeaponAmmoType(int chassisSlot, uint32 weaponAmmoType);
+
+	//-- shields
+
+	bool       setShieldHitpointsFrontCurrent    (float shieldHitpointsFrontCurrent);
+	bool       setShieldHitpointsFrontMaximum    (float shieldHitpointsFrontMaximum);
+	bool       setShieldHitpointsBackCurrent     (float shieldHitpointsBackCurrent);
+	bool       setShieldHitpointsBackMaximum     (float shieldHitpointsBackMaximum);
+	bool       setShieldRechargeRate             (float shieldRechargeRate);
+
+	//-- capacitor
+
+	bool       setCapacitorEnergyCurrent         (float capacitorEnergyCurrent);
+	bool       setCapacitorEnergyMaximum         (float capacitorEnergyMaximum);
+	bool       setCapacitorEnergyRechargeRate    (float capacitorEnergyRechargeRate);
+
+	//-- engine
+	bool       setEngineAccelerationRate         (float engineAccelerationRate);
+	bool       setEngineDecelerationRate         (float engineDecelerationRate);
+	bool       setEnginePitchAccelerationRate    (float enginePitchAccelerationRate);
+	bool       setEngineYawAccelerationRate      (float engineYawAccelerationRate);
+	bool       setEngineRollAccelerationRate     (float engineRollAccelerationRate);
+	bool       setEnginePitchRateMaximum         (float enginePitchRateMaximum);
+	bool       setEngineYawRateMaximum           (float engineYawRateMaximum);
+	bool       setEngineRollRateMaximum          (float engineRollRateMaximum);
+	bool       setEngineSpeedMaximum             (float engineSpeedMaximum);
+	bool setEngineSpeedRotationFactorMaximum(float engineSpeedRotationFactor);
+	bool setEngineSpeedRotationFactorMinimum(float engineSpeedRotationFactorMin);
+	bool setEngineSpeedRotationFactorOptimal(float engineSpeedRotationFactorSweetSpot);
+
+	//-- reactor
+	bool       setReactorEnergyGenerationRate    (float reactorEnergyGenerationRate);
+
+	//-- booster
+	bool       setBoosterEnergyCurrent           (float boosterEnergyCurrent);
+	bool       setBoosterEnergyMaximum           (float boosterEnergyMaximum);
+	bool       setBoosterEnergyRechargeRate      (float boosterEnergyRechargeRate);
+	bool       setBoosterEnergyConsumptionRate   (float boosterEnergyConsumptionRate);
+	bool       setBoosterAcceleration            (float boosterAcceleration);
+	bool       setBoosterSpeedMaximum            (float boosterSpeedMaximum);
+	void setBoosterActive(bool acvtive);
+	bool isBoosterInstalled() const;
+
+	//-- speed multiplier (for god mode)
+	bool setMovementPercent (float newMultiplier);
+	float getMovementPercent() const;
+
+	//-- droid interface
+	bool       setDroidInterfaceCommandSpeed     (float droidInterfaceCommandSpeed);
+
+	//-- component support
+
+	bool       canInstallComponent               (int chassisSlot, TangibleObject const & component) const;
+	bool       hasSlot                           (int chassisSlot) const;
+
+	/**
+	* installComponent destroys the component if the installation succeeds
+	*/
+
+	bool                installComponent        (NetworkId const & installerId, int chassisSlot, TangibleObject & component);
+
+	bool installComponentFromData(int chassisSlot, ShipComponentData const & shipComponentData);
+	bool                pseudoInstallComponent  (int chassisSlot, uint32 componentCrc);
+	TangibleObject *    uninstallComponent      (NetworkId const & uninstallerId, int chassisSlot, ServerObject & containerTarget, bool allowOverload = false);
+	void                purgeComponent          (int chassisSlot);
+	ShipComponentData * createShipComponentData (int chassisSlot) const;
+
+	NetworkId getInstalledDroidControlDevice    () const;
+	void setInstalledDroidControlDevice         (NetworkId const & droidControlDevice);
+
+	ServerObject const *getControlDevice        () const;
+
+	int getCargoHoldContentsMaximum() const;
+	bool setCargoHoldContentsMaximum(int contents);
+	int getCargoHoldContentsCurrent() const;
+
+	void setCargoHoldContents(NetworkIdIntMap const & contents);
+	NetworkIdIntMap const & getCargoHoldContents() const;
+	int getCargoHoldContent(NetworkId const & resourceTypeId) const;
+	void setCargoHoldContent(NetworkId const & resourceTypeId, int amount);
+
+	float computeActualComponentEfficiencyGeneral(int chassisType) const;
+
+	// space faction related functions
+	uint32 getSpaceFaction() const;
+	std::vector<uint32> const &getSpaceFactionAllies() const;
+	std::vector<uint32> const &getSpaceFactionEnemies() const;
+	bool getSpaceFactionIsAggro() const;
+
+	void setSpaceFaction(uint32 spaceFaction);
+	void setSpaceFactionAllies(std::vector<uint32> const &spaceFactionAllies);
+	void setSpaceFactionEnemies(std::vector<uint32> const &spaceFactionEnemies);
+	void setSpaceFactionIsAggro(bool isAggro);
+
+	bool isPlayerShip() const;
+
+	IntVector const & getNebulas() const;
+
+	void setWingName(std::string const & wingName);
+	std::string const & getWingName() const;
+	void setTypeName(std::string const & typeName);
+	std::string const & getTypeName() const;
+	void setDifficulty(std::string const & difficultyName);
+	std::string const & getDifficulty() const;
+	void setFaction(std::string const & factionName);
+	std::string const & getFaction() const;
+	virtual TangibleObject const &getPvpViewer(Client const &client) const;
+	virtual int getNumberOfLots() const;
+
+	bool canFireShot(int weaponIndex) const;
+	bool isAlwaysStationary() const;
+
+	void setAutoAggroImmuneTime(float const time) const;
+	bool isAutoAggroImmune() const;
+
+	void setDamageAggroImmune(bool const enabled);
+	bool isDamageAggroImmune() const;
+
+	Vector getInterceptPosition(float timeDelta) const;
+
+	void setInvulnerabilityTimer(float duration);
+	virtual bool isInvulnerable() const;
+	virtual void handleCMessageTo(MessageToPayload const &message);
+
+	bool isBoosterReady() const;
+	void restartBoosterTimer();
+
+	float getChassisSpeedMaximumModifier() const;
+	void setChassisSpeedMaximumModifier(float f);
+	virtual void getAuthClients(stdset<Client const *>::fwd &authClients) const;
+
+	void stopFiringWeapon(int weaponIndex);
+
+protected:
+	virtual void calcPvpableState();
+	virtual void endBaselines();
+	virtual void virtualOnSetAuthority();
+	virtual void handleGunnerChange(ServerObject const &player);
+
+private:
+	ShipObject();
+	ShipObject(ShipObject const &);
+	ShipObject &operator=(ShipObject const &);
+
+	void constructFromTemplate();
+
+	//-- Implementation of this function is located in generated/Packager.cpp
+	void addMembersToPackages();
+
+	bool validateShot(int weaponIndex, Transform const & transform_p) const;
+
+	void handlePowerPulse (float elapsedTimeSecs);
+	TangibleObject *    internalUninstallComponent      (NetworkId const & uninstallerId, int chassisSlot, ServerObject * containerTarget, bool allowOverload = false);
+
+	float     computeShipActualAccelerationRate       () const;
+	float     computeShipActualDecelerationRate       () const;
+	float     computeShipActualPitchAccelerationRate  () const;
+	float     computeShipActualYawAccelerationRate    () const;
+	float     computeShipActualRollAccelerationRate   () const;
+	float     computeShipActualPitchRateMaximum       () const;
+	float     computeShipActualYawRateMaximum         () const;
+	float     computeShipActualRollRateMaximum        () const;
+	float     computeShipActualSpeedMaximum           () const;
+
+	float computeChassisComponentMassCurrent() const;
+
+	void internalHandleFireShot(Client const *gunnerClient, int const weaponIndex, Transform const & transform_p, uint32 const syncStampLong, bool clientShot, NetworkId const & targetId, ShipChassisSlotType::Type targetedComponent, bool fromAutoTurret);
+
+	ShipComponentDataEngine const & getShipDataEngine() const;
+
+	void internalSetChassisComponentMassCurrent(float massCurrent);
+
+	float computeSpeedRotationFactor() const;
+
+	int computeCargoHoldContentsCurrent() const;
+	bool setCargoHoldContentsCurrent(int contents);
+
+private:
+	Archive::AutoDeltaVariable<uint16> m_shipId;
+
+	//-- Engine system
+	Archive::AutoDeltaVariable<float> m_slideDampener;
+	float m_currentYaw;  
+	float m_currentPitch;  
+	float m_currentRoll;  
+
+	//-- Chassis system
+	Archive::AutoDeltaVariable<float> m_currentChassisHitPoints;
+	Archive::AutoDeltaVariable<float> m_maximumChassisHitPoints;
+
+	Timer * m_weaponRefireTimers;
+
+	int m_numberOfHits;
+
+	//-- 
+	//-- Ship Component System
+	//--
+
+	//-- all components
+
+	Archive::AutoDeltaVariable<uint32>    m_chassisType;
+	Archive::AutoDeltaVariable<float>     m_chassisComponentMassMaximum;
+	Archive::AutoDeltaVariable<float>     m_chassisComponentMassCurrent;
+	Archive::AutoDeltaVariable<float>     m_chassisSpeedMaximumModifier;
+
+	Archive::AutoDeltaVariable<float>     m_shipActualAccelerationRate;
+	Archive::AutoDeltaVariable<float>     m_shipActualDecelerationRate;
+	Archive::AutoDeltaVariable<float>     m_shipActualPitchAccelerationRate;
+	Archive::AutoDeltaVariable<float>     m_shipActualYawAccelerationRate;
+	Archive::AutoDeltaVariable<float>     m_shipActualRollAccelerationRate;
+	Archive::AutoDeltaVariable<float>     m_shipActualPitchRateMaximum;
+	Archive::AutoDeltaVariable<float>     m_shipActualYawRateMaximum;
+	Archive::AutoDeltaVariable<float>     m_shipActualRollRateMaximum;
+	Archive::AutoDeltaVariable<float>     m_shipActualSpeedMaximum;
+
+	Archive::AutoDeltaPackedMap<int, float>     m_componentArmorHitpointsMaximum;
+	Archive::AutoDeltaPackedMap<int, float>     m_componentArmorHitpointsCurrent;
+	Archive::AutoDeltaPackedMap<int, float>     m_componentEfficiencyGeneral;
+	Archive::AutoDeltaPackedMap<int, float>     m_componentEfficiencyEnergy;
+	Archive::AutoDeltaPackedMap<int, float>     m_componentEnergyMaintenanceRequirement;
+	Archive::AutoDeltaPackedMap<int, float>     m_componentMass;
+	Archive::AutoDeltaPackedMap<int, uint32>    m_componentCrc;
+	Archive::AutoDeltaMap<int, uint32>          m_componentCrcForClient;
+	Archive::AutoDeltaPackedMap<int, float>     m_componentHitpointsCurrent;
+	Archive::AutoDeltaPackedMap<int, float>     m_componentHitpointsMaximum;
+	Archive::AutoDeltaPackedMap<int, int>       m_componentFlags;
+	Archive::AutoDeltaPackedMap<int, Unicode::String> m_componentNames;
+	Archive::AutoDeltaPackedMap<int, NetworkId> m_componentCreators;
+
+	//-- weapons
+	//-- The following maps have one entry per installed weapon .
+
+	Archive::AutoDeltaPackedMap<int, float>     m_weaponDamageMaximum;
+	Archive::AutoDeltaPackedMap<int, float>     m_weaponDamageMinimum;
+	Archive::AutoDeltaPackedMap<int, float>     m_weaponEffectivenessShields;
+	Archive::AutoDeltaPackedMap<int, float>     m_weaponEffectivenessArmor;
+	Archive::AutoDeltaPackedMap<int, float>     m_weaponEnergyPerShot;
+	Archive::AutoDeltaPackedMap<int, float>     m_weaponRefireRate;
+	Archive::AutoDeltaPackedMap<int, float>     m_weaponEfficiencyRefireRate;
+	Archive::AutoDeltaPackedMap<int, int>       m_weaponAmmoCurrent;
+	Archive::AutoDeltaPackedMap<int, int>       m_weaponAmmoMaximum;
+	Archive::AutoDeltaPackedMap<int, uint32>    m_weaponAmmoType;
+
+	//-- shields
+	//-- The following maps have one entry per installed shield.
+
+	Archive::AutoDeltaVariable<float>     m_shieldHitpointsFrontCurrent;
+	Archive::AutoDeltaVariable<float>     m_shieldHitpointsFrontMaximum;
+	Archive::AutoDeltaVariable<float>     m_shieldHitpointsBackCurrent;
+	Archive::AutoDeltaVariable<float>     m_shieldHitpointsBackMaximum;
+	Archive::AutoDeltaVariable<float>     m_shieldRechargeRate;
+
+	//-- capacitor
+	//-- The following data is for component types which may not be installed in multiples.
+
+	Archive::AutoDeltaVariable<float>     m_capacitorEnergyCurrent;
+	Archive::AutoDeltaVariable<float>     m_capacitorEnergyMaximum;
+	Archive::AutoDeltaVariable<float>     m_capacitorEnergyRechargeRate;
+
+	//-- engine
+	Archive::AutoDeltaVariable<float>     m_engineAccelerationRate;
+	Archive::AutoDeltaVariable<float>     m_engineDecelerationRate;
+	Archive::AutoDeltaVariable<float>     m_enginePitchAccelerationRate;
+	Archive::AutoDeltaVariable<float>     m_engineYawAccelerationRate;
+	Archive::AutoDeltaVariable<float>     m_engineRollAccelerationRate;
+	Archive::AutoDeltaVariable<float>     m_enginePitchRateMaximum;
+	Archive::AutoDeltaVariable<float>     m_engineYawRateMaximum;
+	Archive::AutoDeltaVariable<float>     m_engineRollRateMaximum;
+	Archive::AutoDeltaVariable<float>     m_engineSpeedMaximum;
+	Archive::AutoDeltaVariable<float> m_engineSpeedRotationFactorMaximum;
+	Archive::AutoDeltaVariable<float> m_engineSpeedRotationFactorMinimum;
+	Archive::AutoDeltaVariable<float> m_engineSpeedRotationFactorOptimal;
+
+	//-- reactor
+	Archive::AutoDeltaVariable<float>     m_reactorEnergyGenerationRate;
+
+	//-- booster
+	Archive::AutoDeltaVariable<float>     m_boosterEnergyCurrent;
+	Archive::AutoDeltaVariable<float>     m_boosterEnergyMaximum;
+	Archive::AutoDeltaVariable<float>     m_boosterEnergyRechargeRate;
+	Archive::AutoDeltaVariable<float>     m_boosterEnergyConsumptionRate;
+	Archive::AutoDeltaVariable<float>     m_boosterAcceleration;
+	Archive::AutoDeltaVariable<float>     m_boosterSpeedMaximum;
+
+	//-- droid interface
+	Archive::AutoDeltaVariable<float>     m_droidInterfaceCommandSpeed;
+
+	Archive::AutoDeltaVariable<NetworkId> m_installedDroidControlDevice;
+
+	//-- cargo hold
+	Archive::AutoDeltaVariable<int>       m_cargoHoldContentsMaximum;
+	Archive::AutoDeltaVariable<int>       m_cargoHoldContentsCurrent;
+
+	Archive::AutoDeltaPackedMap<NetworkId, int> m_cargoHoldContents;
+	Archive::AutoDeltaMap<NetworkId, std::pair<Unicode::String, std::string> > m_cargoHoldContentsResourceTypeInfo;
+
+	float                                 m_timeSinceLastPowerPulse;
+
+	typedef stdvector<FireShotQueueData>::fwd FireShotQueue;
+	FireShotQueue *                       m_fireShotQueue;
+
+	static float const                    ms_powerPulsePeriodSecs;
+
+	IntVector *                           m_nebulas;
+
+	float                                 m_nebulaEffectReactor;
+	float                                 m_nebulaEffectEngine;
+	float                                 m_nebulaEffectShields;
+
+	Archive::AutoDeltaVariable<NetworkId> m_pilotLookAtTarget;
+	Archive::AutoDeltaVariable<int>       m_pilotLookAtTargetSlot;
+	Archive::AutoDeltaVariable<BitArray>  m_targetableSlotBitfield;
+
+	std::map<int, CachedNetworkId> m_turretTargets;
+
+	Archive::AutoDeltaVariable<std::string>  m_wingName;
+	Archive::AutoDeltaVariable<std::string>  m_typeName;
+	Archive::AutoDeltaVariable<std::string>  m_difficulty;
+	Archive::AutoDeltaVariable<std::string>  m_faction;
+
+	Archive::AutoDeltaVariable<int> m_guildId;
+
+	uint32 m_spaceFaction;
+	std::vector<uint32> m_spaceFactionAllies;
+	std::vector<uint32> m_spaceFactionEnemies;
+	bool m_spaceFactionIsAggro;
+	int m_lotsConsumed;
+	Timer * const m_autoAggroImmuneTimer;
+	bool m_damageAggroImmune;
+	BitArray * const m_turretWeaponIndices;
+	float m_movementPercent;
+	float m_invulnerabilityTimer;
+	Timer * m_boosterAvailableTimer;
+	float m_fastestWeaponProjectileSpeed;
+
+private:
+//BPM ShipObject : TangibleObject // Begin persisted members.
+//EPM
+};
+
+// ======================================================================
+
+inline const NetworkId& ShipObject::getPilotLookAtTarget() const
+{
+	return m_pilotLookAtTarget.get();
+}
+
+//----------------------------------------------------------------------
+
+inline ShipChassisSlotType::Type ShipObject::getPilotLookAtTargetSlot() const
+{
+	return static_cast<ShipChassisSlotType::Type>(m_pilotLookAtTargetSlot.get());
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ShipObject::isPlayerShip() const
+{
+	return getLocalFlag(LocalObjectFlags::ShipObject_PlayerControlled);
+}
+
+//----------------------------------------------------------------------
+
+inline bool ShipObject::isComponentFunctional(int chassisSlot) const
+{
+	return isSlotInstalled(chassisSlot) && !(isComponentDisabled(chassisSlot) || isComponentDemolished(chassisSlot));
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/ShipObject_Components.cpp b/engine/server/library/serverGame/src/shared/object/ShipObject_Components.cpp
new file mode 100644
index 00000000..934fffc7
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ShipObject_Components.cpp
@@ -0,0 +1,3421 @@
+//======================================================================
+//
+// ShipObject_Components.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipObject_Components.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/Chat.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/MissileManager.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerObjectTemplate.h"
+#include "serverGame/ServerResourceClassObject.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipComponentDataEngine.h"
+#include "serverGame/ShipComponentDataManager.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/Timer.h"
+#include "sharedGame/SharedStringIds.h"
+#include "sharedGame/ShipChassis.h"
+#include "sharedGame/ShipChassisSlot.h"
+#include "sharedGame/ShipChassisSlotType.h"
+#include "sharedGame/ShipComponentAttachmentManager.h"
+#include "sharedGame/ShipComponentData.h"
+#include "sharedGame/ShipComponentDescriptor.h"
+#include "sharedGame/ShipComponentFlags.h"
+#include "sharedGame/ShipComponentWeaponManager.h"
+#include "sharedGame/ShipTurretManager.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/Appearance.h"
+#include "sharedObject/AppearanceTemplate.h"
+#include "sharedObject/AppearanceTemplateList.h"
+#include "sharedObject/Hardpoint.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/PortalProperty.h"
+#include "sharedObject/PortalPropertyTemplate.h"
+#include "sharedObject/VolumeContainer.h"
+
+
+// ======================================================================
+
+namespace ShipObjectNamespace
+{
+	ConstCharCrcString const s_turretPitchHardpoint("turretpitch1");
+}
+using namespace ShipObjectNamespace;
+
+// ======================================================================
+
+uint32 ShipObject::getChassisType () const
+{
+	return m_chassisType.get ();
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Returns [0.0, 1.0] relating to the hitpoints of the chassis and all installed components
+ * 1.0 == pristine, 0.0 == totally broken (though there are other rules to determine if a ship is flyable)
+ */
+float ShipObject::getOverallHealth() const
+{
+	float total = 0.0f;
+	int numComponents = 0;
+	if(getMaximumChassisHitPoints() > 0.0)
+	{
+		total += getCurrentChassisHitPoints() / getMaximumChassisHitPoints();
+		++numComponents;
+	}
+
+	for(int i = ShipChassisSlotType::SCST_first; i != ShipChassisSlotType::SCST_num_types; ++i)
+	{
+		if(isSlotInstalled(i))
+		{
+			if(getComponentHitpointsMaximum(i) > 0.0f)
+			{
+				total += getComponentHitpointsCurrent(i) / getComponentHitpointsMaximum(i);
+				++numComponents;
+			}
+		}
+	}
+
+	if(numComponents <= 0)
+		return 0.0f;
+	else
+		return clamp(0.0f, total / numComponents, 1.0f);
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getOverallHealthWithShieldsAndArmor() const
+{
+	int numberObjectsToWeight = 0;
+
+	float total = getOverallHealth();
+	++numberObjectsToWeight;
+
+	float const shieldHitpointsFrontMaximum = getShieldHitpointsFrontMaximum();
+	if (shieldHitpointsFrontMaximum != 0.0)
+	{
+		total += getShieldHitpointsFrontCurrent() / shieldHitpointsFrontMaximum;
+		++numberObjectsToWeight;
+	}
+
+	float const shieldHitpointsBackMaximum = getShieldHitpointsBackMaximum();
+	if (shieldHitpointsBackMaximum != 0.0)
+	{
+		total += getShieldHitpointsBackCurrent() / shieldHitpointsBackMaximum;
+		++numberObjectsToWeight;
+	}
+
+	float const componentArmorHitpointsMaximum0 = getComponentArmorHitpointsMaximum(ShipChassisSlotType::SCST_armor_0);
+	if (componentArmorHitpointsMaximum0 != 0.0)
+	{
+		total += getComponentArmorHitpointsCurrent(ShipChassisSlotType::SCST_armor_0) / componentArmorHitpointsMaximum0;
+		++numberObjectsToWeight;
+	}
+
+	float const componentArmorHitpointsMaximum1 = getComponentArmorHitpointsMaximum(ShipChassisSlotType::SCST_armor_1);
+	if (componentArmorHitpointsMaximum1 != 0.0)
+	{
+		total += getComponentArmorHitpointsCurrent(ShipChassisSlotType::SCST_armor_1) / componentArmorHitpointsMaximum1;
+		++numberObjectsToWeight;
+	}
+
+	return clamp(0.0f, total / static_cast<float>(numberObjectsToWeight), 1.0f);
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getComponentArmorHitpointsMaximum (int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, float>::const_iterator const it = m_componentArmorHitpointsMaximum.find (chassisSlot);
+	if (it != m_componentArmorHitpointsMaximum.end ())
+		return (*it).second;
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getComponentArmorHitpointsCurrent (int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, float>::const_iterator const it = m_componentArmorHitpointsCurrent.find (chassisSlot);
+	if (it != m_componentArmorHitpointsCurrent.end ())
+		return (*it).second;
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getComponentEfficiencyGeneral (int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, float>::const_iterator const it = m_componentEfficiencyGeneral.find (chassisSlot);
+	if (it != m_componentEfficiencyGeneral.end ())
+		return (*it).second;
+	return 1.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getComponentEfficiencyEnergy (int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, float>::const_iterator const it = m_componentEfficiencyEnergy.find (chassisSlot);
+	if (it != m_componentEfficiencyEnergy.end ())
+		return (*it).second;
+	return 1.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getComponentEnergyMaintenanceRequirement (int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, float>::const_iterator const it = m_componentEnergyMaintenanceRequirement.find (chassisSlot);
+	if (it != m_componentEnergyMaintenanceRequirement.end ())
+		return (*it).second;
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getComponentMass (int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, float>::const_iterator const it = m_componentMass.find (chassisSlot);
+	if (it != m_componentMass.end ())
+		return (*it).second;
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+uint32 ShipObject::getComponentCrc (int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, uint32>::const_iterator const it = m_componentCrc.find (chassisSlot);
+	if (it != m_componentCrc.end ())
+		return (*it).second;
+	return 0;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getComponentHitpointsCurrent (int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, float>::const_iterator const it = m_componentHitpointsCurrent.find (chassisSlot);
+	if (it != m_componentHitpointsCurrent.end ())
+		return (*it).second;
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getComponentHitpointsMaximum (int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, float>::const_iterator const it = m_componentHitpointsMaximum.find (chassisSlot);
+	if (it != m_componentHitpointsMaximum.end ())
+		return (*it).second;
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+int ShipObject::getComponentFlags (int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, int>::const_iterator const it = m_componentFlags.find (chassisSlot);
+	if (it != m_componentFlags.end ())
+		return (*it).second;
+	return 0;
+}
+
+//----------------------------------------------------------------------
+
+Unicode::String const &ShipObject::getComponentName(int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, Unicode::String>::const_iterator const it = m_componentNames.find (chassisSlot);
+	if (it != m_componentNames.end() && !(*it).second.empty())
+		return (*it).second;
+
+	return Unicode::emptyString;
+}
+
+//----------------------------------------------------------------------
+
+NetworkId const &ShipObject::getComponentCreator(int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, NetworkId>::const_iterator const it = m_componentCreators.find (chassisSlot);
+	if (it != m_componentCreators.end())
+		return (*it).second;
+
+	return NetworkId::cms_invalid;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getWeaponDamageMaximum (int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, float>::const_iterator const it = m_weaponDamageMaximum.find (chassisSlot);
+	if (it != m_weaponDamageMaximum.end ())
+		return (*it).second;
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getWeaponDamageMinimum (int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, float>::const_iterator const it = m_weaponDamageMinimum.find (chassisSlot);
+	if (it != m_weaponDamageMinimum.end ())
+		return (*it).second;
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getWeaponEffectivenessShields (int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, float>::const_iterator const it = m_weaponEffectivenessShields.find (chassisSlot);
+	if (it != m_weaponEffectivenessShields.end ())
+		return (*it).second;
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getWeaponEffectivenessArmor (int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, float>::const_iterator const it = m_weaponEffectivenessArmor.find (chassisSlot);
+	if (it != m_weaponEffectivenessArmor.end ())
+		return (*it).second;
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getWeaponEnergyPerShot (int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, float>::const_iterator const it = m_weaponEnergyPerShot.find (chassisSlot);
+	if (it != m_weaponEnergyPerShot.end ())
+		return (*it).second;
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getWeaponActualEnergyPerShot(int chassisSlot) const
+{
+	float const weaponEfficiencyEnergy = std::max(0.1f, getComponentEfficiencyEnergy(chassisSlot));
+	return getWeaponEnergyPerShot(chassisSlot) / weaponEfficiencyEnergy;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getWeaponRefireRate (int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, float>::const_iterator const it = m_weaponRefireRate.find (chassisSlot);
+	if (it != m_weaponRefireRate.end ())
+		return (*it).second;
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getWeaponActualRefireRate         (int chassisSlot) const
+{
+	if (!isSlotInstalled(chassisSlot))
+		return 0.0f;
+
+	float const eff = clamp(0.1f, getWeaponEfficiencyRefireRate(chassisSlot), 10.0f);
+	return getWeaponRefireRate(chassisSlot) / eff;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getWeaponEfficiencyRefireRate (int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, float>::const_iterator const it = m_weaponEfficiencyRefireRate.find (chassisSlot);
+	if (it != m_weaponEfficiencyRefireRate.end ())
+		return (*it).second;
+	return 1.0f;
+}
+
+//----------------------------------------------------------------------
+
+int ShipObject::getWeaponAmmoCurrent(int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, int>::const_iterator const it = m_weaponAmmoCurrent.find (chassisSlot);
+	if (it != m_weaponAmmoCurrent.end ())
+		return (*it).second;
+	return 0;
+}
+
+//----------------------------------------------------------------------
+
+int ShipObject::getWeaponAmmoMaximum(int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, int>::const_iterator const it = m_weaponAmmoMaximum.find (chassisSlot);
+	if (it != m_weaponAmmoMaximum.end ())
+		return (*it).second;
+	return 0;
+}
+
+//----------------------------------------------------------------------
+
+uint32 ShipObject::getWeaponAmmoType(int chassisSlot) const
+{
+	Archive::AutoDeltaMap<int, uint32>::const_iterator const it = m_weaponAmmoType.find (chassisSlot);
+	if (it != m_weaponAmmoType.end ())
+		return (*it).second;
+	return 0;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getShieldHitpointsFrontCurrent () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_shield_0))
+		return m_shieldHitpointsFrontCurrent.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getShieldHitpointsFrontMaximum () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_shield_0))
+		return m_shieldHitpointsFrontMaximum.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getShieldHitpointsBackCurrent () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_shield_0))
+		return m_shieldHitpointsBackCurrent.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getShieldHitpointsBackMaximum () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_shield_0))
+		return m_shieldHitpointsBackMaximum.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getShieldRechargeRate () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_shield_0))
+		return m_shieldRechargeRate.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getCapacitorEnergyCurrent () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_capacitor))
+		return m_capacitorEnergyCurrent.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getCapacitorEnergyMaximum () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_capacitor))
+		return m_capacitorEnergyMaximum.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getCapacitorEnergyEffectiveMaximum () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_capacitor) && isComponentFunctional(ShipChassisSlotType::SCST_capacitor))
+		return m_capacitorEnergyMaximum.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getCapacitorEnergyRechargeRate () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_capacitor))
+		return m_capacitorEnergyRechargeRate.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getEngineAccelerationRate () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine))
+		return m_engineAccelerationRate.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getEngineDecelerationRate () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine))
+		return m_engineDecelerationRate.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getEnginePitchAccelerationRate () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine))
+		return m_enginePitchAccelerationRate.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getEngineYawAccelerationRate () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine))
+		return m_engineYawAccelerationRate.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getEngineRollAccelerationRate () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine))
+		return m_engineRollAccelerationRate.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getEnginePitchRateMaximum () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine))
+		return m_enginePitchRateMaximum.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getEngineYawRateMaximum () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine))
+		return m_engineYawRateMaximum.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getEngineRollRateMaximum () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine))
+		return m_engineRollRateMaximum.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getEngineSpeedMaximum () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine))
+		return m_engineSpeedMaximum.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getEngineSpeedRotationFactorMaximum() const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine))
+		return m_engineSpeedRotationFactorMaximum.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getEngineSpeedRotationFactorMinimum() const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine))
+		return m_engineSpeedRotationFactorMinimum.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getEngineSpeedRotationFactorOptimal() const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine))
+		return m_engineSpeedRotationFactorOptimal.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getReactorEnergyGenerationRate () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_reactor))
+		return m_reactorEnergyGenerationRate.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getBoosterEnergyCurrent () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_booster))
+		return m_boosterEnergyCurrent.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getBoosterEnergyMaximum () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_booster))
+		return m_boosterEnergyMaximum.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getBoosterEnergyRechargeRate () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_booster))
+		return m_boosterEnergyRechargeRate.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getBoosterEnergyConsumptionRate () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_booster))
+		return m_boosterEnergyConsumptionRate.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getBoosterAcceleration () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_booster))
+		return m_boosterAcceleration.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getBoosterSpeedMaximum () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_booster))
+		return m_boosterSpeedMaximum.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getDroidInterfaceCommandSpeed () const
+{
+	if (isSlotInstalled (ShipChassisSlotType::SCST_droid_interface))
+		return m_droidInterfaceCommandSpeed.get ();
+	return 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::hasSlot (int chassisSlot) const
+{
+	ShipChassis const * const shipChassis = ShipChassis::findShipChassisByCrc (getChassisType ());
+	return shipChassis && shipChassis->getSlot (static_cast<ShipChassisSlotType::Type>(chassisSlot));
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setComponentArmorHitpointsMaximum (int chassisSlot, float componentArmorHitpointsMaximum)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setComponentArmorHitpointsMaximum () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setComponentArmorHitpointsMaximum () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	m_componentArmorHitpointsMaximum.set (chassisSlot, componentArmorHitpointsMaximum);
+	//-- force update of current hitpoints
+	IGNORE_RETURN(setComponentArmorHitpointsCurrent (chassisSlot, getComponentArmorHitpointsCurrent (chassisSlot)));
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setComponentArmorHitpointsCurrent (int chassisSlot, float componentArmorHitpointsCurrent)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setComponentArmorHitpointsCurrent () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setComponentArmorHitpointsCurrent () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	componentArmorHitpointsCurrent = std::min (getComponentArmorHitpointsMaximum (chassisSlot), componentArmorHitpointsCurrent);
+	m_componentArmorHitpointsCurrent.set (chassisSlot, componentArmorHitpointsCurrent);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setComponentEfficiencyGeneral (int chassisSlot, float componentEfficiencyGeneral)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setComponentEfficiencyGeneral () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setComponentEfficiencyGeneral () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	componentEfficiencyGeneral = clamp (0.1f, componentEfficiencyGeneral, 10.0f);
+	m_componentEfficiencyGeneral.set (chassisSlot, componentEfficiencyGeneral);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setComponentEfficiencyEnergy (int chassisSlot, float componentEfficiencyEnergy)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setComponentEfficiencyEnergy () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setComponentEfficiencyEnergy () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	componentEfficiencyEnergy = clamp (0.1f, componentEfficiencyEnergy, 10.0f);
+	m_componentEfficiencyEnergy.set (chassisSlot, componentEfficiencyEnergy);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setComponentEnergyMaintenanceRequirement (int chassisSlot, float componentEnergyMaintenanceRequirement)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setComponentEnergyMaintenanceRequirement () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setComponentEnergyMaintenanceRequirement () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	m_componentEnergyMaintenanceRequirement.set (chassisSlot, componentEnergyMaintenanceRequirement);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setComponentMass (int chassisSlot, float componentMass)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setComponentMass () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setComponentMass () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	m_componentMass.set (chassisSlot, componentMass);
+
+	internalSetChassisComponentMassCurrent(computeChassisComponentMassCurrent());
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+/**
+* Setting a component template crc to zero removes the component
+*/
+
+void ShipObject::setComponentCrc (int chassisSlot, uint32 componentCrc)
+{
+	if (componentCrc == 0)
+	{
+		IGNORE_RETURN (m_componentArmorHitpointsMaximum.erase (chassisSlot));
+		IGNORE_RETURN (m_componentArmorHitpointsCurrent.erase (chassisSlot));
+		IGNORE_RETURN (m_componentEfficiencyGeneral.erase (chassisSlot));
+		IGNORE_RETURN (m_componentEfficiencyEnergy.erase (chassisSlot));
+		IGNORE_RETURN (m_componentEnergyMaintenanceRequirement.erase (chassisSlot));
+		IGNORE_RETURN (m_componentMass.erase (chassisSlot));
+		IGNORE_RETURN (m_componentCrc.erase (chassisSlot));
+		IGNORE_RETURN (m_componentCrcForClient.erase (chassisSlot));
+		IGNORE_RETURN (m_componentHitpointsCurrent.erase (chassisSlot));
+		IGNORE_RETURN (m_componentHitpointsMaximum.erase (chassisSlot));
+		IGNORE_RETURN (m_componentFlags.erase (chassisSlot));
+		IGNORE_RETURN (m_componentNames.erase (chassisSlot));
+		IGNORE_RETURN (m_weaponDamageMaximum.erase (chassisSlot));
+		IGNORE_RETURN (m_weaponDamageMinimum.erase (chassisSlot));
+		IGNORE_RETURN (m_weaponEffectivenessShields.erase (chassisSlot));
+		IGNORE_RETURN (m_weaponEffectivenessArmor.erase (chassisSlot));
+		IGNORE_RETURN (m_weaponEnergyPerShot.erase (chassisSlot));
+		IGNORE_RETURN (m_weaponRefireRate.erase (chassisSlot));
+		IGNORE_RETURN (m_componentCreators.erase (chassisSlot));
+
+		internalSetChassisComponentMassCurrent(computeChassisComponentMassCurrent());
+	}
+	else
+	{
+		m_componentCrc.set (chassisSlot, componentCrc);
+		m_componentCrcForClient.set (chassisSlot, componentCrc);
+
+		//-- all components start out at low power so script gets the first power up pulse
+		IGNORE_RETURN(setComponentLowPower (chassisSlot, true));
+
+		internalSetChassisComponentMassCurrent(computeChassisComponentMassCurrent());
+	}
+
+	if (ShipChassisSlotType::isWeaponChassisSlot(static_cast<ShipChassisSlotType::Type>(chassisSlot)))
+	{
+		// Cache the turret positions
+		{
+			int const weaponIndex = ShipChassisSlotType::getWeaponIndex(static_cast<ShipChassisSlotType::Type>(chassisSlot));
+
+			if (ShipTurretManager::isTurret(getChassisType(), weaponIndex))
+			{
+				m_turretWeaponIndices->setBit(weaponIndex);
+			}
+			else
+			{
+				m_turretWeaponIndices->clearBit(weaponIndex);
+			}
+		}
+
+		// Cache for the fastest projectile weapon speed
+		{
+			m_fastestWeaponProjectileSpeed = 0.0f;
+
+			for (int weaponIndex = 0; weaponIndex < ShipChassisSlotType::cms_numWeaponIndices; ++weaponIndex)
+			{
+				if (isProjectile(weaponIndex))
+				{
+					m_fastestWeaponProjectileSpeed = std::max(m_fastestWeaponProjectileSpeed, getWeaponProjectileSpeed(weaponIndex));
+				}
+			}
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setComponentHitpointsCurrent (int chassisSlot, float componentHitpointsCurrent)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setComponentHitpointsCurrent () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setComponentHitpointsCurrent () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	float const maxHp = getComponentHitpointsMaximum(chassisSlot);
+
+	componentHitpointsCurrent = std::min (maxHp, componentHitpointsCurrent);
+	m_componentHitpointsCurrent.set (chassisSlot, componentHitpointsCurrent);
+
+	bool const isDemolished = isComponentDemolished(chassisSlot);
+
+	if (componentHitpointsCurrent <= 0.0f && maxHp > 0.0f && !isDemolished)
+		IGNORE_RETURN(setComponentDemolished(chassisSlot, true));
+	else if (isDemolished)
+		IGNORE_RETURN(setComponentDemolished(chassisSlot, false));
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setComponentHitpointsMaximum (int chassisSlot, float componentHitpointsMaximum)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setComponentHitpointsMaximum () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setComponentHitpointsMaximum () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	m_componentHitpointsMaximum.set (chassisSlot, componentHitpointsMaximum);
+	IGNORE_RETURN(setComponentHitpointsCurrent (chassisSlot, getComponentHitpointsCurrent (chassisSlot)));
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setComponentFlags (int chassisSlot, int componentFlags)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setComponentFlags () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setComponentFlags () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	m_componentFlags.set (chassisSlot, componentFlags);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setComponentName(int chassisSlot, Unicode::String const & componentName)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setComponentName () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setComponentName () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	m_componentNames.set (chassisSlot, componentName);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setComponentCreator(int chassisSlot, NetworkId const & componentCreator)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setComponentName () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setComponentCreator () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	if (componentCreator != NetworkId::cms_invalid)
+		m_componentCreators.set (chassisSlot, componentCreator);
+	else
+		m_componentCreators.erase(chassisSlot);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setComponentDisabled                     (int chassisSlot, bool componentDisabled)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setComponentDisabled                     () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setComponentDisabled                     () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	int const flags = getComponentFlags (chassisSlot);
+
+	if (componentDisabled)
+	{
+		IGNORE_RETURN(setComponentFlags(chassisSlot, flags | static_cast<int>(ShipComponentFlags::F_disabled)));
+		IGNORE_RETURN(setComponentLowPower(chassisSlot, true));
+		IGNORE_RETURN(setComponentActive(chassisSlot, false));
+	}
+	else
+	{
+		IGNORE_RETURN(setComponentFlags (chassisSlot, flags & ~static_cast<int>(ShipComponentFlags::F_disabled)));
+		IGNORE_RETURN(setComponentDisabledNeedsPower(chassisSlot, false));
+	}
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setComponentDisabledNeedsPower(int chassisSlot, bool componentDisabledNeedsPower)
+{
+	FATAL(isInitialized() && !isAuthoritative(), ("ShipObject::setComponentDisabledNeedsPower() called on non-auth object."));
+	if (!isSlotInstalled(chassisSlot))
+	{
+		WARNING(true, ("ShipObject::setComponentDisabledNeedsPower() called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	int const flags = getComponentFlags(chassisSlot);
+
+	if (componentDisabledNeedsPower)
+		IGNORE_RETURN(setComponentFlags(chassisSlot, flags | static_cast<int>(ShipComponentFlags::F_disabledNeedsPower)));
+	else
+		IGNORE_RETURN(setComponentFlags(chassisSlot, flags & ~static_cast<int>(ShipComponentFlags::F_disabledNeedsPower)));
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setComponentLowPower                     (int chassisSlot, bool componentLowPower)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setComponentLowPower                     () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setComponentLowPower                     () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	int const flags = getComponentFlags (chassisSlot);
+
+	if (componentLowPower)
+		IGNORE_RETURN(setComponentFlags (chassisSlot, flags | static_cast<int>(ShipComponentFlags::F_lowPower)));
+	else
+		IGNORE_RETURN(setComponentFlags (chassisSlot, flags & ~static_cast<int>(ShipComponentFlags::F_lowPower)));
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setComponentActive                       (int chassisSlot, bool componentActive)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setComponentActive() called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setComponentActive() called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+	
+	int const flags = getComponentFlags (chassisSlot);
+	
+	if (componentActive)
+		IGNORE_RETURN(setComponentFlags (chassisSlot, flags | static_cast<int>(ShipComponentFlags::F_active)));
+	else
+		IGNORE_RETURN(setComponentFlags (chassisSlot, flags & ~static_cast<int>(ShipComponentFlags::F_active)));
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setComponentDemolished(int chassisSlot, bool const componentDemolished)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setComponentDemolished() called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setComponentDemolished() called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+	
+	int const flags = getComponentFlags (chassisSlot);
+	
+	if (componentDemolished)
+		IGNORE_RETURN(setComponentFlags (chassisSlot, flags | static_cast<int>(ShipComponentFlags::F_demolished)));
+	else
+		IGNORE_RETURN(setComponentFlags (chassisSlot, flags & ~static_cast<int>(ShipComponentFlags::F_demolished)));
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setWeaponDamageMaximum (int chassisSlot, float weaponDamageMaximum)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setWeaponDamageMaximum () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setWeaponDamageMaximum () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	m_weaponDamageMaximum.set (chassisSlot, weaponDamageMaximum);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setWeaponDamageMinimum (int chassisSlot, float weaponDamageMinimum)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setWeaponDamageMinimum () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setWeaponDamageMinimum () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	m_weaponDamageMinimum.set (chassisSlot, weaponDamageMinimum);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setWeaponEffectivenessShields (int chassisSlot, float weaponEffectivenessShields)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setWeaponEffectivenessShields () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setWeaponEffectivenessShields () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	m_weaponEffectivenessShields.set (chassisSlot, weaponEffectivenessShields);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setWeaponEffectivenessArmor (int chassisSlot, float weaponEffectivenessArmor)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setWeaponEffectivenessArmor () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setWeaponEffectivenessArmor () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	m_weaponEffectivenessArmor.set (chassisSlot, weaponEffectivenessArmor);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setWeaponEnergyPerShot (int chassisSlot, float weaponEnergyPerShot)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setWeaponEnergyPerShot () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setWeaponEnergyPerShot () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	m_weaponEnergyPerShot.set (chassisSlot, weaponEnergyPerShot);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setWeaponRefireRate (int chassisSlot, float weaponRefireRate)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setWeaponRefireRate () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setWeaponRefireRate () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	m_weaponRefireRate.set (chassisSlot, weaponRefireRate);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setWeaponEfficiencyRefireRate (int chassisSlot, float weaponEfficiencyRefireRate)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setWeaponEfficiencyRefireRate () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setWeaponEfficiencyRefireRate () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	m_weaponEfficiencyRefireRate.set (chassisSlot, weaponEfficiencyRefireRate);
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Set a weapon's refire timer to have the specified percentage of its time
+ * already elapsed.  For example, 0.25 will prevent the weapon from firing
+ * again until 75% of its regular refire time has elapsed.  This setting
+ * applies to the next shot only; future shots will use the regular refire rate.
+ */
+void ShipObject::setWeaponRefireTimerPercent(int weaponIndex, float refireTimerPercent)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setWeaponRefireTimerPercent () called on non-auth object."));
+	m_weaponRefireTimers[weaponIndex].setElapsedTime(refireTimerPercent * getWeaponActualRefireRate(static_cast<int>(ShipChassisSlotType::SCST_weapon_first) + weaponIndex));
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setWeaponAmmoCurrent(int chassisSlot, int weaponAmmoCurrent)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setWeaponProjectileSpeed () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setWeaponAmmoCurrent () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	m_weaponAmmoCurrent.set (chassisSlot, weaponAmmoCurrent);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setWeaponAmmoMaximum(int chassisSlot, int weaponAmmoMaximum)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setWeaponProjectileSpeed () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setWeaponAmmoMaximum () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	m_weaponAmmoMaximum.set (chassisSlot, weaponAmmoMaximum);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setWeaponAmmoType(int chassisSlot, uint32 weaponAmmoType)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setWeaponProjectileSpeed () called on non-auth object."));
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::setWeaponAmmoType () called on slot [%d] with nothing installed.", chassisSlot));
+		return false;
+	}
+
+	m_weaponAmmoType.set (chassisSlot, weaponAmmoType);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setShieldHitpointsFrontCurrent (float shieldHitpointsCurrent)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setShieldHitpointsFrontCurrent () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_shield_0)))
+	{
+		WARNING (true, ("ShipObject::setShieldHitpointsFrontCurrent () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_shield_0)));
+		return false;
+	}
+
+	shieldHitpointsCurrent = std::min (getShieldHitpointsFrontMaximum (), shieldHitpointsCurrent);
+	m_shieldHitpointsFrontCurrent.set (shieldHitpointsCurrent);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setShieldHitpointsFrontMaximum (float shieldHitpointsMaximum)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setShieldHitpointsFrontMaximum () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_shield_0)))
+	{
+		WARNING (true, ("ShipObject::setShieldHitpointsFrontMaximum () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_shield_0)));
+		return false;
+	}
+
+	m_shieldHitpointsFrontMaximum.set (shieldHitpointsMaximum);
+	IGNORE_RETURN(setShieldHitpointsFrontCurrent (getShieldHitpointsFrontCurrent ()));
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setShieldHitpointsBackCurrent (float shieldHitpointsCurrent)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setShieldHitpointsBackCurrent () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_shield_0)))
+	{
+		WARNING (true, ("ShipObject::setShieldHitpointsBackCurrent () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_shield_0)));
+		return false;
+	}
+
+	shieldHitpointsCurrent = std::min (getShieldHitpointsBackMaximum (), shieldHitpointsCurrent);
+	m_shieldHitpointsBackCurrent.set (shieldHitpointsCurrent);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setShieldHitpointsBackMaximum (float shieldHitpointsMaximum)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setShieldHitpointsBackMaximum () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_shield_0)))
+	{
+		WARNING (true, ("ShipObject::setShieldHitpointsBackMaximum () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_shield_0)));
+		return false;
+	}
+
+	m_shieldHitpointsBackMaximum.set (shieldHitpointsMaximum);
+	IGNORE_RETURN(setShieldHitpointsBackCurrent (getShieldHitpointsBackCurrent ()));
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setShieldRechargeRate (float shieldRechargeRate)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setShieldRechargeRate () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_shield_0)))
+	{
+		WARNING (true, ("ShipObject::setShieldRechargeRate () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_shield_0)));
+		return false;
+	}
+
+	m_shieldRechargeRate.set (shieldRechargeRate);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setCapacitorEnergyCurrent (float capacitorEnergyCurrent)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setCapacitorEnergyCurrent () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_capacitor)))
+	{
+		WARNING (true, ("ShipObject::setCapacitorEnergyCurrent () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_capacitor)));
+		return false;
+	}
+
+	float const capacitorEnergyMaximum = getCapacitorEnergyEffectiveMaximum () * getComponentEfficiencyGeneral(ShipChassisSlotType::SCST_capacitor);
+	capacitorEnergyCurrent = std::min (capacitorEnergyMaximum, capacitorEnergyCurrent);
+	m_capacitorEnergyCurrent = capacitorEnergyCurrent;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setCapacitorEnergyMaximum (float capacitorEnergyMaximum)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setCapacitorEnergyMaximum () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_capacitor)))
+	{
+		WARNING (true, ("ShipObject::setCapacitorEnergyMaximum () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_capacitor)));
+		return false;
+	}
+
+	m_capacitorEnergyMaximum = capacitorEnergyMaximum;
+	IGNORE_RETURN(setCapacitorEnergyCurrent (getCapacitorEnergyCurrent ()));
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setCapacitorEnergyRechargeRate (float capacitorEnergyRechargeRate)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setCapacitorEnergyRechargeRate () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_capacitor)))
+	{
+		WARNING (true, ("ShipObject::setCapacitorEnergyRechargeRate () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_capacitor)));
+		return false;
+	}
+
+	m_capacitorEnergyRechargeRate = capacitorEnergyRechargeRate;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setEngineAccelerationRate (float engineAccelerationRate)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setEngineAccelerationRate () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_engine)))
+	{
+		WARNING (true, ("ShipObject::setEngineAccelerationRate () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_engine)));
+		return false;
+	}
+
+	m_engineAccelerationRate = engineAccelerationRate;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setEngineDecelerationRate (float engineDecelerationRate)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setEngineDecelerationRate () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_engine)))
+	{
+		WARNING (true, ("ShipObject::setEngineDecelerationRate () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_engine)));
+		return false;
+	}
+
+	m_engineDecelerationRate = engineDecelerationRate;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setEnginePitchAccelerationRate (float enginePitchAccelerationRate)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setEnginePitchAccelerationRate () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_engine)))
+	{
+		WARNING (true, ("ShipObject::setEnginePitchAccelerationRate () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_engine)));
+		return false;
+	}
+
+	m_enginePitchAccelerationRate = enginePitchAccelerationRate;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setEngineYawAccelerationRate (float engineYawAccelerationRate)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setEngineYawAccelerationRate () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_engine)))
+	{
+		WARNING (true, ("ShipObject::setEngineYawAccelerationRate () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_engine)));
+		return false;
+	}
+
+	m_engineYawAccelerationRate = engineYawAccelerationRate;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setEngineRollAccelerationRate (float engineRollAccelerationRate)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setEngineRollAccelerationRate () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_engine)))
+	{
+		WARNING (true, ("ShipObject::setEngineRollAccelerationRate () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_engine)));
+		return false;
+	}
+
+	m_engineRollAccelerationRate = engineRollAccelerationRate;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setEnginePitchRateMaximum (float enginePitchRateMaximum)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setEnginePitchRateMaximum () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_engine)))
+	{
+		WARNING (true, ("ShipObject::setEnginePitchRateMaximum () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_engine)));
+		return false;
+	}
+
+	m_enginePitchRateMaximum = enginePitchRateMaximum;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setEngineYawRateMaximum (float engineYawRateMaximum)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setEngineYawRateMaximum () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_engine)))
+	{
+		WARNING (true, ("ShipObject::setEngineYawRateMaximum () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_engine)));
+		return false;
+	}
+
+	m_engineYawRateMaximum = engineYawRateMaximum;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setEngineRollRateMaximum (float engineRollRateMaximum)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setEngineRollRateMaximum () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_engine)))
+	{
+		WARNING (true, ("ShipObject::setEngineRollRateMaximum () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_engine)));
+		return false;
+	}
+
+	m_engineRollRateMaximum = engineRollRateMaximum;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setEngineSpeedMaximum (float engineSpeedMaximum)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setEngineSpeedMaximum () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_engine)))
+	{
+		WARNING (true, ("ShipObject::setEngineSpeedMaximum () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_engine)));
+		return false;
+	}
+
+	m_engineSpeedMaximum = engineSpeedMaximum;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setEngineSpeedRotationFactorMaximum(float engineSpeedRotationFactor)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setEngineSpeedRotationFactorMaximum () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_engine)))
+	{
+		WARNING (true, ("ShipObject::setEngineSpeedRotationFactorMaximum () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_engine)));
+		return false;
+	}
+
+	m_engineSpeedRotationFactorMaximum = engineSpeedRotationFactor;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setEngineSpeedRotationFactorMinimum(float engineSpeedRotationFactorMin)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setEngineSpeedRotationFactorMinimum() called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_engine)))
+	{
+		WARNING (true, ("ShipObject::setEngineSpeedRotationFactorMinimum() called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_engine)));
+		return false;
+	}
+
+	m_engineSpeedRotationFactorMinimum = engineSpeedRotationFactorMin;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setEngineSpeedRotationFactorOptimal(float engineSpeedRotationFactorOptimal)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setEngineSpeedRotationFactorOptimal() called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_engine)))
+	{
+		WARNING (true, ("ShipObject::setEngineSpeedRotationFactorOptimal() called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_engine)));
+		return false;
+	}
+
+	m_engineSpeedRotationFactorOptimal = engineSpeedRotationFactorOptimal;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setReactorEnergyGenerationRate (float reactorEnergyGenerationRate)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setReactorEnergyGenerationRate () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_reactor)))
+	{
+		WARNING (true, ("ShipObject::setReactorEnergyGenerationRate () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_reactor)));
+		return false;
+	}
+
+	m_reactorEnergyGenerationRate = reactorEnergyGenerationRate;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setBoosterEnergyCurrent (float boosterEnergyCurrent)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setBoosterEnergyCurrent () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_booster)))
+	{
+		WARNING (true, ("ShipObject::setBoosterEnergyCurrent () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_booster)));
+		return false;
+	}
+
+	boosterEnergyCurrent = std::min (getBoosterEnergyMaximum (), boosterEnergyCurrent);
+	m_boosterEnergyCurrent = boosterEnergyCurrent;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setBoosterEnergyMaximum (float boosterEnergyMaximum)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setBoosterEnergyMaximum () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_booster)))
+	{
+		WARNING (true, ("ShipObject::setBoosterEnergyMaximum () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_booster)));
+		return false;
+	}
+
+	m_boosterEnergyMaximum = boosterEnergyMaximum;
+	IGNORE_RETURN(setBoosterEnergyCurrent (getBoosterEnergyCurrent ()));
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setBoosterEnergyRechargeRate (float boosterEnergyRechargeRate)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setBoosterEnergyRechargeRate () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_booster)))
+	{
+		WARNING (true, ("ShipObject::setBoosterEnergyRechargeRate () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_booster)));
+		return false;
+	}
+
+	m_boosterEnergyRechargeRate = boosterEnergyRechargeRate;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setBoosterEnergyConsumptionRate (float boosterEnergyConsumptionRate)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setBoosterEnergyConsumptionRate () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_booster)))
+	{
+		WARNING (true, ("ShipObject::setBoosterEnergyConsumptionRate () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_booster)));
+		return false;
+	}
+
+	m_boosterEnergyConsumptionRate = boosterEnergyConsumptionRate;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setBoosterAcceleration (float boosterAcceleration)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setBoosterAcceleration () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_booster)))
+	{
+		WARNING (true, ("ShipObject::setBoosterAcceleration () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_booster)));
+		return false;
+	}
+
+	m_boosterAcceleration = boosterAcceleration;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setBoosterSpeedMaximum (float boosterSpeedMaximum)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setBoosterSpeedMaximum () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_booster)))
+	{
+		WARNING (true, ("ShipObject::setBoosterSpeedMaximum () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_booster)));
+		return false;
+	}
+
+	m_boosterSpeedMaximum = boosterSpeedMaximum;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setDroidInterfaceCommandSpeed (float droidInterfaceCommandSpeed)
+{
+	FATAL (isInitialized () && !isAuthoritative (), ("ShipObject::setDroidInterfaceCommandSpeed () called on non-auth object."));
+	if (!isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_droid_interface)))
+	{
+		WARNING (true, ("ShipObject::setDroidInterfaceCommandSpeed () called on slot [%d] with nothing installed.", static_cast<int>(ShipChassisSlotType::SCST_droid_interface)));
+		return false;
+	}
+
+	m_droidInterfaceCommandSpeed = droidInterfaceCommandSpeed;
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::canInstallComponent     (int chassisSlot, TangibleObject const & component) const
+{
+	ShipComponentData const * const shipComponentData = ShipComponentDataManager::create (component);
+	if (!shipComponentData)
+	{
+		WARNING (true, ("ShipObject::canInstallComponent failed for [%s] because a ShipComponentData could not be constructed.", component.getNetworkId ().getValueString ().c_str ()));
+		return false;
+	}
+
+	if (chassisSlot < static_cast<int>(ShipChassisSlotType::SCST_first) ||
+		chassisSlot >= static_cast<int>(ShipChassisSlotType::SCST_num_types))
+	{
+		WARNING (true, ("ShipObject::canInstallComponent failed for [%s] because a chassisSlot was invalid.", component.getNetworkId ().getValueString ().c_str ()));
+		return false;
+	}
+
+	ShipChassis const * const shipChassis = ShipChassis::findShipChassisByCrc (getChassisType ());
+	if (shipChassis)
+	{
+		int effectiveCompatibilitySlot = chassisSlot;
+		// weapon slots beyond 7 wrap back to slot 0 for the purposes of compatibility checking on captial ships
+		if (isCapitalShip() && chassisSlot >= ShipChassisSlotType::SCST_num_explicit_types && chassisSlot <= ShipChassisSlotType::SCST_weapon_last)
+			effectiveCompatibilitySlot = ShipChassisSlotType::SCST_weapon_first+((chassisSlot-ShipChassisSlotType::SCST_weapon_first)&7);
+
+		ShipChassisSlot const * const slot = shipChassis->getSlot (static_cast<ShipChassisSlotType::Type>(effectiveCompatibilitySlot));
+
+		if (slot != NULL)
+		{
+			if (slot->canAcceptComponent (shipComponentData->getDescriptor ()))
+			{
+				//-- check for mass availability
+				float const massAvailable = getChassisComponentMassMaximum() - getChassisComponentMassCurrent();
+				return massAvailable >= shipComponentData->m_mass;
+			}
+		}
+	}
+
+	return false;
+}
+
+//----------------------------------------------------------------------
+
+/**
+* This function destroys the component
+*/
+
+bool ShipObject::installComponent   (NetworkId const & installerId, int chassisSlot, TangibleObject & component)
+{
+	if (!canInstallComponent (chassisSlot, component))
+	{
+		WARNING (true, ("ShipObject::installComponent failed for [%s] because the component can't go here.", component.getNetworkId ().getValueString ().c_str ()));
+		return false;
+	}
+
+	if (isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::installComponent failed for [%s] because the slot is occupied.", component.getNetworkId ().getValueString ().c_str ()));
+		return false;
+	}
+
+	ShipComponentData const * const shipComponentData = ShipComponentDataManager::create (component);
+	if (!shipComponentData)
+	{
+		WARNING (true, ("ShipObject::installComponent failed for [%s] because a ShipComponentData could not be constructed.", component.getNetworkId ().getValueString ().c_str ()));
+		return false;
+	}
+
+	if(getScriptObject())
+	{
+		ScriptParams p;
+		p.addParam(installerId);
+		p.addParam(component.getNetworkId ());
+		p.addParam(chassisSlot);
+
+		if (getScriptObject()->trigAllScripts(Scripting::TRIG_SHIP_COMPONENT_INSTALLING, p) == SCRIPT_OVERRIDE)
+			return false;
+	}
+
+	shipComponentData->writeDataToShip (chassisSlot, *this);
+
+	LOG(
+		"CustomerService",
+		(
+			"ShipComponents: %s (%s), [%s]: added to %s (%s) by %s",
+			Unicode::wideToNarrow(component.getObjectName()).c_str(),
+			component.getNetworkId().getValueString().c_str(),
+			component.getObjectTemplateName(),
+			Unicode::wideToNarrow(getObjectName()).c_str(),
+			getNetworkId().getValueString().c_str(),
+			PlayerObject::getAccountDescription(getOwnerId()).c_str()));
+
+	IGNORE_RETURN (component.permanentlyDestroy (DeleteReasons::Consumed));
+
+	if(getScriptObject())
+	{
+		ScriptParams p;
+		p.addParam(installerId);
+		p.addParam (chassisSlot);
+
+		IGNORE_RETURN (getScriptObject()->trigAllScripts(Scripting::TRIG_SHIP_COMPONENT_INSTALLED, p));
+	}
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipObject::purgeComponent          (int chassisSlot)
+{
+	IGNORE_RETURN (internalUninstallComponent (NetworkId::cms_invalid, chassisSlot, NULL));
+}
+
+//----------------------------------------------------------------------
+
+TangibleObject *    ShipObject::internalUninstallComponent      (NetworkId const & uninstallerId, int chassisSlot, ServerObject * containerTarget, bool allowOverload)
+{
+	if (!isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("ShipObject::internalUninstallComponent failed... no component installed in slot"));
+		return NULL;
+	}
+
+	ShipComponentData * const shipComponentData = createShipComponentData (chassisSlot);
+
+	if (shipComponentData == NULL)
+	{
+		WARNING (true, ("ShipObject::internalUninstallComponent failed null data"));
+		delete shipComponentData;
+		return NULL;
+	}
+
+	if(getScriptObject())
+	{
+		ScriptParams p;
+		p.addParam(uninstallerId);
+		p.addParam (chassisSlot);
+		p.addParam (containerTarget ? containerTarget->getNetworkId () : NetworkId::cms_invalid);
+
+		if (getScriptObject()->trigAllScripts(Scripting::TRIG_SHIP_COMPONENT_UNINSTALLING, p) == SCRIPT_OVERRIDE)
+			return NULL;
+	}
+
+	TangibleObject * tangible = 0;
+
+	if (containerTarget)
+	{
+		uint32 const objectTemplateCrc = shipComponentData->getDescriptor ().getObjectTemplateCrc ();
+
+		ServerObject * obj = 0;
+		if (allowOverload)
+		{
+
+			VolumeContainer * volContainer = ContainerInterface::getVolumeContainer(*containerTarget);
+			if (volContainer == NULL)
+				return 0;
+
+			int oldCapacity = volContainer->debugDoNotUseSetCapacity(-1);
+
+			obj = ServerWorld::createNewObject(objectTemplateCrc, *containerTarget, true, true);
+
+			volContainer->debugDoNotUseSetCapacity(oldCapacity);
+			volContainer->recalculateVolume();
+		}
+		else
+		{
+			obj = safe_cast<ServerObject *>(ServerWorld::createNewObject (objectTemplateCrc, *containerTarget, true));
+		}
+
+		if (obj == NULL)
+		{
+			WARNING (true, ("ShipObject::internalUninstallComponent failed for slot [%d] because ServerWorld could not create an object for [%d], or container is full", chassisSlot, objectTemplateCrc));
+			delete shipComponentData;
+			return NULL;
+		}
+
+		tangible = obj->asTangibleObject ();
+
+		if (tangible == NULL)
+		{
+			WARNING (true, ("ShipObject::internalUninstallComponent failed for slot [%d] because object template [%d] is not tangible", chassisSlot, objectTemplateCrc));
+			delete shipComponentData;
+			IGNORE_RETURN (obj->permanentlyDestroy (DeleteReasons::SetupFailed));
+			return NULL;
+		}
+
+		shipComponentData->writeDataToComponent (*tangible);
+
+		LOG(
+			"CustomerService",
+			(
+				"ShipComponents: %s (%s), [%s]: removed from %s (%s) by %s",
+				Unicode::wideToNarrow(tangible->getObjectName()).c_str(),
+				tangible->getNetworkId().getValueString().c_str(),
+				tangible->getObjectTemplateName(),
+				Unicode::wideToNarrow(getObjectName()).c_str(),
+				getNetworkId().getValueString().c_str(),
+				PlayerObject::getAccountDescription(getOwnerId()).c_str()));
+	}
+
+	switch (chassisSlot)
+	{
+	case ShipChassisSlotType::SCST_reactor:
+		IGNORE_RETURN(setReactorEnergyGenerationRate    (0.0f));
+		break;
+	case ShipChassisSlotType::SCST_engine:
+		IGNORE_RETURN(setEngineAccelerationRate         (0.0f));
+		IGNORE_RETURN(setEngineDecelerationRate         (0.0f));
+		IGNORE_RETURN(setEnginePitchAccelerationRate    (0.0f));
+		IGNORE_RETURN(setEngineYawAccelerationRate      (0.0f));
+		IGNORE_RETURN(setEngineRollAccelerationRate     (0.0f));
+		IGNORE_RETURN(setEnginePitchRateMaximum         (0.0f));
+		IGNORE_RETURN(setEngineYawRateMaximum           (0.0f));
+		IGNORE_RETURN(setEngineRollRateMaximum          (0.0f));
+		IGNORE_RETURN(setEngineSpeedMaximum             (0.0f));
+		break;
+
+	case ShipChassisSlotType::SCST_capacitor:
+		IGNORE_RETURN(setCapacitorEnergyCurrent         (0.0f));
+		IGNORE_RETURN(setCapacitorEnergyMaximum         (0.0f));
+		IGNORE_RETURN(setCapacitorEnergyRechargeRate    (0.0f));
+		break;
+
+	case ShipChassisSlotType::SCST_shield_0:
+		IGNORE_RETURN(setShieldHitpointsFrontCurrent    (0.0f));
+		IGNORE_RETURN(setShieldHitpointsFrontMaximum    (0.0f));
+		IGNORE_RETURN(setShieldHitpointsBackCurrent     (0.0f));
+		IGNORE_RETURN(setShieldHitpointsBackMaximum     (0.0f));
+		IGNORE_RETURN(setShieldRechargeRate             (0.0f));
+		break;
+
+	case ShipChassisSlotType::SCST_booster:
+		IGNORE_RETURN(setBoosterEnergyCurrent           (0.0f));
+		IGNORE_RETURN(setBoosterEnergyMaximum           (0.0f));
+		IGNORE_RETURN(setBoosterEnergyRechargeRate      (0.0f));
+		IGNORE_RETURN(setBoosterEnergyConsumptionRate   (0.0f));
+		IGNORE_RETURN(setBoosterAcceleration            (0.0f));
+		IGNORE_RETURN(setBoosterSpeedMaximum            (0.0f));
+		break;
+
+	case ShipChassisSlotType::SCST_droid_interface:
+		IGNORE_RETURN(setDroidInterfaceCommandSpeed     (0.0f));
+		break;
+
+	case ShipChassisSlotType::SCST_cargo_hold:
+		{
+			m_cargoHoldContents.clear();
+			setCargoHoldContentsCurrent(0);
+			setCargoHoldContentsMaximum(0);
+		}
+		break;
+
+	default:
+		break;
+	}
+
+	setComponentCrc (chassisSlot, 0);
+
+	delete shipComponentData;
+
+	if(getScriptObject())
+	{
+		ScriptParams p;
+		p.addParam(uninstallerId);
+		p.addParam (tangible ? tangible->getNetworkId () : NetworkId::cms_invalid);
+		p.addParam (chassisSlot);
+		p.addParam (containerTarget ? containerTarget->getNetworkId () : NetworkId::cms_invalid);
+
+		IGNORE_RETURN (getScriptObject()->trigAllScripts(Scripting::TRIG_SHIP_COMPONENT_UNINSTALLED, p));
+	}
+
+	return tangible;
+}
+
+//----------------------------------------------------------------------
+
+TangibleObject * ShipObject::uninstallComponent (NetworkId const & uninstallerId, int chassisSlot, ServerObject & containerTarget, bool allowOverload)
+{
+	return internalUninstallComponent (uninstallerId, chassisSlot, &containerTarget, allowOverload);
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::installComponentFromData(int chassisSlot, ShipComponentData const & shipComponentData)
+{
+	ShipChassis const * const shipChassis = ShipChassis::findShipChassisByCrc (getChassisType ());
+	if (shipChassis == NULL)
+	{
+		WARNING (true, ("Ship [%s] chassis [%d] is invalid for installing component [%s]",
+			getNetworkId().getValueString().c_str(), 
+			static_cast<int>(getChassisType ()),
+			shipComponentData.getDescriptor().getName().getString()));
+		return false;
+	}
+	
+	if (isSlotInstalled (chassisSlot))
+	{
+		WARNING (true, ("Ship [%s] chassis [%s] slot [%s] is already filled, cannot install [%s]",
+			getNetworkId().getValueString().c_str(), 
+			shipChassis->getName().getString(),
+			ShipChassisSlotType::getNameFromType(static_cast<ShipChassisSlotType::Type>(chassisSlot)).c_str(),
+			shipComponentData.getDescriptor().getName().getString()));
+		
+		return false;
+	}
+
+	int effectiveCompatibilitySlot = chassisSlot;
+	// weapon slots beyond 7 wrap back to slot 0 for the purposes of compatibility checking on captial ships
+	if (isCapitalShip() && chassisSlot >= ShipChassisSlotType::SCST_num_explicit_types && chassisSlot <= ShipChassisSlotType::SCST_weapon_last)
+		effectiveCompatibilitySlot = ShipChassisSlotType::SCST_weapon_first+((chassisSlot-ShipChassisSlotType::SCST_weapon_first)&7);
+
+	ShipChassisSlot const * const slot = shipChassis->getSlot (static_cast<ShipChassisSlotType::Type>(effectiveCompatibilitySlot));
+	if (slot == NULL)
+	{
+		WARNING (true, ("Ship [%s] chassis [%s] does not support slot [%s] for installing component [%s]",
+			getNetworkId().getValueString().c_str(), 
+			shipChassis->getName().getString(),
+			ShipChassisSlotType::getNameFromType(static_cast<ShipChassisSlotType::Type>(chassisSlot)).c_str(),
+			shipComponentData.getDescriptor().getName().getString()));
+		return false;
+	}
+	
+	if (!slot->canAcceptComponent(shipComponentData.getDescriptor()))
+	{
+		WARNING (true, ("Component [%s], compat [%s] cannot be installed in ship [%s] chassis [%s], slot [%s], compats [%s].", 
+			shipComponentData.getDescriptor().getName().getString(), 
+			shipComponentData.getDescriptor().getCompatibility().getString(),
+			getNetworkId().getValueString().c_str(), 
+			shipChassis->getName().getString(),
+			ShipChassisSlotType::getNameFromType(static_cast<ShipChassisSlotType::Type>(chassisSlot)).c_str(),
+			slot->getCompatibilityString().c_str()));
+		return false;
+	}
+	
+	shipComponentData.writeDataToShip (chassisSlot, *this);
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::pseudoInstallComponent(int chassisSlot, uint32 componentCrc)
+{
+	ShipComponentDescriptor const * const shipComponentDescriptor = ShipComponentDescriptor::findShipComponentDescriptorByCrc (componentCrc);
+	if (shipComponentDescriptor == NULL)
+	{
+		WARNING (true, ("Invalid component name"));
+		return false;
+	}
+
+	ShipComponentData * const shipComponentData = ShipComponentDataManager::create (*shipComponentDescriptor);
+
+	if (shipComponentData == NULL)
+	{
+		WARNING(true, ("ShipObject::pseudoInstallComponent invalid descriptor"));
+		return false;
+	}
+
+	bool const retval = installComponentFromData(chassisSlot, *shipComponentData);
+
+	delete shipComponentData;
+
+	return retval;
+}
+
+//----------------------------------------------------------------------
+
+ShipComponentData * ShipObject::createShipComponentData (int chassisSlot) const
+{
+	ShipComponentDescriptor const * shipComponentDescriptor = NULL;
+
+	uint32 const componentCrc = getComponentCrc (chassisSlot);
+	if (componentCrc)
+	{
+		shipComponentDescriptor   = ShipComponentDescriptor::findShipComponentDescriptorByCrc (componentCrc);
+		if (shipComponentDescriptor == NULL)
+		{
+			WARNING (true, ("ShipObject::createShipComponentData failed for slot [%d] because component crc [%d] could not map to a component descriptor", chassisSlot, componentCrc));
+			return NULL;
+		}
+	}
+	else
+		return NULL;
+
+	ShipComponentData * const shipComponentData = ShipComponentDataManager::create (*shipComponentDescriptor);
+	if (shipComponentData == NULL)
+	{
+		WARNING (true, ("ShipObject::createShipComponentData failed for slot [%d] ship Component data could not be constructed", chassisSlot));
+		return NULL;
+	}
+
+	if (!shipComponentData->readDataFromShip (chassisSlot, *this))
+		WARNING (true, ("ShipObject::createShipComponentData failed for read data from the ship"));
+
+	return shipComponentData;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::isSlotInstalled                          (int chassisSlot) const
+{
+	return getComponentCrc (chassisSlot) != 0;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::isBoosterInstalled() const
+{
+	return isSlotInstalled(ShipChassisSlotType::SCST_booster);
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::isBoosterActive() const
+{
+	if (isBoosterInstalled())
+	{
+		return isComponentActive(ShipChassisSlotType::SCST_booster);
+	}
+	
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::setBoosterActive(bool const active)
+{
+	if (isSlotInstalled(ShipChassisSlotType::SCST_booster))
+		IGNORE_RETURN(setComponentActive(ShipChassisSlotType::SCST_booster, active));
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::computeShipActualAccelerationRate       () const
+{
+	float rate = 0.0f;
+
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine) && isComponentFunctional(ShipChassisSlotType::SCST_engine))
+	{
+		float const efficiency = computeActualComponentEfficiencyGeneral(ShipChassisSlotType::SCST_engine);
+		rate = getEngineAccelerationRate () * efficiency;
+	}
+	
+	if (isSlotInstalled (ShipChassisSlotType::SCST_booster) && isBoosterActive () && isComponentFunctional(ShipChassisSlotType::SCST_booster))
+	{
+		float const boosterEfficiency = computeActualComponentEfficiencyGeneral (ShipChassisSlotType::SCST_booster);
+		rate += getBoosterAcceleration () * boosterEfficiency;
+	}
+	
+	//-- @todo: divide rate by mass
+
+	rate = rate * m_movementPercent;
+	
+	return rate;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::computeShipActualDecelerationRate       () const
+{
+	float rate = 0.0f;
+
+	float const efficiency = computeActualComponentEfficiencyGeneral(ShipChassisSlotType::SCST_engine);
+
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine) && isComponentFunctional(ShipChassisSlotType::SCST_engine))
+		rate = getEngineDecelerationRate () * efficiency;
+	else
+		rate = getShipDataEngine().m_engineDecelerationRate;
+
+	//-- @todo: divide rate by mass
+
+	rate = rate * m_movementPercent;
+	
+	return rate;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::computeSpeedRotationFactor() const
+{
+	//-- compute rotational factor
+	float const engineSpeedRotationFactorBaseMax = getEngineSpeedRotationFactorMaximum();
+	float const engineSpeedRotationFactorBaseMin = getEngineSpeedRotationFactorMinimum();
+	float const engineSpeedRotationFactorOptimal = getEngineSpeedRotationFactorOptimal();
+
+	float const speedMax = getShipActualSpeedMaximum();
+	float const speedCur = getCurrentSpeed();
+	float const speedPercent = (speedMax > 0.0f) ? (speedCur / speedMax) : 0.0f;
+	float engineSpeedRotationFactor = 1.0f;
+	
+	if (speedPercent < engineSpeedRotationFactorOptimal || engineSpeedRotationFactorOptimal >= 1.0f)
+	{
+		float const speedPercentToOptimal = speedPercent / engineSpeedRotationFactorOptimal;
+		engineSpeedRotationFactor = linearInterpolate(engineSpeedRotationFactorBaseMin, 1.0f, speedPercentToOptimal);
+	}
+	else
+	{
+		float const speedPercentFromOptimal = (speedPercent - engineSpeedRotationFactorOptimal) / (1.0f - engineSpeedRotationFactorOptimal);
+		engineSpeedRotationFactor = linearInterpolate(1.0f, engineSpeedRotationFactorBaseMax, speedPercentFromOptimal);
+	}
+
+	// snap to discreet values, to avoid constant change
+	return floorf((engineSpeedRotationFactor * 10.f) + 0.5f) / 10.f;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::computeShipActualPitchAccelerationRate  () const
+{
+	//float rate = 0.0f;
+	//
+	//float const efficiency = computeActualComponentEfficiencyGeneral(ShipChassisSlotType::SCST_engine);
+	//
+	//if (isSlotInstalled (ShipChassisSlotType::SCST_engine))
+	//{
+	//	rate = getEnginePitchAccelerationRate () * efficiency;
+	//
+	//	if (isComponentDisabled(ShipChassisSlotType::SCST_engine))
+	//	{
+	//		//-- player ships are allowed to stop spinning
+	//		if (isPlayerShip())
+	//			rate *= 0.5f;
+	//		else
+	//			rate = 0.0f;
+	//	}
+	//}
+	float rate = 0.0f;
+
+	float const efficiency = computeActualComponentEfficiencyGeneral(ShipChassisSlotType::SCST_engine);
+
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine) && isComponentFunctional(ShipChassisSlotType::SCST_engine))
+		rate = getEnginePitchAccelerationRate () * efficiency;
+	else
+		rate = getShipDataEngine().m_enginePitchAccelerationRate;
+
+	//-- @todo: divide rate by rotational inertia
+
+	return rate;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::computeShipActualYawAccelerationRate    () const
+{
+	//float rate = 0.0f;
+	//
+	//float const efficiency = computeActualComponentEfficiencyGeneral(ShipChassisSlotType::SCST_engine);
+	//
+	//if (isSlotInstalled (ShipChassisSlotType::SCST_engine))
+	//{
+	//	rate = getEngineYawAccelerationRate () * efficiency;
+	//
+	//	if (isComponentDisabled(ShipChassisSlotType::SCST_engine))
+	//	{
+	//		//-- player ships are allowed to stop spinning
+	//		if (isPlayerShip())
+	//			rate *= 0.5f;
+	//		else
+	//			rate = 0.0f;
+	//	}
+	//}
+	float rate = 0.0f;
+
+	float const efficiency = computeActualComponentEfficiencyGeneral(ShipChassisSlotType::SCST_engine);
+
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine) && isComponentFunctional(ShipChassisSlotType::SCST_engine))
+		rate = getEngineYawAccelerationRate () * efficiency;
+	else
+		rate = getShipDataEngine().m_engineYawAccelerationRate;
+
+	//-- @todo: divide rate by rotational inertia
+
+	return rate;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::computeShipActualRollAccelerationRate   () const
+{
+	//float rate = 0.0f;
+	//
+	//float const efficiency = computeActualComponentEfficiencyGeneral(ShipChassisSlotType::SCST_engine);
+	//
+	//if (isSlotInstalled (ShipChassisSlotType::SCST_engine))
+	//{
+	//	rate = getEngineRollAccelerationRate () * efficiency;
+	//
+	//	if (isComponentDisabled(ShipChassisSlotType::SCST_engine))
+	//	{
+	//		//-- player ships are allowed to stop spinning
+	//		if (isPlayerShip())
+	//			rate *= 0.5f;
+	//		else
+	//			rate = 0.0f;
+	//	}
+	//}
+
+	float rate = 0.0f;
+
+	float const efficiency = computeActualComponentEfficiencyGeneral(ShipChassisSlotType::SCST_engine);
+
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine) && isComponentFunctional(ShipChassisSlotType::SCST_engine))
+		rate = getEngineRollAccelerationRate () * efficiency;
+	else
+		rate = getShipDataEngine().m_engineRollAccelerationRate;
+
+	//-- @todo: divide rate by rotational inertia
+
+	return rate;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::computeShipActualPitchRateMaximum       () const
+{
+	//float rate = 0.0f;
+	//
+	//float const efficiency = computeActualComponentEfficiencyGeneral(ShipChassisSlotType::SCST_engine);
+	//
+	//if (isSlotInstalled (ShipChassisSlotType::SCST_engine))
+	//{
+	//	rate = getEnginePitchRateMaximum () * efficiency;
+	//
+	//	if (isComponentDisabled(ShipChassisSlotType::SCST_engine))
+	//	{
+	//		//-- player ships have zero max rotation rates so the ship will come to a stop
+	//		if (isPlayerShip())
+	//			rate = 0.0f;
+	//	}
+	//}
+	float rate = 0.0f;
+
+	float const efficiency = computeActualComponentEfficiencyGeneral(ShipChassisSlotType::SCST_engine);
+
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine) && isComponentFunctional(ShipChassisSlotType::SCST_engine))
+		rate = getEnginePitchRateMaximum () * efficiency;
+
+	rate *= computeSpeedRotationFactor();
+
+	return rate;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::computeShipActualYawRateMaximum         () const
+{
+	//float rate = 0.0f;
+	//
+	//float const efficiency = computeActualComponentEfficiencyGeneral(ShipChassisSlotType::SCST_engine);
+	//
+	//if (isSlotInstalled (ShipChassisSlotType::SCST_engine))
+	//{
+	//	rate = getEngineYawRateMaximum () * efficiency;
+	//
+	//	if (isComponentDisabled(ShipChassisSlotType::SCST_engine))
+	//	{
+	//		//-- player ships have zero max rotation rates so the ship will come to a stop
+	//		if (isPlayerShip())
+	//			rate = 0.0f;
+	//	}
+	//}
+	float rate = 0.0f;
+
+	float const efficiency = computeActualComponentEfficiencyGeneral(ShipChassisSlotType::SCST_engine);
+
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine) && isComponentFunctional(ShipChassisSlotType::SCST_engine))
+		rate = getEngineYawRateMaximum () * efficiency;
+
+	rate *= computeSpeedRotationFactor();
+
+	return rate;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::computeShipActualRollRateMaximum        () const
+{
+	//float rate = 0.0f;
+	//
+	//float const efficiency = computeActualComponentEfficiencyGeneral(ShipChassisSlotType::SCST_engine);
+	//
+	//if (isSlotInstalled (ShipChassisSlotType::SCST_engine))
+	//{
+	//	rate = getEngineRollRateMaximum () * efficiency;
+	//
+	//	if (isComponentDisabled(ShipChassisSlotType::SCST_engine))
+	//	{
+	//		//-- player ships have zero max rotation rates so the ship will come to a stop
+	//		if (isPlayerShip())
+	//			rate = 0.0f;
+	//	}
+	//}
+	float rate = 0.0f;
+
+	float const efficiency = computeActualComponentEfficiencyGeneral(ShipChassisSlotType::SCST_engine);
+
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine) && isComponentFunctional(ShipChassisSlotType::SCST_engine))
+		rate = getEngineRollRateMaximum () * efficiency;
+
+	return rate;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::computeShipActualSpeedMaximum           () const
+{
+	float rate = 0.0f;
+
+	if (isSlotInstalled (ShipChassisSlotType::SCST_engine) && isComponentFunctional(ShipChassisSlotType::SCST_engine))
+	{
+		float const efficiency = computeActualComponentEfficiencyGeneral(ShipChassisSlotType::SCST_engine);
+		rate = getEngineSpeedMaximum () * efficiency;
+	}
+
+	if (isSlotInstalled(ShipChassisSlotType::SCST_booster) && isBoosterActive() && isComponentFunctional(ShipChassisSlotType::SCST_booster))
+		rate += getBoosterSpeedMaximum () * computeActualComponentEfficiencyGeneral(ShipChassisSlotType::SCST_booster);
+	
+	if (hasWings() && hasCondition(TangibleObject::C_wingsOpened))
+	{
+		ShipChassis const * const shipChassis = ShipChassis::findShipChassisByCrc(getChassisType());
+		if (NULL != shipChassis)			
+		{
+			float const wingOpenSpeedFactor = shipChassis->getWingOpenSpeedFactor();
+			rate *= wingOpenSpeedFactor;
+		}
+	}
+
+	rate *= m_chassisSpeedMaximumModifier.get();
+
+	rate = std::min(512.0f, rate * m_movementPercent);
+	
+	return rate;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getShipActualAccelerationRate       () const
+{
+	return m_shipActualAccelerationRate.get();
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getShipActualDecelerationRate       () const
+{
+	return m_shipActualDecelerationRate.get();
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getShipActualPitchAccelerationRate  () const
+{
+	return m_shipActualPitchAccelerationRate.get();
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getShipActualYawAccelerationRate    () const
+{
+	return m_shipActualYawAccelerationRate.get();
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getShipActualRollAccelerationRate   () const
+{
+	return m_shipActualRollAccelerationRate.get();
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getShipActualPitchRateMaximum       () const
+{
+	return m_shipActualPitchRateMaximum.get();
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getShipActualYawRateMaximum         () const
+{
+	return m_shipActualYawRateMaximum.get();
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getShipActualRollRateMaximum        () const
+{
+	return m_shipActualRollRateMaximum.get();
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getShipActualYprRateMaximum() const
+{
+	return std::max(std::max(m_shipActualPitchRateMaximum.get(), m_shipActualYawRateMaximum.get()), m_shipActualRollRateMaximum.get());
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getShipActualSpeedMaximum           () const
+{
+	return m_shipActualSpeedMaximum.get();
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::isComponentDisabled                      (int chassisSlot) const
+{
+	return (getComponentFlags (chassisSlot) & static_cast<int>(ShipComponentFlags::F_disabled)) != 0;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::isComponentDisabledNeedsPower(int chassisSlot) const
+{
+	return (getComponentFlags (chassisSlot) & static_cast<int>(ShipComponentFlags::F_disabledNeedsPower)) != 0;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::isComponentLowPower                      (int chassisSlot) const
+{
+	return (getComponentFlags (chassisSlot) & static_cast<int>(ShipComponentFlags::F_lowPower)) != 0;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::isComponentActive(int chassisSlot) const
+{
+	return (getComponentFlags (chassisSlot) & static_cast<int>(ShipComponentFlags::F_active)) != 0;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::isComponentDemolished(int chassisSlot) const
+{
+	return (getComponentFlags(chassisSlot) & ShipComponentFlags::F_demolished) != 0;
+}
+
+//----------------------------------------------------------------------
+
+void ShipObject::handlePowerPulse (float timeElapsedSecs)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("ShipObject::handlePowerPulse");
+
+	DEBUG_FATAL (!isAuthoritative(), ("ShipObject::handlePowerPulse called on non-auth ship object"));
+
+	//-- handle componentized power system
+
+	ShipChassis const * const shipChassis = ShipChassis::findShipChassisByCrc (getChassisType ());
+	if (!shipChassis)
+		return;
+
+	CreatureObject * const pilot = getPilot();
+
+	float powerGenerated = 0.0f;
+
+	if (isSlotInstalled (static_cast<int>(ShipChassisSlotType::SCST_reactor)) && isComponentFunctional(ShipChassisSlotType::SCST_reactor))
+	{
+		powerGenerated = getReactorEnergyGenerationRate () * computeActualComponentEfficiencyGeneral (static_cast<int>(ShipChassisSlotType::SCST_reactor)) * timeElapsedSecs;
+		powerGenerated += (powerGenerated * m_nebulaEffectReactor);
+		powerGenerated = std::max (0.0f, powerGenerated);
+	}
+
+	//-- discharge the capacitor if it is disabled (because the power logic below is skipped for disabled components)
+	if (isSlotInstalled(ShipChassisSlotType::SCST_capacitor) && !isComponentFunctional(ShipChassisSlotType::SCST_capacitor))
+		IGNORE_RETURN(setCapacitorEnergyCurrent(0.0f));
+	
+	for (int i = static_cast<int>(ShipChassisSlotType::SCST_first); i < static_cast<int>(ShipChassisSlotType::SCST_num_types); ++i)
+	{
+		ShipChassisSlotType::Type const slotType = shipChassis->getSlotPowerPriority (i);
+		if (slotType == ShipChassisSlotType::SCST_num_types || slotType == ShipChassisSlotType::SCST_reactor)
+			continue;
+
+		int const slotIndex = static_cast<int>(slotType);
+
+		if (!isSlotInstalled (slotIndex))
+			continue;
+
+		if (isComponentDemolished(slotIndex))
+			continue;
+
+		if (isComponentDisabled(slotIndex))
+		{			
+			if (!isComponentDisabledNeedsPower(slotIndex))
+				continue;
+		}
+
+		float const baseComponentEnergyRequired = getComponentEnergyMaintenanceRequirement (slotIndex) * timeElapsedSecs;
+
+		float oo_componentEfficiencyEnergy   = getComponentEfficiencyEnergy (slotIndex);
+		if (oo_componentEfficiencyEnergy > 0.0f)
+			oo_componentEfficiencyEnergy = RECIP (oo_componentEfficiencyEnergy);
+
+		float const energyRequired = baseComponentEnergyRequired * oo_componentEfficiencyEnergy;
+
+		//-- first consume the base energy requirement for the component
+
+		float energyInsufficiencyPercent = 0.0f;
+
+		//-- insufficient power
+		if (energyRequired > powerGenerated)
+		{
+			if(getScriptObject())
+			{
+				ScriptParams p;
+				p.addParam (slotIndex);
+				p.addParam (energyRequired);
+				p.addParam (powerGenerated);
+
+				IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_SHIP_COMPONENT_POWER_INSUFFICIENT, p));
+				
+				//-- script has for some reason removed the component, stop processing it
+				if (!isSlotInstalled(slotIndex))
+					continue;
+			}
+
+			//-- energy req cannot be zero
+			energyInsufficiencyPercent = 1.0f - powerGenerated / energyRequired;
+			IGNORE_RETURN(setComponentLowPower (slotIndex, true));
+		}
+		//-- sufficient power
+		else
+		{
+			if (isComponentLowPower (slotIndex))
+			{
+				if(getScriptObject())
+				{
+					ScriptParams p;
+					p.addParam (slotIndex);
+					p.addParam (energyRequired);
+					
+					IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_SHIP_COMPONENT_POWER_SUFFICIENT, p));
+					
+					//-- script has for some reason removed the component, stop processing it
+					if (!isSlotInstalled(slotIndex))
+						continue;					
+				}
+
+				IGNORE_RETURN(setComponentLowPower (slotIndex, false));
+			}
+		}
+
+		powerGenerated = std::max (0.0f, powerGenerated - energyRequired);
+
+		//-- 
+		if (isComponentDisabled(slotIndex))
+			continue;
+
+		float const efficiencyGeneral = computeActualComponentEfficiencyGeneral(slotIndex);
+
+		switch (slotType)
+		{
+			//--
+			//-- recharge or decay the shields
+			//--
+
+		case ShipChassisSlotType::SCST_shield_0:
+			{
+				float const hpFrontCurrent = getShieldHitpointsFrontCurrent   ();
+				float const hpFrontMaximum = getShieldHitpointsFrontMaximum   ();
+				float const hpBackCurrent  = getShieldHitpointsBackCurrent    ();
+				float const hpBackMaximum  = getShieldHitpointsBackMaximum    ();
+
+				//-- recharge the shields
+				if (!isComponentLowPower(slotIndex))
+				{
+					float shieldRechargeRateHps = getShieldRechargeRate () * efficiencyGeneral * timeElapsedSecs;
+					shieldRechargeRateHps += (shieldRechargeRateHps * m_nebulaEffectShields);
+
+					if (shieldRechargeRateHps > 0.0f)
+					{
+						float const hpFrontNeeded = std::max (0.0f, std::min (hpFrontMaximum - hpFrontCurrent, shieldRechargeRateHps));
+						float const hpBackNeeded  = std::max (0.0f, std::min (hpBackMaximum - hpBackCurrent,   shieldRechargeRateHps));
+
+						if (hpFrontNeeded > 0.0f || hpBackNeeded > 0.0f)
+						{							
+							if (hpFrontNeeded)
+								IGNORE_RETURN(setShieldHitpointsFrontCurrent(hpFrontCurrent + hpFrontNeeded));
+							if (hpBackNeeded)
+								IGNORE_RETURN(setShieldHitpointsBackCurrent(hpBackCurrent + hpBackNeeded));
+						}
+					}
+				}
+				//-- decay the shields to some percentage
+				else if (energyInsufficiencyPercent > 0.0f)
+				{
+					float const shieldDecayRateHps = std::max (1.0f, (getShieldRechargeRate () * timeElapsedSecs) * energyInsufficiencyPercent);
+
+					float const minShieldsFront = (1.0f - energyInsufficiencyPercent) * getShieldHitpointsFrontMaximum();
+					float const minShieldsBack = (1.0f - energyInsufficiencyPercent) * getShieldHitpointsBackMaximum();
+
+					if (hpFrontCurrent > minShieldsFront)
+						IGNORE_RETURN(setShieldHitpointsFrontCurrent(std::max(minShieldsFront, hpFrontCurrent - shieldDecayRateHps)));
+					if (hpBackCurrent > minShieldsBack)
+						IGNORE_RETURN(setShieldHitpointsBackCurrent(std::max(minShieldsFront, hpBackCurrent - shieldDecayRateHps)));
+				}
+			}
+			break;
+
+			//--
+			//-- recharge or decay the capacitor
+			//--
+
+		case ShipChassisSlotType::SCST_capacitor:
+			{
+				float       capacitorEnergyCurrent = getCapacitorEnergyCurrent ();
+				float const capacitorEnergyMaximum = getCapacitorEnergyEffectiveMaximum () * getComponentEfficiencyGeneral(ShipChassisSlotType::SCST_capacitor);
+
+				//-- the efficiency might cause the current charge to exceed the max
+				if (capacitorEnergyCurrent > capacitorEnergyMaximum)
+				{
+					IGNORE_RETURN(setCapacitorEnergyCurrent (capacitorEnergyMaximum));
+					capacitorEnergyCurrent = getCapacitorEnergyCurrent ();
+				}
+
+				//-- recharge the capacitor
+				if (!isComponentLowPower(slotIndex))
+				{
+					float const rechargeRate = getCapacitorEnergyRechargeRate () * efficiencyGeneral * timeElapsedSecs;
+					float const capacitorEnergyRechargeNeeded = std::min (capacitorEnergyMaximum - capacitorEnergyCurrent, rechargeRate);
+
+					if (capacitorEnergyRechargeNeeded > 0.0f)
+					{						
+						IGNORE_RETURN(setCapacitorEnergyCurrent (capacitorEnergyCurrent + capacitorEnergyRechargeNeeded));
+					}
+				}
+				//-- decay the capacitors to some percentage
+				else if (energyInsufficiencyPercent > 0.0f)
+				{
+					float const decayRate = std::max (1.0f, (getCapacitorEnergyRechargeRate () * timeElapsedSecs) * energyInsufficiencyPercent);
+
+					float const minLevel = (1.0f - energyInsufficiencyPercent) * getCapacitorEnergyEffectiveMaximum();
+
+					if (capacitorEnergyCurrent > minLevel)
+						IGNORE_RETURN(setCapacitorEnergyCurrent (std::max(minLevel, capacitorEnergyCurrent - decayRate)));
+				}
+			}
+			break;
+
+			//--
+			//-- recharge or decay the booster
+			//--
+
+		case ShipChassisSlotType::SCST_booster:
+			{
+				float boosterEnergyCurrent   = getBoosterEnergyCurrent();
+
+				if (isBoosterActive())
+				{
+					float const boosterEnergyUsed = (getBoosterEnergyConsumptionRate() * timeElapsedSecs) * oo_componentEfficiencyEnergy;
+
+					IGNORE_RETURN(setBoosterEnergyCurrent(std::max(0.0f, boosterEnergyCurrent - boosterEnergyUsed)));
+					boosterEnergyCurrent   = getBoosterEnergyCurrent();
+
+					//-- when the booster runs out of energy, kill it
+					if (boosterEnergyCurrent <= 0.0f)
+					{
+						IGNORE_RETURN(setComponentActive(ShipChassisSlotType::SCST_booster, false));
+						if (pilot != NULL)
+							Chat::sendSystemMessage(*pilot, SharedStringIds::booster_energy_depleted, Unicode::emptyString);
+
+						restartBoosterTimer();
+					}
+					break;
+				}
+				
+				float const boosterEnergyMaximum   = getBoosterEnergyMaximum   ();
+				
+				//recharge the booster
+				if (!isComponentLowPower(slotIndex))
+				{
+					float const rechargeRate = getBoosterEnergyRechargeRate () * efficiencyGeneral * timeElapsedSecs;
+					float const boosterEnergyRechargeNeeded = std::min (boosterEnergyMaximum - boosterEnergyCurrent, rechargeRate);
+					
+					if (boosterEnergyRechargeNeeded > 0.0f)
+					{
+						
+						float const boosterEnergyRequired = boosterEnergyRechargeNeeded * oo_componentEfficiencyEnergy;
+												
+						IGNORE_RETURN(setBoosterEnergyCurrent (boosterEnergyCurrent + boosterEnergyRequired));
+					}
+				}
+				//-- decay the boosters to some percentage
+				else if (energyInsufficiencyPercent > 0.0f)
+				{
+					float const decayRate = std::max (1.0f, (getBoosterEnergyRechargeRate () * timeElapsedSecs) * energyInsufficiencyPercent);
+					
+					float const minLevel = (1.0f - energyInsufficiencyPercent) * getBoosterEnergyMaximum();
+					
+					if (boosterEnergyCurrent > minLevel)
+						IGNORE_RETURN(setBoosterEnergyCurrent (std::max(minLevel, boosterEnergyCurrent - decayRate)));
+				}
+			}
+			break;
+
+		default:
+			break;
+
+		} //lint !e788 //switch cases not used
+	}
+}
+
+//----------------------------------------------------------------------
+
+int ShipObject::getProjectileIndexForWeapon(int const weaponIndex) const
+{
+	if (weaponIndex < 0 || weaponIndex >= ShipChassisSlotType::cms_numWeaponIndices)
+		return -1;
+
+	ShipChassisSlotType::Type const weaponChassisSlotType = static_cast<ShipChassisSlotType::Type>(weaponIndex + static_cast<int>(ShipChassisSlotType::SCST_weapon_0));
+
+	uint32 const componentCrc = getComponentCrc(weaponChassisSlotType);
+	if (componentCrc == 0)
+		return -1;
+
+	return ShipComponentWeaponManager::getProjectileIndex(componentCrc);
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getWeaponRange(int weaponIndex) const
+{
+	if (weaponIndex < 0 || weaponIndex >= ShipChassisSlotType::cms_numWeaponIndices)
+		return 0.0f;
+
+	ShipChassisSlotType::Type const weaponChassisSlotType = static_cast<ShipChassisSlotType::Type>(weaponIndex + static_cast<int>(ShipChassisSlotType::SCST_weapon_0));
+
+	uint32 const componentCrc = getComponentCrc(weaponChassisSlotType);
+	if (componentCrc == 0)
+		return 0.0f;
+
+	float range = 0.0f;
+
+	if (ShipComponentWeaponManager::isMissile(componentCrc))
+	{
+		int const missileTypeId = static_cast<int>(getWeaponAmmoType(weaponChassisSlotType));
+		range = MissileManager::getInstance().getRangeByMissileType(missileTypeId);
+	}
+	else
+	{
+		range = ShipComponentWeaponManager::getRange(componentCrc);
+	}
+
+	return range;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getWeaponProjectileSpeed(int weaponIndex) const
+{
+	if (weaponIndex < 0 || weaponIndex >= ShipChassisSlotType::cms_numWeaponIndices)
+		return 0.0f;
+
+	ShipChassisSlotType::Type const weaponChassisSlotType = static_cast<ShipChassisSlotType::Type>(weaponIndex + static_cast<int>(ShipChassisSlotType::SCST_weapon_0));
+
+	uint32 const componentCrc = getComponentCrc(weaponChassisSlotType);
+	if (componentCrc == 0)
+		return 0.0f;
+
+	float speed = 0.0f;
+	
+	if (ShipComponentWeaponManager::isMissile(componentCrc))
+	{
+		int const missileTypeId = static_cast<int>(getWeaponAmmoType(weaponChassisSlotType));
+		speed = MissileManager::getInstance().getSpeedByMissileType(missileTypeId);
+	}
+	else
+	{
+		speed = ShipComponentWeaponManager::getProjectileSpeed(componentCrc);
+	}
+
+	return speed;
+}
+//----------------------------------------------------------------------
+
+float ShipObject::computeWeaponProjectileTimeToLive(int weaponIndex) const
+{
+	if (weaponIndex < 0 || weaponIndex >= ShipChassisSlotType::cms_numWeaponIndices)
+		return 0.0f;
+
+	ShipChassisSlotType::Type const weaponChassisSlotType = static_cast<ShipChassisSlotType::Type>(weaponIndex + static_cast<int>(ShipChassisSlotType::SCST_weapon_0));
+
+	uint32 const componentCrc = getComponentCrc(weaponChassisSlotType);
+	if (componentCrc == 0)
+		return 0.0f;
+
+	float timeToLive = 0.0f;
+	
+	if (ShipComponentWeaponManager::isMissile(componentCrc))
+	{
+		int const missileTypeId = static_cast<int>(getWeaponAmmoType(weaponChassisSlotType));
+		timeToLive = MissileManager::getInstance().getMaxTimeByMissileType(missileTypeId);
+	}
+	else
+	{
+		float const range = ShipComponentWeaponManager::getRange(componentCrc);
+		float const projectileSpeed = ShipComponentWeaponManager::getProjectileSpeed(componentCrc);
+		timeToLive = (projectileSpeed <= 0.0f) ? 0.0f : range / projectileSpeed;
+	}
+
+	return timeToLive;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::computeActualComponentEfficiencyGeneral(int chassisType) const
+{
+	float efficiency = getComponentEfficiencyGeneral(chassisType);
+	float nebulaEffect = 0.0f;
+
+	switch (chassisType)
+	{
+	case ShipChassisSlotType::SCST_engine:
+		nebulaEffect = m_nebulaEffectEngine;
+		break;
+	case ShipChassisSlotType::SCST_reactor:
+		nebulaEffect = m_nebulaEffectReactor;
+		break;
+	case ShipChassisSlotType::SCST_shield_0:
+		nebulaEffect = m_nebulaEffectShields;
+		break;
+	default:
+		break;
+	}
+
+	efficiency = clamp(0.1f, efficiency + nebulaEffect, 10.0f);
+	return efficiency;
+}
+
+//----------------------------------------------------------------------
+
+void ShipObject::setSlotTargetable(ShipChassisSlotType::Type slot)
+{
+	BitArray tmp(m_targetableSlotBitfield.get());
+	tmp.setBit(slot);
+	m_targetableSlotBitfield = tmp;
+}
+
+//----------------------------------------------------------------------
+
+void ShipObject::clearSlotTargetable(ShipChassisSlotType::Type slot)
+{
+	BitArray tmp(m_targetableSlotBitfield.get());
+	tmp.clearBit(slot);
+	m_targetableSlotBitfield = tmp;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::getSlotTargetable(ShipChassisSlotType::Type slot) const
+{
+	return m_targetableSlotBitfield.get().testBit(slot);
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::isValidTargetableSlot (ShipChassisSlotType::Type slot) const
+{
+	if(getSlotTargetable(slot))
+	{
+		if(isSlotInstalled(slot))
+		{
+			if(isComponentFunctional(slot))
+			{
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+//----------------------------------------------------------------------
+
+void ShipObject::setPilotLookAtTargetSlot(ShipChassisSlotType::Type slot)
+{
+	if(isAuthoritative() && isValidTargetableSlot(slot))
+	{
+		m_pilotLookAtTargetSlot.set(slot);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ShipObject::setTurretTarget(int weaponIndex, CachedNetworkId const & target)
+{
+	if (isAuthoritative())
+	{
+		DEBUG_FATAL(!isTurret(weaponIndex), ("Assigning a target(%s) to a weaponIndex(%d) that is not a turret", target.getValueString().c_str(), weaponIndex));
+
+		if (!target.isValid())
+			IGNORE_RETURN(m_turretTargets.erase(weaponIndex));
+		else
+			m_turretTargets[weaponIndex] = target;
+	}
+}
+
+//----------------------------------------------------------------------
+
+CachedNetworkId const & ShipObject::getTurretTarget(int weaponIndex) const
+{
+	if (isAuthoritative())
+	{
+		DEBUG_FATAL(!isTurret(weaponIndex), ("Requesting the target of an weaponIndex(%d) that is not a turret", weaponIndex));
+
+		std::map<int, CachedNetworkId>::const_iterator const it = m_turretTargets.find(weaponIndex);
+		if (it != m_turretTargets.end())
+			return (*it).second;
+	}
+	return CachedNetworkId::cms_cachedInvalid;
+}
+
+//----------------------------------------------------------------------
+
+Transform const ShipObject::getTurretTransform(int weaponIndex) const
+{
+	int const chassisSlot = static_cast<int>(ShipChassisSlotType::SCST_weapon_0) + weaponIndex;
+	uint32 const componentCrc = getComponentCrc(chassisSlot);
+
+	if (componentCrc != 0)
+	{
+		AppearanceTemplate const * exteriorAppearanceTemplate = 0;
+
+		PortalProperty const * const portalProperty = getPortalProperty();
+		if (portalProperty)
+		{
+			char const * const exteriorAppearanceName = portalProperty->getPortalPropertyTemplate().getExteriorAppearanceName();
+			if (exteriorAppearanceName)
+				exteriorAppearanceTemplate = AppearanceTemplateList::fetch(exteriorAppearanceName);
+		}
+		else
+		{
+			Appearance const * const appearance = getAppearance();
+			if (appearance)
+				exteriorAppearanceTemplate = appearance->getAppearanceTemplate();
+		}
+
+		if (exteriorAppearanceTemplate)
+		{
+			ShipComponentAttachmentManager::TemplateHardpointPairVector const &attachments = ShipComponentAttachmentManager::getAttachmentsForShip(getChassisType(), componentCrc, chassisSlot);
+			if (!attachments.empty())
+			{
+				ShipComponentAttachmentManager::TemplateHardpointPair const &templateHardpointPair = *attachments.begin();
+				int const turretYawHardpointIndex = exteriorAppearanceTemplate->getHardpointIndex(templateHardpointPair.second, true);
+				WARNING(turretYawHardpointIndex == -1, ("Ship %s references hardpoint '%s' which could not be found.", getDebugInformation().c_str(), templateHardpointPair.second.getString()));
+				if (turretYawHardpointIndex != -1)
+				{
+					Hardpoint const &turretYawHardpoint = exteriorAppearanceTemplate->getHardpoint(turretYawHardpointIndex);
+					// we now need to find a weapon hardpoint on this attachment
+					SharedObjectTemplate const * const objectTemplate = safe_cast<SharedObjectTemplate const *>(ObjectTemplateList::fetch(templateHardpointPair.first));
+					if (objectTemplate)
+					{
+						AppearanceTemplate const * const appearanceTemplate = AppearanceTemplateList::fetch(objectTemplate->getAppearanceFilename().c_str());
+						if (appearanceTemplate)
+						{
+							int const turretPitchHardpointIndex = appearanceTemplate->getHardpointIndex(s_turretPitchHardpoint, true);
+							if (turretPitchHardpointIndex != -1)
+							{
+								Hardpoint const &turretPitchHardpoint = appearanceTemplate->getHardpoint(turretPitchHardpointIndex);
+								return getTransform_o2p().rotateTranslate_l2p(turretYawHardpoint.getTransform().rotateTranslate_l2p(turretPitchHardpoint.getTransform()));
+							}
+						}
+					}
+					// we couldn't find a turret pitch hardpoint, so the turret yaw hardpoint is for the object which pitches also
+					return getTransform_o2p().rotateTranslate_l2p(turretYawHardpoint.getTransform());
+				}
+			}
+		}
+	}
+
+	// we couldn't find an attachment hardpoint, so assume we fire forward from the ship center
+	return getTransform_o2p();
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::isMissile(int const weaponIndex) const
+{
+	bool ismissile = false;
+
+	if(weaponIndex >= 0 && weaponIndex < ShipChassisSlotType::cms_numWeaponIndices)
+	{
+		int const chassisSlot = static_cast<int>(ShipChassisSlotType::SCST_weapon_first) + weaponIndex;
+		uint32 const componentCrc = getComponentCrc(chassisSlot);
+		if (componentCrc != 0)
+		{
+			ismissile = ShipComponentWeaponManager::isMissile(componentCrc);
+		}
+	}
+
+	return ismissile;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::isTurret(int const weaponIndex) const
+{
+	DEBUG_FATAL(!ShipChassisSlotType::isWeaponIndex(weaponIndex), ("weaponIndex(%d) is out of range [0...%d]", weaponIndex, ShipChassisSlotType::cms_numWeaponIndices - 1));
+
+	return m_turretWeaponIndices->testBit(weaponIndex);
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::isCountermeasure(int const weaponIndex) const
+{
+	ShipChassisSlotType::Type const shipChassisSlotType = static_cast<ShipChassisSlotType::Type>(static_cast<int>(ShipChassisSlotType::SCST_weapon_0) + weaponIndex);
+	if (isSlotInstalled(shipChassisSlotType))
+	{
+		uint32 const componentCrc = getComponentCrc(shipChassisSlotType);
+		return ShipComponentWeaponManager::isCountermeasure(componentCrc);
+	}
+	return false;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::isProjectile(int const weaponIndex) const
+{
+	bool missile = isMissile(weaponIndex);
+	bool turret = isTurret(weaponIndex);
+	bool countermeasure = isCountermeasure(weaponIndex);
+
+	return (!missile && !turret && !countermeasure);
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::computeChassisComponentMassCurrent() const
+{
+	float massCurrent = 0.0f;
+
+	for (int chassisSlot = static_cast<int>(ShipChassisSlotType::SCST_first); chassisSlot < static_cast<int>(ShipChassisSlotType::SCST_num_types); ++chassisSlot)
+	{
+		if (!isSlotInstalled (chassisSlot))
+			continue;
+
+		massCurrent += getComponentMass(chassisSlot);
+	}
+
+	return massCurrent;
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getChassisComponentMassMaximum() const
+{
+	return m_chassisComponentMassMaximum.get();
+}
+
+//----------------------------------------------------------------------
+
+float ShipObject::getChassisComponentMassCurrent() const
+{
+	return m_chassisComponentMassCurrent.get();
+}
+
+//----------------------------------------------------------------------
+
+void ShipObject::setChassisComponentMassMaximum(float massMaximum)
+{
+	m_chassisComponentMassMaximum.set(massMaximum);
+}
+
+//----------------------------------------------------------------------
+
+void ShipObject::internalSetChassisComponentMassCurrent(float massCurrent)
+{
+	m_chassisComponentMassCurrent.set(massCurrent);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Check whether a turret can fire towards a particular location without
+ * exceeding its rotation limits.
+ */
+bool ShipObject::canTurretFireTowardsLocation_p(int weaponIndex, Vector const & targetLocation_p) const
+{
+	Transform turretTransform_o2p(getTurretTransform(weaponIndex));
+	
+	uint32 const chassisCrc = getChassisType();
+	float const minYaw = ShipTurretManager::getTurretMinYaw(chassisCrc, weaponIndex);
+	float const maxYaw = ShipTurretManager::getTurretMaxYaw(chassisCrc, weaponIndex);
+	float const minPitch = ShipTurretManager::getTurretMinPitch(chassisCrc, weaponIndex);
+	float const maxPitch = ShipTurretManager::getTurretMaxPitch(chassisCrc, weaponIndex);
+
+	Vector const turretToTarget = turretTransform_o2p.rotateTranslate_p2l(targetLocation_p);
+	
+	float yaw=turretToTarget.theta();
+	float pitch=turretToTarget.phi();
+
+	// if yaw and pitch are limited for this turret, check that the desired yaw/pitch is within the range
+
+	if ((maxYaw-minYaw)+0.001 < PI_TIMES_2)
+		if (yaw > maxYaw || yaw < minYaw)
+			return false;
+
+	if ((maxPitch-minPitch)+0.001 < PI_TIMES_2)
+		if (pitch > maxPitch || pitch < minPitch)
+			return false;
+	
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Given a position on the ship, figure out which targettable chassis slot covers
+ * that position.  Used to determine which component a projectile hit.
+ */
+int ShipObject::findTargetChassisSlotByPosition(Vector const & position_o) const
+{
+	DEBUG_FATAL(!isCapitalShip(),("Programmer bug:  findChassisSlotByPosition() should only be called on capital ships"));
+
+	AppearanceTemplate const * exteriorAppearanceTemplate = 0;
+
+	PortalProperty const * const portalProperty = getPortalProperty();
+	if (portalProperty)
+	{
+		char const * const exteriorAppearanceName = portalProperty->getPortalPropertyTemplate().getExteriorAppearanceName();
+		if (exteriorAppearanceName)
+			exteriorAppearanceTemplate = AppearanceTemplateList::fetch(exteriorAppearanceName);
+	}
+	else
+	{
+		Appearance const * const appearance = getAppearance();
+		if (appearance)
+			exteriorAppearanceTemplate = appearance->getAppearanceTemplate();
+	}
+	NOT_NULL(exteriorAppearanceTemplate);
+	if (!exteriorAppearanceTemplate) //lint !e774 only always false in debug mode
+		return ShipChassisSlotType::SCST_invalid;
+
+	ShipChassisSlotType::Type closestSlot = ShipChassisSlotType::SCST_invalid;
+	float closestDistance = 0.0f;
+	
+	for (int chassisSlotIterator = static_cast<int>(ShipChassisSlotType::SCST_first); chassisSlotIterator != static_cast<int>(ShipChassisSlotType::SCST_num_types); ++chassisSlotIterator)
+	{
+		ShipChassisSlotType::Type chassisSlot = static_cast<ShipChassisSlotType::Type>(chassisSlotIterator);
+		uint32 const componentCrc = getComponentCrc(chassisSlot);
+
+		//DEBUG_REPORT_LOG(componentCrc != 0 && !getSlotTargetable(chassisSlot),("Skipping slot %i because it is not targettable\n",chassisSlot));
+		
+		if (componentCrc != 0 && getSlotTargetable(chassisSlot))
+		{
+			float hitRange = ShipComponentAttachmentManager::getComponentHitRange(getChassisType(), componentCrc, chassisSlot);
+			{
+				// First look at regular attachments
+				ShipComponentAttachmentManager::TemplateHardpointPairVector const &attachments = ShipComponentAttachmentManager::getAttachmentsForShip(getChassisType(), componentCrc, chassisSlot);
+				for (ShipComponentAttachmentManager::TemplateHardpointPairVector::const_iterator i=attachments.begin(); i!=attachments.end(); ++i)
+				{
+					ShipComponentAttachmentManager::TemplateHardpointPair const &templateHardpointPair = *i;
+				
+					int const hardpointIndex = exteriorAppearanceTemplate->getHardpointIndex(templateHardpointPair.second, true);
+					WARNING(hardpointIndex == -1, ("Ship %s references hardpoint '%s' which could not be found.", getDebugInformation().c_str(), templateHardpointPair.second.getString()));
+					if (hardpointIndex != -1)
+					{
+						Hardpoint const & hardpoint = exteriorAppearanceTemplate->getHardpoint(hardpointIndex);
+						Transform const & transform_o = hardpoint.getTransform();
+						float const distanceSquared = (position_o - transform_o.getPosition_p()).magnitudeSquared();
+					
+						if (distanceSquared < sqr(hitRange) &&
+							((closestSlot == ShipChassisSlotType::SCST_invalid) || (distanceSquared < closestDistance)))
+						{
+							closestSlot = chassisSlot;
+							closestDistance = distanceSquared;
+						}
+					}
+				}
+			}
+			{
+				// Second look at "extra" hardpoints (hardpoints that exist for the sake of targeting only
+				ShipComponentAttachmentManager::HardpointVector const &extraHardpoints = ShipComponentAttachmentManager::getExtraHardpointsForComponent(getChassisType(), componentCrc, chassisSlot);
+				for (ShipComponentAttachmentManager::HardpointVector::const_iterator i=extraHardpoints.begin(); i!=extraHardpoints.end(); ++i)
+				{
+					int const hardpointIndex = exteriorAppearanceTemplate->getHardpointIndex(*i, true);
+					WARNING(hardpointIndex == -1, ("Ship %s references hardpoint '%s' which could not be found.", getDebugInformation().c_str(), (*i).getString()));
+					if (hardpointIndex != -1)
+					{
+						Hardpoint const & hardpoint = exteriorAppearanceTemplate->getHardpoint(hardpointIndex);
+						Transform const & transform_o = hardpoint.getTransform();
+						float const distanceSquared = (position_o - transform_o.getPosition_p()).magnitudeSquared();
+					
+						if (distanceSquared < sqr(hitRange) &&
+							((closestSlot == ShipChassisSlotType::SCST_invalid) || (distanceSquared < closestDistance)))
+						{
+							closestSlot = chassisSlot;
+							closestDistance = distanceSquared;
+						}
+					}
+				}
+			}
+		}
+	}
+	return closestSlot;
+}
+
+// ----------------------------------------------------------------------
+
+void ShipObject::findTransformsForComponent(int const chassisSlot, std::vector<Transform> & transforms) const
+{
+	transforms.clear();
+	AppearanceTemplate const * const exteriorAppearanceTemplate = getExteriorAppearance();
+	if (!exteriorAppearanceTemplate)
+		return;
+	uint32 const componentCrc = getComponentCrc(chassisSlot);
+	
+	{
+		// First look at regular attachments
+		ShipComponentAttachmentManager::TemplateHardpointPairVector const &attachments = ShipComponentAttachmentManager::getAttachmentsForShip(getChassisType(), componentCrc, chassisSlot);
+		for (ShipComponentAttachmentManager::TemplateHardpointPairVector::const_iterator i=attachments.begin(); i!=attachments.end(); ++i)
+		{
+			ShipComponentAttachmentManager::TemplateHardpointPair const &templateHardpointPair = *i;
+				
+			int const hardpointIndex = exteriorAppearanceTemplate->getHardpointIndex(templateHardpointPair.second, true);
+			WARNING(hardpointIndex == -1, ("Ship %s references hardpoint '%s' which could not be found.", getDebugInformation().c_str(), templateHardpointPair.second.getString()));
+			if (hardpointIndex != -1)
+			{
+				Hardpoint const & hardpoint = exteriorAppearanceTemplate->getHardpoint(hardpointIndex);
+				Transform const & transform_o = hardpoint.getTransform();
+				transforms.push_back(transform_o);
+			}
+		}
+	}
+
+	{
+		// Second look at "extra" hardpoints (hardpoints that exist for the sake of targeting only
+		ShipComponentAttachmentManager::HardpointVector const &extraHardpoints = ShipComponentAttachmentManager::getExtraHardpointsForComponent(getChassisType(), componentCrc, chassisSlot);
+		for (ShipComponentAttachmentManager::HardpointVector::const_iterator i=extraHardpoints.begin(); i!=extraHardpoints.end(); ++i)
+		{
+			int const hardpointIndex = exteriorAppearanceTemplate->getHardpointIndex(*i, true);
+			WARNING(hardpointIndex == -1, ("Ship %s references hardpoint '%s' which could not be found.", getDebugInformation().c_str(), (*i).getString()));
+			if (hardpointIndex != -1)
+			{
+				Hardpoint const & hardpoint = exteriorAppearanceTemplate->getHardpoint(hardpointIndex);
+				Transform const & transform_o = hardpoint.getTransform();
+				transforms.push_back(transform_o);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+AppearanceTemplate const * ShipObject::getExteriorAppearance() const
+{
+	AppearanceTemplate const * exteriorAppearanceTemplate = 0;
+
+	PortalProperty const * const portalProperty = getPortalProperty();
+	if (portalProperty)
+	{
+		char const * const exteriorAppearanceName = portalProperty->getPortalPropertyTemplate().getExteriorAppearanceName();
+		if (exteriorAppearanceName)
+			exteriorAppearanceTemplate = AppearanceTemplateList::fetch(exteriorAppearanceName);
+	}
+	else
+	{
+		Appearance const * const appearance = getAppearance();
+		if (appearance)
+			exteriorAppearanceTemplate = appearance->getAppearanceTemplate();
+	}
+	NOT_NULL(exteriorAppearanceTemplate);
+	return exteriorAppearanceTemplate;
+}
+	
+// ----------------------------------------------------------------------
+
+float ShipObject::getFastestWeaponProjectileSpeed() const
+{
+	return m_fastestWeaponProjectileSpeed;
+}
+
+//----------------------------------------------------------------------
+
+int ShipObject::getCargoHoldContentsMaximum() const
+{
+	return m_cargoHoldContentsMaximum.get();
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setCargoHoldContentsMaximum(int contents)
+{
+	if (isSlotInstalled(static_cast<int>(ShipChassisSlotType::SCST_cargo_hold)))
+	{
+		m_cargoHoldContentsMaximum = contents;
+		setCargoHoldContentsCurrent(getCargoHoldContentsCurrent());
+		return true;
+	}
+
+	return false;
+}
+
+//----------------------------------------------------------------------
+
+int ShipObject::getCargoHoldContentsCurrent() const
+{
+	return m_cargoHoldContentsCurrent.get();
+}
+
+//----------------------------------------------------------------------
+
+bool ShipObject::setCargoHoldContentsCurrent(int contents)
+{
+	if (isSlotInstalled(static_cast<int>(ShipChassisSlotType::SCST_cargo_hold)))
+	{
+		int const maximum = getCargoHoldContentsMaximum();
+		m_cargoHoldContentsCurrent = std::min(contents, maximum);
+		return true;
+	}
+
+	return false;
+}
+
+//----------------------------------------------------------------------
+
+ShipObject::NetworkIdIntMap const & ShipObject::getCargoHoldContents() const
+{
+	return m_cargoHoldContents.getMap();
+}
+
+//----------------------------------------------------------------------
+
+void ShipObject::setCargoHoldContents(NetworkIdIntMap const & contents)
+{
+	if (isSlotInstalled(static_cast<int>(ShipChassisSlotType::SCST_cargo_hold)))
+	{
+		m_cargoHoldContents.clear();
+
+		NetworkIdIntMap::const_iterator const end = contents.end();
+		for (NetworkIdIntMap::const_iterator it = contents.begin(); it != end; ++it)
+		{
+			m_cargoHoldContents.insert(it->first, it->second);
+		}
+
+		setCargoHoldContentsCurrent(computeCargoHoldContentsCurrent());
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ShipObject::setCargoHoldContent(NetworkId const & resourceTypeId, int amount)
+{
+	if (isSlotInstalled(static_cast<int>(ShipChassisSlotType::SCST_cargo_hold)))
+	{
+		if (amount <= 0)
+		{
+			m_cargoHoldContents.erase(resourceTypeId);
+			m_cargoHoldContentsResourceTypeInfo.erase(resourceTypeId);
+		}
+		else
+		{
+			ResourceTypeObject const * const resourceTypeObject = ServerUniverse::getInstance().getResourceTypeById(resourceTypeId);
+			if (NULL == ServerUniverse::getInstance().getResourceTypeById(resourceTypeId))
+			{
+				WARNING(true, ("ShipObject::setCargoHoldContent invalid resource type [%s]", resourceTypeId.getValueString().c_str()));
+				return;
+			}
+			
+			bool alreadyHasThisResource = getCargoHoldContent(resourceTypeId) > 0;
+
+			if (!alreadyHasThisResource)
+			{
+				m_cargoHoldContentsResourceTypeInfo.set(
+					resourceTypeId, 
+					ResourceTypeInfoPair(Unicode::narrowToWide(resourceTypeObject->getResourceName()), resourceTypeObject->getParentClass().getResourceClassName()));
+			}
+
+			m_cargoHoldContents.set(resourceTypeId, amount);
+
+		}
+
+		setCargoHoldContentsCurrent(computeCargoHoldContentsCurrent());
+	}
+}
+
+//----------------------------------------------------------------------
+
+int ShipObject::getCargoHoldContent(NetworkId const & resourceTypeId) const
+{
+	if (isSlotInstalled(static_cast<int>(ShipChassisSlotType::SCST_cargo_hold)))
+	{
+		NetworkIdIntMap::const_iterator const it = m_cargoHoldContents.find(resourceTypeId);
+		if (it != m_cargoHoldContents.end())
+		{
+			return (*it).second;
+		}
+	}
+
+	return 0;
+}
+
+//----------------------------------------------------------------------
+
+int ShipObject::computeCargoHoldContentsCurrent() const
+{
+	int total = 0;
+	NetworkIdIntMap::const_iterator const end = m_cargoHoldContents.end();
+	for (NetworkIdIntMap::const_iterator it = m_cargoHoldContents.begin(); it != end; ++it)
+	{
+		total += (*it).second;
+	}
+
+	return total;
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/ShipObject_Components.h b/engine/server/library/serverGame/src/shared/object/ShipObject_Components.h
new file mode 100644
index 00000000..c81b07dd
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/ShipObject_Components.h
@@ -0,0 +1,17 @@
+//======================================================================
+//
+// ShipObject_Components.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipObject_Components_H
+#define INCLUDED_ShipObject_Components_H
+
+#include "serverGame/ShipObject.h"
+
+//======================================================================
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/StaticObject.cpp b/engine/server/library/serverGame/src/shared/object/StaticObject.cpp
new file mode 100644
index 00000000..17de52ee
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/StaticObject.cpp
@@ -0,0 +1,176 @@
+//========================================================================
+//
+// StaticObject.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/StaticObject.h"
+
+#include "serverGame/GameServer.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/ServerCollisionProperty.h"
+#include "serverGame/ServerStaticObjectTemplate.h"
+#include "serverNetworkMessages/UpdateObjectOnPlanetMessage.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedObject/AppearanceTemplateList.h"
+#include "sharedObject/ObjectTemplateList.h"
+
+const SharedObjectTemplate * StaticObject::m_defaultSharedTemplate = NULL;
+
+//-----------------------------------------------------------------------
+
+StaticObject::StaticObject(const ServerStaticObjectTemplate* newTemplate) :
+	ServerObject(newTemplate)
+{
+	SharedObjectTemplate const * sharedObjectTemplate = getSharedTemplate();
+
+	WARNING_STRICT_FATAL(!sharedObjectTemplate, ("Tried to create a STATIC object %s without a shared template!\n", newTemplate->DataResource::getName()));
+
+	if(ConfigServerGame::getCreateAppearances())
+	{
+		const std::string &appearanceString = sharedObjectTemplate->getAppearanceFilename();
+		if (appearanceString.size() != 0)
+		{
+			Appearance * newAppearance = AppearanceTemplateList::createAppearance(appearanceString.c_str());
+
+			if(newAppearance != NULL)
+			{
+				setAppearance(newAppearance);
+			}
+		}
+	}
+
+	// attach the collision property
+
+	ServerCollisionProperty* collision = new ServerCollisionProperty(*this,sharedObjectTemplate);
+
+	addProperty(*collision);
+
+	addMembersToPackages();
+
+	//@todo -- HACK! this is supposed to be set by the database,
+	// but that code isn't written. Assume all buildings and cells
+	// are in the client cache file. //-- it is now [8/4/2002 4:20:48 PM],
+	// this should be implemented in a few days. If you see this comment
+	// and the code below calls setIsCachedOnClient(true), get with Chris
+	// and Calan to determine the status of this code.
+	//setCacheVersion(1);
+}
+
+//-----------------------------------------------------------------------
+
+StaticObject::~StaticObject()
+{
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a shared template if none was given for this object.
+ *
+ * @return the shared template
+ */
+const SharedObjectTemplate * StaticObject::getDefaultSharedTemplate(void) const
+{
+static const ConstCharCrcLowerString templateName("object/static/base/shared_static_default.iff");
+
+	if (m_defaultSharedTemplate == NULL)
+	{
+		m_defaultSharedTemplate = safe_cast<const SharedObjectTemplate *>(
+			ObjectTemplateList::fetch(templateName));
+		WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create "
+			"default shared object template %s", templateName.getString()));
+		if (m_defaultSharedTemplate != NULL)
+			ExitChain::add (removeDefaultTemplate, "StaticObject::removeDefaultTemplate");
+	}
+	return m_defaultSharedTemplate;
+}	// StaticObject::getDefaultSharedTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Cleans up the default shared template.
+ */
+void StaticObject::removeDefaultTemplate(void)
+{
+	if (m_defaultSharedTemplate != NULL)
+	{
+		m_defaultSharedTemplate->releaseReference();
+		m_defaultSharedTemplate = NULL;
+	}
+}	// StaticObject::removeDefaultTemplate
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sends a message to the Planet Server to update the position of the object.
+ */
+void StaticObject::updatePlanetServerInternal(const bool forceUpdate) const
+{
+	// only update static objects when forced, and only topmost static objects
+	if (forceUpdate && !ContainerInterface::getContainedByObject(*this))
+	{
+		Vector const &position = getPosition_p();
+	
+		UpdateObjectOnPlanetMessage const msg(
+			getNetworkId(),
+			NetworkId::cms_invalid,
+			static_cast<int>(position.x),
+			static_cast<int>(position.y),
+			static_cast<int>(position.z),
+			0,
+			static_cast<int>(getLocationReservationRadius()),
+			false,
+			false,
+			static_cast<int>(getObjectType()),
+			0,
+			false,
+			getTemplateCrc(),
+			-1,
+			-1);
+		GameServer::getInstance().sendToPlanetServer(msg);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+bool StaticObject::isVisibleOnClient (const Client & /*client*/) const
+{
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+bool StaticObject::canDropInWorld() const
+{
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+void StaticObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+{
+	ServerObject::getAttributes(data);
+}
+
+// ----------------------------------------------------------------------
+
+StaticObject * StaticObject::asStaticObject()
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+StaticObject const * StaticObject::asStaticObject() const
+{
+	return this;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/StaticObject.h b/engine/server/library/serverGame/src/shared/object/StaticObject.h
new file mode 100644
index 00000000..0d1c057b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/StaticObject.h
@@ -0,0 +1,52 @@
+//========================================================================
+//
+// StaticObject.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_StaticObject_H
+#define _INCLUDED_StaticObject_H
+
+#include "serverGame/ServerObject.h"
+
+class Controller;
+class ServerStaticObjectTemplate;
+
+
+class StaticObject : public ServerObject
+{
+public:
+
+	StaticObject(const ServerStaticObjectTemplate* newTemplate);
+	virtual ~StaticObject();
+
+	virtual StaticObject *       asStaticObject();
+	virtual StaticObject const * asStaticObject() const;
+
+	static void removeDefaultTemplate(void);
+
+	void addMembersToPackages();
+
+	virtual bool canDropInWorld() const;
+	virtual bool isVisibleOnClient (const Client & client) const;
+	virtual void getAttributes     (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+
+protected:
+	
+	virtual void updatePlanetServerInternal(bool forceUpdate) const;
+	virtual const SharedObjectTemplate *  getDefaultSharedTemplate(void) const;
+	
+private:
+  	StaticObject();
+	StaticObject(const StaticObject& rhs);
+	StaticObject&	operator=(const StaticObject& rhs);
+
+private:
+	static const SharedObjectTemplate * m_defaultSharedTemplate;	// template to use if no shared template is given
+};
+
+//------------------------------------------------------------------------------------------
+
+#endif	// _INCLUDED_StaticObject_H
diff --git a/engine/server/library/serverGame/src/shared/object/TangibleConditionObserver.cpp b/engine/server/library/serverGame/src/shared/object/TangibleConditionObserver.cpp
new file mode 100644
index 00000000..ab9526b4
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/TangibleConditionObserver.cpp
@@ -0,0 +1,74 @@
+// ======================================================================
+//
+// TangibleConditionObserver.cpp
+// Copyright 2003 Sony Online Entertainment, Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/TangibleConditionObserver.h"
+
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ObjectTracker.h"
+#include "serverGame/ServerTangibleObjectTemplate.h"
+
+
+// ======================================================================
+
+TangibleConditionObserver::TangibleConditionObserver(TangibleObject const *who, Archive::AutoDeltaObserverOp operation):
+	m_tangibleObject(who),
+	m_oldCondition(who ? who->getCondition() : 0),
+	m_pvpUpdateObserver(who, operation)
+{
+}
+
+// ----------------------------------------------------------------------
+
+TangibleConditionObserver::~TangibleConditionObserver()
+{
+	if (m_tangibleObject != NULL)
+	{
+		const CreatureObject * creature = m_tangibleObject->asCreatureObject();
+		if (creature != NULL)
+		{
+			int currentCondition = creature->getCondition();
+			if ((m_oldCondition & TangibleObject::C_hibernating) != 0 && (currentCondition & TangibleObject::C_hibernating) == 0)
+			{
+				// we've come out of hibernation
+				ObjectTracker::removeHibernatingAI();
+			}
+			else if ((m_oldCondition & TangibleObject::C_hibernating) == 0 && (currentCondition & TangibleObject::C_hibernating) != 0)
+			{
+				// we're going into hibernation
+				ObjectTracker::addHibernatingAI();
+			}
+		}
+
+		bool const wasInvulnerable = ((m_oldCondition & ServerTangibleObjectTemplate::C_invulnerable) != 0);
+		bool const isInvulnerable = m_tangibleObject->hasCondition(ServerTangibleObjectTemplate::C_invulnerable);
+		if ((wasInvulnerable != isInvulnerable) && !m_tangibleObject->getObservers().empty())
+		{
+			// did the object's "pvp sync" status change because of the invulnerability change?
+			bool const wasPvpSync = PvpUpdateObserver::satisfyPvpSyncCondition(m_tangibleObject->isNonPvpObject(), wasInvulnerable, (m_tangibleObject->asCreatureObject() != NULL), m_tangibleObject->getPvpFaction());
+			bool const isPvpSync = PvpUpdateObserver::satisfyPvpSyncCondition(m_tangibleObject->isNonPvpObject(), isInvulnerable, (m_tangibleObject->asCreatureObject() != NULL), m_tangibleObject->getPvpFaction());
+
+			if (wasPvpSync != isPvpSync)
+			{
+				// force pvp status update
+				Pvp::forceStatusUpdate(*(const_cast<TangibleObject *>(m_tangibleObject)));
+
+				const std::set<Client *> &observers = m_tangibleObject->getObservers();
+				for (std::set<Client *>::const_iterator i = observers.begin(); i != observers.end(); ++i)
+				{
+					if (isPvpSync)
+						(*i)->addObservingPvpSync(const_cast<TangibleObject *>(m_tangibleObject));
+					else
+						(*i)->removeObservingPvpSync(const_cast<TangibleObject *>(m_tangibleObject));
+				}
+			}
+		}
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/TangibleConditionObserver.h b/engine/server/library/serverGame/src/shared/object/TangibleConditionObserver.h
new file mode 100644
index 00000000..bac179ea
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/TangibleConditionObserver.h
@@ -0,0 +1,42 @@
+// ======================================================================
+//
+// TangibleConditionObserver.h
+// Copyright 2003 Sony Online Entertainment, Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef INCLUDED_TangibleConditionObserver_H
+#define INCLUDED_TangibleConditionObserver_H
+
+// ======================================================================
+
+#include "serverGame/PvpUpdateObserver.h"
+
+// ======================================================================
+
+class TangibleConditionObserver
+{
+public:
+
+	TangibleConditionObserver(TangibleObject const *who, Archive::AutoDeltaObserverOp operation);
+	~TangibleConditionObserver();
+
+private:
+
+	// Disabled.
+	TangibleConditionObserver();
+	TangibleConditionObserver(TangibleConditionObserver const&);
+	TangibleConditionObserver &operator =(TangibleConditionObserver const&);
+	
+private:
+
+	TangibleObject const *m_tangibleObject;
+	int                   m_oldCondition;
+	PvpUpdateObserver     m_pvpUpdateObserver;
+	
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp b/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp
new file mode 100644
index 00000000..01283913
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/TangibleObject.cpp
@@ -0,0 +1,6410 @@
+// ======================================================================
+//
+// TangibleObject.cpp
+// Copyright 2001, 2002 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/TangibleObject.h"
+
+#include "SwgGameServer/CombatEngine.h"
+#include "SwgGameServer/ConfigCombatEngine.h"
+#include "serverGame/AiCombatPulseQueue.h"
+#include "serverGame/AiCreatureController.h"
+#include "serverGame/Chat.h"
+#include "serverGame/CityInfo.h"
+#include "serverGame/CityInterface.h"
+#include "serverGame/Client.h"
+#include "serverGame/CombatTracker.h"
+#include "serverGame/CommandQueue.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/DraftSchematicObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/ManufactureSchematicObject.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverGame/NameManager.h"
+#include "serverGame/NetworkTriggerVolume.h"
+#include "serverGame/NpcConversation.h"
+#include "serverGame/ObjectTracker.h"
+#include "serverGame/ObserveTracker.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/Pvp.h"
+#include "serverGame/RegionMaster.h"
+#include "serverGame/RegionPvp.h"
+#include "serverGame/ResourceContainerObject.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerCollisionProperty.h"
+#include "serverGame/ServerLotManagerNotification.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerResourceClassObject.h"
+#include "serverGame/ServerSynchronizedUi.h"
+#include "serverGame/ServerTangibleObjectTemplate.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipComponentDataManager.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/TangibleController.h"
+#include "serverNetworkMessages/MessageQueueCommandQueueEnqueueFwd.h"
+#include "serverNetworkMessages/MessageQueueCommandQueueForceExecuteCommandFwd.h"
+#include "serverNetworkMessages/MessageToPayload.h"
+#include "serverNetworkMessages/UpdateObjectOnPlanetMessage.h"
+#include "serverPathfinding/ServerPathfindingNotification.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptDictionary.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedFile/FileNameUtils.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/Os.h"
+#include "sharedGame/Command.h"
+#include "sharedGame/CraftingData.h"
+#include "sharedGame/GameObjectTypes.h"
+#include "sharedGame/LfgCharacterData.h"
+#include "sharedGame/PvpData.h"
+#include "sharedGame/SharedObjectAttributes.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedGame/SharedStringIds.h"
+#include "sharedGame/SharedTangibleObjectTemplate.h"
+#include "sharedGame/ShipComponentData.h"
+#include "sharedLog/Log.h"
+#include "sharedMath/PackedArgb.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#include "sharedNetworkMessages/IncubatorCommitMessage.h"
+#include "sharedNetworkMessages/MessageQueueCommandQueueRemove.h"
+#include "sharedNetworkMessages/MessageQueueCraftIngredients.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedNetworkMessages/MessageQueueNetworkId.h"
+#include "sharedNetworkMessages/MessageQueueOpponentInfo.h"
+#include "sharedNetworkMessages/MessageQueueShowFlyText.h"
+#include "sharedNetworkMessages/MessageQueueShowCombatText.h"
+#include "sharedNetworkMessages/MessageQueueStartNpcConversation.h"
+#include "sharedNetworkMessages/MessageQueueStopNpcConversation.h"
+#include "sharedNetworkMessages/ObjectChannelMessages.h"
+#include "sharedNetworkMessages/UpdatePvpStatusMessage.h"
+#include "sharedObject/AlterResult.h"
+#include "sharedObject/AppearanceTemplateList.h"
+#include "sharedObject/ContainedByProperty.h"
+#include "sharedObject/Container.h"
+#include "sharedObject/CustomizationData.h"
+#include "sharedObject/CustomizationDataProperty.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/SlottedContainmentProperty.h"
+#include "sharedObject/StructureFootprint.h"
+#include "sharedObject/VolumeContainer.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+
+#ifdef _DEBUG
+#include "serverGame/ConsoleManager.h"
+#endif
+
+#include <cstdio>
+#include <algorithm>
+
+#pragma warning(disable:4355)
+
+
+namespace TangibleObjectNamespace
+{
+	int const s_minCombatDuration = 4;
+	const int NUM_DAMAGE_TYPES = 9;
+
+	const int s_ignoreDamageTypes =
+		static_cast<int>(ServerArmorTemplate::DT_environmental_heat) |
+		static_cast<int>(ServerArmorTemplate::DT_environmental_cold) |
+		static_cast<int>(ServerArmorTemplate::DT_environmental_acid) |
+		static_cast<int>(ServerArmorTemplate::DT_environmental_electrical);
+
+	bool isEmpty(const ServerObject& obj)
+	{
+		const Container* container = obj.getContainerProperty();
+		if (container)
+		{
+			return (container->getNumberOfItems() == 0);
+		}
+		return true;
+	}
+
+	std::string const s_attributeBonusNames[] =
+	{
+		"health",
+		"health_regen",
+		"action",
+		"action_regen",
+		"mind",
+		"mind_regen"
+	};
+
+	const char * const s_accessListScriptVar = "tangible_object.accessList";
+	const char * const s_guildAccessListScriptVar = "tangible_object.guildAccessList";
+
+	void getCategorizedSkillModBonuses(TangibleObject const & to, std::string const & objvarName, std::map<std::string, int> & skillModBonuses);
+	int getCategorizedSkillModBonus(TangibleObject const & to, std::string const & objvarName, std::string const & skillMod);
+}
+
+//----------------------------------------------------------------------
+
+void TangibleObjectNamespace::getCategorizedSkillModBonuses(TangibleObject const & to, std::string const & objvarName,  std::map<std::string, int> & skillModBonuses)
+{
+	DynamicVariableList::NestedList children(to.getObjVars(), objvarName);
+	for (DynamicVariableList::NestedList::const_iterator iterChildren = children.begin(); iterChildren != children.end(); ++iterChildren)
+	{
+		DynamicVariable::DynamicVariableType const type = iterChildren.getType();
+		if (type == DynamicVariable::INT)
+		{
+			int bonus = 0;
+			iterChildren.getValue(bonus);
+
+			std::string const childName = iterChildren.getName();
+			std::map<std::string, int>::iterator iterFind = skillModBonuses.find(childName);
+			if (iterFind != skillModBonuses.end())
+				iterFind->second += bonus;
+			else
+				IGNORE_RETURN(skillModBonuses.insert(std::make_pair(childName, bonus)));
+		}
+		else if (type == DynamicVariable::LIST)
+		{
+			std::string const childFullName = objvarName + '.' + iterChildren.getName();
+			getCategorizedSkillModBonuses(to, childFullName, skillModBonuses);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+int TangibleObjectNamespace::getCategorizedSkillModBonus(TangibleObject const & to, std::string const & objvarName, std::string const & skillMod)
+{
+	int totalBonus = 0;
+	DynamicVariableList::NestedList children(to.getObjVars(), objvarName);
+	for (DynamicVariableList::NestedList::const_iterator iterChildren = children.begin(); iterChildren != children.end(); ++iterChildren)
+	{
+		DynamicVariable::DynamicVariableType const type = iterChildren.getType();
+		if (type == DynamicVariable::INT)
+		{
+			if (iterChildren.getName() == skillMod)
+			{
+				int bonus = 0;
+				iterChildren.getValue(bonus);
+
+				totalBonus += bonus;
+			}
+		}
+		else if (type == DynamicVariable::LIST)
+		{
+			std::string const childFullName = objvarName + '.' + iterChildren.getName();
+			totalBonus += getCategorizedSkillModBonus(to, childFullName, skillMod);
+		}
+	}
+
+	return totalBonus;
+}
+
+//----------------------------------------------------------------------
+
+using namespace TangibleObjectNamespace;
+
+//=======================================================================
+// class TangibleObject::CraftingToolSyncUi
+
+class TangibleObject::CraftingToolSyncUi : public ServerSynchronizedUi
+{
+public:
+	CraftingToolSyncUi(TangibleObject & owner) :
+		ServerSynchronizedUi(owner),
+		m_prototype(),
+		m_manfSchematic(),
+		m_manfSchematicObserver()
+	{
+		addToUiPackage(m_prototype);
+		addToUiPackage(m_manfSchematic);
+	}
+
+	virtual ~CraftingToolSyncUi()
+	{
+		if (!isOwnerChangingAuthority())
+		{
+			if (m_manfSchematic.get() != CachedNetworkId::cms_cachedInvalid)
+			{
+				safe_cast<TangibleObject *>(getOwner())->clearCraftingManufactureSchematic();
+			}
+			if (m_prototype.get() != CachedNetworkId::cms_cachedInvalid)
+			{
+				safe_cast<TangibleObject *>(getOwner())->clearCraftingPrototype();
+			}
+		}
+	}
+
+	const CachedNetworkId & getPrototype(void) const
+	{
+		return m_prototype.get();
+	}
+
+	void setPrototype(const CachedNetworkId & prototype)
+	{
+		m_prototype = prototype;
+	}
+
+	const CachedNetworkId & getManfSchematic(void) const
+	{
+		return m_manfSchematic.get();
+	}
+
+	void setManfSchematic(const CachedNetworkId & manfSchematic, const CachedNetworkId & observer, bool deleteSchematic)
+	{
+		m_manfSchematic = manfSchematic;
+		m_manfSchematicObserver = observer;
+	}
+
+private:
+
+	CraftingToolSyncUi(const CraftingToolSyncUi & src);
+	CraftingToolSyncUi & operator =(const CraftingToolSyncUi & src);
+
+private:
+
+	Archive::AutoDeltaVariable<CachedNetworkId> m_prototype;
+	Archive::AutoDeltaVariable<CachedNetworkId> m_manfSchematic;
+
+	CachedNetworkId m_manfSchematicObserver;
+};
+
+//=======================================================================
+
+static const ConstCharCrcLowerString COMMAND_GROUP_COMBAT("combat");
+
+// armor objvars - also defined in armor.scriptlib
+static const std::string OBJVAR_ARMOR_BASE =                          "armor";
+static const std::string OBJVAR_ARMOR_ENCUMBRANCE = "armorencumbrance";
+static const std::string OBJVAR_ENCUMBRANCE_SPLIT = "encumbranceSplit";
+static const std::string OBJVAR_ARMOR_LEVEL       = "armorLevel";
+
+// objvar to flag the object as a shield
+static const std::string OBJVAR_ARMOR_SHIELD =                        "armor.isShield";
+
+// armor datatable strings
+static const std::string DATATABLE_ARMOR               = "datatables/crafting/armor.iff";
+static const std::string DATATABLE_FINAL_ROW           = "final";
+static const std::string DATATABLE_TYPE_COL            = "type";
+static const std::string DATATABLE_MIN_ENCUMBRANCE_COL = "min_encumbrance";
+static const std::string DATATABLE_MAX_ENCUMBRANCE_COL = "max_encumbrance";
+
+// bio-link objvars
+static const std::string OBJVAR_BIO_LINK      = "biolink";
+static const std::string OBJVAR_BIO_LINK_ID   = "biolink.id";
+// This id is used for a bio-linked item that is linked to no one.
+// It is safe as long as no player has id 1 (which should be a good assumption).
+// Note this value is reflected in library.utils.scriptlib.
+static const NetworkId PENDING_BIO_LINK_NETWORK_ID(static_cast<NetworkId::NetworkIdType>(1));
+
+// template for crafting components container
+const static ConstCharCrcLowerString CRAFTING_COMPONENTS_CONTAINER =  "object/tangible/crafting/crafting_components_container.iff";
+
+// slots for a crafting tool
+const static ConstCharCrcLowerString INGREDIENT_HOPPER_SLOT_NAME =    "ingredient_hopper";
+const static ConstCharCrcLowerString MANF_OUTPUT_SLOT_NAME =          "anythingnomod2";
+const static ConstCharCrcLowerString TEMP_PROTOTYPE_SLOT_NAME =       "anythingnomod1";
+const static ConstCharCrcLowerString TEMP_SCHEMATIC_SLOT_NAME =       "test_manf_schematic";
+
+// objvars for crafting
+const static std::string OBJVAR_CRAFTING_TOOL =                       "crafting.tool";
+const static std::string OBJVAR_CRAFTING_STATION =                    "crafting.station";
+const static std::string OBJVAR_CRAFTING_CRAFTER =                    "crafting.crafter";
+const static std::string OBJVAR_CRAFTING_COMPONENTS =                 "crafting.components";
+const static std::string OBJVAR_CRAFTING_SCHEMATIC =                  "crafting.source_schematic";
+const static std::string OBJVAR_CRAFTING_TYPE =                       "crafting.type";
+const static std::string OBJVAR_CRAFTING_REPAIR_TYPE =                "crafting.repair_type";
+const static std::string OBJVAR_CRAFTING_PROTOTYPE_TIME =             "crafting.prototypeTime";
+const static std::string OBJVAR_CRAFTING_PROTOTYPE_START_TIME =       "crafting.prototypeStartTime";
+const static std::string OBJVAR_CRAFTING_PROTOTYPE_OBJECT =           "crafting.prototypeObject";
+const static std::string OBJVAR_CRAFTING_PROTOTYPE_CRAFTER =          "crafting.prototypeCrafter";
+const static std::string OBJVAR_CREATOR_ID =                          "crafting.creator.id";
+const static std::string OBJVAR_CREATOR_XP =                          "crafting.creator.xp";
+const static std::string OBJVAR_CREATOR_XP_TYPE =                     "crafting.creator.xpType";
+const static std::string OBJVAR_REPAIR_TOOL =                         "crafting.repair";
+const static std::string OBJVAR_CRAFTING_STATIONMOD  =                "crafting.stationMod";
+const static std::string OBJVAR_SKILLMOD_BONUS =                      "skillmod.bonus";
+const static std::string OBJVAR_CATEGORIZED_SKILLMOD_BONUS =          "categorizedSkillmod.bonus";
+const static std::string OBJVAR_SKILLMOD_SOCKETS =                    "skillmod.sockets";
+const static std::string OBJVAR_ATTRIBUTE_BONUS =                     "attribute.bonus";
+
+const std::string OBJVAR_COMPONENT_DATA("crafting_components");
+
+// battlefield objvars
+const static std::string OBJVAR_BATTLEFIELD_PARTICIPANTS =            "battleDudes";
+
+// no trade
+static const std::string NOMOVE_SCRIPT  = "item.special.nomove";
+
+static const std::string OBJVAR_DECLINE_DUEL  = "decline_duel";
+
+const SharedObjectTemplate * TangibleObject::m_defaultSharedTemplate = NULL;
+
+
+//-----------------------------------------------------------------------
+TangibleObject::TangibleObject(const ServerTangibleObjectTemplate* newTemplate) :
+	ServerObject(newTemplate),
+	m_combatData(NULL),
+	m_pvpType(),
+	m_pvpMercenaryType(PvpType_Neutral),
+	m_pvpFutureType(-1),
+	m_pvpFaction(),
+	m_pvpMercenaryFaction(PvpData::getNeutralFactionId()),
+	m_pvpRegionCrc(),
+	m_pvpEnemies(),
+	m_damageTaken(0),
+	m_maxHitPoints(newTemplate->getMaxHitPoints()),
+	m_ownerId(NetworkId(static_cast<NetworkId::NetworkIdType>(0))),
+	m_customAppearance(),
+	m_appearanceData(),
+	m_locationTargets(),
+	m_components(),
+	m_visible(true),
+	m_hideFromClient(false),
+	m_count(newTemplate->getCount()),
+	m_condition(newTemplate->getCondition()),
+	m_creatorId(NetworkId::cms_invalid),
+	m_sourceDraftSchematic(0),
+	m_hateList(),
+	m_hateOverTime(),
+	m_inCombat(false),
+	m_combatStartTime(0),
+	m_attackableOverride(false),
+	m_passiveReveal(),
+	m_passiveRevealPlayerCharacter(),
+	m_mapColorOverride(0),
+	m_accessList(),
+	m_guildAccessList(),
+	m_effectsMap(),
+	m_npcConversation(NULL),
+	m_conversations()
+{
+	WARNING_STRICT_FATAL(!getSharedTemplate(), ("Tried to create a TANGIBLE %s object without a shared template!\n", newTemplate->DataResource::getName()));
+
+	m_hateList.addServerNpAutoDeltaVariables(m_serverPackage_np);
+	m_hateList.setOwner(this);
+
+	m_maxHitPoints.setSourceObject(this);
+	m_ownerId.setSourceObject(this);
+	m_customAppearance.setSourceObject(this);
+	m_appearanceData.setSourceObject(this);
+	m_pvpType.setSourceObject(this);
+	m_pvpMercenaryType.setSourceObject(this);
+	m_pvpFaction.setSourceObject(this);
+	m_pvpMercenaryFaction.setSourceObject(this);
+	m_pvpRegionCrc.setSourceObject(this);
+	m_pvpEnemies.setSourceObject(this);
+	m_visible.setSourceObject(this);
+	m_hideFromClient.setSourceObject(this);
+	m_condition.setSourceObject(this);
+	m_inCombat.setSourceObject(this);
+	m_attackableOverride.setSourceObject(this);
+	m_passiveRevealPlayerCharacter.setSourceObject(this);
+
+	// set to not disabled, and set invulnerable and wantSawAttack from template
+	int condition = m_condition.get();
+	condition &= ~(  ServerTangibleObjectTemplate::C_disabled
+	               | ServerTangibleObjectTemplate::C_invulnerable
+	               | ServerTangibleObjectTemplate::C_wantSawAttackTrigger);
+	if (newTemplate->getInvulnerable())
+		condition |= ServerTangibleObjectTemplate::C_invulnerable;
+	if (newTemplate->getWantSawAttackTriggers())
+		condition |= ServerTangibleObjectTemplate::C_wantSawAttackTrigger;
+	m_condition = condition;
+
+	// attach trigger volumes to this object
+	size_t i;
+	size_t count = newTemplate->getTriggerVolumesCount();
+	for (i = 0; i < count; ++i)
+	{
+		const TriggerVolumeData & trigger = newTemplate->getTriggerVolumes(static_cast<int>(i));
+		createTriggerVolume(trigger.getRadius(), trigger.getName(), true); //@todo : add "promiscuous param to template entry
+	}
+
+	//-- initialize CustomizationDataProperty if any customization variables are declared
+	//   for the SharedTangibleObjectTemplate.
+	const SharedTangibleObjectTemplate *const sharedObjectTemplate = safe_cast<const SharedTangibleObjectTemplate*>(getSharedTemplate());
+	if (sharedObjectTemplate)
+	{
+		//-- create CustomizationDataProperty if appropriate
+		sharedObjectTemplate->createCustomizationDataPropertyAsNeeded(*this);
+
+		//-- if a CustomizationDataProperty was created, attach a modification listener.
+		// check if the property exists
+		CustomizationDataProperty *cdProperty = safe_cast<CustomizationDataProperty*>(getProperty(CustomizationDataProperty::getClassPropertyId()));
+
+		if (cdProperty)
+		{
+			// retrieve the CustomizationData instance associated with the property
+			CustomizationData *const customizationData = cdProperty->fetchCustomizationData();
+			NOT_NULL(customizationData);
+
+			// attach modification callback
+			customizationData->registerModificationListener(customizationDataModificationCallback, this);
+
+			// release local reference
+			customizationData->release();
+		}
+
+		if(ConfigServerGame::getCreateAppearances())
+		{
+			const std::string &appearanceString = sharedObjectTemplate->getAppearanceFilename();
+			if (appearanceString.size() != 0 && strstr (appearanceString.c_str (), ".apt") != 0)
+			{
+				Appearance * newAppearance = AppearanceTemplateList::createAppearance(appearanceString.c_str());
+
+				if(newAppearance != NULL)
+				{
+					setAppearance(newAppearance);
+				}
+			}
+		}
+	}
+
+	// If the object is a path node, attach the pathfinding notification
+
+	if (isWaypoint())
+	{
+		addNotification( ServerPathfindingNotification::getInstance() );
+	}
+
+	// attach the collision property
+
+	ServerCollisionProperty* collision = new ServerCollisionProperty(*this,getSharedTemplate());
+
+	addProperty(*collision);
+
+	addMembersToPackages();
+
+	ObjectTracker::addTangible();
+
+	if(getGameObjectType() == SharedObjectTemplate::GOT_loadbeacon)
+	{
+		ServerWorld::addLoadBeacon(this);
+	}
+
+	//-- add the lot manager notification
+	{
+		SharedTangibleObjectTemplate const * const sharedTangibleObjectTemplate = dynamic_cast<SharedTangibleObjectTemplate const *> (getSharedTemplate ());
+		if (sharedTangibleObjectTemplate)
+		{
+			StructureFootprint const * const structureFootprint = sharedTangibleObjectTemplate->getStructureFootprint ();
+			if (structureFootprint)
+				addNotification (ServerLotManagerNotification::getInstance ());
+		}
+		else
+			DEBUG_WARNING (true, ("TangibleObject::TangibleObject - [%s] does not have a shared tangible object template", getObjectTemplate ()->getName ()));
+	}
+}
+
+//-----------------------------------------------------------------------
+
+TangibleObject::~TangibleObject()
+{
+	//-- This must be the first line in the destructor to invalidate any watchers watching this object
+	nullWatchers();
+
+	if (getSynchronizedUi() != NULL)
+	{
+		CraftingToolSyncUi * sync = dynamic_cast<CraftingToolSyncUi *>(
+			getSynchronizedUi());
+		if (sync != NULL)
+		{
+			if (isAuthoritative() && isCraftingTool())
+			{
+				clearCraftingPrototype();
+				clearCraftingManufactureSchematic();
+			}
+			else
+			{
+				if (!isAuthoritative())
+				{
+					WARNING(true, ("Tangible object %s is not authoritative "
+						"but has a SynchronizedUi",
+						getNetworkId().getValueString().c_str()));
+				}
+				if (!isCraftingTool())
+				{
+					WARNING(true, ("Tangible object %s is not a crafting tool "
+						"but has a CraftingToolSyncUi",
+						getNetworkId().getValueString().c_str()));
+				}
+				sync->setPrototype(CachedNetworkId::cms_cachedInvalid);
+				sync->setManfSchematic(CachedNetworkId::cms_cachedInvalid,
+					CachedNetworkId::cms_cachedInvalid, true);
+			}
+		}
+	}
+
+	if(getGameObjectType() == SharedObjectTemplate::GOT_loadbeacon)
+	{
+		ServerWorld::removeLoadBeacon(this);
+	}
+
+	CombatTracker::removeDefender(this);
+
+	if (m_combatData != NULL)
+	{
+		if (isAuthoritative())
+		{
+			if (!getCombatData()->defenseData.damage.empty())
+			{
+				WARNING(true, ("\tobject still has a non-empty damage list"));
+
+				// look up the call stack information
+				const int callStackOffset = 4;
+				const int maxStackDepth   = 64;
+				const int callStackSize = callStackOffset + maxStackDepth;
+				uint32 callStack[callStackOffset + maxStackDepth];
+				DebugHelp::getCallStack(callStack, callStackOffset + maxStackDepth);
+
+				// look up the caller's file and line
+				if (callStack[callStackOffset])
+				{
+					char lib[4 * 1024] = { '\0' };
+					char file[4 * 1024] = { '\0' };
+					int line = 0;
+					REPORT_LOG(true, ("\tCall stack:"));
+					for (int i = callStackOffset; i < callStackSize; ++i)
+					{
+						if (callStack[i])
+						{
+							if (DebugHelp::lookupAddress(callStack[i], lib, file, sizeof(file), line))
+								REPORT_LOG(true, ("\t%s(%d) : caller %d\n", file, line, i-callStackOffset));
+							else
+								REPORT_LOG(true, ("\tunknown(0x%08X) : caller %d\n", static_cast<int>(callStack[i]), i-callStackOffset));
+						}
+					}
+				}
+			}
+		}
+
+		delete m_combatData;
+		m_combatData = NULL;
+
+		if (!isPlayerControlled())
+			ObjectTracker::removeCombatAI();
+	}
+
+	if (m_npcConversation != NULL)
+	{
+		delete m_npcConversation;
+		m_npcConversation = NULL;
+	}
+
+	ObjectTracker::removeTangible();
+}	// TangibleObject::~TangibleObject
+
+//-----------------------------------------------------------------------
+
+/**
+ * Initializes a newly created object.
+ */
+void TangibleObject::initializeFirstTimeObject()
+{
+	DEBUG_FATAL(!isAuthoritative(), ("Trying to initialize non auth object %s", getNetworkId().getValueString().c_str()));
+
+	// set up armor from the template
+	const ServerTangibleObjectTemplate * newTemplate = safe_cast<
+		const ServerTangibleObjectTemplate *>(getObjectTemplate());
+	if (newTemplate != NULL)
+	{
+		setInvulnerable(newTemplate->getInvulnerable());
+
+		if (isAuthoritative())
+		{
+			initializeVisibility();
+
+			const ServerArmorTemplate * armorTemplate = newTemplate->getArmor();
+			if (armorTemplate != NULL)
+			{
+				int const rating = static_cast<int>(armorTemplate->getRating());
+				if (   rating < static_cast<int>(ServerArmorTemplate::AR_armorNone)
+				    || rating > static_cast<int>(ServerArmorTemplate::AR_armorHeavy))
+				{
+					WARNING(true, ("TangibleObject::initializeFirstTimeObject trying "
+						"to add armor data from template %s with an invalid rating "
+						"of %d", armorTemplate->getName(), rating));
+				}
+				else
+				{
+					// armor integrity replaces hitpoints
+					m_maxHitPoints = armorTemplate->getIntegrity();
+				}
+			}
+		}
+	}
+
+	// attach the combat skeleton script to this object
+	ServerTangibleObjectTemplate::CombatSkeleton skeleton = static_cast<ServerTangibleObjectTemplate::CombatSkeleton>(getCombatSkeleton());
+	const ConfigCombatEngine::SkeletonAttackMod & skeletonMod =
+		ConfigCombatEngine::getSkeletonAttackMod(skeleton);
+	if (!skeletonMod.script.empty() && skeletonMod.script[0] != '\0')
+	{
+		NOT_NULL(getScriptObject());
+		getScriptObject()->attachScript(skeletonMod.script, true);
+	}
+
+	handleContainerSetup();
+
+	ServerObject::initializeFirstTimeObject();
+
+	setDefaultAlterTime(AlterResult::cms_keepNoAlter);
+
+	calcPvpableState();
+	if (!isNonPvpObject())
+		MessageToQueue::sendRecurringMessageToC(getNetworkId(), "C++CheckPvpRegion", std::string(), static_cast<int>(getPvpRegionCheckTime()));
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Initializes a proxy object.
+ */
+void TangibleObject::endBaselines()
+{
+	ServerObject::endBaselines();
+	handleContainerSetup();
+
+	// set the hate list owner to ensure the player object is set correctly
+	m_hateList.setOwner(this);
+
+	if (isAuthoritative())
+	{
+		// fix the load_with values if they don't match
+		if ( getLoadWith() != ContainerInterface::getLoadWithContainerId(*this))
+		{
+			setLoadWith(ContainerInterface::getLoadWithContainerId(*this));
+		}
+
+		// test to flag the object as disabled
+		if (getDamageTaken() >= getMaxHitPoints())
+			setDisabled(true);
+
+		// pvp needs to be notified after an object is both initialized and made authoritative.
+		Pvp::handleAuthorityAcquire(*this);
+
+		// this code is for legacy objects already in the database
+		// Don't consider virtual overrides for invulnerability in this case
+		if (getCacheVersion() > 0 && !TangibleObject::isInvulnerable())
+			setInvulnerable(true);
+
+		if (getObjVars().hasItem(OBJVAR_CRAFTING_SCHEMATIC))
+			setCondition(C_crafted);
+		else
+			clearCondition(C_crafted);
+
+		removeObjVarItem("debuggingLogCommandEnqueue");
+
+		// destroy duped TCG Set5 AT-AT Head ITV
+		if ((getStaticItemName() == "item_tcg_loot_reward_series5_atat_head_itv") && !getObjVars().hasItem("rewardGrantInfo"))
+		{
+			MessageToQueue::getInstance().sendMessageToC(getNetworkId(),
+				"C++DestroyDupedTcg5AtAtHeadItv",
+				"",
+				5,
+				false);
+		}
+	}
+
+	calcPvpableState();
+
+	// check for existence of objvar to enable/disable m_logCommandEnqueue
+	CommandQueue * const queue = getCommandQueue();
+	if (queue != NULL)
+	{
+		queue->setLogCommandEnqueue(getObjVars().hasItem("debuggingLogCommandEnqueue"));
+	}
+
+	// if this is an incubator, and it contains imported resource from another
+	// galaxy, register the imported resource type on this game server, if it
+	// hasn't already been registered on this game server; this must be done
+	// on each game server as it receives the incubator
+	static const uint32 crcIncubator = CrcLowerString::calculateCrc("object/tangible/crafting/station/incubator_station.iff");
+	if (getTemplateCrc() == crcIncubator)
+	{
+		DynamicVariableList const & objvars = getObjVars();
+		if (objvars.hasItem("power.resourceData") && (DynamicVariable::STRING == objvars.getType("power.resourceData")))
+		{
+			std::string resourceData;
+			IGNORE_RETURN(objvars.getItem("power.resourceData", resourceData));
+			IGNORE_RETURN(ResourceTypeObject::addImportedResourceType(resourceData));
+		}
+	}
+}	// TangibleObject::endBaselines
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::onLoadedFromDatabase()
+{
+	ServerObject::onLoadedFromDatabase();
+
+	// if we are a crafting tool that is counting down a prototype,
+	// reactivate the counter
+	if (isCraftingTool() && isAuthoritative())
+	{
+		float prototypeTime = 0;
+		getObjVars().getItem(OBJVAR_CRAFTING_PROTOTYPE_TIME, prototypeTime);
+		if (prototypeTime > 0)
+		{
+			int timeLeft = getCraftingToolPrototypeTime();
+			if (timeLeft < 1)
+				timeLeft = 1;
+
+			NetworkId ownerId;
+			NetworkId prototypeId;
+			bool result = getObjVars().getItem(OBJVAR_CRAFTING_PROTOTYPE_OBJECT,
+				prototypeId) &&	getObjVars().getItem(OBJVAR_CRAFTING_PROTOTYPE_CRAFTER,
+				ownerId);
+			if (result)
+			{
+				ScriptParams params;
+				params.addParam(ownerId, "crafter");
+				params.addParam(prototypeId, "prototype");
+				ScriptDictionaryPtr dictionary;
+				getScriptObject()->makeScriptDictionary(params, dictionary);
+				if (dictionary.get() != NULL)
+				{
+					dictionary->serialize();
+					MessageToQueue::getInstance().sendMessageToJava(getNetworkId(),
+						"prototypeDone", dictionary->getSerializedData(),
+						timeLeft, false);
+					MessageToQueue::getInstance().sendMessageToC(getNetworkId(),
+						"C++updateCounter", "", 1, false);
+				}
+			}
+		}
+	}
+
+	setDefaultAlterTime(AlterResult::cms_keepNoAlter);
+
+	calcPvpableState();
+	if (!isNonPvpObject())
+		MessageToQueue::sendRecurringMessageToC(getNetworkId(), "C++CheckPvpRegion", std::string(), static_cast<int>(getPvpRegionCheckTime()));
+
+	if(isLocked())
+	{
+		readInUserAccessListObjVars();
+		readInGuildAccessListObjVars();
+	}
+
+	// Invalid Socket check.
+	bool checkForInvalidSockets = (GameObjectTypes::isTypeOf(getGameObjectType(), SharedObjectTemplate::GOT_clothing) || 
+		                           GameObjectTypes::isTypeOf(getGameObjectType(), SharedObjectTemplate::GOT_armor) ) && isCrafted();
+	if(checkForInvalidSockets)
+	{
+		std::vector< std::pair< std::string, int > > skillMods;
+		getSkillModBonuses(skillMods, false);
+
+		if(skillMods.size() > 3) // 3 is the max legit amount for any 1 socket item
+		{
+			// Check all our stats, make sure they aren't over the limit for 1 socket, cross reference names with the reverse engineering datatable.
+			DataTable * modTable = DataTableManager::getTable("datatables/crafting/reverse_engineering_mods.iff", true);
+			if(!modTable)
+				return;
+			int invalidSkillCounter = 0;
+			// Check each skill mod against the datatable. If we don't have that skill mod in the table, then it could be a legitimate item from the older system.
+			for(unsigned int i = 0; i < skillMods.size(); ++i)
+			{
+				std::string skillModName = skillMods[i].first;
+				int row = modTable->searchColumnString(0, skillModName);
+
+				if(row < 0) // wasn't in our table, could be legit.
+					continue;
+
+				++invalidSkillCounter;
+			}
+
+			if(invalidSkillCounter <= 3) // Valid item.
+				return;
+
+			// Player Name
+			std::string playerName = NameManager::getInstance().getPlayerFullName(getOwnerId());
+			Unicode::String objName = getObjectName();
+			std::string narrowObjName;
+			if(!objName.empty())
+				narrowObjName = Unicode::wideToNarrow(objName);
+			// Possible invalid item.
+			LOG("CustomerService", ("extraSocketExploit:Reason: Invalid # of Skill mods. Item Name: [%s] OID:[%s] Shared Template Name: [%s]", 
+				narrowObjName.empty() ? "" : narrowObjName.c_str(), getNetworkId().getValueString().c_str(), getSharedTemplateName() ? getSharedTemplateName() : ""));
+			LOG("CustomerService", ("extraSocketExploit:Owner OID: [%s] Owner Station ID: [%u] Owner Name: [%s]", 
+				getOwnerId().getValueString().c_str(), NameManager::getInstance().getPlayerStationId(getOwnerId()), playerName.empty() ? "" : playerName.c_str()));
+			LOG("CustomerService", ("extraSocketExploit:Skill Mods are:"));
+
+			for(unsigned int i = 0; i < skillMods.size(); ++i)
+			{
+				int row = modTable->searchColumnString(0, skillMods[i].first);
+				int currentValue = skillMods[i].second;
+				int maxValue = 0;
+
+				if(row < 0)
+				{
+					LOG("CustomerService", ("extraSocketExploit:Skill Mod: [%s] Value: [%d]", skillMods[i].first.c_str(), skillMods[i].second));
+					continue;
+				}
+
+				int ratioValue = modTable->getIntValue(1, row);
+
+				if(ratioValue != 0)
+					maxValue = 35 / ratioValue;
+
+				if(currentValue > maxValue)
+					LOG("CustomerService", ("extraSocketExploit:(Invalid)Skill Mod: [%s] Value: [%d] Max Legal Value [%d]", skillMods[i].first.c_str(), skillMods[i].second, maxValue));
+				else if(currentValue > 35)
+					LOG("CustomerService", ("extraSocketExploit:(Invalid)Skill Mod: [%s] Value: [%d] Max Legal Value [35]", skillMods[i].first.c_str(), skillMods[i].second));
+				else
+					LOG("CustomerService", ("extraSocketExploit:Skill Mod: [%s] Value: [%d]", skillMods[i].first.c_str(), skillMods[i].second));
+			}
+		}
+		else
+		{
+			// Check all our stats, make sure they aren't over the limit for 1 socket.
+			DataTable * modTable = DataTableManager::getTable("datatables/crafting/reverse_engineering_mods.iff", true);
+			if(!modTable)
+				return;
+
+			for(unsigned int i = 0; i < skillMods.size(); ++i)
+			{
+				std::string skillModName = skillMods[i].first;
+				int currentValue = skillMods[i].second;
+				int maxValue = 0;
+				bool logItem = false;
+
+				if(currentValue > 35)
+					logItem = true;
+				else
+				{
+					int row = modTable->searchColumnString(0, skillModName);
+
+					if(row < 0)
+						return;
+
+					int ratioValue = modTable->getIntValue(1, row);
+
+					if(ratioValue != 0)
+						maxValue = 35 / ratioValue;
+
+					if(currentValue > maxValue)
+						logItem = true;
+				}
+
+				if(logItem)
+				{
+					// Player Name
+					std::string playerName = NameManager::getInstance().getPlayerFullName(getOwnerId());
+					Unicode::String objName = getObjectName();
+					std::string narrowObjName;
+					if(!objName.empty())
+						narrowObjName = Unicode::wideToNarrow(objName);
+					// Possible invalid item.
+					LOG("CustomerService", ("extraSocketExploit:Reason: Invalid Skill mod value. Item Name: [%s] OID:[%s] Shared Template Name: [%s]", 
+						narrowObjName.empty() ? "" : narrowObjName.c_str(), getNetworkId().getValueString().c_str(), getSharedTemplateName() ? getSharedTemplateName() : ""));
+					LOG("CustomerService", ("extraSocketExploit:Owner OID: [%s] Owner Station ID: [%u] Owner Name: [%s]", 
+						getOwnerId().getValueString().c_str(), NameManager::getInstance().getPlayerStationId(getOwnerId()), playerName.empty() ? "" : playerName.c_str()));
+					LOG("CustomerService", ("extraSocketExploit:Skill Mods are:"));
+
+					for(unsigned int j = 0; j < skillMods.size(); ++j)
+					{
+
+						int row = modTable->searchColumnString(0, skillMods[j].first);
+						currentValue = skillMods[j].second;
+
+						if(row < 0)
+						{
+							LOG("CustomerService", ("extraSocketExploit:Skill Mod: [%s] Value: [%d]", skillMods[j].first.c_str(), skillMods[j].second));
+							continue;
+						}
+
+						int ratioValue = modTable->getIntValue(1, row);
+
+						if(ratioValue != 0)
+							maxValue = 35 / ratioValue;
+
+						if(currentValue > maxValue)
+							LOG("CustomerService", ("extraSocketExploit:(Invalid)Skill Mod: [%s] Value: [%d] Max Legal Value [%d]", skillMods[j].first.c_str(), skillMods[j].second, maxValue));
+						else if(currentValue > 35)
+							LOG("CustomerService", ("extraSocketExploit:(Invalid)Skill Mod: [%s] Value: [%d] Max Legal Value [35]", skillMods[j].first.c_str(), skillMods[j].second));
+						else
+							LOG("CustomerService", ("extraSocketExploit:Skill Mod: [%s] Value: [%d]", skillMods[j].first.c_str(), skillMods[j].second));
+					}
+
+					return;
+				}
+			}
+		}
+	}
+
+	// start the decay process going
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::virtualOnSetAuthority()
+{
+	ServerObject::virtualOnSetAuthority();
+}
+
+//-----------------------------------------------------------------------
+
+TangibleObject * TangibleObject::getTangibleObject(NetworkId const & networkId)
+{
+	return asTangibleObject(NetworkIdManager::getObjectById(networkId));
+}
+
+//-----------------------------------------------------------------------
+
+TangibleObject * TangibleObject::asTangibleObject(Object * object)
+{
+	ServerObject * serverObject = (object != NULL) ? object->asServerObject() : NULL;
+	return (serverObject != NULL) ? serverObject->asTangibleObject() : NULL;
+}
+
+//-----------------------------------------------------------------------
+
+TangibleObject const * TangibleObject::asTangibleObject(Object const * object)
+{
+	ServerObject const * serverObject = (object != NULL) ? object->asServerObject() : NULL;
+	return (serverObject != NULL) ? serverObject->asTangibleObject() : NULL;
+}
+
+//-----------------------------------------------------------------------
+
+TangibleObject * TangibleObject::asTangibleObject()
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+TangibleObject const * TangibleObject::asTangibleObject() const
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns a shared template if none was given for this object.
+ *
+ * @return the shared template
+ */
+const SharedObjectTemplate * TangibleObject::getDefaultSharedTemplate(void) const
+{
+static const ConstCharCrcLowerString templateName("object/tangible/base/shared_tangible_default.iff");
+
+	if (m_defaultSharedTemplate == NULL)
+	{
+		m_defaultSharedTemplate = safe_cast<const SharedObjectTemplate *>(
+			ObjectTemplateList::fetch(templateName));
+		WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create "
+			"default shared object template %s", templateName.getString()));
+		if (m_defaultSharedTemplate != NULL)
+			ExitChain::add (removeDefaultTemplate, "TangibleObject::removeDefaultTemplate");
+	}
+	return m_defaultSharedTemplate;
+}	// TangibleObject::getDefaultSharedTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Cleans up the default shared template.
+ */
+void TangibleObject::removeDefaultTemplate(void)
+{
+	if (m_defaultSharedTemplate != NULL)
+	{
+		m_defaultSharedTemplate->releaseReference();
+		m_defaultSharedTemplate = NULL;
+	}
+}	// TangibleObject::removeDefaultTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the name of the shared template that will be sent to the client when
+ * this object is created. If this object has a custom appearance, that template
+ * name will be returned, otherwise the default name will be returned.
+ *
+ *
+ */
+const char * TangibleObject::getClientSharedTemplateName(void) const
+{
+	if (!m_customAppearance.get().empty())
+		return m_customAppearance.get().c_str();
+	return ServerObject::getClientSharedTemplateName();
+}	// TangibleObject::getClientSharedTemplateName
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::addLocationTarget(const LocationData & location)
+{
+	if(isAuthoritative())
+	{
+		std::vector<LocationData>::const_iterator i;
+		for(i = m_locationTargets.begin(); i != m_locationTargets.end(); ++i)
+		{
+			if((*i).name == location.name)
+			{
+				m_locationTargets.set(static_cast<size_t>(std::distance(m_locationTargets.begin(), i)), location);
+				return;
+			}
+		}
+		m_locationTargets.push_back(location);
+		scheduleForAlter();
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_addLocationTarget, new MessageQueueGenericValueType<LocationData>(location));
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::removeLocationTarget(const Unicode::String & locationName)
+{
+	if(isAuthoritative())
+	{
+		std::vector<LocationData>::const_iterator i;
+		for(i = m_locationTargets.begin(); i != m_locationTargets.end(); ++i)
+		{
+			if((*i).name == locationName)
+			{
+				m_locationTargets.erase(static_cast<size_t>(std::distance(m_locationTargets.begin(), i)));
+				return;
+			}
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removeLocationTarget, new MessageQueueGenericValueType<Unicode::String>(locationName));
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::onArrivedAtLocation(const LocationData & location)
+{
+	// only invokes a script trigger, which is automagically forwarded to
+	// the authoritative server
+	if(getScriptObject())
+	{
+		ScriptParams p;
+		p.addParam(location.name);
+		IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_ARRIVE_AT_LOCATION, p));
+	}
+}
+// ----------------------------------------------------------------------
+
+/**
+ * This function is called after the TangibleObject has received a
+ * new custom appearance string.
+ *
+ * @arg value  the value of the new custom appearance string
+ */
+void TangibleObject::customAppearanceModified(const std::string& value)
+{
+	// we don't value to use the value arg since we already have the
+	// data stored in m_customAppearance, but just in case the interface
+	// changes, we'll use it here.
+
+	if (value.empty())
+		return;
+}	// TangibleObject::customAppearanceModified
+
+// ----------------------------------------------------------------------
+
+/**
+ * This function is called after the TangibleObject has received a
+ * new appearance data customization string.
+ *
+ * @arg value  the value of the new appearance customization string
+ */
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::appearanceDataModified(const std::string& value)
+{
+	// we don't value to use the value arg since we already have the
+	// data stored in m_appearanceData, but just in case the interface
+	// changes, we'll use it here.  Technically we don't need to keep
+	// the m_appearanceData string around on the client.  We can build
+	// it at will from the appearance.
+
+	//-- skip no-content customization data
+	if (value.empty())
+		return;
+
+	// check if the property exists
+	CustomizationDataProperty *cdProperty = safe_cast<CustomizationDataProperty*>(getProperty(CustomizationDataProperty::getClassPropertyId()));
+
+	if (!cdProperty)
+	{
+		// every debug warning I put here goes into never-never land in addr2line.  real handy feature...
+		//	DEBUG_WARNING(true, ("non-zero-length appearance string sent to object that doesn't declare any customization variables in its template."));
+		// DEBUG_WARNING(true, ("received appear string for non-customizable object."));
+		return;
+	}
+
+	// retrieve the CustomizationData instance associated with the property
+	CustomizationData *const customizationData = cdProperty->fetchCustomizationData();
+	NOT_NULL(customizationData);
+
+	//-- initialize CustomizationData variable values from the string
+	customizationData->loadLocalDataFromString(value);
+
+	//-- release local reference
+	customizationData->release();
+}
+//-----------------------------------------------------------------------
+
+/**
+ * Gets all the equipped items corresponding to a combat skeleton "bone".
+ *
+ * @param combatBone		the bone we want equipment for
+ * @param items				list to be filled in with the items
+ */
+void TangibleObject::getEquippedItems(uint32 combatBone, std::vector<TangibleObject *> &items) const
+{
+	SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this);
+	if (container == NULL)
+		return;
+
+	std::vector<Container::ContainedItem> itemIds;
+	container->getObjectsForCombatBone(combatBone, itemIds);
+
+	std::vector<Container::ContainedItem>::const_iterator iter;
+	for (iter = itemIds.begin(); iter != itemIds.end(); ++iter)
+	{
+		Object * object = (*iter).getObject();
+		if (object != NULL)
+		{
+			TangibleObject * item = dynamic_cast<TangibleObject *>(object);
+			if (item != NULL)
+				items.push_back(item);
+		}
+	}
+}	// TangibleObject::getEquippedItems
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a random equipped item corresponding to a combat skeleton "bone".
+ *
+ * @param combatBone		the bone we want the item for
+ *
+ * @return the item
+ */
+TangibleObject * TangibleObject::getRandomEquippedItem(uint32 combatBone) const
+{
+	std::vector<TangibleObject *> items;
+	getEquippedItems(combatBone, items);
+
+	if (items.empty())
+	{
+		return NULL;
+	}
+
+	int index = Random::random(0, items.size() - 1);
+	return items[index];
+}	// TangibleObject::getRandomEquippedItem
+
+//-----------------------------------------------------------------------
+
+/**
+ * Updates the object for damage taken in battle.
+ *
+ * @param time		current game time
+ *
+ * @return base class result
+ */
+float TangibleObject::alter(real time)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("TangibleObject::alter");
+
+	if (isAuthoritative())
+	{
+		// Determine the combat state of the object
+		{
+			CombatEngine::alter(*this);
+
+			m_hateList.alter();
+
+			if (!m_hateList.isEmpty())
+			{
+				if (!isPlayerControlled())
+				{
+					// AI
+
+					// Schedule the AI for an update
+					{
+						AiCombatPulseQueue::schedule(this, 0, static_cast<unsigned long>(time * 1000.0f));
+					}
+				}
+				else
+				{
+					// Player
+
+					// Make sure the hate list is purged of invalid hate targets. If a player is no
+					// longer hated by a hate target, then remove that target from the player's list.
+					// A player must be in their hate target's hate list and vice versa.
+					{
+						typedef std::vector<NetworkId> PurgeList;
+						static PurgeList purgeList;
+						purgeList.clear();
+
+						HateList::UnSortedList const & unSortedHateList = getUnSortedHateList();
+						HateList::UnSortedList::const_iterator iterUnSortedHateList = unSortedHateList.begin();
+
+						for (; iterUnSortedHateList != unSortedHateList.end(); ++iterUnSortedHateList)
+						{
+							CachedNetworkId const & id = iterUnSortedHateList->first;
+
+							if (!isHatedBy(id.getObject()))
+							{
+								purgeList.push_back(id);
+							}
+						}
+
+						PurgeList::const_iterator iterPurgeList = purgeList.begin();
+
+						for (; iterPurgeList != purgeList.end(); ++iterPurgeList)
+						{
+							removeHateTarget(*iterPurgeList);
+						}
+					}
+				}
+			}
+
+			if (m_hateList.isEmpty())
+			{
+				if (   !isPlayerControlled()
+					|| (getCombatDuration() > s_minCombatDuration))
+				{
+					setInCombat(false);
+				}
+			}
+		}
+	}
+
+	// check for location target arrival
+	if(isAuthoritative() && !m_locationTargets.empty())
+	{
+		Vector const effectiveWorldLocation = findPosition_w();
+		for (std::vector<LocationData>::const_iterator i = m_locationTargets.begin(); i != m_locationTargets.end(); ++i)
+		{
+			if ((*i).scene == ServerWorld::getSceneId())
+			{
+				Sphere const &s = (*i).location;
+				// 3d targets are denoted by y coordinates > 50k, with 100k added to them
+				// If it's a 3d target, add 100k to our y coordinate
+				// If it's a 2d target, set our y coordinate to the target's
+				// 2d comparison, put locations on same plane
+				Vector v = effectiveWorldLocation;
+				if (s.getCenter().y > 50000.0f)
+					v.y += 100000.0f;
+				else
+					v.y = s.getCenter().y;
+
+				if (s.contains(v))
+				{
+					// copy the location data so we can remove it from the vector prior to triggerring
+					LocationData triggeredLocation(*i);
+					removeLocationTarget((*i).name);
+					// trigger any scripts
+					onArrivedAtLocation(triggeredLocation);
+					// we'll catch any additional location triggers going off during the next alter
+					break;
+				}
+			}
+		}
+	}
+
+	//-- handle modified customization data
+	if (isCustomizationDataModified())
+	{
+		// associated CustomizationData instance is modified.  Pack CustomizationData
+		// into m_appearanceData string, which will get sent to others.
+
+		//-- get property
+		CustomizationDataProperty *cdProperty = safe_cast<CustomizationDataProperty*>(getProperty(CustomizationDataProperty::getClassPropertyId()));
+		if (!cdProperty)
+		{
+			DEBUG_WARNING(true, ("customization data modified but no customization data!"));
+		}
+		else
+		{
+			// retrieve the CustomizationData instance associated with the property
+			CustomizationData *const customizationData = cdProperty->fetchCustomizationData();
+			NOT_NULL(customizationData);
+
+			//-- initialize CustomizationData variable values from the string
+			m_appearanceData.set(customizationData->writeLocalDataToString());
+
+			//-- release reference
+			customizationData->release();
+
+		}
+
+		// reset flag
+		setCustomizationDataModified(false);
+	}
+
+	return ServerObject::alter(time);
+}	// TangibleObject::alter
+
+//-----------------------------------------------------------------------
+
+float TangibleObject::getNextAlterTime(float baseAlterTime) const
+{
+	if (baseAlterTime == AlterResult::cms_kill || baseAlterTime == AlterResult::cms_alterNextFrame)
+		return baseAlterTime;
+
+	float result = baseAlterTime;
+
+	if (getSynchronizedUi() && dynamic_cast<const CraftingToolSyncUi *>(getSynchronizedUi()))
+		return AlterResult::cms_alterNextFrame;
+
+	if (isAuthoritative())
+	{
+		if (isInCombat())
+			return AlterResult::cms_alterNextFrame;
+
+		if (!m_locationTargets.empty())
+			AlterResult::incorporateAlterResult(result, ConfigServerGame::getLocationTargetCheckIntervalSec());
+	}
+
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::conclude()
+{
+	PROFILER_AUTO_BLOCK_DEFINE("TangibleObject::conclude");
+
+	// if we are a crafting tool, conclude our prototype and manf schematic
+	if (getSynchronizedUi() != NULL)
+	{
+		const CraftingToolSyncUi * sync = dynamic_cast<const CraftingToolSyncUi *>(
+			getSynchronizedUi());
+		if (sync != NULL)
+		{
+			Object * object = sync->getPrototype().getObject();
+			if (object != NULL)
+				object->conclude();
+			object = sync->getManfSchematic().getObject();
+			if (object != NULL)
+				object->conclude();
+		}
+	}
+
+	ServerObject::conclude();
+}
+
+//-----------------------------------------------------------------------
+
+float TangibleObject::getPvpRegionCheckTime()
+{
+	return ConfigServerGame::getTangiblePvpRegionCheckTime();
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::setPvpType(Pvp::PvpType pvpType)
+{
+	FATAL(!isAuthoritative(), ("Inappropriate use of TangibleObject::setPvpType - this should only be called from the Pvp interface."));
+	Pvp::PvpType oldType = static_cast<Pvp::PvpType>(m_pvpType.get());
+	if (oldType != pvpType)
+	{
+		m_pvpType.set(static_cast<int>(pvpType));
+		m_pvpFutureType.set(-1);
+		if (getScriptObject())
+		{
+			ScriptParams params;
+			params.addParam(oldType);
+			params.addParam(pvpType);
+			IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_PVP_TYPE_CHANGED, params));
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::setPvpFutureType(Pvp::PvpType pvpFutureType)
+{
+	FATAL(!isAuthoritative(), ("Inappropriate use of TangibleObject::setPvpFutureType - this should only be called from the Pvp interface."));
+	Pvp::PvpType oldFutureType = static_cast<Pvp::PvpType>(m_pvpFutureType.get());
+	if (oldFutureType != pvpFutureType)
+	{
+		m_pvpFutureType.set(static_cast<int>(pvpFutureType));
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::setPvpFaction(Pvp::FactionId factionId)
+{
+	FATAL(!isAuthoritative(), ("Inappropriate use of TangibleObject::setPvpFaction - this should only be called from the Pvp interface."));
+	Pvp::FactionId oldFaction = static_cast<Pvp::FactionId>(m_pvpFaction.get());
+	if (oldFaction != factionId)
+	{
+		m_pvpFaction.set(static_cast<uint32>(factionId));
+		if (getScriptObject())
+		{
+			ScriptParams params;
+			params.addParam(static_cast<int>(oldFaction));
+			params.addParam(static_cast<int>(factionId));
+			IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_PVP_FACTION_CHANGED, params));
+		}
+
+		// if player character is changing faction, clear
+		// out current accumulated CGW points and rating;
+		// this *MUST* be done after m_pvpFaction has
+		// been set to the new faction because 
+		// modifyCurrentGcwRating() uses the faction information
+		CreatureObject * creature = asCreatureObject();
+		if (creature)
+		{
+			PlayerObject * player = PlayerCreatureController::getPlayerObject(creature);
+			if (player)
+			{
+				// decrementing the value by a really large
+				// number will cause it to reset to 0
+				static int const min = std::numeric_limits<int>::min();
+
+				player->modifyCurrentGcwPoints(min, false);
+				player->modifyCurrentGcwRating(min, true);
+
+				// if player is no longer factional, reset current pvp kills
+				if (!PvpData::isImperialFactionId(factionId) && !PvpData::isRebelFactionId(factionId))
+					player->modifyCurrentPvpKills(min, false);
+
+				// if new faction is not neutral, remove any mercenary status
+				if (!PvpData::isNeutralFactionId(factionId))
+					Pvp::setNeutralMercenaryFaction(*creature, PvpData::getNeutralFactionId(), PvpType_Neutral);
+			}
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::setPvpMercenaryFaction(Pvp::FactionId factionId, Pvp::PvpType pvpType)
+{
+	FATAL(!isAuthoritative(), ("Inappropriate use of TangibleObject::setPvpMercenaryFaction - this should only be called from the Pvp interface."));
+
+	// this only applies to neutral
+	if (!PvpData::isNeutralFactionId(m_pvpFaction.get()) && !PvpData::isNeutralFactionId(factionId))
+		return;
+
+	// this only applies to player character
+	PlayerObject * const po = PlayerCreatureController::getPlayerObject(asCreatureObject());
+	if (!po || !po->isAuthoritative())
+		return;
+
+	// see if mercenary functionality is allowed
+	if (!PvpData::isNeutralFactionId(factionId))
+	{
+		if (PvpData::isImperialFactionId(factionId))
+		{
+			if (pvpType == PvpType_Covert)
+			{
+				if (!ConfigServerGame::getEnableCovertImperialMercenary())
+					return;
+
+				po->modifyCollectionSlotValue("covert_imperial_mercenary", 1);
+				po->modifyCollectionSlotValue("overt_imperial_mercenary", -1);
+				po->modifyCollectionSlotValue("covert_rebel_mercenary", -1);
+				po->modifyCollectionSlotValue("overt_rebel_mercenary", -1);
+
+				std::string const & currentTitle = po->getTitle();
+				if (po->hasCompletedCollectionSlot("covert_imperial_mercenary"))
+				{
+					if ((currentTitle == "covert_imperial_mercenary") || (currentTitle == "overt_imperial_mercenary") || (currentTitle == "covert_rebel_mercenary") || (currentTitle == "overt_rebel_mercenary"))
+						po->setTitle("covert_imperial_mercenary");
+					else if ((currentTitle == "covert_imperial_sympathizer") || (currentTitle == "overt_imperial_sympathizer") || (currentTitle == "covert_rebel_sympathizer") || (currentTitle == "overt_rebel_sympathizer"))
+						po->setTitle("covert_imperial_sympathizer");
+					else if ((currentTitle == "covert_imperial_loyalist") || (currentTitle == "overt_imperial_loyalist") || (currentTitle == "covert_rebel_insurgent") || (currentTitle == "overt_rebel_insurgent"))
+						po->setTitle("covert_imperial_loyalist");
+				}
+				else
+				{
+					if ((currentTitle == "covert_imperial_mercenary") || (currentTitle == "overt_imperial_mercenary") || (currentTitle == "covert_rebel_mercenary") || (currentTitle == "overt_rebel_mercenary"))
+						po->setTitle(std::string());
+					else if ((currentTitle == "covert_imperial_sympathizer") || (currentTitle == "overt_imperial_sympathizer") || (currentTitle == "covert_rebel_sympathizer") || (currentTitle == "overt_rebel_sympathizer"))
+						po->setTitle(std::string());
+					else if ((currentTitle == "covert_imperial_loyalist") || (currentTitle == "overt_imperial_loyalist") || (currentTitle == "covert_rebel_insurgent") || (currentTitle == "overt_rebel_insurgent"))
+						po->setTitle(std::string());
+				}
+			}
+			else if (pvpType == PvpType_Declared)
+			{
+				if (!ConfigServerGame::getEnableOvertImperialMercenary())
+					return;
+
+				po->modifyCollectionSlotValue("covert_imperial_mercenary", -1);
+				po->modifyCollectionSlotValue("overt_imperial_mercenary", 1);
+				po->modifyCollectionSlotValue("covert_rebel_mercenary", -1);
+				po->modifyCollectionSlotValue("overt_rebel_mercenary", -1);
+
+				std::string const & currentTitle = po->getTitle();
+				if (po->hasCompletedCollectionSlot("overt_imperial_mercenary"))
+				{
+					if ((currentTitle == "covert_imperial_mercenary") || (currentTitle == "overt_imperial_mercenary") || (currentTitle == "covert_rebel_mercenary") || (currentTitle == "overt_rebel_mercenary"))
+						po->setTitle("overt_imperial_mercenary");
+					else if ((currentTitle == "covert_imperial_sympathizer") || (currentTitle == "overt_imperial_sympathizer") || (currentTitle == "covert_rebel_sympathizer") || (currentTitle == "overt_rebel_sympathizer"))
+						po->setTitle("overt_imperial_sympathizer");
+					else if ((currentTitle == "covert_imperial_loyalist") || (currentTitle == "overt_imperial_loyalist") || (currentTitle == "covert_rebel_insurgent") || (currentTitle == "overt_rebel_insurgent"))
+						po->setTitle("overt_imperial_loyalist");
+				}
+				else
+				{
+					if ((currentTitle == "covert_imperial_mercenary") || (currentTitle == "overt_imperial_mercenary") || (currentTitle == "covert_rebel_mercenary") || (currentTitle == "overt_rebel_mercenary"))
+						po->setTitle(std::string());
+					else if ((currentTitle == "covert_imperial_sympathizer") || (currentTitle == "overt_imperial_sympathizer") || (currentTitle == "covert_rebel_sympathizer") || (currentTitle == "overt_rebel_sympathizer"))
+						po->setTitle(std::string());
+					else if ((currentTitle == "covert_imperial_loyalist") || (currentTitle == "overt_imperial_loyalist") || (currentTitle == "covert_rebel_insurgent") || (currentTitle == "overt_rebel_insurgent"))
+						po->setTitle(std::string());
+				}
+			}
+			else
+			{
+				return;
+			}
+		}
+		else if (PvpData::isRebelFactionId(factionId))
+		{
+			if (pvpType == PvpType_Covert)
+			{
+				if (!ConfigServerGame::getEnableCovertRebelMercenary())
+					return;
+
+				po->modifyCollectionSlotValue("covert_imperial_mercenary", -1);
+				po->modifyCollectionSlotValue("overt_imperial_mercenary", -1);
+				po->modifyCollectionSlotValue("covert_rebel_mercenary", 1);
+				po->modifyCollectionSlotValue("overt_rebel_mercenary", -1);
+
+				std::string const & currentTitle = po->getTitle();
+				if (po->hasCompletedCollectionSlot("covert_rebel_mercenary"))
+				{
+					if ((currentTitle == "covert_imperial_mercenary") || (currentTitle == "overt_imperial_mercenary") || (currentTitle == "covert_rebel_mercenary") || (currentTitle == "overt_rebel_mercenary"))
+						po->setTitle("covert_rebel_mercenary");
+					else if ((currentTitle == "covert_imperial_sympathizer") || (currentTitle == "overt_imperial_sympathizer") || (currentTitle == "covert_rebel_sympathizer") || (currentTitle == "overt_rebel_sympathizer"))
+						po->setTitle("covert_rebel_sympathizer");
+					else if ((currentTitle == "covert_imperial_loyalist") || (currentTitle == "overt_imperial_loyalist") || (currentTitle == "covert_rebel_insurgent") || (currentTitle == "overt_rebel_insurgent"))
+						po->setTitle("covert_rebel_insurgent");
+				}
+				else
+				{
+					if ((currentTitle == "covert_imperial_mercenary") || (currentTitle == "overt_imperial_mercenary") || (currentTitle == "covert_rebel_mercenary") || (currentTitle == "overt_rebel_mercenary"))
+						po->setTitle(std::string());
+					else if ((currentTitle == "covert_imperial_sympathizer") || (currentTitle == "overt_imperial_sympathizer") || (currentTitle == "covert_rebel_sympathizer") || (currentTitle == "overt_rebel_sympathizer"))
+						po->setTitle(std::string());
+					else if ((currentTitle == "covert_imperial_loyalist") || (currentTitle == "overt_imperial_loyalist") || (currentTitle == "covert_rebel_insurgent") || (currentTitle == "overt_rebel_insurgent"))
+						po->setTitle(std::string());
+				}
+			}
+			else if (pvpType == PvpType_Declared)
+			{
+				if (!ConfigServerGame::getEnableOvertRebelMercenary())
+					return;
+
+				po->modifyCollectionSlotValue("covert_imperial_mercenary", -1);
+				po->modifyCollectionSlotValue("overt_imperial_mercenary", -1);
+				po->modifyCollectionSlotValue("covert_rebel_mercenary", -1);
+				po->modifyCollectionSlotValue("overt_rebel_mercenary", 1);
+
+				std::string const & currentTitle = po->getTitle();
+				if (po->hasCompletedCollectionSlot("overt_rebel_mercenary"))
+				{
+					if ((currentTitle == "covert_imperial_mercenary") || (currentTitle == "overt_imperial_mercenary") || (currentTitle == "covert_rebel_mercenary") || (currentTitle == "overt_rebel_mercenary"))
+						po->setTitle("overt_rebel_mercenary");
+					else if ((currentTitle == "covert_imperial_sympathizer") || (currentTitle == "overt_imperial_sympathizer") || (currentTitle == "covert_rebel_sympathizer") || (currentTitle == "overt_rebel_sympathizer"))
+						po->setTitle("overt_rebel_sympathizer");
+					else if ((currentTitle == "covert_imperial_loyalist") || (currentTitle == "overt_imperial_loyalist") || (currentTitle == "covert_rebel_insurgent") || (currentTitle == "overt_rebel_insurgent"))
+						po->setTitle("overt_rebel_insurgent");
+				}
+				else
+				{
+					if ((currentTitle == "covert_imperial_mercenary") || (currentTitle == "overt_imperial_mercenary") || (currentTitle == "covert_rebel_mercenary") || (currentTitle == "overt_rebel_mercenary"))
+						po->setTitle(std::string());
+					else if ((currentTitle == "covert_imperial_sympathizer") || (currentTitle == "overt_imperial_sympathizer") || (currentTitle == "covert_rebel_sympathizer") || (currentTitle == "overt_rebel_sympathizer"))
+						po->setTitle(std::string());
+					else if ((currentTitle == "covert_imperial_loyalist") || (currentTitle == "overt_imperial_loyalist") || (currentTitle == "covert_rebel_insurgent") || (currentTitle == "overt_rebel_insurgent"))
+						po->setTitle(std::string());
+				}
+			}
+			else
+			{
+				return;
+			}
+		}
+		else
+		{
+			return;
+		}
+	}
+	else
+	{
+		po->modifyCollectionSlotValue("covert_imperial_mercenary", -1);
+		po->modifyCollectionSlotValue("overt_imperial_mercenary", -1);
+		po->modifyCollectionSlotValue("covert_rebel_mercenary", -1);
+		po->modifyCollectionSlotValue("overt_rebel_mercenary", -1);
+
+		std::string const & currentTitle = po->getTitle();
+		if ((currentTitle == "covert_imperial_mercenary") || (currentTitle == "overt_imperial_mercenary") || (currentTitle == "covert_rebel_mercenary") || (currentTitle == "overt_rebel_mercenary") ||
+		    (currentTitle == "covert_imperial_sympathizer") || (currentTitle == "overt_imperial_sympathizer") || (currentTitle == "covert_rebel_sympathizer") || (currentTitle == "overt_rebel_sympathizer") ||
+		    (currentTitle == "covert_imperial_loyalist") || (currentTitle == "overt_imperial_loyalist") || (currentTitle == "covert_rebel_insurgent") || (currentTitle == "overt_rebel_insurgent"))
+		{
+			po->setTitle(std::string());
+		}
+	}
+
+	// flag when the player stopped being a factional helper for the particular faction
+	if (m_pvpMercenaryFaction.get() != factionId)
+	{
+		if (PvpData::isImperialFactionId(m_pvpMercenaryFaction.get()))
+		{
+			IGNORE_RETURN(setObjVarItem("factionalHelper.timeStopHelpingImperial", static_cast<int>(::time(NULL))));
+			removeObjVarItem("factionalHelper.timeStopHelpingRebel");
+		}
+		else if (PvpData::isRebelFactionId(m_pvpMercenaryFaction.get()))
+		{
+			IGNORE_RETURN(setObjVarItem("factionalHelper.timeStopHelpingRebel", static_cast<int>(::time(NULL))));
+			removeObjVarItem("factionalHelper.timeStopHelpingImperial");
+		}
+	}
+
+	m_pvpMercenaryFaction.set(static_cast<uint32>(factionId));
+	m_pvpMercenaryType.set(((PvpData::isNeutralFactionId(factionId)) ? PvpType_Neutral : static_cast<int>(pvpType)));
+}
+
+//-----------------------------------------------------------------------
+
+Region const *TangibleObject::getPvpRegion() const
+{
+	uint32 crc = m_pvpRegionCrc.get();
+	if (crc)
+		return Region::findRegionByNameCrc(crc);
+	return 0;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the pvp region this object is in.
+ *
+ * @param pvpRegion		the pvp region
+ */
+void TangibleObject::setPvpRegion(Region const * pvpRegion)
+{
+	if (isAuthoritative())
+	{
+		uint32 crc = pvpRegion ? pvpRegion->getNameCrc() : 0;
+		if (m_pvpRegionCrc.get() != crc)
+			m_pvpRegionCrc = crc;
+	}
+	else
+	{
+		FATAL(true, ("TangibleObject::setPvpRegion : send message to auth object!!!"));
+	}
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a default controller for this object.
+ *
+ * @return the object's controller
+ */
+Controller* TangibleObject::createDefaultController(void)
+{
+	Controller* controller = new TangibleController(this);
+	NOT_NULL(controller);
+
+	setController(controller);
+	return controller;
+}	// TangibleObject::createDefaultController
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::forwardServerObjectSpecificBaselines() const
+{
+	ServerObject::forwardServerObjectSpecificBaselines();
+}
+
+//-----------------------------------------------------------------------
+
+TangibleObject const &TangibleObject::getPvpViewer(Client const &client) const
+{
+	TangibleObject const * const clientObj = safe_cast<TangibleObject const *>(client.getCharacterObject());
+	FATAL(!clientObj, ("Client trying to get pvp viewer with no character object?"));
+	return *clientObj;
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::sendObjectSpecificBaselinesToClient(Client const &client) const
+{
+	ServerObject::sendObjectSpecificBaselinesToClient(client);
+	if (!isNonPvpObject())
+	{
+		uint32 flags, factionId;
+		Pvp::getClientVisibleStatus(client, *this, flags, factionId);
+		UpdatePvpStatusMessage const statusMessage(getNetworkId(), flags, factionId);
+		client.send(statusMessage, true);
+		PvpUpdateObserver::updatePvpStatusCache(&client, *this, flags, factionId);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Flags the object as being cached on the client or not.
+ */
+void TangibleObject::setCacheVersion(const int cacheVersion)
+{
+	ServerObject::setCacheVersion(cacheVersion);
+
+	// if we are cached, we need to be made invulnerable
+	// @todo: if we are not cached, do we need to change our invulnerability?
+	if (cacheVersion > 0)
+		setInvulnerable(true);
+}	// TangibleObject::setCacheVersion
+
+//-----------------------------------------------------------------------
+
+/**
+ * Allows an object to do pre-deletion cleanup.
+ */
+void TangibleObject::onRemovingFromWorld()
+{
+	ServerObject::onRemovingFromWorld();
+
+	clearHateList();
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::unload()
+{
+	ServerObject::unload();
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::onPermanentlyDestroyed()
+{
+	ServerObject::onPermanentlyDestroyed();
+
+	if (isAuthoritative())
+	{
+		clearHateList();
+
+		if (isCraftingTool())
+		{
+			ServerObject * owner = ServerWorld::findObjectByNetworkId(getOwnerId());
+			if (owner != NULL && owner->asCreatureObject() != NULL)
+			{
+				PlayerObject * player = PlayerCreatureController::getPlayerObject(
+					owner->asCreatureObject());
+				if (player != NULL && player->isCrafting() && player->getCraftingTool() == getNetworkId())
+					player->stopCrafting(false);
+			}
+		}
+	}
+
+	if (isWaypoint())
+	{
+		ServerPathfindingNotification::destroyWaypoint(this);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a synchronized ui class in order to get data to the client during a
+ * crafting session.
+ *
+ * @return the newly created class
+ */
+ServerSynchronizedUi * TangibleObject::createSynchronizedUi ()
+{
+	return new CraftingToolSyncUi(*this);
+}
+
+
+// ======================================================================
+// TangibleObject private static member functions
+// ======================================================================
+
+void TangibleObject::customizationDataModificationCallback(const CustomizationData & /* customizationData */, const void *context)
+{
+	if (!context)
+		return;
+
+	//-- turn context into TangibleObject
+	TangibleObject *const tangibleObject = const_cast<TangibleObject*>(reinterpret_cast<const TangibleObject*>(context));
+
+	//-- set the tangible object's customization data modification flag now.
+	//   The reason we don't handle the customization data change now is that
+	//   we want to lump up all the changes that occur during one server
+	//   frame and handle the string conversion once.
+	tangibleObject->setCustomizationDataModified(true);
+}
+
+// ======================================================================
+// TangibleObject private member functions
+// ======================================================================
+
+void TangibleObject::handleContainerSetup()
+{
+
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::setOwnerId(NetworkId const &id)
+{
+	if(isAuthoritative())
+	{
+		// if we are changing owners, we are no longer insured
+		bool ownerChanged = false;
+		if (m_ownerId.get() != id)
+		{
+			ownerChanged = true;
+			setInsured(false);
+		}
+
+		m_ownerId = id;
+		Container* container = ContainerInterface::getContainer(*this);
+		if (container)
+		{
+			ContainerIterator i = container->begin();
+			for (; i != container->end(); ++i)
+			{
+				ServerObject* content = safe_cast<ServerObject*>((*i).getObject());
+				if (content && !dynamic_cast<CreatureObject*>(content))
+				{
+					content->setOwnerId(id);
+				}
+			}
+		}
+
+		// if we're hidden, who can see us has changed
+		if (ownerChanged && isInWorld() && isHidden())
+			visibilityDataModified();
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setOwnerId, new MessageQueueNetworkId(id));
+	}
+}
+//-----------------------------------------------------------------------
+
+bool TangibleObject::onContainerAboutToTransfer(ServerObject * destination, ServerObject* transferer)
+{
+	const int got = getGameObjectType ();
+	if (got == SharedObjectTemplate::GOT_misc_crafting_station && destination && !destination->asCellObject())
+	{
+		//Only allow stations to be trasferred if their hoppers are empty
+		Container* container = ContainerInterface::getContainer(*this);
+		if (container)
+		{
+			ContainerIterator i = container->begin();
+			for (; i != container->end(); ++i)
+			{
+				ServerObject* content = safe_cast<ServerObject*>((*i).getObject());
+				if (!isEmpty(*content))
+				{
+
+					if (transferer && transferer->getClient())
+						ContainerInterface::sendContainerMessageToClient(*transferer, Container::CEC_HopperNotEmpty);
+					return false;
+				}
+			}
+		}
+	}
+	if (destination != NULL && getObjVars().hasItem(OBJVAR_BIO_LINK_ID))
+	{
+		// if this item is bio-linked and a player is trying to equip it, make
+		// sure the link id matches the player's id
+		if (destination->asCreatureObject() != NULL)
+		{
+			// allow holograms to have biolinked items transferred to them
+			int hologramVal = 0;
+			destination->getObjVars().getItem("hologram_performer", hologramVal);
+			
+			NetworkId linkId(getBioLink());
+			if (linkId != destination->getNetworkId() && hologramVal == 0)
+			{
+				if (transferer && transferer->getClient())
+					ContainerInterface::sendContainerMessageToClient(*transferer, Container::CEC_BioLinkedToOtherPlayer);
+				return false;
+			}
+		}
+
+	    // Check to see if we're trying to appearance equip a biolinked item.
+		Object * containedBy = ContainerInterface::getContainedByObject(*destination);
+		if(containedBy && containedBy->asServerObject() && containedBy->asServerObject()->asCreatureObject())
+		{
+			CreatureObject * creatureContainer = containedBy->asServerObject()->asCreatureObject();
+			if(creatureContainer && creatureContainer->getAppearanceInventory() && creatureContainer->getAppearanceInventory() == destination)
+			{
+				// We're trying to appearance equip a biolinked item. Make sure the BioLink ID matches our player ID.
+				NetworkId linkId(getBioLink());
+				if (linkId != creatureContainer->getNetworkId())
+				{
+					if (transferer && transferer->getClient())
+						ContainerInterface::sendContainerMessageToClient(*transferer, Container::CEC_BioLinkedToOtherPlayer);
+					return false;
+				}
+			}
+		}
+	}
+	return ServerObject::onContainerAboutToTransfer(destination, transferer);
+}
+
+//-----------------------------------------------------------------------
+
+bool TangibleObject::onContainerChildAboutToLoseItem(ServerObject *destination, ServerObject &item, ServerObject *transferer)
+{
+	int const got = getGameObjectType();
+	if (transferer && got == SharedObjectTemplate::GOT_misc_crafting_station && !isInWorld())
+		return false;
+
+	if (getPortalProperty() && !onPobChildAboutToLoseItem(destination, item, transferer))
+		return false;
+
+	return ServerObject::onContainerChildAboutToLoseItem(destination, item, transferer);
+}
+
+//-----------------------------------------------------------------------
+
+bool TangibleObject::onContainerChildAboutToGainItem(ServerObject &item, ServerObject *destination, ServerObject *transferer)
+{
+	int const got = getGameObjectType();
+	if (transferer && got == SharedObjectTemplate::GOT_misc_crafting_station && !isInWorld())
+		return false;
+
+	if (getPortalProperty() && !onPobChildAboutToGainItem(item, destination, transferer))
+		return false;
+
+	return ServerObject::onContainerChildAboutToGainItem(item, destination, transferer);
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::onContainerChildLostItem(ServerObject *destination, ServerObject &item, ServerObject *source, ServerObject *transferer)
+{
+	if (getPortalProperty())
+		onPobChildLostItem(destination, item, source, transferer);
+	ServerObject::onContainerChildLostItem(destination, item, source, transferer);
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::onContainerChildGainItem(ServerObject &item, ServerObject *source, ServerObject *transferer)
+{
+	if (getPortalProperty())
+		onPobChildGainItem(item, source, transferer);
+	ServerObject::onContainerChildGainItem(item, source, transferer);
+}
+
+// ----------------------------------------------------------------------
+
+int TangibleObject::onContainerAboutToGainItem(ServerObject& item, ServerObject* transferer)
+{
+	if (transferer && isCraftingTool())
+	{
+		return Container::CEC_BlockedByDestinationContainer;
+	}
+	return ServerObject::onContainerAboutToGainItem(item, transferer);
+}
+
+//----------------------------------------------------------------------
+
+void TangibleObject::onContainerGainItem(ServerObject& item, ServerObject* source, ServerObject* transferer)
+{
+	ServerObject::onContainerGainItem(item, source, transferer);
+	//do not set owners of creatures
+	//and do not set the owner of items going into the bazaar
+	if (getOwnerId() != NetworkId::cms_invalid && !item.asCreatureObject() && !isBazaarTerminal())
+		item.setOwnerId(getOwnerId());
+}
+
+// ----------------------------------------------------------------------
+
+Footprint *TangibleObject::getFootprint()
+{
+	CollisionProperty *const property = getCollisionProperty();
+	if (property)
+		return property->getFootprint();
+	else
+		return NULL;
+}
+
+//-----------------------------------------------------------------------
+
+Footprint const *TangibleObject::getFootprint() const
+{
+	CollisionProperty const *const property = getCollisionProperty();
+	if (property)
+		return property->getFootprint();
+	else
+		return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sets up the object for being in or out of combat.
+ *
+ * @param inCombat		flag to put the object in combat-ready state or not
+ *
+ * @return true if state was set, false if something went wrong
+ */
+void TangibleObject::setInCombat(bool inCombat)
+{
+	m_inCombat = inCombat;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * If this object is in combat, adds an aim to it.
+ */
+void TangibleObject::addAim(void)
+{
+	if(isAuthoritative())
+	{
+		if (isInCombat())
+		{
+			CombatEngineData::AttackData & attackData = NON_NULL(getCombatData())->attackData;
+
+			if (attackData.aims < ConfigCombatEngine::getMaxAims())
+			{
+				++attackData.aims;
+			}
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_addAim, 0);
+	}
+}	// TangibleObject::addAim
+
+//-----------------------------------------------------------------------
+
+/**
+ * If this object is in combat, clear's it's aims.
+ */
+void TangibleObject::clearAims(void)
+{
+	if(isAuthoritative())
+	{
+		if (isInCombat())
+		{
+			CombatEngineData::AttackData & attackData = NON_NULL(getCombatData())->attackData;
+			attackData.aims = 0;
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_clearAims, 0);
+	}
+}	// TangibleObject::clearAims
+
+//-----------------------------------------------------------------------
+
+/**
+ * Applies damage to the object. No other function should modify m_damageTaken.
+ *
+ * @param delta					amount of damage to apply
+ * @param ignoreInvulnerable	flag to ignore the invulnerable setting of this object
+ * @param source				who is doing the damage
+ *
+ * @return the amount of damage actually applied
+ */
+int TangibleObject::alterHitPoints(int delta, bool ignoreInvulnerable,
+	const NetworkId & source)
+{
+	if(isAuthoritative())
+	{
+#ifdef _DEBUG
+		char debugBuffer[1024];
+		const char * craftedString = "";
+		Client *client = NULL;
+		ServerObject * sourceObject = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(source));
+		if (source != NetworkId::cms_invalid && sourceObject != NULL)
+			client = sourceObject->getClient();
+#endif
+
+		// Only consider tangible invulnerability rules for this case
+		if (isDisabled() || (!ignoreInvulnerable && TangibleObject::isInvulnerable()))
+			return 0;
+
+		int totalHitPoints = getMaxHitPoints();
+		int totalDamageTaken = m_damageTaken.get() - delta;
+
+#ifdef _DEBUG
+		if (ConfigCombatEngine::getDebugDamage())
+		{
+			snprintf(debugBuffer, sizeof(debugBuffer), "%s object %s (hp=%d) damaged "
+				"from %d to %d\n", craftedString, getNetworkId().getValueString().c_str(),
+				totalHitPoints,	m_damageTaken.get(), totalDamageTaken);
+			DEBUG_REPORT_LOG (true, ("%s", debugBuffer));
+			if (source != NetworkId::cms_invalid && client != NULL)
+				ConsoleMgr::broadcastString(debugBuffer, client);
+		}
+#endif
+
+		if (totalDamageTaken >= totalHitPoints)
+		{
+			// clip delta and damage taken
+			if (isDisabled())
+				delta = 0;
+			else
+				delta += totalDamageTaken - totalHitPoints;
+			totalDamageTaken = totalHitPoints;
+		}
+		else if (totalDamageTaken < 0)
+			totalDamageTaken = 0;
+		if (totalDamageTaken == totalHitPoints)
+			setDisabled(true);
+
+		m_damageTaken = totalDamageTaken;
+
+		if (isDisabled())
+		{
+#ifdef _DEBUG
+			if (ConfigCombatEngine::getDebugDamage())
+			{
+				snprintf(debugBuffer, sizeof(debugBuffer), "%s object %s has been "
+					"disabled\n", craftedString, getNetworkId().getValueString().c_str());
+				DEBUG_REPORT_LOG (true, ("%s", debugBuffer));
+				if (source != NetworkId::cms_invalid && client != NULL)
+					ConsoleMgr::broadcastString(debugBuffer, client);
+			}
+#endif
+			ScriptParams params;
+			params.addParam(source);
+			IGNORE_RETURN(getScriptObject()->trigAllScripts(
+				Scripting::TRIG_OBJECT_DISABLED, params));
+		}
+		scheduleForAlter();
+		return delta;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_alterHitPoints, new MessageQueueGenericValueType<std::pair<int, NetworkId> >(std::make_pair(delta, source)));
+		return 0;
+	}
+}	// TangibleObject::alterHitpoints
+
+//-----------------------------------------------------------------------
+
+/**
+ * Applies damage done during combat to the object.
+ *
+ * @param damageData		the damage
+ */
+void TangibleObject::applyDamage(const CombatEngineData::DamageData &damageData)
+{
+	int totalDamage = 0;
+
+	WARNING_STRICT_FATAL(! isAuthoritative(), ("TangibleObject::applyDamage() invoked on a NON-AUTHORITATIVE object %s:%s.", getObjectTemplateName(), getNetworkId().getValueString().c_str()));
+
+	// it is possible for damageData to go bad if this object is being damaged from
+	// combat and it goes out of combat, so we copy the items we need off of it
+	const NetworkId attackerId(damageData.attackerId);
+	const NetworkId weaponId(damageData.weaponId);
+
+	std::vector<AttribMod::AttribMod>::const_iterator iter;
+	for (iter = damageData.damage.begin(); !isDisabled() && iter != damageData.damage.end();
+		++iter)
+	{
+		const AttribMod::AttribMod &mod = *iter;
+		if (mod.value == 0)
+			continue;
+
+		if (AttribMod::isDirectDamage(mod))
+		{
+			// apply instantanious damage directly
+			totalDamage -= alterHitPoints(mod.value, damageData.ignoreInvulnerable,
+				attackerId);
+		}
+		else
+		{
+			WARNING(true, ("Trying to apply non-immediate damage to tangible "
+				"object %s. This isn't supported, the damage won't be applied",
+				getNetworkId().getValueString().c_str()));
+		}
+	}
+
+	// tell scripts we have taken combat damage
+	if (attackerId != NetworkId::cms_invalid && totalDamage > 0)
+	{
+		NOT_NULL(getScriptObject());
+		ScriptParams params;
+		params.addParam(attackerId);
+		params.addParam(weaponId);
+		params.addParam(totalDamage);
+		IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_OBJECT_DAMAGED,
+			params));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sends a message to the Planet Server to update the position of the object.
+ */
+void TangibleObject::updatePlanetServerInternal(const bool forceUpdate) const
+{
+	// Don't send updates for contained tangibles without an interest radius, and only send when forced or moving
+	if ((forceUpdate || getPositionChanged()) && (!ContainerInterface::getContainedByObject(*this) || getInterestRadius() > 0))
+	{
+		Object const * const topmostContainer = ContainerInterface::getTopmostContainer(*this);
+		FATAL(!topmostContainer, ("Object %s was contained by something, but getTopmostContainer() returned NULL\n",getNetworkId().getValueString().c_str()));
+		Vector const &position = topmostContainer->getPosition_p();
+
+		UpdateObjectOnPlanetMessage const msg(
+			getNetworkId(),
+			topmostContainer == this ? NetworkId::cms_invalid : topmostContainer->getNetworkId(),
+			static_cast<int>(position.x),
+			static_cast<int>(position.y),
+			static_cast<int>(position.z),
+			getInterestRadius(),
+			static_cast<int> (getLocationReservationRadius()),
+			false,
+			false,
+			static_cast<int>(getObjectType()),
+			0,
+			false,
+			getTemplateCrc(),
+			-1,
+			-1);
+		GameServer::getInstance().sendToPlanetServer(msg);
+	}
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Clears our damage list.
+ */
+void TangibleObject::clearDamageList(void)
+{
+	if (m_combatData != NULL)
+	{
+		m_combatData->defenseData.damage.clear();
+	}
+}
+
+//----------------------------------------------------------------------
+
+bool TangibleObject::addHate(NetworkId const & target, float const hate)
+{
+	bool result = false;
+
+	if (isAuthoritative())
+	{
+		if (m_hateList.addHate(target, hate))
+		{
+			result = true;
+
+			CombatTracker::addDefender(this);
+			setInCombat(true);
+			scheduleForAlter();
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_addHate, new MessageQueueGenericValueType<std::pair<NetworkId, float> >(std::make_pair(target, hate)));
+	}
+
+	return result;
+}
+
+//----------------------------------------------------------------------
+
+void TangibleObject::addHateOverTime(NetworkId const & target, float const hate, int const seconds)
+{
+	if (seconds <= 0)
+		return;
+
+	if (isAuthoritative())
+	{
+		unsigned long const currentGameTime =  ServerClock::getInstance().getGameTimeSeconds();
+		unsigned long const endGameTime = currentGameTime + seconds;
+
+		IGNORE_RETURN(addHate(target, hate));
+
+		bool const firstHateOverTime = m_hateOverTime.empty();
+		m_hateOverTime.set(target, std::make_pair(hate, std::make_pair(currentGameTime, endGameTime)));
+
+		if (firstHateOverTime)
+			MessageToQueue::sendMessageToC(getNetworkId(), "C++ProcessHateOverTime", std::string(), 1, false);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_addHateOverTime, new MessageQueueGenericValueType<std::pair<NetworkId, std::pair<int, float> > >(std::make_pair(target, std::make_pair(seconds, hate))));
+	}
+}
+
+//----------------------------------------------------------------------
+
+bool TangibleObject::setHate(NetworkId const & target, float const hate)
+{
+	bool result = false;
+
+	if (isAuthoritative())
+	{
+		if (m_hateList.setHate(target, hate))
+		{
+			result = true;
+
+			CombatTracker::addDefender(this);
+			setInCombat(true);
+			scheduleForAlter();
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setHate, new MessageQueueGenericValueType<std::pair<NetworkId, float> >(std::make_pair(target, hate)));
+	}
+
+	return result;
+}
+
+//----------------------------------------------------------------------
+
+float TangibleObject::getHate(NetworkId const & target) const
+{
+	return m_hateList.getHate(target);
+}
+
+//----------------------------------------------------------------------
+
+float TangibleObject::getMaxHate() const
+{
+	return m_hateList.getMaxHate();
+}
+
+//----------------------------------------------------------------------
+
+CachedNetworkId const & TangibleObject::getHateTarget() const
+{
+	return m_hateList.getTarget();
+}
+
+//----------------------------------------------------------------------
+
+void TangibleObject::removeHateTarget(NetworkId const & target)
+{
+	if (isAuthoritative())
+	{
+		m_hateList.removeTarget(target);
+		scheduleForAlter();
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removeHateTarget, new MessageQueueGenericValueType<NetworkId>(target));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void TangibleObject::clearHateList()
+{
+	if (isAuthoritative())
+	{
+		m_hateList.clear();
+		scheduleForAlter();
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_clearHateList, NULL);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+HateList::UnSortedList const & TangibleObject::getUnSortedHateList() const
+{
+	return m_hateList.getUnSortedList();
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::getSortedHateList(HateList::SortedList & sortedHateList) const
+{
+	m_hateList.getSortedList(sortedHateList);
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::verifyHateList()
+{
+	LOGC(ConfigServerGame::isAiLoggingEnabled(), "debug_ai", ("TangibleObject::verifyHateList() owner(%s:%s)", getNetworkId().getValueString().c_str(), Unicode::wideToNarrow(getEncodedObjectName()).c_str()));
+
+	m_hateList.alter();
+}
+
+//-----------------------------------------------------------------------
+
+bool TangibleObject::isHatedBy(Object * const object)
+{
+	bool result = false;
+	TangibleObject * const hatedByTangibleObject = TangibleObject::asTangibleObject(object);
+
+	if (hatedByTangibleObject != NULL)
+	{
+		HateList::UnSortedList const & hateList = hatedByTangibleObject->getUnSortedHateList();
+
+		if (hateList.find(CachedNetworkId(*this)) != hateList.end())
+		{
+			result = true;
+		}
+	}
+
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+bool TangibleObject::isOnHateList(NetworkId const & target) const
+{
+	return m_hateList.isOnList(target);
+}
+
+//-----------------------------------------------------------------------
+
+int TangibleObject::getTimeSinceLastHateListUpdate() const
+{
+	return m_hateList.getTimeSinceLastUpdate();
+}
+
+//-----------------------------------------------------------------------
+
+bool TangibleObject::isHateListEmpty() const
+{
+	return m_hateList.isEmpty();
+}
+
+//-----------------------------------------------------------------------
+HateList::RecentList const & TangibleObject::getRecentHateList() const
+{
+	return m_hateList.getRecentList();
+}
+
+//-----------------------------------------------------------------------
+void TangibleObject::clearRecentHateList()
+{
+	m_hateList.clearRecentList();
+	scheduleForAlter();
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::resetHateTimer()
+{
+	if (isAuthoritative())
+	{
+		m_hateList.resetHateTimer();
+		scheduleForAlter();
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_resetHateTimer, NULL);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::setHateListAutoExpireTargetEnabled(bool const enabled)
+{
+	m_hateList.setAutoExpireTargetEnabled(enabled);
+
+	if (!isAuthoritative())
+	{
+		sendControllerMessageToAuthServer(CM_autoExpireHateListTargetEnabled, new MessageQueueGenericValueType<bool>(enabled));
+	}
+}
+
+//-----------------------------------------------------------------------
+
+bool TangibleObject::isHateListAutoExpireTargetEnabled() const
+{
+	return m_hateList.isAutoExpireTargetEnabled();
+}
+
+//-----------------------------------------------------------------------
+
+int TangibleObject::getHateListAutoExpireTargetDuration() const
+{
+	return m_hateList.getAutoExpireTargetDuration();
+}
+
+//-----------------------------------------------------------------------
+float TangibleObject::getAILeashTime() const
+{
+	return m_hateList.getAILeashTime();
+}
+
+
+//-----------------------------------------------------------------------
+void  TangibleObject::setAILeashTime( float time )
+{
+	m_hateList.setAILeashTime( time );
+}
+
+
+//-----------------------------------------------------------------------
+
+/**
+ * @return true if we are crafted, false if not
+ */
+bool TangibleObject::isCrafted(void) const
+{
+	return hasCondition(C_crafted);
+}	// TangibleObject::isCrafted
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the id of the manufacturing schematic that was used to craft this
+ * item, or NetworkId::cms_invalid if the item wasn't crafted.
+ *
+ * @return the schematic id
+ */
+const NetworkId TangibleObject::getCraftedId(void) const
+{
+	NetworkId craftedId(NetworkId::cms_invalid);
+	getObjVars().getItem(OBJVAR_CRAFTING_SCHEMATIC,craftedId);
+	return craftedId;
+}	// TangibleObject::getCraftedId
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the id of the manufacturing schematic used to create this object.
+ *
+ * @param id		the schematic id
+ */
+void TangibleObject::setCraftedId(const NetworkId & id)
+{
+	if (isAuthoritative())
+	{
+		if (id == NetworkId::cms_invalid)
+		{
+			IGNORE_RETURN(removeObjVarItem(OBJVAR_CRAFTING_SCHEMATIC));
+			m_sourceDraftSchematic = 0;
+			clearCondition(C_crafted);
+		}
+		else
+		{
+			IGNORE_RETURN(setObjVarItem(OBJVAR_CRAFTING_SCHEMATIC, id));
+			setCondition(C_crafted);
+			const Object * object = NetworkIdManager::getObjectById(id);
+			if (object != NULL)
+			{
+				const ManufactureSchematicObject * schematic = dynamic_cast<
+					const ManufactureSchematicObject *>(object);
+				if (schematic != NULL)
+					m_sourceDraftSchematic = schematic->getDraftSchematic();
+			}
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setCraftedId,
+			new MessageQueueGenericValueType<NetworkId>(id));
+	}
+}	// TangibleObject::setCraftedId
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the crafting type of a crafting/repair tool.
+ *
+ * @return the crafting type
+ */
+int TangibleObject::getCraftingType(void) const
+{
+	int type = 0;
+	getObjVars().getItem(OBJVAR_CRAFTING_TYPE, type);
+	return type;
+}	// TangibleObject::getCraftingType
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the crafted type of a crafted object.
+ *
+ * @return the crafted type
+ */
+int TangibleObject::getCraftedType(void) const
+{
+	int craftedType = 0;
+	getObjVars().getItem(OBJVAR_CRAFTING_REPAIR_TYPE,craftedType);
+	return craftedType;
+}	// TangibleObject::getCraftedType
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the crafted type of a crafted object.
+ *
+ * @param type		the crafted type
+ */
+void TangibleObject::setCraftedType(int type)
+{
+	if (isAuthoritative())
+	{
+		IGNORE_RETURN(setObjVarItem(OBJVAR_CRAFTING_REPAIR_TYPE, type));
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setCraftedType,
+			new MessageQueueGenericValueType<int>(type));
+	}
+}	// TangibleObject::setCraftedType
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the id of the object's creator's id.
+ *
+ * @return the object's creator's id
+ */
+const NetworkId TangibleObject::getCreatorId(void) const
+{
+	if (m_creatorId.get() == NetworkId::cms_invalid)
+	{
+		// @todo remove this code when no object has the objvar
+		// OBJVAR_CREATOR_ID
+		NetworkId creatorId(NetworkId::cms_invalid);
+		if (getObjVars().getItem(OBJVAR_CREATOR_ID, creatorId))
+		{
+			const_cast<TangibleObject*>(this)->setCreatorId(creatorId);
+			return creatorId;
+		}
+	}
+	return m_creatorId.get();
+}	// TangibleObject::getCreatorId
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the creator id of this object.
+ *
+ * @param creatorId		the creator id
+ */
+void TangibleObject::setCreatorId(const NetworkId & creatorId)
+{
+	if (isAuthoritative())
+	{
+		m_creatorId = creatorId;
+		if (getObjVars().hasItem(OBJVAR_CREATOR_ID))
+			removeObjVarItem(OBJVAR_CREATOR_ID);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setCreatorId,
+			new MessageQueueGenericValueType<NetworkId>(creatorId));
+	}
+}	// TangibleObject::setCreatorId
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the id of the object's creator's name.
+ *
+ * @return the object's creator's name
+ */
+const Unicode::String TangibleObject::getCreatorName(void) const
+{
+	return Unicode::narrowToWide(NameManager::getInstance().getPlayerName(
+		getCreatorId()));
+}	// TangibleObject::getCreatorName
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the xp amount the creator of this object will get when it is "used".
+ *
+ * @return the xp amount
+ */
+int TangibleObject::getCreatorXp(void) const
+{
+	int creatorXp=0;
+	getObjVars().getItem(OBJVAR_CREATOR_XP,creatorXp);
+	return creatorXp;
+}	// TangibleObject::getCreatorXp
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the xp amount the creator of this object will get when it is "used".
+ *
+ * @param xp		the xp amount
+ */
+void TangibleObject::setCreatorXp(int xp)
+{
+	if (isAuthoritative())
+	{
+		setObjVarItem(OBJVAR_CREATOR_XP, xp);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setCreatorXp, new MessageQueueGenericValueType<int>(xp));
+	}
+}	// TangibleObject::setCreatorXp
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the xp type the creator of this object will get when it is "used".
+ *
+ * @return the xp type
+ */
+int TangibleObject::getCreatorXpType(void) const
+{
+	int creatorXpType = -1;
+	getObjVars().getItem(OBJVAR_CREATOR_XP_TYPE,creatorXpType);
+	return creatorXpType;
+}	// TangibleObject::getCreatorXpType
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the xp type the creator of this object will get when it is "used".
+ *
+ * @param type		the xp type
+ */
+void TangibleObject::setCreatorXpType(int type)
+{
+	if (isAuthoritative())
+	{
+		setObjVarItem(OBJVAR_CREATOR_XP_TYPE, type);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setCreatorXpType, new MessageQueueGenericValueType<int>(type));
+	}
+}	// TangibleObject::setCreatorXpType
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns if this object is a crafting tool or not.
+ *
+ * @return true if we are a tool, false if not
+ */
+bool TangibleObject::isCraftingTool(void) const
+{
+	return getObjVars().hasItem(OBJVAR_CRAFTING_TOOL);
+}	// TangibleObject::isCraftingTool
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns if this object is a crafting station or not.
+ *
+ * @return true if we are a station, false if not
+ */
+bool TangibleObject::isCraftingStation(void) const
+{
+	return getObjVars().hasItem(OBJVAR_CRAFTING_STATION);
+}	// TangibleObject::isCraftingStation
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns if this object is a repair tool or not.
+ *
+ * @return true if we are a repair tool, false if not
+ */
+bool TangibleObject::isRepairTool(void) const
+{
+	return getObjVars().hasItem(OBJVAR_REPAIR_TOOL);
+}	// TangibleObject::isRepairTool
+
+//-----------------------------------------------------------------------
+
+/**
+* If this is a crafting tool, tries to start a session with a player.
+*
+* @param crafter		the player who wants to craft something
+*
+* @return true if the session was started, false if not
+*/
+bool TangibleObject::startCraftingSession(CreatureObject & crafter)
+{
+	static const SlotId outputSlotId(SlotIdManager::findSlotId(MANF_OUTPUT_SLOT_NAME));
+
+	if(isAuthoritative())
+	{
+		const std::string myId(getNetworkId().getValueString());
+		const char * myIdString = myId.c_str();
+		UNREF(myIdString);		// needed for release mode
+
+		PlayerObject * crafterPlayer = PlayerCreatureController::getPlayerObject(&crafter);
+		if (crafterPlayer == NULL)
+			return false;
+
+		// make sure we are a crafting tool
+		if (!isCraftingTool())
+		{
+			DEBUG_WARNING(true, ("Tried to start crafting session on non-tool "
+				"object %s", myIdString));
+			return false;
+		}
+
+		if (isDisabled())
+		{
+			DEBUG_WARNING(true, ("Tried to start crafting session on disabled "
+				"tool %s", myIdString));
+			return false;
+		}
+
+		// make sure the tool isn't creating a prototype
+		float realTimeVar = 0;
+		getObjVars().getItem(OBJVAR_CRAFTING_PROTOTYPE_TIME,realTimeVar);
+		if (realTimeVar > 0)
+		{
+			StringId message("system_msg", "crafting_tool_creating_prototype");
+			Unicode::String outOfBand;
+			Chat::sendSystemMessage(crafter, message, outOfBand);
+			return false;
+		}
+
+		// make sure the tool isn't already being used
+		if (getObjVars().hasItem(OBJVAR_CRAFTING_CRAFTER))
+		{
+			StringId message("system_msg", "crafting_tool_in_use");
+			Unicode::String outOfBand;
+			Chat::sendSystemMessage(crafter, message, outOfBand);
+			return false;
+		}
+
+		// make sure the output slot is empty
+		SlottedContainer const * const slotContainer = ContainerInterface::getSlottedContainer(*this);
+		if (slotContainer == NULL)
+		{
+			DEBUG_WARNING(true, ("Crafting tool %s does not have a container!", myIdString));
+			return false;
+		}
+		Container::ContainerErrorCode tmp = Container::CEC_Success;
+		if (slotContainer->getObjectInSlot(outputSlotId, tmp) != Container::ContainedItem::cms_invalid)
+		{
+			StringId message("system_msg", "crafting_tool_full");
+			Unicode::String outOfBand;
+			Chat::sendSystemMessage(crafter, message, outOfBand);
+			return false;
+		}
+
+		// get the schematics list from the player and filter for the type of
+		// schematics we can make
+		int myType = getCraftingType();
+
+		bool sendComplexities = true;
+		if (!crafter.isSchematicFilteringEnabled())
+			sendComplexities = false;
+
+		std::vector<int> goodSchematics;
+		std::vector<float>  scriptComplexities;
+		const std::map<std::pair<uint32, uint32>,int> & schematics = crafter.getDraftSchematics();
+		std::map<std::pair<uint32, uint32>,int>::const_iterator iter;
+		for (iter = schematics.begin(); iter != schematics.end(); ++iter)
+		{
+			const DraftSchematicObject * schematic = DraftSchematicObject::getSchematic((*iter).first.first);
+			if (schematic != NULL && ((myType & ServerObjectTemplate::CT_genericItem) != 0 ||
+				((schematic->getCategory() & myType) != 0)))
+			{
+				// make sure the player has all the skill commands needed for the
+				// schematic
+				int skillCount = schematic->getSkillCommandsCount();
+				int i;
+				for (i = 0; i < skillCount; ++i)
+				{
+					if (!crafter.hasCommand(schematic->getSkillCommands(i)))
+						break;
+				}
+				if (i == skillCount)
+				{
+					goodSchematics.push_back((*iter).first.first);
+					if (sendComplexities)
+						scriptComplexities.push_back(schematic->getComplexity());
+					else
+						scriptComplexities.push_back(1.0f);
+				}
+			}
+		}
+
+		crafterPlayer->setCraftingTool(*this);
+
+		if (goodSchematics.size() > 0)
+		{
+			ScriptParams params;
+			params.addParam(crafter.getNetworkId());
+			params.addParam(goodSchematics);
+			params.addParam(scriptComplexities);
+			if (getScriptObject()->trigAllScripts(Scripting::TRIG_REQUEST_DRAFT_SCHEMATICS, params) != SCRIPT_CONTINUE)
+			{
+				std::vector<uint32> empty;
+				crafterPlayer->sendUseableDraftSchematics (empty);
+				crafterPlayer->stopCrafting(true);
+
+				return false;
+			}
+			setObjVarItem(OBJVAR_CRAFTING_CRAFTER, crafter.getNetworkId());
+		}
+		else
+		{
+			std::vector<uint32> empty;
+			crafterPlayer->sendUseableDraftSchematics (empty);
+			crafterPlayer->stopCrafting(true);
+
+			StringId message("system_msg", "no_valid_schematics");
+			Unicode::String outOfBand;
+			Chat::sendSystemMessage(crafter, message, outOfBand);
+			return false;
+		}
+
+		// the following section to send the ingredients to the player is only needed for
+		// testing crafting via the console
+#ifdef _DEBUG
+
+		// send the player info about the ingredients in the tool's hopper;
+		// the actual sending of the messages could be spread out over a few
+		// frames
+//		listIngredientsInHopper(crafter);
+#endif
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_startCraftingSession, new MessageQueueGenericValueType<NetworkId>(crafter.getNetworkId()));
+	}
+	return true;
+}	// TangibleObject::startCraftingSession
+
+//-----------------------------------------------------------------------
+
+/**
+ * If this is a crafting tool, tries to stop a session with a player.
+ *
+ * @return true if the session was stopped, false if not
+ */
+bool TangibleObject::stopCraftingSession(void)
+{
+	if (isAuthoritative())
+	{
+		const std::string myId(getNetworkId().getValueString());
+		const char * myIdString = myId.c_str();
+		UNREF(myIdString);		// needed for release mode
+
+		// make sure we are a crafting tool
+		if (!isCraftingTool())
+		{
+			DEBUG_WARNING(true, ("Tried to stop crafting session on non-tool "
+				"object %s", myIdString));
+			return false;
+		}
+
+		// make sure a prototype object isn't being made (the session will be
+		// stopped when the prototype is done)
+		float realTimeVar = 0;
+		if (getObjVars().getItem(OBJVAR_CRAFTING_PROTOTYPE_TIME, realTimeVar) && realTimeVar > 0)
+			return false;
+
+		// make sure the tool isn't already being used
+		NetworkId crafterId;
+		if (!getObjVars().getItem(OBJVAR_CRAFTING_CRAFTER,crafterId))
+		{
+			DEBUG_REPORT_LOG(true, ("Crafting tool %s in not in use\n", myIdString));
+			return false;
+		}
+
+		clearCraftingManufactureSchematic();
+		clearCraftingPrototype();
+		removeObjVarItem(OBJVAR_CRAFTING_CRAFTER);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_stopCraftingSession, 0);
+	}
+	return true;
+}	// TangibleObject::stopCraftingSession
+
+//-----------------------------------------------------------------------
+
+/**
+ * Test to see if an object is in a crafting tool's ingredient hopper.
+ *
+ * @param ingredientId		object we want to test
+ *
+ * @return true if the object is in the hopper, false if not
+ */
+bool TangibleObject::isIngredientInHopper(const NetworkId & ingredientId) const
+{
+	ServerObject const * const hopper = getIngredientHopper();
+	if (hopper == NULL)
+		return false;
+
+	Object const * const ingredient = CachedNetworkId(ingredientId).getObject();
+	if (ingredient == NULL)
+		return false;
+
+	return ContainerInterface::isNestedWithin(*ingredient, getNetworkId());
+}	// TangibleObject::isIngredientInHopper
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns this crafting station's ingredient hopper.
+ *
+ * @return the hopper
+ */
+ServerObject * TangibleObject::getIngredientHopper(void) const
+{
+static const SlotId hopperSlotId(SlotIdManager::findSlotId(INGREDIENT_HOPPER_SLOT_NAME));
+
+	const std::string myId(getNetworkId().getValueString());
+	const char * myIdString = myId.c_str();
+	UNREF(myIdString);		// needed for release mode
+
+	// make sure we are a crafting station
+	if (!isCraftingStation())
+	{
+		DEBUG_WARNING(true, ("Tried to get input hopper for non-crafting station "
+			"object %s", myIdString));
+		return NULL;
+	}
+
+	// get the ingredient hopper
+	SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this);
+	if (container == NULL)
+	{
+		DEBUG_WARNING(true, ("Crafting tool %s does not have a container!", myIdString));
+		return NULL;
+	}
+	Container::ContainerErrorCode tmp = Container::CEC_Success;
+	Container::ContainedItem hopperId = container->getObjectInSlot(hopperSlotId, tmp);
+	if (hopperId == NetworkId::cms_invalid)
+	{
+		DEBUG_WARNING(true, ("Crafting tool %s does not have a ingredient "
+			"hopper!", myIdString));
+		return NULL;
+	}
+	ServerObject * hopper = safe_cast<ServerObject *>(hopperId.getObject());
+	if (hopper == NULL)
+	{
+		DEBUG_WARNING(true, ("Can't find object for ingredient hopper id %s",
+			hopperId.getValueString().c_str()));
+		return NULL;
+	}
+
+	return hopper;
+}	// TangibleObject::getIngredientHopper
+
+//----------------------------------------------------------------------
+
+/**
+ * Adds an object to this tool's output slot.
+ *
+ * @param object			the object to add
+ * @param transferer        who is transferring the ingredient
+ *
+ * @return true on success, false on fail
+ */
+bool TangibleObject::addObjectToOutputSlot(ServerObject & object,
+	ServerObject * transferer)
+{
+static const SlotId outputSlotId(SlotIdManager::findSlotId(MANF_OUTPUT_SLOT_NAME));
+
+	if(isAuthoritative())
+	{
+		const std::string myId(getNetworkId().getValueString());
+		const char * myIdString = myId.c_str();
+		UNREF(myIdString);		// needed for release mode
+
+		// get output slot
+		SlottedContainer const * const slotContainer = ContainerInterface::getSlottedContainer(*this);
+		if (slotContainer == NULL)
+		{
+			DEBUG_WARNING(true, ("Crafting tool %s does not have a container!", myIdString));
+			return false;
+		}
+
+		// make sure the transferer is in the final stage of crafting
+		if (transferer == NULL)
+		{
+			DEBUG_WARNING(true, ("addObjectToOutputSlot, NULL transferer"));
+			return false;
+		}
+		NetworkId crafterVarId(NetworkId::cms_invalid);
+		if (!getObjVars().getItem(OBJVAR_CRAFTING_CRAFTER, crafterVarId))
+		{
+			// @todo: send a message to the player saying this tool is in use
+			DEBUG_WARNING(true, ("addObjectToOutputSlot, crafting tool %s has "
+				"no crafter", myIdString));
+			return false;
+		}
+		if (crafterVarId != transferer->getNetworkId())
+		{
+			DEBUG_WARNING(true, ("addObjectToOutputSlot, transferer %s is not the "
+				"crafter %s", transferer->getNetworkId().getValueString().c_str(),
+				crafterVarId.getValueString().c_str()));
+			return false;
+		}
+		CreatureObject const * const creatureTransferer = transferer->asCreatureObject();
+		if (creatureTransferer == NULL)
+		{
+			DEBUG_WARNING(true, ("addObjectToOutputSlot, transferer %s is not a "
+				"creature", transferer->getNetworkId().getValueString().c_str()));
+			return false;
+		}
+		PlayerObject const * const creaturePlayer = PlayerCreatureController::getPlayerObject(creatureTransferer);
+		if (creaturePlayer == NULL)
+			return false;
+
+		if (creaturePlayer->getCraftingStage() != Crafting::CS_finish)
+		{
+			DEBUG_WARNING(true, ("addObjectToOutputSlot, crafter %s is in the "
+				"wrong stage %d", transferer->getNetworkId().getValueString().c_str(),
+				static_cast<int>(creaturePlayer->getCraftingStage())));
+			return false;
+		}
+
+		// if the object is our prototype, clear the prototype
+		if (getSynchronizedUi() != NULL)
+		{
+			CraftingToolSyncUi * sync = dynamic_cast<CraftingToolSyncUi *>(
+				getSynchronizedUi());
+			if (sync != NULL)
+			{
+				if (sync->getPrototype() == object.getNetworkId())
+				{
+					sync->setPrototype(CachedNetworkId::cms_cachedInvalid);
+				}
+			}
+		}
+
+		// put the object in the slot
+		Container::ContainerErrorCode tmp = Container::CEC_Success;
+		if (!ContainerInterface::transferItemToSlottedContainer(*this, object, outputSlotId, NULL, tmp))
+		{
+			DEBUG_WARNING(true, ("Failed to transfer object %s to crafting "
+				"tool %s", object.getNetworkId().getValueString().c_str(),
+				myIdString));
+			return false;
+		}
+	}
+	else
+	{
+		NetworkId transfererId;
+		if(transferer)
+			transfererId = transferer->getNetworkId();
+
+		sendControllerMessageToAuthServer(CM_addObjectToOutputSlot, new MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> >(std::make_pair(object.getNetworkId(), transfererId)));
+	}
+
+	return true;
+}	// TangibleObject::addObjectToOutputSlot
+
+//----------------------------------------------------------------------
+
+/**
+ * Gets the temporary manufacturing schematic used during a crafting session.
+ *
+ * @return the schematic
+ */
+ManufactureSchematicObject * TangibleObject::getCraftingManufactureSchematic(void) const
+{
+	const std::string myId(getNetworkId().getValueString());
+	const char * myIdString = myId.c_str();
+	UNREF(myIdString);		// needed for release mode
+
+	// make sure we are a crafting tool
+	if (!isCraftingTool())
+	{
+		DEBUG_WARNING(true, ("Tried to get non-crafting tool "
+			"object %s", myIdString));
+		return NULL;
+	}
+
+	SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this);
+	if (container)
+	{
+		Container::ContainerErrorCode error;
+		const CachedNetworkId & schematicId =
+			container->getObjectInSlot(getCraftingManufactureSchematicSlotId(), error);
+		return safe_cast<ManufactureSchematicObject *>(schematicId.getObject());
+	}
+	else
+	{
+		DEBUG_WARNING(true, ("ManufactureSchematicObject doesn't have a slotted container."));
+		return NULL;
+	}
+}	// TangibleObject::getCraftingManufactureSchematic
+
+//----------------------------------------------------------------------
+
+/**
+ * Gives the schematic to the player at the end of the session.
+ *
+ * @return the schematic
+ */
+ManufactureSchematicObject * TangibleObject::removeCraftingManufactureSchematic(void)
+{
+	const std::string myId(getNetworkId().getValueString());
+	const char * myIdString = myId.c_str();
+	UNREF(myIdString);		// needed for release mode
+
+	// make sure we are a crafting tool
+	if (!isCraftingTool() || getSynchronizedUi() == NULL)
+	{
+		DEBUG_WARNING(true, ("Tried to get non-crafting tool "
+			"object %s", myIdString));
+		return NULL;
+	}
+
+	CraftingToolSyncUi * sync = dynamic_cast<CraftingToolSyncUi *>(
+		getSynchronizedUi());
+	if (sync == NULL)
+		return NULL;
+
+	ManufactureSchematicObject * schematic = safe_cast<ManufactureSchematicObject *>(
+		sync->getManfSchematic().getObject());
+
+	sync->setManfSchematic(CachedNetworkId::cms_cachedInvalid,
+		CachedNetworkId::cms_cachedInvalid, false);
+
+	return schematic;
+}	// TangibleObject::removeCraftingManufactureSchematic
+
+//----------------------------------------------------------------------
+
+/**
+ * Stores the temporary manufacturing schematic used during crafting in this
+ * crafting tool.
+ *
+ * @param schematic		the schematic
+ */
+void TangibleObject::setCraftingManufactureSchematic(ManufactureSchematicObject & schematic)
+{
+	if(isAuthoritative())
+	{
+		const std::string myId(getNetworkId().getValueString());
+		const char * myIdString = myId.c_str();
+		UNREF(myIdString);		// needed for release mode
+
+		// make sure we are a crafting tool
+		if (!isCraftingTool() || getSynchronizedUi() == NULL)
+		{
+			DEBUG_WARNING(true, ("Tried to get non-crafting tool "
+				"object %s", myIdString));
+			return;
+		}
+
+		CraftingToolSyncUi * sync = dynamic_cast<CraftingToolSyncUi *>(
+			getSynchronizedUi());
+		if (sync == NULL)
+			return;
+
+		// see if there is already a schematic object set
+		const CachedNetworkId & schematicId = sync->getManfSchematic();
+		if (schematicId == schematic.getNetworkId())
+			return;
+
+		// remove the old schematic
+		ServerObject * object = safe_cast<ServerObject *>(schematicId.getObject());
+		if (object == NULL)
+		{
+			if (schematicId != NetworkId::cms_invalid)
+			{
+				DEBUG_WARNING(true, ("Can't find object for schematic id %s",
+					schematicId.getValueString().c_str()));
+				// go on anyway
+			}
+		}
+		else
+		{
+			sync->setManfSchematic(CachedNetworkId::cms_cachedInvalid,
+				CachedNetworkId::cms_cachedInvalid, true);
+			object->permanentlyDestroy(DeleteReasons::Consumed);
+		}
+
+		// the schematic isn't in the world or in a container, so we need to
+		// tell the client about it
+		int stationBonus = 0;
+		ServerObject * crafter = NULL;
+		NetworkId crafterId;
+		if (getObjVars().getItem(OBJVAR_CRAFTING_CRAFTER,crafterId))
+		{
+			crafter = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(crafterId));
+		}
+		if (crafter != NULL)
+		{
+			sync->setManfSchematic(CachedNetworkId(schematic), CachedNetworkId(*crafter),
+				true);
+
+			// if the crafter is near a crafting station, get any crafting bonus
+			// it has
+			const PlayerObject * player = PlayerCreatureController::getPlayerObject(
+				crafter->asCreatureObject());
+			if (player != NULL && player->getCraftingStation().getObject() != NULL)
+			{
+				player->getCraftingStation().getObject()->asServerObject()->
+					getObjVars().getItem(OBJVAR_CRAFTING_STATIONMOD, stationBonus);
+			}
+		}
+		else
+		{
+			WARNING_STRICT_FATAL(true, ("TangibleObject::setCraftingManufactureSchematic "
+				"no crafter id on crafting tool %s!", myIdString));
+		}
+
+		// set any crafting bonus we give on the schematic
+		int myBonus = 0;
+		getObjVars().getItem(OBJVAR_CRAFTING_STATIONMOD, myBonus);
+		if (myBonus + stationBonus != 0)
+		{
+			schematic.setObjVarItem(OBJVAR_CRAFTING_STATIONMOD, myBonus + stationBonus);
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setCraftingManufactureSchematic, new MessageQueueGenericValueType<NetworkId>(schematic.getNetworkId()));
+	}
+}	// TangibleObject::setCraftingManufactureSchematic
+
+//----------------------------------------------------------------------
+
+/**
+ * Removes the temporary manufacturing schematic from the crafting tool and
+ * deletes it.
+ */
+void TangibleObject::clearCraftingManufactureSchematic(void)
+{
+	if(isAuthoritative())
+	{
+		const std::string myId(getNetworkId().getValueString());
+		const char * myIdString = myId.c_str();
+		UNREF(myIdString);		// needed for release mode
+
+		// make sure we are a crafting tool
+		if (!isCraftingTool())
+		{
+			DEBUG_WARNING(true, ("Tried to get non-crafting tool "
+				"object %s", myIdString));
+			return;
+		}
+
+		// see if we have a schematic in our schematic slot
+		CachedNetworkId schematicId = CachedNetworkId::cms_cachedInvalid;
+		SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this);
+		if (container)
+		{
+			Container::ContainerErrorCode error = Container::CEC_Success;
+			CachedNetworkId schematicId = container->getObjectInSlot(
+				getCraftingManufactureSchematicSlotId(), error);
+		}
+		else
+		{
+			DEBUG_WARNING(true, ("failed to get slotted container for schematic lookup."));
+		}
+
+		// get our ui
+		CraftingToolSyncUi * sync = NULL;
+		if (getSynchronizedUi() != NULL)
+			sync = dynamic_cast<CraftingToolSyncUi *>(getSynchronizedUi());
+
+		if (schematicId == CachedNetworkId::cms_cachedInvalid && sync == NULL)
+		{
+			// no schematic
+			return;
+		}
+
+		if (schematicId == CachedNetworkId::cms_invalid)
+			schematicId = sync->getManfSchematic();
+		else if (sync != NULL && sync->getManfSchematic() != CachedNetworkId::cms_invalid &&
+			schematicId != sync->getManfSchematic())
+		{
+			WARNING(true, ("TangibleObject::clearCraftingManufactureSchematic "
+				"crafting tool %s has schematic %s in its slot but schematic %s "
+				"in its ui!!!", getNetworkId().getValueString().c_str(),
+				schematicId.getValueString().c_str(),
+				sync->getManfSchematic().getValueString().c_str()));
+			if (schematicId.getObject() != NULL)
+			{
+				schematicId.getObject()->asServerObject()->permanentlyDestroy(
+					DeleteReasons::Consumed);
+			}
+			else
+			{
+				WARNING_STRICT_FATAL(true, ("TangibleObject::clearCraftingManufactureSchematic "
+					"crafting tool %s has slotted schematic %s with no object!",
+					getNetworkId().getValueString().c_str(),
+					schematicId.getValueString().c_str()));
+			}
+			schematicId = sync->getManfSchematic();
+		}
+
+		// get the schematic
+		ManufactureSchematicObject * manfSchematic = NULL;
+		ServerObject * object = safe_cast<ServerObject *>(schematicId.getObject());
+		if (object == NULL && schematicId != CachedNetworkId::cms_invalid)
+		{
+			WARNING_STRICT_FATAL(true, ("Can't find object for manufactring schematic "
+				"id %s", schematicId.getValueString().c_str()));
+		}
+		else
+			manfSchematic = safe_cast<ManufactureSchematicObject *>(object);
+
+		if (manfSchematic != NULL)
+		{
+			NetworkId crafterId;
+			if (getObjVars().getItem(OBJVAR_CRAFTING_CRAFTER,crafterId))
+			{
+				// if we are at the assembly stage of crafting, or the draft schematic says
+				// not to destroy the ingredients, put the ingredients in the schematic back
+				// in the tool
+				CreatureObject * const crafter = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById(crafterId));
+				PlayerObject * const crafterPlayer = PlayerCreatureController::getPlayerObject(crafter);
+				if (!manfSchematic->mustDestroyIngredients() || (crafterPlayer != NULL &&
+					crafterPlayer->getCraftingStage() == Crafting::CS_assembly))
+				{
+					crafterPlayer->setAllowEmptySlot(true);
+					int count = manfSchematic->getSlotsCount();
+					// note this loop is odd because when we clear a slot it may
+					// actually be removed if it was optional
+					Crafting::IngredientSlot manfSlot;
+					for (int i = 0; i < count;)
+					{
+						if (manfSchematic->getSlot(i, manfSlot, false))
+						{
+							if (manfSlot.ingredientType != Crafting::IT_none &&
+								!manfSlot.ingredients.empty())
+							{
+								if (crafterPlayer->emptySlot(i, NetworkId::cms_invalid))
+								{
+									if (count != manfSchematic->getSlotsCount())
+									{
+										count = manfSchematic->getSlotsCount();
+										continue;
+									}
+								}
+							}
+						}
+						++i;
+					}
+					crafterPlayer->setAllowEmptySlot(false);
+				}
+				else
+					manfSchematic->destroyAllIngredients();
+			}
+		}
+
+		if (sync != NULL)
+			sync->setManfSchematic(CachedNetworkId::cms_cachedInvalid, CachedNetworkId::cms_cachedInvalid, true);
+		if (object != NULL)
+		{
+			object->permanentlyDestroy(DeleteReasons::Consumed);
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_clearCraftingManufactureSchematic, 0);
+	}
+}	// TangibleObject::clearCraftingManufactureSchematic
+
+//----------------------------------------------------------------------
+
+/**
+ * Gets the temporary prototype used during a crafting session. May also be used
+ * to give the prototype to the player at the end of the session.
+ *
+ * @return the prototype
+ */
+ServerObject * TangibleObject::getCraftingPrototype(void) const
+{
+	const std::string myId(getNetworkId().getValueString());
+	const char * myIdString = myId.c_str();
+	UNREF(myIdString);		// needed for release mode
+
+	// make sure we are a crafting tool
+	if (!isCraftingTool() || getSynchronizedUi() == NULL)
+	{
+		DEBUG_WARNING(true, ("Tried to get non-crafting tool "
+			"object %s", myIdString));
+		return NULL;
+	}
+
+	const CraftingToolSyncUi * sync = dynamic_cast<const CraftingToolSyncUi *>(
+		getSynchronizedUi());
+	if (sync == NULL)
+		return NULL;
+
+	return safe_cast<ServerObject *>(sync->getPrototype().getObject());
+}	// TangibleObject::getCraftingPrototype
+
+//----------------------------------------------------------------------
+
+/**
+ * Stores the temporary prototype object used during crafting in this
+ * crafting tool.
+ *
+ * @param prototype		the prototype
+ */
+void TangibleObject::setCraftingPrototype(ServerObject & prototype)
+{
+	if (isAuthoritative())
+	{
+		const std::string myId(getNetworkId().getValueString());
+		const char * myIdString = myId.c_str();
+		UNREF(myIdString);		// needed for release mode
+
+		// make sure we are a crafting tool
+		if (!isCraftingTool() || getSynchronizedUi() == NULL)
+		{
+			DEBUG_WARNING(true, ("Tried to get non-crafting tool "
+				"object %s", myIdString));
+			return;
+		}
+
+		CraftingToolSyncUi * sync = dynamic_cast<CraftingToolSyncUi *>(
+			getSynchronizedUi());
+		if (sync == NULL)
+			return;
+
+		// see if there is already a prototype object set
+		const CachedNetworkId & prototypeId = sync->getPrototype();
+		if (prototypeId == prototype.getNetworkId())
+			return;
+
+		// remove the old prototype
+		ServerObject * object = safe_cast<ServerObject *>(prototypeId.getObject());
+		if (object == NULL)
+		{
+			if (prototypeId != NetworkId::cms_invalid)
+			{
+				DEBUG_WARNING(true, ("Can't find object for prototype id %s",
+					prototypeId.getValueString().c_str()));
+				// go on anyway
+			}
+		}
+		else
+		{
+			sync->setPrototype(CachedNetworkId::cms_cachedInvalid);
+			object->permanentlyDestroy(DeleteReasons::Consumed);
+		}
+
+		// put the prototype in the tool's slot so the crafter will get updates
+		// about it
+		Container::ContainerErrorCode tmp = Container::CEC_Success;
+		if (!ContainerInterface::transferItemToSlottedContainer(*this, prototype,
+			getCraftingPrototypeSlotId(), NULL, tmp))
+		{
+			// see if there is something in the slot, and delete it if there is
+			bool failed = true;
+			SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this);
+			NOT_NULL(container);
+			const Container::ContainedItem & oldItem = container->getObjectInSlot(
+				getCraftingPrototypeSlotId(), tmp);
+			if (oldItem != prototype.getNetworkId())
+			{
+				if (oldItem.getObject() != NULL)
+				{
+					safe_cast<ServerObject*>(oldItem.getObject())->permanentlyDestroy(
+						DeleteReasons::Consumed);
+					// try the transfer again
+					if (ContainerInterface::transferItemToSlottedContainer(*this,
+						prototype, getCraftingPrototypeSlotId(), NULL, tmp))
+					{
+						failed = false;
+					}
+				}
+				if (failed)
+				{
+					DEBUG_WARNING(true, ("Failed to transfer prototype %s to crafting "
+						"tool %s", prototype.getNetworkId().getValueString().c_str(),
+						myIdString));
+					return;
+				}
+			}
+		}
+
+		sync->setPrototype(CachedNetworkId(prototype));
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setCraftingPrototype, new MessageQueueGenericValueType<NetworkId>(prototype.getNetworkId()));
+	}
+}	// TangibleObject::setCraftingPrototype
+
+//----------------------------------------------------------------------
+
+/**
+ * Removes the temporary prototype from the crafting tool and
+ * deletes it.
+ */
+void TangibleObject::clearCraftingPrototype(void)
+{
+	if(isAuthoritative())
+	{
+		const std::string myId(getNetworkId().getValueString());
+		const char * myIdString = myId.c_str();
+		UNREF(myIdString);		// needed for release mode
+
+		// make sure we are a crafting tool
+		if (!isCraftingTool() || getSynchronizedUi() == NULL)
+		{
+			DEBUG_WARNING(true, ("Tried to get non-crafting tool "
+				"object %s", myIdString));
+			return;
+		}
+
+		CraftingToolSyncUi * sync = dynamic_cast<CraftingToolSyncUi *>(
+			getSynchronizedUi());
+		if (sync == NULL)
+			return;
+
+		const CachedNetworkId & prototypeId = sync->getPrototype();
+		ServerObject * object = safe_cast<ServerObject *>(prototypeId.getObject());
+		if (object != NULL)
+		{
+			object->permanentlyDestroy(DeleteReasons::Consumed);
+		}
+		else
+		{
+			// double-check the prototype slot to make sure nothing is in it
+			SlottedContainer const * const container = ContainerInterface::getSlottedContainer(*this);
+			NOT_NULL(container);
+			Container::ContainerErrorCode error;
+			const Container::ContainedItem & contents = container->getObjectInSlot(
+				getCraftingPrototypeSlotId(), error);
+			if (contents.getObject() != NULL)
+			{
+				safe_cast<ServerObject *>(contents.getObject())->permanentlyDestroy(
+					DeleteReasons::Consumed);
+			}
+
+		}
+		sync->setPrototype(CachedNetworkId::cms_cachedInvalid);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_clearCraftingPrototype, 0);
+	}
+}	// TangibleObject::clearCraftingPrototype
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sets the visible component string for this object. Note m_components is
+ * write-only on the server because this variable exists only to provide
+ * visual data to the client.
+ *
+ * @param components		component table ids of visible components attached to this object
+ */
+void TangibleObject::setVisibleComponents(const std::vector<int> & components)
+{
+	if(isAuthoritative())
+	{
+		m_components.clear ();
+
+		for (uint i = 0; i < components.size (); ++i)
+			m_components.insert(components [i]);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setVisibleComponents, new MessageQueueGenericValueType<std::vector<int> >(components));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::forceExecuteCommand(Command const &command, NetworkId const &targetId, Unicode::String const &params, Command::ErrorCode &status, bool commandIsFromCommandQueue)
+{
+	if (!isAuthoritative())
+	{
+		Controller *controller = getController();
+		if (controller)
+		{
+			safe_cast<TangibleController *>(controller)->appendMessage(
+				CM_commandQueueForceExecuteCommandFwd,
+				0.0f,
+				new MessageQueueCommandQueueForceExecuteCommandFwd(command.m_commandHash, targetId, params, status, commandIsFromCommandQueue),
+				GameControllerMessageFlags::SEND |
+				GameControllerMessageFlags::RELIABLE |
+				GameControllerMessageFlags::DEST_AUTH_SERVER);
+		}
+		return;
+	}
+
+	if (status == Command::CEC_Success && ConfigServerGame::getLogAllCommands())
+	{
+		LOGU(
+			"Command",
+			("%s>%s %s",
+				getNetworkId().getValueString().c_str(),
+				targetId.getValueString().c_str(),
+				command.m_commandName.c_str()),
+				params);
+	}
+
+	if (getClient() && getClient()->isGod())
+	{
+		CreatureObject* creatureObject = asCreatureObject();
+		if (creatureObject)
+		{
+			LOGU(
+				"CustomerService",
+				("Avatar: %s executed command: (%s) %s",
+				 PlayerObject::getAccountDescription(creatureObject).c_str(),
+				 targetId.getValueString().c_str(),
+				 command.m_commandName.c_str()),
+				params);
+		}
+	}
+
+	if (getObjVars().hasItem("cheater"))
+	{
+		CreatureObject* creatureObject = asCreatureObject();
+		if (creatureObject)
+		{
+			LOGU(
+				"CustomerService",
+				("SuspectedCheaterChannel: %s executed command: (%s) %s",
+				 PlayerObject::getAccountDescription(creatureObject).c_str(),
+				 targetId.getValueString().c_str(),
+				 command.m_commandName.c_str()),
+				params);
+		}
+	}
+
+	PROFILER_BLOCK_DEFINE(profileBlockCommandIsFromCommandQueue, "TangibleObject::forceExecuteCommand commandIsFromCommandQueue");
+	if (commandIsFromCommandQueue)
+		PROFILER_BLOCK_ENTER(profileBlockCommandIsFromCommandQueue);
+
+	// attach temp script
+	bool needDetach = false;
+	if (command.m_tempScript.length())
+	{
+		int ret = getScriptObject()->attachScript(command.m_tempScript, true);
+		if (ret != SCRIPT_OVERRIDE)
+			needDetach = true;
+	}
+
+	// do script call
+	bool commandOverride = false;
+	if (status == Command::CEC_Success)
+	{
+		if (!command.m_scriptHook.empty())
+		{
+			ScriptParams scriptParams;
+			scriptParams.addParam(targetId);
+			scriptParams.addParam(params);
+			scriptParams.addParam(command.m_defaultTime);
+			if (getScriptObject()->callScriptCommandHandler(command.m_scriptHook, scriptParams) == SCRIPT_OVERRIDE)
+				commandOverride = true;
+		}
+	}
+	else
+	{
+		if (!command.m_failScriptHook.empty())
+		{
+			ScriptParams scriptParams;
+			scriptParams.addParam(targetId);
+			scriptParams.addParam(params);
+			scriptParams.addParam(command.m_defaultTime);
+			if (getScriptObject()->callScriptCommandHandler(command.m_failScriptHook, scriptParams) == SCRIPT_OVERRIDE)
+			{
+				commandOverride = true;
+				// an override in a failure script handler should mean to mark it as a success (used for standing from feign death)
+				status = Command::CEC_Success;
+			}
+		}
+	}
+
+	// detach temp scripts
+	if (needDetach)
+		getScriptObject()->detachScript(command.m_tempScript);
+
+	if ( commandOverride && commandIsFromCommandQueue )
+	{
+		CommandQueue * const queue = getCommandQueue();
+
+		if (queue != NULL)
+		{
+			queue->cancelCurrentCommand();
+		}
+	}
+
+	// do c function call if not overridden by script
+	if (!commandOverride)
+	{
+		if (status == Command::CEC_Success)
+		{
+			if (command.m_cppHook)
+				(*command.m_cppHook)(command, getNetworkId(), targetId, params);
+		}
+		else
+		{
+			if (command.m_failCppHook)
+				(*command.m_failCppHook)(command, getNetworkId(), targetId, params);
+		}
+	}
+
+	if (commandIsFromCommandQueue)
+		PROFILER_BLOCK_LEAVE(profileBlockCommandIsFromCommandQueue);
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::setCondition(int condition)
+{
+	if (isAuthoritative())
+		m_condition = (m_condition.get() | condition);
+	else
+		sendControllerMessageToAuthServer(CM_setCondition, new MessageQueueGenericValueType<int>(condition));
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::clearCondition(int condition)
+{
+	if (isAuthoritative())
+		m_condition = (m_condition.get() & (~condition));
+	else
+		sendControllerMessageToAuthServer(CM_clearCondition, new MessageQueueGenericValueType<int>(condition));
+}
+
+// ----------------------------------------------------------------------
+
+bool TangibleObject::isDisabled() const
+{
+	return hasCondition(ServerTangibleObjectTemplate::C_disabled);
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::setDisabled(bool disabled)
+{
+	if (disabled)
+		setCondition(ServerTangibleObjectTemplate::C_disabled);
+	else
+		clearCondition(ServerTangibleObjectTemplate::C_disabled);
+}
+
+// ----------------------------------------------------------------------
+
+
+const NetworkId & TangibleObject::getOwnerId() const
+{
+	return m_ownerId.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool TangibleObject::isOwner(NetworkId const &id, Client const *client) const
+{
+	if (id == getOwnerId())
+		return true;
+	if (client && client->isGod())
+		return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Determine the initial visibility state of an object when it is created.
+ */
+void TangibleObject::initializeVisibility()
+{
+	if (isAuthoritative())
+	{
+		const ServerTangibleObjectTemplate * myTemplate = safe_cast<
+			const ServerTangibleObjectTemplate *>(getObjectTemplate());
+		if (myTemplate != NULL)
+		{
+			bool visible = false;
+			for (size_t i = 0; i < myTemplate->getVisibleFlagsCount(); ++i)
+			{
+				if (myTemplate->getVisibleFlags(i) == ServerObjectTemplate::VF_player)
+				{
+					visible = true;
+					break;
+				}
+			}
+			setVisible(visible);
+		}
+	}
+	else
+	{
+		WARNING(true, ("TangibleObject::initializeVisibility called on non-authoritative object %s", 
+			getNetworkId().getValueString().c_str()));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::setVisible(bool isVisible)
+{
+	if (isAuthoritative())
+		m_visible = isVisible;
+	else
+		sendControllerMessageToAuthServer(CM_setVisible, new MessageQueueGenericValueType<bool>(isVisible));
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::setHidden(bool const hide)
+{
+	if (isAuthoritative())
+		m_hideFromClient = hide;
+	else
+		sendControllerMessageToAuthServer(CM_hideFromClient, new MessageQueueGenericValueType<bool>(hide));
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::visibilityDataModified()
+{
+	if (isInWorld())
+	{
+		if (isVisible() && !isHidden())
+		{
+			// show the object
+			const TriggerVolume * triggerVolume = getTriggerVolume(NetworkTriggerVolumeNamespace::NetworkTriggerVolumeName);
+			if (triggerVolume != NULL)
+			{
+				std::vector<ServerObject *> observers;
+				ServerWorld::findPlayerCreaturesInRange(getPosition_w(), triggerVolume->getRadius(), observers);
+				if (!observers.empty())
+					ObserveTracker::onObjectMadeVisibleTo(*this, observers);
+			}
+		}
+		else
+		{
+			// hide the object
+			ObserveTracker::onObjectMadeInvisible(*this);
+
+			// if the object is hidden, show the object to
+			// players who have passively revealed the object
+			if (isVisible() && isHidden() && !m_passiveRevealPlayerCharacter.empty())
+			{
+				const TriggerVolume * triggerVolume = getTriggerVolume(NetworkTriggerVolumeNamespace::NetworkTriggerVolumeName);
+				if (triggerVolume != NULL)
+				{
+					std::vector<ServerObject *> possibleObservers;
+					ServerWorld::findPlayerCreaturesInRange(getPosition_w(), triggerVolume->getRadius(), possibleObservers);
+					if (!possibleObservers.empty())
+					{
+						std::vector<ServerObject *> allowedObservers;
+						for (std::vector<ServerObject *>::const_iterator i = possibleObservers.begin(); i != possibleObservers.end(); ++i)
+						{
+							if (m_passiveRevealPlayerCharacter.contains((*i)->getNetworkId()))
+								allowedObservers.push_back(*i);
+						}
+
+						if (!allowedObservers.empty())
+							ObserveTracker::onObjectMadeVisibleTo(*this, allowedObservers);
+					}
+				}
+			}
+		}
+	}
+}
+bool TangibleObject::isVisibleOnClient(Client const &client) const
+{
+	// Everyone can see visible objects.
+	// Gods and clients on the buildcluster can see everything.
+	if (client.isGod() || ConfigServerGame::getBuildCluster() || (isVisible() && !isHidden()))
+		return true;
+
+	// Invisible objects are visible to a non-god client if the client's
+	// creature contains (or indirectly contains) the invisible object.
+
+	ServerObject const * const characterObject = client.getCharacterObject();
+
+	{
+		for (ServerObject const *o = this; o; o = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*o)))
+		{
+			if (o == characterObject)
+				return true;
+			if (o->isInWorld() || o->asCellObject())
+				break;
+		}
+	}
+
+	// Invisible objects are visible to a non-god client if they are in
+	// the client's character's containment chain.
+	{
+		for (ServerObject const *o = characterObject; o; o = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*o)))
+			if (o == this)
+				return true;
+	}
+
+	if (isVisible())
+	{
+		// if the client's character is the owner, then he can see it.
+		const CachedNetworkId ownerId(getOwnerId());
+		if (ownerId == characterObject->getNetworkId())
+			return true;
+
+		// if the client's character is grouped with the the owner, then he can see it.
+		const CreatureObject * owner = safe_cast<const CreatureObject *>(ownerId.getObject());
+		if (owner != NULL)
+		{
+			const GroupObject * group = owner->getGroup();
+			if (group != NULL)
+			{
+				if (group->isGroupMember(characterObject->getNetworkId()))
+					return true;
+			}
+		}
+
+		// if the client's character has passively revealed the hidden object, then he can see it.
+		if (m_passiveRevealPlayerCharacter.contains(characterObject->getNetworkId()))
+			return true;
+	}
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Tests if this item will encumber a player when equipped.
+ *
+ * @return true if the item has encumbrance data
+ */
+bool TangibleObject::hasEncumbrances() const
+	{
+	return getObjVars().hasItem(OBJVAR_ARMOR_BASE + '.' + OBJVAR_ARMOR_ENCUMBRANCE);
+}	// TangibleObject::hasEncumbrances
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the encumbrance values this object applies to a player when equipped.
+ *
+ * @param encumbrances	vector to be filled in with encumbrance values for the health,
+ *						action, and mind groups; will be empty if this object does not
+ *						encumber a creature
+ *
+ * @return true if encumbrances has good data, false if not
+ */
+bool TangibleObject::getEncumbrances(std::vector<int> & encumbrances) const
+		{
+static int datatable_type_col            = -1;
+static int datatable_min_encumbrance_col = -1;
+static int datatable_max_encumbrance_col = -1;
+
+	// NOTE: it might be better if we do all this via script, to reduce
+	// duplicate functionality
+
+	encumbrances.clear();
+
+	DataTable * dt = DataTableManager::getTable(DATATABLE_ARMOR, true);
+	if (dt == NULL)
+		return false;
+	else if (datatable_type_col == -1)
+	{
+		// cache the column indexes
+		datatable_type_col            = dt->findColumnNumber(DATATABLE_TYPE_COL);
+		datatable_min_encumbrance_col = dt->findColumnNumber(DATATABLE_MIN_ENCUMBRANCE_COL);
+		datatable_max_encumbrance_col = dt->findColumnNumber(DATATABLE_MAX_ENCUMBRANCE_COL);
+		if (datatable_type_col < 0 ||
+			datatable_min_encumbrance_col < 0 ||
+			datatable_max_encumbrance_col < 0)
+		{
+			WARNING_STRICT_FATAL(true, ("TangibleObject::getEncumbrances: armor datatable missing expected columns"));
+			return false;
+		}
+	}
+
+	// get the encumbrance values from the objvars
+	float baseEncumbrance = 0;
+	if (!getObjVars().getItem(OBJVAR_ARMOR_BASE + '.' + OBJVAR_ARMOR_ENCUMBRANCE, baseEncumbrance))
+			return false;
+	std::vector<float> encumbranceSplit;
+	if (!getObjVars().getItem(OBJVAR_ARMOR_BASE + '.' + OBJVAR_ENCUMBRANCE_SPLIT, encumbranceSplit))
+			return false;
+	if (encumbranceSplit.size() != 3)
+		return false;
+
+	// get the actual encumbrance range from the armor datatable
+	int armorLevel;
+	if (!getObjVars().getItem(OBJVAR_ARMOR_BASE + "." + OBJVAR_ARMOR_LEVEL, armorLevel))
+			return false;
+	char armorLevelRowName[64];
+	snprintf(armorLevelRowName, sizeof(armorLevelRowName), "%s%d", DATATABLE_FINAL_ROW.c_str(), armorLevel);
+	int armorLevelRow = dt->searchColumnInt(datatable_type_col, Crc::calculate(armorLevelRowName));
+	if (armorLevelRow < 0)
+		return false;
+	int minEncumbrance = dt->getIntValue(datatable_min_encumbrance_col, armorLevelRow);
+	int maxEncumbrance = dt->getIntValue(datatable_max_encumbrance_col, armorLevelRow);
+
+	// scale the base encumbrance by the actual encumbrance range
+	baseEncumbrance = baseEncumbrance * (maxEncumbrance - minEncumbrance) + minEncumbrance;
+
+	// split the base encumbrace into the three attrib groups
+	encumbrances.resize(encumbranceSplit.size());
+	std::vector<int>::iterator j = encumbrances.begin();
+	for (std::vector<float>::const_iterator i = encumbranceSplit.begin(); i != encumbranceSplit.end(); ++i, ++j)
+	{
+		*j = static_cast<int>((*i) * baseEncumbrance);
+		}
+		return true;
+	}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the slot id of the slot we use to hold temporary crafting prototypes.
+ *
+ * @return the prototype slot id
+ */
+const SlotId & TangibleObject::getCraftingPrototypeSlotId()
+{
+static const SlotId prototypeSlotId(SlotIdManager::findSlotId(TEMP_PROTOTYPE_SLOT_NAME));
+
+	return prototypeSlotId;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the slot id of the slot we use to hold temporary manf schematics.
+ *
+ * @return the schematic slot id
+ */
+const SlotId & TangibleObject::getCraftingManufactureSchematicSlotId()
+{
+static const SlotId schematicSlotId(SlotIdManager::findSlotId(TEMP_SCHEMATIC_SLOT_NAME));
+
+	return schematicSlotId;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Generates an id to allow players to identify a crafted component. NOTE: this
+ * returns a pointer to a static buffer, so make sure you save off the number
+ * before calling this function again.
+ *
+ * @param id		network id that the serial number will be generated from
+ *
+ * @return the serial number
+ */
+const char * TangibleObject::generateSerialNumber(const NetworkId & id)
+{
+static char buffer[11] = {'(', 0, 0, 0, 0, 0, 0, 0, 0, ')', 0};
+int i;
+char c;
+uint64 mask;
+
+#if defined(WIN32)
+	uint64 value = (id.getValue() & 0x000000FFFFFFFFFFi64);
+#elif defined(linux)
+	uint64 value = (id.getValue() & 0x000000FFFFFFFFFFULL);
+#else
+#error unsupported OS
+#endif
+
+	for (i = 0; i < 10; ++i)
+	{
+		mask = ((value >> 4) | ((value & 0x0F) << 36));
+		value ^= mask;
+	}
+
+	for (i = 1; i < 9; ++i)
+	{
+		c = static_cast<char>(value & 0x1F);
+		value >>= 5;
+		if (c < 10)
+			c += '0';
+		else
+			c += ('a' - 10);
+		buffer[i] = c;
+	}
+	return buffer;
+}	// TangibleObject::generateSerialNumber
+
+//----------------------------------------------------------------------
+
+/**
+ * Returns the attribute bonuses this object grants when equipped.
+ *
+ * @param attribBonuses		list to be filled in with the bonuses
+ */
+void TangibleObject::getAttribBonuses(std::vector<std::pair<int, int> > & attribBonuses) const
+{
+	attribBonuses.clear();
+
+	DynamicVariableList::NestedList mods(getObjVars(), OBJVAR_ATTRIBUTE_BONUS);
+
+	for (DynamicVariableList::NestedList::const_iterator i = mods.begin();
+		i != mods.end(); ++i)
+	{
+		int bonus = 0;
+		i.getValue(bonus);
+		int attribute = atoi(i.getName().c_str());
+		if (isdigit(i.getName()[0]) && attribute >= 0 &&
+			attribute < Attributes::NumberOfAttributes)
+		{
+			if (bonus > ConfigServerGame::getMaxItemAttribBonus())
+				bonus = ConfigServerGame::getMaxItemAttribBonus();
+			else if (bonus < -ConfigServerGame::getMaxItemAttribBonus())
+				bonus = -ConfigServerGame::getMaxItemAttribBonus();
+			attribBonuses.push_back(std::make_pair(attribute, bonus));
+		}
+		else
+		{
+			WARNING(true, ("Object %s has invalid attribute bonus objvar name of %s",
+				getNetworkId().getValueString().c_str(), i.getName().c_str()));
+		}
+	}
+}	// TangibleObject::getAttribBonuses
+
+/**
+ * Returns the attribute bonuses this object grants when equipped.
+ *
+ * @param attribBonuses		list of length 9 to be filled in with the bonuses
+ *
+ * @return true if we have bonuses, false if not
+ */
+bool TangibleObject::getAttribBonuses(std::vector<int> & attribBonuses) const
+{
+	attribBonuses.clear();
+	attribBonuses.resize(Attributes::NumberOfAttributes, 0);
+
+	bool hasBonues = false;
+	typedef std::vector<std::pair<int, int> > BonusPairs;
+	BonusPairs pairedBonuses;
+	getAttribBonuses(pairedBonuses);
+	for (BonusPairs::const_iterator i = pairedBonuses.begin(); i != pairedBonuses.end(); ++i)
+	{
+		int index = (*i).first;
+		if (index >=0 && index < Attributes::NumberOfAttributes)
+		{
+			attribBonuses[index] = (*i).second;
+			hasBonues = true;
+		}
+	}
+	return hasBonues;
+}	// TangibleObject::getAttribBonuses
+
+//----------------------------------------------------------------------
+
+/**
+ * Returns the attribute bonus of this object for a given attribute.
+ *
+ * @param attribute		the attribute
+ *
+ * @return the bonus for the attribute
+ */
+int TangibleObject::getAttribBonus(int attribute) const
+{
+	if (attribute < 0 || attribute >= Attributes::NumberOfAttributes)
+		return 0;
+
+	DynamicVariableList::NestedList mods(getObjVars(), OBJVAR_ATTRIBUTE_BONUS);
+	char buffer[8];
+	snprintf(buffer, sizeof(buffer), "%d", attribute);
+	int bonus = 0;
+	IGNORE_RETURN(mods.getItem(buffer, bonus));
+
+	if (bonus > ConfigServerGame::getMaxItemAttribBonus())
+		bonus = ConfigServerGame::getMaxItemAttribBonus();
+	else if (bonus < -ConfigServerGame::getMaxItemAttribBonus())
+		bonus = -ConfigServerGame::getMaxItemAttribBonus();
+	return bonus;
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Sets the attribute bonus this object applies when equipped.
+ *
+ * @param attribute		the attribute
+ * @param bonus			the bonus
+ */
+void TangibleObject::setAttribBonus(int attribute, int bonus)
+{
+	if (attribute < 0 || attribute >= Attributes::NumberOfAttributes)
+		return;
+
+	char buffer[8];
+	snprintf(buffer, sizeof(buffer), "%d", attribute);
+	if (bonus != 0)
+		setObjVarItem(OBJVAR_ATTRIBUTE_BONUS + '.' + buffer, bonus);
+	else
+		removeObjVarItem(OBJVAR_ATTRIBUTE_BONUS + '.' + buffer);
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Returns the skill mod bonuses this object grants when equipped.
+ *
+ * @param skillModBonuses		list to be filled in with the bonuses
+ */
+void TangibleObject::getSkillModBonuses(std::vector<std::pair<std::string, int> > & skillModBonuses, bool includeCategorizedSkillmod /*= true*/) const
+{
+	static std::map<std::string, int> mapSkillModBonuses;
+	mapSkillModBonuses.clear();
+
+	DynamicVariableList::NestedList mods(getObjVars(), OBJVAR_SKILLMOD_BONUS);
+	for (DynamicVariableList::NestedList::const_iterator i = mods.begin();
+		i != mods.end(); ++i)
+	{
+		int bonus = 0;
+		i.getValue(bonus);
+
+		std::string const name = i.getName();
+		std::map<std::string, int>::iterator iterFind = mapSkillModBonuses.find(name);
+		if (iterFind != mapSkillModBonuses.end())
+			iterFind->second += bonus;
+		else
+			IGNORE_RETURN(mapSkillModBonuses.insert(std::make_pair(name, bonus)));
+	}
+
+	if (includeCategorizedSkillmod)
+		getCategorizedSkillModBonuses(*this, OBJVAR_CATEGORIZED_SKILLMOD_BONUS, mapSkillModBonuses);
+
+	skillModBonuses.clear();
+	for (std::map<std::string, int>::const_iterator iterMapSkillModBonuses = mapSkillModBonuses.begin(); iterMapSkillModBonuses != mapSkillModBonuses.end(); ++iterMapSkillModBonuses)
+	{
+		if (iterMapSkillModBonuses->second != 0)
+			skillModBonuses.push_back(std::make_pair(iterMapSkillModBonuses->first, iterMapSkillModBonuses->second));
+	}
+}	// TangibleObject::getSkillModBonuses
+
+//----------------------------------------------------------------------
+
+/**
+ * Returns the skill mod bonus of this object for a given skill mod.
+ *
+ * @param skillMod		the skill mod name
+ *
+ * @return the bonus for the skill mod
+ */
+int TangibleObject::getSkillModBonus(const std::string & skillMod, bool includeCategorizedSkillmod /*= true*/) const
+{
+	DynamicVariableList::NestedList mods(getObjVars(), OBJVAR_SKILLMOD_BONUS);
+	int value = 0;
+	IGNORE_RETURN(mods.getItem(skillMod, value));
+
+	if (includeCategorizedSkillmod)
+		value += getCategorizedSkillModBonus(*this, OBJVAR_CATEGORIZED_SKILLMOD_BONUS, skillMod);
+
+	return value;
+}	// TangibleObject::getSkillModBonus
+
+//----------------------------------------------------------------------
+
+/**
+ * Sets the base skill mod bonus this object applies when equipped.
+ *
+ * @param skillMod		the skill mod name
+ * @param bonus			the bonus
+ */
+void TangibleObject::setSkillModBonus(const std::string & skillMod, int bonus)
+{
+	std::string const skillModObjvar = OBJVAR_SKILLMOD_BONUS + '.' + skillMod;
+
+	if (bonus < 0)
+	{
+		setObjVarItem(skillModObjvar, bonus);
+		return;
+	}
+	else if (bonus == 0)
+	{
+		removeObjVarItem(skillModObjvar);
+		return;
+	}
+
+	int const currentTotalBonus = getSkillModBonus(skillMod);
+	int const currentBonus = getSkillModBonus(skillMod, false);
+	if ((currentTotalBonus - currentBonus + bonus) > ConfigServerGame::getMaxObjectSkillModBonus())
+		bonus = std::max(0, ConfigServerGame::getMaxObjectSkillModBonus() - currentTotalBonus + currentBonus);
+
+	if (bonus != 0)
+		setObjVarItem(skillModObjvar, bonus);
+	else
+		removeObjVarItem(skillModObjvar);
+}	// TangibleObject::setSkillModBonus
+
+//----------------------------------------------------------------------
+
+void TangibleObject::setSkillModBonus(const std::string & category, const std::string & skillMod, int bonus)
+{
+	if (category.empty())
+		return;
+
+	std::string const skillModObjvar = OBJVAR_CATEGORIZED_SKILLMOD_BONUS + '.' + category + '.' + skillMod;
+	if (bonus < 0)
+	{
+		setObjVarItem(skillModObjvar, bonus);
+		return;
+	}
+	else if (bonus == 0)
+	{
+		removeObjVarItem(skillModObjvar);
+		return;
+	}
+
+	int const currentTotalBonus = getSkillModBonus(skillMod);
+	int currentBonus = 0;
+	IGNORE_RETURN(getObjVars().getItem(skillModObjvar, currentBonus));
+
+	if ((currentTotalBonus - currentBonus + bonus) > ConfigServerGame::getMaxObjectSkillModBonus())
+		bonus = std::max(0, ConfigServerGame::getMaxObjectSkillModBonus() - currentTotalBonus + currentBonus);
+
+	if (bonus != 0)
+		setObjVarItem(skillModObjvar, bonus);
+	else
+		removeObjVarItem(skillModObjvar);	
+}	// TangibleObject::setSkillModBonus
+
+//----------------------------------------------------------------------
+
+void TangibleObject::removeCategorizedSkillModBonuses(const std::string & category)
+{
+	if (category.empty())
+		return;
+
+	std::string const skillModObjvar = OBJVAR_CATEGORIZED_SKILLMOD_BONUS + '.' + category;
+	if (getObjVars().hasItem(skillModObjvar) && (getObjVars().getType(skillModObjvar) == DynamicVariable::LIST))
+		removeObjVarItem(skillModObjvar);
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Adds a skill mod bonus to a skill mod socket, if the object has an open socket.
+ *
+ * @param skillMod		the skill mod name
+ * @param bonus			the bonus
+ *
+ * @return true if the bonus was added, false if the object didn't have an open socket
+ */
+bool TangibleObject::addSkillModSocketBonus(const std::string & skillMod, int bonus)
+{
+	if (bonus > ConfigServerGame::getMaxSocketSkillModBonus())
+		bonus = ConfigServerGame::getMaxSocketSkillModBonus();
+
+	int sockets = getSkillModSockets();
+	if (sockets > 0)
+	{
+		int currentBonus = getSkillModBonus(skillMod, false);
+
+		// only apply the bonus if it's greater than the current bonus
+		/*if (bonus <= currentBonus) // This breaks multi-socketed items, so now we combine all values.
+			return false;*/          // Not sure if this code was ever hit in the first place.
+
+		setSkillModBonus(skillMod, currentBonus + bonus);
+
+		// trigger scripts
+		ScriptParams params;
+		std::vector<const char *> skillModParam;
+		skillModParam.push_back(skillMod.c_str());
+		std::vector<int> bonusParam;
+		bonusParam.push_back(bonus);
+		params.addParam(skillModParam);
+		params.addParam(bonusParam);
+		IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_SOCKET_USED, params));
+	}
+	return sockets > 0;
+}	// TangibleObject::addSkillModSocketBonus
+
+//----------------------------------------------------------------------
+
+/**
+ * Adds multiple skill mod bonuses to a skill mod socket, if the object has an
+ * open socket. Note that this call will only use up one socket, no matter how
+ * many bonuses are added.
+ *
+ * @param skillModBonuses		the bonuses
+ *
+ * @return true if the bonus was added, false if the object didn't have an open socket
+ */
+bool TangibleObject::addSkillModSocketBonuses(const std::vector<std::pair<std::string,
+	int> > & skillModBonuses)
+{
+	int sockets = getSkillModSockets();
+	if (sockets > 0)
+	{
+		int i;
+		int count = skillModBonuses.size();
+		std::vector<int> bonusOrder(1, 0);
+		for (i = 1; i < count; ++i)
+		{
+			std::vector<int>::iterator j;
+			for (j = bonusOrder.begin(); j != bonusOrder.end(); ++j)
+			{
+				if (skillModBonuses[i].second > skillModBonuses[*j].second)
+				{
+					bonusOrder.insert(j, i);
+					break;
+				}
+			}
+			if (j == bonusOrder.end())
+				bonusOrder.push_back(i);
+		}
+
+		bool someSucceeded = false;
+		for (i = 0; i < count; ++i)
+		{
+			int index = bonusOrder[i];
+			if(addSkillModSocketBonus(skillModBonuses[index].first,
+				skillModBonuses[index].second))
+				someSucceeded = true;
+		}
+		if(someSucceeded)
+		{
+			setSkillModSockets(sockets - 1);
+			return true;
+		}
+	}
+	return sockets > 0;
+}	// TangibleObject::addSkillModSocketBonuses
+
+//----------------------------------------------------------------------
+
+/**
+ * Returns the number of available skill mod sockets.
+ *
+ * @return the number of sockets
+ */
+int TangibleObject::getSkillModSockets(void) const
+{
+	int sockets = 0;
+
+	if (getGameObjectType() == SharedObjectTemplate::GOT_misc_container_wearable)
+		return 0;
+
+	bool const isCybernetic = getGameObjectType() == SharedObjectTemplate::GOT_cybernetic_arm || getGameObjectType() == SharedObjectTemplate::GOT_cybernetic_legs;
+
+	IGNORE_RETURN(getObjVars().getItem(OBJVAR_SKILLMOD_SOCKETS, sockets));
+	return isCybernetic ? sockets : std::min(sockets, ConfigServerGame::getMaxSkillModSockets());
+}	// TangibleObject::getSkillModSockets
+
+//----------------------------------------------------------------------
+
+/**
+ * Sets the number of available skill mod sockets.
+ *
+ * @param sockets		the number of sockets
+ */
+void TangibleObject::setSkillModSockets(int sockets)
+{
+	bool const isCybernetic = getGameObjectType() == SharedObjectTemplate::GOT_cybernetic_arm || getGameObjectType() == SharedObjectTemplate::GOT_cybernetic_legs;
+
+	if (sockets > ConfigServerGame::getMaxSkillModSockets() && !isCybernetic)
+		sockets = ConfigServerGame::getMaxSkillModSockets();
+	if (sockets > 0)
+		setObjVarItem(OBJVAR_SKILLMOD_SOCKETS, sockets);
+	else
+		removeObjVarItem(OBJVAR_SKILLMOD_SOCKETS);
+}	// TangibleObject::setSkillModSockets
+
+//----------------------------------------------------------------------
+
+/**
+ * Returns the amount of time left before a crafted prototype object will be done.
+ *
+ * @return the time left, in secs
+ */
+int TangibleObject::getCraftingToolPrototypeTime() const
+{
+	int timeLeft = -1;
+	float prototypeTime = 0;
+	getObjVars().getItem(OBJVAR_CRAFTING_PROTOTYPE_TIME,prototypeTime);
+
+	if (prototypeTime > 0)
+	{
+		int startTime =0;
+		if (getObjVars().getItem(OBJVAR_CRAFTING_PROTOTYPE_START_TIME,startTime))
+		{
+			const int currentTime = static_cast<int>(ServerClock::getInstance().getGameTimeSeconds());
+			timeLeft = static_cast<int>(prototypeTime + 0.5f) - (currentTime - startTime);
+		}
+	}
+	return timeLeft;
+}	// TangibleObject::getCraftingToolPrototypeTime
+
+//----------------------------------------------------------------------
+
+void TangibleObject::getAttributesForCraftingTool (AttributeVector & data) const
+{
+	char valueBuffer[32];
+
+	static const Unicode::String CRAFT_TOOL_WORKING  (Unicode::narrowToWide("@crafting:tool_status_working"));
+	static const Unicode::String CRAFT_TOOL_FINISHED (Unicode::narrowToWide("@crafting:tool_status_finished"));
+	static const Unicode::String CRAFT_TOOL_READY    (Unicode::narrowToWide("@crafting:tool_status_ready"));
+	static const SlotId outputSlotId(SlotIdManager::findSlotId(MANF_OUTPUT_SLOT_NAME));
+
+	float craft_effectiveness = 0.0f;
+	getObjVars ().getItem(OBJVAR_CRAFTING_STATIONMOD, craft_effectiveness);
+	snprintf (valueBuffer, sizeof (valueBuffer), "%.2f", craft_effectiveness);
+	data.push_back (std::make_pair(SharedObjectAttributes::craft_tool_effectiveness, Unicode::narrowToWide(valueBuffer)));
+
+	// add some internal attribs for the crafting station state
+
+	// see if we are making a prototype
+
+	int prototypeTimeLeft = getCraftingToolPrototypeTime();
+	if (prototypeTimeLeft > 0)
+	{
+		data.push_back(std::make_pair(SharedObjectAttributes::craft_tool_status, CRAFT_TOOL_WORKING));
+		_itoa(prototypeTimeLeft, valueBuffer, 10);
+		data.push_back(std::make_pair(SharedObjectAttributes::craft_tool_time, Unicode::narrowToWide(valueBuffer)));
+	}
+	else
+	{
+		// see if there is an object in the output hopper
+		bool hasPrototype = false;
+		SlottedContainer const * const slotContainer = ContainerInterface::getSlottedContainer(*this);
+		if (slotContainer != NULL)
+		{
+			Container::ContainerErrorCode tmp = Container::CEC_Success;
+			if (slotContainer->getObjectInSlot(outputSlotId, tmp) != Container::ContainedItem::cms_invalid)
+			{
+				hasPrototype = true;
+			}
+		}
+		if (hasPrototype)
+			data.push_back(std::make_pair(SharedObjectAttributes::craft_tool_status, CRAFT_TOOL_FINISHED));
+		else
+			data.push_back(std::make_pair(SharedObjectAttributes::craft_tool_status, CRAFT_TOOL_READY));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::getAttributes(const NetworkId & playerId, AttributeVector &data) const
+{
+	ServerObject::getAttributes(playerId, data);
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::getAttributesForShipComponent (AttributeVector & data) const
+{
+	ShipComponentData * const componentData = ShipComponentDataManager::create(*this);
+	if(componentData)
+	{
+		componentData->getAttributes(data);
+		delete componentData;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::getAttributes(AttributeVector & data) const
+{
+	ServerObject::getAttributes(data);
+
+	char valueBuffer[32];
+
+	CreatureObject const * const thisCreature = asCreatureObject();
+
+	if (!thisCreature)
+	{
+		const int maxHit = getMaxHitPoints ();
+		// Only consider tangible invulnerability rules for this case
+		if (maxHit > 0 && !TangibleObject::isInvulnerable())
+		{
+			snprintf (valueBuffer, sizeof (valueBuffer), "%d/%d", maxHit - getDamageTaken (), maxHit);
+			data.push_back (std::make_pair (SharedObjectAttributes::condition, Unicode::narrowToWide (valueBuffer)));
+		}
+
+		const ServerObjectTemplate * const targetTemplate = safe_cast<const ServerObjectTemplate *>(getObjectTemplate());
+		if (targetTemplate)
+		{
+			bool playerCanMove = false;
+
+			for (size_t i = 0; i < targetTemplate->getMoveFlagsCount(); ++i)
+			{
+				if (targetTemplate->getMoveFlags(i) == ServerObjectTemplate::MF_player)
+				{
+					playerCanMove = true;
+					break;
+				}
+			}
+
+			if (getCacheVersion() <= 0 && playerCanMove)
+			{
+				snprintf (valueBuffer, sizeof (valueBuffer), "%d", std::max (1, getVolume ()));
+				data.push_back (std::make_pair (SharedObjectAttributes::volume, Unicode::narrowToWide (valueBuffer)));
+			}
+		}
+	}
+
+	const int got = getGameObjectType ();
+
+	switch (got)
+	{
+	case SharedObjectTemplate::GOT_misc_drink:
+	case SharedObjectTemplate::GOT_misc_food:
+	case SharedObjectTemplate::GOT_misc_pharmaceutical:
+	case SharedObjectTemplate::GOT_weapon_ranged_thrown:
+	case SharedObjectTemplate::GOT_weapon_heavy_misc:
+	case SharedObjectTemplate::GOT_misc_fishing_bait:
+		{
+			const int count = m_count.get ();
+			if (count)
+			{
+				snprintf (valueBuffer, sizeof (valueBuffer), "%d", m_count.get ());
+				data.push_back (std::make_pair (SharedObjectAttributes::counter_uses_remaining, Unicode::narrowToWide (valueBuffer)));
+			}
+		}
+		break;
+	case SharedObjectTemplate::GOT_resource_container_pseudo:
+		{
+			int resourceValue = 0;
+			for (int i = 0; i < Crafting::RA_numResourceAttributes; ++i)
+			{
+
+				const std::string ovName(OBJVAR_COMPONENT_DATA + "." +
+					Crafting::getResourceAttributeName(i));
+				if (getObjVars().getItem(ovName, resourceValue))
+				{
+					char buffer[24];
+					snprintf(buffer, sizeof(buffer), "%i", resourceValue);
+					data.push_back(std::make_pair(Crafting::getResourceAttributeName(i),Unicode::narrowToWide(buffer)));
+				}
+			}
+		}
+		break;
+	default:
+		break;
+	}
+
+	const VolumeContainer * const volumeContainer = ContainerInterface::getVolumeContainer (*this);
+	if (volumeContainer)
+	{
+		if (got != SharedObjectTemplate::GOT_misc_factory_crate)
+		{
+			const int curVol = volumeContainer->getCurrentVolume ();
+			const int totVol = volumeContainer->getTotalVolume ();
+
+			if (curVol >= 0 && totVol >= 0)
+			{
+				snprintf (valueBuffer, sizeof (valueBuffer), "%d/%d", curVol, totVol);
+				data.push_back (std::make_pair (SharedObjectAttributes::contents, Unicode::narrowToWide (valueBuffer)));
+			}
+		}
+	}
+
+	std::vector<std::pair<std::string, int> > skillModBonuses;
+	getSkillModBonuses(skillModBonuses);
+	if (!skillModBonuses.empty())
+	{
+		char buffer[16];
+		int count = skillModBonuses.size();
+		for (int i = 0; i < count; ++i)
+		{
+			_itoa(skillModBonuses[i].second, buffer, 10);
+			data.push_back(std::make_pair(SharedObjectAttributes::cat_skill_mod_bonus + "." + "@stat_n:" + skillModBonuses[i].first, Unicode::narrowToWide(buffer)));
+		}
+	}
+
+	std::vector<int> attribBonuses;
+	if (getAttribBonuses(attribBonuses) && !attribBonuses.empty())
+	{
+		char buffer[16];
+		int const attribCount = attribBonuses.size();
+		for (int attrib = 0; attrib < attribCount; ++attrib)
+		{
+			int const bonus = attribBonuses[attrib];
+			if (bonus != 0)
+			{
+				_itoa(bonus, buffer, 10);
+				data.push_back(std::make_pair(SharedObjectAttributes::cat_attrib_mod_bonus + "." + "@att_bonus_n:" + s_attributeBonusNames[attrib], Unicode::narrowToWide(buffer)));
+			}
+		}
+	}
+
+	int sockets = getSkillModSockets();
+	if (sockets > 0)
+	{
+		char buffer[16];
+		_itoa(sockets, buffer, 10);
+		data.push_back(std::make_pair(SharedObjectAttributes::sockets, Unicode::narrowToWide(buffer)));
+	}
+
+	if (isCraftingTool())
+		getAttributesForCraftingTool (data);
+
+	if (getCreatorId() != NetworkId::cms_invalid)
+		data.push_back(std::make_pair(SharedObjectAttributes::crafter,       getCreatorName()));
+
+	if (isCrafted())
+		data.push_back(std::make_pair(SharedObjectAttributes::serial_number, Unicode::narrowToWide(generateSerialNumber(getCraftedId()))));
+
+	if(GameObjectTypes::isTypeOf(got, SharedObjectTemplate::GOT_ship_component))
+	{
+		getAttributesForShipComponent(data);
+	}
+
+	{
+		// If this is a fake ship component in the interior of a ship, get its attributes from the ship
+
+		ServerObject const * const cell = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*this));
+		if (cell && cell->asCellObject())
+		{
+			ServerObject const * const shipAsObject = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*cell));
+			if (shipAsObject)
+			{
+				ShipObject const * const ship = shipAsObject->asShipObject();
+				if (ship)
+				{
+					int slot;
+					if (getObjVars().getItem("intSlot",slot))
+					{
+						ShipComponentData const * const componentData = ship->createShipComponentData(slot);
+						if (componentData)
+						{
+							componentData->getAttributes(data);
+							delete componentData;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	if (getObjVars().hasItem(OBJVAR_BIO_LINK_ID))
+	{
+		// display the bio-link info
+		if (getBioLink() == PENDING_BIO_LINK_NETWORK_ID)
+		{
+			data.push_back(std::make_pair(SharedObjectAttributes::bio_link, Unicode::narrowToWide("@"+SharedStringIds::bio_link_pending.getCanonicalRepresentation())));
+		}
+		else
+		{
+			const std::string & bioLinkName = NameManager::getInstance().getPlayerFullName(getBioLink());
+			if (!bioLinkName.empty())
+			{
+				data.push_back(std::make_pair(SharedObjectAttributes::bio_link, Unicode::narrowToWide(bioLinkName)));
+			}
+			else
+			{
+				LOG("CustomerService", ("Biolink: object %s is flagged as bio-linked "
+					"to player %s that we can't find a name for",
+					getNetworkId().getValueString().c_str(),
+					PlayerObject::getAccountDescription(getBioLink()).c_str()));
+				data.push_back(std::make_pair(SharedObjectAttributes::bio_link, Unicode::narrowToWide("@"+SharedStringIds::bio_link_unknown.getCanonicalRepresentation())));
+			}
+		}
+	}
+
+	// No Trade
+	{
+		if (markedNoTrade())
+		{
+			data.push_back(std::make_pair(SharedObjectAttributes::no_trade, Unicode::emptyString));
+
+			if (markedNoTradeShared(true))
+			{
+				data.push_back(std::make_pair(SharedObjectAttributes::no_trade_shared, Unicode::emptyString));
+			}
+		}
+		else
+		{
+			GameScriptObject * const gso = const_cast<GameScriptObject *>(getScriptObject());
+			if (gso && gso->hasScript(NOMOVE_SCRIPT))
+			{
+				data.push_back(std::make_pair(SharedObjectAttributes::no_trade, Unicode::emptyString));
+
+				if (markedNoTradeShared(false))
+				{
+					data.push_back(std::make_pair(SharedObjectAttributes::no_trade_shared, Unicode::emptyString));
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::getAttributesForAuction(AttributeVector &data) const
+{
+	static const std::string attributeAppearanceData("AppearanceData");
+
+	DEBUG_FATAL(getAppearanceData().length() > 1000,("Appearance data was more than 1000 characters long, too long to save."));
+	data.push_back(std::make_pair(attributeAppearanceData, Unicode::narrowToWide(getAppearanceData())));
+	ServerObject::getAttributesForAuction(data);
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::showFlyText(const StringId &outputText, float scale, int r, int g, int b)
+{
+	//-- Get the controller.
+	Controller *const controller = getController();
+	if (!controller)
+	{
+		DEBUG_WARNING(true, ("showFlyText(): object [%s] has no controller.", getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	//-- Send the showFlyText message to all clients.
+	uint32 flags = GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_PROXY_CLIENT;
+	if (isPlayerControlled())
+		flags |= GameControllerMessageFlags::DEST_AUTH_CLIENT;
+	controller->appendMessage(static_cast<int>(CM_showFlyText), 0.0f, new MessageQueueShowFlyText(getNetworkId(), outputText, scale, r, g, b, 0), flags);
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::showFlyText(const Unicode::String &outputTextOOB, float scale, int r, int g, int b)
+{
+	//-- Get the controller.
+	Controller *const controller = getController();
+	if (!controller)
+	{
+		DEBUG_WARNING(true, ("showFlyText(): object [%s] has no controller.", getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	//-- Send the showFlyText message to all clients.
+	uint32 flags = GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_PROXY_CLIENT;
+	if (isPlayerControlled())
+		flags |= GameControllerMessageFlags::DEST_AUTH_CLIENT;
+	controller->appendMessage(static_cast<int>(CM_showFlyText), 0.0f, new MessageQueueShowFlyText(getNetworkId(), outputTextOOB, scale, r, g, b, 0), flags);
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::showFlyText(const Unicode::String &outputTextOOB, float scale, int r, int g, int b, int flags)
+{
+	//-- Get the controller.
+	Controller *const controller = getController();
+	if (!controller)
+	{
+		DEBUG_WARNING(true, ("showFlyText(): object [%s] has no controller.", getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	//-- Send the showFlyText message to all clients.
+	uint32 netFlags = GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_PROXY_CLIENT;
+	if (isPlayerControlled())
+		flags |= GameControllerMessageFlags::DEST_AUTH_CLIENT;
+	controller->appendMessage(static_cast<int>(CM_showFlyText), 0.0f, new MessageQueueShowFlyText(getNetworkId(), outputTextOOB, scale, r, g, b,  flags), netFlags);
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::showCombatText(const TangibleObject & attackerObject, const StringId &outputText, float scale, int r, int g, int b)
+{
+	//-- Get the controller.
+	Controller *const controller = getController();
+	if (!controller)
+	{
+		DEBUG_WARNING(true, ("showFlyText(): object [%s] has no controller.", getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	//-- Send the showFlyText message to all clients.
+	uint32 flags = GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_PROXY_CLIENT;
+	if (isPlayerControlled())
+		flags |= GameControllerMessageFlags::DEST_AUTH_CLIENT;
+	controller->appendMessage(static_cast<int>(CM_showCombatText), 0.0f, new MessageQueueShowCombatText(getNetworkId(), attackerObject.getNetworkId(), outputText, scale, r, g, b, 0), flags);
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::showCombatText(const TangibleObject & attackerObject, const Unicode::String &outputTextOOB, float scale, int r, int g, int b)
+{
+	//-- Get the controller.
+	Controller *const controller = getController();
+	if (!controller)
+	{
+		DEBUG_WARNING(true, ("showFlyText(): object [%s] has no controller.", getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	//-- Send the showFlyText message to all clients.
+	uint32 flags = GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_PROXY_CLIENT;
+	if (isPlayerControlled())
+		flags |= GameControllerMessageFlags::DEST_AUTH_CLIENT;
+	controller->appendMessage(static_cast<int>(CM_showCombatText), 0.0f, new MessageQueueShowCombatText(getNetworkId(), attackerObject.getNetworkId(), outputTextOOB, scale, r, g, b, 0), flags);
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::handleCMessageTo(const MessageToPayload &message)
+{
+	static const std::string methodname_updateCounter = "C++updateCounter";
+
+	if (message.getMethod() == methodname_updateCounter)
+	{
+		if (isCraftingTool())
+		{
+			int timeLeft = getCraftingToolPrototypeTime();
+			if (timeLeft <= 0)
+			{
+				// done
+				timeLeft = 0;
+			}
+			else
+			{
+				// update the count 5 sec from now
+				MessageToQueue::getInstance().sendMessageToC (getNetworkId(), methodname_updateCounter, std::string (), 5, false);
+			}
+			m_count = timeLeft;
+		}
+	}
+	else if (message.getMethod() == "C++UpdatePvp")
+	{
+		Pvp::forceStatusUpdate(*this);
+	}
+	else if (message.getMethod() == "C++PurgeStructure")
+	{
+		LOG("CustomerService",("Purge:  Purging structure %s",getNetworkId().getValueString().c_str()));
+		rollupStructure(NetworkId(message.getDataAsString()),false);
+	}
+	else if (message.getMethod() == "C++WarnAboutPurge")
+	{
+		LOG("CustomerService",("Purge:  Sending warning emails to the admins of structure %s",getNetworkId().getValueString().c_str()));
+		rollupStructure(NetworkId(message.getDataAsString()),true);
+	}
+	else if (message.getMethod() == "C++PurgeVendor")
+	{
+		LOG("CustomerService",("Purge:  Purging vendor %s",getNetworkId().getValueString().c_str()));
+		permanentlyDestroy(DeleteReasons::Decay); // Script's onDestroy() method will handle cleanup
+	}
+	else if (message.getMethod() == "C++CheckPvpRegion")
+	{
+		// check for pvp region change
+		if (isAuthoritative() && !isInvulnerable() && !isNonPvpObject())
+		{
+			Pvp::checkForRegionChange(*this);
+		}
+
+		if (isPlayerControlled())
+		{
+			std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData = ServerUniverse::getConnectedCharacterLfgData();
+			std::map<NetworkId, LfgCharacterData>::const_iterator iterFind = connectedCharacterLfgData.find(getNetworkId());
+			if (iterFind != connectedCharacterLfgData.end())
+			{
+				std::string regionName;
+				std::string playerCityName;
+
+				std::string const & sceneId = ServerWorld::getSceneId();
+				Vector const &position = findPosition_w();
+				Region const * const region = RegionMaster::getSmallestVisibleRegionAtPoint(sceneId, position.x, position.z);
+				if (region != NULL)
+					regionName = Unicode::wideToNarrow(region->getName());
+
+				int const cityId = CityInterface::getCityAtLocation(sceneId, static_cast<int>(position.x), static_cast<int>(position.z), 0);
+				if (cityId > 0)
+					playerCityName = CityInterface::getCityInfo(cityId).getCityName();
+
+				if (iterFind->second.locationRegion != regionName)
+					ServerUniverse::setConnectedCharacterRegionData(getNetworkId(), regionName);
+
+				if (iterFind->second.locationPlayerCity != playerCityName)
+					ServerUniverse::setConnectedCharacterPlayerCityData(getNetworkId(), playerCityName);
+
+				PlayerObject * const player = PlayerCreatureController::getPlayerObject(asCreatureObject());
+				if (player)
+					player->updateGcwRegionInfo();
+			}
+		}
+	}
+	else if (message.getMethod() == "C++ProcessHateOverTime")
+	{
+		if (!m_hateOverTime.empty())
+		{
+			std::list<NetworkId> expired;
+			unsigned long const currentGameTime =  ServerClock::getInstance().getGameTimeSeconds();
+
+			for (std::map<NetworkId, std::pair<float, std::pair<unsigned long, unsigned long> > >::const_iterator iter = m_hateOverTime.begin(); iter != m_hateOverTime.end(); ++iter)
+			{
+				if (iter->second.second.first < currentGameTime)
+				{
+					IGNORE_RETURN(addHate(iter->first, iter->second.first * static_cast<float>(std::min(currentGameTime, iter->second.second.second) - iter->second.second.first)));
+
+					if (iter->second.second.second <= currentGameTime)
+					{
+						expired.push_back(iter->first);
+					}
+					else
+					{
+						m_hateOverTime.set(iter->first, std::make_pair(iter->second.first, std::make_pair(currentGameTime, iter->second.second.second)));
+					}
+				}
+			}
+
+			if (!expired.empty())
+			{
+				for (std::list<NetworkId>::const_iterator iterExpired = expired.begin(); iterExpired != expired.end(); ++iterExpired)
+				{
+					IGNORE_RETURN(m_hateOverTime.erase(*iterExpired));
+				}
+			}
+
+			if (!m_hateOverTime.empty())
+			{
+				MessageToQueue::sendMessageToC(getNetworkId(), "C++ProcessHateOverTime", std::string(), 1, false);
+			}
+		}
+	}
+	else if (message.getMethod() == "C++DestroyDupedTcg5AtAtHeadItv")
+	{
+		LOG("CustomerService",("VeteranRewards:  destroying duped tcg5_atat_head_itv item (%s) owned by (%s)", getNetworkId().getValueString().c_str(), getOwnerId().getValueString().c_str()));
+		permanentlyDestroy(DeleteReasons::Replaced);
+	}
+	else
+		ServerObject::handleCMessageTo(message);
+}
+
+//----------------------------------------------------------------------
+
+CustomizationData *TangibleObject::fetchCustomizationData ()
+{
+	CustomizationDataProperty * const cdprop = safe_cast<CustomizationDataProperty *>(getProperty (CustomizationDataProperty::getClassPropertyId()));
+	return cdprop ? cdprop->fetchCustomizationData () : 0;
+}
+
+//----------------------------------------------------------------------
+
+const CustomizationData *TangibleObject::fetchCustomizationData () const
+{
+	const CustomizationDataProperty * const cdprop = safe_cast<const CustomizationDataProperty *>(getProperty (CustomizationDataProperty::getClassPropertyId()));
+	return cdprop ? cdprop->fetchCustomizationData () : 0;
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::calcPvpableState()
+{
+	// a tangible is pvpable if it has hit points, has a shared template, does not have an arrangement descriptor, and is not player movable
+	// or m_attackableOverride is true
+	if (m_attackableOverride.get())
+	{
+		setPvpable(true);
+		return;
+	}
+
+	setPvpable(false);
+	if (getMaxHitPoints() && getSharedTemplate() && !getSharedTemplate()->getArrangementDescriptor())
+	{
+		ServerObjectTemplate const *objTemplate = safe_cast<ServerObjectTemplate const *>(getObjectTemplate());
+		for (size_t i = 0; i < objTemplate->getMoveFlagsCount(); ++i)
+			if (objTemplate->getMoveFlags(i) == ServerObjectTemplate::MF_player)
+				return;
+		setPvpable(true);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool TangibleObject::isInvulnerable() const
+{
+	return hasCondition(ServerTangibleObjectTemplate::C_invulnerable);
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::setInvulnerable(bool invulnerable)
+{
+	if (invulnerable)
+	{
+		setCondition(ServerTangibleObjectTemplate::C_invulnerable);
+	}
+	else
+	{
+		clearCondition(ServerTangibleObjectTemplate::C_invulnerable);
+	}
+
+	GameScriptObject * const gameScriptObject = getScriptObject();
+
+	if (gameScriptObject != NULL)
+	{
+		ScriptParams scriptParams;
+		scriptParams.addParam(hasCondition(ServerTangibleObjectTemplate::C_invulnerable));
+		IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_INVULNERABLE_CHANGED, scriptParams));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool TangibleObject::isInsured(void) const
+{
+	return hasCondition(ServerTangibleObjectTemplate::C_insured);
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::setInsured(bool insured)
+{
+	if (insured)
+		setCondition(ServerTangibleObjectTemplate::C_insured);
+	else
+		clearCondition(ServerTangibleObjectTemplate::C_insured);
+}
+
+// ----------------------------------------------------------------------
+
+bool TangibleObject::isUninsurable(void) const
+{
+	return hasCondition(ServerTangibleObjectTemplate::C_uninsurable);
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::setUninsurable(bool uninsurable)
+{
+	if (uninsurable)
+		setCondition(ServerTangibleObjectTemplate::C_uninsurable);
+	else
+		clearCondition(ServerTangibleObjectTemplate::C_uninsurable);
+}
+
+// ----------------------------------------------------------------------
+
+bool TangibleObject::wantSawAttackTriggers() const
+{
+	if (isAuthoritative())
+		return hasCondition(ServerTangibleObjectTemplate::C_wantSawAttackTrigger);
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::setWantSawAttackTriggers(bool enable)
+{
+	if (enable)
+		setCondition(ServerTangibleObjectTemplate::C_wantSawAttackTrigger);
+	else
+		clearCondition(ServerTangibleObjectTemplate::C_wantSawAttackTrigger);
+}
+
+//----------------------------------------------------------------------
+
+int TangibleObject::getCombatSkeleton() const
+{
+	return static_cast<int>((safe_cast<const ServerTangibleObjectTemplate *>(getObjectTemplate()))->getCombatSkeleton());
+}	// TangibleObject::getCombatSkeleton()
+
+//-----------------------------------------------------------------------
+
+bool TangibleObject::canDropInWorld() const
+{
+	return true;
+}
+
+//------------------------------------------------------------------------------------------
+
+int TangibleObject::getNumberOfLots() const
+{
+
+//-- fetch the shared object template
+	const SharedTangibleObjectTemplate* const tangibleObjectTemplate = safe_cast<const SharedTangibleObjectTemplate*> (getSharedTemplate());
+	if (!tangibleObjectTemplate)
+	{
+		return 0;
+	}
+
+	//-- get the structure footprint
+	const StructureFootprint* const structureFootprint = tangibleObjectTemplate->getStructureFootprint ();
+	if (!structureFootprint)
+	{
+		return 0;
+	}
+
+	//-- return the number of lots
+	return structureFootprint->getNumberOfStructureReservations ();
+}
+
+//------------------------------------------------------------------------------------------
+
+bool TangibleObject::isOnAdminList(const CreatureObject& player) const
+{
+	//shortcut for owners
+	if (getOwnerId() == player.getNetworkId())
+		return true;
+
+	if(player.getClient() && player.getClient()->isGod())
+		return true;
+
+	// In script, the admin list is stored as a list of strings.
+	// The format of the list is:
+	// 1) All player are stored as network IDs represented as a string
+	// 2) All guilds are stored as guild IDs represted as a string and prefixed with "guild:"
+
+	typedef stdvector<Unicode::String>::fwd StringVector;
+	static StringVector sv;
+	sv.clear ();
+
+	if (getObjVars().getItem("player_structure.admin.adminList", sv))
+	{
+		const NetworkId requestorNetworkId = player.getNetworkId();
+
+		// Convert the network ID to a Unicode string
+		Unicode::String requestorNetworkIdString = Unicode::narrowToWide( requestorNetworkId.getValueString() );
+
+		// Try to match the string
+		for (StringVector::const_iterator it = sv.begin(); it != sv.end(); ++it)
+		{
+			const Unicode::String & adminString = *it;
+			if (Unicode::caseInsensitiveCompare(adminString, requestorNetworkIdString))
+			{
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+//------------------------------------------------------------------------------------------
+
+bool TangibleObject::isOnHopperList(const CreatureObject& player) const
+{
+	if (getOwnerId() == player.getNetworkId())
+		return true;
+
+	if(player.getClient() && player.getClient()->isGod())
+		return true;
+
+	// In script, the hopper list is stored as a list of strings.
+	// The format of the list is:
+	// 1) All player are stored as network IDs represented as a string
+	// 2) All guilds are stored as guild IDs represted as a string and prefixed with "guild:"
+
+	typedef stdvector<Unicode::String>::fwd StringVector;
+	static StringVector sv;
+	sv.clear ();
+
+	if (getObjVars().getItem("player_structure.hopper.hopperList", sv))
+	{
+		const NetworkId requestorNetworkId = player.getNetworkId();
+
+		// Convert the network ID to a Unicode string
+		Unicode::String requestorNetworkIdString = Unicode::narrowToWide( requestorNetworkId.getValueString() );
+
+		// Try to match the string
+		for (StringVector::const_iterator it = sv.begin(); it != sv.end(); ++it)
+		{
+			const Unicode::String & adminString = *it;
+			if (Unicode::caseInsensitiveCompare(adminString, requestorNetworkIdString))
+			{
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool TangibleObject::isCustomizationDataModified() const
+{
+	return getLocalFlag(LocalObjectFlags::TangibleObject_CustomizationDataModified);
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::setCustomizationDataModified(bool modified)
+{
+	setLocalFlag(LocalObjectFlags::TangibleObject_CustomizationDataModified, modified);
+	scheduleForAlter();
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::setPvpable(bool pvpable)
+{
+	bool oldPvpable = !isNonPvpObject();
+	setLocalFlag(LocalObjectFlags::TangibleObject_Pvpable, pvpable);
+
+	if ((oldPvpable != pvpable) && !getObservers().empty())
+	{
+		// did the object's "pvp sync" status change because of the Pvpable change?
+		bool const wasPvpSync = PvpUpdateObserver::satisfyPvpSyncCondition(!oldPvpable, hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (asCreatureObject() != NULL), getPvpFaction());
+		bool const isPvpSync = PvpUpdateObserver::satisfyPvpSyncCondition(!pvpable, hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (asCreatureObject() != NULL), getPvpFaction());
+
+		if (wasPvpSync != isPvpSync)
+		{
+			// force pvp status update
+			Pvp::forceStatusUpdate(*this);
+
+			const std::set<Client *> &observers = getObservers();
+			for (std::set<Client *>::const_iterator i = observers.begin(); i != observers.end(); ++i)
+			{
+				if (isPvpSync)
+					(*i)->addObservingPvpSync(this);
+				else
+					(*i)->removeObservingPvpSync(this);
+			}
+		}
+	}
+
+	if (isAuthoritative())
+	{
+		if (pvpable && !oldPvpable)
+			MessageToQueue::sendRecurringMessageToC(getNetworkId(), "C++CheckPvpRegion", std::string(), static_cast<int>(getPvpRegionCheckTime()));
+		else if (!pvpable && oldPvpable)
+			MessageToQueue::cancelRecurringMessageTo(getNetworkId(), "C++CheckPvpRegion");
+	}
+}
+
+// ----------------------------------------------------------------------
+
+int TangibleObject::getInterestRadius() const
+{
+	if (isPlayerControlled())
+		return ConfigServerGame::getPlayerInterestRange();
+	ServerTangibleObjectTemplate const *myTemplate = safe_cast<ServerTangibleObjectTemplate const *>(getObjectTemplate());
+	return myTemplate->getInterestRadius();
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::getRequiredCertifications(std::vector<std::string> & results) const
+{
+	const SharedTangibleObjectTemplate *const sharedObjectTemplate = safe_cast<const SharedTangibleObjectTemplate*>(getSharedTemplate());
+	if (sharedObjectTemplate)
+	{
+		const int numRequired = sharedObjectTemplate->getCertificationsRequiredCount();
+		for(int i=0; i<numRequired; ++i)
+		{
+			results.push_back(sharedObjectTemplate->getCertificationsRequired(i));
+		}
+	}
+}
+
+// ======================================================================
+
+void TangibleObject::MaxHitPointsCallback::modified(TangibleObject &target, int oldValue, int value, bool) const
+{
+	// if the values actually changed, and if it changed from 0 or to 0, then we need to recalculate pvp state
+	if ((oldValue != value) && ((oldValue == 0) || (value == 0)))
+	{
+		bool oldNonPvpState = target.isNonPvpObject();
+		target.calcPvpableState();
+
+		// if pvp state changed, need to update clients
+		if (oldNonPvpState != target.isNonPvpObject())
+			Pvp::forceStatusUpdate(target);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::AttackableOverrideCallback::modified(TangibleObject &target, bool oldValue, bool value, bool) const
+{
+	// if the values actually changed, then we need to recalculate pvp state
+	if (oldValue != value)
+	{
+		bool oldNonPvpState = target.isNonPvpObject();
+		target.calcPvpableState();
+
+		// if pvp state changed, need to update clients
+		if (oldNonPvpState != target.isNonPvpObject())
+			Pvp::forceStatusUpdate(target);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::AppearanceDataCallback::modified(TangibleObject &target, const std::string &oldValue, const std::string &value, bool isLocal) const
+{
+	UNREF(isLocal);
+
+	//-- Log any time an authoritative, player-controlled object has customizations set to the empty string.
+	//   This most likely is something very wrong since the player is going to get reset to default cusotmizations.
+	if (value.empty() && !oldValue.empty())
+	{
+		if (target.isPlayerControlled() && target.isAuthoritative())
+		{
+			std::string const oldAppearanceDataDump = CustomizationData::makeSelectDumpFormat(oldValue.c_str());
+			LOG("customization-data-loss", ("non-empty old customization data getting wiped, id=[%s],template=[%s],old m_appearanceData in SELECT DUMP format:[%s]", target.getNetworkId().getValueString().c_str(), target.getObjectTemplateName(), oldAppearanceDataDump.c_str() ));
+		}
+	}
+
+	//-- Notify the object that its appearance data has been modified.
+	target.appearanceDataModified(value);
+
+	Object * const objectContainer = ContainerInterface::getContainedByObject(target);
+	ServerObject * const serverContainer = objectContainer ? objectContainer->asServerObject() : NULL;
+	TangibleObject * const tangibleContainer = serverContainer ? serverContainer->asTangibleObject() : NULL;
+	if(tangibleContainer)
+		tangibleContainer->onContainedItemAppearanceDataModified(target, oldValue, value);
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::onContainedItemAppearanceDataModified(TangibleObject const & , std::string const & , std::string const & )
+{
+	//do nothing.  Tangibles don't care if their contained objects have their appearance data change
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::getByteStreamFromAutoVariable(const std::string & name, Archive::ByteStream & target) const
+{
+	if(name == "customAppearance")
+	{
+		m_customAppearance.pack(target);
+	}
+	else if(name == "appearanceData")
+	{
+		m_appearanceData.pack(target);
+	}
+	else if(name == "incubatorResourceData")
+	{
+		std::string resourceData;
+
+		static const uint32 crcIncubator = CrcLowerString::calculateCrc("object/tangible/crafting/station/incubator_station.iff");
+		if (getTemplateCrc() == crcIncubator)
+		{
+			DynamicVariableList const & objvars = getObjVars();
+			if (objvars.hasItem("power.name") && (DynamicVariable::STRING == objvars.getType("power.name")))
+			{
+				std::string resourceName;
+				IGNORE_RETURN(objvars.getItem("power.name", resourceName));
+
+				ResourceTypeObject const * const rto = ServerUniverse::getInstance().getResourceTypeByName(resourceName);
+				if (rto && !rto->getParentClass().isRecycled() && !rto->getParentClass().isPermanent())
+					resourceData = rto->getResourceTypeDataForExport();
+			}
+		}
+
+		Archive::put(target, resourceData);
+	}
+	else
+	{
+		ServerObject::getByteStreamFromAutoVariable(name, target);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::setAutoVariableFromByteStream(const std::string & name, const Archive::ByteStream & source)
+{
+    Archive::ReadIterator ri(source);
+    if(name == "customAppearance")
+    {
+        m_customAppearance.unpackDelta(ri);
+    }
+	else if(name == "appearanceData")
+	{
+		m_appearanceData.unpackDelta(ri);
+	}
+	else if(name == "incubatorResourceData")
+	{
+		std::string resourceData;
+		Archive::get(ri, resourceData);
+
+		static const uint32 crcIncubator = CrcLowerString::calculateCrc("object/tangible/crafting/station/incubator_station.iff");
+		if ((getTemplateCrc() == crcIncubator) && !resourceData.empty())
+		{
+			DynamicVariableList const & objvars = getObjVars();
+			if (objvars.hasItem("power.name") && (DynamicVariable::STRING == objvars.getType("power.name")))
+			{
+				NetworkId const importedResourceType = ResourceTypeObject::addImportedResourceType(resourceData);
+				if (importedResourceType.isValid())
+				{
+					if (importedResourceType.getValue() > NetworkId::cms_maxNetworkIdWithoutClusterId)
+					{
+						// need to tell all proxy game servers, if any, to create the imported
+						// resource type, if it hasn't already been created on that game server
+						ProxyList const &proxyList = getExposedProxyList();
+						if (!proxyList.empty())
+						{
+							ServerMessageForwarding::begin(std::vector<uint32>(proxyList.begin(), proxyList.end()));
+
+							GenericValueTypeMessage<std::pair<NetworkId, std::string> > const addImportedResourceTypeMsg("AddImportedResourceType", std::make_pair(importedResourceType, resourceData));
+							ServerMessageForwarding::send(addImportedResourceTypeMsg);
+
+							ServerMessageForwarding::end();
+						}
+					}
+
+					ResourceTypeObject const * const rto = ServerUniverse::getInstance().getResourceTypeById(importedResourceType);
+					if (rto)
+					{
+						IGNORE_RETURN(setObjVarItem("power.name", rto->getResourceName()));
+
+						if (importedResourceType.getValue() > NetworkId::cms_maxNetworkIdWithoutClusterId)
+							IGNORE_RETURN(setObjVarItem("power.resourceData", resourceData));
+						else
+							removeObjVarItem("power.resourceData");
+					}
+				}
+			}
+		}
+	}
+    else
+    {
+        ServerObject::setAutoVariableFromByteStream(name, source);
+    }
+	addObjectToConcludeList();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sets a bio-link on this object. This object will only be able to be equipped by
+ * the player who's id matches the bio-link id.
+ *
+ * @param playerId		the player to link this object to
+ */
+void TangibleObject::setBioLink(const NetworkId & playerId)
+{
+	if (playerId != NetworkId::cms_invalid)
+	{
+		if (isAuthoritative())
+		{
+			setObjVarItem(OBJVAR_BIO_LINK_ID, playerId);
+		}
+		else
+		{
+			sendControllerMessageToAuthServer(CM_setBioLink, new MessageQueueGenericValueType<NetworkId>(playerId));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Sets the pending bio-link on this object. This will prevent the object from
+ * being equipped by any player until a real bio-link is set.
+ */
+void TangibleObject::setPendingBioLink()
+{
+	setBioLink(PENDING_BIO_LINK_NETWORK_ID);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Removes the bio-link on this object.
+ */
+void TangibleObject::clearBioLink()
+{
+	if (isAuthoritative())
+	{
+		removeObjVarItem(OBJVAR_BIO_LINK);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setBioLink, new MessageQueueGenericValueType<NetworkId>(NetworkId::cms_invalid));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the bio-link id of this object.
+ *
+ * @return the bio-link player id (NetworkId::cms_invalid if the object isn't bio-linked)
+ */
+NetworkId TangibleObject::getBioLink() const
+{
+	NetworkId linkId;
+	if (getObjVars().getItem(OBJVAR_BIO_LINK_ID, linkId))
+		return linkId;
+	return NetworkId::cms_invalid;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns whether an object, or any contained object, is biolinked
+ *
+ * @return true if a biolinked object is found
+ */
+bool TangibleObject::isBioLinked() const
+{
+	NetworkId const linkId = getBioLink();
+
+	if( (linkId != NetworkId::cms_invalid) && (linkId != PENDING_BIO_LINK_NETWORK_ID) )
+	{
+		// If the network ID is valid and does not correspond to a pending bio-link
+		// then we will assume that the tangible object is bio-linked
+		return true;
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::rollupStructure(NetworkId const & owner, bool warnOnly)
+{
+	GameScriptObject* gso = getScriptObject();
+	if (gso)
+	{
+		gso->attachScript("structure.structure_rollup", true);
+		ScriptParams params;
+		params.addParam(owner);
+		params.addParam(warnOnly);
+		gso->trigAllScripts(Scripting::TRIG_DO_STRUCTURE_ROLLUP, params);
+		gso->detachScript("structure.structure_rollup");
+	}
+}
+
+// ----------------------------------------------------------------------
+
+CommandQueue * TangibleObject::getCommandQueue() const
+{
+	return CommandQueue::getCommandQueue(*const_cast<TangibleObject *>(this));
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::commandQueueEnqueue(Command const &command, NetworkId const &targetId, Unicode::String const &params, uint32 const sequenceId, bool const clearable, Command::Priority const priority, bool fromServer)
+{
+	if(!fromServer)
+	{
+		if(command.m_fromServerOnly)
+		{
+			LOG("CustomerService", ("CheatChannel: attempt to queue server-only command %s from client on object %s", command.m_commandName.c_str(), getNetworkId().getValueString().c_str()));
+			return;
+		}
+	}
+	if (!isAuthoritative())
+	{
+		sendControllerMessageToAuthServer(CM_commandQueueEnqueueFwd, new MessageQueueCommandQueueEnqueueFwd(sequenceId, command.m_commandHash, targetId, params, clearable, static_cast<int>(priority), fromServer));
+	}
+	else
+	{
+		CommandQueue * const queue = getCommandQueue();
+		if (queue != NULL)
+		{
+			queue->enqueue(command, targetId, params, sequenceId, clearable, priority);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::commandQueueRemove(uint32 const sequenceId)
+{
+	if (!isAuthoritative())
+	{
+		sendControllerMessageToAuthServer(CM_commandQueueRemove, new MessageQueueCommandQueueRemove(sequenceId, 0.0f, static_cast<int>(Command::CEC_Success), 0));
+	}
+	else
+	{
+		CommandQueue * const queue = getCommandQueue();
+		if (queue != NULL)
+		{
+			queue->remove(sequenceId);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::commandQueueClear()
+{
+	// commandQueueRemove clears the queue when passed a 0 sequenceId
+	commandQueueRemove(0);
+}
+
+//-----------------------------------------------------------------------
+
+bool TangibleObject::commandQueueHasCommandFromGroup(uint32 groupHash) const
+{
+	CommandQueue * const queue = getCommandQueue();
+	if (queue != NULL)
+	{
+		return queue->hasCommandFromGroup(groupHash);
+	}
+	return false;
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::commandQueueClearCommandsFromGroup(uint32 groupHash, bool force)
+{
+	CommandQueue * const queue = getCommandQueue();
+	if (queue != NULL)
+	{
+		queue->clearCommandsFromGroup(groupHash, force);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+CombatEngineData::CombatData * TangibleObject::getCombatData()
+{
+	return m_combatData;
+}
+
+//-----------------------------------------------------------------------
+
+CombatEngineData::CombatData const * TangibleObject::getCombatData() const
+{
+	return m_combatData;
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::CombatStateChangedCallback::modified(TangibleObject & target, bool /*oldValue*/, bool newValue, bool /*local*/) const
+{
+	if (newValue)
+	{
+		// Starting Combat
+
+		LOGC(ConfigServerGame::isAiLoggingEnabled(), "debug_ai", ("TangibleObject::Callbacks::CombatStateChanged::modified() STARTING COMBAT owner(%s:%s)", target.getNetworkId().getValueString().c_str(), Unicode::wideToNarrow(target.getEncodedObjectName()).c_str()));
+
+		if (target.isAuthoritative())
+		{
+			target.createCombatData();
+
+			target.m_combatStartTime = Os::getRealSystemTime();
+
+			if (!target.isPlayerControlled())
+			{
+				ObjectTracker::addCombatAI();
+			}
+
+			AICreatureController * const aiCreatureController = AICreatureController::asAiCreatureController(target.getController());
+
+			if (aiCreatureController != NULL)
+			{
+				aiCreatureController->markCombatStartLocation();
+			}
+
+			if (target.getScriptObject() != NULL)
+			{
+				ScriptParams params;
+				IGNORE_RETURN(target.getScriptObject()->trigAllScripts(Scripting::TRIG_ENTERED_COMBAT, params));
+			}
+
+			target.scheduleForAlter();
+		}
+	}
+	else
+	{
+		// Exiting Combat
+
+		LOGC(ConfigServerGame::isAiLoggingEnabled(), "debug_ai", ("TangibleObject::Callbacks::CombatStateChanged::modified() EXITING COMBAT owner(%s:%s)", target.getNetworkId().getValueString().c_str(), Unicode::wideToNarrow(target.getEncodedObjectName()).c_str()));
+
+		if (target.isAuthoritative())
+		{
+			if (!target.isPlayerControlled())
+			{
+				ObjectTracker::removeCombatAI();
+			}
+
+			//target.clearHateList();
+
+			target.commandQueueClearCommandsFromGroup(COMMAND_GROUP_COMBAT.getCrc());
+
+			if (target.getScriptObject() != NULL)
+			{
+				ScriptParams params;
+				IGNORE_RETURN(target.getScriptObject()->trigAllScripts(Scripting::TRIG_EXITED_COMBAT, params));
+			}
+
+			target.scheduleForAlter();
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+int TangibleObject::getCombatDuration() const
+{
+	int result = 0;
+
+	if (isInCombat())
+	{
+		result = static_cast<int>(Os::getRealSystemTime() - m_combatStartTime.get());
+	}
+
+	return result;
+}
+
+//-----------------------------------------------------------------------
+void TangibleObject::setAttackableOverride(bool attackable)
+{
+	if (isAuthoritative())
+	{
+		if (m_attackableOverride.get() != attackable)
+			m_attackableOverride = attackable;
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_setAttackableOverride, new MessageQueueGenericValueType<bool>(attackable));
+	}
+}
+
+//-----------------------------------------------------------------------
+bool TangibleObject::hasAutoDeclineDuel() const
+{
+	return getObjVars().hasItem(OBJVAR_DECLINE_DUEL);
+}
+
+//----------------------------------------------------------------------
+
+int TangibleObject::getPassiveRevealRange(NetworkId const & target) const
+{
+	Archive::AutoDeltaMap<NetworkId, int>::const_iterator i = m_passiveReveal.find(target);
+	if (i == m_passiveReveal.end())
+		return -1;
+
+	return i->second;
+}
+
+//----------------------------------------------------------------------
+
+void TangibleObject::addPassiveReveal(TangibleObject const & target, int range)
+{
+	addPassiveReveal(target.getNetworkId(), range, (NULL != PlayerCreatureController::getPlayerObject(target.asCreatureObject())));
+}
+
+//----------------------------------------------------------------------
+
+void TangibleObject::addPassiveReveal(NetworkId const & target, int range, bool isTargetPlayerCharacter)
+{
+	// and object cannot passively reveal itself
+	if (target == getNetworkId())
+		return;
+
+	// range must be > 0
+	if (range <= 0)
+		return;
+
+	if(isAuthoritative())
+	{
+		m_passiveReveal.set(target, range);
+
+		if (isTargetPlayerCharacter)
+			m_passiveRevealPlayerCharacter.insert(target);
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_addPassiveReveal, new MessageQueueGenericValueType<std::pair<std::pair<int, int>, NetworkId> >(std::make_pair(std::make_pair(range, (isTargetPlayerCharacter ? 1 : 0)), target)));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void TangibleObject::removePassiveReveal(NetworkId const & target)
+{
+	if(isAuthoritative())
+	{
+		IGNORE_RETURN(m_passiveReveal.erase(target));
+		IGNORE_RETURN(m_passiveRevealPlayerCharacter.erase(target));
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removePassiveReveal, new MessageQueueGenericValueType<NetworkId>(target));
+	}
+}
+
+//----------------------------------------------------------------------
+
+void TangibleObject::removeAllPassiveReveal()
+{
+	if(isAuthoritative())
+	{
+		m_passiveReveal.clear();
+		m_passiveRevealPlayerCharacter.clear();
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removeAllPassiveReveal, 0);
+	}
+}
+
+//----------------------------------------------------------------------
+
+bool TangibleObject::setOverrideMapColor(unsigned char r, unsigned char g, unsigned char b)
+{
+	if(!isAuthoritative())
+	{
+		return false;
+	}
+
+	PackedArgb color(255, r, g, b);
+	m_mapColorOverride.set(color.getArgb());
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool TangibleObject::clearOverrideMapColor()
+{
+	if(!isAuthoritative())
+	{
+		return false;
+	}
+
+	m_mapColorOverride.set(0);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool TangibleObject::getOverrideMapColor(unsigned char & r, unsigned char & g, unsigned char & b) const
+{
+	PackedArgb color(m_mapColorOverride.get());
+	if(color.getA() == 0)
+	{
+		return false;
+	}
+
+	r = color.getR();
+	g = color.getG();
+	b = color.getB();
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void TangibleObject::handleIncubatorCommit(CreatureObject const & owner, IncubatorCommitMessage const & msg)
+{
+	// this operation *REQUIRES* that both the incubator and the
+	// character manipulating the incubator be authoritative on
+	// the same game server, so it's really not possible to
+	// pass this handler over to the authoritative incubator,
+	// since there's no guarantee that the character will be
+	// authoritative on that game server either
+	if (!isAuthoritative() || !owner.isAuthoritative())
+		return;
+
+	GameScriptObject * const scriptObject = getScriptObject();
+	if (scriptObject)
+	{
+		ScriptParams params;
+		params.addParam(owner.getNetworkId(), "playerId");
+		params.addParam(getNetworkId(), "terminalId");
+		params.addParam(msg.getSlot1Id(), "slot1Id");
+		params.addParam(msg.getSlot2Id(), "slot2Id");
+		params.addParam(msg.getSlot3Id(), "slot3Id");
+		params.addParam(msg.getSlot4Id(), "slot4Id");
+		params.addParam(msg.getInitialPointsSurvival(), "initialPointsSurvival");
+		params.addParam(msg.getInitialPointsBeastialResilience(),"initialPointsBeastialResilience");
+		params.addParam(msg.getInitialPointsCunning(),"initialPointsCunning");
+		params.addParam(msg.getInitialPointsIntelligence(),"initialPointsIntelligence");
+		params.addParam(msg.getInitialPointsAggression(),"initialPointsAggression");
+		params.addParam(msg.getInitialPointsHuntersInstinct(),"initialPointsHuntersInstinct");
+		params.addParam(msg.getTotalPointsSurvival(),"totalPointsSurvival");
+		params.addParam(msg.getTotalPointsBeastialResilience(),"totalPointsBeastialResilience");
+		params.addParam(msg.getTotalPointsCunning(),"totalPointsCunning");
+		params.addParam(msg.getTotalPointsIntelligence(),"totalPointsIntelligence");
+		params.addParam(msg.getTotalPointsAggression(),"totalPointsAggression");
+		params.addParam(msg.getTotalPointsHuntersInstinct(),"totalPointsHuntersInstinct");
+		params.addParam(msg.getTemperatureGauge(),"temperatureGauge");
+		params.addParam(msg.getNutrientGauge(),"nutrientGauge");
+		params.addParam(msg.getNewCreatureColorIndex(), "newCreatureColorIndex");
+
+		IGNORE_RETURN(scriptObject->trigAllScripts(Scripting::TRIG_INCUBATOR_COMMITTED, params));	
+	}
+}
+
+void TangibleObject::handleIncubatorCancel(CreatureObject const & owner)
+{
+	// this operation *REQUIRES* that both the incubator and the
+	// character manipulating the incubator be authoritative on
+	// the same game server, so it's really not possible to
+	// pass this handler over to the authoritative incubator,
+	// since there's no guarantee that the character will be
+	// authoritative on that game server either
+	if (!isAuthoritative() || !owner.isAuthoritative())
+		return;
+
+	GameScriptObject * const scriptObject = getScriptObject();
+	if (scriptObject)
+	{
+		ScriptParams params;
+		params.addParam(owner.getNetworkId(), "playerId");
+		params.addParam(getNetworkId(), "terminalId");
+
+		IGNORE_RETURN(scriptObject->trigAllScripts(Scripting::TRIG_INCUBATOR_CANCELED, params));	
+	}
+}
+
+void TangibleObject::forceHateTarget(NetworkId const & target)
+{
+	if(isAuthoritative())
+	{
+		m_hateList.forceHateTarget(target);
+		scheduleForAlter();
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_forceHateTarget, new MessageQueueGenericValueType<NetworkId>(target));
+	}
+
+}
+
+bool TangibleObject::isUserOnAccessList(NetworkId const user) const
+{
+	return (std::find(m_accessList.begin(), m_accessList.end(), user) != m_accessList.end());
+}
+
+bool TangibleObject::isGuildOnAccessList(int guildId) const
+{
+	return (std::find(m_guildAccessList.begin(), m_guildAccessList.end(), guildId) != m_guildAccessList.end());
+}
+
+void TangibleObject::addUserToAccessList(const NetworkId user)
+{
+	if(isAuthoritative())
+	{
+		if(m_accessList.find(user) == m_accessList.end())
+		{
+			if(!hasCondition(C_locked)) // If we weren't locked before, we are now.
+				setCondition(C_locked);
+
+			m_accessList.insert(user);
+			
+			copyUserAccessListToObjVars();
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_addUserToAccessList, new MessageQueueGenericValueType< std::pair<int, NetworkId> >(std::make_pair<int, NetworkId>(-1, user) ) );
+	}
+}
+
+void TangibleObject::addGuildToAccessList(int guildId)
+{
+	if(isAuthoritative())
+	{
+		if(m_guildAccessList.find(guildId) == m_guildAccessList.end())
+		{
+			if(!hasCondition(C_locked)) // If we weren't locked before, we are now.
+				setCondition(C_locked);
+
+			m_guildAccessList.insert(guildId);
+
+			copyGuildAccessListToObjVars();
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_addUserToAccessList, new MessageQueueGenericValueType< std::pair<int, NetworkId> >(std::make_pair<int, NetworkId>(guildId, NetworkId::cms_invalid) ) );
+	}
+}
+
+
+void TangibleObject::removeUserFromAccessList(const NetworkId user)
+{
+	if(isAuthoritative())
+	{
+		Archive::AutoDeltaSet<NetworkId>::const_iterator iter = m_accessList.find(user);
+		if(iter != m_accessList.end())
+		{
+			m_accessList.erase(iter);
+			if(m_accessList.empty())
+			{
+				if(hasCondition(C_locked))
+					clearCondition(C_locked); // Containers with no access list are open to whomever.
+
+				removeObjVarItem(s_accessListScriptVar); // Remove our objvars, no need for them anymore.
+
+				return;
+			}
+
+			copyUserAccessListToObjVars();
+
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removeUserFromAccessList, new MessageQueueGenericValueType< std::pair<int, NetworkId> >(std::make_pair<int, NetworkId>(-1, user)));
+	}
+}
+
+void TangibleObject::removeGuildFromAccessList(int guildId)
+{
+	if(isAuthoritative())
+	{
+		Archive::AutoDeltaSet<int>::const_iterator iter = m_guildAccessList.find(guildId);
+		if(iter != m_guildAccessList.end())
+		{
+			m_guildAccessList.erase(iter);
+			if(m_guildAccessList.empty())
+			{
+				if(hasCondition(C_locked) && m_accessList.empty())
+					clearCondition(C_locked); // Containers with no access list are open to whomever.
+
+				removeObjVarItem(s_guildAccessListScriptVar); // Remove our objvars, no need for them anymore.
+
+				return;
+			}
+
+			copyGuildAccessListToObjVars();
+
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removeUserFromAccessList, new MessageQueueGenericValueType< std::pair<int, NetworkId> >(std::make_pair<int, NetworkId>(guildId, NetworkId::cms_invalid)));
+	}
+}
+
+void TangibleObject::copyUserAccessListToObjVars()
+{
+	std::vector<NetworkId> newAccessList;
+	Archive::AutoDeltaSet<NetworkId>::const_iterator iter = m_accessList.begin();
+	for(; iter != m_accessList.end(); ++iter)
+		newAccessList.push_back((*iter));
+
+	setObjVarItem(s_accessListScriptVar, newAccessList);
+}
+
+void TangibleObject::copyGuildAccessListToObjVars()
+{
+	std::vector<int> newAccessList;
+	Archive::AutoDeltaSet<int>::const_iterator iter = m_guildAccessList.begin();
+	for(; iter != m_guildAccessList.end(); ++iter)
+		newAccessList.push_back((*iter));
+
+	setObjVarItem(s_guildAccessListScriptVar, newAccessList);
+}
+
+
+void TangibleObject::readInUserAccessListObjVars()
+{
+	std::vector<NetworkId> inputVector;
+	if(getObjVars().getItem(s_accessListScriptVar, inputVector))
+	{
+		// We have some obj vars to add to our list!
+		std::vector<NetworkId>::size_type i = 0;
+		for( ; i < inputVector.size(); ++i)
+		{
+			m_accessList.insert(inputVector[i]);
+		}
+	}
+}
+
+void TangibleObject::readInGuildAccessListObjVars()
+{
+	std::vector<int> inputVector;
+	if(getObjVars().getItem(s_guildAccessListScriptVar, inputVector))
+	{
+		// We have some obj vars to add to our list!
+		std::vector<int>::size_type i = 0;
+		for( ; i < inputVector.size(); ++i)
+		{
+			m_guildAccessList.insert(inputVector[i]);
+		}
+	}
+}
+
+void TangibleObject::clearUserAccessList()
+{
+	if(isAuthoritative())
+	{
+		if(hasCondition(C_locked) && m_guildAccessList.empty()) // No access list = total unlock.
+			clearCondition(C_locked);
+
+		m_accessList.clear();
+
+		removeObjVarItem(s_accessListScriptVar); // Remove our objvars, no need for them anymore.
+
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_clearUserAccessList, new MessageQueueGenericValueType<bool>(false));
+	}
+}
+
+void TangibleObject::clearGuildAccessList()
+{
+	if(isAuthoritative())
+	{
+		if(hasCondition(C_locked) && m_accessList.empty()) // No access list = total unlock.
+			clearCondition(C_locked);
+
+		m_guildAccessList.clear();
+
+		removeObjVarItem(s_guildAccessListScriptVar); // Remove our objvars, no need for them anymore.
+
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_clearUserAccessList, new MessageQueueGenericValueType<bool>(true));
+	}
+}
+
+void TangibleObject::getUserAccessList(std::vector<NetworkId> & ids)
+{
+	getObjVars().getItem(s_accessListScriptVar, ids);
+}
+
+void TangibleObject::getGuildAccessList(std::vector<int> & ids)
+{
+	getObjVars().getItem(s_guildAccessListScriptVar, ids);
+}
+
+void TangibleObject::addObjectEffect(std::string const & filename, std::string const & hardpoint, Vector const & offset, float scale, std::string const & label)
+{
+	if(isAuthoritative())
+	{
+		if(m_effectsMap.find(label) != m_effectsMap.end())
+			return;
+
+		m_effectsMap.insert(label, std::make_pair(filename, std::make_pair( hardpoint, std::make_pair(offset, scale ))));
+	}
+	else
+		sendControllerMessageToAuthServer(CM_addObjectEffect, 
+		new MessageQueueGenericValueType<std::pair<std::string, std::pair<std::string, std::pair<std::string, std::pair<Vector, float > > > > >(std::make_pair(label, std::make_pair(filename, std::make_pair(hardpoint, std::make_pair(offset, scale))))));
+}
+
+void TangibleObject::removeObjectEffect(std::string const & label)
+{
+	if(isAuthoritative())
+	{
+		Archive::AutoDeltaMap<std::string, std::pair<std::string, std::pair<std::string, std::pair<Vector, float> > > >::const_iterator iter = m_effectsMap.find(label);
+		if(iter == m_effectsMap.end())
+			return;
+
+		m_effectsMap.erase(iter);
+	}
+	else
+		sendControllerMessageToAuthServer(CM_removeObjectEffect, new MessageQueueGenericValueType<std::string>(label));
+}
+
+bool TangibleObject::hasObjectEffect(std::string const & label)
+{
+	return m_effectsMap.find(label) != m_effectsMap.end();
+}
+
+void TangibleObject::removeAllObjectEffects()
+{
+	if(isAuthoritative())
+	{
+		m_effectsMap.clear();
+	}
+	else
+		sendControllerMessageToAuthServer(CM_removeAllObjectEffect, new MessageQueueGenericValueType<bool>(true));
+}
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/TangibleObject.h b/engine/server/library/serverGame/src/shared/object/TangibleObject.h
new file mode 100644
index 00000000..c05f93bf
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/TangibleObject.h
@@ -0,0 +1,844 @@
+// ======================================================================
+//
+// TangibleObject.h
+// Copyright 2001, 2002 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef INCLUDED_TangibleObject_H
+#define INCLUDED_TangibleObject_H
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "Archive/AutoDeltaSet.h"
+#include "Archive/AutoDeltaSetObserver.h"
+#include "Archive/AutoDeltaVariableCallback.h"
+#include "Archive/AutoDeltaVariableObserver.h"
+#include "Archive/AutoDeltaVectorObserver.h"
+#include "serverGame/CellPermissions.h"
+#include "serverGame/HateList.h"
+#include "serverGame/Pvp.h"
+#include "serverGame/PvpEnemiesObserver.h"
+#include "serverGame/PvpUpdateObserver.h"
+#include "serverGame/ServerArmorTemplate.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/TangibleConditionObserver.h"
+#include "serverUtility/LocationData.h"
+#include "serverUtility/PvpEnemy.h"
+#include "sharedGame/Command.h"
+#include "sharedGame/NpcConversationData.h"
+#include "sharedMath/Sphere.h"
+#include "sharedObject/CachedNetworkId.h"
+#include "swgSharedUtility/CombatEngineData.h"
+
+#include <list> // why is this needed?... stl forward decl isnt working here
+
+class Client;
+class CommandQueue;
+class CreatureObject;
+class CustomizationData;
+class Footprint;
+class IncubatorCommitMessage;
+class ManufactureSchematicObject;
+class NpcConversation;
+class ProsePackage;
+class RegionPvp;
+class ServerSynchronizedUi;
+class ServerTangibleObjectTemplate;
+class StringId;
+
+namespace CombatEngineData
+{
+	struct CombatData;
+	struct DamageData;
+
+	typedef stdvector<CachedNetworkId>::fwd TargetIdList;
+};
+
+namespace LocalObjectFlags
+{
+	enum
+	{
+		TangibleObject_Pvpable                   = ServerObject_Max,
+		TangibleObject_CustomizationDataModified = ServerObject_Max+1,
+
+		// This must come last.
+		TangibleObject_Max
+	};
+}
+
+/**
+  *  A TangibleObject is an object that has a physical representation in the world.  It has physical properties such
+  *  as weight and volume.  Most everything that a character interacts with is a tangible item.
+  */
+class TangibleObject : public ServerObject
+{
+	friend class TangibleController;
+
+public:
+
+	// these MUST be reflected in: 
+	// //depot/swg/current/dsrc/sku.0/sys.server/compiled/game/object/tangible_object_template.tdf
+	// //depot/swg/current/dsrc/sku.0/sys.server/compiled/game/script/base_class.java
+	// //depot/swg/current/src/engine/client/library/clientGame/src/shared/object/TangibleObject.h
+	// //depot/swg/current/src/engine/server/library/serverGame/src/shared/object/TangibleObject.h
+
+	enum Conditions
+	{
+		C_onOff                = 0x00000001,
+		C_vendor               = 0x00000002,
+		C_insured              = 0x00000004,
+		C_conversable          = 0x00000008,
+		C_hibernating          = 0x00000010,
+		C_magicItem            = 0x00000020,
+		C_aggressive           = 0x00000040,
+		C_wantSawAttackTrigger = 0x00000080,
+		C_invulnerable         = 0x00000100,
+		C_disabled             = 0x00000200,
+		C_uninsurable          = 0x00000400,
+		C_interesting          = 0x00000800,
+		C_mount                = 0x00001000,    //   Set programmatically by mount system.  Do not set this in the template.
+		C_crafted              = 0x00002000,    //   Set programmatically by crafting system.  Do not set this in the template.
+		C_wingsOpened          = 0x00004000,    //   Set programmatically by wing system.  Do not set this in the template.
+		C_spaceInteresting     = 0x00008000,
+		C_docking              = 0x00010000,    //   Set programmatically by docking system.  Do not set this in the template.
+		C_destroying           = 0x00020000,    //   Set programmatically by destruction system.  Do not set this in the template.
+		C_commable             = 0x00040000,
+		C_dockable             = 0x00080000,
+		C_eject                = 0x00100000,
+		C_inspectable          = 0x00200000,
+		C_transferable         = 0x00400000,
+		C_inflightTutorial     = 0x00800000,
+		C_spaceCombatMusic     = 0x01000000,    //   Set programmatically by the AI system.  Do not set this in the template.
+		C_encounterLocked      = 0x02000000,
+		C_spawnedCreature      = 0x04000000,
+		C_holidayInteresting   = 0x08000000,
+		C_locked			   = 0x10000000,
+	};
+
+	explicit TangibleObject(const ServerTangibleObjectTemplate* newTemplate);
+	virtual ~TangibleObject();
+
+	static void install();
+
+	static TangibleObject * getTangibleObject(NetworkId const & networkId);
+	static TangibleObject * asTangibleObject(Object * object);
+	static TangibleObject const * asTangibleObject(Object const * object);
+
+	virtual TangibleObject *       asTangibleObject();
+	virtual TangibleObject const * asTangibleObject() const;
+
+	static void         removeDefaultTemplate   (void);
+
+	virtual Controller* createDefaultController (void);
+	void                addMembersToPackages    ();
+
+	virtual float       alter    (float time);
+	virtual void        conclude ();
+
+	virtual void getByteStreamFromAutoVariable(const std::string & name, Archive::ByteStream & target) const;
+	virtual void setAutoVariableFromByteStream(const std::string & name, const Archive::ByteStream & source);
+
+	// combat functions
+	virtual void                           addAim(void);
+	virtual void                           clearAims(void);
+	        bool                           isInCombat(void) const;
+
+	void createCombatData();
+	CombatEngineData::CombatData * getCombatData();
+	CombatEngineData::CombatData const * getCombatData() const;
+
+	// Hate List
+	bool addHate(NetworkId const & target, float const hate);
+	void addHateOverTime(NetworkId const & target, float const hate, int const seconds);
+	bool setHate(NetworkId const & target, float const hate);
+	float getHate(NetworkId const & target) const;
+	std::map<NetworkId, std::pair<float, std::pair<unsigned long, unsigned long> > > const & getHateOverTime() const;
+	float getMaxHate() const;
+	CachedNetworkId const & getHateTarget() const;
+	void removeHateTarget(NetworkId const & target);
+	void clearHateList();
+	HateList::UnSortedList const & getUnSortedHateList() const;
+	void getSortedHateList(HateList::SortedList & sortedHateList) const; // Slower, don't call every frame
+	void verifyHateList();
+	bool isHatedBy(Object * const object);
+	bool isOnHateList(NetworkId const & target) const;
+	int getTimeSinceLastHateListUpdate() const;
+	bool isHateListEmpty() const;
+	HateList::RecentList const & getRecentHateList() const;
+	void clearRecentHateList();
+	void resetHateTimer();
+	void setHateListAutoExpireTargetEnabled(bool enabled);
+	bool isHateListAutoExpireTargetEnabled() const;
+	int getHateListAutoExpireTargetDuration() const;
+	bool isHateListOwnerPlayer() const;
+
+	void forceHateTarget(NetworkId const & target);
+
+	float getAILeashTime() const;
+	void  setAILeashTime( float time );
+
+	void                                   clearDamageList(void);
+
+	virtual bool                 canDropInWorld () const;
+
+	// access functions
+	const char *         getCustomAppearance() const;
+	const std::string &  getAppearanceData() const;
+	int                  getDamageTaken() const;
+	int                  getMaxHitPoints() const;
+	bool                 isVisible() const;
+	void                 initializeVisibility();
+	void                 setVisible(bool isVisible);
+	bool                 isHidden() const;
+	void                 setHidden(bool const hide);
+
+	int                  getCombatSkeleton() const;
+	virtual bool         isDisabled() const;
+
+	virtual const NetworkId &    getOwnerId() const;
+	virtual bool         isOwner(NetworkId const &id, Client const *client) const;
+
+	virtual bool         isVisibleOnClient(const Client & client) const;
+	virtual bool         isInvulnerable() const;
+	bool                 isInsured(void) const;
+	void                 setInsured(bool insured);
+	bool                 isUninsurable(void) const;
+	void                 setUninsurable(bool uninsurable);
+	virtual const char * getClientSharedTemplateName() const;
+	int                  getCount(void) const;
+	void                 setCount(int value);
+	void                 incrementCount(int delta);
+	int                  getCondition(void) const;
+	bool                 hasCondition(int condition) const;
+	void                 setCondition(int condition);
+	void                 clearCondition(int condition);
+	void                 rollupStructure(NetworkId const & owner, bool warnOnly);
+
+	bool                hasEncumbrances() const;
+	bool                getEncumbrances(std::vector<int> & encumbrances) const;
+
+	virtual void        forwardServerObjectSpecificBaselines() const;
+	virtual void        sendObjectSpecificBaselinesToClient(Client const &client) const;
+	virtual void        onRemovingFromWorld();
+	virtual void        unload();
+	virtual void        onPermanentlyDestroyed();
+
+	void getEquippedItems(uint32 combatBone, stdvector<TangibleObject *>::fwd & items) const;
+	TangibleObject * getRandomEquippedItem(uint32 combatBone) const;
+
+
+	void        setCustomAppearance(const std::string & newCustomAppearance);
+	void        setAppearanceData(const std::string & newAppearanceData);
+
+	int         getInterestRadius() const;
+
+	std::vector<LocationData> const & getLocationTargets() const;
+	void        addLocationTarget(const LocationData & location);
+	void        removeLocationTarget(const Unicode::String & locationName);
+
+	virtual int getNumberOfLots() const;
+
+	// crafting functions
+	bool                               isCrafted(void) const;
+	const NetworkId                    getCraftedId(void) const;
+	void                               setCraftedId(const NetworkId & id);
+	int                                getCraftingType(void) const;
+	int                                getCraftedType(void) const;
+	void                               setCraftedType(int type);
+	const NetworkId                    getCreatorId(void) const;
+	void                               setCreatorId(const NetworkId & creatorId);
+	const Unicode::String              getCreatorName(void) const;
+	int                                getCreatorXp(void) const;
+	void                               setCreatorXp(int xp);
+	int                                getCreatorXpType(void) const;
+	void                               setCreatorXpType(int type);
+	uint32                             getSourceDraftSchematic() const;
+	bool                               isCraftingTool(void) const;
+	bool                               isCraftingStation(void) const;
+	bool                               isRepairTool(void) const;
+	ServerObject *                     getIngredientHopper(void) const;
+	bool                               startCraftingSession(CreatureObject & crafter);
+	bool                               stopCraftingSession(void);
+	bool                               isIngredientInHopper(const NetworkId & ingredientId) const;
+	bool                               addObjectToOutputSlot(ServerObject & object, ServerObject * transferer);
+	ManufactureSchematicObject *       getCraftingManufactureSchematic(void) const;
+	ManufactureSchematicObject *       removeCraftingManufactureSchematic(void);
+	void                               setCraftingManufactureSchematic(ManufactureSchematicObject & schematic);
+	void                               clearCraftingManufactureSchematic(void);
+	ServerObject *                     getCraftingPrototype(void) const;
+	void                               setCraftingPrototype(ServerObject & prototype);
+	void                               clearCraftingPrototype(void);
+	void                               setVisibleComponents(const std::vector<int> & components);
+	static const SlotId &              getCraftingPrototypeSlotId();
+	static const SlotId &              getCraftingManufactureSchematicSlotId();
+	static const char *                generateSerialNumber(const NetworkId & id);
+
+	void                               getAttribBonuses(std::vector<std::pair<int, int> > & attribBonuses) const;
+	bool                               getAttribBonuses(std::vector<int> & attribBonuses) const;
+	int                                getAttribBonus(int attribute) const;
+	void                               setAttribBonus(int attribute, int bonus);
+	void                               getSkillModBonuses(std::vector<std::pair<std::string, int> > & skillModBonuses, bool includeCategorizedSkillmod = true) const;
+	int                                getSkillModBonus(const std::string & skillMod, bool includeCategorizedSkillmod = true) const;
+	void                               setSkillModBonus(const std::string & skillMod, int bonus);
+	void                               setSkillModBonus(const std::string & category, const std::string & skillMod, int bonus);
+	void                               removeCategorizedSkillModBonuses(const std::string & category);
+	bool                               addSkillModSocketBonus(const std::string & skillMod, int bonus);
+	bool                               addSkillModSocketBonuses(const std::vector<std::pair<std::string, int> > & skillModBonuses);
+	int                                getSkillModSockets(void) const;
+	void                               setSkillModSockets(int sockets);
+	void                               getRequiredCertifications(stdvector<std::string>::fwd & results) const;
+
+	void                               forceExecuteCommand(Command const &command, NetworkId const &targetId, Unicode::String const &params, Command::ErrorCode &status, bool commandIsFromCommandQueue);
+	virtual void                       setOwnerId(const NetworkId &id);
+	void                               setMaxHitPoints(int maxHitPoints);
+	void                               setDisabled(bool disabled);
+	void                               setInvulnerable(bool invulnerable);
+	virtual void                       applyDamage(const CombatEngineData::DamageData &damageData);
+	virtual void                       getAttributes(const NetworkId & playerId, AttributeVector &data) const;
+	virtual void                       getAttributes(AttributeVector &data) const;
+	virtual void                       getAttributesForAuction(AttributeVector &data) const;
+
+	// text output functions
+	void                               showFlyText(const StringId &outputText, float scale, int r, int g, int b);
+	void                               showFlyText(const Unicode::String &outputTextOOB, float scale, int r, int g, int b);
+	void                               showFlyText(const Unicode::String &outputTextOOB, float scale, int r, int g, int b, int flags);
+	void                               showCombatText(const TangibleObject & attackerObject, const StringId &outputText, float scale, int r, int g, int b);
+	void                               showCombatText(const TangibleObject & attackerObject, const Unicode::String &outputTextOOB, float scale, int r, int g, int b);
+	virtual void                       handleCMessageTo(const MessageToPayload &message);
+
+	CustomizationData *                fetchCustomizationData   ();
+	const CustomizationData *          fetchCustomizationData   () const;
+
+	virtual int                        onContainerAboutToGainItem(ServerObject& item, ServerObject* transferer);
+	virtual void                       onContainerGainItem(ServerObject& item, ServerObject* source, ServerObject* transferer);
+
+	virtual bool                       onContainerAboutToTransfer(ServerObject * destination, ServerObject* transferer);
+	virtual bool                       onContainerChildAboutToLoseItem(ServerObject *destination, ServerObject &item, ServerObject *transferer);
+	virtual bool                       onContainerChildAboutToGainItem(ServerObject &item, ServerObject *destination, ServerObject *transferer);
+	virtual void                       onContainerChildLostItem(ServerObject *destination, ServerObject &item, ServerObject *source, ServerObject *transferrer);
+	virtual void                       onContainerChildGainItem(ServerObject &item, ServerObject *source, ServerObject *transferer);
+
+	// In TangibleObject_PobItemLimits.cpp:
+	virtual bool                       onPobChildAboutToLoseItem(ServerObject *destination, ServerObject &item, ServerObject *transferer);
+	virtual bool                       onPobChildAboutToGainItem(ServerObject &item, ServerObject *destination, ServerObject *transferer);
+	virtual void                       onPobChildLostItem(ServerObject *destination, ServerObject &item, ServerObject *source, ServerObject *transferer);
+	virtual void                       onPobChildGainItem(ServerObject &item, ServerObject *source, ServerObject *transferer);
+	int                                getPobItemCount() const; // returns the number of items (that count against the item limit) currently in this building
+	int								   getPobBaseItemLimit() const; // returns the base number of items this building can hold
+	int                                getPobTotalItemLimit(int & base, int & additional) const; // returns the total number of items this building can hold (base + storage increase)
+	void                               fixUpPobItemLimit();
+	void                               deletePobPersistedContents(CreatureObject const *player, int deleteReason);
+	NetworkId const &                  movePobItemToPlayer(CreatureObject const &player, int index, bool overrideOwnership);
+	NetworkId const &                  movePobItemToPlayer(CreatureObject const &player, NetworkId const &item, bool overrideOwnership);
+
+	virtual void                       onContainedItemAppearanceDataModified(TangibleObject const & target, std::string const & oldValue, std::string const & value);
+
+	Footprint                         *getFootprint();
+	Footprint const                   *getFootprint() const;
+
+	//permissions functions
+	bool         isOnAdminList(const CreatureObject& player) const;
+	bool         isOnHopperList(const CreatureObject& player) const;
+
+	// NPC conversation functions -----------------------------------------------
+	bool                              startNpcConversation          (TangibleObject & npc, const std::string & convoName, NpcConversationData::ConversationStarter starter, uint32 appearanceOverrideSharedTemplateCrc);
+	void                              endNpcConversation            ();
+	void                              endNpcConversation            (StringId const & stringId, Unicode::String const & oob);
+	void                              clearNpcConversation          ();
+	void                              sendNpcConversationMessage    (const StringId & stringId, const ProsePackage & pp, const Unicode::String & oob);
+	bool                              addNpcConversationResponse    (const StringId & stringId, const ProsePackage & pp);
+	bool                              removeNpcConversationResponse (const StringId & stringId, const ProsePackage & pp);
+	void                              sendNpcConversationResponses  ();
+	void                              respondToNpc                  (int responseIndex);
+	bool                              isInNpcConversation           () const;
+	void                              addConversation               (const NetworkId & conversant);
+	void                              removeConversation            (const NetworkId & conversant);
+	const stdvector<NetworkId>::fwd & getConversations              () const;
+	void                              handlePlayerResponseToNpcConversation (const std::string & conversationName, const NetworkId & player, const StringId & response, const ProsePackage & pp);
+	virtual void                      setCacheVersion (const int cacheVersion);
+
+	// bio-link functions
+	void                               setBioLink(const NetworkId & playerId);
+	void                               setPendingBioLink();
+	void                               clearBioLink();
+	NetworkId                          getBioLink() const;
+	virtual bool                       isBioLinked() const;
+
+	virtual CommandQueue * getCommandQueue() const;
+
+	void commandQueueEnqueue(Command const &command, NetworkId const &targetId, Unicode::String const &params, uint32 sequenceId = 0, bool clearable = true, Command::Priority priority = Command::CP_Default, bool fromServer = false);
+	void commandQueueRemove(uint32 sequenceId);
+	void commandQueueClear();
+	bool commandQueueHasCommandFromGroup(uint32 groupHash) const;
+	void commandQueueClearCommandsFromGroup(uint32 groupHash, bool force = false);
+
+	bool hasAutoDeclineDuel() const;
+
+	void handleIncubatorCommit(CreatureObject const & owner, IncubatorCommitMessage const & msg);
+	void handleIncubatorCancel(CreatureObject const & owner);
+
+protected:
+	virtual void                       endBaselines();
+	virtual void                       initializeFirstTimeObject();
+	virtual void                       onLoadedFromDatabase();
+	virtual void                       virtualOnSetAuthority();
+	int                                getCraftingToolPrototypeTime() const;
+	void                               getAttributesForCraftingTool (AttributeVector & data) const;
+	void                               getAttributesForShipComponent (AttributeVector & data) const;
+
+	virtual void                       updatePlanetServerInternal(bool forceUpdate) const;
+	virtual float                      getPvpRegionCheckTime();
+
+	virtual const SharedObjectTemplate *  getDefaultSharedTemplate(void) const;
+	virtual void setInCombat(bool inCombat);
+
+private:
+
+	struct MaxHitPointsCallback
+	{
+		void modified(TangibleObject &target, int oldValue, int value, bool isLocal) const;
+	};
+	friend struct MaxHitPointsCallback;
+	struct AttackableOverrideCallback
+	{
+		void modified(TangibleObject &target, bool oldValue, bool value, bool isLocal) const;
+	};
+	friend struct AttackableOverrideCallback;
+	// used by m_appearanceData string
+	struct AppearanceDataCallback
+	{
+		void modified(TangibleObject &target, const std::string &oldValue, const std::string &value, bool isLocal) const;
+	};
+	friend struct AppearanceDataCallback;
+	// used by m_customAppearance string
+	struct CustomAppearanceCallback
+	{
+		void modified(TangibleObject &target, const std::string &oldValue, const std::string &value, bool isLocal) const;
+	};
+	friend struct CustomAppearanceCallback;
+
+	struct VisibilityDataCallback
+	{
+		void modified(TangibleObject &target, bool oldValue, bool value, bool isLocal) const;
+	};
+	friend struct VisibilityDataCallback;
+
+	struct CombatStateChangedCallback
+	{
+		void modified(TangibleObject & target, bool oldValue, bool newValue, bool local) const;
+	};
+	friend struct CombatStateChangedCallback;
+
+	struct PassiveRevealPlayerCharacterObserver
+	{
+		PassiveRevealPlayerCharacterObserver(TangibleObject *tangible, Archive::AutoDeltaObserverOp operation);
+		~PassiveRevealPlayerCharacterObserver();
+
+		TangibleObject * m_target;
+	};
+	friend struct PassiveRevealPlayerCharacterObserver;
+
+public:
+
+	typedef Archive::AutoDeltaVariableObserver<int, TangibleConditionObserver, TangibleObject> ConditionObserverType;
+	typedef Archive::AutoDeltaVariableObserver<int, PvpUpdateObserver, TangibleObject> PvpType;
+	typedef Archive::AutoDeltaVariableObserver<uint32, PvpUpdateObserver, TangibleObject> PvpFaction;
+	typedef Archive::AutoDeltaVariableObserver<uint32, PvpUpdateObserver, TangibleObject> PvpRegionCrc;
+	typedef Archive::AutoDeltaVectorObserver<PvpEnemy, PvpEnemiesObserver, TangibleObject> PvpEnemies;
+
+	Pvp::PvpType       getPvpType() const;
+	Pvp::PvpType       getPvpMercenaryType() const;
+	void               setPvpType(Pvp::PvpType pvpType);
+	Pvp::PvpType       getPvpFutureType() const;
+	void               setPvpFutureType(Pvp::PvpType pvpType);
+	Pvp::FactionId     getPvpFaction() const;
+	Pvp::FactionId     getPvpMercenaryFaction() const;
+	virtual void       setPvpFaction(Pvp::FactionId factionId);
+	void               setPvpMercenaryFaction(Pvp::FactionId factionId, Pvp::PvpType pvpType);
+	Region const *     getPvpRegion() const;
+	void               setPvpRegion(Region const *pvpRegion);
+	PvpEnemies const & getPvpEnemies() const;
+	PvpEnemies &       getPvpEnemies();
+	virtual TangibleObject const &getPvpViewer(Client const &client) const;
+
+	bool isNonPvpObject() const;
+
+	virtual bool wantSawAttackTriggers() const;
+	void setWantSawAttackTriggers(bool enable);
+
+	int getCombatDuration() const;
+
+	void setAttackableOverride(bool attackable);
+
+	int getPassiveRevealRange(NetworkId const & target) const;
+	void addPassiveReveal(TangibleObject const & target, int range);
+	void addPassiveReveal(NetworkId const & target, int range, bool isTargetPlayerCharacter);
+	void removePassiveReveal(NetworkId const & target);
+	void removeAllPassiveReveal();
+
+	std::map<NetworkId, int> const & getPassiveReveal() const;
+	std::set<NetworkId> const & getPassiveRevealPlayerCharacter() const;
+
+	bool setOverrideMapColor(unsigned char r, unsigned char g, unsigned char b);
+	bool clearOverrideMapColor();
+	bool getOverrideMapColor(unsigned char & r, unsigned char & g, unsigned char & b) const;
+
+	bool isLocked() const;
+	void addUserToAccessList(NetworkId const user);
+	void removeUserFromAccessList(NetworkId const user);
+	bool isUserOnAccessList(NetworkId const user) const;
+	void clearUserAccessList();
+
+	void addGuildToAccessList(int guildId);
+	void removeGuildFromAccessList(int guildId);
+	bool isGuildOnAccessList(int guildId) const;
+	void clearGuildAccessList();
+
+	void getUserAccessList(std::vector<NetworkId> & ids);
+	void getGuildAccessList(std::vector<int> & ids);
+
+	void addObjectEffect(std::string const & filename, std::string const & hardpoint, Vector const & offset, float scale, std::string const & label);
+	void removeObjectEffect(std::string const & label);
+	void removeAllObjectEffects();
+	bool hasObjectEffect(std::string const & label);
+
+protected:
+	ServerSynchronizedUi * createSynchronizedUi ();
+	virtual void calcPvpableState();
+	bool isCustomizationDataModified() const;
+	void setCustomizationDataModified(bool modified);
+	void setPvpable(bool pvpable);
+
+private:
+
+	static void customizationDataModificationCallback(const CustomizationData &customizationData, const void *context);
+
+private:
+
+	TangibleObject();
+	TangibleObject(const TangibleObject& rhs);
+	TangibleObject&	operator=(const TangibleObject& rhs);
+
+	void handleContainerSetup();
+	void onArrivedAtLocation(const LocationData & location);
+	void customAppearanceModified(const std::string & value);
+	void appearanceDataModified(const std::string & value);
+	void visibilityDataModified();
+	int  alterHitPoints(int delta, bool ignoreInvulnerable, const NetworkId & source = NetworkId::cms_invalid);
+	float getNextAlterTime(float baseAlterTime) const;
+	const char * const getDamageTypeString(ServerArmorTemplate::DamageType damage) const;
+
+	void copyUserAccessListToObjVars();
+	void readInUserAccessListObjVars();
+
+	void copyGuildAccessListToObjVars();
+	void readInGuildAccessListObjVars();
+
+private:
+
+	class CraftingToolSyncUi;
+	static const SharedObjectTemplate * m_defaultSharedTemplate;	// template to use if no shared template is given
+
+	// @todo: what happens to m_combatData if this object is migrated?
+	mutable CombatEngineData::CombatData * m_combatData;	///< info needed by the combat engine if this object is involved in combat
+
+// BPM TangibleObject // Begin persisted members.
+	PvpType                        m_pvpType;
+	PvpType                        m_pvpMercenaryType;
+	PvpType                        m_pvpFutureType;
+	PvpFaction                     m_pvpFaction;
+	PvpFaction                     m_pvpMercenaryFaction;
+	PvpRegionCrc                   m_pvpRegionCrc;
+	PvpEnemies                     m_pvpEnemies;
+	Archive::AutoDeltaVariable<int>                m_damageTaken;			///< Amount of damage this object has taken
+	Archive::AutoDeltaVariableCallback<int, MaxHitPointsCallback, TangibleObject> m_maxHitPoints;			///< The number of hitpoints this object has.
+	Archive::AutoDeltaVariableObserver<NetworkId, CellPermissions::UpdateObserver, TangibleObject> m_ownerId;
+
+	Archive::AutoDeltaVariableCallback<std::string, CustomAppearanceCallback, TangibleObject> m_customAppearance;
+	Archive::AutoDeltaVariableCallback<std::string, AppearanceDataCallback, TangibleObject> m_appearanceData;
+
+	Archive::AutoDeltaVector<LocationData>  m_locationTargets;
+
+	Archive::AutoDeltaSet<int>              m_components;      // component table ids of visible components attached to this object
+
+// EPM
+
+	Archive::AutoDeltaVariableCallback<bool, VisibilityDataCallback, TangibleObject> m_visible;       // flag that the object is visible
+	Archive::AutoDeltaVariableCallback<bool, VisibilityDataCallback, TangibleObject> m_hideFromClient;// flag that the object is visible only to the owner of the object
+	Archive::AutoDeltaVariable<int>         m_count;         // generic counter
+	ConditionObserverType                   m_condition;     // object condition bit flags
+	Archive::AutoDeltaVariable<NetworkId>   m_creatorId;
+	Archive::AutoDeltaVariable<uint32>      m_sourceDraftSchematic;
+
+	typedef Archive::AutoDeltaVector<CachedNetworkId, TangibleObject> TargetIdList;
+
+	HateList m_hateList;
+
+	// for applying "hate over time"
+	Archive::AutoDeltaMap<NetworkId, std::pair<float, std::pair<unsigned long, unsigned long> > > m_hateOverTime;
+
+	Archive::AutoDeltaVariableCallback<bool, CombatStateChangedCallback, TangibleObject> m_inCombat;
+	Archive::AutoDeltaVariable<time_t> m_combatStartTime;
+
+	// allows script to make an object (i.e. like a turret) attackable
+	Archive::AutoDeltaVariableCallback<bool, AttackableOverrideCallback, TangibleObject> m_attackableOverride;
+
+	// tracks objects that have passively revealed this object
+	Archive::AutoDeltaMap<NetworkId, int> m_passiveReveal;
+
+	// tracks player character objects that have passively revealed this object
+	// m_passiveRevealPlayerCharacter is a subset of m_passiveReveal
+	Archive::AutoDeltaSetObserver<NetworkId, PassiveRevealPlayerCharacterObserver, TangibleObject> m_passiveRevealPlayerCharacter;
+
+	// allows script to override the color of an object as it appears on maps, etc.
+	Archive::AutoDeltaVariable<uint32> m_mapColorOverride;
+
+	// Access list of users if the item is condition locked.
+	Archive::AutoDeltaSet<NetworkId> m_accessList;
+
+	// Access list of guilds that can access the item if it's locked.
+	Archive::AutoDeltaSet<int>       m_guildAccessList;
+
+	// List of object effects.
+	Archive::AutoDeltaMap<std::string, std::pair<std::string, std::pair<std::string, std::pair<Vector, float> > > > m_effectsMap;
+
+protected:
+	// NPC conversation data
+	NpcConversation *                                m_npcConversation;
+	Archive::AutoDeltaVector<NetworkId>              m_conversations; ///< Ids of everyone this creature is in conversation with (for NPC conversations)
+
+///@ todo define destroy permissions and equipment slot type list and resource list.
+//  destroyPermissions;					///< The permissions list of who is allowed to destroy an item.
+//	ResourceList resourceList;			///< List of resources that make up this item.
+
+};
+
+// ======================================================================
+
+inline void TangibleObject::CustomAppearanceCallback::modified(TangibleObject &target, const std::string &oldValue, const std::string &value, bool isLocal) const
+{
+	UNREF(oldValue);
+	UNREF(isLocal);
+	target.customAppearanceModified(value);
+}
+
+inline void TangibleObject::VisibilityDataCallback::modified(TangibleObject &target, bool oldValue, bool newValue, bool isLocal) const
+{
+	UNREF(isLocal);
+	if (oldValue != newValue)
+		target.visibilityDataModified();
+}
+
+// ======================================================================
+
+inline TangibleObject::PassiveRevealPlayerCharacterObserver::PassiveRevealPlayerCharacterObserver(TangibleObject *tangible, Archive::AutoDeltaObserverOp)
+: m_target(tangible)
+{
+}
+
+inline TangibleObject::PassiveRevealPlayerCharacterObserver::~PassiveRevealPlayerCharacterObserver()
+{
+	if (m_target)
+		m_target->visibilityDataModified();
+}
+
+// ======================================================================
+
+inline const char * TangibleObject::getCustomAppearance() const
+{
+	if (!m_customAppearance.get().empty())
+		return m_customAppearance.get().c_str();
+	return getSharedTemplateName();
+}
+
+inline void TangibleObject::setCustomAppearance(const std::string & newCustomAppearance)
+{
+	m_customAppearance = newCustomAppearance;
+}
+
+inline const std::string & TangibleObject::getAppearanceData() const
+{
+	return m_appearanceData.get();
+}
+
+inline void TangibleObject::setAppearanceData(const std::string & newAppearanceData)
+{
+	m_appearanceData = newAppearanceData;
+}
+
+inline bool TangibleObject::isInCombat(void) const
+{
+	return m_inCombat.get();
+}
+
+inline Pvp::PvpType TangibleObject::getPvpType() const
+{
+	return static_cast<Pvp::PvpType>(m_pvpType.get());
+}
+
+inline Pvp::PvpType TangibleObject::getPvpMercenaryType() const
+{
+	return static_cast<Pvp::PvpType>(m_pvpMercenaryType.get());
+}
+
+inline Pvp::PvpType TangibleObject::getPvpFutureType() const
+{
+	return static_cast<Pvp::PvpType>(m_pvpFutureType.get());
+}
+
+inline Pvp::FactionId TangibleObject::getPvpFaction() const
+{
+	return static_cast<Pvp::FactionId>(m_pvpFaction.get());
+}
+
+inline Pvp::FactionId TangibleObject::getPvpMercenaryFaction() const
+{
+	return static_cast<Pvp::FactionId>(m_pvpMercenaryFaction.get());
+}
+
+inline TangibleObject::PvpEnemies const &TangibleObject::getPvpEnemies() const
+{
+	return m_pvpEnemies;
+}
+
+inline TangibleObject::PvpEnemies &TangibleObject::getPvpEnemies()
+{
+	return m_pvpEnemies;
+}
+
+inline int TangibleObject::getDamageTaken() const
+{
+	return m_damageTaken.get();
+}
+
+inline int TangibleObject::getMaxHitPoints() const
+{
+	return m_maxHitPoints.get();
+}
+
+inline void TangibleObject::setMaxHitPoints(int maxHitPoints)
+{
+	m_maxHitPoints = maxHitPoints;
+}
+
+inline int TangibleObject::getCount(void) const
+{
+	return m_count.get();
+}
+
+inline void TangibleObject::setCount(int value)
+{
+	m_count = value;
+}
+
+inline void TangibleObject::incrementCount(int delta)
+{
+	m_count = m_count.get() + delta;
+}
+
+inline int TangibleObject::getCondition(void) const
+{
+	return m_condition.get();
+}
+
+inline bool TangibleObject::hasCondition(int condition) const
+{
+	return (m_condition.get() & condition) != 0;
+}
+
+inline bool TangibleObject::isNonPvpObject() const
+{
+	return !getLocalFlag(LocalObjectFlags::TangibleObject_Pvpable);
+}
+
+//-----------------------------------------------------------------------
+
+inline bool TangibleObject::isInNpcConversation () const
+{
+	return !m_conversations.empty();
+}
+
+//-----------------------------------------------------------------------
+
+inline const stdvector<NetworkId>::fwd & TangibleObject::getConversations () const
+{
+	return m_conversations.get ();
+}
+
+//----------------------------------------------------------------------
+
+inline uint32 TangibleObject::getSourceDraftSchematic() const
+{
+	return m_sourceDraftSchematic.get();
+}
+
+//----------------------------------------------------------------------
+
+inline void TangibleObject::createCombatData()
+{
+	if (m_combatData == NULL)
+	{
+		m_combatData = new CombatEngineData::CombatData;
+	}
+}
+
+//----------------------------------------------------------------------
+
+inline bool TangibleObject::isVisible() const
+{
+	return m_visible.get();
+}
+
+//----------------------------------------------------------------------
+
+inline bool TangibleObject::isHidden() const
+{
+	return m_hideFromClient.get();
+}
+
+//----------------------------------------------------------------------
+
+inline std::map<NetworkId, int> const & TangibleObject::getPassiveReveal() const
+{
+	return m_passiveReveal.getMap();
+}
+
+//----------------------------------------------------------------------
+
+inline std::set<NetworkId> const & TangibleObject::getPassiveRevealPlayerCharacter() const
+{
+	return m_passiveRevealPlayerCharacter.get();
+}
+
+//----------------------------------------------------------------------
+
+inline std::map<NetworkId, std::pair<float, std::pair<unsigned long, unsigned long> > > const & TangibleObject::getHateOverTime() const
+{
+	return m_hateOverTime.getMap();
+}
+
+//----------------------------------------------------------------------
+
+inline bool TangibleObject::isHateListOwnerPlayer() const
+{
+	return m_hateList.isOwnerPlayer();
+}
+//----------------------------------------------------------------------
+
+inline std::vector<LocationData> const & TangibleObject::getLocationTargets() const
+{
+	return m_locationTargets.get();
+}
+
+//----------------------------------------------------------------------
+
+inline bool TangibleObject::isLocked() const
+{
+	return hasCondition(C_locked);
+}
+
+//----------------------------------------------------------------------
+
+#endif	// INCLUDED_TangibleObject_H
+
diff --git a/engine/server/library/serverGame/src/shared/object/TangibleObject_Conversation.cpp b/engine/server/library/serverGame/src/shared/object/TangibleObject_Conversation.cpp
new file mode 100644
index 00000000..7f7aafe5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/TangibleObject_Conversation.cpp
@@ -0,0 +1,437 @@
+//======================================================================
+//
+// TangibleObject_Conversation.cpp
+// copyright(c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/TangibleObject_Conversation.h"
+
+#include "serverGame/NpcConversation.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedNetworkMessages/MessageQueueStartNpcConversation.h"
+#include "sharedNetworkMessages/MessageQueueStopNpcConversation.h"
+#include "sharedObject/Controller.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedFoundation/NetworkId.h"
+
+//======================================================================
+
+/**
+ * Starts up a conversation with an NPC. Note that if a player is starting the
+ * conversation it is up to a script to re-call this function via script function
+ * npcInitializeConversation().
+ *
+ * @param npc			the NPC we want to talk to
+ * @param convoName		the conversation name
+ * @param starter		who started the conversation
+ *
+ * @return true if the conversation was started, false if not
+ */
+
+bool TangibleObject::startNpcConversation(TangibleObject & npc, const std::string & convoName, NpcConversationData::ConversationStarter starter, uint32 const appearanceOverrideSharedTemplateCrc)
+{
+	if (isAuthoritative())
+	{
+		// test that I'm a player
+		if (!isPlayerControlled())
+			return false;
+
+		// test that the npc isn't a player
+		if (npc.isPlayerControlled())
+			return false;
+
+		// test if already in a conversation
+		if (m_npcConversation != NULL)
+			return false;
+
+		if (starter == NpcConversationData::CS_Player)
+		{
+			// trigger OnStartNpcConversation
+			ScriptParams params;
+			params.addParam(getNetworkId());
+			bool npcHadTrigger = false;
+			if (npc.getScriptObject()->hasTrigger(Scripting::TRIG_START_NPC_CONVERSATION))
+			{
+				IGNORE_RETURN(npc.getScriptObject()->trigAllScripts(Scripting::TRIG_START_NPC_CONVERSATION, params));
+				npcHadTrigger = true;
+			}
+
+			//inform player that they began a conversation
+			if (getScriptObject()->hasTrigger(Scripting::TRIG_START_CONVERSATION))
+			{
+				ScriptParams playerParams;
+				playerParams.addParam(npc.getNetworkId());
+				IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_START_CONVERSATION, playerParams));
+			}
+
+			return npcHadTrigger;
+		}
+
+		if (convoName.empty())
+		{
+			DEBUG_WARNING(true,("NPC conversation started with empty name!"));
+			return false;
+		}
+
+		delete m_npcConversation;
+		m_npcConversation = new NpcConversation(*this, npc, convoName, appearanceOverrideSharedTemplateCrc);
+
+		// update any proxies
+		addConversation(npc.getNetworkId());
+		npc.addConversation(getNetworkId());
+	}
+	else
+	{
+		MessageQueueStartNpcConversation * const message = new MessageQueueStartNpcConversation;
+		message->setNpc(npc.getNetworkId());
+		message->setStarter(starter);
+		message->setConversationName(std::string(convoName));
+		message->setAppearanceOverrideTemplateCrc(appearanceOverrideSharedTemplateCrc);
+		sendControllerMessageToAuthServer(CM_npcConversationStart, message);
+	}  //lint !e429 //cust ptr msg
+	return true;
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::endNpcConversation(StringId const & stringId, Unicode::String const & oob)
+{
+	if (isAuthoritative() && m_npcConversation)
+	{
+		m_npcConversation->setFinalStringId(stringId);
+		m_npcConversation->setFinalProsePackage(oob);
+	}
+
+	endNpcConversation();
+}
+
+//-----------------------------------------------------------------------
+
+/**
+* Ends a conversation with an NPC.
+*/
+void TangibleObject::endNpcConversation()
+{
+	if (isAuthoritative())
+	{
+		if (m_npcConversation != NULL)
+		{
+			// I am a player, end my conversation
+
+			// verify that I am a player
+			if (isPlayerControlled())
+			{
+				TangibleObject * const npc = safe_cast<TangibleObject*>(m_npcConversation->getNPC().getObject());
+				if (npc != NULL)
+				{
+					// trigger OnEndNpcConversation
+					ScriptParams params;
+					params.addParam(getNetworkId());
+					bool overridden = false;
+					if (npc->getScriptObject()->trigAllScripts(Scripting::TRIG_END_NPC_CONVERSATION, params) == SCRIPT_OVERRIDE)
+					{
+						overridden = true;
+					}
+
+					//trigger OnEndNpcConversation
+					ScriptParams playerParams;
+					playerParams.addParam(npc->getNetworkId());
+					if (getScriptObject()->trigAllScripts(Scripting::TRIG_END_CONVERSATION, playerParams) == SCRIPT_OVERRIDE)
+					{
+						overridden = true;
+					}
+
+					if(overridden)
+						return;
+
+					// update any proxies
+					npc->removeConversation(getNetworkId());
+				}
+				removeConversation(m_npcConversation->getNPC());
+			}
+			else
+			{
+				WARNING(true,("TangibleObject::endNpcConversation: creature %s has a non-null m_npcConversation pointer %p but is not a player-controlled object!", 
+					getNetworkId().getValueString().c_str(), m_npcConversation));
+				m_conversations.clear();
+			}
+
+			delete m_npcConversation;
+			m_npcConversation = NULL;
+		}
+		else
+		{
+			// I am an npc, end conversations with players
+
+			// verify that I am an npc
+			if (!isPlayerControlled())
+			{
+				// since m_conversations will be changed as players are forced out
+				// of the conversation, we need to make a copy of our conversants
+				typedef stdvector<NetworkId>::fwd NetworkIdVector;
+				NetworkIdVector conversants(m_conversations.get());
+
+				{
+					for (NetworkIdVector::iterator it = conversants.begin(); it != conversants.end(); ++it)
+					{
+						NetworkId const & networkId = *it;
+						TangibleObject * const player = dynamic_cast<TangibleObject *>(NetworkIdManager::getObjectById(networkId));
+						if (player != NULL)
+							player->endNpcConversation();
+					}
+				}
+			}
+			else
+			{
+				WARNING(true,("TangibleObject::endNpcConversation: creature %s has a null m_npcConversation pointer but is a player-controlled object!", 
+					getNetworkId().getValueString().c_str()));
+				m_conversations.clear();
+			}
+		}
+	}
+	else
+	{
+		MessageQueueStopNpcConversation * const message = new MessageQueueStopNpcConversation;
+
+		if (m_npcConversation) 
+		{
+			message->setFinalMessageId(m_npcConversation->getFinalStringId());
+			message->setFinalMessageProse(m_npcConversation->getFinalProsePackage());
+		}
+
+		sendControllerMessageToAuthServer(CM_npcConversationStop, message);
+	}  //lint !e429 //cust ptr msg
+
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Clears the current responses available to the player.
+ */
+void TangibleObject::clearNpcConversation()
+{
+	if (m_npcConversation != NULL)
+	{
+		m_npcConversation->clearResponses();
+	}
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sends an npc message to the player.
+ *
+ * @param message		the message to send
+ */
+void TangibleObject::sendNpcConversationMessage(const StringId & stringId, const ProsePackage & pp, const Unicode::String & oob)
+{
+	if (isAuthoritative())
+	{
+		if (m_npcConversation != NULL)
+		{
+			NpcConversation::Response response;
+			response.stringId = stringId;
+			response.pp       = pp;
+			m_npcConversation->sendMessage(response, oob);
+		}
+	}
+	else
+	{
+		typedef std::pair<std::pair<StringId, ProsePackage>, Unicode::String> Payload;
+		sendControllerMessageToAuthServer(CM_forwardNpcConversationMessage, new MessageQueueGenericValueType<Payload>(std::make_pair(std::make_pair(stringId, pp), oob)));
+	}
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Adds a response to be available to the player.
+ *
+ * @param response		the response
+ *
+ * @return true if the response was added, false if not
+ */
+bool TangibleObject::addNpcConversationResponse(const StringId & stringId, const ProsePackage & pp)
+{
+	if (isAuthoritative())
+	{
+		if (m_npcConversation != NULL)
+		{
+			NpcConversation::Response response;
+			response.stringId = stringId;
+			response.pp       = pp;
+			m_npcConversation->addResponse(response);
+			return true;
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_addNpcConversationResponse, new MessageQueueGenericValueType<std::pair<StringId, ProsePackage> >(std::make_pair(stringId, pp)));
+		return true;
+	}
+	return false;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Removes a response from the current response list.
+ *
+ * @param response		the response
+ *
+ * @return true if the response was removed, false if not
+ */
+bool TangibleObject::removeNpcConversationResponse(const StringId & stringId, const ProsePackage & pp)
+{
+	bool result = false;
+	if (isAuthoritative())
+	{
+		if (m_npcConversation != NULL)
+		{
+			NpcConversation::Response response;
+			response.stringId = stringId;
+			response.pp       = pp;
+			m_npcConversation->removeResponse(response);
+			result = true;
+		}
+	}
+	else
+	{
+		sendControllerMessageToAuthServer(CM_removeNpcConversationResponse, new MessageQueueGenericValueType<std::pair<StringId, ProsePackage> >(std::make_pair(stringId, pp)));
+		result = true;
+	}
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sends the current npc conversation responses to the player.
+ */
+void TangibleObject::sendNpcConversationResponses()
+{
+	if (isAuthoritative())
+	{
+		if (m_npcConversation != NULL)
+		{
+			m_npcConversation->sendResponses();
+		}
+	}
+	else
+	{
+		Controller * const controller = NON_NULL(getController());
+		controller->appendMessage(CM_sendNpcConversationResponses, 0.0f, NULL, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Called when a player selects a response to an NPC.
+ *
+ * @param responseIndex		the index of the response chosen(base 0)
+ */
+void TangibleObject::respondToNpc(int responseIndex)
+{
+	if (isAuthoritative())
+	{
+		if (m_npcConversation != NULL)
+		{
+			TangibleObject * const npc = safe_cast<TangibleObject *>(m_npcConversation->getNPC().getObject());
+			if (npc == NULL)
+			{
+				endNpcConversation();
+				return;
+			}
+
+			if (responseIndex < 0)
+				return;
+
+			const NpcConversation::Response & response = m_npcConversation->getResponse(responseIndex);
+			if (response.isValid())
+				npc->handlePlayerResponseToNpcConversation(m_npcConversation->getName(), getNetworkId(), response.stringId, response.pp);
+		}
+	}
+	else
+	{
+		Controller * const controller = getController();
+		if (controller)
+			controller->appendMessage(CM_npcConversationSelect, static_cast<float>(responseIndex), NULL, GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_SERVER);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void TangibleObject::handlePlayerResponseToNpcConversation(const std::string & conversationName, const NetworkId & player, const StringId & stringId, const ProsePackage & pp)
+{
+	if (isAuthoritative())
+	{
+		TangibleObject * const playerObject = safe_cast<TangibleObject *>(NetworkIdManager::getObjectById(player));
+		if (playerObject != NULL)
+		{
+			// trigger OnNpcConversationResponse
+			ScriptParams params;
+			params.addParam(conversationName.c_str());
+			params.addParam(player);
+
+			if (!stringId.isInvalid())
+				params.addParam(stringId);
+			else
+				params.addParam(pp.stringId);
+
+			IGNORE_RETURN(getScriptObject()->trigAllScripts(Scripting::TRIG_NPC_CONVERSATION_RESPONSE, params));
+			playerObject->sendNpcConversationResponses();
+		}
+	}
+	else
+	{
+		typedef std::pair<StringId, ProsePackage>       ResponsePair;
+		typedef std::pair<NetworkId, ResponsePair>      PlayerResponse;
+		typedef std::pair<std::string, PlayerResponse>  Payload;
+		typedef MessageQueueGenericValueType<Payload>   MsgType;
+
+		MsgType * const msg = new MsgType(Payload(conversationName, PlayerResponse(player, ResponsePair(stringId, pp))));
+		sendControllerMessageToAuthServer(CM_playerResponseToNpcConversation, msg);
+	} //lint !e429 //cust ptr msg
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Adds the network id of a creature this creature is talking to.
+ *
+ * @param conversant		id of the creature we want to add
+ */
+void TangibleObject::addConversation(const NetworkId & conversant)
+{
+	// check for duplicate value
+	if (m_conversations.find(conversant) >= 0)
+		return;
+
+	// add the conversant
+	m_conversations.push_back(conversant);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Removes the network id of a creature this creature is talking to.
+ *
+ * @param conversant		id of the creature we want to remove
+ */
+void TangibleObject::removeConversation(const NetworkId & conversant)
+{
+	// check for duplicate value
+	int const index = m_conversations.find(conversant);
+	if (index >= 0)
+		m_conversations.erase(static_cast<size_t>(index));
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/TangibleObject_Conversation.h b/engine/server/library/serverGame/src/shared/object/TangibleObject_Conversation.h
new file mode 100644
index 00000000..5cb8886b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/TangibleObject_Conversation.h
@@ -0,0 +1,17 @@
+//======================================================================
+//
+// TangibleObject_Conversation.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_TangibleObject_Conversation_H
+#define INCLUDED_TangibleObject_Conversation_H
+
+//======================================================================
+
+#include "serverGame/TangibleObject.h"
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/TangibleObject_PobItemLimit.cpp b/engine/server/library/serverGame/src/shared/object/TangibleObject_PobItemLimit.cpp
new file mode 100644
index 00000000..e1f0e87d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/TangibleObject_PobItemLimit.cpp
@@ -0,0 +1,572 @@
+// ======================================================================
+//
+// TangibleObject_PobItemLimit.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/TangibleObject.h"
+
+#include "serverGame/BuildingObject.h"
+#include "serverGame/CellObject.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ServerCreatureObjectTemplate.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedLog/Log.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainer.h"
+#include "sharedObject/VolumeContainer.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+
+// ======================================================================
+
+namespace TangibleObjectNamespace
+{
+	void remove();
+	bool isCreatureObject(Object const &object);
+	bool isPlayerPob(TangibleObject const &pob);
+	bool countsToItemLimit(ServerObject const &item, TangibleObject const &pob, ServerObject const *firstParentOfDestination);
+	void logContents(ServerObject const &item);
+	std::string const &getItemLogPobType(TangibleObject const &pob); //lint !e1929 // ok to return a reference when it always refers to a static
+	void permanentlyDestroyContents(ServerObject &item, int deleteReason);
+
+	std::string const OBJVAR_POB_ITEM_LIMIT("itemLimit");
+	std::string const OBJVAR_POB_ITEM_LIMIT_INCREASE ("structureChange.storageIncrease");
+	std::string const s_itemLogPobTypeString_House("house");
+	std::string const s_itemLogPobTypeString_Ship("ship");
+
+	// for structures that uses up additional lots over the structure footprint,
+	// keep a list of them here, so that we can include the additional lots when
+	// calculating the base item limit for the structure
+	std::map<uint32, int> s_mapPobLotIncreaseAdjustment;
+}
+
+using namespace TangibleObjectNamespace;
+
+// ======================================================================
+
+bool TangibleObjectNamespace::isCreatureObject(Object const &object)
+{
+	return object.getObjectTemplate()->getId() == ServerCreatureObjectTemplate::ServerCreatureObjectTemplate_tag;
+}
+
+// ----------------------------------------------------------------------
+
+bool TangibleObjectNamespace::isPlayerPob(TangibleObject const &pob)
+{
+	ShipObject const * const pobAsShip = pob.asShipObject();
+	if (pobAsShip)
+		return pobAsShip->isPlayerShip();
+	BuildingObject const * const pobAsBuilding = pob.asBuildingObject();
+	if (pobAsBuilding)
+		return pobAsBuilding->isPlayerPlaced();
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool TangibleObjectNamespace::countsToItemLimit(ServerObject const &item, TangibleObject const &pob, ServerObject const *firstParentOfDestination)
+{
+	if (&item == firstParentOfDestination && item.getGameObjectType() == SharedObjectTemplate::GOT_misc_container_ship_loot)
+		return true;
+
+	return    item.isPersisted()
+	       && firstParentOfDestination
+	       && !isCreatureObject(item)
+	       && !isCreatureObject(*firstParentOfDestination)
+	       && isPlayerPob(pob)
+	       && !firstParentOfDestination->isVendor();
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObjectNamespace::logContents(ServerObject const &item)
+{
+	Container const * const container = ContainerInterface::getContainer(item);
+	if (container)
+	{
+		std::string const &itemLog = item.getItemLog();
+		for (ContainerConstIterator i = container->begin(); i != container->end(); ++i)
+		{
+			ServerObject const * const content = safe_cast<ServerObject const *>((*i).getObject());
+			if (content)
+			{
+				LOG("CustomerService", ("DropLog:    Item: %s in %s", content->getItemLog().c_str(), itemLog.c_str()));
+				logContents(*content);
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObjectNamespace::remove()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::install()
+{
+	// for structures that uses up additional lots over the structure footprint,
+	// keep a list of them here, so that we can include the additional lots when
+	// calculating the base item limit for the structure
+	char const * const playerStructureDataTableName = "datatables/structure/player_structure.iff";
+	DataTable * table = DataTableManager::getTable(playerStructureDataTableName, true);
+	if (table)
+	{
+		int const columnStructure = table->findColumnNumber("STRUCTURE");
+		int const columnLotReduction = table->findColumnNumber("LOT_REDUCTION");
+		if ((columnStructure >= 0) && (columnLotReduction >= 0))
+		{
+			std::string structure;
+			int lotReduction;
+
+			for (int i = 0, numRows = table->getNumRows(); i < numRows; ++i)
+			{
+				structure = table->getStringValue(columnStructure, i);
+				if (structure.empty())
+					continue;
+
+				lotReduction = table->getIntValue(columnLotReduction, i);
+				if (lotReduction >= 0)
+					continue;
+
+				s_mapPobLotIncreaseAdjustment[CrcLowerString::calculateCrc(structure.c_str())] = -lotReduction;
+			}
+		}
+
+		DataTableManager::close(playerStructureDataTableName);
+	}
+
+	ExitChain::add(TangibleObjectNamespace::remove, "TangibleObjectNamespace::remove");
+}
+
+// ----------------------------------------------------------------------
+
+bool TangibleObject::onPobChildAboutToLoseItem(ServerObject *, ServerObject &, ServerObject *transferer)
+{
+	if (transferer && ContainerInterface::getTopmostContainer(*transferer) != this)
+		return false;
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool TangibleObject::onPobChildAboutToGainItem(ServerObject &item, ServerObject *destination, ServerObject *transferer)
+{
+	// Only let people transfer stuff in a pob if they are in the pob
+	if (transferer && ContainerInterface::getTopmostContainer(*transferer) != this)
+		return false;
+
+	ServerObject * const firstParent = destination ? safe_cast<ServerObject *>(ContainerInterface::getFirstParentInWorld(*destination)) : 0;
+	if (countsToItemLimit(item, *this, firstParent))
+	{
+		Container const * const container = ContainerInterface::getContainer(*this);
+		if (container)
+		{
+			// no dropping things that count toward item limits in demand loaded cells that are not loaded
+			ServerObject const * const cell = safe_cast<ServerObject const *>((*container->begin()).getObject());
+			if (cell && !cell->getLoadContents() && !cell->areContentsLoaded())
+				return false;
+
+			// check item limits
+			if (getObjVars().hasItem(OBJVAR_POB_ITEM_LIMIT))
+			{
+				int volume = item.getVolume();
+				if (item.getGameObjectType() == SharedObjectTemplate::GOT_misc_container_ship_loot)
+					--volume;
+
+				int baseItemLimit = 0;
+				int additionalItems = 0;
+				const int itemLimit = getPobTotalItemLimit(baseItemLimit, additionalItems);
+
+				int const limit = getPobItemCount();
+
+				DEBUG_REPORT_LOG(true,("*** \nnetworkId[%s]\ngetNumberOfLots()=%d\nbaseItemLimit=%d\nadditionalItems=%d\nlimit=%d\nvolume=%d\n\n\n",
+					getNetworkId().getValueString().c_str(),
+					getNumberOfLots(),
+					baseItemLimit,
+					additionalItems,
+					limit,
+					volume
+					));
+
+				if (limit + volume > itemLimit)
+				{
+					// if the item is currently immediately contained inside
+					// a cell of this POB, then allow the transfer, because
+					// we are only moving items within the POB, and not really
+					// adding a new item; this is required for /restoreDecorationLayout
+					// to work when the POB is already full, and all we are
+					// doing is just moving stuff around the POB
+					bool ignoreOverlimit = false;
+					while (true)
+					{
+						ServerObject const * const itemContainingCell = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(item));
+						if (!itemContainingCell || !itemContainingCell->asCellObject())
+							break;
+
+						if (!destination || !destination->asCellObject())
+							break;
+
+						ServerObject const * const itemContainingPob = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*itemContainingCell));
+						if (!itemContainingPob)
+							break;
+
+						if (const_cast<ServerObject *>(itemContainingPob) != this)
+							break;
+
+						if (const_cast<ServerObject *>(itemContainingPob) != ContainerInterface::getContainedByObject(*destination))
+							break;
+
+						ignoreOverlimit = true;
+						break;
+					}
+
+					if (!ignoreOverlimit)
+					{
+						if (transferer && transferer->getClient())
+							ContainerInterface::sendContainerMessageToClient(*transferer, Container::CEC_HouseItemLimit);
+						return false;
+					}
+				}
+			}
+		}
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::onPobChildLostItem(ServerObject *, ServerObject &item, ServerObject *source, ServerObject *transferer)
+{
+	ServerObject * const firstParent = source ? safe_cast<ServerObject *>(ContainerInterface::getFirstParentInWorld(*source)) : 0;
+	if (countsToItemLimit(item, *this, firstParent))
+	{
+		LOG(
+			"CustomerService",
+			(
+				"DropLog: Player %s has removed object %s from %s %s",
+				transferer ? PlayerObject::getAccountDescription(transferer->asCreatureObject()).c_str() : "The Game System",
+				item.getItemLog().c_str(),
+				getItemLogPobType(*this).c_str(),
+				getNetworkId().getValueString().c_str()));
+		logContents(item);
+
+		fixUpPobItemLimit();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::onPobChildGainItem(ServerObject &item, ServerObject *, ServerObject *transferer)
+{
+	ServerObject * const firstParent = safe_cast<ServerObject *>(ContainerInterface::getFirstParentInWorld(item));
+	if (countsToItemLimit(item, *this, firstParent))
+	{
+		LOG(
+			"CustomerService",
+			(
+				"DropLog: Player %s has put object %s in %s %s",
+				transferer ? PlayerObject::getAccountDescription(transferer->asCreatureObject()).c_str() : "The Game System",
+				item.getItemLog().c_str(),
+				getItemLogPobType(*this).c_str(),
+				getNetworkId().getValueString().c_str()));
+		logContents(item);
+
+		fixUpPobItemLimit();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+// returns the number of items (that count against the item limit) currently in this building
+int TangibleObject::getPobItemCount() const
+{
+	int limit = 0;
+	if (getObjVars().getItem(OBJVAR_POB_ITEM_LIMIT, limit))
+		return limit;
+
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+// returns the base number of items this pob can hold
+int TangibleObject::getPobBaseItemLimit() const
+{
+	int limitBasedOnLots = 0;
+	if (!getObjVars().getItem("structure.capacity_override", limitBasedOnLots))
+	{
+		int numberOfLots = (getNumberOfLots() / 4);
+
+		// the higher of the lots used by the footprint vs lots actually
+		// consumed will be used to calculate the base limit based on lots
+		std::map<uint32, int>::const_iterator const iterFind = s_mapPobLotIncreaseAdjustment.find(getTemplateCrc());
+		if (iterFind != s_mapPobLotIncreaseAdjustment.end())
+			numberOfLots += iterFind->second;
+
+		limitBasedOnLots = numberOfLots * ConfigServerGame::getHouseItemLimitMultiplier();
+	}
+
+	const int limitBasedOnConfig = ConfigServerGame::getMaxHouseItemLimit();
+	const int baseItemLimit = std::min(limitBasedOnLots,limitBasedOnConfig);
+
+	DEBUG_REPORT_LOG(true,("*** \nnetworkId[%s]\ngetNumberOfLots()=%d\nlimitBasedOnLots=%d\nlimitBasedOnConfig=%d\nbaseItemLimit=%d\n\n\n",
+		getNetworkId().getValueString().c_str(),
+		getNumberOfLots(),
+		limitBasedOnLots,
+		limitBasedOnConfig,
+		baseItemLimit
+	));
+
+	return baseItemLimit;
+}
+
+// ----------------------------------------------------------------------
+
+// returns the total number of items this building can hold (base + storage increase)
+int TangibleObject::getPobTotalItemLimit(int & base, int & additional) const
+{
+	base = getPobBaseItemLimit();
+
+	if (!getObjVars().getItem(OBJVAR_POB_ITEM_LIMIT_INCREASE, additional))
+		additional = 0;
+
+	return (base + additional);
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::fixUpPobItemLimit()
+{
+	DEBUG_FATAL(!getPortalProperty(), ("fixUpPobItemLimit called on non-pob"));
+
+	Container const * const container = ContainerInterface::getContainer(*this);
+	if (container)
+	{
+		int totalVolume = 0;
+		for (ContainerConstIterator i = container->begin(); i != container->end(); ++i)
+		{
+			ServerObject const * const cell = safe_cast<ServerObject const *>((*i).getObject());
+			if (cell)
+			{
+				Container const * const cellContainer = ContainerInterface::getContainer(*cell);
+				if (cellContainer)
+				{
+					for (ContainerConstIterator j = cellContainer->begin(); j != cellContainer->end(); ++j)
+					{
+						ServerObject const * const cellContent = safe_cast<ServerObject const *>((*j).getObject());
+						if (cellContent && countsToItemLimit(*cellContent, *this, cellContent))
+						{
+							totalVolume += cellContent->getVolume();
+							if (cellContent->getGameObjectType() == SharedObjectTemplate::GOT_misc_container_ship_loot)
+							{
+								--totalVolume;
+							}
+							else if (cellContent->asTangibleObject() && cellContent->asTangibleObject()->isCraftingStation())
+							{
+								// for crafting station, the contents of the hopper count against the item limit
+								static const ConstCharCrcLowerString INGREDIENT_HOPPER_SLOT_NAME = "ingredient_hopper";
+								static const SlotId hopperSlotId(SlotIdManager::findSlotId(INGREDIENT_HOPPER_SLOT_NAME));
+
+								Container::ContainerErrorCode tmp = Container::CEC_Success;
+								SlottedContainer const * const stationContainer = ContainerInterface::getSlottedContainer(*cellContent);
+								if (stationContainer)
+								{
+									Container::ContainedItem const hopperId = stationContainer->getObjectInSlot(hopperSlotId, tmp);
+
+									if (hopperId.isValid())
+									{
+										ServerObject const * const hopper = safe_cast<ServerObject const *>(hopperId.getObject());
+
+										if (hopper)
+										{
+											VolumeContainer const * const hopperContainer = ContainerInterface::getVolumeContainer(*hopper);
+
+											if (hopperContainer)
+												totalVolume += hopperContainer->getCurrentVolume();
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		IGNORE_RETURN(setObjVarItem(OBJVAR_POB_ITEM_LIMIT, totalVolume));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObject::deletePobPersistedContents(CreatureObject const *player, int deleteReason)
+{
+	DEBUG_FATAL(!getPortalProperty(), ("deletePobPersistedContents called on non-pob"));
+
+	if (player && player->getNetworkId() != getOwnerId())
+		return; // only the owner of the pob can do this
+
+	if (isPlayerPob(*this))
+	{
+		Container * const container = ContainerInterface::getContainer(*this);
+		if (container)
+		{
+			for (ContainerIterator i = container->begin(); i != container->end(); ++i)
+			{
+				ServerObject * const cell = safe_cast<ServerObject *>((*i).getObject());
+				if (cell)
+				{
+					Container * const cellContainer = ContainerInterface::getContainer(*cell);
+					if (cellContainer)
+					{
+						for (ContainerIterator j = cellContainer->begin(); j != cellContainer->end(); ++j)
+						{
+							ServerObject * const cellContent = safe_cast<ServerObject *>((*j).getObject());
+							if (cellContent && countsToItemLimit(*cellContent, *this, cellContent))
+							{
+								if (cellContent->getGameObjectType() == SharedObjectTemplate::GOT_misc_container_ship_loot)
+									permanentlyDestroyContents(*cellContent, deleteReason);
+								else
+									IGNORE_RETURN(cellContent->permanentlyDestroy(deleteReason));
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & TangibleObject::movePobItemToPlayer(CreatureObject const &player, int index, bool overrideOwnership)
+{
+	DEBUG_FATAL(!getPortalProperty(), ("movePobItemToPlayer called on non-pob"));
+
+	if (!overrideOwnership && player.getNetworkId() != getOwnerId())
+		return NetworkId::cms_invalid;// only the owner of the pob can do this
+
+	if (ContainerInterface::getTopmostContainer(player) != this)
+		return NetworkId::cms_invalid; // only works if player is standing in the pob
+
+	CellObject const * const playerCell = ContainerInterface::getContainingCellObject(player);
+	if (playerCell && isPlayerPob(*this))
+	{
+		Container * const container = ContainerInterface::getContainer(*this);
+		if (container)
+		{
+			for (ContainerIterator i = container->begin(); i != container->end(); ++i)
+			{
+				ServerObject * const cell = safe_cast<ServerObject *>((*i).getObject());
+				if (cell)
+				{
+					Container *cellContainer = ContainerInterface::getContainer(*cell);
+					if (cellContainer)
+					{
+						for (ContainerIterator j = cellContainer->begin(); j != cellContainer->end(); ++j)
+						{
+							ServerObject * const cellContent = safe_cast<ServerObject *>((*j).getObject());
+							if (   cellContent
+							    && countsToItemLimit(*cellContent, *this, cellContent)
+							    && cellContent->getGameObjectType() != SharedObjectTemplate::GOT_misc_container_ship_loot)
+							{
+								if (index <= 0)
+								{
+									cellContent->teleportObject(player.getPosition_w(), playerCell->getNetworkId(), "", player.getPosition_p(), "");
+									return cellContent->getNetworkId();
+								}
+								--index;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return NetworkId::cms_invalid;
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & TangibleObject::movePobItemToPlayer(CreatureObject const &player, NetworkId const &item, bool overrideOwnership)
+{
+	DEBUG_FATAL(!getPortalProperty(), ("movePobItemToPlayer called on non-pob"));
+
+	if (!overrideOwnership && player.getNetworkId() != getOwnerId())
+		return NetworkId::cms_invalid;// only the owner of the pob can do this
+
+	if (ContainerInterface::getTopmostContainer(player) != this)
+		return NetworkId::cms_invalid; // only works if player is standing in the pob
+
+	ServerObject * const itemObject = ServerWorld::findObjectByNetworkId(item);
+	if (!itemObject)
+		return NetworkId::cms_invalid; // item not found
+
+	ServerObject const * const itemContainer = safe_cast<ServerObject const *>(ContainerInterface::getContainedByObject(*itemObject));
+	if (!itemContainer)
+		return NetworkId::cms_invalid; // item must be the topmost item in the cell
+
+	if (!itemContainer->asCellObject())
+		return NetworkId::cms_invalid; // item must be the topmost item in the cell
+
+	if (ContainerInterface::getTopmostContainer(*itemContainer) != this)
+		return NetworkId::cms_invalid; // item is not contained inside this pob
+
+	CellObject const * const playerCell = ContainerInterface::getContainingCellObject(player);
+	if (playerCell && isPlayerPob(*this) && countsToItemLimit(*itemObject, *this, itemObject) && (itemObject->getGameObjectType() != SharedObjectTemplate::GOT_misc_container_ship_loot))
+	{
+		itemObject->teleportObject(player.getPosition_w(), playerCell->getNetworkId(), "", player.getPosition_p(), "");
+		return itemObject->getNetworkId();
+	}
+
+	return NetworkId::cms_invalid;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const &TangibleObjectNamespace::getItemLogPobType(TangibleObject const &container)
+{ //lint !e1929 // ok to return a reference when it always refers to a static
+	if (container.asShipObject())
+		return s_itemLogPobTypeString_Ship;
+	return s_itemLogPobTypeString_House;
+}
+
+// ----------------------------------------------------------------------
+
+void TangibleObjectNamespace::permanentlyDestroyContents(ServerObject &item, int deleteReason)
+{
+	std::vector<Watcher<ServerObject> > contents;
+
+	Container * const container = ContainerInterface::getContainer(item);
+	if (container)
+	{
+		for (ContainerIterator i = container->begin(); i != container->end(); ++i)
+		{
+			ServerObject * const content = safe_cast<ServerObject *>((*i).getObject());
+			if (content)
+				contents.push_back(Watcher<ServerObject>(content));
+		}
+	}
+
+	for (std::vector<Watcher<ServerObject> >::iterator i = contents.begin(); i != contents.end(); ++i)
+	{
+		ServerObject * const content = (*i).getPointer();
+		if (content)
+			IGNORE_RETURN(content->permanentlyDestroy(deleteReason));
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/TriggerVolume.cpp b/engine/server/library/serverGame/src/shared/object/TriggerVolume.cpp
new file mode 100644
index 00000000..b9251c57
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/TriggerVolume.cpp
@@ -0,0 +1,594 @@
+// ======================================================================
+//
+// TriggerVolume.cpp
+//
+// Copyright 2000-04 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/TriggerVolume.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptDictionary.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverScript/ScriptMessage.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedObject/NetworkIdManager.h"
+#include <algorithm>
+#include <hash_map>
+
+// ======================================================================
+
+namespace TriggerVolumeNamespace
+{
+
+	// ----------------------------------------------------------------------
+
+	class TriggerScriptParam
+	{
+	public:
+		void add(NetworkId const & source, NetworkId const & target, const char * name, bool isEnter);
+		void remove(NetworkId const & id);
+		void clear();
+
+		std::deque<bool> const &  getIsEnter() const;
+		std::vector<const char *> const & getNames() const;
+		std::vector<NetworkId> const & getSources() const;
+		std::vector<NetworkId> const & getTargets() const;
+
+	private:
+		std::deque<bool>          m_isEnter;
+		std::vector<const char *> m_names;
+		std::vector<NetworkId>    m_sources;
+		std::vector<NetworkId>    m_targets;
+
+		// optimization to track how many time a NetworkId appears
+		// in sources and targets, so that we can avoid unnecessarily
+		// searching the entire sources and targets vectors
+		std::hash_map<NetworkId, int> m_sourcesCount;
+		std::hash_map<NetworkId, int> m_targetsCount;
+	};
+
+	// ----------------------------------------------------------------------
+
+	void TriggerScriptParam::add(NetworkId const & source, NetworkId const & target, const char * name, bool isEnter)
+	{
+		m_isEnter.push_back(isEnter);
+		m_names.push_back(name);
+		m_sources.push_back(source);
+		m_targets.push_back(target);
+
+		std::hash_map<NetworkId, int>::iterator i = m_sourcesCount.find(source);
+		if (i == m_sourcesCount.end())
+			m_sourcesCount[source] = 1;
+		else
+			++(i->second);
+
+		i = m_targetsCount.find(target);
+		if (i == m_targetsCount.end())
+			m_targetsCount[target] = 1;
+		else
+			++(i->second);
+	}
+
+	// ----------------------------------------------------------------------
+
+	void TriggerScriptParam::remove(NetworkId const & id)
+	{
+		// remove all entries from sources
+		// and targets for the specified id
+		std::hash_map<NetworkId, int>::iterator const iterCountSource = m_sourcesCount.find(id);
+		if (iterCountSource != m_sourcesCount.end())
+		{
+			int countSource = iterCountSource->second;
+			for (std::vector<NetworkId>::iterator s = m_sources.begin(); ((s != m_sources.end()) && (countSource > 0));)
+			{
+				if (*s == id)
+				{
+					size_t const index = std::distance(m_sources.begin(), s);
+
+					// remove corresponding item from m_isEnter
+					std::deque<bool>::iterator enterIter = m_isEnter.begin();
+					std::advance(enterIter, index);
+					IGNORE_RETURN(m_isEnter.erase(enterIter));
+					
+					// remove corresponding item from m_names
+					std::vector<const char *>::iterator namesIter = m_names.begin();
+					std::advance(namesIter, index);
+					IGNORE_RETURN(m_names.erase(namesIter));
+
+					// remove corresponding item from m_targets
+					std::vector<NetworkId>::iterator targetsIter = m_targets.begin();
+					std::advance(targetsIter, index);
+
+					std::hash_map<NetworkId, int>::iterator const iterCountTarget = m_targetsCount.find(*targetsIter);
+					if (iterCountTarget != m_targetsCount.end())
+					{
+						if (iterCountTarget->second <= 1)
+							m_targetsCount.erase(iterCountTarget);
+						else
+							--(iterCountTarget->second);
+					}
+
+					IGNORE_RETURN(m_targets.erase(targetsIter));
+
+					// remove item from m_sources
+					s =  m_sources.erase(s);
+					--countSource;
+				}
+				else
+				{
+					++s;
+				}
+			}
+
+			m_sourcesCount.erase(iterCountSource);
+		}
+
+		std::hash_map<NetworkId, int>::iterator const iterCountTarget = m_targetsCount.find(id);
+		if (iterCountTarget != m_targetsCount.end())
+		{
+			int countTarget = iterCountTarget->second;
+			for (std::vector<NetworkId>::iterator s = m_targets.begin(); ((s != m_targets.end()) && (countTarget > 0));)
+			{
+				if (*s == id)
+				{
+					size_t const index = std::distance(m_targets.begin(), s);
+
+					// remove corresponding item from m_isEnter
+					std::deque<bool>::iterator enterIter = m_isEnter.begin();
+					std::advance(enterIter, index);
+					IGNORE_RETURN(m_isEnter.erase(enterIter));
+					
+					// remove corresponding item from m_names
+					std::vector<const char *>::iterator namesIter = m_names.begin();
+					std::advance(namesIter, index);
+					IGNORE_RETURN(m_names.erase(namesIter));
+
+					// remove corresponding item from m_sources
+					std::vector<NetworkId>::iterator sourcesIter = m_sources.begin();
+					std::advance(sourcesIter, index);
+
+					std::hash_map<NetworkId, int>::iterator const iterCountSource = m_sourcesCount.find(*sourcesIter);
+					if (iterCountSource != m_sourcesCount.end())
+					{
+						if (iterCountSource->second <= 1)
+							m_sourcesCount.erase(iterCountSource);
+						else
+							--(iterCountSource->second);
+					}
+
+					IGNORE_RETURN(m_sources.erase(sourcesIter));
+
+					// remove item from m_targets
+					s = m_targets.erase(s);
+					--countTarget;
+				}
+				else
+				{
+					++s;
+				}
+			}
+
+			m_targetsCount.erase(iterCountTarget);
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	void TriggerScriptParam::clear()
+	{
+		m_isEnter.clear();
+		m_names.clear();
+		m_sources.clear();
+		m_targets.clear();
+		m_sourcesCount.clear();
+		m_targetsCount.clear();
+	}
+
+	// ----------------------------------------------------------------------
+
+	std::deque<bool> const & TriggerScriptParam::getIsEnter() const
+	{
+		return m_isEnter;
+	}
+
+	// ----------------------------------------------------------------------
+
+	std::vector<const char *> const & TriggerScriptParam::getNames() const
+	{
+		return m_names;
+	}
+
+	// ----------------------------------------------------------------------
+
+	std::vector<NetworkId> const & TriggerScriptParam::getSources() const
+	{
+		return m_sources;
+	}
+
+	// ----------------------------------------------------------------------
+
+	std::vector<NetworkId> const & TriggerScriptParam::getTargets() const
+	{
+		return m_targets;
+	}
+
+	// ----------------------------------------------------------------------
+
+	// don't update s_triggers1 and s_triggers2 directly; use s_triggers instead
+	TriggerScriptParam s_triggers1;
+	TriggerScriptParam s_triggers2;
+	TriggerScriptParam * s_triggers = &s_triggers1;
+}
+
+using namespace TriggerVolumeNamespace;
+
+// ======================================================================
+
+TriggerVolume::TriggerVolume(ServerObject &newOwner, float radius, std::string const &newName, bool isPromiscuous) :
+	m_radius(radius),
+	m_contents(),
+	m_eventSources(),
+	m_name(newName),
+	m_owner(newOwner),
+	m_spatialSubdivisionHandle(0),
+	m_promiscuous(isPromiscuous)
+{
+}
+
+// ----------------------------------------------------------------------
+
+TriggerVolume::~TriggerVolume()
+{
+	// remove all entries from s_triggers.sources
+	// and s_triggers.targets corresponding to m_owner
+	s_triggers->remove(m_owner.getNetworkId());
+
+	// tell all objects in our trigger volume that we are going away
+	for (ContentsSet::const_iterator i = m_contents.begin(); i != m_contents.end(); ++i)
+		(*i)->onRemovedFromTriggerVolume(*this);
+
+	m_spatialSubdivisionHandle = 0;
+}
+
+// ----------------------------------------------------------------------
+
+bool TriggerVolume::intersectsExtent(ServerObject const &object) const
+{
+	Vector const &position_w = m_owner.getPosition_w();
+	return Sphere(position_w, m_radius).intersectsSphere(object.getSphereExtent());
+}
+
+// ----------------------------------------------------------------------
+
+void TriggerVolume::addEventSource(NetworkId const &source)
+{
+	IGNORE_RETURN(m_eventSources.insert(source));
+	ServerObject * const object = ServerWorld::findObjectByNetworkId(source);
+	if (object && intersectsExtent(*object))
+		s_triggers->add(object->getNetworkId(), m_owner.getNetworkId(), m_name.c_str(), true);
+}
+
+// ----------------------------------------------------------------------
+
+void TriggerVolume::addObject(ServerObject &object)
+{
+	if (intersectsExtent(object))
+		onEnter(object);
+}
+
+// ----------------------------------------------------------------------
+
+void TriggerVolume::onEnter(ServerObject &object)
+{
+	std::pair<ContentsSet::iterator, bool> const result = m_contents.insert(&object);
+	if (result.second)
+	{
+		virtualOnEnter(object);
+		object.onAddedToTriggerVolume(*this);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void TriggerVolume::onExit(ServerObject &object)
+{
+	if (m_contents.erase(&object) > 0)
+	{
+		virtualOnExit(object);
+		object.onRemovedFromTriggerVolume(*this);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void TriggerVolume::virtualOnEnter(ServerObject &object)
+{
+	if (   m_owner.isAuthoritative()
+	    && &object != &m_owner
+	    && !isNetworkTriggerVolume()
+	    && (   !ConfigServerGame::getEnforcePlayerTriggerVolumesOnly()
+	        || object.isPlayerControlled()
+	        || m_owner.isPlayerControlled()
+	        || object.isInterested(m_owner)
+	        || m_owner.isInterested(object))
+	    && (   m_promiscuous
+	        || m_eventSources.find(object.getNetworkId()) != m_eventSources.end()))
+	{
+		s_triggers->add(object.getNetworkId(), m_owner.getNetworkId(), m_name.c_str(), true);
+	}
+	m_owner.onTriggerEnter(object, *this);
+}
+
+// ----------------------------------------------------------------------
+
+void TriggerVolume::virtualOnExit(ServerObject &object)
+{
+	if (   m_owner.isAuthoritative()
+	    && &object != &m_owner
+	    && !isNetworkTriggerVolume()
+	    && (   !ConfigServerGame::getEnforcePlayerTriggerVolumesOnly()
+	        || object.isPlayerControlled()
+	        || m_owner.isPlayerControlled()
+	        || object.isInterested(m_owner)
+	        || m_owner.isInterested(object))
+	    && (   m_promiscuous
+	        || m_eventSources.find(object.getNetworkId()) != m_eventSources.end()))
+	{
+		s_triggers->add(object.getNetworkId(), m_owner.getNetworkId(), m_name.c_str(), false);
+	}
+	m_owner.onTriggerExit(object, *this);
+}
+
+// ----------------------------------------------------------------------
+
+void TriggerVolume::moveObject(ServerObject &object, Vector const &start, Vector const &end)
+{
+	static const int notInTrigger     = 0x0000;
+	static const int startedInTrigger = 0x0001;
+	static const int endedInTrigger   = 0x0002;
+
+	// update the sphere position
+	Vector const &position_w = m_owner.getPosition_w();
+	Sphere const &objectExtentSphere = object.getSphereExtent();
+
+	Vector intersectionPoint;
+	if (end.magnitudeBetweenSquared(start) > Vector::NORMALIZE_THRESHOLD)
+		intersectionPoint = position_w.findClosestPointOnLineSegment(start, end);
+	else
+		intersectionPoint = end;
+
+	if (position_w.magnitudeBetween(intersectionPoint) - m_radius < objectExtentSphere.getRadius())
+	{
+		// there was an intersection along the path. Determine start and end sphere intersection status
+		int flags = notInTrigger;
+
+		Sphere const triggerSphere(position_w, m_radius);
+
+		if (triggerSphere.intersectsSphere(Sphere(end, objectExtentSphere.getRadius())))
+			flags |= endedInTrigger;
+		
+		if (triggerSphere.intersectsSphere(Sphere(start, objectExtentSphere.getRadius())))
+			flags |= startedInTrigger;
+
+		switch (flags)
+		{
+			case (startedInTrigger | endedInTrigger):
+				onEnter(object); // started and ended in the trigger volume
+				break;
+			case startedInTrigger:
+				onExit(object);	// it started in the trigger but ended outside of it
+				break;
+			case endedInTrigger:
+				onEnter(object); // started outside the trigger, but ended inside of it
+				break;
+			case notInTrigger:
+				// The object crossed the trigger volume but did not start or end inside
+				// it, so if we didn't move more than the triggerVolumeWarpDistance,
+				// consider us as having entered and left the trigger volume.
+				if (start.magnitudeBetweenSquared(end) < sqr(ConfigServerGame::getTriggerVolumeWarpDistance()))
+				{
+					onEnter(object);
+					onExit(object);
+				}
+				break;
+			default:
+				break;
+		}
+	}
+	else
+	{
+		onExit(object);
+	}
+}
+
+// ----------------------------------------------------------------------
+/**
+	@brief move the trigger volume relative to an object to determine if
+	there was an interaction.
+*/
+void TriggerVolume::moveTriggerVolume(ServerObject &object, Vector const &start, Vector const &end)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("TriggerVolume::moveTriggerVolume");
+	static const int notInTrigger     = 0x0000;
+	static const int startedInTrigger = 0x0001;
+	static const int endedInTrigger   = 0x0002;
+
+	Sphere const &objectExtentSphere = object.getSphereExtent();
+
+	Vector intersectionPoint;
+	if (end.magnitudeBetweenSquared(start) > Vector::NORMALIZE_THRESHOLD)
+		intersectionPoint = objectExtentSphere.getCenter().findClosestPointOnLineSegment(start, end);
+	else
+		intersectionPoint = end;
+	
+	if (objectExtentSphere.getCenter().magnitudeBetween(intersectionPoint) - objectExtentSphere.getRadius() < m_radius)
+	{
+		// there was an intersection along the path. Determine start and end sphere intersection
+		// status
+		int flags = notInTrigger;
+
+		if (objectExtentSphere.intersectsSphere(Sphere(end, m_radius)))
+			flags |= endedInTrigger;
+		
+		if (objectExtentSphere.intersectsSphere(Sphere(start, m_radius)))
+			flags |= startedInTrigger;
+
+		switch (flags)
+		{
+			case (startedInTrigger | endedInTrigger):
+				onEnter(object); // started and ended in the trigger volume
+				break;
+			case startedInTrigger:
+				onExit(object);	// it started in the trigger but ended outside of it
+				break;
+			case endedInTrigger:
+				onEnter(object); // started outside the trigger, but ended inside of it
+				break;
+			case notInTrigger:
+				onExit(object); // handle warping out
+				break;			
+			default:
+				break;
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void TriggerVolume::removeEventSource(NetworkId const &source)
+{
+	IGNORE_RETURN(m_eventSources.erase(source));
+	ServerObject * const object = ServerWorld::findObjectByNetworkId(source);
+	if (object && intersectsExtent(*object))
+		onExit(*object);
+}
+
+// ----------------------------------------------------------------------
+
+void TriggerVolume::removeObject(ServerObject &object)
+{
+	onExit(object); // doesn't hurt if it isn't already in the volume
+}
+
+// ----------------------------------------------------------------------
+
+void TriggerVolume::runScriptTriggers()
+{
+	if (!s_triggers->getIsEnter().empty())
+	{
+		ScriptParams s;
+		s.addParam(const_cast<std::deque<bool> &>(s_triggers->getIsEnter()), "is_enter_trigger");
+		s.addParam(const_cast<std::vector<const char *> &>(s_triggers->getNames()), "trigger_volume_names");
+		s.addParam(const_cast<std::vector<NetworkId> &>(s_triggers->getSources()), "source_objects");
+		s.addParam(const_cast<std::vector<NetworkId> &>(s_triggers->getTargets()), "target_objects");
+
+		// set s_triggers to use the other TriggerScriptParam so that
+		// any TriggerVolume update that occurs because of the call
+		// into script below will get processed the next time
+		// TriggerVolume::runScriptTriggers() gets called;
+		// hang on to the current TriggerScriptParam so that we can
+		// clear it out after the call into script below 
+		TriggerScriptParam * current = s_triggers;
+		s_triggers = ((s_triggers == &s_triggers1) ? &s_triggers2 : &s_triggers1);
+
+		// invoke the script for trigger enters
+		GameScriptObject::runOneScript("base_class", "dispatchTriggerVolumeEvents", "b[s[O[O[", s);
+
+		// triggers have been processed
+		// MUST be done after calling GameScriptObject::runOneScript() since
+		// ScriptParams just save off the pointers to the vectors; the vectors
+		// don't actually get packed until GameScriptObject::runOneScript()
+		// is called
+		current->clear();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void TriggerVolume::setPromiscuous(bool isPromiscuous)
+{
+	m_promiscuous = isPromiscuous;
+}
+
+// ----------------------------------------------------------------------
+
+void TriggerVolume::setSpatialSubdivisionHandle(SpatialSubdivisionHandle *newHandle)
+{
+	m_spatialSubdivisionHandle = newHandle;
+}
+
+// ----------------------------------------------------------------------
+
+bool TriggerVolume::isNetworkTriggerVolume() const
+{
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool TriggerVolume::isPortalTriggerVolume() const
+{
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void TriggerVolume::objectMoved(ServerObject &object)
+{
+	if (intersectsExtent(object))
+		onEnter(object);
+	else
+		onExit(object);
+}
+
+// ----------------------------------------------------------------------
+
+void TriggerVolume::objectDestroyed(ServerObject &object)
+{
+	// NOTE: do not reference the ServerObject because
+	// it is being destroyed and is not guaranteed to be
+	// in a valid state
+	IGNORE_RETURN(m_contents.erase(&object));
+}
+
+// ----------------------------------------------------------------------
+
+void TriggerVolume::contentsChanged(std::vector<ServerObject *> const &newSortedContents)
+{
+	static std::vector<ServerObject *> lostObjects;
+	static std::vector<ServerObject *> gainedObjects;
+
+	IGNORE_RETURN(std::set_difference(
+		m_contents.begin(), m_contents.end(),
+		newSortedContents.begin(), newSortedContents.end(),
+		std::back_insert_iterator<std::vector<ServerObject *> >(lostObjects)));
+	IGNORE_RETURN(std::set_difference(
+		newSortedContents.begin(), newSortedContents.end(),
+		m_contents.begin(), m_contents.end(),
+		std::back_insert_iterator<std::vector<ServerObject *> >(gainedObjects)));
+
+	m_contents.clear();
+	m_contents.insert(newSortedContents.begin(), newSortedContents.end());
+
+	for (std::vector<ServerObject *>::const_iterator i = lostObjects.begin(); i != lostObjects.end(); ++i)
+	{
+		virtualOnExit(**i);
+		(*i)->onRemovedFromTriggerVolume(*this);
+	}
+	for (std::vector<ServerObject *>::const_iterator j = gainedObjects.begin(); j != gainedObjects.end(); ++j)
+	{
+		virtualOnEnter(**j);
+		(*j)->onAddedToTriggerVolume(*this);
+	}
+
+	lostObjects.clear();
+	gainedObjects.clear();
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/object/TriggerVolume.h b/engine/server/library/serverGame/src/shared/object/TriggerVolume.h
new file mode 100644
index 00000000..11851752
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/TriggerVolume.h
@@ -0,0 +1,149 @@
+// ======================================================================
+//
+// TriggerVolume.h
+//
+// Copyright 2000-04 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_TriggerVolume_H
+#define	_INCLUDED_TriggerVolume_H
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedUtility/PooledString.h"
+
+#include <hash_set>
+
+// ======================================================================
+
+class ServerObject;
+class SpatialSubdivisionHandle;
+class Vector;
+
+// ======================================================================
+
+class TriggerVolume
+{
+public:
+
+
+	TriggerVolume(ServerObject &owner, float radius, std::string const &name, bool isPromiscuous);
+	virtual ~TriggerVolume();
+
+	struct ServerObjectPointerHash
+	{
+		size_t operator()(ServerObject const * const ptr) const
+		{
+			return (reinterpret_cast<const size_t>(ptr) >> 4);
+		};
+	};
+
+	typedef std::hash_set<ServerObject *, ServerObjectPointerHash> ContentsSet;
+
+	void                              addObject(ServerObject &object);
+	void                              addEventSource(NetworkId const &source);
+	ContentsSet const &  getContents() const;
+	std::string const &               getName() const;
+	ServerObject &                    getOwner();
+	ServerObject const &              getOwner() const;
+	bool                              getPromiscuous() const;
+	float                             getRadius() const;
+	SpatialSubdivisionHandle *        getSpatialSubdivisionHandle();
+	bool                              hasObject(ServerObject const &object) const;
+	void                              moveObject(ServerObject &object, Vector const &start, Vector const &end);
+	void                              moveTriggerVolume(ServerObject &object, Vector const &start, Vector const &end);
+	void                              removeEventSource(NetworkId const &source);
+	void                              removeObject(ServerObject &object);
+	void                              setPromiscuous(bool isPromiscuous);
+	void                              setSpatialSubdivisionHandle(SpatialSubdivisionHandle *newHandle);
+	void                              objectMoved(ServerObject &object);
+	void                              objectDestroyed(ServerObject &object);
+	void                              contentsChanged(stdvector<ServerObject *>::fwd const &newSortedContents);
+	static void                       runScriptTriggers();
+
+	virtual bool                      isNetworkTriggerVolume() const;
+	virtual bool                      isPortalTriggerVolume() const;
+
+private:
+	TriggerVolume(TriggerVolume const &);
+	TriggerVolume &operator=(TriggerVolume const &);
+
+	void onEnter(ServerObject &object);
+	void onExit(ServerObject &object);
+	bool intersectsExtent(ServerObject const &object) const;
+
+	virtual void virtualOnEnter(ServerObject &object);
+	virtual void virtualOnExit(ServerObject &object);
+
+private:
+	float                        m_radius;
+	ContentsSet                  m_contents;
+	std::set<NetworkId>          m_eventSources;
+	PooledString                 m_name;
+	ServerObject &               m_owner;
+	SpatialSubdivisionHandle *   m_spatialSubdivisionHandle;
+	bool                         m_promiscuous;
+};
+
+// ----------------------------------------------------------------------
+
+inline TriggerVolume::ContentsSet const &TriggerVolume::getContents() const
+{
+	return m_contents;
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const &TriggerVolume::getName() const
+{
+	return m_name;
+}
+
+// ----------------------------------------------------------------------
+
+inline ServerObject const &TriggerVolume::getOwner() const
+{
+	return m_owner;
+}
+
+// ----------------------------------------------------------------------
+
+inline ServerObject &TriggerVolume::getOwner()
+{
+	return m_owner;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool TriggerVolume::getPromiscuous() const
+{
+	return m_promiscuous;
+}
+
+// ----------------------------------------------------------------------
+
+inline float TriggerVolume::getRadius() const
+{
+	return m_radius;
+}
+
+// ----------------------------------------------------------------------
+
+inline SpatialSubdivisionHandle *TriggerVolume::getSpatialSubdivisionHandle()
+{
+	return m_spatialSubdivisionHandle;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool TriggerVolume::hasObject(ServerObject const &object) const
+{
+	return m_contents.count(const_cast<ServerObject*>(&object)) > 0;
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_TriggerVolume_H
+
diff --git a/engine/server/library/serverGame/src/shared/object/UniverseObject.cpp b/engine/server/library/serverGame/src/shared/object/UniverseObject.cpp
new file mode 100644
index 00000000..a55013bf
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/UniverseObject.cpp
@@ -0,0 +1,161 @@
+// ======================================================================
+//
+// UniverseObject.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/UniverseObject.h"
+#include "serverGame/RegionMaster.h"
+#include "serverGame/ObjectTracker.h"
+#include "serverGame/ServerUniverseObjectTemplate.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/UniverseController.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedObject/ObjectTemplateList.h"
+
+// objvars for dynamic regions
+const static std::string OBJVAR_DYNAMIC_REGION("dynamic_region");
+
+const SharedObjectTemplate * UniverseObject::m_defaultSharedTemplate = NULL;
+
+
+// ======================================================================
+
+UniverseObject::UniverseObject(const ServerUniverseObjectTemplate *newTemplate) :
+		ServerObject(newTemplate, ServerWorld::getUniverseNotification())
+{
+	addMembersToPackages();
+	ObjectTracker::addUniverseObject();
+}
+
+// ----------------------------------------------------------------------
+
+UniverseObject::~UniverseObject()
+{
+	if (isDynamicRegion())
+		RegionMaster::removeDynamicRegion(*this);
+
+	if (isInWorld())
+		removeFromWorld();
+
+	ObjectTracker::removeUniverseObject();
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a shared template if none was given for this object.
+ *
+ * @return the shared template
+ */
+const SharedObjectTemplate * UniverseObject::getDefaultSharedTemplate(void) const
+{
+static const ConstCharCrcLowerString templateName("object/universe/base/shared_universe_default.iff");
+
+	if (m_defaultSharedTemplate == NULL)
+	{
+		m_defaultSharedTemplate = safe_cast<const SharedObjectTemplate *>(
+			ObjectTemplateList::fetch(templateName));
+		WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create "
+			"default shared object template %s", templateName.getString()));
+		if (m_defaultSharedTemplate != NULL)
+			ExitChain::add (removeDefaultTemplate, "UniverseObject::removeDefaultTemplate");
+	}
+	return m_defaultSharedTemplate;
+}	// UniverseObject::getDefaultSharedTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Cleans up the default shared template.
+ */
+void UniverseObject::removeDefaultTemplate(void)
+{
+	if (m_defaultSharedTemplate != NULL)
+	{
+		m_defaultSharedTemplate->releaseReference();
+		m_defaultSharedTemplate = NULL;
+	}
+}	// UniverseObject::removeDefaultTemplate
+
+// ----------------------------------------------------------------------
+
+Controller* UniverseObject::createDefaultController (void)
+{
+	Controller* controller = new UniverseController(this);
+	NOT_NULL(controller);
+	
+	setController(controller);
+	return controller;
+}
+
+// ----------------------------------------------------------------------
+
+void UniverseObject::initializeFirstTimeObject()
+{
+	ServerObject::initializeFirstTimeObject();
+	setSceneId("universe");
+//	if (isDynamicRegion())
+//		RegionMaster::addDynamicRegion(*this);
+}
+
+// ----------------------------------------------------------------------
+
+void UniverseObject::endBaselines()
+{
+	ServerObject::endBaselines();
+	if (isDynamicRegion())
+		RegionMaster::addDynamicRegion(*this);
+}
+
+// ----------------------------------------------------------------------
+
+void UniverseObject::setupUniverse()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void UniverseObject::onServerUniverseGainedAuthority()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void UniverseObject::updatePlanetServerInternal(bool) const
+{
+}
+
+// ----------------------------------------------------------------------
+
+bool UniverseObject::isVisibleOnClient (const Client & /*client*/) const
+{
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void UniverseObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+{
+	ServerObject::getAttributes(data);
+}
+
+// ----------------------------------------------------------------------
+
+bool UniverseObject::isDynamicRegion() const
+{
+	return getObjVars().hasItem(OBJVAR_DYNAMIC_REGION);
+}
+
+// ----------------------------------------------------------------------
+
+const Region * UniverseObject::getDynamicRegion() const
+{
+	return RegionMaster::getDynamicRegionFromObject(*this);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/UniverseObject.h b/engine/server/library/serverGame/src/shared/object/UniverseObject.h
new file mode 100644
index 00000000..73974909
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/UniverseObject.h
@@ -0,0 +1,60 @@
+// ======================================================================
+//
+// UniverseObject.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_UniverseObject_H
+#define INCLUDED_UniverseObject_H
+
+#include "serverGame/ServerObject.h"
+
+class Region;
+class ServerUniverseObjectTemplate;
+
+// ======================================================================
+
+/**
+ * A UniverseObject is an object that is global to the entire server
+ * cluster.  UniverseObjects represent global data (such as Resource
+ * Classes) or objects with no definite location (such as Resource Pools).
+ */
+class UniverseObject : public ServerObject
+{
+public:
+	         UniverseObject(const ServerUniverseObjectTemplate* newTemplate);
+	virtual ~UniverseObject();
+
+	static void         removeDefaultTemplate          (void);
+
+	virtual Controller* createDefaultController (void); //???
+	void                addMembersToPackages    ();
+
+	virtual void setupUniverse();
+	virtual void onServerUniverseGainedAuthority();
+
+	virtual bool isVisibleOnClient (const Client & client) const;
+	virtual void getAttributes     (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+
+	bool           isDynamicRegion() const;
+	const Region * getDynamicRegion() const;
+
+protected:
+	virtual void initializeFirstTimeObject();
+	virtual void endBaselines();
+
+virtual void updatePlanetServerInternal(bool) const;
+	virtual const SharedObjectTemplate *  getDefaultSharedTemplate(void) const;
+	
+private:
+	  UniverseObject(const UniverseObject&);
+	  UniverseObject & operator=(const UniverseObject&);
+
+private:
+	static const SharedObjectTemplate * m_defaultSharedTemplate;	// template to use if no shared template is given
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/object/VehicleObject.cpp b/engine/server/library/serverGame/src/shared/object/VehicleObject.cpp
new file mode 100644
index 00000000..a72186d9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/VehicleObject.cpp
@@ -0,0 +1,54 @@
+//========================================================================
+//
+// VehicleObject.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/VehicleObject.h"
+
+#include "serverGame/GameServer.h"
+#include "sharedNetworkMessages/ObjectChannelMessages.h"
+#include "serverGame/ServerVehicleObjectTemplate.h"
+#include "serverGame/VehicleController.h"
+
+
+//-----------------------------------------------------------------------
+VehicleObject::VehicleObject(const ServerVehicleObjectTemplate* newTemplate) : 
+	TangibleObject(newTemplate)
+{
+	addMembersToPackages();
+}
+
+//-----------------------------------------------------------------------
+
+VehicleObject::~VehicleObject()
+{
+}
+ 
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a default controller for this object.
+ *
+ * @return the object's controller
+ */
+Controller* VehicleObject::createDefaultController(void)
+{
+	Controller* controller = new VehicleController(this);
+	NOT_NULL(controller);
+
+	setController(controller);
+	return controller;
+}	// VehicleObject::createDefaultController
+
+//-----------------------------------------------------------------------
+
+void VehicleObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
+{
+	TangibleObject::getAttributes(data);
+}
+
+// ----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/object/VehicleObject.h b/engine/server/library/serverGame/src/shared/object/VehicleObject.h
new file mode 100644
index 00000000..bfa1364d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/VehicleObject.h
@@ -0,0 +1,70 @@
+//========================================================================
+//
+// VehicleObject.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef INCLUDED_VehicleObject_H
+#define INCLUDED_VehicleObject_H
+
+#include "serverGame/TangibleObject.h"
+class ServerVehicleObjectTemplate;
+
+/**
+  *  A VehicleObject represents a vehicle.  Duh.
+  */
+class VehicleObject : public TangibleObject
+{
+	friend class VehicleController;
+
+public:
+	VehicleObject(const ServerVehicleObjectTemplate* newTemplate);
+	virtual ~VehicleObject();
+
+	virtual Controller* createDefaultController (void);
+	void                addMembersToPackages    ();
+	void                getAttributes           (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
+	
+public:
+	int getBogus() const;
+//	void setBogus(int newBogus);
+	
+protected:
+    explicit  VehicleObject(const Tag objectType);
+
+	// setter functions that should be called by the object's controller
+	void setBogus(int bogus);
+
+public:
+
+private:
+	VehicleObject();
+	VehicleObject(const VehicleObject& rhs);
+	VehicleObject&	operator=(const VehicleObject& rhs);
+
+private:
+
+// BPM VehicleObject : TangibleObject // Begin persisted members.
+	Archive::AutoDeltaVariable<int> m_bogus;
+// EPM
+};
+
+//-----------------------------------------------------------------------
+
+inline int VehicleObject::getBogus() const
+{
+	return m_bogus.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline void VehicleObject::setBogus(int bogus)
+{
+	m_bogus = bogus;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// INCLUDED_VehicleObject_H
diff --git a/engine/server/library/serverGame/src/shared/object/WeaponObject.cpp b/engine/server/library/serverGame/src/shared/object/WeaponObject.cpp
new file mode 100644
index 00000000..ae1c7bf8
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/WeaponObject.cpp
@@ -0,0 +1,330 @@
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/WeaponObject.h"
+
+#include "SwgGameServer/CombatEngine.h"
+#include "UnicodeUtils.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ServerController.h"
+#include "serverGame/ServerWeaponObjectTemplate.h"
+#include "serverGame/WeaponController.h"
+#include "sharedFoundation/ConstCharCrcLowerString.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedGame/SharedObjectAttributes.h"
+#include "sharedGame/SharedStringIds.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/SlotIdManager.h"
+#include "sharedObject/SlottedContainer.h"
+#include <cstdio>
+
+//-- this include path is an error
+#include "swgSharedUtility/Attributes.h"
+
+//----------------------------------------------------------------------
+
+
+const SharedObjectTemplate * WeaponObject::m_defaultSharedTemplate = NULL;
+static const std::string OBJVAR_CERTIFICATION = "weapon.strCertUsed";
+
+
+//-----------------------------------------------------------------------
+
+WeaponObject::WeaponObject(const ServerWeaponObjectTemplate* newTemplate) : 
+	TangibleObject(newTemplate),
+	m_minDamage(0),
+	m_maxDamage(0),
+	m_attackSpeed(0),
+	m_woundChance(0),
+	m_minRange(0),
+	m_maxRange(0),
+	m_accuracy(0),
+	m_damageRadius(0),
+	m_attackCost(0),
+	m_isDefaultWeapon(false),
+	m_damageType(newTemplate->getDamageType()),
+	m_elementalType(0), //m_elementalType(newTemplate->getElementalType()),
+	m_elementalValue(0), //m_elementalValue(newTemplate->getElementalValue()),
+	m_weaponType(newTemplate->getWeaponType())
+{
+	addMembersToPackages();
+}
+
+//-----------------------------------------------------------------------
+
+WeaponObject::~WeaponObject()
+{
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns a shared template if none was given for this object.
+ *
+ * @return the shared template
+ */
+const SharedObjectTemplate * WeaponObject::getDefaultSharedTemplate(void) const
+{
+static const ConstCharCrcLowerString templateName("object/weapon/base/shared_weapon_default.iff");
+
+	if (m_defaultSharedTemplate == NULL)
+	{
+		m_defaultSharedTemplate = safe_cast<const SharedObjectTemplate *>(
+			ObjectTemplateList::fetch(templateName));
+		WARNING_STRICT_FATAL(m_defaultSharedTemplate == NULL, ("Cannot create "
+			"default shared object template %s", templateName.getString()));
+		if (m_defaultSharedTemplate != NULL)
+			ExitChain::add (removeDefaultTemplate, "WeaponObject::removeDefaultTemplate");
+	}
+	return m_defaultSharedTemplate;
+}	// WeaponObject::getDefaultSharedTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Cleans up the default shared template.
+ */
+void WeaponObject::removeDefaultTemplate(void)
+{
+	if (m_defaultSharedTemplate != NULL)
+	{
+		m_defaultSharedTemplate->releaseReference();
+		m_defaultSharedTemplate = NULL;
+	}
+}	// WeaponObject::removeDefaultTemplate
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets up the data for a new weapon object.
+ */
+void WeaponObject::initializeFirstTimeObject()
+{
+	TangibleObject::initializeFirstTimeObject();
+
+	const ServerWeaponObjectTemplate * myTemplate = safe_cast<
+		const ServerWeaponObjectTemplate *>(getObjectTemplate());
+	NOT_NULL(myTemplate);
+
+	m_minDamage        = myTemplate->getMinDamageAmount();
+	m_maxDamage        = myTemplate->getMaxDamageAmount();
+	m_attackSpeed      = myTemplate->getAttackSpeed();
+	m_woundChance      = myTemplate->getWoundChance();
+	m_minRange         = myTemplate->getMinRange();
+	m_maxRange         = myTemplate->getMaxRange();
+	m_accuracy         = myTemplate->getAccuracy();
+	m_damageRadius     = myTemplate->getDamageRadius();
+	m_attackCost       = myTemplate->getAttackCost();
+	m_elementalType    = myTemplate->getElementalType();
+	m_elementalValue   = myTemplate->getElementalValue();
+}	// WeaponObject::initializeFirstTimeObject
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets up the data for an old weapon object.
+ */
+void WeaponObject::onLoadedFromDatabase()
+{
+	TangibleObject::onLoadedFromDatabase();
+
+	const ServerWeaponObjectTemplate * myTemplate = safe_cast<
+		const ServerWeaponObjectTemplate *>(getObjectTemplate());
+	NOT_NULL(myTemplate);
+
+	// if the min or max range hasn't been set, set it from the template
+	if (m_minRange.get() < 0)
+		m_minRange = myTemplate->getMinRange();
+	if (m_maxRange.get() < 0)
+		m_maxRange = myTemplate->getMaxRange();
+
+}	// WeaponObject::initializeFirstTimeObject
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a default controller for this object.
+ *
+ * @return the object's controller
+ */
+Controller* WeaponObject::createDefaultController(void)
+{
+	Controller* controller = new WeaponController(this);
+	NOT_NULL(controller);
+
+	setController(controller);
+	return controller;
+}	// WeaponObject::createDefaultController
+
+// ----------------------------------------------------------------------
+
+ServerWeaponObjectTemplate::WeaponType WeaponObject::getWeaponType(void) const
+{
+	const ServerWeaponObjectTemplate * myTemplate = safe_cast<
+		const ServerWeaponObjectTemplate *>(getObjectTemplate());
+	NOT_NULL(myTemplate);
+
+	return myTemplate->getWeaponType();
+}
+
+// ----------------------------------------------------------------------
+
+ServerWeaponObjectTemplate::AttackType WeaponObject::getAttackType() const
+{
+	const ServerWeaponObjectTemplate * myTemplate = safe_cast<
+		const ServerWeaponObjectTemplate *>(getObjectTemplate());
+	NOT_NULL(myTemplate);
+
+	return myTemplate->getAttackType();
+}
+
+// ----------------------------------------------------------------------
+
+float WeaponObject::getAudibleRange() const
+{
+	const ServerWeaponObjectTemplate * myTemplate = safe_cast<
+		const ServerWeaponObjectTemplate *>(getObjectTemplate());
+	NOT_NULL(myTemplate);
+
+	return myTemplate->getAudibleRange();
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the minimum amount of damage the weapon can do, scaled by the amount 
+ * of damage the weapon has taken.
+ *
+ * @return the min damage value
+ */
+int WeaponObject::getMinDamage() const		
+{
+	if (isDisabled())
+		return 0;
+
+	float effectiveness = 1.0f;
+	float damagePercent = 1.0f - static_cast<float>(getDamageTaken()) / getMaxHitPoints();
+	if (damagePercent < ConfigServerGame::getWeaponDecayThreshold())
+	{
+		effectiveness -= ConfigServerGame::getWeaponDecayThreshold() - damagePercent;
+	}
+
+	return static_cast<int>(m_minDamage.get() * effectiveness);
+}	// WeaponObject::getMinDamageAmount
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the minimum amount of damage the weapon can do, scaled by the amount 
+ * of damage the weapon has taken.
+ *
+ * @return the min damage value
+ */
+int WeaponObject::getMaxDamage() const
+{
+	if (isDisabled())
+		return 0;
+
+	float effectiveness = 1.0f;
+	float damagePercent = 1.0f - static_cast<float>(getDamageTaken()) / getMaxHitPoints();
+	if (damagePercent < ConfigServerGame::getWeaponDecayThreshold())
+	{
+		effectiveness -= ConfigServerGame::getWeaponDecayThreshold() - damagePercent;
+	}
+
+	return static_cast<int>(m_maxDamage.get() * effectiveness);
+}	// WeaponObject::getMaxDamageAmount
+
+// ----------------------------------------------------------------------
+
+/**
+ * Prevent destruction of the weapon if it is a default weapon.
+ */
+bool WeaponObject::canDestroy() const
+{
+	if (m_isDefaultWeapon.get())
+	{
+		WARNING(true, ("WeaponObject::canDestroy called for default weapon "
+			"%s", getNetworkId().getValueString().c_str()));
+		return false;
+	}
+	return TangibleObject::canDestroy();
+}	// WeaponObject::canDestroy
+
+// ----------------------------------------------------------------------
+
+/**
+ * Prevent transfer of the weapon if it is a default weapon.
+ */
+bool WeaponObject::onContainerAboutToTransfer(ServerObject * destination, 
+	ServerObject* transferer)
+{
+	if (m_isDefaultWeapon.get())
+	{
+		WARNING(true, ("WeaponObject::onContainerAboutToTransfer called "
+			"for default weapon %s", getNetworkId().getValueString().c_str()));
+		return false;
+	}
+	return TangibleObject::onContainerAboutToTransfer(destination, transferer);
+}	// WeaponObject::onContainerAboutToTransfer
+
+// ----------------------------------------------------------------------
+
+/**
+ * Flags this weapon as/not a default weapon.
+ *
+ * @param isDefault		flag that the weapon is a default weapon or not.
+ */
+void WeaponObject::setAsDefaultWeapon(bool isDefault)
+{
+	if (isDefault != m_isDefaultWeapon.get())
+	{
+		if (isAuthoritative())
+			m_isDefaultWeapon = isDefault;
+		else
+		{
+			WARNING_STRICT_FATAL(true, ("WeaponObject::setAsDefaultWeapon called on "
+				"non-auth weapon %s", getNetworkId().getValueString().c_str()));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void WeaponObject::getAttributes(const NetworkId & playerId, AttributeVector &data) const
+{
+	TangibleObject::getAttributes(playerId, data);
+}
+
+// ----------------------------------------------------------------------
+
+void WeaponObject::getAttributes(AttributeVector &data) const
+{
+	TangibleObject::getAttributes(data);	
+}
+
+// ----------------------------------------------------------------------
+
+WeaponObject *WeaponObject::asWeaponObject()
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+WeaponObject const *WeaponObject::asWeaponObject() const
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+WeaponObject * WeaponObject::getWeaponObject(NetworkId const & networkId)
+{
+	ServerObject * serverObject = ServerObject::getServerObject(networkId);
+
+	return (serverObject != NULL) ? serverObject->asWeaponObject() : NULL;
+}
+
+// ----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/object/WeaponObject.h b/engine/server/library/serverGame/src/shared/object/WeaponObject.h
new file mode 100644
index 00000000..305ad128
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/object/WeaponObject.h
@@ -0,0 +1,233 @@
+//========================================================================
+//
+// WeaponObject.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_WeaponObject_H
+#define _INCLUDED_WeaponObject_H
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "serverGame/TangibleObject.h"
+#include "serverGame/ServerWeaponObjectTemplate.h"
+#include "sharedGame/SharedWeaponObjectTemplate.h"
+
+class NetworkId;
+
+/** 
+  * A weapon object is an object that is used in combat to damage other objects.
+  */
+class WeaponObject : public TangibleObject
+{
+public:
+
+	enum OutOfRangeAttackMod
+	{
+		OUT_OF_RANGE_ATTACK_MOD = INT_MIN
+	};
+
+public:
+	
+	WeaponObject(const ServerWeaponObjectTemplate* newTemplate);
+	virtual ~WeaponObject();
+
+	static WeaponObject * getWeaponObject(NetworkId const & networkId);
+	virtual WeaponObject *asWeaponObject();
+	virtual WeaponObject const *asWeaponObject() const;
+
+	static void         removeDefaultTemplate          (void);
+
+
+	virtual Controller* createDefaultController(void);
+	void                addMembersToPackages();
+
+	ServerWeaponObjectTemplate::WeaponType    getWeaponType        (void) const;
+	ServerWeaponObjectTemplate::AttackType    getAttackType        (void) const;
+	ServerWeaponObjectTemplate::DamageType    getDamageType        (void) const;
+	ServerWeaponObjectTemplate::DamageType    getElementalType     (void) const;
+	int                                       getElementalValue    (void) const;
+	int                                       getMaxDamage         (void) const;
+	int                                       getMinDamage         (void) const;
+	float                                     getWoundChance       (void) const;
+	virtual void                              getAttributes        (const NetworkId & playerId, AttributeVector &data) const;
+	virtual void                              getAttributes        (AttributeVector &data) const;
+
+	float                               getAudibleRange       (void) const;
+	float                               getMinRange           (void) const;
+	float                               getMaxRange           (void) const;
+	int                                 getAccuracy           (void) const;
+
+	float                               getDamageRadius       (void) const;
+
+	int                                 getAttackCost         (void) const;
+
+	float                               getAttackTime(void) const;
+	void                                setAttackTime(float time);
+	
+	void                                setMinRange          (float range);
+	void                                setMaxRange          (float range);
+	void                                setAccuracy          (int value);
+	
+	void                                setDamageRadius      (float radius);
+
+	void                                setMinDamage         (int damage);
+	void                                setMaxDamage         (int damage);
+	void                                setWoundChance       (float chance);
+
+	void                                setAttackCost        (int cost);
+
+	void								setDamageType        (int type);
+	void								setElementalType     (int type);
+	void                                setElementalValue    (int value);
+
+	void                                setAsDefaultWeapon(bool isDefault);
+
+	virtual bool                        canDestroy() const;
+	virtual bool                        onContainerAboutToTransfer(ServerObject * destination, ServerObject* transferer);
+
+protected:
+
+	virtual void initializeFirstTimeObject();
+	virtual void onLoadedFromDatabase();
+
+	virtual const SharedObjectTemplate *  getDefaultSharedTemplate(void) const;
+
+private:
+  	WeaponObject();
+	WeaponObject(const WeaponObject& rhs);
+	WeaponObject&	operator=(const WeaponObject& rhs);
+
+private:
+	static const SharedObjectTemplate * m_defaultSharedTemplate;	// template to use if no shared template is given
+
+	Archive::AutoDeltaVariable<int>    m_minDamage;
+	Archive::AutoDeltaVariable<int>    m_maxDamage;
+	Archive::AutoDeltaVariable<float>  m_attackSpeed;
+	Archive::AutoDeltaVariable<float>  m_woundChance;
+	Archive::AutoDeltaVariable<float>  m_minRange;
+	Archive::AutoDeltaVariable<float>  m_maxRange;
+	Archive::AutoDeltaVariable<int>    m_accuracy;
+	Archive::AutoDeltaVariable<float>  m_damageRadius;
+	Archive::AutoDeltaVariable<int>    m_attackCost;
+	Archive::AutoDeltaVariable<bool>   m_isDefaultWeapon;
+	Archive::AutoDeltaVariable<int>    m_damageType;
+	Archive::AutoDeltaVariable<int>    m_elementalType;
+	Archive::AutoDeltaVariable<int>    m_elementalValue;
+	Archive::AutoDeltaVariable<int>    m_weaponType;
+};
+
+
+inline float WeaponObject::getAttackTime(void) const
+{
+	return m_attackSpeed.get();
+}
+
+inline void WeaponObject::setAttackTime(float time)
+{
+	m_attackSpeed = time;
+}
+
+inline void WeaponObject::setMinDamage(int damage) 
+{
+	m_minDamage = damage;
+}
+
+inline void WeaponObject::setMaxDamage(int damage)
+{
+	m_maxDamage = damage;
+}
+
+inline float WeaponObject::getWoundChance(void) const
+{
+	return m_woundChance.get();
+}
+
+inline void WeaponObject::setWoundChance(float chance)
+{
+	m_woundChance = chance;
+}
+inline int WeaponObject::getAccuracy(void) const
+{
+	return m_accuracy.get();
+}
+
+inline void WeaponObject::setAccuracy(int value)
+{
+	m_accuracy = value;
+}
+
+inline float WeaponObject::getMinRange(void) const
+{
+	return m_minRange.get();
+}
+
+inline float WeaponObject::getMaxRange(void) const
+{
+	return m_maxRange.get();
+}
+
+inline void WeaponObject::setMinRange(float range)
+{
+	m_minRange = range;
+}
+
+inline void WeaponObject::setMaxRange(float range)
+{
+	m_maxRange = range;
+}
+
+inline float WeaponObject::getDamageRadius(void) const
+{
+	return m_damageRadius.get();
+}
+
+inline void WeaponObject::setDamageRadius(float radius)
+{
+	m_damageRadius = radius;
+}
+
+inline int WeaponObject::getAttackCost(void) const
+{
+	return m_attackCost.get();
+}
+
+inline void WeaponObject::setAttackCost(int cost)
+{
+	m_attackCost = cost;
+}
+
+inline ServerWeaponObjectTemplate::DamageType WeaponObject::getDamageType(void) const
+{
+	ServerWeaponObjectTemplate::DamageType value = static_cast<ServerWeaponObjectTemplate::DamageType>(m_damageType.get());
+	return value;
+}
+
+inline void WeaponObject::setDamageType(int type)
+{
+	m_damageType = type;
+}
+
+inline ServerWeaponObjectTemplate::DamageType WeaponObject::getElementalType(void) const
+{
+	ServerWeaponObjectTemplate::DamageType value = static_cast<ServerWeaponObjectTemplate::DamageType>(m_elementalType.get());
+	return value;
+}
+
+inline void WeaponObject::setElementalType(int type)
+{
+	m_elementalType = type;
+}
+
+inline int WeaponObject::getElementalValue(void) const
+{
+	return m_elementalValue.get();
+}
+
+inline void WeaponObject::setElementalValue(int value)
+{
+	m_elementalValue= value;
+}
+
+#endif	// _INCLUDED_WeaponObject_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp
new file mode 100644
index 00000000..b29db96c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp
@@ -0,0 +1,1476 @@
+//========================================================================
+//
+// ServerArmorTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerArmorTemplate.h"
+#include "sharedFile/Iff.h"
+#include "sharedMath/Vector.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerArmorTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerArmorTemplate::ServerArmorTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ObjectTemplate(filename)
+	,m_specialProtectionLoaded(false)
+	,m_specialProtectionAppend(false)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerArmorTemplate::ServerArmorTemplate
+
+/**
+ * Class destructor.
+ */
+ServerArmorTemplate::~ServerArmorTemplate()
+{
+//@BEGIN TFD CLEANUP
+	{
+		std::vector<StructParamOT *>::iterator iter;
+		for (iter = m_specialProtection.begin(); iter != m_specialProtection.end(); ++iter)
+		{
+			delete *iter;
+			*iter = NULL;
+		}
+		m_specialProtection.clear();
+	}
+//@END TFD CLEANUP
+}	// ServerArmorTemplate::~ServerArmorTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerArmorTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerArmorTemplate_tag, create);
+}	// ServerArmorTemplate::registerMe
+
+/**
+ * Creates a ServerArmorTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerArmorTemplate::create(const std::string & filename)
+{
+	return new ServerArmorTemplate(filename);
+}	// ServerArmorTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerArmorTemplate::getId(void) const
+{
+	return ServerArmorTemplate_tag;
+}	// ServerArmorTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerArmorTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerArmorTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerArmorTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerArmorTemplate * base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerArmorTemplate::getHighestTemplateVersion
+
+//@BEGIN TFD
+ServerArmorTemplate::ArmorRating ServerArmorTemplate::getRating(bool testData) const
+{
+#ifdef _DEBUG
+ServerArmorTemplate::ArmorRating testDataValue = static_cast<ServerArmorTemplate::ArmorRating>(0);
+#else
+UNREF(testData);
+#endif
+
+	const ServerArmorTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getRating(true);
+#endif
+	}
+
+	if (!m_rating.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter rating in template %s", DataResource::getName()));
+			return static_cast<ArmorRating>(0);
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter rating has not been defined in template %s!", DataResource::getName()));
+			return base->getRating();
+		}
+	}
+
+	ArmorRating value = static_cast<ArmorRating>(m_rating.getValue());
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerArmorTemplate::getRating
+
+int ServerArmorTemplate::getIntegrity(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerArmorTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getIntegrity(true);
+#endif
+	}
+
+	if (!m_integrity.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter integrity in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter integrity has not been defined in template %s!", DataResource::getName()));
+			return base->getIntegrity();
+		}
+	}
+
+	int value = m_integrity.getValue();
+	char delta = m_integrity.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getIntegrity();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerArmorTemplate::getIntegrity
+
+int ServerArmorTemplate::getIntegrityMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerArmorTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getIntegrityMin(true);
+#endif
+	}
+
+	if (!m_integrity.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter integrity in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter integrity has not been defined in template %s!", DataResource::getName()));
+			return base->getIntegrityMin();
+		}
+	}
+
+	int value = m_integrity.getMinValue();
+	char delta = m_integrity.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getIntegrityMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerArmorTemplate::getIntegrityMin
+
+int ServerArmorTemplate::getIntegrityMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerArmorTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getIntegrityMax(true);
+#endif
+	}
+
+	if (!m_integrity.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter integrity in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter integrity has not been defined in template %s!", DataResource::getName()));
+			return base->getIntegrityMax();
+		}
+	}
+
+	int value = m_integrity.getMaxValue();
+	char delta = m_integrity.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getIntegrityMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerArmorTemplate::getIntegrityMax
+
+int ServerArmorTemplate::getEffectiveness(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerArmorTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getEffectiveness(true);
+#endif
+	}
+
+	if (!m_effectiveness.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter effectiveness in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter effectiveness has not been defined in template %s!", DataResource::getName()));
+			return base->getEffectiveness();
+		}
+	}
+
+	int value = m_effectiveness.getValue();
+	char delta = m_effectiveness.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getEffectiveness();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerArmorTemplate::getEffectiveness
+
+int ServerArmorTemplate::getEffectivenessMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerArmorTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getEffectivenessMin(true);
+#endif
+	}
+
+	if (!m_effectiveness.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter effectiveness in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter effectiveness has not been defined in template %s!", DataResource::getName()));
+			return base->getEffectivenessMin();
+		}
+	}
+
+	int value = m_effectiveness.getMinValue();
+	char delta = m_effectiveness.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getEffectivenessMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerArmorTemplate::getEffectivenessMin
+
+int ServerArmorTemplate::getEffectivenessMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerArmorTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getEffectivenessMax(true);
+#endif
+	}
+
+	if (!m_effectiveness.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter effectiveness in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter effectiveness has not been defined in template %s!", DataResource::getName()));
+			return base->getEffectivenessMax();
+		}
+	}
+
+	int value = m_effectiveness.getMaxValue();
+	char delta = m_effectiveness.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getEffectivenessMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerArmorTemplate::getEffectivenessMax
+
+void ServerArmorTemplate::getSpecialProtection(SpecialProtection &data, int index) const
+{
+	const ServerArmorTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+	}
+
+	if (!m_specialProtectionLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter specialProtection in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter specialProtection has not been defined in template %s!", DataResource::getName()));
+			base->getSpecialProtection(data, index);
+			return;
+		}
+	}
+
+	if (m_specialProtectionAppend && base != NULL)
+	{
+		int baseCount = base->getSpecialProtectionCount();
+		if (index < baseCount)
+			{
+				base->getSpecialProtection(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_specialProtection.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_specialProtection[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _SpecialProtection *param = dynamic_cast<const _SpecialProtection *>(structTemplate);
+	NOT_NULL(param);
+	data.type = param->getType(m_versionOk);
+	data.effectiveness = param->getEffectiveness(m_versionOk);
+}	// ServerArmorTemplate::getSpecialProtection
+
+void ServerArmorTemplate::getSpecialProtectionMin(SpecialProtection &data, int index) const
+{
+	const ServerArmorTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+	}
+
+	if (!m_specialProtectionLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter specialProtection in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter specialProtection has not been defined in template %s!", DataResource::getName()));
+			base->getSpecialProtectionMin(data, index);
+			return;
+		}
+	}
+
+	if (m_specialProtectionAppend && base != NULL)
+	{
+		int baseCount = base->getSpecialProtectionCount();
+		if (index < baseCount)
+			{
+				base->getSpecialProtectionMin(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_specialProtection.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_specialProtection[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _SpecialProtection *param = dynamic_cast<const _SpecialProtection *>(structTemplate);
+	NOT_NULL(param);
+	data.type = param->getType(m_versionOk);
+	data.effectiveness = param->getEffectivenessMin(m_versionOk);
+}	// ServerArmorTemplate::getSpecialProtectionMin
+
+void ServerArmorTemplate::getSpecialProtectionMax(SpecialProtection &data, int index) const
+{
+	const ServerArmorTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+	}
+
+	if (!m_specialProtectionLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter specialProtection in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter specialProtection has not been defined in template %s!", DataResource::getName()));
+			base->getSpecialProtectionMax(data, index);
+			return;
+		}
+	}
+
+	if (m_specialProtectionAppend && base != NULL)
+	{
+		int baseCount = base->getSpecialProtectionCount();
+		if (index < baseCount)
+			{
+				base->getSpecialProtectionMax(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_specialProtection.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_specialProtection[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _SpecialProtection *param = dynamic_cast<const _SpecialProtection *>(structTemplate);
+	NOT_NULL(param);
+	data.type = param->getType(m_versionOk);
+	data.effectiveness = param->getEffectivenessMax(m_versionOk);
+}	// ServerArmorTemplate::getSpecialProtectionMax
+
+size_t ServerArmorTemplate::getSpecialProtectionCount(void) const
+{
+	if (!m_specialProtectionLoaded)
+	{
+		if (m_baseData == NULL)
+			return 0;
+		const ServerArmorTemplate * base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+		DEBUG_FATAL(base == NULL, ("base template wrong type"));
+		return base->getSpecialProtectionCount();
+	}
+
+	size_t count = m_specialProtection.size();
+
+	// if we are extending our base template, add it's count
+	if (m_specialProtectionAppend && m_baseData != NULL)
+	{
+		const ServerArmorTemplate * base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+		if (base != NULL)
+			count += base->getSpecialProtectionCount();
+	}
+
+	return count;
+}	// ServerArmorTemplate::getSpecialProtectionCount
+
+int ServerArmorTemplate::getVulnerability(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerArmorTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getVulnerability(true);
+#endif
+	}
+
+	if (!m_vulnerability.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter vulnerability in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter vulnerability has not been defined in template %s!", DataResource::getName()));
+			return base->getVulnerability();
+		}
+	}
+
+	int value = m_vulnerability.getValue();
+	char delta = m_vulnerability.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getVulnerability();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerArmorTemplate::getVulnerability
+
+int ServerArmorTemplate::getVulnerabilityMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerArmorTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getVulnerabilityMin(true);
+#endif
+	}
+
+	if (!m_vulnerability.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter vulnerability in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter vulnerability has not been defined in template %s!", DataResource::getName()));
+			return base->getVulnerabilityMin();
+		}
+	}
+
+	int value = m_vulnerability.getMinValue();
+	char delta = m_vulnerability.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getVulnerabilityMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerArmorTemplate::getVulnerabilityMin
+
+int ServerArmorTemplate::getVulnerabilityMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerArmorTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getVulnerabilityMax(true);
+#endif
+	}
+
+	if (!m_vulnerability.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter vulnerability in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter vulnerability has not been defined in template %s!", DataResource::getName()));
+			return base->getVulnerabilityMax();
+		}
+	}
+
+	int value = m_vulnerability.getMaxValue();
+	char delta = m_vulnerability.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getVulnerabilityMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerArmorTemplate::getVulnerabilityMax
+
+int ServerArmorTemplate::getEncumbrance(int index) const
+{
+	const ServerArmorTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 3, ("template param index out of range"));
+	if (!m_encumbrance[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter encumbrance in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter encumbrance has not been defined in template %s!", DataResource::getName()));
+			return base->getEncumbrance(index);
+		}
+	}
+
+	int value = m_encumbrance[index].getValue();
+	char delta = m_encumbrance[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getEncumbrance(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerArmorTemplate::getEncumbrance
+
+int ServerArmorTemplate::getEncumbranceMin(int index) const
+{
+	const ServerArmorTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 3, ("template param index out of range"));
+	if (!m_encumbrance[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter encumbrance in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter encumbrance has not been defined in template %s!", DataResource::getName()));
+			return base->getEncumbranceMin(index);
+		}
+	}
+
+	int value = m_encumbrance[index].getMinValue();
+	char delta = m_encumbrance[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getEncumbranceMin(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerArmorTemplate::getEncumbranceMin
+
+int ServerArmorTemplate::getEncumbranceMax(int index) const
+{
+	const ServerArmorTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 3, ("template param index out of range"));
+	if (!m_encumbrance[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter encumbrance in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter encumbrance has not been defined in template %s!", DataResource::getName()));
+			return base->getEncumbranceMax(index);
+		}
+	}
+
+	int value = m_encumbrance[index].getMaxValue();
+	char delta = m_encumbrance[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getEncumbranceMax(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerArmorTemplate::getEncumbranceMax
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerArmorTemplate::testValues(void) const
+{
+	IGNORE_RETURN(getRating(true));
+	IGNORE_RETURN(getIntegrityMin(true));
+	IGNORE_RETURN(getIntegrityMax(true));
+	IGNORE_RETURN(getEffectivenessMin(true));
+	IGNORE_RETURN(getEffectivenessMax(true));
+	IGNORE_RETURN(getVulnerabilityMin(true));
+	IGNORE_RETURN(getVulnerabilityMax(true));
+}	// ServerArmorTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerArmorTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerArmorTemplate_tag)
+	{
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,1))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "rating") == 0)
+			m_rating.loadFromIff(file);
+		else if (strcmp(paramName, "integrity") == 0)
+			m_integrity.loadFromIff(file);
+		else if (strcmp(paramName, "effectiveness") == 0)
+			m_effectiveness.loadFromIff(file);
+		else if (strcmp(paramName, "specialProtection") == 0)
+		{
+			std::vector<StructParamOT *>::iterator iter;
+			for (iter = m_specialProtection.begin(); iter != m_specialProtection.end(); ++iter)
+			{
+				delete *iter;
+				*iter = NULL;
+			}
+			m_specialProtection.clear();
+			m_specialProtectionAppend = file.read_bool8();
+			int listCount = file.read_int32();
+			for (int j = 0; j < listCount; ++j)
+			{
+				StructParamOT * newData = new StructParamOT;
+				newData->loadFromIff(file);
+				m_specialProtection.push_back(newData);
+			}
+			m_specialProtectionLoaded = true;
+		}
+		else if (strcmp(paramName, "vulnerability") == 0)
+			m_vulnerability.loadFromIff(file);
+		else if (strcmp(paramName, "encumbrance") == 0)
+		{
+			int listCount = file.read_int32();
+			DEBUG_WARNING(listCount != 3, ("Template %s: read array size of %d for array \"encumbrance\" of size 3, reading values anyway", file.getFileName(), listCount));
+			int j;
+			for (j = 0; j < 3 && j < listCount; ++j)
+				m_encumbrance[j].loadFromIff(file);
+			// if there are more params for encumbrance read and dump them
+			for (; j < listCount; ++j)
+			{
+				IntegerParam dummy;
+				dummy.loadFromIff(file);
+			}
+		}
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	return;
+}	// ServerArmorTemplate::load
+
+
+//=============================================================================
+// class ServerArmorTemplate::_SpecialProtection
+
+/**
+ * Class constructor.
+ */
+ServerArmorTemplate::_SpecialProtection::_SpecialProtection(const std::string & filename)
+	: ObjectTemplate(filename)
+{
+}	// ServerArmorTemplate::_SpecialProtection::_SpecialProtection
+
+/**
+ * Class destructor.
+ */
+ServerArmorTemplate::_SpecialProtection::~_SpecialProtection()
+{
+}	// ServerArmorTemplate::_SpecialProtection::~_SpecialProtection
+
+/**
+ * Static function used to register this template.
+ */
+void ServerArmorTemplate::_SpecialProtection::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(_SpecialProtection_tag, create);
+}	// ServerArmorTemplate::_SpecialProtection::registerMe
+
+/**
+ * Creates a ServerArmorTemplate::_SpecialProtection template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerArmorTemplate::_SpecialProtection::create(const std::string & filename)
+{
+	return new ServerArmorTemplate::_SpecialProtection(filename);
+}	// ServerArmorTemplate::_SpecialProtection::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerArmorTemplate::_SpecialProtection::getId(void) const
+{
+	return _SpecialProtection_tag;
+}	// ServerArmorTemplate::_SpecialProtection::getId
+
+ServerArmorTemplate::DamageType ServerArmorTemplate::_SpecialProtection::getType(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+ServerArmorTemplate::DamageType testDataValue = static_cast<ServerArmorTemplate::DamageType>(0);
+#else
+UNREF(testData);
+#endif
+
+	const ServerArmorTemplate::_SpecialProtection * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate::_SpecialProtection *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getType(true);
+#endif
+	}
+
+	if (!m_type.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter type in template %s", DataResource::getName()));
+			return static_cast<DamageType>(0);
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter type has not been defined in template %s!", DataResource::getName()));
+			return base->getType(versionOk);
+		}
+	}
+
+	DamageType value = static_cast<DamageType>(m_type.getValue());
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerArmorTemplate::_SpecialProtection::getType
+
+int ServerArmorTemplate::_SpecialProtection::getEffectiveness(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerArmorTemplate::_SpecialProtection * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate::_SpecialProtection *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getEffectiveness(true);
+#endif
+	}
+
+	if (!m_effectiveness.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter effectiveness in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter effectiveness has not been defined in template %s!", DataResource::getName()));
+			return base->getEffectiveness(versionOk);
+		}
+	}
+
+	int value = m_effectiveness.getValue();
+	char delta = m_effectiveness.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getEffectiveness(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerArmorTemplate::_SpecialProtection::getEffectiveness
+
+int ServerArmorTemplate::_SpecialProtection::getEffectivenessMin(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerArmorTemplate::_SpecialProtection * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate::_SpecialProtection *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getEffectivenessMin(true);
+#endif
+	}
+
+	if (!m_effectiveness.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter effectiveness in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter effectiveness has not been defined in template %s!", DataResource::getName()));
+			return base->getEffectivenessMin(versionOk);
+		}
+	}
+
+	int value = m_effectiveness.getMinValue();
+	char delta = m_effectiveness.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getEffectivenessMin(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerArmorTemplate::_SpecialProtection::getEffectivenessMin
+
+int ServerArmorTemplate::_SpecialProtection::getEffectivenessMax(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerArmorTemplate::_SpecialProtection * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerArmorTemplate::_SpecialProtection *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getEffectivenessMax(true);
+#endif
+	}
+
+	if (!m_effectiveness.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter effectiveness in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter effectiveness has not been defined in template %s!", DataResource::getName()));
+			return base->getEffectivenessMax(versionOk);
+		}
+	}
+
+	int value = m_effectiveness.getMaxValue();
+	char delta = m_effectiveness.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getEffectivenessMax(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerArmorTemplate::_SpecialProtection::getEffectivenessMax
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerArmorTemplate::_SpecialProtection::testValues(void) const
+{
+	IGNORE_RETURN(getType(true));
+	IGNORE_RETURN(getEffectivenessMin(true));
+	IGNORE_RETURN(getEffectivenessMax(true));
+}	// ServerArmorTemplate::_SpecialProtection::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerArmorTemplate::_SpecialProtection::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "type") == 0)
+			m_type.loadFromIff(file);
+		else if (strcmp(paramName, "effectiveness") == 0)
+			m_effectiveness.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	UNREF(file);
+}	// ServerArmorTemplate::_SpecialProtection::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.h
new file mode 100644
index 00000000..87ee48bc
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.h
@@ -0,0 +1,194 @@
+//========================================================================
+//
+// ServerArmorTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerArmorTemplate_H
+#define _INCLUDED_ServerArmorTemplate_H
+
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Armor;
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerArmorTemplate : public ObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerArmorTemplate_tag = TAG(A,R,M,O)
+	};
+//@END TFD ID
+public:
+	         ServerArmorTemplate(const std::string & filename);
+	virtual ~ServerArmorTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+	enum ArmorRating
+	{
+		AR_armorRealNone = -1,		// 			needed for internal reasons, do not use in templates! This means you!
+		AR_armorNone = 0,
+		AR_armorLight,
+		AR_armorMedium,
+		AR_armorHeavy,
+		ArmorRating_Last = AR_armorHeavy,
+	};
+
+	enum DamageType
+	{
+		DT_none = 0x00000000,
+		DT_kinetic = 0x00000001,
+		DT_energy = 0x00000002,
+		DT_blast = 0x00000004,
+		DT_stun = 0x00000008,
+		DT_restraint = 0x00000010,
+		DT_elemental_heat = 0x00000020,
+		DT_elemental_cold = 0x00000040,
+		DT_elemental_acid = 0x00000080,
+		DT_elemental_electrical = 0x00000100,
+		DT_environmental_heat = 0x00000200,
+		DT_environmental_cold = 0x00000400,
+		DT_environmental_acid = 0x00000800,
+		DT_environmental_electrical = 0x00001000,
+		DamageType_Last = DT_environmental_electrical,
+	};
+
+public:
+	struct SpecialProtection
+	{
+		enum DamageType type;
+		int                    effectiveness;
+	};
+
+protected:
+	class _SpecialProtection : public ObjectTemplate
+	{
+		friend class ServerArmorTemplate;
+	public:
+		enum
+		{
+			_SpecialProtection_tag = TAG(A,R,S,P)
+		};
+
+	public:
+		         _SpecialProtection(const std::string & filename);
+		virtual ~_SpecialProtection();
+
+	virtual Tag getId(void) const;
+
+public:
+	DamageType     getType(bool versionOk, bool testData = false) const;
+	int                    getEffectiveness(bool versionOk, bool testData = false) const;
+	int                    getEffectivenessMin(bool versionOk, bool testData = false) const;
+	int                    getEffectivenessMax(bool versionOk, bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	IntegerParam m_type;		// specific damage being protected from
+	IntegerParam m_effectiveness;		// armor effectiveness ( <0 = no protection for this damage type, default protection will be ignored)
+	private:
+		static void registerMe(void);
+		static ObjectTemplate * create(const std::string & filename);
+	private:
+		_SpecialProtection(const _SpecialProtection &);
+		_SpecialProtection & operator =(const _SpecialProtection &);
+	};
+	friend class ServerArmorTemplate::_SpecialProtection;
+
+public:
+	ArmorRating     getRating(bool testData = false) const;
+	int                    getIntegrity(bool testData = false) const;
+	int                    getIntegrityMin(bool testData = false) const;
+	int                    getIntegrityMax(bool testData = false) const;
+	int                    getEffectiveness(bool testData = false) const;
+	int                    getEffectivenessMin(bool testData = false) const;
+	int                    getEffectivenessMax(bool testData = false) const;
+	void              getSpecialProtection(SpecialProtection &data, int index) const;
+	void              getSpecialProtectionMin(SpecialProtection &data, int index) const;
+	void              getSpecialProtectionMax(SpecialProtection &data, int index) const;
+	size_t            getSpecialProtectionCount(void) const;
+	int                    getVulnerability(bool testData = false) const;
+	int                    getVulnerabilityMin(bool testData = false) const;
+	int                    getVulnerabilityMax(bool testData = false) const;
+	int                    getEncumbrance(int index) const;
+	int                    getEncumbranceMin(int index) const;
+	int                    getEncumbranceMax(int index) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	IntegerParam m_rating;		// armor rating
+	IntegerParam m_integrity;		// integrity
+	IntegerParam m_effectiveness;		// default effectiveness (0 = only use special protection)
+	stdvector<StructParamOT *>::fwd m_specialProtection;		// damage-type specific protection
+	bool m_specialProtectionLoaded;
+	bool m_specialProtectionAppend;
+	IntegerParam m_vulnerability;		// damaga types that this armor doesn't protect against
+	IntegerParam m_encumbrance[3];		// reduction to attributes from wearing this armor
+//@END TFD
+
+public:
+	// user functions
+
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerArmorTemplate(const ServerArmorTemplate &);
+	ServerArmorTemplate & operator =(const ServerArmorTemplate &);
+};
+
+
+inline void ServerArmorTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerArmorTemplate::registerMe();
+	ServerArmorTemplate::_SpecialProtection::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerArmorTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.cpp
new file mode 100644
index 00000000..98360e9b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.cpp
@@ -0,0 +1,186 @@
+//========================================================================
+//
+// ServerBattlefieldMarkerObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerBattlefieldMarkerObjectTemplate.h"
+#include "serverGame/BattlefieldMarkerObject.h"
+#include "sharedDebug/DataLint.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerBattlefieldMarkerObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerBattlefieldMarkerObjectTemplate::ServerBattlefieldMarkerObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerTangibleObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerBattlefieldMarkerObjectTemplate::ServerBattlefieldMarkerObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerBattlefieldMarkerObjectTemplate::~ServerBattlefieldMarkerObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerBattlefieldMarkerObjectTemplate::~ServerBattlefieldMarkerObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerBattlefieldMarkerObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerBattlefieldMarkerObjectTemplate_tag, create);
+}	// ServerBattlefieldMarkerObjectTemplate::registerMe
+
+/**
+ * Creates a ServerBattlefieldMarkerObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerBattlefieldMarkerObjectTemplate::create(const std::string & filename)
+{
+	return new ServerBattlefieldMarkerObjectTemplate(filename);
+}	// ServerBattlefieldMarkerObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerBattlefieldMarkerObjectTemplate::getId(void) const
+{
+	return ServerBattlefieldMarkerObjectTemplate_tag;
+}	// ServerBattlefieldMarkerObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerBattlefieldMarkerObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerBattlefieldMarkerObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerBattlefieldMarkerObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerBattlefieldMarkerObjectTemplate * base = dynamic_cast<const ServerBattlefieldMarkerObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerBattlefieldMarkerObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerBattlefieldMarkerObjectTemplate::createObject(void) const
+{
+	return new BattlefieldMarkerObject(this);
+}	// ServerBattlefieldMarkerObjectTemplate::createObject
+
+//@BEGIN TFD
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerBattlefieldMarkerObjectTemplate::testValues(void) const
+{
+	ServerTangibleObjectTemplate::testValues();
+}	// ServerBattlefieldMarkerObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerBattlefieldMarkerObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerBattlefieldMarkerObjectTemplate_tag)
+	{
+		ServerTangibleObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,0))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	UNREF(paramName);
+	UNREF(paramCount);
+
+	file.exitForm();
+	ServerTangibleObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerBattlefieldMarkerObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.h
new file mode 100644
index 00000000..935ba00c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.h
@@ -0,0 +1,87 @@
+//========================================================================
+//
+// ServerBattlefieldMarkerObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerBattlefieldMarkerObjectTemplate_H
+#define _INCLUDED_ServerBattlefieldMarkerObjectTemplate_H
+
+#include "ServerTangibleObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerBattlefieldMarkerObjectTemplate : public ServerTangibleObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerBattlefieldMarkerObjectTemplate_tag = TAG(B,M,R,K)
+	};
+//@END TFD ID
+public:
+	         ServerBattlefieldMarkerObjectTemplate(const std::string & filename);
+	virtual ~ServerBattlefieldMarkerObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerBattlefieldMarkerObjectTemplate(const ServerBattlefieldMarkerObjectTemplate &);
+	ServerBattlefieldMarkerObjectTemplate & operator =(const ServerBattlefieldMarkerObjectTemplate &);
+};
+
+
+inline void ServerBattlefieldMarkerObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerBattlefieldMarkerObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerBattlefieldMarkerObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerBuildingObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBuildingObjectTemplate.cpp
new file mode 100644
index 00000000..57086652
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBuildingObjectTemplate.cpp
@@ -0,0 +1,430 @@
+//========================================================================
+//
+// ServerBuildingObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerBuildingObjectTemplate.h"
+#include "serverGame/BuildingObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerBuildingObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerBuildingObjectTemplate::ServerBuildingObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerTangibleObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerBuildingObjectTemplate::ServerBuildingObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerBuildingObjectTemplate::~ServerBuildingObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerBuildingObjectTemplate::~ServerBuildingObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerBuildingObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerBuildingObjectTemplate_tag, create);
+}	// ServerBuildingObjectTemplate::registerMe
+
+/**
+ * Creates a ServerBuildingObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerBuildingObjectTemplate::create(const std::string & filename)
+{
+	return new ServerBuildingObjectTemplate(filename);
+}	// ServerBuildingObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerBuildingObjectTemplate::getId(void) const
+{
+	return ServerBuildingObjectTemplate_tag;
+}	// ServerBuildingObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerBuildingObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerBuildingObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerBuildingObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerBuildingObjectTemplate * base = dynamic_cast<const ServerBuildingObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerBuildingObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerBuildingObjectTemplate::createObject(void) const
+{
+	return new BuildingObject(this);
+}	// ServerBuildingObjectTemplate::createObject
+
+//@BEGIN TFD
+int ServerBuildingObjectTemplate::getMaintenanceCost(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerBuildingObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerBuildingObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaintenanceCost(true);
+#endif
+	}
+
+	if (!m_maintenanceCost.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maintenanceCost in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maintenanceCost has not been defined in template %s!", DataResource::getName()));
+			return base->getMaintenanceCost();
+		}
+	}
+
+	int value = m_maintenanceCost.getValue();
+	char delta = m_maintenanceCost.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaintenanceCost();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerBuildingObjectTemplate::getMaintenanceCost
+
+int ServerBuildingObjectTemplate::getMaintenanceCostMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerBuildingObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerBuildingObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaintenanceCostMin(true);
+#endif
+	}
+
+	if (!m_maintenanceCost.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maintenanceCost in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maintenanceCost has not been defined in template %s!", DataResource::getName()));
+			return base->getMaintenanceCostMin();
+		}
+	}
+
+	int value = m_maintenanceCost.getMinValue();
+	char delta = m_maintenanceCost.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaintenanceCostMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerBuildingObjectTemplate::getMaintenanceCostMin
+
+int ServerBuildingObjectTemplate::getMaintenanceCostMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerBuildingObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerBuildingObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaintenanceCostMax(true);
+#endif
+	}
+
+	if (!m_maintenanceCost.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maintenanceCost in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maintenanceCost has not been defined in template %s!", DataResource::getName()));
+			return base->getMaintenanceCostMax();
+		}
+	}
+
+	int value = m_maintenanceCost.getMaxValue();
+	char delta = m_maintenanceCost.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaintenanceCostMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerBuildingObjectTemplate::getMaintenanceCostMax
+
+bool ServerBuildingObjectTemplate::getIsPublic(bool testData) const
+{
+#ifdef _DEBUG
+bool testDataValue = false;
+#else
+UNREF(testData);
+#endif
+
+	const ServerBuildingObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerBuildingObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getIsPublic(true);
+#endif
+	}
+
+	if (!m_isPublic.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter isPublic in template %s", DataResource::getName()));
+			return false;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter isPublic has not been defined in template %s!", DataResource::getName()));
+			return base->getIsPublic();
+		}
+	}
+
+	bool value = m_isPublic.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerBuildingObjectTemplate::getIsPublic
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerBuildingObjectTemplate::testValues(void) const
+{
+	IGNORE_RETURN(getMaintenanceCostMin(true));
+	IGNORE_RETURN(getMaintenanceCostMax(true));
+	IGNORE_RETURN(getIsPublic(true));
+	ServerTangibleObjectTemplate::testValues();
+}	// ServerBuildingObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerBuildingObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerBuildingObjectTemplate_tag)
+	{
+		ServerTangibleObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,1))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "maintenanceCost") == 0)
+			m_maintenanceCost.loadFromIff(file);
+		else if (strcmp(paramName, "isPublic") == 0)
+			m_isPublic.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	ServerTangibleObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerBuildingObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerBuildingObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBuildingObjectTemplate.h
new file mode 100644
index 00000000..7ae6150d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBuildingObjectTemplate.h
@@ -0,0 +1,93 @@
+//========================================================================
+//
+// ServerBuildingObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerBuildingObjectTemplate_H
+#define _INCLUDED_ServerBuildingObjectTemplate_H
+
+#include "ServerTangibleObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerBuildingObjectTemplate : public ServerTangibleObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerBuildingObjectTemplate_tag = TAG(B,U,I,O)
+	};
+//@END TFD ID
+public:
+	         ServerBuildingObjectTemplate(const std::string & filename);
+	virtual ~ServerBuildingObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+	int                    getMaintenanceCost(bool testData = false) const;
+	int                    getMaintenanceCostMin(bool testData = false) const;
+	int                    getMaintenanceCostMax(bool testData = false) const;
+	bool                   getIsPublic(bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	IntegerParam m_maintenanceCost;		// The weekly cost (in credits) of maintaining this Building.
+	BoolParam m_isPublic;		// Whether by default the building is flagged public.
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerBuildingObjectTemplate(const ServerBuildingObjectTemplate &);
+	ServerBuildingObjectTemplate & operator =(const ServerBuildingObjectTemplate &);
+};
+
+
+inline void ServerBuildingObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerBuildingObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerBuildingObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCellObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCellObjectTemplate.cpp
new file mode 100644
index 00000000..5a35a6f9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCellObjectTemplate.cpp
@@ -0,0 +1,191 @@
+//========================================================================
+//
+// ServerCellObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerCellObjectTemplate.h"
+#include "serverGame/CellObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerCellObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerCellObjectTemplate::ServerCellObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerCellObjectTemplate::ServerCellObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerCellObjectTemplate::~ServerCellObjectTemplate()
+{
+	if (m_baseData)
+	{
+		DEBUG_REPORT_LOG(true,("Released m_baseData.\n"));
+		m_baseData->releaseReference();
+		m_baseData=0;
+	}
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerCellObjectTemplate::~ServerCellObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerCellObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerCellObjectTemplate_tag, create);
+}	// ServerCellObjectTemplate::registerMe
+
+/**
+ * Creates a ServerCellObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerCellObjectTemplate::create(const std::string & filename)
+{
+	return new ServerCellObjectTemplate(filename);
+}	// ServerCellObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerCellObjectTemplate::getId(void) const
+{
+	return ServerCellObjectTemplate_tag;
+}	// ServerCellObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerCellObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerCellObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerCellObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerCellObjectTemplate * base = dynamic_cast<const ServerCellObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerCellObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerCellObjectTemplate::createObject(void) const
+{
+	return new CellObject(this);
+}	// ServerCellObjectTemplate::createObject
+
+//@BEGIN TFD
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerCellObjectTemplate::testValues(void) const
+{
+	ServerObjectTemplate::testValues();
+}	// ServerCellObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerCellObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerCellObjectTemplate_tag)
+	{
+		ServerObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,0))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	UNREF(paramName);
+	UNREF(paramCount);
+
+	file.exitForm();
+	ServerObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerCellObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCellObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCellObjectTemplate.h
new file mode 100644
index 00000000..4af0214f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCellObjectTemplate.h
@@ -0,0 +1,87 @@
+//========================================================================
+//
+// ServerCellObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerCellObjectTemplate_H
+#define _INCLUDED_ServerCellObjectTemplate_H
+
+#include "ServerObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerCellObjectTemplate : public ServerObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerCellObjectTemplate_tag = TAG(S,C,L,T)
+	};
+//@END TFD ID
+public:
+	         ServerCellObjectTemplate(const std::string & filename);
+	virtual ~ServerCellObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerCellObjectTemplate(const ServerCellObjectTemplate &);
+	ServerCellObjectTemplate & operator =(const ServerCellObjectTemplate &);
+};
+
+
+inline void ServerCellObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerCellObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerCellObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCityObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCityObjectTemplate.cpp
new file mode 100644
index 00000000..0b59a960
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCityObjectTemplate.cpp
@@ -0,0 +1,187 @@
+//========================================================================
+//
+// ServerCityObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerCityObjectTemplate.h"
+
+#include "serverGame/CityObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerCityObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerCityObjectTemplate::ServerCityObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerUniverseObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerCityObjectTemplate::ServerCityObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerCityObjectTemplate::~ServerCityObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerCityObjectTemplate::~ServerCityObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerCityObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerCityObjectTemplate_tag, create);
+}	// ServerCityObjectTemplate::registerMe
+
+/**
+ * Creates a ServerCityObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerCityObjectTemplate::create(const std::string & filename)
+{
+	return new ServerCityObjectTemplate(filename);
+}	// ServerCityObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerCityObjectTemplate::getId(void) const
+{
+	return ServerCityObjectTemplate_tag;
+}	// ServerCityObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerCityObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerCityObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerCityObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerCityObjectTemplate * base = dynamic_cast<const ServerCityObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerCityObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerCityObjectTemplate::createObject(void) const
+{
+	return new CityObject(this);
+}	// ServerCityObjectTemplate::createObject
+
+//@BEGIN TFD
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerCityObjectTemplate::testValues(void) const
+{
+	ServerUniverseObjectTemplate::testValues();
+}	// ServerCityObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerCityObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerCityObjectTemplate_tag)
+	{
+		ServerUniverseObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,0))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	UNREF(paramName);
+	UNREF(paramCount);
+
+	file.exitForm();
+	ServerUniverseObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerCityObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCityObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCityObjectTemplate.h
new file mode 100644
index 00000000..3056b960
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCityObjectTemplate.h
@@ -0,0 +1,87 @@
+//========================================================================
+//
+// ServerCityObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerCityObjectTemplate_H
+#define _INCLUDED_ServerCityObjectTemplate_H
+
+#include "ServerUniverseObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerCityObjectTemplate : public ServerUniverseObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerCityObjectTemplate_tag = TAG(C,I,T,Y)
+	};
+//@END TFD ID
+public:
+	         ServerCityObjectTemplate(const std::string & filename);
+	virtual ~ServerCityObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerCityObjectTemplate(const ServerCityObjectTemplate &);
+	ServerCityObjectTemplate & operator =(const ServerCityObjectTemplate &);
+};
+
+
+inline void ServerCityObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerCityObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerCityObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp
new file mode 100644
index 00000000..22b6b4fe
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp
@@ -0,0 +1,175 @@
+//========================================================================
+//
+// ServerConstructionContractObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerConstructionContractObjectTemplate.h"
+#include "sharedFile/Iff.h"
+#include "sharedMath/Vector.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerConstructionContractObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerConstructionContractObjectTemplate::ServerConstructionContractObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerIntangibleObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerConstructionContractObjectTemplate::ServerConstructionContractObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerConstructionContractObjectTemplate::~ServerConstructionContractObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerConstructionContractObjectTemplate::~ServerConstructionContractObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerConstructionContractObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerConstructionContractObjectTemplate_tag, create);
+}	// ServerConstructionContractObjectTemplate::registerMe
+
+/**
+ * Creates a ServerConstructionContractObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerConstructionContractObjectTemplate::create(const std::string & filename)
+{
+	return new ServerConstructionContractObjectTemplate(filename);
+}	// ServerConstructionContractObjectTemplate::create
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerConstructionContractObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerConstructionContractObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerConstructionContractObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerConstructionContractObjectTemplate * base = dynamic_cast<const ServerConstructionContractObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerConstructionContractObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerConstructionContractObjectTemplate::getId(void) const
+{
+	return ServerConstructionContractObjectTemplate_tag;
+}	// ServerConstructionContractObjectTemplate::getId
+
+//@BEGIN TFD
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerConstructionContractObjectTemplate::testValues(void) const
+{
+	ServerIntangibleObjectTemplate::testValues();
+}	// ServerConstructionContractObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerConstructionContractObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerConstructionContractObjectTemplate_tag)
+	{
+		ServerIntangibleObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,0))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	UNREF(paramName);
+	UNREF(paramCount);
+
+	file.exitForm();
+	ServerIntangibleObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerConstructionContractObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.h
new file mode 100644
index 00000000..b14da90b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.h
@@ -0,0 +1,83 @@
+//========================================================================
+//
+// ServerConstructionContractObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerConstructionContractObjectTemplate_H
+#define _INCLUDED_ServerConstructionContractObjectTemplate_H
+
+#include "ServerIntangibleObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerConstructionContractObjectTemplate : public ServerIntangibleObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerConstructionContractObjectTemplate_tag = TAG(C,O,N,C)
+	};
+//@END TFD ID
+public:
+	         ServerConstructionContractObjectTemplate(const std::string & filename);
+	virtual ~ServerConstructionContractObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+//@END TFD
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerConstructionContractObjectTemplate(const ServerConstructionContractObjectTemplate &);
+	ServerConstructionContractObjectTemplate & operator =(const ServerConstructionContractObjectTemplate &);
+};
+
+
+inline void ServerConstructionContractObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerConstructionContractObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerConstructionContractObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.cpp
new file mode 100644
index 00000000..e5ba5655
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.cpp
@@ -0,0 +1,2512 @@
+//========================================================================
+//
+// ServerCreatureObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerCreatureObjectTemplate.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/NameManager.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedUtility/NameGenerator.h"
+#include "sharedNetworkMessages/NameErrors.h"
+//@BEGIN TFD TEMPLATE REFS
+#include "ServerWeaponObjectTemplate.h"
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerCreatureObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerCreatureObjectTemplate::ServerCreatureObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerTangibleObjectTemplate(filename)
+	,m_attribModsLoaded(false)
+	,m_attribModsAppend(false)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerCreatureObjectTemplate::ServerCreatureObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerCreatureObjectTemplate::~ServerCreatureObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+	{
+		std::vector<StructParamOT *>::iterator iter;
+		for (iter = m_attribMods.begin(); iter != m_attribMods.end(); ++iter)
+		{
+			delete *iter;
+			*iter = NULL;
+		}
+		m_attribMods.clear();
+	}
+//@END TFD CLEANUP
+}	// ServerCreatureObjectTemplate::~ServerCreatureObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerCreatureObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerCreatureObjectTemplate_tag, create);
+}	// ServerCreatureObjectTemplate::registerMe
+
+/**
+ * Creates a ServerCreatureObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerCreatureObjectTemplate::create(const std::string & filename)
+{
+	return new ServerCreatureObjectTemplate(filename);
+}	// ServerCreatureObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerCreatureObjectTemplate::getId(void) const
+{
+	return ServerCreatureObjectTemplate_tag;
+}	// ServerCreatureObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerCreatureObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerCreatureObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerCreatureObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerCreatureObjectTemplate * base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerCreatureObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerCreatureObjectTemplate::createObject(void) const
+{
+	return new CreatureObject(this);
+}	// ServerCreatureObjectTemplate::createObject
+
+//@BEGIN TFD
+const ServerWeaponObjectTemplate * ServerCreatureObjectTemplate::getDefaultWeapon() const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_defaultWeapon.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter defaultWeapon in template %s", DataResource::getName()));
+			return NULL;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter defaultWeapon has not been defined in template %s!", DataResource::getName()));
+			return base->getDefaultWeapon();
+		}
+	}
+
+	const ServerWeaponObjectTemplate * returnValue = NULL;
+	const std::string & templateName = m_defaultWeapon.getValue();
+	if (!templateName.empty())
+	{
+		returnValue = dynamic_cast<const ServerWeaponObjectTemplate *>(ObjectTemplateList::fetch(templateName));
+		if (returnValue == NULL)
+			WARNING_STRICT_FATAL(true, ("Error loading template %s",templateName.c_str()));
+	}
+	return returnValue;
+}	// ServerCreatureObjectTemplate::getDefaultWeapon
+
+int ServerCreatureObjectTemplate::getAttributes(Attributes index) const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 6, ("template param index out of range"));
+	if (!m_attributes[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter attributes in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter attributes has not been defined in template %s!", DataResource::getName()));
+			return base->getAttributes(index);
+		}
+	}
+
+	int value = m_attributes[index].getValue();
+	char delta = m_attributes[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getAttributes(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerCreatureObjectTemplate::getAttributes
+
+int ServerCreatureObjectTemplate::getAttributesMin(Attributes index) const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 6, ("template param index out of range"));
+	if (!m_attributes[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter attributes in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter attributes has not been defined in template %s!", DataResource::getName()));
+			return base->getAttributesMin(index);
+		}
+	}
+
+	int value = m_attributes[index].getMinValue();
+	char delta = m_attributes[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getAttributesMin(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerCreatureObjectTemplate::getAttributesMin
+
+int ServerCreatureObjectTemplate::getAttributesMax(Attributes index) const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 6, ("template param index out of range"));
+	if (!m_attributes[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter attributes in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter attributes has not been defined in template %s!", DataResource::getName()));
+			return base->getAttributesMax(index);
+		}
+	}
+
+	int value = m_attributes[index].getMaxValue();
+	char delta = m_attributes[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getAttributesMax(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerCreatureObjectTemplate::getAttributesMax
+
+int ServerCreatureObjectTemplate::getMinAttributes(Attributes index) const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 6, ("template param index out of range"));
+	if (!m_minAttributes[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter minAttributes in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter minAttributes has not been defined in template %s!", DataResource::getName()));
+			return base->getMinAttributes(index);
+		}
+	}
+
+	int value = m_minAttributes[index].getValue();
+	char delta = m_minAttributes[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMinAttributes(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerCreatureObjectTemplate::getMinAttributes
+
+int ServerCreatureObjectTemplate::getMinAttributesMin(Attributes index) const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 6, ("template param index out of range"));
+	if (!m_minAttributes[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter minAttributes in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter minAttributes has not been defined in template %s!", DataResource::getName()));
+			return base->getMinAttributesMin(index);
+		}
+	}
+
+	int value = m_minAttributes[index].getMinValue();
+	char delta = m_minAttributes[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMinAttributesMin(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerCreatureObjectTemplate::getMinAttributesMin
+
+int ServerCreatureObjectTemplate::getMinAttributesMax(Attributes index) const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 6, ("template param index out of range"));
+	if (!m_minAttributes[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter minAttributes in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter minAttributes has not been defined in template %s!", DataResource::getName()));
+			return base->getMinAttributesMax(index);
+		}
+	}
+
+	int value = m_minAttributes[index].getMaxValue();
+	char delta = m_minAttributes[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMinAttributesMax(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerCreatureObjectTemplate::getMinAttributesMax
+
+int ServerCreatureObjectTemplate::getMaxAttributes(Attributes index) const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 6, ("template param index out of range"));
+	if (!m_maxAttributes[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxAttributes in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxAttributes has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxAttributes(index);
+		}
+	}
+
+	int value = m_maxAttributes[index].getValue();
+	char delta = m_maxAttributes[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxAttributes(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerCreatureObjectTemplate::getMaxAttributes
+
+int ServerCreatureObjectTemplate::getMaxAttributesMin(Attributes index) const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 6, ("template param index out of range"));
+	if (!m_maxAttributes[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxAttributes in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxAttributes has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxAttributesMin(index);
+		}
+	}
+
+	int value = m_maxAttributes[index].getMinValue();
+	char delta = m_maxAttributes[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxAttributesMin(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerCreatureObjectTemplate::getMaxAttributesMin
+
+int ServerCreatureObjectTemplate::getMaxAttributesMax(Attributes index) const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 6, ("template param index out of range"));
+	if (!m_maxAttributes[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxAttributes in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxAttributes has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxAttributesMax(index);
+		}
+	}
+
+	int value = m_maxAttributes[index].getMaxValue();
+	char delta = m_maxAttributes[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxAttributesMax(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerCreatureObjectTemplate::getMaxAttributesMax
+
+float ServerCreatureObjectTemplate::getMinDrainModifier(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMinDrainModifier(true);
+#endif
+	}
+
+	if (!m_minDrainModifier.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter minDrainModifier in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter minDrainModifier has not been defined in template %s!", DataResource::getName()));
+			return base->getMinDrainModifier();
+		}
+	}
+
+	float value = m_minDrainModifier.getValue();
+	char delta = m_minDrainModifier.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMinDrainModifier();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getMinDrainModifier
+
+float ServerCreatureObjectTemplate::getMinDrainModifierMin(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMinDrainModifierMin(true);
+#endif
+	}
+
+	if (!m_minDrainModifier.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter minDrainModifier in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter minDrainModifier has not been defined in template %s!", DataResource::getName()));
+			return base->getMinDrainModifierMin();
+		}
+	}
+
+	float value = m_minDrainModifier.getMinValue();
+	char delta = m_minDrainModifier.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMinDrainModifierMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getMinDrainModifierMin
+
+float ServerCreatureObjectTemplate::getMinDrainModifierMax(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMinDrainModifierMax(true);
+#endif
+	}
+
+	if (!m_minDrainModifier.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter minDrainModifier in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter minDrainModifier has not been defined in template %s!", DataResource::getName()));
+			return base->getMinDrainModifierMax();
+		}
+	}
+
+	float value = m_minDrainModifier.getMaxValue();
+	char delta = m_minDrainModifier.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMinDrainModifierMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getMinDrainModifierMax
+
+float ServerCreatureObjectTemplate::getMaxDrainModifier(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxDrainModifier(true);
+#endif
+	}
+
+	if (!m_maxDrainModifier.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxDrainModifier in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxDrainModifier has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxDrainModifier();
+		}
+	}
+
+	float value = m_maxDrainModifier.getValue();
+	char delta = m_maxDrainModifier.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxDrainModifier();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getMaxDrainModifier
+
+float ServerCreatureObjectTemplate::getMaxDrainModifierMin(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxDrainModifierMin(true);
+#endif
+	}
+
+	if (!m_maxDrainModifier.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxDrainModifier in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxDrainModifier has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxDrainModifierMin();
+		}
+	}
+
+	float value = m_maxDrainModifier.getMinValue();
+	char delta = m_maxDrainModifier.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxDrainModifierMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getMaxDrainModifierMin
+
+float ServerCreatureObjectTemplate::getMaxDrainModifierMax(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxDrainModifierMax(true);
+#endif
+	}
+
+	if (!m_maxDrainModifier.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxDrainModifier in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxDrainModifier has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxDrainModifierMax();
+		}
+	}
+
+	float value = m_maxDrainModifier.getMaxValue();
+	char delta = m_maxDrainModifier.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxDrainModifierMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getMaxDrainModifierMax
+
+float ServerCreatureObjectTemplate::getMinFaucetModifier(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMinFaucetModifier(true);
+#endif
+	}
+
+	if (!m_minFaucetModifier.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter minFaucetModifier in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter minFaucetModifier has not been defined in template %s!", DataResource::getName()));
+			return base->getMinFaucetModifier();
+		}
+	}
+
+	float value = m_minFaucetModifier.getValue();
+	char delta = m_minFaucetModifier.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMinFaucetModifier();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getMinFaucetModifier
+
+float ServerCreatureObjectTemplate::getMinFaucetModifierMin(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMinFaucetModifierMin(true);
+#endif
+	}
+
+	if (!m_minFaucetModifier.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter minFaucetModifier in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter minFaucetModifier has not been defined in template %s!", DataResource::getName()));
+			return base->getMinFaucetModifierMin();
+		}
+	}
+
+	float value = m_minFaucetModifier.getMinValue();
+	char delta = m_minFaucetModifier.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMinFaucetModifierMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getMinFaucetModifierMin
+
+float ServerCreatureObjectTemplate::getMinFaucetModifierMax(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMinFaucetModifierMax(true);
+#endif
+	}
+
+	if (!m_minFaucetModifier.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter minFaucetModifier in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter minFaucetModifier has not been defined in template %s!", DataResource::getName()));
+			return base->getMinFaucetModifierMax();
+		}
+	}
+
+	float value = m_minFaucetModifier.getMaxValue();
+	char delta = m_minFaucetModifier.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMinFaucetModifierMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getMinFaucetModifierMax
+
+float ServerCreatureObjectTemplate::getMaxFaucetModifier(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxFaucetModifier(true);
+#endif
+	}
+
+	if (!m_maxFaucetModifier.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxFaucetModifier in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxFaucetModifier has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxFaucetModifier();
+		}
+	}
+
+	float value = m_maxFaucetModifier.getValue();
+	char delta = m_maxFaucetModifier.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxFaucetModifier();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getMaxFaucetModifier
+
+float ServerCreatureObjectTemplate::getMaxFaucetModifierMin(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxFaucetModifierMin(true);
+#endif
+	}
+
+	if (!m_maxFaucetModifier.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxFaucetModifier in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxFaucetModifier has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxFaucetModifierMin();
+		}
+	}
+
+	float value = m_maxFaucetModifier.getMinValue();
+	char delta = m_maxFaucetModifier.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxFaucetModifierMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getMaxFaucetModifierMin
+
+float ServerCreatureObjectTemplate::getMaxFaucetModifierMax(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxFaucetModifierMax(true);
+#endif
+	}
+
+	if (!m_maxFaucetModifier.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxFaucetModifier in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxFaucetModifier has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxFaucetModifierMax();
+		}
+	}
+
+	float value = m_maxFaucetModifier.getMaxValue();
+	char delta = m_maxFaucetModifier.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxFaucetModifierMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getMaxFaucetModifierMax
+
+void ServerCreatureObjectTemplate::getAttribMods(AttribMod &data, int index) const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_attribModsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter attribMods in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter attribMods has not been defined in template %s!", DataResource::getName()));
+			base->getAttribMods(data, index);
+			return;
+		}
+	}
+
+	if (m_attribModsAppend && base != NULL)
+	{
+		int baseCount = base->getAttribModsCount();
+		if (index < baseCount)
+			{
+				base->getAttribMods(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_attribMods.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_attribMods[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _AttribMod *param = dynamic_cast<const _AttribMod *>(structTemplate);
+	NOT_NULL(param);
+	data.target = param->getTarget(m_versionOk);
+	data.value = param->getValue(m_versionOk);
+	data.time = param->getTime(m_versionOk);
+	data.timeAtValue = param->getTimeAtValue(m_versionOk);
+	data.decay = param->getDecay(m_versionOk);
+}	// ServerCreatureObjectTemplate::getAttribMods
+
+void ServerCreatureObjectTemplate::getAttribModsMin(AttribMod &data, int index) const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_attribModsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter attribMods in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter attribMods has not been defined in template %s!", DataResource::getName()));
+			base->getAttribModsMin(data, index);
+			return;
+		}
+	}
+
+	if (m_attribModsAppend && base != NULL)
+	{
+		int baseCount = base->getAttribModsCount();
+		if (index < baseCount)
+			{
+				base->getAttribModsMin(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_attribMods.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_attribMods[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _AttribMod *param = dynamic_cast<const _AttribMod *>(structTemplate);
+	NOT_NULL(param);
+	data.target = param->getTarget(m_versionOk);
+	data.value = param->getValueMin(m_versionOk);
+	data.time = param->getTimeMin(m_versionOk);
+	data.timeAtValue = param->getTimeAtValueMin(m_versionOk);
+	data.decay = param->getDecayMin(m_versionOk);
+}	// ServerCreatureObjectTemplate::getAttribModsMin
+
+void ServerCreatureObjectTemplate::getAttribModsMax(AttribMod &data, int index) const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_attribModsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter attribMods in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter attribMods has not been defined in template %s!", DataResource::getName()));
+			base->getAttribModsMax(data, index);
+			return;
+		}
+	}
+
+	if (m_attribModsAppend && base != NULL)
+	{
+		int baseCount = base->getAttribModsCount();
+		if (index < baseCount)
+			{
+				base->getAttribModsMax(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_attribMods.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_attribMods[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _AttribMod *param = dynamic_cast<const _AttribMod *>(structTemplate);
+	NOT_NULL(param);
+	data.target = param->getTarget(m_versionOk);
+	data.value = param->getValueMax(m_versionOk);
+	data.time = param->getTimeMax(m_versionOk);
+	data.timeAtValue = param->getTimeAtValueMax(m_versionOk);
+	data.decay = param->getDecayMax(m_versionOk);
+}	// ServerCreatureObjectTemplate::getAttribModsMax
+
+size_t ServerCreatureObjectTemplate::getAttribModsCount(void) const
+{
+	if (!m_attribModsLoaded)
+	{
+		if (m_baseData == NULL)
+			return 0;
+		const ServerCreatureObjectTemplate * base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+		DEBUG_FATAL(base == NULL, ("base template wrong type"));
+		return base->getAttribModsCount();
+	}
+
+	size_t count = m_attribMods.size();
+
+	// if we are extending our base template, add it's count
+	if (m_attribModsAppend && m_baseData != NULL)
+	{
+		const ServerCreatureObjectTemplate * base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+		if (base != NULL)
+			count += base->getAttribModsCount();
+	}
+
+	return count;
+}	// ServerCreatureObjectTemplate::getAttribModsCount
+
+int ServerCreatureObjectTemplate::getShockWounds(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getShockWounds(true);
+#endif
+	}
+
+	if (!m_shockWounds.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter shockWounds in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter shockWounds has not been defined in template %s!", DataResource::getName()));
+			return base->getShockWounds();
+		}
+	}
+
+	int value = m_shockWounds.getValue();
+	char delta = m_shockWounds.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getShockWounds();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getShockWounds
+
+int ServerCreatureObjectTemplate::getShockWoundsMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getShockWoundsMin(true);
+#endif
+	}
+
+	if (!m_shockWounds.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter shockWounds in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter shockWounds has not been defined in template %s!", DataResource::getName()));
+			return base->getShockWoundsMin();
+		}
+	}
+
+	int value = m_shockWounds.getMinValue();
+	char delta = m_shockWounds.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getShockWoundsMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getShockWoundsMin
+
+int ServerCreatureObjectTemplate::getShockWoundsMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getShockWoundsMax(true);
+#endif
+	}
+
+	if (!m_shockWounds.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter shockWounds in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter shockWounds has not been defined in template %s!", DataResource::getName()));
+			return base->getShockWoundsMax();
+		}
+	}
+
+	int value = m_shockWounds.getMaxValue();
+	char delta = m_shockWounds.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getShockWoundsMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getShockWoundsMax
+
+bool ServerCreatureObjectTemplate::getCanCreateAvatar(bool testData) const
+{
+#ifdef _DEBUG
+bool testDataValue = false;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCanCreateAvatar(true);
+#endif
+	}
+
+	if (!m_canCreateAvatar.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter canCreateAvatar in template %s", DataResource::getName()));
+			return false;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter canCreateAvatar has not been defined in template %s!", DataResource::getName()));
+			return base->getCanCreateAvatar();
+		}
+	}
+
+	bool value = m_canCreateAvatar.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getCanCreateAvatar
+
+const std::string & ServerCreatureObjectTemplate::getNameGeneratorType(bool testData) const
+{
+#ifdef _DEBUG
+std::string testDataValue = DefaultString;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getNameGeneratorType(true);
+#endif
+	}
+
+	if (!m_nameGeneratorType.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter nameGeneratorType in template %s", DataResource::getName()));
+			return DefaultString;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter nameGeneratorType has not been defined in template %s!", DataResource::getName()));
+			return base->getNameGeneratorType();
+		}
+	}
+
+	const std::string & value = m_nameGeneratorType.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getNameGeneratorType
+
+float ServerCreatureObjectTemplate::getApproachTriggerRange(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getApproachTriggerRange(true);
+#endif
+	}
+
+	if (!m_approachTriggerRange.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter approachTriggerRange in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter approachTriggerRange has not been defined in template %s!", DataResource::getName()));
+			return base->getApproachTriggerRange();
+		}
+	}
+
+	float value = m_approachTriggerRange.getValue();
+	char delta = m_approachTriggerRange.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getApproachTriggerRange();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getApproachTriggerRange
+
+float ServerCreatureObjectTemplate::getApproachTriggerRangeMin(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getApproachTriggerRangeMin(true);
+#endif
+	}
+
+	if (!m_approachTriggerRange.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter approachTriggerRange in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter approachTriggerRange has not been defined in template %s!", DataResource::getName()));
+			return base->getApproachTriggerRangeMin();
+		}
+	}
+
+	float value = m_approachTriggerRange.getMinValue();
+	char delta = m_approachTriggerRange.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getApproachTriggerRangeMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getApproachTriggerRangeMin
+
+float ServerCreatureObjectTemplate::getApproachTriggerRangeMax(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getApproachTriggerRangeMax(true);
+#endif
+	}
+
+	if (!m_approachTriggerRange.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter approachTriggerRange in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter approachTriggerRange has not been defined in template %s!", DataResource::getName()));
+			return base->getApproachTriggerRangeMax();
+		}
+	}
+
+	float value = m_approachTriggerRange.getMaxValue();
+	char delta = m_approachTriggerRange.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getApproachTriggerRangeMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerCreatureObjectTemplate::getApproachTriggerRangeMax
+
+float ServerCreatureObjectTemplate::getMaxMentalStates(MentalStates index) const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 4, ("template param index out of range"));
+	if (!m_maxMentalStates[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxMentalStates in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxMentalStates has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxMentalStates(index);
+		}
+	}
+
+	float value = m_maxMentalStates[index].getValue();
+	char delta = m_maxMentalStates[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxMentalStates(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerCreatureObjectTemplate::getMaxMentalStates
+
+float ServerCreatureObjectTemplate::getMaxMentalStatesMin(MentalStates index) const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 4, ("template param index out of range"));
+	if (!m_maxMentalStates[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxMentalStates in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxMentalStates has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxMentalStatesMin(index);
+		}
+	}
+
+	float value = m_maxMentalStates[index].getMinValue();
+	char delta = m_maxMentalStates[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxMentalStatesMin(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerCreatureObjectTemplate::getMaxMentalStatesMin
+
+float ServerCreatureObjectTemplate::getMaxMentalStatesMax(MentalStates index) const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 4, ("template param index out of range"));
+	if (!m_maxMentalStates[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxMentalStates in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxMentalStates has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxMentalStatesMax(index);
+		}
+	}
+
+	float value = m_maxMentalStates[index].getMaxValue();
+	char delta = m_maxMentalStates[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxMentalStatesMax(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerCreatureObjectTemplate::getMaxMentalStatesMax
+
+float ServerCreatureObjectTemplate::getMentalStatesDecay(MentalStates index) const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 4, ("template param index out of range"));
+	if (!m_mentalStatesDecay[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter mentalStatesDecay in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter mentalStatesDecay has not been defined in template %s!", DataResource::getName()));
+			return base->getMentalStatesDecay(index);
+		}
+	}
+
+	float value = m_mentalStatesDecay[index].getValue();
+	char delta = m_mentalStatesDecay[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMentalStatesDecay(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerCreatureObjectTemplate::getMentalStatesDecay
+
+float ServerCreatureObjectTemplate::getMentalStatesDecayMin(MentalStates index) const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 4, ("template param index out of range"));
+	if (!m_mentalStatesDecay[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter mentalStatesDecay in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter mentalStatesDecay has not been defined in template %s!", DataResource::getName()));
+			return base->getMentalStatesDecayMin(index);
+		}
+	}
+
+	float value = m_mentalStatesDecay[index].getMinValue();
+	char delta = m_mentalStatesDecay[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMentalStatesDecayMin(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerCreatureObjectTemplate::getMentalStatesDecayMin
+
+float ServerCreatureObjectTemplate::getMentalStatesDecayMax(MentalStates index) const
+{
+	const ServerCreatureObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerCreatureObjectTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 4, ("template param index out of range"));
+	if (!m_mentalStatesDecay[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter mentalStatesDecay in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter mentalStatesDecay has not been defined in template %s!", DataResource::getName()));
+			return base->getMentalStatesDecayMax(index);
+		}
+	}
+
+	float value = m_mentalStatesDecay[index].getMaxValue();
+	char delta = m_mentalStatesDecay[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMentalStatesDecayMax(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerCreatureObjectTemplate::getMentalStatesDecayMax
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerCreatureObjectTemplate::testValues(void) const
+{
+	IGNORE_RETURN(getMinDrainModifierMin(true));
+	IGNORE_RETURN(getMinDrainModifierMax(true));
+	IGNORE_RETURN(getMaxDrainModifierMin(true));
+	IGNORE_RETURN(getMaxDrainModifierMax(true));
+	IGNORE_RETURN(getMinFaucetModifierMin(true));
+	IGNORE_RETURN(getMinFaucetModifierMax(true));
+	IGNORE_RETURN(getMaxFaucetModifierMin(true));
+	IGNORE_RETURN(getMaxFaucetModifierMax(true));
+	IGNORE_RETURN(getShockWoundsMin(true));
+	IGNORE_RETURN(getShockWoundsMax(true));
+	IGNORE_RETURN(getCanCreateAvatar(true));
+	IGNORE_RETURN(getNameGeneratorType(true));
+	IGNORE_RETURN(getApproachTriggerRangeMin(true));
+	IGNORE_RETURN(getApproachTriggerRangeMax(true));
+	ServerTangibleObjectTemplate::testValues();
+}	// ServerCreatureObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerCreatureObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerCreatureObjectTemplate_tag)
+	{
+		ServerTangibleObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,5))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "defaultWeapon") == 0)
+			m_defaultWeapon.loadFromIff(file);
+		else if (strcmp(paramName, "attributes") == 0)
+		{
+			int listCount = file.read_int32();
+			DEBUG_WARNING(listCount != 6, ("Template %s: read array size of %d for array \"attributes\" of size 6, reading values anyway", file.getFileName(), listCount));
+			int j;
+			for (j = 0; j < 6 && j < listCount; ++j)
+				m_attributes[j].loadFromIff(file);
+			// if there are more params for attributes read and dump them
+			for (; j < listCount; ++j)
+			{
+				IntegerParam dummy;
+				dummy.loadFromIff(file);
+			}
+		}
+		else if (strcmp(paramName, "minAttributes") == 0)
+		{
+			int listCount = file.read_int32();
+			DEBUG_WARNING(listCount != 6, ("Template %s: read array size of %d for array \"minAttributes\" of size 6, reading values anyway", file.getFileName(), listCount));
+			int j;
+			for (j = 0; j < 6 && j < listCount; ++j)
+				m_minAttributes[j].loadFromIff(file);
+			// if there are more params for minAttributes read and dump them
+			for (; j < listCount; ++j)
+			{
+				IntegerParam dummy;
+				dummy.loadFromIff(file);
+			}
+		}
+		else if (strcmp(paramName, "maxAttributes") == 0)
+		{
+			int listCount = file.read_int32();
+			DEBUG_WARNING(listCount != 6, ("Template %s: read array size of %d for array \"maxAttributes\" of size 6, reading values anyway", file.getFileName(), listCount));
+			int j;
+			for (j = 0; j < 6 && j < listCount; ++j)
+				m_maxAttributes[j].loadFromIff(file);
+			// if there are more params for maxAttributes read and dump them
+			for (; j < listCount; ++j)
+			{
+				IntegerParam dummy;
+				dummy.loadFromIff(file);
+			}
+		}
+		else if (strcmp(paramName, "minDrainModifier") == 0)
+			m_minDrainModifier.loadFromIff(file);
+		else if (strcmp(paramName, "maxDrainModifier") == 0)
+			m_maxDrainModifier.loadFromIff(file);
+		else if (strcmp(paramName, "minFaucetModifier") == 0)
+			m_minFaucetModifier.loadFromIff(file);
+		else if (strcmp(paramName, "maxFaucetModifier") == 0)
+			m_maxFaucetModifier.loadFromIff(file);
+		else if (strcmp(paramName, "attribMods") == 0)
+		{
+			std::vector<StructParamOT *>::iterator iter;
+			for (iter = m_attribMods.begin(); iter != m_attribMods.end(); ++iter)
+			{
+				delete *iter;
+				*iter = NULL;
+			}
+			m_attribMods.clear();
+			m_attribModsAppend = file.read_bool8();
+			int listCount = file.read_int32();
+			for (int j = 0; j < listCount; ++j)
+			{
+				StructParamOT * newData = new StructParamOT;
+				newData->loadFromIff(file);
+				m_attribMods.push_back(newData);
+			}
+			m_attribModsLoaded = true;
+		}
+		else if (strcmp(paramName, "shockWounds") == 0)
+			m_shockWounds.loadFromIff(file);
+		else if (strcmp(paramName, "canCreateAvatar") == 0)
+			m_canCreateAvatar.loadFromIff(file);
+		else if (strcmp(paramName, "nameGeneratorType") == 0)
+			m_nameGeneratorType.loadFromIff(file);
+		else if (strcmp(paramName, "approachTriggerRange") == 0)
+			m_approachTriggerRange.loadFromIff(file);
+		else if (strcmp(paramName, "maxMentalStates") == 0)
+		{
+			int listCount = file.read_int32();
+			DEBUG_WARNING(listCount != 4, ("Template %s: read array size of %d for array \"maxMentalStates\" of size 4, reading values anyway", file.getFileName(), listCount));
+			int j;
+			for (j = 0; j < 4 && j < listCount; ++j)
+				m_maxMentalStates[j].loadFromIff(file);
+			// if there are more params for maxMentalStates read and dump them
+			for (; j < listCount; ++j)
+			{
+				FloatParam dummy;
+				dummy.loadFromIff(file);
+			}
+		}
+		else if (strcmp(paramName, "mentalStatesDecay") == 0)
+		{
+			int listCount = file.read_int32();
+			DEBUG_WARNING(listCount != 4, ("Template %s: read array size of %d for array \"mentalStatesDecay\" of size 4, reading values anyway", file.getFileName(), listCount));
+			int j;
+			for (j = 0; j < 4 && j < listCount; ++j)
+				m_mentalStatesDecay[j].loadFromIff(file);
+			// if there are more params for mentalStatesDecay read and dump them
+			for (; j < listCount; ++j)
+			{
+				FloatParam dummy;
+				dummy.loadFromIff(file);
+			}
+		}
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	ServerTangibleObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerCreatureObjectTemplate::load
+
+//@END TFD
+
+/*
+Unicode::String ServerCreatureObjectTemplate::generateRandomName(StringId &o_errorMessage) const
+{
+	o_errorMessage = NameErrors::nameApproved;
+	return NameManager::getInstance().generateRandomName("name",getNameGeneratorType());
+}
+
+const StringId &ServerCreatureObjectTemplate::verifyName(const Unicode::String &name) const
+{
+	if (NameManager::getInstance().isNameAppropriate("name",getNameGeneratorType(),name))
+		return NameErrors::nameApproved;
+	else
+		return NameErrors::nameDeclinedRaciallyInappropriate;
+}
+*/
+
+void ServerCreatureObjectTemplate::postLoad()
+{
+	ServerTangibleObjectTemplate::postLoad();
+}
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.h
new file mode 100644
index 00000000..17478495
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.h
@@ -0,0 +1,162 @@
+//========================================================================
+//
+// ServerCreatureObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerCreatureObjectTemplate_H
+#define _INCLUDED_ServerCreatureObjectTemplate_H
+
+#include "ServerTangibleObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+class ServerWeaponObjectTemplate;
+//@END TFD TEMPLATE REFS
+
+
+class ServerCreatureObjectTemplate : public ServerTangibleObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerCreatureObjectTemplate_tag = TAG(C,R,E,O)
+	};
+//@END TFD ID
+public:
+	         ServerCreatureObjectTemplate(const std::string & filename);
+	virtual ~ServerCreatureObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+	void postLoad();
+
+//@BEGIN TFD
+public:
+	enum PathNodeType
+	{
+		PN_Open,		// //grasslands
+		PN_SparseCover,		// //light forests, vaporator farms
+		PN_DenseCover,		// //dense forests etc.
+		PN_NaturalInterior,		// //caves
+		PN_ArtificialInterior,		// //buildings
+		PN_NaturalPath,		// //paths and trails
+		PN_ArtificialPath,		// //roads
+		PN_PassableWater,		// //rivers, ponds, shorelines
+		PN_ImpassableWater,		// //big lakes and oceans
+		PathNodeType_Last = PN_ImpassableWater,
+	};
+
+public:
+	const ServerWeaponObjectTemplate * getDefaultWeapon() const;
+	int                    getAttributes(Attributes index) const;
+	int                    getAttributesMin(Attributes index) const;
+	int                    getAttributesMax(Attributes index) const;
+	int                    getMinAttributes(Attributes index) const;
+	int                    getMinAttributesMin(Attributes index) const;
+	int                    getMinAttributesMax(Attributes index) const;
+	int                    getMaxAttributes(Attributes index) const;
+	int                    getMaxAttributesMin(Attributes index) const;
+	int                    getMaxAttributesMax(Attributes index) const;
+	float                  getMinDrainModifier(bool testData = false) const;
+	float                  getMinDrainModifierMin(bool testData = false) const;
+	float                  getMinDrainModifierMax(bool testData = false) const;
+	float                  getMaxDrainModifier(bool testData = false) const;
+	float                  getMaxDrainModifierMin(bool testData = false) const;
+	float                  getMaxDrainModifierMax(bool testData = false) const;
+	float                  getMinFaucetModifier(bool testData = false) const;
+	float                  getMinFaucetModifierMin(bool testData = false) const;
+	float                  getMinFaucetModifierMax(bool testData = false) const;
+	float                  getMaxFaucetModifier(bool testData = false) const;
+	float                  getMaxFaucetModifierMin(bool testData = false) const;
+	float                  getMaxFaucetModifierMax(bool testData = false) const;
+	void              getAttribMods(AttribMod &data, int index) const;
+	void              getAttribModsMin(AttribMod &data, int index) const;
+	void              getAttribModsMax(AttribMod &data, int index) const;
+	size_t            getAttribModsCount(void) const;
+	int                    getShockWounds(bool testData = false) const;
+	int                    getShockWoundsMin(bool testData = false) const;
+	int                    getShockWoundsMax(bool testData = false) const;
+	bool                   getCanCreateAvatar(bool testData = false) const;
+	const std::string &    getNameGeneratorType(bool testData = false) const;
+	float                  getApproachTriggerRange(bool testData = false) const;
+	float                  getApproachTriggerRangeMin(bool testData = false) const;
+	float                  getApproachTriggerRangeMax(bool testData = false) const;
+	float                  getMaxMentalStates(MentalStates index) const;
+	float                  getMaxMentalStatesMin(MentalStates index) const;
+	float                  getMaxMentalStatesMax(MentalStates index) const;
+	float                  getMentalStatesDecay(MentalStates index) const;
+	float                  getMentalStatesDecayMin(MentalStates index) const;
+	float                  getMentalStatesDecayMax(MentalStates index) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	//Creature Attributes
+	StringParam m_defaultWeapon;		// //weapon to use if none is equipped
+	IntegerParam m_attributes[6];		// //initial value for attributes
+	IntegerParam m_minAttributes[6];		// //minimum value for attributes
+	IntegerParam m_maxAttributes[6];		// //maximum value for attributes
+	FloatParam m_minDrainModifier;		// //min drain rate in units/sec
+	FloatParam m_maxDrainModifier;		// //max drain rate in units/sec
+	FloatParam m_minFaucetModifier;		// //min regeneration rate in units/sec
+	FloatParam m_maxFaucetModifier;		// //max regeneration rate in units/sec
+	stdvector<StructParamOT *>::fwd m_attribMods;		// //(de)buffs the creature is created with
+	bool m_attribModsLoaded;
+	bool m_attribModsAppend;
+	IntegerParam m_shockWounds;		// //current shock wounds
+	BoolParam m_canCreateAvatar;		// //can a player create an avatar with this template
+	StringParam m_nameGeneratorType;		// //identifies which name generator to use
+	// AI Behavioral Variables
+	FloatParam m_approachTriggerRange;
+	FloatParam m_maxMentalStates[4];		// //maximum value for the mental state
+	FloatParam m_mentalStatesDecay[4];		// //time for the state to decay from 100 to 0
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerCreatureObjectTemplate(const ServerCreatureObjectTemplate &);
+	ServerCreatureObjectTemplate & operator =(const ServerCreatureObjectTemplate &);
+};
+
+
+inline void ServerCreatureObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerCreatureObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerCreatureObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.cpp
new file mode 100644
index 00000000..6ed8a518
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.cpp
@@ -0,0 +1,2021 @@
+//========================================================================
+//
+// ServerDraftSchematicObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerDraftSchematicObjectTemplate.h"
+#include "serverGame/DraftSchematicObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+#include "ServerFactoryObjectTemplate.h"
+#include "ServerObjectTemplate.h"
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerDraftSchematicObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerDraftSchematicObjectTemplate::ServerDraftSchematicObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerIntangibleObjectTemplate(filename)
+	,m_slotsLoaded(false)
+	,m_slotsAppend(false)
+	,m_skillCommandsLoaded(false)
+	,m_skillCommandsAppend(false)
+	,m_manufactureScriptsLoaded(false)
+	,m_manufactureScriptsAppend(false)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerDraftSchematicObjectTemplate::ServerDraftSchematicObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerDraftSchematicObjectTemplate::~ServerDraftSchematicObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+	{
+		std::vector<StructParamOT *>::iterator iter;
+		for (iter = m_slots.begin(); iter != m_slots.end(); ++iter)
+		{
+			delete *iter;
+			*iter = NULL;
+		}
+		m_slots.clear();
+	}
+	{
+		std::vector<StringParam *>::iterator iter;
+		for (iter = m_skillCommands.begin(); iter != m_skillCommands.end(); ++iter)
+		{
+			delete *iter;
+			*iter = NULL;
+		}
+		m_skillCommands.clear();
+	}
+	{
+		std::vector<StringParam *>::iterator iter;
+		for (iter = m_manufactureScripts.begin(); iter != m_manufactureScripts.end(); ++iter)
+		{
+			delete *iter;
+			*iter = NULL;
+		}
+		m_manufactureScripts.clear();
+	}
+//@END TFD CLEANUP
+}	// ServerDraftSchematicObjectTemplate::~ServerDraftSchematicObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerDraftSchematicObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerDraftSchematicObjectTemplate_tag, create);
+}	// ServerDraftSchematicObjectTemplate::registerMe
+
+/**
+ * Creates a ServerDraftSchematicObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerDraftSchematicObjectTemplate::create(const std::string & filename)
+{
+	return new ServerDraftSchematicObjectTemplate(filename);
+}	// ServerDraftSchematicObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerDraftSchematicObjectTemplate::getId(void) const
+{
+	return ServerDraftSchematicObjectTemplate_tag;
+}	// ServerDraftSchematicObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerDraftSchematicObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerDraftSchematicObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerDraftSchematicObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerDraftSchematicObjectTemplate * base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerDraftSchematicObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerDraftSchematicObjectTemplate::createObject(void) const
+{
+#ifdef _DEBUG
+	if (DataLint::isEnabled())
+	{
+		return new DraftSchematicObject(this);
+	}
+#endif
+
+	WARNING(true, ("Trying to create a draft schematic %s outside the draft "
+		"schematic factory!\n", getName()));
+	return NULL;
+}	// ServerDraftSchematicObjectTemplate::createObject
+
+/**
+ * Called after the template data has been loaded. Verifies that the schematic has 
+ * good data.
+ */
+void ServerDraftSchematicObjectTemplate::postLoad()
+{
+#ifdef _DEBUG
+	// verify that all slot names are unique
+	std::set<std::string> slotNames;
+
+	IngredientSlot data;
+	int count = getSlotsCount();
+	for (int i = 0; i < count; ++i)
+	{
+		getSlots(data, i);
+		if (slotNames.insert(data.name.getText()).second == false)
+		{
+			WARNING(true, ("Draft schematic %s has duplicate slot name %s",
+				getName(), data.name.getText().c_str()));
+		}
+	}
+#endif
+}	// ServerDraftSchematicObjectTemplate::postLoad
+
+//@BEGIN TFD
+ServerDraftSchematicObjectTemplate::CraftingType ServerDraftSchematicObjectTemplate::getCategory(bool testData) const
+{
+#ifdef _DEBUG
+ServerDraftSchematicObjectTemplate::CraftingType testDataValue = static_cast<ServerDraftSchematicObjectTemplate::CraftingType>(0);
+#else
+UNREF(testData);
+#endif
+
+	const ServerDraftSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCategory(true);
+#endif
+	}
+
+	if (!m_category.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter category in template %s", DataResource::getName()));
+			return static_cast<CraftingType>(0);
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter category has not been defined in template %s!", DataResource::getName()));
+			return base->getCategory();
+		}
+	}
+
+	CraftingType value = static_cast<CraftingType>(m_category.getValue());
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerDraftSchematicObjectTemplate::getCategory
+
+const ServerObjectTemplate * ServerDraftSchematicObjectTemplate::getCraftedObjectTemplate() const
+{
+	const ServerDraftSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_craftedObjectTemplate.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter craftedObjectTemplate in template %s", DataResource::getName()));
+			return NULL;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter craftedObjectTemplate has not been defined in template %s!", DataResource::getName()));
+			return base->getCraftedObjectTemplate();
+		}
+	}
+
+	const std::string & templateName = m_craftedObjectTemplate.getValue();
+	const ServerObjectTemplate * returnValue = dynamic_cast<const ServerObjectTemplate *>(ObjectTemplateList::fetch(templateName));
+	if (returnValue == NULL)
+		WARNING_STRICT_FATAL(true, ("Error loading template %s",templateName.c_str()));
+	return returnValue;
+}	// ServerDraftSchematicObjectTemplate::getCraftedObjectTemplate
+
+const ServerFactoryObjectTemplate * ServerDraftSchematicObjectTemplate::getCrateObjectTemplate() const
+{
+	const ServerDraftSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_crateObjectTemplate.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter crateObjectTemplate in template %s", DataResource::getName()));
+			return NULL;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter crateObjectTemplate has not been defined in template %s!", DataResource::getName()));
+			return base->getCrateObjectTemplate();
+		}
+	}
+
+	const std::string & templateName = m_crateObjectTemplate.getValue();
+	const ServerFactoryObjectTemplate * returnValue = dynamic_cast<const ServerFactoryObjectTemplate *>(ObjectTemplateList::fetch(templateName));
+	if (returnValue == NULL)
+		WARNING_STRICT_FATAL(true, ("Error loading template %s",templateName.c_str()));
+	return returnValue;
+}	// ServerDraftSchematicObjectTemplate::getCrateObjectTemplate
+
+void ServerDraftSchematicObjectTemplate::getSlots(IngredientSlot &data, int index) const
+{
+	const ServerDraftSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_slotsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter slots in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter slots has not been defined in template %s!", DataResource::getName()));
+			base->getSlots(data, index);
+			return;
+		}
+	}
+
+	if (m_slotsAppend && base != NULL)
+	{
+		int baseCount = base->getSlotsCount();
+		if (index < baseCount)
+			{
+				base->getSlots(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_slots.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_slots[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _IngredientSlot *param = dynamic_cast<const _IngredientSlot *>(structTemplate);
+	NOT_NULL(param);
+	data.optional = param->getOptional(m_versionOk);
+	data.name = param->getName(m_versionOk);
+	{
+		for (size_t i = 0; i < param->getOptionsCount(); ++i)
+		{
+			data.options.push_back(Ingredient());
+			param->getOptions(data.options.back(), i, m_versionOk);
+		}
+	}
+	data.optionalSkillCommand = param->getOptionalSkillCommand(m_versionOk);
+	data.complexity = param->getComplexity(m_versionOk);
+	data.appearance = param->getAppearance(m_versionOk);
+}	// ServerDraftSchematicObjectTemplate::getSlots
+
+void ServerDraftSchematicObjectTemplate::getSlotsMin(IngredientSlot &data, int index) const
+{
+	const ServerDraftSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_slotsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter slots in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter slots has not been defined in template %s!", DataResource::getName()));
+			base->getSlotsMin(data, index);
+			return;
+		}
+	}
+
+	if (m_slotsAppend && base != NULL)
+	{
+		int baseCount = base->getSlotsCount();
+		if (index < baseCount)
+			{
+				base->getSlotsMin(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_slots.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_slots[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _IngredientSlot *param = dynamic_cast<const _IngredientSlot *>(structTemplate);
+	NOT_NULL(param);
+	data.optional = param->getOptional(m_versionOk);
+	data.name = param->getName(m_versionOk);
+	{
+		for (size_t i = 0; i < param->getOptionsCount(); ++i)
+		{
+			data.options.push_back(Ingredient());
+			param->getOptionsMin(data.options.back(), i, m_versionOk);
+		}
+	}
+	data.optionalSkillCommand = param->getOptionalSkillCommand(m_versionOk);
+	data.complexity = param->getComplexityMin(m_versionOk);
+	data.appearance = param->getAppearance(m_versionOk);
+}	// ServerDraftSchematicObjectTemplate::getSlotsMin
+
+void ServerDraftSchematicObjectTemplate::getSlotsMax(IngredientSlot &data, int index) const
+{
+	const ServerDraftSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_slotsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter slots in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter slots has not been defined in template %s!", DataResource::getName()));
+			base->getSlotsMax(data, index);
+			return;
+		}
+	}
+
+	if (m_slotsAppend && base != NULL)
+	{
+		int baseCount = base->getSlotsCount();
+		if (index < baseCount)
+			{
+				base->getSlotsMax(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_slots.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_slots[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _IngredientSlot *param = dynamic_cast<const _IngredientSlot *>(structTemplate);
+	NOT_NULL(param);
+	data.optional = param->getOptional(m_versionOk);
+	data.name = param->getName(m_versionOk);
+	{
+		for (size_t i = 0; i < param->getOptionsCount(); ++i)
+		{
+			data.options.push_back(Ingredient());
+			param->getOptionsMax(data.options.back(), i, m_versionOk);
+		}
+	}
+	data.optionalSkillCommand = param->getOptionalSkillCommand(m_versionOk);
+	data.complexity = param->getComplexityMax(m_versionOk);
+	data.appearance = param->getAppearance(m_versionOk);
+}	// ServerDraftSchematicObjectTemplate::getSlotsMax
+
+size_t ServerDraftSchematicObjectTemplate::getSlotsCount(void) const
+{
+	if (!m_slotsLoaded)
+	{
+		if (m_baseData == NULL)
+			return 0;
+		const ServerDraftSchematicObjectTemplate * base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+		DEBUG_FATAL(base == NULL, ("base template wrong type"));
+		return base->getSlotsCount();
+	}
+
+	size_t count = m_slots.size();
+
+	// if we are extending our base template, add it's count
+	if (m_slotsAppend && m_baseData != NULL)
+	{
+		const ServerDraftSchematicObjectTemplate * base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+		if (base != NULL)
+			count += base->getSlotsCount();
+	}
+
+	return count;
+}	// ServerDraftSchematicObjectTemplate::getSlotsCount
+
+const std::string & ServerDraftSchematicObjectTemplate::getSkillCommands(int index) const
+{
+	const ServerDraftSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_skillCommandsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter skillCommands in template %s", DataResource::getName()));
+			return DefaultString;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter skillCommands has not been defined in template %s!", DataResource::getName()));
+			return base->getSkillCommands(index);
+		}
+	}
+
+	if (m_skillCommandsAppend && base != NULL)
+	{
+		int baseCount = base->getSkillCommandsCount();
+		if (index < baseCount)
+			return base->getSkillCommands(index);
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_skillCommands.size(), ("template param index out of range"));
+	const std::string & value = m_skillCommands[index]->getValue();
+	return value;
+}	// ServerDraftSchematicObjectTemplate::getSkillCommands
+
+size_t ServerDraftSchematicObjectTemplate::getSkillCommandsCount(void) const
+{
+	if (!m_skillCommandsLoaded)
+	{
+		if (m_baseData == NULL)
+			return 0;
+		const ServerDraftSchematicObjectTemplate * base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+		DEBUG_FATAL(base == NULL, ("base template wrong type"));
+		return base->getSkillCommandsCount();
+	}
+
+	size_t count = m_skillCommands.size();
+
+	// if we are extending our base template, add it's count
+	if (m_skillCommandsAppend && m_baseData != NULL)
+	{
+		const ServerDraftSchematicObjectTemplate * base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+		if (base != NULL)
+			count += base->getSkillCommandsCount();
+	}
+
+	return count;
+}	// ServerDraftSchematicObjectTemplate::getSkillCommandsCount
+
+bool ServerDraftSchematicObjectTemplate::getDestroyIngredients(bool testData) const
+{
+#ifdef _DEBUG
+bool testDataValue = false;
+#else
+UNREF(testData);
+#endif
+
+	const ServerDraftSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getDestroyIngredients(true);
+#endif
+	}
+
+	if (!m_destroyIngredients.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter destroyIngredients in template %s", DataResource::getName()));
+			return false;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter destroyIngredients has not been defined in template %s!", DataResource::getName()));
+			return base->getDestroyIngredients();
+		}
+	}
+
+	bool value = m_destroyIngredients.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerDraftSchematicObjectTemplate::getDestroyIngredients
+
+const std::string & ServerDraftSchematicObjectTemplate::getManufactureScripts(int index) const
+{
+	const ServerDraftSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_manufactureScriptsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter manufactureScripts in template %s", DataResource::getName()));
+			return DefaultString;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter manufactureScripts has not been defined in template %s!", DataResource::getName()));
+			return base->getManufactureScripts(index);
+		}
+	}
+
+	if (m_manufactureScriptsAppend && base != NULL)
+	{
+		int baseCount = base->getManufactureScriptsCount();
+		if (index < baseCount)
+			return base->getManufactureScripts(index);
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_manufactureScripts.size(), ("template param index out of range"));
+	const std::string & value = m_manufactureScripts[index]->getValue();
+	return value;
+}	// ServerDraftSchematicObjectTemplate::getManufactureScripts
+
+size_t ServerDraftSchematicObjectTemplate::getManufactureScriptsCount(void) const
+{
+	if (!m_manufactureScriptsLoaded)
+	{
+		if (m_baseData == NULL)
+			return 0;
+		const ServerDraftSchematicObjectTemplate * base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+		DEBUG_FATAL(base == NULL, ("base template wrong type"));
+		return base->getManufactureScriptsCount();
+	}
+
+	size_t count = m_manufactureScripts.size();
+
+	// if we are extending our base template, add it's count
+	if (m_manufactureScriptsAppend && m_baseData != NULL)
+	{
+		const ServerDraftSchematicObjectTemplate * base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+		if (base != NULL)
+			count += base->getManufactureScriptsCount();
+	}
+
+	return count;
+}	// ServerDraftSchematicObjectTemplate::getManufactureScriptsCount
+
+int ServerDraftSchematicObjectTemplate::getItemsPerContainer(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerDraftSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getItemsPerContainer(true);
+#endif
+	}
+
+	if (!m_itemsPerContainer.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter itemsPerContainer in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter itemsPerContainer has not been defined in template %s!", DataResource::getName()));
+			return base->getItemsPerContainer();
+		}
+	}
+
+	int value = m_itemsPerContainer.getValue();
+	char delta = m_itemsPerContainer.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getItemsPerContainer();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerDraftSchematicObjectTemplate::getItemsPerContainer
+
+int ServerDraftSchematicObjectTemplate::getItemsPerContainerMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerDraftSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getItemsPerContainerMin(true);
+#endif
+	}
+
+	if (!m_itemsPerContainer.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter itemsPerContainer in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter itemsPerContainer has not been defined in template %s!", DataResource::getName()));
+			return base->getItemsPerContainerMin();
+		}
+	}
+
+	int value = m_itemsPerContainer.getMinValue();
+	char delta = m_itemsPerContainer.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getItemsPerContainerMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerDraftSchematicObjectTemplate::getItemsPerContainerMin
+
+int ServerDraftSchematicObjectTemplate::getItemsPerContainerMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerDraftSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getItemsPerContainerMax(true);
+#endif
+	}
+
+	if (!m_itemsPerContainer.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter itemsPerContainer in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter itemsPerContainer has not been defined in template %s!", DataResource::getName()));
+			return base->getItemsPerContainerMax();
+		}
+	}
+
+	int value = m_itemsPerContainer.getMaxValue();
+	char delta = m_itemsPerContainer.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getItemsPerContainerMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerDraftSchematicObjectTemplate::getItemsPerContainerMax
+
+float ServerDraftSchematicObjectTemplate::getManufactureTime(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerDraftSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getManufactureTime(true);
+#endif
+	}
+
+	if (!m_manufactureTime.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter manufactureTime in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter manufactureTime has not been defined in template %s!", DataResource::getName()));
+			return base->getManufactureTime();
+		}
+	}
+
+	float value = m_manufactureTime.getValue();
+	char delta = m_manufactureTime.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getManufactureTime();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerDraftSchematicObjectTemplate::getManufactureTime
+
+float ServerDraftSchematicObjectTemplate::getManufactureTimeMin(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerDraftSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getManufactureTimeMin(true);
+#endif
+	}
+
+	if (!m_manufactureTime.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter manufactureTime in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter manufactureTime has not been defined in template %s!", DataResource::getName()));
+			return base->getManufactureTimeMin();
+		}
+	}
+
+	float value = m_manufactureTime.getMinValue();
+	char delta = m_manufactureTime.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getManufactureTimeMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerDraftSchematicObjectTemplate::getManufactureTimeMin
+
+float ServerDraftSchematicObjectTemplate::getManufactureTimeMax(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerDraftSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getManufactureTimeMax(true);
+#endif
+	}
+
+	if (!m_manufactureTime.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter manufactureTime in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter manufactureTime has not been defined in template %s!", DataResource::getName()));
+			return base->getManufactureTimeMax();
+		}
+	}
+
+	float value = m_manufactureTime.getMaxValue();
+	char delta = m_manufactureTime.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getManufactureTimeMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerDraftSchematicObjectTemplate::getManufactureTimeMax
+
+float ServerDraftSchematicObjectTemplate::getPrototypeTime(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerDraftSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getPrototypeTime(true);
+#endif
+	}
+
+	if (!m_prototypeTime.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter prototypeTime in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter prototypeTime has not been defined in template %s!", DataResource::getName()));
+			return base->getPrototypeTime();
+		}
+	}
+
+	float value = m_prototypeTime.getValue();
+	char delta = m_prototypeTime.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getPrototypeTime();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerDraftSchematicObjectTemplate::getPrototypeTime
+
+float ServerDraftSchematicObjectTemplate::getPrototypeTimeMin(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerDraftSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getPrototypeTimeMin(true);
+#endif
+	}
+
+	if (!m_prototypeTime.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter prototypeTime in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter prototypeTime has not been defined in template %s!", DataResource::getName()));
+			return base->getPrototypeTimeMin();
+		}
+	}
+
+	float value = m_prototypeTime.getMinValue();
+	char delta = m_prototypeTime.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getPrototypeTimeMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerDraftSchematicObjectTemplate::getPrototypeTimeMin
+
+float ServerDraftSchematicObjectTemplate::getPrototypeTimeMax(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerDraftSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getPrototypeTimeMax(true);
+#endif
+	}
+
+	if (!m_prototypeTime.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter prototypeTime in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter prototypeTime has not been defined in template %s!", DataResource::getName()));
+			return base->getPrototypeTimeMax();
+		}
+	}
+
+	float value = m_prototypeTime.getMaxValue();
+	char delta = m_prototypeTime.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getPrototypeTimeMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerDraftSchematicObjectTemplate::getPrototypeTimeMax
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerDraftSchematicObjectTemplate::testValues(void) const
+{
+	IGNORE_RETURN(getCategory(true));
+	IGNORE_RETURN(getDestroyIngredients(true));
+	IGNORE_RETURN(getItemsPerContainerMin(true));
+	IGNORE_RETURN(getItemsPerContainerMax(true));
+	IGNORE_RETURN(getManufactureTimeMin(true));
+	IGNORE_RETURN(getManufactureTimeMax(true));
+	IGNORE_RETURN(getPrototypeTimeMin(true));
+	IGNORE_RETURN(getPrototypeTimeMax(true));
+	ServerIntangibleObjectTemplate::testValues();
+}	// ServerDraftSchematicObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerDraftSchematicObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerDraftSchematicObjectTemplate_tag)
+	{
+		ServerIntangibleObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,7))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "category") == 0)
+			m_category.loadFromIff(file);
+		else if (strcmp(paramName, "craftedObjectTemplate") == 0)
+			m_craftedObjectTemplate.loadFromIff(file);
+		else if (strcmp(paramName, "crateObjectTemplate") == 0)
+			m_crateObjectTemplate.loadFromIff(file);
+		else if (strcmp(paramName, "slots") == 0)
+		{
+			std::vector<StructParamOT *>::iterator iter;
+			for (iter = m_slots.begin(); iter != m_slots.end(); ++iter)
+			{
+				delete *iter;
+				*iter = NULL;
+			}
+			m_slots.clear();
+			m_slotsAppend = file.read_bool8();
+			int listCount = file.read_int32();
+			for (int j = 0; j < listCount; ++j)
+			{
+				StructParamOT * newData = new StructParamOT;
+				newData->loadFromIff(file);
+				m_slots.push_back(newData);
+			}
+			m_slotsLoaded = true;
+		}
+		else if (strcmp(paramName, "skillCommands") == 0)
+		{
+			std::vector<StringParam *>::iterator iter;
+			for (iter = m_skillCommands.begin(); iter != m_skillCommands.end(); ++iter)
+			{
+				delete *iter;
+				*iter = NULL;
+			}
+			m_skillCommands.clear();
+			m_skillCommandsAppend = file.read_bool8();
+			int listCount = file.read_int32();
+			for (int j = 0; j < listCount; ++j)
+			{
+				StringParam * newData = new StringParam;
+				newData->loadFromIff(file);
+				m_skillCommands.push_back(newData);
+			}
+			m_skillCommandsLoaded = true;
+		}
+		else if (strcmp(paramName, "destroyIngredients") == 0)
+			m_destroyIngredients.loadFromIff(file);
+		else if (strcmp(paramName, "manufactureScripts") == 0)
+		{
+			std::vector<StringParam *>::iterator iter;
+			for (iter = m_manufactureScripts.begin(); iter != m_manufactureScripts.end(); ++iter)
+			{
+				delete *iter;
+				*iter = NULL;
+			}
+			m_manufactureScripts.clear();
+			m_manufactureScriptsAppend = file.read_bool8();
+			int listCount = file.read_int32();
+			for (int j = 0; j < listCount; ++j)
+			{
+				StringParam * newData = new StringParam;
+				newData->loadFromIff(file);
+				m_manufactureScripts.push_back(newData);
+			}
+			m_manufactureScriptsLoaded = true;
+		}
+		else if (strcmp(paramName, "itemsPerContainer") == 0)
+			m_itemsPerContainer.loadFromIff(file);
+		else if (strcmp(paramName, "manufactureTime") == 0)
+			m_manufactureTime.loadFromIff(file);
+		else if (strcmp(paramName, "prototypeTime") == 0)
+			m_prototypeTime.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	ServerIntangibleObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerDraftSchematicObjectTemplate::load
+
+
+//=============================================================================
+// class ServerDraftSchematicObjectTemplate::_IngredientSlot
+
+/**
+ * Class constructor.
+ */
+ServerDraftSchematicObjectTemplate::_IngredientSlot::_IngredientSlot(const std::string & filename)
+	: ObjectTemplate(filename)
+	,m_optionsLoaded(false)
+	,m_optionsAppend(false)
+{
+}	// ServerDraftSchematicObjectTemplate::_IngredientSlot::_IngredientSlot
+
+/**
+ * Class destructor.
+ */
+ServerDraftSchematicObjectTemplate::_IngredientSlot::~_IngredientSlot()
+{
+	{
+		std::vector<StructParamOT *>::iterator iter;
+		for (iter = m_options.begin(); iter != m_options.end(); ++iter)
+		{
+			delete *iter;
+			*iter = NULL;
+		}
+		m_options.clear();
+	}
+}	// ServerDraftSchematicObjectTemplate::_IngredientSlot::~_IngredientSlot
+
+/**
+ * Static function used to register this template.
+ */
+void ServerDraftSchematicObjectTemplate::_IngredientSlot::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(_IngredientSlot_tag, create);
+}	// ServerDraftSchematicObjectTemplate::_IngredientSlot::registerMe
+
+/**
+ * Creates a ServerDraftSchematicObjectTemplate::_IngredientSlot template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerDraftSchematicObjectTemplate::_IngredientSlot::create(const std::string & filename)
+{
+	return new ServerDraftSchematicObjectTemplate::_IngredientSlot(filename);
+}	// ServerDraftSchematicObjectTemplate::_IngredientSlot::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerDraftSchematicObjectTemplate::_IngredientSlot::getId(void) const
+{
+	return _IngredientSlot_tag;
+}	// ServerDraftSchematicObjectTemplate::_IngredientSlot::getId
+
+bool ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptional(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+bool testDataValue = false;
+#else
+UNREF(testData);
+#endif
+
+	const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate::_IngredientSlot *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getOptional(true);
+#endif
+	}
+
+	if (!m_optional.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter optional in template %s", DataResource::getName()));
+			return false;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter optional has not been defined in template %s!", DataResource::getName()));
+			return base->getOptional(versionOk);
+		}
+	}
+
+	bool value = m_optional.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptional
+
+const StringId ServerDraftSchematicObjectTemplate::_IngredientSlot::getName(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+StringId testDataValue = DefaultStringId;
+#else
+UNREF(testData);
+#endif
+
+	const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate::_IngredientSlot *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getName(true);
+#endif
+	}
+
+	if (!m_name.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter name in template %s", DataResource::getName()));
+			return DefaultStringId;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter name has not been defined in template %s!", DataResource::getName()));
+			return base->getName(versionOk);
+		}
+	}
+
+	const StringId value = m_name.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerDraftSchematicObjectTemplate::_IngredientSlot::getName
+
+void ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptions(Ingredient &data, int index, bool versionOk) const
+{
+	const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate::_IngredientSlot *>(m_baseData);
+	}
+
+	if (!m_optionsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter options in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter options has not been defined in template %s!", DataResource::getName()));
+			base->getOptions(data, index, versionOk);
+			return;
+		}
+	}
+
+	if (m_optionsAppend && base != NULL)
+	{
+		int baseCount = base->getOptionsCount();
+		if (index < baseCount)
+			{
+				base->getOptions(data, index, versionOk);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_options.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_options[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _Ingredient *param = dynamic_cast<const _Ingredient *>(structTemplate);
+	NOT_NULL(param);
+	data.ingredientType = param->getIngredientType(versionOk);
+	{
+		for (size_t i = 0; i < param->getIngredientsCount(); ++i)
+		{
+			data.ingredients.push_back(SimpleIngredient());
+			param->getIngredients(data.ingredients.back(), i, versionOk);
+		}
+	}
+	data.complexity = param->getComplexity(versionOk);
+	data.skillCommand = param->getSkillCommand(versionOk);
+}	// ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptions
+
+void ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionsMin(Ingredient &data, int index, bool versionOk) const
+{
+	const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate::_IngredientSlot *>(m_baseData);
+	}
+
+	if (!m_optionsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter options in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter options has not been defined in template %s!", DataResource::getName()));
+			base->getOptionsMin(data, index, versionOk);
+			return;
+		}
+	}
+
+	if (m_optionsAppend && base != NULL)
+	{
+		int baseCount = base->getOptionsCount();
+		if (index < baseCount)
+			{
+				base->getOptionsMin(data, index, versionOk);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_options.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_options[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _Ingredient *param = dynamic_cast<const _Ingredient *>(structTemplate);
+	NOT_NULL(param);
+	data.ingredientType = param->getIngredientType(versionOk);
+	{
+		for (size_t i = 0; i < param->getIngredientsCount(); ++i)
+		{
+			data.ingredients.push_back(SimpleIngredient());
+			param->getIngredientsMin(data.ingredients.back(), i, versionOk);
+		}
+	}
+	data.complexity = param->getComplexityMin(versionOk);
+	data.skillCommand = param->getSkillCommand(versionOk);
+}	// ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionsMin
+
+void ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionsMax(Ingredient &data, int index, bool versionOk) const
+{
+	const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate::_IngredientSlot *>(m_baseData);
+	}
+
+	if (!m_optionsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter options in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter options has not been defined in template %s!", DataResource::getName()));
+			base->getOptionsMax(data, index, versionOk);
+			return;
+		}
+	}
+
+	if (m_optionsAppend && base != NULL)
+	{
+		int baseCount = base->getOptionsCount();
+		if (index < baseCount)
+			{
+				base->getOptionsMax(data, index, versionOk);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_options.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_options[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _Ingredient *param = dynamic_cast<const _Ingredient *>(structTemplate);
+	NOT_NULL(param);
+	data.ingredientType = param->getIngredientType(versionOk);
+	{
+		for (size_t i = 0; i < param->getIngredientsCount(); ++i)
+		{
+			data.ingredients.push_back(SimpleIngredient());
+			param->getIngredientsMax(data.ingredients.back(), i, versionOk);
+		}
+	}
+	data.complexity = param->getComplexityMax(versionOk);
+	data.skillCommand = param->getSkillCommand(versionOk);
+}	// ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionsMax
+
+size_t ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionsCount(void) const
+{
+	if (!m_optionsLoaded)
+	{
+		if (m_baseData == NULL)
+			return 0;
+		const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = dynamic_cast<const ServerDraftSchematicObjectTemplate::_IngredientSlot *>(m_baseData);
+		DEBUG_FATAL(base == NULL, ("base template wrong type"));
+		return base->getOptionsCount();
+	}
+
+	size_t count = m_options.size();
+
+	// if we are extending our base template, add it's count
+	if (m_optionsAppend && m_baseData != NULL)
+	{
+		const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = dynamic_cast<const ServerDraftSchematicObjectTemplate::_IngredientSlot *>(m_baseData);
+		if (base != NULL)
+			count += base->getOptionsCount();
+	}
+
+	return count;
+}	// ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionsCount
+
+const std::string & ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionalSkillCommand(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+std::string testDataValue = DefaultString;
+#else
+UNREF(testData);
+#endif
+
+	const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate::_IngredientSlot *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getOptionalSkillCommand(true);
+#endif
+	}
+
+	if (!m_optionalSkillCommand.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter optionalSkillCommand in template %s", DataResource::getName()));
+			return DefaultString;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter optionalSkillCommand has not been defined in template %s!", DataResource::getName()));
+			return base->getOptionalSkillCommand(versionOk);
+		}
+	}
+
+	const std::string & value = m_optionalSkillCommand.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionalSkillCommand
+
+float ServerDraftSchematicObjectTemplate::_IngredientSlot::getComplexity(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate::_IngredientSlot *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getComplexity(true);
+#endif
+	}
+
+	if (!m_complexity.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter complexity in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter complexity has not been defined in template %s!", DataResource::getName()));
+			return base->getComplexity(versionOk);
+		}
+	}
+
+	float value = m_complexity.getValue();
+	char delta = m_complexity.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getComplexity(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerDraftSchematicObjectTemplate::_IngredientSlot::getComplexity
+
+float ServerDraftSchematicObjectTemplate::_IngredientSlot::getComplexityMin(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate::_IngredientSlot *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getComplexityMin(true);
+#endif
+	}
+
+	if (!m_complexity.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter complexity in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter complexity has not been defined in template %s!", DataResource::getName()));
+			return base->getComplexityMin(versionOk);
+		}
+	}
+
+	float value = m_complexity.getMinValue();
+	char delta = m_complexity.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getComplexityMin(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerDraftSchematicObjectTemplate::_IngredientSlot::getComplexityMin
+
+float ServerDraftSchematicObjectTemplate::_IngredientSlot::getComplexityMax(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate::_IngredientSlot *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getComplexityMax(true);
+#endif
+	}
+
+	if (!m_complexity.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter complexity in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter complexity has not been defined in template %s!", DataResource::getName()));
+			return base->getComplexityMax(versionOk);
+		}
+	}
+
+	float value = m_complexity.getMaxValue();
+	char delta = m_complexity.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getComplexityMax(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerDraftSchematicObjectTemplate::_IngredientSlot::getComplexityMax
+
+const std::string & ServerDraftSchematicObjectTemplate::_IngredientSlot::getAppearance(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+std::string testDataValue = DefaultString;
+#else
+UNREF(testData);
+#endif
+
+	const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerDraftSchematicObjectTemplate::_IngredientSlot *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getAppearance(true);
+#endif
+	}
+
+	if (!m_appearance.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter appearance in template %s", DataResource::getName()));
+			return DefaultString;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter appearance has not been defined in template %s!", DataResource::getName()));
+			return base->getAppearance(versionOk);
+		}
+	}
+
+	const std::string & value = m_appearance.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerDraftSchematicObjectTemplate::_IngredientSlot::getAppearance
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerDraftSchematicObjectTemplate::_IngredientSlot::testValues(void) const
+{
+	IGNORE_RETURN(getOptional(true));
+	IGNORE_RETURN(getName(true));
+	IGNORE_RETURN(getOptionalSkillCommand(true));
+	IGNORE_RETURN(getComplexityMin(true));
+	IGNORE_RETURN(getComplexityMax(true));
+	IGNORE_RETURN(getAppearance(true));
+}	// ServerDraftSchematicObjectTemplate::_IngredientSlot::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerDraftSchematicObjectTemplate::_IngredientSlot::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "optional") == 0)
+			m_optional.loadFromIff(file);
+		else if (strcmp(paramName, "name") == 0)
+			m_name.loadFromIff(file);
+		else if (strcmp(paramName, "options") == 0)
+		{
+			std::vector<StructParamOT *>::iterator iter;
+			for (iter = m_options.begin(); iter != m_options.end(); ++iter)
+			{
+				delete *iter;
+				*iter = NULL;
+			}
+			m_options.clear();
+			m_optionsAppend = file.read_bool8();
+			int listCount = file.read_int32();
+			for (int j = 0; j < listCount; ++j)
+			{
+				StructParamOT * newData = new StructParamOT;
+				newData->loadFromIff(file);
+				m_options.push_back(newData);
+			}
+			m_optionsLoaded = true;
+		}
+		else if (strcmp(paramName, "optionalSkillCommand") == 0)
+			m_optionalSkillCommand.loadFromIff(file);
+		else if (strcmp(paramName, "complexity") == 0)
+			m_complexity.loadFromIff(file);
+		else if (strcmp(paramName, "appearance") == 0)
+			m_appearance.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	UNREF(file);
+}	// ServerDraftSchematicObjectTemplate::_IngredientSlot::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.h
new file mode 100644
index 00000000..a13fec2d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.h
@@ -0,0 +1,198 @@
+//========================================================================
+//
+// ServerDraftSchematicObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerDraftSchematicObjectTemplate_H
+#define _INCLUDED_ServerDraftSchematicObjectTemplate_H
+
+#include "ServerIntangibleObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+class ServerFactoryObjectTemplate;
+class ServerObjectTemplate;
+//@END TFD TEMPLATE REFS
+
+
+class ServerDraftSchematicObjectTemplate : public ServerIntangibleObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerDraftSchematicObjectTemplate_tag = TAG(D,S,C,O)
+	};
+//@END TFD ID
+public:
+	         ServerDraftSchematicObjectTemplate(const std::string & filename);
+	virtual ~ServerDraftSchematicObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+	struct IngredientSlot
+	{
+		bool                   optional;
+		StringId               name;
+		stdvector<Ingredient>::fwd options;
+		std::string            optionalSkillCommand;
+		float                  complexity;
+		std::string            appearance;
+	};
+
+protected:
+	class _IngredientSlot : public ObjectTemplate
+	{
+		friend class ServerDraftSchematicObjectTemplate;
+	public:
+		enum
+		{
+			_IngredientSlot_tag = TAG(D,I,N,S)
+		};
+
+	public:
+		         _IngredientSlot(const std::string & filename);
+		virtual ~_IngredientSlot();
+
+	virtual Tag getId(void) const;
+
+public:
+	bool                   getOptional(bool versionOk, bool testData = false) const;
+	const StringId         getName(bool versionOk, bool testData = false) const;
+	void              getOptions(Ingredient &data, int index, bool versionOk) const;
+	void              getOptionsMin(Ingredient &data, int index, bool versionOk) const;
+	void              getOptionsMax(Ingredient &data, int index, bool versionOk) const;
+	size_t            getOptionsCount(void) const;
+	const std::string &    getOptionalSkillCommand(bool versionOk, bool testData = false) const;
+	float                  getComplexity(bool versionOk, bool testData = false) const;
+	float                  getComplexityMin(bool versionOk, bool testData = false) const;
+	float                  getComplexityMax(bool versionOk, bool testData = false) const;
+	const std::string &    getAppearance(bool versionOk, bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	BoolParam m_optional;		// is the slot optional
+	StringIdParam m_name;		// slot name
+	stdvector<StructParamOT *>::fwd m_options;		// possible ingredients that can be used to fill the slot
+	bool m_optionsLoaded;
+	bool m_optionsAppend;
+	StringParam m_optionalSkillCommand;		// skill commands needed to access this slot if it is optional (ignored for required slots)
+	FloatParam m_complexity;		// adjustment to complexity by using this slot
+	StringParam m_appearance;		// if the slot is a component, the name of the hardpoint associated with the slot; if the slot is a resource, a string used to build an appearance file name
+	private:
+		static void registerMe(void);
+		static ObjectTemplate * create(const std::string & filename);
+	private:
+		_IngredientSlot(const _IngredientSlot &);
+		_IngredientSlot & operator =(const _IngredientSlot &);
+	};
+	friend class ServerDraftSchematicObjectTemplate::_IngredientSlot;
+
+public:
+	CraftingType     getCategory(bool testData = false) const;
+	const ServerObjectTemplate * getCraftedObjectTemplate() const;
+	const ServerFactoryObjectTemplate * getCrateObjectTemplate() const;
+	void              getSlots(IngredientSlot &data, int index) const;
+	void              getSlotsMin(IngredientSlot &data, int index) const;
+	void              getSlotsMax(IngredientSlot &data, int index) const;
+	size_t            getSlotsCount(void) const;
+	const std::string &    getSkillCommands(int index) const;
+	size_t            getSkillCommandsCount(void) const;
+	bool                   getDestroyIngredients(bool testData = false) const;
+	const std::string &    getManufactureScripts(int index) const;
+	size_t            getManufactureScriptsCount(void) const;
+	int                    getItemsPerContainer(bool testData = false) const;
+	int                    getItemsPerContainerMin(bool testData = false) const;
+	int                    getItemsPerContainerMax(bool testData = false) const;
+	float                  getManufactureTime(bool testData = false) const;
+	float                  getManufactureTimeMin(bool testData = false) const;
+	float                  getManufactureTimeMax(bool testData = false) const;
+	float                  getPrototypeTime(bool testData = false) const;
+	float                  getPrototypeTimeMin(bool testData = false) const;
+	float                  getPrototypeTimeMax(bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	IntegerParam m_category;		// schematic category (food, weapon, etc)
+	StringParam m_craftedObjectTemplate;		// what object we create
+	StringParam m_crateObjectTemplate;		// the "crate" to use when manufacturing multiple copies of the object
+	stdvector<StructParamOT *>::fwd m_slots;		// ingredient slots
+	bool m_slotsLoaded;
+	bool m_slotsAppend;
+	stdvector<StringParam *>::fwd m_skillCommands;		// skill commands needed to access this schematic and required slots
+	bool m_skillCommandsLoaded;
+	bool m_skillCommandsAppend;
+	BoolParam m_destroyIngredients;		// flag that the ingredients used in the design stage should be destroyed
+	stdvector<StringParam *>::fwd m_manufactureScripts;		// scripts that will be attached to a manufacturing schematic created from this schematic
+	bool m_manufactureScriptsLoaded;
+	bool m_manufactureScriptsAppend;
+	IntegerParam m_itemsPerContainer;		// when manufacturing, how many items will be put in a container (1 = items not in a container)
+	FloatParam m_manufactureTime;		// time to manufacture an item (in secs) per complexity point
+	FloatParam m_prototypeTime;		// time to create a prototype (in secs) per complexity point
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+protected:
+	// user functions
+	virtual void     postLoad();
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerDraftSchematicObjectTemplate(const ServerDraftSchematicObjectTemplate &);
+	ServerDraftSchematicObjectTemplate & operator =(const ServerDraftSchematicObjectTemplate &);
+};
+
+
+inline void ServerDraftSchematicObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerDraftSchematicObjectTemplate::registerMe();
+	ServerDraftSchematicObjectTemplate::_IngredientSlot::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerDraftSchematicObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerFactoryObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerFactoryObjectTemplate.cpp
new file mode 100644
index 00000000..413f930b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerFactoryObjectTemplate.cpp
@@ -0,0 +1,185 @@
+//========================================================================
+//
+// ServerFactoryObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerFactoryObjectTemplate.h"
+#include "serverGame/FactoryObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerFactoryObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerFactoryObjectTemplate::ServerFactoryObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerTangibleObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerFactoryObjectTemplate::ServerFactoryObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerFactoryObjectTemplate::~ServerFactoryObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerFactoryObjectTemplate::~ServerFactoryObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerFactoryObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerFactoryObjectTemplate_tag, create);
+}	// ServerFactoryObjectTemplate::registerMe
+
+/**
+ * Creates a ServerFactoryObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerFactoryObjectTemplate::create(const std::string & filename)
+{
+	return new ServerFactoryObjectTemplate(filename);
+}	// ServerFactoryObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerFactoryObjectTemplate::getId(void) const
+{
+	return ServerFactoryObjectTemplate_tag;
+}	// ServerFactoryObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerFactoryObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerFactoryObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerFactoryObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerFactoryObjectTemplate * base = dynamic_cast<const ServerFactoryObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerFactoryObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerFactoryObjectTemplate::createObject(void) const
+{
+	return new FactoryObject(this);
+}	// ServerFactoryObjectTemplate::createObject
+
+//@BEGIN TFD
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerFactoryObjectTemplate::testValues(void) const
+{
+	ServerTangibleObjectTemplate::testValues();
+}	// ServerFactoryObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerFactoryObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerFactoryObjectTemplate_tag)
+	{
+		ServerTangibleObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,0))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	UNREF(paramName);
+	UNREF(paramCount);
+
+	file.exitForm();
+	ServerTangibleObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerFactoryObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerFactoryObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerFactoryObjectTemplate.h
new file mode 100644
index 00000000..91736fac
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerFactoryObjectTemplate.h
@@ -0,0 +1,87 @@
+//========================================================================
+//
+// ServerFactoryObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerFactoryObjectTemplate_H
+#define _INCLUDED_ServerFactoryObjectTemplate_H
+
+#include "ServerTangibleObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerFactoryObjectTemplate : public ServerTangibleObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerFactoryObjectTemplate_tag = TAG(F,C,Y,T)
+	};
+//@END TFD ID
+public:
+	         ServerFactoryObjectTemplate(const std::string & filename);
+	virtual ~ServerFactoryObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerFactoryObjectTemplate(const ServerFactoryObjectTemplate &);
+	ServerFactoryObjectTemplate & operator =(const ServerFactoryObjectTemplate &);
+};
+
+
+inline void ServerFactoryObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerFactoryObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerFactoryObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerGroupObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGroupObjectTemplate.cpp
new file mode 100644
index 00000000..9f63f2db
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGroupObjectTemplate.cpp
@@ -0,0 +1,187 @@
+//========================================================================
+//
+// ServerGroupObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerGroupObjectTemplate.h"
+
+#include "serverGame/GroupObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerGroupObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerGroupObjectTemplate::ServerGroupObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerUniverseObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerGroupObjectTemplate::ServerGroupObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerGroupObjectTemplate::~ServerGroupObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerGroupObjectTemplate::~ServerGroupObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerGroupObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerGroupObjectTemplate_tag, create);
+}	// ServerGroupObjectTemplate::registerMe
+
+/**
+ * Creates a ServerGroupObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerGroupObjectTemplate::create(const std::string & filename)
+{
+	return new ServerGroupObjectTemplate(filename);
+}	// ServerGroupObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerGroupObjectTemplate::getId(void) const
+{
+	return ServerGroupObjectTemplate_tag;
+}	// ServerGroupObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerGroupObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerGroupObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerGroupObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerGroupObjectTemplate * base = dynamic_cast<const ServerGroupObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerGroupObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerGroupObjectTemplate::createObject(void) const
+{
+	return new GroupObject(this);
+}	// ServerGroupObjectTemplate::createObject
+
+//@BEGIN TFD
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerGroupObjectTemplate::testValues(void) const
+{
+	ServerUniverseObjectTemplate::testValues();
+}	// ServerGroupObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerGroupObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerGroupObjectTemplate_tag)
+	{
+		ServerUniverseObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,0))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	UNREF(paramName);
+	UNREF(paramCount);
+
+	file.exitForm();
+	ServerUniverseObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerGroupObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerGroupObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGroupObjectTemplate.h
new file mode 100644
index 00000000..e847ca95
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGroupObjectTemplate.h
@@ -0,0 +1,87 @@
+//========================================================================
+//
+// ServerGroupObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerGroupObjectTemplate_H
+#define _INCLUDED_ServerGroupObjectTemplate_H
+
+#include "ServerUniverseObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerGroupObjectTemplate : public ServerUniverseObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerGroupObjectTemplate_tag = TAG(G,R,U,P)
+	};
+//@END TFD ID
+public:
+	         ServerGroupObjectTemplate(const std::string & filename);
+	virtual ~ServerGroupObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerGroupObjectTemplate(const ServerGroupObjectTemplate &);
+	ServerGroupObjectTemplate & operator =(const ServerGroupObjectTemplate &);
+};
+
+
+inline void ServerGroupObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerGroupObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerGroupObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerGuildObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGuildObjectTemplate.cpp
new file mode 100644
index 00000000..00d26b3f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGuildObjectTemplate.cpp
@@ -0,0 +1,187 @@
+//========================================================================
+//
+// ServerGuildObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerGuildObjectTemplate.h"
+
+#include "serverGame/GuildObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerGuildObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerGuildObjectTemplate::ServerGuildObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerUniverseObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerGuildObjectTemplate::ServerGuildObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerGuildObjectTemplate::~ServerGuildObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerGuildObjectTemplate::~ServerGuildObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerGuildObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerGuildObjectTemplate_tag, create);
+}	// ServerGuildObjectTemplate::registerMe
+
+/**
+ * Creates a ServerGuildObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerGuildObjectTemplate::create(const std::string & filename)
+{
+	return new ServerGuildObjectTemplate(filename);
+}	// ServerGuildObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerGuildObjectTemplate::getId(void) const
+{
+	return ServerGuildObjectTemplate_tag;
+}	// ServerGuildObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerGuildObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerGuildObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerGuildObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerGuildObjectTemplate * base = dynamic_cast<const ServerGuildObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerGuildObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerGuildObjectTemplate::createObject(void) const
+{
+	return new GuildObject(this);
+}	// ServerGuildObjectTemplate::createObject
+
+//@BEGIN TFD
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerGuildObjectTemplate::testValues(void) const
+{
+	ServerUniverseObjectTemplate::testValues();
+}	// ServerGuildObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerGuildObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerGuildObjectTemplate_tag)
+	{
+		ServerUniverseObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,0))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	UNREF(paramName);
+	UNREF(paramCount);
+
+	file.exitForm();
+	ServerUniverseObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerGuildObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerGuildObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGuildObjectTemplate.h
new file mode 100644
index 00000000..5aed85aa
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGuildObjectTemplate.h
@@ -0,0 +1,87 @@
+//========================================================================
+//
+// ServerGuildObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerGuildObjectTemplate_H
+#define _INCLUDED_ServerGuildObjectTemplate_H
+
+#include "ServerUniverseObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerGuildObjectTemplate : public ServerUniverseObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerGuildObjectTemplate_tag = TAG(G,I,L,D)
+	};
+//@END TFD ID
+public:
+	         ServerGuildObjectTemplate(const std::string & filename);
+	virtual ~ServerGuildObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerGuildObjectTemplate(const ServerGuildObjectTemplate &);
+	ServerGuildObjectTemplate & operator =(const ServerGuildObjectTemplate &);
+};
+
+
+inline void ServerGuildObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerGuildObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerGuildObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.cpp
new file mode 100644
index 00000000..a226afb3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.cpp
@@ -0,0 +1,822 @@
+//========================================================================
+//
+// ServerHarvesterInstallationObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerHarvesterInstallationObjectTemplate.h"
+#include "serverGame/HarvesterInstallationObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerHarvesterInstallationObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerHarvesterInstallationObjectTemplate::ServerHarvesterInstallationObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerInstallationObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerHarvesterInstallationObjectTemplate::ServerHarvesterInstallationObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerHarvesterInstallationObjectTemplate::~ServerHarvesterInstallationObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerHarvesterInstallationObjectTemplate::~ServerHarvesterInstallationObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerHarvesterInstallationObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerHarvesterInstallationObjectTemplate_tag, create);
+}	// ServerHarvesterInstallationObjectTemplate::registerMe
+
+/**
+ * Creates a ServerHarvesterInstallationObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerHarvesterInstallationObjectTemplate::create(const std::string & filename)
+{
+	return new ServerHarvesterInstallationObjectTemplate(filename);
+}	// ServerHarvesterInstallationObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerHarvesterInstallationObjectTemplate::getId(void) const
+{
+	return ServerHarvesterInstallationObjectTemplate_tag;
+}	// ServerHarvesterInstallationObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerHarvesterInstallationObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerHarvesterInstallationObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerHarvesterInstallationObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerHarvesterInstallationObjectTemplate * base = dynamic_cast<const ServerHarvesterInstallationObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerHarvesterInstallationObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerHarvesterInstallationObjectTemplate::createObject(void) const
+{
+	return new HarvesterInstallationObject(this);
+}	// ServerHarvesterInstallationObjectTemplate::createObject
+
+//@BEGIN TFD
+int ServerHarvesterInstallationObjectTemplate::getMaxExtractionRate(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerHarvesterInstallationObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerHarvesterInstallationObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxExtractionRate(true);
+#endif
+	}
+
+	if (!m_maxExtractionRate.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxExtractionRate in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxExtractionRate has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxExtractionRate();
+		}
+	}
+
+	int value = m_maxExtractionRate.getValue();
+	char delta = m_maxExtractionRate.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxExtractionRate();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerHarvesterInstallationObjectTemplate::getMaxExtractionRate
+
+int ServerHarvesterInstallationObjectTemplate::getMaxExtractionRateMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerHarvesterInstallationObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerHarvesterInstallationObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxExtractionRateMin(true);
+#endif
+	}
+
+	if (!m_maxExtractionRate.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxExtractionRate in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxExtractionRate has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxExtractionRateMin();
+		}
+	}
+
+	int value = m_maxExtractionRate.getMinValue();
+	char delta = m_maxExtractionRate.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxExtractionRateMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerHarvesterInstallationObjectTemplate::getMaxExtractionRateMin
+
+int ServerHarvesterInstallationObjectTemplate::getMaxExtractionRateMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerHarvesterInstallationObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerHarvesterInstallationObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxExtractionRateMax(true);
+#endif
+	}
+
+	if (!m_maxExtractionRate.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxExtractionRate in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxExtractionRate has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxExtractionRateMax();
+		}
+	}
+
+	int value = m_maxExtractionRate.getMaxValue();
+	char delta = m_maxExtractionRate.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxExtractionRateMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerHarvesterInstallationObjectTemplate::getMaxExtractionRateMax
+
+int ServerHarvesterInstallationObjectTemplate::getCurrentExtractionRate(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerHarvesterInstallationObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerHarvesterInstallationObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCurrentExtractionRate(true);
+#endif
+	}
+
+	if (!m_currentExtractionRate.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter currentExtractionRate in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter currentExtractionRate has not been defined in template %s!", DataResource::getName()));
+			return base->getCurrentExtractionRate();
+		}
+	}
+
+	int value = m_currentExtractionRate.getValue();
+	char delta = m_currentExtractionRate.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getCurrentExtractionRate();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerHarvesterInstallationObjectTemplate::getCurrentExtractionRate
+
+int ServerHarvesterInstallationObjectTemplate::getCurrentExtractionRateMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerHarvesterInstallationObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerHarvesterInstallationObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCurrentExtractionRateMin(true);
+#endif
+	}
+
+	if (!m_currentExtractionRate.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter currentExtractionRate in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter currentExtractionRate has not been defined in template %s!", DataResource::getName()));
+			return base->getCurrentExtractionRateMin();
+		}
+	}
+
+	int value = m_currentExtractionRate.getMinValue();
+	char delta = m_currentExtractionRate.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getCurrentExtractionRateMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerHarvesterInstallationObjectTemplate::getCurrentExtractionRateMin
+
+int ServerHarvesterInstallationObjectTemplate::getCurrentExtractionRateMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerHarvesterInstallationObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerHarvesterInstallationObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCurrentExtractionRateMax(true);
+#endif
+	}
+
+	if (!m_currentExtractionRate.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter currentExtractionRate in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter currentExtractionRate has not been defined in template %s!", DataResource::getName()));
+			return base->getCurrentExtractionRateMax();
+		}
+	}
+
+	int value = m_currentExtractionRate.getMaxValue();
+	char delta = m_currentExtractionRate.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getCurrentExtractionRateMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerHarvesterInstallationObjectTemplate::getCurrentExtractionRateMax
+
+int ServerHarvesterInstallationObjectTemplate::getMaxHopperSize(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerHarvesterInstallationObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerHarvesterInstallationObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxHopperSize(true);
+#endif
+	}
+
+	if (!m_maxHopperSize.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxHopperSize in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxHopperSize has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxHopperSize();
+		}
+	}
+
+	int value = m_maxHopperSize.getValue();
+	char delta = m_maxHopperSize.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxHopperSize();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerHarvesterInstallationObjectTemplate::getMaxHopperSize
+
+int ServerHarvesterInstallationObjectTemplate::getMaxHopperSizeMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerHarvesterInstallationObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerHarvesterInstallationObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxHopperSizeMin(true);
+#endif
+	}
+
+	if (!m_maxHopperSize.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxHopperSize in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxHopperSize has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxHopperSizeMin();
+		}
+	}
+
+	int value = m_maxHopperSize.getMinValue();
+	char delta = m_maxHopperSize.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxHopperSizeMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerHarvesterInstallationObjectTemplate::getMaxHopperSizeMin
+
+int ServerHarvesterInstallationObjectTemplate::getMaxHopperSizeMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerHarvesterInstallationObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerHarvesterInstallationObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxHopperSizeMax(true);
+#endif
+	}
+
+	if (!m_maxHopperSize.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxHopperSize in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxHopperSize has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxHopperSizeMax();
+		}
+	}
+
+	int value = m_maxHopperSize.getMaxValue();
+	char delta = m_maxHopperSize.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxHopperSizeMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerHarvesterInstallationObjectTemplate::getMaxHopperSizeMax
+
+const std::string & ServerHarvesterInstallationObjectTemplate::getMasterClassName(bool testData) const
+{
+#ifdef _DEBUG
+std::string testDataValue = DefaultString;
+#else
+UNREF(testData);
+#endif
+
+	const ServerHarvesterInstallationObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerHarvesterInstallationObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMasterClassName(true);
+#endif
+	}
+
+	if (!m_masterClassName.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter masterClassName in template %s", DataResource::getName()));
+			return DefaultString;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter masterClassName has not been defined in template %s!", DataResource::getName()));
+			return base->getMasterClassName();
+		}
+	}
+
+	const std::string & value = m_masterClassName.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerHarvesterInstallationObjectTemplate::getMasterClassName
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerHarvesterInstallationObjectTemplate::testValues(void) const
+{
+	IGNORE_RETURN(getMaxExtractionRateMin(true));
+	IGNORE_RETURN(getMaxExtractionRateMax(true));
+	IGNORE_RETURN(getCurrentExtractionRateMin(true));
+	IGNORE_RETURN(getCurrentExtractionRateMax(true));
+	IGNORE_RETURN(getMaxHopperSizeMin(true));
+	IGNORE_RETURN(getMaxHopperSizeMax(true));
+	IGNORE_RETURN(getMasterClassName(true));
+	ServerInstallationObjectTemplate::testValues();
+}	// ServerHarvesterInstallationObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerHarvesterInstallationObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerHarvesterInstallationObjectTemplate_tag)
+	{
+		ServerInstallationObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,0))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "maxExtractionRate") == 0)
+			m_maxExtractionRate.loadFromIff(file);
+		else if (strcmp(paramName, "currentExtractionRate") == 0)
+			m_currentExtractionRate.loadFromIff(file);
+		else if (strcmp(paramName, "maxHopperSize") == 0)
+			m_maxHopperSize.loadFromIff(file);
+		else if (strcmp(paramName, "masterClassName") == 0)
+			m_masterClassName.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	ServerInstallationObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerHarvesterInstallationObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.h
new file mode 100644
index 00000000..a1e72bd8
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.h
@@ -0,0 +1,101 @@
+//========================================================================
+//
+// ServerHarvesterInstallationObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerHarvesterInstallationObjectTemplate_H
+#define _INCLUDED_ServerHarvesterInstallationObjectTemplate_H
+
+#include "ServerInstallationObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerHarvesterInstallationObjectTemplate : public ServerInstallationObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerHarvesterInstallationObjectTemplate_tag = TAG(H,I,N,O)
+	};
+//@END TFD ID
+public:
+	         ServerHarvesterInstallationObjectTemplate(const std::string & filename);
+	virtual ~ServerHarvesterInstallationObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+	int                    getMaxExtractionRate(bool testData = false) const;
+	int                    getMaxExtractionRateMin(bool testData = false) const;
+	int                    getMaxExtractionRateMax(bool testData = false) const;
+	int                    getCurrentExtractionRate(bool testData = false) const;
+	int                    getCurrentExtractionRateMin(bool testData = false) const;
+	int                    getCurrentExtractionRateMax(bool testData = false) const;
+	int                    getMaxHopperSize(bool testData = false) const;
+	int                    getMaxHopperSizeMin(bool testData = false) const;
+	int                    getMaxHopperSizeMax(bool testData = false) const;
+	const std::string &    getMasterClassName(bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	IntegerParam m_maxExtractionRate;		// max extraction rate
+	IntegerParam m_currentExtractionRate;		// rate at which the machine could currently operate
+	IntegerParam m_maxHopperSize;		// max extracted resource storage capacity of the installation
+	StringParam m_masterClassName;		// highest level resource class that the harverster can extract
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerHarvesterInstallationObjectTemplate(const ServerHarvesterInstallationObjectTemplate &);
+	ServerHarvesterInstallationObjectTemplate & operator =(const ServerHarvesterInstallationObjectTemplate &);
+};
+
+
+inline void ServerHarvesterInstallationObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerHarvesterInstallationObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerHarvesterInstallationObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerInstallationObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerInstallationObjectTemplate.cpp
new file mode 100644
index 00000000..ad1661bb
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerInstallationObjectTemplate.cpp
@@ -0,0 +1,186 @@
+//========================================================================
+//
+// ServerInstallationObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerInstallationObjectTemplate.h"
+#include "serverGame/InstallationObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerInstallationObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerInstallationObjectTemplate::ServerInstallationObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerTangibleObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerInstallationObjectTemplate::ServerInstallationObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerInstallationObjectTemplate::~ServerInstallationObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerInstallationObjectTemplate::~ServerInstallationObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerInstallationObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerInstallationObjectTemplate_tag, create);
+}	// ServerInstallationObjectTemplate::registerMe
+
+/**
+ * Creates a ServerInstallationObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerInstallationObjectTemplate::create(const std::string & filename)
+{
+	return new ServerInstallationObjectTemplate(filename);
+}	// ServerInstallationObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerInstallationObjectTemplate::getId(void) const
+{
+	return ServerInstallationObjectTemplate_tag;
+}	// ServerInstallationObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerInstallationObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerInstallationObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerInstallationObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerInstallationObjectTemplate * base = dynamic_cast<const ServerInstallationObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerInstallationObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerInstallationObjectTemplate::createObject(void) const
+{
+	return new InstallationObject(this);
+}	// ServerInstallationObjectTemplate::createObject
+
+//@BEGIN TFD
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerInstallationObjectTemplate::testValues(void) const
+{
+	ServerTangibleObjectTemplate::testValues();
+}	// ServerInstallationObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerInstallationObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerInstallationObjectTemplate_tag)
+	{
+		ServerTangibleObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,1))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	UNREF(paramName);
+	UNREF(paramCount);
+
+	file.exitForm();
+	ServerTangibleObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerInstallationObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerInstallationObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerInstallationObjectTemplate.h
new file mode 100644
index 00000000..85a1a18b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerInstallationObjectTemplate.h
@@ -0,0 +1,87 @@
+//========================================================================
+//
+// ServerInstallationObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerInstallationObjectTemplate_H
+#define _INCLUDED_ServerInstallationObjectTemplate_H
+
+#include "ServerTangibleObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerInstallationObjectTemplate : public ServerTangibleObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerInstallationObjectTemplate_tag = TAG(I,N,S,O)
+	};
+//@END TFD ID
+public:
+	         ServerInstallationObjectTemplate(const std::string & filename);
+	virtual ~ServerInstallationObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerInstallationObjectTemplate(const ServerInstallationObjectTemplate &);
+	ServerInstallationObjectTemplate & operator =(const ServerInstallationObjectTemplate &);
+};
+
+
+inline void ServerInstallationObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerInstallationObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerInstallationObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.cpp
new file mode 100644
index 00000000..992bf06d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.cpp
@@ -0,0 +1,1633 @@
+//========================================================================
+//
+// ServerIntangibleObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerIntangibleObjectTemplate.h"
+#include "serverGame/IntangibleObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerIntangibleObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerIntangibleObjectTemplate::ServerIntangibleObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerIntangibleObjectTemplate::ServerIntangibleObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerIntangibleObjectTemplate::~ServerIntangibleObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerIntangibleObjectTemplate::~ServerIntangibleObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerIntangibleObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerIntangibleObjectTemplate_tag, create);
+}	// ServerIntangibleObjectTemplate::registerMe
+
+/**
+ * Creates a ServerIntangibleObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerIntangibleObjectTemplate::create(const std::string & filename)
+{
+	return new ServerIntangibleObjectTemplate(filename);
+}	// ServerIntangibleObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerIntangibleObjectTemplate::getId(void) const
+{
+	return ServerIntangibleObjectTemplate_tag;
+}	// ServerIntangibleObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerIntangibleObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerIntangibleObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerIntangibleObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerIntangibleObjectTemplate * base = dynamic_cast<const ServerIntangibleObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerIntangibleObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerIntangibleObjectTemplate::createObject(void) const
+{
+	return new IntangibleObject(this);
+}	// ServerIntangibleObjectTemplate::createObject
+
+//@BEGIN TFD
+int ServerIntangibleObjectTemplate::getCount(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerIntangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCount(true);
+#endif
+	}
+
+	if (!m_count.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter count in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter count has not been defined in template %s!", DataResource::getName()));
+			return base->getCount();
+		}
+	}
+
+	int value = m_count.getValue();
+	char delta = m_count.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getCount();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerIntangibleObjectTemplate::getCount
+
+int ServerIntangibleObjectTemplate::getCountMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerIntangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCountMin(true);
+#endif
+	}
+
+	if (!m_count.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter count in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter count has not been defined in template %s!", DataResource::getName()));
+			return base->getCountMin();
+		}
+	}
+
+	int value = m_count.getMinValue();
+	char delta = m_count.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getCountMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerIntangibleObjectTemplate::getCountMin
+
+int ServerIntangibleObjectTemplate::getCountMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerIntangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCountMax(true);
+#endif
+	}
+
+	if (!m_count.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter count in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter count has not been defined in template %s!", DataResource::getName()));
+			return base->getCountMax();
+		}
+	}
+
+	int value = m_count.getMaxValue();
+	char delta = m_count.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getCountMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerIntangibleObjectTemplate::getCountMax
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerIntangibleObjectTemplate::testValues(void) const
+{
+	IGNORE_RETURN(getCountMin(true));
+	IGNORE_RETURN(getCountMax(true));
+	ServerObjectTemplate::testValues();
+}	// ServerIntangibleObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerIntangibleObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerIntangibleObjectTemplate_tag)
+	{
+		ServerObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,1))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "count") == 0)
+			m_count.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	ServerObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerIntangibleObjectTemplate::load
+
+
+//=============================================================================
+// class ServerIntangibleObjectTemplate::_Ingredient
+
+/**
+ * Class constructor.
+ */
+ServerIntangibleObjectTemplate::_Ingredient::_Ingredient(const std::string & filename)
+	: ObjectTemplate(filename)
+	,m_ingredientsLoaded(false)
+	,m_ingredientsAppend(false)
+{
+}	// ServerIntangibleObjectTemplate::_Ingredient::_Ingredient
+
+/**
+ * Class destructor.
+ */
+ServerIntangibleObjectTemplate::_Ingredient::~_Ingredient()
+{
+	{
+		std::vector<StructParamOT *>::iterator iter;
+		for (iter = m_ingredients.begin(); iter != m_ingredients.end(); ++iter)
+		{
+			delete *iter;
+			*iter = NULL;
+		}
+		m_ingredients.clear();
+	}
+}	// ServerIntangibleObjectTemplate::_Ingredient::~_Ingredient
+
+/**
+ * Static function used to register this template.
+ */
+void ServerIntangibleObjectTemplate::_Ingredient::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(_Ingredient_tag, create);
+}	// ServerIntangibleObjectTemplate::_Ingredient::registerMe
+
+/**
+ * Creates a ServerIntangibleObjectTemplate::_Ingredient template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerIntangibleObjectTemplate::_Ingredient::create(const std::string & filename)
+{
+	return new ServerIntangibleObjectTemplate::_Ingredient(filename);
+}	// ServerIntangibleObjectTemplate::_Ingredient::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerIntangibleObjectTemplate::_Ingredient::getId(void) const
+{
+	return _Ingredient_tag;
+}	// ServerIntangibleObjectTemplate::_Ingredient::getId
+
+ServerIntangibleObjectTemplate::IngredientType ServerIntangibleObjectTemplate::_Ingredient::getIngredientType(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+ServerIntangibleObjectTemplate::IngredientType testDataValue = static_cast<ServerIntangibleObjectTemplate::IngredientType>(0);
+#else
+UNREF(testData);
+#endif
+
+	const ServerIntangibleObjectTemplate::_Ingredient * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate::_Ingredient *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getIngredientType(true);
+#endif
+	}
+
+	if (!m_ingredientType.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter ingredientType in template %s", DataResource::getName()));
+			return static_cast<IngredientType>(0);
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter ingredientType has not been defined in template %s!", DataResource::getName()));
+			return base->getIngredientType(versionOk);
+		}
+	}
+
+	IngredientType value = static_cast<IngredientType>(m_ingredientType.getValue());
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerIntangibleObjectTemplate::_Ingredient::getIngredientType
+
+void ServerIntangibleObjectTemplate::_Ingredient::getIngredients(SimpleIngredient &data, int index, bool versionOk) const
+{
+	const ServerIntangibleObjectTemplate::_Ingredient * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate::_Ingredient *>(m_baseData);
+	}
+
+	if (!m_ingredientsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter ingredients in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter ingredients has not been defined in template %s!", DataResource::getName()));
+			base->getIngredients(data, index, versionOk);
+			return;
+		}
+	}
+
+	if (m_ingredientsAppend && base != NULL)
+	{
+		int baseCount = base->getIngredientsCount();
+		if (index < baseCount)
+			{
+				base->getIngredients(data, index, versionOk);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_ingredients.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_ingredients[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _SimpleIngredient *param = dynamic_cast<const _SimpleIngredient *>(structTemplate);
+	NOT_NULL(param);
+	data.name = param->getName(versionOk);
+	data.ingredient = param->getIngredient(versionOk);
+	data.count = param->getCount(versionOk);
+}	// ServerIntangibleObjectTemplate::_Ingredient::getIngredients
+
+void ServerIntangibleObjectTemplate::_Ingredient::getIngredientsMin(SimpleIngredient &data, int index, bool versionOk) const
+{
+	const ServerIntangibleObjectTemplate::_Ingredient * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate::_Ingredient *>(m_baseData);
+	}
+
+	if (!m_ingredientsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter ingredients in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter ingredients has not been defined in template %s!", DataResource::getName()));
+			base->getIngredientsMin(data, index, versionOk);
+			return;
+		}
+	}
+
+	if (m_ingredientsAppend && base != NULL)
+	{
+		int baseCount = base->getIngredientsCount();
+		if (index < baseCount)
+			{
+				base->getIngredientsMin(data, index, versionOk);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_ingredients.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_ingredients[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _SimpleIngredient *param = dynamic_cast<const _SimpleIngredient *>(structTemplate);
+	NOT_NULL(param);
+	data.name = param->getName(versionOk);
+	data.ingredient = param->getIngredient(versionOk);
+	data.count = param->getCountMin(versionOk);
+}	// ServerIntangibleObjectTemplate::_Ingredient::getIngredientsMin
+
+void ServerIntangibleObjectTemplate::_Ingredient::getIngredientsMax(SimpleIngredient &data, int index, bool versionOk) const
+{
+	const ServerIntangibleObjectTemplate::_Ingredient * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate::_Ingredient *>(m_baseData);
+	}
+
+	if (!m_ingredientsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter ingredients in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter ingredients has not been defined in template %s!", DataResource::getName()));
+			base->getIngredientsMax(data, index, versionOk);
+			return;
+		}
+	}
+
+	if (m_ingredientsAppend && base != NULL)
+	{
+		int baseCount = base->getIngredientsCount();
+		if (index < baseCount)
+			{
+				base->getIngredientsMax(data, index, versionOk);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_ingredients.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_ingredients[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _SimpleIngredient *param = dynamic_cast<const _SimpleIngredient *>(structTemplate);
+	NOT_NULL(param);
+	data.name = param->getName(versionOk);
+	data.ingredient = param->getIngredient(versionOk);
+	data.count = param->getCountMax(versionOk);
+}	// ServerIntangibleObjectTemplate::_Ingredient::getIngredientsMax
+
+size_t ServerIntangibleObjectTemplate::_Ingredient::getIngredientsCount(void) const
+{
+	if (!m_ingredientsLoaded)
+	{
+		if (m_baseData == NULL)
+			return 0;
+		const ServerIntangibleObjectTemplate::_Ingredient * base = dynamic_cast<const ServerIntangibleObjectTemplate::_Ingredient *>(m_baseData);
+		DEBUG_FATAL(base == NULL, ("base template wrong type"));
+		return base->getIngredientsCount();
+	}
+
+	size_t count = m_ingredients.size();
+
+	// if we are extending our base template, add it's count
+	if (m_ingredientsAppend && m_baseData != NULL)
+	{
+		const ServerIntangibleObjectTemplate::_Ingredient * base = dynamic_cast<const ServerIntangibleObjectTemplate::_Ingredient *>(m_baseData);
+		if (base != NULL)
+			count += base->getIngredientsCount();
+	}
+
+	return count;
+}	// ServerIntangibleObjectTemplate::_Ingredient::getIngredientsCount
+
+float ServerIntangibleObjectTemplate::_Ingredient::getComplexity(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerIntangibleObjectTemplate::_Ingredient * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate::_Ingredient *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getComplexity(true);
+#endif
+	}
+
+	if (!m_complexity.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter complexity in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter complexity has not been defined in template %s!", DataResource::getName()));
+			return base->getComplexity(versionOk);
+		}
+	}
+
+	float value = m_complexity.getValue();
+	char delta = m_complexity.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getComplexity(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerIntangibleObjectTemplate::_Ingredient::getComplexity
+
+float ServerIntangibleObjectTemplate::_Ingredient::getComplexityMin(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerIntangibleObjectTemplate::_Ingredient * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate::_Ingredient *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getComplexityMin(true);
+#endif
+	}
+
+	if (!m_complexity.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter complexity in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter complexity has not been defined in template %s!", DataResource::getName()));
+			return base->getComplexityMin(versionOk);
+		}
+	}
+
+	float value = m_complexity.getMinValue();
+	char delta = m_complexity.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getComplexityMin(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerIntangibleObjectTemplate::_Ingredient::getComplexityMin
+
+float ServerIntangibleObjectTemplate::_Ingredient::getComplexityMax(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerIntangibleObjectTemplate::_Ingredient * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate::_Ingredient *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getComplexityMax(true);
+#endif
+	}
+
+	if (!m_complexity.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter complexity in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter complexity has not been defined in template %s!", DataResource::getName()));
+			return base->getComplexityMax(versionOk);
+		}
+	}
+
+	float value = m_complexity.getMaxValue();
+	char delta = m_complexity.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getComplexityMax(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerIntangibleObjectTemplate::_Ingredient::getComplexityMax
+
+const std::string & ServerIntangibleObjectTemplate::_Ingredient::getSkillCommand(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+std::string testDataValue = DefaultString;
+#else
+UNREF(testData);
+#endif
+
+	const ServerIntangibleObjectTemplate::_Ingredient * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate::_Ingredient *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getSkillCommand(true);
+#endif
+	}
+
+	if (!m_skillCommand.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter skillCommand in template %s", DataResource::getName()));
+			return DefaultString;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter skillCommand has not been defined in template %s!", DataResource::getName()));
+			return base->getSkillCommand(versionOk);
+		}
+	}
+
+	const std::string & value = m_skillCommand.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerIntangibleObjectTemplate::_Ingredient::getSkillCommand
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerIntangibleObjectTemplate::_Ingredient::testValues(void) const
+{
+	IGNORE_RETURN(getIngredientType(true));
+	IGNORE_RETURN(getComplexityMin(true));
+	IGNORE_RETURN(getComplexityMax(true));
+	IGNORE_RETURN(getSkillCommand(true));
+}	// ServerIntangibleObjectTemplate::_Ingredient::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerIntangibleObjectTemplate::_Ingredient::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "ingredientType") == 0)
+			m_ingredientType.loadFromIff(file);
+		else if (strcmp(paramName, "ingredients") == 0)
+		{
+			std::vector<StructParamOT *>::iterator iter;
+			for (iter = m_ingredients.begin(); iter != m_ingredients.end(); ++iter)
+			{
+				delete *iter;
+				*iter = NULL;
+			}
+			m_ingredients.clear();
+			m_ingredientsAppend = file.read_bool8();
+			int listCount = file.read_int32();
+			for (int j = 0; j < listCount; ++j)
+			{
+				StructParamOT * newData = new StructParamOT;
+				newData->loadFromIff(file);
+				m_ingredients.push_back(newData);
+			}
+			m_ingredientsLoaded = true;
+		}
+		else if (strcmp(paramName, "complexity") == 0)
+			m_complexity.loadFromIff(file);
+		else if (strcmp(paramName, "skillCommand") == 0)
+			m_skillCommand.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	UNREF(file);
+}	// ServerIntangibleObjectTemplate::_Ingredient::load
+
+
+//=============================================================================
+// class ServerIntangibleObjectTemplate::_SchematicAttribute
+
+/**
+ * Class constructor.
+ */
+ServerIntangibleObjectTemplate::_SchematicAttribute::_SchematicAttribute(const std::string & filename)
+	: ObjectTemplate(filename)
+{
+}	// ServerIntangibleObjectTemplate::_SchematicAttribute::_SchematicAttribute
+
+/**
+ * Class destructor.
+ */
+ServerIntangibleObjectTemplate::_SchematicAttribute::~_SchematicAttribute()
+{
+}	// ServerIntangibleObjectTemplate::_SchematicAttribute::~_SchematicAttribute
+
+/**
+ * Static function used to register this template.
+ */
+void ServerIntangibleObjectTemplate::_SchematicAttribute::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(_SchematicAttribute_tag, create);
+}	// ServerIntangibleObjectTemplate::_SchematicAttribute::registerMe
+
+/**
+ * Creates a ServerIntangibleObjectTemplate::_SchematicAttribute template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerIntangibleObjectTemplate::_SchematicAttribute::create(const std::string & filename)
+{
+	return new ServerIntangibleObjectTemplate::_SchematicAttribute(filename);
+}	// ServerIntangibleObjectTemplate::_SchematicAttribute::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerIntangibleObjectTemplate::_SchematicAttribute::getId(void) const
+{
+	return _SchematicAttribute_tag;
+}	// ServerIntangibleObjectTemplate::_SchematicAttribute::getId
+
+const StringId ServerIntangibleObjectTemplate::_SchematicAttribute::getName(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+StringId testDataValue = DefaultStringId;
+#else
+UNREF(testData);
+#endif
+
+	const ServerIntangibleObjectTemplate::_SchematicAttribute * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate::_SchematicAttribute *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getName(true);
+#endif
+	}
+
+	if (!m_name.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter name in template %s", DataResource::getName()));
+			return DefaultStringId;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter name has not been defined in template %s!", DataResource::getName()));
+			return base->getName(versionOk);
+		}
+	}
+
+	const StringId value = m_name.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerIntangibleObjectTemplate::_SchematicAttribute::getName
+
+int ServerIntangibleObjectTemplate::_SchematicAttribute::getValue(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerIntangibleObjectTemplate::_SchematicAttribute * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate::_SchematicAttribute *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getValue(true);
+#endif
+	}
+
+	if (!m_value.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName()));
+			return base->getValue(versionOk);
+		}
+	}
+
+	int value = m_value.getValue();
+	char delta = m_value.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getValue(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerIntangibleObjectTemplate::_SchematicAttribute::getValue
+
+int ServerIntangibleObjectTemplate::_SchematicAttribute::getValueMin(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerIntangibleObjectTemplate::_SchematicAttribute * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate::_SchematicAttribute *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getValueMin(true);
+#endif
+	}
+
+	if (!m_value.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName()));
+			return base->getValueMin(versionOk);
+		}
+	}
+
+	int value = m_value.getMinValue();
+	char delta = m_value.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getValueMin(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerIntangibleObjectTemplate::_SchematicAttribute::getValueMin
+
+int ServerIntangibleObjectTemplate::_SchematicAttribute::getValueMax(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerIntangibleObjectTemplate::_SchematicAttribute * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate::_SchematicAttribute *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getValueMax(true);
+#endif
+	}
+
+	if (!m_value.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName()));
+			return base->getValueMax(versionOk);
+		}
+	}
+
+	int value = m_value.getMaxValue();
+	char delta = m_value.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getValueMax(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerIntangibleObjectTemplate::_SchematicAttribute::getValueMax
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerIntangibleObjectTemplate::_SchematicAttribute::testValues(void) const
+{
+	IGNORE_RETURN(getName(true));
+	IGNORE_RETURN(getValueMin(true));
+	IGNORE_RETURN(getValueMax(true));
+}	// ServerIntangibleObjectTemplate::_SchematicAttribute::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerIntangibleObjectTemplate::_SchematicAttribute::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "name") == 0)
+			m_name.loadFromIff(file);
+		else if (strcmp(paramName, "value") == 0)
+			m_value.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	UNREF(file);
+}	// ServerIntangibleObjectTemplate::_SchematicAttribute::load
+
+
+//=============================================================================
+// class ServerIntangibleObjectTemplate::_SimpleIngredient
+
+/**
+ * Class constructor.
+ */
+ServerIntangibleObjectTemplate::_SimpleIngredient::_SimpleIngredient(const std::string & filename)
+	: ObjectTemplate(filename)
+{
+}	// ServerIntangibleObjectTemplate::_SimpleIngredient::_SimpleIngredient
+
+/**
+ * Class destructor.
+ */
+ServerIntangibleObjectTemplate::_SimpleIngredient::~_SimpleIngredient()
+{
+}	// ServerIntangibleObjectTemplate::_SimpleIngredient::~_SimpleIngredient
+
+/**
+ * Static function used to register this template.
+ */
+void ServerIntangibleObjectTemplate::_SimpleIngredient::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(_SimpleIngredient_tag, create);
+}	// ServerIntangibleObjectTemplate::_SimpleIngredient::registerMe
+
+/**
+ * Creates a ServerIntangibleObjectTemplate::_SimpleIngredient template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerIntangibleObjectTemplate::_SimpleIngredient::create(const std::string & filename)
+{
+	return new ServerIntangibleObjectTemplate::_SimpleIngredient(filename);
+}	// ServerIntangibleObjectTemplate::_SimpleIngredient::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerIntangibleObjectTemplate::_SimpleIngredient::getId(void) const
+{
+	return _SimpleIngredient_tag;
+}	// ServerIntangibleObjectTemplate::_SimpleIngredient::getId
+
+const StringId ServerIntangibleObjectTemplate::_SimpleIngredient::getName(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+StringId testDataValue = DefaultStringId;
+#else
+UNREF(testData);
+#endif
+
+	const ServerIntangibleObjectTemplate::_SimpleIngredient * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate::_SimpleIngredient *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getName(true);
+#endif
+	}
+
+	if (!m_name.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter name in template %s", DataResource::getName()));
+			return DefaultStringId;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter name has not been defined in template %s!", DataResource::getName()));
+			return base->getName(versionOk);
+		}
+	}
+
+	const StringId value = m_name.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerIntangibleObjectTemplate::_SimpleIngredient::getName
+
+const std::string & ServerIntangibleObjectTemplate::_SimpleIngredient::getIngredient(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+std::string testDataValue = DefaultString;
+#else
+UNREF(testData);
+#endif
+
+	const ServerIntangibleObjectTemplate::_SimpleIngredient * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate::_SimpleIngredient *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getIngredient(true);
+#endif
+	}
+
+	if (!m_ingredient.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter ingredient in template %s", DataResource::getName()));
+			return DefaultString;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter ingredient has not been defined in template %s!", DataResource::getName()));
+			return base->getIngredient(versionOk);
+		}
+	}
+
+	const std::string & value = m_ingredient.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerIntangibleObjectTemplate::_SimpleIngredient::getIngredient
+
+int ServerIntangibleObjectTemplate::_SimpleIngredient::getCount(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerIntangibleObjectTemplate::_SimpleIngredient * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate::_SimpleIngredient *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCount(true);
+#endif
+	}
+
+	if (!m_count.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter count in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter count has not been defined in template %s!", DataResource::getName()));
+			return base->getCount(versionOk);
+		}
+	}
+
+	int value = m_count.getValue();
+	char delta = m_count.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getCount(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerIntangibleObjectTemplate::_SimpleIngredient::getCount
+
+int ServerIntangibleObjectTemplate::_SimpleIngredient::getCountMin(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerIntangibleObjectTemplate::_SimpleIngredient * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate::_SimpleIngredient *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCountMin(true);
+#endif
+	}
+
+	if (!m_count.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter count in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter count has not been defined in template %s!", DataResource::getName()));
+			return base->getCountMin(versionOk);
+		}
+	}
+
+	int value = m_count.getMinValue();
+	char delta = m_count.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getCountMin(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerIntangibleObjectTemplate::_SimpleIngredient::getCountMin
+
+int ServerIntangibleObjectTemplate::_SimpleIngredient::getCountMax(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerIntangibleObjectTemplate::_SimpleIngredient * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerIntangibleObjectTemplate::_SimpleIngredient *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCountMax(true);
+#endif
+	}
+
+	if (!m_count.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter count in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter count has not been defined in template %s!", DataResource::getName()));
+			return base->getCountMax(versionOk);
+		}
+	}
+
+	int value = m_count.getMaxValue();
+	char delta = m_count.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getCountMax(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerIntangibleObjectTemplate::_SimpleIngredient::getCountMax
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerIntangibleObjectTemplate::_SimpleIngredient::testValues(void) const
+{
+	IGNORE_RETURN(getName(true));
+	IGNORE_RETURN(getIngredient(true));
+	IGNORE_RETURN(getCountMin(true));
+	IGNORE_RETURN(getCountMax(true));
+}	// ServerIntangibleObjectTemplate::_SimpleIngredient::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerIntangibleObjectTemplate::_SimpleIngredient::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "name") == 0)
+			m_name.loadFromIff(file);
+		else if (strcmp(paramName, "ingredient") == 0)
+			m_ingredient.loadFromIff(file);
+		else if (strcmp(paramName, "count") == 0)
+			m_count.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	UNREF(file);
+}	// ServerIntangibleObjectTemplate::_SimpleIngredient::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.h
new file mode 100644
index 00000000..6c9bf227
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.h
@@ -0,0 +1,272 @@
+//========================================================================
+//
+// ServerIntangibleObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerIntangibleObjectTemplate_H
+#define _INCLUDED_ServerIntangibleObjectTemplate_H
+
+#include "ServerObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerIntangibleObjectTemplate : public ServerObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerIntangibleObjectTemplate_tag = TAG(I,T,N,O)
+	};
+//@END TFD ID
+public:
+	         ServerIntangibleObjectTemplate(const std::string & filename);
+	virtual ~ServerIntangibleObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+	enum IngredientType
+	{
+		IT_none,		// no item (for empty/unused slots)
+		IT_item,		// a specific item (Skywalker barrel mark V)
+		IT_template,		// any item created from a template (any small_blaster_barrel)
+		IT_resourceType,		// a specific resource type (iron type 5)
+		IT_resourceClass,		// any resource of a resource class (ferrous metal)
+		IT_templateGeneric,		// same as IT_template, but if multiple components are required, they don't have to be the same exact type as the first component used
+		IT_schematic,		// item crafted from a draft schematic
+		IT_schematicGeneric,		// same as IT_schematic, but if multiple components are required, they don't have to be the same exact type as the first component used
+		IngredientType_Last = IT_schematicGeneric,
+	};
+
+public:
+	struct SimpleIngredient
+	{
+		StringId               name;
+		std::string            ingredient;
+		int                    count;
+	};
+
+	struct Ingredient
+	{
+		enum IngredientType ingredientType;
+		stdvector<SimpleIngredient>::fwd ingredients;
+		float                  complexity;
+		std::string            skillCommand;
+	};
+
+	struct SchematicAttribute
+	{
+		StringId               name;
+		int                    value;
+	};
+
+protected:
+	class _SimpleIngredient : public ObjectTemplate
+	{
+		friend class ServerIntangibleObjectTemplate;
+	public:
+		enum
+		{
+			_SimpleIngredient_tag = TAG(S,I,N,G)
+		};
+
+	public:
+		         _SimpleIngredient(const std::string & filename);
+		virtual ~_SimpleIngredient();
+
+	virtual Tag getId(void) const;
+
+public:
+	const StringId         getName(bool versionOk, bool testData = false) const;
+	const std::string &    getIngredient(bool versionOk, bool testData = false) const;
+	int                    getCount(bool versionOk, bool testData = false) const;
+	int                    getCountMin(bool versionOk, bool testData = false) const;
+	int                    getCountMax(bool versionOk, bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	StringIdParam m_name;		// name of ingredient that is given to players
+	StringParam m_ingredient;		// name of ingredient used to match the resource/component name
+	IntegerParam m_count;		// number of ingredients
+	private:
+		static void registerMe(void);
+		static ObjectTemplate * create(const std::string & filename);
+	private:
+		_SimpleIngredient(const _SimpleIngredient &);
+		_SimpleIngredient & operator =(const _SimpleIngredient &);
+	};
+	friend class ServerIntangibleObjectTemplate::_SimpleIngredient;
+
+	class _Ingredient : public ObjectTemplate
+	{
+		friend class ServerIntangibleObjectTemplate;
+	public:
+		enum
+		{
+			_Ingredient_tag = TAG(I,N,G,R)
+		};
+
+	public:
+		         _Ingredient(const std::string & filename);
+		virtual ~_Ingredient();
+
+	virtual Tag getId(void) const;
+
+public:
+	IngredientType     getIngredientType(bool versionOk, bool testData = false) const;
+	void              getIngredients(SimpleIngredient &data, int index, bool versionOk) const;
+	void              getIngredientsMin(SimpleIngredient &data, int index, bool versionOk) const;
+	void              getIngredientsMax(SimpleIngredient &data, int index, bool versionOk) const;
+	size_t            getIngredientsCount(void) const;
+	float                  getComplexity(bool versionOk, bool testData = false) const;
+	float                  getComplexityMin(bool versionOk, bool testData = false) const;
+	float                  getComplexityMax(bool versionOk, bool testData = false) const;
+	const std::string &    getSkillCommand(bool versionOk, bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	IntegerParam m_ingredientType;		// type of ingredient required
+	stdvector<StructParamOT *>::fwd m_ingredients;		// ingredients to be used/being used
+	bool m_ingredientsLoaded;
+	bool m_ingredientsAppend;
+	FloatParam m_complexity;		// adjustment to complexity by using this ingredient
+	StringParam m_skillCommand;		// skill command needed to use this ingredient
+	private:
+		static void registerMe(void);
+		static ObjectTemplate * create(const std::string & filename);
+	private:
+		_Ingredient(const _Ingredient &);
+		_Ingredient & operator =(const _Ingredient &);
+	};
+	friend class ServerIntangibleObjectTemplate::_Ingredient;
+
+	class _SchematicAttribute : public ObjectTemplate
+	{
+		friend class ServerIntangibleObjectTemplate;
+	public:
+		enum
+		{
+			_SchematicAttribute_tag = TAG(I,T,A,T)
+		};
+
+	public:
+		         _SchematicAttribute(const std::string & filename);
+		virtual ~_SchematicAttribute();
+
+	virtual Tag getId(void) const;
+
+public:
+	const StringId         getName(bool versionOk, bool testData = false) const;
+	int                    getValue(bool versionOk, bool testData = false) const;
+	int                    getValueMin(bool versionOk, bool testData = false) const;
+	int                    getValueMax(bool versionOk, bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	StringIdParam m_name;		// name of the attribute
+	IntegerParam m_value;		// value of the attribute - a range for draft schematics and a single value for manufacture schematics
+	private:
+		static void registerMe(void);
+		static ObjectTemplate * create(const std::string & filename);
+	private:
+		_SchematicAttribute(const _SchematicAttribute &);
+		_SchematicAttribute & operator =(const _SchematicAttribute &);
+	};
+	friend class ServerIntangibleObjectTemplate::_SchematicAttribute;
+
+public:
+	int                    getCount(bool testData = false) const;
+	int                    getCountMin(bool testData = false) const;
+	int                    getCountMax(bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	//
+	// shared info needed by draft and manufacturing schematics
+	//
+	// this enum list must be reflected in MessageQueueIngredients.h
+	IntegerParam m_count;		// generic counter
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerIntangibleObjectTemplate(const ServerIntangibleObjectTemplate &);
+	ServerIntangibleObjectTemplate & operator =(const ServerIntangibleObjectTemplate &);
+};
+
+
+inline void ServerIntangibleObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerIntangibleObjectTemplate::registerMe();
+	ServerIntangibleObjectTemplate::_Ingredient::registerMe();
+	ServerIntangibleObjectTemplate::_SchematicAttribute::registerMe();
+	ServerIntangibleObjectTemplate::_SimpleIngredient::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerIntangibleObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.cpp
new file mode 100644
index 00000000..373a81f7
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.cpp
@@ -0,0 +1,185 @@
+//========================================================================
+//
+// ServerManufactureInstallationObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerManufactureInstallationObjectTemplate.h"
+#include "serverGame/ManufactureInstallationObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerManufactureInstallationObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerManufactureInstallationObjectTemplate::ServerManufactureInstallationObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerInstallationObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerManufactureInstallationObjectTemplate::ServerManufactureInstallationObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerManufactureInstallationObjectTemplate::~ServerManufactureInstallationObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerManufactureInstallationObjectTemplate::~ServerManufactureInstallationObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerManufactureInstallationObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerManufactureInstallationObjectTemplate_tag, create);
+}	// ServerManufactureInstallationObjectTemplate::registerMe
+
+/**
+ * Creates a ServerManufactureInstallationObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerManufactureInstallationObjectTemplate::create(const std::string & filename)
+{
+	return new ServerManufactureInstallationObjectTemplate(filename);
+}	// ServerManufactureInstallationObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerManufactureInstallationObjectTemplate::getId(void) const
+{
+	return ServerManufactureInstallationObjectTemplate_tag;
+}	// ServerManufactureInstallationObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerManufactureInstallationObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerManufactureInstallationObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerManufactureInstallationObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerManufactureInstallationObjectTemplate * base = dynamic_cast<const ServerManufactureInstallationObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerManufactureInstallationObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerManufactureInstallationObjectTemplate::createObject(void) const
+{
+	return new ManufactureInstallationObject(this);
+}	// ServerManufactureInstallationObjectTemplate::createObject
+
+//@BEGIN TFD
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerManufactureInstallationObjectTemplate::testValues(void) const
+{
+	ServerInstallationObjectTemplate::testValues();
+}	// ServerManufactureInstallationObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerManufactureInstallationObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerManufactureInstallationObjectTemplate_tag)
+	{
+		ServerInstallationObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,0))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	UNREF(paramName);
+	UNREF(paramCount);
+
+	file.exitForm();
+	ServerInstallationObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerManufactureInstallationObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.h
new file mode 100644
index 00000000..6829674e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.h
@@ -0,0 +1,87 @@
+//========================================================================
+//
+// ServerManufactureInstallationObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerManufactureInstallationObjectTemplate_H
+#define _INCLUDED_ServerManufactureInstallationObjectTemplate_H
+
+#include "ServerInstallationObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerManufactureInstallationObjectTemplate : public ServerInstallationObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerManufactureInstallationObjectTemplate_tag = TAG(M,I,N,O)
+	};
+//@END TFD ID
+public:
+	         ServerManufactureInstallationObjectTemplate(const std::string & filename);
+	virtual ~ServerManufactureInstallationObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerManufactureInstallationObjectTemplate(const ServerManufactureInstallationObjectTemplate &);
+	ServerManufactureInstallationObjectTemplate & operator =(const ServerManufactureInstallationObjectTemplate &);
+};
+
+
+inline void ServerManufactureInstallationObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerManufactureInstallationObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerManufactureInstallationObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.cpp
new file mode 100644
index 00000000..0f00a74b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.cpp
@@ -0,0 +1,1124 @@
+//========================================================================
+//
+// ServerManufactureSchematicObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerManufactureSchematicObjectTemplate.h"
+#include "serverGame/ManufactureSchematicObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerManufactureSchematicObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerIntangibleObjectTemplate(filename)
+	,m_ingredientsLoaded(false)
+	,m_ingredientsAppend(false)
+	,m_attributesLoaded(false)
+	,m_attributesAppend(false)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerManufactureSchematicObjectTemplate::~ServerManufactureSchematicObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+	{
+		std::vector<StructParamOT *>::iterator iter;
+		for (iter = m_ingredients.begin(); iter != m_ingredients.end(); ++iter)
+		{
+			delete *iter;
+			*iter = NULL;
+		}
+		m_ingredients.clear();
+	}
+	{
+		std::vector<StructParamOT *>::iterator iter;
+		for (iter = m_attributes.begin(); iter != m_attributes.end(); ++iter)
+		{
+			delete *iter;
+			*iter = NULL;
+		}
+		m_attributes.clear();
+	}
+//@END TFD CLEANUP
+}	// ServerManufactureSchematicObjectTemplate::~ServerManufactureSchematicObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerManufactureSchematicObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerManufactureSchematicObjectTemplate_tag, create);
+}	// ServerManufactureSchematicObjectTemplate::registerMe
+
+/**
+ * Creates a ServerManufactureSchematicObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerManufactureSchematicObjectTemplate::create(const std::string & filename)
+{
+	return new ServerManufactureSchematicObjectTemplate(filename);
+}	// ServerManufactureSchematicObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerManufactureSchematicObjectTemplate::getId(void) const
+{
+	return ServerManufactureSchematicObjectTemplate_tag;
+}	// ServerManufactureSchematicObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerManufactureSchematicObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerManufactureSchematicObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerManufactureSchematicObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerManufactureSchematicObjectTemplate * base = dynamic_cast<const ServerManufactureSchematicObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerManufactureSchematicObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Called when the game tries to create a manf schematic via the default method.
+ * Manf must be created via a draft schematic, so we always return NULL;
+ *
+ * @return the object
+ */
+Object * ServerManufactureSchematicObjectTemplate::createObject(void) const
+{
+//	WARNING(true, ("Someone is trying to create a manf schematic without a "
+//		"draft schematic source!"));
+	return new ManufactureSchematicObject(this);
+}	// ServerManufactureSchematicObjectTemplate::createObject
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerManufactureSchematicObjectTemplate::createObject(const char *const fileName, const DraftSchematicObject & schematic)
+{
+	const ObjectTemplate *const objectTemplate = ObjectTemplateList::fetch(fileName);
+	if (objectTemplate)
+	{
+		Object * object = NULL;
+		const ServerManufactureSchematicObjectTemplate * const manfTemplate = 
+			dynamic_cast<const ServerManufactureSchematicObjectTemplate *const>(
+			objectTemplate);
+		if (manfTemplate != NULL)
+			object = manfTemplate->createObject(schematic);
+		objectTemplate->releaseReference ();
+
+		return object;
+	}
+	return NULL;
+}	// ServerManufactureSchematicObjectTemplate::createObject
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerManufactureSchematicObjectTemplate::createObject(const DraftSchematicObject &) const
+{
+	return new ManufactureSchematicObject(this);
+}	// ServerManufactureSchematicObjectTemplate::createObject
+
+//@BEGIN TFD
+const std::string & ServerManufactureSchematicObjectTemplate::getDraftSchematic(bool testData) const
+{
+#ifdef _DEBUG
+std::string testDataValue = DefaultString;
+#else
+UNREF(testData);
+#endif
+
+	const ServerManufactureSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerManufactureSchematicObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getDraftSchematic(true);
+#endif
+	}
+
+	if (!m_draftSchematic.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter draftSchematic in template %s", DataResource::getName()));
+			return DefaultString;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter draftSchematic has not been defined in template %s!", DataResource::getName()));
+			return base->getDraftSchematic();
+		}
+	}
+
+	const std::string & value = m_draftSchematic.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerManufactureSchematicObjectTemplate::getDraftSchematic
+
+const std::string & ServerManufactureSchematicObjectTemplate::getCreator(bool testData) const
+{
+#ifdef _DEBUG
+std::string testDataValue = DefaultString;
+#else
+UNREF(testData);
+#endif
+
+	const ServerManufactureSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerManufactureSchematicObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCreator(true);
+#endif
+	}
+
+	if (!m_creator.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter creator in template %s", DataResource::getName()));
+			return DefaultString;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter creator has not been defined in template %s!", DataResource::getName()));
+			return base->getCreator();
+		}
+	}
+
+	const std::string & value = m_creator.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerManufactureSchematicObjectTemplate::getCreator
+
+void ServerManufactureSchematicObjectTemplate::getIngredients(IngredientSlot &data, int index) const
+{
+	const ServerManufactureSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerManufactureSchematicObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_ingredientsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter ingredients in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter ingredients has not been defined in template %s!", DataResource::getName()));
+			base->getIngredients(data, index);
+			return;
+		}
+	}
+
+	if (m_ingredientsAppend && base != NULL)
+	{
+		int baseCount = base->getIngredientsCount();
+		if (index < baseCount)
+			{
+				base->getIngredients(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_ingredients.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_ingredients[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _IngredientSlot *param = dynamic_cast<const _IngredientSlot *>(structTemplate);
+	NOT_NULL(param);
+	data.name = param->getName(m_versionOk);
+	param->getIngredient(data.ingredient, m_versionOk);
+}	// ServerManufactureSchematicObjectTemplate::getIngredients
+
+void ServerManufactureSchematicObjectTemplate::getIngredientsMin(IngredientSlot &data, int index) const
+{
+	const ServerManufactureSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerManufactureSchematicObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_ingredientsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter ingredients in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter ingredients has not been defined in template %s!", DataResource::getName()));
+			base->getIngredientsMin(data, index);
+			return;
+		}
+	}
+
+	if (m_ingredientsAppend && base != NULL)
+	{
+		int baseCount = base->getIngredientsCount();
+		if (index < baseCount)
+			{
+				base->getIngredientsMin(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_ingredients.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_ingredients[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _IngredientSlot *param = dynamic_cast<const _IngredientSlot *>(structTemplate);
+	NOT_NULL(param);
+	data.name = param->getName(m_versionOk);
+	param->getIngredientMin(data.ingredient, m_versionOk);
+}	// ServerManufactureSchematicObjectTemplate::getIngredientsMin
+
+void ServerManufactureSchematicObjectTemplate::getIngredientsMax(IngredientSlot &data, int index) const
+{
+	const ServerManufactureSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerManufactureSchematicObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_ingredientsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter ingredients in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter ingredients has not been defined in template %s!", DataResource::getName()));
+			base->getIngredientsMax(data, index);
+			return;
+		}
+	}
+
+	if (m_ingredientsAppend && base != NULL)
+	{
+		int baseCount = base->getIngredientsCount();
+		if (index < baseCount)
+			{
+				base->getIngredientsMax(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_ingredients.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_ingredients[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _IngredientSlot *param = dynamic_cast<const _IngredientSlot *>(structTemplate);
+	NOT_NULL(param);
+	data.name = param->getName(m_versionOk);
+	param->getIngredientMax(data.ingredient, m_versionOk);
+}	// ServerManufactureSchematicObjectTemplate::getIngredientsMax
+
+size_t ServerManufactureSchematicObjectTemplate::getIngredientsCount(void) const
+{
+	if (!m_ingredientsLoaded)
+	{
+		if (m_baseData == NULL)
+			return 0;
+		const ServerManufactureSchematicObjectTemplate * base = dynamic_cast<const ServerManufactureSchematicObjectTemplate *>(m_baseData);
+		DEBUG_FATAL(base == NULL, ("base template wrong type"));
+		return base->getIngredientsCount();
+	}
+
+	size_t count = m_ingredients.size();
+
+	// if we are extending our base template, add it's count
+	if (m_ingredientsAppend && m_baseData != NULL)
+	{
+		const ServerManufactureSchematicObjectTemplate * base = dynamic_cast<const ServerManufactureSchematicObjectTemplate *>(m_baseData);
+		if (base != NULL)
+			count += base->getIngredientsCount();
+	}
+
+	return count;
+}	// ServerManufactureSchematicObjectTemplate::getIngredientsCount
+
+int ServerManufactureSchematicObjectTemplate::getItemCount(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerManufactureSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerManufactureSchematicObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getItemCount(true);
+#endif
+	}
+
+	if (!m_itemCount.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter itemCount in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter itemCount has not been defined in template %s!", DataResource::getName()));
+			return base->getItemCount();
+		}
+	}
+
+	int value = m_itemCount.getValue();
+	char delta = m_itemCount.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getItemCount();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerManufactureSchematicObjectTemplate::getItemCount
+
+int ServerManufactureSchematicObjectTemplate::getItemCountMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerManufactureSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerManufactureSchematicObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getItemCountMin(true);
+#endif
+	}
+
+	if (!m_itemCount.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter itemCount in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter itemCount has not been defined in template %s!", DataResource::getName()));
+			return base->getItemCountMin();
+		}
+	}
+
+	int value = m_itemCount.getMinValue();
+	char delta = m_itemCount.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getItemCountMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerManufactureSchematicObjectTemplate::getItemCountMin
+
+int ServerManufactureSchematicObjectTemplate::getItemCountMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerManufactureSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerManufactureSchematicObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getItemCountMax(true);
+#endif
+	}
+
+	if (!m_itemCount.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter itemCount in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter itemCount has not been defined in template %s!", DataResource::getName()));
+			return base->getItemCountMax();
+		}
+	}
+
+	int value = m_itemCount.getMaxValue();
+	char delta = m_itemCount.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getItemCountMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerManufactureSchematicObjectTemplate::getItemCountMax
+
+void ServerManufactureSchematicObjectTemplate::getAttributes(SchematicAttribute &data, int index) const
+{
+	const ServerManufactureSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerManufactureSchematicObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_attributesLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter attributes in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter attributes has not been defined in template %s!", DataResource::getName()));
+			base->getAttributes(data, index);
+			return;
+		}
+	}
+
+	if (m_attributesAppend && base != NULL)
+	{
+		int baseCount = base->getAttributesCount();
+		if (index < baseCount)
+			{
+				base->getAttributes(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_attributes.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_attributes[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _SchematicAttribute *param = dynamic_cast<const _SchematicAttribute *>(structTemplate);
+	NOT_NULL(param);
+	data.name = param->getName(m_versionOk);
+	data.value = param->getValue(m_versionOk);
+}	// ServerManufactureSchematicObjectTemplate::getAttributes
+
+void ServerManufactureSchematicObjectTemplate::getAttributesMin(SchematicAttribute &data, int index) const
+{
+	const ServerManufactureSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerManufactureSchematicObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_attributesLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter attributes in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter attributes has not been defined in template %s!", DataResource::getName()));
+			base->getAttributesMin(data, index);
+			return;
+		}
+	}
+
+	if (m_attributesAppend && base != NULL)
+	{
+		int baseCount = base->getAttributesCount();
+		if (index < baseCount)
+			{
+				base->getAttributesMin(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_attributes.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_attributes[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _SchematicAttribute *param = dynamic_cast<const _SchematicAttribute *>(structTemplate);
+	NOT_NULL(param);
+	data.name = param->getName(m_versionOk);
+	data.value = param->getValueMin(m_versionOk);
+}	// ServerManufactureSchematicObjectTemplate::getAttributesMin
+
+void ServerManufactureSchematicObjectTemplate::getAttributesMax(SchematicAttribute &data, int index) const
+{
+	const ServerManufactureSchematicObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerManufactureSchematicObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_attributesLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter attributes in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter attributes has not been defined in template %s!", DataResource::getName()));
+			base->getAttributesMax(data, index);
+			return;
+		}
+	}
+
+	if (m_attributesAppend && base != NULL)
+	{
+		int baseCount = base->getAttributesCount();
+		if (index < baseCount)
+			{
+				base->getAttributesMax(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_attributes.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_attributes[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _SchematicAttribute *param = dynamic_cast<const _SchematicAttribute *>(structTemplate);
+	NOT_NULL(param);
+	data.name = param->getName(m_versionOk);
+	data.value = param->getValueMax(m_versionOk);
+}	// ServerManufactureSchematicObjectTemplate::getAttributesMax
+
+size_t ServerManufactureSchematicObjectTemplate::getAttributesCount(void) const
+{
+	if (!m_attributesLoaded)
+	{
+		if (m_baseData == NULL)
+			return 0;
+		const ServerManufactureSchematicObjectTemplate * base = dynamic_cast<const ServerManufactureSchematicObjectTemplate *>(m_baseData);
+		DEBUG_FATAL(base == NULL, ("base template wrong type"));
+		return base->getAttributesCount();
+	}
+
+	size_t count = m_attributes.size();
+
+	// if we are extending our base template, add it's count
+	if (m_attributesAppend && m_baseData != NULL)
+	{
+		const ServerManufactureSchematicObjectTemplate * base = dynamic_cast<const ServerManufactureSchematicObjectTemplate *>(m_baseData);
+		if (base != NULL)
+			count += base->getAttributesCount();
+	}
+
+	return count;
+}	// ServerManufactureSchematicObjectTemplate::getAttributesCount
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerManufactureSchematicObjectTemplate::testValues(void) const
+{
+	IGNORE_RETURN(getDraftSchematic(true));
+	IGNORE_RETURN(getCreator(true));
+	IGNORE_RETURN(getItemCountMin(true));
+	IGNORE_RETURN(getItemCountMax(true));
+	ServerIntangibleObjectTemplate::testValues();
+}	// ServerManufactureSchematicObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerManufactureSchematicObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerManufactureSchematicObjectTemplate_tag)
+	{
+		ServerIntangibleObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,0))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "draftSchematic") == 0)
+			m_draftSchematic.loadFromIff(file);
+		else if (strcmp(paramName, "creator") == 0)
+			m_creator.loadFromIff(file);
+		else if (strcmp(paramName, "ingredients") == 0)
+		{
+			std::vector<StructParamOT *>::iterator iter;
+			for (iter = m_ingredients.begin(); iter != m_ingredients.end(); ++iter)
+			{
+				delete *iter;
+				*iter = NULL;
+			}
+			m_ingredients.clear();
+			m_ingredientsAppend = file.read_bool8();
+			int listCount = file.read_int32();
+			for (int j = 0; j < listCount; ++j)
+			{
+				StructParamOT * newData = new StructParamOT;
+				newData->loadFromIff(file);
+				m_ingredients.push_back(newData);
+			}
+			m_ingredientsLoaded = true;
+		}
+		else if (strcmp(paramName, "itemCount") == 0)
+			m_itemCount.loadFromIff(file);
+		else if (strcmp(paramName, "attributes") == 0)
+		{
+			std::vector<StructParamOT *>::iterator iter;
+			for (iter = m_attributes.begin(); iter != m_attributes.end(); ++iter)
+			{
+				delete *iter;
+				*iter = NULL;
+			}
+			m_attributes.clear();
+			m_attributesAppend = file.read_bool8();
+			int listCount = file.read_int32();
+			for (int j = 0; j < listCount; ++j)
+			{
+				StructParamOT * newData = new StructParamOT;
+				newData->loadFromIff(file);
+				m_attributes.push_back(newData);
+			}
+			m_attributesLoaded = true;
+		}
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	ServerIntangibleObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerManufactureSchematicObjectTemplate::load
+
+
+//=============================================================================
+// class ServerManufactureSchematicObjectTemplate::_IngredientSlot
+
+/**
+ * Class constructor.
+ */
+ServerManufactureSchematicObjectTemplate::_IngredientSlot::_IngredientSlot(const std::string & filename)
+	: ObjectTemplate(filename)
+{
+}	// ServerManufactureSchematicObjectTemplate::_IngredientSlot::_IngredientSlot
+
+/**
+ * Class destructor.
+ */
+ServerManufactureSchematicObjectTemplate::_IngredientSlot::~_IngredientSlot()
+{
+}	// ServerManufactureSchematicObjectTemplate::_IngredientSlot::~_IngredientSlot
+
+/**
+ * Static function used to register this template.
+ */
+void ServerManufactureSchematicObjectTemplate::_IngredientSlot::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(_IngredientSlot_tag, create);
+}	// ServerManufactureSchematicObjectTemplate::_IngredientSlot::registerMe
+
+/**
+ * Creates a ServerManufactureSchematicObjectTemplate::_IngredientSlot template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerManufactureSchematicObjectTemplate::_IngredientSlot::create(const std::string & filename)
+{
+	return new ServerManufactureSchematicObjectTemplate::_IngredientSlot(filename);
+}	// ServerManufactureSchematicObjectTemplate::_IngredientSlot::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerManufactureSchematicObjectTemplate::_IngredientSlot::getId(void) const
+{
+	return _IngredientSlot_tag;
+}	// ServerManufactureSchematicObjectTemplate::_IngredientSlot::getId
+
+const StringId ServerManufactureSchematicObjectTemplate::_IngredientSlot::getName(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+StringId testDataValue = DefaultStringId;
+#else
+UNREF(testData);
+#endif
+
+	const ServerManufactureSchematicObjectTemplate::_IngredientSlot * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerManufactureSchematicObjectTemplate::_IngredientSlot *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getName(true);
+#endif
+	}
+
+	if (!m_name.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter name in template %s", DataResource::getName()));
+			return DefaultStringId;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter name has not been defined in template %s!", DataResource::getName()));
+			return base->getName(versionOk);
+		}
+	}
+
+	const StringId value = m_name.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerManufactureSchematicObjectTemplate::_IngredientSlot::getName
+
+void ServerManufactureSchematicObjectTemplate::_IngredientSlot::getIngredient(Ingredient &data, bool versionOk) const
+{
+	const ServerManufactureSchematicObjectTemplate::_IngredientSlot * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerManufactureSchematicObjectTemplate::_IngredientSlot *>(m_baseData);
+	}
+
+	if (!m_ingredient.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter ingredient in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter ingredient has not been defined in template %s!", DataResource::getName()));
+			base->getIngredient(data, versionOk);
+			return;
+		}
+	}
+
+	const ObjectTemplate * structTemplate = m_ingredient.getValue();
+	NOT_NULL(structTemplate);
+	const _Ingredient *param = dynamic_cast<const _Ingredient *>(structTemplate);
+	NOT_NULL(param);
+	data.ingredientType = param->getIngredientType(versionOk);
+	{
+		for (size_t i = 0; i < param->getIngredientsCount(); ++i)
+		{
+			data.ingredients.push_back(SimpleIngredient());
+			param->getIngredients(data.ingredients.back(), i, versionOk);
+		}
+	}
+	data.complexity = param->getComplexity(versionOk);
+	data.skillCommand = param->getSkillCommand(versionOk);
+}	// ServerManufactureSchematicObjectTemplate::_IngredientSlot::getIngredient
+
+void ServerManufactureSchematicObjectTemplate::_IngredientSlot::getIngredientMin(Ingredient &data, bool versionOk) const
+{
+	const ServerManufactureSchematicObjectTemplate::_IngredientSlot * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerManufactureSchematicObjectTemplate::_IngredientSlot *>(m_baseData);
+	}
+
+	if (!m_ingredient.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter ingredient in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter ingredient has not been defined in template %s!", DataResource::getName()));
+			base->getIngredientMin(data, versionOk);
+			return;
+		}
+	}
+
+	const ObjectTemplate * structTemplate = m_ingredient.getValue();
+	NOT_NULL(structTemplate);
+	const _Ingredient *param = dynamic_cast<const _Ingredient *>(structTemplate);
+	NOT_NULL(param);
+	data.ingredientType = param->getIngredientType(versionOk);
+	{
+		for (size_t i = 0; i < param->getIngredientsCount(); ++i)
+		{
+			data.ingredients.push_back(SimpleIngredient());
+			param->getIngredientsMin(data.ingredients.back(), i, versionOk);
+		}
+	}
+	data.complexity = param->getComplexityMin(versionOk);
+	data.skillCommand = param->getSkillCommand(versionOk);
+}	// ServerManufactureSchematicObjectTemplate::_IngredientSlot::getIngredientMin
+
+void ServerManufactureSchematicObjectTemplate::_IngredientSlot::getIngredientMax(Ingredient &data, bool versionOk) const
+{
+	const ServerManufactureSchematicObjectTemplate::_IngredientSlot * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerManufactureSchematicObjectTemplate::_IngredientSlot *>(m_baseData);
+	}
+
+	if (!m_ingredient.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter ingredient in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter ingredient has not been defined in template %s!", DataResource::getName()));
+			base->getIngredientMax(data, versionOk);
+			return;
+		}
+	}
+
+	const ObjectTemplate * structTemplate = m_ingredient.getValue();
+	NOT_NULL(structTemplate);
+	const _Ingredient *param = dynamic_cast<const _Ingredient *>(structTemplate);
+	NOT_NULL(param);
+	data.ingredientType = param->getIngredientType(versionOk);
+	{
+		for (size_t i = 0; i < param->getIngredientsCount(); ++i)
+		{
+			data.ingredients.push_back(SimpleIngredient());
+			param->getIngredientsMax(data.ingredients.back(), i, versionOk);
+		}
+	}
+	data.complexity = param->getComplexityMax(versionOk);
+	data.skillCommand = param->getSkillCommand(versionOk);
+}	// ServerManufactureSchematicObjectTemplate::_IngredientSlot::getIngredientMax
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerManufactureSchematicObjectTemplate::_IngredientSlot::testValues(void) const
+{
+	IGNORE_RETURN(getName(true));
+}	// ServerManufactureSchematicObjectTemplate::_IngredientSlot::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerManufactureSchematicObjectTemplate::_IngredientSlot::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "name") == 0)
+			m_name.loadFromIff(file);
+		else if (strcmp(paramName, "ingredient") == 0)
+			m_ingredient.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	UNREF(file);
+}	// ServerManufactureSchematicObjectTemplate::_IngredientSlot::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.h
new file mode 100644
index 00000000..d7853c72
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.h
@@ -0,0 +1,163 @@
+//========================================================================
+//
+// ServerManufactureSchematicObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerManufactureSchematicObjectTemplate_H
+#define _INCLUDED_ServerManufactureSchematicObjectTemplate_H
+
+#include "ServerIntangibleObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class DraftSchematicObject;
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerManufactureSchematicObjectTemplate : public ServerIntangibleObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerManufactureSchematicObjectTemplate_tag = TAG(M,S,C,O)
+	};
+//@END TFD ID
+public:
+	         ServerManufactureSchematicObjectTemplate(const std::string & filename);
+	virtual ~ServerManufactureSchematicObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+	struct IngredientSlot
+	{
+		StringId               name;
+		Ingredient ingredient;
+	};
+
+protected:
+	class _IngredientSlot : public ObjectTemplate
+	{
+		friend class ServerManufactureSchematicObjectTemplate;
+	public:
+		enum
+		{
+			_IngredientSlot_tag = TAG(M,I,N,S)
+		};
+
+	public:
+		         _IngredientSlot(const std::string & filename);
+		virtual ~_IngredientSlot();
+
+	virtual Tag getId(void) const;
+
+public:
+	const StringId         getName(bool versionOk, bool testData = false) const;
+	void              getIngredient(Ingredient &data, bool versionOk) const;
+	void              getIngredientMin(Ingredient &data, bool versionOk) const;
+	void              getIngredientMax(Ingredient &data, bool versionOk) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	StringIdParam m_name;		// slot name
+	StructParamOT m_ingredient;		// ingredient used to fill the slot
+	private:
+		static void registerMe(void);
+		static ObjectTemplate * create(const std::string & filename);
+	private:
+		_IngredientSlot(const _IngredientSlot &);
+		_IngredientSlot & operator =(const _IngredientSlot &);
+	};
+	friend class ServerManufactureSchematicObjectTemplate::_IngredientSlot;
+
+public:
+	const std::string &    getDraftSchematic(bool testData = false) const;
+	const std::string &    getCreator(bool testData = false) const;
+	void              getIngredients(IngredientSlot &data, int index) const;
+	void              getIngredientsMin(IngredientSlot &data, int index) const;
+	void              getIngredientsMax(IngredientSlot &data, int index) const;
+	size_t            getIngredientsCount(void) const;
+	int                    getItemCount(bool testData = false) const;
+	int                    getItemCountMin(bool testData = false) const;
+	int                    getItemCountMax(bool testData = false) const;
+	void              getAttributes(SchematicAttribute &data, int index) const;
+	void              getAttributesMin(SchematicAttribute &data, int index) const;
+	void              getAttributesMax(SchematicAttribute &data, int index) const;
+	size_t            getAttributesCount(void) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	StringParam m_draftSchematic;		// source draft schematic
+	StringParam m_creator;		// who created me
+	stdvector<StructParamOT *>::fwd m_ingredients;		// ingredients needed to create
+	bool m_ingredientsLoaded;
+	bool m_ingredientsAppend;
+	IntegerParam m_itemCount;		// number of items this schematic can make
+	stdvector<StructParamOT *>::fwd m_attributes;		// values for the attributes the schematic affects
+	bool m_attributesLoaded;
+	bool m_attributesAppend;
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+	static  Object * createObject(const char *const fileName, const DraftSchematicObject &);
+	        Object * createObject(const DraftSchematicObject &) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerManufactureSchematicObjectTemplate(const ServerManufactureSchematicObjectTemplate &);
+	ServerManufactureSchematicObjectTemplate & operator =(const ServerManufactureSchematicObjectTemplate &);
+};
+
+
+inline void ServerManufactureSchematicObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerManufactureSchematicObjectTemplate::registerMe();
+	ServerManufactureSchematicObjectTemplate::_IngredientSlot::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerManufactureSchematicObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionObjectTemplate.cpp
new file mode 100644
index 00000000..66ee2754
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionObjectTemplate.cpp
@@ -0,0 +1,185 @@
+//========================================================================
+//
+// ServerMissionObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerMissionObjectTemplate.h"
+#include "serverGame/MissionObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerMissionObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerMissionObjectTemplate::ServerMissionObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerIntangibleObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerMissionObjectTemplate::ServerMissionObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerMissionObjectTemplate::~ServerMissionObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerMissionObjectTemplate::~ServerMissionObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerMissionObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerMissionObjectTemplate_tag, create);
+}	// ServerMissionObjectTemplate::registerMe
+
+/**
+ * Creates a ServerMissionObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerMissionObjectTemplate::create(const std::string & filename)
+{
+	return new ServerMissionObjectTemplate(filename);
+}	// ServerMissionObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerMissionObjectTemplate::getId(void) const
+{
+	return ServerMissionObjectTemplate_tag;
+}	// ServerMissionObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerMissionObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerMissionObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerMissionObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerMissionObjectTemplate * base = dynamic_cast<const ServerMissionObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerMissionObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerMissionObjectTemplate::createObject(void) const
+{
+	return new MissionObject(this);
+}	// ServerMissionObjectTemplate::createObject
+
+//@BEGIN TFD
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerMissionObjectTemplate::testValues(void) const
+{
+	ServerIntangibleObjectTemplate::testValues();
+}	// ServerMissionObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerMissionObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerMissionObjectTemplate_tag)
+	{
+		ServerIntangibleObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,0))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	UNREF(paramName);
+	UNREF(paramCount);
+
+	file.exitForm();
+	ServerIntangibleObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerMissionObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionObjectTemplate.h
new file mode 100644
index 00000000..9ee9cdfb
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionObjectTemplate.h
@@ -0,0 +1,87 @@
+//========================================================================
+//
+// ServerMissionObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerMissionObjectTemplate_H
+#define _INCLUDED_ServerMissionObjectTemplate_H
+
+#include "ServerIntangibleObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerMissionObjectTemplate : public ServerIntangibleObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerMissionObjectTemplate_tag = TAG(M,I,S,O)
+	};
+//@END TFD ID
+public:
+	         ServerMissionObjectTemplate(const std::string & filename);
+	virtual ~ServerMissionObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerMissionObjectTemplate(const ServerMissionObjectTemplate &);
+	ServerMissionObjectTemplate & operator =(const ServerMissionObjectTemplate &);
+};
+
+
+inline void ServerMissionObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerMissionObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerMissionObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp
new file mode 100644
index 00000000..718b680f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp
@@ -0,0 +1,4653 @@
+//========================================================================
+//
+// ServerObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerObjectTemplate.h"
+#include "sharedFile/Iff.h"
+#include "sharedMath/Vector.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+#include "ServerObjectTemplate.h"
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+#include <hash_map>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+typedef std::hash_map<ServerObjectTemplate::XpTypes, std::string, std::hash<int> > XP_MAP; 
+static XP_MAP * XpMap = NULL;
+
+
+/**
+ * Class constructor.
+ */
+ServerObjectTemplate::ServerObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ObjectTemplate(filename)
+	,m_scriptsLoaded(false)
+	,m_scriptsAppend(false)
+	,m_visibleFlagsLoaded(false)
+	,m_visibleFlagsAppend(false)
+	,m_deleteFlagsLoaded(false)
+	,m_deleteFlagsAppend(false)
+	,m_moveFlagsLoaded(false)
+	,m_moveFlagsAppend(false)
+	,m_contentsLoaded(false)
+	,m_contentsAppend(false)
+	,m_xpPointsLoaded(false)
+	,m_xpPointsAppend(false)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerObjectTemplate::ServerObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerObjectTemplate::~ServerObjectTemplate()
+{
+	if (m_baseData)
+	{
+		m_baseData->releaseReference();
+		m_baseData=0;
+	}
+//@BEGIN TFD CLEANUP
+	{
+		std::vector<StringParam *>::iterator iter;
+		for (iter = m_scripts.begin(); iter != m_scripts.end(); ++iter)
+		{
+			delete *iter;
+			*iter = NULL;
+		}
+		m_scripts.clear();
+	}
+	{
+		std::vector<IntegerParam *>::iterator iter;
+		for (iter = m_visibleFlags.begin(); iter != m_visibleFlags.end(); ++iter)
+		{
+			delete *iter;
+			*iter = NULL;
+		}
+		m_visibleFlags.clear();
+	}
+	{
+		std::vector<IntegerParam *>::iterator iter;
+		for (iter = m_deleteFlags.begin(); iter != m_deleteFlags.end(); ++iter)
+		{
+			delete *iter;
+			*iter = NULL;
+		}
+		m_deleteFlags.clear();
+	}
+	{
+		std::vector<IntegerParam *>::iterator iter;
+		for (iter = m_moveFlags.begin(); iter != m_moveFlags.end(); ++iter)
+		{
+			delete *iter;
+			*iter = NULL;
+		}
+		m_moveFlags.clear();
+	}
+	{
+		std::vector<StructParamOT *>::iterator iter;
+		for (iter = m_contents.begin(); iter != m_contents.end(); ++iter)
+		{
+			delete *iter;
+			*iter = NULL;
+		}
+		m_contents.clear();
+	}
+	{
+		std::vector<StructParamOT *>::iterator iter;
+		for (iter = m_xpPoints.begin(); iter != m_xpPoints.end(); ++iter)
+		{
+			delete *iter;
+			*iter = NULL;
+		}
+		m_xpPoints.clear();
+	}
+//@END TFD CLEANUP
+}	// ServerObjectTemplate::~ServerObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerObjectTemplate_tag, create);
+
+	if (XpMap == NULL)
+	{
+		XpMap = new XP_MAP();
+		NOT_NULL(XpMap);
+		ExitChain::add(exit, "ServerObjectTemplate");
+
+		// @todo: fill in the rest of this map
+		(*XpMap)[XP_rangedCombat] = "";
+		(*XpMap)[XP_meleeCombat] = "";
+		(*XpMap)[XP_tamingNoTime] = "";
+		(*XpMap)[XP_tamingShortTime] = "";
+		(*XpMap)[XP_tamingMediumTime] = "";
+		(*XpMap)[XP_tamingLargeTime] = "";
+		(*XpMap)[XP_architect] = "";
+		(*XpMap)[XP_botany] = "";
+		(*XpMap)[XP_bountyHunter] = "";
+		(*XpMap)[XP_chemist] = "";
+		(*XpMap)[XP_dancing] = "";
+		(*XpMap)[XP_facilityManagementSavings] = "";
+		(*XpMap)[XP_facilityManagementWearAndTear] = "";
+		(*XpMap)[XP_squadLeaderNoTime] = "";
+		(*XpMap)[XP_squadLeaderSmallTime] = "";
+		(*XpMap)[XP_squadLeaderMediumTime] = "";
+		(*XpMap)[XP_squadLeaderLargeTime] = "";
+		(*XpMap)[XP_hairdressing] = "";
+		(*XpMap)[XP_holonetSlicingPopularity] = "";
+		(*XpMap)[XP_holonetSlicingQuantity] = "";
+		(*XpMap)[XP_investigation] = "";
+		(*XpMap)[XP_medic] = "";
+		(*XpMap)[XP_military] = "";
+		(*XpMap)[XP_mining] = "";
+		(*XpMap)[XP_miningSavings] = "";
+		(*XpMap)[XP_musician] = "music";
+		(*XpMap)[XP_musicanPopularity] = "";
+		(*XpMap)[XP_politics] = "";
+		(*XpMap)[XP_slicing] = "";
+		(*XpMap)[XP_smuggling] = "";
+		(*XpMap)[XP_surveyingNoMinimum] = "";
+		(*XpMap)[XP_surveyingLowMinimum] = "";
+		(*XpMap)[XP_surveyingMediumMinimum] = "";
+		(*XpMap)[XP_surveyingHighMinimum] = "";
+		(*XpMap)[XP_survivalHealing] = "";
+		(*XpMap)[XP_survivalTracking] = "";
+		(*XpMap)[XP_vehicularControl] = "";
+		(*XpMap)[XP_vehicularWearAndTear] = "";
+		(*XpMap)[XP_resourceHarvestingOrganic] = "resource_harvesting_organic";
+		(*XpMap)[XP_resourceHarvestingInorganic] = "resource_harvesting_inorganic";
+		(*XpMap)[XP_crafting] = "crafting_general";
+		(*XpMap)[XP_craftingClothing] = "crafting_clothing_general";
+		(*XpMap)[XP_craftingClothingArmor] = "crafting_clothing_armor";
+		(*XpMap)[XP_craftingDroid] = "crafting_droid_general";
+		(*XpMap)[XP_craftingFood] = "crafting_food_general";
+		(*XpMap)[XP_craftingMedicine] = "crafting_medicine_general";
+		(*XpMap)[XP_craftingStructure] = "crafting_structure_general";
+		(*XpMap)[XP_craftingWeapons] = "crafting_weapons_general";
+		(*XpMap)[XP_craftingWeaponsMelee] = "crafting_weapons_melee";
+		(*XpMap)[XP_craftingWeaponsRanged] = "crafting_weapons_ranged";
+		(*XpMap)[XP_craftingWeaponsMunition] = "crafting_weapons_munition";
+		(*XpMap)[XP_craftingScout] = "scout";
+		(*XpMap)[XP_craftingCreature] = "crafting_bio_engineer_creature";
+		(*XpMap)[XP_craftingTissue] = "crafting_bio_engineer_tissue";
+		(*XpMap)[XP_craftingCamp] = "camp";
+		(*XpMap)[XP_craftingTrapping] = "trapping";
+		(*XpMap)[XP_craftingSpice] = "crafting_spice";
+		(*XpMap)[XP_industrialist] = "industrialist";
+		(*XpMap)[XP_jediGeneral] = "jedi_general";
+		(*XpMap)[XP_shipwright] = "shipwright";
+		(*XpMap)[XP_reverseEngineering] = "reverse_engineering";
+	}
+}	// ServerObjectTemplate::registerMe
+
+/**
+ * Called on program exit to clean up class-level memory.
+ */
+void ServerObjectTemplate::exit()
+{
+	if (XpMap != NULL)
+	{
+		delete XpMap;
+		XpMap = NULL;
+	}
+}	// ServerObjectTemplate::exit
+
+/**
+ * Creates a ServerObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerObjectTemplate::create(const std::string & filename)
+{
+	return new ServerObjectTemplate(filename);
+}	// ServerObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerObjectTemplate::getId(void) const
+{
+	return ServerObjectTemplate_tag;
+}	// ServerObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerObjectTemplate * base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerObjectTemplate::getHighestTemplateVersion
+
+// ----------------------------------------------------------------------
+
+ServerObjectTemplate * ServerObjectTemplate::asServerObjectTemplate()
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+ServerObjectTemplate const * ServerObjectTemplate::asServerObjectTemplate() const
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns the xp string associated with an xp enum value
+ *
+ * @param type		the xp type
+ *
+ * @return the string associated with the xp, or an empty string for a bad value
+ */
+const std::string & ServerObjectTemplate::getXpString(XpTypes type)
+{
+	static const std::string emptyString;
+
+	if (XpMap != NULL)
+	{
+		XP_MAP::const_iterator result = XpMap->find(type);
+		if (result != XpMap->end())
+			return (*result).second;
+	}
+
+	return emptyString;
+}	// ServerObjectTemplate::getXpString
+
+//----------------------------------------------------------------------
+
+const std::string & ServerObjectTemplate::getDamageTypeString  (DamageType type)
+{
+	static const std::string emptyString;
+
+	static const std::string DAMAGE_TYPE_NAMES[] = 
+	{
+		"kinetic",
+		"energy",
+		"blast",
+		"stun",
+		"restraint",
+		"elemental_heat",
+		"elemental_cold",
+		"elemental_acid",
+		"elemental_electrical",
+		"environmental_heat",
+		"environmental_cold",
+		"environmental_acid",
+		"environmental_electrical"
+	};
+
+	const int DAMAGE_TYPE_NAMES_SIZE = sizeof(DAMAGE_TYPE_NAMES) / sizeof(DAMAGE_TYPE_NAMES[0]);
+
+	const int i_damage = static_cast<int>(type);
+
+	if (i_damage != 0)
+	{
+		for (int index = 0; index < DAMAGE_TYPE_NAMES_SIZE; ++index)
+		{
+			if ((i_damage & (1 << index)) != 0)
+				return DAMAGE_TYPE_NAMES [index];
+		}
+	}
+
+	return emptyString;
+}
+
+//----------------------------------------------------------------------
+
+const std::string & ServerObjectTemplate::getArmorRatingString (ArmorRating type)
+{
+	static const std::string emptyString;
+
+	static const std::string ARMOR_RATING_NAMES[] = 
+	{
+		"none",
+		"light",
+		"medium",
+		"heavy"
+	};
+
+	const int ARMOR_RATING_NAMES_SIZE = sizeof(ARMOR_RATING_NAMES) / sizeof(ARMOR_RATING_NAMES[0]);
+
+	const int i_type = static_cast<int>(type);
+
+	if (i_type < 0 || i_type >= ARMOR_RATING_NAMES_SIZE)
+		return emptyString;
+
+	return ARMOR_RATING_NAMES [i_type];
+}
+
+//----------------------------------------------------------------------
+
+//@BEGIN TFD
+const std::string & ServerObjectTemplate::getSharedTemplate(bool testData) const
+{
+#ifdef _DEBUG
+std::string testDataValue = DefaultString;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getSharedTemplate(true);
+#endif
+	}
+
+	if (!m_sharedTemplate.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter sharedTemplate in template %s", DataResource::getName()));
+			return DefaultString;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter sharedTemplate has not been defined in template %s!", DataResource::getName()));
+			return base->getSharedTemplate();
+		}
+	}
+
+	const std::string & value = m_sharedTemplate.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::getSharedTemplate
+
+const std::string & ServerObjectTemplate::getScripts(int index) const
+{
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_scriptsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter scripts in template %s", DataResource::getName()));
+			return DefaultString;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter scripts has not been defined in template %s!", DataResource::getName()));
+			return base->getScripts(index);
+		}
+	}
+
+	if (m_scriptsAppend && base != NULL)
+	{
+		int baseCount = base->getScriptsCount();
+		if (index < baseCount)
+			return base->getScripts(index);
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_scripts.size(), ("template param index out of range"));
+	const std::string & value = m_scripts[index]->getValue();
+	return value;
+}	// ServerObjectTemplate::getScripts
+
+size_t ServerObjectTemplate::getScriptsCount(void) const
+{
+	if (!m_scriptsLoaded)
+	{
+		if (m_baseData == NULL)
+			return 0;
+		const ServerObjectTemplate * base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+		DEBUG_FATAL(base == NULL, ("base template wrong type"));
+		return base->getScriptsCount();
+	}
+
+	size_t count = m_scripts.size();
+
+	// if we are extending our base template, add it's count
+	if (m_scriptsAppend && m_baseData != NULL)
+	{
+		const ServerObjectTemplate * base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+		if (base != NULL)
+			count += base->getScriptsCount();
+	}
+
+	return count;
+}	// ServerObjectTemplate::getScriptsCount
+
+void ServerObjectTemplate::getObjvars(DynamicVariableList &list) const
+{
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_objvars.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter objvars in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter objvars has not been defined in template %s!", DataResource::getName()));
+			base->getObjvars(list);
+			return;
+		}
+	}
+
+	if (m_objvars.isExtendingBaseList() && base != NULL)
+		base->getObjvars(list);
+	m_objvars.getDynamicVariableList(list);
+}	// ServerObjectTemplate::getObjvars
+
+int ServerObjectTemplate::getVolume(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getVolume(true);
+#endif
+	}
+
+	if (!m_volume.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter volume in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter volume has not been defined in template %s!", DataResource::getName()));
+			return base->getVolume();
+		}
+	}
+
+	int value = m_volume.getValue();
+	char delta = m_volume.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getVolume();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::getVolume
+
+int ServerObjectTemplate::getVolumeMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getVolumeMin(true);
+#endif
+	}
+
+	if (!m_volume.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter volume in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter volume has not been defined in template %s!", DataResource::getName()));
+			return base->getVolumeMin();
+		}
+	}
+
+	int value = m_volume.getMinValue();
+	char delta = m_volume.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getVolumeMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::getVolumeMin
+
+int ServerObjectTemplate::getVolumeMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getVolumeMax(true);
+#endif
+	}
+
+	if (!m_volume.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter volume in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter volume has not been defined in template %s!", DataResource::getName()));
+			return base->getVolumeMax();
+		}
+	}
+
+	int value = m_volume.getMaxValue();
+	char delta = m_volume.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getVolumeMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::getVolumeMax
+
+ServerObjectTemplate::VisibleFlags ServerObjectTemplate::getVisibleFlags(int index) const
+{
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_visibleFlagsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter visibleFlags in template %s", DataResource::getName()));
+			return static_cast<VisibleFlags>(0);
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter visibleFlags has not been defined in template %s!", DataResource::getName()));
+			return base->getVisibleFlags(index);
+		}
+	}
+
+	if (m_visibleFlagsAppend && base != NULL)
+	{
+		int baseCount = base->getVisibleFlagsCount();
+		if (index < baseCount)
+			return base->getVisibleFlags(index);
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_visibleFlags.size(), ("template param index out of range"));
+	return static_cast<VisibleFlags>(m_visibleFlags[index]->getValue());
+}	// ServerObjectTemplate::getVisibleFlags
+
+size_t ServerObjectTemplate::getVisibleFlagsCount(void) const
+{
+	if (!m_visibleFlagsLoaded)
+	{
+		if (m_baseData == NULL)
+			return 0;
+		const ServerObjectTemplate * base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+		DEBUG_FATAL(base == NULL, ("base template wrong type"));
+		return base->getVisibleFlagsCount();
+	}
+
+	size_t count = m_visibleFlags.size();
+
+	// if we are extending our base template, add it's count
+	if (m_visibleFlagsAppend && m_baseData != NULL)
+	{
+		const ServerObjectTemplate * base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+		if (base != NULL)
+			count += base->getVisibleFlagsCount();
+	}
+
+	return count;
+}	// ServerObjectTemplate::getVisibleFlagsCount
+
+ServerObjectTemplate::DeleteFlags ServerObjectTemplate::getDeleteFlags(int index) const
+{
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_deleteFlagsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter deleteFlags in template %s", DataResource::getName()));
+			return static_cast<DeleteFlags>(0);
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter deleteFlags has not been defined in template %s!", DataResource::getName()));
+			return base->getDeleteFlags(index);
+		}
+	}
+
+	if (m_deleteFlagsAppend && base != NULL)
+	{
+		int baseCount = base->getDeleteFlagsCount();
+		if (index < baseCount)
+			return base->getDeleteFlags(index);
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_deleteFlags.size(), ("template param index out of range"));
+	return static_cast<DeleteFlags>(m_deleteFlags[index]->getValue());
+}	// ServerObjectTemplate::getDeleteFlags
+
+size_t ServerObjectTemplate::getDeleteFlagsCount(void) const
+{
+	if (!m_deleteFlagsLoaded)
+	{
+		if (m_baseData == NULL)
+			return 0;
+		const ServerObjectTemplate * base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+		DEBUG_FATAL(base == NULL, ("base template wrong type"));
+		return base->getDeleteFlagsCount();
+	}
+
+	size_t count = m_deleteFlags.size();
+
+	// if we are extending our base template, add it's count
+	if (m_deleteFlagsAppend && m_baseData != NULL)
+	{
+		const ServerObjectTemplate * base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+		if (base != NULL)
+			count += base->getDeleteFlagsCount();
+	}
+
+	return count;
+}	// ServerObjectTemplate::getDeleteFlagsCount
+
+ServerObjectTemplate::MoveFlags ServerObjectTemplate::getMoveFlags(int index) const
+{
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_moveFlagsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter moveFlags in template %s", DataResource::getName()));
+			return static_cast<MoveFlags>(0);
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter moveFlags has not been defined in template %s!", DataResource::getName()));
+			return base->getMoveFlags(index);
+		}
+	}
+
+	if (m_moveFlagsAppend && base != NULL)
+	{
+		int baseCount = base->getMoveFlagsCount();
+		if (index < baseCount)
+			return base->getMoveFlags(index);
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_moveFlags.size(), ("template param index out of range"));
+	return static_cast<MoveFlags>(m_moveFlags[index]->getValue());
+}	// ServerObjectTemplate::getMoveFlags
+
+size_t ServerObjectTemplate::getMoveFlagsCount(void) const
+{
+	if (!m_moveFlagsLoaded)
+	{
+		if (m_baseData == NULL)
+			return 0;
+		const ServerObjectTemplate * base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+		DEBUG_FATAL(base == NULL, ("base template wrong type"));
+		return base->getMoveFlagsCount();
+	}
+
+	size_t count = m_moveFlags.size();
+
+	// if we are extending our base template, add it's count
+	if (m_moveFlagsAppend && m_baseData != NULL)
+	{
+		const ServerObjectTemplate * base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+		if (base != NULL)
+			count += base->getMoveFlagsCount();
+	}
+
+	return count;
+}	// ServerObjectTemplate::getMoveFlagsCount
+
+bool ServerObjectTemplate::getInvulnerable(bool testData) const
+{
+#ifdef _DEBUG
+bool testDataValue = false;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getInvulnerable(true);
+#endif
+	}
+
+	if (!m_invulnerable.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter invulnerable in template %s", DataResource::getName()));
+			return false;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter invulnerable has not been defined in template %s!", DataResource::getName()));
+			return base->getInvulnerable();
+		}
+	}
+
+	bool value = m_invulnerable.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::getInvulnerable
+
+float ServerObjectTemplate::getComplexity(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getComplexity(true);
+#endif
+	}
+
+	if (!m_complexity.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter complexity in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter complexity has not been defined in template %s!", DataResource::getName()));
+			return base->getComplexity();
+		}
+	}
+
+	float value = m_complexity.getValue();
+	char delta = m_complexity.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getComplexity();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::getComplexity
+
+float ServerObjectTemplate::getComplexityMin(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getComplexityMin(true);
+#endif
+	}
+
+	if (!m_complexity.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter complexity in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter complexity has not been defined in template %s!", DataResource::getName()));
+			return base->getComplexityMin();
+		}
+	}
+
+	float value = m_complexity.getMinValue();
+	char delta = m_complexity.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getComplexityMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::getComplexityMin
+
+float ServerObjectTemplate::getComplexityMax(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getComplexityMax(true);
+#endif
+	}
+
+	if (!m_complexity.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter complexity in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter complexity has not been defined in template %s!", DataResource::getName()));
+			return base->getComplexityMax();
+		}
+	}
+
+	float value = m_complexity.getMaxValue();
+	char delta = m_complexity.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getComplexityMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::getComplexityMax
+
+int ServerObjectTemplate::getTintIndex(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getTintIndex(true);
+#endif
+	}
+
+	if (!m_tintIndex.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter tintIndex in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter tintIndex has not been defined in template %s!", DataResource::getName()));
+			return base->getTintIndex();
+		}
+	}
+
+	int value = m_tintIndex.getValue();
+	char delta = m_tintIndex.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getTintIndex();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::getTintIndex
+
+int ServerObjectTemplate::getTintIndexMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getTintIndexMin(true);
+#endif
+	}
+
+	if (!m_tintIndex.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter tintIndex in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter tintIndex has not been defined in template %s!", DataResource::getName()));
+			return base->getTintIndexMin();
+		}
+	}
+
+	int value = m_tintIndex.getMinValue();
+	char delta = m_tintIndex.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getTintIndexMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::getTintIndexMin
+
+int ServerObjectTemplate::getTintIndexMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getTintIndexMax(true);
+#endif
+	}
+
+	if (!m_tintIndex.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter tintIndex in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter tintIndex has not been defined in template %s!", DataResource::getName()));
+			return base->getTintIndexMax();
+		}
+	}
+
+	int value = m_tintIndex.getMaxValue();
+	char delta = m_tintIndex.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getTintIndexMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::getTintIndexMax
+
+float ServerObjectTemplate::getUpdateRanges(UpdateRanges index) const
+{
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 3, ("template param index out of range"));
+	if (!m_updateRanges[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter updateRanges in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter updateRanges has not been defined in template %s!", DataResource::getName()));
+			return base->getUpdateRanges(index);
+		}
+	}
+
+	float value = m_updateRanges[index].getValue();
+	char delta = m_updateRanges[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getUpdateRanges(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerObjectTemplate::getUpdateRanges
+
+float ServerObjectTemplate::getUpdateRangesMin(UpdateRanges index) const
+{
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 3, ("template param index out of range"));
+	if (!m_updateRanges[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter updateRanges in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter updateRanges has not been defined in template %s!", DataResource::getName()));
+			return base->getUpdateRangesMin(index);
+		}
+	}
+
+	float value = m_updateRanges[index].getMinValue();
+	char delta = m_updateRanges[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getUpdateRangesMin(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerObjectTemplate::getUpdateRangesMin
+
+float ServerObjectTemplate::getUpdateRangesMax(UpdateRanges index) const
+{
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+	}
+
+	DEBUG_FATAL(index < 0 || index >= 3, ("template param index out of range"));
+	if (!m_updateRanges[index].isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter updateRanges in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter updateRanges has not been defined in template %s!", DataResource::getName()));
+			return base->getUpdateRangesMax(index);
+		}
+	}
+
+	float value = m_updateRanges[index].getMaxValue();
+	char delta = m_updateRanges[index].getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getUpdateRangesMax(index);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+	return value;
+}	// ServerObjectTemplate::getUpdateRangesMax
+
+void ServerObjectTemplate::getContents(Contents &data, int index) const
+{
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_contentsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter contents in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter contents has not been defined in template %s!", DataResource::getName()));
+			base->getContents(data, index);
+			return;
+		}
+	}
+
+	if (m_contentsAppend && base != NULL)
+	{
+		int baseCount = base->getContentsCount();
+		if (index < baseCount)
+			{
+				base->getContents(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_contents.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_contents[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _Contents *param = dynamic_cast<const _Contents *>(structTemplate);
+	NOT_NULL(param);
+	data.slotName = param->getSlotName(m_versionOk);
+	data.equipObject = param->getEquipObject(m_versionOk);
+	data.content = param->getContent(m_versionOk);
+}	// ServerObjectTemplate::getContents
+
+void ServerObjectTemplate::getContentsMin(Contents &data, int index) const
+{
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_contentsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter contents in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter contents has not been defined in template %s!", DataResource::getName()));
+			base->getContentsMin(data, index);
+			return;
+		}
+	}
+
+	if (m_contentsAppend && base != NULL)
+	{
+		int baseCount = base->getContentsCount();
+		if (index < baseCount)
+			{
+				base->getContentsMin(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_contents.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_contents[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _Contents *param = dynamic_cast<const _Contents *>(structTemplate);
+	NOT_NULL(param);
+	data.slotName = param->getSlotName(m_versionOk);
+	data.equipObject = param->getEquipObject(m_versionOk);
+	data.content = param->getContent(m_versionOk);
+}	// ServerObjectTemplate::getContentsMin
+
+void ServerObjectTemplate::getContentsMax(Contents &data, int index) const
+{
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_contentsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter contents in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter contents has not been defined in template %s!", DataResource::getName()));
+			base->getContentsMax(data, index);
+			return;
+		}
+	}
+
+	if (m_contentsAppend && base != NULL)
+	{
+		int baseCount = base->getContentsCount();
+		if (index < baseCount)
+			{
+				base->getContentsMax(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_contents.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_contents[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _Contents *param = dynamic_cast<const _Contents *>(structTemplate);
+	NOT_NULL(param);
+	data.slotName = param->getSlotName(m_versionOk);
+	data.equipObject = param->getEquipObject(m_versionOk);
+	data.content = param->getContent(m_versionOk);
+}	// ServerObjectTemplate::getContentsMax
+
+size_t ServerObjectTemplate::getContentsCount(void) const
+{
+	if (!m_contentsLoaded)
+	{
+		if (m_baseData == NULL)
+			return 0;
+		const ServerObjectTemplate * base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+		DEBUG_FATAL(base == NULL, ("base template wrong type"));
+		return base->getContentsCount();
+	}
+
+	size_t count = m_contents.size();
+
+	// if we are extending our base template, add it's count
+	if (m_contentsAppend && m_baseData != NULL)
+	{
+		const ServerObjectTemplate * base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+		if (base != NULL)
+			count += base->getContentsCount();
+	}
+
+	return count;
+}	// ServerObjectTemplate::getContentsCount
+
+void ServerObjectTemplate::getXpPoints(Xp &data, int index) const
+{
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_xpPointsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter xpPoints in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter xpPoints has not been defined in template %s!", DataResource::getName()));
+			base->getXpPoints(data, index);
+			return;
+		}
+	}
+
+	if (m_xpPointsAppend && base != NULL)
+	{
+		int baseCount = base->getXpPointsCount();
+		if (index < baseCount)
+			{
+				base->getXpPoints(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_xpPoints.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_xpPoints[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _Xp *param = dynamic_cast<const _Xp *>(structTemplate);
+	NOT_NULL(param);
+	data.type = param->getType(m_versionOk);
+	data.level = param->getLevel(m_versionOk);
+	data.value = param->getValue(m_versionOk);
+}	// ServerObjectTemplate::getXpPoints
+
+void ServerObjectTemplate::getXpPointsMin(Xp &data, int index) const
+{
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_xpPointsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter xpPoints in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter xpPoints has not been defined in template %s!", DataResource::getName()));
+			base->getXpPointsMin(data, index);
+			return;
+		}
+	}
+
+	if (m_xpPointsAppend && base != NULL)
+	{
+		int baseCount = base->getXpPointsCount();
+		if (index < baseCount)
+			{
+				base->getXpPointsMin(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_xpPoints.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_xpPoints[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _Xp *param = dynamic_cast<const _Xp *>(structTemplate);
+	NOT_NULL(param);
+	data.type = param->getType(m_versionOk);
+	data.level = param->getLevelMin(m_versionOk);
+	data.value = param->getValueMin(m_versionOk);
+}	// ServerObjectTemplate::getXpPointsMin
+
+void ServerObjectTemplate::getXpPointsMax(Xp &data, int index) const
+{
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_xpPointsLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter xpPoints in template %s", DataResource::getName()));
+			return ;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter xpPoints has not been defined in template %s!", DataResource::getName()));
+			base->getXpPointsMax(data, index);
+			return;
+		}
+	}
+
+	if (m_xpPointsAppend && base != NULL)
+	{
+		int baseCount = base->getXpPointsCount();
+		if (index < baseCount)
+			{
+				base->getXpPointsMax(data, index);
+				return;
+			}
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_xpPoints.size(), ("template param index out of range"));
+	const ObjectTemplate * structTemplate = (*m_xpPoints[index]).getValue();
+	NOT_NULL(structTemplate);
+	const _Xp *param = dynamic_cast<const _Xp *>(structTemplate);
+	NOT_NULL(param);
+	data.type = param->getType(m_versionOk);
+	data.level = param->getLevelMax(m_versionOk);
+	data.value = param->getValueMax(m_versionOk);
+}	// ServerObjectTemplate::getXpPointsMax
+
+size_t ServerObjectTemplate::getXpPointsCount(void) const
+{
+	if (!m_xpPointsLoaded)
+	{
+		if (m_baseData == NULL)
+			return 0;
+		const ServerObjectTemplate * base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+		DEBUG_FATAL(base == NULL, ("base template wrong type"));
+		return base->getXpPointsCount();
+	}
+
+	size_t count = m_xpPoints.size();
+
+	// if we are extending our base template, add it's count
+	if (m_xpPointsAppend && m_baseData != NULL)
+	{
+		const ServerObjectTemplate * base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+		if (base != NULL)
+			count += base->getXpPointsCount();
+	}
+
+	return count;
+}	// ServerObjectTemplate::getXpPointsCount
+
+bool ServerObjectTemplate::getPersistByDefault(bool testData) const
+{
+#ifdef _DEBUG
+bool testDataValue = false;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getPersistByDefault(true);
+#endif
+	}
+
+	if (!m_persistByDefault.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter persistByDefault in template %s", DataResource::getName()));
+			return false;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter persistByDefault has not been defined in template %s!", DataResource::getName()));
+			return base->getPersistByDefault();
+		}
+	}
+
+	bool value = m_persistByDefault.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::getPersistByDefault
+
+bool ServerObjectTemplate::getPersistContents(bool testData) const
+{
+#ifdef _DEBUG
+bool testDataValue = false;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getPersistContents(true);
+#endif
+	}
+
+	if (!m_persistContents.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter persistContents in template %s", DataResource::getName()));
+			return false;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter persistContents has not been defined in template %s!", DataResource::getName()));
+			return base->getPersistContents();
+		}
+	}
+
+	bool value = m_persistContents.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::getPersistContents
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerObjectTemplate::testValues(void) const
+{
+	IGNORE_RETURN(getSharedTemplate(true));
+	IGNORE_RETURN(getVolumeMin(true));
+	IGNORE_RETURN(getVolumeMax(true));
+	IGNORE_RETURN(getInvulnerable(true));
+	IGNORE_RETURN(getComplexityMin(true));
+	IGNORE_RETURN(getComplexityMax(true));
+	IGNORE_RETURN(getTintIndexMin(true));
+	IGNORE_RETURN(getTintIndexMax(true));
+	IGNORE_RETURN(getPersistByDefault(true));
+	IGNORE_RETURN(getPersistContents(true));
+}	// ServerObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerObjectTemplate_tag)
+	{
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,1,1))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "sharedTemplate") == 0)
+			m_sharedTemplate.loadFromIff(file);
+		else if (strcmp(paramName, "scripts") == 0)
+		{
+			std::vector<StringParam *>::iterator iter;
+			for (iter = m_scripts.begin(); iter != m_scripts.end(); ++iter)
+			{
+				delete *iter;
+				*iter = NULL;
+			}
+			m_scripts.clear();
+			m_scriptsAppend = file.read_bool8();
+			int listCount = file.read_int32();
+			for (int j = 0; j < listCount; ++j)
+			{
+				StringParam * newData = new StringParam;
+				newData->loadFromIff(file);
+				m_scripts.push_back(newData);
+			}
+			m_scriptsLoaded = true;
+		}
+		else if (strcmp(paramName, "objvars") == 0)
+			m_objvars.loadFromIff(file);
+		else if (strcmp(paramName, "volume") == 0)
+			m_volume.loadFromIff(file);
+		else if (strcmp(paramName, "visibleFlags") == 0)
+		{
+			std::vector<IntegerParam *>::iterator iter;
+			for (iter = m_visibleFlags.begin(); iter != m_visibleFlags.end(); ++iter)
+			{
+				delete *iter;
+				*iter = NULL;
+			}
+			m_visibleFlags.clear();
+			m_visibleFlagsAppend = file.read_bool8();
+			int listCount = file.read_int32();
+			for (int j = 0; j < listCount; ++j)
+			{
+				IntegerParam * newData = new IntegerParam;
+				newData->loadFromIff(file);
+				m_visibleFlags.push_back(newData);
+			}
+			m_visibleFlagsLoaded = true;
+		}
+		else if (strcmp(paramName, "deleteFlags") == 0)
+		{
+			std::vector<IntegerParam *>::iterator iter;
+			for (iter = m_deleteFlags.begin(); iter != m_deleteFlags.end(); ++iter)
+			{
+				delete *iter;
+				*iter = NULL;
+			}
+			m_deleteFlags.clear();
+			m_deleteFlagsAppend = file.read_bool8();
+			int listCount = file.read_int32();
+			for (int j = 0; j < listCount; ++j)
+			{
+				IntegerParam * newData = new IntegerParam;
+				newData->loadFromIff(file);
+				m_deleteFlags.push_back(newData);
+			}
+			m_deleteFlagsLoaded = true;
+		}
+		else if (strcmp(paramName, "moveFlags") == 0)
+		{
+			std::vector<IntegerParam *>::iterator iter;
+			for (iter = m_moveFlags.begin(); iter != m_moveFlags.end(); ++iter)
+			{
+				delete *iter;
+				*iter = NULL;
+			}
+			m_moveFlags.clear();
+			m_moveFlagsAppend = file.read_bool8();
+			int listCount = file.read_int32();
+			for (int j = 0; j < listCount; ++j)
+			{
+				IntegerParam * newData = new IntegerParam;
+				newData->loadFromIff(file);
+				m_moveFlags.push_back(newData);
+			}
+			m_moveFlagsLoaded = true;
+		}
+		else if (strcmp(paramName, "invulnerable") == 0)
+			m_invulnerable.loadFromIff(file);
+		else if (strcmp(paramName, "complexity") == 0)
+			m_complexity.loadFromIff(file);
+		else if (strcmp(paramName, "tintIndex") == 0)
+			m_tintIndex.loadFromIff(file);
+		else if (strcmp(paramName, "updateRanges") == 0)
+		{
+			int listCount = file.read_int32();
+			DEBUG_WARNING(listCount != 3, ("Template %s: read array size of %d for array \"updateRanges\" of size 3, reading values anyway", file.getFileName(), listCount));
+			int j;
+			for (j = 0; j < 3 && j < listCount; ++j)
+				m_updateRanges[j].loadFromIff(file);
+			// if there are more params for updateRanges read and dump them
+			for (; j < listCount; ++j)
+			{
+				FloatParam dummy;
+				dummy.loadFromIff(file);
+			}
+		}
+		else if (strcmp(paramName, "contents") == 0)
+		{
+			std::vector<StructParamOT *>::iterator iter;
+			for (iter = m_contents.begin(); iter != m_contents.end(); ++iter)
+			{
+				delete *iter;
+				*iter = NULL;
+			}
+			m_contents.clear();
+			m_contentsAppend = file.read_bool8();
+			int listCount = file.read_int32();
+			for (int j = 0; j < listCount; ++j)
+			{
+				StructParamOT * newData = new StructParamOT;
+				newData->loadFromIff(file);
+				m_contents.push_back(newData);
+			}
+			m_contentsLoaded = true;
+		}
+		else if (strcmp(paramName, "xpPoints") == 0)
+		{
+			std::vector<StructParamOT *>::iterator iter;
+			for (iter = m_xpPoints.begin(); iter != m_xpPoints.end(); ++iter)
+			{
+				delete *iter;
+				*iter = NULL;
+			}
+			m_xpPoints.clear();
+			m_xpPointsAppend = file.read_bool8();
+			int listCount = file.read_int32();
+			for (int j = 0; j < listCount; ++j)
+			{
+				StructParamOT * newData = new StructParamOT;
+				newData->loadFromIff(file);
+				m_xpPoints.push_back(newData);
+			}
+			m_xpPointsLoaded = true;
+		}
+		else if (strcmp(paramName, "persistByDefault") == 0)
+			m_persistByDefault.loadFromIff(file);
+		else if (strcmp(paramName, "persistContents") == 0)
+			m_persistContents.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	return;
+}	// ServerObjectTemplate::load
+
+
+//=============================================================================
+// class ServerObjectTemplate::_AttribMod
+
+/**
+ * Class constructor.
+ */
+ServerObjectTemplate::_AttribMod::_AttribMod(const std::string & filename)
+	: ObjectTemplate(filename)
+{
+}	// ServerObjectTemplate::_AttribMod::_AttribMod
+
+/**
+ * Class destructor.
+ */
+ServerObjectTemplate::_AttribMod::~_AttribMod()
+{
+}	// ServerObjectTemplate::_AttribMod::~_AttribMod
+
+/**
+ * Static function used to register this template.
+ */
+void ServerObjectTemplate::_AttribMod::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(_AttribMod_tag, create);
+}	// ServerObjectTemplate::_AttribMod::registerMe
+
+/**
+ * Creates a ServerObjectTemplate::_AttribMod template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerObjectTemplate::_AttribMod::create(const std::string & filename)
+{
+	return new ServerObjectTemplate::_AttribMod(filename);
+}	// ServerObjectTemplate::_AttribMod::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerObjectTemplate::_AttribMod::getId(void) const
+{
+	return _AttribMod_tag;
+}	// ServerObjectTemplate::_AttribMod::getId
+
+ServerObjectTemplate::Attributes ServerObjectTemplate::_AttribMod::getTarget(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+ServerObjectTemplate::Attributes testDataValue = static_cast<ServerObjectTemplate::Attributes>(0);
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_AttribMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_AttribMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getTarget(true);
+#endif
+	}
+
+	if (!m_target.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter target in template %s", DataResource::getName()));
+			return static_cast<Attributes>(0);
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter target has not been defined in template %s!", DataResource::getName()));
+			return base->getTarget(versionOk);
+		}
+	}
+
+	Attributes value = static_cast<Attributes>(m_target.getValue());
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_AttribMod::getTarget
+
+int ServerObjectTemplate::_AttribMod::getValue(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_AttribMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_AttribMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getValue(true);
+#endif
+	}
+
+	if (!m_value.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName()));
+			return base->getValue(versionOk);
+		}
+	}
+
+	int value = m_value.getValue();
+	char delta = m_value.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getValue(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_AttribMod::getValue
+
+int ServerObjectTemplate::_AttribMod::getValueMin(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_AttribMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_AttribMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getValueMin(true);
+#endif
+	}
+
+	if (!m_value.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName()));
+			return base->getValueMin(versionOk);
+		}
+	}
+
+	int value = m_value.getMinValue();
+	char delta = m_value.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getValueMin(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_AttribMod::getValueMin
+
+int ServerObjectTemplate::_AttribMod::getValueMax(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_AttribMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_AttribMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getValueMax(true);
+#endif
+	}
+
+	if (!m_value.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName()));
+			return base->getValueMax(versionOk);
+		}
+	}
+
+	int value = m_value.getMaxValue();
+	char delta = m_value.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getValueMax(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_AttribMod::getValueMax
+
+float ServerObjectTemplate::_AttribMod::getTime(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_AttribMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_AttribMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getTime(true);
+#endif
+	}
+
+	if (!m_time.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter time in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter time has not been defined in template %s!", DataResource::getName()));
+			return base->getTime(versionOk);
+		}
+	}
+
+	float value = m_time.getValue();
+	char delta = m_time.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getTime(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_AttribMod::getTime
+
+float ServerObjectTemplate::_AttribMod::getTimeMin(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_AttribMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_AttribMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getTimeMin(true);
+#endif
+	}
+
+	if (!m_time.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter time in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter time has not been defined in template %s!", DataResource::getName()));
+			return base->getTimeMin(versionOk);
+		}
+	}
+
+	float value = m_time.getMinValue();
+	char delta = m_time.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getTimeMin(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_AttribMod::getTimeMin
+
+float ServerObjectTemplate::_AttribMod::getTimeMax(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_AttribMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_AttribMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getTimeMax(true);
+#endif
+	}
+
+	if (!m_time.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter time in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter time has not been defined in template %s!", DataResource::getName()));
+			return base->getTimeMax(versionOk);
+		}
+	}
+
+	float value = m_time.getMaxValue();
+	char delta = m_time.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getTimeMax(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_AttribMod::getTimeMax
+
+float ServerObjectTemplate::_AttribMod::getTimeAtValue(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_AttribMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_AttribMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getTimeAtValue(true);
+#endif
+	}
+
+	if (!m_timeAtValue.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter timeAtValue in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter timeAtValue has not been defined in template %s!", DataResource::getName()));
+			return base->getTimeAtValue(versionOk);
+		}
+	}
+
+	float value = m_timeAtValue.getValue();
+	char delta = m_timeAtValue.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getTimeAtValue(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_AttribMod::getTimeAtValue
+
+float ServerObjectTemplate::_AttribMod::getTimeAtValueMin(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_AttribMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_AttribMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getTimeAtValueMin(true);
+#endif
+	}
+
+	if (!m_timeAtValue.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter timeAtValue in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter timeAtValue has not been defined in template %s!", DataResource::getName()));
+			return base->getTimeAtValueMin(versionOk);
+		}
+	}
+
+	float value = m_timeAtValue.getMinValue();
+	char delta = m_timeAtValue.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getTimeAtValueMin(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_AttribMod::getTimeAtValueMin
+
+float ServerObjectTemplate::_AttribMod::getTimeAtValueMax(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_AttribMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_AttribMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getTimeAtValueMax(true);
+#endif
+	}
+
+	if (!m_timeAtValue.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter timeAtValue in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter timeAtValue has not been defined in template %s!", DataResource::getName()));
+			return base->getTimeAtValueMax(versionOk);
+		}
+	}
+
+	float value = m_timeAtValue.getMaxValue();
+	char delta = m_timeAtValue.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getTimeAtValueMax(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_AttribMod::getTimeAtValueMax
+
+float ServerObjectTemplate::_AttribMod::getDecay(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_AttribMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_AttribMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getDecay(true);
+#endif
+	}
+
+	if (!m_decay.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter decay in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter decay has not been defined in template %s!", DataResource::getName()));
+			return base->getDecay(versionOk);
+		}
+	}
+
+	float value = m_decay.getValue();
+	char delta = m_decay.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getDecay(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_AttribMod::getDecay
+
+float ServerObjectTemplate::_AttribMod::getDecayMin(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_AttribMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_AttribMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getDecayMin(true);
+#endif
+	}
+
+	if (!m_decay.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter decay in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter decay has not been defined in template %s!", DataResource::getName()));
+			return base->getDecayMin(versionOk);
+		}
+	}
+
+	float value = m_decay.getMinValue();
+	char delta = m_decay.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getDecayMin(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_AttribMod::getDecayMin
+
+float ServerObjectTemplate::_AttribMod::getDecayMax(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_AttribMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_AttribMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getDecayMax(true);
+#endif
+	}
+
+	if (!m_decay.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter decay in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter decay has not been defined in template %s!", DataResource::getName()));
+			return base->getDecayMax(versionOk);
+		}
+	}
+
+	float value = m_decay.getMaxValue();
+	char delta = m_decay.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getDecayMax(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_AttribMod::getDecayMax
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerObjectTemplate::_AttribMod::testValues(void) const
+{
+	IGNORE_RETURN(getTarget(true));
+	IGNORE_RETURN(getValueMin(true));
+	IGNORE_RETURN(getValueMax(true));
+	IGNORE_RETURN(getTimeMin(true));
+	IGNORE_RETURN(getTimeMax(true));
+	IGNORE_RETURN(getTimeAtValueMin(true));
+	IGNORE_RETURN(getTimeAtValueMax(true));
+	IGNORE_RETURN(getDecayMin(true));
+	IGNORE_RETURN(getDecayMax(true));
+}	// ServerObjectTemplate::_AttribMod::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerObjectTemplate::_AttribMod::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "target") == 0)
+			m_target.loadFromIff(file);
+		else if (strcmp(paramName, "value") == 0)
+			m_value.loadFromIff(file);
+		else if (strcmp(paramName, "time") == 0)
+			m_time.loadFromIff(file);
+		else if (strcmp(paramName, "timeAtValue") == 0)
+			m_timeAtValue.loadFromIff(file);
+		else if (strcmp(paramName, "decay") == 0)
+			m_decay.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	UNREF(file);
+}	// ServerObjectTemplate::_AttribMod::load
+
+
+//=============================================================================
+// struct ServerObjectTemplate::Contents
+
+/**
+ * Struct constructor.
+ */
+ServerObjectTemplate::Contents::Contents(void)
+{
+	content = NULL;
+}	// ServerObjectTemplate::Contents::Contents()
+
+/**
+ * Struct copy constructor.
+ */
+ServerObjectTemplate::Contents::Contents(const ServerObjectTemplate::Contents & source) :
+	slotName(source.slotName),
+	equipObject(source.equipObject),
+	content(source.content)
+{
+	if (content != NULL)
+		const_cast<ObjectTemplate *>(content)->addReference();
+}	// ServerObjectTemplate::Contents::Contents(const ServerObjectTemplate::Contents &)
+
+/**
+ * Struct destructor.
+ */
+ServerObjectTemplate::Contents::~Contents()
+{
+	if (content != NULL)
+	{
+		content->releaseReference();
+		content = NULL;
+	}
+}	// ServerObjectTemplate::Contents::~Contents
+
+#ifdef WIN32
+/**
+ * Struct destructor.
+ */
+ServerObjectTemplate::Contents & ServerObjectTemplate::Contents::operator =(const ServerObjectTemplate::Contents &)
+{
+	DEBUG_FATAL(true, ("operator = should not be called for template structures!"));
+	return *this;
+} // ServerObjectTemplate::Contents::operator =
+#endif
+
+
+//=============================================================================
+// class ServerObjectTemplate::_Contents
+
+/**
+ * Class constructor.
+ */
+ServerObjectTemplate::_Contents::_Contents(const std::string & filename)
+	: ObjectTemplate(filename)
+{
+}	// ServerObjectTemplate::_Contents::_Contents
+
+/**
+ * Class destructor.
+ */
+ServerObjectTemplate::_Contents::~_Contents()
+{
+}	// ServerObjectTemplate::_Contents::~_Contents
+
+/**
+ * Static function used to register this template.
+ */
+void ServerObjectTemplate::_Contents::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(_Contents_tag, create);
+}	// ServerObjectTemplate::_Contents::registerMe
+
+/**
+ * Creates a ServerObjectTemplate::_Contents template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerObjectTemplate::_Contents::create(const std::string & filename)
+{
+	return new ServerObjectTemplate::_Contents(filename);
+}	// ServerObjectTemplate::_Contents::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerObjectTemplate::_Contents::getId(void) const
+{
+	return _Contents_tag;
+}	// ServerObjectTemplate::_Contents::getId
+
+const std::string & ServerObjectTemplate::_Contents::getSlotName(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+std::string testDataValue = DefaultString;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_Contents * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_Contents *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getSlotName(true);
+#endif
+	}
+
+	if (!m_slotName.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter slotName in template %s", DataResource::getName()));
+			return DefaultString;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter slotName has not been defined in template %s!", DataResource::getName()));
+			return base->getSlotName(versionOk);
+		}
+	}
+
+	const std::string & value = m_slotName.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_Contents::getSlotName
+
+bool ServerObjectTemplate::_Contents::getEquipObject(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+bool testDataValue = false;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_Contents * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_Contents *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getEquipObject(true);
+#endif
+	}
+
+	if (!m_equipObject.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter equipObject in template %s", DataResource::getName()));
+			return false;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter equipObject has not been defined in template %s!", DataResource::getName()));
+			return base->getEquipObject(versionOk);
+		}
+	}
+
+	bool value = m_equipObject.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_Contents::getEquipObject
+
+const ServerObjectTemplate * ServerObjectTemplate::_Contents::getContent(bool versionOk) const
+{
+	const ServerObjectTemplate::_Contents * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_Contents *>(m_baseData);
+	}
+
+	if (!m_content.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter content in template %s", DataResource::getName()));
+			return NULL;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter content has not been defined in template %s!", DataResource::getName()));
+			return base->getContent(versionOk);
+		}
+	}
+
+	const ServerObjectTemplate * returnValue = NULL;
+	const std::string & templateName = m_content.getValue();
+	if (!templateName.empty())
+	{
+		returnValue = dynamic_cast<const ServerObjectTemplate *>(ObjectTemplateList::fetch(templateName));
+		if (returnValue == NULL)
+			WARNING_STRICT_FATAL(true, ("Error loading template %s",templateName.c_str()));
+	}
+	return returnValue;
+}	// ServerObjectTemplate::_Contents::getContent
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerObjectTemplate::_Contents::testValues(void) const
+{
+	IGNORE_RETURN(getSlotName(true));
+	IGNORE_RETURN(getEquipObject(true));
+}	// ServerObjectTemplate::_Contents::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerObjectTemplate::_Contents::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "slotName") == 0)
+			m_slotName.loadFromIff(file);
+		else if (strcmp(paramName, "equipObject") == 0)
+			m_equipObject.loadFromIff(file);
+		else if (strcmp(paramName, "content") == 0)
+			m_content.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	UNREF(file);
+}	// ServerObjectTemplate::_Contents::load
+
+
+//=============================================================================
+// class ServerObjectTemplate::_MentalStateMod
+
+/**
+ * Class constructor.
+ */
+ServerObjectTemplate::_MentalStateMod::_MentalStateMod(const std::string & filename)
+	: ObjectTemplate(filename)
+{
+}	// ServerObjectTemplate::_MentalStateMod::_MentalStateMod
+
+/**
+ * Class destructor.
+ */
+ServerObjectTemplate::_MentalStateMod::~_MentalStateMod()
+{
+}	// ServerObjectTemplate::_MentalStateMod::~_MentalStateMod
+
+/**
+ * Static function used to register this template.
+ */
+void ServerObjectTemplate::_MentalStateMod::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(_MentalStateMod_tag, create);
+}	// ServerObjectTemplate::_MentalStateMod::registerMe
+
+/**
+ * Creates a ServerObjectTemplate::_MentalStateMod template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerObjectTemplate::_MentalStateMod::create(const std::string & filename)
+{
+	return new ServerObjectTemplate::_MentalStateMod(filename);
+}	// ServerObjectTemplate::_MentalStateMod::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerObjectTemplate::_MentalStateMod::getId(void) const
+{
+	return _MentalStateMod_tag;
+}	// ServerObjectTemplate::_MentalStateMod::getId
+
+ServerObjectTemplate::MentalStates ServerObjectTemplate::_MentalStateMod::getTarget(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+ServerObjectTemplate::MentalStates testDataValue = static_cast<ServerObjectTemplate::MentalStates>(0);
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_MentalStateMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_MentalStateMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getTarget(true);
+#endif
+	}
+
+	if (!m_target.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter target in template %s", DataResource::getName()));
+			return static_cast<MentalStates>(0);
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter target has not been defined in template %s!", DataResource::getName()));
+			return base->getTarget(versionOk);
+		}
+	}
+
+	MentalStates value = static_cast<MentalStates>(m_target.getValue());
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_MentalStateMod::getTarget
+
+float ServerObjectTemplate::_MentalStateMod::getValue(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_MentalStateMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_MentalStateMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getValue(true);
+#endif
+	}
+
+	if (!m_value.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName()));
+			return base->getValue(versionOk);
+		}
+	}
+
+	float value = m_value.getValue();
+	char delta = m_value.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getValue(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_MentalStateMod::getValue
+
+float ServerObjectTemplate::_MentalStateMod::getValueMin(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_MentalStateMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_MentalStateMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getValueMin(true);
+#endif
+	}
+
+	if (!m_value.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName()));
+			return base->getValueMin(versionOk);
+		}
+	}
+
+	float value = m_value.getMinValue();
+	char delta = m_value.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getValueMin(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_MentalStateMod::getValueMin
+
+float ServerObjectTemplate::_MentalStateMod::getValueMax(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_MentalStateMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_MentalStateMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getValueMax(true);
+#endif
+	}
+
+	if (!m_value.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName()));
+			return base->getValueMax(versionOk);
+		}
+	}
+
+	float value = m_value.getMaxValue();
+	char delta = m_value.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getValueMax(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_MentalStateMod::getValueMax
+
+float ServerObjectTemplate::_MentalStateMod::getTime(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_MentalStateMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_MentalStateMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getTime(true);
+#endif
+	}
+
+	if (!m_time.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter time in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter time has not been defined in template %s!", DataResource::getName()));
+			return base->getTime(versionOk);
+		}
+	}
+
+	float value = m_time.getValue();
+	char delta = m_time.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getTime(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_MentalStateMod::getTime
+
+float ServerObjectTemplate::_MentalStateMod::getTimeMin(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_MentalStateMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_MentalStateMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getTimeMin(true);
+#endif
+	}
+
+	if (!m_time.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter time in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter time has not been defined in template %s!", DataResource::getName()));
+			return base->getTimeMin(versionOk);
+		}
+	}
+
+	float value = m_time.getMinValue();
+	char delta = m_time.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getTimeMin(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_MentalStateMod::getTimeMin
+
+float ServerObjectTemplate::_MentalStateMod::getTimeMax(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_MentalStateMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_MentalStateMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getTimeMax(true);
+#endif
+	}
+
+	if (!m_time.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter time in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter time has not been defined in template %s!", DataResource::getName()));
+			return base->getTimeMax(versionOk);
+		}
+	}
+
+	float value = m_time.getMaxValue();
+	char delta = m_time.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getTimeMax(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_MentalStateMod::getTimeMax
+
+float ServerObjectTemplate::_MentalStateMod::getTimeAtValue(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_MentalStateMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_MentalStateMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getTimeAtValue(true);
+#endif
+	}
+
+	if (!m_timeAtValue.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter timeAtValue in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter timeAtValue has not been defined in template %s!", DataResource::getName()));
+			return base->getTimeAtValue(versionOk);
+		}
+	}
+
+	float value = m_timeAtValue.getValue();
+	char delta = m_timeAtValue.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getTimeAtValue(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_MentalStateMod::getTimeAtValue
+
+float ServerObjectTemplate::_MentalStateMod::getTimeAtValueMin(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_MentalStateMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_MentalStateMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getTimeAtValueMin(true);
+#endif
+	}
+
+	if (!m_timeAtValue.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter timeAtValue in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter timeAtValue has not been defined in template %s!", DataResource::getName()));
+			return base->getTimeAtValueMin(versionOk);
+		}
+	}
+
+	float value = m_timeAtValue.getMinValue();
+	char delta = m_timeAtValue.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getTimeAtValueMin(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_MentalStateMod::getTimeAtValueMin
+
+float ServerObjectTemplate::_MentalStateMod::getTimeAtValueMax(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_MentalStateMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_MentalStateMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getTimeAtValueMax(true);
+#endif
+	}
+
+	if (!m_timeAtValue.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter timeAtValue in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter timeAtValue has not been defined in template %s!", DataResource::getName()));
+			return base->getTimeAtValueMax(versionOk);
+		}
+	}
+
+	float value = m_timeAtValue.getMaxValue();
+	char delta = m_timeAtValue.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getTimeAtValueMax(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_MentalStateMod::getTimeAtValueMax
+
+float ServerObjectTemplate::_MentalStateMod::getDecay(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_MentalStateMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_MentalStateMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getDecay(true);
+#endif
+	}
+
+	if (!m_decay.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter decay in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter decay has not been defined in template %s!", DataResource::getName()));
+			return base->getDecay(versionOk);
+		}
+	}
+
+	float value = m_decay.getValue();
+	char delta = m_decay.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getDecay(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_MentalStateMod::getDecay
+
+float ServerObjectTemplate::_MentalStateMod::getDecayMin(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_MentalStateMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_MentalStateMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getDecayMin(true);
+#endif
+	}
+
+	if (!m_decay.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter decay in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter decay has not been defined in template %s!", DataResource::getName()));
+			return base->getDecayMin(versionOk);
+		}
+	}
+
+	float value = m_decay.getMinValue();
+	char delta = m_decay.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getDecayMin(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_MentalStateMod::getDecayMin
+
+float ServerObjectTemplate::_MentalStateMod::getDecayMax(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_MentalStateMod * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_MentalStateMod *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getDecayMax(true);
+#endif
+	}
+
+	if (!m_decay.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter decay in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter decay has not been defined in template %s!", DataResource::getName()));
+			return base->getDecayMax(versionOk);
+		}
+	}
+
+	float value = m_decay.getMaxValue();
+	char delta = m_decay.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getDecayMax(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_MentalStateMod::getDecayMax
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerObjectTemplate::_MentalStateMod::testValues(void) const
+{
+	IGNORE_RETURN(getTarget(true));
+	IGNORE_RETURN(getValueMin(true));
+	IGNORE_RETURN(getValueMax(true));
+	IGNORE_RETURN(getTimeMin(true));
+	IGNORE_RETURN(getTimeMax(true));
+	IGNORE_RETURN(getTimeAtValueMin(true));
+	IGNORE_RETURN(getTimeAtValueMax(true));
+	IGNORE_RETURN(getDecayMin(true));
+	IGNORE_RETURN(getDecayMax(true));
+}	// ServerObjectTemplate::_MentalStateMod::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerObjectTemplate::_MentalStateMod::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "target") == 0)
+			m_target.loadFromIff(file);
+		else if (strcmp(paramName, "value") == 0)
+			m_value.loadFromIff(file);
+		else if (strcmp(paramName, "time") == 0)
+			m_time.loadFromIff(file);
+		else if (strcmp(paramName, "timeAtValue") == 0)
+			m_timeAtValue.loadFromIff(file);
+		else if (strcmp(paramName, "decay") == 0)
+			m_decay.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	UNREF(file);
+}	// ServerObjectTemplate::_MentalStateMod::load
+
+
+//=============================================================================
+// class ServerObjectTemplate::_Xp
+
+/**
+ * Class constructor.
+ */
+ServerObjectTemplate::_Xp::_Xp(const std::string & filename)
+	: ObjectTemplate(filename)
+{
+}	// ServerObjectTemplate::_Xp::_Xp
+
+/**
+ * Class destructor.
+ */
+ServerObjectTemplate::_Xp::~_Xp()
+{
+}	// ServerObjectTemplate::_Xp::~_Xp
+
+/**
+ * Static function used to register this template.
+ */
+void ServerObjectTemplate::_Xp::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(_Xp_tag, create);
+}	// ServerObjectTemplate::_Xp::registerMe
+
+/**
+ * Creates a ServerObjectTemplate::_Xp template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerObjectTemplate::_Xp::create(const std::string & filename)
+{
+	return new ServerObjectTemplate::_Xp(filename);
+}	// ServerObjectTemplate::_Xp::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerObjectTemplate::_Xp::getId(void) const
+{
+	return _Xp_tag;
+}	// ServerObjectTemplate::_Xp::getId
+
+ServerObjectTemplate::XpTypes ServerObjectTemplate::_Xp::getType(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+ServerObjectTemplate::XpTypes testDataValue = static_cast<ServerObjectTemplate::XpTypes>(0);
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_Xp * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_Xp *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getType(true);
+#endif
+	}
+
+	if (!m_type.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter type in template %s", DataResource::getName()));
+			return static_cast<XpTypes>(0);
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter type has not been defined in template %s!", DataResource::getName()));
+			return base->getType(versionOk);
+		}
+	}
+
+	XpTypes value = static_cast<XpTypes>(m_type.getValue());
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_Xp::getType
+
+int ServerObjectTemplate::_Xp::getLevel(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_Xp * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_Xp *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getLevel(true);
+#endif
+	}
+
+	if (!m_level.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter level in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter level has not been defined in template %s!", DataResource::getName()));
+			return base->getLevel(versionOk);
+		}
+	}
+
+	int value = m_level.getValue();
+	char delta = m_level.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getLevel(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_Xp::getLevel
+
+int ServerObjectTemplate::_Xp::getLevelMin(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_Xp * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_Xp *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getLevelMin(true);
+#endif
+	}
+
+	if (!m_level.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter level in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter level has not been defined in template %s!", DataResource::getName()));
+			return base->getLevelMin(versionOk);
+		}
+	}
+
+	int value = m_level.getMinValue();
+	char delta = m_level.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getLevelMin(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_Xp::getLevelMin
+
+int ServerObjectTemplate::_Xp::getLevelMax(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_Xp * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_Xp *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getLevelMax(true);
+#endif
+	}
+
+	if (!m_level.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter level in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter level has not been defined in template %s!", DataResource::getName()));
+			return base->getLevelMax(versionOk);
+		}
+	}
+
+	int value = m_level.getMaxValue();
+	char delta = m_level.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getLevelMax(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_Xp::getLevelMax
+
+int ServerObjectTemplate::_Xp::getValue(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_Xp * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_Xp *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getValue(true);
+#endif
+	}
+
+	if (!m_value.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName()));
+			return base->getValue(versionOk);
+		}
+	}
+
+	int value = m_value.getValue();
+	char delta = m_value.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getValue(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_Xp::getValue
+
+int ServerObjectTemplate::_Xp::getValueMin(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_Xp * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_Xp *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getValueMin(true);
+#endif
+	}
+
+	if (!m_value.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName()));
+			return base->getValueMin(versionOk);
+		}
+	}
+
+	int value = m_value.getMinValue();
+	char delta = m_value.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getValueMin(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_Xp::getValueMin
+
+int ServerObjectTemplate::_Xp::getValueMax(bool versionOk, bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerObjectTemplate::_Xp * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerObjectTemplate::_Xp *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getValueMax(true);
+#endif
+	}
+
+	if (!m_value.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter value in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter value has not been defined in template %s!", DataResource::getName()));
+			return base->getValueMax(versionOk);
+		}
+	}
+
+	int value = m_value.getMaxValue();
+	char delta = m_value.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getValueMax(versionOk);
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerObjectTemplate::_Xp::getValueMax
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerObjectTemplate::_Xp::testValues(void) const
+{
+	IGNORE_RETURN(getType(true));
+	IGNORE_RETURN(getLevelMin(true));
+	IGNORE_RETURN(getLevelMax(true));
+	IGNORE_RETURN(getValueMin(true));
+	IGNORE_RETURN(getValueMax(true));
+}	// ServerObjectTemplate::_Xp::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerObjectTemplate::_Xp::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "type") == 0)
+			m_type.loadFromIff(file);
+		else if (strcmp(paramName, "level") == 0)
+			m_level.loadFromIff(file);
+		else if (strcmp(paramName, "value") == 0)
+			m_value.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	UNREF(file);
+}	// ServerObjectTemplate::_Xp::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.h
new file mode 100644
index 00000000..774c30f6
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.h
@@ -0,0 +1,615 @@
+//========================================================================
+//
+// ServerObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerObjectTemplate_H
+#define _INCLUDED_ServerObjectTemplate_H
+
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+class ServerObjectTemplate;
+//@END TFD TEMPLATE REFS
+
+
+class ServerObjectTemplate : public ObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerObjectTemplate_tag = TAG(S,W,O,O)
+	};
+//@END TFD ID
+
+public:
+	         ServerObjectTemplate(const std::string & filename);
+	virtual ~ServerObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+	static void exit();
+
+//@BEGIN TFD
+public:
+	enum ArmorCategory
+	{
+		AC_reconnaissance,
+		AC_battle,
+		AC_assault,
+		AC_psg,		// // personal shield generator
+		ArmorCategory_Last = AC_psg,
+	};
+
+	enum ArmorLevel
+	{
+		AL_basic,
+		AL_standard,
+		AL_advanced,
+		ArmorLevel_Last = AL_advanced,
+	};
+
+	enum ArmorRating
+	{
+		AR_armorNone,
+		AR_armorLight,
+		AR_armorMedium,
+		AR_armorHeavy,
+		ArmorRating_Last = AR_armorHeavy,
+	};
+
+	enum Attributes
+	{
+		AT_health,
+		AT_constitution,
+		AT_action,
+		AT_stamina,
+		AT_mind,
+		AT_willpower,
+		Attributes_Last = AT_willpower,
+	};
+
+	enum CraftingType
+	{
+		CT_weapon = 0x00000001,
+		CT_armor = 0x00000002,
+		CT_food = 0x00000004,
+		CT_clothing = 0x00000008,
+		CT_vehicle = 0x00000010,
+		CT_droid = 0x00000020,
+		CT_chemical = 0x00000040,
+		CT_plantBreeding = 0x00000080,
+		CT_animalBreeding = 0x00000100,
+		CT_furniture = 0x00000200,
+		CT_installation = 0x00000400,
+		CT_lightsaber = 0x00000800,
+		CT_genericItem = 0x00001000,
+		CT_genetics = 0x00002000,
+		CT_mandalorianTailor = 0x00004000,
+		CT_mandalorianArmorsmith = 0x00008000,
+		CT_mandalorianDroidEngineer = 0x00010000,
+		CT_space = 0x00020000,
+		CT_reverseEngineering = 0x00040000,
+		CT_misc = 0x00080000,
+		CT_spaceComponent = 0x00100000,
+		CT_mission = 0x80000000,
+		CT_weaponMission = 0x80000001,
+		CT_armorMission = 0x80000002,
+		CT_foodMission = 0x80000004,
+		CT_clothingMission = 0x80000008,
+		CT_vehicleMission = 0x80000010,
+		CT_droidMission = 0x80000020,
+		CT_chemicalMission = 0x80000040,
+		CT_plantBreedingMission = 0x80000080,
+		CT_animalBreedingMission = 0x80000100,
+		CT_furnitureMission = 0x80000200,
+		CT_installationMission = 0x80000400,
+		CT_lightsaberMission = 0x80000800,
+		CT_genericItemMission = 0x80001000,
+		CT_geneticsMission = 0x80002000,
+		CT_mandalorianTailorMission = 0x80004000,
+		CT_mandalorianArmorsmithMission = 0x80008000,
+		CT_mandalorianDroidEngineerMission = 0x80010000,
+		CT_spaceMission = 0x80020000,
+		CT_reverseEngineeringMission = 0x80040000,
+		CT_miscMission = 0x80080000,
+		CT_spaceComponentMission = 0x80100000,
+		CraftingType_Last = CT_spaceComponentMission,
+	};
+
+	enum DamageType
+	{
+		DT_none = 0x00000000,
+		DT_kinetic = 0x00000001,
+		DT_energy = 0x00000002,
+		DT_blast = 0x00000004,
+		DT_stun = 0x00000008,
+		DT_restraint = 0x00000010,
+		DT_elemental_heat = 0x00000020,
+		DT_elemental_cold = 0x00000040,
+		DT_elemental_acid = 0x00000080,
+		DT_elemental_electrical = 0x00000100,
+		DT_environmental_heat = 0x00000200,
+		DT_environmental_cold = 0x00000400,
+		DT_environmental_acid = 0x00000800,
+		DT_environmental_electrical = 0x00001000,
+		DamageType_Last = DT_environmental_electrical,
+	};
+
+	enum DeleteFlags
+	{
+		DF_gm,
+		DF_player,
+		DeleteFlags_Last = DF_player,
+	};
+
+	enum MentalStates
+	{
+		MS_fear,
+		MS_anger,
+		MS_interest,
+		MS_distress,
+		MentalStates_Last = MS_distress,
+	};
+
+	enum MoveFlags
+	{
+		MF_gm,
+		MF_player,
+		MoveFlags_Last = MF_player,
+	};
+
+	enum UpdateRanges
+	{
+		UR_near,
+		UR_normal,
+		UR_far,
+		UpdateRanges_Last = UR_far,
+	};
+
+	enum VisibleFlags
+	{
+		VF_gm,
+		VF_player,
+		VisibleFlags_Last = VF_player,
+	};
+
+	enum XpTypes
+	{
+		XP_rangedCombat,
+		XP_meleeCombat,
+		XP_tamingNoTime,
+		XP_tamingShortTime,
+		XP_tamingMediumTime,
+		XP_tamingLargeTime,
+		XP_architect,
+		XP_botany,
+		XP_bountyHunter,
+		XP_chemist,
+		XP_dancing,
+		XP_facilityManagementSavings,
+		XP_facilityManagementWearAndTear,
+		XP_squadLeaderNoTime,
+		XP_squadLeaderSmallTime,
+		XP_squadLeaderMediumTime,
+		XP_squadLeaderLargeTime,
+		XP_hairdressing,
+		XP_holonetSlicingPopularity,
+		XP_holonetSlicingQuantity,
+		XP_investigation,
+		XP_medic,
+		XP_military,
+		XP_mining,
+		XP_miningSavings,
+		XP_musician,
+		XP_musicanPopularity,
+		XP_politics,
+		XP_slicing,
+		XP_smuggling,
+		XP_surveyingNoMinimum,
+		XP_surveyingLowMinimum,
+		XP_surveyingMediumMinimum,
+		XP_surveyingHighMinimum,
+		XP_survivalHealing,
+		XP_survivalTracking,
+		XP_vehicularControl,
+		XP_vehicularWearAndTear,
+		XP_resourceHarvestingOrganic,
+		XP_resourceHarvestingInorganic,
+		XP_crafting,
+		XP_craftingClothing,
+		XP_craftingClothingArmor,
+		XP_craftingDroid,
+		XP_craftingFood,
+		XP_craftingMedicine,
+		XP_craftingStructure,
+		XP_craftingWeapons,
+		XP_craftingWeaponsMelee,
+		XP_craftingWeaponsRanged,
+		XP_craftingWeaponsMunition,
+		XP_industrialist,
+		XP_craftingScout,
+		XP_craftingCreature,
+		XP_craftingTissue,
+		XP_craftingCamp,
+		XP_craftingTrapping,
+		XP_craftingSpice,
+		XP_jediGeneral,
+		XP_shipwright,
+		XP_reverseEngineering,
+		XpTypes_Last = XP_reverseEngineering,
+	};
+
+public:
+	struct AttribMod
+	{
+		enum Attributes target;
+		int                    value;
+		float                  time;
+		float                  timeAtValue;
+		float                  decay;
+	};
+
+	struct MentalStateMod
+	{
+		enum MentalStates target;
+		float                  value;
+		float                  time;
+		float                  timeAtValue;
+		float                  decay;
+	};
+
+	struct Contents
+	{
+		std::string            slotName;
+		bool                   equipObject;
+		const ObjectTemplate * content;
+
+		 Contents(void);
+		 Contents(const Contents & source);
+		~Contents();
+#ifdef WIN32
+		Contents & operator =(const Contents &);
+#endif
+#ifdef LINUX
+
+	private:
+		Contents & operator =(const Contents &);
+#endif 
+	};
+
+	struct Xp
+	{
+		enum XpTypes type;
+		int                    level;
+		int                    value;
+	};
+
+protected:
+	class _AttribMod : public ObjectTemplate
+	{
+		friend class ServerObjectTemplate;
+	public:
+		enum
+		{
+			_AttribMod_tag = TAG(A,T,T,S)
+		};
+
+	public:
+		         _AttribMod(const std::string & filename);
+		virtual ~_AttribMod();
+
+	virtual Tag getId(void) const;
+
+public:
+	Attributes     getTarget(bool versionOk, bool testData = false) const;
+	int                    getValue(bool versionOk, bool testData = false) const;
+	int                    getValueMin(bool versionOk, bool testData = false) const;
+	int                    getValueMax(bool versionOk, bool testData = false) const;
+	float                  getTime(bool versionOk, bool testData = false) const;
+	float                  getTimeMin(bool versionOk, bool testData = false) const;
+	float                  getTimeMax(bool versionOk, bool testData = false) const;
+	float                  getTimeAtValue(bool versionOk, bool testData = false) const;
+	float                  getTimeAtValueMin(bool versionOk, bool testData = false) const;
+	float                  getTimeAtValueMax(bool versionOk, bool testData = false) const;
+	float                  getDecay(bool versionOk, bool testData = false) const;
+	float                  getDecayMin(bool versionOk, bool testData = false) const;
+	float                  getDecayMax(bool versionOk, bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	IntegerParam m_target;		// server        //which attribute is affected
+	IntegerParam m_value;		// server        //max strength of the modifier
+	FloatParam m_time;		// server        //how long it takes for the modifier to reach full strength (in secs)
+	FloatParam m_timeAtValue;		// server        //how long the modifier remains at full strength (in secs)
+	FloatParam m_decay;		// server        //how long it takes for the modifier to go from full strength to 0 (in secs)
+	private:
+		static void registerMe(void);
+		static ObjectTemplate * create(const std::string & filename);
+	private:
+		_AttribMod(const _AttribMod &);
+		_AttribMod & operator =(const _AttribMod &);
+	};
+	friend class ServerObjectTemplate::_AttribMod;
+
+	class _MentalStateMod : public ObjectTemplate
+	{
+		friend class ServerObjectTemplate;
+	public:
+		enum
+		{
+			_MentalStateMod_tag = TAG(M,E,S,M)
+		};
+
+	public:
+		         _MentalStateMod(const std::string & filename);
+		virtual ~_MentalStateMod();
+
+	virtual Tag getId(void) const;
+
+public:
+	MentalStates     getTarget(bool versionOk, bool testData = false) const;
+	float                  getValue(bool versionOk, bool testData = false) const;
+	float                  getValueMin(bool versionOk, bool testData = false) const;
+	float                  getValueMax(bool versionOk, bool testData = false) const;
+	float                  getTime(bool versionOk, bool testData = false) const;
+	float                  getTimeMin(bool versionOk, bool testData = false) const;
+	float                  getTimeMax(bool versionOk, bool testData = false) const;
+	float                  getTimeAtValue(bool versionOk, bool testData = false) const;
+	float                  getTimeAtValueMin(bool versionOk, bool testData = false) const;
+	float                  getTimeAtValueMax(bool versionOk, bool testData = false) const;
+	float                  getDecay(bool versionOk, bool testData = false) const;
+	float                  getDecayMin(bool versionOk, bool testData = false) const;
+	float                  getDecayMax(bool versionOk, bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	IntegerParam m_target;		// server       //which mental state is affected
+	FloatParam m_value;		// server       //max strength of the modifier
+	FloatParam m_time;		// server       //how long it takes for the modifier to reach full strength (in secs)
+	FloatParam m_timeAtValue;		// server       //how long the modifier remains at full strength (in secs)
+	FloatParam m_decay;		// server       //how long it takes for the modifier to go from full strength to 0 (in secs)
+	private:
+		static void registerMe(void);
+		static ObjectTemplate * create(const std::string & filename);
+	private:
+		_MentalStateMod(const _MentalStateMod &);
+		_MentalStateMod & operator =(const _MentalStateMod &);
+	};
+	friend class ServerObjectTemplate::_MentalStateMod;
+
+	class _Contents : public ObjectTemplate
+	{
+		friend class ServerObjectTemplate;
+	public:
+		enum
+		{
+			_Contents_tag = TAG(C,O,N,T)
+		};
+
+	public:
+		         _Contents(const std::string & filename);
+		virtual ~_Contents();
+
+	virtual Tag getId(void) const;
+
+public:
+	const std::string &    getSlotName(bool versionOk, bool testData = false) const;
+	bool                   getEquipObject(bool versionOk, bool testData = false) const;
+	const ServerObjectTemplate * getContent(bool versionOk) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	StringParam m_slotName;		// //slot name, as defined in the object's slotDescriptorFilename
+	BoolParam m_equipObject;		// //flag to put the contents in the slot, as opposed to adding it to the container in the slot
+	StringParam m_content;		// //the object to add
+	private:
+		static void registerMe(void);
+		static ObjectTemplate * create(const std::string & filename);
+	private:
+		_Contents(const _Contents &);
+		_Contents & operator =(const _Contents &);
+	};
+	friend class ServerObjectTemplate::_Contents;
+
+	class _Xp : public ObjectTemplate
+	{
+		friend class ServerObjectTemplate;
+	public:
+		enum
+		{
+			_Xp_tag = TAG(E,X,P,S)
+		};
+
+	public:
+		         _Xp(const std::string & filename);
+		virtual ~_Xp();
+
+	virtual Tag getId(void) const;
+
+public:
+	XpTypes     getType(bool versionOk, bool testData = false) const;
+	int                    getLevel(bool versionOk, bool testData = false) const;
+	int                    getLevelMin(bool versionOk, bool testData = false) const;
+	int                    getLevelMax(bool versionOk, bool testData = false) const;
+	int                    getValue(bool versionOk, bool testData = false) const;
+	int                    getValueMin(bool versionOk, bool testData = false) const;
+	int                    getValueMax(bool versionOk, bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	IntegerParam m_type;		// //type of experience earned
+	IntegerParam m_level;		// //difficulty level, 0 for leveless xp types
+	IntegerParam m_value;		// //amount of experience earned
+	private:
+		static void registerMe(void);
+		static ObjectTemplate * create(const std::string & filename);
+	private:
+		_Xp(const _Xp &);
+		_Xp & operator =(const _Xp &);
+	};
+	friend class ServerObjectTemplate::_Xp;
+
+public:
+	const std::string &    getSharedTemplate(bool testData = false) const;
+	const std::string &    getScripts(int index) const;
+	size_t            getScriptsCount(void) const;
+	void                   getObjvars(DynamicVariableList &list) const;
+	int                    getVolume(bool testData = false) const;
+	int                    getVolumeMin(bool testData = false) const;
+	int                    getVolumeMax(bool testData = false) const;
+	VisibleFlags     getVisibleFlags(int index) const;
+	size_t            getVisibleFlagsCount(void) const;
+	DeleteFlags     getDeleteFlags(int index) const;
+	size_t            getDeleteFlagsCount(void) const;
+	MoveFlags     getMoveFlags(int index) const;
+	size_t            getMoveFlagsCount(void) const;
+	bool                   getInvulnerable(bool testData = false) const;
+	float                  getComplexity(bool testData = false) const;
+	float                  getComplexityMin(bool testData = false) const;
+	float                  getComplexityMax(bool testData = false) const;
+	int                    getTintIndex(bool testData = false) const;
+	int                    getTintIndexMin(bool testData = false) const;
+	int                    getTintIndexMax(bool testData = false) const;
+	float                  getUpdateRanges(UpdateRanges index) const;
+	float                  getUpdateRangesMin(UpdateRanges index) const;
+	float                  getUpdateRangesMax(UpdateRanges index) const;
+	void              getContents(Contents &data, int index) const;
+	void              getContentsMin(Contents &data, int index) const;
+	void              getContentsMax(Contents &data, int index) const;
+	size_t            getContentsCount(void) const;
+	void              getXpPoints(Xp &data, int index) const;
+	void              getXpPointsMin(Xp &data, int index) const;
+	void              getXpPointsMax(Xp &data, int index) const;
+	size_t            getXpPointsCount(void) const;
+	bool                   getPersistByDefault(bool testData = false) const;
+	bool                   getPersistContents(bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	// crafting types also defined in base_class.java
+	// NOTE: when you update this list, make sure to update the registerMe() function in ServerObjectTemplate.cpp
+	// this enum is also defined in the shared draft_schematic_object_template.tdf file
+	// this enum is also defined in the shared draft_schematic_object_template.tdf file
+	StringParam m_sharedTemplate;		// //template the client should associate with this template
+	stdvector<StringParam *>::fwd m_scripts;		// //scripts attached to the object
+	bool m_scriptsLoaded;
+	bool m_scriptsAppend;
+	DynamicVariableParam m_objvars;		// //default objvars added to the object
+	IntegerParam m_volume;		// //how much room does the object take up
+	stdvector<IntegerParam *>::fwd m_visibleFlags;		// //who can see this object
+	bool m_visibleFlagsLoaded;
+	bool m_visibleFlagsAppend;
+	stdvector<IntegerParam *>::fwd m_deleteFlags;		// //who can delete this object
+	bool m_deleteFlagsLoaded;
+	bool m_deleteFlagsAppend;
+	stdvector<IntegerParam *>::fwd m_moveFlags;		// //who can move this object
+	bool m_moveFlagsLoaded;
+	bool m_moveFlagsAppend;
+	BoolParam m_invulnerable;		// //can this object not be destroyed/killed
+	FloatParam m_complexity;		// //how hard this item is to craft (?)
+	IntegerParam m_tintIndex;		// //index into client tint palette
+	FloatParam m_updateRanges[3];		// //distances for network updates
+	stdvector<StructParamOT *>::fwd m_contents;		// //what's in this object
+	bool m_contentsLoaded;
+	bool m_contentsAppend;
+	stdvector<StructParamOT *>::fwd m_xpPoints;		// //experience points for interacting with this object
+	bool m_xpPointsLoaded;
+	bool m_xpPointsAppend;
+	BoolParam m_persistByDefault;		// //flag to automatically persist this object on creation
+	BoolParam m_persistContents;		// //flag that this container persists its contents
+//@END TFD
+
+public:
+	
+	// user functions
+	virtual ServerObjectTemplate *       asServerObjectTemplate();
+	virtual ServerObjectTemplate const * asServerObjectTemplate() const;
+
+	static const std::string & getXpString          (XpTypes type);
+	static const std::string & getDamageTypeString  (DamageType type);
+	static const std::string & getArmorRatingString (ArmorRating type);
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerObjectTemplate(const ServerObjectTemplate &);
+	ServerObjectTemplate & operator =(const ServerObjectTemplate &);
+};
+
+
+inline void ServerObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerObjectTemplate::registerMe();
+	ServerObjectTemplate::_AttribMod::registerMe();
+	ServerObjectTemplate::_Contents::registerMe();
+	ServerObjectTemplate::_MentalStateMod::registerMe();
+	ServerObjectTemplate::_Xp::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlanetObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlanetObjectTemplate.cpp
new file mode 100644
index 00000000..985007c1
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlanetObjectTemplate.cpp
@@ -0,0 +1,234 @@
+//========================================================================
+//
+// ServerPlanetObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerPlanetObjectTemplate.h"
+#include "serverGame/PlanetObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerPlanetObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerPlanetObjectTemplate::ServerPlanetObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerUniverseObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerPlanetObjectTemplate::ServerPlanetObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerPlanetObjectTemplate::~ServerPlanetObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerPlanetObjectTemplate::~ServerPlanetObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerPlanetObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerPlanetObjectTemplate_tag, create);
+}	// ServerPlanetObjectTemplate::registerMe
+
+/**
+ * Creates a ServerPlanetObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerPlanetObjectTemplate::create(const std::string & filename)
+{
+	return new ServerPlanetObjectTemplate(filename);
+}	// ServerPlanetObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerPlanetObjectTemplate::getId(void) const
+{
+	return ServerPlanetObjectTemplate_tag;
+}	// ServerPlanetObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerPlanetObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerPlanetObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerPlanetObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerPlanetObjectTemplate * base = dynamic_cast<const ServerPlanetObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerPlanetObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerPlanetObjectTemplate::createObject(void) const
+{
+	return new PlanetObject(this);
+}	// ServerPlanetObjectTemplate::createObject
+
+//@BEGIN TFD
+const std::string & ServerPlanetObjectTemplate::getPlanetName(bool testData) const
+{
+#ifdef _DEBUG
+std::string testDataValue = DefaultString;
+#else
+UNREF(testData);
+#endif
+
+	const ServerPlanetObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerPlanetObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getPlanetName(true);
+#endif
+	}
+
+	if (!m_planetName.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter planetName in template %s", DataResource::getName()));
+			return DefaultString;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter planetName has not been defined in template %s!", DataResource::getName()));
+			return base->getPlanetName();
+		}
+	}
+
+	const std::string & value = m_planetName.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerPlanetObjectTemplate::getPlanetName
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerPlanetObjectTemplate::testValues(void) const
+{
+	IGNORE_RETURN(getPlanetName(true));
+	ServerUniverseObjectTemplate::testValues();
+}	// ServerPlanetObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerPlanetObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerPlanetObjectTemplate_tag)
+	{
+		ServerUniverseObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,0))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "planetName") == 0)
+			m_planetName.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	ServerUniverseObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerPlanetObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlanetObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlanetObjectTemplate.h
new file mode 100644
index 00000000..16160251
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlanetObjectTemplate.h
@@ -0,0 +1,89 @@
+//========================================================================
+//
+// ServerPlanetObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerPlanetObjectTemplate_H
+#define _INCLUDED_ServerPlanetObjectTemplate_H
+
+#include "ServerUniverseObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerPlanetObjectTemplate : public ServerUniverseObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerPlanetObjectTemplate_tag = TAG(P,L,A,N)
+	};
+//@END TFD ID
+public:
+	         ServerPlanetObjectTemplate(const std::string & filename);
+	virtual ~ServerPlanetObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+	const std::string &    getPlanetName(bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	StringParam m_planetName;		// name of the planet
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerPlanetObjectTemplate(const ServerPlanetObjectTemplate &);
+	ServerPlanetObjectTemplate & operator =(const ServerPlanetObjectTemplate &);
+};
+
+
+inline void ServerPlanetObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerPlanetObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerPlanetObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerObjectTemplate.cpp
new file mode 100644
index 00000000..9051a1f9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerObjectTemplate.cpp
@@ -0,0 +1,187 @@
+//========================================================================
+//
+// ServerPlayerObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerPlayerObjectTemplate.h"
+#include "sharedDebug/DataLint.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "serverGame/PlayerObject.h"
+
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerPlayerObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerPlayerObjectTemplate::ServerPlayerObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerIntangibleObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerPlayerObjectTemplate::ServerPlayerObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerPlayerObjectTemplate::~ServerPlayerObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerPlayerObjectTemplate::~ServerPlayerObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerPlayerObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerPlayerObjectTemplate_tag, create);
+}	// ServerPlayerObjectTemplate::registerMe
+
+/**
+ * Creates a ServerPlayerObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerPlayerObjectTemplate::create(const std::string & filename)
+{
+	return new ServerPlayerObjectTemplate(filename);
+}	// ServerPlayerObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerPlayerObjectTemplate::getId(void) const
+{
+	return ServerPlayerObjectTemplate_tag;
+}	// ServerPlayerObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerPlayerObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerPlayerObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerPlayerObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerPlayerObjectTemplate * base = dynamic_cast<const ServerPlayerObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerPlayerObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerPlayerObjectTemplate::createObject(void) const
+{
+	return new PlayerObject(this);
+}	// ServerPlayerObjectTemplate::createObject
+
+//@BEGIN TFD
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerPlayerObjectTemplate::testValues(void) const
+{
+	ServerIntangibleObjectTemplate::testValues();
+}	// ServerPlayerObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerPlayerObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerPlayerObjectTemplate_tag)
+	{
+		ServerIntangibleObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,0))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	UNREF(paramName);
+	UNREF(paramCount);
+
+	file.exitForm();
+	ServerIntangibleObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerPlayerObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerObjectTemplate.h
new file mode 100644
index 00000000..9ca8d598
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerObjectTemplate.h
@@ -0,0 +1,86 @@
+//========================================================================
+//
+// ServerPlayerObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerPlayerObjectTemplate_H
+#define _INCLUDED_ServerPlayerObjectTemplate_H
+
+#include "ServerIntangibleObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerPlayerObjectTemplate : public ServerIntangibleObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerPlayerObjectTemplate_tag = TAG(P,L,A,Y)
+	};
+//@END TFD ID
+public:
+	         ServerPlayerObjectTemplate(const std::string & filename);
+	virtual ~ServerPlayerObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+public:
+	virtual Object * createObject(void) const;
+	
+//@BEGIN TFD
+public:
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+//@END TFD
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerPlayerObjectTemplate(const ServerPlayerObjectTemplate &);
+	ServerPlayerObjectTemplate & operator =(const ServerPlayerObjectTemplate &);
+};
+
+
+inline void ServerPlayerObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerPlayerObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerPlayerObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.cpp
new file mode 100644
index 00000000..ea316d04
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.cpp
@@ -0,0 +1,188 @@
+//========================================================================
+//
+// ServerPlayerQuestObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PlayerQuestObject.h"
+#include "ServerPlayerQuestObjectTemplate.h"
+#include "sharedDebug/DataLint.h"
+#include "sharedFile/Iff.h"
+#include "sharedMath/Vector.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerPlayerQuestObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerPlayerQuestObjectTemplate::ServerPlayerQuestObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerTangibleObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerPlayerQuestObjectTemplate::ServerPlayerQuestObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerPlayerQuestObjectTemplate::~ServerPlayerQuestObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerPlayerQuestObjectTemplate::~ServerPlayerQuestObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerPlayerQuestObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerPlayerQuestObjectTemplate_tag, create);
+}	// ServerPlayerQuestObjectTemplate::registerMe
+
+/**
+ * Creates a ServerPlayerQuestObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerPlayerQuestObjectTemplate::create(const std::string & filename)
+{
+	return new ServerPlayerQuestObjectTemplate(filename);
+}	// ServerPlayerQuestObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerPlayerQuestObjectTemplate::getId(void) const
+{
+	return ServerPlayerQuestObjectTemplate_tag;
+}	// ServerPlayerQuestObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerPlayerQuestObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerPlayerQuestObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerPlayerQuestObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerPlayerQuestObjectTemplate * base = dynamic_cast<const ServerPlayerQuestObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerPlayerQuestObjectTemplate::getHighestTemplateVersion
+
+/**
+* Creates a new object from this template.
+*
+* @return the object
+*/
+Object * ServerPlayerQuestObjectTemplate::createObject(void) const
+{
+	return new PlayerQuestObject(this);
+}	// ServerMissionObjectTemplate::createObject
+
+
+//@BEGIN TFD
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerPlayerQuestObjectTemplate::testValues(void) const
+{
+	ServerTangibleObjectTemplate::testValues();
+}	// ServerPlayerQuestObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerPlayerQuestObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerPlayerQuestObjectTemplate_tag)
+	{
+		ServerTangibleObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,0))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	UNREF(paramName);
+	UNREF(paramCount);
+
+	file.exitForm();
+	ServerTangibleObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerPlayerQuestObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.h
new file mode 100644
index 00000000..3027c1af
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.h
@@ -0,0 +1,87 @@
+//========================================================================
+//
+// ServerPlayerQuestObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerPlayerQuestObjectTemplate_H
+#define _INCLUDED_ServerPlayerQuestObjectTemplate_H
+
+#include "ServerTangibleObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerPlayerQuestObjectTemplate : public ServerTangibleObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerPlayerQuestObjectTemplate_tag = TAG(P,Q,O,S)
+	};
+//@END TFD ID
+public:
+	         ServerPlayerQuestObjectTemplate(const std::string & filename);
+	virtual ~ServerPlayerQuestObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerPlayerQuestObjectTemplate(const ServerPlayerQuestObjectTemplate &);
+	ServerPlayerQuestObjectTemplate & operator =(const ServerPlayerQuestObjectTemplate &);
+};
+
+
+inline void ServerPlayerQuestObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerPlayerQuestObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerPlayerQuestObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerResourceContainerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerResourceContainerObjectTemplate.cpp
new file mode 100644
index 00000000..bdd03637
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerResourceContainerObjectTemplate.cpp
@@ -0,0 +1,385 @@
+//========================================================================
+//
+// ServerResourceContainerObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerResourceContainerObjectTemplate.h"
+#include "serverGame/ResourceContainerObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerResourceContainerObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerResourceContainerObjectTemplate::ServerResourceContainerObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerTangibleObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerResourceContainerObjectTemplate::ServerResourceContainerObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerResourceContainerObjectTemplate::~ServerResourceContainerObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerResourceContainerObjectTemplate::~ServerResourceContainerObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerResourceContainerObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerResourceContainerObjectTemplate_tag, create);
+}	// ServerResourceContainerObjectTemplate::registerMe
+
+/**
+ * Creates a ServerResourceContainerObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerResourceContainerObjectTemplate::create(const std::string & filename)
+{
+	return new ServerResourceContainerObjectTemplate(filename);
+}	// ServerResourceContainerObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerResourceContainerObjectTemplate::getId(void) const
+{
+	return ServerResourceContainerObjectTemplate_tag;
+}	// ServerResourceContainerObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerResourceContainerObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerResourceContainerObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerResourceContainerObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerResourceContainerObjectTemplate * base = dynamic_cast<const ServerResourceContainerObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerResourceContainerObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerResourceContainerObjectTemplate::createObject(void) const
+{
+	return new ResourceContainerObject(this);
+}	// ServerResourceContainerObjectTemplate::createObject
+
+//@BEGIN TFD
+int ServerResourceContainerObjectTemplate::getMaxResources(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerResourceContainerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerResourceContainerObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxResources(true);
+#endif
+	}
+
+	if (!m_maxResources.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxResources in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxResources has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxResources();
+		}
+	}
+
+	int value = m_maxResources.getValue();
+	char delta = m_maxResources.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxResources();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerResourceContainerObjectTemplate::getMaxResources
+
+int ServerResourceContainerObjectTemplate::getMaxResourcesMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerResourceContainerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerResourceContainerObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxResourcesMin(true);
+#endif
+	}
+
+	if (!m_maxResources.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxResources in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxResources has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxResourcesMin();
+		}
+	}
+
+	int value = m_maxResources.getMinValue();
+	char delta = m_maxResources.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxResourcesMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerResourceContainerObjectTemplate::getMaxResourcesMin
+
+int ServerResourceContainerObjectTemplate::getMaxResourcesMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerResourceContainerObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerResourceContainerObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxResourcesMax(true);
+#endif
+	}
+
+	if (!m_maxResources.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxResources in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxResources has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxResourcesMax();
+		}
+	}
+
+	int value = m_maxResources.getMaxValue();
+	char delta = m_maxResources.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxResourcesMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerResourceContainerObjectTemplate::getMaxResourcesMax
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerResourceContainerObjectTemplate::testValues(void) const
+{
+	IGNORE_RETURN(getMaxResourcesMin(true));
+	IGNORE_RETURN(getMaxResourcesMax(true));
+	ServerTangibleObjectTemplate::testValues();
+}	// ServerResourceContainerObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerResourceContainerObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerResourceContainerObjectTemplate_tag)
+	{
+		ServerTangibleObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,0))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "maxResources") == 0)
+			m_maxResources.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	ServerTangibleObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerResourceContainerObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerResourceContainerObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerResourceContainerObjectTemplate.h
new file mode 100644
index 00000000..478e871f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerResourceContainerObjectTemplate.h
@@ -0,0 +1,91 @@
+//========================================================================
+//
+// ServerResourceContainerObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerResourceContainerObjectTemplate_H
+#define _INCLUDED_ServerResourceContainerObjectTemplate_H
+
+#include "ServerTangibleObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerResourceContainerObjectTemplate : public ServerTangibleObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerResourceContainerObjectTemplate_tag = TAG(R,C,N,O)
+	};
+//@END TFD ID
+public:
+	         ServerResourceContainerObjectTemplate(const std::string & filename);
+	virtual ~ServerResourceContainerObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+	int                    getMaxResources(bool testData = false) const;
+	int                    getMaxResourcesMin(bool testData = false) const;
+	int                    getMaxResourcesMax(bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	IntegerParam m_maxResources;		// Maximum number of units of resource the container can hold.
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerResourceContainerObjectTemplate(const ServerResourceContainerObjectTemplate &);
+	ServerResourceContainerObjectTemplate & operator =(const ServerResourceContainerObjectTemplate &);
+};
+
+
+inline void ServerResourceContainerObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerResourceContainerObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerResourceContainerObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerSharedObjectTemplateInterface.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerSharedObjectTemplateInterface.cpp
new file mode 100644
index 00000000..852eb981
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerSharedObjectTemplateInterface.cpp
@@ -0,0 +1,62 @@
+//======================================================================
+//
+// ServerSharedObjectTemplateInterface.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerSharedObjectTemplateInterface.h"
+
+#include "serverGame/ServerObject.h"
+#include "serverGame/ShipObject.h"
+
+//======================================================================
+
+ServerSharedObjectTemplateInterface::ServerSharedObjectTemplateInterface()
+: SharedObjectTemplateInterface()
+{
+}
+
+//----------------------------------------------------------------------
+
+ServerSharedObjectTemplateInterface::~ServerSharedObjectTemplateInterface()
+{
+}
+
+//----------------------------------------------------------------------
+
+SharedObjectTemplate const * ServerSharedObjectTemplateInterface::getSharedTemplate(Object const * const object) const
+{
+	ServerObject const * const serverObject = object->asServerObject();
+	return static_cast<SharedObjectTemplate const *>(serverObject->getSharedTemplate());
+}
+
+//----------------------------------------------------------------------
+
+bool ServerSharedObjectTemplateInterface::isShipObject(Object const * const object) const
+{
+	ServerObject const * const serverObject = (object != 0) ? object->asServerObject() : 0;
+	ShipObject const * const shipObject = (serverObject != 0) ? serverObject->asShipObject() : 0;
+	return shipObject != 0;
+}
+
+//----------------------------------------------------------------------
+
+uint32 ServerSharedObjectTemplateInterface::getShipChassisType(Object const * const object) const
+{
+	ServerObject const * const serverObject = (object != 0) ? object->asServerObject() : 0;
+	ShipObject const * const shipObject = (serverObject != 0) ? serverObject->asShipObject() : 0;
+	return (shipObject != 0) ? shipObject->getChassisType() : 0;
+}
+
+//----------------------------------------------------------------------
+
+uint32 ServerSharedObjectTemplateInterface::getShipComponentCrc(Object const * const object, int chassisSlot) const
+{
+	ServerObject const * const serverObject = (object != 0) ? object->asServerObject() : 0;
+	ShipObject const * const shipObject = (serverObject != 0) ? serverObject->asShipObject() : 0;
+	return (shipObject != 0) ? shipObject->getComponentCrc(chassisSlot) : 0;
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerSharedObjectTemplateInterface.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerSharedObjectTemplateInterface.h
new file mode 100644
index 00000000..1d77b1cb
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerSharedObjectTemplateInterface.h
@@ -0,0 +1,38 @@
+//======================================================================
+//
+// ServerSharedObjectTemplateInterface.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ServerSharedObjectTemplateInterface_H
+#define INCLUDED_ServerSharedObjectTemplateInterface_H
+
+//======================================================================
+
+#include "sharedGame/SharedObjectTemplateInterface.h"
+
+class Object;
+class SharedObjectTemplate;
+
+//----------------------------------------------------------------------
+
+class ServerSharedObjectTemplateInterface : public SharedObjectTemplateInterface
+{
+public:
+	ServerSharedObjectTemplateInterface();
+	virtual ~ServerSharedObjectTemplateInterface();
+
+	virtual SharedObjectTemplate const * getSharedTemplate(Object const * object) const;
+	virtual bool isShipObject(Object const * object) const;
+	virtual uint32 getShipChassisType(Object const * object) const;
+	virtual uint32 getShipComponentCrc(Object const * object, int chassisSlot) const;
+
+private:
+	ServerSharedObjectTemplateInterface(ServerSharedObjectTemplateInterface const & copy);
+	ServerSharedObjectTemplateInterface & operator=(ServerSharedObjectTemplateInterface const & copy);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerShipObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerShipObjectTemplate.cpp
new file mode 100644
index 00000000..1acde7a0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerShipObjectTemplate.cpp
@@ -0,0 +1,235 @@
+//========================================================================
+//
+// ServerShipObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerShipObjectTemplate.h"
+#include "serverGame/ShipObject.h"
+#include "sharedDebug/DataLint.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerShipObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerShipObjectTemplate::ServerShipObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerTangibleObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerShipObjectTemplate::ServerShipObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerShipObjectTemplate::~ServerShipObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerShipObjectTemplate::~ServerShipObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerShipObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerShipObjectTemplate_tag, create);
+}	// ServerShipObjectTemplate::registerMe
+
+/**
+ * Creates a ServerShipObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerShipObjectTemplate::create(const std::string & filename)
+{
+	return new ServerShipObjectTemplate(filename);
+}	// ServerShipObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerShipObjectTemplate::getId(void) const
+{
+	return ServerShipObjectTemplate_tag;
+}	// ServerShipObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerShipObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerShipObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerShipObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerShipObjectTemplate * base = dynamic_cast<const ServerShipObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerShipObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerShipObjectTemplate::createObject(void) const
+{
+	return new ShipObject(this);
+}	// ServerShipObjectTemplate::createObject
+
+//@BEGIN TFD
+const std::string & ServerShipObjectTemplate::getShipType(bool testData) const
+{
+#ifdef _DEBUG
+std::string testDataValue = DefaultString;
+#else
+UNREF(testData);
+#endif
+
+	const ServerShipObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerShipObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getShipType(true);
+#endif
+	}
+
+	if (!m_shipType.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter shipType in template %s", DataResource::getName()));
+			return DefaultString;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter shipType has not been defined in template %s!", DataResource::getName()));
+			return base->getShipType();
+		}
+	}
+
+	const std::string & value = m_shipType.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerShipObjectTemplate::getShipType
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerShipObjectTemplate::testValues(void) const
+{
+	IGNORE_RETURN(getShipType(true));
+	ServerTangibleObjectTemplate::testValues();
+}	// ServerShipObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerShipObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerShipObjectTemplate_tag)
+	{
+		ServerTangibleObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,1))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "shipType") == 0)
+			m_shipType.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	ServerTangibleObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerShipObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerShipObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerShipObjectTemplate.h
new file mode 100644
index 00000000..44f18426
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerShipObjectTemplate.h
@@ -0,0 +1,89 @@
+//========================================================================
+//
+// ServerShipObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerShipObjectTemplate_H
+#define _INCLUDED_ServerShipObjectTemplate_H
+
+#include "ServerTangibleObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerShipObjectTemplate : public ServerTangibleObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerShipObjectTemplate_tag = TAG(S,H,I,P)
+	};
+//@END TFD ID
+public:
+	         ServerShipObjectTemplate(const std::string & filename);
+	virtual ~ServerShipObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+	const std::string &    getShipType(bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	StringParam m_shipType;
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerShipObjectTemplate(const ServerShipObjectTemplate &);
+	ServerShipObjectTemplate & operator =(const ServerShipObjectTemplate &);
+};
+
+
+inline void ServerShipObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerShipObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerShipObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.cpp
new file mode 100644
index 00000000..767901e7
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.cpp
@@ -0,0 +1,234 @@
+//========================================================================
+//
+// ServerStaticObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerStaticObjectTemplate.h"
+#include "serverGame/StaticObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerStaticObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerStaticObjectTemplate::ServerStaticObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerStaticObjectTemplate::ServerStaticObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerStaticObjectTemplate::~ServerStaticObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerStaticObjectTemplate::~ServerStaticObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerStaticObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerStaticObjectTemplate_tag, create);
+}	// ServerStaticObjectTemplate::registerMe
+
+/**
+ * Creates a ServerStaticObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerStaticObjectTemplate::create(const std::string & filename)
+{
+	return new ServerStaticObjectTemplate(filename);
+}	// ServerStaticObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerStaticObjectTemplate::getId(void) const
+{
+	return ServerStaticObjectTemplate_tag;
+}	// ServerStaticObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerStaticObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerStaticObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerStaticObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerStaticObjectTemplate * base = dynamic_cast<const ServerStaticObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerStaticObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerStaticObjectTemplate::createObject(void) const
+{
+	return new StaticObject(this);
+}	// ServerStaticObjectTemplate::createObject
+
+//@BEGIN TFD
+bool ServerStaticObjectTemplate::getClientOnlyBuildout(bool testData) const
+{
+#ifdef _DEBUG
+bool testDataValue = false;
+#else
+UNREF(testData);
+#endif
+
+	const ServerStaticObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerStaticObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getClientOnlyBuildout(true);
+#endif
+	}
+
+	if (!m_clientOnlyBuildout.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter clientOnlyBuildout in template %s", DataResource::getName()));
+			return false;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter clientOnlyBuildout has not been defined in template %s!", DataResource::getName()));
+			return base->getClientOnlyBuildout();
+		}
+	}
+
+	bool value = m_clientOnlyBuildout.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerStaticObjectTemplate::getClientOnlyBuildout
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerStaticObjectTemplate::testValues(void) const
+{
+	IGNORE_RETURN(getClientOnlyBuildout(true));
+	ServerObjectTemplate::testValues();
+}	// ServerStaticObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerStaticObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerStaticObjectTemplate_tag)
+	{
+		ServerObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,1))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "clientOnlyBuildout") == 0)
+			m_clientOnlyBuildout.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	ServerObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerStaticObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.h
new file mode 100644
index 00000000..cda42b71
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.h
@@ -0,0 +1,89 @@
+//========================================================================
+//
+// ServerStaticObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerStaticObjectTemplate_H
+#define _INCLUDED_ServerStaticObjectTemplate_H
+
+#include "ServerObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerStaticObjectTemplate : public ServerObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerStaticObjectTemplate_tag = TAG(S,T,A,O)
+	};
+//@END TFD ID
+public:
+	         ServerStaticObjectTemplate(const std::string & filename);
+	virtual ~ServerStaticObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+	bool                   getClientOnlyBuildout(bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	BoolParam m_clientOnlyBuildout;		// Whether we should be instantiated from buildout files on the server
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerStaticObjectTemplate(const ServerStaticObjectTemplate &);
+	ServerStaticObjectTemplate & operator =(const ServerStaticObjectTemplate &);
+};
+
+
+inline void ServerStaticObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerStaticObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerStaticObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp
new file mode 100644
index 00000000..a557a075
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp
@@ -0,0 +1,1188 @@
+//========================================================================
+//
+// ServerTangibleObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerTangibleObjectTemplate.h"
+#include "serverGame/TangibleObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+#include "ServerArmorTemplate.h"
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerTangibleObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerTangibleObjectTemplate::ServerTangibleObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerObjectTemplate(filename)
+	,m_triggerVolumesLoaded(false)
+	,m_triggerVolumesAppend(false)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerTangibleObjectTemplate::ServerTangibleObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerTangibleObjectTemplate::~ServerTangibleObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+	{
+		std::vector<TriggerVolumeParam *>::iterator iter;
+		for (iter = m_triggerVolumes.begin(); iter != m_triggerVolumes.end(); ++iter)
+		{
+			delete *iter;
+			*iter = NULL;
+		}
+		m_triggerVolumes.clear();
+	}
+//@END TFD CLEANUP
+}	// ServerTangibleObjectTemplate::~ServerTangibleObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerTangibleObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerTangibleObjectTemplate_tag, create);
+}	// ServerTangibleObjectTemplate::registerMe
+
+/**
+ * Creates a ServerTangibleObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerTangibleObjectTemplate::create(const std::string & filename)
+{
+	return new ServerTangibleObjectTemplate(filename);
+}	// ServerTangibleObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerTangibleObjectTemplate::getId(void) const
+{
+	return ServerTangibleObjectTemplate_tag;
+}	// ServerTangibleObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerTangibleObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerTangibleObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerTangibleObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerTangibleObjectTemplate * base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerTangibleObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerTangibleObjectTemplate::createObject(void) const
+{
+	return new TangibleObject(this);
+}	// ServerTangibleObjectTemplate::createObject
+
+//@BEGIN TFD
+const TriggerVolumeData & ServerTangibleObjectTemplate::getTriggerVolumes(int index) const
+{
+	const ServerTangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_triggerVolumesLoaded)
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter triggerVolumes in template %s", DataResource::getName()));
+			return DefaultTriggerVolumeData;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter triggerVolumes has not been defined in template %s!", DataResource::getName()));
+			return base->getTriggerVolumes(index);
+		}
+	}
+
+	if (m_triggerVolumesAppend && base != NULL)
+	{
+		int baseCount = base->getTriggerVolumesCount();
+		if (index < baseCount)
+			return base->getTriggerVolumes(index);
+		index -= baseCount;
+	}
+
+	DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_triggerVolumes.size(), ("template param index out of range"));
+	const TriggerVolumeData & value = m_triggerVolumes[index]->getValue();
+	return value;
+}	// ServerTangibleObjectTemplate::getTriggerVolumes
+
+size_t ServerTangibleObjectTemplate::getTriggerVolumesCount(void) const
+{
+	if (!m_triggerVolumesLoaded)
+	{
+		if (m_baseData == NULL)
+			return 0;
+		const ServerTangibleObjectTemplate * base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+		DEBUG_FATAL(base == NULL, ("base template wrong type"));
+		return base->getTriggerVolumesCount();
+	}
+
+	size_t count = m_triggerVolumes.size();
+
+	// if we are extending our base template, add it's count
+	if (m_triggerVolumesAppend && m_baseData != NULL)
+	{
+		const ServerTangibleObjectTemplate * base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+		if (base != NULL)
+			count += base->getTriggerVolumesCount();
+	}
+
+	return count;
+}	// ServerTangibleObjectTemplate::getTriggerVolumesCount
+
+ServerTangibleObjectTemplate::CombatSkeleton ServerTangibleObjectTemplate::getCombatSkeleton(bool testData) const
+{
+#ifdef _DEBUG
+ServerTangibleObjectTemplate::CombatSkeleton testDataValue = static_cast<ServerTangibleObjectTemplate::CombatSkeleton>(0);
+#else
+UNREF(testData);
+#endif
+
+	const ServerTangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCombatSkeleton(true);
+#endif
+	}
+
+	if (!m_combatSkeleton.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter combatSkeleton in template %s", DataResource::getName()));
+			return static_cast<CombatSkeleton>(0);
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter combatSkeleton has not been defined in template %s!", DataResource::getName()));
+			return base->getCombatSkeleton();
+		}
+	}
+
+	CombatSkeleton value = static_cast<CombatSkeleton>(m_combatSkeleton.getValue());
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerTangibleObjectTemplate::getCombatSkeleton
+
+int ServerTangibleObjectTemplate::getMaxHitPoints(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerTangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxHitPoints(true);
+#endif
+	}
+
+	if (!m_maxHitPoints.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxHitPoints in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxHitPoints has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxHitPoints();
+		}
+	}
+
+	int value = m_maxHitPoints.getValue();
+	char delta = m_maxHitPoints.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxHitPoints();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerTangibleObjectTemplate::getMaxHitPoints
+
+int ServerTangibleObjectTemplate::getMaxHitPointsMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerTangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxHitPointsMin(true);
+#endif
+	}
+
+	if (!m_maxHitPoints.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxHitPoints in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxHitPoints has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxHitPointsMin();
+		}
+	}
+
+	int value = m_maxHitPoints.getMinValue();
+	char delta = m_maxHitPoints.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxHitPointsMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerTangibleObjectTemplate::getMaxHitPointsMin
+
+int ServerTangibleObjectTemplate::getMaxHitPointsMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerTangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxHitPointsMax(true);
+#endif
+	}
+
+	if (!m_maxHitPoints.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxHitPoints in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxHitPoints has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxHitPointsMax();
+		}
+	}
+
+	int value = m_maxHitPoints.getMaxValue();
+	char delta = m_maxHitPoints.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxHitPointsMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerTangibleObjectTemplate::getMaxHitPointsMax
+
+const ServerArmorTemplate * ServerTangibleObjectTemplate::getArmor() const
+{
+	const ServerTangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+	}
+
+	if (!m_armor.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter armor in template %s", DataResource::getName()));
+			return NULL;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter armor has not been defined in template %s!", DataResource::getName()));
+			return base->getArmor();
+		}
+	}
+
+	const ServerArmorTemplate * returnValue = NULL;
+	const std::string & templateName = m_armor.getValue();
+	if (!templateName.empty())
+	{
+		returnValue = dynamic_cast<const ServerArmorTemplate *>(ObjectTemplateList::fetch(templateName));
+		if (returnValue == NULL)
+			WARNING_STRICT_FATAL(true, ("Error loading template %s",templateName.c_str()));
+	}
+	return returnValue;
+}	// ServerTangibleObjectTemplate::getArmor
+
+int ServerTangibleObjectTemplate::getInterestRadius(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerTangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getInterestRadius(true);
+#endif
+	}
+
+	if (!m_interestRadius.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter interestRadius in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter interestRadius has not been defined in template %s!", DataResource::getName()));
+			return base->getInterestRadius();
+		}
+	}
+
+	int value = m_interestRadius.getValue();
+	char delta = m_interestRadius.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getInterestRadius();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerTangibleObjectTemplate::getInterestRadius
+
+int ServerTangibleObjectTemplate::getInterestRadiusMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerTangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getInterestRadiusMin(true);
+#endif
+	}
+
+	if (!m_interestRadius.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter interestRadius in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter interestRadius has not been defined in template %s!", DataResource::getName()));
+			return base->getInterestRadiusMin();
+		}
+	}
+
+	int value = m_interestRadius.getMinValue();
+	char delta = m_interestRadius.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getInterestRadiusMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerTangibleObjectTemplate::getInterestRadiusMin
+
+int ServerTangibleObjectTemplate::getInterestRadiusMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerTangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getInterestRadiusMax(true);
+#endif
+	}
+
+	if (!m_interestRadius.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter interestRadius in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter interestRadius has not been defined in template %s!", DataResource::getName()));
+			return base->getInterestRadiusMax();
+		}
+	}
+
+	int value = m_interestRadius.getMaxValue();
+	char delta = m_interestRadius.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getInterestRadiusMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerTangibleObjectTemplate::getInterestRadiusMax
+
+int ServerTangibleObjectTemplate::getCount(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerTangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCount(true);
+#endif
+	}
+
+	if (!m_count.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter count in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter count has not been defined in template %s!", DataResource::getName()));
+			return base->getCount();
+		}
+	}
+
+	int value = m_count.getValue();
+	char delta = m_count.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getCount();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerTangibleObjectTemplate::getCount
+
+int ServerTangibleObjectTemplate::getCountMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerTangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCountMin(true);
+#endif
+	}
+
+	if (!m_count.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter count in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter count has not been defined in template %s!", DataResource::getName()));
+			return base->getCountMin();
+		}
+	}
+
+	int value = m_count.getMinValue();
+	char delta = m_count.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getCountMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerTangibleObjectTemplate::getCountMin
+
+int ServerTangibleObjectTemplate::getCountMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerTangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCountMax(true);
+#endif
+	}
+
+	if (!m_count.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter count in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter count has not been defined in template %s!", DataResource::getName()));
+			return base->getCountMax();
+		}
+	}
+
+	int value = m_count.getMaxValue();
+	char delta = m_count.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getCountMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerTangibleObjectTemplate::getCountMax
+
+int ServerTangibleObjectTemplate::getCondition(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerTangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCondition(true);
+#endif
+	}
+
+	if (!m_condition.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter condition in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter condition has not been defined in template %s!", DataResource::getName()));
+			return base->getCondition();
+		}
+	}
+
+	int value = m_condition.getValue();
+	char delta = m_condition.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getCondition();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerTangibleObjectTemplate::getCondition
+
+int ServerTangibleObjectTemplate::getConditionMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerTangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getConditionMin(true);
+#endif
+	}
+
+	if (!m_condition.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter condition in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter condition has not been defined in template %s!", DataResource::getName()));
+			return base->getConditionMin();
+		}
+	}
+
+	int value = m_condition.getMinValue();
+	char delta = m_condition.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getConditionMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerTangibleObjectTemplate::getConditionMin
+
+int ServerTangibleObjectTemplate::getConditionMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerTangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getConditionMax(true);
+#endif
+	}
+
+	if (!m_condition.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter condition in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter condition has not been defined in template %s!", DataResource::getName()));
+			return base->getConditionMax();
+		}
+	}
+
+	int value = m_condition.getMaxValue();
+	char delta = m_condition.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getConditionMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerTangibleObjectTemplate::getConditionMax
+
+bool ServerTangibleObjectTemplate::getWantSawAttackTriggers(bool testData) const
+{
+#ifdef _DEBUG
+bool testDataValue = false;
+#else
+UNREF(testData);
+#endif
+
+	const ServerTangibleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerTangibleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getWantSawAttackTriggers(true);
+#endif
+	}
+
+	if (!m_wantSawAttackTriggers.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter wantSawAttackTriggers in template %s", DataResource::getName()));
+			return false;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter wantSawAttackTriggers has not been defined in template %s!", DataResource::getName()));
+			return base->getWantSawAttackTriggers();
+		}
+	}
+
+	bool value = m_wantSawAttackTriggers.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerTangibleObjectTemplate::getWantSawAttackTriggers
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerTangibleObjectTemplate::testValues(void) const
+{
+	IGNORE_RETURN(getCombatSkeleton(true));
+	IGNORE_RETURN(getMaxHitPointsMin(true));
+	IGNORE_RETURN(getMaxHitPointsMax(true));
+	IGNORE_RETURN(getInterestRadiusMin(true));
+	IGNORE_RETURN(getInterestRadiusMax(true));
+	IGNORE_RETURN(getCountMin(true));
+	IGNORE_RETURN(getCountMax(true));
+	IGNORE_RETURN(getConditionMin(true));
+	IGNORE_RETURN(getConditionMax(true));
+	IGNORE_RETURN(getWantSawAttackTriggers(true));
+	ServerObjectTemplate::testValues();
+}	// ServerTangibleObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerTangibleObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerTangibleObjectTemplate_tag)
+	{
+		ServerObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,4))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "triggerVolumes") == 0)
+		{
+			std::vector<TriggerVolumeParam *>::iterator iter;
+			for (iter = m_triggerVolumes.begin(); iter != m_triggerVolumes.end(); ++iter)
+			{
+				delete *iter;
+				*iter = NULL;
+			}
+			m_triggerVolumes.clear();
+			m_triggerVolumesAppend = file.read_bool8();
+			int listCount = file.read_int32();
+			for (int j = 0; j < listCount; ++j)
+			{
+				TriggerVolumeParam * newData = new TriggerVolumeParam;
+				newData->loadFromIff(file);
+				m_triggerVolumes.push_back(newData);
+			}
+			m_triggerVolumesLoaded = true;
+		}
+		else if (strcmp(paramName, "combatSkeleton") == 0)
+			m_combatSkeleton.loadFromIff(file);
+		else if (strcmp(paramName, "maxHitPoints") == 0)
+			m_maxHitPoints.loadFromIff(file);
+		else if (strcmp(paramName, "armor") == 0)
+			m_armor.loadFromIff(file);
+		else if (strcmp(paramName, "interestRadius") == 0)
+			m_interestRadius.loadFromIff(file);
+		else if (strcmp(paramName, "count") == 0)
+			m_count.loadFromIff(file);
+		else if (strcmp(paramName, "condition") == 0)
+			m_condition.loadFromIff(file);
+		else if (strcmp(paramName, "wantSawAttackTriggers") == 0)
+			m_wantSawAttackTriggers.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	ServerObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerTangibleObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h
new file mode 100644
index 00000000..5c941b2d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h
@@ -0,0 +1,156 @@
+//========================================================================
+//
+// ServerTangibleObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerTangibleObjectTemplate_H
+#define _INCLUDED_ServerTangibleObjectTemplate_H
+
+#include "ServerObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+class ServerArmorTemplate;
+//@END TFD TEMPLATE REFS
+
+
+class ServerTangibleObjectTemplate : public ServerObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerTangibleObjectTemplate_tag = TAG(T,A,N,O)
+	};
+//@END TFD ID
+public:
+	         ServerTangibleObjectTemplate(const std::string & filename);
+	virtual ~ServerTangibleObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+	enum CombatSkeleton
+	{
+		CS_none,		// // all "body" or not attackable
+		CS_humanoid,		// // head, body, 2 arms, 2 legs, standard human proportions/layout
+		CombatSkeleton_Last = CS_humanoid,
+	};
+
+	enum Conditions
+	{
+		C_onOff = 0x00000001,
+		C_vendor = 0x00000002,
+		C_insured = 0x00000004,
+		C_conversable = 0x00000008,
+		C_hibernating = 0x00000010,
+		C_magicItem = 0x00000020,
+		C_aggressive = 0x00000040,
+		C_wantSawAttackTrigger = 0x00000080,
+		C_invulnerable = 0x00000100,
+		C_disabled = 0x00000200,
+		C_uninsurable = 0x00000400,
+		C_interesting = 0x00000800,
+		C_mount = 0x00001000,		//   Set programmatically by mount system.  Do not set this in the template.
+		C_crafted = 0x00002000,		//   Set programmatically by crafting system.  Do not set this in the template.
+		C_wingsOpened = 0x00004000,		//   Set programmatically by wing system.  Do not set this in the template.
+		C_spaceInteresting = 0x00008000,
+		C_docking = 0x00010000,		//   Set programmatically by docking system.  Do not set this in the template.
+		C_destroying = 0x00020000,		//   Set programmatically by destruction system.  Do not set this in the template.
+		C_commable = 0x00040000,
+		C_dockable = 0x00080000,
+		C_eject = 0x00100000,
+		C_inspectable = 0x00200000,
+		C_transferable = 0x00400000,
+		C_inflightTutorial = 0x00800000,
+		C_spaceCombatMusic = 0x01000000,		//   Set programmatically by the AI system.  Do not set this in the template.
+		C_encounterLocked = 0x02000000,
+		Conditions_Last = C_encounterLocked,
+	};
+
+public:
+	const TriggerVolumeData & getTriggerVolumes(int index) const;
+	size_t            getTriggerVolumesCount(void) const;
+	CombatSkeleton     getCombatSkeleton(bool testData = false) const;
+	int                    getMaxHitPoints(bool testData = false) const;
+	int                    getMaxHitPointsMin(bool testData = false) const;
+	int                    getMaxHitPointsMax(bool testData = false) const;
+	const ServerArmorTemplate * getArmor() const;
+	int                    getInterestRadius(bool testData = false) const;
+	int                    getInterestRadiusMin(bool testData = false) const;
+	int                    getInterestRadiusMax(bool testData = false) const;
+	int                    getCount(bool testData = false) const;
+	int                    getCountMin(bool testData = false) const;
+	int                    getCountMax(bool testData = false) const;
+	int                    getCondition(bool testData = false) const;
+	int                    getConditionMin(bool testData = false) const;
+	int                    getConditionMax(bool testData = false) const;
+	bool                   getWantSawAttackTriggers(bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	// these MUST be reflected in clientGame/TangibleObject.h
+	// these MUST be reflected in base_class.java
+	stdvector<TriggerVolumeParam *>::fwd m_triggerVolumes;		// trigger volume(s) attached to the object
+	bool m_triggerVolumesLoaded;
+	bool m_triggerVolumesAppend;
+	IntegerParam m_combatSkeleton;		// this should be fixed (not random) for any template type
+	IntegerParam m_maxHitPoints;		// hp for non-creature objects
+	StringParam m_armor;		// what kind of armor this object has (if any)
+	IntegerParam m_interestRadius;		// area of interest of the object
+	IntegerParam m_count;		// generic counter
+	IntegerParam m_condition;		// object condition
+	BoolParam m_wantSawAttackTriggers;		// whether we're interested in OnSawAttack triggers
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerTangibleObjectTemplate(const ServerTangibleObjectTemplate &);
+	ServerTangibleObjectTemplate & operator =(const ServerTangibleObjectTemplate &);
+};
+
+
+inline void ServerTangibleObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerTangibleObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerTangibleObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerUniverseObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerUniverseObjectTemplate.cpp
new file mode 100644
index 00000000..03a16459
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerUniverseObjectTemplate.cpp
@@ -0,0 +1,185 @@
+//========================================================================
+//
+// ServerUniverseObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerUniverseObjectTemplate.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "serverGame/UniverseObject.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerUniverseObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerUniverseObjectTemplate::ServerUniverseObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerUniverseObjectTemplate::ServerUniverseObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerUniverseObjectTemplate::~ServerUniverseObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerUniverseObjectTemplate::~ServerUniverseObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerUniverseObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerUniverseObjectTemplate_tag, create);
+}	// ServerUniverseObjectTemplate::registerMe
+
+/**
+ * Creates a ServerUniverseObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerUniverseObjectTemplate::create(const std::string & filename)
+{
+	return new ServerUniverseObjectTemplate(filename);
+}	// ServerUniverseObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerUniverseObjectTemplate::getId(void) const
+{
+	return ServerUniverseObjectTemplate_tag;
+}	// ServerUniverseObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerUniverseObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerUniverseObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerUniverseObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerUniverseObjectTemplate * base = dynamic_cast<const ServerUniverseObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerUniverseObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerUniverseObjectTemplate::createObject(void) const
+{
+	return new UniverseObject(this);
+}	// ServerUniverseObjectTemplate::createObject
+
+//@BEGIN TFD
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerUniverseObjectTemplate::testValues(void) const
+{
+	ServerObjectTemplate::testValues();
+}	// ServerUniverseObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerUniverseObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerUniverseObjectTemplate_tag)
+	{
+		ServerObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,0))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	UNREF(paramName);
+	UNREF(paramCount);
+
+	file.exitForm();
+	ServerObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerUniverseObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerUniverseObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerUniverseObjectTemplate.h
new file mode 100644
index 00000000..1a49cd4f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerUniverseObjectTemplate.h
@@ -0,0 +1,87 @@
+//========================================================================
+//
+// ServerUniverseObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerUniverseObjectTemplate_H
+#define _INCLUDED_ServerUniverseObjectTemplate_H
+
+#include "ServerObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerUniverseObjectTemplate : public ServerObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerUniverseObjectTemplate_tag = TAG(U,N,I,O)
+	};
+//@END TFD ID
+public:
+	         ServerUniverseObjectTemplate(const std::string & filename);
+	virtual ~ServerUniverseObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerUniverseObjectTemplate(const ServerUniverseObjectTemplate &);
+	ServerUniverseObjectTemplate & operator =(const ServerUniverseObjectTemplate &);
+};
+
+
+inline void ServerUniverseObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerUniverseObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerUniverseObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerVehicleObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerVehicleObjectTemplate.cpp
new file mode 100644
index 00000000..501b241a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerVehicleObjectTemplate.cpp
@@ -0,0 +1,822 @@
+//========================================================================
+//
+// ServerVehicleObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerVehicleObjectTemplate.h"
+#include "serverGame/VehicleObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerVehicleObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerVehicleObjectTemplate::ServerVehicleObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerTangibleObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerVehicleObjectTemplate::ServerVehicleObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerVehicleObjectTemplate::~ServerVehicleObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerVehicleObjectTemplate::~ServerVehicleObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerVehicleObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerVehicleObjectTemplate_tag, create);
+}	// ServerVehicleObjectTemplate::registerMe
+
+/**
+ * Creates a ServerVehicleObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerVehicleObjectTemplate::create(const std::string & filename)
+{
+	return new ServerVehicleObjectTemplate(filename);
+}	// ServerVehicleObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerVehicleObjectTemplate::getId(void) const
+{
+	return ServerVehicleObjectTemplate_tag;
+}	// ServerVehicleObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerVehicleObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerVehicleObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerVehicleObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerVehicleObjectTemplate * base = dynamic_cast<const ServerVehicleObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerVehicleObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerVehicleObjectTemplate::createObject(void) const
+{
+	return new VehicleObject(this);
+}	// ServerVehicleObjectTemplate::createObject
+
+//@BEGIN TFD
+const std::string & ServerVehicleObjectTemplate::getFuelType(bool testData) const
+{
+#ifdef _DEBUG
+std::string testDataValue = DefaultString;
+#else
+UNREF(testData);
+#endif
+
+	const ServerVehicleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerVehicleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getFuelType(true);
+#endif
+	}
+
+	if (!m_fuelType.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter fuelType in template %s", DataResource::getName()));
+			return DefaultString;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter fuelType has not been defined in template %s!", DataResource::getName()));
+			return base->getFuelType();
+		}
+	}
+
+	const std::string & value = m_fuelType.getValue();
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerVehicleObjectTemplate::getFuelType
+
+float ServerVehicleObjectTemplate::getCurrentFuel(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerVehicleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerVehicleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCurrentFuel(true);
+#endif
+	}
+
+	if (!m_currentFuel.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter currentFuel in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter currentFuel has not been defined in template %s!", DataResource::getName()));
+			return base->getCurrentFuel();
+		}
+	}
+
+	float value = m_currentFuel.getValue();
+	char delta = m_currentFuel.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getCurrentFuel();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerVehicleObjectTemplate::getCurrentFuel
+
+float ServerVehicleObjectTemplate::getCurrentFuelMin(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerVehicleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerVehicleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCurrentFuelMin(true);
+#endif
+	}
+
+	if (!m_currentFuel.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter currentFuel in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter currentFuel has not been defined in template %s!", DataResource::getName()));
+			return base->getCurrentFuelMin();
+		}
+	}
+
+	float value = m_currentFuel.getMinValue();
+	char delta = m_currentFuel.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getCurrentFuelMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerVehicleObjectTemplate::getCurrentFuelMin
+
+float ServerVehicleObjectTemplate::getCurrentFuelMax(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerVehicleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerVehicleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getCurrentFuelMax(true);
+#endif
+	}
+
+	if (!m_currentFuel.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter currentFuel in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter currentFuel has not been defined in template %s!", DataResource::getName()));
+			return base->getCurrentFuelMax();
+		}
+	}
+
+	float value = m_currentFuel.getMaxValue();
+	char delta = m_currentFuel.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getCurrentFuelMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerVehicleObjectTemplate::getCurrentFuelMax
+
+float ServerVehicleObjectTemplate::getMaxFuel(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerVehicleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerVehicleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxFuel(true);
+#endif
+	}
+
+	if (!m_maxFuel.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxFuel in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxFuel has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxFuel();
+		}
+	}
+
+	float value = m_maxFuel.getValue();
+	char delta = m_maxFuel.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxFuel();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerVehicleObjectTemplate::getMaxFuel
+
+float ServerVehicleObjectTemplate::getMaxFuelMin(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerVehicleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerVehicleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxFuelMin(true);
+#endif
+	}
+
+	if (!m_maxFuel.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxFuel in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxFuel has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxFuelMin();
+		}
+	}
+
+	float value = m_maxFuel.getMinValue();
+	char delta = m_maxFuel.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxFuelMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerVehicleObjectTemplate::getMaxFuelMin
+
+float ServerVehicleObjectTemplate::getMaxFuelMax(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerVehicleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerVehicleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxFuelMax(true);
+#endif
+	}
+
+	if (!m_maxFuel.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxFuel in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxFuel has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxFuelMax();
+		}
+	}
+
+	float value = m_maxFuel.getMaxValue();
+	char delta = m_maxFuel.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxFuelMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerVehicleObjectTemplate::getMaxFuelMax
+
+float ServerVehicleObjectTemplate::getConsumpsion(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerVehicleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerVehicleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getConsumpsion(true);
+#endif
+	}
+
+	if (!m_consumpsion.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter consumpsion in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter consumpsion has not been defined in template %s!", DataResource::getName()));
+			return base->getConsumpsion();
+		}
+	}
+
+	float value = m_consumpsion.getValue();
+	char delta = m_consumpsion.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getConsumpsion();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerVehicleObjectTemplate::getConsumpsion
+
+float ServerVehicleObjectTemplate::getConsumpsionMin(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerVehicleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerVehicleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getConsumpsionMin(true);
+#endif
+	}
+
+	if (!m_consumpsion.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter consumpsion in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter consumpsion has not been defined in template %s!", DataResource::getName()));
+			return base->getConsumpsionMin();
+		}
+	}
+
+	float value = m_consumpsion.getMinValue();
+	char delta = m_consumpsion.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getConsumpsionMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerVehicleObjectTemplate::getConsumpsionMin
+
+float ServerVehicleObjectTemplate::getConsumpsionMax(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerVehicleObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerVehicleObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getConsumpsionMax(true);
+#endif
+	}
+
+	if (!m_consumpsion.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter consumpsion in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter consumpsion has not been defined in template %s!", DataResource::getName()));
+			return base->getConsumpsionMax();
+		}
+	}
+
+	float value = m_consumpsion.getMaxValue();
+	char delta = m_consumpsion.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getConsumpsionMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerVehicleObjectTemplate::getConsumpsionMax
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerVehicleObjectTemplate::testValues(void) const
+{
+	IGNORE_RETURN(getFuelType(true));
+	IGNORE_RETURN(getCurrentFuelMin(true));
+	IGNORE_RETURN(getCurrentFuelMax(true));
+	IGNORE_RETURN(getMaxFuelMin(true));
+	IGNORE_RETURN(getMaxFuelMax(true));
+	IGNORE_RETURN(getConsumpsionMin(true));
+	IGNORE_RETURN(getConsumpsionMax(true));
+	ServerTangibleObjectTemplate::testValues();
+}	// ServerVehicleObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerVehicleObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerVehicleObjectTemplate_tag)
+	{
+		ServerTangibleObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,0))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "fuelType") == 0)
+			m_fuelType.loadFromIff(file);
+		else if (strcmp(paramName, "currentFuel") == 0)
+			m_currentFuel.loadFromIff(file);
+		else if (strcmp(paramName, "maxFuel") == 0)
+			m_maxFuel.loadFromIff(file);
+		else if (strcmp(paramName, "consumpsion") == 0)
+			m_consumpsion.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	ServerTangibleObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerVehicleObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerVehicleObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerVehicleObjectTemplate.h
new file mode 100644
index 00000000..8b66cfd5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerVehicleObjectTemplate.h
@@ -0,0 +1,101 @@
+//========================================================================
+//
+// ServerVehicleObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerVehicleObjectTemplate_H
+#define _INCLUDED_ServerVehicleObjectTemplate_H
+
+#include "ServerTangibleObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerVehicleObjectTemplate : public ServerTangibleObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerVehicleObjectTemplate_tag = TAG(V,E,H,O)
+	};
+//@END TFD ID
+public:
+	         ServerVehicleObjectTemplate(const std::string & filename);
+	virtual ~ServerVehicleObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+	const std::string &    getFuelType(bool testData = false) const;
+	float                  getCurrentFuel(bool testData = false) const;
+	float                  getCurrentFuelMin(bool testData = false) const;
+	float                  getCurrentFuelMax(bool testData = false) const;
+	float                  getMaxFuel(bool testData = false) const;
+	float                  getMaxFuelMin(bool testData = false) const;
+	float                  getMaxFuelMax(bool testData = false) const;
+	float                  getConsumpsion(bool testData = false) const;
+	float                  getConsumpsionMin(bool testData = false) const;
+	float                  getConsumpsionMax(bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	StringParam m_fuelType;		// type of fuel used
+	FloatParam m_currentFuel;		// current amount of fuel the vehicle has
+	FloatParam m_maxFuel;		// max amount of fuel the vehicle can hold
+	FloatParam m_consumpsion;		// units/sec/speed(?) fuel used
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerVehicleObjectTemplate(const ServerVehicleObjectTemplate &);
+	ServerVehicleObjectTemplate & operator =(const ServerVehicleObjectTemplate &);
+};
+
+
+inline void ServerVehicleObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerVehicleObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerVehicleObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerWeaponObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerWeaponObjectTemplate.cpp
new file mode 100644
index 00000000..8d4bbfa0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerWeaponObjectTemplate.cpp
@@ -0,0 +1,2525 @@
+//========================================================================
+//
+// ServerWeaponObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerWeaponObjectTemplate.h"
+#include "serverGame/WeaponObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerWeaponObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerWeaponObjectTemplate::ServerWeaponObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerTangibleObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerWeaponObjectTemplate::ServerWeaponObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerWeaponObjectTemplate::~ServerWeaponObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerWeaponObjectTemplate::~ServerWeaponObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerWeaponObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerWeaponObjectTemplate_tag, create);
+}	// ServerWeaponObjectTemplate::registerMe
+
+/**
+ * Creates a ServerWeaponObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerWeaponObjectTemplate::create(const std::string & filename)
+{
+	return new ServerWeaponObjectTemplate(filename);
+}	// ServerWeaponObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerWeaponObjectTemplate::getId(void) const
+{
+	return ServerWeaponObjectTemplate_tag;
+}	// ServerWeaponObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerWeaponObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerWeaponObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerWeaponObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerWeaponObjectTemplate * base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerWeaponObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerWeaponObjectTemplate::createObject(void) const
+{
+	return new WeaponObject(this);
+}	// ServerWeaponObjectTemplate::createObject
+
+//@BEGIN TFD
+ServerWeaponObjectTemplate::WeaponType ServerWeaponObjectTemplate::getWeaponType(bool testData) const
+{
+#ifdef _DEBUG
+ServerWeaponObjectTemplate::WeaponType testDataValue = static_cast<ServerWeaponObjectTemplate::WeaponType>(0);
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getWeaponType(true);
+#endif
+	}
+
+	if (!m_weaponType.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter weaponType in template %s", DataResource::getName()));
+			return static_cast<WeaponType>(0);
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter weaponType has not been defined in template %s!", DataResource::getName()));
+			return base->getWeaponType();
+		}
+	}
+
+	WeaponType value = static_cast<WeaponType>(m_weaponType.getValue());
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getWeaponType
+
+ServerWeaponObjectTemplate::AttackType ServerWeaponObjectTemplate::getAttackType(bool testData) const
+{
+#ifdef _DEBUG
+ServerWeaponObjectTemplate::AttackType testDataValue = static_cast<ServerWeaponObjectTemplate::AttackType>(0);
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getAttackType(true);
+#endif
+	}
+
+	if (!m_attackType.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter attackType in template %s", DataResource::getName()));
+			return static_cast<AttackType>(0);
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter attackType has not been defined in template %s!", DataResource::getName()));
+			return base->getAttackType();
+		}
+	}
+
+	AttackType value = static_cast<AttackType>(m_attackType.getValue());
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getAttackType
+
+ServerWeaponObjectTemplate::DamageType ServerWeaponObjectTemplate::getDamageType(bool testData) const
+{
+#ifdef _DEBUG
+ServerWeaponObjectTemplate::DamageType testDataValue = static_cast<ServerWeaponObjectTemplate::DamageType>(0);
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getDamageType(true);
+#endif
+	}
+
+	if (!m_damageType.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter damageType in template %s", DataResource::getName()));
+			return static_cast<DamageType>(0);
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter damageType has not been defined in template %s!", DataResource::getName()));
+			return base->getDamageType();
+		}
+	}
+
+	DamageType value = static_cast<DamageType>(m_damageType.getValue());
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getDamageType
+
+ServerWeaponObjectTemplate::DamageType ServerWeaponObjectTemplate::getElementalType(bool testData) const
+{
+#ifdef _DEBUG
+ServerWeaponObjectTemplate::DamageType testDataValue = static_cast<ServerWeaponObjectTemplate::DamageType>(0);
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getElementalType(true);
+#endif
+	}
+
+	if (!m_elementalType.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter elementalType in template %s", DataResource::getName()));
+			return static_cast<DamageType>(0);
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter elementalType has not been defined in template %s!", DataResource::getName()));
+			return base->getElementalType();
+		}
+	}
+
+	DamageType value = static_cast<DamageType>(m_elementalType.getValue());
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getElementalType
+
+int ServerWeaponObjectTemplate::getElementalValue(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getElementalValue(true);
+#endif
+	}
+
+	if (!m_elementalValue.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter elementalValue in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter elementalValue has not been defined in template %s!", DataResource::getName()));
+			return base->getElementalValue();
+		}
+	}
+
+	int value = m_elementalValue.getValue();
+	char delta = m_elementalValue.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getElementalValue();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getElementalValue
+
+int ServerWeaponObjectTemplate::getElementalValueMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getElementalValueMin(true);
+#endif
+	}
+
+	if (!m_elementalValue.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter elementalValue in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter elementalValue has not been defined in template %s!", DataResource::getName()));
+			return base->getElementalValueMin();
+		}
+	}
+
+	int value = m_elementalValue.getMinValue();
+	char delta = m_elementalValue.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getElementalValueMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getElementalValueMin
+
+int ServerWeaponObjectTemplate::getElementalValueMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getElementalValueMax(true);
+#endif
+	}
+
+	if (!m_elementalValue.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter elementalValue in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter elementalValue has not been defined in template %s!", DataResource::getName()));
+			return base->getElementalValueMax();
+		}
+	}
+
+	int value = m_elementalValue.getMaxValue();
+	char delta = m_elementalValue.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getElementalValueMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getElementalValueMax
+
+int ServerWeaponObjectTemplate::getMinDamageAmount(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMinDamageAmount(true);
+#endif
+	}
+
+	if (!m_minDamageAmount.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter minDamageAmount in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter minDamageAmount has not been defined in template %s!", DataResource::getName()));
+			return base->getMinDamageAmount();
+		}
+	}
+
+	int value = m_minDamageAmount.getValue();
+	char delta = m_minDamageAmount.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMinDamageAmount();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getMinDamageAmount
+
+int ServerWeaponObjectTemplate::getMinDamageAmountMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMinDamageAmountMin(true);
+#endif
+	}
+
+	if (!m_minDamageAmount.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter minDamageAmount in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter minDamageAmount has not been defined in template %s!", DataResource::getName()));
+			return base->getMinDamageAmountMin();
+		}
+	}
+
+	int value = m_minDamageAmount.getMinValue();
+	char delta = m_minDamageAmount.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMinDamageAmountMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getMinDamageAmountMin
+
+int ServerWeaponObjectTemplate::getMinDamageAmountMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMinDamageAmountMax(true);
+#endif
+	}
+
+	if (!m_minDamageAmount.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter minDamageAmount in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter minDamageAmount has not been defined in template %s!", DataResource::getName()));
+			return base->getMinDamageAmountMax();
+		}
+	}
+
+	int value = m_minDamageAmount.getMaxValue();
+	char delta = m_minDamageAmount.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMinDamageAmountMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getMinDamageAmountMax
+
+int ServerWeaponObjectTemplate::getMaxDamageAmount(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxDamageAmount(true);
+#endif
+	}
+
+	if (!m_maxDamageAmount.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxDamageAmount in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxDamageAmount has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxDamageAmount();
+		}
+	}
+
+	int value = m_maxDamageAmount.getValue();
+	char delta = m_maxDamageAmount.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxDamageAmount();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getMaxDamageAmount
+
+int ServerWeaponObjectTemplate::getMaxDamageAmountMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxDamageAmountMin(true);
+#endif
+	}
+
+	if (!m_maxDamageAmount.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxDamageAmount in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxDamageAmount has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxDamageAmountMin();
+		}
+	}
+
+	int value = m_maxDamageAmount.getMinValue();
+	char delta = m_maxDamageAmount.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxDamageAmountMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getMaxDamageAmountMin
+
+int ServerWeaponObjectTemplate::getMaxDamageAmountMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxDamageAmountMax(true);
+#endif
+	}
+
+	if (!m_maxDamageAmount.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxDamageAmount in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxDamageAmount has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxDamageAmountMax();
+		}
+	}
+
+	int value = m_maxDamageAmount.getMaxValue();
+	char delta = m_maxDamageAmount.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxDamageAmountMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getMaxDamageAmountMax
+
+float ServerWeaponObjectTemplate::getAttackSpeed(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getAttackSpeed(true);
+#endif
+	}
+
+	if (!m_attackSpeed.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter attackSpeed in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter attackSpeed has not been defined in template %s!", DataResource::getName()));
+			return base->getAttackSpeed();
+		}
+	}
+
+	float value = m_attackSpeed.getValue();
+	char delta = m_attackSpeed.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getAttackSpeed();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getAttackSpeed
+
+float ServerWeaponObjectTemplate::getAttackSpeedMin(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getAttackSpeedMin(true);
+#endif
+	}
+
+	if (!m_attackSpeed.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter attackSpeed in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter attackSpeed has not been defined in template %s!", DataResource::getName()));
+			return base->getAttackSpeedMin();
+		}
+	}
+
+	float value = m_attackSpeed.getMinValue();
+	char delta = m_attackSpeed.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getAttackSpeedMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getAttackSpeedMin
+
+float ServerWeaponObjectTemplate::getAttackSpeedMax(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getAttackSpeedMax(true);
+#endif
+	}
+
+	if (!m_attackSpeed.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter attackSpeed in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter attackSpeed has not been defined in template %s!", DataResource::getName()));
+			return base->getAttackSpeedMax();
+		}
+	}
+
+	float value = m_attackSpeed.getMaxValue();
+	char delta = m_attackSpeed.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getAttackSpeedMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getAttackSpeedMax
+
+float ServerWeaponObjectTemplate::getAudibleRange(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getAudibleRange(true);
+#endif
+	}
+
+	if (!m_audibleRange.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter audibleRange in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter audibleRange has not been defined in template %s!", DataResource::getName()));
+			return base->getAudibleRange();
+		}
+	}
+
+	float value = m_audibleRange.getValue();
+	char delta = m_audibleRange.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getAudibleRange();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getAudibleRange
+
+float ServerWeaponObjectTemplate::getAudibleRangeMin(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getAudibleRangeMin(true);
+#endif
+	}
+
+	if (!m_audibleRange.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter audibleRange in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter audibleRange has not been defined in template %s!", DataResource::getName()));
+			return base->getAudibleRangeMin();
+		}
+	}
+
+	float value = m_audibleRange.getMinValue();
+	char delta = m_audibleRange.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getAudibleRangeMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getAudibleRangeMin
+
+float ServerWeaponObjectTemplate::getAudibleRangeMax(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getAudibleRangeMax(true);
+#endif
+	}
+
+	if (!m_audibleRange.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter audibleRange in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter audibleRange has not been defined in template %s!", DataResource::getName()));
+			return base->getAudibleRangeMax();
+		}
+	}
+
+	float value = m_audibleRange.getMaxValue();
+	char delta = m_audibleRange.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getAudibleRangeMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getAudibleRangeMax
+
+float ServerWeaponObjectTemplate::getMinRange(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMinRange(true);
+#endif
+	}
+
+	if (!m_minRange.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter minRange in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter minRange has not been defined in template %s!", DataResource::getName()));
+			return base->getMinRange();
+		}
+	}
+
+	float value = m_minRange.getValue();
+	char delta = m_minRange.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMinRange();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getMinRange
+
+float ServerWeaponObjectTemplate::getMinRangeMin(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMinRangeMin(true);
+#endif
+	}
+
+	if (!m_minRange.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter minRange in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter minRange has not been defined in template %s!", DataResource::getName()));
+			return base->getMinRangeMin();
+		}
+	}
+
+	float value = m_minRange.getMinValue();
+	char delta = m_minRange.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMinRangeMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getMinRangeMin
+
+float ServerWeaponObjectTemplate::getMinRangeMax(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMinRangeMax(true);
+#endif
+	}
+
+	if (!m_minRange.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter minRange in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter minRange has not been defined in template %s!", DataResource::getName()));
+			return base->getMinRangeMax();
+		}
+	}
+
+	float value = m_minRange.getMaxValue();
+	char delta = m_minRange.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMinRangeMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getMinRangeMax
+
+float ServerWeaponObjectTemplate::getMaxRange(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxRange(true);
+#endif
+	}
+
+	if (!m_maxRange.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxRange in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxRange has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxRange();
+		}
+	}
+
+	float value = m_maxRange.getValue();
+	char delta = m_maxRange.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxRange();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getMaxRange
+
+float ServerWeaponObjectTemplate::getMaxRangeMin(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxRangeMin(true);
+#endif
+	}
+
+	if (!m_maxRange.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxRange in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxRange has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxRangeMin();
+		}
+	}
+
+	float value = m_maxRange.getMinValue();
+	char delta = m_maxRange.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxRangeMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getMaxRangeMin
+
+float ServerWeaponObjectTemplate::getMaxRangeMax(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getMaxRangeMax(true);
+#endif
+	}
+
+	if (!m_maxRange.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter maxRange in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter maxRange has not been defined in template %s!", DataResource::getName()));
+			return base->getMaxRangeMax();
+		}
+	}
+
+	float value = m_maxRange.getMaxValue();
+	char delta = m_maxRange.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getMaxRangeMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getMaxRangeMax
+
+float ServerWeaponObjectTemplate::getDamageRadius(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getDamageRadius(true);
+#endif
+	}
+
+	if (!m_damageRadius.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter damageRadius in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter damageRadius has not been defined in template %s!", DataResource::getName()));
+			return base->getDamageRadius();
+		}
+	}
+
+	float value = m_damageRadius.getValue();
+	char delta = m_damageRadius.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getDamageRadius();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getDamageRadius
+
+float ServerWeaponObjectTemplate::getDamageRadiusMin(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getDamageRadiusMin(true);
+#endif
+	}
+
+	if (!m_damageRadius.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter damageRadius in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter damageRadius has not been defined in template %s!", DataResource::getName()));
+			return base->getDamageRadiusMin();
+		}
+	}
+
+	float value = m_damageRadius.getMinValue();
+	char delta = m_damageRadius.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getDamageRadiusMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getDamageRadiusMin
+
+float ServerWeaponObjectTemplate::getDamageRadiusMax(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getDamageRadiusMax(true);
+#endif
+	}
+
+	if (!m_damageRadius.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter damageRadius in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter damageRadius has not been defined in template %s!", DataResource::getName()));
+			return base->getDamageRadiusMax();
+		}
+	}
+
+	float value = m_damageRadius.getMaxValue();
+	char delta = m_damageRadius.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getDamageRadiusMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getDamageRadiusMax
+
+float ServerWeaponObjectTemplate::getWoundChance(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getWoundChance(true);
+#endif
+	}
+
+	if (!m_woundChance.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter woundChance in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter woundChance has not been defined in template %s!", DataResource::getName()));
+			return base->getWoundChance();
+		}
+	}
+
+	float value = m_woundChance.getValue();
+	char delta = m_woundChance.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getWoundChance();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getWoundChance
+
+float ServerWeaponObjectTemplate::getWoundChanceMin(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getWoundChanceMin(true);
+#endif
+	}
+
+	if (!m_woundChance.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter woundChance in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter woundChance has not been defined in template %s!", DataResource::getName()));
+			return base->getWoundChanceMin();
+		}
+	}
+
+	float value = m_woundChance.getMinValue();
+	char delta = m_woundChance.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getWoundChanceMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getWoundChanceMin
+
+float ServerWeaponObjectTemplate::getWoundChanceMax(bool testData) const
+{
+#ifdef _DEBUG
+float testDataValue = 0.0f;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getWoundChanceMax(true);
+#endif
+	}
+
+	if (!m_woundChance.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter woundChance in template %s", DataResource::getName()));
+			return 0.0f;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter woundChance has not been defined in template %s!", DataResource::getName()));
+			return base->getWoundChanceMax();
+		}
+	}
+
+	float value = m_woundChance.getMaxValue();
+	char delta = m_woundChance.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		float baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getWoundChanceMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<float>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<float>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getWoundChanceMax
+
+int ServerWeaponObjectTemplate::getAttackCost(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getAttackCost(true);
+#endif
+	}
+
+	if (!m_attackCost.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter attackCost in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter attackCost has not been defined in template %s!", DataResource::getName()));
+			return base->getAttackCost();
+		}
+	}
+
+	int value = m_attackCost.getValue();
+	char delta = m_attackCost.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getAttackCost();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getAttackCost
+
+int ServerWeaponObjectTemplate::getAttackCostMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getAttackCostMin(true);
+#endif
+	}
+
+	if (!m_attackCost.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter attackCost in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter attackCost has not been defined in template %s!", DataResource::getName()));
+			return base->getAttackCostMin();
+		}
+	}
+
+	int value = m_attackCost.getMinValue();
+	char delta = m_attackCost.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getAttackCostMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getAttackCostMin
+
+int ServerWeaponObjectTemplate::getAttackCostMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getAttackCostMax(true);
+#endif
+	}
+
+	if (!m_attackCost.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter attackCost in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter attackCost has not been defined in template %s!", DataResource::getName()));
+			return base->getAttackCostMax();
+		}
+	}
+
+	int value = m_attackCost.getMaxValue();
+	char delta = m_attackCost.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getAttackCostMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getAttackCostMax
+
+int ServerWeaponObjectTemplate::getAccuracy(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getAccuracy(true);
+#endif
+	}
+
+	if (!m_accuracy.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter accuracy in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter accuracy has not been defined in template %s!", DataResource::getName()));
+			return base->getAccuracy();
+		}
+	}
+
+	int value = m_accuracy.getValue();
+	char delta = m_accuracy.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getAccuracy();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getAccuracy
+
+int ServerWeaponObjectTemplate::getAccuracyMin(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getAccuracyMin(true);
+#endif
+	}
+
+	if (!m_accuracy.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter accuracy in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter accuracy has not been defined in template %s!", DataResource::getName()));
+			return base->getAccuracyMin();
+		}
+	}
+
+	int value = m_accuracy.getMinValue();
+	char delta = m_accuracy.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getAccuracyMin();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getAccuracyMin
+
+int ServerWeaponObjectTemplate::getAccuracyMax(bool testData) const
+{
+#ifdef _DEBUG
+int testDataValue = 0;
+#else
+UNREF(testData);
+#endif
+
+	const ServerWeaponObjectTemplate * base = NULL;
+	if (m_baseData != NULL)
+	{
+		base = dynamic_cast<const ServerWeaponObjectTemplate *>(m_baseData);
+#ifdef _DEBUG
+		if (testData && base != NULL)
+			testDataValue = base->getAccuracyMax(true);
+#endif
+	}
+
+	if (!m_accuracy.isLoaded())
+	{
+		if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == NULL)
+		{
+			DEBUG_WARNING(true, ("Returning default value for missing parameter accuracy in template %s", DataResource::getName()));
+			return 0;
+		}
+		else
+		{
+			DEBUG_FATAL(base == NULL, ("Template parameter accuracy has not been defined in template %s!", DataResource::getName()));
+			return base->getAccuracyMax();
+		}
+	}
+
+	int value = m_accuracy.getMaxValue();
+	char delta = m_accuracy.getDeltaType();
+	if (delta == '+' || delta == '-' || delta == '_' || delta == '=')
+	{
+		int baseValue = 0;
+		if (m_baseData != NULL)
+		{
+			if (base != NULL)
+				baseValue = base->getAccuracyMax();
+			else if (ms_allowDefaultTemplateParams)
+				DEBUG_WARNING(true, ("No base template for delta, using 0"));
+			else
+				NOT_NULL(base);
+		}
+		if (delta == '+')
+			value = baseValue + value;
+		else if (delta == '-')
+			value = baseValue - value;
+		else if (delta == '=')
+			value = baseValue + static_cast<int>(baseValue * (value / 100.0f));
+		else if (delta == '_')
+			value = baseValue - static_cast<int>(baseValue * (value / 100.0f));
+	}
+#ifdef _DEBUG
+	if (testData && base != NULL)
+	{
+	}
+#endif
+
+	return value;
+}	// ServerWeaponObjectTemplate::getAccuracyMax
+
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerWeaponObjectTemplate::testValues(void) const
+{
+	IGNORE_RETURN(getWeaponType(true));
+	IGNORE_RETURN(getAttackType(true));
+	IGNORE_RETURN(getDamageType(true));
+	IGNORE_RETURN(getElementalType(true));
+	IGNORE_RETURN(getElementalValueMin(true));
+	IGNORE_RETURN(getElementalValueMax(true));
+	IGNORE_RETURN(getMinDamageAmountMin(true));
+	IGNORE_RETURN(getMinDamageAmountMax(true));
+	IGNORE_RETURN(getMaxDamageAmountMin(true));
+	IGNORE_RETURN(getMaxDamageAmountMax(true));
+	IGNORE_RETURN(getAttackSpeedMin(true));
+	IGNORE_RETURN(getAttackSpeedMax(true));
+	IGNORE_RETURN(getAudibleRangeMin(true));
+	IGNORE_RETURN(getAudibleRangeMax(true));
+	IGNORE_RETURN(getMinRangeMin(true));
+	IGNORE_RETURN(getMinRangeMax(true));
+	IGNORE_RETURN(getMaxRangeMin(true));
+	IGNORE_RETURN(getMaxRangeMax(true));
+	IGNORE_RETURN(getDamageRadiusMin(true));
+	IGNORE_RETURN(getDamageRadiusMax(true));
+	IGNORE_RETURN(getWoundChanceMin(true));
+	IGNORE_RETURN(getWoundChanceMax(true));
+	IGNORE_RETURN(getAttackCostMin(true));
+	IGNORE_RETURN(getAttackCostMax(true));
+	IGNORE_RETURN(getAccuracyMin(true));
+	IGNORE_RETURN(getAccuracyMax(true));
+	ServerTangibleObjectTemplate::testValues();
+}	// ServerWeaponObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerWeaponObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerWeaponObjectTemplate_tag)
+	{
+		ServerTangibleObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,1,1))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	for (int i = 0; i < paramCount; ++i)
+	{
+		file.enterChunk();
+		file.read_string(paramName, MAX_NAME_SIZE);
+		if (strcmp(paramName, "weaponType") == 0)
+			m_weaponType.loadFromIff(file);
+		else if (strcmp(paramName, "attackType") == 0)
+			m_attackType.loadFromIff(file);
+		else if (strcmp(paramName, "damageType") == 0)
+			m_damageType.loadFromIff(file);
+		else if (strcmp(paramName, "elementalType") == 0)
+			m_elementalType.loadFromIff(file);
+		else if (strcmp(paramName, "elementalValue") == 0)
+			m_elementalValue.loadFromIff(file);
+		else if (strcmp(paramName, "minDamageAmount") == 0)
+			m_minDamageAmount.loadFromIff(file);
+		else if (strcmp(paramName, "maxDamageAmount") == 0)
+			m_maxDamageAmount.loadFromIff(file);
+		else if (strcmp(paramName, "attackSpeed") == 0)
+			m_attackSpeed.loadFromIff(file);
+		else if (strcmp(paramName, "audibleRange") == 0)
+			m_audibleRange.loadFromIff(file);
+		else if (strcmp(paramName, "minRange") == 0)
+			m_minRange.loadFromIff(file);
+		else if (strcmp(paramName, "maxRange") == 0)
+			m_maxRange.loadFromIff(file);
+		else if (strcmp(paramName, "damageRadius") == 0)
+			m_damageRadius.loadFromIff(file);
+		else if (strcmp(paramName, "woundChance") == 0)
+			m_woundChance.loadFromIff(file);
+		else if (strcmp(paramName, "attackCost") == 0)
+			m_attackCost.loadFromIff(file);
+		else if (strcmp(paramName, "accuracy") == 0)
+			m_accuracy.loadFromIff(file);
+		file.exitChunk(true);
+	}
+
+	file.exitForm();
+	ServerTangibleObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerWeaponObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerWeaponObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerWeaponObjectTemplate.h
new file mode 100644
index 00000000..1a3107e8
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerWeaponObjectTemplate.h
@@ -0,0 +1,173 @@
+//========================================================================
+//
+// ServerWeaponObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerWeaponObjectTemplate_H
+#define _INCLUDED_ServerWeaponObjectTemplate_H
+
+#include "ServerTangibleObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerWeaponObjectTemplate : public ServerTangibleObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerWeaponObjectTemplate_tag = TAG(W,E,A,O)
+	};
+//@END TFD ID
+public:
+	         ServerWeaponObjectTemplate(const std::string & filename);
+	virtual ~ServerWeaponObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+	enum AttackType
+	{
+		AT_melee,
+		AT_ranged,
+		AT_thrown,
+		AttackType_Last = AT_thrown,
+	};
+
+	enum AttribModDecaySpecial
+	{
+		AMDS_pool = -1,		//            use the attribute pool recovery rate (normal recovery)
+		AMDS_wound = -2,		//            can only be healed by skill/item use, heal difficulty adjusted by shock wound value
+		AMDS_antidote = -3,		//            used to clear all attrib mods for a given attribute
+		AttribModDecaySpecial_Last = AMDS_antidote,
+	};
+
+	enum WeaponType
+	{
+		WT_rifle,
+		WT_lightRifle,
+		WT_pistol,
+		WT_heavyWeapon,
+		WT_1handMelee,
+		WT_2handMelee,
+		WT_unarmed,
+		WT_polearm,
+		WT_thrown,
+		WT_1handLightsaber,
+		WT_2handLightsaber,
+		WT_polearmLightsaber,
+		WeaponType_Last = WT_polearmLightsaber,
+	};
+
+public:
+	WeaponType     getWeaponType(bool testData = false) const;
+	AttackType     getAttackType(bool testData = false) const;
+	DamageType     getDamageType(bool testData = false) const;
+	DamageType     getElementalType(bool testData = false) const;
+	int                    getElementalValue(bool testData = false) const;
+	int                    getElementalValueMin(bool testData = false) const;
+	int                    getElementalValueMax(bool testData = false) const;
+	int                    getMinDamageAmount(bool testData = false) const;
+	int                    getMinDamageAmountMin(bool testData = false) const;
+	int                    getMinDamageAmountMax(bool testData = false) const;
+	int                    getMaxDamageAmount(bool testData = false) const;
+	int                    getMaxDamageAmountMin(bool testData = false) const;
+	int                    getMaxDamageAmountMax(bool testData = false) const;
+	float                  getAttackSpeed(bool testData = false) const;
+	float                  getAttackSpeedMin(bool testData = false) const;
+	float                  getAttackSpeedMax(bool testData = false) const;
+	float                  getAudibleRange(bool testData = false) const;
+	float                  getAudibleRangeMin(bool testData = false) const;
+	float                  getAudibleRangeMax(bool testData = false) const;
+	float                  getMinRange(bool testData = false) const;
+	float                  getMinRangeMin(bool testData = false) const;
+	float                  getMinRangeMax(bool testData = false) const;
+	float                  getMaxRange(bool testData = false) const;
+	float                  getMaxRangeMin(bool testData = false) const;
+	float                  getMaxRangeMax(bool testData = false) const;
+	float                  getDamageRadius(bool testData = false) const;
+	float                  getDamageRadiusMin(bool testData = false) const;
+	float                  getDamageRadiusMax(bool testData = false) const;
+	float                  getWoundChance(bool testData = false) const;
+	float                  getWoundChanceMin(bool testData = false) const;
+	float                  getWoundChanceMax(bool testData = false) const;
+	int                    getAttackCost(bool testData = false) const;
+	int                    getAttackCostMin(bool testData = false) const;
+	int                    getAttackCostMax(bool testData = false) const;
+	int                    getAccuracy(bool testData = false) const;
+	int                    getAccuracyMin(bool testData = false) const;
+	int                    getAccuracyMax(bool testData = false) const;
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+	IntegerParam m_weaponType;		// General type of weapon
+	IntegerParam m_attackType;		// Type of attack this weapon is used with.
+	IntegerParam m_damageType;		// The kind of damage this weapon deals.
+	IntegerParam m_elementalType;		// The kind of special elemental damage this weapon deals.
+	IntegerParam m_elementalValue;		// The amount of special elemental damage this weapon deals.
+	IntegerParam m_minDamageAmount;		// The amount of damage done by a weapon is between min-max evenly, randomly, distributed.
+	IntegerParam m_maxDamageAmount;		// The amount of damage done by a weapon is between min-max evenly, randomly, distributed.
+	FloatParam m_attackSpeed;		// The weapon's intrisic firing rate.
+	FloatParam m_audibleRange;		// Distance message gets sent to NPCs when fired.
+	FloatParam m_minRange;		// range where the min range mod is set
+	FloatParam m_maxRange;		// range where the max range mod is set
+	FloatParam m_damageRadius;		// Blast radius for area effect weapons
+	FloatParam m_woundChance;		// Base % chance for a wound to occur on a successful attack
+	IntegerParam m_attackCost;		// Amount of H/A/M drained by using the weapon
+	IntegerParam m_accuracy;		// Accuracy bonus/penalty for this weapon
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerWeaponObjectTemplate(const ServerWeaponObjectTemplate &);
+	ServerWeaponObjectTemplate & operator =(const ServerWeaponObjectTemplate &);
+};
+
+
+inline void ServerWeaponObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerWeaponObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerWeaponObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp
new file mode 100644
index 00000000..810113e1
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp
@@ -0,0 +1,187 @@
+//========================================================================
+//
+// ServerXpManagerObjectTemplate.cpp
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "ServerXpManagerObjectTemplate.h"
+#include "sharedDebug/DataLint.h"
+#include "sharedFile/Iff.h"
+#include "sharedObject/ObjectTemplate.h"
+#include "sharedObject/ObjectTemplateList.h"
+//#include "serverGame/XpManagerObject.h"
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+#include <stdio.h>
+
+const std::string DefaultString("");
+const StringId DefaultStringId("", 0);
+//const Vector DefaultVector(0,0,0);
+const TriggerVolumeData DefaultTriggerVolumeData;
+
+bool ServerXpManagerObjectTemplate::ms_allowDefaultTemplateParams = true;
+
+
+/**
+ * Class constructor.
+ */
+ServerXpManagerObjectTemplate::ServerXpManagerObjectTemplate(const std::string & filename)
+//@BEGIN TFD INIT
+	: ServerUniverseObjectTemplate(filename)
+	,m_versionOk(true)
+//@END TFD INIT
+{
+}	// ServerXpManagerObjectTemplate::ServerXpManagerObjectTemplate
+
+/**
+ * Class destructor.
+ */
+ServerXpManagerObjectTemplate::~ServerXpManagerObjectTemplate()
+{
+//@BEGIN TFD CLEANUP
+//@END TFD CLEANUP
+}	// ServerXpManagerObjectTemplate::~ServerXpManagerObjectTemplate
+
+/**
+ * Static function used to register this template.
+ */
+void ServerXpManagerObjectTemplate::registerMe(void)
+{
+	ObjectTemplateList::registerTemplate(ServerXpManagerObjectTemplate_tag, create);
+}	// ServerXpManagerObjectTemplate::registerMe
+
+/**
+ * Creates a ServerXpManagerObjectTemplate template.
+ *
+ * @return a new instance of the template
+ */
+ObjectTemplate * ServerXpManagerObjectTemplate::create(const std::string & filename)
+{
+	return new ServerXpManagerObjectTemplate(filename);
+}	// ServerXpManagerObjectTemplate::create
+
+/**
+ * Returns the template id.
+ *
+ * @return the template id
+ */
+Tag ServerXpManagerObjectTemplate::getId(void) const
+{
+	return ServerXpManagerObjectTemplate_tag;
+}	// ServerXpManagerObjectTemplate::getId
+
+/**
+ * Returns this template's version.
+ *
+ * @return the version
+ */
+Tag ServerXpManagerObjectTemplate::getTemplateVersion(void) const
+{
+	return m_templateVersion;
+} // ServerXpManagerObjectTemplate::getTemplateVersion
+
+/**
+ * Returns the highest version of this template or it's base templates.
+ *
+ * @return the highest version
+ */
+Tag ServerXpManagerObjectTemplate::getHighestTemplateVersion(void) const
+{
+	if (m_baseData == NULL)
+		return m_templateVersion;
+	const ServerXpManagerObjectTemplate * base = dynamic_cast<const ServerXpManagerObjectTemplate *>(m_baseData);
+	if (base == NULL)
+		return m_templateVersion;
+	return std::max(m_templateVersion, base->getHighestTemplateVersion());
+} // ServerXpManagerObjectTemplate::getHighestTemplateVersion
+
+/**
+ * Creates a new object from this template.
+ *
+ * @return the object
+ */
+Object * ServerXpManagerObjectTemplate::createObject(void) const
+{
+//	return new XpManagerObject(this);
+	return NULL;
+}	// ServerXpManagerObjectTemplate::createObject
+
+//@BEGIN TFD
+#ifdef _DEBUG
+/**
+ * Special function used by datalint. Checks for duplicate values in base and derived templates.
+ */
+void ServerXpManagerObjectTemplate::testValues(void) const
+{
+	ServerUniverseObjectTemplate::testValues();
+}	// ServerXpManagerObjectTemplate::testValues
+#endif
+
+/**
+ * Loads the template data from an iff file. We should already be in the form
+ * for this template.
+ *
+ * @param file		file to load from
+ */
+void ServerXpManagerObjectTemplate::load(Iff &file)
+{
+static const int MAX_NAME_SIZE = 256;
+char paramName[MAX_NAME_SIZE];
+
+	if (file.getCurrentName() != ServerXpManagerObjectTemplate_tag)
+	{
+		ServerUniverseObjectTemplate::load(file);
+		return;
+	}
+
+	file.enterForm();
+	m_templateVersion = file.getCurrentName();
+	if (m_templateVersion == TAG(D,E,R,V))
+	{
+		file.enterForm();
+		file.enterChunk();
+		std::string baseFilename;
+		file.read_string(baseFilename);
+		file.exitChunk();
+		const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename);
+		DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str()));
+		if (m_baseData == base && base != NULL)
+			base->releaseReference();
+		else
+		{
+			if (m_baseData != NULL)
+				m_baseData->releaseReference();
+			m_baseData = base;
+		}
+		file.exitForm();
+		m_templateVersion = file.getCurrentName();
+	}
+	if (getHighestTemplateVersion() != TAG(0,0,0,0))
+	{
+		if (DataLint::isEnabled())
+			DEBUG_WARNING(true, ("template %s version out of date", file.getFileName()));
+		m_versionOk = false;
+	}
+
+	file.enterForm();
+
+	file.enterChunk();
+	int paramCount = file.read_int32();
+	file.exitChunk();
+	UNREF(paramName);
+	UNREF(paramCount);
+
+	file.exitForm();
+	ServerUniverseObjectTemplate::load(file);
+	file.exitForm();
+	return;
+}	// ServerXpManagerObjectTemplate::load
+
+//@END TFD
diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.h
new file mode 100644
index 00000000..0e17966c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.h
@@ -0,0 +1,87 @@
+//========================================================================
+//
+// ServerXpManagerObjectTemplate.h
+//
+//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be
+//overwritten the next time the template definition is compiled. Do not
+//make changes to code inside these blocks.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef _INCLUDED_ServerXpManagerObjectTemplate_H
+#define _INCLUDED_ServerXpManagerObjectTemplate_H
+
+#include "ServerUniverseObjectTemplate.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedUtility/TemplateParameter.h"
+
+
+class Vector;
+typedef StructParam<ObjectTemplate> StructParamOT;
+//@BEGIN TFD TEMPLATE REFS
+//@END TFD TEMPLATE REFS
+
+
+class ServerXpManagerObjectTemplate : public ServerUniverseObjectTemplate
+{
+public:
+//@BEGIN TFD ID
+	enum
+	{
+		ServerXpManagerObjectTemplate_tag = TAG(X,P,M,G)
+	};
+//@END TFD ID
+public:
+	         ServerXpManagerObjectTemplate(const std::string & filename);
+	virtual ~ServerXpManagerObjectTemplate();
+
+	virtual Tag getId(void) const;
+	virtual Tag getTemplateVersion(void) const;
+	virtual Tag getHighestTemplateVersion(void) const;
+	static void install(bool allowDefaultTemplateParams = true);
+
+//@BEGIN TFD
+public:
+
+#ifdef _DEBUG
+public:
+	// special code used by datalint
+	virtual void testValues(void) const;
+#endif
+
+protected:
+	virtual void load(Iff &file);
+
+private:
+//@END TFD
+
+public:
+	// user functions
+	virtual Object * createObject(void) const;
+
+private:
+	Tag  m_templateVersion;	// the template version
+	bool m_versionOk;	// flag that the template version loaded is the one we expect
+	static bool ms_allowDefaultTemplateParams;	// flag to allow defaut params instead of fataling
+
+	static void registerMe(void);
+	static ObjectTemplate * create(const std::string & filename);
+
+	// no copying
+	ServerXpManagerObjectTemplate(const ServerXpManagerObjectTemplate &);
+	ServerXpManagerObjectTemplate & operator =(const ServerXpManagerObjectTemplate &);
+};
+
+
+inline void ServerXpManagerObjectTemplate::install(bool allowDefaultTemplateParams)
+{
+	ms_allowDefaultTemplateParams = allowDefaultTemplateParams;
+//@BEGIN TFD INSTALL
+	ServerXpManagerObjectTemplate::registerMe();
+//@END TFD INSTALL
+}
+
+
+#endif	// _INCLUDED_ServerXpManagerObjectTemplate_H
diff --git a/engine/server/library/serverGame/src/shared/pvp/Pvp.cpp b/engine/server/library/serverGame/src/shared/pvp/Pvp.cpp
new file mode 100644
index 00000000..d705d1cf
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/Pvp.cpp
@@ -0,0 +1,1364 @@
+// ======================================================================
+//
+// Pvp.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/Pvp.h"
+
+#include "serverGame/CellObject.h"
+#include "serverGame/CityInfo.h"
+#include "serverGame/CityInterface.h"
+#include "serverGame/Client.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GuildInterface.h"
+#include "serverGame/GuildObject.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/PvpInternal.h"
+#include "serverGame/PvpRuleSetBase.h"
+#include "serverGame/RegionMaster.h"
+#include "serverGame/RegionPvp.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/TangibleObject.h"
+#include "sharedFoundation/CalendarTime.h"
+#include "sharedFoundation/ConfigFile.h"
+#include "sharedFoundation/Scheduler.h"
+#include "sharedGame/PvpData.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/UpdatePvpStatusMessage.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+
+// ======================================================================
+
+namespace PvpNamespace
+{
+	bool s_installed;
+	Scheduler *s_pvpScheduler;
+
+	std::string const s_gcwRankTableName("datatables/gcw/gcw_rank.iff");
+	std::string const s_gcwRankDecayExclusionTableName("datatables/gcw/gcw_rank_decay_exclusion.iff");
+
+	Pvp::PvpRankInfo s_RankNone;
+	std::map<int, Pvp::PvpRankInfo *> s_RankData;
+	std::multimap<time_t, time_t> s_RankDecayExclusion;
+	int s_minRatingForRank;
+	int s_maxRatingForRank;
+	std::string s_debugGcwRankTable;
+	std::string s_debugGcwFormulasTable;
+	std::string s_debugGcwRankDecayExclusion;
+
+	void loadGcwRankTable();
+	void loadGcwRankDecayExclusionTable();
+
+	std::string const s_gcwScoreCategoryTableName("datatables/gcw/gcw_score_category.iff");
+	std::map<std::string, Pvp::GcwScoreCategory const *> s_gcwScoreCategory;
+
+	std::map<std::string, std::map<std::string, std::pair<std::pair<float, float>, float> > > s_gcwScoreCategoryRegions;
+
+	std::map<std::string, std::map<std::string, int> > s_gcwScoreCategoryGroups;
+
+	//
+	// *****WARNING WARNING WARNING WARNING WARNING*****
+	// this list must be kept in sync in
+	// PvpNamespace::loadGcwScoreCategoryTable()
+	// SwgCuiSpaceZoneMap::SwgCuiSpaceZoneMap()
+	// SwgCuiHyperspaceMap::SwgCuiHyperspaceMap()
+	// and gcw.scriptlib (validScenes and defaultRegions)
+	// *****WARNING WARNING WARNING WARNING WARNING*****
+	//
+	std::map<std::string, Pvp::GcwScoreCategory const *> s_gcwScoreDefaultCategoryForPlanet;
+
+	void loadGcwScoreCategoryTable();
+}
+
+// ======================================================================
+
+using namespace PvpNamespace;
+
+// ======================================================================
+
+void Pvp::install()
+{
+	FATAL(s_installed, ("Pvp::install - already installed"));
+	s_installed = true;
+	s_pvpScheduler = new Scheduler;
+
+	loadGcwRankTable();
+	loadGcwRankDecayExclusionTable();
+	loadGcwScoreCategoryTable();
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::remove()
+{
+	FATAL(!s_installed, ("Pvp::remove - not installed"));
+
+	for (std::map<int, Pvp::PvpRankInfo *>::const_iterator iter = s_RankData.begin(); iter != s_RankData.end(); ++iter)
+		delete iter->second;
+
+	s_RankData.clear();
+
+	s_RankDecayExclusion.clear();
+
+	for (std::map<std::string, Pvp::GcwScoreCategory const *>::const_iterator iter2 = s_gcwScoreCategory.begin(); iter2 != s_gcwScoreCategory.end(); ++iter2)
+		delete iter2->second;
+
+	s_gcwScoreCategory.clear();
+
+	s_gcwScoreCategoryRegions.clear();
+
+	s_gcwScoreCategoryGroups.clear();
+
+	delete s_pvpScheduler;
+	s_pvpScheduler = 0;
+	s_installed = false;
+}
+
+// ----------------------------------------------------------------------
+
+bool Pvp::canAttack(TangibleObject const &actor, TangibleObject const &target)
+{
+	if (!PvpInternal::getRuleSet(actor, target).canAttack(actor, target))
+		return false;
+
+	// At this point, we know that the client believes they are able to attack, but now we apply any rules which
+	// do not affect the client status.
+
+	// Prevent people from attacking if they are not allowed in their opponent's cell.  We cannot easily update
+	// pvp status of clients on change of this condition, so we apply it outside of normal pvp rules.
+	CreatureObject const * const creatureTarget = target.asCreatureObject();
+	if (creatureTarget)
+	{
+		// if the target is not allowed in the actor's cell, don't allow the attack
+		CellObject const * const actorCell = ContainerInterface::getContainingCellObject(actor);
+		if (actorCell && !actorCell->isAllowed(*creatureTarget))
+			return false;
+	}
+	CreatureObject const * const creatureActor = actor.asCreatureObject();
+	if (creatureActor)
+	{
+		// if the actor is not allowed in the target's cell, don't allow the attack
+		CellObject const * const targetCell = ContainerInterface::getContainingCellObject(target);
+		if (targetCell && !targetCell->isAllowed(*creatureActor))
+			return false;
+	}
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+bool Pvp::canHelp(TangibleObject const &actor, TangibleObject const &target)
+{
+	return PvpInternal::getRuleSet(actor, target).canHelp(actor, target);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::attackPerformed(TangibleObject &actor, TangibleObject &target)
+{
+	std::vector<PvpEnemy> actorRepercussions;
+	std::vector<PvpEnemy> targetRepercussions;
+	PvpRuleSetBase &ruleSet = PvpInternal::getRuleSet(actor, target);
+	ruleSet.getAttackRepercussions(actor, target, actorRepercussions, targetRepercussions);
+	ruleSet.applyRepercussions(actor, target, actorRepercussions, targetRepercussions);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::helpPerformed(TangibleObject &actor, TangibleObject &target)
+{
+	std::vector<PvpEnemy> actorRepercussions;
+	std::vector<PvpEnemy> targetRepercussions;
+	PvpRuleSetBase &ruleSet = PvpInternal::getRuleSet(actor, target);
+	ruleSet.getHelpRepercussions(actor, target, actorRepercussions, targetRepercussions);
+	ruleSet.applyRepercussions(actor, target, actorRepercussions, targetRepercussions);
+}
+
+// ----------------------------------------------------------------------
+
+bool Pvp::wouldAttackCauseAlignedEnemyFlag(TangibleObject const &actor, TangibleObject const &target)
+{
+	std::vector<PvpEnemy> actorRepercussions;
+	std::vector<PvpEnemy> targetRepercussions;
+	PvpInternal::getRuleSet(actor, target).getAttackRepercussions(actor, target, actorRepercussions, targetRepercussions);
+	return PvpInternal::containsAlignedEnemyFlag(actorRepercussions);
+}
+
+// ----------------------------------------------------------------------
+
+bool Pvp::wouldHelpCauseAlignedEnemyFlag(TangibleObject const &actor, TangibleObject const &target)
+{
+	std::vector<PvpEnemy> actorRepercussions;
+	std::vector<PvpEnemy> targetRepercussions;
+	PvpInternal::getRuleSet(actor, target).getHelpRepercussions(actor, target, actorRepercussions, targetRepercussions);
+	return PvpInternal::containsAlignedEnemyFlag(actorRepercussions);
+}
+
+// ----------------------------------------------------------------------
+
+bool Pvp::isEnemy(TangibleObject const &actor, TangibleObject const &target)
+{
+	return PvpInternal::getRuleSet(actor, target).isEnemy(actor, target);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::setAlignedFaction(TangibleObject &who, FactionId factionId)
+{
+	PvpInternal::setAlignedFaction(who, factionId);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::setNeutralMercenaryFaction(CreatureObject &who, FactionId factionId, PvpType pvpType)
+{
+	PvpInternal::setNeutralMercenaryFaction(who, factionId, pvpType);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::makeOnLeave(TangibleObject &who)
+{
+	PvpInternal::makeOnLeave(who);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::makeCovert(TangibleObject &who)
+{
+	PvpInternal::makeCovert(who);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::makeDeclared(TangibleObject &who)
+{
+	PvpInternal::makeDeclared(who);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::makeNeutral(TangibleObject &who)
+{
+	PvpInternal::makeNeutral(who);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::prepareToBeCovert(TangibleObject &who)
+{
+	PvpInternal::prepareToBeCovert(who);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::prepareToBeDeclared(TangibleObject &who)
+{
+	PvpInternal::prepareToBeDeclared(who);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::prepareToBeNeutral(TangibleObject &who)
+{
+	PvpInternal::prepareToBeNeutral(who);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::setFactionEnemyFlag(TangibleObject &who, FactionId enemyAlign, int expireTimeMs)
+{
+	PvpInternal::setFactionEnemyFlag(who, enemyAlign, expireTimeMs);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::setDuelEnemyFlag(TangibleObject &who, TangibleObject const &enemy)
+{
+	PvpInternal::setDuelEnemyFlag(who, enemy);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::setPersonalEnemyFlag(TangibleObject &who, TangibleObject const &enemy)
+{
+	PvpInternal::setPersonalEnemyFlag(who, enemy);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::setPermanentPersonalEnemyFlag(TangibleObject &who, NetworkId const &enemyId)
+{
+	PvpInternal::setPermanentPersonalEnemyFlag(who, enemyId);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::removeAllTempEnemyFlags(TangibleObject &dest)
+{
+	PvpInternal::removeTempEnemyFlags(dest, NetworkId::cms_invalid);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::removeDuelEnemyFlags(TangibleObject &dest, NetworkId const &enemyId)
+{
+	PvpInternal::removeDuelEnemyFlags(dest, enemyId);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::removePersonalEnemyFlags(TangibleObject &dest, NetworkId const &enemyId)
+{
+	PvpInternal::removePersonalEnemyFlags(dest, enemyId);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::removeTempEnemyFlags(TangibleObject &dest, NetworkId const &enemyId)
+{
+	PvpInternal::removeTempEnemyFlags(dest, enemyId);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::battlefieldSetParticipant(TangibleObject const &who, RegionPvp const &region, Pvp::FactionId factionId)
+{
+	PvpInternal::battlefieldSetParticipant(who, region, factionId);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::battlefieldClearParticipants(RegionPvp const &region)
+{
+	region.clearBattlefieldParticipants();
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::handleCreatureDied(TangibleObject &creature)
+{
+	PvpInternal::handleCreatureDied(creature);
+}
+
+// ----------------------------------------------------------------------
+
+bool Pvp::hasDuelEnemyFlag(TangibleObject const &who, NetworkId const &enemyId)
+{
+	return PvpInternal::hasDuelEnemyFlag(who, enemyId);
+}
+
+// ----------------------------------------------------------------------
+
+bool Pvp::hasPersonalEnemyFlag(TangibleObject const &who, NetworkId const &enemyId)
+{
+	return PvpInternal::hasPersonalEnemyFlag(who, enemyId);
+}
+
+// ----------------------------------------------------------------------
+
+bool Pvp::hasFactionEnemyFlag(TangibleObject const &who, FactionId factionId)
+{
+	return PvpInternal::hasFactionEnemyFlag(who, factionId);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::getPersonalEnemyIds(TangibleObject const &who, std::vector<NetworkId> &enemyIds)
+{
+	PvpInternal::getPersonalEnemyIds(who, enemyIds);
+}
+
+// ----------------------------------------------------------------------
+
+bool Pvp::areFactionsOpposed(FactionId align1, FactionId align2)
+{
+	return PvpInternal::areFactionsOpposed(align1, align2);
+}
+
+// ----------------------------------------------------------------------
+
+Pvp::FactionId Pvp::battlefieldGetFaction(TangibleObject const &who, RegionPvp const &region)
+{
+	return PvpInternal::battlefieldGetFaction(who, region);
+}
+
+// ----------------------------------------------------------------------
+
+bool Pvp::battlefieldIsParticipant(TangibleObject const &who, RegionPvp const &region)
+{
+	return PvpInternal::battlefieldIsParticipant(who, region);
+}
+
+// ----------------------------------------------------------------------
+
+bool Pvp::hasAnyTimedEnemyFlag(TangibleObject const &who)
+{
+	return PvpInternal::hasAnyTimedEnemyFlag(who);
+}
+
+// ----------------------------------------------------------------------
+
+bool Pvp::hasAnyAlignedTimedEnemyFlag(TangibleObject const &who)
+{
+	return PvpInternal::hasAnyAlignedTimedEnemyFlag(who);
+}
+
+// ----------------------------------------------------------------------
+
+bool Pvp::hasAnyBountyDuelEnemyFlag(TangibleObject const &who)
+{
+	return PvpInternal::hasAnyBountyDuelEnemyFlag(who);
+}
+
+// ----------------------------------------------------------------------
+
+bool Pvp::hasAnyGuildWarCoolDownPeriodEnemyFlag(TangibleObject const &who)
+{
+	return PvpInternal::hasAnyGuildWarCoolDownPeriodEnemyFlag(who);
+}
+
+// ----------------------------------------------------------------------
+
+Region const *Pvp::getPvpRegion(TangibleObject const &who)
+{
+	return PvpInternal::getPvpRegion(who);
+}
+
+// ----------------------------------------------------------------------
+
+Pvp::FactionId Pvp::getApparantFaction(FactionId viewerFaction, TangibleObject const &target)
+{
+	FactionId const targetAlign = PvpInternal::getAlignedFaction(target);
+	if (viewerFaction == targetAlign || PvpInternal::isDeclared(target))
+		return targetAlign;
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+bool Pvp::isDuelingAllowed(TangibleObject const &actor, TangibleObject const &target)
+{
+	return PvpInternal::getRuleSet(actor, target).isDuelingAllowed(actor, target);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::getClientVisibleStatus(Client const &viewerClient, TangibleObject const &target, uint32 &flags, FactionId &factionId)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("Pvp::getClientVisibleStatus");
+
+	TangibleObject const &viewer = target.getPvpViewer(viewerClient);
+	PvpRuleSetBase &ruleSet = PvpInternal::getRuleSet(viewer, target);
+
+	flags = 0;
+	factionId = 0;
+	if (PvpInternal::isPlayer(target))
+		flags |= PvpStatusFlags::IsPlayer;
+	if (ruleSet.canAttack(viewer, target))
+		flags |= PvpStatusFlags::YouCanAttack;
+	if (ruleSet.canAttack(target, viewer))
+		flags |= PvpStatusFlags::CanAttackYou;
+	if (ruleSet.isEnemy(target, viewer))
+		flags |= PvpStatusFlags::IsEnemy;
+	if (ruleSet.canHelp(viewer, target))
+		flags |= PvpStatusFlags::YouCanHelp;
+
+	TangibleObject const * realTarget = &target;
+
+	// when dealing with pets, pvp type and faction is based on the master
+	if (PvpInternal::isPet(*realTarget))
+		realTarget = PvpInternal::getPetMaster(*realTarget);
+
+	if (realTarget)
+	{
+		// only get to know about enemy flags if you're the one watching
+		if (&viewer == realTarget && PvpInternal::hasAnyAlignedTimedEnemyFlag(viewer))
+			flags |= PvpStatusFlags::HasEnemies;
+		FactionId const targetAlign = PvpInternal::getAlignedFaction(*realTarget);
+		// only get to know about alignment if the target is declared
+  	// or has same alignment as viewer
+		if (PvpInternal::isDeclared(*realTarget))
+		{
+			flags |= PvpStatusFlags::Declared;
+			factionId = targetAlign;
+		}
+		else if (PvpInternal::getAlignedFaction(viewer) == targetAlign)
+			factionId = targetAlign;
+
+		if (PvpInternal::isPreparedToBeDeclared(*realTarget))
+		{
+			flags |= PvpStatusFlags::WillBeDeclared;
+		}
+
+		//if (PvpInternal::isPreparedToBeNeutral(*realTarget))
+		//{
+		//	flags |= PvpStatusFlags::WasDeclared;
+		//}
+	
+		if (PvpInternal::isPreparedToBeCovert(*realTarget))
+		{
+			flags |= PvpStatusFlags::WasDeclared;
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::forceStatusUpdate(TangibleObject &who)
+{
+	// send status of this object to all observing it (including self)
+	if (!who.isNonPvpObject())
+	{
+		std::set<Client *> const &clients = who.getObservers();
+		for (std::set<Client *>::const_iterator i = clients.begin(); i != clients.end(); ++i)
+		{
+			uint32 flags, factionId;
+			Pvp::getClientVisibleStatus(**i, who, flags, factionId);
+			if (ConfigServerGame::getLogPvpUpdates())
+			{
+				LOG("PvpUpdate", ("sending UpdatePvpStatus for %s to client %s, flags=%d, factionId=%d (forced)",
+					who.getNetworkId().getValueString().c_str(),
+					(*i)->getCharacterObjectId().getValueString().c_str(),
+					flags,
+					factionId));
+			}
+			UpdatePvpStatusMessage const statusMessage(who.getNetworkId(), flags, factionId);
+			(*i)->send(statusMessage, true);
+			PvpUpdateObserver::updatePvpStatusCache(*i, who, flags, factionId);
+		}
+	}
+	// send status of all objects this object is observing (except self)
+	{
+		Client * const client = who.getClient();
+		if (client)
+		{
+			Client::ObservingList const &objs = client->getObserving();
+			for (Client::ObservingList::const_iterator i = objs.begin(); i != objs.end(); ++i)
+			{
+				TangibleObject * const obj = (*i)->asTangibleObject();
+				if (obj && obj != &who && !obj->isNonPvpObject())
+				{
+					uint32 flags, factionId;
+					Pvp::getClientVisibleStatus(*client, *obj, flags, factionId);
+					if (ConfigServerGame::getLogPvpUpdates())
+					{
+						LOG("PvpUpdate", ("sending UpdatePvpStatus for %s to client %s, flags=%d, factionId=%d (forced)",
+							obj->getNetworkId().getValueString().c_str(),
+							client->getCharacterObjectId().getValueString().c_str(),
+							flags,
+							factionId));
+					}
+					UpdatePvpStatusMessage const statusMessage(obj->getNetworkId(), flags, factionId);
+					client->send(statusMessage, true);
+					PvpUpdateObserver::updatePvpStatusCache(client, *obj, flags, factionId);
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::checkForRegionChange(TangibleObject &who)
+{
+	FATAL(!who.isAuthoritative(), ("checkForRegionChange on non-authoritative object"));
+	if (!who.isNonPvpObject())
+	{
+		// pvp regions
+		Region const * const pvpRegion = getPvpRegion(who);
+		if (pvpRegion != who.getPvpRegion())
+			who.setPvpRegion(pvpRegion ? pvpRegion->asRegionPvp() : 0);
+		// cities
+		CreatureObject * const creature = who.asCreatureObject();
+		if (creature && creature->isPlayerControlled())
+		{
+			Vector const v(creature->getPosition_w());
+			int const newCityId = CityInterface::getCityAtLocation(ServerWorld::getSceneId(), static_cast<int>(v.x), static_cast<int>(v.z), 0);
+			if (newCityId != creature->getLocatedInCityId())
+				creature->setLocatedInCityId(newCityId);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::handlePvpMessage(TangibleObject &dest, MessageQueuePvpCommand const &pvpMessage)
+{
+	PvpInternal::handlePvpMessage(dest, pvpMessage);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::handleAuthorityAcquire(TangibleObject &dest)
+{
+	PvpInternal::handleAuthorityAcquire(dest);
+}
+
+// ----------------------------------------------------------------------
+
+void Pvp::updateTimedFlags(const void *context)
+{
+	UNREF(context);
+
+	unsigned long const updateTimeMs = static_cast<unsigned long>(ConfigServerGame::getPvpUpdateTimeMs());
+	PvpInternal::updateTimedFlags(updateTimeMs);
+	getScheduler().setCallback(Pvp::updateTimedFlags, NULL, updateTimeMs);
+}
+
+// ----------------------------------------------------------------------
+
+Scheduler &Pvp::getScheduler()
+{
+	FATAL(!s_pvpScheduler, ("No Pvp scheduler found"));
+	return *s_pvpScheduler;
+}
+
+// ----------------------------------------------------------------------
+
+Pvp::PvpRankInfo const & Pvp::getRankInfo(int rating)
+{
+	if (rating < s_minRatingForRank)
+		return s_RankNone;
+
+	std::map<int, Pvp::PvpRankInfo *>::const_iterator iterFind = s_RankData.lower_bound(rating);
+	if (iterFind == s_RankData.end())
+		return s_RankNone;
+
+	return *(iterFind->second);
+}
+
+// ----------------------------------------------------------------------
+
+int Pvp::getMinRatingForRank()
+{
+	return s_minRatingForRank;
+}
+
+// ----------------------------------------------------------------------
+
+int Pvp::getMaxRatingForRank()
+{
+	return s_maxRatingForRank;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & Pvp::debugGetGcwRankTable()
+{
+	return s_debugGcwRankTable;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & Pvp::debugGetGcwFormulasTable()
+{
+	return s_debugGcwFormulasTable;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & Pvp::debugGetGcwRankDecayExclusion()
+{
+	return s_debugGcwRankDecayExclusion;
+}
+
+// ----------------------------------------------------------------------
+
+int Pvp::calculateRatingAdjustment(int const gcwPoints, int const currentRating, int &totalEarnedRating, int &totalEarnedRatingAfterDecay, int &cappedRatingAdjustment)
+{
+	totalEarnedRating = 0;
+	totalEarnedRatingAfterDecay = 0;
+	cappedRatingAdjustment = 0;
+
+	// get current rank
+	Pvp::PvpRankInfo const & rankInfo = getRankInfo(currentRating);
+	if (rankInfo.rank <= 0)
+		return 0;
+
+	// nothing to do if no points to convert and current rank doesn't decay
+	if ((gcwPoints <= 0) && (rankInfo.ratingDecayBalance <= 0))
+		return 0;
+
+	// convert points to rating
+	if (gcwPoints > 0)
+	{
+		// round any fractional rating up so that no hard earned GCW points are "lost"
+		int64 numerator = static_cast<int64>(gcwPoints) * static_cast<int64>(rankInfo.ratingEarningCap);
+		int64 denominator = static_cast<int64>(gcwPoints) + static_cast<int64>(rankInfo.ratingEarningCap);
+		totalEarnedRating = static_cast<int>(numerator / denominator);
+		if (numerator % denominator)
+			++totalEarnedRating;
+
+		// if the rank is a decayable rank, and the GCW points is more than
+		// what is required to offset rank decay, use a different formula
+		// to calculate the additional rank progress
+		if ((rankInfo.ratingDecayBalance > 0) && (totalEarnedRating >= rankInfo.ratingDecayBalance) && (rankInfo.pointToOffsetDecay > 0) && (gcwPoints > rankInfo.pointToOffsetDecay))
+		{
+			numerator = static_cast<int64>(gcwPoints - rankInfo.pointToOffsetDecay) * static_cast<int64>(rankInfo.ratingEarningCap - rankInfo.ratingDecayBalance + 1000);
+			denominator = static_cast<int64>(gcwPoints - rankInfo.pointToOffsetDecay) + static_cast<int64>(rankInfo.ratingEarningCap - rankInfo.ratingDecayBalance + 1000);
+			totalEarnedRating = static_cast<int>(numerator / denominator);
+			if (numerator % denominator)
+				++totalEarnedRating;
+
+			totalEarnedRating += rankInfo.ratingDecayBalance;
+		}
+	}
+	else
+	{
+		totalEarnedRating = 0;
+	}
+
+	// apply rating decay, if any
+	totalEarnedRatingAfterDecay = totalEarnedRating - rankInfo.ratingDecayBalance;
+
+	// if rating loss from decay, cap loss
+	cappedRatingAdjustment = std::max(-rankInfo.maxRatingDecay, totalEarnedRatingAfterDecay);
+
+	// if there's a decay floor, make sure the rating decay doesn't cause the rating to fall below the floor
+	int finalRatingAdjustment = cappedRatingAdjustment;
+	if ((rankInfo.ratingDecayFloor > 0) && (finalRatingAdjustment < 0) && ((currentRating + finalRatingAdjustment) < rankInfo.ratingDecayFloor))
+		finalRatingAdjustment = rankInfo.ratingDecayFloor - currentRating;
+
+	return finalRatingAdjustment;
+}
+
+// ----------------------------------------------------------------------
+
+bool Pvp::isInGcwRankDecayExclusionInterval(time_t t)
+{
+	for (std::multimap<time_t, time_t>::const_iterator iter = s_RankDecayExclusion.lower_bound(t); iter != s_RankDecayExclusion.end(); ++iter)
+	{
+		if (iter->second <= t)
+			return true;
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+Pvp::GcwScoreCategory const * Pvp::getGcwScoreCategory(std::string const & scoreCategory)
+{
+	std::map<std::string, Pvp::GcwScoreCategory const *>::const_iterator const iterFind = s_gcwScoreCategory.find(scoreCategory);
+	if (iterFind != s_gcwScoreCategory.end())
+		return iterFind->second;
+
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+Pvp::GcwScoreCategory const * Pvp::getGcwScoreDefaultCategoryForPlanet(std::string const & planetName)
+{
+	std::map<std::string, Pvp::GcwScoreCategory const *>::const_iterator const iterFind = s_gcwScoreDefaultCategoryForPlanet.find(planetName);
+	if (iterFind != s_gcwScoreDefaultCategoryForPlanet.end())
+		return iterFind->second;
+
+	return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+std::map<std::string, Pvp::GcwScoreCategory const *> const & Pvp::getAllGcwScoreCategory()
+{
+	return s_gcwScoreCategory;
+}
+
+// ----------------------------------------------------------------------
+
+std::map<std::string, std::map<std::string, std::pair<std::pair<float, float>, float> > > const & Pvp::getGcwScoreCategoryRegions()
+{
+	return s_gcwScoreCategoryRegions;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & Pvp::getGcwScoreCategoryRegion(std::string const & planetName, Vector const & position_w)
+{
+	std::map<std::string, std::map<std::string, std::pair<std::pair<float, float>, float> > >::const_iterator const iterPlanet = s_gcwScoreCategoryRegions.find(planetName);
+	if (iterPlanet != s_gcwScoreCategoryRegions.end())
+	{
+		static std::vector<const Region *> regions;
+		regions.clear();
+
+		RegionMaster::getRegionsAtPoint(planetName, position_w.x, position_w.z, regions);
+
+		std::map<std::string, std::pair<std::pair<float, float>, float> >::const_iterator iterFind;
+		for (std::vector<const Region *>::const_iterator iter = regions.begin(); iter != regions.end(); ++iter)
+		{
+			iterFind = iterPlanet->second.find(Unicode::wideToNarrow((*iter)->getName()));
+			if (iterFind != iterPlanet->second.end())
+				return iterFind->first;
+		}
+	}
+
+	static std::string const empty;
+	return empty;
+}
+
+// ----------------------------------------------------------------------
+
+std::map<std::string, std::map<std::string, int> > const & Pvp::getGcwScoreCategoryGroups()
+{
+	return s_gcwScoreCategoryGroups;
+}
+
+// ----------------------------------------------------------------------
+
+bool Pvp::getGcwScoreCategoryGroupTotalPoints(std::string const & group, std::string const & category, int & totalPoints)
+{
+	std::map<std::string, std::map<std::string, int> >::const_iterator iterFindGroup = s_gcwScoreCategoryGroups.find(group);
+	if (iterFindGroup != s_gcwScoreCategoryGroups.end())
+	{
+		std::map<std::string, int>::const_iterator iterFindCategory = iterFindGroup->second.find(category);
+		if (iterFindCategory != iterFindGroup->second.end())
+		{
+			totalPoints = iterFindCategory->second;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+int Pvp::calculateGcwImperialScorePercentile(std::string const & gcwCategory, std::map<std::string, std::pair<int64, int64> > const & gcwImperialScore, std::map<std::string, std::pair<int64, int64> > const & gcwRebelScore)
+{
+	if (!getGcwScoreCategory(gcwCategory))
+		return 50; // tie
+
+	uint64 totalImperial = 0ull;
+	{
+		std::map<std::string, std::pair<int64, int64> >::const_iterator const iterImperial = gcwImperialScore.find(gcwCategory);
+		if (iterImperial != gcwImperialScore.end())
+			totalImperial = static_cast<uint64>(std::max(0ll, iterImperial->second.first)) + static_cast<uint64>(std::max(0ll, iterImperial->second.second));
+	}
+
+	uint64 total = totalImperial;
+	{
+		std::map<std::string, std::pair<int64, int64> >::const_iterator const iterRebel = gcwRebelScore.find(gcwCategory);
+		if (iterRebel != gcwRebelScore.end())
+			total += (static_cast<uint64>(std::max(0ll, iterRebel->second.first)) + static_cast<uint64>(std::max(0ll, iterRebel->second.second)));
+	}
+
+	// if the score is less than 1, treat it as a tie; note that score is scaled by 1000
+	if (total < static_cast<uint64>(c_gcwScoreScaleFactor))
+		return 50; // tie
+
+	return static_cast<int>(totalImperial * 100ull / total);
+}
+
+// ----------------------------------------------------------------------
+
+int Pvp::calculateGcwImperialScorePercentile(std::string const & gcwCategory, std::map<std::string, std::pair<uint64, uint64> > const & gcwImperialScore, std::map<std::string, std::pair<uint64, uint64> > const & gcwRebelScore)
+{
+	if (!getGcwScoreCategory(gcwCategory))
+		return 50; // tie
+
+	uint64 totalImperial = 0ull;
+	{
+		std::map<std::string, std::pair<uint64, uint64> >::const_iterator const iterImperial = gcwImperialScore.find(gcwCategory);
+		if (iterImperial != gcwImperialScore.end())
+			totalImperial = iterImperial->second.first + iterImperial->second.second;
+	}
+
+	uint64 total = totalImperial;
+	{
+		std::map<std::string, std::pair<uint64, uint64> >::const_iterator const iterRebel = gcwRebelScore.find(gcwCategory);
+		if (iterRebel != gcwRebelScore.end())
+			total += (iterRebel->second.first + iterRebel->second.second);
+	}
+
+	// if the score is less than 1, treat it as a tie; note that score is scaled by 1000
+	if (total < static_cast<uint64>(c_gcwScoreScaleFactor))
+		return 50; // tie
+
+	return static_cast<int>(totalImperial * 100ull / total);
+}
+
+// ----------------------------------------------------------------------
+
+float Pvp::getGcwDefenderRegionImperialBonus(std::string const & scoreCategory)
+{
+	GuildObject const * const go = ServerUniverse::getInstance().getMasterGuildObject();
+	if (go)
+		return go->getGcwDefenderRegionImperialBonus(scoreCategory);
+
+	return 0.0f;
+}
+
+// ----------------------------------------------------------------------
+
+float Pvp::getGcwDefenderRegionRebelBonus(std::string const & scoreCategory)
+{
+	GuildObject const * const go = ServerUniverse::getInstance().getMasterGuildObject();
+	if (go)
+		return go->getGcwDefenderRegionRebelBonus(scoreCategory);
+
+	return 0.0f;
+}
+
+// ----------------------------------------------------------------------
+
+bool Pvp::getGcwDefenderRegionBonus(CreatureObject const & creature, PlayerObject const & player, float & bonus)
+{
+	std::string const & playerCurrentGcwRegion = player.getCurrentGcwRegion();
+	if (playerCurrentGcwRegion.empty())
+		return false;
+
+	{
+		std::pair<std::string, std::pair<bool, bool> > const & cityGcwDefenderRegionInfo = player.getCityGcwDefenderRegionInfo();
+		if (!cityGcwDefenderRegionInfo.first.empty() && cityGcwDefenderRegionInfo.second.first && (playerCurrentGcwRegion == cityGcwDefenderRegionInfo.first))
+		{
+			uint32 const faction = creature.getPvpFaction();
+			if (PvpData::isImperialFactionId(faction))
+			{
+				bonus = Pvp::getGcwDefenderRegionImperialBonus(playerCurrentGcwRegion);
+				return true;
+			}
+			else if (PvpData::isRebelFactionId(faction))
+			{
+				bonus = Pvp::getGcwDefenderRegionRebelBonus(playerCurrentGcwRegion);
+				return true;
+			}
+		}
+	}
+
+	{
+		std::pair<std::string, std::pair<bool, bool> > const & guildGcwDefenderRegionInfo = player.getGuildGcwDefenderRegionInfo();
+		if (!guildGcwDefenderRegionInfo.first.empty() && guildGcwDefenderRegionInfo.second.first && (playerCurrentGcwRegion == guildGcwDefenderRegionInfo.first))
+		{
+			uint32 const faction = creature.getPvpFaction();
+			if (PvpData::isImperialFactionId(faction))
+			{
+				bonus = Pvp::getGcwDefenderRegionImperialBonus(playerCurrentGcwRegion);
+				return true;
+			}
+			else if (PvpData::isRebelFactionId(faction))
+			{
+				bonus = Pvp::getGcwDefenderRegionRebelBonus(playerCurrentGcwRegion);
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void PvpNamespace::loadGcwRankTable()
+{
+	s_RankNone.dataTableRow = -1;
+	s_RankNone.rank = 0;
+	s_RankNone.minRating = -1;
+	s_RankNone.maxRating = -1;
+	s_RankNone.imperialTitle = std::string("imperial_none");
+	s_RankNone.rebelTitle = std::string("rebel_none");
+	s_RankNone.ratingEarningCap = 0;
+	s_RankNone.ratingDecayBalance = 0;
+	s_RankNone.maxRatingDecay = 0;
+	s_RankNone.ratingDecayFloor = 0;
+	s_RankNone.pointToOffsetDecay = 0;
+
+	for (std::map<int, Pvp::PvpRankInfo *>::const_iterator iter = s_RankData.begin(); iter != s_RankData.end(); ++iter)
+		delete iter->second;
+
+	s_RankData.clear();
+
+	{
+		DataTable * data = NON_NULL(DataTableManager::getTable(s_gcwRankTableName, true));
+		int numRows = data->getNumRows();
+		Pvp::PvpRankInfo * pvpRankInfo;
+		for (int row=0; row<numRows; ++row)
+		{
+			pvpRankInfo = new Pvp::PvpRankInfo();
+			pvpRankInfo->dataTableRow = row;
+			pvpRankInfo->rank = data->getIntValue("Rank", row);
+			pvpRankInfo->minRating = data->getIntValue("MinRating", row);
+			pvpRankInfo->maxRating = data->getIntValue("MaxRating", row);
+			pvpRankInfo->imperialTitle = data->getStringValue("ImperialTitle", row);
+			pvpRankInfo->rebelTitle = data->getStringValue("RebelTitle", row);
+			pvpRankInfo->ratingEarningCap = data->getIntValue("RatingEarningCap", row);
+			pvpRankInfo->ratingDecayBalance = data->getIntValue("RatingDecayBalance", row);
+			pvpRankInfo->maxRatingDecay = data->getIntValue("MaxRatingDecay", row);
+			pvpRankInfo->ratingDecayFloor = data->getIntValue("RatingDecayFloor", row);
+
+			// begin per-row data consistency check
+			FATAL((pvpRankInfo->rank < 1), ("%s, row (%d), Rank (%d) must be >= 1", s_gcwRankTableName.c_str(), row, pvpRankInfo->rank));
+			FATAL((pvpRankInfo->minRating < 0), ("%s, row (%d), MinRating (%d) must be >= 0", s_gcwRankTableName.c_str(), row, pvpRankInfo->minRating));
+			FATAL((pvpRankInfo->maxRating < 0), ("%s, row (%d), MaxRating (%d) must be >= 0", s_gcwRankTableName.c_str(), row, pvpRankInfo->maxRating));
+			FATAL((pvpRankInfo->minRating >= pvpRankInfo->maxRating), ("%s, row (%d), MinRating (%d) must be less than MaxRating (%d)", s_gcwRankTableName.c_str(), row, pvpRankInfo->minRating, pvpRankInfo->maxRating));
+			FATAL((pvpRankInfo->ratingEarningCap < 0), ("%s, row (%d), RatingEarningCap (%d) must be >= 0", s_gcwRankTableName.c_str(), row, pvpRankInfo->ratingEarningCap));
+			FATAL((pvpRankInfo->ratingDecayBalance < 0), ("%s, row (%d), RatingDecayBalance (%d) must be >= 0", s_gcwRankTableName.c_str(), row, pvpRankInfo->ratingDecayBalance));
+			FATAL((pvpRankInfo->maxRatingDecay < 0), ("%s, row (%d), MaxRatingDecay (%d) must be >= 0", s_gcwRankTableName.c_str(), row, pvpRankInfo->maxRatingDecay));
+			FATAL((pvpRankInfo->ratingDecayFloor < 0), ("%s, row (%d), RatingDecayFloor (%d) must be >= 0", s_gcwRankTableName.c_str(), row, pvpRankInfo->ratingDecayFloor));
+			// end per-row data consistency check
+
+			s_RankData[pvpRankInfo->maxRating] = pvpRankInfo;
+		}
+
+		DataTableManager::close(s_gcwRankTableName);
+	}
+
+	// start inter-row data consistency check
+	s_minRatingForRank = 0;
+	s_maxRatingForRank = 0;
+	int previousRank = 0;
+
+	std::map<int, Pvp::PvpRankInfo *>::iterator iter;
+	for (iter = s_RankData.begin(); iter != s_RankData.end(); ++iter)
+	{
+		// first rank must have Rank = 1 and MinRating = 0
+		if (iter == s_RankData.begin())
+		{
+			FATAL((iter->second->rank != 1), ("%s, row (%d), first Rank (%d) must be 1", s_gcwRankTableName.c_str(), iter->second->dataTableRow, iter->second->rank));
+			FATAL((iter->second->minRating != 0), ("%s, row (%d), first rank's MinRating (%d) must be 0", s_gcwRankTableName.c_str(), iter->second->dataTableRow, iter->second->minRating));
+
+			s_minRatingForRank = iter->second->minRating;
+		}
+		// subsequent rank must have Rank = <previous rank> + 1
+		// and MinRating = <previous rank MaxRating> + 1
+		else
+		{
+			FATAL(((previousRank + 1) != iter->second->rank), ("%s, row (%d), Rank (%d) must be 1 more than previous Rank (%d)", s_gcwRankTableName.c_str(), iter->second->dataTableRow, iter->second->rank, previousRank));
+			FATAL(((s_maxRatingForRank + 1) != iter->second->minRating), ("%s, row (%d), MinRating (%d) must be 1 more than previous MaxRating (%d)", s_gcwRankTableName.c_str(), iter->second->dataTableRow, iter->second->minRating, s_maxRatingForRank));
+		}
+
+		s_maxRatingForRank = iter->second->maxRating;
+		previousRank = iter->second->rank;
+
+		// calculate pointToOffsetDecay for each decayable rank
+		if (iter->second->ratingDecayBalance > 0)
+			iter->second->pointToOffsetDecay = static_cast<int>((static_cast<int64>(iter->second->ratingEarningCap) * static_cast<int64>(iter->second->ratingDecayBalance - 1)) / static_cast<int64>(iter->second->ratingEarningCap - iter->second->ratingDecayBalance + 1)) + 1;
+		else
+			iter->second->pointToOffsetDecay = 0;
+	}
+	// end inter-row data consistency check
+
+	char buffer[2048];
+	s_debugGcwRankTable  = "Rank    Required Rating    Imperial Title / Rebel Title\n";
+	s_debugGcwRankTable += "====    ===============    ============================\n";
+
+	s_debugGcwFormulasTable  = "Rank RatingEarningCap RatingDecayBalance MaxRatingDecay RatingDecayFloor PointToOffsetDecay\n";
+	s_debugGcwFormulasTable += "==== ================ ================== ============== ================ ==================\n";
+
+	for (iter = s_RankData.begin(); iter != s_RankData.end(); ++iter)
+	{
+		snprintf(buffer, sizeof(buffer)-1, "%2d      %6d - %6d    %s / %s\n", iter->second->rank, iter->second->minRating, iter->second->maxRating, iter->second->imperialTitle.c_str(), iter->second->rebelTitle.c_str());
+		buffer[sizeof(buffer)-1] = '\0';
+		s_debugGcwRankTable += buffer;
+
+		snprintf(buffer, sizeof(buffer)-1, "%2d   %16d %18d %14d %16d %18d\n", iter->second->rank, iter->second->ratingEarningCap, iter->second->ratingDecayBalance, iter->second->maxRatingDecay, iter->second->ratingDecayFloor, iter->second->pointToOffsetDecay);
+		buffer[sizeof(buffer)-1] = '\0';
+		s_debugGcwFormulasTable += buffer;
+	}
+
+	snprintf(buffer, sizeof(buffer)-1, "minimum rating for rank: %d\n", s_minRatingForRank);
+	buffer[sizeof(buffer)-1] = '\0';
+	s_debugGcwRankTable += buffer;
+
+	snprintf(buffer, sizeof(buffer)-1, "maximum rating for rank: %d\n", s_maxRatingForRank);
+	buffer[sizeof(buffer)-1] = '\0';
+	s_debugGcwRankTable += buffer;
+}
+
+// ----------------------------------------------------------------------
+
+void PvpNamespace::loadGcwRankDecayExclusionTable()
+{
+	s_RankDecayExclusion.clear();
+
+	int intervalBegin, intervalEnd;
+	{
+		DataTable * data = NON_NULL(DataTableManager::getTable(s_gcwRankDecayExclusionTableName, true));
+		int numRows = data->getNumRows();
+		for (int row=0; row<numRows; ++row)
+		{
+			intervalBegin = data->getIntValue("IntervalBegin", row);
+			intervalEnd = data->getIntValue("IntervalEnd", row);
+
+			FATAL((intervalBegin <= 0), ("%s, row (%d), IntervalBegin (%d) must be >= 1", s_gcwRankDecayExclusionTableName.c_str(), row, intervalBegin));
+			FATAL((intervalEnd <= 0), ("%s, row (%d), IntervalEnd (%d) must be >= 1", s_gcwRankDecayExclusionTableName.c_str(), row, intervalEnd));
+			FATAL((intervalBegin >= intervalEnd), ("%s, row (%d), IntervalBegin (%d) must be less than IntervalEnd (%d)", s_gcwRankDecayExclusionTableName.c_str(), row, intervalBegin, intervalEnd));
+
+			IGNORE_RETURN(s_RankDecayExclusion.insert(std::make_pair(static_cast<time_t>(intervalEnd), static_cast<time_t>(intervalBegin))));
+		}
+
+		DataTableManager::close(s_gcwRankDecayExclusionTableName);
+	}
+
+	// read exclusion intervals from config file
+	static int const min = std::numeric_limits<int>::min();
+	int index = 0;
+	while (true)
+	{
+		intervalBegin = ConfigFile::getKeyInt("GameServer", "gcwRankDecayExclusionIntervalBegin", index, min);
+		intervalEnd = ConfigFile::getKeyInt("GameServer", "gcwRankDecayExclusionIntervalEnd", index++, min);
+
+		if ((intervalBegin == min) || (intervalEnd == min))
+			break;
+
+		FATAL((intervalBegin <= 0), ("[GameServer] config option gcwRankDecayExclusionIntervalBegin (%d) must be >= 1", intervalBegin));
+		FATAL((intervalEnd <= 0), ("[GameServer] config option gcwRankDecayExclusionIntervalEnd (%d) must be >= 1", intervalEnd));
+		FATAL((intervalBegin >= intervalEnd), ("[GameServer] config option gcwRankDecayExclusionIntervalBegin (%d) must be less than gcwRankDecayExclusionIntervalEnd (%d)", intervalBegin, intervalEnd));
+
+		IGNORE_RETURN(s_RankDecayExclusion.insert(std::make_pair(static_cast<time_t>(intervalEnd), static_cast<time_t>(intervalBegin))));
+	}
+
+	char buffer[2048];
+	s_debugGcwRankDecayExclusion  = "Begin                                                                      End\n";
+	s_debugGcwRankDecayExclusion += "=====                                                                      ===\n";
+
+	for (std::multimap<time_t, time_t>::const_iterator iter = s_RankDecayExclusion.begin(); iter != s_RankDecayExclusion.end(); ++iter)
+	{
+		snprintf(buffer, sizeof(buffer)-1, "%10ld (%s) (%s) %10ld (%s) (%s)\n", iter->second, CalendarTime::convertEpochToTimeStringGMT(iter->second).c_str(), CalendarTime::convertEpochToTimeStringLocal(iter->second).c_str(), iter->first, CalendarTime::convertEpochToTimeStringGMT(iter->first).c_str(), CalendarTime::convertEpochToTimeStringLocal(iter->first).c_str());
+		buffer[sizeof(buffer)-1] = '\0';
+		s_debugGcwRankDecayExclusion += buffer;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PvpNamespace::loadGcwScoreCategoryTable()
+{
+	if (!s_gcwScoreCategory.empty())
+		return;
+
+	DataTable * data = NON_NULL(DataTableManager::getTable(s_gcwScoreCategoryTableName, true));
+
+	int const columnCategoryName = data->findColumnNumber("CategoryName");
+	FATAL((columnCategoryName < 0), ("column \"CategoryName\" not found in %s", s_gcwScoreCategoryTableName.c_str()));
+
+	int const columnCategoryScoreWeight = data->findColumnNumber("CategoryScoreWeight");
+	FATAL((columnCategoryScoreWeight < 0), ("column \"CategoryScoreWeight\" not found in %s", s_gcwScoreCategoryTableName.c_str()));
+
+	int const columnRegionPlanet = data->findColumnNumber("RegionPlanet");
+	FATAL((columnRegionPlanet < 0), ("column \"RegionPlanet\" not found in %s", s_gcwScoreCategoryTableName.c_str()));
+
+	int const columnGcwRegionDefender = data->findColumnNumber("GcwRegionDefender");
+	FATAL((columnGcwRegionDefender < 0), ("column \"GcwRegionDefender\" not found in %s", s_gcwScoreCategoryTableName.c_str()));
+
+	int const columnNotifyOnPercentileChange = data->findColumnNumber("NotifyOnPercentileChange");
+	FATAL((columnNotifyOnPercentileChange < 0), ("column \"NotifyOnPercentileChange\" not found in %s", s_gcwScoreCategoryTableName.c_str()));
+
+	// the can be a variable number of "GcwGroup" columns, as long as the
+	// columns are named GcwGroup1, GcwGroup2, GcwGroup3, GcwGroup4,
+	// GcwGroup5, and so on
+	std::vector<int> columnGcwGroup;
+	char buffer[128];
+	int columnNumber;
+	for (int i = 1; i <= 1000000000; ++i)
+	{
+		snprintf(buffer, sizeof(buffer)-1, "GcwGroup%d", i);
+		buffer[sizeof(buffer)-1] = '\0';
+
+		columnNumber = data->findColumnNumber(buffer);
+		if (columnNumber < 0)
+			break;
+
+		columnGcwGroup.push_back(columnNumber);
+	}
+
+	int const numRows = data->getNumRows();
+	Pvp::GcwScoreCategory * gcwScoreCategory;
+	int const cMaxCategoryScoreWeight = 1000000;
+	int categoryScoreWeightBase, categoryScoreWeight;
+	std::string::size_type posCategoryScoreWeightOverride;
+	std::string regionPlanet;
+	Region const * region;
+	RegionCircle const * regionCircle;
+	float regionCenterX, regionCenterZ, regionRadius;
+	std::string gcwGroup;
+	std::map<std::string, int> gcwGroupTotalCategoryScoreWeight;
+	std::map<std::string, int>::iterator iterFindGcwGroupTotalWeight;
+	for (int row=0; row<numRows; ++row)
+	{
+		gcwScoreCategory = new Pvp::GcwScoreCategory();
+
+		gcwScoreCategory->categoryName = data->getStringValue(columnCategoryName, row);
+		if (gcwScoreCategory->categoryName.empty())
+		{
+			delete gcwScoreCategory;
+			continue;
+		}
+
+		categoryScoreWeightBase = data->getIntValue(columnCategoryScoreWeight, row);
+
+		regionPlanet = data->getStringValue(columnRegionPlanet, row);
+		if (!regionPlanet.empty())
+		{
+			region = RegionMaster::getRegionByName(regionPlanet, Unicode::narrowToWide(gcwScoreCategory->categoryName));
+			if (region)
+			{
+				regionCircle = dynamic_cast<RegionCircle const *>(region);
+				if (regionCircle)
+				{
+					regionCircle->getExtent(regionCenterX, regionCenterZ, regionRadius);
+					(s_gcwScoreCategoryRegions[regionPlanet])[gcwScoreCategory->categoryName] = std::make_pair(std::make_pair(regionCenterX, regionCenterZ), regionRadius);						
+				}
+				else
+				{
+					FATAL(true, ("%s, row (%d), GCW score category (%s) must be a circle region", s_gcwScoreCategoryTableName.c_str(), (row+3), gcwScoreCategory->categoryName.c_str()));
+				}
+
+				FATAL((region->getGeography() != RegionNamespace::RG_fictional), ("%s, row (%d), GCW score category (%s) must be a fictional region", s_gcwScoreCategoryTableName.c_str(), (row+3), gcwScoreCategory->categoryName.c_str()));
+				FATAL(region->getMunicipal(), ("%s, row (%d), GCW score category (%s) must not be a municipal region", s_gcwScoreCategoryTableName.c_str(), (row+3), gcwScoreCategory->categoryName.c_str()));
+				FATAL(region->isVisible(), ("%s, row (%d), GCW score category (%s) must not be a visible region", s_gcwScoreCategoryTableName.c_str(), (row+3), gcwScoreCategory->categoryName.c_str()));
+				FATAL(region->getNotify(), ("%s, row (%d), GCW score category (%s) must not be a notify region", s_gcwScoreCategoryTableName.c_str(), (row+3), gcwScoreCategory->categoryName.c_str()));
+			}
+			else
+			{
+				FATAL(true, ("%s, row (%d), GCW score category (%s) has no region defined in the corresponding planet region file", s_gcwScoreCategoryTableName.c_str(), (row+3), gcwScoreCategory->categoryName.c_str()));
+			}
+		}
+
+		gcwScoreCategory->gcwRegionDefender = (data->getIntValue(columnGcwRegionDefender, row) != 0);
+		gcwScoreCategory->notifyOnPercentileChange = (data->getIntValue(columnNotifyOnPercentileChange, row) != 0);
+
+		// read all GCW group for GCW score category
+		gcwScoreCategory->gcwScoreCategoryGroups.clear();
+		for (std::vector<int>::const_iterator iterColumnGcwGroup = columnGcwGroup.begin(); iterColumnGcwGroup != columnGcwGroup.end(); ++iterColumnGcwGroup)
+		{
+			gcwGroup = data->getStringValue(*iterColumnGcwGroup, row);
+
+			if (gcwGroup.empty())
+				continue;
+
+			categoryScoreWeight = categoryScoreWeightBase;
+
+			// see if there's a category score weight override and use the override value
+			posCategoryScoreWeightOverride = gcwGroup.find(':');
+			if (posCategoryScoreWeightOverride != std::string::npos)
+			{
+				categoryScoreWeight = ::atoi(gcwGroup.substr(posCategoryScoreWeightOverride + 1).c_str());
+				gcwGroup = gcwGroup.substr(0, posCategoryScoreWeightOverride);
+
+				FATAL(((categoryScoreWeight < 1) || (categoryScoreWeight > cMaxCategoryScoreWeight)), ("%s, row (%d), GCW score category (%s) override category score weight for GCW group (%s) must be 1 - %d inclusive", s_gcwScoreCategoryTableName.c_str(), (row+3), gcwScoreCategory->categoryName.c_str(), gcwGroup.c_str(), cMaxCategoryScoreWeight));
+			}
+
+			if (gcwGroup.empty())
+				continue;
+
+			FATAL((gcwScoreCategory->gcwScoreCategoryGroups.count(gcwGroup) > 0), ("%s, row (%d), duplicate GCW group (%s) defined for GCW score category (%s)", s_gcwScoreCategoryTableName.c_str(), (row+3), gcwGroup.c_str(), gcwScoreCategory->categoryName.c_str()));
+
+			IGNORE_RETURN(gcwScoreCategory->gcwScoreCategoryGroups.insert(gcwGroup));
+			IGNORE_RETURN(s_gcwScoreCategoryGroups[gcwGroup].insert(std::make_pair(gcwScoreCategory->categoryName, categoryScoreWeight)));
+
+			iterFindGcwGroupTotalWeight = gcwGroupTotalCategoryScoreWeight.find(gcwGroup);
+			if (iterFindGcwGroupTotalWeight != gcwGroupTotalCategoryScoreWeight.end())
+			{
+				iterFindGcwGroupTotalWeight->second += categoryScoreWeight;
+			}
+			else
+			{
+				gcwGroupTotalCategoryScoreWeight.insert(std::make_pair(gcwGroup, categoryScoreWeight));
+			}
+		}
+
+		FATAL((!gcwScoreCategory->gcwScoreCategoryGroups.empty() && ((categoryScoreWeightBase < 1) || (categoryScoreWeightBase > cMaxCategoryScoreWeight))), ("%s, row (%d), GCW score category (%s) that is in a GCW group must have CategoryScoreWeight value of 1 - %d inclusive", s_gcwScoreCategoryTableName.c_str(), (row+3), gcwScoreCategory->categoryName.c_str(), cMaxCategoryScoreWeight));
+		FATAL((gcwScoreCategory->gcwScoreCategoryGroups.empty() && (categoryScoreWeightBase != 0)), ("%s, row (%d), GCW score category (%s) that is NOT in any GCW group must have CategoryScoreWeight value of 0", s_gcwScoreCategoryTableName.c_str(), (row+3), gcwScoreCategory->categoryName.c_str()));
+
+		FATAL((s_gcwScoreCategory.count(gcwScoreCategory->categoryName) > 0), ("%s, row (%d), duplicate GCW score category (%s)", s_gcwScoreCategoryTableName.c_str(), (row+3), gcwScoreCategory->categoryName.c_str()));
+
+		IGNORE_RETURN(s_gcwScoreCategory.insert(std::make_pair(gcwScoreCategory->categoryName, gcwScoreCategory)));
+	}
+
+	DataTableManager::close(s_gcwScoreCategoryTableName);
+
+	// for all the GCW groups, calculate the amount that each GCW category in the group
+	// contribute to the GCW group score; the total available score for a GCW group is
+	// 1,000,000,000, which will be divided up among the GCW category in the group based
+	// on the GCW category's categoryScoreWeight value
+	std::map<std::string, std::map<std::string, int> >::iterator iterFindGcwGroup;
+	int const cGcwGroupScoreTotal = 1000000000;
+	int gcwGroupScoreRemaining;
+	for (std::map<std::string, int>::const_iterator iterGcwGroupTotalWeight = gcwGroupTotalCategoryScoreWeight.begin(); iterGcwGroupTotalWeight != gcwGroupTotalCategoryScoreWeight.end(); ++iterGcwGroupTotalWeight)
+	{
+		iterFindGcwGroup = s_gcwScoreCategoryGroups.find(iterGcwGroupTotalWeight->first);
+
+		FATAL((iterFindGcwGroup == s_gcwScoreCategoryGroups.end()), ("GCW group (%s) not found in s_gcwScoreCategoryGroups", iterGcwGroupTotalWeight->first.c_str()));
+		FATAL((iterFindGcwGroup->second.empty()), ("GCW group (%s) has no associated GCW score categories", iterGcwGroupTotalWeight->first.c_str()));
+
+		gcwGroupScoreRemaining = cGcwGroupScoreTotal;
+		for (std::map<std::string, int>::iterator iterGcwGroupWeight = iterFindGcwGroup->second.begin(); iterGcwGroupWeight != iterFindGcwGroup->second.end(); ++iterGcwGroupWeight)
+		{
+			iterGcwGroupWeight->second = static_cast<int>(static_cast<int64>(iterGcwGroupWeight->second) * static_cast<int64>(cGcwGroupScoreTotal) / static_cast<int64>(iterGcwGroupTotalWeight->second));
+			gcwGroupScoreRemaining -= iterGcwGroupWeight->second;
+		}
+
+		FATAL((gcwGroupScoreRemaining < 0), ("GCW group (%s) used up more than its allotted %d points (%d points over the limit)", iterGcwGroupTotalWeight->first.c_str(), cGcwGroupScoreTotal, -gcwGroupScoreRemaining));
+
+		// if there's any points left (from rounding), distribute it evenly amongst the GCW score categories
+		while (gcwGroupScoreRemaining > 0)
+		{
+			for (std::map<std::string, int>::iterator iterGcwGroupWeight = iterFindGcwGroup->second.begin(); iterGcwGroupWeight != iterFindGcwGroup->second.end(); ++iterGcwGroupWeight)
+			{
+				++(iterGcwGroupWeight->second);
+				--gcwGroupScoreRemaining;
+
+				if (gcwGroupScoreRemaining <= 0)
+					break;
+			}
+		}
+	}
+
+#ifdef _DEBUG
+	// sanity check to make sure all GCW groups have allocated all
+	// its 1,000,000,000 points amongst all its GCW score categories
+	{
+		for (std::map<std::string, std::map<std::string, int> >::const_iterator iterGroup = s_gcwScoreCategoryGroups.begin(); iterGroup != s_gcwScoreCategoryGroups.end(); ++iterGroup)
+		{
+			gcwGroupScoreRemaining = cGcwGroupScoreTotal;
+			for (std::map<std::string, int>::const_iterator iterCategory = iterGroup->second.begin(); iterCategory != iterGroup->second.end(); ++iterCategory)
+			{
+				gcwGroupScoreRemaining -= iterCategory->second;
+			}
+
+			FATAL((gcwGroupScoreRemaining > 0), ("GCW group (%s) did not use up all its allotted %d points (%d points remaining)", iterGroup->first.c_str(), cGcwGroupScoreTotal, gcwGroupScoreRemaining));
+			FATAL((gcwGroupScoreRemaining < 0), ("GCW group (%s) used up more than its allotted %d points (%d points over the limit)", iterGroup->first.c_str(), cGcwGroupScoreTotal, -gcwGroupScoreRemaining));
+		}
+	}
+#endif
+
+	// build list of default categories for the ground planets
+	//
+	// *****WARNING WARNING WARNING WARNING WARNING*****
+	// this list must be kept in sync in
+	// PvpNamespace::loadGcwScoreCategoryTable()
+	// SwgCuiSpaceZoneMap::SwgCuiSpaceZoneMap()
+	// SwgCuiHyperspaceMap::SwgCuiHyperspaceMap()
+	// and gcw.scriptlib (validScenes and defaultRegions)
+	// *****WARNING WARNING WARNING WARNING WARNING*****
+	//
+	s_gcwScoreDefaultCategoryForPlanet["tatooine"] = Pvp::getGcwScoreCategory("gcw_region_tatooine_13");
+	s_gcwScoreDefaultCategoryForPlanet["corellia"] = Pvp::getGcwScoreCategory("gcw_region_corellia_13");
+	s_gcwScoreDefaultCategoryForPlanet["dantooine"] = Pvp::getGcwScoreCategory("gcw_region_dantooine_16");
+	s_gcwScoreDefaultCategoryForPlanet["dathomir"] = Pvp::getGcwScoreCategory("gcw_region_dathomir_13");
+	s_gcwScoreDefaultCategoryForPlanet["endor"] = Pvp::getGcwScoreCategory("gcw_region_endor_15");
+	s_gcwScoreDefaultCategoryForPlanet["lok"] = Pvp::getGcwScoreCategory("gcw_region_lok_13");
+	s_gcwScoreDefaultCategoryForPlanet["naboo"] = Pvp::getGcwScoreCategory("gcw_region_naboo_13");
+	s_gcwScoreDefaultCategoryForPlanet["rori"] = Pvp::getGcwScoreCategory("gcw_region_rori_13");
+	s_gcwScoreDefaultCategoryForPlanet["talus"] = Pvp::getGcwScoreCategory("gcw_region_talus_16");
+	s_gcwScoreDefaultCategoryForPlanet["yavin4"] = Pvp::getGcwScoreCategory("gcw_region_yavin4_17");
+	s_gcwScoreDefaultCategoryForPlanet["space_tatooine"] = Pvp::getGcwScoreCategory("gcw_region_tatooine_12");
+	s_gcwScoreDefaultCategoryForPlanet["space_corellia"] = Pvp::getGcwScoreCategory("gcw_region_corellia_14");
+	s_gcwScoreDefaultCategoryForPlanet["space_dantooine"] = Pvp::getGcwScoreCategory("gcw_region_dantooine_17");
+	s_gcwScoreDefaultCategoryForPlanet["space_dathomir"] = Pvp::getGcwScoreCategory("gcw_region_dathomir_12");
+	s_gcwScoreDefaultCategoryForPlanet["space_endor"] = Pvp::getGcwScoreCategory("gcw_region_endor_16");
+	s_gcwScoreDefaultCategoryForPlanet["space_lok"] = Pvp::getGcwScoreCategory("gcw_region_lok_14");
+	s_gcwScoreDefaultCategoryForPlanet["space_naboo"] = Pvp::getGcwScoreCategory("gcw_region_naboo_14");
+	s_gcwScoreDefaultCategoryForPlanet["space_yavin4"] = Pvp::getGcwScoreCategory("gcw_region_yavin4_18");
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/pvp/Pvp.h b/engine/server/library/serverGame/src/shared/pvp/Pvp.h
new file mode 100644
index 00000000..64936a90
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/Pvp.h
@@ -0,0 +1,166 @@
+// ======================================================================
+//
+// Pvp.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _Pvp_H
+#define _Pvp_H
+
+// ======================================================================
+
+#include <set>
+
+// ======================================================================
+
+class Client;
+class CreatureObject;
+class MessageQueuePvpCommand;
+class NetworkId;
+class PlayerObject;
+class Region;
+class RegionPvp;
+class Scheduler;
+class TangibleObject;
+class Vector;
+
+// ======================================================================
+
+const int PvpType_Neutral  = 0;
+const int PvpType_Covert   = 1;
+const int PvpType_Declared = 2;
+
+// ======================================================================
+
+class Pvp
+{
+public:
+	typedef uint32 FactionId;
+	typedef int PvpType;
+
+	static void install                   ();
+	static void remove                    ();
+
+	// pvp actions
+	static bool canAttack                 (TangibleObject const &actor, TangibleObject const &target);
+	static bool canHelp                   (TangibleObject const &actor, TangibleObject const &target);
+	static void attackPerformed           (TangibleObject &actor, TangibleObject &target);
+	static void helpPerformed             (TangibleObject &actor, TangibleObject &target);
+	static bool wouldAttackCauseAlignedEnemyFlag(TangibleObject const &actor, TangibleObject const &target);
+	static bool wouldHelpCauseAlignedEnemyFlag(TangibleObject const &actor, TangibleObject const &target);
+
+	// pvp information
+	static bool isEnemy                   (TangibleObject const &actor, TangibleObject const &target);
+	static bool hasDuelEnemyFlag          (TangibleObject const &who, NetworkId const &enemyId);
+	static bool hasPersonalEnemyFlag      (TangibleObject const &who, NetworkId const &enemyId);
+	static bool hasFactionEnemyFlag       (TangibleObject const &who, FactionId factionId);
+	static bool areFactionsOpposed        (FactionId align1, FactionId align2);
+	static FactionId battlefieldGetFaction(TangibleObject const &who, RegionPvp const &region);
+	static bool battlefieldIsParticipant  (TangibleObject const &who, RegionPvp const &region);
+	static bool hasAnyTimedEnemyFlag      (TangibleObject const &who);
+	static bool hasAnyAlignedTimedEnemyFlag(TangibleObject const &who);
+	static bool hasAnyBountyDuelEnemyFlag (TangibleObject const &who);
+	static bool hasAnyGuildWarCoolDownPeriodEnemyFlag(TangibleObject const &who);
+	static bool isDuelingAllowed          (TangibleObject const &actor, TangibleObject const &target);
+	static void getPersonalEnemyIds       (TangibleObject const &who, stdvector<NetworkId>::fwd &enemyIds);
+
+	// pvp setup
+	static void setAlignedFaction         (TangibleObject &who, FactionId factionId);
+	static void setNeutralMercenaryFaction(CreatureObject &who, FactionId factionId, PvpType pvpType);
+	static void makeOnLeave               (TangibleObject &who);
+	static void makeCovert                (TangibleObject &who);
+	static void makeDeclared              (TangibleObject &who);
+	static void makeNeutral               (TangibleObject &who);
+	static void prepareToBeCovert         (TangibleObject &who);
+	static void prepareToBeDeclared       (TangibleObject &who);
+	static void prepareToBeNeutral        (TangibleObject &who);
+	static void setDuelEnemyFlag          (TangibleObject &who, TangibleObject const &enemy);
+	static void setPersonalEnemyFlag      (TangibleObject &who, TangibleObject const &enemy);
+	static void setPermanentPersonalEnemyFlag(TangibleObject &who, NetworkId const &enemyId);
+	static void setFactionEnemyFlag       (TangibleObject &who, FactionId enemyAlign, int expireTimeMs = -1);
+	static void removeAllTempEnemyFlags   (TangibleObject &dest);
+	static void removeDuelEnemyFlags      (TangibleObject &dest, NetworkId const &enemyId);
+	static void removePersonalEnemyFlags  (TangibleObject &dest, NetworkId const &enemyId);
+	static void removeTempEnemyFlags      (TangibleObject &dest, NetworkId const &enemyId);
+	static void battlefieldSetParticipant (TangibleObject const &who, RegionPvp const &region, Pvp::FactionId factionId);
+	static void battlefieldClearParticipants(RegionPvp const &region);
+	static void handleCreatureDied        (TangibleObject &creature);
+
+	// client updating
+	static Region const *getPvpRegion     (TangibleObject const &who);
+	static FactionId getApparantFaction   (FactionId viewerFaction, TangibleObject const &target);
+	static void getClientVisibleStatus    (Client const &viewerClient, TangibleObject const &target, uint32 &flags, FactionId &factionId);
+	static void checkForRegionChange      (TangibleObject &who);
+	static void forceStatusUpdate         (TangibleObject &who);
+
+	// multiserver handling
+	static void handlePvpMessage          (TangibleObject &dest, MessageQueuePvpCommand const &pvpMessage);
+	static void handleAuthorityAcquire    (TangibleObject &dest);
+
+	// pvp scheduler
+	static Scheduler &getScheduler        ();
+	static void updateTimedFlags          (const void *context);
+
+	// pvp ranking
+	struct PvpRankInfo
+	{
+		int dataTableRow;
+		int rank;
+		int minRating;
+		int maxRating;
+		std::string imperialTitle;
+		std::string rebelTitle;
+		int ratingEarningCap;
+		int ratingDecayBalance;
+		int maxRatingDecay;
+		int ratingDecayFloor;
+		int pointToOffsetDecay;
+	};
+
+	static PvpRankInfo const & getRankInfo(int rating);
+	static int getMinRatingForRank();
+	static int getMaxRatingForRank();
+	static std::string const & debugGetGcwRankTable();
+	static std::string const & debugGetGcwFormulasTable();
+	static std::string const & debugGetGcwRankDecayExclusion();
+	static int calculateRatingAdjustment(int gcwPoints, int currentRating, int &totalEarnedRating, int &totalEarnedRatingAfterDecay, int &cappedRatingAdjustment);
+	static bool isInGcwRankDecayExclusionInterval(time_t t);
+
+	// gcw score
+
+	// scale score by 1,000 so that we can do diminishing value
+	// (like divide score by 2 each week) and not lose any accuracy
+	// (i.e. partial points) for 10 weeks
+	static int const c_gcwScoreScaleFactor = 1000;
+
+	struct GcwScoreCategory 
+	{
+		std::string categoryName;
+		bool gcwRegionDefender;
+		bool notifyOnPercentileChange;
+		std::set<std::string> gcwScoreCategoryGroups;
+	};
+
+	static GcwScoreCategory const * getGcwScoreCategory(std::string const & scoreCategory);
+	static GcwScoreCategory const * getGcwScoreDefaultCategoryForPlanet(std::string const & planetName);
+	static stdmap<std::string, Pvp::GcwScoreCategory const *>::fwd const & getAllGcwScoreCategory();
+	static stdmap<std::string, stdmap<std::string, std::pair<std::pair<float, float>, float> >::fwd >::fwd const & getGcwScoreCategoryRegions();
+	static std::string const & getGcwScoreCategoryRegion(std::string const & planetName, Vector const & position_w);
+	static stdmap<std::string, stdmap<std::string, int>::fwd >::fwd const & getGcwScoreCategoryGroups();
+	static bool getGcwScoreCategoryGroupTotalPoints(std::string const & group, std::string const & category, int & totalPoints);
+	static int calculateGcwImperialScorePercentile(std::string const & gcwCategory, stdmap<std::string, std::pair<int64, int64> >::fwd const & gcwImperialScore, stdmap<std::string, std::pair<int64, int64> >::fwd const & gcwRebelScore);
+	static int calculateGcwImperialScorePercentile(std::string const & gcwCategory, stdmap<std::string, std::pair<uint64, uint64> >::fwd const & gcwImperialScore, stdmap<std::string, std::pair<uint64, uint64> >::fwd const & gcwRebelScore);
+	static float getGcwDefenderRegionImperialBonus(std::string const & scoreCategory);
+	static float getGcwDefenderRegionRebelBonus(std::string const & scoreCategory);
+	static bool getGcwDefenderRegionBonus(CreatureObject const & creature, PlayerObject const & player, float & bonus);
+
+private:
+	Pvp();
+	Pvp(Pvp const &);
+};
+
+// ======================================================================
+
+#endif // _Pvp_H
diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpFactions.cpp b/engine/server/library/serverGame/src/shared/pvp/PvpFactions.cpp
new file mode 100644
index 00000000..414a6815
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/PvpFactions.cpp
@@ -0,0 +1,181 @@
+// ======================================================================
+//
+// PvpFactions.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PvpFactions.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/Crc.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+
+#include <cstdio>
+#include <map>
+#include <set>
+
+// ======================================================================
+
+namespace PvpFactionsNamespace
+{
+	bool s_factionTablesLoaded = false;
+	std::set<Pvp::FactionId> s_nonaggressiveFactions;
+	std::set<Pvp::FactionId> s_unattackableFactions;
+	std::set<Pvp::FactionId> s_bountyTargetFactions;
+	std::map<Pvp::FactionId, std::vector<Pvp::FactionId> > s_factionOpponents;
+	ConstCharCrcString s_battlefieldFaction("battlefield");
+	ConstCharCrcString s_duelFaction("duel");
+	ConstCharCrcString s_bountyDuelFaction("bountyduel");
+	ConstCharCrcString s_guildWarCoolDownPeriodFaction("guildwarcooldownperiod");
+	ConstCharCrcString s_bubbleCombatFaction("bubblecombat");
+
+	// ----------------------------------------------------------------------
+
+	void loadFactionTables()
+	{
+		// nonaggressive factions
+		{
+			char const *fileName = ConfigServerGame::getPvpNonaggressiveFactionsFilename();
+			DataTable *t = DataTableManager::getTable(fileName, true);
+			FATAL(!t, ("Could not find pvp nonaggressive factions table %s", fileName));
+			for (int row = 0; row < t->getNumRows(); ++row)
+				IGNORE_RETURN(s_nonaggressiveFactions.insert(static_cast<Pvp::FactionId>(t->getIntValue("faction", row))));
+			DataTableManager::close(fileName);
+		}
+		// unattackable factions
+		{
+			char const *fileName = ConfigServerGame::getPvpUnattackableFactionsFilename();
+			DataTable *t = DataTableManager::getTable(fileName, true);
+			FATAL(!t, ("Could not find pvp unattackable factions table %s", fileName));
+			for (int row = 0; row < t->getNumRows(); ++row)
+				IGNORE_RETURN(s_unattackableFactions.insert(static_cast<Pvp::FactionId>(t->getIntValue("faction", row))));
+			DataTableManager::close(fileName);
+		}
+		// bounty target factions
+		{
+			char const *fileName = ConfigServerGame::getPvpBountyTargetFactionsFilename();
+			DataTable *t = DataTableManager::getTable(fileName, true);
+			FATAL(!t, ("Could not find pvp bounty target factions table %s", fileName));
+			for (int row = 0; row < t->getNumRows(); ++row)
+				IGNORE_RETURN(s_bountyTargetFactions.insert(static_cast<Pvp::FactionId>(t->getIntValue("faction", row))));
+			DataTableManager::close(fileName);
+		}
+		// faction opponents
+		{
+			char const *fileName = ConfigServerGame::getPvpFactionOpponentsFilename();
+			DataTable *t = DataTableManager::getTable(fileName, true);
+			FATAL(!t, ("Could not find pvp faction opponents table %s", fileName));
+			for (int row = 0; row < t->getNumRows(); ++row)
+			{
+				Pvp::FactionId factionId = static_cast<Pvp::FactionId>(t->getIntValue("faction", row));
+				int opponentNum = 1;
+				bool found;
+				do
+				{
+					char colName[64];
+					sprintf(colName, "opponent%d", opponentNum);
+					found = t->findColumnNumber(colName) >= 0;
+					if (found)
+					{
+						s_factionOpponents[factionId].push_back(static_cast<Pvp::FactionId>(t->getIntValue(colName, row)));
+						++opponentNum;
+					}
+				} while (found);
+			}
+			DataTableManager::close(fileName);
+		}
+		s_factionTablesLoaded = true;
+	}
+}
+using namespace PvpFactionsNamespace;
+
+// ======================================================================
+
+bool PvpFactions::isNonaggressiveFaction(Pvp::FactionId factionId)
+{
+	if (!s_factionTablesLoaded)
+		loadFactionTables();
+	return s_nonaggressiveFactions.find(factionId) != s_nonaggressiveFactions.end();
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpFactions::isUnattackableFaction(Pvp::FactionId factionId)
+{
+	if (!s_factionTablesLoaded)
+		loadFactionTables();
+	return s_unattackableFactions.find(factionId) != s_unattackableFactions.end();
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpFactions::isBountyTargetFaction(Pvp::FactionId factionId)
+{
+	if (!s_factionTablesLoaded)
+		loadFactionTables();
+	return s_bountyTargetFactions.find(factionId) != s_bountyTargetFactions.end();
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpFactions::isBubbleFaction(Pvp::FactionId factionId)
+{
+	return factionId == s_bubbleCombatFaction.getCrc();
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<Pvp::FactionId> const &PvpFactions::getOpposingFactions(Pvp::FactionId factionId)
+{
+	static std::vector<Pvp::FactionId> nullFactionVector;
+
+	if (!s_factionTablesLoaded)
+		loadFactionTables();
+
+	std::map<Pvp::FactionId, std::vector<Pvp::FactionId> >::const_iterator i = s_factionOpponents.find(factionId);
+	if (i != s_factionOpponents.end())
+		return (*i).second;
+	return nullFactionVector;
+}
+
+// ----------------------------------------------------------------------
+
+Pvp::FactionId PvpFactions::getBattlefieldFactionId()
+{
+	return s_battlefieldFaction.getCrc();
+}
+
+// ----------------------------------------------------------------------
+
+Pvp::FactionId PvpFactions::getDuelFactionId()
+{
+	return s_duelFaction.getCrc();
+}
+
+// ----------------------------------------------------------------------
+
+Pvp::FactionId PvpFactions::getBountyDuelFactionId()
+{
+	return s_bountyDuelFaction.getCrc();
+}
+
+// ----------------------------------------------------------------------
+
+Pvp::FactionId PvpFactions::getGuildWarCoolDownPeriodFactionId()
+{
+	return s_guildWarCoolDownPeriodFaction.getCrc();
+}
+
+// ----------------------------------------------------------------------
+
+Pvp::FactionId PvpFactions::getBubbleCombatFactionId()
+{
+	return s_bubbleCombatFaction.getCrc();
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpFactions.h b/engine/server/library/serverGame/src/shared/pvp/PvpFactions.h
new file mode 100644
index 00000000..816cfe7d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/PvpFactions.h
@@ -0,0 +1,36 @@
+// ======================================================================
+//
+// PvpFactions.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _PvpFactions_H_
+#define _PvpFactions_H_
+
+// ======================================================================
+
+#include "Pvp.h"
+
+// ======================================================================
+
+class PvpFactions
+{
+public:
+	static bool isNonaggressiveFaction(Pvp::FactionId factionId);
+	static bool isUnattackableFaction(Pvp::FactionId factionId);
+	static bool isBountyTargetFaction(Pvp::FactionId factionId);
+	static bool isBubbleFaction(Pvp::FactionId factionId);
+	static stdvector<Pvp::FactionId>::fwd const &getOpposingFactions(Pvp::FactionId factionId);
+	static Pvp::FactionId getBattlefieldFactionId();
+	static Pvp::FactionId getDuelFactionId();
+	static Pvp::FactionId getBountyDuelFactionId();
+	static Pvp::FactionId getGuildWarCoolDownPeriodFactionId();
+	static Pvp::FactionId getBubbleCombatFactionId();
+};
+
+// ======================================================================
+
+#endif // _PvpFactions_H_
+
diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpInternal.cpp b/engine/server/library/serverGame/src/shared/pvp/PvpInternal.cpp
new file mode 100644
index 00000000..60f4c9cd
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/PvpInternal.cpp
@@ -0,0 +1,1211 @@
+// ======================================================================
+//
+// PvpInternal.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PvpInternal.h"
+
+#include "serverGame/BattlefieldMarkerObject.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GroupObject.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/PvpFactions.h"
+#include "serverGame/PvpUpdateObserver.h"
+#include "serverGame/PvpRuleSetBase.h"
+#include "serverGame/PvpRuleSetBattlefield.h"
+#include "serverGame/PvpRuleSetNormal.h"
+#include "serverGame/PvpRuleSetPet.h"
+#include "serverGame/PvpRuleSetShip.h"
+#include "serverGame/PvpRuleSetTruce.h"
+#include "serverGame/RegionPvp.h"
+#include "serverGame/RegionMaster.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/TangibleObject.h"
+#include "serverGame/TangibleController.h"
+#include "serverNetworkMessages/MessageQueuePvpCommand.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverUtility/PvpEnemy.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedObject/NetworkIdManager.h"
+#include <vector>
+#include <cstdio>
+
+// ======================================================================
+
+namespace PvpMessages
+{
+	ConstCharCrcString setEnemyFlag            ("setenemyflag");
+	ConstCharCrcString setAlignedFaction       ("setalignedfaction");
+	ConstCharCrcString setMercenaryFaction     ("setmercenaryfaction");
+	ConstCharCrcString setType                 ("settype");
+	ConstCharCrcString setFutureType           ("setfuturetype");
+	ConstCharCrcString removeTempEnemyFlags    ("removetempenemyflags");
+	ConstCharCrcString removeDuelEnemyFlags    ("removeduelenemyflags");
+	ConstCharCrcString removePersonalEnemyFlags("removepersonalenemyflags");
+}
+
+// ======================================================================
+
+namespace PvpRegionTypes
+{
+//	static const int Normal          = 0;
+	static const int Truce           = 1;
+	static const int Battlefield_Min = 2;
+//	static const int Battlefield_Pvp = 2;
+//	static const int Battlefield_Pve = 3;
+	static const int Battlefield_Max = 3;
+}
+
+// ======================================================================
+
+static PvpRuleSetBattlefield                   s_pvpRuleSetBattlefield;
+static PvpRuleSetBase                          s_pvpRuleSetDisallowAll;
+static PvpRuleSetNormal                        s_pvpRuleSetNormal;
+static PvpRuleSetPet                           s_pvpRuleSetPet;
+static PvpRuleSetShip                          s_pvpRuleSetShip;
+static PvpRuleSetTruce                         s_pvpRuleSetTruce;
+static std::set<NetworkId>                     s_objectsWithTempFlags;
+
+// ======================================================================
+
+PvpRuleSetBase &PvpInternal::getRuleSet(TangibleObject const &obj1, TangibleObject const &obj2)
+{
+	if (ConfigServerGame::getPvpDisableCombat())
+		return s_pvpRuleSetDisallowAll;
+
+	// if a ship is involved, use the ship ruleset
+	if (obj1.asShipObject() || obj2.asShipObject())
+		return s_pvpRuleSetShip;
+
+	// if a pet is involved, use the pet ruleset, which will fall through to the appropriate other ruleset
+	if (isPet(obj1) || isPet(obj2))
+		return s_pvpRuleSetPet;
+
+	Region const *region1 = obj1.getPvpRegion();
+	Region const *region2 = obj2.getPvpRegion();
+	if (region1 != region2)
+		return s_pvpRuleSetDisallowAll;
+
+	if (region1)
+	{
+		if (isTruceRegion(*region1))
+			return s_pvpRuleSetTruce;
+		if (isBattlefieldRegion(*region1))
+			return s_pvpRuleSetBattlefield;
+	}
+	return s_pvpRuleSetNormal;
+}
+
+// ----------------------------------------------------------------------
+
+Region const *PvpInternal::getPvpRegion(TangibleObject const &obj)
+{
+	// Run through the regions this object is in, and find a pvp region.
+	// prefer truce to battlefield, battlefield to normal.  0 is returned
+	// if there is no truce or battlefield region
+	std::vector<Region const *> regions;
+	RegionMaster::getRegionsAtPoint(ServerWorld::getSceneId(), obj.getPosition_w().x, obj.getPosition_w().z, regions);
+	Region const *region = 0;
+	for (std::vector<Region const *>::const_iterator i = regions.begin(); i != regions.end(); ++i)
+	{
+		if (isTruceRegion(**i))
+			return *i;
+		if (isBattlefieldRegion(**i))
+			region = *i;
+	}
+	return region;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::isTruceRegion(Region const &region)
+{
+	return region.getPvp() == PvpRegionTypes::Truce;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::isBattlefieldRegion(Region const &region)
+{
+	int val = region.getPvp();
+	return val >= PvpRegionTypes::Battlefield_Min && val <= PvpRegionTypes::Battlefield_Max;
+}
+
+// ----------------------------------------------------------------------
+
+TangibleObject const *PvpInternal::getPetMaster(TangibleObject const &who)
+{
+	CreatureObject const * const creature = who.asCreatureObject();
+	if (creature && creature->getMasterId() != NetworkId::cms_invalid)
+	{
+		Object const * const o = NetworkIdManager::getObjectById(creature->getMasterId());
+		if (o)
+		{
+			ServerObject const * const so = o->asServerObject();
+			if (so)
+			{
+				TangibleObject const * const to = so->asTangibleObject();
+				if (to)
+					return to;
+			}
+		}
+	}
+	return &who;
+}
+
+// ----------------------------------------------------------------------
+
+TangibleObject *PvpInternal::getPetMaster(TangibleObject &who)
+{
+	CreatureObject * const creature = who.asCreatureObject();
+	if (creature && creature->getMasterId() != NetworkId::cms_invalid)
+	{
+		Object * const o = NetworkIdManager::getObjectById(creature->getMasterId());
+		if (o)
+		{
+			ServerObject * const so = o->asServerObject();
+			if (so)
+			{
+				TangibleObject * const to = so->asTangibleObject();
+				if (to)
+					return to;
+			}
+		}
+	}
+	return &who;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::inSameGroup(TangibleObject const &obj1, TangibleObject const &obj2)
+{
+	CreatureObject const * const creature1 = obj1.asCreatureObject();
+	if (creature1)
+	{
+		GroupObject const * const group1 = creature1->getGroup();
+		if (group1)
+		{
+			CreatureObject const * const creature2 = obj2.asCreatureObject();
+			if (creature2 && creature2->getGroup() == group1)
+				return true;
+		}
+	}
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::getGroupMembers(TangibleObject const &src, std::vector<TangibleObject const *> &members)
+{
+	members.push_back(&src);
+	CreatureObject const * const creature = src.asCreatureObject();
+	if (creature)
+	{
+		GroupObject const * const group = creature->getGroup();
+		if (group)
+		{
+			GroupObject::GroupMemberVector const &groupMembers = group->getGroupMembers();
+			for (GroupObject::GroupMemberVector::const_iterator i = groupMembers.begin(); i != groupMembers.end(); ++i)
+			{
+				if ((*i).first != src.getNetworkId())
+				{
+					Object const * const o = NetworkIdManager::getObjectById((*i).first);
+					if (o)
+					{
+						ServerObject const * const so = o->asServerObject();
+						if (so)
+						{
+							CreatureObject const * const co = so->asCreatureObject();
+							if (co)
+								members.push_back(co);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+Pvp::FactionId PvpInternal::getAlignedFaction(TangibleObject const &who)
+{
+	return who.getPvpFaction();
+}
+
+// ----------------------------------------------------------------------
+
+Pvp::FactionId PvpInternal::getAlignedFaction(NetworkId const &who)
+{
+	Object const * const o = NetworkIdManager::getObjectById(who);
+	if (o)
+	{
+		ServerObject const * const so = o->asServerObject();
+		if (so)
+		{
+			TangibleObject const * const to = so->asTangibleObject();
+			if (to)
+				return to->getPvpFaction();
+		}
+	}
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+int PvpInternal::getExpireTimeMs()
+{
+	return ConfigServerGame::getPvpTempFlagExpireTimeMs();
+}
+
+// ----------------------------------------------------------------------
+
+Pvp::FactionId PvpInternal::battlefieldGetFaction(TangibleObject const &who, RegionPvp const &region)
+{
+	return region.getBattlefieldFactionId(who.getNetworkId());
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::battlefieldIsParticipant(TangibleObject const &who, RegionPvp const &region)
+{
+	return battlefieldGetFaction(who, region) != 0;
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::battlefieldSetParticipant(TangibleObject const &who, RegionPvp const &region, Pvp::FactionId factionId)
+{
+	region.setBattlefieldParticipant(who.getNetworkId(), factionId);
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::isPet(TangibleObject const &who)
+{
+	CreatureObject const * const creature = who.asCreatureObject();
+	if (creature && creature->getMasterId() != NetworkId::cms_invalid)
+		return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::isPlayer(TangibleObject const &who)
+{
+	return who.isPlayerControlled();
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::isNeutral(TangibleObject const &who)
+{
+	return who.getPvpType() == PvpType_Neutral;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::isCovert(TangibleObject const &who)
+{
+	return who.getPvpType() == PvpType_Covert;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::isDeclared(TangibleObject const &who)
+{
+	return who.getPvpType() == PvpType_Declared;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::isPreparedToBeNeutral(TangibleObject const &who)
+{
+	return who.getPvpFutureType() == PvpType_Neutral;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::isPreparedToBeCovert(TangibleObject const &who)
+{
+	return who.getPvpFutureType() == PvpType_Covert;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::isPreparedToBeDeclared(TangibleObject const &who)
+{
+	return who.getPvpFutureType() == PvpType_Declared;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::hasAnyEnemyFlag(TangibleObject const &who)
+{
+	if (who.getPvpEnemies().size())
+		return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::hasAnyTimedEnemyFlag(TangibleObject const &who)
+{
+	TangibleObject::PvpEnemies const &enemies = who.getPvpEnemies();
+	for (TangibleObject::PvpEnemies::const_iterator i = enemies.begin(); i != enemies.end(); ++i)
+		if ((*i).expireTime)
+			return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::hasAnyAlignedTimedEnemyFlag(TangibleObject const &who)
+{
+	TangibleObject::PvpEnemies const &enemies = who.getPvpEnemies();
+	for (TangibleObject::PvpEnemies::const_iterator i = enemies.begin(); i != enemies.end(); ++i)
+		if ((*i).expireTime && isFactionAligned((*i).enemyFaction))
+			return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::hasAnyAlignedEnemyFlag(TangibleObject const &who)
+{
+	TangibleObject::PvpEnemies const &enemies = who.getPvpEnemies();
+	for (TangibleObject::PvpEnemies::const_iterator i = enemies.begin(); i != enemies.end(); ++i)
+		if (isFactionAligned((*i).enemyFaction))
+			return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::hasAnyFactionEnemyFlag(TangibleObject const &who)
+{
+	TangibleObject::PvpEnemies const &enemies = who.getPvpEnemies();
+	for (TangibleObject::PvpEnemies::const_iterator i = enemies.begin(); i != enemies.end(); ++i)
+		if ((*i).enemyId == NetworkId::cms_invalid && isFactionAligned((*i).enemyFaction))
+			return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::hasAnyBountyDuelEnemyFlag(TangibleObject const &who)
+{
+	TangibleObject::PvpEnemies const &enemies = who.getPvpEnemies();
+	for (TangibleObject::PvpEnemies::const_iterator i = enemies.begin(); i != enemies.end(); ++i)
+		if ((*i).enemyFaction == PvpFactions::getBountyDuelFactionId())
+			return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::hasAnyGuildWarCoolDownPeriodEnemyFlag(TangibleObject const &who)
+{
+	TangibleObject::PvpEnemies const &enemies = who.getPvpEnemies();
+	for (TangibleObject::PvpEnemies::const_iterator i = enemies.begin(); i != enemies.end(); ++i)
+		if ((*i).enemyFaction == PvpFactions::getGuildWarCoolDownPeriodFactionId())
+			return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::hasFactionEnemyFlag(TangibleObject const &who, Pvp::FactionId enemyAlign)
+{
+	TangibleObject::PvpEnemies const &enemies = who.getPvpEnemies();
+	for (TangibleObject::PvpEnemies::const_iterator i = enemies.begin(); i != enemies.end(); ++i)
+		if ((*i).enemyId == NetworkId::cms_invalid && (*i).enemyFaction == enemyAlign)
+			return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::hasDuelEnemyFlag(TangibleObject const &who, NetworkId const &enemyId)
+{
+	TangibleObject::PvpEnemies const &enemies = who.getPvpEnemies();
+	for (TangibleObject::PvpEnemies::const_iterator i = enemies.begin(); i != enemies.end(); ++i)
+		if ((*i).enemyId == enemyId && (*i).enemyFaction == PvpFactions::getDuelFactionId())
+			return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::hasPersonalEnemyFlag(TangibleObject const &who, NetworkId const &enemyId)
+{
+	TangibleObject::PvpEnemies const &enemies = who.getPvpEnemies();
+	for (TangibleObject::PvpEnemies::const_iterator i = enemies.begin(); i != enemies.end(); ++i)
+		if ((*i).enemyId == enemyId && (*i).enemyFaction != PvpFactions::getDuelFactionId())
+			return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::hasBubbleCombatFlag(const TangibleObject &who)
+{
+	TangibleObject::PvpEnemies const &enemies = who.getPvpEnemies();
+	for (TangibleObject::PvpEnemies::const_iterator i = enemies.begin(); i != enemies.end(); ++i)
+		if ((*i).enemyFaction == PvpFactions::getBubbleCombatFactionId())
+			return true;
+	return false;
+}
+
+bool PvpInternal::hasBubbleCombatFlagAgainstTarget(const TangibleObject &who, const NetworkId &enemyId)
+{
+	TangibleObject::PvpEnemies const &enemies = who.getPvpEnemies();
+	for (TangibleObject::PvpEnemies::const_iterator i = enemies.begin(); i != enemies.end(); ++i)
+		if ((*i).enemyId == enemyId && (*i).enemyFaction == PvpFactions::getBubbleCombatFactionId())
+			return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::getPersonalEnemyIds(TangibleObject const &who, std::vector<NetworkId> &enemyIds)
+{
+	enemyIds.clear();
+	TangibleObject::PvpEnemies const &enemies = who.getPvpEnemies();
+	for (TangibleObject::PvpEnemies::const_iterator i = enemies.begin(); i != enemies.end(); ++i)
+		if ((*i).enemyId != NetworkId::cms_invalid)
+			enemyIds.push_back((*i).enemyId);
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::setPermFactionEnemyFlags(TangibleObject &dest)
+{
+	FATAL(!dest.isAuthoritative(), ("setPermFactionEnemyFlags on non-authoritative object"));
+
+	// run through the current enemies list and remove any permanent factional enemies
+	TangibleObject::PvpEnemies &enemies = dest.getPvpEnemies();
+	unsigned int pos = 0;
+	while (pos < enemies.size())
+	{
+		if (!(enemies.get(pos).expireTime) && (enemies.get(pos).enemyId == NetworkId::cms_invalid) && isFactionAligned(enemies.get(pos).enemyFaction))
+			enemies.erase(pos);
+		else
+			++pos;
+	}
+	// add any permanent factional enemy flags
+	Pvp::FactionId align = getAlignedFaction(dest);
+	Pvp::PvpType pvpType = dest.getPvpType();
+
+	// if player character is neutral, see if he's a mercenary
+	if (PvpData::isNeutralFactionId(align) && isPlayer(dest))
+	{
+		align = dest.getPvpMercenaryFaction();
+		pvpType = dest.getPvpMercenaryType();
+	}
+
+	if ((pvpType == PvpType_Declared) && align)
+	{
+		std::vector<Pvp::FactionId> const &opposingFactions = PvpFactions::getOpposingFactions(align);
+		for (std::vector<Pvp::FactionId>::const_iterator j = opposingFactions.begin(); j != opposingFactions.end(); ++j)
+			enemies.push_back(PvpEnemy(NetworkId::cms_invalid, *j, 0));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::buildPvpMessageSetFactionEnemyFlag(MessageQueuePvpCommand & messageQueuePvpCommand, Pvp::FactionId enemyAlign, int expireTimeMs)
+{
+	messageQueuePvpCommand.addPvpCommand(PvpMessages::setEnemyFlag.getCrc(), NetworkId::cms_invalid, static_cast<int>(enemyAlign), expireTimeMs);
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::setFactionEnemyFlag(TangibleObject &dest, Pvp::FactionId enemyAlign, int expireTimeMs)
+{
+	if (!dest.isAuthoritative())
+	{
+		MessageQueuePvpCommand * messageQueuePvpCommand = new MessageQueuePvpCommand();
+		buildPvpMessageSetFactionEnemyFlag(*messageQueuePvpCommand, enemyAlign, expireTimeMs);
+
+		// forwardPvpMessage() will own messageQueuePvpCommand
+		// and will be responsible for deallocation
+		forwardPvpMessage(dest, messageQueuePvpCommand);
+
+		return;
+	}
+
+	//XXX You cannot be flagged against your own faction, so check to make sure that we aren't trying to do that
+	Pvp::FactionId destFaction = PvpInternal::getAlignedFaction(dest);
+	if (destFaction == enemyAlign)
+		return;
+	//XXX end
+
+	if (expireTimeMs == -1)
+		expireTimeMs = getExpireTimeMs();
+
+	PvpUpdateObserver o(&dest, Archive::ADOO_generic);
+
+	TangibleObject::PvpEnemies &enemies = dest.getPvpEnemies();
+
+	// if the enemy is already set, update and refresh it
+	for (unsigned int pos = 0; pos < enemies.size(); ++pos)
+	{
+		PvpEnemy const &enemy = enemies.get(pos);
+		if (enemy.enemyId == NetworkId::cms_invalid && enemy.enemyFaction == enemyAlign)
+		{
+			// if they have a permanent flag for this faction, or the time difference isn't significant, don't bother to update it,
+			// but do update if the flag is going from temporary to permanent
+			if (enemy.expireTime && ((expireTimeMs == 0) || (expireTimeMs-enemy.expireTime > 30000)))
+				enemies.set(pos, PvpEnemy(NetworkId::cms_invalid, enemyAlign, expireTimeMs));
+			return;
+		}
+	}
+	// they didn't already have a flag for this faction, so add one
+	enemies.push_back(PvpEnemy(NetworkId::cms_invalid, enemyAlign, expireTimeMs));
+	tempEnemyFlagAdded(dest);
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::buildPvpMessageSetPersonalEnemyFlag(MessageQueuePvpCommand &messageQueuePvpCommand, NetworkId const &enemyId, Pvp::FactionId enemyAlign, int expireTimeMs)
+{
+	messageQueuePvpCommand.addPvpCommand(PvpMessages::setEnemyFlag.getCrc(), enemyId, static_cast<int>(enemyAlign), expireTimeMs);
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::setPersonalEnemyFlag(TangibleObject &dest, NetworkId const &enemyId, Pvp::FactionId enemyAlign, int expireTimeMs)
+{
+	if (!dest.isAuthoritative())
+	{
+		MessageQueuePvpCommand * messageQueuePvpCommand = new MessageQueuePvpCommand();
+		buildPvpMessageSetPersonalEnemyFlag(*messageQueuePvpCommand, enemyId, enemyAlign, expireTimeMs);
+
+		// forwardPvpMessage() will own messageQueuePvpCommand
+		// and will be responsible for deallocation
+		forwardPvpMessage(dest, messageQueuePvpCommand);
+
+		return;
+	}
+
+	if (expireTimeMs == -1)
+		expireTimeMs = getExpireTimeMs();
+
+	PvpUpdateObserver o(&dest, Archive::ADOO_generic);
+
+	TangibleObject::PvpEnemies &enemies = dest.getPvpEnemies();
+
+	// if the enemy is already set, update and refresh it
+	for (unsigned int pos = 0; pos < enemies.size(); ++pos)
+	{
+		PvpEnemy const &enemy = enemies.get(pos);
+		if (enemy.enemyId == enemyId)
+		{
+			// only update it if the time difference is significant (30 sec)
+			// or the flag is going from temporary to permanent
+			// or the alignment has changed
+			if (((expireTimeMs == 0) || (expireTimeMs-enemy.expireTime > 30000)) && (enemy.expireTime != 0))
+				enemies.set(pos, PvpEnemy(enemyId, enemyAlign, expireTimeMs));
+			else if (enemy.enemyFaction != enemyAlign)
+				enemies.set(pos, PvpEnemy(enemyId, enemyAlign, ((enemy.expireTime == 0) ? 0 : expireTimeMs)));
+			return;
+		}
+	}
+	// they didn't already have a flag for this faction, so add one
+	enemies.push_back(PvpEnemy(enemyId, enemyAlign, expireTimeMs));
+	tempEnemyFlagAdded(dest);
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::setPersonalEnemyFlag(TangibleObject &dest, TangibleObject const &src)
+{
+	setPersonalEnemyFlag(dest, src.getNetworkId(), getAlignedFaction(src));
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::setDuelEnemyFlag(TangibleObject &dest, TangibleObject const &src)
+{
+	setPersonalEnemyFlag(dest, src.getNetworkId(), PvpFactions::getDuelFactionId(), 0);
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::setPermanentPersonalEnemyFlag(TangibleObject &dest, NetworkId const &enemyId)
+{
+	setPersonalEnemyFlag(dest, enemyId, getAlignedFaction(enemyId), 0); // 0 expireTime = permanent
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::areFactionsOpposed(Pvp::FactionId align1, Pvp::FactionId align2)
+{
+	std::vector<Pvp::FactionId> const &opposingFactions = PvpFactions::getOpposingFactions(align1);
+	return std::find(opposingFactions.begin(), opposingFactions.end(), align2) != opposingFactions.end();
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::setAlignedFaction(TangibleObject &dest, Pvp::FactionId align)
+{
+	if (getAlignedFaction(dest) != align)
+	{
+		if (!dest.isAuthoritative())
+		{
+			forwardPvpMessage(dest, PvpMessages::setAlignedFaction.getCrc(), NetworkId::cms_invalid, align, 0);
+			return;
+		}
+
+		PvpUpdateObserver o(&dest, Archive::ADOO_generic);
+
+		dest.setPvpFaction(align);
+		if (isDeclared(dest))
+			setPermFactionEnemyFlags(dest);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::setNeutralMercenaryFaction(CreatureObject &dest, Pvp::FactionId align, Pvp::PvpType pvpType)
+{
+	// this only applies to neutral
+	if (!PvpData::isNeutralFactionId(getAlignedFaction(dest)) && !PvpData::isNeutralFactionId(align))
+		return;
+
+	if ((dest.getPvpMercenaryFaction() != align) || (dest.getPvpMercenaryType() != pvpType))
+	{
+		if (!dest.isAuthoritative())
+		{
+			forwardPvpMessage(dest, PvpMessages::setMercenaryFaction.getCrc(), NetworkId::cms_invalid, align, pvpType);
+			return;
+		}
+
+		bool const wasDeclared = (!PvpData::isNeutralFactionId(dest.getPvpMercenaryFaction()) && (dest.getPvpMercenaryType() == PvpType_Declared));
+
+		PvpUpdateObserver o(&dest, Archive::ADOO_generic);
+
+		dest.setPvpMercenaryFaction(align, pvpType);
+
+		bool const isDeclared = (!PvpData::isNeutralFactionId(dest.getPvpMercenaryFaction()) && (dest.getPvpMercenaryType() == PvpType_Declared));
+
+		if (wasDeclared != isDeclared)
+			setPermFactionEnemyFlags(dest);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::makeOnLeave(TangibleObject &dest)
+{
+	// don't need to do anything if the character
+	// is not factional or already "on leave";
+	// "on leave" means character belongs to
+	// a faction and is PvpType_Neutral
+	if (dest.getPvpFaction() == 0)
+		return;
+
+	if (dest.getPvpType() == PvpType_Neutral)
+		return;
+
+	if (!dest.isAuthoritative())
+	{
+		// 782497134 (just an arbitrary random value) is a special value to indicate "on leave"
+		forwardPvpMessage(dest, PvpMessages::setType.getCrc(), NetworkId::cms_invalid, 0, 782497134);
+		return;
+	}
+
+	PvpUpdateObserver o(&dest, Archive::ADOO_generic);
+
+	bool wasDeclared = isDeclared(dest);
+	dest.setPvpType(PvpType_Neutral);
+	if (wasDeclared)
+		setPermFactionEnemyFlags(dest);
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::makeCovert(TangibleObject &dest)
+{
+	if (!isCovert(dest))
+	{
+		if (!dest.isAuthoritative())
+		{
+			forwardPvpMessage(dest, PvpMessages::setType.getCrc(), NetworkId::cms_invalid, 0, 1);
+			return;
+		}
+
+		PvpUpdateObserver o(&dest, Archive::ADOO_generic);
+
+		bool wasDeclared = isDeclared(dest);
+		dest.setPvpType(PvpType_Covert);
+		if (wasDeclared)
+			setPermFactionEnemyFlags(dest);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::makeDeclared(TangibleObject &dest)
+{
+	if (!isDeclared(dest))
+	{
+		if (!dest.isAuthoritative())
+		{
+			forwardPvpMessage(dest, PvpMessages::setType.getCrc(), NetworkId::cms_invalid, 0, 2);
+			return;
+		}
+
+		PvpUpdateObserver o(&dest, Archive::ADOO_generic);
+
+		dest.setPvpType(PvpType_Declared);
+		setPermFactionEnemyFlags(dest);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::makeNeutral(TangibleObject &dest)
+{
+	// don't need to do anything if
+	// the character is already neutral
+	if ((dest.getPvpFaction() == 0) && (dest.getPvpType() == PvpType_Neutral))
+		return;
+
+	if (!dest.isAuthoritative())
+	{
+		forwardPvpMessage(dest, PvpMessages::setType.getCrc(), NetworkId::cms_invalid, 0, 0);
+		return;
+	}
+
+	PvpUpdateObserver o(&dest, Archive::ADOO_generic);
+
+	bool wasDeclared = isDeclared(dest);
+
+	if (dest.getPvpType() != PvpType_Neutral)
+		dest.setPvpType(PvpType_Neutral);
+
+	if (wasDeclared)
+		setPermFactionEnemyFlags(dest);
+
+	// lose faction when made neutral
+	if (dest.getPvpFaction() != 0)
+		setAlignedFaction(dest, 0);
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::prepareToBeCovert(TangibleObject &dest)
+{
+	if (!isPreparedToBeCovert(dest))
+	{
+		if (!dest.isAuthoritative())
+		{
+			forwardPvpMessage(dest, PvpMessages::setFutureType.getCrc(), NetworkId::cms_invalid, 0, 1);
+			return;
+		}
+
+		PvpUpdateObserver o(&dest, Archive::ADOO_generic);
+		dest.setPvpFutureType(PvpType_Covert);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::prepareToBeDeclared(TangibleObject &dest)
+{
+	if (!isPreparedToBeDeclared(dest))
+	{
+		if (!dest.isAuthoritative())
+		{
+			forwardPvpMessage(dest, PvpMessages::setFutureType.getCrc(), NetworkId::cms_invalid, 0, 2);
+			return;
+		}
+
+		PvpUpdateObserver o(&dest, Archive::ADOO_generic);
+		dest.setPvpFutureType(PvpType_Declared);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::prepareToBeNeutral(TangibleObject &dest)
+{
+	if (!isPreparedToBeNeutral(dest))
+	{
+		if (!dest.isAuthoritative())
+		{
+			forwardPvpMessage(dest, PvpMessages::setFutureType.getCrc(), NetworkId::cms_invalid, 0, 0);
+			return;
+		}
+
+		PvpUpdateObserver o(&dest, Archive::ADOO_generic);
+		dest.setPvpFutureType(PvpType_Neutral);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::tempEnemyFlagAdded(TangibleObject const &dest)
+{
+	IGNORE_RETURN(s_objectsWithTempFlags.insert(dest.getNetworkId()));
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::removeDuelEnemyFlags(TangibleObject &dest, NetworkId const &enemyId)
+{
+	if (!dest.isAuthoritative())
+	{
+		forwardPvpMessage(dest, PvpMessages::removeDuelEnemyFlags.getCrc(), enemyId, 0, 0);
+		return;
+	}
+
+	PvpUpdateObserver o(&dest, Archive::ADOO_generic);
+	TangibleObject::PvpEnemies &enemies = dest.getPvpEnemies();
+	unsigned int pos = 0;
+	while (pos < enemies.size())
+	{
+		PvpEnemy const &enemy = enemies.get(pos);
+		bool removed = false;
+		if (enemy.enemyFaction == PvpFactions::getDuelFactionId())
+		{
+			if (enemyId == NetworkId::cms_invalid)
+			{
+				// if removing all duel flags from someone, remove the opposite flag from those involved
+				Object * const o = NetworkIdManager::getObjectById(enemy.enemyId);
+				if (o)
+				{
+					ServerObject * const so = o->asServerObject();
+					if (so)
+					{
+						TangibleObject * const to = so->asTangibleObject();
+						if (to)
+							removeDuelEnemyFlags(*to, dest.getNetworkId());
+					}
+				}
+				removed = true;
+				enemies.erase(pos);
+			}
+			else if (enemy.enemyId == enemyId)
+			{
+				removed = true;
+				enemies.erase(pos);
+			}
+		}
+		if (!removed)
+			++pos;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::removePersonalEnemyFlags(TangibleObject &dest, NetworkId const &enemyId)
+{
+	if (!dest.isAuthoritative())
+	{
+		forwardPvpMessage(dest, PvpMessages::removePersonalEnemyFlags.getCrc(), enemyId, 0, 0);
+		return;
+	}
+
+	PvpUpdateObserver o(&dest, Archive::ADOO_generic);
+	TangibleObject::PvpEnemies &enemies = dest.getPvpEnemies();
+	unsigned int pos = 0;
+	while (pos < enemies.size())
+	{
+		PvpEnemy const &enemy = enemies.get(pos);
+		if (enemy.enemyId == enemyId && enemy.enemyFaction != PvpFactions::getDuelFactionId())
+			enemies.erase(pos);
+		else
+			++pos;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::removeTempEnemyFlags(TangibleObject &dest, NetworkId const &enemyId)
+{
+	if (!dest.isAuthoritative())
+	{
+		forwardPvpMessage(dest, PvpMessages::removeTempEnemyFlags.getCrc(), enemyId, 0, 0);
+		return;
+	}
+
+	PvpUpdateObserver o(&dest, Archive::ADOO_generic);
+	TangibleObject::PvpEnemies &enemies = dest.getPvpEnemies();
+	unsigned int pos = 0;
+	while (pos < enemies.size())
+	{
+		PvpEnemy const &enemy = enemies.get(pos);
+		if (enemy.expireTime && (enemyId == NetworkId::cms_invalid || enemy.enemyId == enemyId))
+			enemies.erase(pos);
+		else
+			++pos;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::updateTimedFlags(unsigned long updateTimeMs)
+{
+	// Run through adjusting the remaining time on any temp flags.  This may cause pvp status changes, so
+	// we use a PvpUpdateObserver to catch anything significant.
+	std::set<NetworkId>::iterator i = s_objectsWithTempFlags.begin();
+	while (i != s_objectsWithTempFlags.end())
+	{
+		bool removeFlag = true;
+		Object *o = NetworkIdManager::getObjectById(*i);
+		if (o)
+		{
+			ServerObject *so = o->asServerObject();
+			if (so && so->isAuthoritative())
+			{
+				TangibleObject *to = so->asTangibleObject();
+				if (to)
+				{
+					PvpUpdateObserver updateObserver(to, Archive::ADOO_generic);
+					TangibleObject::PvpEnemies &enemies = to->getPvpEnemies();
+					unsigned int pos = 0;
+					while (pos < enemies.size())
+					{
+						PvpEnemy const &enemy = enemies.get(pos);
+						int expireTime = enemy.expireTime;
+
+						if (expireTime)
+						{
+							expireTime -= static_cast<int>(updateTimeMs);
+							if (expireTime <= 0)
+								enemies.erase(pos);
+							else
+							{
+								enemies.set(pos, PvpEnemy(enemy.enemyId, enemy.enemyFaction, expireTime));
+								removeFlag = false;
+								++pos;
+							}
+						}
+						else
+							++pos;
+					}
+				}
+			}
+		}
+		if (removeFlag)
+			s_objectsWithTempFlags.erase(i++);
+		else
+			++i;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::handleAuthorityAcquire(TangibleObject &dest)
+{
+	setPermFactionEnemyFlags(dest);
+
+	if (hasAnyTimedEnemyFlag(dest))
+		IGNORE_RETURN(s_objectsWithTempFlags.insert(dest.getNetworkId()));
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Clean up TEFs to a creature that has died.
+ * @todo: this is really slow, speed it up!
+ */
+void PvpInternal::handleCreatureDied(TangibleObject &creature)
+{
+	// clear out any duel flags on the player, and reciprocated flags for any we can find
+	if (creature.isAuthoritative() && creature.isPlayerControlled())
+		removeDuelEnemyFlags(creature, NetworkId::cms_invalid);
+
+	// Run through removing pef's toward this creature from auth players
+	std::set<NetworkId>::iterator i = s_objectsWithTempFlags.begin();
+	while (i != s_objectsWithTempFlags.end())
+	{
+		bool removeFlag = true;
+		Object *o = NetworkIdManager::getObjectById(*i);
+		if (o)
+		{
+			ServerObject *so = o->asServerObject();
+			if (so && so->isAuthoritative())
+			{
+				TangibleObject *to = so->asTangibleObject();
+				if (to)
+				{
+		 			if (!to->isPlayerControlled())
+						removeFlag = false;
+					else
+					{
+						PvpUpdateObserver updateObserver(to, Archive::ADOO_generic);
+						TangibleObject::PvpEnemies &enemies = to->getPvpEnemies();
+						unsigned int pos = 0;
+						while (pos < enemies.size())
+						{
+							PvpEnemy const &enemy = enemies.get(pos);
+							if (enemy.expireTime && enemy.enemyId == creature.getNetworkId())
+								enemies.erase(pos);
+							else
+							{
+								removeFlag = false;
+								++pos;
+							}
+						}
+					}
+				}
+			}
+		}
+		if (removeFlag)
+			s_objectsWithTempFlags.erase(i++);
+		else
+			++i;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+// messageQueuePvpCommand must be dynamically allocated; function owns
+// messageQueuePvpCommand and will be responsible for deallocation
+void PvpInternal::forwardPvpMessage(TangibleObject &dest, MessageQueuePvpCommand *messageQueuePvpCommand)
+{
+	if (!messageQueuePvpCommand)
+		return;
+
+	Controller *controller = dest.getController();
+	FATAL(!controller, ("forwardPvpMessage with no object controller"));
+	safe_cast<TangibleController*>(controller)->appendMessage(
+		static_cast<int>(CM_pvpMessage),
+		0.0f,
+		messageQueuePvpCommand,
+		GameControllerMessageFlags::SEND |
+		GameControllerMessageFlags::RELIABLE |
+		GameControllerMessageFlags::DEST_AUTH_SERVER);
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::forwardPvpMessage(TangibleObject &dest, uint32 command, NetworkId const &idParam, Pvp::FactionId factionParam, int intParam)
+{
+	// forwardPvpMessage() will own messageQueuePvpCommand
+	// and will be responsible for deallocation
+	forwardPvpMessage(dest, new MessageQueuePvpCommand(command, idParam, static_cast<int>(factionParam), intParam));
+}
+
+// ----------------------------------------------------------------------
+
+void PvpInternal::handlePvpMessage(TangibleObject &dest, MessageQueuePvpCommand const &pvpMessage)
+{
+	MessageQueuePvpCommand::PvpCommands const & pvpCommands = pvpMessage.getPvpCommands();
+
+	if (pvpCommands.empty())
+		return;
+
+	PvpUpdateObserver o(&dest, Archive::ADOO_generic);
+
+	for (MessageQueuePvpCommand::PvpCommands::const_iterator i = pvpCommands.begin(); i != pvpCommands.end(); ++i)
+	{
+		if (i->m_command == PvpMessages::setEnemyFlag.getCrc())
+		{
+			if (i->m_idParam == NetworkId::cms_invalid)
+				setFactionEnemyFlag(dest, static_cast<Pvp::FactionId>(i->m_intParam1), i->m_intParam2);
+			else
+				setPersonalEnemyFlag(dest, i->m_idParam, static_cast<Pvp::FactionId>(i->m_intParam1), i->m_intParam2);
+		}
+		else if (i->m_command == PvpMessages::setAlignedFaction.getCrc())
+		{
+			setAlignedFaction(dest, static_cast<Pvp::FactionId>(i->m_intParam1));
+		}
+		else if (i->m_command == PvpMessages::setMercenaryFaction.getCrc())
+		{
+			CreatureObject * const co = dest.asCreatureObject();
+			if (co)
+				setNeutralMercenaryFaction(*co, static_cast<Pvp::FactionId>(i->m_intParam1), static_cast<Pvp::PvpType>(i->m_intParam2));
+		}
+		else if (i->m_command == PvpMessages::setType.getCrc())
+		{
+			switch (i->m_intParam2)
+			{
+			case PvpType_Neutral:
+				makeNeutral(dest);
+				break;
+			case PvpType_Covert:
+				makeCovert(dest);
+				break;
+			case PvpType_Declared:
+				makeDeclared(dest);
+				break;
+			// 782497134 (just an arbitrary random value) is a special value to indicate "on leave"
+			case 782497134:
+				makeOnLeave(dest);
+				break;
+			default:
+				FATAL(true, ("bad pvp type specified"));
+				break;
+			}
+		}
+		else if (i->m_command == PvpMessages::setFutureType.getCrc())
+		{
+			switch (i->m_intParam2)
+			{
+			case PvpType_Neutral:
+				prepareToBeNeutral(dest);
+				break;
+			case PvpType_Covert:
+				prepareToBeCovert(dest);
+				break;
+			case PvpType_Declared:
+				prepareToBeDeclared(dest);
+				break;
+			default:
+				FATAL(true, ("bad future pvp type specified"));
+				break;
+			}
+		}
+		else if (i->m_command == PvpMessages::removeTempEnemyFlags.getCrc())
+		{
+			removeTempEnemyFlags(dest, i->m_idParam);
+		}
+		else if (i->m_command == PvpMessages::removeDuelEnemyFlags.getCrc())
+		{
+			removeDuelEnemyFlags(dest, i->m_idParam);
+		}
+		else if (i->m_command == PvpMessages::removePersonalEnemyFlags.getCrc())
+		{
+			removePersonalEnemyFlags(dest, i->m_idParam);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::containsAlignedEnemyFlag(std::vector<PvpEnemy> const &flagList)
+{
+	for (std::vector<PvpEnemy>::const_iterator i = flagList.begin(); i != flagList.end(); ++i)
+		if (isFactionAligned((*i).enemyFaction))
+			return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpInternal::isFactionAligned(Pvp::FactionId faction)
+{
+	if (   faction
+	    && faction != PvpFactions::getDuelFactionId()
+	    && faction != PvpFactions::getBountyDuelFactionId()
+	    && faction != PvpFactions::getGuildWarCoolDownPeriodFactionId()
+	    && faction != PvpFactions::getBattlefieldFactionId()
+	    && !PvpFactions::isNonaggressiveFaction(faction)
+	    && !PvpFactions::isBountyTargetFaction(faction))
+		return true;
+	return false;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpInternal.h b/engine/server/library/serverGame/src/shared/pvp/PvpInternal.h
new file mode 100644
index 00000000..f5ce3051
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/PvpInternal.h
@@ -0,0 +1,101 @@
+// ======================================================================
+//
+// PvpInternal.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _PvpInternal_H
+#define _PvpInternal_H
+
+// ======================================================================
+
+#include "Pvp.h"
+
+// ======================================================================
+
+class PvpRuleSetBase;
+class Region;
+class RegionPvp;
+class MessageQueuePvpCommand;
+struct PvpEnemy;
+
+// ======================================================================
+
+class PvpInternal
+{
+public:
+	static PvpRuleSetBase & getRuleSet          (TangibleObject const &obj1, TangibleObject const &obj2);
+	static Region const *   getPvpRegion        (TangibleObject const &obj);
+	static TangibleObject const *getPetMaster   (TangibleObject const &who);
+	static TangibleObject *getPetMaster         (TangibleObject &who);
+	static bool      inSameGroup                (TangibleObject const &obj1, TangibleObject const &obj2);
+	static void      getGroupMembers            (TangibleObject const &src, stdvector<TangibleObject const *>::fwd &members);
+	static Pvp::FactionId getAlignedFaction     (TangibleObject const &who);
+	static Pvp::FactionId getAlignedFaction     (NetworkId const &who);
+	static bool      hasAnyEnemyFlag            (TangibleObject const &who);
+	static bool      hasAnyTimedEnemyFlag       (TangibleObject const &who);
+	static bool      hasAnyAlignedTimedEnemyFlag(TangibleObject const &who);
+	static bool      hasAnyAlignedEnemyFlag     (TangibleObject const &who);
+	static bool      hasAnyFactionEnemyFlag     (TangibleObject const &who);
+	static bool      hasAnyBountyDuelEnemyFlag  (TangibleObject const &who);
+	static bool      hasAnyGuildWarCoolDownPeriodEnemyFlag(TangibleObject const &who);
+	static bool      hasFactionEnemyFlag        (TangibleObject const &who, Pvp::FactionId enemyAlign);
+	static bool      hasDuelEnemyFlag           (TangibleObject const &who, NetworkId const &enemyId);
+	static bool      hasPersonalEnemyFlag       (TangibleObject const &who, NetworkId const &enemyId);
+	static bool		 hasBubbleCombatFlag		(TangibleObject const &who);
+	static bool		 hasBubbleCombatFlagAgainstTarget (TangibleObject const &who, NetworkId const &enemyId);
+	static void      getPersonalEnemyIds        (TangibleObject const &who, stdvector<NetworkId>::fwd &enemyIds);
+	static Pvp::FactionId battlefieldGetFaction (TangibleObject const &who, RegionPvp const &region);
+	static bool      battlefieldIsParticipant   (TangibleObject const &who, RegionPvp const &region);
+	static void      battlefieldSetParticipant  (TangibleObject const &who, RegionPvp const &region, Pvp::FactionId factionId);
+	static bool      isPet                      (TangibleObject const &who);
+	static bool      isPlayer                   (TangibleObject const &who);
+	static bool      isNeutral                  (TangibleObject const &who);
+	static bool      isCovert                   (TangibleObject const &who);
+	static bool      isDeclared                 (TangibleObject const &who);
+	static bool      isPreparedToBeNeutral      (TangibleObject const &who);
+	static bool      isPreparedToBeCovert       (TangibleObject const &who);
+	static bool      isPreparedToBeDeclared     (TangibleObject const &who);
+	static void      buildPvpMessageSetFactionEnemyFlag(MessageQueuePvpCommand &messageQueuePvpCommand, Pvp::FactionId enemyAlign, int expireTimeMs = -1);
+	static void      setFactionEnemyFlag        (TangibleObject &dest, Pvp::FactionId enemyAlign, int expireTimeMs = -1);
+	static void      buildPvpMessageSetPersonalEnemyFlag(MessageQueuePvpCommand &messageQueuePvpCommand, NetworkId const &enemyId, Pvp::FactionId enemyAlign, int expireTimeMs = -1);
+	static void      setPersonalEnemyFlag       (TangibleObject &dest, NetworkId const &enemyId, Pvp::FactionId enemyAlign, int expireTimeMs = -1);
+	static void      setPersonalEnemyFlag       (TangibleObject &dest, TangibleObject const &src);
+	static void      setPermanentPersonalEnemyFlag(TangibleObject &dest, NetworkId const &enemyId);
+	static void      setDuelEnemyFlag           (TangibleObject &dest, TangibleObject const &src);
+	static void      removeDuelEnemyFlags       (TangibleObject &dest, NetworkId const &enemyId);
+	static void      removePersonalEnemyFlags   (TangibleObject &dest, NetworkId const &enemyId);
+	static void      removeTempEnemyFlags       (TangibleObject &dest, NetworkId const &enemyId);
+	static void      setAlignedFaction          (TangibleObject &dest, Pvp::FactionId align);
+	static void      setNeutralMercenaryFaction (CreatureObject &dest, Pvp::FactionId align, Pvp::PvpType pvpType);
+	static void      makeOnLeave                (TangibleObject &dest);
+	static void      makeCovert                 (TangibleObject &dest);
+	static void      makeDeclared               (TangibleObject &dest);
+	static void      makeNeutral                (TangibleObject &dest);
+	static void      prepareToBeCovert          (TangibleObject &dest);
+	static void      prepareToBeDeclared        (TangibleObject &dest);
+	static void      prepareToBeNeutral         (TangibleObject &dest);
+	static int       getExpireTimeMs            ();
+	static void      updateTimedFlags           (unsigned long updateTimeMs);
+	static bool      areFactionsOpposed         (Pvp::FactionId align1, Pvp::FactionId align2);
+	static void      handlePvpMessage           (TangibleObject &dest, MessageQueuePvpCommand const &pvpMessage);
+	static void      handleAuthorityAcquire     (TangibleObject &dest);
+	static void      handleCreatureDied         (TangibleObject &creature);
+	static bool      containsAlignedEnemyFlag   (std::vector<PvpEnemy> const &flagList);
+	static bool      isFactionAligned           (Pvp::FactionId faction);
+	static void      forwardPvpMessage          (TangibleObject &dest, MessageQueuePvpCommand *messageQueuePvpCommand);
+
+private:
+	static bool      isTruceRegion              (Region const &regionObj);
+	static bool      isBattlefieldRegion        (Region const &regionObj);
+	static void      setPermFactionEnemyFlags   (TangibleObject &dest);
+	static void      tempEnemyFlagAdded         (TangibleObject const &dest);
+	static void      forwardPvpMessage          (TangibleObject &dest, uint32 command, NetworkId const &idParam, Pvp::FactionId factionParam, int intParam);
+};
+
+// ======================================================================
+
+#endif // _PvpInternal_H
+
diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetBase.cpp b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetBase.cpp
new file mode 100644
index 00000000..440b0ed7
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetBase.cpp
@@ -0,0 +1,118 @@
+// ======================================================================
+//
+// PvpRuleSetBase.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PvpRuleSetBase.h"
+
+#include "serverGame/PvpFactions.h"
+#include "serverGame/PvpInternal.h"
+#include "serverGame/PvpUpdateObserver.h"
+#include "serverGame/TangibleObject.h"
+#include "serverNetworkMessages/MessageQueuePvpCommand.h"
+#include "serverUtility/PvpEnemy.h"
+
+// ======================================================================
+
+namespace PvpRuleSetBaseNamespace
+{
+	void applyRepercussions(TangibleObject &actor, std::vector<PvpEnemy> const &repercussions)
+	{
+		if (repercussions.empty())
+			return;
+
+		// if object is authoritative, then apply repercussions immediately;
+		// otherwise, forward repercussions over to the authoritative server
+		PvpUpdateObserver * o = NULL;
+		MessageQueuePvpCommand * messageQueuePvpCommand = NULL;
+
+		if (actor.isAuthoritative())
+			o = new PvpUpdateObserver(&actor, Archive::ADOO_generic);
+		else
+			// this will be owned and deallocated by PvpInternal::forwardPvpMessage()
+			messageQueuePvpCommand = new MessageQueuePvpCommand();
+
+		for (std::vector<PvpEnemy>::const_iterator i = repercussions.begin(); i != repercussions.end(); ++i)
+		{
+			if ((*i).enemyId == NetworkId::cms_invalid)
+			{
+				if (actor.isAuthoritative())
+					PvpInternal::setFactionEnemyFlag(actor, (*i).enemyFaction);
+				else
+					PvpInternal::buildPvpMessageSetFactionEnemyFlag(*messageQueuePvpCommand, (*i).enemyFaction);
+			}
+			else
+			{
+				if (actor.isAuthoritative())
+					PvpInternal::setPersonalEnemyFlag(actor, (*i).enemyId, (*i).enemyFaction);
+				else
+					PvpInternal::buildPvpMessageSetPersonalEnemyFlag(*messageQueuePvpCommand, (*i).enemyId, (*i).enemyFaction);
+			}
+		}
+
+		if (actor.isAuthoritative())
+			delete o;
+		else
+			// forwardPvpMessage() will own messageQueuePvpCommand
+			// and will be responsible for deallocation
+			PvpInternal::forwardPvpMessage(actor, messageQueuePvpCommand);
+	}
+}
+
+// ======================================================================
+
+bool PvpRuleSetBase::canAttack(TangibleObject const &, TangibleObject const &) const
+{
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpRuleSetBase::canHelp(TangibleObject const &, TangibleObject const &) const
+{
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpRuleSetBase::isEnemy(TangibleObject const &, TangibleObject const &) const
+{
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpRuleSetBase::isDuelingAllowed(TangibleObject const &, TangibleObject const &) const
+{
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void PvpRuleSetBase::getAttackRepercussions(TangibleObject const &, TangibleObject const &, std::vector<PvpEnemy> &actorRepercussions, std::vector<PvpEnemy> &targetRepercussions) const
+{
+	actorRepercussions.clear();
+	targetRepercussions.clear();
+}
+
+// ----------------------------------------------------------------------
+
+void PvpRuleSetBase::getHelpRepercussions(TangibleObject const &, TangibleObject const &, std::vector<PvpEnemy> &actorRepercussions, std::vector<PvpEnemy> &targetRepercussions) const
+{
+	actorRepercussions.clear();
+	targetRepercussions.clear();
+}
+
+// ----------------------------------------------------------------------
+
+void PvpRuleSetBase::applyRepercussions(TangibleObject &actor, TangibleObject &target, std::vector<PvpEnemy> const &actorRepercussions, std::vector<PvpEnemy> const &targetRepercussions)
+{
+	PvpRuleSetBaseNamespace::applyRepercussions(actor, actorRepercussions);
+	PvpRuleSetBaseNamespace::applyRepercussions(target, targetRepercussions);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetBase.h b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetBase.h
new file mode 100644
index 00000000..42cc7c2a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetBase.h
@@ -0,0 +1,34 @@
+// ======================================================================
+//
+// PvpRuleSetBase.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _PvpRuleSetBase_H
+#define _PvpRuleSetBase_H
+
+// ======================================================================
+
+class TangibleObject;
+struct PvpEnemy;
+
+// ======================================================================
+
+class PvpRuleSetBase
+{
+public:
+	virtual bool canAttack(TangibleObject const &actor, TangibleObject const &target) const;
+	virtual bool canHelp(TangibleObject const &actor, TangibleObject const &target) const;
+	virtual bool isEnemy(TangibleObject const &actor, TangibleObject const &target) const;
+	virtual bool isDuelingAllowed(TangibleObject const &actor, TangibleObject const &target) const;
+	virtual void getAttackRepercussions(TangibleObject const &actor, TangibleObject const &target, std::vector<PvpEnemy> &actorRepercussions, std::vector<PvpEnemy> &targetRepercussions) const;
+	virtual void getHelpRepercussions(TangibleObject const &actor, TangibleObject const &target, std::vector<PvpEnemy> &actorRepercussions, std::vector<PvpEnemy> &targetRepercussions) const;
+	virtual void applyRepercussions(TangibleObject &actor, TangibleObject &target, std::vector<PvpEnemy> const &actorRepercussions, std::vector<PvpEnemy> const &targetRepercussions);
+};
+
+// ======================================================================
+
+#endif // _PvpRuleSetBase_H
+
diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetBattlefield.cpp b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetBattlefield.cpp
new file mode 100644
index 00000000..9db946d7
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetBattlefield.cpp
@@ -0,0 +1,104 @@
+// ======================================================================
+//
+// PvpRuleSetBattlefield.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PvpRuleSetBattlefield.h"
+#include "serverGame/PvpFactions.h"
+#include "serverGame/PvpInternal.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/Region.h"
+#include "serverGame/TangibleObject.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedObject/NetworkIdManager.h"
+
+// ======================================================================
+
+bool PvpRuleSetBattlefield::canAttack(TangibleObject const &actor, TangibleObject const &target) const
+{
+	// you can't attack yourself
+	if (&actor == &target)
+		return false;
+
+	// non-pvpable and invulnerable objects cannot be attacked
+	if (target.isNonPvpObject() || target.isInvulnerable())
+		return false;
+
+	Region const *baseRegion = actor.getPvpRegion();
+	if (!baseRegion)
+		return false;
+
+	RegionPvp const *region = baseRegion->asRegionPvp();
+	if (!region)
+		return false;
+
+	// non-creatures cannot attack unless they have the pvpCanAttack objvar
+	if (!actor.asCreatureObject())
+	{
+		int pvpCanAttack = 0;
+		if (!actor.getObjVars().getItem("pvpCanAttack", pvpCanAttack) || pvpCanAttack != 1)
+			return false;
+	}
+
+	Pvp::FactionId actorSide = PvpInternal::battlefieldGetFaction(actor, *region);
+	Pvp::FactionId targetSide = PvpInternal::battlefieldGetFaction(target, *region);
+	if (actorSide != targetSide && actorSide && targetSide)
+		return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpRuleSetBattlefield::canHelp(TangibleObject const &actor, TangibleObject const &target) const
+{
+	if (&actor == &target)
+		return true;
+
+	Region const *baseRegion = actor.getPvpRegion();
+	if (!baseRegion)
+		return false;
+
+	RegionPvp const *region = baseRegion->asRegionPvp();
+	if (!region)
+		return false;
+
+	Pvp::FactionId actorSide = PvpInternal::battlefieldGetFaction(actor, *region);
+	Pvp::FactionId targetSide = PvpInternal::battlefieldGetFaction(target, *region);
+	if (actorSide && actorSide == targetSide)
+		return true;
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void PvpRuleSetBattlefield::getAttackRepercussions(TangibleObject const &, TangibleObject const &, std::vector<PvpEnemy> &actorRepercussions, std::vector<PvpEnemy> &targetRepercussions) const
+{
+	actorRepercussions.clear();
+	actorRepercussions.push_back(PvpEnemy(NetworkId::cms_invalid, PvpFactions::getBattlefieldFactionId(), -1));
+
+	targetRepercussions.clear();
+}
+
+// ----------------------------------------------------------------------
+
+void PvpRuleSetBattlefield::getHelpRepercussions(TangibleObject const &, TangibleObject const &, std::vector<PvpEnemy> &actorRepercussions, std::vector<PvpEnemy> &targetRepercussions) const
+{
+	actorRepercussions.clear();
+	actorRepercussions.push_back(PvpEnemy(NetworkId::cms_invalid, PvpFactions::getBattlefieldFactionId(), -1));
+
+	targetRepercussions.clear();
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpRuleSetBattlefield::isEnemy(TangibleObject const &actor, TangibleObject const &target) const
+{
+	return canAttack(actor, target);
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetBattlefield.h b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetBattlefield.h
new file mode 100644
index 00000000..809f97f4
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetBattlefield.h
@@ -0,0 +1,31 @@
+// ======================================================================
+//
+// PvpRuleSetBattlefield.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _PvpRuleSetBattlefield_H
+#define _PvpRuleSetBattlefield_H
+
+// ======================================================================
+
+#include "serverGame/PvpRuleSetBase.h"
+
+// ======================================================================
+
+class PvpRuleSetBattlefield: public PvpRuleSetBase
+{
+public:
+	virtual bool canAttack(TangibleObject const &actor, TangibleObject const &target) const;
+	virtual bool canHelp(TangibleObject const &actor, TangibleObject const &target) const;
+	virtual void getAttackRepercussions(TangibleObject const &actor, TangibleObject const &target, std::vector<PvpEnemy> &actorRepercussions, std::vector<PvpEnemy> &targetRepercussions) const;
+	virtual void getHelpRepercussions(TangibleObject const &actor, TangibleObject const &target, std::vector<PvpEnemy> &actorRepercussions, std::vector<PvpEnemy> &targetRepercussions) const;
+	virtual bool isEnemy(TangibleObject const &actor, TangibleObject const &target) const;
+};
+
+// ======================================================================
+
+#endif // _PvpRuleSetBattlefield_H
+
diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetNormal.cpp b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetNormal.cpp
new file mode 100644
index 00000000..93765ca8
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetNormal.cpp
@@ -0,0 +1,615 @@
+// ======================================================================
+//
+// PvpRuleSetNormal.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PvpRuleSetNormal.h"
+
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GuildInterface.h"
+#include "serverGame/PlayerCreatureController.h"
+#include "serverGame/PvpFactions.h"
+#include "serverGame/PvpInternal.h"
+#include "serverGame/TangibleObject.h"
+#include "serverScript/GameScriptObject.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedObject/NetworkIdManager.h"
+
+// ======================================================================
+
+bool PvpRuleSetNormal::canAttack(TangibleObject const &actor, TangibleObject const &target) const
+{
+	// people can never hurt themselves
+	if (&actor == &target)
+		return false;
+
+	// non-pvpable and invulnerable objects cannot be attacked
+	if (target.isNonPvpObject() || target.isInvulnerable())
+		return false;
+
+	bool const actorIsPlayer = PvpInternal::isPlayer(actor);
+	bool const targetIsPlayer = PvpInternal::isPlayer(target);
+	Pvp::FactionId targetFaction = PvpInternal::getAlignedFaction(target);
+	Pvp::FactionId actorFaction  = PvpInternal::getAlignedFaction(actor);
+	Pvp::PvpType actorPvpType = actor.getPvpType();
+	Pvp::PvpType targetPvpType = target.getPvpType();
+
+	CreatureObject const *creatureActor = actor.asCreatureObject();
+	CreatureObject const *creatureTarget = target.asCreatureObject();
+
+	// if player character is neutral, see if he's a mercenary
+	if (PvpData::isNeutralFactionId(targetFaction) && targetIsPlayer)
+	{
+		targetFaction = target.getPvpMercenaryFaction();
+		targetPvpType = target.getPvpMercenaryType();
+	}
+
+	// if player character is neutral, see if he's a mercenary
+	if (PvpData::isNeutralFactionId(actorFaction) && actorIsPlayer)
+	{
+		actorFaction = actor.getPvpMercenaryFaction();
+		actorPvpType = actor.getPvpMercenaryType();
+	}
+
+	// only creatures can attack without having the pvpCanAttack objvar
+	if (!creatureActor)
+	{
+		int pvpCanAttack = 0;
+		if (!actor.getObjVars().getItem("pvpCanAttack", pvpCanAttack) || pvpCanAttack != 1)
+			return false;
+	}
+	else if (creatureActor->getInvulnerabilityTimer() > 0.f)
+		return false; // players cannot attack while their invulnerability timer is active
+
+	// unattackable creatures may not be attacked
+	if (PvpFactions::isUnattackableFaction(targetFaction))
+		return false;
+	if (PvpFactions::isUnattackableFaction(actorFaction))
+		return false;
+
+	// special forces NPC can only attack opposing special forces NPC or player
+	// special forces NPC can only be attacked by opposing special forces NPC or player
+	bool const actorIsSpecialForcesNPC = (!actorIsPlayer && actor.getObjVars().hasItem("huysMagicSpecialForcesOnlyObjvar"));
+	bool const targetIsSpecialForcesNPC = (!targetIsPlayer && target.getObjVars().hasItem("huysMagicSpecialForcesOnlyObjvar"));
+	if (actorIsSpecialForcesNPC || targetIsSpecialForcesNPC)
+	{
+		if (actorIsSpecialForcesNPC)
+		{
+			if (actorFaction != targetFaction)
+			{
+				// special forces NPC can attack opposing special forces NPC
+				if (targetIsSpecialForcesNPC)
+					return true;
+
+				// special forces NPC can attack opposing special forces player
+				if (targetIsPlayer && (targetPvpType == PvpType_Declared))
+					return true;
+			}
+
+			return false;
+		}
+		
+		if (actorFaction != targetFaction)
+		{
+			// special forces player can attack opposing special forces NPC
+			if (actorIsPlayer && (actorPvpType == PvpType_Declared))
+				return true;
+		}
+
+		return false;
+	}
+
+	// anyone may attack someone they are mutually dueling with
+	if (   PvpInternal::hasDuelEnemyFlag(target, actor.getNetworkId())
+	    && PvpInternal::hasDuelEnemyFlag(actor, target.getNetworkId()))
+		return true;
+
+	// a bounty hunter can attack their target
+	if (actorIsPlayer && targetIsPlayer && creatureActor && creatureTarget && creatureActor->hasBounty(*creatureTarget) && creatureActor->hasBountyMissionForTarget(creatureTarget->getNetworkId()))
+		return true;
+
+	if(targetIsPlayer && actorIsPlayer)
+	{
+		// noone may attack someone in their own group
+		if (PvpInternal::inSameGroup(actor, target))
+			return false;
+				
+		if(actorFaction!=targetFaction)
+		{
+			//IF I'M DECLARED AND THEY ARE AS WELL, WE CAN ATTACK.
+			if ((actorPvpType == PvpType_Declared) && (targetPvpType == PvpType_Declared))
+			{
+				return true;
+			}	
+		}
+		
+	}	
+
+	// anyone may attack someone with a PEF against them (unless they are unattackable)
+	if (PvpInternal::hasPersonalEnemyFlag(target, actor.getNetworkId()))
+		return true;
+
+	// Bubble NPCs may have first attack against people they have a PEF against.
+	if (!actorIsPlayer && PvpFactions::isBubbleFaction(actorFaction))
+	{
+		if (PvpInternal::hasPersonalEnemyFlag(actor, target.getNetworkId()))
+			return true;
+	}
+
+	// If we are in bubble combat mode, only the bubble participants are allowed to attack.
+	// Bubble participants have a TEF so they would of hit the logic above us.
+	if (PvpFactions::isBubbleFaction(targetFaction))
+		return false;
+
+	// noone may attack a bounty target unless they had a PEF against them,
+	// which is why this check ***MUST*** be placed after the above
+	// PvpInternal::hasPersonalEnemyFlag() check so that the actor with
+	// the PEF against the bounty target can attack the bounty target
+	if (PvpFactions::isBountyTargetFaction(targetFaction))
+	{
+		// defensive check just in case an NPC bounty target
+		// didn't have a PEF for the bounty hunter set on it
+		if (target.getScriptObject() && target.getScriptObject()->hasScript("systems.missions.dynamic.mission_bounty_target"))
+		{
+			NetworkId bhId;
+			if (target.getObjVars().getItem("objHunter", bhId) && (bhId == actor.getNetworkId()))
+			{
+/*
+				static int sentinel = 0;
+
+				// PvpInternal::setPermanentPersonalEnemyFlag() can cause PvpRuleSetNormal::canAttack()
+				// to get called again; to prevent infinite recursion, don't call
+				// PvpInternal::setPermanentPersonalEnemyFlag() again
+				if (sentinel == 0)
+				{
+					sentinel = 1;
+
+					// need to const cast because of updating target to set the PEF
+					PvpInternal::setPermanentPersonalEnemyFlag(const_cast<TangibleObject &>(target), actor.getNetworkId());
+
+					sentinel = 0;
+				}
+*/
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	// guild and militia rules only apply to creature vs. creature
+	if (creatureActor && creatureTarget)
+	{
+		// guild members may attack members of other guilds which have declared war on their guild,
+		// but only if neither guild members is in a guild war "cool down" period
+		if (   GuildInterface::hasDeclaredWarAgainst(creatureTarget->getGuildId(), creatureActor->getGuildId())
+		    && GuildInterface::hasDeclaredWarAgainst(creatureActor->getGuildId(), creatureTarget->getGuildId())
+			&& creatureActor->getGuildWarEnabled()
+			&& creatureTarget->getGuildWarEnabled()
+		    && !PvpInternal::hasAnyGuildWarCoolDownPeriodEnemyFlag(*creatureActor)
+		    && !PvpInternal::hasAnyGuildWarCoolDownPeriodEnemyFlag(*creatureTarget))
+			return true;
+	}
+	
+	if ( (actorIsPlayer) && (!targetIsPlayer) )
+	{
+		// PC attacker rules
+		// anyone may attack npc targets with no faction opponents
+		if (!targetIsPlayer && PvpFactions::getOpposingFactions(targetFaction).empty())
+			return true;
+
+		
+		if (targetFaction != 0)
+		{
+			// so they're factional
+			if (actorFaction!=targetFaction)
+			{
+				//they have a differnent faction than me
+				//am I neutral?
+				if (actorPvpType == PvpType_Neutral)
+				{
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+		else
+		{
+			return true;
+		}	
+	}
+	
+	if (!actorIsPlayer)	
+	{
+		// NPC attacker rules
+
+		if (!actorFaction)
+		{
+		 	// A neutral NPC can attack anything
+			return true;
+		}
+		else if ((!targetFaction) && (targetIsPlayer))
+		{
+			// The target is neutral and the target is a player, NPC can't attack
+			return false;
+		}
+		else if ((!targetFaction) && (!targetIsPlayer))
+		{
+			// The target is neutral and the target is not a player, NPC can attack
+			return true;
+		}
+		else if (targetFaction == actorFaction)
+		{
+			// NPCs can’t attack a target of the same faction
+			return false;
+		}
+		else if (PvpFactions::isNonaggressiveFaction(actorFaction))
+		{
+			// Non-Agg creatures may not attack anything
+			return false;
+		}
+		else if (targetPvpType == PvpType_Neutral)
+		{
+			// The player target is On Leave!!
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpRuleSetNormal::canHelp(TangibleObject const &actor, TangibleObject const &target) const
+{
+	// people can always help themselves
+	if (&actor == &target)
+		return true;
+
+	bool const actorIsPlayer = PvpInternal::isPlayer(actor);
+	bool const targetIsPlayer = PvpInternal::isPlayer(target);
+	Pvp::FactionId targetFaction = PvpInternal::getAlignedFaction(target);
+	Pvp::FactionId actorFaction  = PvpInternal::getAlignedFaction(actor);
+	Pvp::PvpType actorPvpType = actor.getPvpType();
+	Pvp::PvpType targetPvpType = target.getPvpType();
+
+	// if player character is neutral, see if he's a mercenary
+	if (PvpData::isNeutralFactionId(targetFaction) && targetIsPlayer)
+	{
+		targetFaction = target.getPvpMercenaryFaction();
+		targetPvpType = target.getPvpMercenaryType();
+	}
+
+	// if player character is neutral, see if he's a mercenary
+	if (PvpData::isNeutralFactionId(actorFaction) && actorIsPlayer)
+	{
+		actorFaction = actor.getPvpMercenaryFaction();
+		actorPvpType = actor.getPvpMercenaryType();
+	}
+
+	// npcs are allowed to help anyone
+	if (!actorIsPlayer)
+		return true;
+		
+	// help target not player and not pet
+	if (!targetIsPlayer && !PvpInternal::isPet(target))
+		return false;
+
+	// Cannot help Jedi or bounty hunters that are currently engaged in combat with each other
+	if (PvpInternal::hasAnyBountyDuelEnemyFlag(target))
+		return false;
+	if (PvpInternal::hasBubbleCombatFlag(target))
+		return false;
+
+	// Neutrals may only help neutrals
+	if (actorPvpType == PvpType_Neutral)
+	{
+		if (targetPvpType != PvpType_Neutral)
+			return false;
+		else
+			return true;
+	}
+
+	// Coverts may help neturals and other coverts of the same faction (but not overts)
+	if (actorPvpType == PvpType_Covert)
+	{
+		if (targetPvpType == PvpType_Neutral)
+			return true;
+		if ((targetPvpType == PvpType_Covert) && (actorFaction == targetFaction))
+			return true;
+		return false;
+	}
+
+	// Overts may help neutrals and anyone of their faction
+	if (actorPvpType == PvpType_Declared)
+	{
+		if (targetPvpType == PvpType_Neutral)
+			return true;
+		if (actorFaction == targetFaction)
+			return true;
+		return false;
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+void PvpRuleSetNormal::getAttackRepercussions(TangibleObject const &actor, TangibleObject const &target, std::vector<PvpEnemy> &actorRepercussions, std::vector<PvpEnemy> &targetRepercussions) const
+{
+	actorRepercussions.clear();
+	targetRepercussions.clear();
+
+	if (&actor == &target)
+		return;
+
+	// attacks between dueling characters only refresh duel flags
+	// attacks between dueling characters have no repercussions
+	if (   PvpInternal::hasDuelEnemyFlag(target, actor.getNetworkId())
+	    && PvpInternal::hasDuelEnemyFlag(actor, target.getNetworkId()))
+		return;
+
+	bool const actorIsPlayer = PvpInternal::isPlayer(actor);
+	bool const targetIsPlayer = PvpInternal::isPlayer(target);
+	CreatureObject const *creatureActor = actor.asCreatureObject();
+	CreatureObject const *creatureTarget = target.asCreatureObject();
+
+	if (actorIsPlayer && targetIsPlayer && creatureActor && creatureTarget)
+	{
+		// attacks between the bounty hunter and their target
+		// takes precedence over any other factional considerations
+		// and guild wars
+		if ((creatureActor->hasBounty(*creatureTarget) && creatureActor->hasBountyMissionForTarget(creatureTarget->getNetworkId())) || (creatureTarget->hasBounty(*creatureActor) && creatureTarget->hasBountyMissionForTarget(creatureActor->getNetworkId())))
+		{
+			// bounty PEF are applied to both parties as soon as one party attacks
+			actorRepercussions.push_back(PvpEnemy(target.getNetworkId(), PvpFactions::getBountyDuelFactionId(), -1));
+			targetRepercussions.push_back(PvpEnemy(actor.getNetworkId(), PvpFactions::getBountyDuelFactionId(), -1));
+			return;
+		}
+
+		// attacks between guild war members have no repercussions, but only if
+		// both the guild war members are not in the guild war "cool down" period
+		if (   GuildInterface::hasDeclaredWarAgainst(creatureActor->getGuildId(), creatureTarget->getGuildId())
+		    && GuildInterface::hasDeclaredWarAgainst(creatureTarget->getGuildId(), creatureActor->getGuildId())
+			&& creatureActor->getGuildWarEnabled()
+			&& creatureTarget->getGuildWarEnabled()
+		    && !PvpInternal::hasAnyGuildWarCoolDownPeriodEnemyFlag(*creatureActor)
+		    && !PvpInternal::hasAnyGuildWarCoolDownPeriodEnemyFlag(*creatureTarget))
+			return;
+	}
+
+	Pvp::FactionId targetFaction = PvpInternal::getAlignedFaction(target);
+	Pvp::FactionId actorFaction  = PvpInternal::getAlignedFaction(actor);
+	Pvp::PvpType actorPvpType = actor.getPvpType();
+	Pvp::PvpType targetPvpType = target.getPvpType();
+
+	// if player character is neutral, see if he's a mercenary
+	if (PvpData::isNeutralFactionId(targetFaction) && targetIsPlayer)
+	{
+		targetFaction = target.getPvpMercenaryFaction();
+		targetPvpType = target.getPvpMercenaryType();
+	}
+
+	// if player character is neutral, see if he's a mercenary
+	if (PvpData::isNeutralFactionId(actorFaction) && actorIsPlayer)
+	{
+		actorFaction = actor.getPvpMercenaryFaction();
+		actorPvpType = actor.getPvpMercenaryType();
+	}
+
+	// Only use factions for npcs and non-neutral players
+	if (actorIsPlayer && (actorPvpType == PvpType_Neutral))
+	{
+		actorFaction = 0;
+	}
+
+	if (targetIsPlayer && (targetPvpType == PvpType_Neutral))
+	{
+		targetFaction = 0;
+	}
+
+	if( PvpFactions::isBubbleFaction(actorFaction) || PvpFactions::isBubbleFaction(targetFaction))
+	{
+		if(actorIsPlayer)
+			actorRepercussions.push_back(PvpEnemy(target.getNetworkId(), PvpFactions::getBubbleCombatFactionId(), -1));
+		else if (targetIsPlayer)
+			targetRepercussions.push_back(PvpEnemy(actor.getNetworkId(), PvpFactions::getBubbleCombatFactionId(), -1));
+		
+		return;
+	}
+
+	// attacking an aligned gives you a timed FEF for their faction,
+	// unless they are in a guild that has declared war on your guild and
+	// both you and the aligned are not in the guild war "cool down" period
+	if (targetFaction && targetFaction != actorFaction) // XXX
+	{
+		// if we get this far, we know that both you and the aligned
+		// are not in a guild war and neither of you are in the
+		// guild war "cool down" period
+		actorRepercussions.push_back(PvpEnemy(NetworkId::cms_invalid, targetFaction, -1));
+	}
+
+	// attacking gives you a timed PEF against the target and any non-neutral members of their group
+	// not aligned with your faction
+	{
+		// if a player is being attacked by an NPC while the player
+		// is incapped (i.e. a deathblow performed while the player
+		// is incapped), don't set any timed PEF on the NPC attacker,
+		// as the player will be dead, so we don't want any timed PEF
+		// between the player and the attacker NPC after the attacker
+		// NPC kills the player
+		//
+		// if !(targetIsPlayer && !actorIsPlayer && creatureTarget && creatureTarget->isIncapacitated())
+		if (!targetIsPlayer || actorIsPlayer || !creatureTarget || !creatureTarget->isIncapacitated())
+			actorRepercussions.push_back(PvpEnemy(target.getNetworkId(), targetFaction, -1));
+
+		// opposing factional PEF are applied to both parties as soon as one party attacks
+		if (targetFaction && actorFaction && (targetFaction != actorFaction) && PvpInternal::isFactionAligned(targetFaction) && PvpInternal::isFactionAligned(actorFaction) && PvpInternal::areFactionsOpposed(actorFaction, targetFaction))
+			targetRepercussions.push_back(PvpEnemy(actor.getNetworkId(), actorFaction, -1));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PvpRuleSetNormal::getHelpRepercussions(TangibleObject const &actor, TangibleObject const &target, std::vector<PvpEnemy> &actorRepercussions, std::vector<PvpEnemy> &targetRepercussions) const
+{
+	actorRepercussions.clear();	
+	targetRepercussions.clear();
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpRuleSetNormal::isEnemy(TangibleObject const &actor, TangibleObject const &target) const
+{
+	if (PvpInternal::hasPersonalEnemyFlag(target, actor.getNetworkId()))
+		return true;
+
+	// until they actually start fighting, a bounty hunter's target should
+	// appear red to the bounty hunter, but not vice versa
+	bool const actorIsPlayer = PvpInternal::isPlayer(actor);
+	bool const targetIsPlayer = PvpInternal::isPlayer(target);
+	CreatureObject const *creatureActor = actor.asCreatureObject();
+	CreatureObject const *creatureTarget = target.asCreatureObject();
+	if (actorIsPlayer && targetIsPlayer && creatureActor && creatureTarget && creatureTarget->hasBounty(*creatureActor) && creatureTarget->hasBountyMissionForTarget(creatureActor->getNetworkId()))
+		return true;
+
+	Pvp::FactionId targetFaction = PvpInternal::getAlignedFaction(target);
+	Pvp::FactionId actorFaction  = PvpInternal::getAlignedFaction(actor);
+	Pvp::PvpType actorPvpType = actor.getPvpType();
+	Pvp::PvpType targetPvpType = target.getPvpType();
+
+	// if player character is neutral, see if he's a mercenary
+	if (PvpData::isNeutralFactionId(targetFaction) && targetIsPlayer)
+	{
+		targetFaction = target.getPvpMercenaryFaction();
+		targetPvpType = target.getPvpMercenaryType();
+	}
+
+	// if player character is neutral, see if he's a mercenary
+	if (PvpData::isNeutralFactionId(actorFaction) && actorIsPlayer)
+	{
+		actorFaction = actor.getPvpMercenaryFaction();
+		actorPvpType = actor.getPvpMercenaryType();
+	}
+
+	if (PvpFactions::isUnattackableFaction(actorFaction))
+		return false;
+
+	if (PvpFactions::isUnattackableFaction(targetFaction))
+		return false;
+
+	// Only use factions for npcs and non-neutral players
+	if (actorIsPlayer && (actorPvpType == PvpType_Neutral))
+	{
+		actorFaction = 0;
+	}
+
+	// special forces NPC can only attack opposing special forces NPC or player
+	// special forces NPC can only be attacked by opposing special forces NPC or player
+	bool const actorIsSpecialForcesNPC = (!actorIsPlayer && actor.getObjVars().hasItem("huysMagicSpecialForcesOnlyObjvar"));
+	bool const targetIsSpecialForcesNPC = (!targetIsPlayer && target.getObjVars().hasItem("huysMagicSpecialForcesOnlyObjvar"));
+	if (actorIsSpecialForcesNPC || targetIsSpecialForcesNPC)
+	{
+		if (actorIsSpecialForcesNPC)
+		{
+			if (actorFaction != targetFaction)
+			{
+				// special forces NPC can attack opposing special forces NPC
+				if (targetIsSpecialForcesNPC)
+					return true;
+
+				// special forces NPC can attack opposing special forces player
+				if (targetIsPlayer && (targetPvpType == PvpType_Declared))
+					return true;
+			}
+
+			return false;
+		}
+
+		if (actorFaction != targetFaction)
+		{
+			// special forces player can attack opposing special forces NPC
+			if (actorIsPlayer && (actorPvpType == PvpType_Declared))
+				return true;
+		}
+
+		return false;
+	}
+
+	// do duel and guild war checks before attackable player faction checks
+	//   this is so covert opposite faction players who duel or guild war can still death blow correctly
+	if (   PvpInternal::hasDuelEnemyFlag(target, actor.getNetworkId())
+		&& PvpInternal::hasDuelEnemyFlag(actor, target.getNetworkId()))
+		return true;
+
+	// guild and militia rules only apply to creature vs. creature
+	if (creatureActor && creatureTarget)
+	{
+		// guild members are enemies of other guilds which have declared war on their guild,
+		// but only if neither guild members is in a guild war "cool down" period
+		// being an enemy sets the client's "default action" to death blow for incapacitated players in a guild war
+		if (   GuildInterface::hasDeclaredWarAgainst(creatureTarget->getGuildId(), creatureActor->getGuildId())
+			&& GuildInterface::hasDeclaredWarAgainst(creatureActor->getGuildId(), creatureTarget->getGuildId())
+			&& creatureActor->getGuildWarEnabled()
+			&& creatureTarget->getGuildWarEnabled()
+			&& !PvpInternal::hasAnyGuildWarCoolDownPeriodEnemyFlag(*creatureActor)
+			&& !PvpInternal::hasAnyGuildWarCoolDownPeriodEnemyFlag(*creatureTarget))
+			return true;
+	}
+
+	if ( actorFaction )
+	{
+		//i'm not neutral
+		if (targetFaction)
+		{
+			if (!targetIsPlayer)
+			{
+				return true;
+			}
+			else
+			{
+				if ((actorPvpType != PvpType_Neutral) && (targetPvpType != PvpType_Neutral) && (targetFaction != actorFaction))
+				{
+					if (actorIsPlayer)
+					{
+						if ((actorPvpType == PvpType_Declared) && (targetPvpType == PvpType_Declared))
+						{
+							return true;
+						}
+						return false;
+					}
+					else
+					{
+						return true;
+					}
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpRuleSetNormal::isDuelingAllowed(TangibleObject const &actor, TangibleObject const &target) const
+{
+	bool const actorIsPlayer = PvpInternal::isPlayer(actor);
+	bool const targetIsPlayer = PvpInternal::isPlayer(target);
+	CreatureObject const * actorCreature = actor.asCreatureObject();
+	CreatureObject const * targetCreature = target.asCreatureObject();
+
+	return ( actorCreature && actorIsPlayer && actorCreature->isInWorld() && !actorCreature->isInTutorial()
+		&& targetCreature && targetIsPlayer && targetCreature->isInWorld() && !targetCreature->isInTutorial() );
+}
+				
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetNormal.h b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetNormal.h
new file mode 100644
index 00000000..a64859c2
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetNormal.h
@@ -0,0 +1,32 @@
+// ======================================================================
+//
+// PvpRuleSetNormal.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _PvpRuleSetNormal_H
+#define _PvpRuleSetNormal_H
+
+// ======================================================================
+
+#include "serverGame/PvpRuleSetBase.h"
+
+// ======================================================================
+
+class PvpRuleSetNormal: public PvpRuleSetBase
+{
+public:
+	virtual bool canAttack(TangibleObject const &actor, TangibleObject const &target) const;
+	virtual bool canHelp(TangibleObject const &actor, TangibleObject const &target) const;
+	virtual void getAttackRepercussions(TangibleObject const &actor, TangibleObject const &target, std::vector<PvpEnemy> &actorRepercussions, std::vector<PvpEnemy> &targetRepercussions) const;
+	virtual void getHelpRepercussions(TangibleObject const &actor, TangibleObject const &target, std::vector<PvpEnemy> &actorRepercussions, std::vector<PvpEnemy> &targetRepercussions) const;
+	virtual bool isEnemy(TangibleObject const &actor, TangibleObject const &target) const;
+	virtual bool isDuelingAllowed(TangibleObject const &actor, TangibleObject const &target) const;
+};
+
+// ======================================================================
+
+#endif // _PvpRuleSetNormal_H
+
diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetPet.cpp b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetPet.cpp
new file mode 100644
index 00000000..cabfe4f4
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetPet.cpp
@@ -0,0 +1,106 @@
+// ======================================================================
+//
+// PvpRuleSetPet.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PvpRuleSetPet.h"
+#include "serverGame/PvpInternal.h"
+#include "serverUtility/PvpEnemy.h"
+
+// ======================================================================
+
+bool PvpRuleSetPet::canAttack(TangibleObject const &actor, TangibleObject const &target) const
+{
+	TangibleObject const *realActor = resolveMaster(actor);
+	TangibleObject const *realTarget = resolveMaster(target);
+	if (!realActor || !realTarget)
+		return false;
+	return PvpInternal::getRuleSet(*realActor, *realTarget).canAttack(*realActor, *realTarget);
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpRuleSetPet::canHelp(TangibleObject const &actor, TangibleObject const &target) const
+{
+	TangibleObject const *realActor = resolveMaster(actor);
+	TangibleObject const *realTarget = resolveMaster(target);
+	if (!realActor || !realTarget)
+		return false;
+	return PvpInternal::getRuleSet(*realActor, *realTarget).canHelp(*realActor, *realTarget);
+}
+
+// ----------------------------------------------------------------------
+
+void PvpRuleSetPet::getAttackRepercussions(TangibleObject const &actor, TangibleObject const &target, std::vector<PvpEnemy> &actorRepercussions, std::vector<PvpEnemy> &targetRepercussions) const
+{
+	actorRepercussions.clear();
+	targetRepercussions.clear();
+	TangibleObject const *realActor = resolveMaster(actor);
+	TangibleObject const *realTarget = resolveMaster(target);
+	if (realActor && realTarget)
+		PvpInternal::getRuleSet(*realActor, *realTarget).getAttackRepercussions(*realActor, *realTarget, actorRepercussions, targetRepercussions);
+}
+
+// ----------------------------------------------------------------------
+
+void PvpRuleSetPet::getHelpRepercussions(TangibleObject const &actor, TangibleObject const &target, std::vector<PvpEnemy> &actorRepercussions, std::vector<PvpEnemy> &targetRepercussions) const
+{
+	actorRepercussions.clear();
+	targetRepercussions.clear();
+	TangibleObject const *realActor = resolveMaster(actor);
+	TangibleObject const *realTarget = resolveMaster(target);
+	if (realActor && realTarget)
+		PvpInternal::getRuleSet(*realActor, *realTarget).getHelpRepercussions(*realActor, *realTarget, actorRepercussions, targetRepercussions);
+}
+
+// ----------------------------------------------------------------------
+
+void PvpRuleSetPet::applyRepercussions(TangibleObject &actor, TangibleObject &target, std::vector<PvpEnemy> const &actorRepercussions, std::vector<PvpEnemy> const &targetRepercussions)
+{
+	TangibleObject *realActor = resolveMaster(actor);
+	TangibleObject *realTarget = resolveMaster(target);
+	if (realActor && realTarget)
+		PvpInternal::getRuleSet(*realActor, *realTarget).applyRepercussions(*realActor, *realTarget, actorRepercussions, targetRepercussions);
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpRuleSetPet::isEnemy(TangibleObject const &actor, TangibleObject const &target) const
+{
+	TangibleObject const *realActor = resolveMaster(actor);
+	TangibleObject const *realTarget = resolveMaster(target);
+	if (!realActor || !realTarget)
+		return false;
+	return PvpInternal::getRuleSet(*realActor, *realTarget).isEnemy(*realActor, *realTarget);
+}
+
+// ----------------------------------------------------------------------
+
+TangibleObject const *PvpRuleSetPet::resolveMaster(TangibleObject const &who) const
+{
+	if (!PvpInternal::isPet(who))
+		return &who;
+	TangibleObject const *master = PvpInternal::getPetMaster(who);
+	if (master != &who)
+		return master;
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+TangibleObject *PvpRuleSetPet::resolveMaster(TangibleObject &who) const
+{
+	if (!PvpInternal::isPet(who))
+		return &who;
+	TangibleObject *master = PvpInternal::getPetMaster(who);
+	if (master != &who)
+		return master;
+	return 0;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetPet.h b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetPet.h
new file mode 100644
index 00000000..bc64254e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetPet.h
@@ -0,0 +1,36 @@
+// ======================================================================
+//
+// PvpRuleSetPet.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _PvpRuleSetPet_H
+#define _PvpRuleSetPet_H
+
+// ======================================================================
+
+#include "serverGame/PvpRuleSetNormal.h"
+
+// ======================================================================
+
+class PvpRuleSetPet: public PvpRuleSetNormal
+{
+public:
+	virtual bool canAttack(TangibleObject const &actor, TangibleObject const &target) const;
+	virtual bool canHelp(TangibleObject const &actor, TangibleObject const &target) const;
+	virtual void getAttackRepercussions(TangibleObject const &actor, TangibleObject const &target, std::vector<PvpEnemy> &actorRepercussions, std::vector<PvpEnemy> &targetRepercussions) const;
+	virtual void getHelpRepercussions(TangibleObject const &actor, TangibleObject const &target, std::vector<PvpEnemy> &actorRepercussions, std::vector<PvpEnemy> &targetRepercussions) const;
+	virtual bool isEnemy(TangibleObject const &actor, TangibleObject const &target) const;
+	virtual void applyRepercussions(TangibleObject &actor, TangibleObject &target, std::vector<PvpEnemy> const &actorRepercussions, std::vector<PvpEnemy> const &targetRepercussions);
+
+private:
+	TangibleObject const *resolveMaster(TangibleObject const &who) const;
+	TangibleObject *resolveMaster(TangibleObject &who) const;
+};
+
+// ======================================================================
+
+#endif // _PvpRuleSetPet_H
+
diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetShip.cpp b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetShip.cpp
new file mode 100644
index 00000000..a5e08326
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetShip.cpp
@@ -0,0 +1,129 @@
+// ======================================================================
+//
+// PvpRuleSetShip.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PvpRuleSetShip.h"
+
+#include "serverGame/AiShipAttackTargetList.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/PvpInternal.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipAiReactionManager.h"
+#include "serverGame/ShipController.h"
+#include "serverGame/ShipObject.h"
+#include <map>
+
+// ======================================================================
+
+bool PvpRuleSetShip::canAttack(TangibleObject const &actor, TangibleObject const &target) const
+{
+	// no attacking invulnerable targets
+	if (target.isInvulnerable())
+		return false;
+
+	// Cannot attack yourself
+	if (&actor == &target)
+		return false;
+
+	ShipObject const * const actorShip = actor.asShipObject();
+	ShipObject const * const targetShip = target.asShipObject();
+
+	// Ships may only attack other ships
+	if (!actorShip || !targetShip)
+		return false;
+
+	if (actorShip->isPlayerShip() && targetShip->isPlayerShip())
+	{
+		// player vs. player
+		// dueling player ships can attack each other
+		if (   PvpInternal::hasDuelEnemyFlag(*actorShip, targetShip->getNetworkId())
+		    && PvpInternal::hasDuelEnemyFlag(*targetShip, actorShip->getNetworkId()))
+			return true;
+		// battlefield zones and pvp with both declared fall through to npc rules, otherwise cannot attack
+		if (!ServerWorld::isSpaceBattlefieldZoneWithPvp() && (!PvpInternal::isDeclared(*actorShip) || !PvpInternal::isDeclared(*targetShip)))
+			return false;
+	}
+
+	// if the ships are of the same space faction, they cannot attack each other
+	uint32 const actorFaction = actorShip->getSpaceFaction();
+	if (actorFaction && actorFaction == targetShip->getSpaceFaction())
+		return false;
+
+	// if either is an ally of the other, they cannot attack each other
+	return    !ShipAiReactionManager::isAlly(*actorShip, *targetShip)
+	       && !ShipAiReactionManager::isAlly(*targetShip, *actorShip);
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpRuleSetShip::isEnemy(TangibleObject const &actor, TangibleObject const &target) const
+{
+	// You are not your own enemy, usually
+	if (&actor == &target)
+		return false;
+
+	ShipObject const * const actorShip = actor.asShipObject();
+	ShipObject const * const targetShip = target.asShipObject();
+
+	// Ships may only attack other ships
+	if (!actorShip || !targetShip)
+		return false;
+
+	if (actorShip->isPlayerShip() && targetShip->isPlayerShip())
+	{
+		// consider players enemies if they can attack each other
+		return canAttack(actor, target);
+	}
+
+	// at least 1 npc is involved, or this is a space battlefield zone, so see if they are enemies
+	if (ShipAiReactionManager::isEnemy(*actorShip, *targetShip))
+	{
+		return true;
+	}
+
+	if ((!actorShip->isPlayerShip()) && (targetShip->isPlayerShip()))
+	{
+		ShipController const * const actorController = safe_cast<ShipController const *>(actorShip->getController());
+
+		if (actorController != 0)
+		{
+			CachedNetworkId const targetCachedNetworkId(*targetShip);
+			AiShipAttackTargetList const & actorAttackList = actorController->getAttackTargetList();
+			AiShipAttackTargetList::TargetList::const_iterator ii = actorAttackList.getUnSortedTargetList().find(targetCachedNetworkId);
+
+			if (ii != actorAttackList.getUnSortedTargetList().end())
+			{
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool PvpRuleSetShip::isDuelingAllowed(TangibleObject const &actor, TangibleObject const &target) const
+{
+	ShipObject const *const actorShip = actor.asShipObject();
+	ShipObject const *const targetShip = target.asShipObject();
+
+	if (actorShip && targetShip && actorShip->isPlayerShip() && targetShip->isPlayerShip())
+	{
+		CreatureObject const * actorPilot = actorShip->getPilot();
+		CreatureObject const * targetPilot = targetShip->getPilot();
+		
+		// Don't know whether it is valid to PvP a pilot-less ship, but previous behavior 
+		//  allowed it so I will maintain it.
+		return (!actorPilot || !actorPilot->isInTutorial()) && (!targetPilot || !targetPilot->isInTutorial());
+	}
+
+	return false;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetShip.h b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetShip.h
new file mode 100644
index 00000000..1a824c82
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetShip.h
@@ -0,0 +1,29 @@
+// ======================================================================
+//
+// PvpRuleSetShip.h
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _PvpRuleSetShip_H
+#define _PvpRuleSetShip_H
+
+// ======================================================================
+
+#include "serverGame/PvpRuleSetBase.h"
+
+// ======================================================================
+
+class PvpRuleSetShip: public PvpRuleSetBase
+{
+public:
+	virtual bool canAttack(TangibleObject const &actor, TangibleObject const &target) const;
+	virtual bool isEnemy(TangibleObject const &actor, TangibleObject const &target) const;
+	virtual bool isDuelingAllowed(TangibleObject const &actor, TangibleObject const &target) const;
+};
+
+// ======================================================================
+
+#endif // _PvpRuleSetShip_H
+
diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetTruce.cpp b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetTruce.cpp
new file mode 100644
index 00000000..4c1f2ab9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetTruce.cpp
@@ -0,0 +1,20 @@
+// ======================================================================
+//
+// PvpRuleSetTruce.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PvpRuleSetTruce.h"
+
+// ======================================================================
+
+bool PvpRuleSetTruce::canHelp(TangibleObject const &, TangibleObject const &) const
+{
+	return true;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetTruce.h b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetTruce.h
new file mode 100644
index 00000000..1c06bb5d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/PvpRuleSetTruce.h
@@ -0,0 +1,27 @@
+// ======================================================================
+//
+// PvpRuleSetTruce.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _PvpRuleSetTruce_H
+#define _PvpRuleSetTruce_H
+
+// ======================================================================
+
+#include "serverGame/PvpRuleSetBase.h"
+
+// ======================================================================
+
+class PvpRuleSetTruce: public PvpRuleSetBase
+{
+public:
+	virtual bool canHelp(TangibleObject const &actor, TangibleObject const &target) const;
+};
+
+// ======================================================================
+
+#endif // _PvpRuleSetTruce_H
+
diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpUpdateObserver.cpp b/engine/server/library/serverGame/src/shared/pvp/PvpUpdateObserver.cpp
new file mode 100644
index 00000000..094ccdb9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/PvpUpdateObserver.cpp
@@ -0,0 +1,317 @@
+// ======================================================================
+//
+// PvpUpdateObserver.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/PvpUpdateObserver.h"
+#include "serverGame/Client.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/Pvp.h"
+#include "serverGame/TangibleObject.h"
+#include "serverGame/ServerTangibleObjectTemplate.h"
+#include "serverGame/ServerWorld.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/UpdatePvpStatusMessage.h"
+
+#include <hash_map>
+#include <hash_set>
+
+// ======================================================================
+
+namespace PvpUpdateObserverNamespace
+{
+	struct ClientObjectPointerHash
+	{
+		size_t operator()(Client const * const ptr) const
+		{
+			return (reinterpret_cast<const size_t>(ptr) >> 4);
+		};
+	};
+
+	struct TangibleObjectPointerHash
+	{
+		size_t operator()(TangibleObject const * const ptr) const
+		{
+			return (reinterpret_cast<const size_t>(ptr) >> 4);
+		};
+	};
+
+	std::hash_set<TangibleObject const *, TangibleObjectPointerHash> s_activeUpdaters;
+
+	typedef std::hash_map<Client const *, std::hash_map<NetworkId, std::pair<uint32, uint32> >, ClientObjectPointerHash> PvpUpdateObserverCache;
+	PvpUpdateObserverCache s_pvpUpdateObserverCache;
+
+	typedef std::hash_map<Client const *, std::hash_set<NetworkId>, ClientObjectPointerHash> PvpUpdateObserverRequestsThisFrame;
+	PvpUpdateObserverRequestsThisFrame s_pvpUpdateObserverRequestsThisFrame;
+
+	// PvpUpdateObserver can be called multiple times per frame for the same object,
+	// and in the constructor, we iterate over the clients observing the object,
+	// and then interate over the objects being observed by this client; these
+	// 2 lists can be quite large on a crowded game server, and repeated iteration
+	// of these 2 lists doesn't gain us anything, but does use up lots of loop time,
+	// so as an optimization, we'll only iterate over these 2 lists once per frame,
+	// and then just watch on individual updates to these 2 lists afterwards, and
+	// process the individual updates to these 2 lists when the updates occur
+	std::hash_set<NetworkId> s_objectsProcessedThisFrame;
+	std::hash_set<Client const *, ClientObjectPointerHash> s_clientsProcessedThisFrame;
+
+	void sendUpdatePvpStatusMessage(Client const & client, std::hash_set<NetworkId> const & requestedNetworkId, std::hash_map<NetworkId, std::pair<uint32, uint32> > & cachedNetworkId);
+}
+
+using namespace PvpUpdateObserverNamespace;
+
+// ======================================================================
+
+PvpUpdateObserver::PvpUpdateObserver(TangibleObject const *who, Archive::AutoDeltaObserverOp) :
+	m_obj(0),
+	m_pvpFaction(0)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("PvpUpdateObserver_init");
+
+	if (!who || !who->getNetworkId().isValid() || s_activeUpdaters.find(who) != s_activeUpdaters.end())
+		return;
+
+	IGNORE_RETURN(s_activeUpdaters.insert(who));
+	m_obj = who;
+	m_pvpFaction = who->getPvpFaction();
+
+	// get client visible status for everyone observing this object (including itself)
+	if ((s_objectsProcessedThisFrame.count(who->getNetworkId()) == 0) && satisfyPvpSyncCondition(who->isNonPvpObject(), who->hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (who->asCreatureObject() != NULL), who->getPvpFaction()))
+	{
+		std::set<Client *> const &clients = who->getObservers();
+		for (std::set<Client *>::const_iterator i = clients.begin(); i != clients.end(); ++i)
+		{
+			std::hash_map<NetworkId, std::pair<uint32, uint32> > & pvpUpdateObserverCache = s_pvpUpdateObserverCache[*i];
+			if (pvpUpdateObserverCache.count(who->getNetworkId()) == 0)
+			{
+				uint32 flags, factionId;
+				Pvp::getClientVisibleStatus(**i, *who, flags, factionId);
+				pvpUpdateObserverCache[who->getNetworkId()] = std::make_pair(flags, factionId);
+			}
+
+			IGNORE_RETURN(s_pvpUpdateObserverRequestsThisFrame[*i].insert(who->getNetworkId()));
+		}
+
+		IGNORE_RETURN(s_objectsProcessedThisFrame.insert(who->getNetworkId()));
+	}
+	// get client visible status for everyone this object is observing except itself
+	{
+		Client * const client = who->getClient();
+		if (client && (s_clientsProcessedThisFrame.count(client) == 0))
+		{
+			std::hash_map<NetworkId, std::pair<uint32, uint32> > & pvpUpdateObserverCache = s_pvpUpdateObserverCache[client];
+			std::hash_set<NetworkId> & pvpUpdateObserverRequestsThisFrame = s_pvpUpdateObserverRequestsThisFrame[client];
+
+			Client::ObservingListPvpSync const &objs = client->getObservingPvpSync();
+			for (Client::ObservingListPvpSync::const_iterator i = objs.begin(); i != objs.end(); ++i)
+			{
+				if (*i != who)
+				{
+					if (pvpUpdateObserverCache.count((*i)->getNetworkId()) == 0)
+					{
+						uint32 flags, factionId;
+						Pvp::getClientVisibleStatus(*client, **i, flags, factionId);
+						pvpUpdateObserverCache[(*i)->getNetworkId()] = std::make_pair(flags, factionId);
+					}
+
+					IGNORE_RETURN(pvpUpdateObserverRequestsThisFrame.insert((*i)->getNetworkId()));
+				}
+			}
+
+			IGNORE_RETURN(s_clientsProcessedThisFrame.insert(client));
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+PvpUpdateObserver::~PvpUpdateObserver()
+{
+	if (!m_obj)
+		return;
+
+	IGNORE_RETURN(s_activeUpdaters.erase(m_obj));
+
+	// see if faction changed to or from imperial or rebel
+	if ((m_pvpFaction != m_obj->getPvpFaction()) && !m_obj->getObservers().empty())
+	{
+		if (PvpData::isImperialFactionId(m_pvpFaction) ||
+			PvpData::isRebelFactionId(m_pvpFaction) ||
+			PvpData::isImperialFactionId(m_obj->getPvpFaction()) ||
+			PvpData::isRebelFactionId(m_obj->getPvpFaction()))
+		{
+			// did the object's "pvp sync" status change because of the faction change?
+			bool const wasPvpSync = PvpUpdateObserver::satisfyPvpSyncCondition(m_obj->isNonPvpObject(), m_obj->hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (m_obj->asCreatureObject() != NULL), m_pvpFaction);
+			bool const isPvpSync = PvpUpdateObserver::satisfyPvpSyncCondition(m_obj->isNonPvpObject(), m_obj->hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (m_obj->asCreatureObject() != NULL), m_obj->getPvpFaction());
+
+			if (wasPvpSync != isPvpSync)
+			{
+				// force pvp status update
+				Pvp::forceStatusUpdate(*(const_cast<TangibleObject *>(m_obj)));
+
+				const std::set<Client *> &observers = m_obj->getObservers();
+				for (std::set<Client *>::const_iterator i = observers.begin(); i != observers.end(); ++i)
+				{
+					if (isPvpSync)
+						(*i)->addObservingPvpSync(const_cast<TangibleObject *>(m_obj));
+					else
+						(*i)->removeObservingPvpSync(const_cast<TangibleObject *>(m_obj));
+				}
+			}
+		}
+	}
+
+	m_obj = 0;
+}
+
+// ----------------------------------------------------------------------
+
+void PvpUpdateObserver::updatePvpStatusCache(Client const *client, TangibleObject const &who, uint32 flags, uint32 factionId)
+{
+	if (!client || !who.getNetworkId().isValid() || !PvpUpdateObserver::satisfyPvpSyncCondition(who.isNonPvpObject(), who.hasCondition(ServerTangibleObjectTemplate::C_invulnerable), (who.asCreatureObject() != NULL), who.getPvpFaction()))
+		return;
+
+	s_pvpUpdateObserverCache[client][who.getNetworkId()] = std::make_pair(flags, factionId);
+}
+
+// ----------------------------------------------------------------------
+
+void PvpUpdateObserver::removeClientFromPvpStatusCache(Client const *client)
+{
+	if (!client)
+		return;
+
+	// the Client * is not guaranteed to be valid, so don't dereference it
+	IGNORE_RETURN(s_pvpUpdateObserverCache.erase(client));
+	IGNORE_RETURN(s_pvpUpdateObserverRequestsThisFrame.erase(client));
+	IGNORE_RETURN(s_clientsProcessedThisFrame.erase(client));
+}
+
+// ----------------------------------------------------------------------
+
+void PvpUpdateObserver::stopObservingPvpSyncNotification(Client const *client, NetworkId const & who)
+{
+	if (!client || !who.isValid())
+		return;
+
+	PvpUpdateObserverCache::iterator iterCacheClient = s_pvpUpdateObserverCache.find(client);
+	PvpUpdateObserverRequestsThisFrame::iterator iterRequestedClient = s_pvpUpdateObserverRequestsThisFrame.find(client);
+
+	if (iterCacheClient != s_pvpUpdateObserverCache.end())
+		IGNORE_RETURN(iterCacheClient->second.erase(who));
+
+	if (iterRequestedClient != s_pvpUpdateObserverRequestsThisFrame.end())
+		IGNORE_RETURN(iterRequestedClient->second.erase(who));
+}
+
+// ----------------------------------------------------------------------
+
+void PvpUpdateObserver::startObservingPvpSyncNotification(Client const *client, TangibleObject const &who)
+{
+	if (!client || !who.getNetworkId().isValid())
+		return;
+
+	if ((s_objectsProcessedThisFrame.count(who.getNetworkId()) != 0) || (s_clientsProcessedThisFrame.count(client) != 0))
+	{
+		std::hash_map<NetworkId, std::pair<uint32, uint32> > & pvpUpdateObserverCache = s_pvpUpdateObserverCache[client];
+		if (pvpUpdateObserverCache.count(who.getNetworkId()) == 0)
+		{
+			uint32 flags, factionId;
+			Pvp::getClientVisibleStatus(*client, who, flags, factionId);
+			pvpUpdateObserverCache[who.getNetworkId()] = std::make_pair(flags, factionId);
+		}
+
+		IGNORE_RETURN(s_pvpUpdateObserverRequestsThisFrame[client].insert(who.getNetworkId()));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void PvpUpdateObserver::sendUpdateAndRemoveClientFromPvpStatusCache(Client const *client)
+{
+	if (!client)
+		return;
+
+	PvpUpdateObserverCache::iterator iterCacheClient = s_pvpUpdateObserverCache.find(client);
+	PvpUpdateObserverRequestsThisFrame::iterator iterRequestedClient = s_pvpUpdateObserverRequestsThisFrame.find(client);
+
+	if ((iterCacheClient != s_pvpUpdateObserverCache.end()) && (iterRequestedClient != s_pvpUpdateObserverRequestsThisFrame.end()))
+		sendUpdatePvpStatusMessage(*client, iterRequestedClient->second, iterCacheClient->second);
+
+	if (iterCacheClient != s_pvpUpdateObserverCache.end())
+		s_pvpUpdateObserverCache.erase(iterCacheClient);
+
+	if (iterRequestedClient != s_pvpUpdateObserverRequestsThisFrame.end())
+		s_pvpUpdateObserverRequestsThisFrame.erase(iterRequestedClient);
+
+	IGNORE_RETURN(s_clientsProcessedThisFrame.erase(client));
+}
+
+// ----------------------------------------------------------------------
+
+void PvpUpdateObserver::update()
+{
+	PvpUpdateObserverCache::iterator iterCacheClient;
+
+	for (PvpUpdateObserverRequestsThisFrame::const_iterator iterRequestedClient = s_pvpUpdateObserverRequestsThisFrame.begin(); iterRequestedClient != s_pvpUpdateObserverRequestsThisFrame.end(); ++iterRequestedClient)
+	{
+		iterCacheClient = s_pvpUpdateObserverCache.find(iterRequestedClient->first);
+		if (iterCacheClient == s_pvpUpdateObserverCache.end())
+			continue;
+
+		sendUpdatePvpStatusMessage(*(iterRequestedClient->first), iterRequestedClient->second, iterCacheClient->second);
+	}
+
+	s_pvpUpdateObserverRequestsThisFrame.clear();
+	s_objectsProcessedThisFrame.clear();
+	s_clientsProcessedThisFrame.clear();
+}
+
+// ----------------------------------------------------------------------
+
+void PvpUpdateObserverNamespace::sendUpdatePvpStatusMessage(Client const & client, std::hash_set<NetworkId> const & requestedNetworkId, std::hash_map<NetworkId, std::pair<uint32, uint32> > & cachedNetworkId)
+{
+	uint32 flags, factionId;
+	ServerObject const * serverObject;
+	TangibleObject const * tangibleObject;
+	std::hash_map<NetworkId, std::pair<uint32, uint32> >::iterator iterCacheNetworkId;
+
+	for (std::hash_set<NetworkId>::const_iterator iterRequestedNetworkId = requestedNetworkId.begin(); iterRequestedNetworkId != requestedNetworkId.end(); ++iterRequestedNetworkId)
+	{
+		iterCacheNetworkId = cachedNetworkId.find(*iterRequestedNetworkId);
+		if (iterCacheNetworkId == cachedNetworkId.end())
+			continue;
+
+		serverObject = ServerWorld::findObjectByNetworkId(*iterRequestedNetworkId);
+		if (serverObject)
+		{
+			tangibleObject = serverObject->asTangibleObject();
+			if (tangibleObject)
+			{
+				Pvp::getClientVisibleStatus(client, *tangibleObject, flags, factionId);
+				if (flags != iterCacheNetworkId->second.first || factionId != iterCacheNetworkId->second.second)
+				{
+					if (ConfigServerGame::getLogPvpUpdates())
+					{
+						LOG("PvpUpdate", ("sending UpdatePvpStatus for %s to client %s, flags=%d, factionId=%d",
+							tangibleObject->getNetworkId().getValueString().c_str(),
+							client.getCharacterObjectId().getValueString().c_str(),
+							flags,
+							factionId));
+					}
+					UpdatePvpStatusMessage message(tangibleObject->getNetworkId(), flags, factionId);
+					client.send(message, true);
+					iterCacheNetworkId->second.first = flags;
+					iterCacheNetworkId->second.second = factionId;
+				}
+			}
+		}
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpUpdateObserver.h b/engine/server/library/serverGame/src/shared/pvp/PvpUpdateObserver.h
new file mode 100644
index 00000000..66e453b3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/pvp/PvpUpdateObserver.h
@@ -0,0 +1,54 @@
+// ======================================================================
+//
+// PvpUpdateObserver.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _PvpUpdateObserver_H_
+#define _PvpUpdateObserver_H_
+
+#include "Archive/AutoDeltaObserverOps.h"
+#include "sharedGame/PvpData.h"
+
+// ======================================================================
+
+class Client;
+class NetworkId;
+class TangibleObject;
+
+// ======================================================================
+
+class PvpUpdateObserver
+{
+public:
+	PvpUpdateObserver(TangibleObject const *who, Archive::AutoDeltaObserverOp operation);
+	~PvpUpdateObserver();
+
+	static void updatePvpStatusCache(Client const *client, TangibleObject const &who, uint32 flags, uint32 factionId);
+	static void removeClientFromPvpStatusCache(Client const *client);
+	static void stopObservingPvpSyncNotification(Client const *client, NetworkId const & who);
+	static void startObservingPvpSyncNotification(Client const *client, TangibleObject const &who);
+	static void sendUpdateAndRemoveClientFromPvpStatusCache(Client const *client);
+	static bool satisfyPvpSyncCondition(bool isNonPvpObject, bool isInvulnerable, bool isCreatureObject, uint32 factionId);
+	static void update();
+
+private:
+	PvpUpdateObserver(PvpUpdateObserver const &);
+	PvpUpdateObserver& operator=(PvpUpdateObserver const &);
+
+	TangibleObject const *m_obj;
+	uint32 m_pvpFaction;
+};
+
+//----------------------------------------------------------------------
+
+inline bool PvpUpdateObserver::satisfyPvpSyncCondition(bool isNonPvpObject, bool isInvulnerable, bool isCreatureObject, uint32 factionId)
+{
+	return ((!isNonPvpObject && !isInvulnerable) || (isCreatureObject && (PvpData::isImperialFactionId(factionId) || PvpData::isRebelFactionId(factionId))));
+}
+
+// ======================================================================
+
+#endif // _PvpUpdateObserver_H_
diff --git a/engine/server/library/serverGame/src/shared/region/Region.cpp b/engine/server/library/serverGame/src/shared/region/Region.cpp
new file mode 100644
index 00000000..fc74229a
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/region/Region.cpp
@@ -0,0 +1,304 @@
+//========================================================================
+//
+// Region.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/Region.h"
+#include "sharedFoundation/Crc.h"
+#include "sharedMath/MxCifQuadTreeBounds.h"
+
+
+// ======================================================================
+
+static std::map<uint32, Region *> s_nameCrcRegionMap;
+
+// ======================================================================
+
+/**
+ * Class constructor for a static region.
+ */
+Region::Region() :
+	m_bounds(NULL),
+	m_dynamicRegionId(),
+	m_name(),
+	m_nameCrc(0),
+	m_planet(),
+	m_pvp(0),
+	m_geography(0),
+	m_minDifficulty(0),
+	m_maxDifficulty(0),
+	m_spawn(0),
+	m_mission(0),
+	m_buildable(0),
+	m_municipal(0),
+	m_visible(false),
+	m_notify(false),
+	m_environmentFlags(0)
+{
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor for a dynamic region.
+ *
+ * @param dynamicRegionId		the id of the dynamic region object
+ */
+Region::Region(const CachedNetworkId & dynamicRegionId) :
+	m_bounds(NULL),
+	m_dynamicRegionId(dynamicRegionId),
+	m_name(),
+	m_nameCrc(0),
+	m_planet(),
+	m_pvp(0),
+	m_geography(0),
+	m_minDifficulty(0),
+	m_maxDifficulty(0),
+	m_spawn(0),
+	m_mission(0),
+	m_buildable(0),
+	m_municipal(0),
+	m_visible(false),
+	m_notify(false),
+	m_environmentFlags(0)
+{
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+Region::~Region()
+{
+	if (m_nameCrc)
+	{
+		std::map<uint32, Region *>::iterator i = s_nameCrcRegionMap.find(m_nameCrc);
+		if (i != s_nameCrcRegionMap.end())
+			s_nameCrcRegionMap.erase(i);
+	}
+
+	delete const_cast<MxCifQuadTreeBounds *>(m_bounds);
+	m_bounds = NULL;
+}
+
+// ----------------------------------------------------------------------
+
+void Region::setName(const Unicode::String & name)
+{
+	// remove from map if changing name
+	if (m_nameCrc)
+	{
+		std::map<uint32, Region *>::iterator i = s_nameCrcRegionMap.find(m_nameCrc);
+		if (i != s_nameCrcRegionMap.end())
+			s_nameCrcRegionMap.erase(i);
+	}
+
+	m_name = name;
+	m_nameCrc = Crc::calculate(name.c_str(), name.length()*2);
+
+	// add to map if non-empty name
+	if (m_nameCrc)
+	{
+		std::map<uint32, Region *>::iterator i = s_nameCrcRegionMap.find(m_nameCrc);
+		if (i != s_nameCrcRegionMap.end())
+		{
+			FATAL(true, ("Tried to add a region with a duplicate crc (%s)", Unicode::wideToNarrow(name).c_str()));
+		}
+		s_nameCrcRegionMap[m_nameCrc] = this;
+	}
+
+}
+
+// ----------------------------------------------------------------------
+
+Region const *Region::findRegionByNameCrc(uint32 nameCrc) // static
+{
+	std::map<uint32, Region *>::const_iterator i = s_nameCrcRegionMap.find(nameCrc);
+	if (i != s_nameCrcRegionMap.end())
+		return (*i).second;
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+void Region::setNotify(bool notify)
+{
+	m_notify = notify;
+}
+
+// ----------------------------------------------------------------------
+
+bool Region::getNotify() const
+{
+	return m_notify;
+}
+
+// ----------------------------------------------------------------------
+
+RegionPvp *Region::asRegionPvp()
+{
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+RegionPvp const *Region::asRegionPvp() const
+{
+	return 0;
+}
+
+// ======================================================================
+
+/**
+ * Class constructor for a static region.
+ *
+ * @param minX		min x value of the rectangle
+ * @param minY		min y value of the rectangle
+ * @param maxX		max x value of the rectangle
+ * @param maxY		max y value of the rectangle
+ */
+RegionRectangle::RegionRectangle(float minX, float minY, float maxX, float maxY) :
+	Region()
+{
+	if (minX > maxX)
+		std::swap(minX, maxX);
+	if (minY > maxY)
+		std::swap(minY, maxY);
+	setBounds(new MxCifQuadTreeBounds(minX, minY, maxX, maxY, this));
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor for a dynamic region.
+ *
+ * @param minX		min x value of the rectangle
+ * @param minY		min y value of the rectangle
+ * @param maxX		max x value of the rectangle
+ * @param maxY		max y value of the rectangle
+ */
+RegionRectangle::RegionRectangle(float minX, float minY, float maxX, float maxY, 
+	const CachedNetworkId & dynamicRegionId) :
+	Region(dynamicRegionId)
+{
+	if (minX > maxX)
+		std::swap(minX, maxX);
+	if (minY > maxY)
+		std::swap(minY, maxY);
+	setBounds(new MxCifQuadTreeBounds(minX, minY, maxX, maxY, this));
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the area of this region.
+ *
+ * @return the area
+ */
+float RegionRectangle::getArea() const
+{
+	float minX, minY, maxX, maxY;
+	getExtent(minX, minY, maxX, maxY);
+	return (maxX - minX) * (maxY - minY);
+}	// RegionRectangle::getArea
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the data that defines the size of this region.
+ *
+ * @param minX		filled with the min x value of the rectangle
+ * @param minY		filled with the min y value of the rectangle
+ * @param maxX		filled with the max x value of the rectangle
+ * @param maxY		filled with the max y value of the rectangle
+ */
+void RegionRectangle::getExtent(float & minX, float & minY, float & maxX, float & maxY) const
+{
+	const MxCifQuadTreeBounds & bounds = getBounds();
+	
+	minX = bounds.getMinX();
+	minY = bounds.getMinY();
+	maxX = bounds.getMaxX();
+	maxY = bounds.getMaxY();
+}	// RegionRectangle::getExtent
+
+Vector RegionRectangle::getCenter() const
+{
+	const MxCifQuadTreeBounds & bounds = getBounds();
+	return Vector(bounds.getMinX() + ((bounds.getMaxX() - bounds.getMinX()) * 0.5f), 0, bounds.getMinY() + ((bounds.getMaxY() - bounds.getMinY()) * 0.5f));
+}
+
+// ======================================================================
+
+/**
+ * Class constructor for a static region.
+ *
+ * @param centerX		x value of the circle's center
+ * @param centerY		y value of the circle's center
+ * @param radius		radius of the circle
+ */
+RegionCircle::RegionCircle(float centerX, float centerY, float radius) :
+	Region()
+{
+	setBounds(new MxCifQuadTreeCircleBounds(centerX, centerY, radius, this));
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor for a dynamic region.
+ *
+ * @param centerX		x value of the circle's center
+ * @param centerY		y value of the circle's center
+ * @param radius		radius of the circle
+ */
+RegionCircle::RegionCircle(float centerX, float centerY, float radius,
+	const CachedNetworkId & dynamicRegionId) :
+	Region(dynamicRegionId)
+{
+	setBounds(new MxCifQuadTreeCircleBounds(centerX, centerY, radius, this));
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the area of this region.
+ *
+ * @return the area
+ */
+float RegionCircle::getArea() const
+{
+	float centerX, centerY, radius;
+	getExtent(centerX, centerY, radius);
+	return PI * radius * radius;
+}	// RegionCircle::getArea
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the data that defines the size of this region.
+ *
+ * @param centerX		filled with the x value of the circle's center
+ * @param centerY		filled with the y value of the circle's center
+ * @param radius		filled with the radius of the circle
+ */
+void RegionCircle::getExtent(float & centerX, float & centerY, float & radius) const
+{
+	const MxCifQuadTreeCircleBounds & bounds = static_cast<const MxCifQuadTreeCircleBounds &>(getBounds());
+	
+	centerX = bounds.getCenterX();
+	centerY = bounds.getCenterY();
+	radius = bounds.getRadius();
+}	// RegionCircle::getExtent
+
+Vector RegionCircle::getCenter() const
+{
+	const MxCifQuadTreeCircleBounds & bounds = static_cast<const MxCifQuadTreeCircleBounds &>(getBounds());
+	return Vector(bounds.getCenterX(), 0.0f, bounds.getCenterY());
+}
+
diff --git a/engine/server/library/serverGame/src/shared/region/Region.h b/engine/server/library/serverGame/src/shared/region/Region.h
new file mode 100644
index 00000000..97d1ac26
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/region/Region.h
@@ -0,0 +1,350 @@
+//========================================================================
+//
+// Region.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef INCLUDED_Region_H
+#define INCLUDED_Region_H
+
+#include "Unicode.h"
+#include "UnicodeUtils.h"
+#include "sharedObject/CachedNetworkId.h"
+
+// ======================================================================
+
+class MxCifQuadTreeBounds;
+class RegionPvp;
+
+// ======================================================================
+
+namespace RegionNamespace
+{
+
+enum RegionPvp
+{
+	RP_normal,
+	RP_truce,
+	RP_pvpBattlefield,
+	RP_pveBattlefield
+};
+
+enum RegionGeography
+{
+	RG_desert,
+	RG_forest,
+	RG_jungle,
+	RG_plateau,
+	RG_oasis,
+	RG_canyon,
+	RG_lake,
+	RG_lakeshore,
+	RG_beach,
+	RG_ocean,
+	RG_underwater,
+	RG_river,
+	RG_volcano,
+	RG_swamp,
+	RG_plains,
+	RG_prairie,
+	RG_mountains,
+	RG_hills,
+	RG_grassland,
+	RG_wasteland,
+	RG_city,
+	RG_fictional,
+	RG_pathfind,
+	RG_default,
+	RG_theater,
+	RG_overload
+};
+
+}
+
+/** 
+ * Represents a game Region.  This is a structure that has a shape (rectangle or circle) 
+ * that covers an area of a game planet.  This structure also has certain properties 
+ * (such as PvP status, geographical type, etc.).
+ */
+typedef int32 EnvironmentInfo; // Type def'd incase we want to change this later.
+
+class Region
+{
+public:
+
+	virtual ~Region();
+
+	static Region const *findRegionByNameCrc(uint32 nameCrc);
+
+	virtual RegionPvp *asRegionPvp();
+	virtual RegionPvp const *asRegionPvp() const;
+	virtual Vector getCenter() const = 0;
+	void setName(const Unicode::String & name);
+	void setPlanet(const std::string & planet);
+	void setPvp(int pvp);
+	void setGeography(int geography);
+	void setMinDifficulty(int difficulty);
+	void setMaxDifficulty(int difficulty);
+	void setSpawn(int spawn);
+	void setMission(int mission);
+	void setBuildable(int buildable);
+	void setMunicipal(int municipal);
+	void setVisible(bool visible);
+	void setNotify(bool notify);
+	void setEnvironmentFlags(EnvironmentInfo const & flags);
+
+	const Unicode::String & getName() const;
+	uint32                  getNameCrc() const;
+	const std::string &     getPlanet() const;
+	int                     getPvp() const;
+	int                     getGeography() const;
+	int                     getMinDifficulty() const;
+	int                     getMaxDifficulty() const;
+	int                     getSpawn() const;
+	int                     getMission() const;
+	int                     getBuildable() const;
+	int                     getMunicipal() const;
+	bool                    isVisible() const;
+	bool                    getNotify() const;
+
+	bool                    isDynamic() const;
+	bool                    isStatic() const;
+	const CachedNetworkId & getDynamicRegionId() const;
+
+	virtual float           getArea(void) const = 0;
+
+	const MxCifQuadTreeBounds & getBounds(void) const;
+
+	const EnvironmentInfo & getEnvironmentFlags() const;
+
+protected:
+	         Region();
+	explicit Region(const CachedNetworkId & dynamicRegionId);
+	
+	void setBounds(const MxCifQuadTreeBounds * bounds);
+
+private:
+	//disabled
+	Region(const Region& rhs);
+	Region& operator=(const Region& rhs);
+
+private:
+	const MxCifQuadTreeBounds * m_bounds;
+	const CachedNetworkId       m_dynamicRegionId;
+
+	Unicode::String             m_name;
+	uint32                      m_nameCrc;
+	std::string                 m_planet;
+	int                         m_pvp;
+	int                         m_geography;
+	int                         m_minDifficulty;
+	int                         m_maxDifficulty;
+	int                         m_spawn;
+	int                         m_mission;
+	int                         m_buildable;
+	int                         m_municipal;
+	bool                        m_visible;
+	bool                        m_notify;
+	EnvironmentInfo             m_environmentFlags;
+};
+
+
+inline void Region::setPlanet(const std::string & planet)
+{
+	m_planet = planet;
+}
+
+inline void Region::setPvp(int pvp)
+{
+	m_pvp = pvp;
+}
+
+inline void Region::setGeography(int geography)
+{
+	m_geography = geography;
+}
+
+inline void Region::setMinDifficulty(int difficulty)
+{
+	m_minDifficulty = difficulty;
+}
+
+inline void Region::setMaxDifficulty(int difficulty)
+{
+	m_maxDifficulty = difficulty;
+}
+
+inline void Region::setSpawn(int spawn)
+{
+	m_spawn = spawn;
+}
+
+inline void Region::setMission(int mission)
+{
+	m_mission = mission;
+}
+
+inline void Region::setBuildable(int buildable)
+{
+	m_buildable = buildable;
+}
+
+inline void Region::setMunicipal(int municipal)
+{
+	m_municipal = municipal;
+}
+
+inline void Region::setVisible(bool visible)
+{
+	m_visible = visible;
+}
+
+inline const Unicode::String & Region::getName() const
+{
+	return m_name;
+}
+
+inline uint32 Region::getNameCrc() const
+{
+	return m_nameCrc;
+}
+
+inline const std::string & Region::getPlanet() const
+{
+	return m_planet;
+}
+
+inline int Region::getPvp() const
+{
+	return m_pvp;
+}
+
+inline int Region::getGeography() const
+{
+	return m_geography;
+}
+
+inline int Region::getMinDifficulty() const
+{
+	return m_minDifficulty;
+}
+
+inline int Region::getMaxDifficulty() const
+{
+	return m_maxDifficulty;
+}
+
+inline int Region::getSpawn() const
+{
+	return m_spawn;
+}
+
+inline int Region::getMission() const
+{
+	return m_mission;
+}
+
+inline int Region::getBuildable() const
+{
+	return m_buildable;
+}
+
+inline int Region::getMunicipal() const
+{
+	return m_municipal;
+}
+
+inline bool Region::isVisible() const
+{
+	return m_visible;
+}
+
+inline bool Region::isDynamic() const
+{
+	return m_dynamicRegionId != CachedNetworkId::cms_cachedInvalid;
+}
+
+inline bool Region::isStatic() const
+{
+	return !isDynamic();
+}
+
+inline const CachedNetworkId & Region::getDynamicRegionId() const
+{
+	WARNING_STRICT_FATAL(isStatic(), ("Calling Region::getDynamicRegionId for "
+		"static region %s", Unicode::wideToNarrow(m_name).c_str()));
+	return m_dynamicRegionId;
+}
+
+inline const MxCifQuadTreeBounds & Region::getBounds(void) const
+{
+	NOT_NULL(m_bounds);
+	return *m_bounds;
+}
+
+inline void Region::setBounds(const MxCifQuadTreeBounds * bounds)
+{
+	m_bounds = bounds;
+}
+
+inline EnvironmentInfo const & Region::getEnvironmentFlags() const
+{
+	return m_environmentFlags;
+}
+
+inline void Region::setEnvironmentFlags(const EnvironmentInfo &flags)
+{
+	m_environmentFlags = flags;
+}
+
+// ======================================================================
+
+/**
+ * A rectangular region.
+ */
+class RegionRectangle : public Region
+{
+public:
+	RegionRectangle(float minX, float minY, float maxX, float maxY);
+	RegionRectangle(float minX, float minY, float maxX, float maxY, const CachedNetworkId & dynamicRegionId);
+
+	virtual float getArea(void) const;
+
+	void getExtent(float & minX, float & minY, float & maxX, float & maxY) const;
+	virtual Vector getCenter() const;
+	
+private:
+	// disabled
+	RegionRectangle();
+	RegionRectangle(const RegionRectangle &);
+	RegionRectangle & operator =(const RegionRectangle &);
+};
+
+
+// ======================================================================
+
+/**
+ * A circualr region.
+ */
+class RegionCircle : public Region
+{
+public:
+	RegionCircle(float centerX, float centerY, float radius);
+	RegionCircle(float centerX, float centerY, float radius, const CachedNetworkId & dynamicRegionId);
+
+	virtual float getArea(void) const;
+
+	void getExtent(float & centerX, float & centerY, float & radius) const;
+	virtual Vector getCenter() const;
+	
+private:
+	// disabled
+	RegionCircle();
+	RegionCircle(const RegionCircle &);
+	RegionCircle & operator =(const RegionCircle &);
+};
+
+
+#endif	// INCLUDED_Region_H
diff --git a/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp b/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp
new file mode 100644
index 00000000..3287ec67
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp
@@ -0,0 +1,1256 @@
+//========================================================================
+//
+// RegionMaster.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/RegionMaster.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/Region.h"
+#include "serverGame/RegionPvp.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/UniverseObject.h"
+#include "serverNetworkMessages/CreateDynamicRegionCircleMessage.h"
+#include "serverNetworkMessages/CreateDynamicRegionRectangleMessage.h"
+#include "serverNetworkMessages/CreateDynamicSpawnRegionCircleMessage.h"
+#include "sharedFoundation/CalendarTime.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedFoundation/FloatMath.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedMath/MxCifQuadTree.h"
+#include "sharedMath/MxCifQuadTreeBounds.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+#include <hash_set>
+#include <map>
+#include <vector>
+
+
+// objvars for dynamic regions
+const static std::string OBJVAR_DYNAMIC_REGION("dynamic_region");
+const static std::string OBJVAR_DYNAMIC_REGION_PLANET("planet");
+const static std::string OBJVAR_DYNAMIC_REGION_NAME("name");
+const static std::string OBJVAR_DYNAMIC_REGION_GEOMETRY("geometry");
+const static std::string OBJVAR_DYNAMIC_REGION_MINX("minX");
+const static std::string OBJVAR_DYNAMIC_REGION_MINY("minY");
+const static std::string OBJVAR_DYNAMIC_REGION_MAXX("maxX");
+const static std::string OBJVAR_DYNAMIC_REGION_MAXY("maxY");
+const static std::string OBJVAR_DYNAMIC_REGION_PVP("pvp");
+const static std::string OBJVAR_DYNAMIC_REGION_GEOGRAPHY("geography");
+const static std::string OBJVAR_DYNAMIC_REGION_MIN_DIFFICULTY("minDifficulty");
+const static std::string OBJVAR_DYNAMIC_REGION_MAX_DIFFICULTY("maxDifficulty");
+const static std::string OBJVAR_DYNAMIC_REGION_SPAWN("spawn");
+const static std::string OBJVAR_DYNAMIC_REGION_MISSION("mission");
+const static std::string OBJVAR_DYNAMIC_REGION_BUILDABLE("buildable");
+const static std::string OBJVAR_DYNAMIC_REGION_MUNICIPAL("municipal");
+const static std::string OBJVAR_DYNAMIC_REGION_VISIBLE("visible");
+const static std::string OBJVAR_DYNAMIC_REGION_BATTLEFIELD_MARKER("_battlefield");
+const static std::string OBJVAR_DYNAMIC_REGION_NOTIFY("notify");
+const static std::string OBJVAR_DYNAMIC_REGION_SPAWNTABLE("spawntable");
+const static std::string OBJVAR_DYNAMIC_REGION_DURATION("duration");
+const static std::string OBJVAR_DYNAMIC_REGION_MAXDURATION("maxDuration");
+const static std::string OBJVAR_DYNAMIC_REGION_BIRTH("birth");
+const static std::string OBJVAR_DYNAMIC_REGION_READABLE_BIRTH("calendarBirth");
+const static std::string OBJVAR_DYNAMIC_REGION_READABLE_DEATH("calenderDeath");
+const static std::string OBJVAR_DYNAMIC_REGION_CREATURE_LIST("creatureList");
+
+// template used to make dynamic regions
+const static std::string DYNAMIC_REGION_TEMPLATE_NAME("object/universe/dynamic_region.iff");
+
+
+
+enum RegionGeometry
+{
+	RG_rectagle,
+	RG_circle
+};
+
+//----------------------------------------------------------------------
+
+struct RegionMaster::RegionData
+{
+	MxCifQuadTree *     tree;
+	RegionsMappedByName nameMap;
+	
+	RegionData() : tree(NULL), nameMap() {}
+};
+
+namespace RegionMasterNamspace
+{
+	EnvironmentInfo convertFromStringToEnvironmentInfo(std::string const & stringList);
+
+	std::string                            s_environmentFlagsDataTable  = "datatables/region/region_environment_flags.iff";
+	std::map<std::string, EnvironmentInfo> s_conversionMap;
+
+	std::string							   s_dynamicMasterScript = "systems.regions.dynamic_region_master";
+}
+
+using namespace RegionMasterNamspace;
+//========================================================================
+// static member vars
+
+std::map<std::string, RegionMaster::RegionData> RegionMaster::ms_planetRegions;
+std::vector<const Region *>                     RegionMaster::ms_staticRegions;
+std::vector<const Region *>                     RegionMaster::ms_dynamicRegions;
+bool                                            RegionMaster::ms_installed = false;
+
+//========================================================================
+
+/**
+ * Called on program startup. Creates the RegionMaster.
+ */
+void RegionMaster::install()
+{
+	if (!ms_installed)
+	{
+		ms_installed = true;
+		readRegionDataTables();
+		ExitChain::add(exit, "RegionMaster");
+	}
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Called on program shutdown. Deletes the RegionMaster.
+ */
+void RegionMaster::exit()
+{
+	if (ms_installed)
+	{
+		{
+			for (std::map<std::string, RegionData>::iterator i1 = ms_planetRegions.begin();
+				i1 != ms_planetRegions.end(); ++i1)
+			{
+				delete (*i1).second.tree;
+				(*i1).second.tree = NULL;
+			}
+			ms_planetRegions.clear();
+		}
+
+		{
+			for (std::vector<const Region *>::iterator i2 = ms_staticRegions.begin();
+				i2 != ms_staticRegions.end(); ++i2)
+			{
+				delete const_cast<Region *>(*i2);
+				*i2 = NULL;
+			}
+			ms_staticRegions.clear();
+		}
+
+		{
+			for (std::vector<const Region *>::iterator i2 = ms_dynamicRegions.begin();
+				i2 != ms_dynamicRegions.end(); ++i2)
+			{
+				delete const_cast<Region *>(*i2);
+				*i2 = NULL;
+			}
+			ms_dynamicRegions.clear();
+		}
+
+		ms_installed = false;
+	}
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Reads the static region info from the planets' region datatables.
+ */
+void RegionMaster::readRegionDataTables()
+{
+	if (!ms_installed)
+	{
+		WARNING(true, ("RegionMaster::readRegionDataTables, not installed"));
+		return;
+	}
+
+	const char * regionFilesName = ConfigServerGame::getRegionFilesName();
+
+	DataTable * const regionFilesTable = DataTableManager::getTable(regionFilesName, true);
+	if (regionFilesTable == NULL)
+	{
+		WARNING(true, ("RegionMaster::readRegionDataTables could not open file %s, static regions will not be read!", regionFilesName));
+		return;
+	}
+
+	{
+		const int numRegionFiles = regionFilesTable->getNumRows();
+		for (int i = 0; i < numRegionFiles; ++i)
+		{
+			// get the region table from the filename table
+			const std::string & planetName     = regionFilesTable->getStringValue(0, i);
+			const std::string & regionFileName = regionFilesTable->getStringValue(1, i);
+			float               regionMinX     = regionFilesTable->getFloatValue (2, i);
+			float               regionMinY     = regionFilesTable->getFloatValue (3, i);
+			float               regionMaxX     = regionFilesTable->getFloatValue (4, i);
+			float               regionMaxY     = regionFilesTable->getFloatValue (5, i);
+			
+			DataTable * const regionTable = DataTableManager::getTable(regionFileName, true);
+			if (regionTable == NULL)
+			{
+				WARNING(true, ("RegionMaster::readRegionDataTables could not open region file %s.", regionFileName.c_str()));
+				continue;
+			}
+			
+			RegionData & regionData = ms_planetRegions[planetName];
+			if (regionData.tree == NULL)
+			{
+				regionData.tree = new MxCifQuadTree(regionMinX, regionMinY, regionMaxX, regionMaxY, ConfigServerGame::getRegionTreeDepth());
+			}
+			
+			int numRegions = regionTable->getNumRows();
+			for (int j = 0; j < numRegions; ++j)
+			{
+				// read the region data from the table
+				const Unicode::String name(Unicode::narrowToWide(regionTable->getStringValue( 0, j)));
+				int                 geometry      = regionTable->getIntValue   ( 1, j);
+				float               minX          = regionTable->getFloatValue ( 2, j);
+				float               minY          = regionTable->getFloatValue ( 3, j);
+				float               maxX          = regionTable->getFloatValue ( 4, j);
+				float               maxY          = regionTable->getFloatValue ( 5, j);
+				int                 pvp           = regionTable->getIntValue   ( 6, j);
+				int                 geography     = regionTable->getIntValue   ( 7, j);
+				int                 minDifficulty = regionTable->getIntValue   ( 8, j);
+				int                 maxDifficulty = regionTable->getIntValue   ( 9, j);
+				int                 spawn         = regionTable->getIntValue   (10, j);
+				int                 mission       = regionTable->getIntValue   (11, j);
+				int                 buildable     = regionTable->getIntValue   (12, j);
+				int                 municipal     = regionTable->getIntValue   (13, j);
+				int                 visible       = regionTable->getIntValue   (14, j);
+				int                 notify        = regionTable->getIntValue   (15, j);
+				EnvironmentInfo     envFlags      = convertFromStringToEnvironmentInfo( regionTable->getStringValue(16, j) );
+				
+				// make sure the region has a unique name
+				if (name.empty())
+				{
+					WARNING(true, ("RegionMaster::readRegionDataTables row %d of table %s has no region name", 
+						j, regionFileName.c_str()));
+					continue;
+				}
+				else if (regionData.nameMap.find(name) != regionData.nameMap.end())
+				{
+					WARNING(true, ("RegionMaster::readRegionDataTables row %d of table %s is trying to add duplicate region %s", 
+						j, regionFileName.c_str(), Unicode::wideToNarrow(name).c_str()));
+					continue;
+				}
+				
+				// create a rectangular or circular region and add it to the region tree
+				Region * region = NULL;
+				switch (geometry)
+				{
+				case RG_rectagle:
+					{
+						RegionRectangle * const rectangle = new RegionRectangle(minX, minY, maxX, maxY);
+						if (regionData.tree->addObject(rectangle->getBounds()))
+							region = rectangle;
+						else
+							delete rectangle;
+					}
+					break;
+				case RG_circle:
+					{
+						if (pvp == PR_battlefieldPvp || pvp == PR_battlefieldPve)
+						{
+							RegionPvp * battlefield = new RegionPvp(minX, minY, maxX);
+							if (regionData.tree->addObject(battlefield->getBounds()))
+								region = battlefield;
+							else
+								delete battlefield;
+						}
+						else
+						{
+							RegionCircle * circle = new RegionCircle(minX, minY, maxX);
+							if (regionData.tree->addObject(circle->getBounds()))
+								region = circle;
+							else
+								delete circle;
+						}
+					}
+					break;
+				default:
+					WARNING(true, ("RegionMaster::readRegionDataTables row %d of table %s has invalid geometry parameter %d", 
+						j, regionFileName.c_str(), geometry));
+					continue;
+				}
+				// set the rest of the region's data
+				if (region != NULL)
+				{
+					region->setName(name);
+					region->setPlanet(planetName);
+					region->setPvp(pvp);
+					region->setGeography(geography);
+					region->setMinDifficulty(minDifficulty);
+					region->setMaxDifficulty(maxDifficulty);
+					region->setSpawn(spawn);
+					region->setMission(mission);
+					region->setBuildable(buildable);
+					region->setMunicipal(municipal);
+					region->setVisible(visible);
+					region->setNotify(notify);
+					region->setEnvironmentFlags(envFlags);
+					ms_staticRegions.push_back(region);
+					regionData.nameMap[name] = region;
+				}
+				else
+				{
+					FATAL(true, ("RegionMaster::readRegionDataTables could not add row %d (%s) of table %s to region tree", 
+						j, Unicode::wideToNarrow(name).c_str(), regionFileName.c_str()));
+				}
+			}
+			DataTableManager::close(regionFileName);
+	}
+	}
+	DataTableManager::close(regionFilesName);
+}	// RegionMaster::readRegionDataTables
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates a new rectangular dynamic region.
+ *
+ * @param minX			min x coordinate
+ * @param minZ			min z coordinate
+ * @param maxX			max x coordinate
+ * @param maxZ			max z coordinate
+ * @param name			region name
+ * @param planet		region planet name
+ * @param pvp			pvp state
+ * @param buildable		buildable state
+ * @param municipal		municipal state
+ * @param geography		geography state
+ * @param minDifficulty	min difficulty state
+ * @param maxDifficulty	max difficulty state
+ * @param spawnable		spawnable state
+ * @param mission		mission state
+ * @param visible		visible flag
+ * @param notify        notify flag
+ */
+void RegionMaster::createNewDynamicRegion(float minX, float minZ, 
+	float maxX, float maxZ, const Unicode::String & name, const std::string & planet, 
+	int pvp, int buildable, int municipal, int geography, int minDifficulty,
+	int maxDifficulty, int spawnable, int mission, bool visible, bool notify)
+{
+	// no creating duplicate regions
+	if (getRegionByName(planet, name))
+		return;
+
+	// only the universe process may create universe objects
+	if (!ServerUniverse::getInstance().isAuthoritative())
+	{
+		CreateDynamicRegionRectangleMessage const createMessage(minX, minZ, maxX, maxZ, name, planet, pvp, buildable, municipal, geography, minDifficulty, maxDifficulty, spawnable, mission, visible, notify);
+		GameServer::getInstance().sendToCentralServer(createMessage);
+		return;
+	}
+
+	// create a new UniverseObject that will be used to hold the region data
+	Transform tr;
+	tr.setPosition_p(Vector::xyz111);
+	UniverseObject *regionObject = safe_cast<UniverseObject *>(ServerWorld::createNewObject(DYNAMIC_REGION_TEMPLATE_NAME, tr, 0, false));
+
+	if (!regionObject)
+		return;
+
+	if (!setDynamicRegionObjectData(*regionObject, name, planet, RG_rectagle, minX, 
+		minZ, maxX, maxZ, pvp, buildable, municipal, geography, minDifficulty,
+		maxDifficulty, spawnable, mission, visible, notify))
+	{
+		regionObject->permanentlyDestroy(DeleteReasons::SetupFailed);
+		return;
+	}
+
+	const Region * region = addDynamicRegion(*regionObject);
+	if (region)
+		regionObject->persist();
+	else
+	{
+		regionObject->removeObjVarItem(OBJVAR_DYNAMIC_REGION);
+		regionObject->permanentlyDestroy(DeleteReasons::SetupFailed);
+	}
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Creates a new circlular dynamic region.
+ *
+ * @param centerX		x coordinate of circle center
+ * @param centerZ		z coordinate of circle center
+ * @param radius		circle radius
+ * @param name			region name
+ * @param planet		region planet name
+ * @param pvp			pvp state
+ * @param buildable		buildable state
+ * @param municipal		municipal state
+ * @param geography		geography state
+ * @param minDifficulty	min difficulty state
+ * @param maxDifficulty	max difficulty state
+ * @param spawnable		spawnable state
+ * @param mission		mission state
+ * @param visible		visible flag
+ * @param notify        notify flag
+ *
+ * @return the new region, or NULL on error
+ */
+void RegionMaster::createNewDynamicRegion(float centerX, float centerZ, 
+	float radius, const Unicode::String & name, const std::string & planet, int pvp, 
+	int buildable, int municipal, int geography, int minDifficulty, int maxDifficulty, 
+	int spawnable, int mission, bool visible, bool notify)
+{
+	// no creating duplicate regions
+	if (getRegionByName(planet, name))
+		return;
+
+	// only the universe process may create universe objects
+	if (!ServerUniverse::getInstance().isAuthoritative())
+	{
+		CreateDynamicRegionCircleMessage const createMessage(centerX, centerZ, radius, name, planet, pvp, buildable, municipal, geography, minDifficulty, maxDifficulty, spawnable, mission, visible, notify);
+		GameServer::getInstance().sendToCentralServer(createMessage);
+		return;
+	}
+
+	// create a new UniverseObject that will be used to hold the region data
+	Transform tr;
+	tr.setPosition_p(Vector::xyz111);
+	UniverseObject *regionObject = safe_cast<UniverseObject *>(ServerWorld::createNewObject(DYNAMIC_REGION_TEMPLATE_NAME, tr, 0, false));
+
+	if (!regionObject)
+		return;
+
+	if (!setDynamicRegionObjectData(*regionObject, name, planet, RG_circle, centerX, 
+		centerZ, radius, 0, pvp, buildable, municipal, geography, minDifficulty,
+		maxDifficulty, spawnable, mission, visible, notify))
+	{
+		regionObject->permanentlyDestroy(DeleteReasons::SetupFailed);
+		return;
+	}
+
+	regionObject->addToWorld();
+
+	const Region * region = addDynamicRegion(*regionObject);
+	if (region)
+		regionObject->persist();
+	else
+	{
+		regionObject->removeObjVarItem(OBJVAR_DYNAMIC_REGION);
+		regionObject->permanentlyDestroy(DeleteReasons::SetupFailed);
+	}
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Sets the objvars on a universe object to turn it into a dynamic region 
+ * object.
+ *
+ * @param object                the object
+ * @param name                  region name
+ * @param planet                region planet name
+ * @param geometry              region geometry (rect or circle)
+ * @param minX                  min x coordinate/center x
+ * @param minZ                  min z coordinate/center z
+ * @param maxX                  max x coordinate/radius
+ * @param maxZ                  max z coordinate/ignored
+ * @param pvp                   pvp state
+ * @param buildable             buildable state
+ * @param municipal             municipal state
+ * @param geography             geography state
+ * @param minDifficulty         min difficulty state
+ * @param maxDifficulty         max difficulty state
+ * @param spawnable             spawnable state
+ * @param mission               mission state
+ * @param visible				visible flag
+ * @param notify                notify flag
+ *
+ * @return true on success, false if there was an error
+ */
+bool RegionMaster::setDynamicRegionObjectData(UniverseObject & object, 
+	const Unicode::String & name, const std::string & planet, int geometry, 
+	float minX, float minZ, float maxX, float maxZ, int pvp, int buildable, 
+	int municipal, int geography, int minDifficulty, int maxDifficulty, int spawnable,
+	int mission, bool visible, bool notify)
+{
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_NAME, name);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_PLANET, Unicode::narrowToWide(planet));
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_GEOMETRY, geometry);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_MINX, minX);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_MINY, minZ);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_MAXX, maxX);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_MAXY, maxZ);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_PVP, pvp);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_GEOGRAPHY, geography);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_MIN_DIFFICULTY, minDifficulty);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_MAX_DIFFICULTY, maxDifficulty);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_SPAWN, spawnable);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_MISSION, mission);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_BUILDABLE, buildable);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_MUNICIPAL, municipal);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_VISIBLE, static_cast<int>(visible));
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_NOTIFY, static_cast<int>(notify));
+	return true;
+}	// RegionMaster::setDynamicRegionObjectData
+
+//----------------------------------------------------------------------
+
+/**
+ * Adds a dynamic region to the world.
+ *
+ * @param source		the source of the region
+ */
+const Region * RegionMaster::addDynamicRegion(const UniverseObject & source)
+{
+	if (!ms_installed)
+	{
+		WARNING(true, ("RegionMaster::addDynamicRegion, not installed"));
+		return NULL;
+	}
+
+	DynamicVariableList::NestedList regionObjvars(source.getObjVars(),OBJVAR_DYNAMIC_REGION);
+
+	Unicode::String planet;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_PLANET,planet))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no planet data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	Unicode::String name;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_NAME,name))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no name data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	if (name.empty())
+	{
+		DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has empty "
+			"name data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	int geometry = 0;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_GEOMETRY,geometry))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no "
+			"geometry data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	float minX;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_MINX,minX))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no "
+			"minX data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	float minY;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_MINY,minY))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no "
+			"minY data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	float maxX;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_MAXX,maxX))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no "
+			"maxX data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	float maxY;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_MAXY,maxY))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no "
+			"maxY data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	int pvp=0;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_PVP,pvp))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no "
+			"pvp data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	int geography=0;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_GEOGRAPHY,geography))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no "
+			"geography data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	int minDifficulty = 0;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_MIN_DIFFICULTY, minDifficulty))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no "
+			"min difficulty data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	int maxDifficulty = 0;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_MAX_DIFFICULTY, maxDifficulty))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no "
+			"max difficulty data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	int spawn = 0;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_SPAWN,spawn))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no "
+			"spawn data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	int mission = 0;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_MISSION,mission))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no "
+			"mission data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	int buildable = 0;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_BUILDABLE,buildable))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no "
+			"buildable data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	int municipal = 0;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_MUNICIPAL,municipal))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no "
+			"municipal data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	int visible = 0;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_VISIBLE,visible))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no "
+			"visible data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	int notify = 0;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_NOTIFY,notify))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has no "
+			"notify data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+
+	// find the appropriate region data for the planet
+	// note that dynamic regions cannot define new planets
+	std::map<std::string, RegionData>::iterator result = ms_planetRegions.find(
+		Unicode::wideToNarrow(planet));
+	if (result == ms_planetRegions.end())
+	{
+		WARNING(true, ("RegionMaster::addDynamicRegion object %s gave unknown "
+			"planet %s for its region", source.getNetworkId().getValueString().c_str(),
+			Unicode::wideToNarrow(planet).c_str()));
+		return NULL;
+	}
+	RegionData & regionData = (*result).second;
+	if (regionData.tree == NULL)
+	{
+		WARNING_STRICT_FATAL(true, ("RegionMaster::addDynamicRegion planet %s "
+			"has no tree defined!", Unicode::wideToNarrow(planet).c_str()));
+		return NULL;
+	}
+
+	// make sure the region name is unique
+	if (regionData.nameMap.find(name) != regionData.nameMap.end())
+	{
+		WARNING(true, ("RegionMaster::addDynamicRegion object %s is trying "
+			"to add duplicate region %s", source.getNetworkId().getValueString().c_str(),
+			Unicode::wideToNarrow(name).c_str()));
+		return NULL;
+	}
+
+	// create a rectangular or circular region and add it to the region tree
+	Region * region = NULL;
+	switch (geometry)
+	{
+		case RG_rectagle:
+			{
+				RegionRectangle * rectangle = new RegionRectangle(minX, minY, maxX, maxY, CachedNetworkId(source));
+				if (regionData.tree->addObject(rectangle->getBounds()))
+					region = rectangle;
+				else
+					delete rectangle;
+			}
+			break;
+		case RG_circle:
+			{
+				if (pvp == PR_battlefieldPvp || pvp == PR_battlefieldPve)
+				{
+					RegionPvp * battlefield = new RegionPvp(minX, minY, maxX, CachedNetworkId(source));
+					if (regionData.tree->addObject(battlefield->getBounds()))
+						region = battlefield;
+					else
+						delete battlefield;
+				}
+				else
+				{
+					RegionCircle * circle = new RegionCircle(minX, minY, maxX, CachedNetworkId(source));
+					if (regionData.tree->addObject(circle->getBounds()))
+						region = circle;
+					else
+						delete circle;
+				}
+			}
+			break;
+		default:
+			DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has unknown "
+				"geometry type", source.getNetworkId().getValueString().c_str(),
+				geometry));
+			return false;
+	}
+	if (region == NULL)
+	{
+		WARNING(true, ("RegionMaster::readRegionDataTables could "
+			"not add region defined by object %s to region tree", 
+			source.getNetworkId().getValueString().c_str()));
+		 return NULL;
+	}
+
+	// set the rest of the region's data
+	region->setName(name);
+	region->setPlanet(Unicode::wideToNarrow(planet));
+	region->setPvp(pvp);
+	region->setGeography(geography);
+	region->setMinDifficulty(minDifficulty);
+	region->setMaxDifficulty(maxDifficulty);
+	region->setSpawn(spawn);
+	region->setMission(mission);
+	region->setBuildable(buildable);
+	region->setMunicipal(municipal);
+	region->setVisible(visible);
+	region->setNotify(notify);
+	ms_dynamicRegions.push_back(region);
+	regionData.nameMap[name] = region;
+
+	if (region->asRegionPvp())
+		region->asRegionPvp()->checkBattlefieldMarker();
+
+	// if the region is a notify region, force checkNotifyRegions() to be
+	// called on all character creatures in the region as soon as possible so
+	// notifications will be sent that the creature has entered the region
+	if (notify)
+	{
+		std::vector<const Region *> regions;
+
+		CreatureObject::AllCreaturesSet const &creatureList = CreatureObject::getAllCreatures();
+		for (CreatureObject::AllCreaturesSet::const_iterator i = creatureList.begin(); i != creatureList.end(); ++i)
+		{
+			CreatureObject *creatureObj = const_cast<CreatureObject*>(*i);
+			if (creatureObj->isInitialized() && creatureObj->isAuthoritative() && creatureObj->isPlayerControlled() && creatureObj->isInWorld())
+			{
+				regions.clear();
+				getRegionsAtPoint(ServerWorld::getSceneId(), creatureObj->getPosition_w().x, creatureObj->getPosition_w().z, regions);
+				if (std::find(regions.begin(), regions.end(), region) != regions.end())
+					creatureObj->forceNotifyRegionsCheck();
+			}
+		}
+	}
+
+	return region;
+}	// RegionMaster::addDynamicRegion
+
+//----------------------------------------------------------------------
+
+/**
+ * Removes a dynamic region from the world.
+ *
+ * @param source		the source of the region
+ */
+void RegionMaster::removeDynamicRegion(const UniverseObject & source)
+{
+	if (!ms_installed)
+	{
+		WARNING(true, ("RegionMaster::removeDynamicRegion, not installed"));
+		return;
+	}
+
+	DynamicVariableList::NestedList regionObjvars(source.getObjVars(),OBJVAR_DYNAMIC_REGION);
+
+	Unicode::String planet;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_PLANET,planet))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::removeDynamicRegion object %s has no "
+			"planet data", source.getNetworkId().getValueString().c_str()));
+		return;
+	}
+	Unicode::String name;
+	if (!regionObjvars.getItem(OBJVAR_DYNAMIC_REGION_NAME,name))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::removeDynamicRegion object %s has no "
+			"name data", source.getNetworkId().getValueString().c_str()));
+		return;
+	}
+
+	// find the appropriate region data for the planet
+	// note that dynamic regions cannot define new planets
+	std::map<std::string, RegionData>::iterator dataResult = ms_planetRegions.find(
+		Unicode::wideToNarrow(planet));
+	if (dataResult == ms_planetRegions.end())
+	{
+		WARNING(true, ("RegionMaster::removeDynamicRegion object %s gave unknown "
+			"planet %s for its region", source.getNetworkId().getValueString().c_str(),
+			Unicode::wideToNarrow(planet).c_str()));
+		return;
+	}
+	RegionData & regionData = (*dataResult).second;
+	if (regionData.tree == NULL)
+	{
+		WARNING_STRICT_FATAL(true, ("RegionMaster::addDynamicRegion planet %s "
+			"has no tree defined!", Unicode::wideToNarrow(planet).c_str()));
+		return;
+	}
+
+	// find the region by its name
+	RegionsMappedByName::iterator regionResult = regionData.nameMap.find(name);
+	if (regionResult == regionData.nameMap.end())
+	{
+		WARNING(true, ("RegionMaster::removeDynamicRegion object %s gave unknown "
+			"name %s for its region", source.getNetworkId().getValueString().c_str(),
+			Unicode::wideToNarrow(name).c_str()));
+		return;
+	}
+	const Region * region = (*regionResult).second;
+	if (region && !region->isDynamic())
+	{
+		WARNING(true, ("RegionMaster::removeDynamicRegion object %s tried to remove static region %s",
+			source.getNetworkId().getValueString().c_str(), Unicode::wideToNarrow(name).c_str()));
+		return;
+	}
+
+	// if the region is a notify region, force checkNotifyRegions() to be
+	// called on all character creatures in the region as soon as possible so
+	// notifications will be sent that the creature has left the region
+	if (region->getNotify())
+	{
+		std::vector<const Region *> regions;
+
+		CreatureObject::AllCreaturesSet const &creatureList = CreatureObject::getAllCreatures();
+		for (CreatureObject::AllCreaturesSet::const_iterator i = creatureList.begin(); i != creatureList.end(); ++i)
+		{
+			CreatureObject *creatureObj = const_cast<CreatureObject*>(*i);
+			if (creatureObj->isInitialized() && creatureObj->isAuthoritative() && creatureObj->isPlayerControlled() && creatureObj->isInWorld())
+			{
+				regions.clear();
+				getRegionsAtPoint(ServerWorld::getSceneId(), creatureObj->getPosition_w().x, creatureObj->getPosition_w().z, regions);
+				if (std::find(regions.begin(), regions.end(), region) != regions.end())
+					creatureObj->forceNotifyRegionsCheck();
+			}
+		}
+	}
+
+	regionData.nameMap.erase(regionResult);
+
+	// remove the region from the tree
+	if (!regionData.tree->removeObject(region->getBounds()))
+	{
+		WARNING(true, ("RegionMaster::removeDynamicRegion error removing dynamic "
+			"region %s from region tree, continuing anyway",
+			source.getNetworkId().getValueString().c_str()));
+	}
+	
+	// remove the region from the dynamic region list
+	std::vector<const Region *>::iterator removeResult = std::find(
+		ms_dynamicRegions.begin(), ms_dynamicRegions.end(), region);
+	if (removeResult != ms_dynamicRegions.end())
+	{
+		ms_dynamicRegions.erase(removeResult);
+	}
+	else
+	{
+		WARNING(true, ("RegionMaster::removeDynamicRegion dynamic region %s was "
+			"not in the dynamic region list, continuing anyway",
+			source.getNetworkId().getValueString().c_str()));
+	}
+
+	// remove the region
+	delete region;
+}	// RegionMaster::removeDynamicRegion
+
+//----------------------------------------------------------------------
+
+/**
+ * Returns the dynamic region associated with a UniverseObject.
+ *
+ * @param source		the object to get the region from
+ */
+const Region * RegionMaster::getDynamicRegionFromObject(const UniverseObject & source)
+{
+	if (!ms_installed)
+	{
+		WARNING(true, ("RegionMaster::getDynamicRegionFromObject, not installed"));
+		return NULL;
+	}
+
+	DynamicVariableList::NestedList regionObjVars(source.getObjVars(),OBJVAR_DYNAMIC_REGION);
+
+	Unicode::String planet;
+	if (!regionObjVars.getItem(OBJVAR_DYNAMIC_REGION_PLANET,planet))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::getDynamicRegionFromObject object %s has no "
+			"planet data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+	Unicode::String name;
+	if (!regionObjVars.getItem(OBJVAR_DYNAMIC_REGION_NAME,name))
+	{
+		DEBUG_WARNING(true, ("RegionMaster::getDynamicRegionFromObject object %s has no "
+			"name data", source.getNetworkId().getValueString().c_str()));
+		return NULL;
+	}
+
+	return getRegionByName(Unicode::wideToNarrow(planet), name);
+}	// RegionMaster::getDynamicRegionFromObject
+
+//----------------------------------------------------------------------
+
+/**
+ * Returns the region with the given name.
+ */
+Region * RegionMaster::getRegionByName(const std::string & planetName, const Unicode::String & regionName)
+{
+	if (!ms_installed)
+	{
+		WARNING(true, ("RegionMaster::getRegionByName, not installed"));
+		return NULL;
+	}
+
+	const RegionData & regionData = ms_planetRegions[planetName];
+	if (regionData.tree != NULL)
+	{
+		RegionsMappedByName::const_iterator result = regionData.nameMap.find(regionName);
+		if (result != regionData.nameMap.end())
+			return (*result).second;
+	}
+	return NULL;
+}	// RegionMaster::getRegionByName
+
+//----------------------------------------------------------------------
+
+/**
+ * Finds the region with the smallest area at a given point.
+ */
+const Region * RegionMaster::getSmallestRegionAtPoint(const std::string & planet, float x, float z)
+{
+	if (!ms_installed)
+	{
+		WARNING(true, ("RegionMaster::getSmallestRegionAtPoint, not installed"));
+		return NULL;
+	}
+
+	std::vector<const Region *> regions;
+	getRegionsAtPoint(planet, x, z, regions);
+	
+	float area = 0;
+	const Region * region = NULL;
+	for (std::vector<const Region *>::const_iterator iter = regions.begin();
+		iter != regions.end(); ++iter)
+	{
+		if (region == NULL)
+		{
+			region = *iter;
+			area = region->getArea();
+		}
+		else
+		{
+			float testArea = (*iter)->getArea();
+			if (testArea < area)
+			{
+				area = testArea;
+				region = *iter;
+			}
+		}
+	}
+	return region;
+}	// RegionMaster::getSmallestRegionAtPoint
+
+//----------------------------------------------------------------------
+
+/**
+ * Same as getSmallestRegionAtPoint, but the region must be marked as visible.
+ */
+const Region * RegionMaster::getSmallestVisibleRegionAtPoint(const std::string & planet, float x, float z)
+{
+	if (!ms_installed)
+	{
+		WARNING(true, ("RegionMaster::getSmallestRegionAtPoint, not installed"));
+		return NULL;
+	}
+
+	std::vector<const Region *> regions;
+	getRegionsAtPoint(planet, x, z, regions);
+	
+	float area = 0;
+	const Region * region = NULL;
+	for (std::vector<const Region *>::const_iterator iter = regions.begin(); iter != regions.end(); ++iter)
+	{
+		if ((*iter)->isVisible())
+		{
+			if (region == NULL)
+			{
+				region = *iter;
+				area = region->getArea();
+			}
+			else
+			{
+				float testArea = (*iter)->getArea();
+				if (testArea < area)
+				{
+					area = testArea;
+					region = *iter;
+				}
+			}
+		}
+	}
+	return region;
+}	// RegionMaster::getSmallestVisibleRegionAtPoint
+
+//----------------------------------------------------------------------
+
+/**
+ * Finds the regions at a given point.
+ *
+ * @param planet		planet name of region to get
+ * @param x				x coordinate of point
+ * @param z				z coordinate of point
+ * @param regions		vector to be filled in with list of regions at the point
+ */
+void RegionMaster::getRegionsAtPoint(const std::string & planet, float x, float z, 
+	std::vector<const Region *> & regions)
+{
+	regions.clear();
+
+	if (!ms_installed)
+	{
+		WARNING(true, ("RegionMaster::getRegionsAtPoint, not installed"));
+		return;
+	}
+
+	const RegionData & regionData = ms_planetRegions[planet];
+	if (regionData.tree != NULL)
+	{
+		std::vector<const MxCifQuadTreeBounds *> objects;
+		regionData.tree->getObjectsAt(x, z, objects);
+		for (std::vector<const MxCifQuadTreeBounds *>::const_iterator iter = objects.begin();
+			iter != objects.end(); ++iter)
+		{
+			regions.push_back(static_cast<Region *>((*iter)->getData()));
+		}
+	}
+}	// RegionMaster::getRegionsAtPoint
+
+//----------------------------------------------------------------------
+
+/**
+ * Returns all the regions for a given planet.
+ */
+void RegionMaster::getRegionsForPlanet(const std::string & planetName, 
+	std::vector<const Region *> & regions)
+{
+	regions.clear();
+
+	if (!ms_installed)
+	{
+		WARNING(true, ("RegionMaster::getRegionsForPlanet, not installed"));
+		return;
+	}
+
+	const RegionData & regionData = ms_planetRegions[planetName];
+	if (regionData.tree != NULL)
+	{
+		std::vector<const MxCifQuadTreeBounds *> objects;
+		regionData.tree->getAllObjects(objects);
+		for (std::vector<const MxCifQuadTreeBounds *>::const_iterator iter = objects.begin();
+			iter != objects.end(); ++iter)
+		{
+			regions.push_back(static_cast<Region *>((*iter)->getData()));
+		}
+	}
+}	// RegionMaster::getRegionsForPlanet
+
+//----------------------------------------------------------------------
+
+void RegionMaster::registerBattlefieldMarker(const std::string &regionName, BattlefieldMarkerObject *marker)
+{
+	Region *region = getRegionByName(ServerWorld::getSceneId(), Unicode::narrowToWide(regionName));
+	if (region)
+	{
+		RegionPvp *regionPvp = region->asRegionPvp();
+		if (regionPvp)
+			regionPvp->setBattlefieldMarker(marker);
+	}
+}
+
+EnvironmentInfo RegionMasterNamspace::convertFromStringToEnvironmentInfo(std::string const & stringList)
+{
+	if(stringList.empty())
+		return 0;
+
+	if(s_conversionMap.empty())
+	{
+		// Fill the Datatable with values from our environment flags datatable.
+		DataTable * const environmentFlagTable = DataTableManager::getTable(s_environmentFlagsDataTable, true);
+		for(int i = 0; i < environmentFlagTable->getNumRows(); ++i)
+		{
+			s_conversionMap.insert( std::pair<std::string, EnvironmentInfo>(environmentFlagTable->getStringValue(0,i), static_cast<EnvironmentInfo>(1 << i) ) );
+		}
+	}
+
+	std::string parserList = stringList;
+	const char delimiter = ',';
+	EnvironmentInfo outputValue = 0;
+	
+	// Parse the input string using , as the delimiter.
+	std::vector<std::string> parsedStringVector;
+	std::string::size_type loc = parserList.find(delimiter);
+
+	if (std::string::npos != loc) // We found a comma
+	{
+		std::vector<int> locations;
+		locations.push_back(loc);
+		while (std::string::npos != (loc = parserList.find(delimiter, loc+1)))
+		{
+			locations.push_back(loc);
+		}
+
+		for(std::vector<int>::size_type i = 0; i < locations.size(); ++i)
+		{
+			std::string subString;
+
+			if(i == 0)
+				subString = parserList.substr(0, locations[i]);
+			else
+				subString = parserList.substr(locations[i - 1], locations[i]);
+
+			parsedStringVector.push_back(subString);
+		}
+
+	}
+	else
+		parsedStringVector.push_back(parserList); // No comma, must be one item in the list.
+
+	// Now we just search our map for the strings we just read in. If we find it, we add that flag to our output value.
+	for(std::vector<std::string>::size_type i = 0; i < parsedStringVector.size(); ++i)
+	{
+		std::map<std::string, EnvironmentInfo>::iterator searchIter = NULL;
+		searchIter = s_conversionMap.find(parsedStringVector[i]);
+
+		if( searchIter != s_conversionMap.end())
+		{
+			outputValue |= searchIter->second;
+		}
+	}
+
+
+	return outputValue;
+}
+
+NetworkId RegionMaster::createNewDynamicRegionWithSpawn(float centerX, float centerY, float centerZ,
+										  float radius, const Unicode::String & name, const std::string & planet, int pvp, 
+										  int buildable, int municipal, int geography, int minDifficulty, int maxDifficulty, 
+										  int spawnable, int mission, bool visible, bool notify, std::string spawnDatatable, int duration)
+{
+	// no creating duplicate regions
+	if (getRegionByName(planet, name))
+		return NetworkId();
+
+	// only the universe process may create universe objects
+	if (!ServerUniverse::getInstance().isAuthoritative())
+	{
+		CreateDynamicSpawnRegionCircleMessage const createMessage(centerX, centerY, centerZ, radius, name, planet, pvp, buildable, municipal, geography, minDifficulty, maxDifficulty, spawnable, mission, visible, notify, spawnDatatable, duration);
+		GameServer::getInstance().sendToCentralServer(createMessage);
+		return NetworkId();
+	}
+
+	// create a new UniverseObject that will be used to hold the region data
+	Transform tr;
+	tr.setPosition_p(Vector::xyz111);
+	UniverseObject *regionObject = safe_cast<UniverseObject *>(ServerWorld::createNewObject(DYNAMIC_REGION_TEMPLATE_NAME, tr, 0, false));
+
+	if (!regionObject || !regionObject->getScriptObject())
+		return NetworkId();
+
+	if (!setDynamicSpawnRegionObjectData(*regionObject, name, planet, RG_circle, centerX, 
+		centerZ, radius, 0, pvp, buildable, municipal, geography, minDifficulty,
+		maxDifficulty, spawnable, mission, visible, notify, spawnDatatable, duration))
+	{
+		regionObject->permanentlyDestroy(DeleteReasons::SetupFailed);
+		return NetworkId();
+	}
+
+	regionObject->addToWorld();
+
+	const Region * region = addDynamicRegion(*regionObject);
+	if (region)
+		regionObject->persist();
+	else
+	{
+		regionObject->removeObjVarItem(OBJVAR_DYNAMIC_REGION);
+		regionObject->permanentlyDestroy(DeleteReasons::SetupFailed);
+	}
+
+	// Everything went okay. Add dynamic spawn script and other objvars.
+	regionObject->getScriptObject()->attachScript(s_dynamicMasterScript, true);
+
+	if(!spawnDatatable.empty())
+	{
+		// Creature spawning has to be done in script.
+		ScriptParams params;
+		params.addParam(regionObject->getNetworkId());
+		params.addParam(spawnDatatable.c_str());
+		params.addParam(centerX);
+		params.addParam(centerY);
+		params.addParam(centerZ);
+
+		IGNORE_RETURN(regionObject->getScriptObject()->trigAllScripts(Scripting::TRIG_ON_DYNAMIC_SPAWN_REGION_CREATED, params));
+	}
+
+	return regionObject->getNetworkId();
+}
+
+bool RegionMaster::setDynamicSpawnRegionObjectData(UniverseObject & object, 
+											  const Unicode::String & name, const std::string & planet, int geometry, 
+											  float minX, float minZ, float maxX, float maxZ, int pvp, int buildable, 
+											  int municipal, int geography, int minDifficulty, int maxDifficulty, int spawnable,
+											  int mission, bool visible, bool notify, std::string spawntable, int duration)
+{
+	time_t const birthEpoch = ::time(NULL);
+	time_t const endEpoch = birthEpoch + (duration * 60); // Duration is in minutes.
+
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_NAME, name);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_PLANET, Unicode::narrowToWide(planet));
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_GEOMETRY, geometry);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_MINX, minX);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_MINY, minZ);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_MAXX, maxX);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_MAXY, maxZ);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_PVP, pvp);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_GEOGRAPHY, geography);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_MIN_DIFFICULTY, minDifficulty);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_MAX_DIFFICULTY, maxDifficulty);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_SPAWN, spawnable);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_MISSION, mission);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_BUILDABLE, buildable);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_MUNICIPAL, municipal);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_VISIBLE, static_cast<int>(visible));
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_NOTIFY, static_cast<int>(notify));
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_SPAWNTABLE, spawntable);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_BIRTH, static_cast<int>(birthEpoch));
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_DURATION, duration);
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_MAXDURATION, duration + (duration/3)); // Max duration is an extra 30% of the time.
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_READABLE_BIRTH, CalendarTime::convertEpochToTimeStringGMT_YYYYMMDDHHMMSS(birthEpoch));
+	object.setObjVarItem(OBJVAR_DYNAMIC_REGION + "." + OBJVAR_DYNAMIC_REGION_READABLE_DEATH, CalendarTime::convertEpochToTimeStringGMT_YYYYMMDDHHMMSS(endEpoch));
+	return true;
+}	// RegionMaster::setDynamicRegionObjectData
+
+//----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverGame/src/shared/region/RegionMaster.h b/engine/server/library/serverGame/src/shared/region/RegionMaster.h
new file mode 100644
index 00000000..cc8dcd61
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/region/RegionMaster.h
@@ -0,0 +1,93 @@
+//========================================================================
+//
+// RegionMaster.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef INCLUDED_RegionMaster_H
+#define INCLUDED_RegionMaster_H
+
+// ======================================================================
+
+class BattlefieldMarkerObject;
+class MxCifQuadTree;
+class NetworkId;
+class Region;
+class ServerObject;
+class UniverseObject;
+class Vector;
+
+// ======================================================================
+
+/** 
+ * Keeps track of all regions in the game.
+ */
+class RegionMaster
+{
+public:
+	// this enum list is so we know when to create a pvp region as opposed to a 
+	// normal region when creating dynamic regions
+	enum PvpRegion
+	{
+		PR_normal,
+		PR_truce,
+		PR_battlefieldPvp,
+		PR_battlefieldPve
+	};
+
+public:
+
+	typedef stdvector<const Region *>::fwd RegionVector;
+	static void install();
+	static void exit();
+
+	static void createNewDynamicRegion                    (float minX, float minZ, float maxX, float maxZ, const Unicode::String & name, const std::string & planet, int pvp, int buildable, int municipal, int geography, int minDifficulty, int maxDifficulty, int spawnable, int mission, bool visible, bool notify);
+	static void createNewDynamicRegion                    (float centerX, float centerZ, float radius, const Unicode::String & name, const std::string & planet, int pvp, int buildable, int municipal, int geography, int minDifficulty, int maxDifficulty, int spawnable, int mission, bool visible, bool notify);
+	static NetworkId createNewDynamicRegionWithSpawn      (float centerX, float centerY, float centerZ, float radius, const Unicode::String & name, const std::string & planet, int pvp, int buildable, int municipal, int geography, int minDifficulty, int maxDifficulty, int spawnable, int mission, bool visible, bool notify, std::string spawnDatatable, int duration);
+
+	static const Region * addDynamicRegion                (const UniverseObject & source);
+	static void           removeDynamicRegion             (const UniverseObject & source);
+	static const Region * getDynamicRegionFromObject      (const UniverseObject & source);
+
+	static Region *       getRegionByName                 (const std::string & planet, const Unicode::String & regionName);
+	static const Region * getSmallestRegionAtPoint        (const std::string & planet, float x, float z);
+	static const Region * getSmallestVisibleRegionAtPoint (const std::string & planet, float x, float z);
+	static void           getRegionsAtPoint               (const std::string & planet, float x, float z, RegionVector & regions);
+
+	static void           getRegionsForPlanet             (const std::string & planetName, RegionVector & regions);
+
+	static void           registerBattlefieldMarker       (const std::string & regionName, BattlefieldMarkerObject *marker);
+
+private:
+
+	// disabled
+	RegionMaster();
+	RegionMaster(const RegionMaster& rhs);
+	RegionMaster& operator=(const RegionMaster& rhs);
+
+private:
+	static void readRegionDataTables       ();
+	static bool setDynamicRegionObjectData (UniverseObject & object, const Unicode::String & name, const std::string & planet, int geometry, float minX, float minZ, float maxX, float maxZ, int pvp, int buildable, int municipal, int geography, int minDifficulty, int maxDifficulty, int spawnable, int mission, bool visible, bool notify);
+	static bool setDynamicSpawnRegionObjectData (UniverseObject & object, const Unicode::String & name, const std::string & planet, int geometry, float minX, float minZ, float maxX, float maxZ, int pvp, int buildable, int municipal, int geography, int minDifficulty, int maxDifficulty, int spawnable, int mission, bool visible, bool notify, std::string spawntable, int duration);
+	// we need to get regions by position or name, so we have fast lookup
+	// structures for both, at the expense of using more memory
+	typedef stdmap<Unicode::String, Region *>::fwd RegionsMappedByName;
+	struct RegionData;
+
+	// regions per planet
+	static stdmap<std::string, RegionData>::fwd ms_planetRegions;
+
+	// regions created from the region datatables
+	static RegionVector ms_staticRegions;
+
+	// regions created from scripts
+	static RegionVector ms_dynamicRegions;
+
+	static bool ms_installed;
+};
+
+
+#endif	// INCLUDED_RegionMaster_H
+
diff --git a/engine/server/library/serverGame/src/shared/region/RegionPvp.cpp b/engine/server/library/serverGame/src/shared/region/RegionPvp.cpp
new file mode 100644
index 00000000..81ca6df3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/region/RegionPvp.cpp
@@ -0,0 +1,138 @@
+// ======================================================================
+//
+// RegionPvp.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/RegionPvp.h"
+#include "boost/smart_ptr.hpp"
+#include "serverGame/BattlefieldMarkerObject.h"
+#include "serverGame/MessageToQueue.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptDictionary.h"
+#include "serverScript/ScriptParameters.h"
+
+// ======================================================================
+
+// battlefield initialization message handler
+const static std::string BATTLEFIELD_MESSAGE_HANDLER("msgInitializeRegion");
+const static std::string BATTLEFIELD_MESSAGE_PLANET("region_planet");
+const static std::string BATTLEFIELD_MESSAGE_NAME("region_name");
+
+// ======================================================================
+
+RegionPvp::RegionPvp(float centerX, float centerY, float radius) :
+	RegionCircle(centerX, centerY, radius),
+	m_battlefieldMarker(0)
+{
+}
+
+// ----------------------------------------------------------------------
+
+RegionPvp::RegionPvp(float centerX, float centerY, float radius, const CachedNetworkId & dynamicRegionId) :
+	RegionCircle(centerX, centerY, radius, dynamicRegionId),
+	m_battlefieldMarker(0)
+{
+}
+
+// ----------------------------------------------------------------------
+
+Pvp::FactionId RegionPvp::getBattlefieldFactionId(const NetworkId & object) const
+{
+	if (!m_battlefieldMarker)
+	{
+		WARNING(true, ("RegionPvp::getBattlefieldFactionId has no marker object for battlefield region %s", Unicode::wideToNarrow(getName()).c_str()));
+		return 0;
+	}
+	return m_battlefieldMarker->getBattlefieldFactionId(object);
+}	// RegionPvp::getBattlefieldFactionId
+
+// ----------------------------------------------------------------------
+
+void RegionPvp::setBattlefieldParticipant(const NetworkId & object, Pvp::FactionId factionId) const
+{
+	if (!m_battlefieldMarker)
+	{
+		WARNING(true, ("RegionPvp::setBattlefieldParticipant has no marker object for battlefield region %s", Unicode::wideToNarrow(getName()).c_str()));
+		return;
+	}
+	m_battlefieldMarker->setBattlefieldParticipant(object, factionId);
+}	// RegionPvp::setBattlefieldParticipant
+
+// ----------------------------------------------------------------------
+
+void RegionPvp::clearBattlefieldParticipants() const
+{
+	if (!m_battlefieldMarker)
+	{
+		WARNING(true, ("RegionPvp::clearBattlefieldParticipants has no marker object for battlefield region %s", Unicode::wideToNarrow(getName()).c_str()));
+		return;
+	}
+	m_battlefieldMarker->clearBattlefieldParticipants();
+}	// RegionPvp::clearBattlefieldParticipants
+
+// ----------------------------------------------------------------------
+
+void RegionPvp::setBattlefieldMarker(BattlefieldMarkerObject *marker)
+{
+	if (m_battlefieldMarker != marker)
+	{
+		m_battlefieldMarker = marker;
+		if (marker)
+			initializeBattlefield();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void RegionPvp::checkBattlefieldMarker()
+{
+	if (!m_battlefieldMarker)
+	{
+		m_battlefieldMarker = BattlefieldMarkerObject::findMarkerByRegionName(Unicode::wideToNarrow(getName()));
+		if (m_battlefieldMarker)
+			initializeBattlefield();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void RegionPvp::initializeBattlefield()
+{
+	NOT_NULL(m_battlefieldMarker);
+
+	ScriptParams params;
+	params.addParam(getPlanet().c_str(), BATTLEFIELD_MESSAGE_PLANET);
+	params.addParam(getName(), BATTLEFIELD_MESSAGE_NAME);
+
+	ScriptDictionaryPtr dictionary;
+	m_battlefieldMarker->getScriptObject()->makeScriptDictionary(params, dictionary);
+	dictionary->serialize();
+
+	MessageToQueue::getInstance().sendMessageToJava(
+		m_battlefieldMarker->getNetworkId(),
+		BATTLEFIELD_MESSAGE_HANDLER,
+		dictionary->getSerializedData(),
+		1,
+		true);
+}
+
+// ----------------------------------------------------------------------
+
+RegionPvp *RegionPvp::asRegionPvp()
+{
+	return this;
+}
+
+// ----------------------------------------------------------------------
+
+RegionPvp const *RegionPvp::asRegionPvp() const
+{
+	return this;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/region/RegionPvp.h b/engine/server/library/serverGame/src/shared/region/RegionPvp.h
new file mode 100644
index 00000000..ffd43c42
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/region/RegionPvp.h
@@ -0,0 +1,63 @@
+//========================================================================
+//
+// RegionPvp.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef INCLUDED_RegionPvp_H
+#define INCLUDED_RegionPvp_H
+
+#include "serverGame/Pvp.h"
+#include "serverGame/Region.h"
+
+// ======================================================================
+
+class BattlefieldMarkerObject;
+
+// ======================================================================
+
+/**
+ * A region used as a pvp area (battlefields).
+ */
+class RegionPvp : public RegionCircle
+{
+public:
+	RegionPvp(float centerX, float centerY, float radius);
+	RegionPvp(float centerX, float centerY, float radius, const CachedNetworkId & dynamicRegionId);
+
+	virtual RegionPvp *asRegionPvp();
+	virtual RegionPvp const *asRegionPvp() const;
+
+	void setBattlefieldMarker(BattlefieldMarkerObject *marker);
+	BattlefieldMarkerObject const *getBattlefieldMarker() const;
+	void checkBattlefieldMarker();
+
+	Pvp::FactionId getBattlefieldFactionId(const NetworkId & object) const;
+	void setBattlefieldParticipant(const NetworkId & object, Pvp::FactionId factionId) const;
+	void clearBattlefieldParticipants() const;
+
+private:
+	// disabled
+	RegionPvp();
+	RegionPvp(const RegionPvp &);
+	RegionPvp & operator =(const RegionPvp &);
+
+	void initializeBattlefield();
+
+private:
+	BattlefieldMarkerObject *m_battlefieldMarker;
+};
+
+// ----------------------------------------------------------------------
+
+inline BattlefieldMarkerObject const *RegionPvp::getBattlefieldMarker() const
+{
+	return m_battlefieldMarker;
+}
+
+// ======================================================================
+
+#endif	// INCLUDED_RegionPvp_H
+
diff --git a/engine/server/library/serverGame/src/shared/region3d/Region3d.cpp b/engine/server/library/serverGame/src/shared/region3d/Region3d.cpp
new file mode 100644
index 00000000..60cca550
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/region3d/Region3d.cpp
@@ -0,0 +1,72 @@
+// ======================================================================
+//
+// Region3d.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/Region3d.h"
+
+#include "serverGame/Region3dMaster.h"
+#include "serverScript/ScriptParameters.h"
+
+// ======================================================================
+
+Region3d::Region3d(std::string const &name, Sphere const &containingSphere, ScriptParams *regionScriptData) :
+	m_name(name),
+	m_containingSphere(containingSphere),
+	m_regionScriptData(regionScriptData),
+	m_spatialSubdivisionHandle(0)
+{
+	Region3dMaster::addRegion(*this);
+}
+
+// ----------------------------------------------------------------------
+
+Region3d::~Region3d()
+{
+	Region3dMaster::removeRegion(*this);
+	delete m_regionScriptData;
+	m_regionScriptData = 0;
+	m_spatialSubdivisionHandle = 0;
+}
+
+// ----------------------------------------------------------------------
+
+Sphere const &Region3d::getContainingSphere() const
+{
+	return m_containingSphere;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const &Region3d::getName() const
+{
+	return m_name;
+}
+
+// ----------------------------------------------------------------------
+
+ScriptParams const *Region3d::getRegionScriptData() const
+{
+	return m_regionScriptData;
+}
+
+// ----------------------------------------------------------------------
+
+SpatialSubdivisionHandle *Region3d::getSpatialSubdivisionHandle()
+{
+	return m_spatialSubdivisionHandle;
+}
+
+// ----------------------------------------------------------------------
+
+void Region3d::setSpatialSubdivisionHandle(SpatialSubdivisionHandle *newHandle)
+{
+	m_spatialSubdivisionHandle = newHandle;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/region3d/Region3d.h b/engine/server/library/serverGame/src/shared/region3d/Region3d.h
new file mode 100644
index 00000000..2fa07bbb
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/region3d/Region3d.h
@@ -0,0 +1,58 @@
+// ======================================================================
+//
+// Region3d.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_Region3d_H
+#define INCLUDED_Region3d_H
+
+// ======================================================================
+
+#include "sharedMath/Sphere.h"
+
+// ======================================================================
+
+class ScriptParams;
+class SpatialSubdivisionHandle;
+
+// ======================================================================
+
+class Region3d
+{
+public:
+	virtual ~Region3d();
+
+	virtual bool containsPoint(Vector const &point) const = 0;
+	virtual float getVolume() const = 0;
+
+	Sphere const &getContainingSphere() const;
+	std::string const &getName() const;
+	ScriptParams const *getRegionScriptData() const;
+
+protected:
+	Region3d(std::string const &name, Sphere const &containingSphere, ScriptParams *regionScriptData);
+
+	SpatialSubdivisionHandle *getSpatialSubdivisionHandle();
+	void setSpatialSubdivisionHandle(SpatialSubdivisionHandle *newHandle);
+
+private:
+	Region3d();
+	Region3d(Region3d const &);
+	Region3d &operator=(Region3d const &);
+
+private:
+	std::string m_name;
+	Sphere m_containingSphere;
+	ScriptParams *m_regionScriptData;
+	SpatialSubdivisionHandle *m_spatialSubdivisionHandle;
+
+friend class Region3dMaster;
+};
+
+// ======================================================================
+
+#endif // INCLUDED_Region3d_H
+
diff --git a/engine/server/library/serverGame/src/shared/region3d/Region3dMaster.cpp b/engine/server/library/serverGame/src/shared/region3d/Region3dMaster.cpp
new file mode 100644
index 00000000..ec4450fe
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/region3d/Region3dMaster.cpp
@@ -0,0 +1,282 @@
+// ======================================================================
+//
+// Region3dMaster.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/Region3dMaster.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/Region3d.h"
+#include "serverGame/RegionBox.h"
+#include "serverGame/RegionSphere.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFile/Iff.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/LessPointerComparator.h"
+#include "sharedMath/SphereTree.h"
+#include "sharedUtility/DataTable.h"
+#include "UnicodeUtils.h"
+
+// ======================================================================
+
+namespace Region3dMasterNamespace
+{
+
+	// ----------------------------------------------------------------------
+
+	class RegionSphereExtentAccessor: public BaseSphereTreeAccessor<Region3d const *, RegionSphereExtentAccessor>
+	{
+	public:
+		static Sphere const getExtent(Region3d const *region)
+		{
+			NOT_NULL(region);
+			return region->getContainingSphere();
+		}
+		static char const *getDebugName(Region3d const *region)
+		{
+			return region->getName().c_str();
+		}
+	};
+
+	class RegionFilter: public SpatialSubdivisionFilter<Region3d const *>
+	{
+	public:
+		explicit RegionFilter(Vector const &searchPoint) :
+			m_searchPoint(searchPoint)
+		{
+		}
+
+		bool operator()(Region3d const * const &region) const
+		{
+			return region->containsPoint(m_searchPoint);
+		}
+
+	private:
+		RegionFilter(); // disable
+
+	private:
+		Vector m_searchPoint;
+	};
+
+	// ----------------------------------------------------------------------
+
+	bool s_installed;
+	// s_nameRegionMap's key field is a pointer to the region name contained
+	// within the Region3d.  Region3d objects are added and removed from the
+	// map during their constructor / destructor, so we guarantee that the
+	// key is always pointing to valid data while in the map.
+	typedef std::map<std::string const *, Region3d *, LessPointerComparator> RegionNameMap;
+	RegionNameMap s_nameRegionMap;
+	SphereTree<Region3d const *, RegionSphereExtentAccessor> s_regionSphereTree;
+
+	// ----------------------------------------------------------------------
+
+	void clearRegions()
+	{
+		while (!s_nameRegionMap.empty())
+			delete (*s_nameRegionMap.begin()).second;
+	}
+
+	// ----------------------------------------------------------------------
+
+	std::string getRegionTableNameForScene(std::string const &sceneId)
+	{
+		static std::string prefix("datatables/region3d/");
+		static std::string suffix(".iff");
+		return prefix + sceneId + suffix;
+	}
+
+	// ----------------------------------------------------------------------
+
+	void remove()
+	{
+		if (s_installed)
+		{
+			clearRegions();
+			s_installed = false;
+		}
+	}
+
+	// ----------------------------------------------------------------------
+
+	void requireColumn(DataTable const &t, char const *columnName, char const *tableName)
+	{
+		FATAL(t.findColumnNumber(columnName) < 0, ("Region3dMaster: require column '%s' missing from datatable '%s'", columnName, tableName));
+	}
+
+	// ----------------------------------------------------------------------
+}
+using namespace Region3dMasterNamespace;
+
+// ======================================================================
+
+void Region3dMaster::install() // static
+{
+	if (!s_installed)
+	{
+		ExitChain::add(remove, "Region3dMaster");
+
+		reloadRegionTable();
+		s_installed = true;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void Region3dMaster::reloadRegionTable() // static
+{
+	clearRegions();
+
+	std::string const &region3dTableName = getRegionTableNameForScene(ConfigServerGame::getSceneID());
+
+	Iff iff;
+	if (iff.open(region3dTableName.c_str(), true))
+	{
+		DataTable region3dTable;
+		region3dTable.load(iff);
+
+		REPORT_LOG(true, ("Region3dMaster: loading 3d region table '%s'\n", region3dTableName.c_str()));
+
+		requireColumn(region3dTable, "regionName", region3dTableName.c_str());
+		requireColumn(region3dTable, "x1", region3dTableName.c_str());
+		requireColumn(region3dTable, "y1", region3dTableName.c_str());
+		requireColumn(region3dTable, "z1", region3dTableName.c_str());
+		requireColumn(region3dTable, "x2", region3dTableName.c_str());
+		requireColumn(region3dTable, "y2", region3dTableName.c_str());
+		requireColumn(region3dTable, "z2", region3dTableName.c_str());
+		requireColumn(region3dTable, "radius", region3dTableName.c_str());
+
+		for (int row = 0; row < region3dTable.getNumRows(); ++row)
+		{
+			// regionName  geometry x1 y1 z1 x2 y2 z2 radius
+			// where regionName is a string id specifier, geometry is 0 for sphere, 1 for box,
+			// boxes use extents x1 y1 z1 x2 y2 z2, with x1 < x2, y1 < y2, z1 < z2,
+			// and spheres use x1 y1 z1 as the center, with radius radius
+			std::string regionName(Unicode::getTrim(region3dTable.getStringValue("regionName", row)));
+			int geometry = region3dTable.getIntValue("geometry", row);
+			float x1 = region3dTable.getFloatValue("x1", row);
+			float y1 = region3dTable.getFloatValue("y1", row); //lint !e578
+			float z1 = region3dTable.getFloatValue("z1", row);
+
+			// Build script params to include everything in the data table row.
+			// The newed region takes ownership of the regionScriptData and is
+			// responsible for deleting it.
+			ScriptParams *regionScriptData = new ScriptParams;
+			for (int column = 0; column < region3dTable.getNumColumns(); ++column)
+			{
+				switch (region3dTable.getDataTypeForColumn(column).getType())
+				{
+				case DataTableColumnType::DT_Int:
+				case DataTableColumnType::DT_HashString:
+				case DataTableColumnType::DT_Enum:
+				case DataTableColumnType::DT_BitVector:
+					regionScriptData->addParam(region3dTable.getIntValue(column, row), region3dTable.getColumnName(column), true);
+					break;
+				case DataTableColumnType::DT_Bool:
+					regionScriptData->addParam(region3dTable.getIntValue(column, row) ? true : false, region3dTable.getColumnName(column), true);
+					break;
+				case DataTableColumnType::DT_Float:
+					regionScriptData->addParam(region3dTable.getFloatValue(column, row), region3dTable.getColumnName(column), true);
+					break;
+				case DataTableColumnType::DT_String:
+				case DataTableColumnType::DT_PackedObjVars:
+					{
+						std::string const &value = region3dTable.getStringValue(column, row);
+						char *s = new char[value.size()+1];
+						strcpy(s, value.c_str());
+						regionScriptData->addParam(s, region3dTable.getColumnName(column), true);
+					} //lint !e429 // regionScriptData takes ownership of s
+					break;
+				case DataTableColumnType::DT_Comment:
+				case DataTableColumnType::DT_Unknown:
+					break;
+				}
+			}
+
+			switch (geometry)
+			{
+			case 0: // sphere
+				{
+					float radius = region3dTable.getFloatValue("radius", row);
+					FATAL(radius <= 0.0f, ("Region3dMaster: Region sphere with bad radius '%s'", regionName.c_str()));
+					IGNORE_RETURN(new RegionSphere(regionName, Vector(x1, y1, z1), radius, regionScriptData));
+				}
+				break;
+			case 1: // box
+				{
+					float x2 = region3dTable.getFloatValue("x2", row);
+					float y2 = region3dTable.getFloatValue("y2", row);
+					float z2 = region3dTable.getFloatValue("z2", row);
+					FATAL(x2 <= x1 || y2 <= y1 || z2 <= z1, ("Region3dMaster: Region box with inverted coordinates '%s'", regionName.c_str()));
+					IGNORE_RETURN(new RegionBox(regionName, Vector(x1, y1, z1), Vector(x2, y2, z2), regionScriptData));
+				}
+				break;
+			default:
+				FATAL(true, ("Region3dMaster: Unknown geometry type %d for region '%s'", geometry, regionName.c_str()));
+				break;
+			}
+		} //lint !e429 // either the new region takes ownership of regionScriptData or we've fataled
+	}
+}
+
+	// ----------------------------------------------------------------------
+
+Region3d const *Region3dMaster::getRegionByName(std::string const &regionName) // static
+{
+	RegionNameMap::const_iterator i = s_nameRegionMap.find(&regionName);
+	if (i != s_nameRegionMap.end())
+		return (*i).second;
+	return 0;
+}
+
+// ----------------------------------------------------------------------
+
+void Region3dMaster::getRegionsAtPoint(Vector const &point, std::vector<Region3d const *> &results) // static
+{
+	s_regionSphereTree.findInRange(point, 0.0f, RegionFilter(point), results);
+}
+
+// ----------------------------------------------------------------------
+
+Region3d const *Region3dMaster::getSmallestRegionAtPoint(Vector const &point) // static
+{
+	std::vector<Region3d const *> results;
+	getRegionsAtPoint(point, results);
+
+	Region3d const *best = 0;
+	for (std::vector<Region3d const *>::iterator i = results.begin(); i != results.end(); ++i)
+		if (!best || (*i)->getVolume() < best->getVolume())
+			best = *i;
+
+	return best;
+}
+
+// ----------------------------------------------------------------------
+
+void Region3dMaster::addRegion(Region3d &region) // static
+{
+	FATAL(s_nameRegionMap.find(&region.getName()) != s_nameRegionMap.end(), ("Region3dMaster: tried to add a region with a duplicate name '%s'", region.getName().c_str()));
+
+	// add to the name map
+	IGNORE_RETURN(s_nameRegionMap.insert(std::make_pair(&region.getName(), &region)));
+	// add to the sphere tree
+	region.setSpatialSubdivisionHandle(s_regionSphereTree.addObject(&region));
+}
+
+// ----------------------------------------------------------------------
+
+void Region3dMaster::removeRegion(Region3d &region) // static
+{
+	// remove from the name map
+	IGNORE_RETURN(s_nameRegionMap.erase(&region.getName()));
+
+	// remove from the sphere tree
+	s_regionSphereTree.removeObject(region.getSpatialSubdivisionHandle());
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/region3d/Region3dMaster.h b/engine/server/library/serverGame/src/shared/region3d/Region3dMaster.h
new file mode 100644
index 00000000..99fcf1af
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/region3d/Region3dMaster.h
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// Region3dMaster.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_Region3dMaster_H
+#define INCLUDED_Region3dMaster_H
+
+// ======================================================================
+
+class Region3d;
+class Vector;
+
+// ======================================================================
+
+class Region3dMaster
+{
+public:
+	static void install();
+	static void reloadRegionTable();
+	static Region3d const *getRegionByName(std::string const &regionName);
+	static void getRegionsAtPoint(Vector const &point, std::vector<Region3d const *> &regions);
+	static Region3d const *getSmallestRegionAtPoint(Vector const &point);
+
+private:
+	static void addRegion(Region3d &region);
+	static void removeRegion(Region3d &region);
+	
+private:
+	Region3dMaster();
+	Region3dMaster(Region3dMaster const &);
+	Region3dMaster &operator=(Region3dMaster const &);
+
+friend class Region3d;
+};
+
+// ======================================================================
+
+#endif // INCLUDED_Region3dMaster_H
+
diff --git a/engine/server/library/serverGame/src/shared/region3d/RegionBox.cpp b/engine/server/library/serverGame/src/shared/region3d/RegionBox.cpp
new file mode 100644
index 00000000..14bc5549
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/region3d/RegionBox.cpp
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// RegionBox.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/RegionBox.h"
+
+// ======================================================================
+
+RegionBox::RegionBox(std::string const &name, Vector const &corner1, Vector const &corner2, ScriptParams *regionScriptData) :
+	Region3d(name, Sphere((corner1+corner2)/2.0f, corner1.magnitudeBetween(corner2)/2.0f), regionScriptData),
+	m_corner1(corner1),
+	m_corner2(corner2)
+{
+}
+
+// ----------------------------------------------------------------------
+
+bool RegionBox::containsPoint(Vector const &point) const
+{
+	return    point.x >= m_corner1.x
+	       && point.y >= m_corner1.y
+	       && point.z >= m_corner1.z
+	       && point.x < m_corner2.x
+	       && point.y < m_corner2.y
+	       && point.z < m_corner2.z;
+}
+
+// ----------------------------------------------------------------------
+
+float RegionBox::getVolume() const
+{
+	return   (m_corner2.x-m_corner1.x)
+	       * (m_corner2.y-m_corner1.y)
+	       * (m_corner2.z-m_corner1.z);
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/region3d/RegionBox.h b/engine/server/library/serverGame/src/shared/region3d/RegionBox.h
new file mode 100644
index 00000000..e5facd95
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/region3d/RegionBox.h
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// RegionBox.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_RegionBox_H
+#define INCLUDED_RegionBox_H
+
+// ======================================================================
+
+#include "Region3d.h"
+
+// ======================================================================
+
+class RegionBox: public Region3d
+{
+public:
+	RegionBox(std::string const &name, Vector const &corner1, Vector const &corner2, ScriptParams *regionScriptData);
+
+	virtual bool containsPoint(Vector const &point) const;
+	virtual float getVolume() const;
+
+private:
+	RegionBox();
+	RegionBox(RegionBox const &);
+	RegionBox &operator=(RegionBox const &);
+
+private:
+	Vector m_corner1;
+	Vector m_corner2;
+};
+
+// ======================================================================
+
+#endif // INCLUDED_RegionBox_H
+
diff --git a/engine/server/library/serverGame/src/shared/region3d/RegionSphere.cpp b/engine/server/library/serverGame/src/shared/region3d/RegionSphere.cpp
new file mode 100644
index 00000000..786dabec
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/region3d/RegionSphere.cpp
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// RegionSphere.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/RegionSphere.h"
+
+// ======================================================================
+
+const float FOUR_THIRDS_PI = (4.0f*PI)/3.0f;
+
+// ======================================================================
+
+RegionSphere::RegionSphere(std::string const &name, Vector const &center, float radius, ScriptParams *regionScriptData) :
+	Region3d(name, Sphere(center, radius), regionScriptData)
+{
+}
+
+// ----------------------------------------------------------------------
+
+bool RegionSphere::containsPoint(Vector const &point) const
+{
+	return getContainingSphere().contains(point);
+}
+
+// ----------------------------------------------------------------------
+
+float RegionSphere::getVolume() const
+{
+	float radius = getContainingSphere().getRadius();
+	return FOUR_THIRDS_PI*radius*radius*radius;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/region3d/RegionSphere.h b/engine/server/library/serverGame/src/shared/region3d/RegionSphere.h
new file mode 100644
index 00000000..d65689cc
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/region3d/RegionSphere.h
@@ -0,0 +1,35 @@
+// ======================================================================
+//
+// RegionSphere.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_RegionSphere_H
+#define INCLUDED_RegionSphere_H
+
+// ======================================================================
+
+#include "Region3d.h"
+
+// ======================================================================
+
+class RegionSphere: public Region3d
+{
+public:
+	RegionSphere(std::string const &name, Vector const &center, float radius, ScriptParams *regionScriptData);
+
+	virtual bool containsPoint(Vector const &point) const;
+	virtual float getVolume() const;
+
+private:
+	RegionSphere();
+	RegionSphere(RegionSphere const &);
+	RegionSphere &operator=(RegionSphere const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_RegionSphere_H
+
diff --git a/engine/server/library/serverGame/src/shared/resource/SurveySystem.cpp b/engine/server/library/serverGame/src/shared/resource/SurveySystem.cpp
new file mode 100644
index 00000000..cac26554
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/resource/SurveySystem.cpp
@@ -0,0 +1,180 @@
+// ======================================================================
+//
+// SurveySystem.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/SurveySystem.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/PlanetObject.h"
+#include "serverGame/ResourcePoolObject.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerResourceClassObject.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ServerWorld.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFoundation/ExitChain.h"
+#include "swgSharedNetworkMessages/ResourceListForSurveyMessage.h"
+#include "swgSharedNetworkMessages/SurveyMessage.h"
+
+// ======================================================================
+
+SurveySystem::SurveySystem() :
+		Singleton2<SurveySystem>()
+{
+	ExitChain::add(&remove, "SurveySystem::remove");
+}
+
+// ----------------------------------------------------------------------
+
+SurveySystem::~SurveySystem()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void SurveySystem::requestResourceListForSurvey(const NetworkId &playerId, const NetworkId &surveyTool, const std::string &parentResourceClassName) const
+{
+	NonCriticalTaskQueue::getInstance().addTask(new TaskGetResourceList(playerId, surveyTool, parentResourceClassName));
+}
+
+// ----------------------------------------------------------------------
+
+void SurveySystem::requestSurvey(const NetworkId &playerId, const std::string &parentResourceClassName, const std::string &resourceTypeName, const Vector &location, int surveyRange, int numPoints) const
+{
+	NonCriticalTaskQueue::getInstance().addTask(new TaskSurvey(playerId, parentResourceClassName, resourceTypeName, location, surveyRange, numPoints));
+}
+
+// ======================================================================
+
+SurveySystem::TaskGetResourceList::TaskGetResourceList(const NetworkId &playerId, const NetworkId& surveyTool, const std::string &parentResourceClassName) :
+		m_playerId(playerId),
+		m_surveyTool(surveyTool),
+		m_parentResourceClassName(new std::string(parentResourceClassName))
+{
+}
+
+// ----------------------------------------------------------------------
+
+SurveySystem::TaskGetResourceList::~TaskGetResourceList()
+{
+	delete m_parentResourceClassName;
+	m_parentResourceClassName = 0;
+}
+
+// ----------------------------------------------------------------------
+
+bool SurveySystem::TaskGetResourceList::run()
+{
+	Client *client = GameServer::getInstance().getClient(m_playerId);
+	const ResourceClassObject *masterClass = ServerUniverse::getInstance().getResourceClassByName(*m_parentResourceClassName);
+	if (client && masterClass)
+	{
+		std::vector<ResourceTypeObject const *> results;
+		std::vector<ResourceListForSurveyMessage::DataItem> sendableResults;
+		ServerUniverse::getInstance().getCurrentPlanet()->getAvailableResourceList(results,*masterClass);
+		for (std::vector<ResourceTypeObject const *>::const_iterator i=results.begin(); i!=results.end(); ++i)
+		{
+			ResourceTypeObject const * const rto = *i;
+			NOT_NULL(rto);
+			if (rto)
+			{
+				ResourceListForSurveyMessage::DataItem d;
+				d.resourceName    = rto->getResourceName();
+				d.resourceId      = rto->getNetworkId();
+				d.parentClassName = rto->getParentClass().getResourceClassName();
+				
+				sendableResults.push_back(d);
+			}
+		}
+		ResourceListForSurveyMessage msg(sendableResults, masterClass->getResourceClassName(), m_surveyTool);
+		client->send(msg,true);
+	}
+	else
+	{
+		// TODO:  request isn't valid -- what do we do?
+	}
+
+	return true;
+}
+
+// ======================================================================
+
+SurveySystem::TaskSurvey::TaskSurvey(const NetworkId &playerId, const std::string &parentResourceClassName, const std::string &resourceTypeName, const Vector &location, int surveyRange, int numPoints) :
+		m_playerId                (playerId),
+		m_parentResourceClassName (new std::string(parentResourceClassName)),
+		m_resourceTypeName        (new std::string(resourceTypeName)),
+		m_location                (location),
+		m_surveyRange             (surveyRange),
+		m_numPoints               (numPoints)
+{
+	DEBUG_WARNING((m_numPoints/2)*2 == m_numPoints,("The number of points on a side should be an odd number when taking a survey, to guarantee that the point the player is standing on is included in the survey.\n"));
+}
+
+// ----------------------------------------------------------------------
+
+SurveySystem::TaskSurvey::~TaskSurvey()
+{
+	delete m_parentResourceClassName; //lint !e605 // deleting const pointer
+	delete m_resourceTypeName;        //lint !e605 // deleting const pointer
+	m_parentResourceClassName = 0;
+	m_resourceTypeName = 0;
+}
+
+// ----------------------------------------------------------------------
+
+bool SurveySystem::TaskSurvey::run()
+{
+	Client const *              client            = GameServer::getInstance().getClient(m_playerId);
+	ResourceTypeObject const *  typeObj           = ServerUniverse::getInstance().getResourceTypeByName(*m_resourceTypeName);
+	ResourceClassObject const * parentClass       = ServerUniverse::getInstance().getResourceClassByName(*m_parentResourceClassName);
+	ResourcePoolObject const *  pool              = typeObj ? typeObj->getPoolForCurrentPlanet() : NULL;
+	int                         distBetweenPoints = m_surveyRange / (m_numPoints - 1); // -1 is so that we get points at both ends
+	int                         radius            = m_surveyRange / 2;
+	
+	if (client && typeObj && parentClass && pool && (typeObj->isDerivedFrom(*parentClass)))
+	{
+		std::vector<SurveyMessage::DataItem> surveyData;
+		SurveyMessage::DataItem item;
+
+		//vectors to store the data that goes to the script trigger
+		std::vector<float>   xVals;
+		std::vector<float>   zVals;
+		std::vector<float>   efficiencyVals;
+		
+		for (item.m_location.x=m_location.x-radius; item.m_location.x<=m_location.x+radius; item.m_location.x+=distBetweenPoints)
+			for (item.m_location.z=m_location.z-radius; item.m_location.z<=m_location.z+radius; item.m_location.z+=distBetweenPoints)
+			{
+				item.m_efficiency = pool->getEfficiencyAtLocation(item.m_location.x, item.m_location.z);
+				surveyData.push_back(item);
+				DEBUG_REPORT_LOG(true,("Adding data item (%f,%f,%f) -- %f\n",item.m_location.x, item.m_location.y, item.m_location.z, item.m_efficiency));
+				xVals.push_back(item.m_location.x);
+				zVals.push_back(item.m_location.z);
+				efficiencyVals.push_back(item.m_efficiency);
+			}
+
+		//send the client the response data
+		SurveyMessage msg(surveyData);
+		client->send(msg,true);
+
+		//send the data to script trigger
+		ScriptParams params;
+		params.addParam(xVals);
+		params.addParam(zVals);
+		params.addParam(efficiencyVals);
+		ServerObject* so = ServerWorld::findObjectByNetworkId(m_playerId);
+		if (so)
+			IGNORE_RETURN(so->getScriptObject()->trigAllScripts(Scripting::TRIG_SURVEY_DATA_RECEIVED, params));
+	}
+	else
+	{
+		// TODO: Survey is not valid -- what to do?
+	}
+	return true;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/resource/SurveySystem.h b/engine/server/library/serverGame/src/shared/resource/SurveySystem.h
new file mode 100644
index 00000000..96182a4e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/resource/SurveySystem.h
@@ -0,0 +1,75 @@
+// ======================================================================
+//
+// SurveySystem.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_SurveySystem_H
+#define INCLUDED_SurveySystem_H
+
+// ======================================================================
+
+#include "serverGame/GameServer.h"
+#include "serverGame/NonCriticalTaskQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMath/Vector.h"
+#include "Singleton/Singleton2.h"
+
+// ======================================================================
+
+/** 
+ * Singleton to manage surveys.
+ */
+class SurveySystem : public Singleton2<SurveySystem>
+{
+  public:
+	void requestResourceListForSurvey  (const NetworkId &playerId, const NetworkId &surveyTool, const std::string &parentResourceClassName) const;
+	void requestSurvey                 (const NetworkId &playerId, const std::string &parentResourceClassName, const std::string &resourceTypeName, const Vector &location, int surveyRange, int numPoints) const;
+	
+  public:
+	SurveySystem                       ();
+	~SurveySystem                      ();
+	
+  private:
+	class TaskGetResourceList : public NonCriticalTaskQueue::TaskRequest
+	{
+	  public:
+		TaskGetResourceList            (const NetworkId &playerId, const NetworkId &surveyTool, const std::string &parentResourceClassName);
+		virtual ~TaskGetResourceList   ();
+		virtual bool run               ();
+
+	  private:
+		NetworkId                      m_playerId;
+		NetworkId                      m_surveyTool; 		
+		std::string *                  m_parentResourceClassName;
+
+	  private:
+		TaskGetResourceList            (const TaskGetResourceList&);
+		TaskGetResourceList & operator=(const TaskGetResourceList&);
+	};
+
+	class TaskSurvey : public NonCriticalTaskQueue::TaskRequest
+	{
+	  public:
+		TaskSurvey                     (const NetworkId &playerId, const std::string &parentResourceClassName, const std::string &resourceTypeName, const Vector &location, int surveyRange, int numPoints);
+		virtual ~TaskSurvey            ();
+		virtual bool run               ();
+
+	  private:
+		const NetworkId                m_playerId;
+		const std::string *            m_parentResourceClassName;
+		const std::string *            m_resourceTypeName;
+		Vector                         m_location;
+		int                            m_surveyRange;
+		int                            m_numPoints;
+
+	  private:
+		TaskSurvey                     (const TaskSurvey&);
+		TaskSurvey & operator=         (const TaskSurvey&);
+	};
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/AiPilotManager.cpp b/engine/server/library/serverGame/src/shared/space/AiPilotManager.cpp
new file mode 100644
index 00000000..31845c45
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/AiPilotManager.cpp
@@ -0,0 +1,241 @@
+// ======================================================================
+//
+// AiPilotManager.cpp
+//
+// Copyright 2004, Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiPilotManager.h"
+
+
+#include "serverGame/AiShipPilotData.h"
+#include "sharedFile/Iff.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/PointerDeleter.h"
+#include "sharedMath/Range.h"
+#include "sharedUtility/DataTable.h"
+
+#include <algorithm>
+#include <map>
+
+// ======================================================================
+
+namespace AiPilotManagerNamespace
+{
+	enum ColumnData
+	{
+		CD_property,
+		CD_isDegrees,
+		CD_useSkill,
+		CD_linearScale,
+		CD_novice,
+		CD_expert,
+		CD_autoAdjust
+	};
+
+	enum RowIndex
+	{
+		RI_weaponBaseFireRate,
+		RI_weaponMissileFireRate,
+		RI_weaponSelectionSkill,
+		RI_targetReactionTime,
+		RI_targetAimZoneUpdate,
+		RI_targetDesiredHitsPerSecond,
+		RI_targetBehind,
+		RI_targetCollisionCourse,
+		RI_hitsToEvadeBase,
+		RI_hitsDecayTimer,
+		RI_boosterUseMinimumRange,
+		RI_maneuverPaths,
+		RI_maneuverTimeMax,
+		RI_maneuverPathComplexity,
+		RI_minimumThrottle,
+		RI_count
+	};
+
+	struct AiPilotManagerData
+	{
+		AiPilotManagerData(RowIndex const rowIndex, const std::string & propertyName) :
+			m_row(rowIndex),
+			m_property(propertyName),
+			m_isDegrees(false),
+			m_useSkill(true),
+			m_linearScale(true),
+			m_skillRange(0.0f, 1.0f),
+			m_autoAdjust(false)
+		{
+		}
+
+		AiPilotManagerData() :
+			m_row(RI_count),
+			m_property("fix me"),
+			m_isDegrees(false),
+			m_useSkill(true),
+			m_linearScale(true),
+			m_skillRange(0.0f, 1.0f),
+			m_autoAdjust(false)
+		{
+		}
+
+		void convertRangeToRadians()
+		{
+			m_skillRange.set(convertDegreesToRadians(m_skillRange.getMin()), convertDegreesToRadians(m_skillRange.getMax()));
+		}
+
+		RowIndex m_row;
+		std::string m_property;
+		bool m_isDegrees;
+		bool m_useSkill;
+		bool m_linearScale;
+		Range m_skillRange;
+		bool m_autoAdjust;
+	};
+
+	#define DEFINEROW( rowName ) AiPilotManagerData(RI_##rowName, #rowName)
+
+	static AiPilotManagerData ms_pilotManagerData[RI_count] =
+	{
+		DEFINEROW(weaponBaseFireRate),
+		DEFINEROW(weaponMissileFireRate),
+		DEFINEROW(weaponSelectionSkill),
+		DEFINEROW(targetReactionTime),
+		DEFINEROW(targetAimZoneUpdate),
+		DEFINEROW(targetDesiredHitsPerSecond),
+		DEFINEROW(targetBehind),
+		DEFINEROW(targetCollisionCourse),
+		DEFINEROW(hitsToEvadeBase),
+		DEFINEROW(hitsDecayTimer),
+		DEFINEROW(boosterUseMinimumRange),
+		DEFINEROW(maneuverPaths),
+		DEFINEROW(maneuverTimeMax),
+		DEFINEROW(maneuverPathComplexity),
+		DEFINEROW(minimumThrottle)
+	};
+
+#define GETRANGE(pilot, pilotData, rowName) { \
+	RowIndex row = static_cast<RowIndex>(RI_##rowName); \
+	DEBUG_FATAL(ms_pilotManagerData[row].m_property != #rowName, ("AiPilotManager - GETRANGE( %s != %s)", ms_pilotManagerData[row].m_property.c_str(), #rowName)); \
+	pilotData.m_##rowName = (ms_pilotManagerData[row].m_skillRange.linearInterpolate(ms_pilotManagerData[row].m_useSkill ? pilot.m_skill : pilot.m_aggression)); }
+	
+	char const * const cs_pilotTypeFileName = "datatables/ship/pilotmanager.iff";
+
+	bool ms_pilotManagerInstalled = false;
+}
+
+using namespace AiPilotManagerNamespace;
+
+// ----------------------------------------------------------------------
+
+AiPilotManager::AiPilotManager() :
+m_weaponBaseFireRate(1.0f),
+m_weaponMissileFireRate(1.0f),
+m_weaponSelectionSkill(1.0f),
+m_targetReactionTime(0.2f),
+m_targetAimZoneUpdate(1.0f),
+m_targetDesiredHitsPerSecond(1.0f),
+m_targetBehind(0.2f),
+m_targetCollisionCourse(0.2f),
+m_hitsToEvadeBase(5.0f),
+m_hitsDecayTimer(25.0f),
+m_boosterUseMinimumRange(50.0f),
+m_maneuverPaths(2),
+m_maneuverTimeMax(30.0f),
+m_maneuverPathComplexity(1.0f),
+m_minimumThrottle(0.5f)
+{
+}
+
+// ----------------------------------------------------------------------
+
+AiPilotManager::~AiPilotManager()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void AiPilotManager::install()
+{
+	DEBUG_FATAL(ms_pilotManagerInstalled, ("AiPilotManager::install - already installed"));
+	ExitChain::add(AiPilotManager::remove, "AiPilotManager::remove");
+
+	//-- Load the pilot type data table
+	{
+		Iff iff;
+		if (iff.open(cs_pilotTypeFileName, true))
+		{
+			ms_pilotManagerInstalled = true;
+
+			DataTable dataTable;
+			dataTable.load(iff);
+
+			int const numberOfRows = dataTable.getNumRows();
+			for (int row = 0; row < numberOfRows; ++row)
+			{
+				AiPilotManagerData & managedData = ms_pilotManagerData[row];
+				
+				// Verify the property names.
+#ifdef _DEBUG
+				std::string const & property = dataTable.getStringValue(static_cast<int>(CD_property), row);
+				DEBUG_FATAL(managedData.m_property != property, ("AiPilotManager::install: Table rows in [%s] do not match at row %d. I expected %s and received %s.", cs_pilotTypeFileName, row, managedData.m_property.c_str(), property.c_str()));
+#endif
+				
+				// Get the skill range.
+				float const noviceSkillValue = dataTable.getFloatValue(static_cast<int>(CD_novice), row);
+				float const expertSkillValue = dataTable.getFloatValue(static_cast<int>(CD_expert), row);
+				managedData.m_skillRange.set(noviceSkillValue, expertSkillValue);
+				
+				// Check to see if we should auto adjust. (not used)
+				managedData.m_autoAdjust = dataTable.getIntValue(static_cast<int>(CD_autoAdjust), row) > 0;
+				
+				// Should we use a linear or non-linear scale.
+				managedData.m_linearScale = dataTable.getIntValue(static_cast<int>(CD_linearScale), row) > 0;
+				
+				// Should we use the skill percentage or the aggression.
+				managedData.m_useSkill = dataTable.getIntValue(static_cast<int>(CD_useSkill), row) > 0;
+				
+				// Should we use the skill percentage or the aggression.
+				managedData.m_isDegrees = dataTable.getIntValue(static_cast<int>(CD_isDegrees), row) > 0;
+				
+				if (managedData.m_isDegrees)
+				{
+					managedData.convertRangeToRadians();
+				}
+			}
+		}
+		else
+			DEBUG_WARNING(true, ("AiPilotManager::install: could not open file %s", cs_pilotTypeFileName));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void AiPilotManager::remove()
+{
+	ms_pilotManagerInstalled = false;
+}
+
+// ----------------------------------------------------------------------
+
+void AiPilotManager::getPilotData(AiShipPilotData const & pilot, AiPilotManager & pilotManagerData)
+{
+	GETRANGE(pilot, pilotManagerData, weaponBaseFireRate);
+	GETRANGE(pilot, pilotManagerData, weaponMissileFireRate);
+	GETRANGE(pilot, pilotManagerData, weaponSelectionSkill);
+	GETRANGE(pilot, pilotManagerData, targetReactionTime);
+	GETRANGE(pilot, pilotManagerData, targetAimZoneUpdate);
+	GETRANGE(pilot, pilotManagerData, targetDesiredHitsPerSecond);
+	GETRANGE(pilot, pilotManagerData, targetBehind);
+	GETRANGE(pilot, pilotManagerData, targetCollisionCourse);
+	GETRANGE(pilot, pilotManagerData, hitsToEvadeBase);
+	GETRANGE(pilot, pilotManagerData, hitsDecayTimer);
+	GETRANGE(pilot, pilotManagerData, boosterUseMinimumRange);
+	GETRANGE(pilot, pilotManagerData, maneuverPaths);
+	GETRANGE(pilot, pilotManagerData, maneuverTimeMax);
+	GETRANGE(pilot, pilotManagerData, maneuverPathComplexity);
+	GETRANGE(pilot, pilotManagerData, minimumThrottle);
+}
+
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/AiPilotManager.h b/engine/server/library/serverGame/src/shared/space/AiPilotManager.h
new file mode 100644
index 00000000..954113d4
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/AiPilotManager.h
@@ -0,0 +1,48 @@
+// ======================================================================
+//
+// AiPilotManager.h
+//
+// copyright 2004, sony online entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AiPilotManager_H
+#define INCLUDED_AiPilotManager_H
+
+// ======================================================================
+
+struct AiShipPilotData;
+
+class AiPilotManager
+{
+public:
+
+	AiPilotManager();
+	~AiPilotManager();
+
+	static void install();
+	static void remove();
+
+
+	static void getPilotData(AiShipPilotData const & pilot, AiPilotManager & pilotData);
+
+	float m_weaponBaseFireRate;
+	float m_weaponMissileFireRate;
+	float m_weaponSelectionSkill;
+	float m_targetReactionTime;
+	float m_targetAimZoneUpdate;
+	float m_targetDesiredHitsPerSecond;
+	float m_targetBehind; // RLS - this is converted to radians as an optimization.
+	float m_targetCollisionCourse; // RLS - this is converted to radians as an optimization.
+	float m_hitsToEvadeBase;
+	float m_hitsDecayTimer;
+	float m_boosterUseMinimumRange;
+	float m_maneuverPaths;
+	float m_maneuverTimeMax;
+	float m_maneuverPathComplexity;
+   	float m_minimumThrottle;
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/AiShipPilotData.cpp b/engine/server/library/serverGame/src/shared/space/AiShipPilotData.cpp
new file mode 100644
index 00000000..a37c4975
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/AiShipPilotData.cpp
@@ -0,0 +1,197 @@
+// ======================================================================
+//
+// AiShipPilotData.cpp
+// asommers
+//
+// copyright 2003, sony online entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/AiShipPilotData.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "sharedFile/Iff.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/PointerDeleter.h"
+#include "sharedLog/Log.h"
+#include "sharedUtility/DataTable.h"
+
+#include <algorithm>
+#include <map>
+
+// ======================================================================
+
+namespace AiShipPilotDataNamespace
+{
+	char const * const cs_pilotTypeFileName = "datatables/ship/pilottype.iff";
+	std::string const cs_defaultPilotType = "default";
+
+	typedef std::map<std::string, AiShipPilotData *> PilotTypePilotDataMap;
+	PilotTypePilotDataMap ms_pilotTypePilotDataMap;
+
+	AiShipPilotData ms_defaultPilotData;
+}
+
+using namespace AiShipPilotDataNamespace;
+
+// ----------------------------------------------------------------------
+
+AiShipPilotData::AiShipPilotData() :
+	m_name(),
+	m_skill(0.0f),
+	m_aggression(0.5f),
+	m_leashRadius(500.0f),
+	m_aggroRadius(200.0f),
+	m_nonCombatMaxSpeedPercent(0.5f),
+	m_projectileFireDelay(0.0f),
+	m_projectileFireAngle(0.0),
+	m_projectileMissAngle(0.0f),
+	m_projectileMissChance(0.0f),
+	m_countermeasureReactionTime(2.0f),
+	m_turretMissAngle(0.0f),
+	m_turretMissChance(.5f),
+	m_bomberMissilesPerBombingRun(1),
+	m_fighterMissileLockOnTime(0.0f),
+	m_fighterMissileLockOnAngle(0.0f),
+	m_fighterMissileChanceToFirePercent(1.0f),
+	m_fighterMissileFireDelay(0.0f),
+	m_fighterChaseMaxTime(0.0f),
+	m_fighterChaseMinThrottle(0.0f),
+	m_fighterChaseSeperationTime(0.0f),
+	m_fighterChaseMaxShots(0),
+	m_fighterChaseMaxOnTailTime(0.0f),
+	m_fighterEvadeMaxTime(0.0f),
+	m_fighterEvadePositionUpdateDelay(0.0f),
+	m_fighterEvadeAngle(0.0f)
+{
+}
+
+// ----------------------------------------------------------------------
+
+AiShipPilotData::~AiShipPilotData()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipPilotData::install()
+{
+	DEBUG_FATAL(!ms_pilotTypePilotDataMap.empty(), ("AiShipPilotData::install - already installed"));
+	ExitChain::add(AiShipPilotData::remove, "AiShipPilotDataNamespace::remove");
+
+	ms_pilotTypePilotDataMap.clear();
+	reload();
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipPilotData::remove()
+{
+	//-- Delete the pilot type to pilot data map
+	std::for_each(ms_pilotTypePilotDataMap.begin(), ms_pilotTypePilotDataMap.end(), PointerDeleterPairSecond());
+	ms_pilotTypePilotDataMap.clear();
+}
+
+// ----------------------------------------------------------------------
+
+void AiShipPilotData::reload()
+{
+	//-- Load the pilot type data table, do not call ms_pilotTypePilotDataMap.clear() in this function, it breaks the reload.
+
+	Iff iff;
+	if (iff.open(cs_pilotTypeFileName, true))
+	{
+		DataTable dataTable;
+		dataTable.load(iff);
+
+		int const numberOfRows = dataTable.getNumRows();
+		for (int row = 0; row < numberOfRows; ++row)
+		{
+			std::string const name = dataTable.getStringValue("name", row);
+
+			if (ms_pilotTypePilotDataMap.find(name) == ms_pilotTypePilotDataMap.end())
+			{
+				AiShipPilotData * const pilotData = new AiShipPilotData;
+
+				std::pair<PilotTypePilotDataMap::iterator, bool> result = ms_pilotTypePilotDataMap.insert(std::make_pair(name, pilotData));
+
+				DEBUG_FATAL(!result.second, ("AiShipPilotData::reload: Failed to insert %s", name.c_str()));
+				UNREF(result);
+			}
+
+			PilotTypePilotDataMap::iterator iterPilotData = ms_pilotTypePilotDataMap.find(name);
+
+			if (iterPilotData != ms_pilotTypePilotDataMap.end())
+			{
+				AiShipPilotData & pilotData = *NON_NULL(iterPilotData->second);
+
+				pilotData.m_name = name;
+				pilotData.m_skill = dataTable.getFloatValue("skill", row);
+				pilotData.m_aggression = dataTable.getFloatValue("aggression", row);
+				pilotData.m_leashRadius = dataTable.getFloatValue("leashRadius", row);
+				pilotData.m_aggroRadius = dataTable.getFloatValue("aggroRadius", row);
+				pilotData.m_nonCombatMaxSpeedPercent = std::max(0.0f, dataTable.getFloatValue("nonCombatMaxSpeedPercent", row));
+				pilotData.m_projectileFireDelay = std::max(0.1f, dataTable.getFloatValue("projectileFireDelay", row));
+				pilotData.m_projectileFireAngle = convertDegreesToRadians(clamp(0.0f, dataTable.getFloatValue("projectileFireAngleDegrees", row), 360.0f));
+				pilotData.m_projectileMissAngle = tan(convertDegreesToRadians(clamp(0.0f, dataTable.getFloatValue("projectileMissAngleDegrees", row), 10.0f)));
+				pilotData.m_projectileMissChance = std::max(0.0f, dataTable.getFloatValue("projectileMissChance", row));
+				pilotData.m_countermeasureReactionTime = dataTable.getFloatValue("countermeasureReactionTime", row);
+				pilotData.m_turretMissAngle = tan(convertDegreesToRadians(clamp(0.0f, dataTable.getFloatValue("turretMissAngleDegrees", row), 20.0f)));
+				pilotData.m_turretMissChance = dataTable.getFloatValue("turretMissChance", row);
+				pilotData.m_bomberMissilesPerBombingRun = dataTable.getIntValue("bomberMissilesPerBombingRun", row);
+				pilotData.m_fighterMissileLockOnTime = std::max(0.0f, dataTable.getFloatValue("fighterMissileLockOnTime", row));
+				pilotData.m_fighterMissileLockOnAngle = convertDegreesToRadians(clamp(1.0f, dataTable.getFloatValue("fighterMissileLockOnAngleDegrees", row), 360.0f));
+				pilotData.m_fighterMissileChanceToFirePercent = clamp(0.0f, dataTable.getFloatValue("fighterMissileChanceToFirePercent", row), 1.0f);
+				pilotData.m_fighterMissileFireDelay = std::max(1.0f, dataTable.getFloatValue("fighterMissileFireDelay", row));
+				pilotData.m_fighterChaseMaxTime = std::max(5.0f, dataTable.getFloatValue("fighterChaseMaxTime", row));
+				pilotData.m_fighterChaseMinThrottle = clamp(0.0f, dataTable.getFloatValue("fighterChaseMinThrottle", row), 1.0f);
+				pilotData.m_fighterChaseSeperationTime = std::max(0.0f, dataTable.getFloatValue("fighterChaseSeperationTime", row));
+				pilotData.m_fighterChaseMaxShots = std::max(1, dataTable.getIntValue("fighterChaseMaxShots", row));
+				pilotData.m_fighterChaseMaxOnTailTime = std::max(0.0f, dataTable.getFloatValue("fighterChaseMaxOnTailTime", row));
+				pilotData.m_fighterEvadeMaxTime = std::max(5.0f, dataTable.getFloatValue("fighterEvadeMaxTime", row));
+				pilotData.m_fighterEvadePositionUpdateDelay = std::max(0.0f, dataTable.getFloatValue("fighterEvadePositionUpdateDelay", row));
+				pilotData.m_fighterEvadeAngle = convertDegreesToRadians(clamp(0.0f, dataTable.getFloatValue("fighterEvadeAngleDegrees", row), 360.0f));
+
+				DEBUG_FATAL(!WithinRangeInclusiveInclusive(0.0f, pilotData.m_skill, 1.0f), ("AiShipPilotData::m_skill (%.2f) is out of range (0 to 1).", pilotData.m_skill));
+				DEBUG_FATAL(!WithinRangeInclusiveInclusive(0.0f, pilotData.m_aggression, 1.0f), ("AiShipPilotData::m_aggression (%.2f) is out of range (0 to 1).", pilotData.m_aggression));
+			}
+		}
+
+		//-- Extract the default pilot data
+		PilotTypePilotDataMap::iterator iter = ms_pilotTypePilotDataMap.find(cs_defaultPilotType);
+		if (iter != ms_pilotTypePilotDataMap.end())
+			ms_defaultPilotData = *iter->second;
+		else
+			DEBUG_WARNING(true, ("AiShipPilotData::install: file %s does not specify pilotType %s", cs_pilotTypeFileName, cs_defaultPilotType.c_str()));
+	}
+	else
+		DEBUG_WARNING(true, ("AiShipPilotData::install: could not open file %s", cs_pilotTypeFileName));
+}
+
+// ----------------------------------------------------------------------
+
+AiShipPilotData const & AiShipPilotData::getPilotData(std::string const & pilotType)
+{
+	//-- Find the pilot data corresponding to the pilot type
+	PilotTypePilotDataMap::iterator iter = ms_pilotTypePilotDataMap.find(pilotType);
+	if (iter != ms_pilotTypePilotDataMap.end())
+	{
+		return *iter->second;
+	}
+	else
+	{
+		//-- Use default pilot data if pilot type was not found
+		DEBUG_WARNING(true, ("Could not find pilotType %s in %s, using default", pilotType.c_str(), cs_pilotTypeFileName));
+		return ms_defaultPilotData;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+AiShipPilotData const & AiShipPilotData::getDefaultPilotData()
+{
+	return ms_defaultPilotData;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/AiShipPilotData.h b/engine/server/library/serverGame/src/shared/space/AiShipPilotData.h
new file mode 100644
index 00000000..4890d6b2
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/AiShipPilotData.h
@@ -0,0 +1,61 @@
+// ======================================================================
+//
+// AiShipPilotData.h
+// asommers
+//
+// copyright 2003, sony online entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AiShipPilotData_H
+#define INCLUDED_AiShipPilotData_H
+
+// ======================================================================
+
+struct AiShipPilotData
+{
+public:
+
+	AiShipPilotData();
+	~AiShipPilotData();
+
+	static void install();
+	static void remove();
+	static void reload();
+
+	static AiShipPilotData const & getPilotData(std::string const & pilotType);
+	static AiShipPilotData const & getDefaultPilotData();
+
+public:
+
+	std::string m_name;
+	float m_skill;
+	float m_aggression;
+	float m_leashRadius;
+	float m_aggroRadius;
+	float m_nonCombatMaxSpeedPercent;
+	float m_projectileFireDelay;
+	float m_projectileFireAngle;
+	float m_projectileMissAngle;
+	float m_projectileMissChance;
+	float m_countermeasureReactionTime;
+	float m_turretMissAngle;
+	float m_turretMissChance;
+	int m_bomberMissilesPerBombingRun;
+	float m_fighterMissileLockOnTime;
+	float m_fighterMissileLockOnAngle;
+	float m_fighterMissileChanceToFirePercent;
+	float m_fighterMissileFireDelay;
+	float m_fighterChaseMaxTime;
+	float m_fighterChaseMinThrottle;
+	float m_fighterChaseSeperationTime;
+	int m_fighterChaseMaxShots;
+	float m_fighterChaseMaxOnTailTime;
+	float m_fighterEvadeMaxTime;
+	float m_fighterEvadePositionUpdateDelay;
+	float m_fighterEvadeAngle;
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/MiningAsteroidController.cpp b/engine/server/library/serverGame/src/shared/space/MiningAsteroidController.cpp
new file mode 100644
index 00000000..928bf8b6
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/MiningAsteroidController.cpp
@@ -0,0 +1,121 @@
+// ======================================================================
+//
+// MiningAsteroidController.cpp
+// jwatson
+//
+// copyright 2005, sony online entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/MiningAsteroidController.h"
+
+#include "serverGame/ShipObject.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedGame/ShipDynamicsModel.h"
+#include "sharedObject/AlterResult.h"
+
+//----------------------------------------------------------------------
+
+namespace MiningAsteroidControllerNamespace
+{
+	static const float s_dynamicLifeSpanSecs = 60.0f;
+}
+
+using namespace MiningAsteroidControllerNamespace;
+
+//----------------------------------------------------------------------
+
+MiningAsteroidController::MiningAsteroidController(ShipObject * const owner) :
+ShipController(owner),
+m_lifeTimeRemainingSecs(s_dynamicLifeSpanSecs),
+m_lastNumberOfHits(0)
+{
+	
+}
+
+//----------------------------------------------------------------------
+
+MiningAsteroidController::~MiningAsteroidController()
+{
+}
+
+//----------------------------------------------------------------------
+
+float MiningAsteroidController::realAlter(float elapsedTime)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("MiningAsteroidController::realAlter");
+
+	ShipObject * const shipOwner = NON_NULL(safe_cast<ShipObject *>(getOwner()));
+	int const got = shipOwner->getGameObjectType();
+
+	bool killIt = false;
+
+	if (got == SharedObjectTemplate::GOT_ship_mining_asteroid_dynamic)
+	{		
+		//-- we've been shot lately, reset our timer
+		if (m_lastNumberOfHits != shipOwner->getNumberOfHits())
+		{
+			m_lifeTimeRemainingSecs = s_dynamicLifeSpanSecs;
+			m_lastNumberOfHits = shipOwner->getNumberOfHits();
+		}
+		else
+			m_lifeTimeRemainingSecs -= elapsedTime;
+
+		Vector const & pos_w = shipOwner->getPosition_p();
+
+		//-- timeout
+		if (m_lifeTimeRemainingSecs <= 0.0f)
+			killIt = true;
+		//-- nobody is observing it
+		else if (shipOwner->getObservers().empty())
+			killIt = true;
+		else
+		{
+			m_shipDynamicsModel->setRollRate(1.0f);
+			
+			Vector const & velocity_w = m_shipDynamicsModel->getVelocity();
+			shipOwner->lookAt_p(pos_w + velocity_w);
+			shipOwner->move_p(velocity_w * elapsedTime);
+			shipOwner->roll_o(elapsedTime);
+			
+			m_shipDynamicsModel->setTransform(shipOwner->getTransform_o2p());
+		}
+	}
+
+	float alterResult = ShipController::realAlter(elapsedTime);
+	AlterResult::incorporateAlterResult(alterResult, killIt ? AlterResult::cms_kill : AlterResult::cms_alterNextFrame);
+	return alterResult;
+}
+
+//----------------------------------------------------------------------
+
+bool MiningAsteroidController::shouldCheckForEnemies() const
+{
+	return false;
+}
+
+//----------------------------------------------------------------------
+
+void MiningAsteroidController::experiencedCollision()
+{
+}
+
+//----------------------------------------------------------------------
+
+void MiningAsteroidController::setVelocity_w(Vector const & velocity_w)
+{
+	m_shipDynamicsModel->setVelocity(velocity_w);
+}
+
+//----------------------------------------------------------------------
+
+Vector const & MiningAsteroidController::getVelocity_w() const
+{
+	return m_shipDynamicsModel->getVelocity();
+}
+
+//----------------------------------------------------------------------
+
+
+
diff --git a/engine/server/library/serverGame/src/shared/space/MiningAsteroidController.h b/engine/server/library/serverGame/src/shared/space/MiningAsteroidController.h
new file mode 100644
index 00000000..1629012b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/MiningAsteroidController.h
@@ -0,0 +1,46 @@
+//======================================================================
+//
+// MiningAsteroidController.h
+// copyright (c) 2005 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MiningAsteroidController_H
+#define INCLUDED_MiningAsteroidController_H
+
+//======================================================================
+
+#include "serverGame/ShipController.h"
+
+//----------------------------------------------------------------------
+
+class MiningAsteroidController : public ShipController
+{
+public:
+
+	explicit MiningAsteroidController(ShipObject * const owner);
+	virtual ~MiningAsteroidController();
+	virtual bool shouldCheckForEnemies() const;
+
+	void setVelocity_w(Vector const & velocity_w);
+	Vector const & getVelocity_w() const;
+	
+private:
+	                         MiningAsteroidController ();
+	                         MiningAsteroidController (const MiningAsteroidController & rhs);
+	MiningAsteroidController & operator= (const MiningAsteroidController & rhs);
+
+protected:
+
+	virtual float realAlter(float elapsedTime);
+	virtual void experiencedCollision();
+
+private:
+
+	float m_lifeTimeRemainingSecs;
+	int m_lastNumberOfHits;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/Missile.cpp b/engine/server/library/serverGame/src/shared/space/Missile.cpp
new file mode 100644
index 00000000..bd4400a5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/Missile.cpp
@@ -0,0 +1,369 @@
+// ======================================================================
+//
+// Missile.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/Missile.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/Chat.h"
+#include "serverGame/ConnectionServerConnection.h"
+#include "serverGame/MissileManager.h"
+#include "serverGame/ObjectIdManager.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ShipObject.h"
+#include "serverNetworkMessages/GameConnectionServerMessages.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedCollision/Extent.h"
+#include "sharedCollision/SpatialDatabase.h"
+#include "sharedMath/MultiShape.h"
+#include "sharedNetworkMessages/CreateMissileMessage.h"
+#include "sharedNetworkMessages/UpdateMissileMessage.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/NetworkIdManager.h"
+
+// ======================================================================
+
+int Missile::ms_nextMissileId=1;
+
+// ======================================================================
+
+Missile::Missile(const NetworkId &sourcePlayer, const NetworkId &sourceShip, int weaponIndex, int missileType, const NetworkId &target, ShipChassisSlotType::Type targetedComponent) :
+		m_missileId(ms_nextMissileId++),
+		m_sourceShip(sourceShip),
+		m_sourcePlayer(sourcePlayer),
+		m_targetShip(target),
+		m_impactTime(0),
+		m_state(MS_None),
+		m_weaponIndex(weaponIndex),
+		m_missileType(missileType),
+		m_targetedComponent(targetedComponent),
+		m_fireTime(0)
+{
+}
+
+// ----------------------------------------------------------------------
+
+Missile::~Missile()
+{
+}
+
+// ----------------------------------------------------------------------
+
+bool Missile::fire()
+{
+	if (m_state != MS_None)
+		return false;
+
+	m_state=MS_Launched;
+	
+	ServerObject *sourceServerObject = getSourceServerObject();
+	ServerObject *targetServerObject = getTargetServerObject();
+
+	if (sourceServerObject && targetServerObject)
+	{
+		Vector sourceLocation = sourceServerObject->getPosition_w();
+		Vector targetLocation = targetServerObject->getPosition_w();
+
+		float distance = (sourceLocation - targetLocation).magnitude();
+
+		// check cone of fire
+		if(distance > 0.0f)
+		{
+
+			Vector firingAngle = targetLocation - sourceLocation;
+
+			Vector shipForwardEnd = sourceLocation + (sourceServerObject->getObjectFrameK_w() * 100.0f); // Arbitrarily scale this vector out a few meters.
+			Vector shipForwardVec = shipForwardEnd - sourceLocation;
+
+			float dotProd = shipForwardVec.dot(firingAngle);
+			float shipForwardLength = shipForwardVec.magnitude();
+			float firingAngleLength = firingAngle.magnitude();
+
+			float finalAngle = acos(dotProd / (shipForwardLength * firingAngleLength));
+
+			float const firingRadius = convertDegreesToRadians(MissileManager::getInstance().getTargetAcquisitionAngle(m_missileType));
+
+			if(finalAngle > firingRadius)
+			{
+				// People trying to mess with the shared data table, fail this launch.
+				m_state = MS_Miss;
+				return false;
+			}
+		}
+
+
+		// Compute time  TODO:  adjustments based on quality of missile
+		float totalTime = distance / MissileManager::getInstance().getSpeedByMissileType(m_missileType);
+		totalTime = std::max(totalTime, MissileManager::getInstance().getMinTimeByMissileType(m_missileType));
+
+		// tell clients about the missile
+		CreateMissileMessage const createMissileMessage(m_missileId, m_sourceShip, m_targetShip, sourceLocation, targetLocation, static_cast<int>(totalTime), m_missileType, m_weaponIndex, m_targetedComponent);
+		sendToAllObservers(createMissileMessage);
+
+		// check for out-of-range
+		if (totalTime > MissileManager::getInstance().getMaxTimeByMissileType(m_missileType))
+		{
+			totalTime = MissileManager::getInstance().getMaxTimeByMissileType(m_missileType);
+			m_state=MS_Miss;
+		}
+
+		// check for obstacles that would block getting a lock
+		{
+			Capsule const missileCapsule_w(sourceLocation, targetLocation, 1.0f);
+			ColliderList collidedWith;
+			CollisionWorld::getDatabase()->queryFor(static_cast<int>(SpatialDatabase::Q_Physicals), CellProperty::getWorldCellProperty(), true, missileCapsule_w, collidedWith);
+			for (ColliderList::const_iterator i = collidedWith.begin(); i != collidedWith.end(); ++i)
+			{
+				Object const * const collider = &(NON_NULL(*i)->getOwner());
+				if (collider != sourceServerObject && collider != targetServerObject)
+					destroy();
+			}
+		}
+				
+		// Schedule the missile
+		m_fireTime=ServerClock::getInstance().getGameTimeSeconds();
+		m_impactTime=m_fireTime + static_cast<uint32>(totalTime);
+		MissileManager::getInstance().scheduleMissile(m_missileId, m_impactTime);
+
+		// Run the missile script on the source ship, to do die rolls for success, etc.
+		// This script may call functions to make the missile lock, miss, etc.  If it does
+		// nothing, the missile will continue towards the target but can still be countermeasured.
+		if (m_state==MS_Launched)
+		{
+			ScriptParams params;
+			params.addParam(m_missileId);
+			params.addParam(m_weaponIndex);
+			params.addParam(static_cast<int>(m_missileType));
+			params.addParam(m_sourcePlayer);
+			params.addParam(m_targetShip);
+			params.addParam(m_targetedComponent);
+			IGNORE_RETURN (sourceServerObject->getScriptObject()->trigAllScripts(Scripting::TRIG_SHIP_FIRED_MISSILE, params));
+		}
+
+		// Let the ship object react to the missile
+		if (m_state==MS_Launched) //lint !e774 (not always true because the triggers above could change it)
+		{
+			if (targetServerObject->asShipObject())
+				targetServerObject->asShipObject()->onTargetedByMissile(m_missileId);
+		}
+		
+		// Warn the target about the missile, so that AIs can react, etc.
+		if (m_state==MS_Launched) //lint !e774 (not always true because the triggers above could change it)
+		{
+			ScriptParams params;
+			params.addParam(m_missileId);
+			params.addParam(m_weaponIndex);
+			params.addParam(static_cast<int>(m_missileType));
+			params.addParam(m_sourceShip);
+			params.addParam(m_sourcePlayer);
+			params.addParam(m_targetedComponent);
+			IGNORE_RETURN (targetServerObject->getScriptObject()->trigAllScripts(Scripting::TRIG_SHIP_TARGETED_BY_MISSILE, params));
+		}
+	}
+	else
+		WARNING_STRICT_FATAL(true,("Missile %i was fired from object %s to object %s, but one or both of these objects did not exist at the time the missile was fired.  Both of these objects should exist when the missile is fired (although they can go away later).",m_missileId, m_sourceShip.getValueString().c_str(), m_targetShip.getValueString().c_str()));
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void Missile::impactTarget()
+{
+	ServerObject * const source = getSourceServerObject();
+	ServerObject * const target = safe_cast<ServerObject *>(NetworkIdManager::getObjectById(m_targetShip));
+	if (source && target && !target->getKill())
+	{
+		ShipObject * const sourceShip = source->asShipObject();
+		ShipObject * const targetShip = target->asShipObject();
+		if (sourceShip && targetShip && Pvp::canAttack(*sourceShip, *targetShip))
+		{
+			ScriptParams params;
+			params.addParam(m_sourceShip);
+			params.addParam(m_weaponIndex);
+			params.addParam(true);
+			params.addParam(static_cast<int>(m_missileType));
+			params.addParam(m_targetedComponent);
+			params.addParam(false);
+			params.addParam(0.0f);
+			params.addParam(0.0f);
+			params.addParam(0.0f);
+			IGNORE_RETURN(target->getScriptObject()->trigAllScripts(Scripting::TRIG_SHIP_HIT, params));
+		}
+	}
+
+	// Notify the clients
+	UpdateMissileMessage const updateMissileMessage(m_missileId, NetworkId::cms_invalid, 0, UpdateMissileMessage::UT_hit);
+	sendToAllObservers(updateMissileMessage);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Flag the missile for destruction due to miss/failed skill check/etc. and notify the clients.
+ */
+void Missile::destroy()
+{
+	UpdateMissileMessage const updateMissileMessage(m_missileId, NetworkId::cms_invalid, 0, UpdateMissileMessage::UT_miss);
+	sendToAllObservers(updateMissileMessage);
+	m_state=MS_Kill;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Countermeasure a missile and notify the clients.
+ * @param ship The ship that launched the countermeasure.  If cms_invalid, the
+ * ship targetted by the missile is assumed.
+ */
+void Missile::countermeasure(NetworkId const & ship, int const countermeasureType)
+{
+	UpdateMissileMessage const updateMissileMessage(m_missileId, ship!=NetworkId::cms_invalid ? ship : static_cast<NetworkId>(m_targetShip), countermeasureType, UpdateMissileMessage::UT_countermeasured);
+	sendToAllObservers(updateMissileMessage);
+	m_state=MS_Kill;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Launch a countermeasure that does not succeed at destroying a missile.
+ */
+void Missile::launchFailedCountermeasure(ServerObject const & ship, int const missileId, int const countermeasureType)
+{
+	UpdateMissileMessage const updateMissileMessage(missileId, ship.getNetworkId(), countermeasureType, UpdateMissileMessage::UT_countermeasureFailed);
+	sendToAllObservers(ship, updateMissileMessage);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Update the missiles status as needed.
+ *
+ * If the missile will need another update, it should call
+ * MissileManager::scheduleUpdate().  Note that the missile might get
+ * another update() called before that time in some circumstances, so it should
+ * always check the effectiveTime.
+ *
+ * @param effectiveTime The time (ServerClock) for the purpose of the update.
+ * @return true if the missile is still active, false if it should be deleted.
+ */
+bool Missile::update(uint32 effectiveTime)
+{
+	bool result=true;
+	
+	switch (m_state)
+	{
+		case MS_None:
+		{
+			break;
+		}
+ 
+		case MS_Launched:
+		{
+			if (effectiveTime >= m_impactTime)
+			{
+				impactTarget();
+				result=false;
+			}
+			break;
+		}
+
+		case MS_Miss:
+		{
+			if (effectiveTime >= m_impactTime)
+			{
+				destroy();
+				result=false;
+			}
+			break;
+		}
+		
+		case MS_Kill:
+		{
+			// missile is already dead
+			result=false;
+		}
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+ServerObject * Missile::getSourceServerObject() const
+{
+	Object *sourceObject = m_sourceShip.getObject();
+	if (sourceObject)
+		return sourceObject->asServerObject();
+	else
+		return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+ServerObject * Missile::getTargetServerObject() const
+{
+	Object *targetObject = m_targetShip.getObject();
+	if (targetObject)
+		return targetObject->asServerObject();
+	else
+		return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Send a network message to all clients observing this missile
+ */
+void Missile::sendToAllObservers(GameNetworkMessage const & message) const
+{
+	ServerObject * const targetAsServerObject = getTargetServerObject();
+	if (targetAsServerObject)
+	{
+		sendToAllObservers(*targetAsServerObject, message);
+	}
+}
+	
+// ----------------------------------------------------------------------
+
+/**
+ * Send a network message to all clients observing an object
+ */
+void Missile::sendToAllObservers(ServerObject const & object, GameNetworkMessage const & message)
+{
+	typedef std::map<ConnectionServerConnection *, std::vector<NetworkId> > DistributionList;
+	DistributionList distributionList;
+
+	{
+		typedef std::set<Client *> ObserverList;
+		ObserverList const & observers = object.getObservers();
+		for (ObserverList::const_iterator iter = observers.begin(); iter != observers.end(); ++iter)
+		{
+			NetworkId const & characterObjectId = (*iter)->getCharacterObjectId();
+			distributionList[(*iter)->getConnection()].push_back(characterObjectId);
+		}
+	}
+		
+	for (DistributionList::const_iterator iter = distributionList.begin(); iter != distributionList.end(); ++iter)
+	{
+		GameClientMessage const gameClientMessage(iter->second, true, message);
+		iter->first->send(gameClientMessage, true);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+int Missile::getTimeSinceFired() const
+{
+	return static_cast<int>(ServerClock::getInstance().getGameTimeSeconds() - m_fireTime);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/Missile.h b/engine/server/library/serverGame/src/shared/space/Missile.h
new file mode 100644
index 00000000..46c59ff6
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/Missile.h
@@ -0,0 +1,145 @@
+// ======================================================================
+//
+// Missile.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_Missile_H
+#define INCLUDED_Missile_H
+
+// ======================================================================
+
+#include "sharedObject/CachedNetworkId.h"
+#include "sharedGame/ShipChassisSlotType.h"
+
+class GameNetworkMessage;
+
+// ======================================================================
+
+class Missile
+{
+  public:
+	enum MissileState
+		{
+			MS_None,       // missile has been created, but not launched yet
+			MS_Launched,   // missile is in space with a designated target
+			MS_Miss,       // target was too far away, missile will be destroyed
+			MS_Kill        // missile will be deleted at the next update() call
+		};
+		
+  public:
+		Missile(const NetworkId &sourcePlayer, const NetworkId &sourceShip, int weaponIndex, int missileType, const NetworkId & targetShip, ShipChassisSlotType::Type targetedComponent);
+	~Missile();
+
+  public:
+	int               getMissileId       () const;
+	const NetworkId & getSource          () const;
+	MissileState      getState           () const;
+	const NetworkId & getTargetShip      () const;
+	int               getTimeSinceFired  () const;
+	int               getTotalTime       () const;
+	int               getImpactTime      () const;
+	int               getType            () const;
+	int               getWeaponIndex      () const;
+	ShipChassisSlotType::Type getTargetedComponent() const;
+
+	void              destroy            ();
+	void              countermeasure     (NetworkId const & ship, int const countermeasureType);
+	static void       launchFailedCountermeasure(ServerObject const & ship, int const missileId, int const countermeasureType);
+	bool              fire               ();
+	bool              update             (uint32 effectiveTime);
+	
+  private:
+	void              impactTarget          ();
+	ServerObject *    getSourceServerObject () const;
+	ServerObject *    getTargetServerObject () const;
+	void              sendToAllObservers    (const GameNetworkMessage &message) const;
+	static void       sendToAllObservers    (ServerObject const & object, GameNetworkMessage const & message);
+
+  private:
+	const int               m_missileId;
+	const CachedNetworkId   m_sourceShip;
+	const CachedNetworkId   m_sourcePlayer;
+	CachedNetworkId         m_targetShip;
+	uint32                  m_impactTime;
+	MissileState            m_state;
+	int                     m_weaponIndex;
+	int                     m_missileType;
+	ShipChassisSlotType::Type m_targetedComponent;
+	uint32                  m_fireTime;
+
+  private:
+	static int        ms_nextMissileId;
+
+  private:
+	Missile & operator=(const Missile &); //disable
+	Missile(const Missile &); //disable
+};
+
+// ======================================================================
+
+inline int Missile::getMissileId() const
+{
+	return m_missileId;
+}
+
+// ----------------------------------------------------------------------
+
+inline Missile::MissileState Missile::getState() const
+{
+	return m_state;
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId &Missile::getTargetShip() const
+{
+	return m_targetShip;
+}
+
+// ----------------------------------------------------------------------
+
+inline int Missile::getWeaponIndex() const
+{
+	return m_weaponIndex;
+}
+
+// ----------------------------------------------------------------------
+
+inline ShipChassisSlotType::Type Missile::getTargetedComponent() const
+{
+	return m_targetedComponent;
+}
+
+// ----------------------------------------------------------------------
+
+inline int Missile::getType() const
+{
+	return m_missileType;
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & Missile::getSource() const
+{
+	return m_sourceShip;
+}
+
+// ----------------------------------------------------------------------
+
+inline int Missile::getTotalTime() const
+{
+	return m_impactTime - m_fireTime;
+}
+
+// ----------------------------------------------------------------------
+
+inline int Missile::getImpactTime() const
+{
+	return m_impactTime;
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/MissileManager.cpp b/engine/server/library/serverGame/src/shared/space/MissileManager.cpp
new file mode 100644
index 00000000..ab30ae81
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/MissileManager.cpp
@@ -0,0 +1,389 @@
+// ======================================================================
+//
+// MissileManager.cpp
+// copyright (c) 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/MissileManager.h"
+
+#include "serverGame/Missile.h"
+#include "serverGame/ObjectIdManager.h"
+#include "serverGame/ServerObject.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "serverUtility/ServerClock.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedUtility/DataTable.h"
+#include "sharedUtility/DataTableManager.h"
+
+// ======================================================================
+
+MissileManager * MissileManager::ms_instance = NULL;
+
+// ======================================================================
+
+void MissileManager::install()
+{
+	DEBUG_FATAL(ms_instance,("Called MissileManager::install when it was already installed."));
+	ExitChain::add(&remove, "MissileManager::remove");
+	ms_instance = new MissileManager;
+}
+
+// ----------------------------------------------------------------------
+
+void MissileManager::remove()
+{
+	delete ms_instance;
+	ms_instance = NULL;
+}
+
+// ----------------------------------------------------------------------
+
+MissileManager::MissileManager() :
+		m_missiles(),
+		m_missilesForTarget(),
+		m_missileQueue(),
+		m_missileTypeData()
+{
+	DataTable * missileDataTable = DataTableManager::getTable("datatables/space/missiles.iff", true);
+	FATAL(!missileDataTable,("Missile data table could not be opened."));
+	int numRows = missileDataTable->getNumRows();
+	for (int row=0; row<numRows; ++row)
+	{
+		MissileTypeDataRecord data;
+		data.m_countermeasureTimeFactor = missileDataTable->getFloatValue("countermeasure_time_factor",row);
+		data.m_maxTime = missileDataTable->getFloatValue("max_time",row);
+		data.m_minTime = missileDataTable->getFloatValue("min_time",row);
+		data.m_speed = missileDataTable->getFloatValue("server_speed",row);
+		data.m_targetAcquisitionAngle = missileDataTable->getFloatValue("target_acquisition_angle",row);
+
+		m_missileTypeData[missileDataTable->getIntValue("missile_type_id",row)] = data;
+	}
+	DataTableManager::close("datatables/space/missiles.iff");
+}
+
+// ----------------------------------------------------------------------
+
+MissileManager::~MissileManager()
+{
+}
+
+// ----------------------------------------------------------------------
+
+bool MissileManager::requestFireMissile(const NetworkId &sourcePlayer, const NetworkId &sourceShip, const NetworkId &targetShip, int weaponIndex, int missileType, ShipChassisSlotType::Type targetedComponent)
+{
+	Missile * const newMissile = addMissile(sourcePlayer, sourceShip, weaponIndex, missileType, targetShip, targetedComponent);
+	
+	if(newMissile->fire())
+	{
+		return true;
+	}
+	else
+	{
+		IGNORE_RETURN(removeMissile(newMissile->getMissileId()));
+		return false;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Called when a client or AI requests launching a countermeasure
+ */
+void MissileManager::requestFireCountermeasure(const NetworkId &player, const NetworkId &ship, const int weaponIndex) const
+{
+	// Countermeasure code is entirely driven by script
+	Object *source = NetworkIdManager::getObjectById(ship);
+
+	if (source)
+	{
+		ServerObject *sourceServerObject = NON_NULL(source->asServerObject());
+
+		ScriptParams params;
+		params.addParam(weaponIndex);
+		params.addParam(player);
+		IGNORE_RETURN (sourceServerObject->getScriptObject()->trigAllScripts(Scripting::TRIG_SHIP_FIRED_COUNTERMEASURE, params));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Called by script to actually launch a countermeasure
+ */
+bool MissileManager::fireCountermeasure(NetworkId const & sourceShip, int const targetMissileId, bool const successful, int const countermeasureType)
+{
+	if (successful)
+	{
+		Missile * const missile = getMissile(targetMissileId);
+		if (missile)
+		{
+			missile->countermeasure(sourceShip, countermeasureType);
+			return true;
+		}
+		else
+			return false;
+	}
+	else
+	{
+		ServerObject const * const sourceShipObject = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(sourceShip));
+		if (sourceShipObject)
+		{
+			Missile::launchFailedCountermeasure(*sourceShipObject, targetMissileId, countermeasureType);
+			return true;
+		}
+		else
+			return false;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void MissileManager::update()
+{
+	if (!m_missileQueue.empty())
+	{
+		DEBUG_FATAL(!ServerClock::getInstance().isSet(),("A missile was launched before the clock was set.  This is illegal because missiles depend on the clock for their timing."));
+		
+		uint32 effectiveTime = ServerClock::getInstance().getGameTimeSeconds();
+
+		while (!m_missileQueue.empty() && m_missileQueue.top().first <= effectiveTime)
+		{
+			Missile *nextMissile = getMissile(m_missileQueue.top().second);
+			m_missileQueue.pop();
+			if (nextMissile)
+			{
+				bool result = nextMissile->update(effectiveTime);
+				if (!result)
+					IGNORE_RETURN(removeMissile(nextMissile->getMissileId()));
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void MissileManager::scheduleMissile(int missileId, uint32 nextUpdateTime)
+{
+	m_missileQueue.push(std::make_pair(nextUpdateTime, missileId));
+}
+
+// ----------------------------------------------------------------------
+
+Missile * MissileManager::addMissile(const NetworkId &sourceShip, const NetworkId &sourcePlayer, int weaponIndex, int missileType, const NetworkId &targetShip, ShipChassisSlotType::Type targetedComponent)
+{
+	Missile * const newMissile = new Missile(sourceShip, sourcePlayer, weaponIndex, missileType, targetShip, targetedComponent);
+	m_missiles[newMissile->getMissileId()]=newMissile;
+	IGNORE_RETURN(m_missilesForTarget.insert(std::make_pair(targetShip, newMissile->getMissileId())));
+	return newMissile;
+}
+
+// ----------------------------------------------------------------------
+
+bool MissileManager::removeMissile(int missileId)
+{
+	MissilesType::iterator i=m_missiles.find(missileId);
+	if (i==m_missiles.end())
+	{
+		WARNING_STRICT_FATAL(true,("called removeMissile with missile %i that doesn't exist.",missileId));
+		return false;
+	}
+	NetworkId targetShip(i->second->getTargetShip());
+
+	std::pair<MissilesForTargetType::iterator, MissilesForTargetType::iterator> range=m_missilesForTarget.equal_range(targetShip);
+	for (MissilesForTargetType::iterator j=range.first; j!=range.second; ++j)
+	{
+		if (j->second == missileId)
+		{
+			m_missilesForTarget.erase(j);
+			break;
+		}
+	}
+	
+	delete i->second;
+	m_missiles.erase(i);
+
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+Missile * MissileManager::getMissile(int missileId)
+{
+	MissilesType::const_iterator i=m_missiles.find(missileId);
+	if (i!=m_missiles.end())
+		return i->second;
+	else
+		return NULL;
+}	
+
+// ----------------------------------------------------------------------
+
+const Missile * MissileManager::getConstMissile(int missileId) const
+{
+	MissilesType::const_iterator i=m_missiles.find(missileId);
+	if (i!=m_missiles.end())
+		return i->second;
+	else
+		return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Get an unlocked missile aimed at the specified target.  If there is more
+ * than one, chose the one with the least time left.
+ */
+int MissileManager::getNearestUnlockedMissileForTarget(const NetworkId &target) const
+{
+	const std::pair<MissilesForTargetType::const_iterator, MissilesForTargetType::const_iterator> range=m_missilesForTarget.equal_range(target);
+
+	const Missile *targetedMissile=NULL;
+	for (MissilesForTargetType::const_iterator i=range.first; i!=range.second; ++i)
+	{
+		const Missile * const missile=getConstMissile(i->second);
+		DEBUG_FATAL(!missile,("Programmer bug:  Missile %i was in m_missilesForTarget, but was not in m_missiles",i->second));
+		if (missile && missile->getState() == Missile::MS_Launched &&
+			(!targetedMissile || (missile->getImpactTime() < targetedMissile->getImpactTime()))) //lint !e774:  missile is non-null in debug mode
+				targetedMissile = missile;
+	}
+
+	if (targetedMissile)
+		return targetedMissile->getMissileId();
+	else
+		return 0;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Returns true if the specified object is targeted by at least one missile.
+ */
+bool MissileManager::isTargetedByMissile(const NetworkId &target) const
+{
+	return (m_missilesForTarget.find(target) != m_missilesForTarget.end());
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Get a list of all the unlocked missiles aimed at the specified target.
+ */
+void MissileManager::getAllUnlockedMissilesForTarget(const NetworkId &target, stdvector<int>::fwd &results) const
+{
+	const std::pair<MissilesForTargetType::const_iterator, MissilesForTargetType::const_iterator> range=m_missilesForTarget.equal_range(target);
+
+	for (MissilesForTargetType::const_iterator i=range.first; i!=range.second; ++i)
+	{
+		const Missile * const missile=getConstMissile(i->second);
+		DEBUG_FATAL(!missile,("Programmer bug:  Missile %i was in m_missilesForTarget, but was not in m_missiles",i->second));
+		if (missile && missile->getState() == Missile::MS_Launched) //lint !e774 // not always true (in release mode)
+			results.push_back(missile->getMissileId());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Flag a missile for destruction.
+ *
+ * @param missileId The id of the missile to destroy.
+ * @param countermeasured True if the missile was destroyed by a countermeasure.
+ * This influences how the destruction is shown on the client, but has no
+ * other function on the server.
+ */
+bool MissileManager::destroyMissile(int const missileId) 
+{
+	Missile *missile=getMissile(missileId);
+	if (missile)
+	{
+		missile->destroy();
+		return true;
+	}
+	else
+		return false;
+}
+
+// ----------------------------------------------------------------------
+
+const MissileManager::MissileTypeDataRecord * MissileManager::getMissileTypeDataRecord(int missileTypeId) const
+{
+	MissileTypeDataType::const_iterator i=m_missileTypeData.find(missileTypeId);
+	if (i!=m_missileTypeData.end())
+		return &(i->second);
+	else
+		return NULL;
+}
+
+// ----------------------------------------------------------------------
+
+float MissileManager::getCountermeasureTimeFactorByMissileType(int missileTypeId) const
+{
+	const MissileTypeDataRecord * data = getMissileTypeDataRecord(missileTypeId);
+	DEBUG_WARNING(!data,("Requested missile data for missile type %i, which is not defined in the data table.",missileTypeId));
+	if (!data)
+		return 0;
+	return data->m_countermeasureTimeFactor;
+}
+
+// ----------------------------------------------------------------------
+
+float MissileManager::getMaxTimeByMissileType(int missileTypeId) const
+{
+	const MissileTypeDataRecord * data = getMissileTypeDataRecord(missileTypeId);
+	DEBUG_WARNING(!data,("Requested missile data for missile type %i, which is not defined in the data table.",missileTypeId));
+	if (!data)
+		return 0;
+	return data->m_maxTime;
+}
+
+// ----------------------------------------------------------------------
+
+float MissileManager::getMinTimeByMissileType(int missileTypeId) const
+{
+	const MissileTypeDataRecord * data = getMissileTypeDataRecord(missileTypeId);
+	DEBUG_WARNING(!data,("Requested missile data for missile type %i, which is not defined in the data table.",missileTypeId));
+	if (!data)
+		return 0;
+	return data->m_minTime;
+}
+
+// ----------------------------------------------------------------------
+
+float MissileManager::getSpeedByMissileType(int missileTypeId) const
+{
+	const MissileTypeDataRecord * data = getMissileTypeDataRecord(missileTypeId);
+	DEBUG_WARNING(!data,("Requested missile data for missile type %i, which is not defined in the data table.",missileTypeId));
+	if (!data)
+		return 0;
+	return data->m_speed;
+}
+
+// ----------------------------------------------------------------------
+
+float MissileManager::getRangeByMissileType(int const missileTypeId) const
+{
+	MissileTypeDataRecord const * const data = getMissileTypeDataRecord(missileTypeId);
+	DEBUG_WARNING(!data,("Requested missile data for missile type %i, which is not defined in the data table.",missileTypeId));
+	if (!data)
+		return 0;
+	return data->m_speed * data->m_maxTime;
+}
+
+// ----------------------------------------------------------------------
+
+float MissileManager::getTargetAcquisitionAngle(int const missileTypeId)
+{
+	MissileTypeDataRecord const * const data = getMissileTypeDataRecord(missileTypeId);
+	DEBUG_WARNING(!data,("Requested missile data for missile type %i, which is not defined in the data table.",missileTypeId));
+	if (!data)
+		return 0.0f;
+
+	return data->m_targetAcquisitionAngle;
+}
+
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/MissileManager.h b/engine/server/library/serverGame/src/shared/space/MissileManager.h
new file mode 100644
index 00000000..4e3f5d0d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/MissileManager.h
@@ -0,0 +1,113 @@
+// ======================================================================
+//
+// MissileManager.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_MissileManager_H
+#define INCLUDED_MissileManager_H
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedGame/ShipChassisSlotType.h"
+#include <queue>
+#include <functional>
+
+// ======================================================================
+
+class Missile;
+
+// ======================================================================
+
+/**
+ * A singleton to manage missiles in flight.  Keeps track of missiles,
+ * and calls the appropriate script functions as needed.
+ */
+class MissileManager
+{
+  public:
+	int          getNearestUnlockedMissileForTarget  (const NetworkId &target) const;
+	bool         isTargetedByMissile                 (const NetworkId &target) const;
+	void         getAllUnlockedMissilesForTarget     (const NetworkId &target, stdvector<int>::fwd &results) const;
+
+	bool         destroyMissile               (int missileId);
+	bool         requestFireMissile           (const NetworkId &sourcePlayer, const NetworkId &sourceShip, const NetworkId &targetShip, int weaponIndex, int missileType, ShipChassisSlotType::Type targetedComponent);
+	void         requestFireCountermeasure    (const NetworkId &player, const NetworkId &ship, const int weaponIndex) const;
+	bool         fireCountermeasure           (NetworkId const & sourceShip, int const targetMissileId, bool const successful, int const countermeasureType);
+	void         scheduleMissile              (int missileId, uint32 nextUpdateTime);
+	void         update                       ();
+	const Missile * getConstMissile           (int missileId) const;
+
+	float getCountermeasureTimeFactorByMissileType (int missileTypeId) const;
+	float getMaxTimeByMissileType                  (int missileTypeId) const;
+	float getMinTimeByMissileType                  (int missileTypeId) const;
+	float getSpeedByMissileType                    (int missileTypeId) const;
+	float getRangeByMissileType(int missileTypeId) const;
+	float getTargetAcquisitionAngle(int missileType);
+	
+  public:
+	static void  install                      ();
+	static void  remove                       ();
+
+	static MissileManager & getInstance       ();
+
+  private:
+	class QueueSorter : public std::binary_function<std::pair<int, int>, std::pair<int, int>, bool>
+	{
+	  public:
+		bool operator() (const std::pair<int, int> &lhs, const std::pair<int, int> &rhs);
+	};
+
+	struct MissileTypeDataRecord
+	{
+		float m_countermeasureTimeFactor;
+		float m_maxTime;
+		float m_minTime;
+		float m_speed;
+		float m_targetAcquisitionAngle;
+	};
+	
+	typedef std::map<int, Missile*> MissilesType;
+	typedef std::multimap<NetworkId, int> MissilesForTargetType;
+	typedef std::priority_queue<std::pair<uint32, int>, std::vector<std::pair<uint32, int> >, QueueSorter> MissileQueueType;
+	typedef std::map<int, MissileTypeDataRecord> MissileTypeDataType;
+
+  private:
+	Missile *    addMissile                   (const NetworkId &sourceShip, const NetworkId &sourcePlayer, int weaponIndex, int missileType, const NetworkId & targetShip, ShipChassisSlotType::Type targetedComponent);
+	bool         removeMissile                (int missileId);
+	Missile *    getMissile                   (int missileId);
+	const MissileTypeDataRecord * getMissileTypeDataRecord (int missileTypeId) const;
+
+  private:
+	MissilesType m_missiles;
+	MissilesForTargetType m_missilesForTarget;
+	MissileQueueType m_missileQueue;
+	MissileTypeDataType m_missileTypeData;
+	
+  private:
+	MissileManager();
+	~MissileManager();
+	
+	static MissileManager *ms_instance;
+};
+
+// ======================================================================
+
+inline MissileManager & MissileManager::getInstance()
+{
+	DEBUG_FATAL(!ms_instance,("MissileManager not installed."));
+	return *ms_instance;
+}
+
+// ======================================================================
+
+inline bool MissileManager::QueueSorter::operator() (const std::pair<int, int> &lhs, const std::pair<int, int> &rhs)
+{
+	return (lhs.first < rhs.first);
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/NebulaManagerServer.cpp b/engine/server/library/serverGame/src/shared/space/NebulaManagerServer.cpp
new file mode 100644
index 00000000..432d57f6
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/NebulaManagerServer.cpp
@@ -0,0 +1,338 @@
+//======================================================================
+//
+// NebulaManagerServer.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/NebulaManagerServer.h"
+
+#include "serverGame/ConnectionServerConnection.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ServerWorld.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/SpaceVisibilityManager.h"
+#include "serverNetworkMessages/GameConnectionServerMessages.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedCollision/CollisionInfo.h"
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedCollision/SpatialDatabase.h"
+#include "sharedFoundation/Clock.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedGame/Nebula.h"
+#include "sharedGame/NebulaManager.h"
+#include "sharedMath/MultiShape.h"
+#include "sharedMath/VectorArgb.h"
+#include "sharedNetworkMessages/CreateNebulaLightningMessage.h"
+#include "sharedNetworkMessages/EnvironmentalHitData.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedNetworkMessages/NebulaLightningData.h"
+#include "sharedNetworkMessages/NebulaLightningHitData.h"
+#include "sharedObject/AppearanceTemplateList.h"
+#include "sharedObject/CachedNetworkId.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/Controller.h"
+#include "sharedRandom/Random.h"
+
+#include <map>
+#include <vector>
+
+//======================================================================
+
+namespace NebulaManagerServerNamespace
+{
+
+	typedef stdvector<NebulaLightningData>::fwd LightningDataVector;
+
+	LightningDataVector s_lightningDataVector;
+
+	typedef stdmap<CachedNetworkId, uint32>::fwd NetworkIdTimeMap;
+	NetworkIdTimeMap s_objectsRecentlyHitByLightning;
+
+	static uint16 s_lastLightningId = 0;
+}
+
+using namespace NebulaManagerServerNamespace;
+
+//----------------------------------------------------------------------
+
+void NebulaManagerServer::loadScene(std::string const & sceneId)
+{
+	NebulaManager::setClearFunction(&NebulaManagerServer::clear);
+	NebulaManager::loadScene(sceneId);
+
+	s_objectsRecentlyHitByLightning.clear();
+}
+
+//----------------------------------------------------------------------
+
+void NebulaManagerServer::clear()
+{
+	s_lightningDataVector.clear();
+}
+
+//----------------------------------------------------------------------
+
+void NebulaManagerServer::update(float elapsedTime)
+{
+	UNREF(elapsedTime);
+	
+	handleEnqueuedLightningEvents();
+
+	generateLightningEvents(elapsedTime);
+}
+
+//----------------------------------------------------------------------
+
+void NebulaManagerServer::enqueueLightning(NebulaLightningData const & nebulaLightningData)
+{
+	Nebula const * const nebula = NebulaManager::getNebulaById(nebulaLightningData.nebulaId);
+	if (nebula == NULL)
+	{
+		WARNING(true, ("NebulaManagerServer::enqueueLightning invalid nebula [%d]", nebulaLightningData.nebulaId));
+		return;
+	}
+	
+	std::string const & lightningAppearance = nebula->getLightningAppearance();
+	
+	if (lightningAppearance.empty())
+	{
+		WARNING(true, ("NebulaManagerServer::enqueueLightning nebula [%d] has no lightning appearance", nebulaLightningData.nebulaId));
+		return;
+	}
+	
+	s_lightningDataVector.push_back(nebulaLightningData);
+
+	//-- send enqueue messages to nearby clients
+	// time is in the context of the connection server's sync stamp, so we need a unique message per connection server
+
+	static float const s_defaultLightningObservationRange = 128.0f;
+
+	typedef std::vector<NetworkId> NetworkIdVector;
+	typedef std::map<ConnectionServerConnection *, NetworkIdVector> DistributionList;
+	DistributionList distributionList;
+
+	static std::set<Client *> observingClients;
+
+	SpaceVisibilityManager::getClientsInRange(
+		(nebulaLightningData.endpoint0+nebulaLightningData.endpoint1)*0.5f,
+		nebulaLightningData.endpoint0.magnitudeBetween(nebulaLightningData.endpoint1)+s_defaultLightningObservationRange,
+		observingClients);
+
+	//-- Build distribution list of clients in range of the lightning
+	for (std::set<Client *>::const_iterator i = observingClients.begin(); i != observingClients.end(); ++i)
+		distributionList[(*i)->getConnection()].push_back((*i)->getCharacterObjectId());
+
+	observingClients.clear();
+
+	uint32 const clockTimeMs = Clock::timeMs();
+	uint32 const deltaTimeStart = nebulaLightningData.syncStampStart - clockTimeMs;
+	uint32 const deltaTimeEnd = nebulaLightningData.syncStampEnd - clockTimeMs;
+
+	//-- Send CreateNebulaLightningMessage to distribution list
+	{
+		NebulaLightningData nebulaLightningDataToSend = nebulaLightningData;
+		for (DistributionList::const_iterator iter = distributionList.begin(); iter != distributionList.end(); ++iter)
+		{
+			ConnectionServerConnection * const connectionServerConnection = (*iter).first;
+			NetworkIdVector const & targetNetworkIds = (*iter).second;
+
+			nebulaLightningDataToSend.syncStampStart = connectionServerConnection->getSyncStampLong() + deltaTimeStart;
+			nebulaLightningDataToSend.syncStampEnd = connectionServerConnection->getSyncStampLong() + deltaTimeEnd;
+
+			CreateNebulaLightningMessage const createNebulaLightningMessage(nebulaLightningDataToSend);
+			GameClientMessage const gameClientMessage(targetNetworkIds, true, createNebulaLightningMessage);
+			connectionServerConnection->send(gameClientMessage, true);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+/*
+* handle enqueued lightning events
+*/
+
+void NebulaManagerServer::handleEnqueuedLightningEvents()
+{
+	uint32 const clockTimeMs = Clock::timeMs();
+	
+	for (LightningDataVector::iterator it = s_lightningDataVector.begin(); it != s_lightningDataVector.end();)
+	{
+		NebulaLightningData const & nebulaLightningData = (*it);
+		
+		Nebula const * const nebula = NebulaManager::getNebulaById(nebulaLightningData.nebulaId);
+		if (nebula == NULL)
+		{
+			it = s_lightningDataVector.erase(it);
+			continue;
+		}
+				
+		//-- lightning occurs now or in the past
+		if (nebulaLightningData.syncStampStart <= clockTimeMs)
+		{
+			//-- lightning is finished
+			if (nebulaLightningData.syncStampEnd < clockTimeMs)
+			{
+				it = s_lightningDataVector.erase(it);
+				continue;
+			}
+			
+			Vector startPosition_w = nebulaLightningData.endpoint0;
+			Vector endPosition_w = nebulaLightningData.endpoint1;			
+						
+			Vector unitLightningRay = (endPosition_w - startPosition_w);
+			if (!unitLightningRay.normalize())
+			{
+				++it;
+				continue;
+			}
+
+			typedef stdvector<Object *>::fwd ObjectVector;
+			
+			static ObjectVector collidingObjects;
+			collidingObjects.clear();
+			
+			if (CollisionWorld::getDatabase()->queryObjects(CellProperty::getWorldCellProperty(), MultiShape(Sphere(startPosition_w, 0.1f)), endPosition_w - startPosition_w, &collidingObjects, &collidingObjects))
+			{
+				for (ObjectVector::const_iterator cit = collidingObjects.begin(); cit != collidingObjects.end(); ++cit)
+				{
+					Object * const hitObject = NON_NULL(*cit);
+					ServerObject const * const serverHitObject = hitObject->asServerObject();
+					ShipObject const * const shipHitObject = serverHitObject->asShipObject();
+					
+					if (shipHitObject != NULL)
+					{
+						NetworkIdTimeMap::const_iterator const oit = s_objectsRecentlyHitByLightning.find(CachedNetworkId(*hitObject));
+						if (oit == s_objectsRecentlyHitByLightning.end() || (*oit).second < clockTimeMs)
+						{
+							Vector const & closestPoint_w = hitObject->getPosition_w().findClosestPointOnLine(startPosition_w, endPosition_w);
+							Vector const & closestPoint_o = hitObject->rotateTranslate_w2o(closestPoint_w);
+							float const dotProduct = Vector::unitZ.dot(closestPoint_o);
+							int const side = dotProduct > 0.0f ? 0 : 1;
+							float const damage = Random::randomReal(nebula->getLightningDamageMin(), nebula->getLightningDamageMax());
+							
+							GameScriptObject * const gso = const_cast<GameScriptObject *>(serverHitObject->getScriptObject());
+							ScriptParams params;
+							params.addParam(side);
+							params.addParam(damage);
+							
+							IGNORE_RETURN(gso->trigAllScripts(Scripting::TRIG_SHIP_HIT_BY_LIGHTNING, params));
+							
+							MessageQueue::Data * const data = new MessageQueueGenericValueType<NebulaLightningHitData>(NebulaLightningHitData(nebulaLightningData.lightningId, static_cast<int8>(side), damage));
+							hitObject->getController()->appendMessage(CM_lightningHitShip, 0.0f, data, 	
+								GameControllerMessageFlags::SEND | 
+								GameControllerMessageFlags::RELIABLE | 
+								GameControllerMessageFlags::DEST_ALL_CLIENT);
+							
+							//-- allow at most 1 hit per object per 2 seconds
+							s_objectsRecentlyHitByLightning[CachedNetworkId(*hitObject)] = clockTimeMs + 2000;
+						}
+					}
+				}
+			}
+		}
+		
+		++it;
+	}
+}
+
+//----------------------------------------------------------------------
+
+void NebulaManagerServer::generateLightningEvents(float elapsedTime)
+{
+	uint32 const clockTimeMs = Clock::timeMs();
+
+	NebulaManager::NebulaVector const & nebulaVector = NebulaManager::getNebulaVector();
+	for (NebulaManager::NebulaVector::const_iterator it = nebulaVector.begin(); it != nebulaVector.end(); ++it)
+	{
+		Nebula const * const nebula = NON_NULL(*it);
+		
+		std::string const & lightningAppearance = nebula->getLightningAppearance();
+		
+		if (lightningAppearance.empty())
+			continue;
+
+		float const lightningFrequency = nebula->getLightningFrequency();
+			
+		if (lightningFrequency <= 0.0f)
+			continue;
+		
+		float const density = nebula->getDensity();
+		if (density <= 0.0f)
+			continue;
+
+		float const averageLightningCountThisFrame = std::min(0.5f, elapsedTime * lightningFrequency);
+		
+		if (Random::randomReal(0.0f, 1.0f) < averageLightningCountThisFrame)
+		{			
+			float const radius = nebula->getSphere().getRadius() * 0.3f;
+			Vector const & center = nebula->getSphere().getCenter();
+			
+			NebulaLightningData nebulaLightningData;
+			
+			//-- zero is the invalid lightning id
+			if (++s_lastLightningId == 0)
+				++s_lastLightningId;
+			
+			float const lightningDurationMax = nebula->getLightningDurationMax();
+			int const lightningDurationMaxMs = static_cast<int>(lightningDurationMax * 1000.0f);
+
+			nebulaLightningData.lightningId = s_lastLightningId;
+			nebulaLightningData.syncStampStart = clockTimeMs + 1000;
+			nebulaLightningData.syncStampEnd = nebulaLightningData.syncStampStart + static_cast<uint32>(Random::random(lightningDurationMaxMs / 2, lightningDurationMaxMs));
+
+			nebulaLightningData.nebulaId = nebula->getId();
+			
+			nebulaLightningData.endpoint0.x = Random::randomReal(center.x - radius, center.x + radius);
+			nebulaLightningData.endpoint0.y = Random::randomReal(center.y - radius, center.y + radius);
+			nebulaLightningData.endpoint0.z = Random::randomReal(center.z - radius, center.z + radius);
+			
+			nebulaLightningData.endpoint1.x = Random::randomReal(center.x - radius, center.x + radius);
+			nebulaLightningData.endpoint1.y = Random::randomReal(center.y - radius, center.y + radius);
+			nebulaLightningData.endpoint1.z = Random::randomReal(center.z - radius, center.z + radius);
+
+			NebulaManagerServer::enqueueLightning(nebulaLightningData);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void NebulaManagerServer::handleEnvironmentalDamage(ServerObject & victim, int nebulaId)
+{
+	Nebula const * const nebula = NebulaManager::getNebulaById(nebulaId);
+	if (nebula == NULL)
+		return;
+	
+	float const environmentalDamageFrequency = nebula->getEnvironmentalDamageFrequency();
+	
+	if (environmentalDamageFrequency <= 0.0f)
+		return;
+	
+	const float lastFrameTime = Clock::frameTime();
+	float const averageRandomDamageCountThisFrame = std::min(0.5f, lastFrameTime * environmentalDamageFrequency);
+	
+	if (Random::randomReal(0.0f, 1.0f) < averageRandomDamageCountThisFrame)
+	{			
+		float const damage = nebula->getEnvironmentalDamage();
+		int const side = Random::random(0,1);
+		
+		GameScriptObject * const gso = const_cast<GameScriptObject *>(victim.getScriptObject());
+		ScriptParams params;
+		params.addParam(side);
+		params.addParam(damage);
+		
+		IGNORE_RETURN(gso->trigAllScripts(Scripting::TRIG_SHIP_HIT_BY_ENVIRONMENT, params));
+		
+		MessageQueue::Data * const data = new MessageQueueGenericValueType<EnvironmentalHitData>(EnvironmentalHitData(nebula->getId(), static_cast<int8>(side), damage));
+		victim.getController()->appendMessage(CM_environmentHitShip, 0.0f, data, 	
+			GameControllerMessageFlags::SEND | 
+			GameControllerMessageFlags::RELIABLE | 
+			GameControllerMessageFlags::DEST_ALL_CLIENT);
+	}
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/NebulaManagerServer.h b/engine/server/library/serverGame/src/shared/space/NebulaManagerServer.h
new file mode 100644
index 00000000..007e74bf
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/NebulaManagerServer.h
@@ -0,0 +1,38 @@
+//======================================================================
+//
+// NebulaManagerServer.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_NebulaManagerServer_H
+#define INCLUDED_NebulaManagerServer_H
+
+//======================================================================
+
+class NebulaLightningData;
+class ServerObject;
+
+//----------------------------------------------------------------------
+
+class NebulaManagerServer
+{
+public:
+
+	static void loadScene(std::string const & sceneId);
+	static void clear();
+
+	static void update(float elapsedTime);
+
+	static void enqueueLightning(NebulaLightningData const & nebulaLightningData);
+	static void handleEnvironmentalDamage(ServerObject & victim, int nebulaId);
+
+private:
+
+	static void generateLightningEvents(float elapsedTime);
+	static void handleEnqueuedLightningEvents();
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/ProjectileManager.cpp b/engine/server/library/serverGame/src/shared/space/ProjectileManager.cpp
new file mode 100644
index 00000000..61ff31b3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ProjectileManager.cpp
@@ -0,0 +1,446 @@
+// ======================================================================
+//
+// ProjectileManager.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ProjectileManager.h"
+
+#include "serverGame/ConnectionServerConnection.h"
+#include "serverGame/PlayerShipController.h"
+#include "serverGame/ShipObject.h"
+#include "serverNetworkMessages/GameConnectionServerMessages.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedCollision/CollisionWorld.h"
+#include "sharedCollision/Extent.h"
+#include "sharedCollision/SpatialDatabase.h"
+#include "sharedGame/GameObjectTypes.h"
+#include "sharedGame/SharedObjectTemplate.h"
+#include "sharedMath/MultiShape.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/CreateProjectileMessage.h"
+#include "sharedObject/Appearance.h"
+#include "sharedObject/AppearanceTemplate.h"
+#include "sharedObject/CellProperty.h"
+
+// ======================================================================
+
+namespace ProjectileManagerNamespace
+{
+
+	// ======================================================================
+
+	class Projectile
+	{
+	public:
+
+		// ----------------------------------------------------------------------
+
+		Projectile(ShipObject &owner, int weaponIndex, int projectileIndex, int targetedComponent, float startDeltaTime, Vector const &position_w, Vector const &direction_w, float length, float speed, float duration, bool fromAutoTurret, bool isBeam) :
+			m_owner(&owner),
+			m_weaponIndex(weaponIndex),
+			m_projectileIndex(projectileIndex),
+			m_targetedComponent(targetedComponent),
+			m_startDeltaTime(startDeltaTime),
+			m_position_w(position_w),
+			m_direction_w(direction_w),
+			m_length(length),
+			m_speed(speed),
+			m_duration(duration),
+			m_fromAutoTurret(fromAutoTurret)
+		{
+
+				if (isBeam)
+				{
+					//-- offset transform used for beam positioning
+					m_position_w = m_owner->rotateTranslate_w2o(m_position_w);
+					m_direction_w = m_owner->rotate_w2o(m_direction_w);
+					m_length = m_speed * m_duration;
+				}
+		}
+
+		// ----------------------------------------------------------------------
+
+		Projectile(Projectile const &rhs) :
+			m_owner(rhs.m_owner),
+			m_weaponIndex(rhs.m_weaponIndex),
+			m_projectileIndex(rhs.m_projectileIndex),
+			m_targetedComponent(rhs.m_targetedComponent),
+			m_startDeltaTime(rhs.m_startDeltaTime),
+			m_position_w(rhs.m_position_w),
+			m_direction_w(rhs.m_direction_w),
+			m_length(rhs.m_length),
+			m_speed(rhs.m_speed),
+			m_duration(rhs.m_duration),
+			m_fromAutoTurret(rhs.m_fromAutoTurret)
+		{
+		}
+
+		//----------------------------------------------------------------------
+
+		Projectile() :
+			m_owner(NULL),
+			m_weaponIndex(0),
+			m_projectileIndex(0),
+			m_targetedComponent(0),
+			m_startDeltaTime(0.0f),
+			m_position_w(),
+			m_direction_w(),
+			m_length(0.0f),
+			m_speed(0.0f),
+			m_duration(0.0f),
+			m_fromAutoTurret(false)
+		{
+		}
+
+		// ----------------------------------------------------------------------
+
+		~Projectile()
+		{
+		}
+
+		// ----------------------------------------------------------------------
+
+		bool update(float const elapsedTime, bool isBeam)
+		{
+			// If the object no longer exists, kill the projectile
+			if (!m_owner.getPointer())
+				return false;
+				
+			//-- for beam weapons, the m_position_w and m_direction_w vectors are actually in the ship's object space, not world space.
+			//-- these values are not changed by this update() method
+
+			Vector projectilePosition_w;
+			Vector projectilePath;
+
+			Vector moveAmountThisFrame;
+
+			if (isBeam)
+			{
+				projectilePosition_w = m_owner->rotateTranslate_o2w(m_position_w);
+				projectilePath = m_owner->rotate_o2w(m_direction_w * m_length);
+			}
+			else
+			{
+				// Move the projectile appropriately for the amount of time passed.  Return whether the projectile should still exist.
+				// If the projectile collides with something or its time expires, it should no longer exist.
+				moveAmountThisFrame = m_direction_w * (m_speed * elapsedTime);
+				projectilePath = moveAmountThisFrame + (m_direction_w * m_length);
+				
+				//-- We need to take into consideration that the object has actually been 
+				//   advanced forward in time by the time it makes it into the ProjectileManager.
+				//   The very first update should be from where the proijectile originated.
+				//   To catch potential cheaters, we will not allow this time to be beyond 0.25 seconds.
+				projectilePosition_w = m_position_w;
+				if (m_startDeltaTime > 0.f)
+				{
+					float const deltaTime = std::min(m_startDeltaTime, 0.25f);
+					m_startDeltaTime = 0.f;
+					
+					Vector const positionOffset_w(m_direction_w * m_speed * deltaTime);
+					projectilePosition_w -= positionOffset_w;
+					projectilePath += positionOffset_w;
+				}
+			}
+
+			// Get all objects that collide with the line segment from m_position_w to endPosition.  Don't collide with the owner.
+			float const projectileSize = 1.f;
+			Capsule const projectileCapsule_w(Sphere(projectilePosition_w, projectileSize), projectilePath);
+			ColliderList collidedWith;
+			CollisionWorld::getDatabase()->queryFor(static_cast<int>(SpatialDatabase::Q_Physicals), CellProperty::getWorldCellProperty(), true, projectileCapsule_w, collidedWith);
+
+			Object * closestObject = NULL;
+			float smallestTime = 0.0f;
+			Vector collisionPosition_o;
+
+			for (ColliderList::const_iterator i = collidedWith.begin(); i != collidedWith.end(); ++i)
+			{
+				Object &collider = NON_NULL(*i)->getOwner();
+				if (projectileCollidesWith(collider))
+				{
+					// find which object it collided with first, and when
+					BaseExtent const * const extent_l = (*i)->getExtent_l();
+					if (extent_l == NULL)
+						WARNING(true, ("ProjectileManager collided with object with null extent. [%s], appearance=[%s]", collider.getDebugName(), collider.getAppearanceTemplateName()));
+					else
+					{
+						Vector const start_o = collider.rotateTranslate_w2o(projectilePosition_w);
+						Vector const end_o = collider.rotateTranslate_w2o(projectilePosition_w + projectilePath);
+						float time;
+						if (extent_l->intersect(start_o, end_o, NULL, &time))
+						{
+							if (!closestObject || time < smallestTime)
+							{
+								closestObject = &collider;
+								smallestTime = time;
+								collisionPosition_o = Vector::linearInterpolate(start_o, end_o, time);
+							}
+						}
+					}
+				}
+			}
+
+			if (closestObject)
+			{
+				ServerObject * const so = closestObject->asServerObject();
+				if (so)
+					trigger(*so, collisionPosition_o);
+				
+				return false;
+			}
+			
+			if (!isBeam)
+			{
+				// update the position and remaining duration
+				m_position_w += moveAmountThisFrame;
+				m_duration -= elapsedTime;
+			}
+
+			return m_duration > 0.0f;
+		}
+
+		// ----------------------------------------------------------------------
+
+		bool projectileCollidesWith(Object const &target) const
+		{
+			// Projectiles collide with anything that isn't a friendly, visible, non-capital ship
+			ShipObject const * const actorShip = m_owner.getPointer();
+			ShipObject const * const targetShip = target.asServerObject() ? target.asServerObject()->asShipObject() : 0;
+			if (   actorShip != &target
+			    && !target.getKill()
+			    && (   !targetShip
+			        || (   targetShip->isVisible()
+			            && (   targetShip->isCapitalShip()
+			                || Pvp::canAttack(*actorShip, *targetShip)))))
+				return true;
+			return false;
+		}
+
+		// ----------------------------------------------------------------------
+
+		void trigger(ServerObject &target, Vector const & collisionPosition_o) const
+		{
+			// Our projectile has hit a server object. Fire off a OnShipHit Trigger for that object.
+			// If our object is a ship, then we check PvP rules before damaging the target.
+			ShipObject * const actorShip = m_owner.getPointer();
+			ShipObject * const targetShip = target.asShipObject();
+
+/*
+			DEBUG_REPORT_LOG(actorShip && targetShip, ("%s shooting %s (%s).\n",
+				actorShip->getNetworkId().getValueString().c_str(),
+				targetShip->getNetworkId().getValueString().c_str(),
+				Pvp::canAttack(*actorShip, *targetShip) ? "allowed" : "denied"));
+*/
+
+			if ( actorShip )
+			{
+				// For small ships, a hit anywhere on the ship counts as hitting the selected target.  For capital ships,
+				// it detects what component was actually hit
+				int actualComponentHit = m_targetedComponent;
+
+				if (targetShip && targetShip->isCapitalShip())
+				{
+					actualComponentHit = targetShip->findTargetChassisSlotByPosition(collisionPosition_o);
+				}
+				
+				// trigger target that it was hit
+				{
+					ScriptParams params;
+					params.addParam(actorShip->getNetworkId());
+					params.addParam(m_weaponIndex);
+					params.addParam(false);
+					params.addParam(static_cast<int>(0));
+					params.addParam(actualComponentHit);
+					params.addParam(m_fromAutoTurret);
+					params.addParam(collisionPosition_o.x);
+					params.addParam(collisionPosition_o.y);
+					params.addParam(collisionPosition_o.z);
+					if(!targetShip) // For Non ship objects. Just trigger the event.
+						IGNORE_RETURN(target.getScriptObject()->trigAllScripts(Scripting::TRIG_SHIP_HIT, params));
+					if(targetShip  && Pvp::canAttack(*actorShip, *targetShip)) // For ship objects AND PvP rule is OK
+					{
+						// Trigger event and decrease ship HP.
+						IGNORE_RETURN(target.getScriptObject()->trigAllScripts(Scripting::TRIG_SHIP_HIT, params));
+						targetShip->setNumberOfHits(targetShip->getNumberOfHits() + 1);	
+					}
+				}
+
+				// trigger attacker that they hit
+				{
+					ScriptParams params;
+					params.addParam(target.getNetworkId());
+					params.addParam(m_weaponIndex);
+					params.addParam(actualComponentHit);
+					IGNORE_RETURN(actorShip->getScriptObject()->trigAllScripts(Scripting::TRIG_SHIP_HITTING, params));
+				}
+			}
+		}
+
+		// ----------------------------------------------------------------------
+
+		ShipObject * getOwner()
+		{
+			return m_owner.getPointer();
+		}
+
+	private:
+
+		Watcher<ShipObject> m_owner;
+		int m_weaponIndex;
+		int m_projectileIndex;
+		int m_targetedComponent;
+		float m_startDeltaTime;
+		Vector m_position_w;
+		Vector m_direction_w;
+		float m_length;
+		float m_speed;
+		float m_duration;
+		bool m_fromAutoTurret;
+	};
+
+	// ======================================================================
+
+	std::vector<Projectile> s_projectiles;
+
+	//----------------------------------------------------------------------
+
+	typedef std::pair<NetworkId /* ship id */, int /*weaponIndex */> ShipWeaponPair;
+	typedef stdmap<ShipWeaponPair, Projectile>::fwd ProjectileMap;
+	ProjectileMap s_projectileBeamMap;
+
+
+	// ======================================================================
+}
+using namespace ProjectileManagerNamespace;
+
+// ======================================================================
+
+void ProjectileManager::create(Client const *gunnerClient, ShipObject &owner, int weaponIndex, int const projectileIndex, int const targetedComponent, float const startDeltaTime, Transform const & transform_p, float const length, float const speed, float const duration, bool const fromAutoTurret)
+{
+	UNREF(gunnerClient);
+	bool const isBeam = owner.isBeamWeapon(weaponIndex);
+
+	Projectile const projectile(owner, weaponIndex, projectileIndex, targetedComponent, startDeltaTime, transform_p.getPosition_p(), transform_p.getLocalFrameK_p(), length, speed, duration, fromAutoTurret, isBeam);
+
+	if (isBeam)
+	{
+		s_projectileBeamMap[ShipWeaponPair(owner.getNetworkId(), weaponIndex)] = projectile;
+	}
+	else
+	{
+		// add the projectile to the active projectiles vector
+		s_projectiles.push_back(projectile);
+	}
+
+	// send the projectile to all clients observing the owner except the owner
+	// time is in the context of the connection server's sync stamp, so we need a unique message per connection server
+	typedef std::map<ConnectionServerConnection *, std::vector<NetworkId> > DistributionList;
+	DistributionList distributionList;
+
+	//-- Build distribution list of clients observing ship, but don't include the client doing the firing
+	{
+		typedef std::set<Client *> ObserverList;
+		ObserverList const & observers = owner.getObservers();
+		for (ObserverList::const_iterator iter = observers.begin(); iter != observers.end(); ++iter)
+		{
+			if (*iter != gunnerClient)
+			{
+				ServerObject const * const characterObject = (*iter)->getCharacterObject();
+				if (characterObject)
+				{
+					// Don't send projectiles to players in ships that are teleporting
+					ShipObject const * const clientShip = ShipObject::getContainingShipObject(characterObject);
+					if (!clientShip || !safe_cast<PlayerShipController const *>(clientShip->getController())->isTeleporting() || !clientShip->getPilot())
+						distributionList[(*iter)->getConnection()].push_back(characterObject->getNetworkId());
+				}
+			}
+		}
+	}
+
+	//-- Send CreateProjectileMessage to distribution list
+	{
+		for (DistributionList::const_iterator iter = distributionList.begin(); iter != distributionList.end(); ++iter)
+		{
+			CreateProjectileMessage const createProjectileMessage(owner.getShipId(), weaponIndex, projectileIndex, targetedComponent, transform_p, (*iter).first->getSyncStampLong());
+			GameClientMessage const gameClientMessage(iter->second, false, createProjectileMessage);
+			iter->first->send(gameClientMessage, true);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ProjectileManager::stopBeam(ShipObject & shipOwner, int weaponIndex)
+{
+	ShipWeaponPair const key(shipOwner.getNetworkId(), weaponIndex);
+	s_projectileBeamMap.erase(key);
+}
+
+// ----------------------------------------------------------------------
+
+void ProjectileManager::update(float timePassed) // static
+{
+	{
+		// Call Projectile::update all projectiles, removing from the vector if Projectile::update() returns false
+		unsigned int i = 0;
+		while (i < s_projectiles.size())
+		{
+			if (s_projectiles[i].update(timePassed, false))
+				++i;
+			else
+			{
+				s_projectiles[i] = s_projectiles[s_projectiles.size()-1];
+				s_projectiles.pop_back();
+			}
+		}
+	}
+
+	//--
+	//-- Update the beam weapons
+	//--
+
+	{
+		for (ProjectileMap::iterator it = s_projectileBeamMap.begin(); it != s_projectileBeamMap.end();)
+		{
+			ShipWeaponPair const & key = (*it).first;
+			NetworkId const & shipId = key.first;
+			int weaponIndex = key.second;
+			Projectile & projectile = (*it).second;
+
+			ShipObject * const shipObject = projectile.getOwner();
+
+			if (NULL == shipObject)
+			{
+				WARNING(true, ("ProjectileManager beam weapon [%d] for ship id [%s], ship object no longer exists.", weaponIndex, shipId.getValueString().c_str()));
+			}
+			else
+			{
+				if (shipObject->isBeamWeapon(weaponIndex))
+				{
+					if (!shipObject->isComponentFunctional(static_cast<int>(ShipChassisSlotType::SCST_weapon_first) + weaponIndex))
+					{
+						WARNING(true, ("ProjectileManager beam weapon [%d] for ship [%s] is no longer functional.", weaponIndex, shipId.getValueString().c_str()));
+					}
+					else
+					{
+						projectile.update(timePassed, true);
+						++it;
+						continue;
+					}
+				}
+			}
+
+			//-- this beam is no longer valid, remove it
+			s_projectileBeamMap.erase(it++);
+		}
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/space/ProjectileManager.h b/engine/server/library/serverGame/src/shared/space/ProjectileManager.h
new file mode 100644
index 00000000..c53fafc5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ProjectileManager.h
@@ -0,0 +1,32 @@
+// ======================================================================
+//
+// ProjectileManager.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ProjectileManager_H
+#define INCLUDED_ProjectileManager_H
+
+// ======================================================================
+
+class Client;
+class ShipObject;
+class Transform;
+
+// ======================================================================
+
+class ProjectileManager
+{
+public:
+
+	static void create(Client const *gunnerClient, ShipObject &owner, int weaponIndex, int projectileIndex, int targetedComponent, float startDeltaTime, Transform const & transform_p, float length, float speed, float duration, bool const fromAutoTurret);
+	static void stopBeam(ShipObject & shipOwner, int weaponIndex);
+	static void update(float timePassed);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_ProjectileManager_H
+
diff --git a/engine/server/library/serverGame/src/shared/space/ServerAsteroidManager.cpp b/engine/server/library/serverGame/src/shared/space/ServerAsteroidManager.cpp
new file mode 100644
index 00000000..1a0cfa50
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ServerAsteroidManager.cpp
@@ -0,0 +1,357 @@
+// ============================================================================
+//
+// ServerAsteroidManager.cpp
+// Copyright 2004 Sony Online Entertainment, Inc.
+//
+// ============================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerAsteroidManager.h"
+
+#include "sharedCollision/Extent.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedGame/AsteroidGenerationManager.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+#include "sharedGame/AsteroidGenerationManager.h"
+#include "sharedMath/Sphere.h"
+#include "sharedObject/AppearanceTemplate.h"
+#include "sharedObject/AppearanceTemplateList.h"
+#include "sharedObject/Controller.h"
+#include "sharedObject/CellProperty.h"
+#include "sharedObject/NetworkIdManager.h"
+#include "sharedObject/Object.h"
+#include "sharedObject/ObjectTemplateList.h"
+#include "sharedObject/RotationDynamics.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/ServerObjectTemplate.h"
+#include "serverGame/ServerWorld.h"
+
+#include <set>
+#include <vector>
+
+// ============================================================================
+
+namespace ServerAsteroidManagerNamespace
+{
+	float const cms_timeBetweenUpdates = 10.0f;
+	float ms_timeSinceLastUpate = 0.0f;
+	bool ms_installed = false;
+}
+
+using namespace ServerAsteroidManagerNamespace;
+
+// ============================================================================
+
+ServerAsteroidManager::FieldHandle const ServerAsteroidManager::BAD_HANDLE = -1;
+ServerAsteroidManager::FieldHandle ServerAsteroidManager::s_nextHandle;
+std::set<NetworkId> ServerAsteroidManager::ms_playersListeningForServerAsteroidDebugData;
+std::vector<NetworkId> ServerAsteroidManager::ms_asteroids;
+
+
+// ============================================================================
+
+void ServerAsteroidManager::install()
+{
+	DEBUG_FATAL(ms_installed, ("ServerAsteroidManager::install() - Already installed."));
+
+	ms_installed = true;
+
+	s_nextHandle = 0;
+
+	AsteroidGenerationManager::registerGetExtentRadiusFunction(getExtentRadius);
+
+	ms_playersListeningForServerAsteroidDebugData.clear();
+	ms_asteroids.clear();
+
+	ExitChain::add(ServerAsteroidManager::remove, "ServerAsteroidManager::remove", 0, false);
+}
+
+//-----------------------------------------------------------------------------
+
+void ServerAsteroidManager::remove()
+{
+	ms_playersListeningForServerAsteroidDebugData.clear();
+	ms_asteroids.clear();
+	ms_installed = false;
+}
+
+//-----------------------------------------------------------------------------
+
+ServerAsteroidManager::FieldHandle ServerAsteroidManager::getBadHandle()
+{
+	DEBUG_FATAL(!ms_installed, ("ServerAsteroidManager not installed"));
+	return BAD_HANDLE;
+}
+
+//-----------------------------------------------------------------------------
+
+/** Create a set of server objects for an asteroid field with the given seed data.
+    The same seed data will always generate the same field
+*/
+ServerAsteroidManager::FieldHandle ServerAsteroidManager::generateField(AsteroidGenerationManager::AsteroidFieldData const & fieldData)
+{
+	if(!ms_installed)
+	{
+		DEBUG_FATAL (true, ("ServerAsteroidManager not installed"));
+		return BAD_HANDLE;
+	}
+
+	std::vector<AsteroidGenerationManager::AsteroidData> asteroidDatas;
+	bool const result = AsteroidGenerationManager::generateField(fieldData, asteroidDatas);
+
+	if(!result)
+	{
+		DEBUG_FATAL(true, ("ServerAsteroidManager::generateField problem occured generating field"));
+		return BAD_HANDLE;
+	}
+
+	if(asteroidDatas.size() != static_cast<unsigned int>(fieldData.count))
+	{
+		DEBUG_FATAL(true, ("ServerAsteroidManager::generateField should have generated %d asteroids, but we have %d instead", fieldData.count, asteroidDatas.size()));
+		return BAD_HANDLE;
+	}
+
+	ServerObject * newAsteroid = NULL;
+
+	//TODO disable server-rotation for now, it apparently spams the client horribly
+//	RotationDynamics * rotationDynamics = NULL;
+
+	for(std::vector<AsteroidGenerationManager::AsteroidData>::iterator i = asteroidDatas.begin(); i != asteroidDatas.end(); ++i)
+	{
+		Transform tr;
+		tr.setPosition_p((*i).position);
+		tr.yaw_l((*i).orientation.x);
+		tr.pitch_l((*i).orientation.y);
+		tr.roll_l((*i).orientation.z);
+		newAsteroid = ServerWorld::createNewObject(i->templateCrc, tr, 0, false);
+
+		if(!newAsteroid)
+			continue;
+
+		//world cell, so add to world
+		newAsteroid->addToWorld();
+
+		newAsteroid->setScale(Vector(i->scale, i->scale, i->scale));
+
+//		rotationDynamics = new RotationDynamics (newAsteroid, i->rotationVector);
+//		rotationDynamics->setState (true);
+//		newAsteroid->setDynamics (rotationDynamics);
+
+		IGNORE_RETURN(newAsteroid->setObjVarItem("intNoDump", 1));
+
+		ms_asteroids.push_back(newAsteroid->getNetworkId());
+	}
+
+	return s_nextHandle++; //lint !e429 rotationDynamics not released (we don't own it)
+}
+
+//-----------------------------------------------------------------------------
+
+/** Generate the static asteroid fields for a given scene
+*/
+void ServerAsteroidManager::setupStaticFields(std::string const & sceneName)
+{
+	if(!ms_installed)
+	{
+		DEBUG_FATAL (true, ("ServerAsteroidManager not installed"));
+		return;
+	}
+
+	AsteroidGenerationManager::loadStaticFieldDataForScene(sceneName, true);
+	std::vector<AsteroidGenerationManager::AsteroidFieldData> const & data = AsteroidGenerationManager::getDataForScene(sceneName);
+	for(std::vector<AsteroidGenerationManager::AsteroidFieldData>::const_iterator i = data.begin(); i != data.end(); ++i)
+	{
+		FieldHandle const handle = generateField(*i);
+		UNREF(handle);
+	}
+}
+
+//-----------------------------------------------------------------------------
+
+/** Add the player to a list of players that gets send the server asteroid data.
+    Send the player an immediate update.
+*/
+void ServerAsteroidManager::listenforServerAsteroidDebugData(NetworkId const & player)
+{
+	UNREF(player);
+
+#ifdef _DEBUG
+	if(!ms_installed)
+	{
+		DEBUG_FATAL (true, ("ServerAsteroidManager not installed"));
+		return;
+	}
+
+	if(ConfigServerGame::getSendAsteroidExtents())
+	{
+		IGNORE_RETURN(ms_playersListeningForServerAsteroidDebugData.insert(player));
+		//send an immediate update
+		std::vector<Sphere> spheres;
+		getServerAsteroidData(spheres);
+		sendServerAsteroidDataToPlayer(player, spheres);
+	}
+#endif
+}
+
+//-----------------------------------------------------------------------------
+
+/** Remove the player from a list of players that gets send the server asteroid data
+*/
+void ServerAsteroidManager::endListenforServerAsteroidDebugData(NetworkId const & player)
+{
+	UNREF(player);
+
+#ifdef _DEBUG
+	if(!ms_installed)
+	{
+		DEBUG_FATAL (true, ("ServerAsteroidManager not installed"));
+		return;
+	}
+
+	if(ConfigServerGame::getSendAsteroidExtents())
+	{
+		IGNORE_RETURN(ms_playersListeningForServerAsteroidDebugData.erase(player));
+		//send an empty update to the client to clear out their data
+		std::vector<Sphere> spheres;
+		sendServerAsteroidDataToPlayer(player, spheres);
+	}
+#endif
+}
+
+//-----------------------------------------------------------------------------
+
+/** If enough time has elapsed, send an update of the server asteroid data to the appropriate players
+*/
+void ServerAsteroidManager::update(float elapsedTime)
+{
+	UNREF(elapsedTime);
+
+#ifdef _DEBUG
+	if(!ms_installed)
+	{
+		DEBUG_FATAL (true, ("ServerAsteroidManager not installed"));
+		return;
+	}
+
+	if(ConfigServerGame::getSendAsteroidExtents())
+	{
+		ms_timeSinceLastUpate += elapsedTime;
+		if(ms_timeSinceLastUpate >= cms_timeBetweenUpdates)
+		{
+			if(!ms_playersListeningForServerAsteroidDebugData.empty())
+			{
+				std::vector<Sphere> spheres;
+				getServerAsteroidData(spheres);
+				for(std::set<NetworkId>::iterator i2 = ms_playersListeningForServerAsteroidDebugData.begin(); i2 != ms_playersListeningForServerAsteroidDebugData.end(); ++i2)
+				{
+					sendServerAsteroidDataToPlayer(*i2, spheres);
+				}
+			}
+			ms_timeSinceLastUpate = 0.0f;
+		}
+	}
+#endif
+}
+
+//-----------------------------------------------------------------------------
+
+/** Build and return a vector of spheres corresponding to the server asteroids
+*/
+void ServerAsteroidManager::getServerAsteroidData(std::vector<Sphere> & /*OUT*/ spheres)
+{
+	if(!ms_installed)
+	{
+		DEBUG_FATAL (true, ("ServerAsteroidManager not installed"));
+		return;
+	}
+
+	spheres.clear();
+	for(std::vector<NetworkId>::iterator i = ms_asteroids.begin(); i != ms_asteroids.end(); ++i)
+	{
+		Object const * const o = NetworkIdManager::getObjectById(*i);
+		ServerObject const * const so = o ? o->asServerObject() : NULL;
+		if(so)
+		{
+			spheres.push_back(so->getSphereExtent());
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+
+/** Send a set of server asteroid data to the given player
+*/
+void ServerAsteroidManager::sendServerAsteroidDataToPlayer(NetworkId const & player, std::vector<Sphere> const & spheres)
+{
+	if(!ms_installed)
+	{
+		DEBUG_FATAL (true, ("ServerAsteroidManager not installed"));
+		return;
+	}
+
+	MessageQueueGenericValueType<std::vector<Sphere> > * const msg = new MessageQueueGenericValueType<std::vector<Sphere> >(spheres);
+
+	Object * const o = NetworkIdManager::getObjectById(player);
+	ServerObject * const so = o ? o->asServerObject() : NULL;
+	CreatureObject * const co = so ? so->asCreatureObject() : NULL;
+	Client const * const client = co ? co->getClient() : NULL;
+	if(client && co && co->isAuthoritative())
+	{
+		co->getController()->appendMessage(static_cast<int>(CM_serverAsteroidDebugData), 0.0f, msg,
+		GameControllerMessageFlags::SEND |
+		GameControllerMessageFlags::RELIABLE |
+		GameControllerMessageFlags::DEST_AUTH_CLIENT);
+	}
+}
+
+
+//-----------------------------------------------------------------------------
+
+float ServerAsteroidManager::getExtentRadius(uint32 serverTemplateCrc)
+{
+	float radius = 0.0f;
+	ObjectTemplate const * const ot = ObjectTemplateList::fetch(serverTemplateCrc);
+	if(ot)
+	{
+		ServerObjectTemplate const * const serverOT = ot->asServerObjectTemplate();
+		if(serverOT)
+		{
+			std::string const sharedTemplateName = serverOT->getSharedTemplate();
+			ObjectTemplate const * const ot2 = ObjectTemplateList::fetch(sharedTemplateName);
+			if(ot2)
+			{
+				SharedObjectTemplate const * const sharedOT = ot2->asSharedObjectTemplate();
+				if(sharedOT)
+				{
+					AppearanceTemplate const * const at = AppearanceTemplateList::fetch(sharedOT->getAppearanceFilename().c_str());
+					if(at)
+					{
+						Extent const * const extent = at->getCollisionExtent();
+						if(extent)
+						{
+							radius = extent->getSphere().getRadius();
+							if (radius==0.0f)
+							{
+								DEBUG_WARNING(true,("Data problem:  Object template %s has radius 0",
+													ObjectTemplateList::lookUp(serverTemplateCrc).getString()));
+								radius=5.0f;
+							}
+						}
+						AppearanceTemplateList::release(at);
+					}
+				}
+				ot2->releaseReference();
+			}
+		}
+		ot->releaseReference();
+	}
+
+	return radius;
+}
+
+// ============================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ServerAsteroidManager.h b/engine/server/library/serverGame/src/shared/space/ServerAsteroidManager.h
new file mode 100644
index 00000000..aaf10145
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ServerAsteroidManager.h
@@ -0,0 +1,57 @@
+// ============================================================================
+//
+// ServerAsteroidManager.h
+// Copyright 2004 Sony Online Entertainment, Inc.
+//
+// ============================================================================
+
+#ifndef INCLUDED_ServerAsteroidManager_H
+#define INCLUDED_ServerAsteroidManager_H
+
+// ============================================================================
+
+#include "sharedGame/AsteroidGenerationManager.h"
+
+class ConstCharCrcString;
+class NetworkId;
+class Sphere;
+class Vector;
+
+// ============================================================================
+
+class ServerAsteroidManager
+{
+public:
+	typedef int FieldHandle;
+
+	static void install();
+	static FieldHandle generateField(AsteroidGenerationManager::AsteroidFieldData const & fieldData);
+	static FieldHandle getBadHandle();
+	static void setupStaticFields(std::string const & sceneName);
+	static void update(float elapsedTime);
+	static void listenforServerAsteroidDebugData(NetworkId const & player);
+	static void endListenforServerAsteroidDebugData(NetworkId const & player);
+	static float getExtentRadius(uint32 sharedTemplateCrc);
+
+private:
+	static void remove();
+	static void getServerAsteroidData(stdvector<Sphere>::fwd & /*OUT*/ spheres);
+	static void sendServerAsteroidDataToPlayer(NetworkId const & player, stdvector<Sphere>::fwd const & spheres);
+
+private:
+	static FieldHandle const BAD_HANDLE;
+	static FieldHandle s_nextHandle;
+	static stdset<NetworkId>::fwd ms_playersListeningForServerAsteroidDebugData;
+	static stdvector<NetworkId>::fwd ms_asteroids;
+
+private:
+	//disabled
+	ServerAsteroidManager();
+	~ServerAsteroidManager();
+	ServerAsteroidManager(ServerAsteroidManager const &);
+	ServerAsteroidManager &operator =(ServerAsteroidManager const &);
+};
+
+// ============================================================================
+
+#endif // INCLUDED_ServerAsteroidManager_H
diff --git a/engine/server/library/serverGame/src/shared/space/ServerShipComponentData.cpp b/engine/server/library/serverGame/src/shared/space/ServerShipComponentData.cpp
new file mode 100644
index 00000000..b0817411
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ServerShipComponentData.cpp
@@ -0,0 +1,227 @@
+//======================================================================
+//
+// ServerShipComponentData.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerShipComponentData.h"
+
+#include "serverGame/ShipObject.h"
+#include "sharedGame/ShipComponentDescriptor.h"
+#include "UnicodeUtils.h"
+
+//======================================================================
+
+namespace ServerShipComponentDataNamespace
+{
+	namespace Objvars
+	{
+		std::string const armorHitpointsCurrent        = "ship_comp.armor_hitpoints_current";
+		std::string const armorHitpointsMaximum        = "ship_comp.armor_hitpoints_maximum";
+		std::string const energyMaintenanceRequirement = "ship_comp.energy_maintenance_requirement";
+		std::string const mass                         = "ship_comp.mass";
+		std::string const hitpointsCurrent             = "ship_comp.hitpoints_current";
+		std::string const hitpointsMaximum             = "ship_comp.hitpoints_maximum";
+		std::string const flags                        = "ship_comp.flags";
+	}
+}
+
+using namespace ServerShipComponentDataNamespace;
+
+//----------------------------------------------------------------------
+
+ServerShipComponentData::ServerShipComponentData (ShipComponentDescriptor const & shipComponentDescriptor) :
+ShipComponentData      (shipComponentDescriptor)
+{
+}
+
+//----------------------------------------------------------------------
+
+ServerShipComponentData::~ServerShipComponentData ()
+{
+}
+
+//----------------------------------------------------------------------
+
+bool ServerShipComponentData::readDataFromShip      (int const chassisSlot, ShipObject const & ship)
+{
+	m_armorHitpointsMaximum        = ship.getComponentArmorHitpointsMaximum        (chassisSlot);
+	m_armorHitpointsCurrent        = ship.getComponentArmorHitpointsCurrent        (chassisSlot);
+	m_efficiencyGeneral            = ship.getComponentEfficiencyGeneral            (chassisSlot);
+	m_efficiencyEnergy             = ship.getComponentEfficiencyEnergy             (chassisSlot);
+	m_energyMaintenanceRequirement = ship.getComponentEnergyMaintenanceRequirement (chassisSlot);
+	m_mass                         = ship.getComponentMass                         (chassisSlot);
+	m_hitpointsCurrent             = ship.getComponentHitpointsCurrent             (chassisSlot);
+	m_hitpointsMaximum             = ship.getComponentHitpointsMaximum             (chassisSlot);
+	m_flags                        = ship.getComponentFlags                        (chassisSlot);
+
+	m_name = ship.getComponentName(chassisSlot);
+	m_creator = ship.getComponentCreator(chassisSlot);
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ServerShipComponentData::writeDataToShip       (int const chassisSlot, ShipObject & ship) const
+{
+	if (!m_descriptor)
+		return;
+
+	ship.setComponentCrc(chassisSlot, m_descriptor->getCrc());
+
+	IGNORE_RETURN(ship.setComponentArmorHitpointsMaximum(chassisSlot, m_armorHitpointsMaximum));
+	IGNORE_RETURN(ship.setComponentArmorHitpointsCurrent(chassisSlot, m_armorHitpointsCurrent));
+	IGNORE_RETURN(ship.setComponentEfficiencyGeneral(chassisSlot, m_efficiencyGeneral));
+	IGNORE_RETURN(ship.setComponentEfficiencyEnergy(chassisSlot, m_efficiencyEnergy));
+	IGNORE_RETURN(ship.setComponentEnergyMaintenanceRequirement(chassisSlot, m_energyMaintenanceRequirement));
+	IGNORE_RETURN(ship.setComponentMass(chassisSlot, m_mass));
+	IGNORE_RETURN(ship.setComponentHitpointsMaximum(chassisSlot, m_hitpointsMaximum));
+	IGNORE_RETURN(ship.setComponentHitpointsCurrent(chassisSlot, m_hitpointsCurrent));
+	IGNORE_RETURN(ship.setComponentFlags(chassisSlot, m_flags));
+	IGNORE_RETURN(ship.setComponentName(chassisSlot, m_name));
+	IGNORE_RETURN(ship.setComponentCreator(chassisSlot, m_creator));
+}
+
+//----------------------------------------------------------------------
+
+bool ServerShipComponentData::readDataFromComponent (TangibleObject const & component)
+{
+	if (component.getObjectTemplate () == NULL)
+	{
+		WARNING (true, ("ShipComponentData [%s] has no object template", component.getNetworkId ().getValueString ().c_str ()));
+		return false;
+	}
+
+	uint32 const objectTemplateCrc = component.getObjectTemplate ()->getCrcName ().getCrc ();
+	m_descriptor = ShipComponentDescriptor::findShipComponentDescriptorByObjectTemplate (objectTemplateCrc);
+
+	if (!m_descriptor)
+	{
+		WARNING (true, ("ShipComponentData [%s]  does not map to a component", component.getNetworkId ().getValueString ().c_str ()));
+		return false;
+	}
+
+	DynamicVariableList const &  objvars = component.getObjVars ();
+
+	if (!objvars.getItem (Objvars::armorHitpointsCurrent, m_armorHitpointsCurrent))
+		WARNING (true, ("ShipComponentData [%s] has no armorHitpointsCurrent [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::armorHitpointsCurrent.c_str ()));
+
+	if (!objvars.getItem (Objvars::armorHitpointsMaximum, m_armorHitpointsMaximum))
+		WARNING (true, ("ShipComponentData [%s] has no armorHitpointsMaximum [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::armorHitpointsMaximum.c_str ()));
+
+	if (!objvars.getItem (Objvars::energyMaintenanceRequirement, m_energyMaintenanceRequirement))
+		WARNING (true, ("ShipComponentData [%s] has no energyMaintenanceRequirement [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::energyMaintenanceRequirement.c_str ()));
+
+	if (!objvars.getItem (Objvars::mass, m_mass))
+		WARNING (true, ("ShipComponentData [%s] has no mass [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::mass.c_str ()));
+
+	if (!objvars.getItem (Objvars::hitpointsCurrent, m_hitpointsCurrent))
+		WARNING (true, ("ShipComponentData [%s] has no hitpointsCurrent [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::hitpointsCurrent.c_str ()));
+
+	if (!objvars.getItem (Objvars::hitpointsMaximum, m_hitpointsMaximum))
+		WARNING (true, ("ShipComponentData [%s] has no hitpointsMaximum [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::hitpointsMaximum.c_str ()));
+
+	if (!objvars.getItem (Objvars::flags, m_flags))
+		WARNING (true, ("ShipComponentData [%s] has no flags [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::flags.c_str ()));
+
+	m_name = component.getAssignedObjectName();
+	m_creator = component.getCreatorId();
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ServerShipComponentData::writeDataToComponent  (TangibleObject & component) const
+{
+	if (m_descriptor == NULL)
+	{
+		WARNING (true, ("ShipComponentData::writeDataToComponent [%s] null descriptor", component.getNetworkId ().getValueString ().c_str ()));
+		return;
+	}
+
+	if (component.getObjectTemplate () == NULL)
+	{
+		WARNING (true, ("ShipComponentData::writeDataToComponent [%s] has no object template", component.getNetworkId ().getValueString ().c_str ()));
+		return;
+	}
+
+	if (m_descriptor->getObjectTemplateCrc () != component.getObjectTemplate ()->getCrcName ().getCrc ())
+	{
+		WARNING (true, ("ShipComponentData::writeDataToComponent [%s] writeDataToComponent failed... wrong object template", component.getNetworkId ().getValueString ().c_str ()));
+		return;
+	}
+
+	ShipComponentDescriptor const * const shipComponentDescriptor = 
+		ShipComponentDescriptor::findShipComponentDescriptorByObjectTemplate (component.getObjectTemplate ()->getCrcName ().getCrc ());
+
+	if (shipComponentDescriptor != m_descriptor)
+	{
+		WARNING (true, ("ShipComponentData::writeDataToComponent [%s] does not match ship component descriptor", component.getNetworkId ().getValueString ().c_str ()));
+		return;
+	}
+
+	IGNORE_RETURN(component.setObjVarItem(Objvars::armorHitpointsCurrent, m_armorHitpointsCurrent));
+	IGNORE_RETURN(component.setObjVarItem(Objvars::armorHitpointsMaximum, m_armorHitpointsMaximum));
+	IGNORE_RETURN(component.setObjVarItem(Objvars::energyMaintenanceRequirement, m_energyMaintenanceRequirement));
+	IGNORE_RETURN(component.setObjVarItem(Objvars::mass, m_mass));
+	IGNORE_RETURN(component.setObjVarItem(Objvars::hitpointsCurrent, m_hitpointsCurrent));
+	IGNORE_RETURN(component.setObjVarItem(Objvars::hitpointsMaximum, m_hitpointsMaximum));	
+	IGNORE_RETURN(component.setObjVarItem(Objvars::flags, m_flags));
+
+	component.setObjectName(m_name);
+	component.setCreatorId(m_creator);
+}
+
+//----------------------------------------------------------------------
+
+void ServerShipComponentData::printDebugString      (Unicode::String & result, Unicode::String const & padding) const
+{
+	if (m_descriptor == NULL)
+		return;
+
+	char buf [2048];
+	const size_t buf_size = sizeof (buf);
+
+	std::string const & nPad = Unicode::wideToNarrow (padding);
+
+	float oo_efficiencyEnergy = m_efficiencyEnergy;
+	if (oo_efficiencyEnergy > 0.0f)
+		oo_efficiencyEnergy = RECIP (oo_efficiencyEnergy);
+
+	snprintf (buf, buf_size,
+		"%s\\#pcontrast2 Descriptor:\\#.\n"
+		"%s    Name: %s (%s), (%s) compat:[%s]\n"
+		"%sArmor: %f/%f, Hitpoints: %f/%f\n"
+		"%sEfficiency: gen: %f, energy: %f\n"
+		"%sEnergy Req: %f (%f)\n"
+		"%sMass: %f\n"
+		"%sFlags: %d\n"
+		"%s----------\n",
+		nPad.c_str (),
+		nPad.c_str (), m_descriptor->getName ().getString (), Unicode::wideToNarrow(m_name).c_str(),
+		ShipComponentType::getNameFromType (m_descriptor->getComponentType ()).c_str (),
+		m_descriptor->getCompatibility ().getString (),
+		nPad.c_str (), m_armorHitpointsCurrent, m_armorHitpointsMaximum,
+		m_hitpointsCurrent, m_hitpointsMaximum,
+		nPad.c_str (), m_efficiencyGeneral, m_efficiencyEnergy,
+		nPad.c_str (), m_energyMaintenanceRequirement, m_energyMaintenanceRequirement * oo_efficiencyEnergy,
+		nPad.c_str (), m_mass,
+		nPad.c_str (), m_flags,
+		nPad.c_str ());
+
+	result += Unicode::narrowToWide (buf);
+}
+
+//----------------------------------------------------------------------
+
+void ServerShipComponentData::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const
+{
+	//everything is handled in the shared, base class
+	ShipComponentData::getAttributes(data);
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ServerShipComponentData.h b/engine/server/library/serverGame/src/shared/space/ServerShipComponentData.h
new file mode 100644
index 00000000..8ce1a5b9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ServerShipComponentData.h
@@ -0,0 +1,40 @@
+//======================================================================
+//
+// ServerShipComponentData.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ServerShipComponentData_H
+#define INCLUDED_ServerShipComponentData_H
+
+//======================================================================
+
+#include "sharedGame/ShipComponentData.h"
+
+//----------------------------------------------------------------------
+
+class ServerShipComponentData : public ShipComponentData
+{
+public:
+
+	explicit ServerShipComponentData (ShipComponentDescriptor const & shipComponentDescriptor);
+	virtual ~ServerShipComponentData ();
+
+	virtual bool readDataFromShip      (int chassisSlot, ShipObject const & ship);
+	virtual void writeDataToShip       (int chassisSlot, ShipObject & ship) const;
+	virtual bool readDataFromComponent (TangibleObject const & component);
+	virtual void writeDataToComponent  (TangibleObject & component) const;
+
+	virtual void printDebugString      (Unicode::String & result, Unicode::String const & padding) const;
+
+	virtual void getAttributes         (stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const;
+
+private:
+	ServerShipComponentData (const ServerShipComponentData & rhs);
+	ServerShipComponentData & operator= (const ServerShipComponentData & rhs);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/ServerShipTargeting.cpp b/engine/server/library/serverGame/src/shared/space/ServerShipTargeting.cpp
new file mode 100644
index 00000000..694861df
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ServerShipTargeting.cpp
@@ -0,0 +1,198 @@
+//=======================================================================
+//
+// ShipTargeting.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//=======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerShipTargeting.h"
+
+#include "serverGame/Pvp.h"
+#include "serverGame/ServerSharedObjectTemplateInterface.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/TangibleObject.h"
+
+#include <vector>
+
+//=======================================================================
+
+namespace ServerShipTargetingNamespace
+{
+	static ServerSharedObjectTemplateInterface const cs_sharedObjectTemplateInterface;
+
+	bool actorAndTargetAreFriends(Object const * actor, Object const * target);
+	bool actorAndTargetAreEnemies(Object const * actor, Object const * target);
+	bool actorAndTargetAreEnemiesAndTargetIsPlayer(Object const * actor, Object const * target);
+	bool actorAndTargetAreFriendsAndTargetIsPlayer(Object const * actor, Object const * target);
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerShipTargetingNamespace::actorAndTargetAreFriends(Object const * const actor, Object const * const target)
+{
+	return !actorAndTargetAreEnemies(actor, target);
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerShipTargetingNamespace::actorAndTargetAreEnemies(Object const * const actor, Object const * const target)
+{
+	TangibleObject const * tangibleActor = 0;
+
+	if (actor != 0)
+	{
+		ServerObject const * const serverObject = actor->asServerObject();
+		if (serverObject != 0)
+		{
+			tangibleActor = serverObject->asTangibleObject();
+		}
+	}
+
+	TangibleObject const * tangibleTarget = 0;
+
+	if (target != 0)
+	{
+		ServerObject const * const serverObject = target->asServerObject();
+		if (serverObject != 0)
+		{
+			tangibleTarget = serverObject->asTangibleObject();
+		}
+	}
+
+	if ((tangibleActor != 0) && (tangibleTarget != 0))
+	{
+		return Pvp::isEnemy(*tangibleActor, *tangibleTarget);
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerShipTargetingNamespace::actorAndTargetAreEnemiesAndTargetIsPlayer(Object const * const actor, Object const * const target)
+{
+	if (actorAndTargetAreEnemies(actor, target))
+	{
+		return ShipTargeting::isPlayerShip(cs_sharedObjectTemplateInterface, target);
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+bool ServerShipTargetingNamespace::actorAndTargetAreFriendsAndTargetIsPlayer(Object const * const actor, Object const * const target)
+{
+	if (actorAndTargetAreFriends(actor, target))
+	{
+		return ShipTargeting::isPlayerShip(cs_sharedObjectTemplateInterface, target);
+	}
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+using namespace ServerShipTargetingNamespace;
+
+//=======================================================================
+
+Object * ServerShipTargeting::closestShip(Object const * const targetingObject)
+{
+	return ShipTargeting::sweepForClosestShip(cs_sharedObjectTemplateInterface, targetingObject);
+}
+
+// ----------------------------------------------------------------------
+
+Object * ServerShipTargeting::closestCapShip(Object const * const targetingObject)
+{
+	return ShipTargeting::sweepForClosestCapShip(cs_sharedObjectTemplateInterface, targetingObject);
+}
+
+// ----------------------------------------------------------------------
+
+Object * ServerShipTargeting::closestUnderReticle(Object const * const targetingObject)
+{
+	return ShipTargeting::sweepForClosestUnderReticle(cs_sharedObjectTemplateInterface, targetingObject);
+}
+
+// ----------------------------------------------------------------------
+
+Object * ServerShipTargeting::closestPlayer(Object const * const targetingObject)
+{
+	return ShipTargeting::sweepForClosestPlayer(cs_sharedObjectTemplateInterface, targetingObject);
+}
+
+// ----------------------------------------------------------------------
+
+Object * ServerShipTargeting::closestNPC(Object const * const targetingObject)
+{
+	return ShipTargeting::sweepForClosestNPC(cs_sharedObjectTemplateInterface, targetingObject);
+}
+
+// ----------------------------------------------------------------------
+
+Object * ServerShipTargeting::closestEnemy(Object const * const targetingObject)
+{
+	return sweepForClosestShipWithRelationShip(cs_sharedObjectTemplateInterface, targetingObject, actorAndTargetAreEnemies);
+}
+
+// ----------------------------------------------------------------------
+
+Object * ServerShipTargeting::closestEnemyPlayer(Object const * const targetingObject)
+{
+	return sweepForClosestShipWithRelationShip(cs_sharedObjectTemplateInterface, targetingObject, actorAndTargetAreEnemiesAndTargetIsPlayer);
+}
+
+// ----------------------------------------------------------------------
+
+Object * ServerShipTargeting::closestFriend(Object const * const targetingObject)
+{
+	return sweepForClosestShipWithRelationShip(cs_sharedObjectTemplateInterface, targetingObject, actorAndTargetAreFriends);
+}
+
+// ----------------------------------------------------------------------
+
+Object * ServerShipTargeting::closestFriendPlayer(Object const * const targetingObject)
+{
+	return sweepForClosestShipWithRelationShip(cs_sharedObjectTemplateInterface, targetingObject, actorAndTargetAreFriendsAndTargetIsPlayer);
+}
+
+// ----------------------------------------------------------------------
+
+Object * ServerShipTargeting::getNextFriendlyTarget(Object const * const targetingObject, Object const * const currentTarget)
+{
+	ShipTargeting::ObjectVector resultObjects;
+	ShipTargeting::sweepForShipsWithRelationship(cs_sharedObjectTemplateInterface, targetingObject, actorAndTargetAreFriends, resultObjects);
+	return getNextTarget(resultObjects, currentTarget);
+}
+
+// ----------------------------------------------------------------------
+
+Object * ServerShipTargeting::getPreviousFriendlyTarget(Object const * const targetingObject, Object const * const currentTarget)
+{
+	ShipTargeting::ObjectVector resultObjects;
+	ShipTargeting::sweepForShipsWithRelationship(cs_sharedObjectTemplateInterface, targetingObject, actorAndTargetAreFriends, resultObjects);
+	return getPreviousTarget(resultObjects, currentTarget);
+}
+
+// ----------------------------------------------------------------------
+
+Object * ServerShipTargeting::getNextEnemyTarget(Object const * const targetingObject, Object const * const currentTarget)
+{
+	ShipTargeting::ObjectVector resultObjects;
+	ShipTargeting::sweepForShipsWithRelationship(cs_sharedObjectTemplateInterface, targetingObject, actorAndTargetAreEnemies, resultObjects);
+	return getNextTarget(resultObjects, currentTarget);
+}
+
+// ----------------------------------------------------------------------
+
+Object * ServerShipTargeting::getPreviousEnemyTarget(Object const * const targetingObject, Object const * const currentTarget)
+{
+	ShipTargeting::ObjectVector resultObjects;
+	ShipTargeting::sweepForShipsWithRelationship(cs_sharedObjectTemplateInterface, targetingObject, actorAndTargetAreEnemies, resultObjects);
+	return getPreviousTarget(resultObjects, currentTarget);
+}
+
+//=======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ServerShipTargeting.h b/engine/server/library/serverGame/src/shared/space/ServerShipTargeting.h
new file mode 100644
index 00000000..2a8ebdb9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ServerShipTargeting.h
@@ -0,0 +1,48 @@
+//======================================================================
+//
+// ServerShipTargeting.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ServerShipTargeting_H
+#define INCLUDED_ServerShipTargeting_H
+
+#include "sharedGame/ShipTargeting.h"
+
+//======================================================================
+
+class Object;
+
+//----------------------------------------------------------------------
+
+class ServerShipTargeting : public ShipTargeting
+{
+public:
+
+	static Object * closestShip(Object const * targetingObject);
+	static Object * closestCapShip(Object const * targetingObject);
+	static Object * closestUnderReticle(Object const * targetingObject);
+	static Object * closestPlayer(Object const * targetingObject);
+	static Object * closestNPC(Object const * targetingObject);
+	static Object * closestEnemy(Object const * targetingObject);
+	static Object * closestEnemyPlayer(Object const * targetingObject);
+	static Object * closestFriend(Object const * targetingObject);
+	static Object * closestFriendPlayer(Object const * targetingObject);
+
+	static Object * getNextFriendlyTarget(Object const * targetingObject, Object const * currentTarget);
+	static Object * getPreviousFriendlyTarget(Object const * targetingObject, Object const * currentTarget);
+
+	static Object * getNextEnemyTarget(Object const * targetingObject, Object const * currentTarget);
+	static Object * getPreviousEnemyTarget(Object const * targetingObject, Object const * currentTarget);
+
+private:
+
+	ServerShipTargeting();
+	ServerShipTargeting(ServerShipTargeting const & copy);
+	ServerShipTargeting & operator=(ServerShipTargeting const & copy);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/ShipAiEnemySearchManager.cpp b/engine/server/library/serverGame/src/shared/space/ShipAiEnemySearchManager.cpp
new file mode 100644
index 00000000..aca06580
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipAiEnemySearchManager.cpp
@@ -0,0 +1,142 @@
+// ======================================================================
+//
+// ShipAiEnemySearchManager.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipAiEnemySearchManager.h"
+
+#include "serverGame/AiShipController.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/SpaceAttackSquad.h"
+#include "serverGame/SpaceVisibilityManager.h"
+#include "sharedLog/Log.h"
+#include <queue>
+
+// ======================================================================
+
+namespace ShipAiEnemySearchManagerNamespace
+{
+	std::queue<Watcher<ShipObject> > s_enemySearchQueue;
+
+	void checkForEnemies(ShipObject &ship);
+
+	int const s_maxNumberOfAttackingShips = 10;
+}
+
+using namespace ShipAiEnemySearchManagerNamespace;
+
+// ======================================================================
+
+void ShipAiEnemySearchManager::update()
+{
+	int count = std::min(static_cast<int>(s_enemySearchQueue.size()), ConfigServerGame::getSpaceAiEnemySearchesPerFrame());
+
+	for (int i = 0; i < count; ++i)
+	{
+		ShipObject * const ship = s_enemySearchQueue.front().getPointer();
+		if (ship)
+			checkForEnemies(*ship);
+		s_enemySearchQueue.pop();
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ShipAiEnemySearchManager::add(ShipObject &ship)
+{
+	s_enemySearchQueue.push(Watcher<ShipObject>(&ship));
+}
+
+// ----------------------------------------------------------------------
+
+void ShipAiEnemySearchManagerNamespace::checkForEnemies(ShipObject &ship)
+{
+	ShipController * const shipController = NON_NULL(ship.getController()->asShipController());
+
+	if (shipController)
+	{
+		AiShipController * const aiShipController = (shipController != NULL) ? shipController->asAiShipController() : NULL;
+		float const aggroRadiusSquared = sqr((aiShipController != NULL) ? aiShipController->getAggroRadius() : 512.0f); // 512.0f is the distance at which turrets on player ships start getting targets
+		Vector const shipPosition_w = ship.getPosition_w();
+		
+		static std::vector<ServerObject *> s_visibilityList;
+		static std::vector<ShipObject *> s_enemyList;
+
+		// Get visible objects
+		SpaceVisibilityManager::getObjectsVisibleFromLocation(ship.getPosition_w(), s_visibilityList);
+
+		{
+			// Filter visible objects for enemies
+			for (std::vector<ServerObject *>::const_iterator i = s_visibilityList.begin(); i != s_visibilityList.end(); ++i)
+			{
+				ServerObject * const visibleServerObject = (*i);
+				ShipObject * const visibleShipObject = visibleServerObject->asShipObject();
+
+				if (visibleShipObject)
+				{
+					if (   (visibleShipObject->getPosition_w().magnitudeBetweenSquared(shipPosition_w) < aggroRadiusSquared)
+						&& !visibleShipObject->isAutoAggroImmune())
+					{
+						if (Pvp::isEnemy(ship, *visibleShipObject))
+						{
+							if (aiShipController->isValidTarget(*visibleShipObject))
+							{
+								s_enemyList.push_back(visibleShipObject);
+							}
+						}
+					}
+				}
+			}
+		}
+		s_visibilityList.clear();
+
+		// Randomly pick an enemy and attack
+		if (!s_enemyList.empty())
+		{
+			if (ship.isCapitalShip())
+			{
+				// Capital ship -- put all enemies into the list (because it can attack multiple enemies using turrets)
+				float const damage = 1.0f;
+				for (std::vector<ShipObject *>::const_iterator i=s_enemyList.begin(); i!=s_enemyList.end(); ++i)
+				{
+					IGNORE_RETURN(shipController->addDamageTaken((*i)->getNetworkId(), damage, false));
+
+					LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("ShipAiEnemySearchManagerNamespace::checkForEnemies() ENEMY DETECTED: enemy(%s) totalEnemies(%u)", (*i)->getNetworkId().getValueString().c_str(), s_enemyList.size()));
+				}
+			}	
+			else
+			{
+				// Fighter -- pick a random enemy
+				unsigned int const randomIndex = static_cast<unsigned int>(rand() % static_cast<int>(s_enemyList.size()));
+				float const damage = 1.0f;
+				ShipObject * const enemy = s_enemyList[randomIndex];
+				ShipController * const enemyShipController = enemy->getController()->asShipController();
+
+				if (enemyShipController != NULL)
+				{
+					// Limit the number of ships that can attack a single enemy
+
+					int const attackingCount = enemyShipController->getNumberOfAiUnitsAttackingMe();
+
+					if (attackingCount < s_maxNumberOfAttackingShips)
+					{
+						IGNORE_RETURN(aiShipController->getAttackSquad().addDamageTaken(enemy->getNetworkId(), damage));
+
+						LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("ShipAiEnemySearchManagerNamespace::checkForEnemies() ENEMY DETECTED: enemy(%s) totalEnemies(%u) numberAttackTheEnemy(%d)", enemy->getNetworkId().getValueString().c_str(), s_enemyList.size(), attackingCount));
+					}
+				}
+			}
+		}
+		s_enemyList.clear();
+
+		shipController->clearEnemyCheckQueuedFlag();
+	}
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/space/ShipAiEnemySearchManager.h b/engine/server/library/serverGame/src/shared/space/ShipAiEnemySearchManager.h
new file mode 100644
index 00000000..07a3fe00
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipAiEnemySearchManager.h
@@ -0,0 +1,28 @@
+// ======================================================================
+//
+// ShipAiEnemySearchManager.h
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ShipAiEnemySearchManager_H
+#define INCLUDED_ShipAiEnemySearchManager_H
+
+// ======================================================================
+
+class ShipObject;
+
+// ======================================================================
+
+class ShipAiEnemySearchManager
+{
+public:
+	static void update();
+	static void add(ShipObject &ship);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_ShipAiEnemySearchManager_H
+
diff --git a/engine/server/library/serverGame/src/shared/space/ShipAiReactionManager.cpp b/engine/server/library/serverGame/src/shared/space/ShipAiReactionManager.cpp
new file mode 100644
index 00000000..2de3506e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipAiReactionManager.cpp
@@ -0,0 +1,230 @@
+// ======================================================================
+//
+// ShipAiReactionManager.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipAiReactionManager.h"
+
+#include "serverGame/PvpUpdateObserver.h"
+#include "serverGame/ShipObject.h"
+#include "sharedFile/Iff.h"
+#include "sharedFoundation/Crc.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/PersistentCrcString.h"
+#include "sharedUtility/DataTable.h"
+
+// ======================================================================
+
+namespace ShipAiReactionManagerNamespace
+{
+
+	// ----------------------------------------------------------------------
+
+	void remove();
+	void loadSpaceMobileData();
+
+	// ----------------------------------------------------------------------
+
+	struct MobileData
+	{
+		MobileData() :
+			m_aggro(false),
+			m_faction(0),
+			m_alliedFactionList(),
+			m_enemyFactionList(),
+			m_shipClass(ShipAiReactionManager::SC_invalid)
+		{
+		}
+
+		bool m_aggro;
+		uint32 m_faction;
+		std::vector<uint32> m_alliedFactionList;
+		std::vector<uint32> m_enemyFactionList;
+		ShipAiReactionManager::ShipClass m_shipClass;
+
+	private:
+		MobileData &operator=(MobileData const &);
+	};
+				
+	// ----------------------------------------------------------------------
+
+	typedef std::map<PersistentCrcString, MobileData> MobileDataList;
+	MobileDataList s_mobileDataList;
+
+	// ----------------------------------------------------------------------
+
+};
+
+using namespace ShipAiReactionManagerNamespace;
+
+// ======================================================================
+
+void ShipAiReactionManager::install()
+{
+	s_mobileDataList.clear();
+	loadSpaceMobileData();
+
+	ExitChain::add(ShipAiReactionManagerNamespace::remove, "ShipAiReactionManagerNamespace::remove");
+}
+
+// ----------------------------------------------------------------------
+
+void ShipAiReactionManagerNamespace::remove()
+{
+	s_mobileDataList.clear();
+}
+
+// ----------------------------------------------------------------------
+
+void ShipAiReactionManagerNamespace::loadSpaceMobileData()
+{
+	// Create the data table
+
+	Iff iff;
+
+	if (iff.open("datatables/space_mobile/space_mobile.iff", true))
+	{
+		DataTable dataTable;
+		dataTable.load(iff);
+
+		int const rowCount = dataTable.getNumRows();
+
+		for (int row = 0; row < rowCount; ++row)
+		{
+			MobileData mobileData;
+
+			mobileData.m_aggro = (dataTable.getIntValue("isAggro", row) != 0);
+			mobileData.m_faction = Crc::calculate(dataTable.getStringValue("space_faction", row));
+			
+			std::string const alliedFactions(dataTable.getStringValue("alliedFactions", row));
+
+			if (alliedFactions.size() > 0)
+			{
+				int startPosition = 0;
+				int endPosition = 0;
+				do
+				{
+					endPosition = static_cast<int>(alliedFactions.find_first_of(",", static_cast<unsigned int>(startPosition)));
+					std::string const alliedFaction(alliedFactions.substr(static_cast<unsigned int>(startPosition), static_cast<unsigned int>(endPosition)));
+					uint32 const crc = Crc::calculate(alliedFaction.c_str());
+					if (std::find(mobileData.m_alliedFactionList.begin(), mobileData.m_alliedFactionList.end(), crc) == mobileData.m_alliedFactionList.end())
+						mobileData.m_alliedFactionList.push_back(crc);
+					startPosition = endPosition + 1;
+
+				} while (endPosition != static_cast<int>(std::string::npos));
+			}
+
+			std::string const enemyFactions(dataTable.getStringValue("enemyFactions", row));
+
+			if (enemyFactions.size() > 0)
+			{
+				int startPosition = 0;
+				int endPosition = 0;
+				do
+				{
+					endPosition = static_cast<int>(enemyFactions.find_first_of(",", static_cast<unsigned int>(startPosition)));
+					std::string const enemyFaction(enemyFactions.substr(static_cast<unsigned int>(startPosition), static_cast<unsigned int>(endPosition)));
+					uint32 const crc = Crc::calculate(enemyFaction.c_str());
+					if (std::find(mobileData.m_enemyFactionList.begin(), mobileData.m_enemyFactionList.end(), crc) == mobileData.m_enemyFactionList.end())
+						mobileData.m_enemyFactionList.push_back(crc);
+					startPosition = endPosition + 1;
+
+				} while (endPosition != static_cast<int>(std::string::npos));
+			}
+
+			mobileData.m_shipClass = static_cast<ShipAiReactionManager::ShipClass>(dataTable.getIntValue("shipClass", row));
+	
+			IGNORE_RETURN(s_mobileDataList.insert(std::make_pair(PersistentCrcString(dataTable.getStringValue("strIndex", row), false), mobileData)));
+		}
+	}
+	else
+	{
+		WARNING(true, ("Unable to load the AI space_mobile.iff, this means the AI is not going to work very well!"));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ShipAiReactionManager::setShipSpaceMobileType(ShipObject &ship, PersistentCrcString const &spaceMobileType)
+{
+	PvpUpdateObserver(&ship, Archive::ADOO_generic);
+
+	MobileDataList::const_iterator const i = s_mobileDataList.find(spaceMobileType);
+	FATAL(i == s_mobileDataList.end(), ("ShipAiReactionManager::setShipSpaceMobileType: invalid space_mobile type '%s' for ship %s", spaceMobileType.getString(), ship.getNetworkId().getValueString().c_str()));
+
+	ship.setSpaceFaction((*i).second.m_faction);
+	ship.setSpaceFactionAllies((*i).second.m_alliedFactionList);
+	ship.setSpaceFactionEnemies((*i).second.m_enemyFactionList);
+	ship.setSpaceFactionIsAggro((*i).second.m_aggro);
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipAiReactionManager::isAlly(ShipObject const &actor, ShipObject const &target)
+{
+	// actors are never allies of unfactioned targets
+	uint32 const targetFaction = target.getSpaceFaction();
+	if (!targetFaction)
+		return false;
+
+	// if the target's faction is on the actor's ally list, they are allies
+	std::vector<uint32> const &allyList = actor.getSpaceFactionAllies();
+	return std::find(allyList.begin(), allyList.end(), targetFaction) != allyList.end();
+}
+
+// ----------------------------------------------------------------------
+
+bool ShipAiReactionManager::isEnemy(ShipObject const &actor, ShipObject const &target)
+{
+	// allies are not enemies
+	if (isAlly(actor, target) || isAlly(target, actor))
+		return false;
+
+	// if the target's faction is nonzero and on the actor's enemy list, they are enemies
+	uint32 const targetFaction = target.getSpaceFaction();
+	if (targetFaction)
+	{
+		std::vector<uint32> const &enemyList = actor.getSpaceFactionEnemies();
+		if (std::find(enemyList.begin(), enemyList.end(), targetFaction) != enemyList.end())
+			return true;
+	}
+
+	// aggro non-allies are enemies
+	if (   (actor.isPlayerShip() && target.getSpaceFactionIsAggro())
+	    || (target.isPlayerShip() && actor.getSpaceFactionIsAggro()))
+		return true;
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+
+ShipAiReactionManager::ShipClass ShipAiReactionManager::getShipClass(PersistentCrcString const & spaceMobileType)
+{
+	MobileDataList::const_iterator const iterMobileDataList = s_mobileDataList.find(spaceMobileType);
+	FATAL((iterMobileDataList == s_mobileDataList.end()), ("ShipAiReactionManager::getShipClass() invalid space_mobile type(%s)", spaceMobileType.getString()));
+
+	return iterMobileDataList->second.m_shipClass;
+}
+
+// ----------------------------------------------------------------------
+
+char const * ShipAiReactionManager::getShipClassString(ShipClass const shipClass)
+{
+	switch (shipClass)
+	{
+		default: { return "invalid"; } break;
+		case SC_fighter: { return "fighter"; } break;
+		case SC_bomber: { return "bomber"; } break;
+		case SC_capitalShip: { return "capitol ship"; } break;
+		case SC_transport: { return "transport"; } break;
+	}
+
+	return "";
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ShipAiReactionManager.h b/engine/server/library/serverGame/src/shared/space/ShipAiReactionManager.h
new file mode 100644
index 00000000..21f2a108
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipAiReactionManager.h
@@ -0,0 +1,44 @@
+// ======================================================================
+//
+// ShipAiReactionManager.h
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ShipAiReactionManager_H
+#define INCLUDED_ShipAiReactionManager_H
+
+// ======================================================================
+
+class PersistentCrcString;
+class ShipObject;
+
+// ======================================================================
+
+class ShipAiReactionManager
+{
+public:
+
+	enum ShipClass
+	{
+		SC_fighter = 0,
+		SC_bomber,
+		SC_capitalShip,
+		SC_transport,
+		SC_invalid
+	};
+
+	static void install();
+
+	static char const * getShipClassString(ShipClass const shipClass);
+	static void setShipSpaceMobileType(ShipObject &ship, PersistentCrcString const &spaceMobileType);
+	static bool isAlly(ShipObject const &actor, ShipObject const &target);
+	static bool isEnemy(ShipObject const &actor, ShipObject const &target);
+	static ShipClass getShipClass(PersistentCrcString const & spaceMobileType);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_ShipAiReactionManager_H
+
diff --git a/engine/server/library/serverGame/src/shared/space/ShipClientUpdateTracker.cpp b/engine/server/library/serverGame/src/shared/space/ShipClientUpdateTracker.cpp
new file mode 100644
index 00000000..a21cbf33
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipClientUpdateTracker.cpp
@@ -0,0 +1,371 @@
+// ======================================================================
+//
+// ShipClientUpdateTracker.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipClientUpdateTracker.h"
+
+#include "serverGame/Client.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ConnectionServerConnection.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ObserveTracker.h"
+#include "serverGame/PlayerShipController.h"
+#include "serverGame/ShipObject.h"
+#include "serverNetworkMessages/GameConnectionServerMessages.h"
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedFoundation/PointerDeleter.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/ShipUpdateTransformMessage.h"
+#include "sharedUtility/PackedRotationRate.h"
+#include "sharedUtility/PackedTransform.h"
+#include "sharedUtility/PackedVelocity.h"
+#include <algorithm>
+
+#ifdef _DEBUG
+#include "sharedGame/AiDebugString.h"
+#include "sharedNetworkMessages/GenericValueTypeMessage.h"
+#endif
+
+// ======================================================================
+
+namespace ShipClientUpdateTrackerNamespace
+{
+
+	// ----------------------------------------------------------------------
+
+	class ClientShipEntry
+	{
+	public:
+		ClientShipEntry(unsigned int priority, ShipObject const &ship) :
+			m_priority(priority),
+			m_ship(ship)
+		{
+		}
+
+		void setPriority(unsigned int priority)
+		{
+			m_priority = priority;
+		}
+
+		unsigned int getPriority() const
+		{
+			return m_priority;
+		}
+
+		ShipObject *getShip() const
+		{
+			return safe_cast<ShipObject *>(m_ship.getObject());
+		}
+
+		NetworkId const &getShipNetworkId() const
+		{
+			return m_ship;
+		}
+
+	private:
+		ClientShipEntry();
+
+	private:
+		unsigned int m_priority;
+		CachedNetworkId m_ship;
+	};
+
+	// ----------------------------------------------------------------------
+
+	typedef std::vector<ClientShipEntry *> ClientShipUpdateQueue;
+
+	struct ClientShipUpdateInfo
+	{
+		ClientShipUpdateInfo() :
+			queuedShipIds(),
+			updateQueue(),
+			unusedTime(0.0f),
+			lastSentPriority(0)
+		{
+		}
+
+		void reprioritize()
+		{
+			lastSentPriority = 0;
+			if (!updateQueue.empty())
+			{
+				unsigned int priorityOffset = (*updateQueue.begin())->getPriority();
+				for (ClientShipUpdateQueue::const_iterator i = updateQueue.begin(); i != updateQueue.end(); ++i)
+					(*i)->setPriority((*i)->getPriority()-priorityOffset);
+			}
+		}
+
+		unsigned int getShipUpdatePriority(Client const &client, ShipObject const &ship)
+		{
+			unsigned int const priorityValue = ShipClientUpdateTracker::getShipUpdatePriorityValue(client, ship);
+			unsigned int newPriority = lastSentPriority+priorityValue;
+			if (newPriority > lastSentPriority)
+				return newPriority;
+			reprioritize();
+			return priorityValue;
+		}
+
+		std::set<NetworkId> queuedShipIds;
+		ClientShipUpdateQueue updateQueue;
+		float unusedTime;
+		unsigned int lastSentPriority;
+	};
+
+	typedef std::map<Client *, ClientShipUpdateInfo> ClientShipUpdateInfoMap;
+
+	bool s_installed = false;
+	ClientShipUpdateInfoMap s_clientShipUpdateInfoMap;
+
+	// ----------------------------------------------------------------------
+
+	bool compareClientShipEntryPriorities(ClientShipEntry const *lhs, ClientShipEntry const *rhs)
+	{
+		return rhs->getPriority() < lhs->getPriority();
+	}
+
+	// ----------------------------------------------------------------------
+
+	void remove()
+	{
+		FATAL(!s_installed, ("ShipClientUpdateTracker not installed"));
+		for (ClientShipUpdateInfoMap::const_iterator i = s_clientShipUpdateInfoMap.begin(); i != s_clientShipUpdateInfoMap.end(); ++i)
+			std::for_each((*i).second.updateQueue.begin(), (*i).second.updateQueue.end(), PointerDeleter());
+		s_clientShipUpdateInfoMap.clear();
+	}
+
+	// ----------------------------------------------------------------------
+
+}
+using namespace ShipClientUpdateTrackerNamespace;
+
+// ======================================================================
+
+void ShipClientUpdateTracker::install() // static
+{
+	FATAL(s_installed, ("ShipClientUpdateTracker already installed"));
+	s_installed = true;
+	ExitChain::add(&ShipClientUpdateTrackerNamespace::remove, "ShipClientUpdateTrackerNamespace::remove");
+}
+
+// ----------------------------------------------------------------------
+
+void ShipClientUpdateTracker::update(float elapsedTime) // static
+{
+	typedef std::map<ConnectionServerConnection *, std::map<ShipObject *, std::vector<NetworkId> > > ShipDistributionList;
+	ShipDistributionList shipDistributionList;
+
+	// Run through all clients, gathering where updates need to be sent this frame.
+	ClientShipUpdateInfoMap::iterator i = s_clientShipUpdateInfoMap.begin();
+	while (i != s_clientShipUpdateInfoMap.end())
+	{
+		Client * const client = (*i).first;
+		ClientShipUpdateInfo &updateInfo = (*i).second;
+		ClientShipUpdateQueue &updateQueue = updateInfo.updateQueue;
+		static std::vector<ClientShipEntry *> reenqueues;
+
+		// Run through the update queue for this client, setting up to send
+		// updates as needed. When an update is sent, move the entries to a
+		// list to be reenqueued after all sending is done, so we don't get
+		// multiple sends for a single ship in a frame.
+
+		int const updatesPerSecond = ConfigServerGame::getShipUpdatesPerSecond();
+		float const deltaTime = elapsedTime+updateInfo.unusedTime;
+		int updateCount = static_cast<int>(updatesPerSecond*deltaTime);
+		updateInfo.unusedTime = deltaTime-static_cast<float>(updateCount)/updatesPerSecond;
+
+		while (updateCount && !updateQueue.empty())
+		{
+			--updateCount;
+
+			ClientShipEntry * const top = updateQueue.front();
+			std::pop_heap(updateQueue.begin(), updateQueue.end(), compareClientShipEntryPriorities);
+			updateQueue.pop_back();
+
+			ShipObject * const ship = top->getShip();
+
+			if (   ship
+			    && (client != ship->getClient() || ship->hasCondition(static_cast<int>(TangibleObject::C_docking)))
+			    && ship->isInWorld()
+			    && ObserveTracker::isObserving(*client, *ship))
+			{
+				if (ship->isAuthoritative())
+				{
+					ServerObject const * const characterObject = client->getCharacterObject();
+					if (characterObject)
+					{
+						#ifdef _DEBUG
+						if (ConfigServerGame::getShipClientUpdateDebugEnabled())
+						{
+							if (characterObject->getObjVars().hasItem("ship_client_update_debug"))
+							{
+								char buf[32];
+								IGNORE_RETURN(snprintf(buf, sizeof(buf)-1, "%u\n", ShipClientUpdateTracker::getShipUpdatePriorityValue(*client, *ship)));
+								buf[sizeof(buf)-1] = '\0';
+								AiDebugString a;
+								a.addText(buf, PackedRgb::solidCyan);
+								client->send(GenericValueTypeMessage<std::pair<NetworkId, std::string> >("AiDebugString", std::make_pair(ship->getNetworkId(), a.toString())), false);
+							}
+						}
+						#endif
+
+						// Don't send position updates to players in ships that are teleporting
+						ShipObject const * const clientShip = ShipObject::getContainingShipObject(characterObject);
+						if (!clientShip || !safe_cast<PlayerShipController const *>(clientShip->getController())->isTeleporting() || !clientShip->getPilot())
+							shipDistributionList[client->getConnection()][ship].push_back(characterObject->getNetworkId());
+					}
+				}
+				reenqueues.push_back(top);
+				updateInfo.lastSentPriority = top->getPriority();
+			}
+			else
+			{
+				IGNORE_RETURN(updateInfo.queuedShipIds.erase(top->getShipNetworkId()));
+				delete top;
+			}
+		}
+
+		// Reenqueue any ships for which updates are being sent this frame.
+		for (std::vector<ClientShipEntry *>::const_iterator j = reenqueues.begin(); j != reenqueues.end(); ++j)
+		{
+			(*j)->setPriority(updateInfo.getShipUpdatePriority(*client, *NON_NULL((*j)->getShip())));
+			updateQueue.push_back(*j);
+			std::push_heap(updateQueue.begin(), updateQueue.end(), compareClientShipEntryPriorities);
+		}
+		reenqueues.clear();
+
+		if (updateQueue.empty())
+			s_clientShipUpdateInfoMap.erase(i++);
+		else
+			++i;
+	}
+
+	// Push out updates now that we've determined what needs to be pushed this frame.
+
+	// The first implementation of this is here to show what we are logically
+	// doing, which is building a GameClientMessage with an embedded
+	// ShipUpdateTransformMessage and sending it to the connection server,
+	// for everything in the distribution list.
+
+	// The second implementation effectively does the same thing, but does
+	// about 4-5x less copying of the data, and the copy to each connection
+	// server's network buffer in a single chunk.  This could be further
+	// improved by making a packet interface which directly builds into
+	// the network buffer, but this was much less intrusive for optimizing
+	// this particular case.
+
+	for (ShipDistributionList::const_iterator j = shipDistributionList.begin(); j != shipDistributionList.end(); ++j)
+	{
+		for (std::map<ShipObject *, std::vector<NetworkId> >::const_iterator k = (*j).second.begin(); k != (*j).second.end(); ++k)
+		{
+			ShipObject * const ship = (*k).first;
+			ShipController const * const controller = safe_cast<ShipController const *>(ship->getController());
+
+			static Archive::ByteStream bs;
+
+			#if 0
+			GameClientMessage gcm(
+				(*k).second,
+				false, 
+				ShipUpdateTransformMessage(
+					ship->getNetworkId(),
+					controller->getTransform(),
+					controller->getVelocity(),
+					controller->getYawRate(),
+					controller->getPitchRate(),
+					controller->getRollRate(),
+					(*j).first->getSyncStampLong()));
+			gcm.pack(bs);
+			#else
+			static ConstCharCrcString const s_gcmname("GameClientMessage");
+			static ConstCharCrcString const s_sutmname("ShipUpdateTransformMessage");
+			static unsigned int const s_sutmByteStreamLength =
+				  2 // member count
+				+ 4 // crc
+				+ 2 // shipId
+				+ PackedTransform::cs_packedSize
+				+ PackedVelocity::cs_packedSize
+				+ PackedRotationRate::cs_packedSize*3
+				+ 4 // syncstamp
+				;
+
+			Archive::put(bs, static_cast<unsigned short>(4/*gcmMemberCount*/));
+			Archive::put(bs, s_gcmname.getCrc());
+			Archive::put(bs, (*k).second);
+			Archive::put(bs, false);
+			Archive::put(bs, s_sutmByteStreamLength);
+			Archive::put(bs, static_cast<unsigned short>(5/*sutmMemberCount*/));
+			Archive::put(bs, s_sutmname.getCrc());
+			Archive::put(bs, ship->getShipId());
+			PackedTransform const packedTransform(controller->getTransform());
+			Archive::put(bs, packedTransform);
+			PackedVelocity const packedVelocity(controller->getVelocity());
+			Archive::put(bs, packedVelocity);
+			PackedRotationRate const packedYawRate(controller->getYawRate());
+			Archive::put(bs, packedYawRate);
+			PackedRotationRate const packedPitchRate(controller->getPitchRate());
+			Archive::put(bs, packedPitchRate);
+			PackedRotationRate const packedRollRate(controller->getRollRate());
+			Archive::put(bs, packedRollRate);
+			Archive::put(bs, (*j).first->getSyncStampLong());
+			#endif
+
+			(*j).first->Connection::send(bs, false);
+			bs.clear();
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ShipClientUpdateTracker::queueForUpdate(Client &client, ShipObject const &ship) // static
+{
+	if (ship.getClient() != &client || ship.hasCondition(static_cast<int>(TangibleObject::C_docking)))
+	{
+		ClientShipUpdateInfo &updateInfo = s_clientShipUpdateInfoMap[&client];
+		std::pair<std::set<NetworkId>::iterator, bool> result = updateInfo.queuedShipIds.insert(ship.getNetworkId());
+		if (result.second)
+		{
+			updateInfo.updateQueue.push_back(new ClientShipEntry(updateInfo.getShipUpdatePriority(client, ship), ship));
+			std::push_heap(updateInfo.updateQueue.begin(), updateInfo.updateQueue.end(), compareClientShipEntryPriorities);
+		}
+	}
+} //lint !e1764 // used in a nonconst manner, even if lint doesn't believe so
+
+// ----------------------------------------------------------------------
+
+void ShipClientUpdateTracker::onClientDestroyed(Client &client) // static
+{
+	ClientShipUpdateInfoMap::iterator i = s_clientShipUpdateInfoMap.find(&client);
+	if (i != s_clientShipUpdateInfoMap.end())
+	{
+		ClientShipUpdateQueue &updateQueue = (*i).second.updateQueue;
+		std::for_each(updateQueue.begin(), updateQueue.end(), PointerDeleter());
+		s_clientShipUpdateInfoMap.erase(i);
+	}
+} //lint !e1764 // used in a nonconst manner, even if lint doesn't believe so
+
+// ----------------------------------------------------------------------
+
+unsigned int ShipClientUpdateTracker::getShipUpdatePriorityValue(Client const &client, ShipObject const &ship) // static
+{
+	CreatureObject const * const characterObject = safe_cast<CreatureObject const *>(client.getCharacterObject());
+	if (characterObject && characterObject->getLookAtTarget() != ship.getNetworkId())
+	{
+		Object const * const clientTopmost = NON_NULL(ContainerInterface::getTopmostContainer(*characterObject));
+		Vector const shipOffset = ship.getPosition_p()-clientTopmost->getPosition_p();
+		float const distance = shipOffset.magnitude();
+		float const angle = acosf(clientTopmost->getObjectFrameK_p().dot(shipOffset/distance));
+		float const anglePriorityAdjust = 1.f+((clamp(PI_OVER_4, angle, PI)-PI_OVER_4)/(PI-PI_OVER_4))*4.f; // 1 when roughly in view frustum, up to 5 directly behind
+		return static_cast<unsigned int>(clamp(100.f, distance, 8192.f)*anglePriorityAdjust);
+	}
+	return 100;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverGame/src/shared/space/ShipClientUpdateTracker.h b/engine/server/library/serverGame/src/shared/space/ShipClientUpdateTracker.h
new file mode 100644
index 00000000..29b75c95
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipClientUpdateTracker.h
@@ -0,0 +1,32 @@
+// ======================================================================
+//
+// ShipClientUpdateTracker.h
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ShipClientUpdateTracker_H
+#define INCLUDED_ShipClientUpdateTracker_H
+
+// ======================================================================
+
+class Client;
+class ShipObject;
+
+// ======================================================================
+
+class ShipClientUpdateTracker
+{
+public:
+	static void install();
+	static void update(float elapsedTime);
+	static void queueForUpdate(Client &client, ShipObject const &ship);
+	static void onClientDestroyed(Client &client);
+	static unsigned int getShipUpdatePriorityValue(Client const &client, ShipObject const &ship);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_ShipClientUpdateTracker_H
+
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataArmor.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataArmor.cpp
new file mode 100644
index 00000000..dc8f3896
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataArmor.cpp
@@ -0,0 +1,90 @@
+//======================================================================
+//
+// ShipComponentDataArmor.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipComponentDataArmor.h"
+
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedGame/SharedObjectAttributes.h"
+#include "UnicodeUtils.h"
+
+//======================================================================
+
+namespace ShipComponentDataArmorNamespace
+{
+	namespace Objvars
+	{
+	}
+}
+
+using namespace ShipComponentDataArmorNamespace;
+
+//----------------------------------------------------------------------
+
+ShipComponentDataArmor::ShipComponentDataArmor (ShipComponentDescriptor const & shipComponentDescriptor) :
+ServerShipComponentData(shipComponentDescriptor)
+{
+}
+
+//----------------------------------------------------------------------
+
+ShipComponentDataArmor::~ShipComponentDataArmor ()
+{
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataArmor::readDataFromShip      (int chassisSlot, ShipObject const & ship)
+{
+	if (!ServerShipComponentData::readDataFromShip (chassisSlot, ship))
+		return false;
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataArmor::writeDataToShip       (int chassisSlot, ShipObject & ship) const
+{
+	ServerShipComponentData::writeDataToShip (chassisSlot, ship);
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataArmor::readDataFromComponent (TangibleObject const & component)
+{
+	if (!ServerShipComponentData::readDataFromComponent (component))
+		return false;
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataArmor::writeDataToComponent  (TangibleObject & component) const
+{
+	ServerShipComponentData::writeDataToComponent (component);
+}
+
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataArmor::printDebugString      (Unicode::String & result, Unicode::String const & padding) const
+{
+	ServerShipComponentData::printDebugString (result, padding);
+	result += padding + Unicode::narrowToWide ("Armor has no special properties.\n");
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataArmor::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const
+{
+	ServerShipComponentData::getAttributes(data);
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataArmor.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataArmor.h
new file mode 100644
index 00000000..90d639a0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataArmor.h
@@ -0,0 +1,46 @@
+//======================================================================
+//
+// ShipComponentDataArmor.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipComponentDataArmor_H
+#define INCLUDED_ShipComponentDataArmor_H
+
+//======================================================================
+
+#include "serverGame/ServerShipComponentData.h"
+
+//----------------------------------------------------------------------
+
+class ShipComponentDataArmor : public ServerShipComponentData
+{
+public:
+
+	explicit ShipComponentDataArmor (ShipComponentDescriptor const & shipComponentDescriptor);
+	virtual ~ShipComponentDataArmor ();
+
+	virtual bool readDataFromShip      (int chassisSlot, ShipObject const & ship);
+	virtual void writeDataToShip       (int chassisSlot, ShipObject & ship) const;
+
+	virtual bool readDataFromComponent (TangibleObject const & component);
+	virtual void writeDataToComponent  (TangibleObject & component) const;
+
+	virtual void printDebugString      (Unicode::String & result, Unicode::String const & padding) const;
+
+	virtual void getAttributes         (stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const;
+
+private:
+	ShipComponentDataArmor (const ShipComponentDataArmor & rhs);
+	ShipComponentDataArmor & operator= (const ShipComponentDataArmor & rhs);
+
+public:
+
+	//-- these members are public because this instances of this class are short-lived temporary objects,
+	//-- to simplify the conversion from the ShipObject & shipt representation of components.
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataBooster.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataBooster.cpp
new file mode 100644
index 00000000..b44c0311
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataBooster.cpp
@@ -0,0 +1,190 @@
+//======================================================================
+//
+// ShipComponentDataBooster.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipComponentDataBooster.h"
+
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedGame/SharedObjectAttributes.h"
+#include "UnicodeUtils.h"
+
+//======================================================================
+
+namespace ShipComponentDataBoosterNamespace
+{
+	namespace Objvars
+	{
+		std::string const boosterEnergyCurrent          = "ship_comp.booster.energy_current";
+		std::string const boosterEnergyMaximum          = "ship_comp.booster.energy_maximum";
+		std::string const boosterEnergyRechargeRate     = "ship_comp.booster.energy_recharge_rate";
+		std::string const boosterEnergyConsumptionRate  = "ship_comp.booster.energy_consumption_rate";
+		std::string const boosterAcceleration           = "ship_comp.booster.acceleration";
+		std::string const boosterSpeedMaximum           = "ship_comp.booster.speed_maximum";
+	}
+}
+
+using namespace ShipComponentDataBoosterNamespace;
+
+//----------------------------------------------------------------------
+
+ShipComponentDataBooster::ShipComponentDataBooster (ShipComponentDescriptor const & shipComponentDescriptor) :
+ServerShipComponentData         (shipComponentDescriptor),
+m_boosterEnergyCurrent          (100.0f),
+m_boosterEnergyMaximum          (100.0f),
+m_boosterEnergyRechargeRate     (20.0f),
+m_boosterEnergyConsumptionRate  (20.0f),
+m_boosterAcceleration           (5.0f),
+m_boosterSpeedMaximum           (10.0f)
+{
+}
+
+//----------------------------------------------------------------------
+
+ShipComponentDataBooster::~ShipComponentDataBooster ()
+{
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataBooster::readDataFromShip      (int chassisSlot, ShipObject const & ship)
+{
+	if (!ServerShipComponentData::readDataFromShip (chassisSlot, ship))
+		return false;
+
+	m_boosterEnergyCurrent          = ship.getBoosterEnergyCurrent ();
+	m_boosterEnergyMaximum          = ship.getBoosterEnergyMaximum ();
+	m_boosterEnergyRechargeRate     = ship.getBoosterEnergyRechargeRate ();
+	m_boosterEnergyConsumptionRate  = ship.getBoosterEnergyConsumptionRate ();
+	m_boosterAcceleration           = ship.getBoosterAcceleration ();
+	m_boosterSpeedMaximum           = ship.getBoosterSpeedMaximum ();
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataBooster::writeDataToShip       (int chassisSlot, ShipObject & ship) const
+{
+	ServerShipComponentData::writeDataToShip (chassisSlot, ship);
+
+	IGNORE_RETURN(ship.setBoosterEnergyMaximum         (m_boosterEnergyMaximum));
+	IGNORE_RETURN(ship.setBoosterEnergyCurrent         (m_boosterEnergyCurrent));
+	IGNORE_RETURN(ship.setBoosterEnergyRechargeRate    (m_boosterEnergyRechargeRate));
+	IGNORE_RETURN(ship.setBoosterEnergyConsumptionRate (m_boosterEnergyConsumptionRate));
+	IGNORE_RETURN(ship.setBoosterAcceleration          (m_boosterAcceleration));
+	IGNORE_RETURN(ship.setBoosterSpeedMaximum          (m_boosterSpeedMaximum));
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataBooster::readDataFromComponent (TangibleObject const & component)
+{
+	if (!ServerShipComponentData::readDataFromComponent (component))
+		return false;
+
+	DynamicVariableList const &  objvars = component.getObjVars ();
+
+	if (!objvars.getItem (Objvars::boosterEnergyCurrent, m_boosterEnergyCurrent))
+		WARNING (true, ("ShipComponentDataBooster [%s] has no boosterEnergyCurrent [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::boosterEnergyCurrent.c_str ()));
+
+	if (!objvars.getItem (Objvars::boosterEnergyMaximum, m_boosterEnergyMaximum))
+		WARNING (true, ("ShipComponentDataBooster [%s] has no boosterEnergyMaximum [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::boosterEnergyMaximum.c_str ()));
+
+	if (!objvars.getItem (Objvars::boosterEnergyRechargeRate, m_boosterEnergyRechargeRate))
+		WARNING (true, ("ShipComponentDataBooster [%s] has no sboosterEnergyRechargeRate [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::boosterEnergyRechargeRate.c_str ()));
+
+	if (!objvars.getItem (Objvars::boosterEnergyConsumptionRate, m_boosterEnergyConsumptionRate))
+		WARNING (true, ("ShipComponentDataBooster [%s] has no boosterEnergyConsumptionRate [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::boosterEnergyConsumptionRate.c_str ()));
+
+	if (!objvars.getItem (Objvars::boosterAcceleration, m_boosterAcceleration))
+		WARNING (true, ("ShipComponentDataBooster [%s] has no boosterAcceleration [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::boosterAcceleration.c_str ()));
+
+	if (!objvars.getItem (Objvars::boosterSpeedMaximum, m_boosterSpeedMaximum))
+		WARNING (true, ("ShipComponentDataBooster [%s] has no boosterSpeedMaximum [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::boosterSpeedMaximum.c_str ()));
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataBooster::writeDataToComponent  (TangibleObject & component) const
+{
+	ServerShipComponentData::writeDataToComponent (component);
+
+	IGNORE_RETURN(component.setObjVarItem (Objvars::boosterEnergyCurrent,         m_boosterEnergyCurrent));
+	IGNORE_RETURN(component.setObjVarItem (Objvars::boosterEnergyMaximum,         m_boosterEnergyMaximum));
+	IGNORE_RETURN(component.setObjVarItem (Objvars::boosterEnergyRechargeRate,    m_boosterEnergyRechargeRate));
+	IGNORE_RETURN(component.setObjVarItem (Objvars::boosterEnergyConsumptionRate, m_boosterEnergyConsumptionRate));
+	IGNORE_RETURN(component.setObjVarItem (Objvars::boosterAcceleration,          m_boosterAcceleration));
+	IGNORE_RETURN(component.setObjVarItem (Objvars::boosterSpeedMaximum,          m_boosterSpeedMaximum));
+}
+
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataBooster::printDebugString      (Unicode::String & result, Unicode::String const & padding) const
+{
+	ServerShipComponentData::printDebugString (result, padding);
+	
+	char buf [1024];
+	const size_t buf_size = sizeof (buf);
+	
+	std::string const & nPad = Unicode::wideToNarrow (padding) + "   ";
+	
+	snprintf (buf, buf_size,
+		"%sboosterEnergyCurrent: %f\n"
+		"%sboosterEnergyMaximum: %f\n"
+		"%sboosterEnergyRechargeRate: %f\n"
+		"%sboosterEnergyConsumptionRate: %f\n"
+		"%sboosterAcceleration: %f\n"
+		"%sboosterSpeedMaximum: %f\n",
+		nPad.c_str (), m_boosterEnergyCurrent,
+		nPad.c_str (), m_boosterEnergyMaximum,
+		nPad.c_str (), m_boosterEnergyRechargeRate,
+		nPad.c_str (), m_boosterEnergyConsumptionRate,
+		nPad.c_str (), m_boosterAcceleration,
+		nPad.c_str (), m_boosterSpeedMaximum);
+	
+	result += Unicode::narrowToWide (buf);
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataBooster::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const
+{
+	ServerShipComponentData::getAttributes(data);
+
+	Unicode::String attrib;
+	static char buffer[128];
+	static const size_t buffer_size = sizeof (buffer);
+
+	snprintf(buffer, buffer_size, "%.1f", m_boosterEnergyCurrent);
+	attrib = Unicode::narrowToWide(buffer);
+	attrib += cm_slash;
+	snprintf(buffer, buffer_size, "%.1f", m_boosterEnergyMaximum);
+	attrib += Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_booster_energy, attrib));
+
+	snprintf(buffer, buffer_size, "%.1f", m_boosterEnergyRechargeRate);
+	attrib = Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_booster_energy_recharge_rate, attrib));
+
+	snprintf(buffer, buffer_size, "%.1f", m_boosterEnergyConsumptionRate);
+	attrib = Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_booster_energy_consumption_rate, attrib));
+	
+	snprintf(buffer, buffer_size, "%.1f", m_boosterAcceleration);
+	attrib = Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_booster_acceleration, attrib));
+
+	snprintf(buffer, buffer_size, "%.1f", m_boosterSpeedMaximum);
+	attrib = Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_booster_speed_maximum, attrib));
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataBooster.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataBooster.h
new file mode 100644
index 00000000..b18c58b3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataBooster.h
@@ -0,0 +1,53 @@
+//======================================================================
+//
+// ShipComponentDataBooster.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipComponentDataBooster_H
+#define INCLUDED_ShipComponentDataBooster_H
+
+//======================================================================
+
+#include "serverGame/ServerShipComponentData.h"
+
+//----------------------------------------------------------------------
+
+class ShipComponentDataBooster : public ServerShipComponentData
+{
+public:
+
+	explicit ShipComponentDataBooster (ShipComponentDescriptor const & shipComponentDescriptor);
+	virtual ~ShipComponentDataBooster ();
+
+	virtual bool readDataFromShip      (int chassisSlot, ShipObject const & ship);
+	virtual void writeDataToShip       (int chassisSlot, ShipObject & ship) const;
+
+	virtual bool readDataFromComponent (TangibleObject const & component);
+	virtual void writeDataToComponent  (TangibleObject & component) const;
+
+	virtual void printDebugString      (Unicode::String & result, Unicode::String const & padding) const;
+
+	virtual void getAttributes         (stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const;
+
+private:
+	ShipComponentDataBooster (const ShipComponentDataBooster & rhs);
+	ShipComponentDataBooster & operator= (const ShipComponentDataBooster & rhs);
+
+public:
+
+	//-- these members are public because this instances of this class are short-lived temporary objects,
+	//-- to simplify the conversion from the ShipObject & shipt representation of components.
+
+	float m_boosterEnergyCurrent;
+	float m_boosterEnergyMaximum;
+	float m_boosterEnergyRechargeRate;
+	float m_boosterEnergyConsumptionRate;
+	float m_boosterAcceleration;
+	float m_boosterSpeedMaximum;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataBridge.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataBridge.cpp
new file mode 100644
index 00000000..ed6bd626
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataBridge.cpp
@@ -0,0 +1,97 @@
+//======================================================================
+//
+// ShipComponentDataBridge.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipComponentDataBridge.h"
+
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "UnicodeUtils.h"
+
+//======================================================================
+
+namespace ShipComponentDataBridgeNamespace
+{
+}
+
+using namespace ShipComponentDataBridgeNamespace;
+
+//----------------------------------------------------------------------
+
+ShipComponentDataBridge::ShipComponentDataBridge (ShipComponentDescriptor const & shipComponentDescriptor) :
+ServerShipComponentData            (shipComponentDescriptor)
+{
+}
+
+//----------------------------------------------------------------------
+
+ShipComponentDataBridge::~ShipComponentDataBridge ()
+{
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataBridge::readDataFromShip      (int chassisSlot, ShipObject const & ship)
+{
+	if (!ServerShipComponentData::readDataFromShip (chassisSlot, ship))
+		return false;
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataBridge::writeDataToShip       (int chassisSlot, ShipObject & ship) const
+{
+	ServerShipComponentData::writeDataToShip (chassisSlot, ship);
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataBridge::readDataFromComponent (TangibleObject const & component)
+{
+	if (!ServerShipComponentData::readDataFromComponent (component))
+		return false;
+
+	DynamicVariableList const &  objvars = component.getObjVars ();
+	UNREF(objvars);
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataBridge::writeDataToComponent  (TangibleObject & component) const
+{
+	ServerShipComponentData::writeDataToComponent (component);
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataBridge::printDebugString      (Unicode::String & result, Unicode::String const & padding) const
+{
+	ServerShipComponentData::printDebugString (result, padding);
+
+	char buf [1024];
+	const size_t buf_size = sizeof (buf);
+	UNREF(buf_size);
+
+	std::string const & nPad = Unicode::wideToNarrow (padding) + "   ";
+	UNREF(nPad);
+
+	result += Unicode::narrowToWide (buf);
+
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataBridge::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const
+{
+	ServerShipComponentData::getAttributes(data);
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataBridge.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataBridge.h
new file mode 100644
index 00000000..e8991bea
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataBridge.h
@@ -0,0 +1,46 @@
+//======================================================================
+//
+// ShipComponentDataBridge.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipComponentDataBridge_H
+#define INCLUDED_ShipComponentDataBridge_H
+
+//======================================================================
+
+#include "serverGame/ServerShipComponentData.h"
+
+//----------------------------------------------------------------------
+
+class ShipComponentDataBridge : public ServerShipComponentData
+{
+public:
+
+	explicit ShipComponentDataBridge (ShipComponentDescriptor const & shipComponentDescriptor);
+	virtual ~ShipComponentDataBridge ();
+
+	virtual bool readDataFromShip      (int chassisSlot, ShipObject const & ship);
+	virtual void writeDataToShip       (int chassisSlot, ShipObject & ship) const;
+
+	virtual bool readDataFromComponent (TangibleObject const & component);
+	virtual void writeDataToComponent  (TangibleObject & component) const;
+
+	virtual void printDebugString      (Unicode::String & result, Unicode::String const & padding) const;
+
+	virtual void getAttributes         (stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const;
+
+private:
+	ShipComponentDataBridge (const ShipComponentDataBridge & rhs);
+	ShipComponentDataBridge & operator= (const ShipComponentDataBridge & rhs);
+
+public:
+
+	//-- these members are public because this instances of this class are short-lived temporary objects,
+	//-- to simplify the conversion from the ShipObject & shipt representation of components.
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataCapacitor.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataCapacitor.cpp
new file mode 100644
index 00000000..7af75191
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataCapacitor.cpp
@@ -0,0 +1,145 @@
+//======================================================================
+//
+// ShipComponentDataCapacitor.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipComponentDataCapacitor.h"
+
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedGame/SharedObjectAttributes.h"
+#include "UnicodeUtils.h"
+
+//======================================================================
+
+namespace ShipComponentDataCapacitorNamespace
+{
+	namespace Objvars
+	{
+		std::string const capacitorEnergyCurrent      = "ship_comp.capacitor.energy_current";
+		std::string const capacitorEnergyMaximum      = "ship_comp.capacitor.energy_maximum";
+		std::string const capacitorEnergyRechargeRate = "ship_comp.capacitor.energy_recharge_rate";
+	}
+}
+
+using namespace ShipComponentDataCapacitorNamespace;
+
+//----------------------------------------------------------------------
+
+ShipComponentDataCapacitor::ShipComponentDataCapacitor (ShipComponentDescriptor const & shipComponentDescriptor) :
+ServerShipComponentData        (shipComponentDescriptor),
+m_capacitorEnergyCurrent       (0.0f),
+m_capacitorEnergyMaximum       (0.0f),
+m_capacitorEnergyRechargeRate  (0.0f)
+{
+}
+
+//----------------------------------------------------------------------
+
+ShipComponentDataCapacitor::~ShipComponentDataCapacitor ()
+{
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataCapacitor::readDataFromShip      (int chassisSlot, ShipObject const & ship)
+{
+	if (!ServerShipComponentData::readDataFromShip (chassisSlot, ship))
+		return false;
+
+	m_capacitorEnergyCurrent        = ship.getCapacitorEnergyCurrent ();
+	m_capacitorEnergyMaximum        = ship.getCapacitorEnergyMaximum ();
+	m_capacitorEnergyRechargeRate   = ship.getCapacitorEnergyRechargeRate ();
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataCapacitor::writeDataToShip       (int chassisSlot, ShipObject & ship) const
+{
+	ServerShipComponentData::writeDataToShip (chassisSlot, ship);
+
+	ship.setCapacitorEnergyMaximum      (m_capacitorEnergyMaximum);
+	ship.setCapacitorEnergyCurrent      (m_capacitorEnergyCurrent);
+	ship.setCapacitorEnergyRechargeRate (m_capacitorEnergyRechargeRate);
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataCapacitor::readDataFromComponent (TangibleObject const & component)
+{
+	if (!ServerShipComponentData::readDataFromComponent (component))
+		return false;
+
+	DynamicVariableList const &  objvars = component.getObjVars ();
+
+	if (!objvars.getItem (Objvars::capacitorEnergyCurrent, m_capacitorEnergyCurrent))
+		WARNING (true, ("ShipComponentDataCapacitor [%s] has no capacitorEnergyCurrent [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::capacitorEnergyCurrent.c_str ()));
+	if (!objvars.getItem (Objvars::capacitorEnergyMaximum, m_capacitorEnergyMaximum))
+		WARNING (true, ("ShipComponentDataCapacitor [%s] has no capacitorEnergyMaximum [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::capacitorEnergyMaximum.c_str ()));
+	if (!objvars.getItem (Objvars::capacitorEnergyRechargeRate, m_capacitorEnergyRechargeRate))
+		WARNING (true, ("ShipComponentDataCapacitor [%s] has no capacitorEnergyRechargeRate [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::capacitorEnergyRechargeRate.c_str ()));
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataCapacitor::writeDataToComponent  (TangibleObject & component) const
+{
+	ServerShipComponentData::writeDataToComponent (component);
+
+	component.setObjVarItem (Objvars::capacitorEnergyCurrent, m_capacitorEnergyCurrent);
+	component.setObjVarItem (Objvars::capacitorEnergyMaximum, m_capacitorEnergyMaximum);
+	component.setObjVarItem (Objvars::capacitorEnergyRechargeRate, m_capacitorEnergyRechargeRate);
+}
+
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataCapacitor::printDebugString      (Unicode::String & result, Unicode::String const & padding) const
+{
+	ServerShipComponentData::printDebugString (result, padding);
+	
+	char buf [1024];
+	const size_t buf_size = sizeof (buf);
+	
+	std::string const & nPad = Unicode::wideToNarrow (padding) + "   ";
+	
+	snprintf (buf, buf_size,
+		"%sCapacitorEnergyCurrent:  %f\n"
+		"%sCapacitorEnergyMaximum:  %f\n"
+		"%sCapacitorEnergyRechargeRate:  %f\n",
+		nPad.c_str (), m_capacitorEnergyCurrent,
+		nPad.c_str (), m_capacitorEnergyMaximum,
+		nPad.c_str (), m_capacitorEnergyRechargeRate);
+	
+	result += Unicode::narrowToWide (buf);
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataCapacitor::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const
+{
+	ServerShipComponentData::getAttributes(data);
+
+	Unicode::String attrib;
+	static char buffer[128];
+	static const size_t buffer_size = sizeof (buffer);
+
+	snprintf(buffer, buffer_size, "%.1f", m_capacitorEnergyCurrent);
+	attrib = Unicode::narrowToWide(buffer);
+	attrib += cm_slash;
+	snprintf(buffer, buffer_size, "%.1f", m_capacitorEnergyMaximum);
+	attrib += Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_capacitor_energy, attrib));
+
+	snprintf(buffer, buffer_size, "%.1f", m_capacitorEnergyRechargeRate);
+	attrib = Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_capacitor_energy_recharge_rate, attrib));
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataCapacitor.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataCapacitor.h
new file mode 100644
index 00000000..e84c1660
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataCapacitor.h
@@ -0,0 +1,48 @@
+//======================================================================
+//
+// ShipComponentDataCapacitor.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipComponentDataCapacitor_H
+#define INCLUDED_ShipComponentDataCapacitor_H
+
+//======================================================================
+
+#include "serverGame/ServerShipComponentData.h"
+
+//----------------------------------------------------------------------
+
+class ShipComponentDataCapacitor : public ServerShipComponentData
+{
+public:
+
+	explicit ShipComponentDataCapacitor (ShipComponentDescriptor const & shipComponentDescriptor);
+	virtual ~ShipComponentDataCapacitor ();
+
+	virtual bool readDataFromShip      (int chassisSlot, ShipObject const & ship);
+	virtual void writeDataToShip       (int chassisSlot, ShipObject & ship) const;
+	virtual bool readDataFromComponent (TangibleObject const & component);
+	virtual void writeDataToComponent  (TangibleObject & component) const;
+
+	virtual void printDebugString      (Unicode::String & result, Unicode::String const & padding) const;
+
+	virtual void getAttributes         (stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const;
+
+private:
+	ShipComponentDataCapacitor (const ShipComponentDataCapacitor & rhs);
+	ShipComponentDataCapacitor & operator= (const ShipComponentDataCapacitor & rhs);
+
+public:
+	//-- these members are public because this instances of this class are short-lived temporary objects,
+	//-- to simplify the conversion from the ShipObject & shipt representation of components.
+
+	float m_capacitorEnergyCurrent;
+	float m_capacitorEnergyMaximum;
+	float m_capacitorEnergyRechargeRate;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataCargoHold.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataCargoHold.cpp
new file mode 100644
index 00000000..ba495697
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataCargoHold.cpp
@@ -0,0 +1,190 @@
+//======================================================================
+//
+// ShipComponentDataCargoHold.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipComponentDataCargoHold.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerUniverse.h"
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedGame/SharedObjectAttributes.h"
+
+//======================================================================
+
+namespace ShipComponentDataCargoHoldNamespace
+{
+	namespace Objvars
+	{
+		std::string const cargoHoldContentsCurrent          = "ship_comp.cargo_hold.contents_current";
+		std::string const cargoHoldContentsMaximum          = "ship_comp.cargo_hold.contents_maximum";
+		std::string const cargoHoldContentsTypes            = "ship_comp.cargo_hold.contents_types";
+		std::string const cargoHoldContentsAmounts          = "ship_comp.cargo_hold.contents_amounts";
+	}
+}
+
+using namespace ShipComponentDataCargoHoldNamespace;
+
+//----------------------------------------------------------------------
+
+ShipComponentDataCargoHold::ShipComponentDataCargoHold (ShipComponentDescriptor const & shipComponentDescriptor) :
+ServerShipComponentData(shipComponentDescriptor),
+m_cargoHoldContentsMaximum(0),
+m_cargoHoldContentsCurrent(0),
+m_cargoHoldContents()
+{
+}
+
+//----------------------------------------------------------------------
+
+ShipComponentDataCargoHold::~ShipComponentDataCargoHold ()
+{
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataCargoHold::readDataFromShip      (int chassisSlot, ShipObject const & ship)
+{
+	if (!ServerShipComponentData::readDataFromShip (chassisSlot, ship))
+		return false;
+
+	m_cargoHoldContentsMaximum = ship.getCargoHoldContentsMaximum();
+	m_cargoHoldContentsCurrent = ship.getCargoHoldContentsCurrent();
+	m_cargoHoldContents = ship.getCargoHoldContents();
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataCargoHold::writeDataToShip       (int chassisSlot, ShipObject & ship) const
+{
+	ServerShipComponentData::writeDataToShip (chassisSlot, ship);
+
+	ship.setCargoHoldContentsMaximum(m_cargoHoldContentsMaximum);
+	ship.setCargoHoldContents(m_cargoHoldContents);
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataCargoHold::readDataFromComponent (TangibleObject const & component)
+{
+	if (!ServerShipComponentData::readDataFromComponent (component))
+		return false;
+
+	DynamicVariableList const &  objvars = component.getObjVars ();
+
+	if (!objvars.getItem (Objvars::cargoHoldContentsCurrent, m_cargoHoldContentsCurrent))
+		WARNING (true, ("ShipComponentDataCargoHold [%s] has no cargoHoldContentsCurrent [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::cargoHoldContentsCurrent.c_str ()));
+
+	if (!objvars.getItem (Objvars::cargoHoldContentsMaximum, m_cargoHoldContentsMaximum))
+		WARNING (true, ("ShipComponentDataCargoHold [%s] has no cargoHoldContentsMaximum [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::cargoHoldContentsMaximum.c_str ()));
+
+	//-- read contents
+	{
+		stdvector<NetworkId>::fwd types;
+		
+		if (objvars.getItem(Objvars::cargoHoldContentsTypes, types))
+		{
+			stdvector<int>::fwd amounts;
+			if (!objvars.getItem(Objvars::cargoHoldContentsAmounts, amounts))
+				WARNING (true, ("ShipComponentDataCargoHold [%s] has no cargoHoldContentsAmounts [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::cargoHoldContentsAmounts.c_str ()));
+			else if (amounts.size() != types.size())
+				WARNING (true, ("ShipComponentDataCargoHold [%s] cargoHoldContentsAmounts/Types sizes mismatched", component.getNetworkId ().getValueString ().c_str ()));
+			else
+			{
+				m_cargoHoldContents.clear();
+				
+				int const size = types.size();
+				for (int i = 0; i < size; ++i)
+				{
+					m_cargoHoldContents[types[i]] = amounts[i];
+				}
+			}
+		}
+	}
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataCargoHold::writeDataToComponent  (TangibleObject & component) const
+{
+	ServerShipComponentData::writeDataToComponent (component);
+
+	IGNORE_RETURN(component.setObjVarItem (Objvars::cargoHoldContentsCurrent,         m_cargoHoldContentsCurrent));
+	IGNORE_RETURN(component.setObjVarItem (Objvars::cargoHoldContentsMaximum,         m_cargoHoldContentsMaximum));
+
+	//-- write contents
+	{
+		stdvector<NetworkId>::fwd types;
+		stdvector<int>::fwd amounts;
+
+		types.reserve(m_cargoHoldContents.size());
+		amounts.reserve(m_cargoHoldContents.size());
+
+		for (ShipObject::NetworkIdIntMap::const_iterator it = m_cargoHoldContents.begin(); it != m_cargoHoldContents.end(); ++it)
+		{
+			NetworkId const & id = (*it).first;
+			int const amount = (*it).second;
+			types.push_back(id);
+			amounts.push_back(amount);
+		}
+
+		component.setObjVarItem(Objvars::cargoHoldContentsTypes, types);
+		component.setObjVarItem(Objvars::cargoHoldContentsAmounts, amounts);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataCargoHold::printDebugString      (Unicode::String & result, Unicode::String const & padding) const
+{
+	ServerShipComponentData::printDebugString (result, padding);
+
+	char buf [1024];
+	const size_t buf_size = sizeof (buf);
+	
+	std::string const & nPad = Unicode::wideToNarrow (padding) + "   ";
+	
+	snprintf (buf, buf_size,
+		"%scontents: %d/%d\n",
+		nPad.c_str (), m_cargoHoldContentsCurrent, m_cargoHoldContentsMaximum);
+
+	result += Unicode::narrowToWide (buf);
+
+	for (ShipObject::NetworkIdIntMap::const_iterator it = m_cargoHoldContents.begin(); it != m_cargoHoldContents.end(); ++it)
+	{
+		NetworkId const & id = (*it).first;
+		int const amount = (*it).second;
+
+		ResourceTypeObject const * const resourceType = ServerUniverse::getInstance().getResourceTypeById(id);
+		std::string const resourceName = resourceType ? resourceType->getResourceName() : "NULL RESOURCE";
+
+		snprintf(buf, buf_size, "%s     %15s (%s): %3d\n", nPad.c_str (), id.getValueString().c_str(), resourceName.c_str(), amount);
+		result += Unicode::narrowToWide(buf);
+	}
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataCargoHold::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const
+{
+	ServerShipComponentData::getAttributes(data);
+
+	Unicode::String attrib;
+	static char buffer[128];
+	static const size_t buffer_size = sizeof (buffer);
+
+	snprintf(buffer, buffer_size, "%d", m_cargoHoldContentsMaximum);
+	attrib = Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_cargo_hold_contents_max, attrib));
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataCargoHold.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataCargoHold.h
new file mode 100644
index 00000000..c867a11d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataCargoHold.h
@@ -0,0 +1,52 @@
+//======================================================================
+//
+// ShipComponentDataCargoHold.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipComponentDataCargoHold_H
+#define INCLUDED_ShipComponentDataCargoHold_H
+
+//======================================================================
+
+#include "serverGame/ServerShipComponentData.h"
+#include "serverGame/ShipObject.h"
+
+//----------------------------------------------------------------------
+
+class ShipComponentDataCargoHold : public ServerShipComponentData
+{
+public:
+
+	explicit ShipComponentDataCargoHold (ShipComponentDescriptor const & shipComponentDescriptor);
+	virtual ~ShipComponentDataCargoHold ();
+
+	virtual bool readDataFromShip      (int chassisSlot, ShipObject const & ship);
+	virtual void writeDataToShip       (int chassisSlot, ShipObject & ship) const;
+
+	virtual bool readDataFromComponent (TangibleObject const & component);
+	virtual void writeDataToComponent  (TangibleObject & component) const;
+
+	virtual void printDebugString      (Unicode::String & result, Unicode::String const & padding) const;
+
+	virtual void getAttributes         (stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const;
+
+private:
+	ShipComponentDataCargoHold (const ShipComponentDataCargoHold & rhs);
+	ShipComponentDataCargoHold & operator= (const ShipComponentDataCargoHold & rhs);
+
+public:
+
+	//-- these members are public because this instances of this class are short-lived temporary objects,
+	//-- to simplify the conversion from the ShipObject & shipt representation of components.
+
+	int m_cargoHoldContentsMaximum;
+	int m_cargoHoldContentsCurrent;
+
+	ShipObject::NetworkIdIntMap m_cargoHoldContents;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataDroidInterface.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataDroidInterface.cpp
new file mode 100644
index 00000000..e87788f9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataDroidInterface.cpp
@@ -0,0 +1,121 @@
+//======================================================================
+//
+// ShipComponentDataDroidInterface.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipComponentDataDroidInterface.h"
+
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedGame/SharedObjectAttributes.h"
+#include "UnicodeUtils.h"
+
+//======================================================================
+
+namespace ShipComponentDataDroidInterfaceNamespace
+{
+	namespace Objvars
+	{
+		std::string const droidInterfaceCommandSpeed        = "ship_comp.droid_interface.command_speed";
+	}
+}
+
+using namespace ShipComponentDataDroidInterfaceNamespace;
+
+//----------------------------------------------------------------------
+
+ShipComponentDataDroidInterface::ShipComponentDataDroidInterface (ShipComponentDescriptor const & shipComponentDescriptor) :
+ServerShipComponentData      (shipComponentDescriptor),
+m_droidInterfaceCommandSpeed (0.0f)
+{
+}
+
+//----------------------------------------------------------------------
+
+ShipComponentDataDroidInterface::~ShipComponentDataDroidInterface ()
+{
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataDroidInterface::readDataFromShip      (int chassisSlot, ShipObject const & ship)
+{
+	if (!ServerShipComponentData::readDataFromShip (chassisSlot, ship))
+		return false;
+
+	m_droidInterfaceCommandSpeed = ship.getDroidInterfaceCommandSpeed ();
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataDroidInterface::writeDataToShip       (int chassisSlot, ShipObject & ship) const
+{
+	ServerShipComponentData::writeDataToShip (chassisSlot, ship);
+
+	ship.setDroidInterfaceCommandSpeed (m_droidInterfaceCommandSpeed);
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataDroidInterface::readDataFromComponent (TangibleObject const & component)
+{
+	if (!ServerShipComponentData::readDataFromComponent (component))
+		return false;
+
+	DynamicVariableList const &  objvars = component.getObjVars ();
+
+	if (!objvars.getItem (Objvars::droidInterfaceCommandSpeed, m_droidInterfaceCommandSpeed))
+		WARNING (true, ("ShipComponentDataDroidInterface [%s] has no droidInterfaceCommandSpeed [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::droidInterfaceCommandSpeed.c_str ()));
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataDroidInterface::writeDataToComponent  (TangibleObject & component) const
+{
+	ServerShipComponentData::writeDataToComponent (component);
+
+	component.setObjVarItem (Objvars::droidInterfaceCommandSpeed, m_droidInterfaceCommandSpeed);
+}
+
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataDroidInterface::printDebugString      (Unicode::String & result, Unicode::String const & padding) const
+{
+	ServerShipComponentData::printDebugString (result, padding);
+
+	char buf [1024];
+	const size_t buf_size = sizeof (buf);
+
+	std::string const & nPad = Unicode::wideToNarrow (padding) + "   ";
+
+	snprintf (buf, buf_size,
+		"%sDroidInterfaceCommandSpeed: %f\n",
+		nPad.c_str (), m_droidInterfaceCommandSpeed);
+
+	result += Unicode::narrowToWide (buf);
+
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataDroidInterface::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const
+{
+	ServerShipComponentData::getAttributes(data);
+
+	Unicode::String attrib;
+	static char buffer[128];
+	static const size_t buffer_size = sizeof (buffer);
+
+	snprintf(buffer, buffer_size, "%.1f", m_droidInterfaceCommandSpeed);
+	attrib = Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_droidinterface_speed, attrib));
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataDroidInterface.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataDroidInterface.h
new file mode 100644
index 00000000..cc629fc4
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataDroidInterface.h
@@ -0,0 +1,46 @@
+//======================================================================
+//
+// ShipComponentDataDroidInterface.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipComponentDataDroidInterface_H
+#define INCLUDED_ShipComponentDataDroidInterface_H
+
+//======================================================================
+
+#include "serverGame/ServerShipComponentData.h"
+
+//----------------------------------------------------------------------
+
+class ShipComponentDataDroidInterface : public ServerShipComponentData
+{
+public:
+
+	explicit ShipComponentDataDroidInterface (ShipComponentDescriptor const & shipComponentDescriptor);
+	virtual ~ShipComponentDataDroidInterface ();
+
+	virtual bool readDataFromShip      (int chassisSlot, ShipObject const & ship);
+	virtual void writeDataToShip       (int chassisSlot, ShipObject & ship) const;
+	virtual bool readDataFromComponent (TangibleObject const & component);
+	virtual void writeDataToComponent  (TangibleObject & component) const;
+
+	virtual void printDebugString      (Unicode::String & result, Unicode::String const & padding) const;
+
+	virtual void getAttributes         (stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const;
+
+private:
+	ShipComponentDataDroidInterface (const ShipComponentDataDroidInterface & rhs);
+	ShipComponentDataDroidInterface & operator= (const ShipComponentDataDroidInterface & rhs);
+
+public:
+	//-- these members are public because this instances of this class are short-lived temporary objects,
+	//-- to simplify the conversion from the ShipObject & shipt representation of components.
+
+	float m_droidInterfaceCommandSpeed;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataEngine.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataEngine.cpp
new file mode 100644
index 00000000..f430a66d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataEngine.cpp
@@ -0,0 +1,253 @@
+//======================================================================
+//
+// ShipComponentDataEngine.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipComponentDataEngine.h"
+
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedGame/SharedObjectAttributes.h"
+#include "UnicodeUtils.h"
+
+//======================================================================
+
+namespace ShipComponentDataEngineNamespace
+{
+	namespace Objvars
+	{
+		std::string const engineAccelerationRate         = "ship_comp.engine.acceleration_rate";
+		std::string const engineDecelerationRate         = "ship_comp.engine.deceleration_rate";
+		std::string const enginePitchAccelerationRate    = "ship_comp.engine.pitch_acceleration_rate";
+		std::string const engineYawAccelerationRate      = "ship_comp.engine.yaw_acceleration_rate";
+		std::string const engineRollAccelerationRate     = "ship_comp.engine.roll_acceleration_rate";
+		std::string const enginePitchRateMaximum         = "ship_comp.engine.pitch_rate_maximum";
+		std::string const engineYawRateMaximum           = "ship_comp.engine.yaw_rate_maximum";
+		std::string const engineRollRateMaximum          = "ship_comp.engine.roll_rate_maximum";
+		std::string const engineSpeedMaximum             = "ship_comp.engine.speed_maximum";
+		std::string const engineSpeedRotationFactorMaximum = "ship_comp.engine.speed_rotation_factor_max";
+		std::string const engineSpeedRotationFactorMaximum_old = "ship_comp.engine.speed_rotation_factor";
+		std::string const engineSpeedRotationFactorMinimum = "ship_comp.engine.speed_rotation_factor_min";
+		std::string const engineSpeedRotationFactorOptimal = "ship_comp.engine.speed_rotation_factor_optimal";
+	}
+}
+
+using namespace ShipComponentDataEngineNamespace;
+
+//----------------------------------------------------------------------
+
+ShipComponentDataEngine::ShipComponentDataEngine (ShipComponentDescriptor const & shipComponentDescriptor) :
+ServerShipComponentData      (shipComponentDescriptor),
+m_engineAccelerationRate        (30.0f),
+m_engineDecelerationRate        (30.0f),
+m_enginePitchAccelerationRate   (PI),
+m_engineYawAccelerationRate     (PI),
+m_engineRollAccelerationRate    (PI),
+m_enginePitchRateMaximum        (PI),
+m_engineYawRateMaximum          (PI),
+m_engineRollRateMaximum         (PI),
+m_engineSpeedMaximum            (50.0f),
+m_engineSpeedRotationFactorMaximum(1.0f),
+m_engineSpeedRotationFactorMinimum(1.0f),
+m_engineSpeedRotationFactorOptimal(0.5f)
+{
+}
+
+//----------------------------------------------------------------------
+
+ShipComponentDataEngine::~ShipComponentDataEngine ()
+{
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataEngine::readDataFromShip      (int chassisSlot, ShipObject const & ship)
+{
+	if (!ServerShipComponentData::readDataFromShip (chassisSlot, ship))
+		return false;
+
+	m_engineAccelerationRate        = ship.getEngineAccelerationRate      ();
+	m_engineDecelerationRate        = ship.getEngineDecelerationRate      ();
+	m_enginePitchAccelerationRate   = ship.getEnginePitchAccelerationRate ();
+	m_engineYawAccelerationRate     = ship.getEngineYawAccelerationRate   ();
+	m_engineRollAccelerationRate    = ship.getEngineRollAccelerationRate  ();
+	m_enginePitchRateMaximum        = ship.getEnginePitchRateMaximum      ();
+	m_engineYawRateMaximum          = ship.getEngineYawRateMaximum        ();
+	m_engineRollRateMaximum         = ship.getEngineRollRateMaximum       ();
+	m_engineSpeedMaximum            = ship.getEngineSpeedMaximum          ();
+	m_engineSpeedRotationFactorMaximum = ship.getEngineSpeedRotationFactorMaximum();
+	m_engineSpeedRotationFactorMinimum = ship.getEngineSpeedRotationFactorMinimum();
+	m_engineSpeedRotationFactorOptimal = ship.getEngineSpeedRotationFactorOptimal();
+
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataEngine::writeDataToShip       (int chassisSlot, ShipObject & ship) const
+{
+	ServerShipComponentData::writeDataToShip (chassisSlot, ship);
+
+	ship.setEngineAccelerationRate      (m_engineAccelerationRate);
+	ship.setEngineDecelerationRate      (m_engineDecelerationRate);
+	ship.setEnginePitchAccelerationRate (m_enginePitchAccelerationRate);
+	ship.setEngineYawAccelerationRate   (m_engineYawAccelerationRate);
+	ship.setEngineRollAccelerationRate  (m_engineRollAccelerationRate);
+	ship.setEnginePitchRateMaximum      (m_enginePitchRateMaximum);
+	ship.setEngineYawRateMaximum        (m_engineYawRateMaximum);
+	ship.setEngineRollRateMaximum       (m_engineRollRateMaximum);
+	ship.setEngineSpeedMaximum          (m_engineSpeedMaximum);
+	ship.setEngineSpeedRotationFactorMaximum(m_engineSpeedRotationFactorMaximum);
+	ship.setEngineSpeedRotationFactorMinimum(m_engineSpeedRotationFactorMinimum);
+	ship.setEngineSpeedRotationFactorOptimal(m_engineSpeedRotationFactorOptimal);
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataEngine::readDataFromComponent (TangibleObject const & component)
+{
+	if (!ServerShipComponentData::readDataFromComponent (component))
+		return false;
+
+	DynamicVariableList const &  objvars = component.getObjVars ();
+
+	if (!objvars.getItem (Objvars::engineAccelerationRate, m_engineAccelerationRate))
+		WARNING (true, ("ShipComponentDataEngine [%s] has no engineAccelerationRate [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::engineAccelerationRate.c_str ()));
+
+	if (!objvars.getItem (Objvars::engineDecelerationRate, m_engineDecelerationRate))
+		WARNING (true, ("ShipComponentDataEngine [%s] has no engineDecelerationRate [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::engineDecelerationRate.c_str ()));
+	
+	if (!objvars.getItem (Objvars::enginePitchAccelerationRate, m_enginePitchAccelerationRate))
+		WARNING (true, ("ShipComponentDataEngine [%s] has no enginePitchAccelerationRate [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::enginePitchAccelerationRate.c_str ()));
+	else
+		m_enginePitchAccelerationRate = convertDegreesToRadians(m_enginePitchAccelerationRate);
+	
+	if (!objvars.getItem (Objvars::engineYawAccelerationRate, m_engineYawAccelerationRate))
+		WARNING (true, ("ShipComponentDataEngine [%s] has no engineYawAccelerationRate [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::engineYawAccelerationRate.c_str ()));
+	else
+		m_engineYawAccelerationRate = convertDegreesToRadians(m_engineYawAccelerationRate);
+	
+	if (!objvars.getItem (Objvars::engineRollAccelerationRate, m_engineRollAccelerationRate))
+		WARNING (true, ("ShipComponentDataEngine [%s] has no engineRollAccelerationRate [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::engineRollAccelerationRate.c_str ()));
+	else
+		m_engineRollAccelerationRate = convertDegreesToRadians(m_engineRollAccelerationRate);
+	
+	if (!objvars.getItem (Objvars::enginePitchRateMaximum, m_enginePitchRateMaximum))
+		WARNING (true, ("ShipComponentDataEngine [%s] has no enginePitchRateMaximum [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::enginePitchRateMaximum.c_str ()));
+	else
+		m_enginePitchRateMaximum = convertDegreesToRadians(m_enginePitchRateMaximum);
+	
+	if (!objvars.getItem (Objvars::engineYawRateMaximum, m_engineYawRateMaximum))
+		WARNING (true, ("ShipComponentDataEngine [%s] has no engineYawRateMaximum [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::engineYawRateMaximum.c_str ()));
+	else
+		m_engineYawRateMaximum = convertDegreesToRadians(m_engineYawRateMaximum);
+	
+	if (!objvars.getItem (Objvars::engineRollRateMaximum, m_engineRollRateMaximum))
+		WARNING (true, ("ShipComponentDataEngine [%s] has no engineRollRateMaximum [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::engineRollRateMaximum.c_str ()));
+	else
+		m_engineRollRateMaximum = convertDegreesToRadians(m_engineRollRateMaximum);
+	
+	if (!objvars.getItem (Objvars::engineSpeedMaximum, m_engineSpeedMaximum))
+		WARNING (true, ("ShipComponentDataEngine [%s] has no engineSpeedMaximum [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::engineSpeedMaximum.c_str ()));
+
+	if (!objvars.getItem(Objvars::engineSpeedRotationFactorMaximum, m_engineSpeedRotationFactorMaximum))
+	{
+		IGNORE_RETURN(objvars.getItem(Objvars::engineSpeedRotationFactorMaximum_old, m_engineSpeedRotationFactorMaximum));
+	}
+
+	IGNORE_RETURN(objvars.getItem(Objvars::engineSpeedRotationFactorMinimum, m_engineSpeedRotationFactorMinimum));
+	IGNORE_RETURN(objvars.getItem(Objvars::engineSpeedRotationFactorOptimal, m_engineSpeedRotationFactorOptimal));
+		
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataEngine::writeDataToComponent  (TangibleObject & component) const
+{
+	ServerShipComponentData::writeDataToComponent (component);
+
+	component.setObjVarItem (Objvars::engineAccelerationRate,      m_engineAccelerationRate);
+	component.setObjVarItem (Objvars::engineDecelerationRate,      m_engineDecelerationRate);
+	component.setObjVarItem (Objvars::enginePitchAccelerationRate, convertRadiansToDegrees(m_enginePitchAccelerationRate));
+	component.setObjVarItem (Objvars::engineYawAccelerationRate,   convertRadiansToDegrees(m_engineYawAccelerationRate));
+	component.setObjVarItem (Objvars::engineRollAccelerationRate,  convertRadiansToDegrees(m_engineRollAccelerationRate));
+	component.setObjVarItem (Objvars::enginePitchRateMaximum,      convertRadiansToDegrees(m_enginePitchRateMaximum));
+	component.setObjVarItem (Objvars::engineYawRateMaximum,        convertRadiansToDegrees(m_engineYawRateMaximum));
+	component.setObjVarItem (Objvars::engineRollRateMaximum,       convertRadiansToDegrees(m_engineRollRateMaximum));
+	component.setObjVarItem (Objvars::engineSpeedMaximum,          m_engineSpeedMaximum);
+	component.setObjVarItem (Objvars::engineSpeedRotationFactorMaximum,   m_engineSpeedRotationFactorMaximum);
+	component.setObjVarItem (Objvars::engineSpeedRotationFactorMinimum, m_engineSpeedRotationFactorMinimum);
+	component.setObjVarItem (Objvars::engineSpeedRotationFactorOptimal, m_engineSpeedRotationFactorOptimal);
+}
+
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataEngine::printDebugString      (Unicode::String & result, Unicode::String const & padding) const
+{
+	ServerShipComponentData::printDebugString (result, padding);
+	
+	char buf [1024];
+	const size_t buf_size = sizeof (buf);
+	
+	std::string const & nPad = Unicode::wideToNarrow (padding) + "   ";
+	
+	snprintf (buf, buf_size,
+		"%sEngineAccelerationRate:  %f\n"
+		"%sEngineDecelerationRate:  %f\n"
+		"%sEnginePitchAccelerationRate:  %f\n"
+		"%sEngineYawAccelerationRate:  %f\n"
+		"%sEngineRollAccelerationRate:  %f\n"
+		"%sEnginePitchRateMaximum:  %f\n"
+		"%sEngineYawRateMaximum:  %f\n"
+		"%sEngineRollRateMaximum:  %f\n"
+		"%sEngineSpeedMaximum:  %f\n"
+		"%sengineSpeedRotationFactor:  %f-%f, Optimal=%f\n",
+		nPad.c_str (), m_engineAccelerationRate,
+		nPad.c_str (), m_engineDecelerationRate,
+		nPad.c_str (), convertRadiansToDegrees(m_enginePitchAccelerationRate),
+		nPad.c_str (), convertRadiansToDegrees(m_engineYawAccelerationRate),
+		nPad.c_str (), convertRadiansToDegrees(m_engineRollAccelerationRate),
+		nPad.c_str (), convertRadiansToDegrees(m_enginePitchRateMaximum),
+		nPad.c_str (), convertRadiansToDegrees(m_engineYawRateMaximum),
+		nPad.c_str (), convertRadiansToDegrees(m_engineRollRateMaximum),
+		nPad.c_str (), m_engineSpeedMaximum,
+		nPad.c_str(), m_engineSpeedRotationFactorMinimum, m_engineSpeedRotationFactorMaximum, m_engineSpeedRotationFactorOptimal);
+	
+	result += Unicode::narrowToWide (buf);
+	
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataEngine::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const
+{
+	ServerShipComponentData::getAttributes(data);
+
+	Unicode::String attrib;
+	static char buffer[128];
+	static const size_t buffer_size = sizeof (buffer);
+
+	snprintf(buffer, buffer_size, "%.1f", convertRadiansToDegrees(m_enginePitchRateMaximum));
+	attrib = Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_engine_pitch_rate_maximum, attrib));
+	
+	snprintf(buffer, buffer_size, "%.1f", convertRadiansToDegrees(m_engineYawRateMaximum));
+	attrib = Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_engine_yaw_rate_maximum, attrib));
+
+	snprintf(buffer, buffer_size, "%.1f", convertRadiansToDegrees(m_engineRollRateMaximum));
+	attrib = Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_engine_roll_rate_maximum, attrib));
+
+	snprintf(buffer, buffer_size, "%.1f", m_engineSpeedMaximum);
+	attrib = Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_engine_speed_maximum, attrib));
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataEngine.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataEngine.h
new file mode 100644
index 00000000..8af59377
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataEngine.h
@@ -0,0 +1,59 @@
+//======================================================================
+//
+// ShipComponentDataEngine.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipComponentDataEngine_H
+#define INCLUDED_ShipComponentDataEngine_H
+
+//======================================================================
+
+#include "serverGame/ServerShipComponentData.h"
+
+//----------------------------------------------------------------------
+
+class ShipComponentDataEngine : public ServerShipComponentData
+{
+public:
+
+	explicit ShipComponentDataEngine (ShipComponentDescriptor const & shipComponentDescriptor);
+	virtual ~ShipComponentDataEngine ();
+
+	virtual bool readDataFromShip      (int chassisSlot, ShipObject const & ship);
+	virtual void writeDataToShip       (int chassisSlot, ShipObject & ship) const;
+
+	virtual bool readDataFromComponent (TangibleObject const & component);
+	virtual void writeDataToComponent  (TangibleObject & component) const;
+
+	virtual void printDebugString      (Unicode::String & result, Unicode::String const & padding) const;
+
+	virtual void getAttributes         (stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const;
+
+private:
+	ShipComponentDataEngine (const ShipComponentDataEngine & rhs);
+	ShipComponentDataEngine & operator= (const ShipComponentDataEngine & rhs);
+
+public:
+
+	//-- these members are public because this instances of this class are short-lived temporary objects,
+	//-- to simplify the conversion from the ShipObject & shipt representation of components.
+
+	float m_engineAccelerationRate;
+	float m_engineDecelerationRate;
+	float m_enginePitchAccelerationRate;
+	float m_engineYawAccelerationRate;
+	float m_engineRollAccelerationRate;
+	float m_enginePitchRateMaximum;
+	float m_engineYawRateMaximum;
+	float m_engineRollRateMaximum;
+	float m_engineSpeedMaximum;
+	float m_engineSpeedRotationFactorMaximum;
+	float m_engineSpeedRotationFactorMinimum;
+	float m_engineSpeedRotationFactorOptimal;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataHangar.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataHangar.cpp
new file mode 100644
index 00000000..bb03777f
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataHangar.cpp
@@ -0,0 +1,97 @@
+//======================================================================
+//
+// ShipComponentDataHangar.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipComponentDataHangar.h"
+
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "UnicodeUtils.h"
+
+//======================================================================
+
+namespace ShipComponentDataHangarNamespace
+{
+}
+
+using namespace ShipComponentDataHangarNamespace;
+
+//----------------------------------------------------------------------
+
+ShipComponentDataHangar::ShipComponentDataHangar (ShipComponentDescriptor const & shipComponentDescriptor) :
+ServerShipComponentData            (shipComponentDescriptor)
+{
+}
+
+//----------------------------------------------------------------------
+
+ShipComponentDataHangar::~ShipComponentDataHangar ()
+{
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataHangar::readDataFromShip      (int chassisSlot, ShipObject const & ship)
+{
+	if (!ServerShipComponentData::readDataFromShip (chassisSlot, ship))
+		return false;
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataHangar::writeDataToShip       (int chassisSlot, ShipObject & ship) const
+{
+	ServerShipComponentData::writeDataToShip (chassisSlot, ship);
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataHangar::readDataFromComponent (TangibleObject const & component)
+{
+	if (!ServerShipComponentData::readDataFromComponent (component))
+		return false;
+
+	DynamicVariableList const &  objvars = component.getObjVars ();
+	UNREF(objvars);
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataHangar::writeDataToComponent  (TangibleObject & component) const
+{
+	ServerShipComponentData::writeDataToComponent (component);
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataHangar::printDebugString      (Unicode::String & result, Unicode::String const & padding) const
+{
+	ServerShipComponentData::printDebugString (result, padding);
+
+	char buf [1024];
+	const size_t buf_size = sizeof (buf);
+	UNREF(buf_size);
+
+	std::string const & nPad = Unicode::wideToNarrow (padding) + "   ";
+	UNREF(nPad);
+
+	result += Unicode::narrowToWide (buf);
+
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataHangar::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const
+{
+	ServerShipComponentData::getAttributes(data);
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataHangar.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataHangar.h
new file mode 100644
index 00000000..c7f9a882
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataHangar.h
@@ -0,0 +1,45 @@
+//======================================================================
+//
+// ShipComponentDataHangar.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipComponentDataHangar_H
+#define INCLUDED_ShipComponentDataHangar_H
+
+//======================================================================
+
+#include "serverGame/ServerShipComponentData.h"
+
+//----------------------------------------------------------------------
+
+class ShipComponentDataHangar : public ServerShipComponentData
+{
+public:
+
+	explicit ShipComponentDataHangar (ShipComponentDescriptor const & shipComponentDescriptor);
+	virtual ~ShipComponentDataHangar ();
+
+	virtual bool readDataFromShip      (int chassisSlot, ShipObject const & ship);
+	virtual void writeDataToShip       (int chassisSlot, ShipObject & ship) const;
+	virtual bool readDataFromComponent (TangibleObject const & component);
+	virtual void writeDataToComponent  (TangibleObject & component) const;
+
+	virtual void printDebugString      (Unicode::String & result, Unicode::String const & padding) const;
+
+	virtual void getAttributes         (stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const;
+
+private:
+	ShipComponentDataHangar (const ShipComponentDataHangar & rhs);
+	ShipComponentDataHangar & operator= (const ShipComponentDataHangar & rhs);
+
+public:
+
+	//-- these members are public because this instances of this class are short-lived temporary objects,
+	//-- to simplify the conversion from the ShipObject & shipt representation of components.
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataManager.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataManager.cpp
new file mode 100644
index 00000000..60053125
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataManager.cpp
@@ -0,0 +1,115 @@
+//======================================================================
+//
+// ShipComponentDataManager.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipComponentDataManager.h"
+
+#include "serverGame/ShipComponentDataArmor.h"
+#include "serverGame/ShipComponentDataBooster.h"
+#include "serverGame/ShipComponentDataBridge.h"
+#include "serverGame/ShipComponentDataCapacitor.h"
+#include "serverGame/ShipComponentDataCargoHold.h"
+#include "serverGame/ShipComponentDataModification.h"
+#include "serverGame/ShipComponentDataDroidInterface.h"
+#include "serverGame/ShipComponentDataEngine.h"
+#include "serverGame/ShipComponentDataHangar.h"
+#include "serverGame/ShipComponentDataReactor.h"
+#include "serverGame/ShipComponentDataShield.h"
+#include "serverGame/ShipComponentDataTargetingStation.h"
+#include "serverGame/ShipComponentDataWeapon.h"
+#include "serverGame/TangibleObject.h"
+#include "sharedFoundation/TemporaryCrcString.h"
+#include "sharedGame/ShipComponentData.h"
+#include "sharedGame/ShipComponentDescriptor.h"
+#include "sharedGame/ShipComponentType.h"
+
+//======================================================================
+
+namespace ShipComponentDataManagerNamespace
+{
+}
+
+using namespace ShipComponentDataManagerNamespace;
+
+//----------------------------------------------------------------------
+
+ShipComponentData * ShipComponentDataManager::create (TangibleObject const & component)
+{
+	ShipComponentDescriptor const * const shipComponentDescriptor = 
+		ShipComponentDescriptor::findShipComponentDescriptorByObjectTemplate (component.getObjectTemplate ()->getCrcName ().getCrc ());
+
+	if (shipComponentDescriptor == NULL)
+	{
+		WARNING (true, ("ShipComponentDataManager [%s] [%s] is not a component", component.getNetworkId ().getValueString ().c_str (), component.getObjectTemplateName()));
+		return NULL;
+	}
+
+	ShipComponentData * const shipComponent = create (*shipComponentDescriptor);
+
+	if (!shipComponent)
+		return NULL;
+
+	shipComponent->readDataFromComponent (component);
+	return shipComponent;
+}
+
+//----------------------------------------------------------------------
+
+ShipComponentData * ShipComponentDataManager::create (ShipComponentDescriptor const & shipComponentDescriptor)
+{
+	ShipComponentData * shipComponent = NULL;
+
+	switch (shipComponentDescriptor.getComponentType ())
+	{
+	case ShipComponentType::SCT_reactor:
+			shipComponent = new ShipComponentDataReactor (shipComponentDescriptor);
+			break;
+	case ShipComponentType::SCT_engine:
+			shipComponent = new ShipComponentDataEngine (shipComponentDescriptor);
+			break;
+	case ShipComponentType::SCT_shield:
+			shipComponent = new ShipComponentDataShield (shipComponentDescriptor);
+			break;
+	case ShipComponentType::SCT_armor:
+			shipComponent = new ShipComponentDataArmor (shipComponentDescriptor);
+			break;
+	case ShipComponentType::SCT_weapon:
+			shipComponent = new ShipComponentDataWeapon (shipComponentDescriptor);
+			break;
+	case ShipComponentType::SCT_capacitor:
+			shipComponent = new ShipComponentDataCapacitor (shipComponentDescriptor);
+			break;
+	case ShipComponentType::SCT_booster:
+			shipComponent = new ShipComponentDataBooster (shipComponentDescriptor);
+			break;
+	case ShipComponentType::SCT_droid_interface:
+			shipComponent = new ShipComponentDataDroidInterface (shipComponentDescriptor);
+			break;
+	case ShipComponentType::SCT_bridge:
+			shipComponent = new ShipComponentDataBridge (shipComponentDescriptor);
+			break;
+	case ShipComponentType::SCT_hangar:
+			shipComponent = new ShipComponentDataHangar (shipComponentDescriptor);
+			break;
+	case ShipComponentType::SCT_targeting_station:
+			shipComponent = new ShipComponentDataTargetingStation (shipComponentDescriptor);
+			break;
+	case ShipComponentType::SCT_cargo_hold:
+			shipComponent = new ShipComponentDataCargoHold(shipComponentDescriptor);
+			break;
+	case ShipComponentType::SCT_modification:
+			shipComponent = new ShipComponentDataModification(shipComponentDescriptor);
+			break;
+	default:
+		WARNING (true, ("ShipComponentDataManager::create descriptor has type [%d] invalid", shipComponentDescriptor.getComponentType ()));
+		return NULL;
+	}
+
+	return shipComponent;
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataManager.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataManager.h
new file mode 100644
index 00000000..6e1d0e82
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataManager.h
@@ -0,0 +1,34 @@
+//======================================================================
+//
+// ShipComponentDataManager.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipComponentDataManager_H
+#define INCLUDED_ShipComponentDataManager_H
+
+//======================================================================
+
+class ShipComponentData;
+class ShipComponentDescriptor;
+class TangibleObject;
+
+//----------------------------------------------------------------------
+
+class ShipComponentDataManager
+{
+public:
+
+	static ShipComponentData * create (TangibleObject const & component);
+	static ShipComponentData * create (ShipComponentDescriptor const & shipComponentDescriptor);
+
+private:
+	ShipComponentDataManager ();
+	ShipComponentDataManager (const ShipComponentDataManager & rhs);
+	ShipComponentDataManager & operator= (const ShipComponentDataManager & rhs);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataModification.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataModification.cpp
new file mode 100644
index 00000000..73e600df
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataModification.cpp
@@ -0,0 +1,90 @@
+//======================================================================
+//
+// ShipComponentDataModification.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipComponentDataModification.h"
+
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedGame/SharedObjectAttributes.h"
+#include "UnicodeUtils.h"
+
+//======================================================================
+
+namespace ShipComponentDataModificationNamespace
+{
+	namespace Objvars
+	{
+	}
+}
+
+using namespace ShipComponentDataModificationNamespace;
+
+//----------------------------------------------------------------------
+
+ShipComponentDataModification::ShipComponentDataModification (ShipComponentDescriptor const & shipComponentDescriptor) :
+ServerShipComponentData(shipComponentDescriptor)
+{
+}
+
+//----------------------------------------------------------------------
+
+ShipComponentDataModification::~ShipComponentDataModification ()
+{
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataModification::readDataFromShip      (int chassisSlot, ShipObject const & ship)
+{
+	if (!ServerShipComponentData::readDataFromShip (chassisSlot, ship))
+		return false;
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataModification::writeDataToShip       (int chassisSlot, ShipObject & ship) const
+{
+	ServerShipComponentData::writeDataToShip (chassisSlot, ship);
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataModification::readDataFromComponent (TangibleObject const & component)
+{
+	if (!ServerShipComponentData::readDataFromComponent (component))
+		return false;
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataModification::writeDataToComponent  (TangibleObject & component) const
+{
+	ServerShipComponentData::writeDataToComponent (component);
+}
+
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataModification::printDebugString      (Unicode::String & result, Unicode::String const & padding) const
+{
+	ServerShipComponentData::printDebugString (result, padding);
+	result += padding + Unicode::narrowToWide ("Modifications have no special properties.\n");
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataModification::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const
+{
+	ServerShipComponentData::getAttributes(data);
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataModification.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataModification.h
new file mode 100644
index 00000000..4009e7e9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataModification.h
@@ -0,0 +1,46 @@
+//======================================================================
+//
+// ShipComponentDataModification.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipComponentDataModification_H
+#define INCLUDED_ShipComponentDataModification_H
+
+//======================================================================
+
+#include "serverGame/ServerShipComponentData.h"
+
+//----------------------------------------------------------------------
+
+class ShipComponentDataModification : public ServerShipComponentData
+{
+public:
+
+	explicit ShipComponentDataModification (ShipComponentDescriptor const & shipComponentDescriptor);
+	virtual ~ShipComponentDataModification ();
+
+	virtual bool readDataFromShip      (int chassisSlot, ShipObject const & ship);
+	virtual void writeDataToShip       (int chassisSlot, ShipObject & ship) const;
+
+	virtual bool readDataFromComponent (TangibleObject const & component);
+	virtual void writeDataToComponent  (TangibleObject & component) const;
+
+	virtual void printDebugString      (Unicode::String & result, Unicode::String const & padding) const;
+
+	virtual void getAttributes         (stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const;
+
+private:
+	ShipComponentDataModification (const ShipComponentDataModification & rhs);
+	ShipComponentDataModification & operator= (const ShipComponentDataModification & rhs);
+
+public:
+
+	//-- these members are public because this instances of this class are short-lived temporary objects,
+	//-- to simplify the conversion from the ShipObject & shipt representation of components.
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataReactor.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataReactor.cpp
new file mode 100644
index 00000000..d725ca61
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataReactor.cpp
@@ -0,0 +1,119 @@
+//======================================================================
+//
+// ShipComponentDataReactor.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipComponentDataReactor.h"
+
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedGame/SharedObjectAttributes.h"
+#include "UnicodeUtils.h"
+
+//======================================================================
+
+namespace ShipComponentDataReactorNamespace
+{
+	namespace Objvars
+	{
+		std::string const energyGenerationRate        = "ship_comp.reactor.energy_generation_rate";
+	}
+}
+
+using namespace ShipComponentDataReactorNamespace;
+
+//----------------------------------------------------------------------
+
+ShipComponentDataReactor::ShipComponentDataReactor (ShipComponentDescriptor const & shipComponentDescriptor) :
+ServerShipComponentData(shipComponentDescriptor),
+m_energyGenerationRate (0.0f)
+{
+}
+
+//----------------------------------------------------------------------
+
+ShipComponentDataReactor::~ShipComponentDataReactor ()
+{
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataReactor::readDataFromShip      (int chassisSlot, ShipObject const & ship)
+{
+	if (!ServerShipComponentData::readDataFromShip (chassisSlot, ship))
+		return false;
+
+	m_energyGenerationRate = ship.getReactorEnergyGenerationRate ();
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataReactor::writeDataToShip       (int chassisSlot, ShipObject & ship) const
+{
+	ServerShipComponentData::writeDataToShip (chassisSlot, ship);
+	ship.setReactorEnergyGenerationRate (m_energyGenerationRate);
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataReactor::readDataFromComponent (TangibleObject const & component)
+{
+	if (!ServerShipComponentData::readDataFromComponent (component))
+		return false;
+
+	DynamicVariableList const &  objvars = component.getObjVars ();
+
+	if (!objvars.getItem (Objvars::energyGenerationRate, m_energyGenerationRate))
+		WARNING (true, ("ShipComponentDataReactor [%s] has no energyGenerationRate [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::energyGenerationRate.c_str ()));
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataReactor::writeDataToComponent  (TangibleObject & component) const
+{
+	ServerShipComponentData::writeDataToComponent (component);
+	component.setObjVarItem (Objvars::energyGenerationRate, m_energyGenerationRate);
+}
+
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataReactor::printDebugString      (Unicode::String & result, Unicode::String const & padding) const
+{
+	ServerShipComponentData::printDebugString (result, padding);
+
+	char buf [1024];
+	const size_t buf_size = sizeof (buf);
+
+	std::string const & nPad = Unicode::wideToNarrow (padding) + "   ";
+
+	snprintf (buf, buf_size,
+		"%sEnergyGenerationRate: %f (%f)\n",
+		nPad.c_str (), m_energyGenerationRate, m_energyGenerationRate * m_efficiencyGeneral);
+
+	result += Unicode::narrowToWide (buf);
+
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataReactor::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const
+{
+	ServerShipComponentData::getAttributes(data);
+
+	Unicode::String attrib;
+	static char buffer[128];
+	static const size_t buffer_size = sizeof (buffer);
+
+	snprintf(buffer, buffer_size, "%.1f", m_energyGenerationRate);
+	attrib = Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_reactor_generation_rate, attrib));
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataReactor.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataReactor.h
new file mode 100644
index 00000000..84777368
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataReactor.h
@@ -0,0 +1,48 @@
+//======================================================================
+//
+// ShipComponentDataReactor.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipComponentDataReactor_H
+#define INCLUDED_ShipComponentDataReactor_H
+
+//======================================================================
+
+#include "serverGame/ServerShipComponentData.h"
+
+//----------------------------------------------------------------------
+
+class ShipComponentDataReactor : public ServerShipComponentData
+{
+public:
+
+	explicit ShipComponentDataReactor (ShipComponentDescriptor const & shipComponentDescriptor);
+	virtual ~ShipComponentDataReactor ();
+
+	virtual bool readDataFromShip      (int chassisSlot, ShipObject const & ship);
+	virtual void writeDataToShip       (int chassisSlot, ShipObject & ship) const;
+	virtual bool readDataFromComponent (TangibleObject const & component);
+	virtual void writeDataToComponent  (TangibleObject & component) const;
+
+	virtual void printDebugString      (Unicode::String & result, Unicode::String const & padding) const;
+
+	virtual void getAttributes         (stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const;
+
+private:
+	ShipComponentDataReactor (const ShipComponentDataReactor & rhs);
+	ShipComponentDataReactor & operator= (const ShipComponentDataReactor & rhs);
+
+public:
+
+	//-- these members are public because this instances of this class are short-lived temporary objects,
+	//-- to simplify the conversion from the ShipObject & shipt representation of components.
+
+	float                 m_energyGenerationRate;
+
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataShield.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataShield.cpp
new file mode 100644
index 00000000..16808ed2
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataShield.cpp
@@ -0,0 +1,173 @@
+//======================================================================
+//
+// ShipComponentDataShield.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipComponentDataShield.h"
+
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedGame/SharedObjectAttributes.h"
+#include "UnicodeUtils.h"
+
+//======================================================================
+
+namespace ShipComponentDataShieldNamespace
+{
+	namespace Objvars
+	{
+		std::string const shieldHitpointsFrontCurrent  = "ship_comp.shield.hitpoints_front_current";
+		std::string const shieldHitpointsFrontMaximum  = "ship_comp.shield.hitpoints_front_maximum";
+		std::string const shieldHitpointsBackCurrent   = "ship_comp.shield.hitpoints_back_current";
+		std::string const shieldHitpointsBackMaximum   = "ship_comp.shield.hitpoints_back_maximum";
+		std::string const shieldRechargeRate           = "ship_comp.shield.recharge_rate";
+	}
+}
+
+using namespace ShipComponentDataShieldNamespace;
+
+//----------------------------------------------------------------------
+
+ShipComponentDataShield::ShipComponentDataShield (ShipComponentDescriptor const & shipComponentDescriptor) :
+ServerShipComponentData        (shipComponentDescriptor),
+m_shieldHitpointsFrontCurrent  (0.0f),
+m_shieldHitpointsFrontMaximum  (0.0f),
+m_shieldHitpointsBackCurrent   (0.0f),
+m_shieldHitpointsBackMaximum   (0.0f),
+m_shieldRechargeRate           (0.0f)
+{
+}
+
+//----------------------------------------------------------------------
+
+ShipComponentDataShield::~ShipComponentDataShield ()
+{
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataShield::readDataFromShip      (int chassisSlot, ShipObject const & ship)
+{
+	if (!ServerShipComponentData::readDataFromShip (chassisSlot, ship))
+		return false;
+
+	m_shieldHitpointsFrontCurrent  = ship.getShieldHitpointsFrontCurrent ();
+	m_shieldHitpointsFrontMaximum  = ship.getShieldHitpointsFrontMaximum ();
+	m_shieldHitpointsBackCurrent   = ship.getShieldHitpointsBackCurrent  ();
+	m_shieldHitpointsBackMaximum   = ship.getShieldHitpointsBackMaximum  ();
+	m_shieldRechargeRate           = ship.getShieldRechargeRate          ();
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataShield::writeDataToShip       (int chassisSlot, ShipObject & ship) const
+{
+	ServerShipComponentData::writeDataToShip (chassisSlot, ship);
+
+	ship.setShieldHitpointsFrontMaximum    (m_shieldHitpointsFrontMaximum);
+	ship.setShieldHitpointsFrontCurrent    (m_shieldHitpointsFrontCurrent);
+	ship.setShieldHitpointsBackMaximum     (m_shieldHitpointsBackMaximum);
+	ship.setShieldHitpointsBackCurrent     (m_shieldHitpointsBackCurrent);
+	ship.setShieldRechargeRate             (m_shieldRechargeRate);
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataShield::readDataFromComponent (TangibleObject const & component)
+{
+	if (!ServerShipComponentData::readDataFromComponent (component))
+		return false;
+
+	DynamicVariableList const &  objvars = component.getObjVars ();
+
+	if (!objvars.getItem (Objvars::shieldHitpointsFrontCurrent, m_shieldHitpointsFrontCurrent))
+		WARNING (true, ("ShipComponentDataShield [%s] has no shieldHitpointsFrontCurrent [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::shieldHitpointsFrontCurrent.c_str ()));
+
+	if (!objvars.getItem (Objvars::shieldHitpointsFrontMaximum, m_shieldHitpointsFrontMaximum))
+		WARNING (true, ("ShipComponentDataShield [%s] has no shieldHitpointsFrontMaximum [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::shieldHitpointsFrontMaximum.c_str ()));
+
+	if (!objvars.getItem (Objvars::shieldHitpointsBackCurrent, m_shieldHitpointsBackCurrent))
+		WARNING (true, ("ShipComponentDataShield [%s] has no shieldHitpointsBackCurrent [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::shieldHitpointsBackCurrent.c_str ()));
+
+	if (!objvars.getItem (Objvars::shieldHitpointsBackMaximum, m_shieldHitpointsBackMaximum))
+		WARNING (true, ("ShipComponentDataShield [%s] has no shieldHitpointsBackMaximum [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::shieldHitpointsBackMaximum.c_str ()));
+
+	if (!objvars.getItem (Objvars::shieldRechargeRate, m_shieldRechargeRate))
+		WARNING (true, ("ShipComponentDataShield [%s] has no shieldRechargeRate [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::shieldRechargeRate.c_str ()));
+
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataShield::writeDataToComponent  (TangibleObject & component) const
+{
+	ServerShipComponentData::writeDataToComponent (component);
+
+	IGNORE_RETURN (component.setObjVarItem (Objvars::shieldHitpointsFrontCurrent, m_shieldHitpointsFrontCurrent));
+	IGNORE_RETURN (component.setObjVarItem (Objvars::shieldHitpointsFrontMaximum, m_shieldHitpointsFrontMaximum));
+	IGNORE_RETURN (component.setObjVarItem (Objvars::shieldHitpointsBackCurrent,  m_shieldHitpointsBackCurrent));
+	IGNORE_RETURN (component.setObjVarItem (Objvars::shieldHitpointsBackMaximum,  m_shieldHitpointsBackMaximum));
+	IGNORE_RETURN (component.setObjVarItem (Objvars::shieldRechargeRate,          m_shieldRechargeRate));
+}
+
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataShield::printDebugString      (Unicode::String & result, Unicode::String const & padding) const
+{
+	ServerShipComponentData::printDebugString (result, padding);
+	
+	char buf [1024];
+	const size_t buf_size = sizeof (buf);
+	
+	std::string const & nPad = Unicode::wideToNarrow (padding) + "   ";
+	
+	snprintf (buf, buf_size,
+		"%sShieldHitpointsFront:  %f / %f\n"
+		"%sShieldHitpointsBack:   %f / %f\n"
+		"%sShieldRechargeRate:    %f (%f)\n",
+		nPad.c_str (), m_shieldHitpointsFrontCurrent, m_shieldHitpointsFrontMaximum,
+		nPad.c_str (), m_shieldHitpointsBackCurrent, m_shieldHitpointsBackMaximum,
+		nPad.c_str (), m_shieldRechargeRate, m_shieldRechargeRate * m_efficiencyGeneral);
+	
+	result += Unicode::narrowToWide (buf);
+	
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataShield::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const
+{
+	ServerShipComponentData::getAttributes(data);
+
+	Unicode::String attrib;
+	static char buffer[128];
+	static const size_t buffer_size = sizeof (buffer);
+
+	snprintf(buffer, buffer_size, "%.1f", m_shieldHitpointsFrontCurrent);
+	attrib = Unicode::narrowToWide(buffer);
+	attrib += cm_slash;
+	snprintf(buffer, buffer_size, "%.1f", m_shieldHitpointsFrontMaximum);
+	attrib += Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_shield_hitpoints_front, attrib));
+
+	snprintf(buffer, buffer_size, "%.1f", m_shieldHitpointsBackCurrent);
+	attrib = Unicode::narrowToWide(buffer);
+	attrib += cm_slash;
+	snprintf(buffer, buffer_size, "%.1f", m_shieldHitpointsBackMaximum);
+	attrib += Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_shield_hitpoints_back, attrib));
+
+	snprintf(buffer, buffer_size, "%.2f", m_shieldRechargeRate);
+	attrib = Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_shield_recharge_rate, attrib));
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataShield.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataShield.h
new file mode 100644
index 00000000..559c3af1
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataShield.h
@@ -0,0 +1,51 @@
+//======================================================================
+//
+// ShipComponentDataShield.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipComponentDataShield_H
+#define INCLUDED_ShipComponentDataShield_H
+
+//======================================================================
+
+#include "serverGame/ServerShipComponentData.h"
+
+//----------------------------------------------------------------------
+
+class ShipComponentDataShield : public ServerShipComponentData
+{
+public:
+
+	explicit ShipComponentDataShield (ShipComponentDescriptor const & shipComponentDescriptor);
+	virtual ~ShipComponentDataShield ();
+
+	virtual bool readDataFromShip      (int chassisSlot, ShipObject const & ship);
+	virtual void writeDataToShip       (int chassisSlot, ShipObject & ship) const;
+	virtual bool readDataFromComponent (TangibleObject const & component);
+	virtual void writeDataToComponent  (TangibleObject & component) const;
+
+	virtual void printDebugString      (Unicode::String & result, Unicode::String const & padding) const;
+
+	virtual void getAttributes         (stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const;
+
+private:
+	ShipComponentDataShield (const ShipComponentDataShield & rhs);
+	ShipComponentDataShield & operator= (const ShipComponentDataShield & rhs);
+
+public:
+
+	//-- these members are public because this instances of this class are short-lived temporary objects,
+	//-- to simplify the conversion from the ShipObject & shipt representation of components.
+
+	float m_shieldHitpointsFrontCurrent;
+	float m_shieldHitpointsFrontMaximum;
+	float m_shieldHitpointsBackCurrent;
+	float m_shieldHitpointsBackMaximum;
+	float m_shieldRechargeRate;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataTargetingStation.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataTargetingStation.cpp
new file mode 100644
index 00000000..2a7daf71
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataTargetingStation.cpp
@@ -0,0 +1,97 @@
+//======================================================================
+//
+// ShipComponentDataTargetingStation.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipComponentDataTargetingStation.h"
+
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "UnicodeUtils.h"
+
+//======================================================================
+
+namespace ShipComponentDataTargetingStationNamespace
+{
+}
+
+using namespace ShipComponentDataTargetingStationNamespace;
+
+//----------------------------------------------------------------------
+
+ShipComponentDataTargetingStation::ShipComponentDataTargetingStation (ShipComponentDescriptor const & shipComponentDescriptor) :
+ServerShipComponentData            (shipComponentDescriptor)
+{
+}
+
+//----------------------------------------------------------------------
+
+ShipComponentDataTargetingStation::~ShipComponentDataTargetingStation ()
+{
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataTargetingStation::readDataFromShip      (int chassisSlot, ShipObject const & ship)
+{
+	if (!ServerShipComponentData::readDataFromShip (chassisSlot, ship))
+		return false;
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataTargetingStation::writeDataToShip       (int chassisSlot, ShipObject & ship) const
+{
+	ServerShipComponentData::writeDataToShip (chassisSlot, ship);
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataTargetingStation::readDataFromComponent (TangibleObject const & component)
+{
+	if (!ServerShipComponentData::readDataFromComponent (component))
+		return false;
+
+	DynamicVariableList const &  objvars = component.getObjVars ();
+	UNREF(objvars);
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataTargetingStation::writeDataToComponent  (TangibleObject & component) const
+{
+	ServerShipComponentData::writeDataToComponent (component);
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataTargetingStation::printDebugString      (Unicode::String & result, Unicode::String const & padding) const
+{
+	ServerShipComponentData::printDebugString (result, padding);
+
+	char buf [1024];
+	const size_t buf_size = sizeof (buf);
+	UNREF(buf_size);
+
+	std::string const & nPad = Unicode::wideToNarrow (padding) + "   ";
+	UNREF(nPad);
+
+	result += Unicode::narrowToWide (buf);
+
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataTargetingStation::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const
+{
+	ServerShipComponentData::getAttributes(data);
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataTargetingStation.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataTargetingStation.h
new file mode 100644
index 00000000..a8440e8b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataTargetingStation.h
@@ -0,0 +1,45 @@
+//======================================================================
+//
+// ShipComponentDataTargetingStation.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipComponentDataTargetingStation_H
+#define INCLUDED_ShipComponentDataTargetingStation_H
+
+//======================================================================
+
+#include "serverGame/ServerShipComponentData.h"
+
+//----------------------------------------------------------------------
+
+class ShipComponentDataTargetingStation : public ServerShipComponentData
+{
+public:
+
+	explicit ShipComponentDataTargetingStation (ShipComponentDescriptor const & shipComponentDescriptor);
+	virtual ~ShipComponentDataTargetingStation ();
+
+	virtual bool readDataFromShip      (int chassisSlot, ShipObject const & ship);
+	virtual void writeDataToShip       (int chassisSlot, ShipObject & ship) const;
+	virtual bool readDataFromComponent (TangibleObject const & component);
+	virtual void writeDataToComponent  (TangibleObject & component) const;
+
+	virtual void printDebugString      (Unicode::String & result, Unicode::String const & padding) const;
+
+	virtual void getAttributes         (stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const;
+
+private:
+	ShipComponentDataTargetingStation (const ShipComponentDataTargetingStation & rhs);
+	ShipComponentDataTargetingStation & operator= (const ShipComponentDataTargetingStation & rhs);
+
+public:
+
+	//-- these members are public because this instances of this class are short-lived temporary objects,
+	//-- to simplify the conversion from the ShipObject & shipt representation of components.
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataWeapon.cpp b/engine/server/library/serverGame/src/shared/space/ShipComponentDataWeapon.cpp
new file mode 100644
index 00000000..aeb4c25c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataWeapon.cpp
@@ -0,0 +1,226 @@
+//======================================================================
+//
+// ShipComponentDataWeapon.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipComponentDataWeapon.h"
+
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/DynamicVariableList.h"
+#include "sharedGame/SharedObjectAttributes.h"
+#include "UnicodeUtils.h"
+
+//======================================================================
+
+namespace ShipComponentDataWeaponNamespace
+{
+	namespace Objvars
+	{
+		std::string const weaponDamageMaximum        = "ship_comp.weapon.damage_maximum";
+		std::string const weaponDamageMinimum        = "ship_comp.weapon.damage_minimum";
+		std::string const weaponEffectivenessShields = "ship_comp.weapon.effectiveness_shields";
+		std::string const weaponEffectivenessArmor   = "ship_comp.weapon.effectiveness_armor";
+		std::string const weaponEnergyPerShot        = "ship_comp.weapon.energy_per_shot";
+		std::string const weaponRefireRate           = "ship_comp.weapon.refire_rate";
+		std::string const weaponAmmoCurrent          = "ship_comp.weapon.ammo_current";
+		std::string const weaponAmmoMaximum          = "ship_comp.weapon.ammo_maximum";
+		std::string const weaponAmmoType             = "ship_comp.weapon.ammo_type";
+	}
+}
+
+using namespace ShipComponentDataWeaponNamespace;
+
+//----------------------------------------------------------------------
+
+ShipComponentDataWeapon::ShipComponentDataWeapon (ShipComponentDescriptor const & shipComponentDescriptor) :
+ServerShipComponentData      (shipComponentDescriptor),
+m_weaponDamageMaximum        (10.0f),
+m_weaponDamageMinimum        (1.0f),
+m_weaponEffectivenessShields (0.5f),
+m_weaponEffectivenessArmor   (0.5f),
+m_weaponEnergyPerShot        (10.0f),
+m_weaponRefireRate           (0.5f),
+m_weaponEfficiencyRefireRate (1.0f),
+m_weaponAmmoCurrent          (0),
+m_weaponAmmoMaximum          (0),
+m_weaponAmmoType             (0)
+{
+}
+
+//----------------------------------------------------------------------
+
+ShipComponentDataWeapon::~ShipComponentDataWeapon ()
+{
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataWeapon::readDataFromShip      (int chassisSlot, ShipObject const & ship)
+{
+	if (!ServerShipComponentData::readDataFromShip (chassisSlot, ship))
+		return false;
+
+	m_weaponDamageMaximum         = ship.getWeaponDamageMaximum        (chassisSlot);
+	m_weaponDamageMinimum         = ship.getWeaponDamageMinimum        (chassisSlot);
+	m_weaponEffectivenessShields  = ship.getWeaponEffectivenessShields (chassisSlot);
+	m_weaponEffectivenessArmor    = ship.getWeaponEffectivenessArmor   (chassisSlot);
+	m_weaponEnergyPerShot         = ship.getWeaponEnergyPerShot        (chassisSlot);
+	m_weaponRefireRate            = ship.getWeaponRefireRate           (chassisSlot);
+	m_weaponEfficiencyRefireRate  = ship.getWeaponEfficiencyRefireRate(chassisSlot);
+	m_weaponAmmoCurrent           = ship.getWeaponAmmoCurrent          (chassisSlot);
+	m_weaponAmmoMaximum           = ship.getWeaponAmmoMaximum          (chassisSlot);
+	m_weaponAmmoType              = ship.getWeaponAmmoType             (chassisSlot);
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataWeapon::writeDataToShip       (int chassisSlot, ShipObject & ship) const
+{
+	ServerShipComponentData::writeDataToShip (chassisSlot, ship);
+
+	IGNORE_RETURN(ship.setWeaponDamageMaximum        (chassisSlot, m_weaponDamageMaximum));
+	IGNORE_RETURN(ship.setWeaponDamageMinimum        (chassisSlot, m_weaponDamageMinimum));
+	IGNORE_RETURN(ship.setWeaponEffectivenessShields (chassisSlot, m_weaponEffectivenessShields));
+	IGNORE_RETURN(ship.setWeaponEffectivenessArmor   (chassisSlot, m_weaponEffectivenessArmor));
+	IGNORE_RETURN(ship.setWeaponEnergyPerShot        (chassisSlot, m_weaponEnergyPerShot));
+	IGNORE_RETURN(ship.setWeaponRefireRate           (chassisSlot, m_weaponRefireRate));
+	IGNORE_RETURN(ship.setWeaponEfficiencyRefireRate(chassisSlot, m_weaponEfficiencyRefireRate));
+	IGNORE_RETURN(ship.setWeaponAmmoCurrent          (chassisSlot, m_weaponAmmoCurrent));
+	IGNORE_RETURN(ship.setWeaponAmmoMaximum          (chassisSlot, m_weaponAmmoMaximum));
+	IGNORE_RETURN(ship.setWeaponAmmoType             (chassisSlot, m_weaponAmmoType));
+}
+
+//----------------------------------------------------------------------
+
+bool ShipComponentDataWeapon::readDataFromComponent (TangibleObject const & component)
+{
+	if (!ServerShipComponentData::readDataFromComponent (component))
+		return false;
+	
+	DynamicVariableList const &  objvars = component.getObjVars ();
+	
+	if (!objvars.getItem (Objvars::weaponDamageMaximum, m_weaponDamageMaximum))
+		WARNING (true, ("ShipComponentDataWeapon [%s] has no weaponDamageMaximum [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::weaponDamageMaximum.c_str ()));
+	
+	if (!objvars.getItem (Objvars::weaponDamageMinimum, m_weaponDamageMinimum))
+		WARNING (true, ("ShipComponentDataWeapon [%s] has no weaponDamageMinimum [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::weaponDamageMinimum.c_str ()));
+	
+	if (!objvars.getItem (Objvars::weaponEffectivenessShields, m_weaponEffectivenessShields))
+		WARNING (true, ("ShipComponentDataWeapon [%s] has no weaponEffectivenessShields [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::weaponEffectivenessShields.c_str ()));
+	
+	if (!objvars.getItem (Objvars::weaponEffectivenessArmor, m_weaponEffectivenessArmor))
+		WARNING (true, ("ShipComponentDataWeapon [%s] has no weaponEffectivenessArmor [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::weaponEffectivenessArmor.c_str ()));
+	
+	if (!objvars.getItem (Objvars::weaponEnergyPerShot, m_weaponEnergyPerShot))
+		WARNING (true, ("ShipComponentDataWeapon [%s] has no weaponEnergyPerShot [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::weaponEnergyPerShot.c_str ()));
+	
+	if (!objvars.getItem (Objvars::weaponRefireRate, m_weaponRefireRate))
+		WARNING (true, ("ShipComponentDataWeapon [%s] has no weaponRefireRate [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::weaponRefireRate.c_str ()));
+
+	if (!objvars.getItem (Objvars::weaponAmmoCurrent, m_weaponAmmoCurrent))
+		WARNING (true, ("ShipComponentDataWeapon [%s] has no m_weaponAmmoCurrent [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::weaponAmmoCurrent.c_str ()));
+
+	if (!objvars.getItem (Objvars::weaponAmmoMaximum, m_weaponAmmoMaximum))
+		WARNING (true, ("ShipComponentDataWeapon [%s] has no m_weaponAmmoMaximum [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::weaponAmmoMaximum.c_str ()));
+
+	int ammoType = 0;
+	if (!objvars.getItem (Objvars::weaponAmmoType, ammoType))
+		WARNING (true, ("ShipComponentDataWeapon [%s] has no m_weaponAmmoType [%s]", component.getNetworkId ().getValueString ().c_str (), Objvars::weaponAmmoType.c_str ()));
+	else
+		m_weaponAmmoType = static_cast<uint32>(ammoType);
+	
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataWeapon::writeDataToComponent  (TangibleObject & component) const
+{
+	ServerShipComponentData::writeDataToComponent (component);
+
+	IGNORE_RETURN (component.setObjVarItem (Objvars::weaponDamageMaximum,        m_weaponDamageMaximum));
+	IGNORE_RETURN (component.setObjVarItem (Objvars::weaponDamageMinimum,        m_weaponDamageMinimum));
+	IGNORE_RETURN (component.setObjVarItem (Objvars::weaponEffectivenessShields, m_weaponEffectivenessShields));
+	IGNORE_RETURN (component.setObjVarItem (Objvars::weaponEffectivenessArmor,   m_weaponEffectivenessArmor));
+	IGNORE_RETURN (component.setObjVarItem (Objvars::weaponEnergyPerShot,        m_weaponEnergyPerShot));
+	IGNORE_RETURN (component.setObjVarItem (Objvars::weaponRefireRate,           m_weaponRefireRate));
+	IGNORE_RETURN (component.setObjVarItem (Objvars::weaponAmmoCurrent,          m_weaponAmmoCurrent));
+	IGNORE_RETURN (component.setObjVarItem (Objvars::weaponAmmoMaximum,          m_weaponAmmoMaximum));
+	IGNORE_RETURN (component.setObjVarItem (Objvars::weaponAmmoType,             static_cast<int>(m_weaponAmmoType)));
+}
+
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataWeapon::printDebugString      (Unicode::String & result, Unicode::String const & padding) const
+{
+	ServerShipComponentData::printDebugString (result, padding);
+
+	char buf [1024];
+	const size_t buf_size = sizeof (buf);
+
+	std::string const & nPad = Unicode::wideToNarrow (padding) + "   ";
+
+	snprintf (buf, buf_size,
+		"%sDamage:                %f-%f\n"
+		"%sEffectivenessShields:  %f\n"
+		"%sEffectivenessArmor:    %f\n"
+		"%sEnergyPerShot:         %f\n"
+		"%sRefireRate:            %f @ %f\n"
+		"%sAmmo:                  (%lu) %d/%d\n",
+		nPad.c_str (), m_weaponDamageMaximum, m_weaponDamageMinimum,
+		nPad.c_str (), m_weaponEffectivenessShields,
+		nPad.c_str (), m_weaponEffectivenessArmor,
+		nPad.c_str (), m_weaponEnergyPerShot,
+		nPad.c_str (), m_weaponRefireRate, m_weaponEfficiencyRefireRate,
+		nPad.c_str (), m_weaponAmmoType, m_weaponAmmoCurrent, m_weaponAmmoMaximum);
+
+	result += Unicode::narrowToWide (buf);
+}
+
+//----------------------------------------------------------------------
+
+void ShipComponentDataWeapon::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const
+{
+	ServerShipComponentData::getAttributes(data);
+
+	Unicode::String attrib;
+	static char buffer[128];
+	static const size_t buffer_size = sizeof (buffer);
+
+	snprintf(buffer, buffer_size, "%.1f-%.1f", m_weaponDamageMinimum, m_weaponDamageMaximum);
+	attrib = Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_weapon_damage, attrib));
+
+	snprintf(buffer, buffer_size, "%.3f", m_weaponEffectivenessShields);
+	attrib = Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_weapon_effectiveness_shields, attrib));
+
+	snprintf(buffer, buffer_size, "%.3f", m_weaponEffectivenessArmor);
+	attrib = Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_weapon_effectiveness_armor, attrib));
+
+	snprintf(buffer, buffer_size, "%.1f", m_weaponEnergyPerShot);
+	attrib = Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_weapon_energy_per_shot, attrib));
+
+	snprintf(buffer, buffer_size, "%.3f", m_weaponRefireRate);
+	attrib = Unicode::narrowToWide(buffer);
+	data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_weapon_refire_rate, attrib));
+
+	if(m_weaponAmmoMaximum != 0)
+	{
+		IGNORE_RETURN(_itoa(m_weaponAmmoCurrent, buffer, 10));
+		attrib = Unicode::narrowToWide(buffer);
+		attrib += cm_slash;
+		IGNORE_RETURN(_itoa(m_weaponAmmoMaximum, buffer, 10));
+		attrib += Unicode::narrowToWide(buffer);
+		data.push_back(std::make_pair(cm_shipComponentCategory + SharedObjectAttributes::ship_component_weapon_ammo, attrib));
+	}
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ShipComponentDataWeapon.h b/engine/server/library/serverGame/src/shared/space/ShipComponentDataWeapon.h
new file mode 100644
index 00000000..bb5f5d71
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipComponentDataWeapon.h
@@ -0,0 +1,57 @@
+//======================================================================
+//
+// ShipComponentDataWeapon.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipComponentDataWeapon_H
+#define INCLUDED_ShipComponentDataWeapon_H
+
+//======================================================================
+
+#include "serverGame/ServerShipComponentData.h"
+
+//----------------------------------------------------------------------
+
+class ShipComponentDataWeapon : public ServerShipComponentData
+{
+public:
+
+	explicit ShipComponentDataWeapon (ShipComponentDescriptor const & shipComponentDescriptor);
+	virtual ~ShipComponentDataWeapon ();
+
+	virtual bool readDataFromShip      (int chassisSlot, ShipObject const & ship);
+	virtual void writeDataToShip       (int chassisSlot, ShipObject & ship) const;
+
+	virtual bool readDataFromComponent (TangibleObject const & component);
+	virtual void writeDataToComponent  (TangibleObject & component) const;
+
+	virtual void printDebugString      (Unicode::String & result, Unicode::String const & padding) const;
+
+	virtual void getAttributes         (stdvector<std::pair<std::string, Unicode::String> >::fwd & data) const;
+
+private:
+	ShipComponentDataWeapon (const ShipComponentDataWeapon & rhs);
+	ShipComponentDataWeapon & operator= (const ShipComponentDataWeapon & rhs);
+
+public:
+
+	//-- these members are public because this instances of this class are short-lived temporary objects,
+	//-- to simplify the conversion from the ShipObject & shipt representation of components.
+
+	float     m_weaponDamageMaximum;
+	float     m_weaponDamageMinimum;
+	float     m_weaponEffectivenessShields;
+	float     m_weaponEffectivenessArmor;
+	float     m_weaponEnergyPerShot;
+	float     m_weaponRefireRate;
+	float     m_weaponEfficiencyRefireRate;
+	int       m_weaponAmmoCurrent;
+	int       m_weaponAmmoMaximum;
+	uint32    m_weaponAmmoType;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTime.cpp b/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTime.cpp
new file mode 100644
index 00000000..9411fb1b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTime.cpp
@@ -0,0 +1,134 @@
+//======================================================================
+//
+// ShipInternalDamageOverTime.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipInternalDamageOverTime.h"
+
+#include "serverGame/ShipObject.h"
+#include "sharedGame/ShipChassisSlotType.h"
+
+//======================================================================
+
+ShipInternalDamageOverTime::ShipInternalDamageOverTime(ShipObject const & ship, int chassisSlot, float damageRate, float damageThreshold) :
+m_shipId(const_cast<ShipObject &>(ship)),
+m_chassisSlot(chassisSlot),
+m_damageRate(damageRate),
+m_damageThreshold(damageThreshold),
+m_expired(false)
+{
+}
+
+//----------------------------------------------------------------------
+
+void ShipInternalDamageOverTime::setDamageRate(float damageRate)
+{
+	m_damageRate = damageRate;
+}
+
+//----------------------------------------------------------------------
+
+void ShipInternalDamageOverTime::setDamageThreshold(float damageThreshold)
+{
+	m_damageThreshold = damageThreshold;
+}
+
+//----------------------------------------------------------------------
+
+ShipObject * const ShipInternalDamageOverTime::getShipObject() const
+{
+	Object  * const object = m_shipId.getObject();
+	if (object != NULL && object->isAuthoritative())
+	{
+		ServerObject  * const serverObject = object->asServerObject();
+		if (serverObject != NULL)
+			return serverObject->asShipObject();
+	}
+	
+	return NULL;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipInternalDamageOverTime::checkValidity(float & hpCurrent, float & hpMaximum) const
+{
+	ShipObject * const ship = getShipObject();
+	if (ship == NULL)
+		return false;
+
+	if (m_chassisSlot < 0 || m_chassisSlot > ShipChassisSlotType::SCST_num_types)
+		return false;
+		
+	//- the ship is the damage target
+	if (m_chassisSlot == ShipChassisSlotType::SCST_num_types)
+	{
+		hpCurrent = ship->getCurrentChassisHitPoints();
+		hpMaximum = ship->getMaximumChassisHitPoints();
+	}
+	else
+	{
+		if (!ship->isSlotInstalled(m_chassisSlot))
+			return false;
+		
+		hpCurrent = ship->getComponentHitpointsCurrent(m_chassisSlot);
+		hpMaximum = ship->getComponentHitpointsMaximum(m_chassisSlot);
+	}
+	
+	if (hpMaximum <= 0.0f)
+		return false;
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+/**
+* @return false if the IDOT is below the damage threshold, or the ship/component no longer exists
+*/
+
+bool ShipInternalDamageOverTime::applyDamage(float elapsedTime, float & damageApplied) const
+{
+	ShipObject * const ship = getShipObject();
+	if (ship == NULL)
+		return false;
+
+	float hpCurrent = 0.0f;
+	float hpMaximum = 0.0f;
+
+	if (!checkValidity(hpCurrent, hpMaximum))
+		return false;
+
+	float const minHpCurrent = m_damageThreshold * hpMaximum;
+	float const newHpCurrent = clamp(minHpCurrent, hpCurrent - (elapsedTime * m_damageRate), hpMaximum);
+
+	if (m_chassisSlot == ShipChassisSlotType::SCST_num_types)
+	{
+		if (!ship->setCurrentChassisHitPoints(newHpCurrent))
+			return false;
+	}
+	else
+	{
+		if (!ship->setComponentHitpointsCurrent(m_chassisSlot, newHpCurrent))
+			return false;
+	}
+	
+	damageApplied = hpCurrent - newHpCurrent;
+
+	float const newHpPercent = newHpCurrent / hpMaximum;
+
+	if (newHpPercent <= m_damageThreshold)
+		return false;
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+void ShipInternalDamageOverTime::setExpired(bool expired) const
+{
+	m_expired = expired;
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTime.h b/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTime.h
new file mode 100644
index 00000000..08943b96
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTime.h
@@ -0,0 +1,114 @@
+//======================================================================
+//
+// ShipInternalDamageOverTime.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipInternalDamageOverTime_H
+#define INCLUDED_ShipInternalDamageOverTime_H
+
+#include "sharedObject/CachedNetworkId.h"
+
+class ShipObject;
+
+//======================================================================
+
+class ShipInternalDamageOverTime
+{
+public:
+	
+	class ExpiredRemoveFunctor
+	{
+	public:
+		bool operator() (ShipInternalDamageOverTime const & rhs)const;
+	};
+
+	ShipInternalDamageOverTime(ShipObject const & ship, int chassisSlot, float damageRate, float damageThreshold);
+
+	float getDamageRate() const;
+	float getDamageThreshold() const;
+	int getChassisSlot() const;
+	bool isExpired() const;
+
+	void setDamageRate(float damageRate);
+	void setDamageThreshold(float damageThreshold);
+
+	bool applyDamage(float elapsedTime, float & damageApplied) const;
+	bool checkValidity() const;
+	bool checkValidity(float & hpCurrent, float & hpMaximum) const;
+	void setExpired(bool expired) const;
+
+	ShipObject * const getShipObject() const;
+	bool operator<(ShipInternalDamageOverTime const & rhs) const;
+
+private:
+
+	CachedNetworkId m_shipId;
+	int m_chassisSlot;
+	float m_damageRate;
+	float m_damageThreshold;
+
+	mutable bool m_expired;
+};
+
+//----------------------------------------------------------------------
+
+inline float ShipInternalDamageOverTime::getDamageRate() const
+{
+	return m_damageRate;
+}
+
+//----------------------------------------------------------------------
+
+inline float ShipInternalDamageOverTime::getDamageThreshold() const
+{
+	return m_damageThreshold;
+}
+
+//----------------------------------------------------------------------
+
+inline int ShipInternalDamageOverTime::getChassisSlot() const
+{
+	return m_chassisSlot;
+}
+
+//----------------------------------------------------------------------
+
+inline bool ShipInternalDamageOverTime::isExpired() const
+{
+	return m_expired;
+}
+
+//----------------------------------------------------------------------
+
+inline bool ShipInternalDamageOverTime::operator<(ShipInternalDamageOverTime const & rhs) const
+{
+	if (m_shipId < rhs.m_shipId)
+		return true;
+
+	if (m_shipId == rhs.m_shipId && m_chassisSlot < rhs.m_chassisSlot)
+		return true;
+
+	return false;
+}
+
+//----------------------------------------------------------------------
+
+inline bool ShipInternalDamageOverTime::ExpiredRemoveFunctor::operator() (ShipInternalDamageOverTime const & rhs)const
+{
+	return rhs.isExpired();
+}
+
+//----------------------------------------------------------------------
+
+inline bool ShipInternalDamageOverTime::checkValidity() const
+{
+	float hpCur = 0.0f;
+	float hpMax = 0.0f;
+	return checkValidity(hpCur, hpMax);
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.cpp b/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.cpp
new file mode 100644
index 00000000..771251a0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.cpp
@@ -0,0 +1,256 @@
+//======================================================================
+//
+// ShipInternalDamageOverTimeManager.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ShipInternalDamageOverTimeManager.h"
+
+#include "serverGame/ShipInternalDamageOverTime.h"
+#include "serverGame/ShipObject.h"
+#include "serverScript/GameScriptObject.h"
+#include "serverScript/ScriptFunctionTable.h"
+#include "serverScript/ScriptParameters.h"
+#include "sharedFoundation/ExitChain.h"
+#include <algorithm>
+#include <vector>
+
+//======================================================================
+
+namespace ShipInternalDamageOverTimeManagerNamespace
+{
+	typedef ShipInternalDamageOverTimeManager::IdotVector IdotVector;
+	typedef std::pair<ShipInternalDamageOverTime, float> IdotDamage;
+	typedef stdvector<IdotDamage>::fwd IdotDamageVector;
+
+	IdotVector s_idotVector;
+	IdotVector s_temporaryIdotVector;
+	IdotDamageVector s_temporaryIdotDamageVector;
+
+	float ms_timeSinceUpdate = 0.0f;
+
+	float const ms_updateTime = 2.0f;
+
+	//----------------------------------------------------------------------
+
+	void notifyIdotRemoval(ShipObject & ship, ShipInternalDamageOverTime const & idot)
+	{
+		GameScriptObject * const gameScriptObject = ship.getScriptObject();
+		
+		if (gameScriptObject != NULL)
+		{
+			ScriptParams p;
+			p.addParam(idot.getChassisSlot());
+			p.addParam(idot.getDamageRate());
+			p.addParam(idot.getDamageThreshold());
+			
+			IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_SHIP_INTERNAL_DAMAGE_OVER_TIME_REMOVED, p));
+		}			
+	}
+
+	//----------------------------------------------------------------------
+
+	void notifyIdotDamage(ShipObject & ship, ShipInternalDamageOverTime const & idot, float damageApplied)
+	{
+		GameScriptObject * const gameScriptObject = ship.getScriptObject();
+		
+		if (gameScriptObject != NULL)
+		{
+			ScriptParams p;
+			p.addParam(idot.getChassisSlot());
+			p.addParam(idot.getDamageRate());
+			p.addParam(idot.getDamageThreshold());
+			p.addParam(damageApplied);
+			
+			IGNORE_RETURN(gameScriptObject->trigAllScripts(Scripting::TRIG_SHIP_DAMAGED_BY_INTERNAL_DAMAGE_OVER_TIME, p));
+		}
+	}
+}
+
+using namespace ShipInternalDamageOverTimeManagerNamespace;
+
+//----------------------------------------------------------------------
+
+void ShipInternalDamageOverTimeManager::install()
+{
+	ExitChain::add(ShipInternalDamageOverTimeManager::remove, "ShipInternalDamageOverTimeManager::remove");
+}
+
+//----------------------------------------------------------------------
+
+void ShipInternalDamageOverTimeManager::remove()
+{ 
+	s_temporaryIdotVector.clear();
+	s_idotVector.clear();
+}
+
+//----------------------------------------------------------------------
+
+void ShipInternalDamageOverTimeManager::update(float elapsedTime)
+{
+	ms_timeSinceUpdate += elapsedTime;
+
+	if (ms_timeSinceUpdate < ms_updateTime)
+		return;
+
+	bool hasExpired = false;
+
+	{
+		s_temporaryIdotDamageVector.clear();
+
+		IdotVector::const_iterator const end = s_idotVector.end();
+		for (IdotVector::const_iterator it = s_idotVector.begin(); it != end; ++it)
+		{
+			ShipInternalDamageOverTime const & idot = *it;
+			
+			float damageApplied = 0.0f;
+			if (idot.isExpired() || !idot.applyDamage(ms_timeSinceUpdate, damageApplied))
+			{
+				idot.setExpired(true);
+				hasExpired = true;
+			}
+
+			if (damageApplied != 0.0f)
+				s_temporaryIdotDamageVector.push_back(IdotDamage(idot, damageApplied));
+		}
+	}
+
+	//-- process queued damage notifications
+	//-- this is done outside the update loop so that script triggers can be allowed to add/remove idots
+	{
+		for (IdotDamageVector::const_iterator it = s_temporaryIdotDamageVector.begin(); it != s_temporaryIdotDamageVector.end(); ++it)
+		{
+			IdotDamage const & idotDamage = *it;
+			ShipInternalDamageOverTime const & idot = idotDamage.first;
+			float const damageApplied = idotDamage.second;
+
+			ShipObject * const shipObject = idot.getShipObject();
+
+			if (NULL != shipObject)
+				notifyIdotDamage(*shipObject, idot, damageApplied);
+		}
+	}
+
+	//-- process any expired idots
+	//-- this is done outside the update loop so that script triggers can be allowed to add/remove idots
+	if (hasExpired)
+	{
+		IdotVector::iterator const expired_begin = std::remove_if(s_idotVector.begin(), s_idotVector.end(), ShipInternalDamageOverTime::ExpiredRemoveFunctor());
+		
+		s_temporaryIdotVector.clear();
+		s_temporaryIdotVector.insert(s_temporaryIdotVector.end(), expired_begin, s_idotVector.end());
+		IGNORE_RETURN(s_idotVector.erase(expired_begin, s_idotVector.end()));
+		
+		{
+			IdotVector::const_iterator const end = s_temporaryIdotVector.end();
+			for (IdotVector::const_iterator it = s_temporaryIdotVector.begin(); it != end; ++it)
+			{
+				ShipInternalDamageOverTime const & expiredIdot = *it;
+				ShipObject * const shipObject = expiredIdot.getShipObject();
+				
+				if (shipObject != NULL)
+					notifyIdotRemoval(*shipObject, expiredIdot);
+			}
+		}
+		
+		s_temporaryIdotVector.clear();
+	}
+
+	ms_timeSinceUpdate = 0.0f;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipInternalDamageOverTimeManager::setEntry(ShipObject const & ship, int chassisSlot, float damageRate, float damageThreshold)
+{
+	ShipInternalDamageOverTime const idot(ship, chassisSlot, damageRate, damageThreshold);
+	
+	if (!idot.checkValidity())
+		return false;
+	
+	IdotVector::iterator const lowerBound = std::lower_bound(s_idotVector.begin(), s_idotVector.end(), idot);
+	
+	//-- there is no lower bound, just stick it at the end
+	if (lowerBound == s_idotVector.end())
+	{
+		s_idotVector.push_back(idot);
+	}
+	else
+	{
+		ShipInternalDamageOverTime & lowerBoundIdot = *lowerBound;
+		
+		//-- the lower bound sorts greater than the new idot, therefore this is a new insertion
+		if (idot < lowerBoundIdot)
+		{
+			IGNORE_RETURN(s_idotVector.insert(lowerBound, idot));
+		}
+		else
+		{
+			//-- otherwise we are overriding an existing value
+			
+			lowerBoundIdot.setDamageRate(damageRate);
+			lowerBoundIdot.setDamageThreshold(damageThreshold);
+		}
+	}
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipInternalDamageOverTimeManager::removeEntry(ShipObject const & ship, int chassisSlot)
+{
+	ShipInternalDamageOverTime const idot(ship, chassisSlot, 0.0f, 0.0f);
+
+	IdotVector::iterator const lowerBound = std::lower_bound(s_idotVector.begin(), s_idotVector.end(), idot);
+
+	//-- there is no lower bound, the idot is not in the vector
+	if (lowerBound == s_idotVector.end())
+		return false;
+
+	ShipInternalDamageOverTime const lowerBoundIdot = *lowerBound;
+
+	//-- the lower bound sorts greater than the new idot, therefore this is a new insertion
+	if (idot < lowerBoundIdot)
+		return false;
+
+	IGNORE_RETURN(s_idotVector.erase(lowerBound));
+
+	ShipObject * const shipObject = lowerBoundIdot.getShipObject();
+	if (shipObject != NULL)
+		notifyIdotRemoval(*shipObject, lowerBoundIdot);
+
+	return true;
+}
+
+//----------------------------------------------------------------------
+
+ShipInternalDamageOverTime const * const ShipInternalDamageOverTimeManager::findEntry(ShipObject const & ship, int chassisSlot)
+{
+	ShipInternalDamageOverTime const idot(ship, chassisSlot, 0.0f, 0.0f);
+
+	IdotVector::iterator const lowerBound = std::lower_bound(s_idotVector.begin(), s_idotVector.end(), idot);
+
+	//-- there is no lower bound, the idot is not in the vector
+	if (lowerBound == s_idotVector.end())
+		return false;
+
+	ShipInternalDamageOverTime & lowerBoundIdot = *lowerBound;
+
+	//-- the lower bound sorts greater than the new idot, therefore this is a new insertion
+	if (idot < lowerBoundIdot)
+		return false;
+
+	return &lowerBoundIdot;
+}
+
+//----------------------------------------------------------------------
+
+ShipInternalDamageOverTimeManager::IdotVector const & ShipInternalDamageOverTimeManager::getActiveShipInternalDamageOverTime()
+{
+	return s_idotVector;
+}
+
+//======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.h b/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.h
new file mode 100644
index 00000000..50c2183c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.h
@@ -0,0 +1,37 @@
+//======================================================================
+//
+// ShipInternalDamageOverTimeManager.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipInternalDamageOverTimeManager_H
+#define INCLUDED_ShipInternalDamageOverTimeManager_H
+
+//======================================================================
+
+class ShipInternalDamageOverTime;
+class ShipObject;
+
+//----------------------------------------------------------------------
+
+class ShipInternalDamageOverTimeManager
+{
+public:
+
+	typedef stdvector<ShipInternalDamageOverTime>::fwd IdotVector;
+
+	static void install();
+	static void remove();
+	static void update(float elapsedTime);
+
+	static bool setEntry(ShipObject const & ship, int chassisSlot, float damageRate, float damageThreshold);
+	static bool removeEntry(ShipObject const & ship, int chassisSlot);
+	static ShipInternalDamageOverTime const * const findEntry(ShipObject const & ship, int chassisSlot);
+
+	static IdotVector const & getActiveShipInternalDamageOverTime();
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/SpaceAttackSquad.cpp b/engine/server/library/serverGame/src/shared/space/SpaceAttackSquad.cpp
new file mode 100644
index 00000000..de7693e5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/SpaceAttackSquad.cpp
@@ -0,0 +1,404 @@
+// ======================================================================
+// 
+// SpaceAttackSquad.cpp
+// Copyright Sony Online Entertainment, Inc.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/SpaceAttackSquad.h"
+
+#include "serverGame/AiPilotManager.h"
+#include "serverGame/AiShipController.h"
+#include "serverGame/AiShipControllerInterface.h"
+#include "serverGame/AiShipPilotData.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ShipObject.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedLog/Log.h"
+
+// ======================================================================
+//
+// SpaceAttackSquadNamespace
+//
+// ======================================================================
+
+namespace SpaceAttackSquadNamespace
+{
+	int s_id = 1;
+}
+
+using namespace SpaceAttackSquadNamespace;
+
+// ======================================================================
+//
+// SpaceAttackSquad
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+SpaceAttackSquad::SpaceAttackSquad()
+ : Squad()
+ , m_inFormation(false)
+ , m_tooCloseToTarget(false)
+ , m_maxNumberOfUnits(2 + (rand() % 2))
+ , m_chaseDistance(0.0f)
+ , m_projectileAttackRange(0.0f)
+ , m_weaponAttackRange(0.0f)
+ , m_totalShotsFired(0)
+{
+	setId(s_id++);
+	getFormation().setSpacing(3.0f);
+	getFormation().setShape(Formation::S_wall);
+}
+
+// ----------------------------------------------------------------------
+SpaceAttackSquad::~SpaceAttackSquad()
+{
+}
+
+// ----------------------------------------------------------------------
+char const * SpaceAttackSquad::getClassName() const
+{
+	return "SpaceAttackSquad";
+}
+
+// ----------------------------------------------------------------------
+void SpaceAttackSquad::onAddUnit(NetworkId const & unit)
+{
+	AiShipController * const aiShipController = AiShipController::getAiShipController(unit);
+	
+	if (aiShipController != NULL)
+	{
+		aiShipController->setAttackSquad(this);
+	}
+	else
+	{
+#ifdef _DEBUG
+		FormattedString<1024> fs;
+		char const * const text = fs.sprintf("SpaceAttackSquad::onAddUnit() id(%d) ERROR: Trying to add a unit(%s) that can't resolve to an AiShipController.", getId(), unit.getValueString().c_str());
+		DEBUG_WARNING(true, (text));
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+	}
+
+	calculateAttackRanges();
+}
+
+// ----------------------------------------------------------------------
+void SpaceAttackSquad::onRemoveUnit()
+{
+	calculateAttackRanges();
+}
+
+// ----------------------------------------------------------------------
+void SpaceAttackSquad::onNewLeader(NetworkId const & /*oldLeader*/)
+{
+	AiShipController * const newLeaderAiShipController = AiShipController::getAiShipController(getLeader());
+
+	if (newLeaderAiShipController != NULL)
+	{
+		m_leaderOffsetPosition_l = -newLeaderAiShipController->getFormationPosition_l();
+	}
+	else
+	{
+#ifdef _DEBUG
+		FormattedString<1024> fs;
+		char const * const text = fs.sprintf("SpaceAttackSquad::onNewLeader() ERROR: The new leader(%s) could not be resolved to an AiShipController.", getLeader().getValueString().c_str());
+		DEBUG_WARNING(true, (text));
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+	}
+}
+
+// ----------------------------------------------------------------------
+void SpaceAttackSquad::onSetUnitFormationPosition_l(NetworkId const & unit, Vector const & position_l)
+{
+	AiShipController * const aiShipController = AiShipController::getAiShipController(unit);
+
+	if (aiShipController != NULL)
+	{
+		aiShipController->setAttackFormationPosition_l(position_l);
+	}
+	else
+	{
+#ifdef _DEBUG
+		FormattedString<1024> fs;
+		char const * const text = fs.sprintf("SpaceAttackSquad::onSetUnitFormationPosition_l() ERROR: Unable to resolve AiShipController for unit(%s)", unit.getValueString().c_str());
+		DEBUG_WARNING(true, (text));
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+	}
+}
+
+// ----------------------------------------------------------------------
+void SpaceAttackSquad::addDamageTaken(NetworkId const & attackingUnit, float const damage) const
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceAttackSquad::addDamageTaken() squadId(%d) attackingUnit(%s) damage(%.f)", getId(), attackingUnit.getValueString().c_str(), damage));
+
+	UnitMap const & unitMap = getUnitMap();
+	UnitMap::const_iterator iterUnitMap = unitMap.begin();
+
+	for (; iterUnitMap != unitMap.end(); ++iterUnitMap)
+	{
+		NetworkId const & unit = iterUnitMap->first;
+		bool const notifySquad = false;
+		bool const checkPlayerAttacker = true;
+
+		IGNORE_RETURN(AiShipControllerInterface::addDamageTaken(unit, attackingUnit, damage, notifySquad, checkPlayerAttacker));
+	}
+}
+
+// ----------------------------------------------------------------------
+CachedNetworkId const & SpaceAttackSquad::getPrimaryAttackTarget() const
+{
+	Object * const leaderObject = getLeader().getObject();
+
+	if (leaderObject != NULL)
+	{
+		AiShipController * const leaderAiShipController = AiShipController::asAiShipController(leaderObject->getController());
+
+		return leaderAiShipController->getPrimaryAttackTarget();
+	}
+
+#ifdef _DEBUG
+	FormattedString<1024> fs;
+	char const * const text = fs.sprintf("SpaceAttackSquad::getPrimaryAttackTarget() ERROR: Why is the attack squad leader(%s) object NULL?", getLeader().getValueString().c_str());
+	DEBUG_WARNING(true, (text));
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+
+	return CachedNetworkId::cms_cachedInvalid;
+}
+
+// ----------------------------------------------------------------------
+bool SpaceAttackSquad::isAttacking() const
+{
+	Object * const leaderObject = getLeader().getObject();
+
+	if (leaderObject != NULL)
+	{
+		AiShipController * const leaderAiShipController = AiShipController::asAiShipController(leaderObject->getController());
+
+		return leaderAiShipController->isAttacking();
+	}
+
+#ifdef _DEBUG
+	FormattedString<1024> fs;
+	char const * const text = fs.sprintf("SpaceAttackSquad::isAttacking() ERROR: Why is the attack squad leader(%s) object NULL?", getLeader().getValueString().c_str());
+	DEBUG_WARNING(true, (text));
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+
+	return false;
+}
+
+// ----------------------------------------------------------------------
+void SpaceAttackSquad::setInFormation(bool const inFormation)
+{
+	//LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceAttackSquad::setInFormation() inFormation(%s)", inFormation ? "yes" : "no"));
+
+	m_inFormation = inFormation;
+}
+
+// ----------------------------------------------------------------------
+bool SpaceAttackSquad::isInFormation() const
+{
+	return m_inFormation;
+}
+
+// ----------------------------------------------------------------------
+void SpaceAttackSquad::setTooCloseToTarget(bool const tooCloseToTarget)
+{
+	//LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceAttackSquad::setTooCloseToTarget() tooCloseToTarget(%s)", tooCloseToTarget ? "yes" : "no"));
+
+	m_tooCloseToTarget = tooCloseToTarget;
+}
+
+// ----------------------------------------------------------------------
+bool SpaceAttackSquad::isTooCloseToTarget() const
+{
+	return m_tooCloseToTarget;
+}
+
+// ----------------------------------------------------------------------
+int SpaceAttackSquad::getMaxNumberOfUnits() const
+{
+	UnitMap const & unitMap = getUnitMap();
+
+	if (unitMap.size() == 1)
+	{
+		NetworkId const & unit = unitMap.begin()->first;
+		AiShipController * const unitAiShipController = AiShipController::getAiShipController(unit);
+
+		if (unitAiShipController != NULL)
+		{
+			if (unitAiShipController->getAttackOrders() == AiShipController::AO_holdFire)
+			{
+				return 1;
+			}
+		}
+	}
+
+	return m_maxNumberOfUnits;
+}
+
+// ----------------------------------------------------------------------
+void SpaceAttackSquad::setChaseDistance(float const chaseDistance)
+{
+	//LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceAttackSquad::setChaseDistance() chaseDistance(%.f)", chaseDistance));
+
+	m_chaseDistance = chaseDistance;
+}
+
+// ----------------------------------------------------------------------
+float SpaceAttackSquad::getChaseDistance() const
+{
+	return m_chaseDistance;
+}
+
+// ----------------------------------------------------------------------
+AiPilotManager const & SpaceAttackSquad::getLeaderPilotManagerInfo() const
+{
+	Object * const leaderObject = NON_NULL(getLeader().getObject());
+	AiShipController * const leaderAiShipController = NON_NULL(AiShipController::asAiShipController(leaderObject->getController()));
+
+	return leaderAiShipController->getPilotManagerInfo();
+}
+
+// ----------------------------------------------------------------------
+void SpaceAttackSquad::calculateAttackRanges()
+{
+	if (!isEmpty())
+	{
+		m_projectileAttackRange = FLT_MAX;
+		m_weaponAttackRange = FLT_MAX;
+	}
+
+	UnitMap const & unitMap = getUnitMap();
+	UnitMap::const_iterator iterUnitMap = unitMap.begin();
+
+	for (; iterUnitMap != unitMap.end(); ++iterUnitMap)
+	{
+		CachedNetworkId const & unit = iterUnitMap->first;
+		Object * const unitObject = unit.getObject();
+		ServerObject * const unitServerObject = (unitObject != NULL) ? unitObject->asServerObject() : NULL;
+		ShipObject * const unitShipObject = (unitServerObject != NULL) ? unitServerObject->asShipObject() : NULL;
+
+		if (unitShipObject != NULL)
+		{
+			m_projectileAttackRange = std::min(m_projectileAttackRange, unitShipObject->getApproximateAttackRange());
+			
+			bool includeMissiles = true;
+			m_weaponAttackRange = std::min(m_projectileAttackRange, unitShipObject->getApproximateAttackRange(includeMissiles));
+		}
+		else
+		{
+#ifdef _DEBUG
+			FormattedString<1024> fs;
+			char const * const text = fs.sprintf("SpaceAttackSquad::calculateProjectileAttackRange() ERROR: Could not convert unit(%s) to a ShipObject.", unit.getValueString().c_str());
+			DEBUG_WARNING(true, (text));
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+		}
+	}
+
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceAttackSquad::calculateProjectileAttackRange() m_projectileAttackRange(%.0f) m_weaponAttackRange(%.0f)", m_projectileAttackRange, m_weaponAttackRange));
+}
+
+// ----------------------------------------------------------------------
+float SpaceAttackSquad::getProjectileAttackRange() const
+{
+	return m_projectileAttackRange;
+}
+
+// ----------------------------------------------------------------------
+float SpaceAttackSquad::getWeaponAttackRange() const
+{
+	return m_weaponAttackRange;
+}
+
+// ----------------------------------------------------------------------
+void SpaceAttackSquad::assignNewLeader()
+{
+	UnitMap const & unitMap = getUnitMap();
+	UnitMap::const_iterator iterUnitMap = unitMap.begin();
+
+	for (; iterUnitMap != unitMap.end(); ++iterUnitMap)
+	{
+		CachedNetworkId const & unit = iterUnitMap->first;
+		Object * const unitObject = unit.getObject();
+		ServerObject * const unitServerObject = (unitObject != NULL) ? unitObject->asServerObject() : NULL;
+		ShipObject * const unitShipObject = (unitServerObject != NULL) ? unitServerObject->asShipObject() : NULL;
+
+		if (unitShipObject != NULL)
+		{
+			if (unitShipObject->isComponentFunctional(ShipChassisSlotType::SCST_engine))
+			{
+				bool const rebuildFormation = false;
+
+				if (!setLeader(unit, rebuildFormation))
+				{
+#ifdef _DEBUG
+					FormattedString<1024> fs;
+					char const * const text = fs.sprintf("SpaceAttackSquad::assignNewLeader() squadId(%d) ERROR: Failure to set the new squad leader(%s)", getId(), unit.getValueString().c_str());
+					DEBUG_WARNING(true, (text));
+					LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+				}
+				else
+				{
+					break;
+				}
+			}
+		}
+		else
+		{
+#ifdef _DEBUG
+			FormattedString<1024> fs;
+			char const * const text = fs.sprintf("SpaceAttackSquad::assignNewLeader() ERROR: Could not convert unit(%s) to a ShipObject.", unit.getValueString().c_str());
+			DEBUG_WARNING(true, (text));
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+bool SpaceAttackSquad::isFull() const
+{
+	int const unitCount = getUnitCount();
+	int maxNumberOfUnits = getMaxNumberOfUnits();
+
+	return (unitCount >= maxNumberOfUnits);
+}
+
+// ----------------------------------------------------------------------
+int SpaceAttackSquad::getNumberOfShotsToFire() const
+{
+	Object * const leaderObject = NON_NULL(getLeader().getObject());
+	AiShipController const & leaderAiShipController = *NON_NULL(AiShipController::asAiShipController(leaderObject->getController()));
+	AiShipPilotData const & pilotData = *NON_NULL(leaderAiShipController.getPilotData());
+
+	return pilotData.m_fighterChaseMaxShots * getUnitCount();
+}
+
+// ----------------------------------------------------------------------
+int SpaceAttackSquad::getTotalShotsFired() const
+{
+	return m_totalShotsFired;
+}
+
+// ----------------------------------------------------------------------
+void SpaceAttackSquad::clearShotsFired()
+{
+	m_totalShotsFired = 0;
+}
+
+// ----------------------------------------------------------------------
+void SpaceAttackSquad::increaseShotsFired()
+{
+	++m_totalShotsFired;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/SpaceAttackSquad.h b/engine/server/library/serverGame/src/shared/space/SpaceAttackSquad.h
new file mode 100644
index 00000000..70ad1e09
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/SpaceAttackSquad.h
@@ -0,0 +1,84 @@
+// ======================================================================
+// 
+// SpaceAttackSquad.h
+// Copyright Sony Online Entertainment, Inc.
+//
+// ======================================================================
+
+#ifndef INCLUDED_SpaceAttackSquad_H
+#define INCLUDED_SpaceAttackSquad_H
+
+#include "serverGame/Squad.h"
+
+class AiPilotManager;
+class NetworkId;
+
+// ----------------------------------------------------------------------
+class SpaceAttackSquad : public Squad
+{
+public:
+
+	SpaceAttackSquad();
+	virtual ~SpaceAttackSquad();
+
+	virtual char const * getClassName() const;
+
+	void addDamageTaken(NetworkId const & attackingUnit, float const damage) const;
+
+	CachedNetworkId const & getPrimaryAttackTarget() const;
+	bool isAttacking() const;
+
+	void setInFormation(bool const inFormation);
+	bool isInFormation() const;
+
+	void setTooCloseToTarget(bool const tooCloseToTarget);
+	bool isTooCloseToTarget() const;
+
+	int getMaxNumberOfUnits() const;
+	bool isFull() const;
+
+	void setChaseDistance(float const chaseDistance);
+	float getChaseDistance() const;
+
+	AiPilotManager const & getLeaderPilotManagerInfo() const;
+
+	float getProjectileAttackRange() const;
+	float getWeaponAttackRange() const;
+
+	virtual void assignNewLeader();
+
+	int getNumberOfShotsToFire() const;
+	int getTotalShotsFired() const;
+	void clearShotsFired();
+	void increaseShotsFired();
+
+protected:
+
+	virtual void onAddUnit(NetworkId const & unit);
+	virtual void onRemoveUnit();
+	virtual void onNewLeader(NetworkId const & oldLeader);
+	virtual void onSetUnitFormationPosition_l(NetworkId const & unit, Vector const & position_l);
+
+private:
+
+	void calculateAttackRanges();
+	void calculateAverageVelocity();
+	void calculateNumberOfShotsToFirePerUnit();
+
+	bool m_inFormation;
+	bool m_tooCloseToTarget;
+	int m_maxNumberOfUnits;
+	float m_chaseDistance;
+	float m_projectileAttackRange;
+	float m_weaponAttackRange;
+	int m_totalShotsFired;
+
+	// Disabled
+
+	SpaceAttackSquad(SpaceAttackSquad const &);
+	SpaceAttackSquad & operator =(SpaceAttackSquad const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_SpaceAttackSquad_H
diff --git a/engine/server/library/serverGame/src/shared/space/SpaceDockingManager.cpp b/engine/server/library/serverGame/src/shared/space/SpaceDockingManager.cpp
new file mode 100644
index 00000000..98444246
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/SpaceDockingManager.cpp
@@ -0,0 +1,476 @@
+// ======================================================================
+//
+// SpaceDockingManager.cpp
+// Copyright Sony Online Entertainment, Inc.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/SpaceDockingManager.h"
+
+#include "serverGame/AiShipController.h"
+#include "serverGame/ConfigServerGame.h"
+#include "sharedCollision/BaseExtent.h"
+#include "sharedCollision/CollisionProperty.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/TemporaryCrcString.h"
+#include "sharedLog/Log.h"
+#include "sharedMath/AxialBox.h"
+#include "sharedMath/Transform.h"
+#include "sharedObject/Appearance.h"
+
+#include <list>
+#include <map>
+#include <set>
+#include <vector>
+
+//-- TODO: Currently, hardpoints are not correctly oriented.  We will need to coordinate with art to fix them and remove this hack.
+#define FIXUP_DOCKING_HARDPOINTS 1
+
+// ======================================================================
+//
+// SpaceDockingManagerNamespace
+//
+// ======================================================================
+
+namespace SpaceDockingManagerNamespace
+{
+	class DockPad;
+	class DockableShip;
+
+	typedef std::vector<DockPad> DockPadList;
+	typedef std::map<CachedNetworkId, DockableShip> ShipsBeingDockedList;
+	typedef std::set<NetworkId> OccupantList;
+
+	bool getHardPoints(Object const & object, char const * const hardPointName, char const hardPointLetter, SpaceDockingManager::HardPointList & hardPointList);
+	float getCollisionRadius(Object const & object);
+	Transform getDockHardPoint(Object const & object);
+	float getShortExtentAxisLength(Object const & object);
+	void remove();
+
+	class DockPad
+	{
+	public:
+
+		DockPad()
+		 : m_dockHardPoint()
+		 , m_occupantList()
+		 , m_radiusSquared(0.0f)
+		 , m_approachHardPointList()
+		 , m_exitHardPointList()
+		 , m_dryDock(false)
+		{
+		}
+
+		Transform m_dockHardPoint;
+		OccupantList m_occupantList;
+		float m_radiusSquared;
+		SpaceDockingManager::HardPointList m_approachHardPointList;
+		SpaceDockingManager::HardPointList m_exitHardPointList;
+		bool m_dryDock;
+	};
+
+	class DockableShip
+	{
+	public:
+
+		explicit DockableShip(Object const & object)
+		 : m_dockPadList()
+		{
+			if (object.getAppearance() != NULL)
+			{
+				// What dock pads do we have, and what are their radii
+
+				bool done = false;
+				char dockLetter = 97; // start with 'a'
+
+				do
+				{
+					char text[256];
+					snprintf(text, sizeof(text) - 1, "dock_%c", dockLetter);
+					text[sizeof(text) - 1] = '\0';
+					DockPad dockPad;
+					if (object.getAppearance()->findHardpoint(TemporaryCrcString(text, false), dockPad.m_dockHardPoint))
+					{
+#if FIXUP_DOCKING_HARDPOINTS
+						//-- TODO: Currently, hardpoints are not correctly oriented.  We will need to coordinate with art to fix them and remove this hack.
+						dockPad.m_dockHardPoint.pitch_l(PI_OVER_2);
+						dockPad.m_dockHardPoint.roll_l(PI_OVER_2);
+#endif
+
+						// Get the radius
+
+						Transform dockRadiusHardPoint;
+						snprintf(text, sizeof(text) - 1, "dockradius_%c", dockLetter);
+						text[sizeof(text) - 1] = '\0';
+						if (object.getAppearance()->findHardpoint(TemporaryCrcString(text, false), dockRadiusHardPoint))
+						{
+							dockPad.m_radiusSquared = dockPad.m_dockHardPoint.getPosition_p().magnitudeBetweenSquared(dockRadiusHardPoint.getPosition_p());
+						}
+
+						// Get the approach hard points
+
+						if (!getHardPoints(object, "approach", dockLetter, dockPad.m_approachHardPointList))
+						{
+							DEBUG_WARNING(true, ("debug_ai: Missing approach hard points on object(%s)", object.getDebugInformation().c_str()));
+						}
+
+						// Get the exit hard points
+
+						if (!getHardPoints(object, "exit", dockLetter, dockPad.m_exitHardPointList))
+						{
+							DEBUG_WARNING(true, ("debug_ai: Missing exit hard points on object(%s)", object.getDebugInformation().c_str()));
+						}
+
+						m_dockPadList.push_back(dockPad);
+						++dockLetter;
+					}
+					else
+					{
+						done = true;
+					}
+				} while (!done);
+
+				// Does this ship have a dry dock?
+
+				Transform dryDockHardPoint;
+
+				if (object.getAppearance()->findHardpoint(TemporaryCrcString("drydock_1", false), dryDockHardPoint))
+				{
+					DockPad dockPad;
+					dockPad.m_dockHardPoint = dryDockHardPoint;
+					dockPad.m_radiusSquared = -1.0f;
+					dockPad.m_dryDock = true;
+					m_dockPadList.push_back(dockPad);
+				}
+			}
+		}
+
+		int getOccupantCount() const
+		{
+			int result = 0;
+			DockPadList::const_iterator iterDockPadList = m_dockPadList.begin();
+
+			for (; iterDockPadList != m_dockPadList.end(); ++iterDockPadList)
+			{
+				result += static_cast<int>(iterDockPadList->m_occupantList.size());
+			}
+
+			return result;
+		}
+
+		DockPadList m_dockPadList;
+	};
+
+	ShipsBeingDockedList s_shipsBeingDockedList;
+	float const s_dockingApproachRadiusGain = 3.0f;
+	float const s_dockingExitRadiusGain = 5.0f;
+}
+
+using namespace SpaceDockingManagerNamespace;
+
+// ----------------------------------------------------------------------
+float SpaceDockingManagerNamespace::getCollisionRadius(Object const & object)
+{
+	CollisionProperty const * const collisionProperty = object.getCollisionProperty();
+	float radius = 0.0f;
+
+	if (collisionProperty != NULL)
+	{
+		radius = collisionProperty->getBoundingSphere_l().getRadius();
+	}
+
+	return radius;
+}
+
+// ----------------------------------------------------------------------
+float SpaceDockingManagerNamespace::getShortExtentAxisLength(Object const & object)
+{
+	float result;
+	CollisionProperty const * const collisionProperty = NON_NULL(object.getCollisionProperty());
+	AxialBox const axialBox = collisionProperty->getExtent_l()->getBoundingBox();
+
+	if (   (axialBox.getWidth() < axialBox.getHeight())
+		&& (axialBox.getWidth() < axialBox.getDepth()))
+	{
+		// Width is the short axis
+
+		result = axialBox.getMax().x;
+	}
+	else if (axialBox.getHeight() < axialBox.getDepth())
+	{
+		// Height is the short axis
+
+		result = axialBox.getMax().y;
+	}
+	else
+	{
+		// Depth is the short axis
+
+		result = axialBox.getMax().z;
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+Transform SpaceDockingManagerNamespace::getDockHardPoint(Object const & object)
+{
+	Transform result;
+	CollisionProperty const * const collisionProperty = NON_NULL(object.getCollisionProperty());
+	AxialBox const axialBox = collisionProperty->getExtent_l()->getBoundingBox();
+
+	// Find the short axis of the object's extent
+
+	if (   (axialBox.getWidth() < axialBox.getHeight())
+		&& (axialBox.getWidth() < axialBox.getDepth()))
+	{
+		// Width is the short axis
+
+		result.yaw_l(-PI_OVER_2);
+		result.move_l(Vector(0.0f, 0.0f, -axialBox.getMax().x));
+	}
+	else if (axialBox.getHeight() < axialBox.getDepth())
+	{
+		// Height is the short axis
+
+		result.pitch_l(PI_OVER_2);
+		result.move_l(Vector(0.0f, 0.0f, -axialBox.getMax().y));
+	}
+	else
+	{
+		// Depth is the short axis
+
+		result.yaw_l(PI);
+		result.move_l(Vector(0.0f, 0.0f, -axialBox.getMax().z));
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+bool SpaceDockingManagerNamespace::getHardPoints(Object const & object, char const * const hardPointName, char const hardPointLetter, SpaceDockingManager::HardPointList & hardPointList)
+{
+	NOT_NULL(hardPointName);
+	NOT_NULL(hardPointLetter);
+
+	hardPointList.clear();
+
+	if (object.getAppearance() != NULL)
+	{
+		int hardPointIndex = 1;
+		bool done = false;
+
+		while (!done)
+		{
+			char text[256];
+			snprintf(text, sizeof(text) - 1, "%s_%c_%d", hardPointName, hardPointLetter, hardPointIndex);
+			text[sizeof(text) - 1] = '\0';
+			Transform transform;
+			if (object.getAppearance()->findHardpoint(TemporaryCrcString(text, false), transform))
+			{
+#if FIXUP_DOCKING_HARDPOINTS
+				//-- TODO: Currently, hardpoints are not correctly oriented.  We will need to coordinate with art to fix them and remove this hack.
+				transform.pitch_l(PI_OVER_2);
+				transform.roll_l(PI_OVER_2);
+#endif
+
+				hardPointList.push_back(transform);
+				++hardPointIndex;
+			}
+			else
+			{
+				done = true;
+			}
+		}
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("SpaceDockingManagerNamespace::getHardPoints() Why does this object(%s) have no appearance?", object.getDebugInformation().c_str()));
+	}
+
+	return !hardPointList.empty();
+}
+
+// ----------------------------------------------------------------------
+void SpaceDockingManagerNamespace::remove()
+{
+	if (!s_shipsBeingDockedList.empty())
+	{
+		WARNING(true, ("debug_ai: The s_shipsBeingDockedList is not empty(%u), this is a sign of a reference counting problem.", s_shipsBeingDockedList.size()));
+	}
+}
+
+// ======================================================================
+//
+// SpaceDockingManager
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+void SpaceDockingManager::install()
+{
+	ExitChain::add(&remove, "SpaceDockingManagerNamespace::remove");
+}
+
+// ----------------------------------------------------------------------
+void SpaceDockingManager::fetchDockingProcedure(Object const & dockingUnit, Object const & dockTarget, Transform & dockHardPoint, HardPointList & approachHardPointList, HardPointList & exitHardPointList)
+{
+	approachHardPointList.clear();
+	exitHardPointList.clear();
+
+	// Find the correct dock pad to set down on
+
+	std::string finalDockPadLetter;
+	ShipsBeingDockedList::iterator iterShipsBeingDockedList = s_shipsBeingDockedList.find(CachedNetworkId(dockTarget));
+
+	if (iterShipsBeingDockedList == s_shipsBeingDockedList.end())
+	{
+		// The unit is not currently being docked, setup the data for storing the docking occupants
+
+		std::pair<ShipsBeingDockedList::iterator, bool> result = s_shipsBeingDockedList.insert(std::make_pair(CachedNetworkId(dockTarget), DockableShip(dockTarget)));
+
+		iterShipsBeingDockedList = result.first;
+	}
+
+	// Find an open docking pad that the docking unit can fit onto
+
+	DockableShip & dockableShip = iterShipsBeingDockedList->second;
+	typedef std::multimap<unsigned int /* occupantCount */, int /* index */> DockPadPriorityList;
+	DockPadPriorityList dockPadPriorityList;
+
+	{
+		float const dockingUnitRadiusSquared = sqr(getCollisionRadius(dockingUnit));
+		int dockPadIndex = 0;
+		DockPadList::const_iterator iterDockPadList = dockableShip.m_dockPadList.begin();
+
+		for (; iterDockPadList != dockableShip.m_dockPadList.end(); ++iterDockPadList)
+		{
+			DockPad const & dockPad = *iterDockPadList;
+
+			if (   (dockingUnitRadiusSquared <= dockPad.m_radiusSquared)
+				|| (dockPad.m_radiusSquared < 0.0f))
+			{
+				// This is a possible pad to dock on
+
+				if (dockPad.m_radiusSquared < 0.0f)
+				{
+					// Dry dock should be the last resort to dock on, so set its occupant count high
+
+					IGNORE_RETURN(dockPadPriorityList.insert(std::make_pair(9999, dockPadIndex)));
+				}
+				else
+				{
+					IGNORE_RETURN(dockPadPriorityList.insert(std::make_pair(dockPad.m_occupantList.size(), dockPadIndex)));
+				}
+			}
+			++dockPadIndex;
+		}
+	}
+
+	// If there is any results in the dockPriorityList, then we will set down on the least occupied pad
+
+	if (!dockPadPriorityList.empty())
+	{
+		DockPad & dockPad = dockableShip.m_dockPadList[static_cast<unsigned int>(dockPadPriorityList.begin()->second)];
+
+		// Add an occupant to this dock pad
+
+		IGNORE_RETURN(dockPad.m_occupantList.insert(dockingUnit.getNetworkId()));
+
+		if (dockPad.m_dryDock)
+		{
+			// Since this is a dry dock, we must take into account the radius of the ship docking with the target
+
+			float const dockingUnitRadius = getCollisionRadius(dockingUnit);
+			float const dockingUnitShortExtentAxisLength = getShortExtentAxisLength(dockingUnit);
+		
+			Transform dryDockHardPoint(dockPad.m_dockHardPoint);
+			dryDockHardPoint.move_l(Vector(0.0f, 0.0f, -dockingUnitShortExtentAxisLength));
+			dockHardPoint = dryDockHardPoint;
+
+			Transform approachHardPoint(dryDockHardPoint);
+			approachHardPoint.move_l(Vector(0.0f, 0.0f, -dockingUnitRadius * s_dockingApproachRadiusGain));
+			approachHardPointList.push_back(approachHardPoint);
+
+			Transform exitHardPoint(dryDockHardPoint);
+			exitHardPoint.move_l(Vector(0.0f, 0.0f, -dockingUnitRadius * s_dockingExitRadiusGain));
+			exitHardPointList.push_back(exitHardPoint);
+		}
+		else
+		{
+			float const dockingUnitShortExtentAxisLength = getShortExtentAxisLength(dockingUnit);
+			dockHardPoint = dockPad.m_dockHardPoint;
+			dockHardPoint.move_l(Vector(0.0f, 0.0f, -dockingUnitShortExtentAxisLength));
+
+			approachHardPointList = dockPad.m_approachHardPointList;
+			exitHardPointList = dockPad.m_exitHardPointList;
+		}
+	}
+	else
+	{
+		// No dry dock, we will dock beside the unit against the long local axis
+		
+		Transform const dockTargetHardPoint(getDockHardPoint(dockTarget));
+		float const dockingUnitRadius = getCollisionRadius(dockingUnit);
+		float const dockingUnitShortExtentAxisLength = getShortExtentAxisLength(dockingUnit);
+
+		dockHardPoint = dockTargetHardPoint;
+		dockHardPoint.move_l(Vector(0.0f, 0.0f, -dockingUnitShortExtentAxisLength));
+
+		Transform approachHardPoint(dockTargetHardPoint);
+		approachHardPoint.move_l(Vector(0.0f, 0.0f, -dockingUnitRadius * s_dockingApproachRadiusGain));
+		approachHardPointList.push_back(approachHardPoint);
+
+		Transform exitHardPoint(dockTargetHardPoint);
+		exitHardPoint.move_l(Vector(0.0f, 0.0f, -dockingUnitRadius * s_dockingExitRadiusGain));
+		exitHardPointList.push_back(exitHardPoint);
+	}
+}
+
+// ----------------------------------------------------------------------
+void SpaceDockingManager::releaseDockingProcedure(NetworkId const & dockingUnit, NetworkId const & dockTarget)
+{
+	ShipsBeingDockedList::iterator iterShipsBeingDockedList = s_shipsBeingDockedList.find(CachedNetworkId(dockTarget));
+
+	if (iterShipsBeingDockedList != s_shipsBeingDockedList.end())
+	{
+		// Remove the docking unit from the pad
+
+		DockableShip & dockableShip = iterShipsBeingDockedList->second;
+		DockPadList::iterator iterDockPadList = dockableShip.m_dockPadList.begin();
+		bool foundUnit = false;
+
+		for (; iterDockPadList != dockableShip.m_dockPadList.end(); ++iterDockPadList)
+		{
+			OccupantList::iterator iterOccupantList = iterDockPadList->m_occupantList.find(dockingUnit);
+
+			if (iterOccupantList != iterDockPadList->m_occupantList.end())
+			{
+				LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("SpaceDockingManager::releaseDockingProcedure() dockingUnit(%s) dockTarget(%s) Removing unit from docking pad.", dockingUnit.getValueString().c_str(), dockTarget.getValueString().c_str()));
+
+				iterDockPadList->m_occupantList.erase(iterOccupantList);
+				foundUnit = true;
+				break;
+			}
+		}
+
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled() && !foundUnit, "debug_ai", ("SpaceDockingManager::releaseDockingProcedure() dockingUnit(%s) dockTarget(%s) Unable to find the dockingUnit on a dock pad.", dockingUnit.getValueString().c_str(), dockTarget.getValueString().c_str()));
+
+		if (iterShipsBeingDockedList->second.getOccupantCount() <= 0)
+		{
+			// No more ships are using this ship to dock, stop tracking it
+
+			s_shipsBeingDockedList.erase(iterShipsBeingDockedList);
+
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("SpaceDockingManager::releaseDockingProcedure() REMOVING dockTarget(%s) s_shipsBeingDockedList.size(%u)", dockTarget.getValueString().c_str(), s_shipsBeingDockedList.size()));
+		}
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "debug_ai", ("SpaceDockingManager::releaseDockingProcedure() Why is this dockTarget(%s) not in the ShipsBeingDockedList?", dockTarget.getValueString().c_str()));
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/SpaceDockingManager.h b/engine/server/library/serverGame/src/shared/space/SpaceDockingManager.h
new file mode 100644
index 00000000..746c145e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/SpaceDockingManager.h
@@ -0,0 +1,39 @@
+// ======================================================================
+// 
+// SpaceDockingManager.h
+// Copyright Sony Online Entertainment, Inc.
+//
+// ======================================================================
+
+#ifndef INCLUDED_SpaceDockingManager_H
+#define INCLUDED_SpaceDockingManager_H
+
+class NetworkId;
+class Object;
+class Transform;
+
+// ----------------------------------------------------------------------
+class SpaceDockingManager
+{
+public:
+
+	typedef stdlist<Transform>::fwd HardPointList;
+
+	static void install();
+
+	static void fetchDockingProcedure(Object const & dockingUnit, Object const & dockTarget, Transform & dockHardPoint, HardPointList & approachHardPointList, HardPointList & exitHardPointList);
+	static void releaseDockingProcedure(NetworkId const & dockingUnit, NetworkId const & dockTarget);
+
+private:
+
+	// Disable
+
+	SpaceDockingManager();
+	~SpaceDockingManager();
+	SpaceDockingManager(SpaceDockingManager const &);
+	SpaceDockingManager & operator =(SpaceDockingManager const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_SpaceDockingManager_H
diff --git a/engine/server/library/serverGame/src/shared/space/SpacePath.cpp b/engine/server/library/serverGame/src/shared/space/SpacePath.cpp
new file mode 100644
index 00000000..99a63cfb
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/SpacePath.cpp
@@ -0,0 +1,305 @@
+// ======================================================================
+// 
+// SpacePath.cpp
+// Copyright Sony Online Entertainment, Inc.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/SpacePath.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "sharedCollision/SpaceAvoidanceManager.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedLog/Log.h"
+
+#include <vector>
+#include <map>
+
+// ======================================================================
+//
+// SpacePath
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+namespace SpacePathNamespace
+{
+	// default collision radius.
+	float const s_minimumCollisionRadius = 7.0f;
+
+	// maximum number of nodes in the path.
+	int const s_maximumPathNodes = 256;
+}
+
+// ----------------------------------------------------------------------
+using namespace SpacePathNamespace;
+
+
+// ----------------------------------------------------------------------
+SpacePath::SpacePath()
+ : m_transformList()
+ , m_transformDirty()
+ , m_transformOriginal()
+ , m_referenceCount(0)
+ , m_updateFlag(false)
+ , m_collisionRadius(s_minimumCollisionRadius)
+ , m_collisionRadiusMap(new ObjectSizeMap)
+{
+}
+
+// ----------------------------------------------------------------------
+SpacePath::~SpacePath()
+{
+	DEBUG_FATAL(!m_collisionRadiusMap->empty(), ("Object size map has outstanding references!"));
+	delete m_collisionRadiusMap;
+}
+
+// ----------------------------------------------------------------------
+void SpacePath::addTransform(Transform const & transform)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpacePath::addTransform() path(0x%p) pathSize(%u) x(%.2f) y(%.2f) z(%.2f)", this, m_transformList.size() + 1, transform.getPosition_p().x, transform.getPosition_p().y, transform.getPosition_p().z));
+
+	DEBUG_FATAL(m_transformList.size() > static_cast<size_t>(s_maximumPathNodes), ("The transform list exceeds %d transforms.", s_maximumPathNodes));
+
+	m_transformDirty.setBit(static_cast<int>(m_transformList.size()));
+	m_transformOriginal.setBit(static_cast<int>(m_transformList.size()));
+
+	m_transformList.push_back(transform);
+}
+	
+
+// ----------------------------------------------------------------------
+void SpacePath::clear()
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpacePath::clearPath() path(0x%p)", this));
+
+	m_transformDirty.clear();
+	m_transformOriginal.clear();
+	m_transformList.clear();
+}
+
+// ----------------------------------------------------------------------
+SpacePath::TransformList const & SpacePath::getTransformList() const
+{
+	return m_transformList;
+}
+
+// ----------------------------------------------------------------------
+bool SpacePath::isEmpty() const
+{
+	return m_transformList.empty();
+}
+
+// ----------------------------------------------------------------------
+void SpacePath::addReference(void const * const object, float const objectSize)
+{
+	DEBUG_FATAL(object == NULL, ("Passing a NULL object into path 0x%p.", this));
+
+	++m_referenceCount;
+
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpacePath::addReference() path(0x%p) pathSize(%u) referenceCount(%d) objectSize(%3.2f)", this, m_transformList.size(), m_referenceCount, objectSize));
+
+	// Add the object to the list here.
+	IGNORE_RETURN(m_collisionRadiusMap->insert(std::make_pair(object, objectSize)));
+
+	// Resize this path if necessary.
+	requestPathResize();
+}
+
+// ----------------------------------------------------------------------
+void SpacePath::releaseReference(void const * const object)
+{
+	DEBUG_FATAL(object == NULL, ("Passing a NULL object into path 0x%p.", this));
+
+	if (--m_referenceCount < 0)
+	{
+		DEBUG_FATAL(true, ("Negative reference count, this means there is a reference counting problem."));
+	}
+
+	// Remove the object from the list.
+	IGNORE_RETURN(m_collisionRadiusMap->erase(object));
+
+	// Resize this path if necessary.
+	requestPathResize();
+
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpacePath::releaseReference() path(0x%p) pathSize(%u) referenceCount(%d)", this, m_transformList.size(), m_referenceCount));
+}
+
+// ----------------------------------------------------------------------
+int SpacePath::getReferenceCount() const
+{
+	return m_referenceCount;
+}
+
+// ----------------------------------------------------------------------
+bool SpacePath::refine(int & pathRefinementsAvailable)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("SpacePath::refine");
+
+	bool isComplete = true;
+
+	// Create a scratch xform.
+	Transform newTransform;
+
+	float const collisionRadius = getCollisionRadius();
+	float const collisionRadiusSquared = sqr(collisionRadius);
+
+	// Keep track of the transform list size.
+	int transformListSize = static_cast<int>(m_transformList.size());
+
+	if (!m_transformList.empty() && !m_transformDirty.empty() && transformListSize < s_maximumPathNodes)
+	{
+		TransformList::iterator iteratorTransform = m_transformList.begin();
+
+		for(; iteratorTransform != m_transformList.end() && (iteratorTransform + 1) != m_transformList.end() && pathRefinementsAvailable > 0 && transformListSize < s_maximumPathNodes; /*++iteratorTransform*/)
+		{
+			int const currentOffset = iteratorTransform - m_transformList.begin();
+
+			if (m_transformDirty.testBit(currentOffset))
+			{
+				m_transformDirty.clearBit(currentOffset);
+
+				// Update refinement counters.
+				pathRefinementsAvailable--;
+
+				TransformList::iterator iteratorTransformNext = iteratorTransform + 1;
+				Transform const & currentTransform = *iteratorTransform;
+				Transform const & nextTransform = *iteratorTransformNext;
+				Vector const & currentPosition_w = currentTransform.getPosition_p();
+				Vector const & nextPosition_w = nextTransform.getPosition_p();
+				Vector const sweepVector(nextPosition_w - currentPosition_w);
+
+				if (sweepVector.magnitudeSquared() > collisionRadiusSquared)
+				{
+					PROFILER_AUTO_BLOCK_DEFINE("SpacePath::refine(){...getAvoidancePosition()...}");
+
+					Vector avoidancePosition_w;
+					
+					bool const pathAdjusted = SpaceAvoidanceManager::getAvoidancePosition(currentTransform, collisionRadius, sweepVector, nextPosition_w, avoidancePosition_w, NULL);
+					if (pathAdjusted)
+					{
+						newTransform.setPosition_p(avoidancePosition_w);
+						
+						iteratorTransform = m_transformList.insert(iteratorTransformNext, newTransform);
+						
+						int const transformIndex = iteratorTransform - m_transformList.begin();
+						m_transformDirty.insertBit(transformIndex, true);
+						m_transformOriginal.insertBit(transformIndex, false);
+
+						// Update transform list size.
+						++transformListSize;
+
+						// Continue as all iterators are now invalid.
+						continue;
+					}
+				}
+				else
+				{
+					int const transformIndex = iteratorTransform - m_transformList.begin();
+
+					// Do not remove original bits.
+					if (m_transformOriginal.testBit(transformIndex)) 
+					{
+						// The sweep distance is too small, remove the point from the list.
+						m_transformDirty.removeBit(transformIndex);
+						m_transformOriginal.removeBit(transformIndex);
+
+						iteratorTransform = m_transformList.erase(iteratorTransform);
+						
+						// Update transform list size.
+						--transformListSize;
+						
+						// Continue as all iterators are now invalid.
+						continue;
+					}
+				}
+			}
+
+			++iteratorTransform;
+		}
+
+		// See if we completed the scan. 
+		isComplete = (iteratorTransform == m_transformList.end() || (iteratorTransform + 1) == m_transformList.end());
+	}
+
+	return isComplete;
+}
+
+
+// ----------------------------------------------------------------------
+void SpacePath::setUpdateFlag(bool const flag)
+{
+	m_updateFlag = flag;
+}
+
+// ----------------------------------------------------------------------
+bool SpacePath::getUpdateFlag() const
+{
+	return m_updateFlag;
+}
+
+// ----------------------------------------------------------------------
+int SpacePath::getLength() const
+{
+	return static_cast<int>(m_transformList.size());
+}
+
+// ----------------------------------------------------------------------
+float SpacePath::getCollisionRadius() const 
+{
+	return m_collisionRadius;
+}
+
+// ----------------------------------------------------------------------
+void SpacePath::requestPathResize()
+{
+	float maximumObjectSize = s_minimumCollisionRadius;
+
+	for (ObjectSizeMap::iterator itObject = m_collisionRadiusMap->begin(); itObject != m_collisionRadiusMap->end(); ++itObject)
+	{
+		maximumObjectSize = std::max(maximumObjectSize, itObject->second);
+	}
+
+	// Always update if the new max object is larger or if the new max object size is smaller by at least the minimum collision radius.
+	if (maximumObjectSize > m_collisionRadius || !WithinEpsilonInclusive(m_collisionRadius, maximumObjectSize, s_minimumCollisionRadius)) 
+	{
+		// Mark all nodes as dirty to refine paths.
+		m_transformDirty.clear();
+		m_transformDirty.setMultipleBits(m_transformList.size());
+
+		// Set the max path granularity to the maximum object size.
+		m_collisionRadius = maximumObjectSize;
+	}
+}
+
+// ----------------------------------------------------------------------
+bool SpacePath::updateCollisionRadius(void const * const object, float const objectSize)
+{
+	DEBUG_FATAL(object == NULL, ("Passing a NULL object into path(0x%p) updateCollisionRadius.", this));
+
+	bool requiresPathUpdate = false;
+
+	// Update all the object sizes.
+	std::pair<ObjectSizeMap::iterator, ObjectSizeMap::iterator> const & collisionRadiiToUpdate = m_collisionRadiusMap->equal_range(object);
+	for (ObjectSizeMap::iterator itRadii = collisionRadiiToUpdate.first; itRadii != collisionRadiiToUpdate.second; ++itRadii)
+	{
+		float const currentSize = itRadii->second;
+		if (!WithinEpsilonInclusive(currentSize, objectSize, s_minimumCollisionRadius)) 
+		{
+			itRadii->second = objectSize;
+			requiresPathUpdate = true;
+		}
+	}
+	
+	// Update the path refinement if necessary.
+	if (requiresPathUpdate) 
+	{
+		requestPathResize();
+	}
+
+	return requiresPathUpdate;
+}
+
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/SpacePath.h b/engine/server/library/serverGame/src/shared/space/SpacePath.h
new file mode 100644
index 00000000..3dbc2e65
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/SpacePath.h
@@ -0,0 +1,68 @@
+// ======================================================================
+// 
+// SpacePath.h
+// Copyright Sony Online Entertainment, Inc.
+//
+// ======================================================================
+
+#ifndef INCLUDED_SpacePath_H
+#define INCLUDED_SpacePath_H
+
+#include "sharedMath/Transform.h"
+#include "sharedFoundation/BitArray.h"
+
+// ----------------------------------------------------------------------
+class SpacePath
+{
+public:
+	friend class SpacePathManager;
+
+	typedef stdvector<Transform>::fwd TransformList;
+
+	void addTransform(Transform const & transform);
+	TransformList const & getTransformList() const;
+	bool isEmpty() const;
+	void clear();
+	int getLength() const;
+
+	float getCollisionRadius() const;
+	bool updateCollisionRadius(void const * const object, float const objectSize);
+
+private:
+	// accessed by SpacePathManager
+	bool refine(int & pathRefinementsAvailable);
+
+	void setUpdateFlag(bool update);
+	bool getUpdateFlag() const;
+
+private:
+	
+	TransformList m_transformList;
+	
+	BitArray m_transformDirty;
+	BitArray m_transformOriginal;
+
+	int m_referenceCount;
+	bool m_updateFlag;
+
+
+	float m_collisionRadius;
+
+	typedef stdmultimap<void const * /*object*/, float /*size of object */>::fwd ObjectSizeMap;
+	ObjectSizeMap * const m_collisionRadiusMap;
+
+	void addReference(void const * const object, float const objectSize);
+	void releaseReference(void const * const object);
+	int getReferenceCount() const;
+
+	void requestPathResize();
+
+	SpacePath(SpacePath const & rhs);
+	SpacePath();
+	~SpacePath();
+	SpacePath & operator=(SpacePath const & rhs);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_SpacePath_H
diff --git a/engine/server/library/serverGame/src/shared/space/SpacePathManager.cpp b/engine/server/library/serverGame/src/shared/space/SpacePathManager.cpp
new file mode 100644
index 00000000..79256ad5
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/SpacePathManager.cpp
@@ -0,0 +1,183 @@
+// ======================================================================
+// 
+// SpacePathManager.cpp
+// Copyright Sony Online Entertainment, Inc.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/SpacePathManager.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/SpacePath.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedLog/Log.h"
+
+#include <algorithm>
+#include <deque>
+#include <set>
+
+// ======================================================================
+//
+// SpacePathManagerNamespace
+//
+// ======================================================================
+
+namespace SpacePathManagerNamespace
+{
+	typedef std::set<SpacePath *> PathList;
+	PathList s_pathList;
+
+	typedef std::deque<SpacePath *> PathQueue;
+	PathQueue s_pathQueue;
+}
+
+using namespace SpacePathManagerNamespace;
+
+// ======================================================================
+//
+// SpacePathManager
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+void SpacePathManager::install()
+{
+	ExitChain::add(&remove, "SpacePathManager::remove");
+	LOGC(ConfigServerGame::getSpaceAiUsePathRefinement(), "space_debug_ai", ("SpacePathManager::install() Per frame path refinement is disabled!"));
+}
+
+// ----------------------------------------------------------------------
+void SpacePathManager::remove()
+{
+	if (!s_pathList.empty())
+	{
+		WARNING(true, ("SpacePathManager::remove() The path list is not empty(%u), this is a sign of a reference counting problem.", s_pathList.size()));
+	}
+}
+
+// ----------------------------------------------------------------------
+SpacePath * SpacePathManager::fetch(SpacePath * const path, void const * const object, float const objectRadius)
+{
+	SpacePath * result = NULL;
+
+	if (path == NULL)
+	{
+		// This is a new path, add it to the list
+	
+		result = new SpacePath;
+		IGNORE_RETURN(s_pathList.insert(result));
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpacePathManager::fetch() NEW PATH path(0x%p) referenceCount(%d) totalPathCount(%u)", result, result->getReferenceCount(), s_pathList.size()));
+	}
+	else
+	{
+		PathList::iterator iterPathList = s_pathList.find(path);
+	
+		if (iterPathList != s_pathList.end())
+		{
+			// This path already exists, increase the reference count
+	
+			result = *iterPathList;
+	
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpacePathManager::fetch() path(0x%p) referenceCount(%d) totalPathCount(%u)", path, (*iterPathList)->getReferenceCount(), s_pathList.size()));
+		}
+		else
+		{
+			FATAL(true, ("SpacePathManager::fetch() ERROR: Unable to fetch the path(0x%p) totalPathCount(%u)", path, s_pathList.size()));
+		}
+	}
+
+	result->addReference(object, objectRadius);
+
+	// Queue up a request to process this path.
+	if(ConfigServerGame::getSpaceAiUsePathRefinement())
+	{
+		if (!result->getUpdateFlag())
+		{
+			result->setUpdateFlag(true);
+			s_pathQueue.push_back(result);
+		}
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+void SpacePathManager::release(SpacePath * const path, void const * const object)
+{
+	if (path == NULL)
+	{
+		return;
+	}
+
+	PathList::iterator iterPathList = s_pathList.find(path);
+	
+	if (iterPathList != s_pathList.end())
+	{
+		path->releaseReference(object);
+
+		if (path->getReferenceCount() <= 0)
+		{
+			removeFromRefineQueue(path);
+
+			s_pathList.erase(iterPathList);
+
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpacePathManager::release() Removing 0 ref count path(0x%p) totalPathCount(%u)", path, s_pathList.size()));
+
+			delete path;
+		}
+		else
+		{
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpacePathManager::release() path(0x%p) referenceCount(%d) totalPathCount(%u)", path, (*iterPathList)->getReferenceCount(), s_pathList.size()));
+		}
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpacePathManager::release() Unable to find the specified path(0x%p) totalPathCount(%u)", path, s_pathList.size()));
+	}
+}
+
+
+// ----------------------------------------------------------------------
+void SpacePathManager::alter(float const /*deltaTime*/)
+{
+	if(ConfigServerGame::getSpaceAiUsePathRefinement())
+	{
+		int remainingAvoidanceChecks = ConfigServerGame::getSpaceAiAvoidanceChecksPerFrame();
+		
+		// Pop some updates off the queue.
+		if (!s_pathQueue.empty())
+		{
+			while(!s_pathQueue.empty() && remainingAvoidanceChecks > 0)
+			{
+				// Shortcut to the object.
+				SpacePath * const spacePath = s_pathQueue.front();
+				
+				// Get rid of this entry.
+				s_pathQueue.pop_front();
+				
+				// Refine the path if it exists.
+				bool notCompleted = !spacePath->refine(remainingAvoidanceChecks);
+				
+				// If we are not done, request another update.
+				spacePath->setUpdateFlag(notCompleted);
+				
+				// Now, add to the queue if not completed.
+				if (notCompleted)
+				{
+					// Schedule for update next frame.
+					s_pathQueue.push_back(spacePath);
+				}
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+void SpacePathManager::removeFromRefineQueue(SpacePath *path)
+{
+	IGNORE_RETURN(s_pathQueue.erase(std::remove(s_pathQueue.begin(), s_pathQueue.end(), path), s_pathQueue.end()));
+}
+
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/SpacePathManager.h b/engine/server/library/serverGame/src/shared/space/SpacePathManager.h
new file mode 100644
index 00000000..ee50df08
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/SpacePathManager.h
@@ -0,0 +1,39 @@
+// ======================================================================
+// 
+// SpacePathManager.h
+// Copyright Sony Online Entertainment, Inc.
+//
+// ======================================================================
+
+#ifndef INCLUDED_SpacePathManager_H
+#define INCLUDED_SpacePathManager_H
+
+class SpacePath;
+
+// ----------------------------------------------------------------------
+class SpacePathManager
+{
+public:
+
+	static void install();
+	static SpacePath * fetch(SpacePath * const path, void const * const object, float const objectRadius);
+	static void release(SpacePath * const path, void const * const object);
+	static void alter(float const deltaTime);
+	static void removeFromRefineQueue(SpacePath * path);
+
+
+private:
+
+	static void remove();
+
+	// Disable
+
+	SpacePathManager();
+	~SpacePathManager();
+	SpacePathManager(SpacePathManager const &);
+	SpacePathManager & operator =(SpacePathManager const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_SpacePathManager_H
diff --git a/engine/server/library/serverGame/src/shared/space/SpaceSquad.cpp b/engine/server/library/serverGame/src/shared/space/SpaceSquad.cpp
new file mode 100644
index 00000000..10d6fc60
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/SpaceSquad.cpp
@@ -0,0 +1,847 @@
+// ======================================================================
+// 
+// SpaceSquad.cpp
+// Copyright Sony Online Entertainment, Inc.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/SpaceSquad.h"
+
+#include "serverGame/AiShipAttackTargetList.h"
+#include "serverGame/AiShipController.h"
+#include "serverGame/AiShipControllerInterface.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ShipObject.h"
+#include "serverGame/SpaceAttackSquad.h"
+#include "serverGame/SpacePath.h"
+#include "serverGame/SpaceSquadManager.h"
+#include "sharedFile/Iff.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/FormattedString.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/PersistentCrcString.h"
+#include "sharedLog/Log.h"
+#include "sharedTerrain/TerrainObject.h"
+#include "sharedUtility/DataTable.h"
+
+#include <list>
+#include <map>
+#include <set>
+
+// ======================================================================
+//
+// SpaceSquadNamespace
+//
+// ======================================================================
+
+namespace SpaceSquadNamespace
+{
+	typedef std::map<PersistentCrcString, int> FormationPriorityList;
+
+	FormationPriorityList s_formationPriorityList;
+	float s_flockingSeperationGain = 4.0f;
+	float s_flockingComfortDistanceGain = 1.0f;
+	float const s_defaultShipRadius = 7.0f;
+}
+
+using namespace SpaceSquadNamespace;
+
+// ======================================================================
+//
+// SpaceSquad
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+void SpaceSquad::install()
+{
+	// Create the data table
+
+	Iff iff;
+
+	if (iff.open("datatables/space_mobile/space_mobile.iff", true))
+	{
+		DataTable dataTable;
+		dataTable.load(iff);
+
+		int const rowCount = dataTable.getNumRows();
+
+		for (int row = 0; row < rowCount; ++row)
+		{
+			PersistentCrcString const shipName(dataTable.getStringValue("strIndex", row), false);
+			int const formationPriority = dataTable.getIntValue("formationPriority", row);
+			
+			IGNORE_RETURN(s_formationPriorityList.insert(std::make_pair(shipName, formationPriority)));
+
+			LOGC((ConfigServerGame::isSpaceAiLoggingEnabled() && formationPriority  <= 0), "space_debug_ai", ("SpaceSquad::install() ERROR: Invalid formationPriority(%d) specified for shipName(%s)", formationPriority, shipName.getString()));
+		}
+	}
+	else
+	{
+		DEBUG_WARNING(true, ("Unable to load space_mobile.iff to retrieve formation priorities!"));
+	}
+
+	ExitChain::add(&remove, "SpaceSquad::remove");
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquad::remove()
+{
+	s_formationPriorityList.clear();
+}
+
+// ----------------------------------------------------------------------
+SpaceSquad::SpaceSquad()
+ : Squad()
+ , m_guardTarget(NULL)
+ , m_guardedByList(new SpaceSquadList)
+ , m_attackSquadList(new AttackSquadList)
+ , m_guarding(false)
+ , m_leashAnchorPosition_w()
+ , m_leashAnchorPositionTimer(4.0f)
+{
+}
+
+// ----------------------------------------------------------------------
+SpaceSquad::~SpaceSquad()
+{
+	// The the squad that I am guarding that I am no longer guarding it
+
+	if (m_guardTarget != NULL)
+	{
+		removeGuardTarget();
+		m_guardTarget = NULL;
+	}
+
+	// Tell all the squads guarding me that I am not longer guardable
+
+	SpaceSquadList::iterator iterGuardedByList = m_guardedByList->begin();
+
+	for (; iterGuardedByList != m_guardedByList->end(); ++iterGuardedByList)
+	{
+		(*iterGuardedByList)->removeGuardTarget();
+	}
+
+	delete m_guardedByList;
+
+	// Clean up the attack squads
+
+	{
+		AttackSquadList::const_iterator iterAttackSquadList = m_attackSquadList->begin();
+
+		for (; iterAttackSquadList != m_attackSquadList->end(); ++iterAttackSquadList)
+		{
+			SpaceAttackSquad * const attackSquad = NON_NULL(*iterAttackSquadList);
+
+			delete attackSquad;
+		}
+
+		m_attackSquadList->clear();
+		delete m_attackSquadList;
+	}
+}
+
+// ----------------------------------------------------------------------
+char const * SpaceSquad::getClassName() const
+{
+	return "SpaceSquad";
+}
+
+// ----------------------------------------------------------------------
+SpacePath * SpaceSquad::getPath() const
+{
+	//-- Get the path of the squad leader
+
+	AiShipController * const aiShipController = AiShipController::getAiShipController(getLeader());
+
+	return NULL != aiShipController ? aiShipController->getPath() : NULL;
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquad::idle() const
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquad::idle() squadId(%d)", getId()));
+
+	UnitMap const & unitMap = getUnitMap();
+	UnitMap::const_iterator iterUnitMap = unitMap.begin();
+
+	for (; iterUnitMap != unitMap.end(); ++iterUnitMap)
+	{
+		NetworkId const & unit = iterUnitMap->first;
+
+		IGNORE_RETURN(AiShipControllerInterface::idle(unit));
+	}
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquad::track(Object const & target) const
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquad::track() squadId(%d) target(%s)", getId(), target.getNetworkId().getValueString().c_str()));
+
+	UnitMap const & unitMap = getUnitMap();
+	UnitMap::const_iterator iterUnitMap = unitMap.begin();
+
+	for (; iterUnitMap != unitMap.end(); ++iterUnitMap)
+	{
+		NetworkId const & unit = iterUnitMap->first;
+
+		IGNORE_RETURN(AiShipControllerInterface::track(unit, target));
+	}
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquad::moveTo(SpacePath * const path) const
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquad::moveTo() squadId(%d) path(0x%p) pathSize(%u)", getId(), path, (path != NULL) ? path->getTransformList().size() : 0));
+
+	UnitMap const & unitMap = getUnitMap();
+	UnitMap::const_iterator iterUnitMap = unitMap.begin();
+
+	for (; iterUnitMap != unitMap.end(); ++iterUnitMap)
+	{
+		NetworkId const & unit = iterUnitMap->first;
+
+		IGNORE_RETURN(AiShipControllerInterface::moveTo(unit, path));
+	}
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquad::addPatrolPath(SpacePath * const path) const
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquad::addPatrolPath() squadId(%d) squadSize(%u) path(0x%p) pathSize(%u)", getId(), getUnitMap().size(), path, (path != NULL) ? path->getTransformList().size() : 0));
+
+	UnitMap const & unitMap = getUnitMap();
+	UnitMap::const_iterator iterUnitMap = unitMap.begin();
+
+	for (; iterUnitMap != unitMap.end(); ++iterUnitMap)
+	{
+		NetworkId const & unit = iterUnitMap->first;
+
+		IGNORE_RETURN(AiShipControllerInterface::addPatrolPath(unit, path));
+	}
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquad::clearPatrolPath()
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquad::clearPatrolPath() squadId(%d) squadSize(%u)", getId(), getUnitMap().size()));
+
+	UnitMap const & unitMap = getUnitMap();
+	UnitMap::const_iterator iterUnitMap = unitMap.begin();
+
+	for (; iterUnitMap != unitMap.end(); ++iterUnitMap)
+	{
+		NetworkId const & unit = iterUnitMap->first;
+
+		IGNORE_RETURN(AiShipControllerInterface::clearPatrolPath(unit));
+	}
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquad::follow(NetworkId const & followedUnit, Vector const & direction_l, float const distance) const
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquad::follow() squadId(%d) squadSize(%u) followedUnit(%s) direction_l(%.2f, %.2f, %.2f) distance(%.2f)", getId(), getUnitMap().size(), followedUnit.getValueString().c_str(), direction_l.x, direction_l.y, direction_l.z, distance));
+
+	UnitMap const & unitMap = getUnitMap();
+	UnitMap::const_iterator iterUnitMap = unitMap.begin();
+
+	for (; iterUnitMap != unitMap.end(); ++iterUnitMap)
+	{
+		NetworkId const & unit = iterUnitMap->first;
+
+		IGNORE_RETURN(AiShipControllerInterface::follow(unit, followedUnit, direction_l, distance));
+	}
+}
+
+// ----------------------------------------------------------------------
+bool SpaceSquad::setGuardTarget(int const squadId)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquad::setGuardTarget() squadId(%d) guardTarget(%d)", getId(), squadId));
+
+	// A squad can't guard itself
+
+	if (squadId == getId())
+	{
+#ifdef _DEBUG
+		FormattedString<1024> fs;
+		char const * const text = fs.sprintf("SpaceSquad::setGuardTarget() ERROR: The squad(%d) is trying to guard itself.", getId());
+		DEBUG_WARNING(true, (text));
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+		return false;
+	}
+
+	SpaceSquad * const desiredGuardTarget = SpaceSquadManager::getSquad(squadId);
+	if (m_guardTarget != desiredGuardTarget)
+	{
+		//-- Tell the guard that I'm guarding that I'm no longer guarding it
+		if (m_guardTarget)
+			m_guardTarget->removeGuardedBy(*this);
+
+		m_guardTarget = desiredGuardTarget;
+		m_guardTarget->setGuardedBy(*this);
+	}
+	else
+	{
+#ifdef _DEBUG
+		FormattedString<1024> fs;
+		char const * const text = fs.sprintf("SpaceSquad::setGuardTarget() squadId(%d) ERROR: guardTarget(%d) does not exist", getId(), squadId);
+		DEBUG_WARNING(true, (text));
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+	}
+
+	return (m_guardTarget != NULL);
+}
+
+// ----------------------------------------------------------------------
+SpaceSquad * SpaceSquad::getGuardTarget()
+{
+	return m_guardTarget;
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquad::removeGuardTarget()
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquad::removeGuardTarget() squadId(%d) guardedBySquad(%d)", getId(), (m_guardTarget != NULL) ? m_guardTarget->getId() : 0));
+
+	//-- Tell the guard target it's no longer being guarded
+
+	if (m_guardTarget != NULL)
+	{
+		m_guardTarget->removeGuardedBy(*this);
+		m_guardTarget = NULL;
+	}
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquad::addDamageTaken(NetworkId const & attackingUnit, float const damage) const
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquad::addDamageTaken() squadId(%d) attackingUnit(%s) damage(%.f)", getId(), attackingUnit.getValueString().c_str(), damage));
+
+	AttackSquadList::iterator iterAttackSquadList = m_attackSquadList->begin();
+
+	for (; iterAttackSquadList != m_attackSquadList->end(); ++iterAttackSquadList)
+	{
+		SpaceAttackSquad & attackSquad = *NON_NULL(*iterAttackSquadList);
+
+		attackSquad.addDamageTaken(attackingUnit, damage);
+	}
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquad::setGuardedBy(SpaceSquad & squad)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquad::setGuardedBy() squadId(%d) guardedBySquad(%d)", getId(), squad.getId()));
+
+	IGNORE_RETURN(m_guardedByList->insert(&squad));
+}
+
+// ----------------------------------------------------------------------
+
+void SpaceSquad::removeGuardedBy(SpaceSquad & squad)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquad::removeGuardedBy() squadId(%d) guardedBySquad(%d)", getId(), squad.getId()));
+	DEBUG_WARNING(m_guardedByList->find(&squad) == m_guardedByList->end(), ("The squad (%d) could not be found in our squad's (%d) guarded by list.", squad.getId(), getId()));
+
+	IGNORE_RETURN(m_guardedByList->erase(&squad));
+}
+
+// ----------------------------------------------------------------------
+SpaceSquad::SpaceSquadList & SpaceSquad::getGuardedByList()
+{
+	return *NON_NULL(m_guardedByList);
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquad::onAddUnit(NetworkId const & unit)
+{
+	AiShipController * unitAiShipController = AiShipController::getAiShipController(unit);
+	
+	if (unitAiShipController != NULL)
+	{
+		unitAiShipController->setSquad(this);
+
+		assignAttackSquad(*unitAiShipController);
+	}
+	else
+	{
+#ifdef _DEBUG
+		FormattedString<1024> fs;
+		char const * const text = fs.sprintf("SpaceSquad::onAddUnit() ERROR: squadId(%d) Trying to add a unit(%s) that can't resolve to an AiShipController.", getId(), unit.getValueString().c_str());
+		WARNING(true, (text));
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+	}
+
+	refreshPathInfo();
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquad::onRemoveUnit()
+{
+	refreshPathInfo();
+}
+
+
+// ----------------------------------------------------------------------
+void SpaceSquad::onNewLeader(NetworkId const & oldLeader)
+{
+	AiShipController * const newLeaderAiShipController = AiShipController::getAiShipController(getLeader());
+
+	if (newLeaderAiShipController != NULL)
+	{
+		AiShipController * const oldLeaderAiShipController = AiShipController::getAiShipController(oldLeader);
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled() && (oldLeaderAiShipController == NULL) && (getUnitCount() > 1), "space_debug_ai", ("Squad::onNewLeader() ERROR: The old leader(%s) could not resolve to an AiShipController.", oldLeader.getValueString().c_str()));
+
+		if (oldLeaderAiShipController != NULL)
+		{
+			newLeaderAiShipController->setCurrentPathIndex(oldLeaderAiShipController->getCurrentPathIndex());
+		}
+
+		m_leaderOffsetPosition_l = -newLeaderAiShipController->getFormationPosition_l();
+		m_leashAnchorPosition_w = newLeaderAiShipController->getOwner()->getPosition_w();
+	}
+	else
+	{
+#ifdef _DEBUG
+		FormattedString<1024> fs;
+		char const * const text = fs.sprintf("SpaceSquad::onNewLeader() ERROR: The new leader(%s) could not be resolved to an AiShipController.", getLeader().getValueString().c_str());
+		DEBUG_WARNING(true, (text));
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+	}
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquad::onSetUnitFormationPosition_l(NetworkId const & unit, Vector const & position_l)
+{
+	AiShipController * const aiShipController = AiShipController::getAiShipController(unit);
+
+	if (aiShipController != NULL)
+	{
+		aiShipController->setFormationPosition_l(position_l);
+	}
+	else
+	{
+#ifdef _DEBUG
+		FormattedString<1024> fs;
+		char const * const text = fs.sprintf("SpaceSquad::onSetUnitFormationPosition_l() ERROR: Unable to resolve AiShipController for unit(%s)", unit.getValueString().c_str());
+		DEBUG_WARNING(true, (text));
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+	}
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquad::alter(float const deltaSeconds)
+{
+	Squad::alter(deltaSeconds);
+
+	AttackSquadList::iterator iterAttackSquadList = m_attackSquadList->begin();
+
+	for (; iterAttackSquadList != m_attackSquadList->end(); ++iterAttackSquadList)
+	{
+		SpaceAttackSquad & attackSquad = *NON_NULL(*iterAttackSquadList);
+
+		attackSquad.alter(deltaSeconds);
+	}
+
+	if (m_leashAnchorPositionTimer.updateNoReset(deltaSeconds))
+	{
+		m_leashAnchorPositionTimer.reset();
+
+		// If the leader is not attacking, then set a new leash position to keep all the squad units near the non-attacking units
+
+		AiShipController const * const leaderAiShipController = AiShipController::getAiShipController(getLeader());
+
+		if (leaderAiShipController != NULL)
+		{
+			if (isGuarding())
+			{
+				SpaceSquad * const guardTarget = getGuardTarget();
+
+				if (guardTarget != NULL)
+				{
+					m_leashAnchorPosition_w = guardTarget->getSquadPosition_w();
+				}
+			}
+			else if (!leaderAiShipController->isAttacking())
+			{
+				m_leashAnchorPosition_w = leaderAiShipController->getOwner()->getPosition_w();
+			}
+
+			leaderAiShipController->clampPositionToZone(m_leashAnchorPosition_w);
+		}
+	}
+
+#ifdef _DEBUG
+	verifyAttackSquads();
+#endif // _DEBUG
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquad::assignNewLeader()
+{
+	UnitMap const & unitMap = getUnitMap();
+
+	if (unitMap.size() == 1)
+	{
+		return;
+	}
+
+	UnitMap::const_iterator iterUnitMap = unitMap.begin();
+
+	for (; iterUnitMap != unitMap.end(); ++iterUnitMap)
+	{
+		CachedNetworkId const & unit = iterUnitMap->first;
+		AiShipController const * const unitAiShipController = AiShipController::getAiShipController(unit);
+
+		if (unitAiShipController != NULL)
+		{
+			if (   unitAiShipController->getShipOwner()->isComponentFunctional(ShipChassisSlotType::SCST_engine)
+			    && !unitAiShipController->isAttacking()
+			    && !unitAiShipController->isDocking())
+			{
+				bool const rebuildFormation = false;
+
+				if (!setLeader(unit, rebuildFormation))
+				{
+#ifdef _DEBUG
+					FormattedString<1024> fs;
+					char const * const text = fs.sprintf("SpaceSquad::assignNewLeader() squadId(%d) ERROR: Failure to set the new squad leader(%s)", getId(), unit.getValueString().c_str());
+					DEBUG_WARNING(true, (text));
+					LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+				}
+				else
+				{
+					break;
+				}
+			}
+		}
+		else
+		{
+#ifdef _DEBUG
+			FormattedString<1024> fs;
+			char const * const text = fs.sprintf("SpaceSquad::assignNewLeader() ERROR: Could not convert unit(%s) to a ShipObject.", unit.getValueString().c_str());
+			DEBUG_WARNING(true, (text));
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquad::setGuarding(bool const guarding)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquad::setGuarding() guarding(%s)", guarding ? "yes" : "no"));
+
+	m_guarding = guarding;
+}
+
+// ----------------------------------------------------------------------
+bool SpaceSquad::isGuarding() const
+{
+#ifdef _DEBUG
+	if (   m_guarding
+	    && !m_guardTarget)
+	{
+		FormattedString<1024> fs;
+		char const * const text = fs.sprintf("SpaceSquad::isGuarding() squadId(%d) ERROR: Why are we guarding a NULL guard target?", getId());
+		DEBUG_WARNING(true, (text));
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+	}
+#endif // _DEBUG
+
+	return m_guarding;
+}
+
+// Returns whether every unit in the squad no longer has an attack target.
+// ----------------------------------------------------------------------
+bool SpaceSquad::isAttackTargetListEmpty() const
+{
+	bool result = true;
+	UnitMap const & unitMap = getUnitMap();
+	UnitMap::const_iterator iterUnitMap = unitMap.begin();
+
+	for (; iterUnitMap != unitMap.end(); ++iterUnitMap)
+	{
+		NetworkId const & unit = iterUnitMap->first;
+		AiShipController * const aiShipController = AiShipController::getAiShipController(unit);
+
+		if (   (aiShipController != NULL)
+		    && !aiShipController->getAttackTargetList().isEmpty())
+		{
+			result = false;
+			break;
+		}
+		else
+		{
+#ifdef _DEBUG
+			FormattedString<1024> fs;
+			char const * const text = fs.sprintf("SpaceSquad::isAttackTargetListEmpty() ERROR: Why does the unit(%s) not have an AiShipController?", unit.getValueString().c_str());
+			DEBUG_WARNING(true, (text));
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+		}
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+Vector SpaceSquad::getAvoidanceVector(ShipObject const & unit) const
+{
+	Vector result;
+
+	if (getUnitCount() <= 1)
+	{
+		return result;
+	}
+
+	// Make sure the average position has been updated this frame
+
+	if (s_flockingSeperationGain > 0.0f)
+	{
+		Vector seperationVector;
+		float closestDistanceSquared = std::numeric_limits<float>::max();
+		float const comfortDistance = (unit.getRadius() * s_flockingComfortDistanceGain);
+		UnitMap const & unitMap = getUnitMap();
+		UnitMap::const_iterator iterUnitMap = unitMap.begin();
+
+		for (; iterUnitMap != unitMap.end(); ++iterUnitMap)
+		{
+			CachedNetworkId const & squadUnit = iterUnitMap->first;
+
+			if (squadUnit == unit.getNetworkId())
+			{
+				// Don't check against ourselves
+				continue;
+			}
+
+			Object * const squadUnitObject = squadUnit.getObject();
+			ServerObject * const squadUnitServerObject = (squadUnitObject != NULL) ? squadUnitObject->asServerObject() : NULL;
+			ShipObject * const squadUnitShipObject = (squadUnitServerObject != NULL) ? squadUnitServerObject->asShipObject() : NULL;
+
+			if (squadUnitShipObject != NULL)
+			{
+				Vector const & unitPosition_w = unit.getPosition_w();
+				Vector const & squadUnitPosition_w = squadUnitShipObject->getPosition_w();
+				float const distanceFromUnitSquared = Vector(squadUnitPosition_w - unitPosition_w).magnitudeSquared();
+
+				if (   (distanceFromUnitSquared <= sqr(comfortDistance))
+				    && (distanceFromUnitSquared < closestDistanceSquared))
+				{
+					closestDistanceSquared = distanceFromUnitSquared;
+
+					seperationVector = (unitPosition_w - squadUnitPosition_w) * 1000.0f;
+				}
+			}
+			else
+			{
+#ifdef _DEBUG
+				FormattedString<1024> fs;
+				char const * const text = fs.sprintf("SpaceSquad::getSquadAvoidanceVector() ERROR: Could not convert the squad unit(%s) to a ShipObject.", squadUnit.getValueString().c_str());
+				DEBUG_WARNING(true, (text));
+				LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+#endif // _DEBUG
+			}
+		}
+
+		if (closestDistanceSquared > sqr(comfortDistance))
+		{
+			result = Vector::zero;
+		}
+		else
+		{
+			seperationVector *= s_flockingSeperationGain;
+			result += seperationVector;
+		}
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+Vector const & SpaceSquad::getLeashAnchorPosition_w() const
+{
+	return m_leashAnchorPosition_w;
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquad::assignAttackSquad(AiShipController & unitAiShipController)
+{
+	// Put the unit in an attack squad
+
+	NetworkId const & unit = unitAiShipController.getOwner()->getNetworkId();
+	AiShipController::AttackOrders const attackOrders = unitAiShipController.getAttackOrders();
+	bool foundAttackSquad = false;
+	
+	if (attackOrders == AiShipController::AO_holdFire)
+	{
+		// Since the unit has HOLD_FIRE attack orders, it needs to be in an attack squad by itself
+
+		AttackSquadList::iterator iterAttackSquadList = m_attackSquadList->begin();
+
+		for (; iterAttackSquadList != m_attackSquadList->end(); ++iterAttackSquadList)
+		{
+			SpaceAttackSquad & attackSquad = *NON_NULL(*iterAttackSquadList);
+
+			if (attackSquad.isEmpty())
+			{
+				attackSquad.addUnit(unit);
+			}
+			else if (   (attackSquad.getUnitCount() == 1)
+			         && attackSquad.contains(unit))
+			{
+				foundAttackSquad = true;
+				break;
+			}
+		}
+	}
+	else
+	{
+		// See if there is a squad that already contains the unit or one that has room for the unit
+
+		AttackSquadList::iterator iterAttackSquadList = m_attackSquadList->begin();
+
+		for (; iterAttackSquadList != m_attackSquadList->end(); ++iterAttackSquadList)
+		{
+			SpaceAttackSquad & attackSquad = *NON_NULL(*iterAttackSquadList);
+
+			if (attackSquad.contains(unit))
+			{
+				foundAttackSquad = true;
+				break;
+			}
+			else
+			{
+				bool const full = attackSquad.isFull();
+
+				if (!full)
+				{
+					foundAttackSquad = true;
+					attackSquad.addUnit(unit);
+
+#ifdef _DEBUG
+					verifyAttackSquads();
+#endif // _DEBUG
+
+					break;
+				}
+			}
+		}
+	}
+
+	// If there was no room in an existing attack squad, create a new attack squad
+
+	if (!foundAttackSquad)
+	{
+		// Add a new attack squad
+
+		SpaceAttackSquad * const attackSquad = new SpaceAttackSquad;
+		attackSquad->addUnit(unit);
+
+		m_attackSquadList->push_back(attackSquad);
+	}
+}
+
+// ----------------------------------------------------------------------
+float SpaceSquad::getLargestShipRadius() const
+{
+	// Find the largest ship.
+	float largestShipRadius = s_defaultShipRadius;
+	
+	UnitMap const & unitMap = getUnitMap();
+	for (UnitMap::const_iterator iterUnitMap = unitMap.begin(); iterUnitMap != unitMap.end(); ++iterUnitMap)
+	{
+		CachedNetworkId const & unit = iterUnitMap->first;
+		Object const * const unitObject = unit.getObject();
+		ServerObject const * const unitServerObject = unitObject ? unitObject->asServerObject() : NULL;
+		
+		if (unitServerObject) 
+		{
+			largestShipRadius = std::max(largestShipRadius, unitServerObject->getRadius());
+		}
+	}
+
+	return largestShipRadius;
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquad::refreshPathInfo() const
+{
+	// check for at least one unit
+	SpacePath * const path = getPath();
+	if (path) 
+	{
+		float const largestShipRadius = getLargestShipRadius();
+		
+		if (!path->updateCollisionRadius(this, largestShipRadius)) 
+		{
+			UnitMap const & unitMap = getUnitMap();
+			for (UnitMap::const_iterator iterUnitMap = unitMap.begin(); iterUnitMap != unitMap.end(); ++iterUnitMap)
+			{
+				CachedNetworkId const & unit = iterUnitMap->first;
+				Object const * const unitObject = unit.getObject();
+				ServerObject const * const unitServerObject = unitObject ? unitObject->asServerObject() : NULL;
+				if (unitObject && unitServerObject) 
+				{
+					IGNORE_RETURN(path->updateCollisionRadius(unitObject, unitServerObject->getRadius()));
+				}
+			}
+		}
+	}
+}
+
+
+
+#ifdef _DEBUG
+// ----------------------------------------------------------------------
+void SpaceSquad::verifyAttackSquads()
+{
+	// Make sure this unit is in exactly 1 attack squad
+
+	UnitMap const & unitMap = getUnitMap();
+	UnitMap::const_iterator iterUnitMap = unitMap.begin();
+
+	for (; iterUnitMap != unitMap.end(); ++iterUnitMap)
+	{
+		CachedNetworkId const & unit = iterUnitMap->first;
+		int attackSquadCount = 0;
+		AttackSquadList::iterator iterAttackSquadList = m_attackSquadList->begin();
+
+		for (; iterAttackSquadList != m_attackSquadList->end(); ++iterAttackSquadList)
+		{
+			SpaceAttackSquad const & attackSquad = *NON_NULL(*iterAttackSquadList);
+
+			if (attackSquad.contains(unit))
+			{
+				++attackSquadCount;
+			}
+		}
+
+#ifdef _DEBUG
+		if (attackSquadCount > 1)
+		{
+			FormattedString<1024> fs;
+			char const * const text = fs.sprintf("SpaceSquad::verifyAttackSquads() squadId(%d) unit(%s) ERROR: Unit is in more than one attack squad! attackSquadCount(%d)", getId(), unit.getValueString().c_str(), attackSquadCount);
+			DEBUG_WARNING(true, (text));
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+		}
+
+		if (attackSquadCount != 1)
+		{
+			FormattedString<1024> fs;
+			char const * const text = fs.sprintf("SpaceSquad::verifyAttackSquads() squadId(%d) unit(%s) ERROR: Unit is not in an attack squad!", getId(), unit.getValueString().c_str());
+			DEBUG_WARNING(true, (text));
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", (text));
+		}
+#endif // _DEBUG
+	}
+}
+#endif // _DEBUG
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/SpaceSquad.h b/engine/server/library/serverGame/src/shared/space/SpaceSquad.h
new file mode 100644
index 00000000..672afa88
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/SpaceSquad.h
@@ -0,0 +1,106 @@
+// ======================================================================
+// 
+// SpaceSquad.h
+// Copyright Sony Online Entertainment, Inc.
+//
+// ======================================================================
+
+#ifndef INCLUDED_SpaceSquad_H
+#define INCLUDED_SpaceSquad_H
+
+#include "serverGame/Squad.h"
+
+class AiShipController;
+class NetworkId;
+class Object;
+class ShipObject;
+class SpaceAttackSquad;
+class SpacePath;
+class Vector;
+
+// ----------------------------------------------------------------------
+class SpaceSquad : public Squad
+{
+friend class SpaceSquadManager;
+
+public:
+
+	typedef stdset<SpaceSquad *>::fwd SpaceSquadList;
+
+	static void install();
+
+public:
+
+	virtual char const * getClassName() const;
+	virtual void alter(float deltaSeconds);
+
+	SpacePath * getPath() const;
+
+	void setCurrentPathIndex(unsigned int const index);
+
+	void idle() const;
+	void track(Object const & target) const;
+	void moveTo(SpacePath * const path) const;
+	void addPatrolPath(SpacePath * const path) const;
+	void clearPatrolPath();
+	void follow(NetworkId const & followedUnit, Vector const & direction_l, float direction) const;
+
+	bool setGuardTarget(int const squadId);
+	SpaceSquad * getGuardTarget();
+	SpaceSquadList & getGuardedByList();
+	void removeGuardTarget();
+
+	void addDamageTaken(NetworkId const & attackingUnit, float const damage) const;
+	virtual void assignNewLeader();
+	void assignAttackSquad(AiShipController & unitAiShipController);
+
+	void setGuarding(bool const guarding);
+	bool isGuarding() const;
+
+	bool isAttackTargetListEmpty() const;
+
+	Vector getAvoidanceVector(ShipObject const & unit) const;
+	Vector const & getLeashAnchorPosition_w() const;
+
+	float getLargestShipRadius() const;
+	void refreshPathInfo() const;
+
+protected:
+
+	virtual void onAddUnit(NetworkId const & unit);
+	virtual void onRemoveUnit();
+	virtual void onNewLeader(NetworkId const & oldLeader);
+	virtual void onSetUnitFormationPosition_l(NetworkId const & unit, Vector const & position_l);
+
+private:
+
+	static void remove();
+
+	void setGuardedBy(SpaceSquad & squad);
+	void removeGuardedBy(SpaceSquad & squad);
+	void updateLargestShipRadius();
+
+#ifdef _DEBUG
+	void verifyAttackSquads();
+#endif // _DEBUG
+
+	typedef stdlist<SpaceAttackSquad *>::fwd AttackSquadList;
+
+	SpaceSquad * m_guardTarget;
+	SpaceSquadList * const m_guardedByList;
+	AttackSquadList * const m_attackSquadList;
+	bool m_guarding;
+	Vector m_leashAnchorPosition_w;
+	Timer m_leashAnchorPositionTimer;
+
+	// Disabled
+
+	SpaceSquad();
+	virtual ~SpaceSquad();
+	SpaceSquad(SpaceSquad const &);
+	SpaceSquad & operator =(SpaceSquad const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_SpaceSquad_H
diff --git a/engine/server/library/serverGame/src/shared/space/SpaceSquadManager.cpp b/engine/server/library/serverGame/src/shared/space/SpaceSquadManager.cpp
new file mode 100644
index 00000000..3a93d451
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/SpaceSquadManager.cpp
@@ -0,0 +1,253 @@
+// ======================================================================
+//
+// SpaceSquadManager.cpp
+// Copyright Sony Online Entertainment, Inc.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/SpaceSquadManager.h"
+
+#include "serverGame/AiShipController.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/SpaceSquad.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedLog/Log.h"
+
+#include <map>
+
+// ======================================================================
+//
+// SpaceSquadManagerNamespace
+//
+// ======================================================================
+
+namespace SpaceSquadManagerNamespace
+{
+	typedef std::map<int, SpaceSquad *> SquadList;
+
+	SquadList s_squadList;
+	int s_nextSquadId = 1;
+
+#ifdef _DEBUG
+	void verifySquads();
+	typedef std::vector<NetworkId> NetworkIdList;
+	NetworkIdList s_debugUnitList;
+#endif // _DEBUG
+}
+
+using namespace SpaceSquadManagerNamespace;
+
+#ifdef _DEBUG
+// ----------------------------------------------------------------------
+void SpaceSquadManagerNamespace::verifySquads()
+{
+	{
+		// Build a list of all the units
+
+		s_debugUnitList.clear();
+		SquadList::const_iterator iterSquadList = s_squadList.begin();
+
+		for (; iterSquadList != s_squadList.end(); ++iterSquadList)
+		{
+			SpaceSquad const & squad = *NON_NULL(iterSquadList->second);
+			SpaceSquad::UnitMap const & unitMap = squad.getUnitMap();
+			SpaceSquad::UnitMap::const_iterator iterUnitMap = unitMap.begin();
+			
+			for (; iterUnitMap != unitMap.end(); ++iterUnitMap)
+			{
+				CachedNetworkId const & unit = iterUnitMap->first;
+
+				s_debugUnitList.push_back(unit);
+			}
+		}
+	}
+
+	{
+		// Make sure each unit is in exactly 1 squad
+
+		NetworkIdList::const_iterator iterDebugUnitList = s_debugUnitList.begin();
+
+		for (; iterDebugUnitList != s_debugUnitList.end(); ++iterDebugUnitList)
+		{
+			NetworkId const & unit = (*iterDebugUnitList);
+			int squadCount = 0;
+
+			SquadList::const_iterator iterSquadList = s_squadList.begin();
+
+			for (; iterSquadList != s_squadList.end(); ++iterSquadList)
+			{
+				SpaceSquad const & squad = *NON_NULL(iterSquadList->second);
+
+				if (squad.contains(unit))
+				{
+					++squadCount;
+				}
+			}
+
+			DEBUG_WARNING((squadCount > 1), ("SpaceSquadManagerNamespace::verifySquads() unit(%s) ERROR: Unit is in more than one squad! attackSquadCount(%d)", unit.getValueString().c_str()));
+			DEBUG_WARNING((squadCount != 1), ("SpaceSquadManagerNamespace::verifySquads() unit(%s) ERROR: Unit is not in an squad!", unit.getValueString().c_str()));
+		}
+	}
+}
+#endif // _DEBUG
+
+// ======================================================================
+//
+// SpaceSquadManager
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+void SpaceSquadManager::install()
+{
+	ExitChain::add(&remove, "SpaceSquadManager::remove");
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquadManager::remove()
+{
+	// Make sure all the squads were cleaned up
+
+	SquadList::const_iterator iterSquadList = s_squadList.begin();
+
+	for (; iterSquadList != s_squadList.end(); ++iterSquadList)
+	{
+		WARNING(!iterSquadList->second->isEmpty(), ("SpaceSquadManager::remove() The squad(%d) is not empty(%u), this is a sign of a reference counting problem.", iterSquadList->first, iterSquadList->second->getUnitCount()));
+	}
+
+	WARNING(!s_squadList.empty(), ("SpaceSquadManager::remove() The squad list is not empty(%u), this is a sign of a reference counting problem.", s_squadList.size()));
+}
+
+// ----------------------------------------------------------------------
+void SpaceSquadManager::alter(float const deltaTime)
+{
+	SquadList::iterator iterSquadList = s_squadList.begin();
+
+	for (; iterSquadList != s_squadList.end();)
+	{
+		// Purge squads with no units
+
+		if (iterSquadList->second->isEmpty())
+		{
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquadManager::alter() Purging empty squad(%d) totalSquadCount(%u)", iterSquadList->first, s_squadList.size() - 1));
+
+			delete iterSquadList->second;
+
+			s_squadList.erase(iterSquadList++);
+		}
+		else
+		{
+			iterSquadList->second->alter(deltaTime);
+			++iterSquadList;
+		}
+	}
+
+#ifdef _DEBUG
+	verifySquads();
+#endif // _DEBUG
+}
+
+// ----------------------------------------------------------------------
+int SpaceSquadManager::createSquadId()
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquadManager::createSquadId() newSquadId(%d)", s_nextSquadId));
+
+	int const newId = s_nextSquadId;
+
+	if (++s_nextSquadId == 0)
+	{
+		s_nextSquadId = 1;
+	}
+
+	return newId;
+}
+
+// ----------------------------------------------------------------------
+SpaceSquad * SpaceSquadManager::createSquad()
+{
+	int const squadId = createSquadId();
+
+	return createSquad(squadId);
+}
+
+// ----------------------------------------------------------------------
+SpaceSquad * SpaceSquadManager::createSquad(int const squadId)
+{
+	FATAL((s_squadList.find(squadId) != s_squadList.end()), ("Trying to create a squad(%d) that already exists.", squadId));
+
+	SpaceSquad * const squad = new SpaceSquad;
+
+	squad->setId(squadId);
+
+	IGNORE_RETURN(s_squadList.insert(std::make_pair(squadId, squad)));
+
+	return squad;
+}
+
+// ----------------------------------------------------------------------
+bool SpaceSquadManager::setSquadId(NetworkId const & unit, int const newSquadId)
+{
+	LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquadManager::setSquadId() unit(%s) newSquadId(%d)", unit.getValueString().c_str(), newSquadId));
+
+	bool result = false;
+	AiShipController * const aiShipController = AiShipController::getAiShipController(unit);
+
+	if (aiShipController != NULL)
+	{
+		result = true;
+
+		//-- See if the unit is already in the requested squad
+
+		SpaceSquad const & oldSquad = aiShipController->getSquad();
+
+		if (oldSquad.getId() != newSquadId)
+		{
+			SquadList::iterator iterSquadList = s_squadList.find(newSquadId);
+
+			if (iterSquadList != s_squadList.end())
+			{
+				//-- The squad already existed, add the unit
+
+				SpaceSquad * const newSquad = iterSquadList->second;
+
+				newSquad->addUnit(unit);
+			}
+			else
+			{
+				//-- The squad did not exist, create it and add the unit
+
+				SpaceSquad * const newSquad = SpaceSquadManager::createSquad(newSquadId);
+
+				newSquad->addUnit(unit);
+			}
+		}
+		else
+		{
+			LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquadManager::setSquadId() unit(%s) newSquadId(%d) ERROR: The unit is already in the requested squad.", unit.getValueString().c_str(), newSquadId));
+		}
+	}
+	else
+	{
+		LOGC(ConfigServerGame::isSpaceAiLoggingEnabled(), "space_debug_ai", ("SpaceSquadManager::setSquadId() unit(%s) newSquadId(%d) ERROR: Unable to resolve unit to an AiShipController.", unit.getValueString().c_str(), newSquadId));
+	}
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+SpaceSquad * SpaceSquadManager::getSquad(int const squadId)
+{
+	SpaceSquad * result = NULL;
+	SquadList::const_iterator iterSpaceSquadList = s_squadList.find(squadId);
+
+	if (iterSpaceSquadList != s_squadList.end())
+	{
+		result = iterSpaceSquadList->second;
+	}
+
+	return result;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/SpaceSquadManager.h b/engine/server/library/serverGame/src/shared/space/SpaceSquadManager.h
new file mode 100644
index 00000000..8e60e5a2
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/SpaceSquadManager.h
@@ -0,0 +1,44 @@
+// ======================================================================
+// 
+// SpaceSquadManager.h
+// Copyright Sony Online Entertainment, Inc.
+//
+// ======================================================================
+
+#ifndef INCLUDED_SpaceSquadManager_H
+#define INCLUDED_SpaceSquadManager_H
+
+class NetworkId;
+class SpaceSquad;
+
+// ----------------------------------------------------------------------
+class SpaceSquadManager
+{
+public:
+
+	static void install();
+	static void alter(float const deltaTime);
+
+public:
+
+	static int createSquadId();
+	static SpaceSquad * createSquad();
+	static bool setSquadId(NetworkId const & unit, int const newSquadId);
+	static SpaceSquad * getSquad(int const squadId);
+
+private:
+
+	static void remove();
+	static SpaceSquad * createSquad(int const squadId);
+
+	// Disable
+
+	SpaceSquadManager();
+	~SpaceSquadManager();
+	SpaceSquadManager(SpaceSquadManager const &);
+	SpaceSquadManager & operator =(SpaceSquadManager const &);
+};
+
+// ======================================================================
+
+#endif // INCLUDED_SpaceSquadManager_H
diff --git a/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp b/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp
new file mode 100644
index 00000000..a4ec08d2
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp
@@ -0,0 +1,851 @@
+// ======================================================================
+//
+// SpaceVisibilityManager.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/SpaceVisibilityManager.h"
+
+#include "serverGame/ConfigServerGame.h"
+#include "serverGame/ObserveTracker.h"
+#include "serverGame/ServerObject.h"
+#include "serverGame/VisibleObjectNotification.h"
+#include "sharedDebug/Profiler.h"
+#include "sharedObject/NetworkIdManager.h"
+
+#include <algorithm>
+#include <hash_map>
+
+// ======================================================================
+
+namespace SpaceVisibilityManager_namespace
+{
+	// Constants
+
+	const int ms_nodeSize      = 512;   // must be a power of 2
+	const int ms_nodeSizeLn    = 9;     // base 2 log of the node size
+	const int ms_maxCoordinate = 4096;  // maximum allowed coordinate for an object, positive or negative
+	const int ms_maxNodeIndex  = (ms_maxCoordinate * 2) / ms_nodeSize; 
+
+	// Typedefs
+
+	class TrackedObject;
+	class Node;
+
+	typedef std::set<Client*>                            ClientSet;
+	typedef std::set<TrackedObject*>                     ObjectSet;
+	typedef std::map<Client*, TrackedObject*>            ClientToObjectMapType;
+	typedef std::hash_map<NetworkId, TrackedObject*>     TrackedObjectsType;
+
+	// Classes
+
+	class NodeId
+	{
+	public:
+		int m_x;  //lint !e1925 public data member
+		int m_y;  //lint !e1925 public data member
+		int m_z;  //lint !e1925 public data member
+
+	public:
+		explicit NodeId (const Vector &location);
+		NodeId          (int x, int y, int z);
+
+		bool operator== (const NodeId &rhs) const;
+		bool operator!= (const NodeId &rhs) const;
+
+		int magnitudeBetweenSquared(const NodeId &rhs) const;
+
+	private:
+		NodeId(); //disable
+	};
+
+	class TrackedObject
+	{
+	public:
+		TrackedObject  (const ServerObject &object, int updateRadius);
+		~TrackedObject ();
+
+		void                    addClient                 (Client &newClient);
+		void                    allClientsObserveObject   (ServerObject &newObject) const;
+		void                    allClientsUnobserveObject (ServerObject &object) const;
+		const NodeId &          getCurrentLocation        () const;
+		Node &                  getCurrentNode            () const;
+		const CachedNetworkId & getNetworkId              () const;
+		ServerObject &          getServerObject           () const;
+		bool                    hasClients                () const;
+		void                    moveTo                    (const NodeId &newLocation);
+		void                    removeClient              (Client &client);
+		int                     getUpdateRadius           () const;
+		ClientSet const *       getClients                () const;
+
+	private:
+		CachedNetworkId m_object; 
+		int             m_updateRadius;       
+		NodeId          m_currentLocation; 
+		ClientSet *     m_clients;     
+
+	private:
+		TrackedObject(); //disable
+	};
+
+	class Node
+	{
+	public:
+		Node ();
+
+		void addObservingObject             (TrackedObject &newObject, bool observeNow);
+		void addVisibleObject               (TrackedObject &newObject);
+		void getAllVisibleObjects           (std::vector<ServerObject*> & results) const;
+		void removeObservingObject          (TrackedObject &newObject);
+		void removeVisibleObject            (TrackedObject &newObject);
+		void getVisibleObjectDifference     (const Node &otherNode, std::vector<TrackedObject*> & lostObjects, std::vector<TrackedObject*> & gainedObjects) const;
+		ObjectSet const &getObservingObjects() const;
+		
+	private:
+		ObjectSet   m_visibleObjects;
+		ObjectSet   m_observingObjects;
+
+	private:
+		Node (const Node &); //lint -esym(754,Node::Node) // unreferenced private copy constructor
+	};
+
+	// Functions
+
+	void            addToNodesInRange       (TrackedObject &object, const NodeId &location, int range);
+	void            addToNodesInVolume      (TrackedObject & object, int minX, int maxX, int minY, int maxY, int minZ, int maxZ);
+	int             coordinateToNodeIndex   (float coordinate);
+	Node &          getNode                 (const NodeId &location); //lint !e1929 returning a reference
+	TrackedObject * internalAddObject       (ServerObject & object, int updateRadius);
+	void            removeFromNodesInRange  (TrackedObject &object, const NodeId &location, int range);
+	void            removeFromNodesInVolume (TrackedObject & object, int minX, int maxX, int minY, int maxY, int minZ, int maxZ);
+	int             roundToNodeBoundary     (int unroundedLocation);
+	int             trimIndexToAllowedRange (int index);
+
+	// Data
+
+	ClientToObjectMapType  ms_clientToObjectMap;
+	Node                   ms_nodeMap[ms_maxNodeIndex+1][ms_maxNodeIndex+1][ms_maxNodeIndex+1];
+	TrackedObjectsType     ms_trackedObjects;
+
+} //namespace
+
+using namespace SpaceVisibilityManager_namespace;
+
+// ======================================================================
+
+void SpaceVisibilityManager::addClient(Client & client, ServerObject & observingObject)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("SpaceVisibilityManager::addClient");
+	DEBUG_REPORT_LOG(ConfigServerGame::getDebugSpaceVisibilityManager(),("SpaceVisibilityManager::addClient(Client & client, %s);\n",observingObject.getNetworkId().getValueString().c_str()));
+
+	TrackedObjectsType::iterator i=ms_trackedObjects.find(observingObject.getNetworkId());
+	TrackedObject *to=NULL;
+	if (i!=ms_trackedObjects.end())
+	{
+		to=i->second;
+	}
+	else
+	{
+		to=internalAddObject(observingObject, static_cast<int>(observingObject.getFarNetworkUpdateRadius()));
+	}
+	NOT_NULL(to);
+
+	std::pair<ClientToObjectMapType::iterator, bool> result =ms_clientToObjectMap.insert(std::make_pair(&client,to));
+	if (!result.second)
+	{
+		DEBUG_WARNING(result.first->second != to,("Programmer bug:  called addClient(c,%s) with a client that was already in the map with a different object (%s).  removeClient() should have been called first.  (SpaceVisibilityTracker does not support controlling multiple objects that aren't in the same containment tree.)", observingObject.getNetworkId().getValueString().c_str(), result.first->second->getNetworkId().getValueString().c_str()));
+		removeClient(client);
+		result = ms_clientToObjectMap.insert(std::make_pair(&client,to));
+		DEBUG_FATAL(!result.second,("Programmer bug:  removeClient did not remove the client from ms_clientToObjectMap"));
+		UNREF(result);
+	}
+
+	to->addClient(client);
+	Node &theNode = to->getCurrentNode();
+	theNode.addObservingObject(*to, true);
+}
+
+// ----------------------------------------------------------------------
+
+void SpaceVisibilityManager::removeClient(Client & client)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("SpaceVisibilityManager::removeClient");
+	DEBUG_REPORT_LOG(ConfigServerGame::getDebugSpaceVisibilityManager(),("SpaceVisibilityManager::removeClient();\n"));
+
+	ClientToObjectMapType::iterator i=ms_clientToObjectMap.find(&client);
+	if (i!=ms_clientToObjectMap.end())
+	{
+		TrackedObject *to=i->second;
+		NOT_NULL(to);
+		to->removeClient(client);
+		ms_clientToObjectMap.erase(i);
+	}
+	else
+		DEBUG_REPORT_LOG(ConfigServerGame::getDebugSpaceVisibilityManager(),("SpaceVisibilityManager::removeClient() called with a client that was not in the map, ignoring.\n"));
+}
+
+// ----------------------------------------------------------------------
+
+void SpaceVisibilityManager::addObject(ServerObject & object, int updateRadius)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("SpaceVisibilityManager::addObject");
+	IGNORE_RETURN(internalAddObject(object,updateRadius));
+}
+
+// ----------------------------------------------------------------------
+
+TrackedObject * SpaceVisibilityManager_namespace::internalAddObject(ServerObject & object, int updateRadius)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("SpaceVisibilityManager::addObject");
+	DEBUG_REPORT_LOG(ConfigServerGame::getDebugSpaceVisibilityManager(),("SpaceVisibilityManager::addObject(%s, %i);\n",object.getNetworkId().getValueString().c_str(), updateRadius));
+
+	updateRadius = updateRadius==0 ? 0 : (1 + (updateRadius-1) / ms_nodeSize); // divide specified radius by node size, but always round up
+	TrackedObjectsType::const_iterator i=ms_trackedObjects.find(object.getNetworkId());
+	if (i!=ms_trackedObjects.end())
+	{
+		DEBUG_FATAL(i->second->getUpdateRadius()!=updateRadius,
+					("Programmer bug:  Added object %s to SpaceVisibilityTracker, but it had already been added with a different update radius.",object.getNetworkId().getValueString().c_str()));
+		return i->second;
+	}
+	else
+	{
+		TrackedObject *newObject=new TrackedObject(object, updateRadius);
+		object.addNotification(VisibleObjectNotification::getInstance(), true);
+
+		return newObject;
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void SpaceVisibilityManager::moveObject(const ServerObject & object)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("SpaceVisibilityManager::moveObject");
+
+	TrackedObject *vis = ms_trackedObjects[object.getNetworkId()];
+	DEBUG_FATAL(!vis,("Programmer Bug:  Called SpaceVisibilityManager::moveObject(%s), but the object had not been added to SpaceVisibilityManager",object.getNetworkId().getValueString().c_str()));
+	if (!vis) //lint !e774 //always false (in debug build only)
+		return;
+
+	vis->moveTo(NodeId(object.getPosition_w()));
+}
+
+// ----------------------------------------------------------------------
+
+void SpaceVisibilityManager::removeObject(ServerObject & object)
+{
+	PROFILER_AUTO_BLOCK_DEFINE("SpaceVisibilityManager::removeObject");
+	DEBUG_REPORT_LOG(ConfigServerGame::getDebugSpaceVisibilityManager(),("SpaceVisibilityManager::removeObject(%s);\n",object.getNetworkId().getValueString().c_str()));
+
+	TrackedObject *vis = ms_trackedObjects[object.getNetworkId()];
+	DEBUG_FATAL(!vis,("Programmer Bug:  Called SpaceVisibilityManager::removeObject(%s), but the object had not been added to SpaceVisibilityManager",object.getNetworkId().getValueString().c_str()));
+	if (!vis)   //lint !e774 //always false (in debug build only)
+		return;
+	delete vis;
+	vis=NULL;
+
+	object.removeNotification(VisibleObjectNotification::getInstance(),true);
+}
+
+// ----------------------------------------------------------------------
+
+void SpaceVisibilityManager_namespace::addToNodesInRange(TrackedObject &object, const NodeId &location, int range)
+{
+	addToNodesInVolume(object, location.m_x-range, location.m_x+range,location.m_y-range, location.m_y+range,location.m_z-range, location.m_z+range);
+}
+
+// ----------------------------------------------------------------------
+
+int SpaceVisibilityManager_namespace::trimIndexToAllowedRange(int index)
+{
+	if (index < 0)
+		return 0;
+	else if (index > ms_maxNodeIndex)
+		return ms_maxNodeIndex;
+	else
+		return index;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Add a visible object from a rectangular volume of space, specified by x,y, and z ranges, which must be node boundaries
+ */
+void SpaceVisibilityManager_namespace::addToNodesInVolume(TrackedObject & object, int minX, int maxX, int minY, int maxY, int minZ, int maxZ)
+{
+	minX = std::max(0, minX);
+	maxX = std::min(ms_maxNodeIndex, maxX);
+	minY = std::max(0, minY);
+	maxY = std::min(ms_maxNodeIndex, maxY);
+	minZ = std::max(0, minZ);
+	maxZ = std::min(ms_maxNodeIndex, maxZ);
+
+	for (int x=minX; x<=maxX; ++x)
+		for (int y=minY; y<=maxY; ++y)
+			for (int z=minZ; z<=maxZ; ++z)
+			{
+				Node &theNode=getNode(NodeId(x,y,z));
+				theNode.addVisibleObject(object);
+			}
+}
+
+// ----------------------------------------------------------------------
+
+void SpaceVisibilityManager_namespace::removeFromNodesInRange(TrackedObject &object, const NodeId &location, int range)
+{
+	removeFromNodesInVolume(object, location.m_x-range, location.m_x+range,location.m_y-range, location.m_y+range,location.m_z-range, location.m_z+range);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Remove a visible object from a rectangular volume of space, specified by x,y, and z ranges, which must be node boundaries
+ */
+void SpaceVisibilityManager_namespace::removeFromNodesInVolume(TrackedObject & object, int minX, int maxX, int minY, int maxY, int minZ, int maxZ)
+{
+	minX = std::max(0, minX);
+	maxX = std::min(ms_maxNodeIndex, maxX);
+	minY = std::max(0, minY);
+	maxY = std::min(ms_maxNodeIndex, maxY);
+	minZ = std::max(0, minZ);
+	maxZ = std::min(ms_maxNodeIndex, maxZ);
+
+	for (int x=minX; x<=maxX; ++x)
+		for (int y=minY; y<=maxY; ++y)
+			for (int z=minZ; z<=maxZ; ++z)
+			{
+				Node &theNode=getNode(NodeId(x,y,z));
+				theNode.removeVisibleObject(object);
+			}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Rounds to the node boundary that contains this coordinate.
+ */
+int SpaceVisibilityManager_namespace::roundToNodeBoundary(int unroundedLocation)
+{
+	return (unroundedLocation >= 0) ? (unroundedLocation/ms_nodeSize)*ms_nodeSize : ((unroundedLocation+1-ms_nodeSize)/ms_nodeSize)*ms_nodeSize;
+}
+
+// ----------------------------------------------------------------------
+
+int SpaceVisibilityManager_namespace::coordinateToNodeIndex(float coordinate)
+{
+	int rounded=static_cast<int>(coordinate);
+
+	if (rounded > ms_maxCoordinate)
+	{ 
+		rounded = ms_maxCoordinate;
+	}
+	if (rounded < -ms_maxCoordinate) 
+	{ 
+		rounded = -ms_maxCoordinate; 
+	}
+
+	DEBUG_FATAL(rounded + ms_maxCoordinate < 0,("Programmer bug:  the result of coordinate + ms_maxCoordinate was negative."));
+	int result = (rounded + ms_maxCoordinate ) >> ms_nodeSizeLn; //lint !e702 shift right of signed - OK because we make sure it's positive
+	DEBUG_FATAL(result < 0 || result > ms_maxNodeIndex,("Programmer bug:  the result of coordinateToNodeIndex() was not within the allowed size."));
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Return the node at the specified coordinates
+ */
+Node &SpaceVisibilityManager_namespace::getNode(const NodeId &location)
+{ //lint !e1929 returning a reference
+#ifdef _DEBUG
+	int x=trimIndexToAllowedRange(location.m_x);
+	int y=trimIndexToAllowedRange(location.m_y);
+	int z=trimIndexToAllowedRange(location.m_z);
+
+	DEBUG_FATAL(location != NodeId(x,y,z),("getNode was called with NodeId (%i, %i, %i), which is not in the allowed range.",location.m_x, location.m_y, location.m_z));
+#endif
+
+	return ms_nodeMap[location.m_x][location.m_y][location.m_z];
+}
+
+// ----------------------------------------------------------------------
+
+void SpaceVisibilityManager::getObjectsVisibleFromLocation(const Vector & location, stdvector<ServerObject*>::fwd &results)
+{
+	const Node &theNode = getNode(NodeId(location));
+	theNode.getAllVisibleObjects(results);
+}
+
+// ----------------------------------------------------------------------
+
+void SpaceVisibilityManager::getClientsInRange(Vector const &location, float radius, std::set<Client *> &results)
+{
+	int const minX = coordinateToNodeIndex(location.x-radius);
+	int const maxX = coordinateToNodeIndex(location.x+radius);
+	int const minY = coordinateToNodeIndex(location.y-radius);
+	int const maxY = coordinateToNodeIndex(location.y+radius);
+	int const minZ = coordinateToNodeIndex(location.z-radius);
+	int const maxZ = coordinateToNodeIndex(location.z+radius);
+
+	float const radiusSquared = sqr(radius);
+
+	for (int x = minX; x <= maxX; ++x)
+	{
+		for (int y = minY; y <= maxY; ++y)
+		{
+			for (int z = minZ; z <= maxZ; ++z)
+			{
+				ObjectSet const &observingObjects = getNode(NodeId(x, y, z)).getObservingObjects();
+				for (ObjectSet::const_iterator i = observingObjects.begin(); i != observingObjects.end(); ++i)
+				{
+					ServerObject const &so = (*i)->getServerObject();
+					if (location.magnitudeBetweenSquared(so.getPosition_w()) < radiusSquared)
+					{
+						ClientSet const * const clients = (*i)->getClients();
+						if (clients && !clients->empty())
+							results.insert(clients->begin(), clients->end());
+					}
+				}
+			}
+		}
+	}
+}
+
+// ======================================================================
+
+Node::Node() :
+		m_visibleObjects(),
+		m_observingObjects()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void Node::addVisibleObject(TrackedObject &newObject)
+{
+	std::pair<ObjectSet::iterator, bool> result = m_visibleObjects.insert(&newObject);
+	DEBUG_FATAL(!result.second,("Called Node::addVisibleObject(%s), but the object was already in the node.",newObject.getNetworkId().getValueString().c_str()));
+	UNREF(result);
+
+	ServerObject &asServerObject = newObject.getServerObject();
+
+	for (ObjectSet::iterator i=m_observingObjects.begin(); i!=m_observingObjects.end(); ++i)
+	{
+		if (*i != &newObject)
+		{
+			NOT_NULL(*i);
+			(*i)->allClientsObserveObject(asServerObject);
+		}
+	}
+} //lint !e1764 parameter can't really be made const, but lint thinks it can
+
+// ----------------------------------------------------------------------
+
+void Node::getAllVisibleObjects(std::vector<ServerObject*> & results) const
+{
+	results.reserve(results.size() + m_visibleObjects.size());
+	
+	for (ObjectSet::iterator i=m_visibleObjects.begin(); i!=m_visibleObjects.end(); ++i)
+	{
+		NOT_NULL(*i);
+		results.push_back(&((*i)->getServerObject()));
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void Node::removeVisibleObject(TrackedObject &object)
+{
+	size_t result = m_visibleObjects.erase(&object);
+	UNREF(result);  // for release mode
+	DEBUG_FATAL(result != 1,("Programmer bug:  Node::removeVisibleObject(%s) called on an object that was not in the list",object.getNetworkId().getValueString().c_str()));
+
+	ServerObject &asServerObject = object.getServerObject();
+
+	for (ObjectSet::iterator i=m_observingObjects.begin(); i!=m_observingObjects.end(); ++i)
+	{
+		if (*i != &object)
+		{
+			NOT_NULL(*i);
+			(*i)->allClientsUnobserveObject(asServerObject);
+		}
+	}
+} //lint !e1764 parameter can't really be made const, but lint thinks it can
+
+// ----------------------------------------------------------------------
+
+void Node::addObservingObject (TrackedObject & newObject, bool observeNow)
+{
+	DEBUG_FATAL(!newObject.hasClients(),("Programmer bug:  called Node::addObservingObject(%s) with an object that did not have any clients attached.",newObject.getNetworkId().getValueString().c_str()));
+	std::pair<ObjectSet::iterator, bool> result = m_observingObjects.insert(&newObject);
+	UNREF(result);
+	DEBUG_REPORT_LOG(ConfigServerGame::getDebugSpaceVisibilityManager() && !result.second,("Called Node::addObservingObject(%s), but it was already on the list\n",newObject.getNetworkId().getValueString().c_str()));
+
+	if (observeNow)
+	{
+		for (ObjectSet::iterator j=m_visibleObjects.begin(); j!=m_visibleObjects.end(); ++j)
+			newObject.allClientsObserveObject((*j)->getServerObject());
+	}
+} //lint !e1764 parameter can't really be made const, but lint thinks it can
+
+// ----------------------------------------------------------------------
+
+/**
+ * Remove an observing object from a node.
+ *
+ * @param oldObject the object
+ */
+void Node::removeObservingObject (TrackedObject & oldObject)
+{
+	size_t result=m_observingObjects.erase(&oldObject);
+	UNREF(result); // for release mode
+	DEBUG_FATAL(result!=1,("Programmer bug:  removeObservingObject called on an object that was not in the observing list on the node"));
+} //lint !e1764 parameter can't really be made const, but lint thinks it can
+
+// ----------------------------------------------------------------------
+
+/**
+ * Find the difference in the visible object list between two nodes
+ *
+ * @param otherNode The node to compare againse.
+ * @param lostObjects (output) The list of objects that are in the other node, but are
+ *    not in this node.
+ * @param gainedObjects (output) The list of objects that are in this node, but are
+ *    not in the other node.
+ */
+void Node::getVisibleObjectDifference(const Node &otherNode, std::vector<TrackedObject*> & lostObjects, std::vector<TrackedObject*> & gainedObjects) const
+{
+	IGNORE_RETURN(std::set_difference(otherNode.m_visibleObjects.begin(), otherNode.m_visibleObjects.end(), m_visibleObjects.begin(), m_visibleObjects.end(), std::back_insert_iterator<std::vector<TrackedObject*> >(lostObjects)));
+	IGNORE_RETURN(std::set_difference(m_visibleObjects.begin(), m_visibleObjects.end(), otherNode.m_visibleObjects.begin(), otherNode.m_visibleObjects.end(), std::back_insert_iterator<std::vector<TrackedObject*> >(gainedObjects)));
+}
+
+// ----------------------------------------------------------------------
+
+ObjectSet const &Node::getObservingObjects() const
+{
+	return m_observingObjects;
+}
+
+// ======================================================================
+
+TrackedObject::TrackedObject(const ServerObject &object, int updateRadius) :
+		m_object(object),
+		m_updateRadius(updateRadius),
+		m_currentLocation(NodeId(object.getPosition_w())),
+		m_clients(NULL)
+{
+	ms_trackedObjects[object.getNetworkId()]=this;
+	addToNodesInRange(*this, m_currentLocation, updateRadius);
+}
+
+// ----------------------------------------------------------------------
+
+TrackedObject::~TrackedObject()
+{
+	if (m_clients)
+	{
+		Node &theNode = getNode(m_currentLocation);
+		theNode.removeObservingObject(*this);
+		for (ClientSet::iterator i=m_clients->begin(); i!=m_clients->end(); ++i)
+		{
+			IGNORE_RETURN(ms_clientToObjectMap.erase(*i));
+		}
+
+		delete m_clients;
+		m_clients=NULL;
+	}
+
+	removeFromNodesInRange(*this, m_currentLocation, m_updateRadius);
+	IGNORE_RETURN(ms_trackedObjects.erase(m_object));
+} //lint !e1740 m_clients not freed (actually it is)
+
+// ----------------------------------------------------------------------
+
+const CachedNetworkId & TrackedObject::getNetworkId() const
+{
+	return m_object;
+}
+
+// ----------------------------------------------------------------------
+
+bool TrackedObject::hasClients() const
+{
+	return (m_clients != NULL);
+}
+
+// ----------------------------------------------------------------------
+
+void TrackedObject::addClient(Client &newClient)
+{
+	if (!m_clients)
+		m_clients=new ClientSet;
+	IGNORE_RETURN(m_clients->insert(&newClient));
+} //lint !e1764 (newClient can't really be made const)
+
+// ----------------------------------------------------------------------
+
+void TrackedObject::removeClient(Client &client)
+{
+	if (m_clients)
+	{
+		IGNORE_RETURN(m_clients->erase(&client));
+		if (m_clients->empty())
+		{
+			delete m_clients;
+			m_clients=NULL;
+
+			getNode(m_currentLocation).removeObservingObject(*this);
+		}
+	}
+}  //lint !e1764 (client can't really be made const)
+
+// ----------------------------------------------------------------------
+
+/**
+ * Tell all clients watching this object about a new object they should
+ * observe.
+ */
+void TrackedObject::allClientsObserveObject(ServerObject &newObject) const
+{
+	if (m_clients)
+	{
+		for (ClientSet::iterator j=m_clients->begin(); j!=m_clients->end(); ++j)
+		{
+			NOT_NULL(*j);
+			ObserveTracker::onClientAddedVisibleObjectSpace(**j, newObject);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Tell all clients watching this object that an object should not longer
+ * be observed
+ */
+void TrackedObject::allClientsUnobserveObject(ServerObject &object) const
+{
+	if (m_clients)
+	{
+		for (ClientSet::iterator j=m_clients->begin(); j!=m_clients->end(); ++j)
+		{
+			NOT_NULL(*j);
+			ObserveTracker::onClientLostVisibleObjectSpace(**j, object);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+Node & TrackedObject::getCurrentNode() const
+{
+	return getNode(m_currentLocation);
+}
+
+// ----------------------------------------------------------------------
+
+ServerObject & TrackedObject::getServerObject() const
+{
+	Object *object = m_object.getObject();
+	NOT_NULL(object);
+	ServerObject *asServerObject = object->asServerObject();
+	NOT_NULL(asServerObject);
+	return *asServerObject;
+}
+
+// ----------------------------------------------------------------------
+
+const NodeId & TrackedObject::getCurrentLocation() const
+{
+	return m_currentLocation;
+}
+
+// ----------------------------------------------------------------------
+
+void TrackedObject::moveTo(const NodeId &newLocation)
+{
+	if (newLocation != m_currentLocation)
+	{
+		DEBUG_REPORT_LOG(ConfigServerGame::getDebugSpaceVisibilityManager(),("SpaceVisibilityManager::TrackedObject::moveTo(); (object id %s)\n",m_object.getValueString().c_str()));
+
+		const NodeId oldLocation(m_currentLocation);
+
+		if (newLocation.magnitudeBetweenSquared(oldLocation) < 4)
+		{
+			// small move.  Do it incrementally to minimize the unobserves/reobserves
+			while (m_currentLocation != newLocation)
+			{
+				if (m_currentLocation.m_x < newLocation.m_x)
+				{
+					removeFromNodesInVolume( *this,
+											 m_currentLocation.m_x - m_updateRadius, m_currentLocation.m_x - m_updateRadius,
+											 m_currentLocation.m_y - m_updateRadius, m_currentLocation.m_y + m_updateRadius,
+											 m_currentLocation.m_z - m_updateRadius, m_currentLocation.m_z + m_updateRadius);
+					m_currentLocation.m_x = m_currentLocation.m_x + 1;
+					addToNodesInVolume( *this,
+										m_currentLocation.m_x + m_updateRadius, m_currentLocation.m_x + m_updateRadius,
+										m_currentLocation.m_y - m_updateRadius, m_currentLocation.m_y + m_updateRadius,
+										m_currentLocation.m_z - m_updateRadius, m_currentLocation.m_z + m_updateRadius);
+				}
+				if (m_currentLocation.m_x > newLocation.m_x)
+				{
+					removeFromNodesInVolume( *this,
+											 m_currentLocation.m_x + m_updateRadius, m_currentLocation.m_x + m_updateRadius,
+											 m_currentLocation.m_y - m_updateRadius, m_currentLocation.m_y + m_updateRadius,
+											 m_currentLocation.m_z - m_updateRadius, m_currentLocation.m_z + m_updateRadius);
+					m_currentLocation.m_x = m_currentLocation.m_x - 1;
+					addToNodesInVolume( *this,
+										m_currentLocation.m_x - m_updateRadius, m_currentLocation.m_x - m_updateRadius,
+										m_currentLocation.m_y - m_updateRadius, m_currentLocation.m_y + m_updateRadius,
+										m_currentLocation.m_z - m_updateRadius, m_currentLocation.m_z + m_updateRadius);
+				}
+
+				if (m_currentLocation.m_y < newLocation.m_y)
+				{
+					removeFromNodesInVolume( *this,
+											 m_currentLocation.m_x - m_updateRadius, m_currentLocation.m_x + m_updateRadius,
+											 m_currentLocation.m_y - m_updateRadius, m_currentLocation.m_y - m_updateRadius,
+											 m_currentLocation.m_z - m_updateRadius, m_currentLocation.m_z + m_updateRadius);
+					m_currentLocation.m_y = m_currentLocation.m_y + 1;
+					addToNodesInVolume( *this,
+										m_currentLocation.m_x - m_updateRadius, m_currentLocation.m_x + m_updateRadius,
+										m_currentLocation.m_y + m_updateRadius, m_currentLocation.m_y + m_updateRadius,
+										m_currentLocation.m_z - m_updateRadius, m_currentLocation.m_z + m_updateRadius);
+				}
+				if (m_currentLocation.m_y > newLocation.m_y)
+				{
+					removeFromNodesInVolume( *this,
+											 m_currentLocation.m_x - m_updateRadius, m_currentLocation.m_x + m_updateRadius,
+											 m_currentLocation.m_y + m_updateRadius, m_currentLocation.m_y + m_updateRadius,
+											 m_currentLocation.m_z - m_updateRadius, m_currentLocation.m_z + m_updateRadius);
+					m_currentLocation.m_y = m_currentLocation.m_y - 1;
+					addToNodesInVolume( *this,
+										m_currentLocation.m_x - m_updateRadius, m_currentLocation.m_x + m_updateRadius,
+										m_currentLocation.m_y - m_updateRadius, m_currentLocation.m_y - m_updateRadius,
+										m_currentLocation.m_z - m_updateRadius, m_currentLocation.m_z + m_updateRadius);
+				}
+
+				if (m_currentLocation.m_z < newLocation.m_z)
+				{
+					removeFromNodesInVolume( *this,
+											 m_currentLocation.m_x - m_updateRadius, m_currentLocation.m_x + m_updateRadius,
+											 m_currentLocation.m_y - m_updateRadius, m_currentLocation.m_y + m_updateRadius,
+											 m_currentLocation.m_z - m_updateRadius, m_currentLocation.m_z - m_updateRadius);
+					m_currentLocation.m_z = m_currentLocation.m_z + 1;
+					addToNodesInVolume( *this,
+										m_currentLocation.m_x - m_updateRadius, m_currentLocation.m_x + m_updateRadius,
+										m_currentLocation.m_y - m_updateRadius, m_currentLocation.m_y + m_updateRadius,
+										m_currentLocation.m_z + m_updateRadius, m_currentLocation.m_z + m_updateRadius);
+				}
+				if (m_currentLocation.m_z > newLocation.m_z)
+				{
+					removeFromNodesInVolume( *this,
+											 m_currentLocation.m_x - m_updateRadius, m_currentLocation.m_x + m_updateRadius,
+											 m_currentLocation.m_y - m_updateRadius, m_currentLocation.m_y + m_updateRadius,
+											 m_currentLocation.m_z + m_updateRadius, m_currentLocation.m_z + m_updateRadius);
+					m_currentLocation.m_z = m_currentLocation.m_z - 1;
+					addToNodesInVolume( *this,
+										m_currentLocation.m_x - m_updateRadius, m_currentLocation.m_x + m_updateRadius,
+										m_currentLocation.m_y - m_updateRadius, m_currentLocation.m_y + m_updateRadius,
+										m_currentLocation.m_z - m_updateRadius, m_currentLocation.m_z - m_updateRadius);
+				}
+			}
+		}
+		else
+		{
+			// big move.  Probably little overlap between the objects it was observing and the objects it will be observing
+			removeFromNodesInRange(*this, oldLocation, m_updateRadius);
+			m_currentLocation = newLocation;
+			addToNodesInRange(*this, newLocation, m_updateRadius);
+		}
+
+		if (m_clients)
+		{
+			Node &oldNode = getNode(oldLocation);
+			Node &newNode = getNode(newLocation);
+
+			static std::vector<TrackedObject*> lostObjects;
+			static std::vector<TrackedObject*> gainedObjects;
+			lostObjects.clear();
+			gainedObjects.clear();
+
+			oldNode.removeObservingObject(*this);
+			newNode.addObservingObject(*this, false);
+			newNode.getVisibleObjectDifference(oldNode, lostObjects, gainedObjects);
+
+			{
+				for (std::vector<TrackedObject*>::const_iterator i = lostObjects.begin(); i != lostObjects.end(); ++i)
+					if (*i != this)
+						allClientsUnobserveObject((*i)->getServerObject());
+			}
+				
+			{
+				for (std::vector<TrackedObject*>::const_iterator i = gainedObjects.begin(); i != gainedObjects.end(); ++i)
+					if (*i != this)
+						allClientsObserveObject((*i)->getServerObject());
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+int TrackedObject::getUpdateRadius() const
+{
+	return m_updateRadius;
+}
+
+// ----------------------------------------------------------------------
+
+ClientSet const *TrackedObject::getClients() const
+{
+	return m_clients;
+}
+
+// ======================================================================
+
+NodeId::NodeId(const Vector &location) :
+		m_x(coordinateToNodeIndex(location.x)),
+		m_y(coordinateToNodeIndex(location.y)),
+		m_z(coordinateToNodeIndex(location.z))
+{
+}
+
+// ----------------------------------------------------------------------
+
+NodeId::NodeId(int x, int y, int z) :
+		m_x(x),
+		m_y(y),
+		m_z(z)
+{
+	DEBUG_FATAL(m_x!=trimIndexToAllowedRange(m_x),("Programmer bug:  NodeId::NodeId(%i,%i,%i) -- indexes are out of the allowed range",m_x,m_y,m_z));
+	DEBUG_FATAL(m_y!=trimIndexToAllowedRange(m_y),("Programmer bug:  NodeId::NodeId(%i,%i,%i) -- indexes are out of the allowed range",m_x,m_y,m_z));
+	DEBUG_FATAL(m_z!=trimIndexToAllowedRange(m_z),("Programmer bug:  NodeId::NodeId(%i,%i,%i) -- indexes are out of the allowed range",m_x,m_y,m_z));
+}
+
+// ----------------------------------------------------------------------
+
+bool NodeId::operator==(const NodeId &rhs) const
+{
+	return (m_x == rhs.m_x) && (m_y == rhs.m_y) && (m_z == rhs.m_z);
+}
+
+// ----------------------------------------------------------------------
+
+bool NodeId::operator!=(const NodeId &rhs) const
+{
+	return !(operator==(rhs));
+}
+
+// ----------------------------------------------------------------------
+
+int NodeId::magnitudeBetweenSquared(const NodeId &rhs) const
+{
+	return ((m_x - rhs.m_x) * (m_x - rhs.m_x) +
+			(m_y - rhs.m_y) * (m_y - rhs.m_y) +
+			(m_z - rhs.m_z) * (m_z - rhs.m_z));
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.h b/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.h
new file mode 100644
index 00000000..32185c8b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.h
@@ -0,0 +1,36 @@
+// ======================================================================
+//
+// SpaceVisibilityManager.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_SpaceVisibilityManager_H
+#define INCLUDED_SpaceVisibilityManager_H
+
+// ======================================================================
+
+class ServerObject;
+class Client;
+class Vector;
+
+// ======================================================================
+
+class SpaceVisibilityManager
+{
+  public:
+	static void addClient           (Client & client, ServerObject & observer);
+	static void removeClient        (Client & client);
+
+	static void addObject           (ServerObject & object, int updateRadius);
+	static void moveObject          (const ServerObject & object);
+	static void removeObject        (ServerObject & object);
+
+	static void getObjectsVisibleFromLocation (const Vector & location, stdvector<ServerObject*>::fwd &results);
+	static void getClientsInRange (const Vector &location, float radius, stdset<Client*>::fwd &results);
+};
+
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/space/VisibleObjectNotification.cpp b/engine/server/library/serverGame/src/shared/space/VisibleObjectNotification.cpp
new file mode 100644
index 00000000..e5b724f2
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/VisibleObjectNotification.cpp
@@ -0,0 +1,62 @@
+// ======================================================================
+//
+// VisibleObjectNotification.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/VisibleObjectNotification.h"
+
+#include "serverGame/ServerObject.h"
+#include "serverGame/SpaceVisibilityManager.h"
+
+// ======================================================================
+
+VisibleObjectNotification VisibleObjectNotification::ms_instance;
+
+// ======================================================================
+
+VisibleObjectNotification::VisibleObjectNotification() :
+		ObjectNotification()
+{
+}
+
+// ----------------------------------------------------------------------
+
+VisibleObjectNotification::~VisibleObjectNotification ()
+{
+}
+
+// ----------------------------------------------------------------------
+
+bool VisibleObjectNotification::positionAndRotationChanged(Object &object, bool /* dueToParentChange */, const Vector & /* oldPosition */) const
+{
+	ServerObject *asServerObject = object.asServerObject();
+	NOT_NULL(asServerObject);
+	SpaceVisibilityManager::moveObject(*asServerObject);
+	return true;
+}
+
+// ----------------------------------------------------------------------
+
+void VisibleObjectNotification::removeFromWorld(Object &object) const
+{
+	ServerObject *asServerObject = object.asServerObject();
+	NOT_NULL(asServerObject);
+	SpaceVisibilityManager::removeObject(*asServerObject);
+}
+
+// ----------------------------------------------------------------------
+
+void VisibleObjectNotification::cellChanged(Object &object, bool /* dueToParentChange */) const
+{
+	if (!object.isInWorldCell())
+	{
+		ServerObject *asServerObject = object.asServerObject();
+		NOT_NULL(asServerObject);
+		SpaceVisibilityManager::removeObject(*asServerObject);
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/space/VisibleObjectNotification.h b/engine/server/library/serverGame/src/shared/space/VisibleObjectNotification.h
new file mode 100644
index 00000000..dda36a78
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/space/VisibleObjectNotification.h
@@ -0,0 +1,53 @@
+// ======================================================================
+//
+// VisibleObjectNotification.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_VisibleObjectNotification_H
+#define INCLUDED_VisibleObjectNotification_H
+
+// ======================================================================
+
+#include "sharedObject/ObjectNotification.h"
+
+// ======================================================================
+
+/**
+ * A Notification that alerts SpaceVisibilityManager about a visible
+ * object that has moved.
+ */
+class VisibleObjectNotification : public ObjectNotification
+{
+  public:
+
+	static VisibleObjectNotification & getInstance ();
+
+  public:
+
+	VisibleObjectNotification ();
+	virtual ~VisibleObjectNotification ();
+
+	virtual void removeFromWorld(Object &object) const;
+	virtual bool positionAndRotationChanged(Object &object, bool dueToParentChange, const Vector &oldPosition) const;
+	virtual void cellChanged(Object &object, bool dueToParentChange) const;
+	
+	VisibleObjectNotification (const VisibleObjectNotification&);
+	VisibleObjectNotification& operator= (const VisibleObjectNotification&);
+
+  private:
+
+	static VisibleObjectNotification ms_instance;
+};
+
+// ======================================================================
+
+inline VisibleObjectNotification & VisibleObjectNotification::getInstance()
+{
+	return ms_instance;
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/stationplayers/StationPlayersCollectorAPI.cpp b/engine/server/library/serverGame/src/shared/stationplayers/StationPlayersCollectorAPI.cpp
new file mode 100644
index 00000000..6ce161b0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/stationplayers/StationPlayersCollectorAPI.cpp
@@ -0,0 +1,224 @@
+// ======================================================================
+//
+// StationPlayersCollectorAPI.cpp
+// Copyright 2005, Sony Online Entertainment Inc., all rights reserved.
+// Author: Doug Mellencamp
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "StationPlayersCollectorAPI.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedLog/Log.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/ConfigServerGame.h"
+#include "serverNetworkMessages/SPCharacterProfileMessage.h"
+#include "serverGame/CreatureObject.h"
+
+// ======================================================================
+
+void StationPlayersCollectorAPI::install()
+{
+	DEBUG_REPORT_LOG(true, ("[StationPlayersCollectorAPI] : StationPlayersCollectorAPI::install().\n"));
+		
+	ExitChain::add(remove, "StationPlayersCollectorAPI::remove");
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::remove()
+{
+	DEBUG_REPORT_LOG(true, ("[StationPlayersCollectorAPI] : StationPlayersCollectorAPI::remove().\n"));
+	
+}
+
+//-----------------------------------------------------------------------
+
+//=======================================================================
+// message senders
+//=======================================================================
+void StationPlayersCollectorAPI::sendSPCharacterProfileData(const std::string & clusterName,const NetworkId & characterId,const std::string & characterName,const std::string & objectName,float x,float y,float z,const std::string & sceneId,float cash_balance,float bank_balance,const std::string & objectTemplateName,int   stationId,const NetworkId & containedBy,int   createTime,int   playedTime,int   numLots)
+{
+
+	if (!ConfigServerGame::getStationPlayersEnabled())
+		return;
+		
+	SPCharacterProfileMessage msg(clusterName, characterId, characterName, objectName, x, y, z, sceneId, cash_balance, bank_balance, objectTemplateName, stationId, containedBy, createTime, playedTime, numLots);
+	
+	DEBUG_REPORT_LOG(ConfigServerGame::getStationPlayersShowAllDebugInfo(), ("[StationPlayersCollectorAPI] : StationPlayersCollectorAPI::sendSPCharacterProfileData().\n"));
+	DEBUG_REPORT_LOG(ConfigServerGame::getStationPlayersShowAllDebugInfo(), ("[StationPlayersCollectorAPI] : \t Clustername: %s\n",msg.GetClusterName().c_str()));
+	DEBUG_REPORT_LOG(ConfigServerGame::getStationPlayersShowAllDebugInfo(), ("[StationPlayersCollectorAPI] : \t CharacterID: %s\n",msg.GetCharacterId().getValueString().c_str()));
+	DEBUG_REPORT_LOG(ConfigServerGame::getStationPlayersShowAllDebugInfo(), ("[StationPlayersCollectorAPI] : \t CharacterName: %s\n",msg.GetCharacterName().c_str()));
+	DEBUG_REPORT_LOG(ConfigServerGame::getStationPlayersShowAllDebugInfo(), ("[StationPlayersCollectorAPI] : \t XCoord: %f\n",msg.GetX()));
+	DEBUG_REPORT_LOG(ConfigServerGame::getStationPlayersShowAllDebugInfo(), ("[StationPlayersCollectorAPI] : \t YCoord: %f\n",msg.GetY()));
+	DEBUG_REPORT_LOG(ConfigServerGame::getStationPlayersShowAllDebugInfo(), ("[StationPlayersCollectorAPI] : \t ZCoord: %f\n",msg.GetZ()));
+	DEBUG_REPORT_LOG(ConfigServerGame::getStationPlayersShowAllDebugInfo(), ("[StationPlayersCollectorAPI] : \t SceneId: %s\n",msg.GetSceneId().c_str()));
+	DEBUG_REPORT_LOG(ConfigServerGame::getStationPlayersShowAllDebugInfo(), ("[StationPlayersCollectorAPI] : \t Cash: %f\n",msg.GetCash_Balance()));
+	DEBUG_REPORT_LOG(ConfigServerGame::getStationPlayersShowAllDebugInfo(), ("[StationPlayersCollectorAPI] : \t Bank: %f\n",msg.GetBank_Balance()));
+	DEBUG_REPORT_LOG(ConfigServerGame::getStationPlayersShowAllDebugInfo(), ("[StationPlayersCollectorAPI] : \t Template: %s\n",msg.GetObjectTemplateName().c_str()));
+	DEBUG_REPORT_LOG(ConfigServerGame::getStationPlayersShowAllDebugInfo(), ("[StationPlayersCollectorAPI] : \t StationId: %d\n",msg.GetStationId()));
+	DEBUG_REPORT_LOG(ConfigServerGame::getStationPlayersShowAllDebugInfo(), ("[StationPlayersCollectorAPI] : \t ContainedBy: %s\n",msg.GetContainedBy().getValueString().c_str()));
+	DEBUG_REPORT_LOG(ConfigServerGame::getStationPlayersShowAllDebugInfo(), ("[StationPlayersCollectorAPI] : \t CreateTime: %d\n",msg.GetCreateTime()));
+	DEBUG_REPORT_LOG(ConfigServerGame::getStationPlayersShowAllDebugInfo(), ("[StationPlayersCollectorAPI] : \t PlayedTime: %d\n",msg.GetPlayedTime()));
+	DEBUG_REPORT_LOG(ConfigServerGame::getStationPlayersShowAllDebugInfo(), ("[StationPlayersCollectorAPI] : \t Lots: %d\n",msg.GetNumLots()));
+
+	
+	sendToCentralServer(msg);
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::sendSPCharacterItemData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::sendSPCharacterVendorData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::sendSPCharacterVendorItemData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::sendSPCharacterStructureData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::sendSPCharacterShipData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::sendSPCharacterSkillData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::sendSPCharacterMount_VehicleData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::sendSPCharacterWayPointData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::sendSPCharacterQuestData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::sendSPCharacterSchematicData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::sendSPCharacterRankingData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+//======================================================================
+// game server message & connection event callbons & sends
+//======================================================================
+void StationPlayersCollectorAPI::onSPCharacterProfileData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::onSPCharacterItemData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::onSPCharacterVendorData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::onSPCharacterVendorItemData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::onSPCharacterStructureData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::onSPCharacterShipData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::onSPCharacterSkillData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::onSPCharacterMount_VehicleData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::onSPCharacterWayPointData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::onSPCharacterQuestData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::onSPCharacterSchematicData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void StationPlayersCollectorAPI::onSPCharacterRankingData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+//======================================================================
+// central server generic/global commincation methods
+//======================================================================
+void StationPlayersCollectorAPI::sendToCentralServer(const GameNetworkMessage & message)
+{
+	GameServer::getInstance().sendToCentralServer(message);
+}
+
+//-----------------------------------------------------------------------
+
+// ======================================================================
+
+
diff --git a/engine/server/library/serverGame/src/shared/stationplayers/StationPlayersCollectorAPI.h b/engine/server/library/serverGame/src/shared/stationplayers/StationPlayersCollectorAPI.h
new file mode 100644
index 00000000..e321b7f9
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/stationplayers/StationPlayersCollectorAPI.h
@@ -0,0 +1,68 @@
+// ======================================================================
+//
+// StationPlayersCollectorAPI.h
+// Copyright 2005, Sony Online Entertainment Inc., all rights reserved.
+// Author: Doug Mellencamp
+//
+// ======================================================================
+#ifndef	_INCLUDED_StationPlayersCollectorAPI_H
+#define	_INCLUDED_StationPlayersCollectorAPI_H
+
+//-----------------------------------------------------------------------
+
+class NetworkId;
+class GameNetworkMessage;
+
+//-----------------------------------------------------------------------
+
+class StationPlayersCollectorAPI 
+{
+ public:
+
+	//===================================================================
+	// send station players data sends 
+	//===================================================================
+	static void sendSPCharacterProfileData                     (const std::string & clusterName,const NetworkId & characterId,const std::string & characterName,const std::string & objectName,float x,float y,float z,const std::string & sceneId,float cash_balance,float bank_balance,const std::string & objectTemplateName,int   stationId,const NetworkId & containedBy,int   createTime,int   playedTime,int   numLots);
+	static void sendSPCharacterItemData                        ();
+	static void sendSPCharacterVendorData                      ();
+	static void sendSPCharacterVendorItemData                  ();
+	static void sendSPCharacterStructureData                   ();
+	static void sendSPCharacterShipData                        ();
+	static void sendSPCharacterSkillData                       ();
+	static void sendSPCharacterMount_VehicleData               ();
+	static void sendSPCharacterWayPointData                    ();
+	static void sendSPCharacterQuestData                       ();
+	static void sendSPCharacterSchematicData                   ();
+	static void sendSPCharacterRankingData                     ();
+
+	//===================================================================
+	// API message & connection event callbacks & sends
+	//===================================================================
+	static void onSPCharacterProfileData                        ();
+	static void onSPCharacterItemData                           ();
+	static void onSPCharacterVendorData                         ();
+	static void onSPCharacterVendorItemData                     ();
+	static void onSPCharacterStructureData                      ();
+	static void onSPCharacterShipData                           ();
+	static void onSPCharacterSkillData                          ();
+	static void onSPCharacterMount_VehicleData                  ();
+	static void onSPCharacterWayPointData                       ();
+	static void onSPCharacterQuestData                          ();
+	static void onSPCharacterSchematicData                      ();
+	static void onSPCharacterRankingData                        ();
+	
+	//===================================================================
+	// game server generic/global commincation methods
+	//===================================================================
+	static void   sendToCentralServer(const GameNetworkMessage & message);
+
+	static void install();
+	static void remove();
+
+ protected:
+
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_StationPlayersCollectorAPI_H
diff --git a/engine/server/library/serverGame/src/shared/synchronizedUi/InstallationSynchronizedUi.cpp b/engine/server/library/serverGame/src/shared/synchronizedUi/InstallationSynchronizedUi.cpp
new file mode 100644
index 00000000..ca2e7048
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/synchronizedUi/InstallationSynchronizedUi.cpp
@@ -0,0 +1,260 @@
+// ======================================================================
+//
+// InstallationSynchronizedUi.cpp
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/InstallationSynchronizedUi.h"
+
+#include "UnicodeUtils.h"
+#include "serverGame/HarvesterInstallationObject.h"
+#include "serverGame/ResourcePoolObject.h"
+#include "serverGame/ResourceTypeObject.h"
+#include "serverGame/ServerResourceClassObject.h"
+#include "serverGame/ServerUniverse.h"
+#include "sharedUtility/InstallationResourceData.h"
+
+//-----------------------------------------------------------------------
+InstallationSynchronizedUi::InstallationSynchronizedUi(InstallationObject& owner) :
+		ServerSynchronizedUi(owner),
+		m_resourcesModified       (0),
+		m_resourcePools           (),
+		m_resourceTypesId         (),
+		m_resourceTypesName       (),
+		m_resourceTypesParent     (),
+		m_resourcePoolId          (NetworkId::cms_invalid),
+		m_active                  (false),
+		m_maxExtractionRate       (0),
+		m_currentExtractionRate   (0.0f),
+		m_installedExtractionRate (0.0f),
+		m_hopperContentsMax       (0),
+		m_hopperContentsModified  (0),
+		m_hopperContents          (),
+		m_hopperContentsCur       (0.0f),
+		m_condition               (0)
+{
+	addToUiPackage(m_resourcesModified);
+	addToUiPackage(m_resourcePools);
+	addToUiPackage(m_resourceTypesId);
+	addToUiPackage(m_resourceTypesName);
+	addToUiPackage(m_resourceTypesParent);
+	addToUiPackage(m_resourcePoolId);
+	addToUiPackage(m_active);
+	addToUiPackage(m_maxExtractionRate);
+	addToUiPackage(m_currentExtractionRate);
+	addToUiPackage(m_installedExtractionRate);
+	addToUiPackage(m_hopperContentsCur);
+	addToUiPackage(m_hopperContentsMax);
+	addToUiPackage(m_hopperContentsModified);
+	addToUiPackage(m_hopperContents);
+	addToUiPackage(m_condition);
+
+	resetResourcePools ();
+}
+
+//-----------------------------------------------------------------------
+
+InstallationSynchronizedUi::~InstallationSynchronizedUi()
+{
+	
+}
+
+//----------------------------------------------------------------------
+
+//@ todo: this should be a server-side funtcion only
+
+void  InstallationSynchronizedUi::addResource (const NetworkId & id)
+{
+	ResourceTypeObject const * const typeObj = ServerUniverse::getInstance().getResourceTypeById(id);
+	if (!typeObj || typeObj->isDepleted())
+		return;
+
+	if (std::find (m_resourcePools.begin (), m_resourcePools.end (), id) != m_resourcePools.end ())
+		return;
+
+	m_resourcePools.push_back (id);
+	addResourceType(id);
+	m_resourcesModified = static_cast<uint8>(m_resourcesModified.get () + 1);
+}
+
+//----------------------------------------------------------------------
+
+namespace InstallationSynchronizedUiNamespace
+{
+	InstallationResourceData makeInstallationResourceData (const NetworkId & id, const Vector & position)
+	{
+		ResourceTypeObject const * const rto = ServerUniverse::getInstance().getResourceTypeById(id);
+		ResourcePoolObject const * const pool = rto ? rto->getPoolForCurrentPlanet() : NULL;
+		if (rto && pool)
+		{
+			std::string const & resourceTypeParent = rto->getParentClass().getResourceClassName();
+
+			return InstallationResourceData (rto->getResourceName(), id, resourceTypeParent, static_cast<uint8>(100.0 * pool->getEfficiencyAtLocation (position.x, position.z)));
+		}
+		else
+			return InstallationResourceData (std::string (), id, std::string(), 0);
+	}
+}
+
+using namespace InstallationSynchronizedUiNamespace;
+
+//----------------------------------------------------------------------
+
+void InstallationSynchronizedUi::getResourceData (ResourceDataVector & data)
+{
+	InstallationObject * const installation = dynamic_cast<InstallationObject *>(getOwner ());
+
+	if (!installation)
+		return;
+
+	const Vector position = installation->getPosition_w ();
+
+	std::vector<NetworkId> ::const_iterator it;
+	for (it = m_resourcePools.begin (); it != m_resourcePools.end (); ++it)
+		data.push_back (makeInstallationResourceData (*it, position));
+
+	for (HopperContentsVector::const_iterator hit = m_hopperContents.begin (); hit != m_hopperContents.end (); ++hit)
+	{
+		const HopperContentElement & elem = *hit;
+		ResourceTypeObject const * const resourceTypeObject = ServerUniverse::getInstance().getResourceTypeById(elem.first);
+		
+		if (resourceTypeObject)
+		{
+				data.push_back (InstallationResourceData (resourceTypeObject->getResourceName (), elem.first, resourceTypeObject->getParentClass().getResourceClassName(), 0));
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+void InstallationSynchronizedUi::clearResources       ()
+{
+	m_resourcePools.clear ();
+	m_resourceTypesId.clear ();
+	m_resourceTypesName.clear ();
+	m_resourceTypesParent.clear ();
+	m_resourcesModified = static_cast<uint8>(m_resourcesModified.get () + 1);
+}
+
+//-----------------------------------------------------------------------
+
+void InstallationSynchronizedUi::refresh()
+{
+	HarvesterInstallationObject* const harvester=dynamic_cast<HarvesterInstallationObject*>(getOwner());
+	NOT_NULL(harvester);
+
+	m_resourcePoolId          = harvester->getSelectedResourceTypeId();
+	m_active                  = harvester->isActive();
+	addResource(m_resourcePoolId.get());
+
+	m_maxExtractionRate       = harvester->getMaxExtractionRate();
+	m_currentExtractionRate   = harvester->getCurrentExtractionRate();
+	m_installedExtractionRate = harvester->getInstalledExtractionRate();
+
+	int8 condition = static_cast<int8>(100 - (100 * harvester->getDamageTaken() / harvester->getMaxHitPoints()));
+	if (condition == 100 && harvester->getDamageTaken() != 0)
+		condition = 99; // make sure even a trivial amount of damage is visible on the meter
+	m_condition = condition;
+
+	for (ResourcePoolVector::const_iterator i = m_resourcePools.begin (); i != m_resourcePools.end (); )
+	{
+		ResourceTypeObject const * const typeObj = ServerUniverse::getInstance().getResourceTypeById(*i);
+		if (!typeObj || typeObj->isDepleted())
+		{
+			m_resourcePools.erase(std::distance (m_resourcePools.begin (), i));
+			m_resourcesModified = static_cast<uint8>(m_resourcesModified.get()+1);
+		}
+		else
+			++i;
+	}
+
+	//----------------------------------------------------------------------
+	//-- update the hopper contents
+
+	m_hopperContentsMax       = harvester->getMaxHopperAmount();
+
+	HopperContentsVector hopperContents;
+	float hopperContentsCurLocal = harvester->getHopperContents (&hopperContents);
+
+	size_t index = 0;
+
+	if (hopperContents.size () != m_hopperContents.size ())
+	{
+		m_hopperContents.resize (hopperContents.size (), HopperContentElement ());
+		m_hopperContentsModified = static_cast<uint8>(m_hopperContentsModified.get()+1);
+	}
+	
+	for (HopperContentsVector::const_iterator harvesterIt = hopperContents.begin (); harvesterIt != hopperContents.end (); ++harvesterIt, ++index)
+	{
+		const HopperContentElement & harvesterElem = *harvesterIt;
+		const HopperContentElement & syncElem      = m_hopperContents.get (index);
+		
+		addResource(harvesterIt->first);
+
+		if (syncElem.first != harvesterElem.first || harvesterElem.second != syncElem.second) //lint !e777 // != on floats
+		{
+			m_hopperContents.set (index, harvesterElem);
+			m_hopperContentsModified = static_cast<uint8>(m_hopperContentsModified.get()+1);
+		}
+	}
+
+	m_hopperContentsCur =  hopperContentsCurLocal; // update this last so that the client refreshes the interface propery (little bit of a hack here)
+}
+
+//----------------------------------------------------------------------
+
+void InstallationSynchronizedUi::resetResourcePools   ()
+{
+	m_resourcePools.clear ();
+
+	clearResourceTypes();
+
+	m_resourcesModified = static_cast<uint8>(m_resourcesModified.get()+1);
+
+	// Puts all the possible pools in the active list
+	// refresh() will move the deleted ones to the other list
+	HarvesterInstallationObject * const harvester = dynamic_cast<HarvesterInstallationObject *>(getOwner ());
+	NOT_NULL (harvester);
+
+	if (harvester) //lint !e774 // harvester is not NULL in debug
+	{
+		std::vector<ResourceTypeObject const *> const & pools = harvester->getSurveyTypes();
+		for (std::vector<ResourceTypeObject const *>::const_iterator i=pools.begin(); i!=pools.end(); ++i)
+		{
+			if (*i)
+			{
+				m_resourcePools.push_back((*i)->getNetworkId());
+				addResourceType((*i)->getNetworkId());
+			}
+		}
+	}
+
+	refresh ();
+}
+
+//----------------------------------------------------------------------
+
+void InstallationSynchronizedUi::addResourceType (const NetworkId& typeId)
+{
+	ResourceTypeObject const * const rto = ServerUniverse::getInstance().getResourceTypeById(typeId);
+	if (rto)
+	{
+		m_resourceTypesId.push_back(typeId);
+		m_resourceTypesName.push_back(rto->getResourceName());
+		m_resourceTypesParent.push_back(rto->getParentClass().getResourceClassName());
+	}
+}
+
+//----------------------------------------------------------------------
+
+void InstallationSynchronizedUi::clearResourceTypes ()
+{
+	m_resourceTypesId.clear ();
+	m_resourceTypesName.clear ();
+	m_resourceTypesParent.clear ();
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/synchronizedUi/InstallationSynchronizedUi.h b/engine/server/library/serverGame/src/shared/synchronizedUi/InstallationSynchronizedUi.h
new file mode 100644
index 00000000..cd089e4d
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/synchronizedUi/InstallationSynchronizedUi.h
@@ -0,0 +1,161 @@
+// ======================================================================
+//
+// InstallationSynchronizedUi.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_InstallationSynchronizedUi_H
+#define	INCLUDED_InstallationSynchronizedUi_H
+
+#include "Archive/AutoDeltaVector.h"
+#include "serverGame/ServerSynchronizedUi.h"
+
+class InstallationObject;
+struct InstallationResourceData;
+
+class InstallationSynchronizedUi : public ServerSynchronizedUi
+{
+public:
+	explicit InstallationSynchronizedUi(InstallationObject &);
+	~InstallationSynchronizedUi();
+		
+	typedef stdvector<InstallationResourceData>::fwd ResourceDataVector;
+	typedef stdvector<NetworkId>::fwd                ResourcePoolVector;
+	typedef stdvector<NetworkId>::fwd                ResourceTypeIdVector;
+	typedef stdvector<std::string>::fwd              ResourceTypeNameVector;
+	typedef stdvector<std::string>::fwd              ResourceTypeParentVector;
+	typedef std::pair<NetworkId, float>              HopperContentElement;
+	typedef stdvector<HopperContentElement>::fwd     HopperContentsVector;
+
+	void                         getResourceData (ResourceDataVector & data);
+
+	const ResourcePoolVector &       getResourcePools         () const;
+	const ResourceTypeIdVector &     getResourceTypesId       () const;
+	const ResourceTypeNameVector &   getResourceTypesName     () const;
+	const ResourceTypeParentVector & getResourceTypesParent   () const;
+
+	const NetworkId &            getSelectedResourcePool () const;
+	bool                         getActive               () const;
+	float                        getEfficiencyCur        () const;
+	int                          getEfficiencyMax        () const;
+	float                        getExtractionRate       () const;
+	float                        getHopperContentsCur    () const;
+	int                          getHopperContentsMax    () const;
+	const HopperContentsVector & getHopperContentsVector () const;
+
+	void                         clearResources       ();
+	void                         addResource          (const NetworkId & id);
+	void                         setResourceDepleted  (const NetworkId & id);
+
+	void                         refresh              ();
+	void                         resetResourcePools   ();
+	
+private:
+
+	InstallationSynchronizedUi();
+	InstallationSynchronizedUi(const InstallationSynchronizedUi& );
+	InstallationSynchronizedUi& operator= (const InstallationSynchronizedUi &);
+	
+	void addResourceType (const NetworkId& pool);
+	void clearResourceTypes();
+
+	/**
+	* This variable is a clever? work around for the inability to put callbacks on an AutoDeltaVector.
+	* _all_ modifications to either resource vector should increment this counter.  rollover is fine.
+	*/
+	Archive::AutoDeltaVariable<uint8>                 m_resourcesModified;
+
+	typedef Archive::AutoDeltaVector<NetworkId>       AutoResourcePoolVector;
+	typedef Archive::AutoDeltaVector<NetworkId>       AutoResourceTypeIdVector;
+	typedef Archive::AutoDeltaVector<std::string>     AutoResourceTypeNameVector;
+	typedef Archive::AutoDeltaVector<std::string>     AutoResourceTypeParentVector;
+	AutoResourcePoolVector                            m_resourcePools; // a vector of type ids which have non-depleted pools on this planet
+	AutoResourceTypeIdVector                          m_resourceTypesId;
+	AutoResourceTypeNameVector                        m_resourceTypesName;
+	AutoResourceTypeParentVector                      m_resourceTypesParent;
+
+	Archive::AutoDeltaVariable<NetworkId>             m_resourcePoolId;
+	Archive::AutoDeltaVariable<bool>                  m_active;
+
+	Archive::AutoDeltaVariable<int>                   m_maxExtractionRate;
+	Archive::AutoDeltaVariable<float>                 m_currentExtractionRate;
+	Archive::AutoDeltaVariable<float>                 m_installedExtractionRate;
+
+	Archive::AutoDeltaVariable<int>                   m_hopperContentsMax;
+
+	Archive::AutoDeltaVariable<uint8>                 m_hopperContentsModified;
+
+	Archive::AutoDeltaVector<HopperContentElement>    m_hopperContents;
+	Archive::AutoDeltaVariable<float>                 m_hopperContentsCur; // keep this after m_hopperContents, because the client triggers updating the hopper based on receiving an update to this item
+	Archive::AutoDeltaVariable<int8>                  m_condition; // condition, 0-100 (percent)
+};
+
+//----------------------------------------------------------------------
+
+inline const NetworkId & InstallationSynchronizedUi::getSelectedResourcePool () const
+{
+	return m_resourcePoolId.get ();
+}
+
+//----------------------------------------------------------------------
+
+inline bool InstallationSynchronizedUi::getActive           () const
+{
+	return m_active.get ();
+}
+
+//----------------------------------------------------------------------
+
+inline float InstallationSynchronizedUi::getHopperContentsCur   () const
+{
+	return m_hopperContentsCur.get();
+}
+
+//----------------------------------------------------------------------
+
+inline int  InstallationSynchronizedUi::getHopperContentsMax   () const
+{
+	return m_hopperContentsMax.get ();
+}
+
+//----------------------------------------------------------------------
+
+inline const InstallationSynchronizedUi::ResourcePoolVector & InstallationSynchronizedUi::getResourcePools   () const
+{
+	return m_resourcePools.get ();
+}
+
+//----------------------------------------------------------------------
+
+inline const InstallationSynchronizedUi::ResourcePoolVector & InstallationSynchronizedUi::getResourceTypesId   () const
+{
+	return m_resourceTypesId.get ();
+}
+
+//----------------------------------------------------------------------
+
+inline const InstallationSynchronizedUi::ResourceTypeNameVector & InstallationSynchronizedUi::getResourceTypesName  () const
+{
+	return m_resourceTypesName.get ();
+}
+
+//----------------------------------------------------------------------
+
+inline const InstallationSynchronizedUi::ResourceTypeParentVector & InstallationSynchronizedUi::getResourceTypesParent   () const
+{
+	return m_resourceTypesParent.get ();
+}
+
+//----------------------------------------------------------------------
+
+inline const InstallationSynchronizedUi::HopperContentsVector & InstallationSynchronizedUi::getHopperContentsVector () const
+{
+	return m_hopperContents.get ();
+}
+
+//----------------------------------------------------------------------
+
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/synchronizedUi/ManufactureSchematicSynchronizedUi.cpp b/engine/server/library/serverGame/src/shared/synchronizedUi/ManufactureSchematicSynchronizedUi.cpp
new file mode 100644
index 00000000..e588bdc0
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/synchronizedUi/ManufactureSchematicSynchronizedUi.cpp
@@ -0,0 +1,648 @@
+// ======================================================================
+//
+// ManufactureSchematicSynchronizedUi.cpp
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ManufactureSchematicSynchronizedUi.h"
+
+#include "serverGame/ManufactureSchematicObject.h"
+#include "sharedGame/CraftingData.h"
+//#include "serverGame/ServerWorld.h"
+
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param owner		manf schematic creating this class
+ */
+ManufactureSchematicSynchronizedUi::ManufactureSchematicSynchronizedUi(ManufactureSchematicObject& owner) :
+	ServerSynchronizedUi(owner),
+	m_slotName(),
+	m_slotType(),
+	m_slotIngredient(),
+	m_slotIngredientCount(),
+	m_slotComplexity(),
+	m_slotDraftOption(),
+	m_slotDraftIndex(),
+	m_slotIngredientsChanged(0),
+	m_attributeName(),
+	m_attributeValue(),
+	m_minAttribute(),
+	m_maxAttribute(),
+	m_resourceMaxAttribute(),
+	m_customName(),
+	m_customIndex(),
+	m_customMinIndex(),
+	m_customMaxIndex(),
+	m_customChanged(0),
+	m_experimentMod(0),
+	m_appearance(),
+	m_ready(false)
+{
+	addToUiPackage(m_slotName);
+	addToUiPackage(m_slotType);
+	addToUiPackage(m_slotIngredient);
+	addToUiPackage(m_slotIngredientCount);
+	addToUiPackage(m_slotComplexity);
+	addToUiPackage(m_slotDraftOption);
+	addToUiPackage(m_slotDraftIndex);
+	addToUiPackage(m_slotIngredientsChanged);
+	addToUiPackage(m_attributeName);
+	addToUiPackage(m_attributeValue);
+	addToUiPackage(m_minAttribute);
+	addToUiPackage(m_maxAttribute);
+	addToUiPackage(m_resourceMaxAttribute);
+	addToUiPackage(m_customName);
+	addToUiPackage(m_customIndex);
+	addToUiPackage(m_customMinIndex);
+	addToUiPackage(m_customMaxIndex);
+	addToUiPackage(m_customChanged);
+	addToUiPackage(m_experimentMod);
+	addToUiPackage(m_appearance);
+	addToUiPackage(m_ready);
+}	// ManufactureSchematicSynchronizedUi::ManufactureSchematicSynchronizedUi
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+ManufactureSchematicSynchronizedUi::~ManufactureSchematicSynchronizedUi()
+{
+}	// ManufactureSchematicSynchronizedUi::~ManufactureSchematicSynchronizedUi
+
+//-----------------------------------------------------------------------
+
+/**
+ * Creates an empty slot with a given name. We assume there isn't already a slot 
+ * with the name.
+ *
+ * @param name			the slot name
+ * @param complexity	the slot's initial complexity
+ */
+void ManufactureSchematicSynchronizedUi::createNewSlot(const StringId & name, 
+	float complexity)
+{
+	m_slotName.push_back(name);
+	m_slotType.push_back(Crafting::IT_none);
+	m_slotIngredient.push_back(NetworkIdList());
+	m_slotIngredientCount.push_back(IntList());
+	m_slotComplexity.push_back(complexity);
+	m_slotDraftOption.push_back(-1);
+	m_slotDraftIndex.push_back(-1);
+	signalIngredientsChanged ();
+}	// ManufactureSchematicSynchronizedUi::createNewSlot(const StringId & name)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the slot type of a manf slot.
+ *
+ * @param name		the name of the slot
+ * @param type		the slot type
+ */
+void ManufactureSchematicSynchronizedUi::setSlotType(const StringId & name, int type)
+{
+	int iter = m_slotName.find(name);
+	if (iter >= 0)
+	{
+		m_slotType.set(iter, type);
+		signalIngredientsChanged ();
+	}
+
+}	// ManufactureSchematicSynchronizedUi::setSlotType
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the slot option index of a manf slot.
+ *
+ * @param name		the name of the slot
+ * @param option	the option index
+ */
+void ManufactureSchematicSynchronizedUi::setSlotOption(const StringId & name, int option)
+{
+	int iter = m_slotName.find(name);
+	if (iter >= 0)
+	{
+		m_slotDraftOption.set(iter, option);
+		signalIngredientsChanged ();
+	}
+
+}	// ManufactureSchematicSynchronizedUi::setSlotOption
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the draft schematic slot index of a manf slot.
+ *
+ * @param name		the name of the slot
+ * @param index		the draft schematic index
+ */
+void ManufactureSchematicSynchronizedUi::setSlotIndex(const StringId & name, int index)
+{
+	int iter = m_slotName.find(name);
+	if (iter >= 0)
+	{
+		m_slotDraftIndex.set(iter, index);
+		signalIngredientsChanged ();
+	}
+
+}	// ManufactureSchematicSynchronizedUi::setSlotIndex
+
+//-----------------------------------------------------------------------
+
+/**
+ * Modifies a slot's complexity by a value.
+ *
+ * @param name			the name of the slot
+ * @param complexity	the slot complexity
+ */ 
+void ManufactureSchematicSynchronizedUi::setSlotComplexity(const StringId & name, 
+	float complexity)
+{
+	int iter = m_slotName.find(name);
+	if (iter >= 0)
+	{
+		m_slotComplexity.set(iter, complexity);
+		signalIngredientsChanged ();
+	}
+
+}	// ManufactureSchematicSynchronizedUi::setSlotComplexity
+
+//-----------------------------------------------------------------------
+
+/**
+ * Adds an ingredient to a schematic slot.
+ *
+ * @param name			the name of the slot
+ * @param ingredientId	the ingredient to add
+ * @param amount		amount of ingredient to add
+ */
+void ManufactureSchematicSynchronizedUi::addSlotIngredient(const StringId & name, 
+	const NetworkId & ingredientId, int amount)
+{
+	int iter = m_slotName.find(name);
+	if (iter >= 0)
+	{
+		// auto delta vector doesn't support sub-list updates, so we have to 
+		// re-write the entire list of ingredients
+		NetworkIdList ingredients(m_slotIngredient.get(iter));
+		IntList counts(m_slotIngredientCount.get(iter));
+
+		ingredients.push_back(ingredientId);
+		counts.push_back(amount);
+
+		m_slotIngredient.set(iter, ingredients);
+		m_slotIngredientCount.set(iter, counts);
+
+		signalIngredientsChanged ();
+	}
+}	// ManufactureSchematicSynchronizedUi::addSlotIngredient
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the amount of an ingredient needed for a schematic slot.
+ *
+ * @param name				the name of the slot
+ * @param ingredientId		the ingredient to set the count of
+ * @param amount			the amount of the ingredient needed
+ */
+void ManufactureSchematicSynchronizedUi::setSlotIngredientCount(const StringId & name, 
+	const NetworkId & ingredientId, int amount)
+{
+	int iter = m_slotName.find(name);
+	if (iter >= 0)
+	{
+		// find the index of the matching ingredient
+		const NetworkIdList & ingredients = m_slotIngredient.get(iter);
+		NetworkIdList::const_iterator iter2 = std::find(ingredients.begin(), 
+			ingredients.end(), ingredientId);
+		if (iter2 != ingredients.end())
+		{
+			// auto delta vector doesn't support sub-list updates, so we have to 
+			// re-write the entire list of ingredients
+			IntList counts(m_slotIngredientCount.get(iter));
+			counts[iter2 - ingredients.begin()] = amount;
+			m_slotIngredientCount.set(iter, counts);
+
+			signalIngredientsChanged ();
+		}
+	}
+}	// ManufactureSchematicSynchronizedUi::setSlotIngredientCount
+
+//-----------------------------------------------------------------------
+
+/**
+ * Clears the data for a given slot in the schematic.
+ *
+ * @param name			the name of the slot to clear
+ * @param complexity	the slot's initial complexity
+ */
+void ManufactureSchematicSynchronizedUi::clearSlot(const StringId & name, 
+	float complexity)
+{
+	int iter = m_slotName.find(name);
+	if (iter >= 0)
+	{
+		m_slotType.set(iter, Crafting::IT_none);
+		m_slotIngredient.set(iter, NetworkIdList());
+		m_slotIngredientCount.set(iter, IntList());
+		m_slotComplexity.set(iter, complexity);
+		m_slotDraftOption.set(iter, -1);
+		signalIngredientsChanged ();
+	}
+}	// ManufactureSchematicSynchronizedUi::clearSlot
+
+//-----------------------------------------------------------------------
+
+/**
+ * Removes an optional slot from the schematic.
+ *
+ * @param name		the name of the slot to clear
+ */
+void ManufactureSchematicSynchronizedUi::removeSlot(const StringId & name)
+{
+	int iter = m_slotName.find(name);
+	if (iter >= 0)
+	{
+		m_slotName.erase(iter);
+		m_slotType.erase(iter);
+		m_slotIngredient.erase(iter);
+		m_slotIngredientCount.erase(iter);
+		m_slotComplexity.erase(iter);
+		m_slotDraftOption.erase(iter);
+		m_slotDraftIndex.erase(iter);
+		signalIngredientsChanged ();
+	}
+}	// ManufactureSchematicSynchronizedUi::removeSlot
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the value of an attribute.
+ *
+ * @param name		name of the attribute
+ *
+ * @return value of the attribute
+ */
+float ManufactureSchematicSynchronizedUi::getAttribute(const StringId & name) const
+{
+	float result = 0;
+	int index = m_attributeName.find(name);
+	if (index != -1)
+		result = m_attributeValue[index];
+	return result;
+}	// ManufactureSchematicSynchronizedUi::getAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the value of an attribute.
+ *
+ * @param name		name of the attribute
+ * @param value		value of the attribute
+ */
+void ManufactureSchematicSynchronizedUi::setAttribute(const StringId & name, 
+	float value)
+{
+	int index = m_attributeName.find(name);
+	if (index == -1)
+	{
+		addAttribute(name);
+		index = m_attributeName.size() - 1;
+	}
+	m_attributeValue.set(index, value);
+}	// ManufactureSchematicSynchronizedUi::setAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the min value of an attribute.
+ *
+ * @param name		name of the attribute
+ *
+ * @return min value of the attribute
+ */
+float ManufactureSchematicSynchronizedUi::getMinAttribute(const StringId & name) const
+{
+	float result = 0;
+	int index = m_attributeName.find(name);
+	if (index != -1)
+		result = m_minAttribute[index];
+	return result;
+}	// ManufactureSchematicSynchronizedUi::getMinAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the min value of an attribute.
+ *
+ * @param name		name of the attribute
+ * @param value		min value of the attribute
+ */
+void ManufactureSchematicSynchronizedUi::setMinAttribute(const StringId & name, float value)
+{
+	int index = m_attributeName.find(name);
+	if (index == -1)
+	{
+		addAttribute(name);
+		index = m_attributeName.size() - 1;
+	}
+	m_minAttribute.set(index, value);
+}	// ManufactureSchematicSynchronizedUi::setMinAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the max value of an attribute.
+ *
+ * @param name		name of the attribute
+ *
+ * @return max value of the attribute
+ */
+float ManufactureSchematicSynchronizedUi::getMaxAttribute(const StringId & name) const
+{
+	float result = 0;
+	int index = m_attributeName.find(name);
+	if (index != -1)
+		result = m_maxAttribute[index];
+	return result;
+}	// ManufactureSchematicSynchronizedUi::getMaxAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the max value of an attribute.
+ *
+ * @param name		name of the attribute
+ * @param value		value of the attribute
+ */
+void ManufactureSchematicSynchronizedUi::setMaxAttribute(const StringId & name, float value)
+{
+	int index = m_attributeName.find(name);
+	if (index == -1)
+	{
+		addAttribute(name);
+		index = m_attributeName.size() - 1;
+	}
+	m_maxAttribute.set(index, value);
+}	// ManufactureSchematicSynchronizedUi::setMaxAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the resource max value of an attribute.
+ *
+ * @param name		name of the attribute
+ *
+ * @return resource max value of the attribute
+ */
+float ManufactureSchematicSynchronizedUi::getResourceMaxAttribute(const StringId & name) const
+{
+	float result = 0;
+	int index = m_attributeName.find(name);
+	if (index != -1)
+		result = m_resourceMaxAttribute[index];
+	return result;
+}	// ManufactureSchematicSynchronizedUi::getResourceMaxAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the resource max value of an attribute.
+ *
+ * @param name		name of the attribute
+ * @param value		resource max value of the attribute
+ */
+void ManufactureSchematicSynchronizedUi::setResourceMaxAttribute(const StringId & name, 
+	float value)
+{
+	int index = m_attributeName.find(name);
+	if (index == -1)
+	{
+		addAttribute(name);
+		index = m_attributeName.size() - 1;
+	}
+	m_resourceMaxAttribute.set(index, value);
+}	// ManufactureSchematicSynchronizedUi::setResourceMaxAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns all the values associated with an attribute.
+ *
+ * @param name					name of the attribute
+ * @param value                 filled in with the attribute value
+ * @param minValue				filled in with the min attribute value
+ * @param maxValue				filled in with the max attribute value
+ * @param resourceMaxValue		filled in with the resource max attribute value
+ */
+void ManufactureSchematicSynchronizedUi::getAllAttributeValues(const StringId & name, 
+	float & value, float & minValue, float & maxValue, float & resourceMaxValue) const
+{
+	int index = m_attributeName.find(name);
+	if (index != -1)
+	{
+		value = m_attributeValue[index];
+		minValue = m_minAttribute[index];
+		maxValue = m_maxAttribute[index];
+		resourceMaxValue = m_resourceMaxAttribute[index];
+	}
+	else
+		value = minValue = maxValue = resourceMaxValue = 0;
+}	// ManufactureSchematicSynchronizedUi::getAllAttributeValues
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the limits of an attribute.
+ *
+ * @param name					name of the attribute
+ * @param minValue				min value of the attribute
+ * @param maxValue				max value of the attribute
+ * @param resourceMaxValue		resource max value of the attribute
+ */
+void ManufactureSchematicSynchronizedUi::setAttributeLimits(const StringId & name, 
+	float minValue, float maxValue, float resourceMaxValue)
+{
+	int index = m_attributeName.find(name);
+	if (index == -1)
+	{
+		addAttribute(name);
+		index = m_attributeName.size() - 1;
+	}
+	m_minAttribute.set(index, minValue);
+	m_maxAttribute.set(index, maxValue);
+	m_resourceMaxAttribute.set(index, resourceMaxValue);
+}	// ManufactureSchematicSynchronizedUi::setAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Adds a new attribute to the attribute lists.
+ *
+ * @param name		name of the attribute
+ */
+void ManufactureSchematicSynchronizedUi::addAttribute(const StringId & name)
+{
+	m_attributeName.push_back(name);
+	m_attributeValue.push_back(0);
+	m_minAttribute.push_back(0);
+	m_maxAttribute.push_back(0);
+	m_resourceMaxAttribute.push_back(0);
+}	// ManufactureSchematicSynchronizedUi::addAttribute
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets or adds customization data to the schematic.
+ *
+ * @param name			the customization data name
+ * @param value			value of the customization data
+ * @param minValue		minimum possible value of the customization data
+ * @param maxValue		maximum possible value of the customization data
+ */
+void ManufactureSchematicSynchronizedUi::setCustomization(const std::string & name, 
+	int value, int minValue, int maxValue)
+{
+	int iter = m_customName.find(name);
+	if (iter >= 0)
+	{
+		m_customIndex.set(iter, value);
+		m_customMinIndex.set(iter, minValue);
+		m_customMaxIndex.set(iter, maxValue);
+		signalCustomizationChanged ();
+	}
+	else
+	{
+		m_customName.push_back(name);
+		m_customIndex.push_back(value);
+		m_customMinIndex.push_back(minValue);
+		m_customMaxIndex.push_back(maxValue);
+		signalCustomizationChanged ();
+	}
+}	// ManufactureSchematicSynchronizedUi::setCustomization(const std::string &, int, int, int)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sets the value of customization data of the schematic.
+ *
+ * @param name			the customization data name
+ * @param value			value of the customization data
+ */
+void ManufactureSchematicSynchronizedUi::setCustomization(const std::string & name, 
+	int value)
+{
+	int iter = m_customName.find(name);
+	if (iter >= 0)
+	{
+		m_customIndex.set(iter, value);
+		signalCustomizationChanged ();
+	}
+}	// ManufactureSchematicSynchronizedUi::setCustomization(const std::string &, int)
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the name of a customization parameter.
+ *
+ * @param index		the index of the param
+ *
+ * @return the customization name
+ */
+const std::string & ManufactureSchematicSynchronizedUi::getCustomizationName(int index)
+{
+static const std::string emptyString;
+
+	if (index < 0 || index >= static_cast<int>(m_customName.size()))
+		return emptyString;
+	return m_customName[index];
+}	// ManufactureSchematicSynchronizedUi::getCustomizationName
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the min value for a customization parameter.
+ *
+ * @param name			the customization data name
+ *
+ * @return the min value
+ */
+int ManufactureSchematicSynchronizedUi::getMinCustomization(const std::string & name)
+{
+	int minValue = 0;
+
+	int index = m_customName.find(name);
+	if (index >= 0)
+	{
+		minValue = m_customMinIndex[index];
+	}
+	return minValue;
+}	// ManufactureSchematicSynchronizedUi::getMinCustomization
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the max value for a customization parameter.
+ *
+ * @param name			the customization data name
+ *
+ * @return the max value
+ */
+int ManufactureSchematicSynchronizedUi::getMaxCustomization(const std::string & name)
+{
+	int maxValue = 0;
+
+	int index = m_customName.find(name);
+	if (index >= 0)
+	{
+		maxValue = m_customMaxIndex[index];
+	}
+	return maxValue;
+}	// ManufactureSchematicSynchronizedUi::getMaxCustomization
+
+//-----------------------------------------------------------------------
+
+/**
+ * Returns the current value for a customization parameter.
+ *
+ * @param name			the customization data name
+ *
+ * @return the current value
+ */
+int ManufactureSchematicSynchronizedUi::getCurrentCustomization(const std::string & name)
+{
+	int value = 0;
+
+	int index = m_customName.find(name);
+	if (index >= 0)
+	{
+		value = m_customIndex[index];
+	}
+	return value;
+}	// ManufactureSchematicSynchronizedUi::getCurrentCustomization
+
+//-----------------------------------------------------------------------
+
+void ManufactureSchematicSynchronizedUi::signalIngredientsChanged ()
+{
+	m_slotIngredientsChanged.set (static_cast<uint8>(m_slotIngredientsChanged.get () + 1));
+}
+
+//----------------------------------------------------------------------
+
+void ManufactureSchematicSynchronizedUi::signalCustomizationChanged ()
+{
+	m_customChanged.set (static_cast<uint8>(m_customChanged.get () + 1));
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/synchronizedUi/ManufactureSchematicSynchronizedUi.h b/engine/server/library/serverGame/src/shared/synchronizedUi/ManufactureSchematicSynchronizedUi.h
new file mode 100644
index 00000000..05054e9e
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/synchronizedUi/ManufactureSchematicSynchronizedUi.h
@@ -0,0 +1,145 @@
+// ======================================================================
+//
+// ManufactureSchematicSynchronizedUi.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_ManufactureSchematicSynchronizedUi_H
+#define	INCLUDED_ManufactureSchematicSynchronizedUi_H
+
+#include "Archive/AutoDeltaVector.h"
+#include "serverGame/ServerSynchronizedUi.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "StringId.h"
+
+class ManufactureSchematicObject;
+
+namespace Crafting
+{
+	class SimpleIngredient;
+};
+
+//----------------------------------------------------------------------
+
+
+class ManufactureSchematicSynchronizedUi : public ServerSynchronizedUi
+{
+public:
+	explicit ManufactureSchematicSynchronizedUi(ManufactureSchematicObject & owner);
+	virtual ~ManufactureSchematicSynchronizedUi();
+
+	void        setReady();
+
+	void        createNewSlot(const StringId & name, float complexity);
+	void        setSlotType(const StringId & name, int type);
+	void        setSlotOption(const StringId & name, int option);
+	void        setSlotIndex(const StringId & name, int index);
+	void        setSlotComplexity(const StringId & name, float complexity);
+	void        addSlotIngredient(const StringId & name, const NetworkId & ingredient, int count);
+	void        setSlotIngredientCount(const StringId & name, const NetworkId & ingredientId, int amount);
+
+	void        clearSlot(const StringId & name, float complexity);
+	void        removeSlot(const StringId & name);
+
+	const std::vector<StringId> & getAttributeNames(void) const;
+	float                         getAttribute(const StringId & name) const;
+	void                          setAttribute(const StringId & name, float value);
+	float                         getMinAttribute(const StringId & name) const;
+	void                          setMinAttribute(const StringId & name, float value);
+	float                         getMaxAttribute(const StringId & name) const;
+	void                          setMaxAttribute(const StringId & name, float value);
+	float                         getResourceMaxAttribute(const StringId & name) const;
+	void                          setResourceMaxAttribute(const StringId & name, float value);
+	void                          getAllAttributeValues(const StringId & name, float & value, float & minValue, float & maxValue, float & resourceMaxValue) const;
+	void                          setAttributeLimits(const StringId & name, float minValue, float maxValue, float resourceMaxValue);
+
+	void                          setExperimentMod(float mod);
+
+	const std::vector<std::string> & getAppearances(void) const;
+	void                             addAppearance(const std::string & appearance);
+
+	void                setCustomization(const std::string & name, int value, int minValue, int maxValue);
+	void                setCustomization(const std::string & name, int value);
+	const std::string & getCustomizationName(int index);
+	int                 getMinCustomization(const std::string & name);
+	int                 getMaxCustomization(const std::string & name);
+	int                 getCurrentCustomization(const std::string & name);
+
+private:
+
+	ManufactureSchematicSynchronizedUi();
+	ManufactureSchematicSynchronizedUi(const ManufactureSchematicSynchronizedUi& );
+	ManufactureSchematicSynchronizedUi& operator= (const ManufactureSchematicSynchronizedUi &);
+
+	void        signalIngredientsChanged ();
+	void        signalCustomizationChanged ();
+	void        addAttribute(const StringId & name);
+
+private:
+	typedef std::vector<NetworkId> NetworkIdList;
+	typedef std::vector<int>       IntList;
+
+	// The following fields are parallel arrays for ingredients
+	Archive::AutoDeltaVector<StringId>          m_slotName;            // slot name @todo: can we make this a string?
+	Archive::AutoDeltaVector<int>               m_slotType;            // enum Crafting::IngredientType
+	Archive::AutoDeltaVector<NetworkIdList>     m_slotIngredient;      // actual ingredients used per slot
+	Archive::AutoDeltaVector<IntList>           m_slotIngredientCount; // number of ingredients used per slot
+	Archive::AutoDeltaVector<float>             m_slotComplexity;      // cuurent slot complexity
+	Archive::AutoDeltaVector<int>               m_slotDraftOption;     // the draft schematic slot option
+	Archive::AutoDeltaVector<int>               m_slotDraftIndex;      // the draft schematic slot index
+	Archive::AutoDeltaVariable<uint8>           m_slotIngredientsChanged;  // used to signal changes
+
+	// The following fields are parallel arrays for experimentation
+	Archive::AutoDeltaVector<StringId>      m_attributeName;        // attributes that can be experimented with
+	Archive::AutoDeltaVector<float>         m_attributeValue;       // current value of the attributes
+	Archive::AutoDeltaVector<float>         m_minAttribute;         // min value of the attribute
+	Archive::AutoDeltaVector<float>         m_maxAttribute;         // max value of the attribute
+	Archive::AutoDeltaVector<float>         m_resourceMaxAttribute; // max value of the attribute due to resource selection
+
+	// The following fields are parallel arrays for customizations
+	Archive::AutoDeltaVector<std::string>   m_customName;       // customization property name
+	Archive::AutoDeltaVector<int>           m_customIndex;      // palette/decal current index
+	Archive::AutoDeltaVector<int>           m_customMinIndex;   // palette/decal minimum index
+	Archive::AutoDeltaVector<int>           m_customMaxIndex;   // palette/decal maximum index
+	Archive::AutoDeltaVariable<uint8>       m_customChanged;    // used to signal changes
+
+	Archive::AutoDeltaVariable<float>     m_experimentMod;      // appoximent mod that will be applied to experimentation tries
+	Archive::AutoDeltaVector<std::string> m_appearance;         // list of appearances the player may choose from
+
+	Archive::AutoDeltaVariable<bool>        m_ready;            // flag that the data is ready
+};
+
+//----------------------------------------------------------------------
+
+
+inline void ManufactureSchematicSynchronizedUi::setReady(void)
+{
+	m_ready = true;
+}
+
+inline const std::vector<StringId> & ManufactureSchematicSynchronizedUi::getAttributeNames(void) const
+{
+	return m_attributeName.get();
+}
+
+inline void ManufactureSchematicSynchronizedUi::setExperimentMod(float mod)
+{
+	m_experimentMod = mod;
+}
+
+inline const std::vector<std::string> & ManufactureSchematicSynchronizedUi::getAppearances(void) const
+{
+	return m_appearance.get();
+}
+
+inline void ManufactureSchematicSynchronizedUi::addAppearance(const std::string & appearance)
+{
+	m_appearance.push_back(appearance);
+}
+
+//----------------------------------------------------------------------
+
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/synchronizedUi/ServerSynchronizedUi.cpp b/engine/server/library/serverGame/src/shared/synchronizedUi/ServerSynchronizedUi.cpp
new file mode 100644
index 00000000..88a0a1f2
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/synchronizedUi/ServerSynchronizedUi.cpp
@@ -0,0 +1,184 @@
+// ======================================================================
+//
+// ServerSynchronizedUi.cpp
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerSynchronizedUi.h"
+
+#include "serverGame/Client.h"
+#include "serverGame/GameServer.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/ServerMessageForwarding.h"
+#include "serverGame/ServerObject.h"
+#include "serverNetworkMessages/CreateSyncUiMessage.h"
+#include "sharedNetworkMessages/BaselinesMessage.h"
+#include "sharedNetworkMessages/DeltasMessage.h"
+#include "sharedObject/NetworkIdManager.h"
+
+#include <vector>
+
+//-----------------------------------------------------------------------
+ServerSynchronizedUi::ServerSynchronizedUi(ServerObject & obj) :
+	m_clientObjects(0),
+	m_owner(&obj),
+	m_ownerChangingAuthority(false),
+	m_uiPackage(),
+	m_watchedByList()
+{
+	m_clientObjects = new std::vector<NetworkId>;
+}
+//-----------------------------------------------------------------------
+
+ServerSynchronizedUi::~ServerSynchronizedUi()
+{
+	delete m_clientObjects;
+	m_clientObjects = 0;
+}
+
+//-----------------------------------------------------------------------
+
+void ServerSynchronizedUi::addClientObject(ServerObject & obj)
+{
+	if (!obj.getClient())
+	{
+		WARNING_STRICT_FATAL(true, ("Tried to add a client object %s that had no client\n", obj.getNetworkId().getValueString().c_str()));
+		return;
+	}
+#ifdef _DEBUG
+	if (std::find(m_clientObjects->begin(), m_clientObjects->end(), obj.getNetworkId()) != m_clientObjects->end())
+	{
+		WARNING_STRICT_FATAL(true, ("Trying to add a client %s to SynchUI object that is already there\n", obj.getNetworkId().getValueString().c_str()));
+	}
+#endif //_DEBUG
+	else
+		m_clientObjects->push_back(obj.getNetworkId());
+
+	CreatureObject* co = dynamic_cast<CreatureObject*>(&obj);
+	if(co)
+	{
+		Client* c = co->getClient();
+		if(c)
+		{
+			c->addSynchronizedUi(this);
+		}
+	}
+
+	sendBaselinesToClient(*obj.getClient());
+}
+
+//-----------------------------------------------------------------------
+
+void ServerSynchronizedUi::addToUiPackage(Archive::AutoDeltaVariableBase & source)
+{
+	m_uiPackage.addVariable(source);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerSynchronizedUi::removeClientObject(const NetworkId & client)
+{
+	std::vector<NetworkId>::iterator i = std::find(m_clientObjects->begin(), m_clientObjects->end(),client);
+	if (i == m_clientObjects->end())
+	{
+		WARNING_STRICT_FATAL(true, ("Trying to remove a client %s to SynchUI object that doesn't exist \n", client.getValueString().c_str()));
+		return;
+	}
+	m_clientObjects->erase(i);
+
+	CreatureObject* co = dynamic_cast<CreatureObject*>(NetworkIdManager::getObjectById(client));
+	if(co)
+	{
+		Client* c = co->getClient();
+		if(c)
+		{
+			c->removeSynchronizedUi(this);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ServerSynchronizedUi::removeAllClientObjects()
+{
+	m_clientObjects->clear();
+}
+
+//-----------------------------------------------------------------------
+
+void ServerSynchronizedUi::applyBaselines(Archive::ReadIterator & source)
+{
+	m_uiPackage.unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerSynchronizedUi::applyDeltas(const DeltasMessage& source)
+{
+	DEBUG_FATAL(source.getPackageId() != DeltasMessage::DELTAS_UI, ("Synchrnoized UI received bad package type"));
+	Archive::ReadIterator bs = source.getPackage().begin();
+	m_uiPackage.unpackDeltas(bs);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerSynchronizedUi::sendBaselinesToClient(const Client& client) const
+{
+	BaselinesMessage uiPackage(m_owner->getNetworkId(), m_owner->getObjectType(), m_uiPackage, BaselinesMessage::BASELINES_UI);
+	client.send(uiPackage, true);
+}
+
+//-----------------------------------------------------------------------
+
+void ServerSynchronizedUi::onAuthorityTransferred()
+{
+	CreateSyncUiMessage const createSyncUiMessage(m_owner->getNetworkId(), getClients());
+	ServerMessageForwarding::send(createSyncUiMessage);
+
+	BaselinesMessage const uiPackage(m_owner->getNetworkId(), m_owner->getObjectType(), m_uiPackage, BaselinesMessage::BASELINES_UI);
+	ServerMessageForwarding::send(uiPackage);
+
+	m_ownerChangingAuthority = true;
+
+	removeAllClientObjects();
+}
+
+//-----------------------------------------------------------------------
+
+void ServerSynchronizedUi::sendDeltas() const
+{
+	if (m_uiPackage.getItemCount() > 0)
+	{
+		DeltasMessage uiPackage(m_owner->getNetworkId(), m_owner->getObjectType(), m_uiPackage, DeltasMessage::DELTAS_UI);
+		std::vector<NetworkId>::const_iterator i = m_clientObjects->begin();
+		for(; i != m_clientObjects->end(); ++i)
+		{
+			ServerObject * object = safe_cast<ServerObject*>(NetworkIdManager::getObjectById(*i));
+			if (object && object->getClient())
+			{
+				object->getClient()->send(uiPackage, true);
+			}
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+const std::vector<NetworkId> & ServerSynchronizedUi::getClients() const
+{
+static const std::vector<NetworkId> NO_CLIENTS;
+
+	return m_clientObjects ? *m_clientObjects : NO_CLIENTS;
+}
+
+//----------------------------------------------------------------------
+
+int ServerSynchronizedUi::getNumClients () const
+{
+	return m_clientObjects ? static_cast<int>(m_clientObjects->size ()) : 0;
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/synchronizedUi/ServerSynchronizedUi.h b/engine/server/library/serverGame/src/shared/synchronizedUi/ServerSynchronizedUi.h
new file mode 100644
index 00000000..ddaa4d59
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/synchronizedUi/ServerSynchronizedUi.h
@@ -0,0 +1,96 @@
+// ======================================================================
+//
+// ServerSynchronizedUi.h
+// Copyright 2001 Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef	INCLUDED_ServerSynchronizedUi_H
+#define	INCLUDED_ServerSynchronizedUi_H
+
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedFoundation/NetworkId.h"
+
+#include "sharedFoundation/Watcher.h"
+
+class BaselinesMessage;
+class Client;
+class DeltasMessage;
+class ServerObject;
+
+class ServerSynchronizedUi
+{
+public:
+	explicit             ServerSynchronizedUi(ServerObject& owner);
+	virtual             ~ServerSynchronizedUi() = 0;
+
+	void                 addClientObject(ServerObject & obj);
+	void                 removeClientObject(const NetworkId & client);
+	void                 removeAllClientObjects();
+
+	void                 applyBaselines(Archive::ReadIterator & source);
+	void                 applyDeltas(const DeltasMessage& source);
+	void                 onAuthorityTransferred();
+	void                 sendDeltas() const;
+
+	int                  getNumClients () const;
+	const stdvector<NetworkId>::fwd & getClients() const;
+
+	ServerObject *       getOwner ();
+	const ServerObject * getOwner () const;
+	bool                 isOwnerChangingAuthority() const;
+
+	WatchedByList        &getWatchedByList() const;
+
+protected:
+	void addToUiPackage(Archive::AutoDeltaVariableBase & source);
+
+private:
+	ServerSynchronizedUi();
+	ServerSynchronizedUi(const ServerSynchronizedUi &);
+	ServerSynchronizedUi& operator= (const ServerSynchronizedUi &);
+
+	void sendBaselinesToClient(const Client& client) const;
+	
+	stdvector<NetworkId>::fwd *   m_clientObjects;
+	ServerObject*                 m_owner;
+	mutable bool                  m_ownerChangingAuthority;
+	Archive::AutoDeltaByteStream  m_uiPackage;
+
+	mutable WatchedByList     m_watchedByList;
+};
+
+//----------------------------------------------------------------------
+
+inline WatchedByList &ServerSynchronizedUi::getWatchedByList() const
+{
+	return m_watchedByList;
+}
+
+// ----------------------------------------------------------------------
+
+inline ServerObject *  ServerSynchronizedUi::getOwner ()
+{
+	return m_owner;
+}
+
+//----------------------------------------------------------------------
+
+inline const ServerObject * ServerSynchronizedUi::getOwner () const
+{
+	return m_owner;
+}
+
+//----------------------------------------------------------------------
+
+inline bool ServerSynchronizedUi::isOwnerChangingAuthority() const
+{
+	return m_ownerChangingAuthority;
+}
+
+//----------------------------------------------------------------------
+
+
+#endif
diff --git a/engine/server/library/serverGame/src/shared/trading/ServerSecureTrade.cpp b/engine/server/library/serverGame/src/shared/trading/ServerSecureTrade.cpp
new file mode 100644
index 00000000..a0b2f63b
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/trading/ServerSecureTrade.cpp
@@ -0,0 +1,905 @@
+// ======================================================================
+//
+// ServerSecureTrade.cpp
+// Copyright 2001, 2002 Sony Online Entertainment Inc.
+// All Rights Reserved.
+// 
+// ======================================================================
+
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerSecureTrade.h"
+
+#include "serverGame/Chat.h"
+#include "serverGame/ContainerInterface.h"
+#include "serverGame/CreatureController.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/Pvp.h"
+#include "serverGame/ServerSecureTradeManager.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedLog/Log.h"
+#include "sharedNetworkMessages/SecureTradeMessages.h"
+#include "sharedObject/VolumeContainer.h"
+
+#include <vector>
+// ----------------------------------------------------------------------
+
+namespace ServerSecureTradeNamespace
+{
+	bool isContainedByPlayerButNotEquipped(const CreatureObject & player, const ServerObject& item)
+	{
+		//@todo TFiala - this function will need to change with mounts
+		const Object* topmost = ContainerInterface::getFirstParentInWorld(item);
+		const Object* parent = ContainerInterface::getContainedByObject(item);
+
+		//This function should return true if the topmost player is equal to the player passed into the function and
+		//  if it is not immediatly contained by the player (equipped)
+		
+		if (topmost == &player && parent != &player)
+			return true;
+
+		return false;
+	}
+};
+
+using namespace ServerSecureTradeNamespace;
+
+//------------------------------------------------------------------------------------------
+
+ServerSecureTrade::ServerSecureTrade(CreatureObject & initiator, CreatureObject & recipient) :
+m_id(0),
+m_initiator(&initiator),
+m_initiatorContents(new std::vector<Watcher<ServerObject> >),
+m_initiatorMoney(0),
+m_initiatorOk(false),
+m_initiatorVerify(false),
+m_recipient(&recipient),
+m_recipientContents(new std::vector<Watcher<ServerObject> >),
+m_recipientMoney (0),
+m_recipientOk(false),
+m_recipientVerify(false),
+m_tradeState(ServerSecureTrade::TS_Initializing)
+{
+	//todo get id from the manager, if we need an id.
+}
+
+// ----------------------------------------------------------------------
+
+ServerSecureTrade::~ServerSecureTrade()
+{
+	delete m_initiatorContents;
+	delete m_recipientContents;
+}
+
+// ----------------------------------------------------------------------
+
+void ServerSecureTrade::acceptOffer(const CreatureObject & trader)
+{
+	if (m_tradeState != TS_Trading)
+	{
+		DEBUG_REPORT_LOG(true, ("Secure Trade: accepting an offer in wrong state\n"));
+		return;
+	}
+
+	if (&trader == m_initiator)
+	{
+		m_initiatorOk = true;
+
+		Client * const recipientClient = m_recipient->getClient();
+		if (recipientClient)
+		{
+			AcceptTransactionMessage const m;
+			recipientClient->send(m, true);
+		}
+	}
+	else if (&trader == m_recipient)
+	{
+		m_recipientOk = true;
+
+		Client * const initiatorClient = m_initiator->getClient();
+		if (initiatorClient)
+		{
+			AcceptTransactionMessage const m;
+			initiatorClient->send(m, true);
+		}
+	}
+	else
+		DEBUG_REPORT_LOG(true, ("Secure Trade: received an accept from non participant\n"));
+
+	if (m_initiatorOk && m_recipientOk)
+		beginVerification();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerSecureTrade::addItem(const CreatureObject & trader, const ServerObject & item)
+{
+
+	if (m_tradeState != TS_Trading)
+	{
+		DEBUG_REPORT_LOG(true, ("Secure Trade: received an item in non-trade state\n"));
+		beginTrading();
+	}
+
+	if (!item.canTradeRecursive(false) && (!(m_initiator->getClient() && m_initiator->getClient()->isGod())) && (!(m_recipient->getClient() && m_recipient->getClient()->isGod())))
+	{
+		DEBUG_REPORT_LOG(true, ("Secure Trade: cannot trade item marked with objvar noTrade\n"));
+		Client * const traderClient = trader.getClient();
+		if (traderClient)
+		{
+			AddItemFailedMessage const m(item.getNetworkId());
+			traderClient->send(m, true);
+		}
+		return;
+	}
+
+	//Only allow trade of things in inventory (but not equipped)
+	Container::ContainerErrorCode code =  Container::CEC_Success;
+	if (!isContainedByPlayerButNotEquipped(trader, item)) //m_recipient->canManipulateObject(item, true, true, true, 0, code))
+	{
+		Client * const traderClient = trader.getClient();
+		if (traderClient)
+		{
+			AddItemFailedMessage const m(item.getNetworkId());
+			traderClient->send(m, true);
+		}
+
+		code = Container::CEC_TradeEquipped;
+		ContainerInterface::sendContainerMessageToClient(trader, code);
+		return;
+	}
+	
+	if (&trader == m_initiator)
+	{
+		if (std::find(m_initiatorContents->begin(), m_initiatorContents->end(), &item) == m_initiatorContents->end())
+		{
+			m_initiatorContents->push_back(Watcher<ServerObject>(const_cast<ServerObject *> (&item)));
+			
+			Client * const recipientClient = m_recipient->getClient();
+			if (recipientClient)
+			{
+				item.sendCreateAndBaselinesToClient(*recipientClient);
+
+				AddItemMessage const m(item.getNetworkId());
+				recipientClient->send(m, true);
+			}
+		}
+		else
+		{
+			Client * const traderClient = trader.getClient();
+			if (traderClient)
+			{
+				AddItemFailedMessage const m(item.getNetworkId());
+				traderClient->send(m, true);
+			}
+			//@todo need an error message
+		}
+	}
+	else if (& trader == m_recipient)
+	{
+		if (std::find(m_recipientContents->begin(), m_recipientContents->end(), &item) == m_recipientContents->end())
+		{
+			m_recipientContents->push_back(Watcher<ServerObject>(const_cast<ServerObject *> (&item)));
+			
+			Client * const initiatorClient = m_initiator->getClient();
+			if (initiatorClient)
+			{
+				item.sendCreateAndBaselinesToClient(*initiatorClient);
+
+				AddItemMessage const m(item.getNetworkId());
+				initiatorClient->send(m, true);
+			}
+		}
+		else
+		{
+			Client * const traderClient = trader.getClient();
+			if (traderClient)
+			{
+				AddItemFailedMessage const m(item.getNetworkId());
+				traderClient->send(m, true);
+			}
+			//@todo need an error message about duplicate item.
+		}
+
+	}
+	else
+	{
+		WARNING_STRICT_FATAL(true, ("Secure Trade: received an add Item from non participant\n"));
+		return;
+	}
+	unacceptOffer(*m_initiator);
+	unacceptOffer(*m_recipient);
+
+}
+
+// ----------------------------------------------------------------------
+
+void ServerSecureTrade::beginTrading()
+{
+	m_tradeState = TS_Trading;
+	m_initiatorOk = false;
+	m_recipientOk = false;
+
+	Client * const initiatorClient = m_initiator->getClient();
+	if (initiatorClient)
+	{
+		BeginTradeMessage const toInitiator(m_recipient->getNetworkId());
+		initiatorClient->send(toInitiator, true);
+	}
+
+	Client * const recipientClient = m_recipient->getClient();
+	if (recipientClient)
+	{
+		BeginTradeMessage const toRecipient(m_initiator->getNetworkId());
+		recipientClient->send(toRecipient, true);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerSecureTrade::beginVerification()
+{
+	WARNING_STRICT_FATAL(m_tradeState != TS_Trading, ("Illegal state transition to verify state\n"));
+	m_tradeState = TS_Verifying;
+	m_initiatorVerify = false;
+	m_recipientVerify = false;
+
+	BeginVerificationMessage const m;
+
+	Client * const initiatorClient = m_initiator->getClient();
+	if (initiatorClient)
+		initiatorClient->send(m, true);
+
+	Client * const recipientClient = m_recipient->getClient();
+	if (recipientClient)
+		recipientClient->send(m, true);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerSecureTrade::cancelTrade(const CreatureObject & trader)
+{
+	if (&trader != m_initiator && &trader != m_recipient)
+	{
+		WARNING_STRICT_FATAL(true, ("Secure Trade: received a cancel from non participant\n"));
+		return;
+	}
+
+	AbortTradeMessage const m;
+
+	Client * const initiatorClient = m_initiator->getClient();
+	if (initiatorClient)
+		initiatorClient->send(m, true);
+
+	Client * const recipientClient = m_recipient->getClient();
+	if (recipientClient)
+		recipientClient->send(m, true);
+
+	//clean up and exit
+	exitTrade();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerSecureTrade::completeTrade()
+{
+	//@todo we need better feedback messages
+	if (m_tradeState != TS_Verifying)
+	{
+		WARNING_STRICT_FATAL(true, ("Illegal state transition to complete state\n"));
+		return;
+	}
+	if (!m_initiator || !m_recipient)
+	{
+		WARNING_STRICT_FATAL(true, ("Null trade participant\n"));
+		return;
+	}
+
+	m_tradeState = TS_Complete;
+
+	//Do a range check
+	float distance = m_initiator->findPosition_w().magnitudeBetween(m_recipient->findPosition_w());
+	distance -= m_initiator->getRadius();
+	distance -= m_recipient->getRadius();
+	// Check range on the server with a 1m fudge factor in it.
+	if (distance > 6.0f + 1.0f)
+	{
+		Client * const initiatorClient = m_initiator->getClient();
+		if (initiatorClient)
+		{
+			ProsePackage prosePackage;
+			prosePackage.stringId = StringId("ui_trade", "out_of_range_prose");
+			prosePackage.target.str = m_recipient->getAssignedObjectName();
+			Chat::sendSystemMessage(*m_initiator, prosePackage);
+		}
+
+		Client * const recipientClient = m_recipient->getClient();
+		if (recipientClient)
+		{
+			ProsePackage prosePackage;
+			prosePackage.stringId = StringId("ui_trade", "out_of_range_prose");
+			prosePackage.target.str = m_initiator->getAssignedObjectName();
+			Chat::sendSystemMessage(*m_recipient, prosePackage);
+		}
+
+		cancelTrade(*m_initiator);
+		return;
+	}
+	
+//Do the trade
+
+	//@todo We need to verify the cash can be transferred!  This may require adding a seperate stage (verifying) that waits for  a DB response.
+
+	const long initatorTotalMoney = m_recipientMoney - m_initiatorMoney;
+	if (initatorTotalMoney > 0)
+	{
+		if (m_recipient->getCashBalance() < initatorTotalMoney)
+		{
+			cancelTrade(*m_recipient);
+			return;
+		}
+	}
+	else if (m_initiatorMoney < 0)
+	{
+		if (m_initiator->getCashBalance() < -initatorTotalMoney)
+		{
+			cancelTrade(*m_initiator);
+			return;
+		}
+	}
+
+	ServerObject* initiatorInventory = m_initiator->getInventory();
+	ServerObject* recipientInventory = m_recipient->getInventory();
+	ServerObject* initiatorDatapad = m_initiator->getDatapad();
+	ServerObject* recipientDatapad = m_recipient->getDatapad();
+	Container::ContainerErrorCode errorCode = Container::CEC_Success;
+
+	if (!initiatorInventory || !recipientInventory || !initiatorDatapad || !recipientDatapad)
+	{
+		cancelTrade(*m_initiator);
+		errorCode = Container::CEC_WrongType;
+		ContainerInterface::sendContainerMessageToClient(*m_initiator, errorCode);
+		ContainerInterface::sendContainerMessageToClient(*m_recipient, errorCode);
+		return;
+	}
+
+	int totalInitiatorTangibleVolume = 0;
+	int totalInitiatorInTangibleVolume = 0;
+	int totalRecipientTangibleVolume = 0;
+	int totalRecipientInTangibleVolume = 0;
+	
+	std::vector<Watcher<ServerObject> >::iterator i = m_initiatorContents->begin();
+	//check scripts on all I's items
+	for (; i != m_initiatorContents->end(); ++i)
+	{
+		ServerObject* item = *i;
+		if (!item)
+		{
+			//Item was deleted during trade.  Better cancel it.
+			errorCode = Container::CEC_NotFound;
+			ContainerInterface::sendContainerMessageToClient(*m_initiator, errorCode);
+			ContainerInterface::sendContainerMessageToClient(*m_recipient, errorCode);
+			cancelTrade(*m_initiator);
+			return;
+		}
+		if (dynamic_cast<TangibleObject*>(item))
+		{
+			if (!ContainerInterface::canTransferTo(recipientInventory, *item, NULL, errorCode))
+			{
+				ContainerInterface::sendContainerMessageToClient(*m_initiator, errorCode);
+				ContainerInterface::sendContainerMessageToClient(*m_recipient, errorCode);
+				cancelTrade(*m_initiator);
+				return;
+			}
+			totalInitiatorTangibleVolume += item->getVolume();
+					
+		}
+		else
+		{
+			if (!ContainerInterface::canTransferTo(recipientDatapad, *item, NULL, errorCode))
+			{
+				ContainerInterface::sendContainerMessageToClient(*m_initiator, errorCode);
+				ContainerInterface::sendContainerMessageToClient(*m_recipient, errorCode);
+				cancelTrade(*m_initiator);
+				return;
+			}
+			totalInitiatorInTangibleVolume += item->getVolume();
+		}
+	}
+
+	//check scripts on all R's items
+	for (i = m_recipientContents->begin(); i != m_recipientContents->end(); ++i)
+	{
+		ServerObject* item = *i;
+		if (!item)
+		{
+			//Item was deleted during trade.  Better cancel it.
+			errorCode = Container::CEC_NotFound;
+			ContainerInterface::sendContainerMessageToClient(*m_initiator, errorCode);
+			ContainerInterface::sendContainerMessageToClient(*m_recipient, errorCode);
+			cancelTrade(*m_initiator);
+			return;
+		}
+		if (dynamic_cast<TangibleObject*>(item))
+		{
+			if (!ContainerInterface::canTransferTo(initiatorInventory, *item, NULL, errorCode))
+			{
+				ContainerInterface::sendContainerMessageToClient(*m_initiator, errorCode);
+				ContainerInterface::sendContainerMessageToClient(*m_recipient, errorCode);
+				cancelTrade(*m_initiator);
+				return;
+			}
+			totalRecipientTangibleVolume += item->getVolume();
+		}
+		else
+		{
+			if (!ContainerInterface::canTransferTo(initiatorDatapad, *item, NULL, errorCode))
+			{
+				ContainerInterface::sendContainerMessageToClient(*m_initiator, errorCode);
+				ContainerInterface::sendContainerMessageToClient(*m_recipient, errorCode);
+				cancelTrade(*m_initiator);
+				return;
+			}
+			totalRecipientInTangibleVolume += item->getVolume();
+		}
+
+	}
+
+	//Check total volumes:
+	VolumeContainer * volCont = ContainerInterface::getVolumeContainer(*initiatorInventory);
+	if (!volCont || !volCont->checkVolume(totalRecipientTangibleVolume))
+	{
+		errorCode = Container::CEC_InventoryFull;
+		ContainerInterface::sendContainerMessageToClient(*m_initiator, errorCode);
+		ContainerInterface::sendContainerMessageToClient(*m_recipient, errorCode);
+		cancelTrade(*m_recipient);
+		return;
+	}
+	volCont = ContainerInterface::getVolumeContainer(*initiatorDatapad);
+	if (!volCont || !volCont->checkVolume(totalRecipientInTangibleVolume))
+	{
+		errorCode = Container::CEC_InventoryFull;
+		ContainerInterface::sendContainerMessageToClient(*m_initiator, errorCode);
+		ContainerInterface::sendContainerMessageToClient(*m_recipient, errorCode);
+		cancelTrade(*m_recipient);
+		return;
+	}
+	volCont = ContainerInterface::getVolumeContainer(*recipientInventory);
+	if (!volCont || !volCont->checkVolume(totalInitiatorTangibleVolume))
+	{
+		errorCode = Container::CEC_InventoryFull;
+		ContainerInterface::sendContainerMessageToClient(*m_initiator, errorCode);
+		ContainerInterface::sendContainerMessageToClient(*m_recipient, errorCode);
+		cancelTrade(*m_recipient);
+		return;
+	}
+	volCont = ContainerInterface::getVolumeContainer(*recipientDatapad);
+	if (!volCont || !volCont->checkVolume(totalInitiatorInTangibleVolume))
+	{
+		errorCode = Container::CEC_InventoryFull;
+		ContainerInterface::sendContainerMessageToClient(*m_initiator, errorCode);
+		ContainerInterface::sendContainerMessageToClient(*m_recipient, errorCode);
+		cancelTrade(*m_recipient);
+		return;
+	}
+	
+	
+	//Do transfers.  All transfers SHOULD succeed at this point.  @todo check this by walking through source.
+	//First money
+	if (initatorTotalMoney > 0)
+	{
+		CachedNetworkId id(*m_initiator);
+		if (!m_recipient->transferCashTo(id, initatorTotalMoney))
+		{
+			cancelTrade(*m_recipient);
+			return;
+		}
+		LOG("CustomerService", ("Trade:%s received %d money from %s", PlayerObject::getAccountDescription(m_initiator->getNetworkId()).c_str(), initatorTotalMoney, PlayerObject::getAccountDescription(m_recipient->getNetworkId()).c_str()));
+	}
+	else if (initatorTotalMoney < 0)
+	{
+		CachedNetworkId id(*m_recipient);
+		if (!m_initiator->transferCashTo(id, -initatorTotalMoney))
+		{
+			cancelTrade(*m_initiator);
+			return;
+		}
+		LOG("CustomerService", ("Trade:%s received %d money from %s", PlayerObject::getAccountDescription(m_recipient->getNetworkId()).c_str(), -initatorTotalMoney, PlayerObject::getAccountDescription(m_initiator->getNetworkId()).c_str()));
+	}
+
+	//Then contents
+	
+	for (i = m_initiatorContents->begin(); i != m_initiatorContents->end(); ++i)
+	{
+		ServerObject* item = *i;
+		NOT_NULL(item);
+		if (dynamic_cast<TangibleObject*>(item))
+		{
+			if (!ContainerInterface::transferItemToVolumeContainer(*recipientInventory, *item, NULL, errorCode))
+			{
+				DEBUG_FATAL(true, ("Secure trade transfer failure in initiator transfer!!\n"));
+				LOG("CustomerService", ("Trade:%s FAILED TO receive %s from %s", PlayerObject::getAccountDescription(m_recipient->getNetworkId()).c_str(), ServerObject::getLogDescription(item).c_str(), PlayerObject::getAccountDescription(m_initiator->getNetworkId()).c_str()));
+			}
+			else
+			{
+				LOG("CustomerService", ("Trade:%s received %s from %s", PlayerObject::getAccountDescription(m_recipient->getNetworkId()).c_str(), ServerObject::getLogDescription(item).c_str(), PlayerObject::getAccountDescription(m_initiator->getNetworkId()).c_str()));
+				logTradeitemContents(*m_recipient, *item, *m_initiator);
+			}
+		}
+		else
+		{
+			if (!ContainerInterface::transferItemToVolumeContainer(*recipientDatapad, *item, NULL, errorCode))
+			{
+				DEBUG_FATAL(true, ("Secure trade transfer failure in initiator transfer!!\n"));
+				LOG("CustomerService", ("Trade:%s FAILED TO receive %s from %s", PlayerObject::getAccountDescription(m_recipient->getNetworkId()).c_str(), ServerObject::getLogDescription(item).c_str(), PlayerObject::getAccountDescription(m_initiator->getNetworkId()).c_str()));
+			}
+			else
+			{
+				LOG("CustomerService", ("Trade:%s received %s from %s", PlayerObject::getAccountDescription(m_recipient->getNetworkId()).c_str(), ServerObject::getLogDescription(item).c_str(), PlayerObject::getAccountDescription(m_initiator->getNetworkId()).c_str()));
+				logTradeitemContents(*m_recipient, *item, *m_initiator);
+			}
+
+		}
+		
+	}
+
+	for (i = m_recipientContents->begin(); i != m_recipientContents->end(); ++i)
+	{
+		ServerObject* item = *i;
+		NOT_NULL(item);
+		if (dynamic_cast<TangibleObject*>(item))
+		{
+			if (!ContainerInterface::transferItemToVolumeContainer(*initiatorInventory, *item, NULL, errorCode))
+			{
+				DEBUG_FATAL(true, ("Secure trade transfer failure in recipient transfer!!\n"));
+				LOG("CustomerService", ("Trade:%s FAILED TO receive %s from %s", PlayerObject::getAccountDescription(m_initiator->getNetworkId()).c_str(), ServerObject::getLogDescription(item).c_str(), PlayerObject::getAccountDescription(m_recipient->getNetworkId()).c_str()));
+			}
+			else
+			{
+				LOG("CustomerService", ("Trade:%s received %s from %s", PlayerObject::getAccountDescription(m_initiator->getNetworkId()).c_str(), ServerObject::getLogDescription(item).c_str(), PlayerObject::getAccountDescription(m_recipient->getNetworkId()).c_str()));
+				logTradeitemContents(*m_initiator, *item, *m_recipient);
+			}
+
+		}
+		else
+		{
+			if (!ContainerInterface::transferItemToVolumeContainer(*initiatorDatapad, *item, NULL, errorCode))
+			{
+				DEBUG_FATAL(true, ("Secure trade transfer failure in recipient transfer!!\n"));
+				LOG("CustomerService", ("Trade:%s FAILED TO receive %s from %s", PlayerObject::getAccountDescription(m_initiator->getNetworkId()).c_str(), ServerObject::getLogDescription(item).c_str(), PlayerObject::getAccountDescription(m_recipient->getNetworkId()).c_str()));
+			}
+			else
+			{
+				LOG("CustomerService", ("Trade:%s received %s from %s", PlayerObject::getAccountDescription(m_initiator->getNetworkId()).c_str(), ServerObject::getLogDescription(item).c_str(), PlayerObject::getAccountDescription(m_recipient->getNetworkId()).c_str()));
+				logTradeitemContents(*m_initiator, *item, *m_recipient);
+			}
+		}
+	}
+
+	//If successful send message to clients.
+	TradeCompleteMessage const m;
+
+	Client * const initiatorClient = m_initiator->getClient();
+	if (initiatorClient)
+		initiatorClient->send(m, true);
+
+	Client * const recipientClient = m_recipient->getClient();
+	if (recipientClient)
+		recipientClient->send(m, true);
+
+	Pvp::helpPerformed(*m_initiator, *m_recipient);
+	Pvp::helpPerformed(*m_recipient, *m_initiator);
+	
+	
+	exitTrade();
+
+}
+
+// ----------------------------------------------------------------------
+
+void ServerSecureTrade::logTradeitemContents(const CreatureObject & to, 
+	const ServerObject & item, const CreatureObject & from) const
+{
+	const Container * container = ContainerInterface::getContainer(item);
+	if (container != NULL)
+	{
+		for (ContainerConstIterator i = container->begin(); i != container->end(); ++i)
+		{
+			const Object * o = (*i).getObject();
+			if (o != NULL)
+			{
+				const ServerObject * content = safe_cast<const ServerObject *>(o);
+				LOG("CustomerService", ("Trade:%s received %s contained in %s from %s", 
+					PlayerObject::getAccountDescription(to.getNetworkId()).c_str(), 
+					ServerObject::getLogDescription(content).c_str(), 
+					ServerObject::getLogDescription(&item).c_str(),
+					PlayerObject::getAccountDescription(from.getNetworkId()).c_str()
+					));
+				logTradeitemContents(to, *content, from);
+			}
+			else if ((*i) != CachedNetworkId::cms_cachedInvalid)
+			{
+				LOG("CustomerService", ("Trade:%s received unknown object %s contained in %s from %s", 
+					PlayerObject::getAccountDescription(to.getNetworkId()).c_str(), 
+					(*i).getValueString().c_str(), 
+					ServerObject::getLogDescription(&item).c_str(),
+					PlayerObject::getAccountDescription(from.getNetworkId()).c_str()
+					));
+			}
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+void ServerSecureTrade::exitTrade()
+{
+	//unlock objects here
+	ServerSecureTradeManager::clearTrade(*m_initiator, *m_recipient);
+}
+
+// ----------------------------------------------------------------------
+
+/** 
+* the initiator money is the amount of money the initiator is putting up for trade
+* the recipient money is the amount of money the recipient is putting up for trade
+*
+* only one transfer results in the end, the difference of the two values
+*
+* It is important to note that the client displays how much money they are GIVING away regardless of who we are.
+* 
+*/
+
+void ServerSecureTrade::giveMoney(const CreatureObject & trader, int amount)
+{
+	if (m_tradeState != TS_Trading)
+	{
+		DEBUG_REPORT_LOG(true, ("Secure Trade: received money in non-trade state\n"));
+		beginTrading();
+	}
+
+	if (amount < 0)
+	{
+		DEBUG_WARNING (true, ("Secure trade: received negative money amount in giveMoney from %s", trader.getNetworkId ().getValueString ().c_str ()));
+		return;
+	}
+
+	if (&trader == m_initiator)
+	{
+		m_initiatorMoney = amount;
+
+		Client * const recipientClient = m_recipient->getClient();
+		if (recipientClient)
+		{
+			GiveMoneyMessage const giveMessage(amount);
+			recipientClient->send(giveMessage, true);
+		}
+	}
+	else if (&trader == m_recipient)
+	{
+		m_recipientMoney = amount;
+
+		Client * const initiatorClient = m_initiator->getClient();
+		if (initiatorClient)
+		{
+			GiveMoneyMessage const giveMessage(amount);
+			initiatorClient->send(giveMessage, true);
+		}
+	}
+	else
+	{
+		WARNING_STRICT_FATAL(true, ("Secure Trade: received a modify money from non participant\n"));
+	}
+
+	unacceptOffer(*m_initiator);
+	unacceptOffer(*m_recipient);
+}
+
+// ----------------------------------------------------------------------
+
+void ServerSecureTrade::rejectOffer(const CreatureObject & trader)
+{	
+	if (m_tradeState != TS_Verifying)
+	{
+		DEBUG_REPORT_LOG(true, ("Secure Trade: received offer reject non-Verify state\n"));
+	}
+
+	DenyTradeMessage const m;
+	if (&trader == m_initiator)
+	{
+		Client * const recipientClient = m_recipient->getClient();
+		if (recipientClient)
+			recipientClient->send(m, true);
+	}
+	else if (&trader == m_recipient)
+	{
+		Client * const initiatorClient = m_initiator->getClient();
+		if (initiatorClient)
+			initiatorClient->send(m, true);
+	}
+	else
+	{
+		WARNING_STRICT_FATAL(true, ("Secure Trade: received reject trade from non participant\n"));
+		return;
+	}
+	beginTrading();
+}
+
+// ----------------------------------------------------------------------
+
+void ServerSecureTrade::removeItem(const CreatureObject & trader, const ServerObject & item)
+{
+	//-- CS requested that removing an item cancels the trade to prevent scamming
+	UNREF (item);
+	cancelTrade (trader);
+
+#if 0
+	if (m_tradeState != TS_Trading)
+	{
+		DEBUG_REPORT_LOG(true, ("Secure Trade: received an remove item in non-trade state\n"));
+		beginTrading();
+	}
+
+	if (&trader == m_initiator)
+	{
+		std::vector<ServerObject *>::iterator i = std::find(m_initiatorContents->begin(), m_initiatorContents->end(), &item);
+		if (i != m_initiatorContents->end())
+		{
+			m_initiatorContents->erase(i);
+
+			Client * const recipientClient = m_recipient->getClient();
+			if (recipientClient)
+			{
+				RemoveItemMessage const m(item.getNetworkId());
+				recipientClient->send(m, true);
+			}
+		}
+		else
+		{
+			//@todo need an error message
+		}
+
+	}
+	else if (& trader == m_recipient)
+	{
+		std::vector<ServerObject *>::iterator i = std::find(m_recipientContents->begin(), m_recipientContents->end(), &item);
+		if (i != m_recipientContents->end())
+		{
+			m_recipientContents->erase(i);
+
+			Client * const initiatorClient = m_initiator->getClient();
+			if (initiatorClient)
+			{
+				RemoveItemMessage const m(item.getNetworkId());
+				initiatorClient->send(m, true);
+			}
+		}
+		else
+		{
+			//@todo need an error message for not found.
+		}
+
+	}
+	else
+	{
+		WARNING_STRICT_FATAL(true, ("Secure Trade: received a remove Item from non participant\n"));
+		return;
+	}
+	unacceptOffer(*m_initiator);
+	unacceptOffer(*m_recipient);
+#endif
+
+}
+
+// ----------------------------------------------------------------------
+
+void ServerSecureTrade::verifyTrade(const CreatureObject & trader)
+{
+	if (m_tradeState != TS_Verifying)
+	{
+		DEBUG_REPORT_LOG(true, ("Secure Trade: verifying an offer in wrong state\n"));
+		return;
+	}
+
+	if (&trader == m_initiator)
+	{
+		m_initiatorVerify = true;
+
+		Client * const recipientClient = m_recipient->getClient();
+		if (recipientClient)
+		{
+			VerifyTradeMessage const m;
+			recipientClient->send(m, true);
+		}
+	}
+	else if (&trader == m_recipient)
+	{
+		m_recipientVerify = true;
+
+		Client * const initiatorClient = m_initiator->getClient();
+		if (initiatorClient)
+		{
+			VerifyTradeMessage const m;
+			initiatorClient->send(m, true);
+		}
+	}
+	else
+		DEBUG_REPORT_LOG(true, ("Secure Trade: received a verify from non participant\n"));
+
+	if (m_initiatorVerify && m_recipientVerify)
+		completeTrade();
+
+}
+
+// ----------------------------------------------------------------------
+
+void ServerSecureTrade::unacceptOffer(const CreatureObject & trader)
+{
+	if (m_tradeState != TS_Trading)
+	{
+		DEBUG_REPORT_LOG(true, ("Secure Trade: accepting an offer in wrong state\n"));
+		return;
+	}
+
+	if (&trader == m_initiator)
+	{
+		if (m_initiatorOk)
+		{
+			m_initiatorOk = false;
+
+			Client * const recipientClient = m_recipient->getClient();
+			if (recipientClient)
+			{
+				UnAcceptTransactionMessage const m;
+				recipientClient->send(m, true);
+			}
+		}
+	}
+	else if (&trader == m_recipient)
+	{
+		if (m_recipientOk)
+		{
+			m_recipientOk = false;
+
+			Client * const initiatorClient = m_initiator->getClient();
+			if (initiatorClient)
+			{
+				UnAcceptTransactionMessage const m;
+				initiatorClient->send(m, true);
+			}
+		}
+	}
+	else
+		DEBUG_REPORT_LOG(true, ("Secure Trade: received an accept from non participant\n"));
+}
+
+bool ServerSecureTrade::hasItemInSecureTrade( const CreatureObject &trader, const ServerObject &item ) const
+{
+	
+	// check for a match in intitiator
+	std::vector<Watcher<ServerObject> >::iterator i = m_initiatorContents->begin();
+	for (; i != m_initiatorContents->end(); ++i)
+	{
+		ServerObject*  tradeItem = *i;
+		if (tradeItem && (tradeItem->getNetworkId() == item.getNetworkId() ) )
+		{
+			return true;
+		}
+	}
+
+	// check for match in recipient
+	std::vector<Watcher<ServerObject> >::iterator r = m_recipientContents->begin();
+	for (; r != m_recipientContents->end(); ++r)
+	{
+		ServerObject*  tradeItem = *r;
+		if (tradeItem && (tradeItem->getNetworkId() == item.getNetworkId()) )
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+// ----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverGame/src/shared/trading/ServerSecureTrade.h b/engine/server/library/serverGame/src/shared/trading/ServerSecureTrade.h
new file mode 100644
index 00000000..9ec22759
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/trading/ServerSecureTrade.h
@@ -0,0 +1,79 @@
+// ======================================================================
+//
+// ServerSecureTrade.h
+// Copyright 2001, 2002 Sony Online Entertainment Inc.
+// All Rights Reserved.
+// 
+// ======================================================================
+
+#ifndef INCLUDED_ServerSecureTrade_H
+#define INCLUDED_ServerSecureTrade_H
+
+#include "sharedFoundation/Watcher.h"
+
+class CreatureObject;
+class ServerObject;
+
+class ServerSecureTrade
+{
+
+public:
+
+	ServerSecureTrade(CreatureObject & inititaor, CreatureObject & recipient);
+	~ServerSecureTrade();
+
+	void acceptOffer(const CreatureObject & trader);
+	void addItem(const CreatureObject & trader, const ServerObject & item);
+	void beginTrading();
+	void cancelTrade(const CreatureObject & trader);
+	void giveMoney(const CreatureObject & trader, int amount);
+	void rejectOffer(const CreatureObject &trader);
+	void removeItem(const CreatureObject & trader, const ServerObject & item);
+	void verifyTrade(const CreatureObject & trader);
+	void unacceptOffer(const CreatureObject & trader);
+	bool hasItemInSecureTrade( const CreatureObject & trader, const ServerObject & item) const;
+
+private:
+	void beginVerification();
+	void completeTrade();
+	void exitTrade();
+	void logTradeitemContents(const CreatureObject & to, const ServerObject & item, const CreatureObject & from) const;
+
+private:
+
+	enum TradeState
+	{
+		TS_Initializing,
+		TS_Trading,
+		TS_Verifying,
+		TS_Complete
+	};
+
+	int                             m_id;
+
+	CreatureObject*                   m_initiator;
+	stdvector<Watcher<ServerObject> >::fwd*   m_initiatorContents;
+	int                               m_initiatorMoney;
+	bool                              m_initiatorOk;
+	bool                              m_initiatorVerify;
+
+	CreatureObject*                    m_recipient;
+	stdvector<Watcher<ServerObject> >::fwd*    m_recipientContents;
+	int                                m_recipientMoney;
+	bool                               m_recipientOk;
+	bool                               m_recipientVerify;
+
+	TradeState                         m_tradeState;
+
+	
+
+	
+
+	ServerSecureTrade (const ServerSecureTrade &);
+	ServerSecureTrade & operator= (const ServerSecureTrade &);
+
+};
+
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/shared/trading/ServerSecureTradeManager.cpp b/engine/server/library/serverGame/src/shared/trading/ServerSecureTradeManager.cpp
new file mode 100644
index 00000000..fd3792b3
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/trading/ServerSecureTradeManager.cpp
@@ -0,0 +1,123 @@
+// ======================================================================
+//
+// ServerSecureTradeManager.cpp
+// Copyright 2001, 2002 Sony Online Entertainment Inc.
+// All Rights Reserved.
+// 
+// ======================================================================
+
+
+#include "serverGame/FirstServerGame.h"
+#include "serverGame/ServerSecureTradeManager.h"
+
+#include "serverGame/CreatureController.h"
+#include "serverGame/CreatureObject.h"
+#include "serverGame/PlayerObject.h"
+#include "serverGame/ServerSecureTrade.h"
+#include "serverGame/ServerWorld.h"
+
+#include "sharedFoundation/GameControllerMessage.h"
+
+#include "sharedNetworkMessages/MessageQueueSecureTrade.h"
+#include "sharedNetworkMessages/SecureTradeMessages.h"
+
+
+// ------------------------------------------------------------
+
+void ServerSecureTradeManager::install()
+{
+}
+
+// ------------------------------------------------------------
+
+void ServerSecureTradeManager::remove()
+{
+}
+
+// ------------------------------------------------------------
+
+/** Normally request is an asynchronous request.  But it can fail immediately (and return false) if
+* The initiator is already trading
+*/
+
+bool ServerSecureTradeManager::requestTradeWith (CreatureObject & initiator, CreatureObject & recipient)
+{
+	if (PlayerObject::isIgnoring(recipient.getNetworkId(), initiator.getNetworkId()))
+	{
+		DEBUG_REPORT_LOG(true, ("Trade request stopped due to recipient ignoring initiator\n"));
+		return false;
+	}
+
+	//Send message to recipient.
+	return recipient.getCreatureController()->tradeRequested(initiator);
+}
+
+// ------------------------------------------------------------
+
+void ServerSecureTradeManager::acceptTradeRequest (CreatureObject & initiator,CreatureObject & recipient)
+{
+	//@todo.  This function will need to see if the two objects are on the same server. 
+	//If not, then request that they be of the planet server and queue up a request
+	//If so proceed with pretrade.  For now, always proceed.
+
+	beginPreTrade(initiator, recipient);
+
+}
+
+// ------------------------------------------------------------
+
+/** 
+	This is issued if the player refuses the trade, or if the recip is already trading.
+*/
+void ServerSecureTradeManager::refuseTrade(CreatureObject & initiator, CreatureObject & recipient)
+{
+	MessageQueueSecureTrade * m = new MessageQueueSecureTrade(MessageQueueSecureTrade::TMI_DeniedTrade, initiator.getNetworkId(), recipient.getNetworkId());
+	initiator.getCreatureController()->appendMessage(static_cast<int>(CM_secureTrade), 0.0f, m,
+					GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
+
+}
+
+// ------------------------------------------------------------
+
+/** When a trade is aborted or exitted, this call will clean things up.
+*/
+void ServerSecureTradeManager::clearTrade (CreatureObject & initiator, CreatureObject & recipient)
+{
+	ServerSecureTrade * secureTrade = initiator.getCreatureController()->getSecureTrade();
+	DEBUG_FATAL( secureTrade != recipient.getCreatureController()->getSecureTrade(), ("Parties not involved in the same trade!\n"));
+
+	initiator.getCreatureController()->setSecureTrade(0);
+	recipient.getCreatureController()->setSecureTrade(0);
+
+	delete secureTrade;
+
+	//@todo unlock players from server migration
+}
+	
+// ------------------------------------------------------------
+
+void ServerSecureTradeManager::beginPreTrade(CreatureObject & initiator, CreatureObject & recipient)
+{
+	if (initiator.getCreatureController()->getSecureTrade() || recipient.getCreatureController()->getSecureTrade())
+	{
+		DEBUG_REPORT_LOG(true, ("Objects already trading\n"));
+		return;
+	}
+
+	//@todo Lock the players from server migration.
+	if (!initiator.isAuthoritative() || !recipient.isAuthoritative())
+	{
+		WARNING_STRICT_FATAL(true, ("Cannot execute trade between objects not on the same server\n"));
+		return;
+	}
+
+	ServerSecureTrade * secureTrade = new ServerSecureTrade(initiator, recipient);
+
+	initiator.getCreatureController()->setSecureTrade(secureTrade);
+	recipient.getCreatureController()->setSecureTrade(secureTrade);
+
+
+	secureTrade->beginTrading();
+}
+
+// ------------------------------------------------------------
diff --git a/engine/server/library/serverGame/src/shared/trading/ServerSecureTradeManager.h b/engine/server/library/serverGame/src/shared/trading/ServerSecureTradeManager.h
new file mode 100644
index 00000000..e855661c
--- /dev/null
+++ b/engine/server/library/serverGame/src/shared/trading/ServerSecureTradeManager.h
@@ -0,0 +1,37 @@
+// ======================================================================
+//
+// ServerSecureTradeManager.h
+// Copyright 2001, 2002 Sony Online Entertainment Inc.
+// All Rights Reserved.
+// 
+// ======================================================================
+
+
+#ifndef INCLUDED_ServerSecureTradeManager_H
+#define INCLUDED_ServerSecureTradeManager_H
+
+class CreatureObject;
+class ServerSecureTrade;
+
+class ServerSecureTradeManager
+{
+public:
+	static void install();
+	static void remove();
+
+	static bool requestTradeWith (CreatureObject & initiator, CreatureObject & recipient);
+	static void acceptTradeRequest (CreatureObject & initiator, CreatureObject & recipient);
+	static void refuseTrade(CreatureObject & initiator, CreatureObject & recipient);
+	static void clearTrade (CreatureObject & initiator, CreatureObject & recipient);
+
+private:
+	ServerSecureTradeManager();
+	~ServerSecureTradeManager();
+
+	static void   beginPreTrade(CreatureObject & initiator, CreatureObject & recipient);
+
+};
+
+
+#endif
+
diff --git a/engine/server/library/serverGame/src/win32/FirstServerGame.cpp b/engine/server/library/serverGame/src/win32/FirstServerGame.cpp
new file mode 100644
index 00000000..c10e7d27
--- /dev/null
+++ b/engine/server/library/serverGame/src/win32/FirstServerGame.cpp
@@ -0,0 +1,10 @@
+// ======================================================================
+//
+// FirstServerGame.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverGame/FirstServerGame.h"
+
+// ======================================================================